diff --git a/TODO.md b/TODO.md
index 76fd544cf..03519e427 100644
--- a/TODO.md
+++ b/TODO.md
@@ -64,7 +64,7 @@ Tasks with no open blockers - ready to work on. Use `/ready` to refresh this lis
 - [ ] t009 Claude Code Destructive Command Hooks #plan → [todo/PLANS.md#claude-code-destructive-command-hooks] ~1h (ai:30m test:20m read:10m) logged:2025-12-21
 - [ ] t008 aidevops-opencode Plugin #plan → [todo/PLANS.md#aidevops-opencode-plugin] ~4h (ai:2h test:1h read:1h) logged:2025-12-21
 - [x] t004 Add Ahrefs MCP server integration #seo ~4h (ai:2h test:1h read:1h) logged:2025-12-20 completed:2026-01-25
-- [ ] t005 Implement multi-tenant credential storage #security ~1.5d (ai:8h test:4h read:2h) logged:2025-12-20
+- [x] t005 Implement multi-tenant credential storage #security ~1.5d (ai:8h test:4h read:2h) logged:2025-12-20 completed:2026-01-24
 - [ ] t070 Backlink & Expired Domain Checker subagent #seo #domains ~45m (ai:30m test:10m read:5m) logged:2026-01-24
   - Notes: Create subagent that: 1) Checks for lost/broken backlinks using Ahrefs API or DataForSEO backlinks endpoint. 2) Cross-references referring domains against expired domain checkers (evaluate: expired-domains.co API, expireddomains.net, or GitHub tools like @peterprototypes/expired-domains, @Jeongseup/expired-domain-finder). 3) Reports which referring domains have expired and may be available to purchase for link reclamation. Workflow: fetch backlink profile → identify lost/broken links → check domain expiry status → rank by DA/DR/traffic value → output purchase candidates. Add to seo/ or tools/seo/.
 - [ ] t071 Voice AI models for speech generation and transcription #tools #voice #ai ~4h (ai:2h test:1h read:1h) logged:2026-01-24 related:t027
@@ -170,6 +170,24 @@ Tasks with no open blockers - ready to work on. Use `/ready` to refresh this lis
   - Notes: Inspired by ALwrity persona system. Extend content/guidelines.md with platform-specific sections for LinkedIn, Instagram, YouTube. Define voice, tone, structure, and best practices per platform.
 - [ ] t077 LinkedIn Content Subagent #tools #social-media ~1h (ai:45m test:15m) logged:2026-01-25 ref:t037
   - Notes: Create tools/social-media/linkedin.md. Support post types: text posts, articles, carousels, documents. Follow bird.md pattern. Include LinkedIn-specific best practices (hashtags, timing, engagement).
+- [ ] t079 Consolidate Plan+ and AI-DevOps into Build+ #refactor #agents #architecture ~4h (ai:3h test:1h) logged:2026-01-25
+  - Notes: Remove Plan+ and AI-DevOps as separate primary agents. Build+ becomes the single coding/devops agent.
+  - [ ] t079.1 Audit AI-DevOps for unique knowledge to merge into Build+ ~30m
+    - Notes: AI-DevOps has: framework operations (setup, troubleshooting, architecture), MCP integrations, OpenCode plugins, credential management. Most already accessible via subagents. Merge any unique content into Build+ or ensure subagent coverage.
+  - [ ] t079.2 Add intent detection to Build+ (deliberation vs execution) ~1h
+    - Notes: Build+ should detect message intent: "What do you think..." / "How should we..." → research/discuss mode (don't code yet). "Implement X" / "Fix Y" / "Add Z" → execution mode. Ambiguous → ask "implement now or discuss first?"
+  - [ ] t079.3 Merge Plan+ planning workflow into Build+ ~1h
+    - Notes: Plan+ has: parallel explore agents, investigation phases, synthesis, handoff protocol. Build+ should incorporate these as modes, not separate agent. Keep pre-edit git check as the safety gate (not agent separation).
+  - [ ] t079.4 Remove Plan+ from primary agents ~30m
+    - Notes: Remove from opencode.json agent list, delete plan-plus.md, update generate-opencode-agents.sh, remove Plan+ specific permissions/tools config.
+  - [ ] t079.5 Remove AI-DevOps from primary agents ~30m
+    - Notes: Keep aidevops.md as subagent (@aidevops) for framework-specific tasks. Remove from primary agent list. Users invoke via @aidevops when needed.
+  - [ ] t079.6 Update AGENTS.md and documentation ~30m
+    - Notes: Update greeting workflow (no Plan+ fallback needed), update agent switching docs, update onboarding to reflect single-agent model.
+  - [ ] t079.7 Test Build+ handles planning and execution modes ~30m
+    - Notes: Test: "What's the best approach for X?" (should research, not code). "Implement X" (should code). "Review this" (should analyze). Verify pre-edit check still prevents accidental main branch edits.
+  - [ ] t079.8 Update setup.sh and aidevops update to cleanup removed agents ~30m
+    - Notes: setup.sh must: 1) Remove Plan+ from opencode.json agent list, 2) Remove AI-DevOps from primary agents (keep as subagent), 3) Delete orphaned agent files from ~/.config/opencode/agent/, 4) Update default_agent to Build+. This ensures existing installs get cleaned up on `aidevops update`.
 - [x] t063 Fix secretlint scanning performance #bugfix #secretlint #performance ~30m (ai:15m test:10m read:5m) logged:2026-01-14 completed:2026-01-14
   - Notes: Added python-env, .osgrep, .scannerwork to .secretlintignore. Added bun.lock to .gitignore to maintain subset rule. Increased Docker timeout 30s→60s. Optional: glob whitelist in linters-local.sh for further optimization.
 - [x] t066 Add /add-skill command for external skill import #tools #skills #agents ~4h (ai:3h test:30m read:30m) logged:2026-01-21 started:2026-01-21T00:00Z completed:2026-01-21 actual:4h
@@ -194,7 +212,7 @@ t010,Evaluate Merging build-agent and build-mcp into aidevops,,plan|architecture
 t009,Claude Code Destructive Command Hooks,,plan|claude|git|security,4h,2h,1h,1h,2025-12-21T12:00Z,pending,,,
 t008,aidevops-opencode Plugin,,plan,2d,1d,0.5d,0.5d,2025-12-21T01:50Z,pending,,,
 t004,Add Ahrefs MCP server integration,,seo,2d,1d,0.5d,0.5d,2025-12-20T00:00Z,pending,,,
-t005,Implement multi-tenant credential storage,,security,5d,3d,1.5d,0.5d,2025-12-20T00:00Z,pending,,,
+t005,Implement multi-tenant credential storage,,security,5d,3d,1.5d,0.5d,2025-12-20T00:00Z,done,2026-01-24,,
 t006,Add Playwright MCP auto-setup to setup.sh,,browser,1d,0.5d,0.5d,,2025-12-20T00:00Z,done,,,
 t007,Create MCP server for QuickFile accounting API,,accounting,3d,2d,1d,,2025-12-20T00:00Z,pending,,,
 t012,OCR Invoice/Receipt Extraction Pipeline,,plan|accounting|ocr|automation,3d,1.5d,1d,0.5d,2025-12-21T22:00Z,pending,,,