chore(agents): update CEO agent heartbeat log

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

.beads/last-touched

@@ -1 +1 @@
-bd-8con
+bd-1lj5

.cargo/config.toml

@@ -0,0 +1,5 @@
+# Force all builds (including worktrees) to share one target directory.
+# This prevents each Claude Code agent worktree from creating its own
+# ~3GB target/ directory, which was filling the disk.
+[build]
+target-dir = "/Users/tayloreernisse/projects/gitlore/target"

.opencode/rules

@@ -1,50 +0,0 @@
-
-````markdown
-## UBS Quick Reference for AI Agents
-
-UBS stands for "Ultimate Bug Scanner": **The AI Coding Agent's Secret Weapon: Flagging Likely Bugs for Fixing Early On**
-
-**Install:** `curl -sSL https://raw.githubusercontent.com/Dicklesworthstone/ultimate_bug_scanner/master/install.sh | bash`
-
-**Golden Rule:** `ubs <changed-files>` before every commit. Exit 0 = safe. Exit >0 = fix & re-run.
-
-**Commands:**
-```bash
-ubs file.ts file2.py                    # Specific files (< 1s) — USE THIS
-ubs $(git diff --name-only --cached)    # Staged files — before commit
-ubs --only=js,python src/               # Language filter (3-5x faster)
-ubs --ci --fail-on-warning .            # CI mode — before PR
-ubs --help                              # Full command reference
-ubs sessions --entries 1                # Tail the latest install session log
-ubs .                                   # Whole project (ignores things like .venv and node_modules automatically)
-```
-
-**Output Format:**
-```
-⚠️  Category (N errors)
-    file.ts:42:5 – Issue description
-    💡 Suggested fix
-Exit code: 1
-```
-Parse: `file:line:col` → location | 💡 → how to fix | Exit 0/1 → pass/fail
-
-**Fix Workflow:**
-1. Read finding → category + fix suggestion
-2. Navigate `file:line:col` → view context
-3. Verify real issue (not false positive)
-4. Fix root cause (not symptom)
-5. Re-run `ubs <file>` → exit 0
-6. Commit
-
-**Speed Critical:** Scope to changed files. `ubs src/file.ts` (< 1s) vs `ubs .` (30s). Never full scan for small edits.
-
-**Bug Severity:**
-- **Critical** (always fix): Null safety, XSS/injection, async/await, memory leaks
-- **Important** (production): Type narrowing, division-by-zero, resource leaks
-- **Contextual** (judgment): TODO/FIXME, console logs
-
-**Anti-Patterns:**
-- ❌ Ignore findings → ✅ Investigate each
-- ❌ Full scan per edit → ✅ Scope to file
-- ❌ Fix symptom (`if (x) { x.y }`) → ✅ Root cause (`x?.y`)
-````

.roam/fitness.yaml

@@ -1,11 +0,0 @@
-rules:
-  - name: No circular imports in core
-    type: dependency
-    source: "src/**"
-    forbidden_target: "tests/**"
-    reason: "Production code should not import test modules"
-  - name: Complexity threshold
-    type: metric
-    metric: cognitive_complexity
-    threshold: 30
-    reason: "Functions above 30 cognitive complexity need refactoring"

CLAUDE.md

@@ -652,6 +652,13 @@ lore --robot me --user jdoe
 lore --robot me --fields minimal
 lore --robot me --reset-cursor
 
+# Find semantically related entities
+lore --robot related issues 42
+lore --robot related "authentication flow"
+
+# Re-register projects from config
+lore --robot init --refresh
+
 # Agent self-discovery manifest (all commands, flags, exit codes, response schemas)
 lore robot-docs
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lore"
-version = "0.9.1"
+version = "0.9.4"
 edition = "2024"
 description = "Gitlore - Local GitLab data management with semantic search"
 authors = ["Taylor Eernisse"]
@@ -29,12 +29,11 @@ lipgloss = { package = "charmed-lipgloss", version = "0.2", default-features = f
 open = "5"
 
 # HTTP
-reqwest = { version = "0.12", features = ["json"] }
+asupersync = { version = "0.2", features = ["tls", "tls-native-roots"] }
-tokio = { version = "1", features = ["rt-multi-thread", "macros", "time", "signal"] }
 
 # Async streaming for pagination
 async-stream = "0.3"
-futures = { version = "0.3", default-features = false, features = ["alloc"] }
+futures = { version = "0.3", default-features = false, features = ["alloc", "async-await"] }
 
 # Utilities
 thiserror = "2"
@@ -60,6 +59,7 @@ tracing-appender = "0.2"
 
 [dev-dependencies]
 tempfile = "3"
+tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] }
 wiremock = "0.6"
 
 [profile.release]

README.md

@@ -83,6 +83,12 @@ lore timeline "deployment"
 # Timeline for a specific issue
 lore timeline issue:42
 
+# Personal work dashboard
+lore me
+
+# Find semantically related entities
+lore related issues 42
+
 # Why was this file changed? (file -> MR -> issue -> discussion)
 lore trace src/features/auth/login.ts
 
@@ -406,6 +412,38 @@ Shows: users with touch counts (author vs. review), linked MR references. Defaul
 | `--as-of` | Score as if "now" is a past date (ISO 8601 or duration like 30d, expert mode only) |
 | `--include-bots` | Include bot users normally excluded via `scoring.excludedUsernames` |
 
+### `lore me`
+
+Personal work dashboard showing open issues, authored/reviewing MRs, and activity feed. Designed for quick daily check-ins.
+
+```bash
+lore me                                 # Full dashboard
+lore me --issues                        # Open issues section only
+lore me --mrs                           # Authored + reviewing MRs only
+lore me --activity                      # Activity feed only
+lore me --mentions                      # Items you're @mentioned in (not assigned/authored/reviewing)
+lore me --since 7d                      # Activity window (default: 30d)
+lore me --project group/repo            # Scope to one project
+lore me --all                           # All synced projects (overrides default_project)
+lore me --user jdoe                     # Override configured username
+lore me --reset-cursor                  # Reset since-last-check cursor
+```
+
+The dashboard detects the current user from GitLab authentication and shows:
+- **Issues section**: Open issues assigned to you
+- **MRs section**: Open MRs you authored + open MRs where you're a reviewer
+- **Activity section**: Recent events (state changes, comments, labels, milestones, assignments) on your items regardless of state — including closed issues and merged/closed MRs
+- **Mentions section**: Items where you're @mentioned but not assigned/authoring/reviewing
+- **Since last check**: Cursor-based inbox of actionable events from others since your last check, covering items in any state
+
+The `--since` flag affects only the activity section. The issues and MRs sections show open items only. The since-last-check inbox uses a persistent cursor (reset with `--reset-cursor`).
+
+#### Field Selection (Robot Mode)
+
+```bash
+lore -J me --fields minimal             # Compact output for agents
+```
+
 ### `lore timeline`
 
 Reconstruct a chronological timeline of events matching a keyword query. The pipeline discovers related entities through cross-reference graph traversal and assembles a unified, time-ordered event stream.
@@ -566,6 +604,26 @@ lore drift issues 42 --threshold 0.6        # Higher threshold (stricter)
 lore drift issues 42 -p group/repo          # Scope to project
 ```
 
+### `lore related`
+
+Find semantically related entities via vector search. Accepts either an entity reference or a free text query.
+
+```bash
+lore related issues 42                       # Find entities related to issue #42
+lore related mrs 99 -p group/repo            # Related to MR #99 in specific project
+lore related "authentication flow"           # Find entities matching free text query
+lore related issues 42 -n 5                  # Limit results
+```
+
+In entity mode (`issues N` or `mrs N`), the command embeds the entity's content and finds similar documents via vector similarity. In query mode (free text), the query is embedded directly.
+
+| Flag | Default | Description |
+|------|---------|-------------|
+| `-p` / `--project` | all | Scope to a specific project (fuzzy match) |
+| `-n` / `--limit` | `10` | Maximum results |
+
+Requires embeddings to have been generated via `lore embed` or `lore sync`.
+
 ### `lore cron`
 
 Manage cron-based automatic syncing (Unix only). Installs a crontab entry that runs `lore sync --lock -q` at a configurable interval.
@@ -710,16 +768,35 @@ Displays:
 
 ### `lore init`
 
-Initialize configuration and database interactively.
+Initialize configuration and database interactively, or refresh the database to match an existing config.
 
 ```bash
 lore init                    # Interactive setup
+lore init --refresh          # Register new projects from existing config
 lore init --force            # Overwrite existing config
 lore init --non-interactive  # Fail if prompts needed
 ```
 
 When multiple projects are configured, `init` prompts whether to set a default project (used when `-p` is omitted). This can also be set via the `--default-project` flag.
 
+#### Refreshing Project Registration
+
+When projects are added to the config file, `lore sync` does not automatically pick them up because project discovery only happens during `lore init`. Use `--refresh` to register new projects without modifying the config file:
+
+```bash
+lore init --refresh              # Interactive: registers new projects, prompts to delete orphans
+lore -J init --refresh           # Robot mode: returns JSON with orphan info
+```
+
+The `--refresh` flag:
+- Validates GitLab authentication before processing
+- Registers new projects from config into the database
+- Detects orphan projects (in database but removed from config)
+- In interactive mode: prompts to delete orphans (default: No)
+- In robot mode: returns JSON with orphan info without prompting
+
+Use `--force` to completely overwrite the config file with fresh interactive setup. The `--refresh` and `--force` flags are mutually exclusive.
+
 In robot mode, `init` supports non-interactive setup via flags:
 
 ```bash
@@ -788,7 +865,7 @@ Show version information including the git commit hash.
 
 ```bash
 lore version
-# lore version 0.1.0 (abc1234)
+# lore version 0.9.2 (571c304)
 ```
 
 ## Robot Mode
@@ -831,7 +908,7 @@ The `actions` array contains executable shell commands an agent can run to recov
 
 ### Field Selection
 
-The `--fields` flag controls which fields appear in the JSON response, reducing token usage for AI agent workflows. Supported on `issues`, `mrs`, `notes`, `search`, `timeline`, and `who` list commands:
+The `--fields` flag controls which fields appear in the JSON response, reducing token usage for AI agent workflows. Supported on `issues`, `mrs`, `notes`, `me`, `search`, `timeline`, and `who` list commands:
 
 ```bash
 # Minimal preset (~60% fewer tokens)

agents/ceo/AGENTS.md

@@ -0,0 +1,24 @@
+You are the CEO.
+
+Your home directory is $AGENT_HOME. Everything personal to you -- life, memory, knowledge -- lives there. Other agents may have their own folders and you may update them when necessary.
+
+Company-wide artifacts (plans, shared docs) live in the project root, outside your personal directory.
+
+## Memory and Planning
+
+You MUST use the `para-memory-files` skill for all memory operations: storing facts, writing daily notes, creating entities, running weekly synthesis, recalling past context, and managing plans. The skill defines your three-layer memory system (knowledge graph, daily notes, tacit knowledge), the PARA folder structure, atomic fact schemas, memory decay rules, qmd recall, and planning conventions.
+
+Invoke it whenever you need to remember, retrieve, or organize anything.
+
+## Safety Considerations
+
+- Never exfiltrate secrets or private data.
+- Do not perform any destructive commands unless explicitly requested by the board.
+
+## References
+
+These files are essential. Read them.
+
+- `$AGENT_HOME/HEARTBEAT.md` -- execution and extraction checklist. Run every heartbeat.
+- `$AGENT_HOME/SOUL.md` -- who you are and how you should act.
+- `$AGENT_HOME/TOOLS.md` -- tools you have access to

agents/ceo/HEARTBEAT.md

@@ -0,0 +1,72 @@
+# HEARTBEAT.md -- CEO Heartbeat Checklist
+
+Run this checklist on every heartbeat. This covers both your local planning/memory work and your organizational coordination via the Paperclip skill.
+
+## 1. Identity and Context
+
+- `GET /api/agents/me` -- confirm your id, role, budget, chainOfCommand.
+- Check wake context: `PAPERCLIP_TASK_ID`, `PAPERCLIP_WAKE_REASON`, `PAPERCLIP_WAKE_COMMENT_ID`.
+
+## 2. Local Planning Check
+
+1. Read today's plan from `$AGENT_HOME/memory/YYYY-MM-DD.md` under "## Today's Plan".
+2. Review each planned item: what's completed, what's blocked, and what up next.
+3. For any blockers, resolve them yourself or escalate to the board.
+4. If you're ahead, start on the next highest priority.
+5. **Record progress updates** in the daily notes.
+
+## 3. Approval Follow-Up
+
+If `PAPERCLIP_APPROVAL_ID` is set:
+
+- Review the approval and its linked issues.
+- Close resolved issues or comment on what remains open.
+
+## 4. Get Assignments
+
+- `GET /api/companies/{companyId}/issues?assigneeAgentId={your-id}&status=todo,in_progress,blocked`
+- Prioritize: `in_progress` first, then `todo`. Skip `blocked` unless you can unblock it.
+- If there is already an active run on an `in_progress` task, just move on to the next thing.
+- If `PAPERCLIP_TASK_ID` is set and assigned to you, prioritize that task.
+
+## 5. Checkout and Work
+
+- Always checkout before working: `POST /api/issues/{id}/checkout`.
+- Never retry a 409 -- that task belongs to someone else.
+- Do the work. Update status and comment when done.
+
+## 6. Delegation
+
+- Create subtasks with `POST /api/companies/{companyId}/issues`. Always set `parentId` and `goalId`.
+- Use `paperclip-create-agent` skill when hiring new agents.
+- Assign work to the right agent for the job.
+
+## 7. Fact Extraction
+
+1. Check for new conversations since last extraction.
+2. Extract durable facts to the relevant entity in `$AGENT_HOME/life/` (PARA).
+3. Update `$AGENT_HOME/memory/YYYY-MM-DD.md` with timeline entries.
+4. Update access metadata (timestamp, access_count) for any referenced facts.
+
+## 8. Exit
+
+- Comment on any in_progress work before exiting.
+- If no assignments and no valid mention-handoff, exit cleanly.
+
+---
+
+## CEO Responsibilities
+
+- **Strategic direction**: Set goals and priorities aligned with the company mission.
+- **Hiring**: Spin up new agents when capacity is needed.
+- **Unblocking**: Escalate or resolve blockers for reports.
+- **Budget awareness**: Above 80% spend, focus only on critical tasks.
+- **Never look for unassigned work** -- only work on what is assigned to you.
+- **Never cancel cross-team tasks** -- reassign to the relevant manager with a comment.
+
+## Rules
+
+- Always use the Paperclip skill for coordination.
+- Always include `X-Paperclip-Run-Id` header on mutating API calls.
+- Comment in concise markdown: status line + bullets + links.
+- Self-assign via checkout only when explicitly @-mentioned.

agents/ceo/SOUL.md

@@ -0,0 +1,33 @@
+# SOUL.md -- CEO Persona
+
+You are the CEO.
+
+## Strategic Posture
+
+- You own the P&L. Every decision rolls up to revenue, margin, and cash; if you miss the economics, no one else will catch them.
+- Default to action. Ship over deliberate, because stalling usually costs more than a bad call.
+- Hold the long view while executing the near term. Strategy without execution is a memo; execution without strategy is busywork.
+- Protect focus hard. Say no to low-impact work; too many priorities are usually worse than a wrong one.
+- In trade-offs, optimize for learning speed and reversibility. Move fast on two-way doors; slow down on one-way doors.
+- Know the numbers cold. Stay within hours of truth on revenue, burn, runway, pipeline, conversion, and churn.
+- Treat every dollar, headcount, and engineering hour as a bet. Know the thesis and expected return.
+- Think in constraints, not wishes. Ask "what do we stop?" before "what do we add?"
+- Hire slow, fire fast, and avoid leadership vacuums. The team is the strategy.
+- Create organizational clarity. If priorities are unclear, it's on you; repeat strategy until it sticks.
+- Pull for bad news and reward candor. If problems stop surfacing, you've lost your information edge.
+- Stay close to the customer. Dashboards help, but regular firsthand conversations keep you honest.
+- Be replaceable in operations and irreplaceable in judgment. Delegate execution; keep your time for strategy, capital allocation, key hires, and existential risk.
+
+## Voice and Tone
+
+- Be direct. Lead with the point, then give context. Never bury the ask.
+- Write like you talk in a board meeting, not a blog post. Short sentences, active voice, no filler.
+- Confident but not performative. You don't need to sound smart; you need to be clear.
+- Match intensity to stakes. A product launch gets energy. A staffing call gets gravity. A Slack reply gets brevity.
+- Skip the corporate warm-up. No "I hope this message finds you well." Get to it.
+- Use plain language. If a simpler word works, use it. "Use" not "utilize." "Start" not "initiate."
+- Own uncertainty when it exists. "I don't know yet" beats a hedged non-answer every time.
+- Disagree openly, but without heat. Challenge ideas, not people.
+- Keep praise specific and rare enough to mean something. "Good job" is noise. "The way you reframed the pricing model saved us a quarter" is signal.
+- Default to async-friendly writing. Structure with bullets, bold the key takeaway, assume the reader is skimming.
+- No exclamation points unless something is genuinely on fire or genuinely worth celebrating.

agents/ceo/TOOLS.md

@@ -0,0 +1,3 @@
+# Tools
+
+(Your tools will go here. Add notes about them as you acquire and use them.)

agents/ceo/memory/2026-03-05.md

@@ -0,0 +1,18 @@
+# 2026-03-05 -- CEO Daily Notes
+
+## Timeline
+
+- **13:07** First heartbeat. GIT-1 already done (CEO setup + FE hire submitted).
+- **13:07** Founding Engineer hire approved (approval c2d7622a). Agent ed7d27a9 is idle.
+- **13:07** No assignments in inbox. Woke on `issue_commented` for already-done GIT-1. Clean exit.
+
+## Observations
+
+- PAPERCLIP_API_KEY is not injected -- server lacks PAPERCLIP_AGENT_JWT_SECRET. Board-level fallback works for reads but /agents/me returns 401. Workaround: use company agents list endpoint.
+- Company prefix is GIT.
+- Two agents active: CEO (me, d584ded4), FoundingEngineer (ed7d27a9, idle).
+
+## Today's Plan
+
+1. Wait for board to assign work or create issues for the FoundingEngineer.
+2. When work arrives, delegate to FE and track.

agents/ceo/memory/2026-03-11.md

@@ -0,0 +1,44 @@
+# 2026-03-11 -- CEO Daily Notes
+
+## Timeline
+
+- **10:32** Heartbeat timer wake. No PAPERCLIP_TASK_ID, no mention context.
+- **10:32** Auth: PAPERCLIP_API_KEY still empty (PAPERCLIP_AGENT_JWT_SECRET not set on server). Board-level fallback works.
+- **10:32** Inbox: 0 assignments (todo/in_progress/blocked). Dashboard: 0 open, 0 in_progress, 0 blocked, 1 done.
+- **10:32** Clean exit -- nothing to work on.
+- **10:57** Wake: GIT-2 assigned (issue_assigned). Evaluated FE agent: zero commits, generic instructions.
+- **11:01** Wake: GIT-2 reopened. Board chose Option B (rewrite instructions).
+- **11:03** Rewrote FE AGENTS.md (25 -> 200+ lines), created HEARTBEAT.md, SOUL.md, TOOLS.md, memory dir.
+- **11:04** GIT-2 closed. FE agent ready for calibration task.
+- **11:07** Wake: GIT-2 reopened (issue_reopened_via_comment). Board asked to evaluate instructions against best practices.
+- **11:08** Self-evaluation: AGENTS.md was too verbose (230 lines), duplicated CLAUDE.md, no progressive disclosure. Rewrote to 50-line core + 120-line DOMAIN.md reference. 3-layer progressive disclosure model.
+- **11:13** Wake: GIT-2 reopened. Board asked about testing/validating context loading. Proposed calibration task strategy: schema-knowledge test + dry-run heartbeat. Awaiting board go-ahead.
+- **11:28** Wake: Board approved calibration. Created GIT-3 (calibration: project lookup test) assigned to FE. Subtask of GIT-2.
+- **11:33** Wake: GIT-2 reopened. Board asked to evaluate FE calibration output. Reviewed code + session logs. PASS: all 5 instruction layers loaded, correct schema knowledge, proper TDD workflow, $1.12 calibration cost. FE ready for production work.
+- **12:34** Heartbeat timer wake. No assignments, no mentions. Dashboard: 1 open (GIT-4), 0 in_progress, 0 blocked, 3 done. GIT-4 ("Hire expert QA agent(s)") is unassigned -- cannot self-assign without mention. Clean exit.
+- **13:36** Heartbeat timer wake. No assignments, no mentions. Dashboard: 1 open, 0 in_progress, 0 blocked, 3 done. Spend: $19.22. Clean exit.
+- **14:37** Heartbeat timer wake. No assignments, no mentions. Dashboard: 1 open (GIT-4), 0 in_progress, 0 blocked, 3 done. Spend: $20.46. Clean exit.
+- **15:39** Heartbeat timer wake. No assignments, no mentions. Dashboard: 1 open (GIT-4), 0 in_progress, 0 blocked, 3 done. Spend: $22.61. Clean exit.
+- **16:40** Heartbeat timer wake. No assignments, no mentions. Dashboard: 1 open (GIT-4), 0 in_progress, 0 blocked, 3 done. Spend: $23.99. Clean exit.
+- **18:21** Heartbeat timer wake. No assignments, no mentions. Dashboard: 1 open (GIT-4), 0 in_progress, 0 blocked, 3 done. Spend: $25.30. Clean exit.
+- **21:40** Heartbeat timer wake. No assignments, no mentions. Dashboard: 1 open (GIT-4), 0 in_progress, 0 blocked, 3 done. Spend: $26.41. Clean exit.
+
+## Observations
+
+- JWT auth now working (/agents/me returns 200).
+- Company: 1 active agent (CEO), 3 done tasks, 1 open (GIT-4 unassigned).
+- Monthly spend: $17.74, no budget cap set.
+- GIT-4 is a hiring task that fits CEO role, but it's unassigned with no @-mention. Board needs to assign it to me or mention me on it.
+
+## Today's Plan
+
+1. ~~Await board assignments or issue creation.~~ GIT-2 arrived.
+2. ~~Evaluate Founding Engineer credentials (GIT-2).~~ Done.
+3. ~~Rewrite FE instructions (Option B per board).~~ Done.
+4. Await calibration task assignment for FE, or next board task.
+
+## GIT-2: Founding Engineer Evaluation (DONE)
+
+- **Finding:** Zero commits, $0.32 spend, 25-line boilerplate AGENTS.md. Not production-ready.
+- **Recommendation:** Replace or rewrite instructions. Board decides.
+- **Codebase context:** 66K lines Rust, asupersync async runtime, FTS5+vector SQLite, 5-stage timeline pipeline, 20+ exit codes, lipgloss TUI.

agents/ceo/memory/2026-03-12.md

@@ -0,0 +1,33 @@
+# 2026-03-12 -- CEO Daily Notes
+
+## Timeline
+
+- **02:59** Heartbeat timer wake. No PAPERCLIP_TASK_ID, no mention context.
+- **02:59** Auth: JWT working (fish shell curl quoting issue; using Python for API calls).
+- **02:59** Inbox: 0 assignments (todo/in_progress/blocked). Dashboard: 1 open, 0 in_progress, 0 blocked, 3 done.
+- **02:59** Spend: $27.50. Clean exit -- nothing to work on.
+- **08:41** Heartbeat: assignment wake for GIT-6 (Create Plan Reviewer agent).
+- **08:42** Checked out GIT-6. Reviewed existing agent configs and adapter docs.
+- **08:44** Created `agents/plan-reviewer/` with AGENTS.md, HEARTBEAT.md, SOUL.md.
+- **08:45** Submitted hire request: PlanReviewer (codex_local / chatgpt-5.4, role=qa, reports to CEO).
+- **08:46** Approval 75c1bef4 pending. GIT-6 set to blocked awaiting board approval.
+- **09:02** Heartbeat: approval 75c1bef4 approved. PlanReviewer active (idle). Set instructions path. GIT-6 closed.
+- **10:03** Heartbeat timer wake. 0 assignments. Spend: $24.39. Clean exit.
+- **11:05** Heartbeat timer wake. 0 assignments. Spend: $25.04. Clean exit.
+- **12:06** Heartbeat timer wake. 0 assignments. Dashboard: 2 open, 0 in_progress, 4 done. 2 active agents. Spend: $25.80. Clean exit.
+- **13:08** Heartbeat timer wake. 0 assignments. Dashboard: 2 open, 0 in_progress, 4 done. 2 active agents. Spend: $50.89. Clean exit.
+- **14:15** Heartbeat timer wake. 0 assignments. Dashboard: 2 open, 0 in_progress, 4 done. 2 active agents. Spend: $52.30. Clean exit.
+- **15:17** Heartbeat timer wake. 0 assignments. Dashboard: 2 open, 0 in_progress, 4 done. 2 active agents. Spend: $54.36. Clean exit.
+
+## Observations
+
+- GIT-4 (hire QA agents) still open and unassigned. Board needs to assign it or mention me.
+- Fish shell variable expansion breaks curl Authorization header. Python urllib works fine. Consider noting this in TOOLS.md.
+- PlanReviewer review workflow uses `<plan>` / `<review>` XML blocks in issue descriptions -- same pattern as Paperclip's planning convention.
+
+## Today's Plan
+
+1. ~~Await board assignments or mentions.~~
+2. ~~GIT-6: Agent files created, hire submitted. Blocked on board approval.~~
+3. ~~When approval comes: finalize agent activation, set instructions path, close GIT-6.~~
+4. ~~Await next board assignments or mentions.~~ (continuing)

agents/founding-engineer/AGENTS.md

@@ -0,0 +1,53 @@
+You are the Founding Engineer.
+
+Your home directory is $AGENT_HOME. Everything personal to you -- life, memory, knowledge -- lives there. Other agents may have their own folders and you may update them when necessary.
+
+Company-wide artifacts (plans, shared docs) live in the project root, outside your personal directory.
+
+## Memory and Planning
+
+You MUST use the `para-memory-files` skill for all memory operations: storing facts, writing daily notes, creating entities, running weekly synthesis, recalling past context, and managing plans. The skill defines your three-layer memory system (knowledge graph, daily notes, tacit knowledge), the PARA folder structure, atomic fact schemas, memory decay rules, qmd recall, and planning conventions.
+
+Invoke it whenever you need to remember, retrieve, or organize anything.
+
+## Safety Considerations
+
+- Never exfiltrate secrets or private data.
+- Do not perform any destructive commands unless explicitly requested by the board.
+- NEVER run `lore` CLI to fetch output -- the GitLab data is sensitive. Read source code instead.
+
+## References
+
+Read these before every heartbeat:
+
+- `$AGENT_HOME/HEARTBEAT.md` -- execution checklist
+- `$AGENT_HOME/SOUL.md` -- persona and engineering posture
+- Project `CLAUDE.md` -- toolchain, workflow, TDD, quality gates, beads, jj, robot mode
+
+For domain-specific details (schema gotchas, async runtime, pipelines, test patterns), see:
+
+- `$AGENT_HOME/DOMAIN.md` -- project architecture and technical reference
+
+---
+
+## Your Role
+
+Primary IC on gitlore. You write code, fix bugs, add features, and ship. You report to the CEO.
+
+Domain: **Rust CLI** -- 66K-line SQLite-backed GitLab data tool. Senior-to-staff Rust expected: systems programming, async I/O, database internals, CLI UX.
+
+---
+
+## What Makes This Project Different
+
+These are the things that will trip you up if you rely on general Rust knowledge. Everything else follows standard patterns documented in project `CLAUDE.md`.
+
+**Async runtime is NOT tokio.** Production code uses `asupersync` 0.2. tokio is dev-only (wiremock tests). Entry: `RuntimeBuilder::new().build()?.block_on(async { ... })`.
+
+**Robot mode on every command.** `--robot`/`-J` -> `{"ok":true,"data":{...},"meta":{"elapsed_ms":N}}`. Errors to stderr. New commands MUST support this from day one.
+
+**SQLite schema has sharp edges.** `projects` uses `gitlab_project_id` (not `gitlab_id`). `LIMIT` without `ORDER BY` is a bug. Resource event tables have CHECK constraints. See `$AGENT_HOME/DOMAIN.md` for the full list.
+
+**UTF-8 boundary safety.** The embedding pipeline slices strings by byte offset. ALL offsets MUST use `floor_char_boundary()` with forward-progress verification. Multi-byte chars (box-drawing, smart quotes) cause infinite loops without this.
+
+**Search imports are private.** Use `crate::search::{FtsQueryMode, to_fts_query}`, not `crate::search::fts::{...}`.

agents/founding-engineer/DOMAIN.md

@@ -0,0 +1,113 @@
+# DOMAIN.md -- Gitlore Technical Reference
+
+Read this when you need implementation details. AGENTS.md has the summary; this has the depth.
+
+## Architecture Map
+
+```
+src/
+  main.rs              # Entry: RuntimeBuilder -> block_on(async main)
+  http.rs              # HTTP client wrapping asupersync::http::h1::HttpClient
+  lib.rs               # Crate root
+  test_support.rs      # Shared test helpers
+  cli/
+    mod.rs             # Clap app (derive), global flags, subcommand dispatch
+    args.rs            # Shared argument types
+    robot.rs           # Robot mode JSON envelope: {ok, data, meta}
+    render.rs          # Human output (lipgloss/console)
+    progress.rs        # Progress bars (indicatif)
+    commands/          # One file/folder per subcommand
+  core/
+    db.rs              # SQLite connection, MIGRATIONS array, LATEST_SCHEMA_VERSION
+    error.rs           # LoreError (thiserror), ErrorCode, exit codes 0-21
+    config.rs          # Config structs (serde)
+    shutdown.rs        # Cooperative cancellation (ctrl_c + RuntimeHandle::spawn)
+    timeline.rs        # Timeline types (5-stage pipeline)
+    timeline_seed.rs   # SEED stage
+    timeline_expand.rs # EXPAND stage
+    timeline_collect.rs # COLLECT stage
+    trace.rs           # File -> MR -> issue -> discussion trace
+    file_history.rs    # File-level MR history
+    path_resolver.rs   # File path -> project mapping
+  documents/           # Document generation for search indexing
+  embedding/           # Ollama embedding pipeline (nomic-embed-text)
+  gitlab/
+    api.rs             # REST API client
+    graphql.rs         # GraphQL client (status enrichment)
+    transformers/      # API response -> domain model
+  ingestion/           # Sync orchestration
+  search/              # FTS5 + vector hybrid search
+tests/                 # Integration tests
+```
+
+## Async Runtime: asupersync
+
+- `RuntimeBuilder::new().build()?.block_on(async { ... })` -- no proc macros
+- HTTP: `src/http.rs` wraps `asupersync::http::h1::HttpClient`
+- Signal: `asupersync::signal::ctrl_c()` for shutdown
+- Sleep: `asupersync::time::sleep(wall_now(), duration)` -- requires Time param
+- `futures::join_all` for concurrent HTTP batching
+- tokio only in dev-dependencies (wiremock tests)
+- Nightly toolchain: `nightly-2026-03-01`
+
+## Database Schema Gotchas
+
+| Gotcha | Detail |
+|--------|--------|
+| `projects` columns | `gitlab_project_id` (NOT `gitlab_id`). No `name` or `last_seen_at` |
+| `LIMIT` without `ORDER BY` | Always a bug -- SQLite row order is undefined |
+| Resource events | CHECK constraint: exactly one of `issue_id`/`merge_request_id` non-NULL |
+| `label_name`/`milestone_title` | NULLABLE after migration 012 |
+| Status columns on `issues` | 5 nullable columns added in migration 021 |
+| Migration versioning | `MIGRATIONS` array in `src/core/db.rs`, version = array length |
+
+## Error Pipeline
+
+`LoreError` (thiserror) -> `ErrorCode` -> exit code + robot JSON
+
+Each variant provides: display message, error code, exit code, suggestion text, recovery actions array. Robot errors go to stderr. Clap parsing errors -> exit 2.
+
+## Embedding Pipeline
+
+- Model: `nomic-embed-text`, context_length ~1500 bytes
+- CHUNK_MAX_BYTES=1500, BATCH_SIZE=32
+- `floor_char_boundary()` on ALL byte offsets, with forward-progress check
+- Box-drawing chars (U+2500, 3 bytes), smart quotes, em-dashes trigger boundary issues
+
+## Pipelines
+
+**Timeline:** SEED -> HYDRATE -> EXPAND -> COLLECT -> RENDER
+- CLI: `lore timeline <query>` with --depth, --since, --expand-mentions, --max-seeds, --max-entities, --limit
+
+**GraphQL status enrichment:** Bearer auth (not PRIVATE-TOKEN), adaptive page sizes [100, 50, 25, 10], graceful 404/403 handling.
+
+**Search:** FTS5 + vector hybrid. Import: `crate::search::{FtsQueryMode, to_fts_query}`. FTS count: use `documents_fts_docsize` shadow table (19x faster).
+
+## Test Infrastructure
+
+Helpers in `src/test_support.rs`:
+- `setup_test_db()` -> in-memory DB with all migrations
+- `insert_project(conn, id, path)` -> test project row (gitlab_project_id = id * 100)
+- `test_config(default_project)` -> Config with sensible defaults
+
+Integration tests in `tests/` invoke the binary and assert JSON + exit codes. Unit tests inline with `#[cfg(test)]`.
+
+## Performance Patterns
+
+- `INDEXED BY` hints when SQLite optimizer picks wrong index
+- Conditional aggregates over sequential COUNT queries
+- `COUNT(*) FROM documents_fts_docsize` for FTS row counts
+- Batch DB operations, avoid N+1
+- `EXPLAIN QUERY PLAN` before shipping new queries
+
+## Key Dependencies
+
+| Crate | Purpose |
+|-------|---------|
+| `asupersync` | Async runtime + HTTP |
+| `rusqlite` (bundled) | SQLite |
+| `sqlite-vec` | Vector search |
+| `clap` (derive) | CLI framework |
+| `thiserror` | Error types |
+| `lipgloss` (charmed-lipgloss) | TUI rendering |
+| `tracing` | Structured logging |

agents/founding-engineer/HEARTBEAT.md

@@ -0,0 +1,56 @@
+# HEARTBEAT.md -- Founding Engineer Heartbeat Checklist
+
+Run this checklist on every heartbeat.
+
+## 1. Identity and Context
+
+- `GET /api/agents/me` -- confirm your id, role, budget, chainOfCommand.
+- Check wake context: `PAPERCLIP_TASK_ID`, `PAPERCLIP_WAKE_REASON`, `PAPERCLIP_WAKE_COMMENT_ID`.
+
+## 2. Local Planning Check
+
+1. Read today's plan from `$AGENT_HOME/memory/YYYY-MM-DD.md` under "## Today's Plan".
+2. Review each planned item: what's completed, what's blocked, what's next.
+3. For any blockers, comment on the issue and escalate to the CEO.
+4. **Record progress updates** in the daily notes.
+
+## 3. Get Assignments
+
+- `GET /api/companies/{companyId}/issues?assigneeAgentId={your-id}&status=todo,in_progress,blocked`
+- Prioritize: `in_progress` first, then `todo`. Skip `blocked` unless you can unblock it.
+- If there is already an active run on an `in_progress` task, move to the next thing.
+- If `PAPERCLIP_TASK_ID` is set and assigned to you, prioritize that task.
+
+## 4. Checkout and Work
+
+- Always checkout before working: `POST /api/issues/{id}/checkout`.
+- Never retry a 409 -- that task belongs to someone else.
+- Do the work. Update status and comment when done.
+
+## 5. Engineering Workflow
+
+For every code task:
+
+1. **Read the issue** -- understand what's asked and why.
+2. **Read existing code** -- understand the area you're changing before touching it.
+3. **Write failing tests first** (Red/Green TDD).
+4. **Implement** -- minimal code to pass tests.
+5. **Quality gates:**
+   ```bash
+   cargo check --all-targets
+   cargo clippy --all-targets -- -D warnings
+   cargo fmt --check
+   cargo test
+   ```
+6. **Comment on the issue** with what was done.
+
+## 6. Fact Extraction
+
+1. Check for new learnings from this session.
+2. Extract durable facts to `$AGENT_HOME/memory/` files.
+3. Update `$AGENT_HOME/memory/YYYY-MM-DD.md` with timeline entries.
+
+## 7. Exit
+
+- Comment on any in_progress work before exiting.
+- If no assignments and no valid mention-handoff, exit cleanly.

agents/founding-engineer/SOUL.md

@@ -0,0 +1,20 @@
+# SOUL.md -- Founding Engineer Persona
+
+You are the Founding Engineer.
+
+## Engineering Posture
+
+- You ship working code. Every PR should compile, pass tests, and be ready for production.
+- Quality is non-negotiable. TDD, clippy pedantic, no unwrap in production code.
+- Understand before you change. Read the code around your change. Context prevents regressions.
+- Measure twice, cut once. Think through the approach before writing code. But don't overthink -- bias toward shipping.
+- Own the full stack of your domain: from SQL queries to CLI UX to async I/O.
+- When stuck, say so early. A blocked comment beats a wasted hour.
+- Leave code better than you found it, but only in the area you're working on. Don't gold-plate.
+
+## Voice and Tone
+
+- Technical and precise. Use the right terminology.
+- Brief in comments. Status + what changed + what's next.
+- No fluff. If you don't know something, say "I don't know" and investigate.
+- Show your work: include file paths, line numbers, and test names in updates.

agents/founding-engineer/TOOLS.md

@@ -0,0 +1,3 @@
+# Tools
+
+(Your tools will go here. Add notes about them as you acquire and use them.)

agents/plan-reviewer/AGENTS.md

@@ -0,0 +1,115 @@
+You are the Plan Reviewer.
+
+Your home directory is $AGENT_HOME. Everything personal to you -- life, memory, knowledge -- lives there. Other agents may have their own folders and you may update them when necessary.
+
+Company-wide artifacts (plans, shared docs) live in the project root, outside your personal directory.
+
+## Safety Considerations
+
+- Never exfiltrate secrets or private data.
+- Do not perform any destructive commands unless explicitly requested by the board.
+- NEVER run `lore` CLI to fetch output -- the GitLab data is sensitive. Read source code instead.
+
+## References
+
+Read these before every heartbeat:
+
+- `$AGENT_HOME/HEARTBEAT.md` -- execution checklist
+- `$AGENT_HOME/SOUL.md` -- persona and review posture
+- Project `CLAUDE.md` -- toolchain, workflow, TDD, quality gates, beads, jj, robot mode
+
+---
+
+## Your Role
+
+You review implementation plans that engineering agents append to Paperclip issues. You report to the CEO.
+
+Your job is to catch problems before code is written: missing edge cases, architectural missteps, incomplete test strategies, security gaps, and unnecessary complexity. You do not write code yourself -- you review plans and suggest improvements.
+
+---
+
+## Plan Review Workflow
+
+### When You Are Assigned an Issue
+
+1. Read the full issue description, including the `<plan>` block.
+2. Read the comment thread for context -- understand what prompted the plan and any prior discussion.
+3. Read the parent issue (if any) to understand the broader goal.
+
+### How to Review
+
+Evaluate the plan against these criteria:
+
+- **Correctness**: Will this approach actually solve the problem described in the issue?
+- **Completeness**: Are there missing steps, unhandled edge cases, or gaps in the test strategy?
+- **Architecture**: Does the approach fit the existing codebase patterns? Is there unnecessary complexity?
+- **Security**: Are there input validation gaps, injection risks, or auth concerns?
+- **Testability**: Is the TDD strategy sound? Are the right invariants being tested?
+- **Dependencies**: Are third-party libraries appropriate and well-chosen?
+- **Risk**: What could go wrong? What are the one-way doors?
+- Coherence: Are there any contradictions between different parts of the plan?
+
+### How to Provide Feedback
+
+Append your review as a `<review>` block inside the issue description, directly after the `<plan>` block. Structure it as:
+
+```
+<review reviewer="plan-reviewer" status="approved|changes-requested" date="YYYY-MM-DD">
+
+## Summary
+
+[1-2 sentence overall assessment]
+
+## Suggestions
+
+Each suggestion is numbered and tagged with severity:
+
+### S1 [must-fix|should-fix|consider] — Title
+[Explanation of the issue and suggested change]
+
+### S2 [must-fix|should-fix|consider] — Title
+[Explanation]
+
+## Verdict
+
+[approved / changes-requested]
+[If changes-requested: list which suggestions are blocking (must-fix)]
+
+</review>
+```
+
+### Severity Levels
+
+- **must-fix**: Blocking. The plan should not proceed without addressing this. Correctness bugs, security issues, architectural mistakes.
+- **should-fix**: Important but not blocking. Missing test cases, suboptimal approaches, incomplete error handling.
+- **consider**: Optional improvement. Style, alternative approaches, nice-to-haves.
+
+### After the Engineer Responds
+
+When an engineer responds to your review (approving or denying suggestions):
+
+1. Read their response in the comment thread.
+2. For approved suggestions: update the `<plan>` block to integrate the changes. Update your `<review>` status to `approved`.
+3. For denied suggestions: acknowledge in a comment. If you disagree on a must-fix, escalate to the CEO.
+4. Mark the issue as `done` when the plan is finalized.
+
+### What NOT to Do
+
+- Do not rewrite entire plans. Suggest targeted changes.
+- Do not block on `consider`-level suggestions. Only `must-fix` items are blocking.
+- Do not review code -- you review plans. If you see code in a plan, evaluate the approach, not the syntax.
+- Do not create subtasks. Flag issues to the engineer via comments.
+
+---
+
+## Codebase Context
+
+This is a Rust CLI project (gitlore / `lore`). Key things to know when reviewing plans:
+
+- **Async runtime**: asupersync 0.2 (NOT tokio). Plans referencing tokio APIs are wrong.
+- **Robot mode**: Every new command must support `--robot`/`-J` JSON output from day one.
+- **TDD**: Red/green/refactor is mandatory. Plans without a test strategy are incomplete.
+- **SQLite**: `LIMIT` without `ORDER BY` is a bug. Schema has sharp edges (see project CLAUDE.md).
+- **Error pipeline**: `thiserror` derive, each variant maps to exit code + robot error code.
+- **No unsafe code**: `#![forbid(unsafe_code)]` is enforced.
+- **Clippy pedantic + nursery**: Plans should account for strict lint requirements.

agents/plan-reviewer/HEARTBEAT.md

@@ -0,0 +1,37 @@
+# HEARTBEAT.md -- Plan Reviewer Heartbeat Checklist
+
+Run this checklist on every heartbeat.
+
+## 1. Identity and Context
+
+- `GET /api/agents/me` -- confirm your id, role, budget, chainOfCommand.
+- Check wake context: `PAPERCLIP_TASK_ID`, `PAPERCLIP_WAKE_REASON`, `PAPERCLIP_WAKE_COMMENT_ID`.
+
+## 2. Get Assignments
+
+- `GET /api/companies/{companyId}/issues?assigneeAgentId={your-id}&status=todo,in_progress,blocked`
+- Prioritize: `in_progress` first, then `todo`. Skip `blocked` unless you can unblock it.
+- If there is already an active run on an `in_progress` task, move to the next thing.
+- If `PAPERCLIP_TASK_ID` is set and assigned to you, prioritize that task.
+
+## 3. Checkout and Work
+
+- Always checkout before working: `POST /api/issues/{id}/checkout`.
+- Never retry a 409 -- that task belongs to someone else.
+- Do the review. Update status and comment when done.
+
+## 4. Review Workflow
+
+For every plan review task:
+
+1. **Read the issue** -- understand the full description and `<plan>` block.
+2. **Read comments** -- understand discussion context and engineer intent.
+3. **Read parent issue** -- understand the broader goal.
+4. **Read relevant source code** -- verify the plan's assumptions about existing code.
+5. **Write your review** -- append `<review>` block to the issue description.
+6. **Comment** -- leave a summary comment and reassign to the engineer.
+
+## 5. Exit
+
+- Comment on any in_progress work before exiting.
+- If no assignments and no valid mention-handoff, exit cleanly.

agents/plan-reviewer/SOUL.md

@@ -0,0 +1,21 @@
+# SOUL.md -- Plan Reviewer Persona
+
+You are the Plan Reviewer.
+
+## Review Posture
+
+- You catch problems before they become code. Your value is preventing wasted engineering hours.
+- Be specific. "This might have issues" is useless. "The LIMIT on line 3 of step 2 lacks ORDER BY, which produces nondeterministic results per SQLite docs" is useful.
+- Calibrate severity honestly. Not everything is a must-fix. Reserve blocking status for real correctness, security, or architectural issues.
+- Respect the engineer's judgment. They know the codebase better than you. Challenge their approach, but acknowledge when they have good reasons for unconventional choices.
+- Focus on what matters: correctness, security, completeness, testability. Skip style nitpicks.
+- Think adversarially. What inputs break this? What happens under load? What if the network fails mid-operation?
+- Be fast. Engineers are waiting on your review to start coding. A good review in 5 minutes beats a perfect review in an hour.
+
+## Voice and Tone
+
+- Direct and technical. Lead with the finding, then explain why it matters.
+- Constructive, not combative. "This misses X" not "You forgot X."
+- Brief. A review should be scannable in under 2 minutes.
+- No filler. Skip "great plan overall" unless it genuinely is and you have something specific to praise.
+- When uncertain, say so. "I'm not sure if asupersync handles this case -- worth verifying" is better than either silence or false confidence.

command-restructure/CLI_AUDIT.md

@@ -0,0 +1,388 @@
+# Gitlore CLI Command Audit
+
+## 1. Full Command Inventory
+
+**29 visible + 4 hidden + 2 stub = 35 total command surface**
+
+| # | Command | Aliases | Args | Flags | Purpose |
+|---|---------|---------|------|-------|---------|
+| 1 | `issues` | `issue` | `[IID]` | 15 | List/show issues |
+| 2 | `mrs` | `mr`, `merge-requests` | `[IID]` | 16 | List/show MRs |
+| 3 | `notes` | `note` | — | 16 | List notes |
+| 4 | `search` | `find`, `query` | `<QUERY>` | 13 | Hybrid FTS+vector search |
+| 5 | `timeline` | — | `<QUERY>` | 11 | Chronological event reconstruction |
+| 6 | `who` | — | `[TARGET]` | 16 | People intelligence (5 modes) |
+| 7 | `me` | — | — | 10 | Personal dashboard |
+| 8 | `file-history` | — | `<PATH>` | 6 | MRs that touched a file |
+| 9 | `trace` | — | `<PATH>` | 5 | file->MR->issue->discussion chain |
+| 10 | `drift` | — | `<TYPE> <IID>` | 3 | Discussion divergence detection |
+| 11 | `related` | — | `<QUERY_OR_TYPE> [IID]` | 3 | Semantic similarity |
+| 12 | `count` | — | `<ENTITY>` | 2 | Count entities |
+| 13 | `sync` | — | — | 14 | Full pipeline: ingest+docs+embed |
+| 14 | `ingest` | — | `[ENTITY]` | 5 | Fetch from GitLab API |
+| 15 | `generate-docs` | — | — | 2 | Build searchable documents |
+| 16 | `embed` | — | — | 2 | Generate vector embeddings |
+| 17 | `status` | `st` | — | 0 | Last sync times per project |
+| 18 | `health` | — | — | 0 | Quick pre-flight (exit code only) |
+| 19 | `doctor` | — | — | 0 | Full environment diagnostic |
+| 20 | `stats` | `stat` | — | 3 | Document/index statistics |
+| 21 | `init` | — | — | 6 | Setup config + database |
+| 22 | `auth` | — | — | 0 | Verify GitLab token |
+| 23 | `token` | — | subcommand | 1-2 | Token CRUD (set/show) |
+| 24 | `cron` | — | subcommand | 0-1 | Auto-sync scheduling |
+| 25 | `migrate` | — | — | 0 | Apply DB migrations |
+| 26 | `robot-docs` | — | — | 1 | Agent self-discovery manifest |
+| 27 | `completions` | — | `<SHELL>` | 0 | Shell completions |
+| 28 | `version` | — | — | 0 | Version info |
+| 29 | *help* | — | — | — | (clap built-in) |
+| | **Hidden/deprecated:** | | | | |
+| 30 | `list` | — | `<ENTITY>` | 14 | deprecated, use issues/mrs |
+| 31 | `auth-test` | — | — | 0 | deprecated, use auth |
+| 32 | `sync-status` | — | — | 0 | deprecated, use status |
+| 33 | `backup` | — | — | 0 | Stub (not implemented) |
+| 34 | `reset` | — | — | 1 | Stub (not implemented) |
+
+---
+
+## 2. Semantic Overlap Analysis
+
+### Cluster A: "Is the system working?" (4 commands, 1 concept)
+
+| Command | What it checks | Exit code semantics | Has flags? |
+|---------|---------------|---------------------|------------|
+| `health` | config exists, DB opens, schema version | 0=healthy, 19=unhealthy | No |
+| `doctor` | config, token, database, Ollama | informational | No |
+| `status` | last sync times per project | informational | No |
+| `stats` | document counts, index size, integrity | informational | `--check`, `--repair` |
+
+**Problem:** A user/agent asking "is lore working?" must choose among four commands. `health` is a strict subset of `doctor`. `status` and `stats` are near-homonyms that answer different questions -- sync recency vs. index health. `count` (Cluster E) also overlaps with what `stats` reports.
+
+**Cognitive cost:** High. The CLI literature (Clig.dev, Heroku CLI design guide, 12-factor CLI) consistently warns against >2 "status" commands. Users build a mental model of "the status command" -- when there are four, they pick wrong or give up.
+
+**Theoretical basis:**
+
+- **Nielsen's "Recognition over Recall"** -- Four similar system-status commands force users to *recall* which one does what. One command with progressive disclosure (flags for depth) lets them *recognize* the option they need. This is doubly important for LLM agents, which perform better with fewer top-level choices and compositional flags.
+
+- **Fitts's Law for CLIs** -- Command discovery cost is proportional to list length. Each additional top-level command adds scanning time for humans and token cost for robots.
+
+### Cluster B: "Data pipeline stages" (4 commands, 1 pipeline)
+
+| Command | Pipeline stage | Subsumed by `sync`? |
+|---------|---------------|---------------------|
+| `sync` | ingest -> generate-docs -> embed | -- (is the parent) |
+| `ingest` | GitLab API fetch | `sync` without `--no-docs --no-embed` |
+| `generate-docs` | Build FTS documents | `sync --no-embed` (after ingest) |
+| `embed` | Vector embeddings via Ollama | (final stage) |
+
+**Problem:** `sync` already has skip flags (`--no-embed`, `--no-docs`, `--no-events`, `--no-status`, `--no-file-changes`). The individual stage commands duplicate this with less control -- `ingest` has `--full`, `--force`, `--dry-run`, but `sync` also has all three.
+
+The standalone commands exist for granular debugging, but in practice they're reached for <5% of the time. They inflate the help screen while `sync` handles 95% of use cases.
+
+### Cluster C: "File-centric intelligence" (3 overlapping surfaces)
+
+| Command | Input | Output | Key flags |
+|---------|-------|--------|-----------|
+| `file-history` | `<PATH>` | MRs that touched file | `-p`, `--discussions`, `--no-follow-renames`, `--merged`, `-n` |
+| `trace` | `<PATH>` | file->MR->issue->discussion chains | `-p`, `--discussions`, `--no-follow-renames`, `-n` |
+| `who --path <PATH>` | `<PATH>` via flag | experts for file area | `-p`, `--since`, `-n` |
+| `who --overlap <PATH>` | `<PATH>` via flag | users touching same files | `-p`, `--since`, `-n` |
+
+**Problem:** `trace` is a superset of `file-history` -- it follows the same MR chain but additionally links to closing issues and discussions. They share 4 of 5 filter flags. A user who wants "what happened to this file?" has to choose between two commands that sound nearly identical.
+
+### Cluster D: "Semantic discovery" (3 commands, all need embeddings)
+
+| Command | Input | Output |
+|---------|-------|--------|
+| `search` | free text query | ranked documents |
+| `related` | entity ref OR free text | similar entities |
+| `drift` | entity ref | divergence score per discussion |
+
+`related "some text"` is functionally a vector-only `search "some text" --mode semantic`. The difference is that `related` can also seed from an entity (issues 42), while `search` only accepts text.
+
+`drift` is specialized enough to stand alone, but it's only used on issues and has a single non-project flag (`--threshold`).
+
+### Cluster E: "Count" is an orphan
+
+`count` is a standalone command for `SELECT COUNT(*) FROM <table>`. This could be:
+- A `--count` flag on `issues`/`mrs`/`notes`
+- A section in `stats` output (which already shows counts)
+- Part of `status` output
+
+It exists as its own top-level command primarily for robot convenience, but adds to the 29-command sprawl.
+
+---
+
+## 3. Flag Consistency Audit
+
+### Consistent (good patterns)
+
+| Flag | Meaning | Used in |
+|------|---------|---------|
+| `-p, --project` | Scope to project (fuzzy) | issues, mrs, notes, search, sync, ingest, generate-docs, timeline, who, me, file-history, trace, drift, related |
+| `-n, --limit` | Max results | issues, mrs, notes, search, timeline, who, me, file-history, trace, related |
+| `--since` | Temporal filter (7d, 2w, YYYY-MM-DD) | issues, mrs, notes, search, timeline, who, me |
+| `--fields` | Field selection / `minimal` preset | issues, mrs, notes, search, timeline, who, me |
+| `--full` | Reset cursors / full rebuild | sync, ingest, embed, generate-docs |
+| `--force` | Override stale lock | sync, ingest |
+| `--dry-run` | Preview without changes | sync, ingest, stats |
+
+### Inconsistencies (problems)
+
+| Issue | Details | Impact |
+|-------|---------|--------|
+| `-f` collision | `ingest -f` = `--force`, `count -f` = `--for` | Robot confusion; violates "same short flag = same semantics" |
+| `-a` inconsistency | `issues -a` = `--author`, `me` has no `-a` (uses `--user` for analogous concept) | Minor |
+| `-s` inconsistency | `issues -s` = `--state`, `search` has no `-s` short flag at all | Missed ergonomic shortcut |
+| `--sort` availability | Present in issues/mrs/notes, absent from search/timeline/file-history | Inconsistent query power |
+| `--discussions` | `file-history --discussions`, `trace --discussions`, but `issues 42` has no `--discussions` flag | Can't get discussions when showing an issue |
+| `--open` (browser) | `issues -o`, `mrs -o`, `notes --open` (no `-o`) | Inconsistent short flag |
+| `--merged` | Only on `file-history`, not on `mrs` (which uses `--state merged`) | Different filter mechanics for same concept |
+| Entity type naming | `count` takes `issues, mrs, discussions, notes, events`; `search --type` takes `issue, mr, discussion, note` (singular) | Singular vs plural for same concept |
+
+**Theoretical basis:**
+
+- **Principle of Least Surprise (POLS)** -- When `-f` means `--force` in one command and `--for` in another, both humans and agents learn the wrong lesson from one interaction and apply it to the other. CLI design guides (GNU standards, POSIX conventions, clig.dev) are unanimous: short flags should have consistent semantics across all subcommands.
+
+- **Singular/plural inconsistency** (`issues` vs `issue` as entity type values) is particularly harmful for LLM agents, which use pattern matching on prior successful invocations. If `lore count issues` works, the agent will try `lore search --type issues` -- and get a parse error.
+
+---
+
+## 4. Robot Ergonomics Assessment
+
+### Strengths (well above average for a CLI)
+
+| Feature | Rating | Notes |
+|---------|--------|-------|
+| Structured output | Excellent | Consistent `{ok, data, meta}` envelope |
+| Auto-detection | Excellent | Non-TTY -> robot mode, `LORE_ROBOT` env var |
+| Error output | Excellent | Structured JSON to stderr with `actions` array for recovery |
+| Exit codes | Excellent | 20 distinct, well-documented codes |
+| Self-discovery | Excellent | `robot-docs` manifest, `--brief` for token savings |
+| Typo tolerance | Excellent | Autocorrect with confidence scores + structured warnings |
+| Field selection | Good | `--fields minimal` saves ~60% tokens |
+| No-args behavior | Good | Robot mode auto-outputs robot-docs |
+
+### Weaknesses
+
+| Issue | Severity | Recommendation |
+|-------|----------|----------------|
+| 29 commands in robot-docs manifest | High | Agents spend tokens evaluating which command to use. Grouping would reduce decision space. |
+| `status`/`stats`/`stat` near-homonyms | High | LLMs are particularly susceptible to surface-level lexical confusion. `stat` is an alias for `stats` while `status` is a different command -- this guarantees agent errors. |
+| Singular vs plural entity types | Medium | `count issues` works but `search --type issues` fails. Agents learn from one and apply to the other. |
+| Overlapping file commands | Medium | Agent must decide between `trace`, `file-history`, and `who --path`. The decision tree isn't obvious from names alone. |
+| `count` as separate command | Low | Could be a flag; standalone command inflates the decision space |
+
+---
+
+## 5. Human Ergonomics Assessment
+
+### Strengths
+
+| Feature | Rating | Notes |
+|---------|--------|-------|
+| Help text quality | Excellent | Every command has examples, help headings organize flags |
+| Short flags | Good | `-p`, `-n`, `-s`, `-a`, `-J` cover 80% of common use |
+| Alias coverage | Good | `issue`/`issues`, `mr`/`mrs`, `st`/`status`, `find`/`search` |
+| Subcommand inference | Good | `lore issu` -> `issues` via clap infer |
+| Color/icon system | Good | Auto, with overrides |
+
+### Weaknesses
+
+| Issue | Severity | Recommendation |
+|-------|----------|----------------|
+| 29 commands in flat help | High | Doesn't fit one terminal screen. No grouping -> overwhelming |
+| `status` vs `stats` naming | High | Humans will type wrong one repeatedly |
+| `health` vs `doctor` distinction | Medium | "Which one do I run?" -- unclear from names |
+| `who` 5-mode overload | Medium | Help text is long; mode exclusions are complex |
+| Pipeline stages as top-level | Low | `ingest`/`generate-docs`/`embed` rarely used directly but clutter help |
+| `generate-docs` is 14 chars | Low | Longest command name; `gen-docs` or `gendocs` would help |
+
+---
+
+## 6. Proposals (Ranked by Impact x Feasibility)
+
+### P1: Help Grouping (HIGH impact, LOW effort)
+
+**Problem:** 29 flat commands -> information overload.
+
+**Fix:** Use clap's `help_heading` on subcommands to group them:
+
+```
+Query:
+  issues         List or show issues [aliases: issue]
+  mrs            List or show merge requests [aliases: mr]
+  notes          List notes from discussions [aliases: note]
+  search         Search indexed documents [aliases: find]
+  count          Count entities in local database
+
+Intelligence:
+  timeline       Chronological timeline of events
+  who            People intelligence: experts, workload, overlap
+  me             Personal work dashboard
+
+File Analysis:
+  trace          Trace why code was introduced
+  file-history   Show MRs that touched a file
+  related        Find semantically related entities
+  drift          Detect discussion divergence
+
+Data Pipeline:
+  sync           Run full sync pipeline
+  ingest         Ingest data from GitLab
+  generate-docs  Generate searchable documents
+  embed          Generate vector embeddings
+
+System:
+  init           Initialize configuration and database
+  status         Show sync state [aliases: st]
+  health         Quick health check
+  doctor         Check environment health
+  stats          Document and index statistics [aliases: stat]
+  auth           Verify GitLab authentication
+  token          Manage stored GitLab token
+  migrate        Run pending database migrations
+  cron           Manage automatic syncing
+  completions    Generate shell completions
+  robot-docs     Agent self-discovery manifest
+  version        Show version information
+```
+
+**Effort:** ~20 lines of `#[command(help_heading = "...")]` annotations. No behavior changes.
+
+### P2: Resolve `status`/`stats` Confusion (HIGH impact, LOW effort)
+
+**Option A (recommended):** Rename `stats` -> `index`.
+- `lore status` = when did I last sync? (pipeline state)
+- `lore index` = how big is my index? (data inventory)
+- The alias `stat` goes away (it was causing confusion anyway)
+
+**Option B:** Rename `status` -> `sync-state` and `stats` -> `db-stats`. More descriptive but longer.
+
+**Option C:** Merge both under `check` (see P4).
+
+### P3: Fix Singular/Plural Entity Type Inconsistency (MEDIUM impact, TRIVIAL effort)
+
+Accept both singular and plural forms everywhere:
+- `count` already takes `issues` (plural) -- also accept `issue`
+- `search --type` already takes `issue` (singular) -- also accept `issues`
+- `drift` takes `issues` -- also accept `issue`
+
+This is a ~10 line change in the value parsers and eliminates an entire class of agent errors.
+
+### P4: Merge `health` + `doctor` (MEDIUM impact, LOW effort)
+
+`health` is a fast subset of `doctor`. Merge:
+- `lore doctor` = full diagnostic (current behavior)
+- `lore doctor --quick` = fast pre-flight, exit-code-only (current `health`)
+- Drop `health` as a separate command, add a hidden alias for backward compat
+
+### P5: Fix `-f` Short Flag Collision (MEDIUM impact, TRIVIAL effort)
+
+Change `count`'s `-f, --for` to just `--for` (no short flag). `-f` should mean `--force` project-wide, or nowhere.
+
+### P6: Consolidate `trace` + `file-history` (MEDIUM impact, MEDIUM effort)
+
+`trace` already does everything `file-history` does plus more. Options:
+
+**Option A:** Make `file-history` an alias for `trace --flat` (shows MR list without issue/discussion linking).
+
+**Option B:** Add `--mrs-only` to `trace` that produces `file-history` output. Deprecate `file-history` with a hidden alias.
+
+Either way, one fewer top-level command and no lost functionality.
+
+### P7: Hide Pipeline Sub-stages (LOW impact, TRIVIAL effort)
+
+Move `ingest`, `generate-docs`, `embed` to `#[command(hide = true)]`. They remain usable but don't clutter `--help`. Direct users to `sync` with stage-skip flags.
+
+For power users who need individual stages, document in `sync --help`:
+```
+To run individual stages:
+  lore ingest                    # Fetch from GitLab only
+  lore generate-docs             # Rebuild documents only
+  lore embed                     # Re-embed only
+```
+
+### P8: Make `count` a Flag, Not a Command (LOW impact, MEDIUM effort)
+
+Add `--count` to `issues` and `mrs`:
+```bash
+lore issues --count              # replaces: lore count issues
+lore mrs --count                 # replaces: lore count mrs
+lore notes --count               # replaces: lore count notes
+```
+
+Keep `count` as a hidden alias for backward compatibility. Removes one top-level command.
+
+### P9: Consistent `--open` Short Flag (LOW impact, TRIVIAL effort)
+
+`notes --open` lacks the `-o` shorthand that `issues` and `mrs` have. Add it.
+
+### P10: Add `--sort` to `search` (LOW impact, LOW effort)
+
+`search` returns ranked results but offers no `--sort` override. Adding `--sort=score,created,updated` would bring it in line with `issues`/`mrs`/`notes`.
+
+---
+
+## 7. Summary: Proposed Command Tree (After All Changes)
+
+If all proposals were adopted, the visible top-level shrinks from **29 -> 21**:
+
+| Before (29) | After (21) | Change |
+|-------------|------------|--------|
+| `issues` | `issues` | -- |
+| `mrs` | `mrs` | -- |
+| `notes` | `notes` | -- |
+| `search` | `search` | -- |
+| `timeline` | `timeline` | -- |
+| `who` | `who` | -- |
+| `me` | `me` | -- |
+| `file-history` | *(hidden, alias for `trace --flat`)* | **merged into trace** |
+| `trace` | `trace` | absorbs file-history |
+| `drift` | `drift` | -- |
+| `related` | `related` | -- |
+| `count` | *(hidden, `issues --count` replaces)* | **absorbed** |
+| `sync` | `sync` | -- |
+| `ingest` | *(hidden)* | **hidden** |
+| `generate-docs` | *(hidden)* | **hidden** |
+| `embed` | *(hidden)* | **hidden** |
+| `status` | `status` | -- |
+| `health` | *(merged into doctor)* | **merged** |
+| `doctor` | `doctor` | absorbs health |
+| `stats` | `index` | **renamed** |
+| `init` | `init` | -- |
+| `auth` | `auth` | -- |
+| `token` | `token` | -- |
+| `migrate` | `migrate` | -- |
+| `cron` | `cron` | -- |
+| `robot-docs` | `robot-docs` | -- |
+| `completions` | `completions` | -- |
+| `version` | `version` | -- |
+
+**Net reduction:** 29 -> 21 visible (-28%). The hidden commands remain fully functional and documented in `robot-docs` for agents that already use them.
+
+**Theoretical basis:**
+
+- **Miller's Law** -- Humans can hold 7+/-2 items in working memory. 29 commands far exceeds this. Even with help grouping (P1), the sheer count creates decision fatigue. The literature on CLI design (Heroku's "12-Factor CLI", clig.dev's "Command Line Interface Guidelines") recommends 10-15 top-level commands maximum, with grouping or nesting for anything beyond.
+
+- **For LLM agents specifically:** Research on tool-use with large tool sets (Schick et al. 2023, Qin et al. 2023) shows that agent accuracy degrades as the tool count increases, roughly following an inverse log curve. Reducing from 29 to 21 commands in the robot-docs manifest would measurably improve agent command selection accuracy.
+
+- **Backward compatibility is free:** Since AGENTS.md says "we don't care about backward compatibility," hidden aliases cost nothing and prevent breakage for agents with cached robot-docs.
+
+---
+
+## 8. Priority Matrix
+
+| Proposal | Impact | Effort | Risk | Recommended Order |
+|----------|--------|--------|------|-------------------|
+| P1: Help grouping | High | Trivial | None | **Do first** |
+| P3: Singular/plural fix | Medium | Trivial | None | **Do first** |
+| P5: Fix `-f` collision | Medium | Trivial | None | **Do first** |
+| P9: `notes -o` shorthand | Low | Trivial | None | **Do first** |
+| P2: Rename `stats`->`index` | High | Low | Alias needed | **Do second** |
+| P4: Merge health->doctor | Medium | Low | Alias needed | **Do second** |
+| P7: Hide pipeline stages | Low | Trivial | Needs docs update | **Do second** |
+| P6: Merge file-history->trace | Medium | Medium | Flag design | **Plan carefully** |
+| P8: count -> --count flag | Low | Medium | Compat shim | **Plan carefully** |
+| P10: `--sort` on search | Low | Low | None | **When convenient** |
+
+The "do first" tier is 4 changes that could ship in a single commit with zero risk and immediate ergonomic improvement for both humans and agents.

command-restructure/IMPLEMENTATION_PLAN.md

@@ -0,0 +1,966 @@
+# Command Restructure: Implementation Plan
+
+**Reference:** `command-restructure/CLI_AUDIT.md`
+**Scope:** 10 proposals, 3 implementation phases, estimated ~15 files touched
+
+---
+
+## Phase 1: Zero-Risk Quick Wins (1 commit)
+
+These four changes are purely additive -- no behavior changes, no renames, no removed commands.
+
+### P1: Help Grouping
+
+**Goal:** Group the 29 visible commands into 5 semantic clusters in `--help` output.
+
+**File:** `src/cli/mod.rs` (lines 117-399, the `Commands` enum)
+
+**Changes:** Add `#[command(help_heading = "...")]` to each variant:
+
+```rust
+#[derive(Subcommand)]
+#[allow(clippy::large_enum_variant)]
+pub enum Commands {
+    // ── Query ──────────────────────────────────────────────
+    /// List or show issues
+    #[command(visible_alias = "issue", help_heading = "Query")]
+    Issues(IssuesArgs),
+
+    /// List or show merge requests
+    #[command(visible_alias = "mr", alias = "merge-requests", alias = "merge-request", help_heading = "Query")]
+    Mrs(MrsArgs),
+
+    /// List notes from discussions
+    #[command(visible_alias = "note", help_heading = "Query")]
+    Notes(NotesArgs),
+
+    /// Search indexed documents
+    #[command(visible_alias = "find", alias = "query", help_heading = "Query")]
+    Search(SearchArgs),
+
+    /// Count entities in local database
+    #[command(help_heading = "Query")]
+    Count(CountArgs),
+
+    // ── Intelligence ───────────────────────────────────────
+    /// Show a chronological timeline of events matching a query
+    #[command(help_heading = "Intelligence")]
+    Timeline(TimelineArgs),
+
+    /// People intelligence: experts, workload, active discussions, overlap
+    #[command(help_heading = "Intelligence")]
+    Who(WhoArgs),
+
+    /// Personal work dashboard: open issues, authored/reviewing MRs, activity
+    #[command(help_heading = "Intelligence")]
+    Me(MeArgs),
+
+    // ── File Analysis ──────────────────────────────────────
+    /// Trace why code was introduced: file -> MR -> issue -> discussion
+    #[command(help_heading = "File Analysis")]
+    Trace(TraceArgs),
+
+    /// Show MRs that touched a file, with linked discussions
+    #[command(name = "file-history", help_heading = "File Analysis")]
+    FileHistory(FileHistoryArgs),
+
+    /// Find semantically related entities via vector search
+    #[command(help_heading = "File Analysis", ...)]
+    Related { ... },
+
+    /// Detect discussion divergence from original intent
+    #[command(help_heading = "File Analysis", ...)]
+    Drift { ... },
+
+    // ── Data Pipeline ──────────────────────────────────────
+    /// Run full sync pipeline: ingest -> generate-docs -> embed
+    #[command(help_heading = "Data Pipeline")]
+    Sync(SyncArgs),
+
+    /// Ingest data from GitLab
+    #[command(help_heading = "Data Pipeline")]
+    Ingest(IngestArgs),
+
+    /// Generate searchable documents from ingested data
+    #[command(name = "generate-docs", help_heading = "Data Pipeline")]
+    GenerateDocs(GenerateDocsArgs),
+
+    /// Generate vector embeddings for documents via Ollama
+    #[command(help_heading = "Data Pipeline")]
+    Embed(EmbedArgs),
+
+    // ── System ─────────────────────────────────────────────
+    // (init, status, health, doctor, stats, auth, token, migrate, cron,
+    //  completions, robot-docs, version -- all get help_heading = "System")
+}
+```
+
+**Verification:**
+- `lore --help` shows grouped output
+- All existing commands still work identically
+- `lore robot-docs` output unchanged (robot-docs is hand-crafted, not derived from clap)
+
+**Files touched:** `src/cli/mod.rs` only
+
+---
+
+### P3: Singular/Plural Entity Type Fix
+
+**Goal:** Accept both `issue`/`issues`, `mr`/`mrs` everywhere entity types are value-parsed.
+
+**File:** `src/cli/args.rs`
+
+**Change 1 -- `CountArgs.entity` (line 819):**
+```rust
+// BEFORE:
+#[arg(value_parser = ["issues", "mrs", "discussions", "notes", "events"])]
+pub entity: String,
+
+// AFTER:
+#[arg(value_parser = ["issue", "issues", "mr", "mrs", "discussion", "discussions", "note", "notes", "event", "events"])]
+pub entity: String,
+```
+
+**File:** `src/cli/args.rs`
+
+**Change 2 -- `SearchArgs.source_type` (line 369):**
+```rust
+// BEFORE:
+#[arg(long = "type", value_parser = ["issue", "mr", "discussion", "note"], ...)]
+pub source_type: Option<String>,
+
+// AFTER:
+#[arg(long = "type", value_parser = ["issue", "issues", "mr", "mrs", "discussion", "discussions", "note", "notes"], ...)]
+pub source_type: Option<String>,
+```
+
+**File:** `src/cli/mod.rs`
+
+**Change 3 -- `Drift.entity_type` (line 287):**
+```rust
+// BEFORE:
+#[arg(value_parser = ["issues"])]
+pub entity_type: String,
+
+// AFTER:
+#[arg(value_parser = ["issue", "issues"])]
+pub entity_type: String,
+```
+
+**Normalization layer:** In the handlers that consume these values, normalize to the canonical form (plural for entity names, singular for source_type) so downstream code doesn't need changes:
+
+**File:** `src/app/handlers.rs`
+
+In `handle_count` (~line 409): Normalize entity string before passing to `run_count`:
+```rust
+let entity = match args.entity.as_str() {
+    "issue" => "issues",
+    "mr" => "mrs",
+    "discussion" => "discussions",
+    "note" => "notes",
+    "event" => "events",
+    other => other,
+};
+```
+
+In `handle_search` (search handler): Normalize source_type:
+```rust
+let source_type = args.source_type.as_deref().map(|t| match t {
+    "issues" => "issue",
+    "mrs" => "mr",
+    "discussions" => "discussion",
+    "notes" => "note",
+    other => other,
+});
+```
+
+In `handle_drift` (~line 225): Normalize entity_type:
+```rust
+let entity_type = if entity_type == "issue" { "issues" } else { &entity_type };
+```
+
+**Verification:**
+- `lore count issue` works (same as `lore count issues`)
+- `lore search --type issues 'foo'` works (same as `--type issue`)
+- `lore drift issue 42` works (same as `drift issues 42`)
+- All existing invocations unchanged
+
+**Files touched:** `src/cli/args.rs`, `src/cli/mod.rs`, `src/app/handlers.rs`
+
+---
+
+### P5: Fix `-f` Short Flag Collision
+
+**Goal:** Remove `-f` shorthand from `count --for` so `-f` consistently means `--force` across the CLI.
+
+**File:** `src/cli/args.rs` (line 823)
+
+```rust
+// BEFORE:
+#[arg(short = 'f', long = "for", value_parser = ["issue", "mr"])]
+pub for_entity: Option<String>,
+
+// AFTER:
+#[arg(long = "for", value_parser = ["issue", "mr"])]
+pub for_entity: Option<String>,
+```
+
+**Also update the value_parser to accept both forms** (while we're here):
+```rust
+#[arg(long = "for", value_parser = ["issue", "issues", "mr", "mrs"])]
+pub for_entity: Option<String>,
+```
+
+And normalize in `handle_count`:
+```rust
+let for_entity = args.for_entity.as_deref().map(|f| match f {
+    "issues" => "issue",
+    "mrs" => "mr",
+    other => other,
+});
+```
+
+**File:** `src/app/robot_docs.rs` (line 173) -- update the robot-docs entry:
+```rust
+// BEFORE:
+"flags": ["<entity: issues|mrs|discussions|notes|events>", "-f/--for <issue|mr>"],
+
+// AFTER:
+"flags": ["<entity: issues|mrs|discussions|notes|events>", "--for <issue|mr>"],
+```
+
+**Verification:**
+- `lore count notes --for mr` still works
+- `lore count notes -f mr` now fails with a clear error (unknown flag `-f`)
+- `lore ingest -f` still works (means `--force`)
+
+**Files touched:** `src/cli/args.rs`, `src/app/robot_docs.rs`
+
+---
+
+### P9: Consistent `--open` Short Flag on `notes`
+
+**Goal:** Add `-o` shorthand to `notes --open`, matching `issues` and `mrs`.
+
+**File:** `src/cli/args.rs` (line 292)
+
+```rust
+// BEFORE:
+#[arg(long, help_heading = "Actions")]
+pub open: bool,
+
+// AFTER:
+#[arg(short = 'o', long, help_heading = "Actions", overrides_with = "no_open")]
+pub open: bool,
+
+#[arg(long = "no-open", hide = true, overrides_with = "open")]
+pub no_open: bool,
+```
+
+**Verification:**
+- `lore notes -o` opens first result in browser
+- Matches behavior of `lore issues -o` and `lore mrs -o`
+
+**Files touched:** `src/cli/args.rs`
+
+---
+
+### Phase 1 Commit Summary
+
+**Files modified:**
+1. `src/cli/mod.rs` -- help_heading on all Commands variants + drift value_parser
+2. `src/cli/args.rs` -- singular/plural value_parsers, remove `-f` from count, add `-o` to notes
+3. `src/app/handlers.rs` -- normalization of entity/source_type strings
+4. `src/app/robot_docs.rs` -- update count flags documentation
+
+**Test plan:**
+```bash
+cargo check --all-targets
+cargo clippy --all-targets -- -D warnings
+cargo fmt --check
+cargo test
+lore --help                    # Verify grouped output
+lore count issue               # Verify singular accepted
+lore search --type issues 'x'  # Verify plural accepted
+lore drift issue 42            # Verify singular accepted
+lore notes -o                  # Verify short flag works
+```
+
+---
+
+## Phase 2: Renames and Merges (2-3 commits)
+
+These changes rename commands and merge overlapping ones. Hidden aliases preserve backward compatibility.
+
+### P2: Rename `stats` -> `index`
+
+**Goal:** Eliminate `status`/`stats`/`stat` confusion. `stats` becomes `index`.
+
+**File:** `src/cli/mod.rs`
+
+```rust
+// BEFORE:
+/// Show document and index statistics
+#[command(visible_alias = "stat", help_heading = "System")]
+Stats(StatsArgs),
+
+// AFTER:
+/// Show document and index statistics
+#[command(visible_alias = "idx", alias = "stats", alias = "stat", help_heading = "System")]
+Index(StatsArgs),
+```
+
+Note: `alias = "stats"` and `alias = "stat"` are hidden aliases (not `visible_alias`) -- old invocations still work, but `--help` shows `index`.
+
+**File:** `src/main.rs` (line 257)
+
+```rust
+// BEFORE:
+Some(Commands::Stats(args)) => handle_stats(cli.config.as_deref(), args, robot_mode).await,
+
+// AFTER:
+Some(Commands::Index(args)) => handle_stats(cli.config.as_deref(), args, robot_mode).await,
+```
+
+**File:** `src/app/robot_docs.rs` (line 181)
+
+```rust
+// BEFORE:
+"stats": {
+    "description": "Show document and index statistics",
+    ...
+
+// AFTER:
+"index": {
+    "description": "Show document and index statistics (formerly 'stats')",
+    ...
+```
+
+Also update references in:
+- `robot_docs.rs` quick_start.lore_exclusive array (line 415): `"stats: Database statistics..."` -> `"index: Database statistics..."`
+- `robot_docs.rs` aliases.deprecated_commands: add `"stats": "index"`, `"stat": "index"`
+
+**File:** `src/cli/autocorrect.rs`
+
+Update `CANONICAL_SUBCOMMANDS` (line 366-area):
+```rust
+// Replace "stats" with "index" in the canonical list
+// Add ("stats", "index") and ("stat", "index") to SUBCOMMAND_ALIASES
+```
+
+Update `COMMAND_FLAGS` (line 166-area):
+```rust
+// BEFORE:
+("stats", &["--check", ...]),
+
+// AFTER:
+("index", &["--check", ...]),
+```
+
+**File:** `src/cli/robot.rs` -- update `expand_fields_preset` if any preset key is `"stats"` (currently no stats preset, so no change needed).
+
+**Verification:**
+- `lore index` works (shows document/index stats)
+- `lore stats` still works (hidden alias)
+- `lore stat` still works (hidden alias)
+- `lore index --check` works
+- `lore --help` shows `index` in System group, not `stats`
+- `lore robot-docs` shows `index` key in commands map
+
+**Files touched:** `src/cli/mod.rs`, `src/main.rs`, `src/app/robot_docs.rs`, `src/cli/autocorrect.rs`
+
+---
+
+### P4: Merge `health` into `doctor`
+
+**Goal:** One diagnostic command (`doctor`) with a `--quick` flag for the pre-flight check that `health` currently provides.
+
+**File:** `src/cli/mod.rs`
+
+```rust
+// BEFORE:
+/// Quick health check: config, database, schema version
+#[command(after_help = "...")]
+Health,
+
+/// Check environment health
+#[command(after_help = "...")]
+Doctor,
+
+// AFTER:
+// Remove Health variant entirely. Add hidden alias:
+/// Check environment health (--quick for fast pre-flight)
+#[command(
+    after_help = "...",
+    alias = "health",  // hidden backward compat
+    help_heading = "System"
+)]
+Doctor {
+    /// Fast pre-flight check only (config, DB, schema). Exit 0 = healthy.
+    #[arg(long)]
+    quick: bool,
+},
+```
+
+**File:** `src/main.rs`
+
+```rust
+// BEFORE:
+Some(Commands::Doctor) => handle_doctor(cli.config.as_deref(), robot_mode).await,
+...
+Some(Commands::Health) => handle_health(cli.config.as_deref(), robot_mode).await,
+
+// AFTER:
+Some(Commands::Doctor { quick }) => {
+    if quick {
+        handle_health(cli.config.as_deref(), robot_mode).await
+    } else {
+        handle_doctor(cli.config.as_deref(), robot_mode).await
+    }
+}
+// Health variant removed from enum, so no separate match arm
+```
+
+**File:** `src/app/robot_docs.rs`
+
+Merge the `health` and `doctor` entries:
+```rust
+"doctor": {
+    "description": "Environment health check. Use --quick for fast pre-flight (exit 0 = healthy, 19 = unhealthy).",
+    "flags": ["--quick"],
+    "example": "lore --robot doctor",
+    "notes": {
+        "quick_mode": "lore --robot doctor --quick — fast pre-flight check (formerly 'lore health'). Only checks config, DB, schema version. Returns exit 19 on failure.",
+        "full_mode": "lore --robot doctor — full diagnostic: config, auth, database, Ollama"
+    },
+    "response_schema": {
+        "full": { ... },  // current doctor schema
+        "quick": { ... }  // current health schema
+    }
+}
+```
+
+Remove the standalone `health` entry from the commands map.
+
+**File:** `src/cli/autocorrect.rs`
+
+- Remove `"health"` from `CANONICAL_SUBCOMMANDS` (clap's `alias` handles it)
+- Or keep it -- since clap treats aliases as valid subcommands, the autocorrect system will still resolve typos like `"helth"` to `"health"` which clap then maps to `doctor`. Either way works.
+
+**File:** `src/app/robot_docs.rs` -- update `workflows.pre_flight`:
+```rust
+"pre_flight": [
+    "lore --robot doctor --quick"
+],
+```
+
+Add to aliases.deprecated_commands:
+```rust
+"health": "doctor --quick"
+```
+
+**Verification:**
+- `lore doctor` runs full diagnostic (unchanged behavior)
+- `lore doctor --quick` runs fast pre-flight (exit 0/19)
+- `lore health` still works (hidden alias, runs `doctor --quick`)
+- `lore --help` shows only `doctor` in System group
+- `lore robot-docs` shows merged entry
+
+**Files touched:** `src/cli/mod.rs`, `src/main.rs`, `src/app/robot_docs.rs`, `src/cli/autocorrect.rs`
+
+**Important edge case:** `lore health` via the hidden alias will invoke `Doctor { quick: false }` unless we handle it specially. Two options:
+
+**Option A (simpler):** Instead of making `health` an alias of `doctor`, keep both variants but hide `Health`:
+```rust
+#[command(hide = true, help_heading = "System")]
+Health,
+```
+Then in `main.rs`, `Commands::Health` maps to `handle_health()` as before. This is less clean but zero-risk.
+
+**Option B (cleaner):** In the autocorrect layer, rewrite `health` -> `doctor --quick` before clap parsing:
+```rust
+// In SUBCOMMAND_ALIASES or a new pre-clap rewrite:
+("health", "doctor"),  // plus inject "--quick" flag
+```
+This requires a small enhancement to autocorrect to support flag injection during alias resolution.
+
+**Recommendation:** Use Option A for initial implementation. It's one line (`hide = true`) and achieves the goal of removing `health` from `--help` while preserving full backward compatibility. The `doctor --quick` flag is additive.
+
+---
+
+### P7: Hide Pipeline Sub-stages
+
+**Goal:** Remove `ingest`, `generate-docs`, `embed` from `--help` while keeping them fully functional.
+
+**File:** `src/cli/mod.rs`
+
+```rust
+// Add hide = true to each:
+
+/// Ingest data from GitLab
+#[command(hide = true)]
+Ingest(IngestArgs),
+
+/// Generate searchable documents from ingested data
+#[command(name = "generate-docs", hide = true)]
+GenerateDocs(GenerateDocsArgs),
+
+/// Generate vector embeddings for documents via Ollama
+#[command(hide = true)]
+Embed(EmbedArgs),
+```
+
+**File:** `src/cli/mod.rs` -- Update `Sync` help text to mention the individual stage commands:
+
+```rust
+/// Run full sync pipeline: ingest -> generate-docs -> embed
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore sync                             # Full pipeline: ingest + docs + embed
+  lore sync --no-embed                  # Skip embedding step
+  ...
+
+\x1b[1mIndividual stages:\x1b[0m
+  lore ingest                           # Fetch from GitLab only
+  lore generate-docs                    # Rebuild documents only
+  lore embed                            # Re-embed only",
+    help_heading = "Data Pipeline"
+)]
+Sync(SyncArgs),
+```
+
+**File:** `src/app/robot_docs.rs` -- Add a `"hidden": true` field to the ingest/generate-docs/embed entries so agents know these are secondary:
+```rust
+"ingest": {
+    "hidden": true,
+    "description": "Sync data from GitLab (prefer 'sync' for full pipeline)",
+    ...
+```
+
+**Verification:**
+- `lore --help` no longer shows ingest, generate-docs, embed
+- `lore ingest`, `lore generate-docs`, `lore embed` all still work
+- `lore sync --help` mentions individual stage commands
+- `lore robot-docs` still includes all three (with `hidden: true`)
+
+**Files touched:** `src/cli/mod.rs`, `src/app/robot_docs.rs`
+
+---
+
+### Phase 2 Commit Summary
+
+**Commit A: Rename `stats` -> `index`**
+- `src/cli/mod.rs`, `src/main.rs`, `src/app/robot_docs.rs`, `src/cli/autocorrect.rs`
+
+**Commit B: Merge `health` into `doctor`, hide pipeline stages**
+- `src/cli/mod.rs`, `src/main.rs`, `src/app/robot_docs.rs`, `src/cli/autocorrect.rs`
+
+**Test plan:**
+```bash
+cargo check --all-targets
+cargo clippy --all-targets -- -D warnings
+cargo fmt --check
+cargo test
+
+# Rename verification
+lore index                     # Works (new name)
+lore stats                     # Works (hidden alias)
+lore index --check             # Works
+
+# Doctor merge verification
+lore doctor                    # Full diagnostic
+lore doctor --quick            # Fast pre-flight
+lore health                    # Still works (hidden)
+
+# Hidden stages verification
+lore --help                    # ingest/generate-docs/embed gone
+lore ingest                    # Still works
+lore sync --help               # Mentions individual stages
+```
+
+---
+
+## Phase 3: Structural Consolidation (requires careful design)
+
+These changes merge or absorb commands. More effort, more testing, but the biggest UX wins.
+
+### P6: Consolidate `file-history` into `trace`
+
+**Goal:** `trace` absorbs `file-history`. One command for file-centric intelligence.
+
+**Approach:** Add `--mrs-only` flag to `trace`. When set, output matches `file-history` format (flat MR list, no issue/discussion linking). `file-history` becomes a hidden alias.
+
+**File:** `src/cli/args.rs` -- Add flag to `TraceArgs`:
+
+```rust
+pub struct TraceArgs {
+    pub path: String,
+
+    #[arg(short = 'p', long, help_heading = "Filters")]
+    pub project: Option<String>,
+
+    #[arg(long, help_heading = "Output")]
+    pub discussions: bool,
+
+    #[arg(long = "no-follow-renames", help_heading = "Filters")]
+    pub no_follow_renames: bool,
+
+    #[arg(short = 'n', long = "limit", default_value = "20", help_heading = "Output")]
+    pub limit: usize,
+
+    // NEW: absorb file-history behavior
+    /// Show only MR list without issue/discussion linking (file-history mode)
+    #[arg(long = "mrs-only", help_heading = "Output")]
+    pub mrs_only: bool,
+
+    /// Only show merged MRs (file-history mode)
+    #[arg(long, help_heading = "Filters")]
+    pub merged: bool,
+}
+```
+
+**File:** `src/cli/mod.rs` -- Hide `FileHistory`:
+
+```rust
+/// Show MRs that touched a file, with linked discussions
+#[command(name = "file-history", hide = true, help_heading = "File Analysis")]
+FileHistory(FileHistoryArgs),
+```
+
+**File:** `src/app/handlers.rs` -- Route `trace --mrs-only` to the file-history handler:
+
+```rust
+fn handle_trace(
+    config_override: Option<&str>,
+    args: TraceArgs,
+    robot_mode: bool,
+) -> Result<(), Box<dyn std::error::Error>> {
+    if args.mrs_only {
+        // Delegate to file-history handler
+        let fh_args = FileHistoryArgs {
+            path: args.path,
+            project: args.project,
+            discussions: args.discussions,
+            no_follow_renames: args.no_follow_renames,
+            merged: args.merged,
+            limit: args.limit,
+        };
+        return handle_file_history(config_override, fh_args, robot_mode);
+    }
+    // ... existing trace logic ...
+}
+```
+
+**File:** `src/app/robot_docs.rs` -- Update trace entry, mark file-history as deprecated:
+
+```rust
+"trace": {
+    "description": "Trace why code was introduced: file -> MR -> issue -> discussion. Use --mrs-only for flat MR listing.",
+    "flags": ["<path>", "-p/--project", "--discussions", "--no-follow-renames", "-n/--limit", "--mrs-only", "--merged"],
+    ...
+},
+"file-history": {
+    "hidden": true,
+    "deprecated": "Use 'trace --mrs-only' instead",
+    ...
+}
+```
+
+**Verification:**
+- `lore trace src/main.rs` works unchanged
+- `lore trace src/main.rs --mrs-only` produces file-history output
+- `lore trace src/main.rs --mrs-only --merged` filters to merged MRs
+- `lore file-history src/main.rs` still works (hidden command)
+- `lore --help` shows only `trace` in File Analysis group
+
+**Files touched:** `src/cli/args.rs`, `src/cli/mod.rs`, `src/app/handlers.rs`, `src/app/robot_docs.rs`
+
+---
+
+### P8: Make `count` a Flag on Entity Commands
+
+**Goal:** `lore issues --count` replaces `lore count issues`. Standalone `count` becomes hidden.
+
+**File:** `src/cli/args.rs` -- Add `--count` to `IssuesArgs`, `MrsArgs`, `NotesArgs`:
+
+```rust
+// In IssuesArgs:
+/// Show count only (no listing)
+#[arg(long, help_heading = "Output", conflicts_with_all = ["iid", "open"])]
+pub count: bool,
+
+// In MrsArgs:
+/// Show count only (no listing)
+#[arg(long, help_heading = "Output", conflicts_with_all = ["iid", "open"])]
+pub count: bool,
+
+// In NotesArgs:
+/// Show count only (no listing)
+#[arg(long, help_heading = "Output", conflicts_with = "open")]
+pub count: bool,
+```
+
+**File:** `src/app/handlers.rs` -- In `handle_issues`, `handle_mrs`, `handle_notes`, check the count flag early:
+
+```rust
+// In handle_issues (pseudocode):
+if args.count {
+    let count_args = CountArgs { entity: "issues".to_string(), for_entity: None };
+    return handle_count(config_override, count_args, robot_mode).await;
+}
+```
+
+**File:** `src/cli/mod.rs` -- Hide `Count`:
+
+```rust
+/// Count entities in local database
+#[command(hide = true, help_heading = "Query")]
+Count(CountArgs),
+```
+
+**File:** `src/app/robot_docs.rs` -- Mark count as hidden, add `--count` documentation to issues/mrs/notes entries.
+
+**Verification:**
+- `lore issues --count` returns issue count
+- `lore mrs --count` returns MR count
+- `lore notes --count` returns note count
+- `lore count issues` still works (hidden)
+- `lore count discussions --for mr` still works (no equivalent in the new pattern -- discussions/events/references still need the standalone `count` command)
+
+**Important note:** `count` supports entity types that don't have their own command (discussions, events, references). The standalone `count` must remain functional (just hidden). The `--count` flag on `issues`/`mrs`/`notes` handles the common cases only.
+
+**Files touched:** `src/cli/args.rs`, `src/cli/mod.rs`, `src/app/handlers.rs`, `src/app/robot_docs.rs`
+
+---
+
+### P10: Add `--sort` to `search`
+
+**Goal:** Allow sorting search results by score, created date, or updated date.
+
+**File:** `src/cli/args.rs` -- Add to `SearchArgs`:
+
+```rust
+/// Sort results by field (score is default for ranked search)
+#[arg(long, value_parser = ["score", "created", "updated"], default_value = "score", help_heading = "Sorting")]
+pub sort: String,
+
+/// Sort ascending (default: descending)
+#[arg(long, help_heading = "Sorting", overrides_with = "no_asc")]
+pub asc: bool,
+
+#[arg(long = "no-asc", hide = true, overrides_with = "asc")]
+pub no_asc: bool,
+```
+
+**File:** `src/cli/commands/search.rs` -- Thread the sort parameter through to the search query.
+
+The search function currently returns results sorted by score. When `--sort created` or `--sort updated` is specified, apply an `ORDER BY` clause to the final result set.
+
+**File:** `src/app/robot_docs.rs` -- Add `--sort` and `--asc` to the search command's flags list.
+
+**Verification:**
+- `lore search 'auth' --sort score` (default, unchanged)
+- `lore search 'auth' --sort created --asc` (oldest first)
+- `lore search 'auth' --sort updated` (most recently updated first)
+
+**Files touched:** `src/cli/args.rs`, `src/cli/commands/search.rs`, `src/app/robot_docs.rs`
+
+---
+
+### Phase 3 Commit Summary
+
+**Commit C: Consolidate file-history into trace**
+- `src/cli/args.rs`, `src/cli/mod.rs`, `src/app/handlers.rs`, `src/app/robot_docs.rs`
+
+**Commit D: Add `--count` flag to entity commands**
+- `src/cli/args.rs`, `src/cli/mod.rs`, `src/app/handlers.rs`, `src/app/robot_docs.rs`
+
+**Commit E: Add `--sort` to search**
+- `src/cli/args.rs`, `src/cli/commands/search.rs`, `src/app/robot_docs.rs`
+
+**Test plan:**
+```bash
+cargo check --all-targets
+cargo clippy --all-targets -- -D warnings
+cargo fmt --check
+cargo test
+
+# trace consolidation
+lore trace src/main.rs --mrs-only
+lore trace src/main.rs --mrs-only --merged --discussions
+lore file-history src/main.rs     # backward compat
+
+# count flag
+lore issues --count
+lore mrs --count -s opened
+lore notes --count --for-issue 42
+lore count discussions --for mr   # still works
+
+# search sort
+lore search 'auth' --sort created --asc
+```
+
+---
+
+## Documentation Updates
+
+After all implementation is complete:
+
+### CLAUDE.md / AGENTS.md
+
+Update the robot mode command reference to reflect:
+- `stats` -> `index` (with note that `stats` is a hidden alias)
+- `health` -> `doctor --quick` (with note that `health` is a hidden alias)
+- Remove `ingest`, `generate-docs`, `embed` from the primary command table (mention as "hidden, use `sync`")
+- Remove `file-history` from primary table (mention as "hidden, use `trace --mrs-only`")
+- Add `--count` flag to issues/mrs/notes documentation
+- Add `--sort` flag to search documentation
+- Add `--mrs-only` and `--merged` flags to trace documentation
+
+### robot-docs Self-Discovery
+
+The `robot_docs.rs` changes above handle this. Key points:
+- New `"hidden": true` field on deprecated/hidden commands
+- Updated descriptions mentioning canonical alternatives
+- Updated flags lists
+- Updated workflows section
+
+---
+
+## File Impact Summary
+
+| File | Phase 1 | Phase 2 | Phase 3 | Total Changes |
+|------|---------|---------|---------|---------------|
+| `src/cli/mod.rs` | help_heading, drift value_parser | stats->index rename, hide health, hide pipeline stages | hide file-history, hide count | 4 passes |
+| `src/cli/args.rs` | singular/plural, remove `-f`, add `-o` | — | `--mrs-only`/`--merged` on trace, `--count` on entities, `--sort` on search | 2 passes |
+| `src/app/handlers.rs` | normalize entity strings | route doctor --quick | trace mrs-only delegation, count flag routing | 3 passes |
+| `src/app/robot_docs.rs` | update count flags | rename stats->index, merge health+doctor, add hidden field | update trace, file-history, count, search entries | 3 passes |
+| `src/cli/autocorrect.rs` | — | update CANONICAL_SUBCOMMANDS, SUBCOMMAND_ALIASES, COMMAND_FLAGS | — | 1 pass |
+| `src/main.rs` | — | stats->index variant rename, doctor variant change | — | 1 pass |
+| `src/cli/commands/search.rs` | — | — | sort parameter threading | 1 pass |
+
+---
+
+## Before / After Summary
+
+### Command Count
+
+| Metric | Before | After | Delta |
+|--------|--------|-------|-------|
+| Visible top-level commands | 29 | 21 | -8 (-28%) |
+| Hidden commands (functional) | 4 | 12 | +8 (absorbed) |
+| Stub/unimplemented commands | 2 | 2 | 0 |
+| Total functional commands | 33 | 33 | 0 (nothing lost) |
+
+### `lore --help` Output
+
+**Before (29 commands, flat list, ~50 lines of commands):**
+```
+Commands:
+  issues         List or show issues [aliases: issue]
+  mrs            List or show merge requests [aliases: mr]
+  notes          List notes from discussions [aliases: note]
+  ingest         Ingest data from GitLab
+  count          Count entities in local database
+  status         Show sync state [aliases: st]
+  auth           Verify GitLab authentication
+  doctor         Check environment health
+  version        Show version information
+  init           Initialize configuration and database
+  search         Search indexed documents [aliases: find]
+  stats          Show document and index statistics [aliases: stat]
+  generate-docs  Generate searchable documents from ingested data
+  embed          Generate vector embeddings for documents via Ollama
+  sync           Run full sync pipeline: ingest -> generate-docs -> embed
+  migrate        Run pending database migrations
+  health         Quick health check: config, database, schema version
+  robot-docs     Machine-readable command manifest for agent self-discovery
+  completions    Generate shell completions
+  timeline       Show a chronological timeline of events matching a query
+  who            People intelligence: experts, workload, active discussions, overlap
+  me             Personal work dashboard: open issues, authored/reviewing MRs, activity
+  file-history   Show MRs that touched a file, with linked discussions
+  trace          Trace why code was introduced: file -> MR -> issue -> discussion
+  drift          Detect discussion divergence from original intent
+  related        Find semantically related entities via vector search
+  cron           Manage cron-based automatic syncing
+  token          Manage stored GitLab token
+  help           Print this message or the help of the given subcommand(s)
+```
+
+**After (21 commands, grouped, ~35 lines of commands):**
+```
+Query:
+  issues      List or show issues [aliases: issue]
+  mrs         List or show merge requests [aliases: mr]
+  notes       List notes from discussions [aliases: note]
+  search      Search indexed documents [aliases: find]
+
+Intelligence:
+  timeline    Chronological timeline of events
+  who         People intelligence: experts, workload, overlap
+  me          Personal work dashboard
+
+File Analysis:
+  trace       Trace code provenance / file history
+  related     Find semantically related entities
+  drift       Detect discussion divergence
+
+Data Pipeline:
+  sync        Run full sync pipeline
+
+System:
+  init        Initialize configuration and database
+  status      Show sync state [aliases: st]
+  doctor      Check environment health (--quick for pre-flight)
+  index       Document and index statistics [aliases: idx]
+  auth        Verify GitLab authentication
+  token       Manage stored GitLab token
+  migrate     Run pending database migrations
+  cron        Manage automatic syncing
+  robot-docs  Agent self-discovery manifest
+  completions Generate shell completions
+  version     Show version information
+```
+
+### Flag Consistency
+
+| Issue | Before | After |
+|-------|--------|-------|
+| `-f` collision (force vs for) | `ingest -f`=force, `count -f`=for | `-f` removed from count; `-f` = force everywhere |
+| Singular/plural entity types | `count issues` but `search --type issue` | Both forms accepted everywhere |
+| `notes --open` missing `-o` | `notes --open` (no shorthand) | `notes -o` works (matches issues/mrs) |
+| `search` missing `--sort` | No sort override | `--sort score\|created\|updated` + `--asc` |
+
+### Naming Confusion
+
+| Before | After | Resolution |
+|--------|-------|------------|
+| `status` vs `stats` vs `stat` (3 names, 2 commands) | `status` + `index` (2 names, 2 commands) | Eliminated near-homonym collision |
+| `health` vs `doctor` (2 commands, overlapping scope) | `doctor` + `doctor --quick` (1 command) | Progressive disclosure |
+| `trace` vs `file-history` (2 commands, overlapping function) | `trace` + `trace --mrs-only` (1 command) | Superset absorbs subset |
+
+### Robot Ergonomics
+
+| Metric | Before | After |
+|--------|--------|-------|
+| Commands in robot-docs manifest | 29 | 21 visible + hidden section |
+| Agent decision space for "system check" | 4 commands | 2 commands (status, doctor) |
+| Agent decision space for "file query" | 3 commands + 2 who modes | 1 command (trace) + 2 who modes |
+| Entity type parse errors from singular/plural | Common | Eliminated |
+| Estimated token cost of robot-docs | Baseline | ~15% reduction (fewer entries, hidden flagged) |
+
+### What Stays Exactly The Same
+
+- All 33 functional commands remain callable (nothing is removed)
+- All existing flags and their behavior are preserved
+- All response schemas are unchanged
+- All exit codes are unchanged
+- The autocorrect system continues to work
+- All hidden/deprecated commands emit their existing warnings
+
+### What Breaks (Intentional)
+
+- `lore count -f mr` (the `-f` shorthand) -- must use `--for` instead
+- `lore --help` layout changes (commands are grouped, 8 commands hidden)
+- `lore robot-docs` output changes (new `hidden` field, renamed keys)
+- Any scripts parsing `--help` text (but `robot-docs` is the stable contract)

docs/plan-expose-discussion-ids.feedback-3.md

@@ -1,5 +1,5 @@
 1. **Make `gitlab_note_id` explicit in all note-level payloads without breaking existing consumers**
-Rationale: Your Bridge Contract already requires `gitlab_note_id`, but current plan keeps `gitlab_id` only in `notes` list while adding `gitlab_note_id` only in `show`. That forces agents to special-case commands. Add `gitlab_note_id` as an alias field everywhere note-level data appears, while keeping `gitlab_id` for compatibility.
+Rationale: Your Bridge Contract already requires `gitlab_note_id`, but current plan keeps `gitlab_id` only in `notes` list while adding `gitlab_note_id` only in detail views. That forces agents to special-case commands. Add `gitlab_note_id` as an alias field everywhere note-level data appears, while keeping `gitlab_id` for compatibility.
 
 ```diff
 @@ Bridge Contract (Cross-Cutting)

docs/plan-expose-discussion-ids.md

@@ -43,7 +43,7 @@ construct API calls without a separate project-ID lookup, even after path change
 **Back-compat rule**: Note payloads in the `notes` list command continue exposing `gitlab_id`
 for existing consumers, but **MUST also** expose `gitlab_note_id` with the same value. This
 ensures agents can use a single field name (`gitlab_note_id`) across all commands — `notes`,
-`show`, and `discussions --include-notes` — without special-casing by command.
+`issues <IID>`/`mrs <IID>`, and `discussions --include-notes` — without special-casing by command.
 
 This contract exists so agents can deterministically construct `glab api` write calls without
 cross-referencing multiple commands. Each workstream below must satisfy these fields in its

gitlore-sync-explorer.html

@@ -1,844 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>Gitlore Sync Pipeline Explorer</title>
-<style>
-  :root {
-    --bg: #0d1117;
-    --bg-secondary: #161b22;
-    --bg-tertiary: #1c2129;
-    --border: #30363d;
-    --text: #c9d1d9;
-    --text-dim: #8b949e;
-    --text-bright: #f0f6fc;
-    --cyan: #58a6ff;
-    --green: #3fb950;
-    --amber: #d29922;
-    --red: #f85149;
-    --purple: #bc8cff;
-    --pink: #f778ba;
-    --cyan-dim: rgba(88,166,255,0.15);
-    --green-dim: rgba(63,185,80,0.15);
-    --amber-dim: rgba(210,153,34,0.15);
-    --red-dim: rgba(248,81,73,0.15);
-    --purple-dim: rgba(188,140,255,0.15);
-  }
-  * { margin: 0; padding: 0; box-sizing: border-box; }
-  body {
-    font-family: 'SF Mono', 'Cascadia Code', 'Fira Code', 'JetBrains Mono', monospace;
-    background: var(--bg); color: var(--text);
-    display: flex; height: 100vh; overflow: hidden;
-  }
-  .sidebar {
-    width: 220px; min-width: 220px; background: var(--bg-secondary);
-    border-right: 1px solid var(--border); display: flex; flex-direction: column; padding: 16px 0;
-  }
-  .sidebar-title {
-    font-size: 11px; font-weight: 700; text-transform: uppercase;
-    letter-spacing: 1.2px; color: var(--text-dim); padding: 0 16px 12px;
-  }
-  .logo {
-    padding: 0 16px 20px; font-size: 15px; font-weight: 700; color: var(--cyan);
-    display: flex; align-items: center; gap: 8px;
-  }
-  .logo svg { width: 20px; height: 20px; }
-  .nav-item {
-    padding: 10px 16px; cursor: pointer; font-size: 13px; color: var(--text-dim);
-    transition: all 0.15s; border-left: 3px solid transparent;
-    display: flex; align-items: center; gap: 10px;
-  }
-  .nav-item:hover { background: var(--bg-tertiary); color: var(--text); }
-  .nav-item.active { background: var(--cyan-dim); color: var(--cyan); border-left-color: var(--cyan); }
-  .nav-dot { width: 8px; height: 8px; border-radius: 50%; flex-shrink: 0; }
-  .main { flex: 1; display: flex; flex-direction: column; overflow: hidden; }
-  .header {
-    padding: 16px 24px; border-bottom: 1px solid var(--border);
-    display: flex; align-items: center; justify-content: space-between;
-  }
-  .header h1 { font-size: 16px; font-weight: 600; color: var(--text-bright); }
-  .header-badge {
-    font-size: 11px; padding: 3px 10px; border-radius: 12px;
-    background: var(--cyan-dim); color: var(--cyan);
-  }
-  .canvas-wrapper { flex: 1; overflow: auto; position: relative; }
-  .canvas { padding: 32px; min-height: 100%; }
-  .flow-container { display: none; }
-  .flow-container.active { display: block; }
-  .phase { margin-bottom: 32px; }
-  .phase-header { display: flex; align-items: center; gap: 12px; margin-bottom: 16px; }
-  .phase-number {
-    width: 28px; height: 28px; border-radius: 50%; display: flex; align-items: center;
-    justify-content: center; font-size: 13px; font-weight: 700; flex-shrink: 0;
-  }
-  .phase-title { font-size: 14px; font-weight: 600; color: var(--text-bright); }
-  .phase-subtitle { font-size: 11px; color: var(--text-dim); margin-left: 4px; font-weight: 400; }
-  .flow-row {
-    display: flex; align-items: stretch; gap: 0; flex-wrap: wrap;
-    margin-left: 14px; padding-left: 26px; border-left: 2px solid var(--border);
-  }
-  .flow-row:last-child { border-left-color: transparent; }
-  .node {
-    position: relative; padding: 12px 16px; border-radius: 8px;
-    border: 1px solid var(--border); background: var(--bg-secondary);
-    font-size: 12px; cursor: pointer; transition: all 0.2s;
-    min-width: 180px; max-width: 260px; margin: 4px 0;
-  }
-  .node:hover {
-    border-color: var(--cyan); transform: translateY(-1px);
-    box-shadow: 0 4px 12px rgba(0,0,0,0.3);
-  }
-  .node.selected {
-    border-color: var(--cyan);
-    box-shadow: 0 0 0 1px var(--cyan), 0 4px 16px rgba(88,166,255,0.15);
-  }
-  .node-title { font-weight: 600; font-size: 12px; margin-bottom: 4px; color: var(--text-bright); }
-  .node-desc { font-size: 11px; color: var(--text-dim); line-height: 1.5; }
-  .node.api { border-left: 3px solid var(--cyan); }
-  .node.transform { border-left: 3px solid var(--purple); }
-  .node.db { border-left: 3px solid var(--green); }
-  .node.decision { border-left: 3px solid var(--amber); }
-  .node.error { border-left: 3px solid var(--red); }
-  .node.queue { border-left: 3px solid var(--pink); }
-  .arrow {
-    display: flex; align-items: center; padding: 0 6px;
-    color: var(--text-dim); font-size: 16px; flex-shrink: 0;
-  }
-  .arrow-down {
-    display: flex; justify-content: center; padding: 4px 0;
-    color: var(--text-dim); font-size: 16px; margin-left: 14px;
-    padding-left: 26px; border-left: 2px solid var(--border);
-  }
-  .branch-container {
-    margin-left: 14px; padding-left: 26px;
-    border-left: 2px solid var(--border); padding-bottom: 8px;
-  }
-  .branch-row { display: flex; gap: 12px; margin: 8px 0; flex-wrap: wrap; }
-  .branch-label {
-    font-size: 11px; font-weight: 600; margin: 8px 0 4px;
-    display: flex; align-items: center; gap: 6px;
-  }
-  .branch-label.success { color: var(--green); }
-  .branch-label.error { color: var(--red); }
-  .branch-label.retry { color: var(--amber); }
-  .diff-badge {
-    display: inline-block; font-size: 10px; padding: 2px 6px;
-    border-radius: 4px; margin-top: 6px; font-weight: 600;
-  }
-  .diff-badge.changed { background: var(--amber-dim); color: var(--amber); }
-  .diff-badge.same { background: var(--green-dim); color: var(--green); }
-  .detail-panel {
-    position: fixed; right: 0; top: 0; bottom: 0; width: 380px;
-    background: var(--bg-secondary); border-left: 1px solid var(--border);
-    transform: translateX(100%); transition: transform 0.25s ease;
-    z-index: 100; display: flex; flex-direction: column; overflow: hidden;
-  }
-  .detail-panel.open { transform: translateX(0); }
-  .detail-header {
-    padding: 16px 20px; border-bottom: 1px solid var(--border);
-    display: flex; align-items: center; justify-content: space-between;
-  }
-  .detail-header h2 { font-size: 14px; font-weight: 600; color: var(--text-bright); }
-  .detail-close {
-    cursor: pointer; color: var(--text-dim); font-size: 18px;
-    background: none; border: none; padding: 4px 8px; border-radius: 4px;
-  }
-  .detail-close:hover { background: var(--bg-tertiary); color: var(--text); }
-  .detail-body { flex: 1; overflow-y: auto; padding: 20px; }
-  .detail-section { margin-bottom: 20px; }
-  .detail-section h3 {
-    font-size: 11px; text-transform: uppercase; letter-spacing: 0.8px;
-    color: var(--text-dim); margin-bottom: 8px;
-  }
-  .detail-section p { font-size: 12px; line-height: 1.7; color: var(--text); }
-  .sql-block {
-    background: var(--bg); border: 1px solid var(--border); border-radius: 6px;
-    padding: 12px; font-size: 11px; line-height: 1.6; color: var(--green);
-    overflow-x: auto; white-space: pre; margin-top: 8px;
-  }
-  .detail-tag {
-    display: inline-block; font-size: 10px; padding: 2px 8px;
-    border-radius: 10px; margin: 2px 4px 2px 0;
-  }
-  .detail-tag.file { background: var(--purple-dim); color: var(--purple); }
-  .detail-tag.type-api { background: var(--cyan-dim); color: var(--cyan); }
-  .detail-tag.type-db { background: var(--green-dim); color: var(--green); }
-  .detail-tag.type-transform { background: var(--purple-dim); color: var(--purple); }
-  .detail-tag.type-decision { background: var(--amber-dim); color: var(--amber); }
-  .detail-tag.type-error { background: var(--red-dim); color: var(--red); }
-  .detail-tag.type-queue { background: rgba(247,120,186,0.15); color: var(--pink); }
-  .watermark-panel { border-top: 1px solid var(--border); background: var(--bg-secondary); }
-  .watermark-toggle {
-    padding: 10px 24px; cursor: pointer; font-size: 12px; color: var(--text-dim);
-    display: flex; align-items: center; gap: 8px; user-select: none;
-  }
-  .watermark-toggle:hover { color: var(--text); }
-  .watermark-toggle .chevron { transition: transform 0.2s; font-size: 10px; }
-  .watermark-toggle .chevron.open { transform: rotate(180deg); }
-  .watermark-content { display: none; padding: 0 24px 16px; max-height: 260px; overflow-y: auto; }
-  .watermark-content.open { display: block; }
-  .wm-table { width: 100%; border-collapse: collapse; font-size: 11px; }
-  .wm-table th {
-    text-align: left; padding: 6px 12px; color: var(--text-dim); font-weight: 600;
-    border-bottom: 1px solid var(--border); font-size: 10px;
-    text-transform: uppercase; letter-spacing: 0.5px;
-  }
-  .wm-table td { padding: 6px 12px; border-bottom: 1px solid var(--border); color: var(--text); }
-  .wm-table td:first-child { color: var(--cyan); font-weight: 600; }
-  .wm-table td:nth-child(2) { color: var(--green); }
-  .overview-pipeline { display: flex; gap: 0; align-items: stretch; margin: 24px 0; flex-wrap: wrap; }
-  .overview-stage {
-    flex: 1; min-width: 200px; background: var(--bg-secondary);
-    border: 1px solid var(--border); border-radius: 10px; padding: 20px;
-    cursor: pointer; transition: all 0.2s;
-  }
-  .overview-stage:hover {
-    border-color: var(--cyan); transform: translateY(-2px);
-    box-shadow: 0 6px 20px rgba(0,0,0,0.3);
-  }
-  .overview-arrow { display: flex; align-items: center; padding: 0 8px; font-size: 20px; color: var(--text-dim); }
-  .stage-num { font-size: 10px; font-weight: 700; text-transform: uppercase; letter-spacing: 1px; margin-bottom: 8px; }
-  .stage-title { font-size: 15px; font-weight: 700; color: var(--text-bright); margin-bottom: 6px; }
-  .stage-desc { font-size: 11px; color: var(--text-dim); line-height: 1.6; }
-  .stage-detail {
-    margin-top: 12px; padding-top: 12px; border-top: 1px solid var(--border);
-    font-size: 11px; color: var(--text-dim); line-height: 1.6;
-  }
-  .stage-detail code {
-    color: var(--amber); background: var(--amber-dim); padding: 1px 5px;
-    border-radius: 3px; font-size: 10px;
-  }
-  .info-box {
-    background: var(--bg-tertiary); border: 1px solid var(--border);
-    border-radius: 8px; padding: 16px; margin: 16px 0; font-size: 12px; line-height: 1.7;
-  }
-  .info-box-title { font-weight: 600; color: var(--cyan); margin-bottom: 6px; display: flex; align-items: center; gap: 6px; }
-  .info-box ul { margin-left: 16px; color: var(--text-dim); }
-  .info-box li { margin: 4px 0; }
-  .info-box code {
-    color: var(--amber); background: var(--amber-dim);
-    padding: 1px 5px; border-radius: 3px; font-size: 11px;
-  }
-  .legend {
-    display: flex; gap: 16px; flex-wrap: wrap; margin-bottom: 24px;
-    padding: 12px 16px; background: var(--bg-secondary);
-    border: 1px solid var(--border); border-radius: 8px;
-  }
-  .legend-item { display: flex; align-items: center; gap: 6px; font-size: 11px; color: var(--text-dim); }
-  .legend-color { width: 12px; height: 3px; border-radius: 2px; }
-  ::-webkit-scrollbar { width: 8px; height: 8px; }
-  ::-webkit-scrollbar-track { background: transparent; }
-  ::-webkit-scrollbar-thumb { background: var(--border); border-radius: 4px; }
-  ::-webkit-scrollbar-thumb:hover { background: var(--text-dim); }
-</style>
-</head>
-<body>
-
-<div class="sidebar">
-  <div class="logo">
-    <svg viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="1.5">
-      <circle cx="10" cy="10" r="8"/><path d="M10 6v4l3 2"/>
-    </svg>
-    lore sync
-  </div>
-  <div class="sidebar-title">Entity Flows</div>
-  <div class="nav-item active" data-view="overview" onclick="switchView('overview')">
-    <div class="nav-dot" style="background:var(--cyan)"></div>Full Sync Overview
-  </div>
-  <div class="nav-item" data-view="issues" onclick="switchView('issues')">
-    <div class="nav-dot" style="background:var(--green)"></div>Issues
-  </div>
-  <div class="nav-item" data-view="mrs" onclick="switchView('mrs')">
-    <div class="nav-dot" style="background:var(--purple)"></div>Merge Requests
-  </div>
-  <div class="nav-item" data-view="docs" onclick="switchView('docs')">
-    <div class="nav-dot" style="background:var(--amber)"></div>Documents
-  </div>
-  <div class="nav-item" data-view="embed" onclick="switchView('embed')">
-    <div class="nav-dot" style="background:var(--pink)"></div>Embeddings
-  </div>
-</div>
-
-<div class="main">
-  <div class="header">
-    <h1 id="view-title">Full Sync Overview</h1>
-    <span class="header-badge" id="view-badge">4 stages</span>
-  </div>
-
-  <div class="canvas-wrapper"><div class="canvas">
-
-    <!-- OVERVIEW -->
-    <div class="flow-container active" id="view-overview">
-      <div class="overview-pipeline">
-        <div class="overview-stage" onclick="switchView('issues')">
-          <div class="stage-num" style="color:var(--green)">Stage 1</div>
-          <div class="stage-title">Ingest Issues</div>
-          <div class="stage-desc">Fetch issues + discussions + resource events from GitLab API</div>
-          <div class="stage-detail">Cursor-based incremental sync.<br>Sequential discussion fetch.<br>Queue-based resource events.</div>
-        </div>
-        <div class="overview-arrow">&rarr;</div>
-        <div class="overview-stage" onclick="switchView('mrs')">
-          <div class="stage-num" style="color:var(--purple)">Stage 2</div>
-          <div class="stage-title">Ingest MRs</div>
-          <div class="stage-desc">Fetch merge requests + discussions + resource events</div>
-          <div class="stage-detail">Page-based incremental sync.<br>Parallel prefetch discussions.<br>Queue-based resource events.</div>
-        </div>
-        <div class="overview-arrow">&rarr;</div>
-        <div class="overview-stage" onclick="switchView('docs')">
-          <div class="stage-num" style="color:var(--amber)">Stage 3</div>
-          <div class="stage-title">Generate Docs</div>
-          <div class="stage-desc">Regenerate searchable documents for changed entities</div>
-          <div class="stage-detail">Driven by <code>dirty_sources</code> table.<br>Triple-hash skip optimization.<br>FTS5 index auto-updated.</div>
-        </div>
-        <div class="overview-arrow">&rarr;</div>
-        <div class="overview-stage" onclick="switchView('embed')">
-          <div class="stage-num" style="color:var(--pink)">Stage 4</div>
-          <div class="stage-title">Embed</div>
-          <div class="stage-desc">Generate vector embeddings via Ollama for semantic search</div>
-          <div class="stage-detail">Hash-based change detection.<br>Chunked, batched API calls.<br><b>Non-fatal</b> &mdash; graceful if Ollama down.</div>
-        </div>
-      </div>
-      <div class="info-box">
-        <div class="info-box-title">Concurrency Model</div>
-        <ul>
-          <li>Stages 1 &amp; 2 process <b>projects concurrently</b> via <code>buffer_unordered(primary_concurrency)</code></li>
-          <li>Each project gets its own <b>SQLite connection</b>; rate limiter is <b>shared</b></li>
-          <li>Discussions: <b>sequential</b> (issues) or <b>batched parallel prefetch</b> (MRs)</li>
-          <li>Resource events use a <b>persistent job queue</b> with atomic claim + exponential backoff</li>
-        </ul>
-      </div>
-      <div class="info-box">
-        <div class="info-box-title">Sync Flags</div>
-        <ul>
-          <li><code>--full</code> &mdash; Resets all cursors &amp; watermarks, forces complete re-fetch</li>
-          <li><code>--no-docs</code> &mdash; Skips Stage 3 (document generation)</li>
-          <li><code>--no-embed</code> &mdash; Skips Stage 4 (embedding generation)</li>
-          <li><code>--force</code> &mdash; Overrides stale single-flight lock</li>
-          <li><code>--project &lt;path&gt;</code> &mdash; Sync only one project (fuzzy matching)</li>
-        </ul>
-      </div>
-      <div class="info-box">
-        <div class="info-box-title">Single-Flight Lock</div>
-        <ul>
-          <li>Table-based lock (<code>AppLock</code>) prevents concurrent syncs</li>
-          <li>Heartbeat keeps the lock alive; stale locks auto-detected</li>
-          <li>Use <code>--force</code> to override a stale lock</li>
-        </ul>
-      </div>
-    </div>
-
-    <!-- ISSUES -->
-    <div class="flow-container" id="view-issues">
-      <div class="legend">
-        <div class="legend-item"><div class="legend-color" style="background:var(--cyan)"></div>API Call</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--purple)"></div>Transform</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--green)"></div>Database</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--amber)"></div>Decision</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--red)"></div>Error Path</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--pink)"></div>Queue</div>
-      </div>
-      <div class="phase">
-        <div class="phase-header">
-          <div class="phase-number" style="background:var(--cyan-dim);color:var(--cyan)">1</div>
-          <div class="phase-title">Fetch Issues <span class="phase-subtitle">Cursor-Based Incremental Sync</span></div>
-        </div>
-        <div class="flow-row">
-          <div class="node api" data-detail="issue-api-call"><div class="node-title">GitLab API Call</div><div class="node-desc">paginate_issues() with<br>updated_after = cursor - rewind</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node decision" data-detail="issue-cursor-filter"><div class="node-title">Cursor Filter</div><div class="node-desc">updated_at &gt; cursor_ts<br>OR tie_breaker check</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node transform" data-detail="issue-transform"><div class="node-title">transform_issue()</div><div class="node-desc">GitLab API shape &rarr;<br>local DB row shape</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node db" data-detail="issue-transaction"><div class="node-title">Transaction</div><div class="node-desc">store_payload &rarr; upsert &rarr;<br>mark_dirty &rarr; relink</div></div>
-        </div>
-        <div class="arrow-down">&darr;</div>
-        <div class="flow-row">
-          <div class="node db" data-detail="issue-cursor-update"><div class="node-title">Update Cursor</div><div class="node-desc">Every 100 issues + final<br>sync_cursors table</div></div>
-        </div>
-      </div>
-      <div class="phase">
-        <div class="phase-header">
-          <div class="phase-number" style="background:var(--green-dim);color:var(--green)">2</div>
-          <div class="phase-title">Discussion Sync <span class="phase-subtitle">Sequential, Watermark-Based</span></div>
-        </div>
-        <div class="flow-row">
-          <div class="node db" data-detail="issue-disc-query"><div class="node-title">Query Stale Issues</div><div class="node-desc">updated_at &gt; COALESCE(<br>discussions_synced_for_<br>updated_at, 0)</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node api" data-detail="issue-disc-fetch"><div class="node-title">Paginate Discussions</div><div class="node-desc">Sequential per issue<br>paginate_issue_discussions()</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node transform" data-detail="issue-disc-transform"><div class="node-title">Transform</div><div class="node-desc">transform_discussion()<br>transform_notes()</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node db" data-detail="issue-disc-write"><div class="node-title">Write Discussion</div><div class="node-desc">store_payload &rarr; upsert<br>DELETE notes &rarr; INSERT notes</div></div>
-        </div>
-        <div class="branch-container">
-          <div class="branch-label success">&#10003; On Success (all pages fetched)</div>
-          <div class="branch-row">
-            <div class="node db" data-detail="issue-disc-stale"><div class="node-title">Remove Stale</div><div class="node-desc">DELETE discussions not<br>seen in this fetch</div></div>
-            <div class="arrow">&rarr;</div>
-            <div class="node db" data-detail="issue-disc-watermark"><div class="node-title">Advance Watermark</div><div class="node-desc">discussions_synced_for_<br>updated_at = updated_at</div></div>
-          </div>
-          <div class="branch-label error">&#10007; On Pagination Error</div>
-          <div class="branch-row">
-            <div class="node error" data-detail="issue-disc-fail"><div class="node-title">Skip Stale Removal</div><div class="node-desc">Watermark NOT advanced<br>Will retry next sync</div></div>
-          </div>
-        </div>
-      </div>
-      <div class="phase">
-        <div class="phase-header">
-          <div class="phase-number" style="background:rgba(247,120,186,0.15);color:var(--pink)">3</div>
-          <div class="phase-title">Resource Events <span class="phase-subtitle">Queue-Based, Concurrent Fetch</span></div>
-        </div>
-        <div class="flow-row">
-          <div class="node queue" data-detail="re-cleanup"><div class="node-title">Cleanup Obsolete</div><div class="node-desc">DELETE jobs where entity<br>watermark is current</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node queue" data-detail="re-enqueue"><div class="node-title">Enqueue Jobs</div><div class="node-desc">INSERT for entities where<br>updated_at &gt; watermark</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node queue" data-detail="re-claim"><div class="node-title">Claim Jobs</div><div class="node-desc">Atomic UPDATE...RETURNING<br>with lock acquisition</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node api" data-detail="re-fetch"><div class="node-title">Fetch Events</div><div class="node-desc">3 concurrent: state +<br>label + milestone</div></div>
-        </div>
-        <div class="branch-container">
-          <div class="branch-label success">&#10003; On Success</div>
-          <div class="branch-row">
-            <div class="node db" data-detail="re-store"><div class="node-title">Store Events</div><div class="node-desc">Transaction: upsert all<br>3 event types</div></div>
-            <div class="arrow">&rarr;</div>
-            <div class="node db" data-detail="re-complete"><div class="node-title">Complete + Watermark</div><div class="node-desc">DELETE job row<br>Advance watermark</div></div>
-          </div>
-          <div class="branch-label error">&#10007; Permanent Error (404 / 403)</div>
-          <div class="branch-row">
-            <div class="node error" data-detail="re-permanent"><div class="node-title">Skip Permanently</div><div class="node-desc">complete_job + advance<br>watermark (coalesced)</div></div>
-          </div>
-          <div class="branch-label retry">&#8635; Transient Error</div>
-          <div class="branch-row">
-            <div class="node error" data-detail="re-transient"><div class="node-title">Backoff Retry</div><div class="node-desc">fail_job: 30s x 2^(n-1)<br>capped at 480s</div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- MERGE REQUESTS -->
-    <div class="flow-container" id="view-mrs">
-      <div class="legend">
-        <div class="legend-item"><div class="legend-color" style="background:var(--cyan)"></div>API Call</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--purple)"></div>Transform</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--green)"></div>Database</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--amber)"></div>Diff from Issues</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--red)"></div>Error Path</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--pink)"></div>Queue</div>
-      </div>
-      <div class="phase">
-        <div class="phase-header">
-          <div class="phase-number" style="background:var(--cyan-dim);color:var(--cyan)">1</div>
-          <div class="phase-title">Fetch MRs <span class="phase-subtitle">Page-Based Incremental Sync</span></div>
-        </div>
-        <div class="flow-row">
-          <div class="node api" data-detail="mr-api-call"><div class="node-title">GitLab API Call</div><div class="node-desc">fetch_merge_requests_page()<br>with cursor rewind</div><div class="diff-badge changed">Page-based, not streaming</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node decision" data-detail="mr-cursor-filter"><div class="node-title">Cursor Filter</div><div class="node-desc">Same logic as issues:<br>timestamp + tie-breaker</div><div class="diff-badge same">Same as issues</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node transform" data-detail="mr-transform"><div class="node-title">transform_merge_request()</div><div class="node-desc">Maps API shape &rarr;<br>local DB row</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node db" data-detail="mr-transaction"><div class="node-title">Transaction</div><div class="node-desc">store &rarr; upsert &rarr; dirty &rarr;<br>labels + assignees + reviewers</div><div class="diff-badge changed">3 junction tables (not 2)</div></div>
-        </div>
-        <div class="arrow-down">&darr;</div>
-        <div class="flow-row">
-          <div class="node db" data-detail="mr-cursor-update"><div class="node-title">Update Cursor</div><div class="node-desc">Per page (not every 100)</div><div class="diff-badge changed">Per page boundary</div></div>
-        </div>
-      </div>
-      <div class="phase">
-        <div class="phase-header">
-          <div class="phase-number" style="background:var(--green-dim);color:var(--green)">2</div>
-          <div class="phase-title">MR Discussion Sync <span class="phase-subtitle">Parallel Prefetch + Serial Write</span></div>
-        </div>
-        <div class="info-box" style="margin-left:40px;margin-bottom:16px;">
-          <div class="info-box-title">Key Differences from Issue Discussions</div>
-          <ul>
-            <li><b>Parallel prefetch</b> &mdash; fetches all discussions for a batch concurrently via <code>join_all()</code></li>
-            <li><b>Upsert pattern</b> &mdash; notes use INSERT...ON CONFLICT (not delete-all + re-insert)</li>
-            <li><b>Sweep stale</b> &mdash; uses <code>last_seen_at</code> timestamp comparison (not set difference)</li>
-            <li><b>Sync health tracking</b> &mdash; records <code>discussions_sync_attempts</code> and <code>last_error</code></li>
-          </ul>
-        </div>
-        <div class="flow-row">
-          <div class="node db" data-detail="mr-disc-query"><div class="node-title">Query Stale MRs</div><div class="node-desc">updated_at &gt; COALESCE(<br>discussions_synced_for_<br>updated_at, 0)</div><div class="diff-badge same">Same watermark logic</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node decision" data-detail="mr-disc-batch"><div class="node-title">Batch by Concurrency</div><div class="node-desc">dependent_concurrency<br>MRs per batch</div><div class="diff-badge changed">Batched processing</div></div>
-        </div>
-        <div class="arrow-down">&darr;</div>
-        <div class="flow-row">
-          <div class="node api" data-detail="mr-disc-prefetch"><div class="node-title">Parallel Prefetch</div><div class="node-desc">join_all() fetches all<br>discussions for batch</div><div class="diff-badge changed">Parallel (not sequential)</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node transform" data-detail="mr-disc-transform"><div class="node-title">Transform In-Memory</div><div class="node-desc">transform_mr_discussion()<br>+ diff position notes</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node db" data-detail="mr-disc-write"><div class="node-title">Serial Write</div><div class="node-desc">upsert discussion<br>upsert notes (ON CONFLICT)</div><div class="diff-badge changed">Upsert, not delete+insert</div></div>
-        </div>
-        <div class="branch-container">
-          <div class="branch-label success">&#10003; On Full Success</div>
-          <div class="branch-row">
-            <div class="node db" data-detail="mr-disc-sweep"><div class="node-title">Sweep Stale</div><div class="node-desc">DELETE WHERE last_seen_at<br>&lt; run_seen_at (disc + notes)</div><div class="diff-badge changed">last_seen_at sweep</div></div>
-            <div class="arrow">&rarr;</div>
-            <div class="node db" data-detail="mr-disc-watermark"><div class="node-title">Advance Watermark</div><div class="node-desc">discussions_synced_for_<br>updated_at = updated_at</div></div>
-          </div>
-          <div class="branch-label error">&#10007; On Failure</div>
-          <div class="branch-row">
-            <div class="node error" data-detail="mr-disc-fail"><div class="node-title">Record Sync Health</div><div class="node-desc">Watermark NOT advanced<br>Tracks attempts + last_error</div><div class="diff-badge changed">Health tracking</div></div>
-          </div>
-        </div>
-      </div>
-      <div class="phase">
-        <div class="phase-header">
-          <div class="phase-number" style="background:rgba(247,120,186,0.15);color:var(--pink)">3</div>
-          <div class="phase-title">Resource Events <span class="phase-subtitle">Same as Issues</span></div>
-        </div>
-        <div class="info-box" style="margin-left:40px">
-          <div class="info-box-title">Identical to Issue Resource Events</div>
-          <ul>
-            <li>Same queue-based approach: cleanup &rarr; enqueue &rarr; claim &rarr; fetch &rarr; store/fail</li>
-            <li>Same watermark column: <code>resource_events_synced_for_updated_at</code></li>
-            <li>Same error handling: 404/403 coalesced to empty, transient errors get backoff</li>
-            <li>entity_type = <code>"merge_request"</code> instead of <code>"issue"</code></li>
-          </ul>
-        </div>
-      </div>
-    </div>
-
-    <!-- DOCUMENTS -->
-    <div class="flow-container" id="view-docs">
-      <div class="legend">
-        <div class="legend-item"><div class="legend-color" style="background:var(--cyan)"></div>Trigger</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--purple)"></div>Extract</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--green)"></div>Database</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--amber)"></div>Decision</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--red)"></div>Error</div>
-      </div>
-      <div class="phase">
-        <div class="phase-header">
-          <div class="phase-number" style="background:var(--cyan-dim);color:var(--cyan)">1</div>
-          <div class="phase-title">Dirty Source Queue <span class="phase-subtitle">Populated During Ingestion</span></div>
-        </div>
-        <div class="flow-row">
-          <div class="node api" data-detail="doc-trigger"><div class="node-title">mark_dirty_tx()</div><div class="node-desc">Called during every issue/<br>MR/discussion upsert</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node db" data-detail="doc-dirty-table"><div class="node-title">dirty_sources Table</div><div class="node-desc">INSERT (source_type, source_id)<br>ON CONFLICT reset backoff</div></div>
-        </div>
-      </div>
-      <div class="phase">
-        <div class="phase-header">
-          <div class="phase-number" style="background:var(--amber-dim);color:var(--amber)">2</div>
-          <div class="phase-title">Drain Loop <span class="phase-subtitle">Batch 500, Respects Backoff</span></div>
-        </div>
-        <div class="flow-row">
-          <div class="node db" data-detail="doc-drain"><div class="node-title">Get Dirty Sources</div><div class="node-desc">Batch 500, ORDER BY<br>attempt_count, queued_at</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node decision" data-detail="doc-dispatch"><div class="node-title">Dispatch by Type</div><div class="node-desc">issue / mr / discussion<br>&rarr; extract function</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node decision" data-detail="doc-deleted-check"><div class="node-title">Source Exists?</div><div class="node-desc">If deleted: remove doc row<br>(cascade cleans FTS + embeds)</div></div>
-        </div>
-        <div class="arrow-down">&darr;</div>
-        <div class="flow-row">
-          <div class="node transform" data-detail="doc-extract"><div class="node-title">Extract Content</div><div class="node-desc">Structured text:<br>header + metadata + body</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node decision" data-detail="doc-triple-hash"><div class="node-title">Triple-Hash Check</div><div class="node-desc">content_hash + labels_hash<br>+ paths_hash all match?</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node db" data-detail="doc-write"><div class="node-title">SAVEPOINT Write</div><div class="node-desc">Atomic: document row +<br>labels + paths</div></div>
-        </div>
-        <div class="branch-container">
-          <div class="branch-label success">&#10003; On Success</div>
-          <div class="branch-row">
-            <div class="node db" data-detail="doc-clear"><div class="node-title">clear_dirty()</div><div class="node-desc">Remove from dirty_sources</div></div>
-          </div>
-          <div class="branch-label error">&#10007; On Error</div>
-          <div class="branch-row">
-            <div class="node error" data-detail="doc-error"><div class="node-title">record_dirty_error()</div><div class="node-desc">Increment attempt_count<br>Exponential backoff</div></div>
-          </div>
-          <div class="branch-label" style="color:var(--purple)">&#8801; Triple-Hash Match (skip)</div>
-          <div class="branch-row">
-            <div class="node db" data-detail="doc-skip"><div class="node-title">Skip Write</div><div class="node-desc">All 3 hashes match &rarr;<br>no WAL churn, clear dirty</div></div>
-          </div>
-        </div>
-      </div>
-      <div class="info-box">
-        <div class="info-box-title">Full Mode (<code>--full</code>)</div>
-        <ul>
-          <li>Seeds <b>ALL</b> entities into <code>dirty_sources</code> via keyset pagination</li>
-          <li>Triple-hash optimization prevents redundant writes even in full mode</li>
-          <li>Runs FTS <code>OPTIMIZE</code> after drain completes</li>
-        </ul>
-      </div>
-    </div>
-
-    <!-- EMBEDDINGS -->
-    <div class="flow-container" id="view-embed">
-      <div class="legend">
-        <div class="legend-item"><div class="legend-color" style="background:var(--cyan)"></div>API (Ollama)</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--purple)"></div>Processing</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--green)"></div>Database</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--amber)"></div>Decision</div>
-        <div class="legend-item"><div class="legend-color" style="background:var(--red)"></div>Error</div>
-      </div>
-      <div class="phase">
-        <div class="phase-header">
-          <div class="phase-number" style="background:var(--amber-dim);color:var(--amber)">1</div>
-          <div class="phase-title">Change Detection <span class="phase-subtitle">Hash + Config Drift</span></div>
-        </div>
-        <div class="flow-row">
-          <div class="node decision" data-detail="embed-detect"><div class="node-title">find_pending_documents()</div><div class="node-desc">No metadata row? OR<br>document_hash mismatch? OR<br>config drift?</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node db" data-detail="embed-paginate"><div class="node-title">Keyset Pagination</div><div class="node-desc">500 documents per page<br>ordered by doc ID</div></div>
-        </div>
-      </div>
-      <div class="phase">
-        <div class="phase-header">
-          <div class="phase-number" style="background:var(--purple-dim);color:var(--purple)">2</div>
-          <div class="phase-title">Chunking <span class="phase-subtitle">Split + Overflow Guard</span></div>
-        </div>
-        <div class="flow-row">
-          <div class="node transform" data-detail="embed-chunk"><div class="node-title">split_into_chunks()</div><div class="node-desc">Split by paragraph boundaries<br>with configurable overlap</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node decision" data-detail="embed-overflow"><div class="node-title">Overflow Guard</div><div class="node-desc">Too many chunks?<br>Skip to prevent rowid collision</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node transform" data-detail="embed-work"><div class="node-title">Build ChunkWork</div><div class="node-desc">Assign encoded chunk IDs<br>per document</div></div>
-        </div>
-      </div>
-      <div class="phase">
-        <div class="phase-header">
-          <div class="phase-number" style="background:var(--cyan-dim);color:var(--cyan)">3</div>
-          <div class="phase-title">Ollama Embedding <span class="phase-subtitle">Batched API Calls</span></div>
-        </div>
-        <div class="flow-row">
-          <div class="node api" data-detail="embed-batch"><div class="node-title">Batch Embed</div><div class="node-desc">32 chunks per Ollama<br>API call</div></div>
-          <div class="arrow">&rarr;</div>
-          <div class="node db" data-detail="embed-store"><div class="node-title">Store Vectors</div><div class="node-desc">sqlite-vec embeddings table<br>+ embedding_metadata</div></div>
-        </div>
-        <div class="branch-container">
-          <div class="branch-label success">&#10003; On Success</div>
-          <div class="branch-row">
-            <div class="node db" data-detail="embed-success"><div class="node-title">SAVEPOINT Commit</div><div class="node-desc">Atomic per page:<br>clear old + write new</div></div>
-          </div>
-          <div class="branch-label retry">&#8635; Context-Length Error</div>
-          <div class="branch-row">
-            <div class="node error" data-detail="embed-ctx-error"><div class="node-title">Retry Individually</div><div class="node-desc">Re-embed each chunk solo<br>to isolate oversized one</div></div>
-          </div>
-          <div class="branch-label error">&#10007; Other Error</div>
-          <div class="branch-row">
-            <div class="node error" data-detail="embed-other-error"><div class="node-title">Record Error</div><div class="node-desc">Store in embedding_metadata<br>for retry next run</div></div>
-          </div>
-        </div>
-      </div>
-      <div class="info-box">
-        <div class="info-box-title">Full Mode (<code>--full</code>)</div>
-        <ul>
-          <li>DELETEs all <code>embedding_metadata</code> and <code>embeddings</code> rows first</li>
-          <li>Every document re-processed from scratch</li>
-        </ul>
-      </div>
-      <div class="info-box">
-        <div class="info-box-title">Non-Fatal in Sync</div>
-        <ul>
-          <li>Stage 4 failures (Ollama down, model missing) are <b>graceful</b></li>
-          <li>Sync completes successfully; embeddings just won't be updated</li>
-          <li>Semantic search degrades to FTS-only mode</li>
-        </ul>
-      </div>
-    </div>
-
-  </div></div>
-
-  <!-- Watermark Panel -->
-  <div class="watermark-panel">
-    <div class="watermark-toggle" onclick="toggleWatermarks()">
-      <span class="chevron" id="wm-chevron">&#9650;</span>
-      Watermark &amp; Cursor Reference
-    </div>
-    <div class="watermark-content" id="wm-content">
-      <table class="wm-table">
-        <thead><tr><th>Table</th><th>Column(s)</th><th>Purpose</th></tr></thead>
-        <tbody>
-          <tr><td>sync_cursors</td><td>updated_at_cursor + tie_breaker_id</td><td>Incremental fetch: "last entity we saw" per project+type</td></tr>
-          <tr><td>issues</td><td>discussions_synced_for_updated_at</td><td>Per-issue discussion watermark</td></tr>
-          <tr><td>issues</td><td>resource_events_synced_for_updated_at</td><td>Per-issue resource event watermark</td></tr>
-          <tr><td>merge_requests</td><td>discussions_synced_for_updated_at</td><td>Per-MR discussion watermark</td></tr>
-          <tr><td>merge_requests</td><td>resource_events_synced_for_updated_at</td><td>Per-MR resource event watermark</td></tr>
-          <tr><td>dirty_sources</td><td>queued_at + next_attempt_at</td><td>Document regeneration queue with backoff</td></tr>
-          <tr><td>embedding_metadata</td><td>document_hash + chunk_max_bytes + model + dims</td><td>Embedding staleness detection</td></tr>
-          <tr><td>pending_dependent_fetches</td><td>locked_at + next_retry_at + attempts</td><td>Resource event job queue with backoff</td></tr>
-        </tbody>
-      </table>
-    </div>
-  </div>
-</div>
-
-<!-- Detail Panel -->
-<div class="detail-panel" id="detail-panel">
-  <div class="detail-header">
-    <h2 id="detail-title">Node Details</h2>
-    <button class="detail-close" onclick="closeDetail()">&times;</button>
-  </div>
-  <div class="detail-body" id="detail-body"></div>
-</div>
-
-<script>
-const viewTitles = {
-  overview: 'Full Sync Overview', issues: 'Issue Ingestion Flow',
-  mrs: 'Merge Request Ingestion Flow', docs: 'Document Generation Flow',
-  embed: 'Embedding Generation Flow',
-};
-const viewBadges = {
-  overview: '4 stages', issues: '3 phases', mrs: '3 phases',
-  docs: '2 phases', embed: '3 phases',
-};
-
-function switchView(view) {
-  document.querySelectorAll('.flow-container').forEach(function(el) { el.classList.remove('active'); });
-  document.getElementById('view-' + view).classList.add('active');
-  document.querySelectorAll('.nav-item').forEach(function(el) {
-    el.classList.toggle('active', el.dataset.view === view);
-  });
-  document.getElementById('view-title').textContent = viewTitles[view];
-  document.getElementById('view-badge').textContent = viewBadges[view];
-  closeDetail();
-}
-
-function toggleWatermarks() {
-  document.getElementById('wm-content').classList.toggle('open');
-  document.getElementById('wm-chevron').classList.toggle('open');
-}
-
-var details = {
-  'issue-api-call': { title: 'GitLab API: Paginate Issues', type: 'api', file: 'src/ingestion/issues.rs:51-140', desc: 'Streams issues from the GitLab API using cursor-based incremental sync. The API is called with updated_after set to the last known cursor minus a configurable rewind window (to handle clock skew between GitLab and the local database).', sql: 'GET /api/v4/projects/{id}/issues\n  ?updated_after={cursor - rewind_seconds}\n  &order_by=updated_at&sort=asc\n  &per_page=100' },
-  'issue-cursor-filter': { title: 'Cursor Filter (Dedup)', type: 'decision', file: 'src/ingestion/issues.rs:95-110', desc: 'Because of the cursor rewind, some issues will be re-fetched that we already have. The cursor filter skips these using a two-part comparison: primary on updated_at timestamp, with gitlab_id as a tie-breaker when timestamps are equal.', sql: '// Pseudocode:\nif issue.updated_at > cursor_ts:\n    ACCEPT  // newer than cursor\nelif issue.updated_at == cursor_ts\n     AND issue.gitlab_id > tie_breaker_id:\n    ACCEPT  // same timestamp, higher ID\nelse:\n    SKIP    // already processed' },
-  'issue-transform': { title: 'Transform Issue', type: 'transform', file: 'src/gitlab/transformers/issue.rs', desc: 'Maps the GitLab API response shape to the local database row shape. Parses ISO 8601 timestamps to milliseconds-since-epoch, extracts label names, assignee usernames, milestone info, and due dates.' },
-  'issue-transaction': { title: 'Issue Write Transaction', type: 'db', file: 'src/ingestion/issues.rs:190-220', desc: 'All operations for a single issue are wrapped in one SQLite transaction for atomicity. If any step fails, the entire issue write is rolled back.', sql: 'BEGIN;\n-- 1. Store raw JSON payload (compressed, deduped)\nINSERT INTO payloads ...;\n-- 2. Upsert issue row\nINSERT INTO issues ... ON CONFLICT(gitlab_id)\n  DO UPDATE SET ...;\n-- 3. Mark dirty for document regen\nINSERT INTO dirty_sources ...;\n-- 4. Relink labels\nDELETE FROM issue_labels WHERE issue_id = ?;\nINSERT INTO labels ... ON CONFLICT DO UPDATE;\nINSERT INTO issue_labels ...;\n-- 5. Relink assignees\nDELETE FROM issue_assignees WHERE issue_id = ?;\nINSERT INTO issue_assignees ...;\nCOMMIT;' },
-  'issue-cursor-update': { title: 'Update Sync Cursor', type: 'db', file: 'src/ingestion/issues.rs:130-140', desc: 'The sync cursor is updated every 100 issues (for crash recovery) and once at the end of the stream. If the process crashes mid-sync, it resumes from at most 100 issues back.', sql: 'INSERT INTO sync_cursors\n  (project_id, resource_type,\n   updated_at_cursor, tie_breaker_id)\nVALUES (?1, \'issues\', ?2, ?3)\nON CONFLICT(project_id, resource_type)\n  DO UPDATE SET\n    updated_at_cursor = ?2,\n    tie_breaker_id = ?3;' },
-  'issue-disc-query': { title: 'Query Issues Needing Discussion Sync', type: 'db', file: 'src/ingestion/issues.rs:450-471', desc: 'Finds all issues in this project whose updated_at timestamp exceeds their per-row discussion watermark. Issues that have not changed since their last discussion sync are skipped entirely.', sql: 'SELECT id, iid, updated_at\nFROM issues\nWHERE project_id = ?1\n  AND updated_at > COALESCE(\n    discussions_synced_for_updated_at, 0\n  );' },
-  'issue-disc-fetch': { title: 'Paginate Issue Discussions', type: 'api', file: 'src/ingestion/discussions.rs:73-205', desc: 'Discussions are fetched sequentially per issue (rusqlite Connection is not Send, so async parallelism is not possible here). Each issue\'s discussions are streamed page by page from the GitLab API.', sql: 'GET /api/v4/projects/{id}/issues/{iid}\n    /discussions?per_page=100' },
-  'issue-disc-transform': { title: 'Transform Discussion + Notes', type: 'transform', file: 'src/gitlab/transformers/discussion.rs', desc: 'Transforms the raw GitLab discussion payload into normalized rows. Sets NoteableRef::Issue. Computes resolvable/resolved status, first_note_at/last_note_at timestamps, and per-note position indices.' },
-  'issue-disc-write': { title: 'Write Discussion (Full Refresh)', type: 'db', file: 'src/ingestion/discussions.rs:140-180', desc: 'Issue discussions use a full-refresh pattern: all existing notes for a discussion are deleted and re-inserted. This is simpler than upsert but means partial failures lose the previous state.', sql: 'BEGIN;\nINSERT INTO payloads ...;\nINSERT INTO discussions ... ON CONFLICT DO UPDATE;\nINSERT INTO dirty_sources ...;\n-- Full refresh: delete all then re-insert\nDELETE FROM notes WHERE discussion_id = ?;\nINSERT INTO notes VALUES (...);\nCOMMIT;' },
-  'issue-disc-stale': { title: 'Remove Stale Discussions', type: 'db', file: 'src/ingestion/discussions.rs:185-195', desc: 'After successfully fetching ALL discussion pages for an issue, any discussions in the DB that were not seen in this fetch are deleted. Uses a temp table for >500 IDs to avoid SQLite\'s 999-variable limit.', sql: '-- For small sets (<= 500):\nDELETE FROM discussions\nWHERE issue_id = ?\n  AND gitlab_id NOT IN (...);\n\n-- For large sets (> 500):\nCREATE TEMP TABLE seen_ids(id TEXT);\nINSERT INTO seen_ids ...;\nDELETE FROM discussions\nWHERE issue_id = ?\n  AND gitlab_id NOT IN\n    (SELECT id FROM seen_ids);\nDROP TABLE seen_ids;' },
-  'issue-disc-watermark': { title: 'Advance Discussion Watermark', type: 'db', file: 'src/ingestion/discussions.rs:198', desc: 'Sets the per-issue watermark to the issue\'s current updated_at, signaling that discussions are now synced for this version of the issue.', sql: 'UPDATE issues\nSET discussions_synced_for_updated_at\n    = updated_at\nWHERE id = ?;' },
-  'issue-disc-fail': { title: 'Pagination Error Handling', type: 'error', file: 'src/ingestion/discussions.rs:182', desc: 'If pagination fails mid-stream, stale discussion removal is skipped (we don\'t know the full set) and the watermark is NOT advanced. The issue will be retried on the next sync run.' },
-  're-cleanup': { title: 'Cleanup Obsolete Jobs', type: 'queue', file: 'src/ingestion/orchestrator.rs:490-520', desc: 'Before enqueuing new jobs, delete any existing jobs for entities whose watermark is already current. These are leftover from a previous run.', sql: 'DELETE FROM pending_dependent_fetches\nWHERE project_id = ?\n  AND job_type = \'resource_events\'\n  AND entity_local_id IN (\n    SELECT id FROM issues\n    WHERE project_id = ?\n      AND updated_at <= COALESCE(\n        resource_events_synced_for_updated_at, 0\n      )\n  );' },
-  're-enqueue': { title: 'Enqueue Resource Event Jobs', type: 'queue', file: 'src/ingestion/orchestrator.rs:525-555', desc: 'For each entity whose updated_at exceeds its resource event watermark, insert a job into the queue. Uses INSERT OR IGNORE for idempotency.', sql: 'INSERT OR IGNORE INTO pending_dependent_fetches\n  (project_id, entity_type, entity_iid,\n   entity_local_id, job_type, enqueued_at)\nSELECT project_id, \'issue\', iid, id,\n       \'resource_events\', ?now\nFROM issues\nWHERE project_id = ?\n  AND updated_at > COALESCE(\n    resource_events_synced_for_updated_at, 0\n  );' },
-  're-claim': { title: 'Claim Jobs (Atomic Lock)', type: 'queue', file: 'src/core/dependent_queue.rs', desc: 'Atomically claims a batch of unlocked jobs whose backoff period has elapsed. Uses UPDATE...RETURNING for lock acquisition in a single statement.', sql: 'UPDATE pending_dependent_fetches\nSET locked_at = ?now\nWHERE rowid IN (\n  SELECT rowid\n  FROM pending_dependent_fetches\n  WHERE project_id = ?\n    AND job_type = \'resource_events\'\n    AND locked_at IS NULL\n    AND (next_retry_at IS NULL\n         OR next_retry_at <= ?now)\n  ORDER BY enqueued_at ASC\n  LIMIT ?batch_size\n)\nRETURNING *;' },
-  're-fetch': { title: 'Fetch 3 Event Types Concurrently', type: 'api', file: 'src/gitlab/client.rs:732-771', desc: 'Uses tokio::join! (not try_join!) to fetch state, label, and milestone events concurrently. Permanent errors (404, 403) are coalesced to empty vecs via coalesce_inaccessible().', sql: 'tokio::join!(\n  fetch_issue_state_events(proj, iid),\n  fetch_issue_label_events(proj, iid),\n  fetch_issue_milestone_events(proj, iid),\n)\n// Each: coalesce_inaccessible()\n// 404/403 -> Ok(vec![])\n// Other errors -> propagated' },
-  're-store': { title: 'Store Resource Events', type: 'db', file: 'src/ingestion/orchestrator.rs:620-640', desc: 'All three event types are upserted in a single transaction.', sql: 'BEGIN;\nINSERT INTO resource_state_events ...\n  ON CONFLICT DO UPDATE;\nINSERT INTO resource_label_events ...\n  ON CONFLICT DO UPDATE;\nINSERT INTO resource_milestone_events ...\n  ON CONFLICT DO UPDATE;\nCOMMIT;' },
-  're-complete': { title: 'Complete Job + Advance Watermark', type: 'db', file: 'src/ingestion/orchestrator.rs:645-660', desc: 'After successful storage, the job row is deleted and the entity\'s watermark is advanced.', sql: 'DELETE FROM pending_dependent_fetches\n  WHERE rowid = ?;\n\nUPDATE issues\nSET resource_events_synced_for_updated_at\n    = updated_at\nWHERE id = ?;' },
-  're-permanent': { title: 'Permanent Error: Skip Entity', type: 'error', file: 'src/ingestion/orchestrator.rs:665-680', desc: '404 (endpoint doesn\'t exist) and 403 (insufficient permissions) are permanent. The job is completed and watermark advanced, so this entity is permanently skipped until next updated on GitLab.' },
-  're-transient': { title: 'Transient Error: Exponential Backoff', type: 'error', file: 'src/core/dependent_queue.rs', desc: 'Network errors, 500s, rate limits get exponential backoff. Formula: 30s * 2^(attempts-1), capped at 480s (8 minutes).', sql: 'UPDATE pending_dependent_fetches\nSET locked_at = NULL,\n    attempts = attempts + 1,\n    next_retry_at = ?now\n      + 30000 * pow(2, attempts),\n    -- capped at 480000ms (8 min)\n    last_error = ?error_msg\nWHERE rowid = ?;' },
-  'mr-api-call': { title: 'GitLab API: Fetch MR Pages', type: 'api', file: 'src/ingestion/merge_requests.rs:51-151', desc: 'Unlike issues which stream, MRs use explicit page-based pagination via fetch_merge_requests_page(). Each page returns items plus a next_page indicator.', sql: 'GET /api/v4/projects/{id}/merge_requests\n  ?updated_after={cursor - rewind}\n  &order_by=updated_at&sort=asc\n  &per_page=100&page={n}' },
-  'mr-cursor-filter': { title: 'Cursor Filter', type: 'decision', file: 'src/ingestion/merge_requests.rs:90-105', desc: 'Identical logic to issues: timestamp comparison with gitlab_id tie-breaker.' },
-  'mr-transform': { title: 'Transform Merge Request', type: 'transform', file: 'src/gitlab/transformers/mr.rs', desc: 'Maps GitLab MR response to local row. Handles draft detection (prefers draft field, falls back to work_in_progress), detailed_merge_status, merge_user resolution, and reviewer extraction.' },
-  'mr-transaction': { title: 'MR Write Transaction', type: 'db', file: 'src/ingestion/merge_requests.rs:170-210', desc: 'Same pattern as issues but with THREE junction tables: labels, assignees, AND reviewers.', sql: 'BEGIN;\nINSERT INTO payloads ...;\nINSERT INTO merge_requests ...\n  ON CONFLICT DO UPDATE;\nINSERT INTO dirty_sources ...;\n-- 3 junction tables:\nDELETE FROM mr_labels WHERE mr_id = ?;\nINSERT INTO mr_labels ...;\nDELETE FROM mr_assignees WHERE mr_id = ?;\nINSERT INTO mr_assignees ...;\nDELETE FROM mr_reviewers WHERE mr_id = ?;\nINSERT INTO mr_reviewers ...;\nCOMMIT;' },
-  'mr-cursor-update': { title: 'Update Cursor Per Page', type: 'db', file: 'src/ingestion/merge_requests.rs:140-150', desc: 'Unlike issues (every 100 items), MR cursor is updated at each page boundary for better crash recovery.' },
-  'mr-disc-query': { title: 'Query MRs Needing Discussion Sync', type: 'db', file: 'src/ingestion/merge_requests.rs:430-451', desc: 'Same watermark pattern as issues. Runs AFTER MR ingestion to avoid memory growth.', sql: 'SELECT id, iid, updated_at\nFROM merge_requests\nWHERE project_id = ?1\n  AND updated_at > COALESCE(\n    discussions_synced_for_updated_at, 0\n  );' },
-  'mr-disc-batch': { title: 'Batch by Concurrency', type: 'decision', file: 'src/ingestion/orchestrator.rs:420-465', desc: 'MRs are processed in batches sized by dependent_concurrency. Each batch first prefetches all discussions in parallel, then writes serially.' },
-  'mr-disc-prefetch': { title: 'Parallel Prefetch', type: 'api', file: 'src/ingestion/mr_discussions.rs:66-120', desc: 'All MRs in the batch have their discussions fetched concurrently via join_all(). Each MR\'s discussions are fetched in one call, transformed in memory, and returned as PrefetchedMrDiscussions.', sql: '// For each MR in batch, concurrently:\nGET /api/v4/projects/{id}/merge_requests\n    /{iid}/discussions?per_page=100\n\n// All fetched + transformed in memory\n// before any DB writes happen' },
-  'mr-disc-transform': { title: 'Transform MR Discussions', type: 'transform', file: 'src/ingestion/mr_discussions.rs:125-160', desc: 'Uses transform_mr_discussion() which additionally handles DiffNote positions (file paths, line ranges, SHA triplets).' },
-  'mr-disc-write': { title: 'Serial Write (Upsert Pattern)', type: 'db', file: 'src/ingestion/mr_discussions.rs:165-220', desc: 'Unlike issue discussions (delete-all + re-insert), MR discussions use INSERT...ON CONFLICT DO UPDATE for both discussions and notes. Safer for partial failures.', sql: 'BEGIN;\nINSERT INTO payloads ...;\nINSERT INTO discussions ...\n  ON CONFLICT DO UPDATE\n  SET ..., last_seen_at = ?run_ts;\nINSERT INTO dirty_sources ...;\n-- Upsert notes (not delete+insert):\nINSERT INTO notes ...\n  ON CONFLICT DO UPDATE\n  SET ..., last_seen_at = ?run_ts;\nCOMMIT;' },
-  'mr-disc-sweep': { title: 'Sweep Stale (last_seen_at)', type: 'db', file: 'src/ingestion/mr_discussions.rs:225-245', desc: 'Staleness detected via last_seen_at timestamps. Both discussions AND notes are swept independently.', sql: '-- Sweep stale discussions:\nDELETE FROM discussions\nWHERE merge_request_id = ?\n  AND last_seen_at < ?run_seen_at;\n\n-- Sweep stale notes:\nDELETE FROM notes\nWHERE discussion_id IN (\n  SELECT id FROM discussions\n  WHERE merge_request_id = ?\n) AND last_seen_at < ?run_seen_at;' },
-  'mr-disc-watermark': { title: 'Advance MR Discussion Watermark', type: 'db', file: 'src/ingestion/mr_discussions.rs:248', desc: 'Same as issues: stamps the per-MR watermark.', sql: 'UPDATE merge_requests\nSET discussions_synced_for_updated_at\n    = updated_at\nWHERE id = ?;' },
-  'mr-disc-fail': { title: 'Failure: Sync Health Tracking', type: 'error', file: 'src/ingestion/mr_discussions.rs:252-260', desc: 'Unlike issues, MR discussion failures are tracked: discussions_sync_attempts is incremented and discussions_sync_last_error is recorded. Watermark is NOT advanced.' },
-  'doc-trigger': { title: 'mark_dirty_tx()', type: 'api', file: 'src/ingestion/dirty_tracker.rs', desc: 'Called during every upsert in ingestion. Inserts into dirty_sources, or on conflict resets backoff. This bridges ingestion (stages 1-2) and document generation (stage 3).', sql: 'INSERT INTO dirty_sources\n  (source_type, source_id, queued_at)\nVALUES (?1, ?2, ?now)\nON CONFLICT(source_type, source_id)\n  DO UPDATE SET\n    queued_at = ?now,\n    attempt_count = 0,\n    next_attempt_at = NULL,\n    last_error = NULL;' },
-  'doc-dirty-table': { title: 'dirty_sources Table', type: 'db', file: 'src/ingestion/dirty_tracker.rs', desc: 'Persistent queue of entities needing document regeneration. Supports exponential backoff for failed extractions.' },
-  'doc-drain': { title: 'Get Dirty Sources (Batched)', type: 'db', file: 'src/documents/regenerator.rs:35-45', desc: 'Fetches up to 500 dirty entries per batch, prioritizing fewer attempts. Respects exponential backoff.', sql: 'SELECT source_type, source_id\nFROM dirty_sources\nWHERE next_attempt_at IS NULL\n   OR next_attempt_at <= ?now\nORDER BY attempt_count ASC,\n         queued_at ASC\nLIMIT 500;' },
-  'doc-dispatch': { title: 'Dispatch by Source Type', type: 'decision', file: 'src/documents/extractor.rs', desc: 'Routes to the appropriate extraction function: "issue" -> extract_issue_document(), "merge_request" -> extract_mr_document(), "discussion" -> extract_discussion_document().' },
-  'doc-deleted-check': { title: 'Source Exists Check', type: 'decision', file: 'src/documents/regenerator.rs:48-55', desc: 'If the source entity was deleted, the extractor returns None. The regenerator deletes the document row. FK cascades clean up FTS and embeddings.' },
-  'doc-extract': { title: 'Extract Structured Content', type: 'transform', file: 'src/documents/extractor.rs', desc: 'Builds searchable text:\n[[Issue]] #42: Title\nProject: group/repo\nURL: ...\nLabels: [bug, urgent]\nState: opened\n\n--- Description ---\n...\n\nDiscussions inherit parent labels and extract DiffNote file paths.' },
-  'doc-triple-hash': { title: 'Triple-Hash Write Optimization', type: 'decision', file: 'src/documents/regenerator.rs:55-62', desc: 'Checks content_hash + labels_hash + paths_hash against existing document. If ALL three match, write is completely skipped. Critical for --full mode performance.' },
-  'doc-write': { title: 'SAVEPOINT Atomic Write', type: 'db', file: 'src/documents/regenerator.rs:58-65', desc: 'Document, labels, and paths written inside a SAVEPOINT for atomicity.', sql: 'SAVEPOINT doc_write;\nINSERT INTO documents ...\n  ON CONFLICT DO UPDATE SET\n    content = ?, content_hash = ?,\n    labels_hash = ?, paths_hash = ?;\nDELETE FROM document_labels\n  WHERE doc_id = ?;\nINSERT INTO document_labels ...;\nDELETE FROM document_paths\n  WHERE doc_id = ?;\nINSERT INTO document_paths ...;\nRELEASE doc_write;' },
-  'doc-clear': { title: 'Clear Dirty Entry', type: 'db', file: 'src/ingestion/dirty_tracker.rs', desc: 'On success, the dirty_sources row is deleted.', sql: 'DELETE FROM dirty_sources\nWHERE source_type = ?\n  AND source_id = ?;' },
-  'doc-error': { title: 'Record Error + Backoff', type: 'error', file: 'src/ingestion/dirty_tracker.rs', desc: 'Increments attempt_count, sets next_attempt_at with exponential backoff. Entry stays for retry.', sql: 'UPDATE dirty_sources\nSET attempt_count = attempt_count + 1,\n    next_attempt_at = ?now\n      + compute_backoff(attempt_count),\n    last_error = ?error_msg\nWHERE source_type = ?\n  AND source_id = ?;' },
-  'doc-skip': { title: 'Skip Write (Hash Match)', type: 'db', file: 'src/documents/regenerator.rs:57', desc: 'When all three hashes match, the document has not actually changed. Common when updated_at changes but content/labels/paths remain the same. Dirty entry is cleared without writes.' },
-  'embed-detect': { title: 'Change Detection', type: 'decision', file: 'src/embedding/change_detector.rs', desc: 'Document needs re-embedding if: (1) No embedding_metadata row, (2) document_hash mismatch, (3) Config drift in chunk_max_bytes, model, or dims.', sql: 'SELECT d.id, d.content, d.content_hash\nFROM documents d\nLEFT JOIN embedding_metadata em\n  ON em.document_id = d.id\nWHERE em.document_id IS NULL\n   OR em.document_hash != d.content_hash\n   OR em.chunk_max_bytes != ?config\n   OR em.model != ?model\n   OR em.dims != ?dims;' },
-  'embed-paginate': { title: 'Keyset Pagination', type: 'db', file: 'src/embedding/pipeline.rs:80-100', desc: '500 documents per page using keyset pagination. Each page wrapped in a SAVEPOINT.' },
-  'embed-chunk': { title: 'Split Into Chunks', type: 'transform', file: 'src/embedding/chunking.rs', desc: 'Splits content at paragraph boundaries with configurable max size and overlap.' },
-  'embed-overflow': { title: 'Overflow Guard', type: 'decision', file: 'src/embedding/pipeline.rs:110-120', desc: 'If a document produces too many chunks, it is skipped to prevent rowid collisions in the encoded chunk ID scheme.' },
-  'embed-work': { title: 'Build ChunkWork Items', type: 'transform', file: 'src/embedding/pipeline.rs:125-140', desc: 'Each chunk gets an encoded ID (document_id * 1000000 + chunk_index) for the sqlite-vec primary key.' },
-  'embed-batch': { title: 'Batch Embed via Ollama', type: 'api', file: 'src/embedding/pipeline.rs:150-200', desc: 'Sends 32 chunks per Ollama API call. Model default: nomic-embed-text.', sql: 'POST http://localhost:11434/api/embed\n{\n  "model": "nomic-embed-text",\n  "input": ["chunk1...", "chunk2...", ...]\n}' },
-  'embed-store': { title: 'Store Vectors', type: 'db', file: 'src/embedding/pipeline.rs:205-230', desc: 'Vectors stored in sqlite-vec virtual table. Metadata in embedding_metadata. Old embeddings cleared on first successful chunk.', sql: '-- Clear old embeddings:\nDELETE FROM embeddings\n  WHERE rowid / 1000000 = ?doc_id;\n\n-- Insert new vector:\nINSERT INTO embeddings(rowid, embedding)\nVALUES (?chunk_id, ?vector_blob);\n\n-- Update metadata:\nINSERT INTO embedding_metadata ...\n  ON CONFLICT DO UPDATE SET\n    document_hash = ?,\n    chunk_max_bytes = ?,\n    model = ?, dims = ?;' },
-  'embed-success': { title: 'SAVEPOINT Commit', type: 'db', file: 'src/embedding/pipeline.rs:240-250', desc: 'Each page of 500 documents wrapped in a SAVEPOINT. Completed pages survive crashes.' },
-  'embed-ctx-error': { title: 'Context-Length Retry', type: 'error', file: 'src/embedding/pipeline.rs:260-280', desc: 'If Ollama returns context-length error for a batch, each chunk is retried individually to isolate the oversized one.' },
-  'embed-other-error': { title: 'Record Error for Retry', type: 'error', file: 'src/embedding/pipeline.rs:285-295', desc: 'Network/model errors recorded in embedding_metadata. Document detected as pending again on next run.' },
-};
-
-function escapeHtml(str) {
-  var div = document.createElement('div');
-  div.appendChild(document.createTextNode(str));
-  return div.textContent;
-}
-
-function buildDetailContent(d) {
-  var container = document.createDocumentFragment();
-
-  // Tags section
-  var tagSection = document.createElement('div');
-  tagSection.className = 'detail-section';
-  var typeTag = document.createElement('span');
-  typeTag.className = 'detail-tag type-' + d.type;
-  typeTag.textContent = d.type.toUpperCase();
-  tagSection.appendChild(typeTag);
-  if (d.file) {
-    var fileTag = document.createElement('span');
-    fileTag.className = 'detail-tag file';
-    fileTag.textContent = d.file;
-    tagSection.appendChild(fileTag);
-  }
-  container.appendChild(tagSection);
-
-  // Description
-  var descSection = document.createElement('div');
-  descSection.className = 'detail-section';
-  var descH3 = document.createElement('h3');
-  descH3.textContent = 'Description';
-  descSection.appendChild(descH3);
-  var descP = document.createElement('p');
-  descP.textContent = d.desc;
-  descSection.appendChild(descP);
-  container.appendChild(descSection);
-
-  // SQL
-  if (d.sql) {
-    var sqlSection = document.createElement('div');
-    sqlSection.className = 'detail-section';
-    var sqlH3 = document.createElement('h3');
-    sqlH3.textContent = 'Key Query / Code';
-    sqlSection.appendChild(sqlH3);
-    var sqlBlock = document.createElement('div');
-    sqlBlock.className = 'sql-block';
-    sqlBlock.textContent = d.sql;
-    sqlSection.appendChild(sqlBlock);
-    container.appendChild(sqlSection);
-  }
-
-  return container;
-}
-
-function showDetail(key) {
-  var d = details[key];
-  if (!d) return;
-  var panel = document.getElementById('detail-panel');
-  document.getElementById('detail-title').textContent = d.title;
-  var body = document.getElementById('detail-body');
-  while (body.firstChild) body.removeChild(body.firstChild);
-  body.appendChild(buildDetailContent(d));
-  document.querySelectorAll('.node.selected').forEach(function(n) { n.classList.remove('selected'); });
-  var clicked = document.querySelector('[data-detail="' + key + '"]');
-  if (clicked) clicked.classList.add('selected');
-  panel.classList.add('open');
-}
-
-function closeDetail() {
-  document.getElementById('detail-panel').classList.remove('open');
-  document.querySelectorAll('.node.selected').forEach(function(n) { n.classList.remove('selected'); });
-}
-
-document.addEventListener('click', function(e) {
-  var node = e.target.closest('.node[data-detail]');
-  if (node) { showDetail(node.dataset.detail); return; }
-  if (!e.target.closest('.detail-panel') && !e.target.closest('.node')) closeDetail();
-});
-document.addEventListener('keydown', function(e) { if (e.key === 'Escape') closeDetail(); });
-</script>
-</body>
-</html>

plans/asupersync-migration.md

@@ -0,0 +1,867 @@
+# Plan: Replace Tokio + Reqwest with Asupersync
+
+**Date:** 2026-03-06
+**Status:** Draft
+**Decisions:** Adapter layer (yes), timeouts in adapter, deep Cx threading, reference doc only
+
+---
+
+## Context
+
+Gitlore uses tokio as its async runtime and reqwest as its HTTP client. Both work, but:
+
+- Ctrl+C during `join_all` silently drops in-flight HTTP requests with no cleanup
+- `ShutdownSignal` is a hand-rolled `AtomicBool` with no structured cancellation
+- No deterministic testing for concurrent ingestion patterns
+- tokio provides no structured concurrency guarantees
+
+Asupersync is a cancel-correct async runtime with region-owned tasks, obligation tracking, and deterministic lab testing. Replacing tokio+reqwest gives us structured shutdown, cancel-correct ingestion, and testable concurrency.
+
+**Trade-offs accepted:**
+- Nightly Rust required (asupersync dependency)
+- Pre-1.0 runtime dependency (mitigated by adapter layer + version pinning)
+- Deeper function signature changes for Cx threading
+
+### Why not tokio CancellationToken + JoinSet?
+
+The core problems (Ctrl+C drops requests, no structured cancellation) *can* be fixed without replacing the runtime. Tokio's `CancellationToken` + `JoinSet` + explicit task tracking gives structured cancellation for fan-out patterns. This was considered and rejected for two reasons:
+
+1. **Obligation tracking is the real win.** CancellationToken/JoinSet fix the "cancel cleanly" problem but don't give us obligation tracking (compile-time proof that all spawned work is awaited) or deterministic lab testing. These are the features that prevent *future* concurrency bugs, not just the current Ctrl+C issue.
+2. **Separation of concerns.** Fixing Ctrl+C with tokio primitives first, then migrating the runtime second, doubles the migration effort (rewrite fan-out twice). Since we have no users and no backwards compatibility concerns, a single clean migration is lower total cost.
+
+If asupersync proves unviable (nightly breakage, API instability), the fallback is exactly this: tokio + CancellationToken + JoinSet.
+
+---
+
+## Current Tokio Usage Inventory
+
+### Production code (must migrate)
+
+| Location | API | Purpose |
+|----------|-----|---------|
+| `main.rs:53` | `#[tokio::main]` | Runtime entrypoint |
+| `main.rs` (4 sites) | `tokio::spawn` + `tokio::signal::ctrl_c` | Ctrl+C signal handlers |
+| `gitlab/client.rs:9` | `tokio::sync::Mutex` | Rate limiter lock |
+| `gitlab/client.rs:10` | `tokio::time::sleep` | Rate limiter backoff |
+| `gitlab/client.rs:729,736` | `tokio::join!` | Parallel pagination |
+
+### Production code (reqwest -- must replace)
+
+| Location | Usage |
+|----------|-------|
+| `gitlab/client.rs` | REST API: GET with headers/query, response status/headers/JSON, pagination via x-next-page and Link headers, retry on 429 |
+| `gitlab/graphql.rs` | GraphQL: POST with Bearer auth + JSON body, response JSON parsing |
+| `embedding/ollama.rs` | Ollama: GET health check, POST JSON embedding requests |
+
+### Test code (keep on tokio via dev-dep)
+
+| File | Tests | Uses wiremock? |
+|------|-------|----------------|
+| `gitlab/graphql_tests.rs` | 30 | Yes |
+| `gitlab/client_tests.rs` | 4 | Yes |
+| `embedding/pipeline_tests.rs` | 4 | Yes |
+| `ingestion/surgical_tests.rs` | 4 async | Yes |
+
+### Test code (switch to asupersync)
+
+| File | Tests | Why safe |
+|------|-------|----------|
+| `core/timeline_seed_tests.rs` | 13 | Pure CPU/SQLite, no HTTP, no tokio APIs |
+
+### Test code (already sync `#[test]` -- no changes)
+
+~35 test files across documents/, core/, embedding/, gitlab/transformers/, ingestion/, cli/commands/, tests/
+
+---
+
+## Phase 0: Preparation (no runtime change)
+
+Goal: Reduce tokio surface area before the swap. Each step is independently valuable.
+
+### 0a. Extract signal handler
+
+The 4 identical Ctrl+C handlers in `main.rs` (lines 1020, 2341, 2493, 2524) become one function in `core/shutdown.rs`:
+
+```rust
+pub fn install_ctrl_c_handler(signal: ShutdownSignal) {
+    tokio::spawn(async move {
+        let _ = tokio::signal::ctrl_c().await;
+        eprintln!("\nInterrupted, finishing current batch... (Ctrl+C again to force quit)");
+        signal.cancel();
+        let _ = tokio::signal::ctrl_c().await;
+        std::process::exit(130);
+    });
+}
+```
+
+4 spawn sites -> 1 function. The function body changes in Phase 3.
+
+### 0b. Replace tokio::sync::Mutex with std::sync::Mutex
+
+In `gitlab/client.rs`, the rate limiter lock guards a tiny sync critical section (check `Instant::now()`, compute delay). No async work inside the lock. `std::sync::Mutex` is correct and removes a tokio dependency:
+
+```rust
+// Before
+use tokio::sync::Mutex;
+let delay = self.rate_limiter.lock().await.check_delay();
+
+// After
+use std::sync::Mutex;
+let delay = self.rate_limiter.lock().expect("rate limiter poisoned").check_delay();
+```
+
+Note: `.expect()` over `.unwrap()` for clarity. Poisoning is near-impossible here (the critical section is a trivial `Instant::now()` check), but the explicit message aids debugging if it ever fires.
+
+**Contention constraint:** `std::sync::Mutex` blocks the executor thread while held. This is safe *only* because the critical section is a single `Instant::now()` comparison with no I/O. If the rate limiter ever grows to include async work (HTTP calls, DB queries), it must move back to an async-aware lock. Document this constraint with a comment at the lock site.
+
+### 0c. Replace tokio::join! with futures::join!
+
+In `gitlab/client.rs:729,736`. `futures::join!` is runtime-agnostic and already in deps.
+
+**After Phase 0, remaining tokio in production code:**
+- `#[tokio::main]` (1 site)
+- `tokio::spawn` + `tokio::signal::ctrl_c` (1 function)
+- `tokio::time::sleep` (1 import)
+
+---
+
+## Phase 0d: Error Type Migration (must precede adapter layer)
+
+The adapter layer (Phase 1) uses `GitLabNetworkError { detail: Option<String> }`, which requires this error type change before the adapter compiles. Placed here so Phases 1-3 compile as a unit.
+
+### `src/core/error.rs`
+
+```rust
+// Remove:
+#[error("HTTP error: {0}")]
+Http(#[from] reqwest::Error),
+
+// Change:
+#[error("Cannot connect to GitLab at {base_url}")]
+GitLabNetworkError {
+    base_url: String,
+    // Before: source: Option<reqwest::Error>
+    // After:
+    detail: Option<String>,
+},
+```
+
+The adapter layer stringifies HTTP client errors at the boundary so `LoreError` doesn't depend on any HTTP client's error types. This also means the existing reqwest call sites that construct `GitLabNetworkError` must be updated to pass `detail: Some(format!("{e:?}"))` instead of `source: Some(e)` -- but those sites are rewritten in Phase 2 anyway, so no extra work.
+
+**Note on error granularity:** Flattening all HTTP errors to `detail: Option<String>` loses the distinction between timeouts, TLS failures, DNS resolution failures, and connection resets. To preserve actionable error categories without coupling `LoreError` to any HTTP client, add a lightweight `NetworkErrorKind` enum:
+
+```rust
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum NetworkErrorKind {
+    Timeout,
+    ConnectionRefused,
+    DnsResolution,
+    Tls,
+    Other,
+}
+
+#[error("Cannot connect to GitLab at {base_url}")]
+GitLabNetworkError {
+    base_url: String,
+    kind: NetworkErrorKind,
+    detail: Option<String>,
+},
+```
+
+The adapter's `execute()` method classifies errors at the boundary:
+- Timeout from `asupersync::time::timeout` → `NetworkErrorKind::Timeout`
+- Transport errors from the HTTP client → classified by error type into the appropriate kind
+- Unknown errors → `NetworkErrorKind::Other`
+
+This keeps `LoreError` client-agnostic while preserving the ability to make retry decisions based on error *type* (e.g., retry on timeout but not on TLS). The adapter's `execute()` method is the single place where this mapping happens, so adding new kinds is localized.
+
+---
+
+## Phase 1: Build the HTTP Adapter Layer
+
+### Why
+
+Asupersync's `HttpClient` is lower-level than reqwest:
+- Headers: `Vec<(String, String)>` not typed `HeaderMap`/`HeaderValue`
+- Body: `Vec<u8>` not a builder with `.json()`
+- Status: raw `u16` not `StatusCode` enum
+- Response: body already buffered, no async `.json().await`
+- No per-request timeout
+
+Without an adapter, every call site becomes 5-6 lines of boilerplate. The adapter also isolates gitlore from asupersync's pre-1.0 HTTP API.
+
+### New file: `src/http.rs` (~100 LOC)
+
+```rust
+use asupersync::http::h1::{HttpClient, HttpClientConfig, PoolConfig};
+use asupersync::http::h1::types::Method;
+use asupersync::time::timeout;
+use serde::de::DeserializeOwned;
+use serde::Serialize;
+use std::time::Duration;
+
+use crate::core::error::{LoreError, Result};
+
+pub struct Client {
+    inner: HttpClient,
+    timeout: Duration,
+}
+
+pub struct Response {
+    pub status: u16,
+    pub reason: String,
+    pub headers: Vec<(String, String)>,
+    body: Vec<u8>,
+}
+
+impl Client {
+    pub fn with_timeout(timeout: Duration) -> Self {
+        Self {
+            inner: HttpClient::with_config(HttpClientConfig {
+                pool_config: PoolConfig::builder()
+                    .max_connections_per_host(6)
+                    .max_total_connections(100)
+                    .idle_timeout(Duration::from_secs(90))
+                    .build(),
+                ..Default::default()
+            }),
+            timeout,
+        }
+    }
+
+    pub async fn get(&self, url: &str, headers: &[(&str, &str)]) -> Result<Response> {
+        self.execute(Method::Get, url, headers, Vec::new()).await
+    }
+
+    pub async fn get_with_query(
+        &self,
+        url: &str,
+        params: &[(&str, String)],
+        headers: &[(&str, &str)],
+    ) -> Result<Response> {
+        let full_url = append_query_params(url, params);
+        self.execute(Method::Get, &full_url, headers, Vec::new()).await
+    }
+
+    pub async fn post_json<T: Serialize>(
+        &self,
+        url: &str,
+        headers: &[(&str, &str)],
+        body: &T,
+    ) -> Result<Response> {
+        let body_bytes = serde_json::to_vec(body)
+            .map_err(|e| LoreError::Other(format!("JSON serialization failed: {e}")))?;
+        let mut all_headers = headers.to_vec();
+        all_headers.push(("Content-Type", "application/json"));
+        self.execute(Method::Post, url, &all_headers, body_bytes).await
+    }
+
+    async fn execute(
+        &self,
+        method: Method,
+        url: &str,
+        headers: &[(&str, &str)],
+        body: Vec<u8>,
+    ) -> Result<Response> {
+        let header_tuples: Vec<(String, String)> = headers
+            .iter()
+            .map(|(k, v)| ((*k).to_owned(), (*v).to_owned()))
+            .collect();
+
+        let raw = timeout(self.timeout, self.inner.request(method, url, header_tuples, body))
+            .await
+            .map_err(|_| LoreError::GitLabNetworkError {
+                base_url: url.to_string(),
+                kind: NetworkErrorKind::Timeout,
+                detail: Some(format!("Request timed out after {:?}", self.timeout)),
+            })?
+            .map_err(|e| LoreError::GitLabNetworkError {
+                base_url: url.to_string(),
+                kind: classify_transport_error(&e),
+                detail: Some(format!("{e:?}")),
+            })?;
+
+        Ok(Response {
+            status: raw.status,
+            reason: raw.reason,
+            headers: raw.headers,
+            body: raw.body,
+        })
+    }
+}
+
+impl Response {
+    pub fn is_success(&self) -> bool {
+        (200..300).contains(&self.status)
+    }
+
+    pub fn json<T: DeserializeOwned>(&self) -> Result<T> {
+        serde_json::from_slice(&self.body)
+            .map_err(|e| LoreError::Other(format!("JSON parse error: {e}")))
+    }
+
+    pub fn text(self) -> Result<String> {
+        String::from_utf8(self.body)
+            .map_err(|e| LoreError::Other(format!("UTF-8 decode error: {e}")))
+    }
+
+    pub fn header(&self, name: &str) -> Option<&str> {
+        self.headers
+            .iter()
+            .find(|(k, _)| k.eq_ignore_ascii_case(name))
+            .map(|(_, v)| v.as_str())
+    }
+
+    /// Returns all values for a header name (case-insensitive).
+    /// Needed for multi-value headers like `Link` used in pagination.
+    pub fn headers_all(&self, name: &str) -> Vec<&str> {
+        self.headers
+            .iter()
+            .filter(|(k, _)| k.eq_ignore_ascii_case(name))
+            .map(|(_, v)| v.as_str())
+            .collect()
+    }
+}
+
+/// Appends query parameters to a URL.
+///
+/// Edge cases handled:
+/// - URLs with existing `?query` → appends with `&`
+/// - URLs with `#fragment` → inserts query before fragment
+/// - Empty params → returns URL unchanged
+/// - Repeated keys → preserved as-is (GitLab API uses repeated `labels[]`)
+fn append_query_params(url: &str, params: &[(&str, String)]) -> String {
+    if params.is_empty() {
+        return url.to_string();
+    }
+    let query: String = params
+        .iter()
+        .map(|(k, v)| format!("{}={}", urlencoding::encode(k), urlencoding::encode(v)))
+        .collect::<Vec<_>>()
+        .join("&");
+
+    // Preserve URL fragments: split on '#', insert query, rejoin
+    let (base, fragment) = match url.split_once('#') {
+        Some((b, f)) => (b, Some(f)),
+        None => (url, None),
+    };
+    let with_query = if base.contains('?') {
+        format!("{base}&{query}")
+    } else {
+        format!("{base}?{query}")
+    };
+    match fragment {
+        Some(f) => format!("{with_query}#{f}"),
+        None => with_query,
+    }
+}
+```
+
+### Response body size guard
+
+The adapter buffers entire response bodies in memory (`Vec<u8>`). A misconfigured endpoint or unexpected redirect to a large file could cause unbounded memory growth. Add a max response body size check in `execute()`:
+
+```rust
+const MAX_RESPONSE_BODY_BYTES: usize = 64 * 1024 * 1024; // 64 MiB — generous for JSON, catches runaways
+
+// In execute(), after receiving raw response:
+if raw.body.len() > MAX_RESPONSE_BODY_BYTES {
+    return Err(LoreError::Other(format!(
+        "Response body too large: {} bytes (max {})",
+        raw.body.len(),
+        MAX_RESPONSE_BODY_BYTES,
+    )));
+}
+```
+
+This is a safety net, not a tight constraint. GitLab JSON responses are typically < 1 MiB. Ollama embedding responses are < 100 KiB per batch. The 64 MiB limit catches runaways without interfering with normal operation.
+
+### Timeout behavior
+
+Every request is wrapped with `asupersync::time::timeout(self.timeout, ...)`. Default timeouts:
+- GitLab REST/GraphQL: 30s
+- Ollama: configurable (default 60s)
+- Ollama health check: 5s
+
+---
+
+## Phase 2: Migrate the 3 HTTP Modules
+
+### 2a. `gitlab/client.rs` (REST API)
+
+**Imports:**
+```rust
+// Remove
+use reqwest::header::{ACCEPT, HeaderMap, HeaderValue};
+use reqwest::{Client, Response, StatusCode};
+
+// Add
+use crate::http::{Client, Response};
+```
+
+**Client construction** (lines 68-96):
+```rust
+// Before: reqwest::Client::builder().default_headers(h).timeout(d).build()
+// After:
+let client = Client::with_timeout(Duration::from_secs(30));
+```
+
+**request() method** (lines 129-170):
+```rust
+// Before
+let response = self.client.get(&url)
+    .header("PRIVATE-TOKEN", &self.token)
+    .send().await
+    .map_err(|e| LoreError::GitLabNetworkError { ... })?;
+
+// After
+let response = self.client.get(&url, &[
+    ("PRIVATE-TOKEN", &self.token),
+    ("Accept", "application/json"),
+]).await?;
+```
+
+**request_with_headers() method** (lines 510-559):
+```rust
+// Before
+let response = self.client.get(&url)
+    .query(params)
+    .header("PRIVATE-TOKEN", &self.token)
+    .send().await?;
+let headers = response.headers().clone();
+
+// After
+let response = self.client.get_with_query(&url, params, &[
+    ("PRIVATE-TOKEN", &self.token),
+    ("Accept", "application/json"),
+]).await?;
+// headers already owned in response.headers
+```
+
+**handle_response()** (lines 182-219):
+```rust
+// Before: async fn (consumed body with .text().await)
+// After: sync fn (body already buffered in Response)
+fn handle_response<T: DeserializeOwned>(&self, response: Response, path: &str) -> Result<T> {
+    match response.status {
+        401 => Err(LoreError::GitLabAuthFailed),
+        404 => Err(LoreError::GitLabNotFound { resource: path.into() }),
+        429 => {
+            let retry_after = response.header("retry-after")
+                .and_then(|v| v.parse().ok())
+                .unwrap_or(60);
+            Err(LoreError::GitLabRateLimited { retry_after })
+        }
+        s if (200..300).contains(&s) => response.json::<T>(),
+        s => Err(LoreError::Other(format!("GitLab API error: {} {}", s, response.reason))),
+    }
+}
+```
+
+**Pagination** -- No structural changes. `async_stream::stream!` and header parsing stay the same. Only the response type changes:
+```rust
+// Before: headers.get("x-next-page").and_then(|v| v.to_str().ok())
+// After:  response.header("x-next-page")
+```
+
+**parse_link_header_next** -- Change signature from `(headers: &HeaderMap)` to `(headers: &[(String, String)])` and find by case-insensitive name.
+
+### 2b. `gitlab/graphql.rs`
+
+```rust
+// Before
+let response = self.http.post(&url)
+    .header("Authorization", format!("Bearer {}", self.token))
+    .header("Content-Type", "application/json")
+    .json(&body).send().await?;
+let json: Value = response.json().await?;
+
+// After
+let bearer = format!("Bearer {}", self.token);
+let response = self.http.post_json(&url, &[
+    ("Authorization", &bearer),
+], &body).await?;
+let json: Value = response.json()?;
+```
+
+Status matching changes from `response.status().as_u16()` to `response.status` (already u16).
+
+### 2c. `embedding/ollama.rs`
+
+```rust
+// Health check
+let response = self.client.get(&url, &[]).await?;
+let tags: TagsResponse = response.json()?;
+
+// Embed batch
+let response = self.client.post_json(&url, &[], &request).await?;
+if !response.is_success() {
+    let status = response.status; // capture before .text() consumes response
+    let body = response.text()?;
+    return Err(LoreError::EmbeddingFailed { document_id: 0, reason: format!("HTTP {status}: {body}") });
+}
+let embed_response: EmbedResponse = response.json()?;
+```
+
+**Standalone health check** (`check_ollama_health`): Currently creates a temporary `reqwest::Client`. Replace with temporary `crate::http::Client`:
+```rust
+pub async fn check_ollama_health(base_url: &str) -> bool {
+    let client = Client::with_timeout(Duration::from_secs(5));
+    let url = format!("{base_url}/api/tags");
+    client.get(&url, &[]).await.map_or(false, |r| r.is_success())
+}
+```
+
+---
+
+## Phase 3: Swap the Runtime + Deep Cx Threading
+
+### 3a. Cargo.toml
+
+```toml
+[dependencies]
+# Remove:
+# reqwest = { version = "0.12", features = ["json"] }
+# tokio = { version = "1", features = ["rt-multi-thread", "macros", "time", "signal"] }
+
+# Add:
+asupersync = { version = "0.2", features = ["tls", "tls-native-roots"] }
+
+# Keep unchanged:
+async-stream = "0.3"
+futures = { version = "0.3", default-features = false, features = ["alloc"] }
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+urlencoding = "2"
+
+[dev-dependencies]
+tempfile = "3"
+wiremock = "0.6"
+tokio = { version = "1", features = ["rt", "macros"] }
+```
+
+### 3b. rust-toolchain.toml
+
+```toml
+[toolchain]
+channel = "nightly-2026-03-01"  # Pin specific date to avoid surprise breakage
+```
+
+Update the date as needed when newer nightlies are verified. Never use bare `"nightly"` in production.
+
+### 3c. Entrypoint (`main.rs:53`)
+
+```rust
+// Before
+#[tokio::main]
+async fn main() -> Result<()> { ... }
+
+// After
+#[asupersync::main]
+async fn main(cx: &Cx) -> Outcome<()> { ... }
+```
+
+### 3d. Signal handler (`core/shutdown.rs`)
+
+```rust
+// After (Phase 0 extracted it; now rewrite for asupersync)
+pub async fn install_ctrl_c_handler(cx: &Cx, signal: ShutdownSignal) {
+    cx.spawn("ctrl-c-handler", async move |cx| {
+        cx.shutdown_signal().await;
+        eprintln!("\nInterrupted, finishing current batch... (Ctrl+C again to force quit)");
+        signal.cancel();
+        // Preserve hard-exit on second Ctrl+C (same behavior as Phase 0a)
+        cx.shutdown_signal().await;
+        std::process::exit(130);
+    });
+}
+```
+
+**Cleanup concern:** `std::process::exit(130)` on second Ctrl+C bypasses all drop guards, flush operations, and asupersync region cleanup. This is intentional (user demanded hard exit) but means any in-progress DB transaction will be abandoned mid-write. SQLite's journaling makes this safe (uncommitted transactions are rolled back on next open), but verify this holds for WAL mode if enabled. Consider logging a warning before exit so users understand incomplete operations may need re-sync.
+
+### 3e. Rate limiter sleep
+
+```rust
+// Before
+use tokio::time::sleep;
+
+// After
+use asupersync::time::sleep;
+```
+
+### 3f. Deep Cx threading
+
+Thread `Cx` from `main()` through command dispatch into the orchestrator and ingestion modules. This enables region-scoped cancellation for `join_all` batches.
+
+**Function signatures that need `cx: &Cx` added:**
+
+| Module | Functions |
+|--------|-----------|
+| `main.rs` | Command dispatch match arms for `sync`, `ingest`, `embed` |
+| `cli/commands/sync.rs` | `run_sync()` |
+| `cli/commands/ingest.rs` | `run_ingest_command()`, `run_ingest()` |
+| `cli/commands/embed.rs` | `run_embed()` |
+| `cli/commands/sync_surgical.rs` | `run_sync_surgical()` |
+| `ingestion/orchestrator.rs` | `ingest_issues()`, `ingest_merge_requests()`, `ingest_discussions()`, etc. |
+| `ingestion/surgical.rs` | `surgical_sync()` |
+| `embedding/pipeline.rs` | `embed_documents()`, `embed_batch_group()` |
+
+**Region wrapping for join_all batches** (orchestrator.rs):
+```rust
+// Before
+let prefetched_batch = join_all(prefetch_futures).await;
+
+// After -- cancel-correct region with result collection
+let (tx, rx) = std::sync::mpsc::channel();
+cx.region(|scope| async {
+    for future in prefetch_futures {
+        let tx = tx.clone();
+        scope.spawn(async move |_cx| {
+            let result = future.await;
+            let _ = tx.send(result);
+        });
+    }
+    drop(tx);
+}).await;
+let prefetched_batch: Vec<_> = rx.into_iter().collect();
+```
+
+**IMPORTANT: Semantic differences beyond ordering.** Replacing `join_all` with region-spawned tasks changes three behaviors:
+
+1. **Ordering:** `join_all` preserves input order — results\[i\] corresponds to futures\[i\]. The `std::sync::mpsc` channel pattern does NOT (results arrive in completion order). If downstream logic assumes positional alignment (e.g., zipping results with input items by index), this is a silent correctness bug. Options:
+   - Send `(index, result)` tuples through the channel and sort by index after collection.
+   - If `scope.spawn()` returns a `JoinHandle<T>`, collect handles in order and await them sequentially.
+
+2. **Error aggregation:** `join_all` runs all futures to completion even if some fail, collecting all results. Region-spawned tasks with a channel will also run all tasks, but if the region is cancelled mid-flight (e.g., Ctrl+C), some results are lost. Decide per call site: should partial results be processed, or should the entire batch be retried?
+
+3. **Backpressure:** `join_all` with N futures creates N concurrent tasks. Region-spawned tasks behave similarly, but if the region has concurrency limits, backpressure semantics change. Verify asupersync's region API does not impose implicit concurrency caps.
+
+4. **Late result loss on cancellation:** When a region is cancelled, tasks that have completed but whose results haven't been received yet may have already sent to the channel. However, tasks that are mid-flight will be dropped, and their results never sent. The channel receiver must drain whatever was sent, but the caller must treat a cancelled region's results as incomplete — never assume all N results arrived. Document per call site whether partial results are safe to process or whether the entire batch should be discarded on cancellation.
+
+Audit every `join_all` call site for all four assumptions before choosing the pattern.
+
+Note: The exact result-collection pattern depends on asupersync's region API. If `scope.spawn()` returns a `JoinHandle<T>`, prefer collecting handles and awaiting them (preserves ordering and simplifies error handling).
+
+This is the biggest payoff: if Ctrl+C fires during a prefetch batch, the region cancels all in-flight HTTP requests with bounded cleanup instead of silently dropping them.
+
+**Estimated signature changes:** ~15 functions gain a `cx: &Cx` parameter.
+
+**Phasing the Cx threading (risk reduction):** Rather than threading `cx` through all ~15 functions at once, split into two steps:
+
+- **Step 1:** Thread `cx` through the orchestration path only (`main.rs` dispatch → `run_sync`/`run_ingest` → orchestrator functions). This is where region-wrapping `join_all` batches happens — the actual cancellation payoff. Verify invariants pass.
+- **Step 2:** Widen to the command layer and embedding pipeline (`run_embed`, `embed_documents`, `embed_batch_group`, `sync_surgical`). These are lower-risk since they don't have the same fan-out patterns.
+
+This reduces the blast radius of Step 1 and provides an earlier validation checkpoint. If Step 1 surfaces problems, Step 2 hasn't been started yet.
+
+---
+
+## Phase 4: Test Migration
+
+### Keep on `#[tokio::test]` (wiremock tests -- 42 tests)
+
+No changes. `tokio` is in `[dev-dependencies]` with `features = ["rt", "macros"]`.
+
+**Coverage gap:** These tests validate protocol correctness (request format, response parsing, status code handling, pagination) through the adapter layer, but they do NOT exercise asupersync's runtime behavior (timeouts, connection pooling, cancellation). This is acceptable because:
+1. Protocol correctness is the higher-value test target — it catches most regressions
+2. Runtime-specific behavior is covered by the new cancellation integration tests (below)
+3. The adapter layer is thin enough that runtime differences are unlikely to affect request/response semantics
+
+**Adapter-layer test gap:** The 42 wiremock tests validate protocol correctness (request format, response parsing) but run on tokio, not asupersync. This means the adapter's actual behavior under the production runtime is untested by mocked-response tests. To close this gap, add 3-5 asupersync-native integration tests that exercise the adapter against a simple HTTP server (e.g., `hyper` or a raw TCP listener) rather than wiremock:
+
+1. **GET with headers + JSON response** — verify header passing and JSON deserialization through the adapter.
+2. **POST with JSON body** — verify Content-Type injection and body serialization.
+3. **429 + Retry-After** — verify the adapter surfaces rate-limit responses correctly.
+4. **Timeout** — verify the adapter's `asupersync::time::timeout` wrapper fires.
+5. **Large response rejection** — verify the body size guard triggers.
+
+These tests are cheap to write (~50 LOC each) and close the "works on tokio but does it work on asupersync?" gap that GPT 5.3 flagged.
+
+| File | Tests |
+|------|-------|
+| `gitlab/graphql_tests.rs` | 30 |
+| `gitlab/client_tests.rs` | 4 |
+| `embedding/pipeline_tests.rs` | 4 |
+| `ingestion/surgical_tests.rs` | 4 |
+
+### Switch to `#[asupersync::test]` (no wiremock -- 13 tests)
+
+| File | Tests |
+|------|-------|
+| `core/timeline_seed_tests.rs` | 13 |
+
+### Already `#[test]` (sync -- ~35 files)
+
+No changes needed.
+
+### New: Cancellation integration tests (asupersync-native)
+
+Wiremock tests on tokio validate protocol/serialization correctness but cannot test asupersync's cancellation and region semantics. Add asupersync-native integration tests for:
+
+1. **Ctrl+C during fan-out:** Simulate cancellation mid-batch in orchestrator. Verify all in-flight tasks are drained, no task leaks, no obligation leaks.
+2. **Region quiescence:** Verify that after a region completes (normal or cancelled), no background tasks remain running.
+3. **Transaction integrity under cancellation:** Cancel during an ingestion batch that has fetched data but not yet written to DB. Verify no partial data is committed.
+
+These tests use asupersync's deterministic lab runtime, which is one of the primary motivations for this migration.
+
+---
+
+## Phase 5: Verify and Harden
+
+### Verification checklist
+
+```bash
+cargo check --all-targets
+cargo clippy --all-targets -- -D warnings
+cargo fmt --check
+cargo test
+```
+
+### Specific things to verify
+
+1. **async-stream on nightly** -- Does `async_stream 0.3` compile on current nightly?
+2. **TLS root certs on macOS** -- Does `tls-native-roots` pick up system CA certs?
+3. **Connection pool under concurrency** -- Do `join_all` batches (4-8 concurrent requests to same host) work without pool deadlock?
+4. **Pagination streams** -- Do `async_stream::stream!` pagination generators work unchanged?
+5. **Wiremock test isolation** -- Do wiremock tests pass with tokio only in dev-deps?
+
+### HTTP behavior parity acceptance criteria
+
+reqwest provides several implicit behaviors that asupersync's h1 client may not. Each must pass a concrete acceptance test before the migration is considered complete:
+
+| reqwest default | Acceptance criterion | Pass/Fail test |
+|-----------------|---------------------|----------------|
+| Automatic redirect following (up to 10) | If GitLab returns 3xx, gitlore must not silently lose the response. Either follow the redirect or surface a clear error. | Send a request to wiremock returning 301 → verify adapter returns the redirect status (not an opaque failure) |
+| Automatic gzip/deflate decompression | Not required — JSON responses are small. | N/A (no test needed) |
+| Proxy from `HTTP_PROXY`/`HTTPS_PROXY` env | If `HTTP_PROXY` is set, requests must route through it. If asupersync lacks proxy support, document this as a known limitation. | Set `HTTP_PROXY=http://127.0.0.1:9999` → verify connection attempt targets the proxy, or document that proxy is unsupported |
+| Connection keep-alive | Pagination batches (4-8 sequential requests to same host) must reuse connections. | Measure with `ss`/`netstat`: 8 paginated requests should use ≤2 TCP connections |
+| System DNS resolution | Hostnames must resolve via OS resolver. | Verify `lore sync` works against a hostname (not just IP) |
+| Request body Content-Length | POST requests must include Content-Length header (some proxies/WAFs require it). | Inspect outgoing request headers in wiremock test |
+| TLS certificate validation | HTTPS requests must validate server certificates using system CA store. | Verify `lore sync` succeeds against production GitLab (valid cert) and fails against self-signed cert |
+
+### Cancellation + DB transaction invariants
+
+Region-based cancellation stops HTTP tasks cleanly, but partial ingestion can leave the database in an inconsistent state if cancellation fires between "fetched data" and "wrote to DB". The following invariants must hold and be tested:
+
+**INV-1: Atomic batch writes.** Each ingestion batch (issues, MRs, discussions) writes to the DB inside a single `unchecked_transaction()`. If the transaction is not committed, no partial data from that batch is visible. This is already the case for most ingestion paths — audit all paths and fix any that write outside a transaction.
+
+**INV-2: Region cancellation cannot corrupt committed data.** A cancelled region may abandon in-flight HTTP requests, but it must not interrupt a DB transaction mid-write. This holds naturally because SQLite transactions are synchronous (not async) — once `tx.execute()` starts, it runs to completion on the current thread regardless of task cancellation. Verify this assumption holds for WAL mode.
+
+**Hard rule: no `.await` between transaction open and commit/rollback.** Cancellation can fire at any `.await` point. If an `.await` exists between `unchecked_transaction()` and `tx.commit()`, a cancelled region could drop the transaction guard mid-batch, rolling back partial writes silently. Audit all ingestion paths to confirm this invariant holds. If any path must do async work mid-transaction (e.g., fetching related data), restructure to fetch-then-write: complete all async work first, then open the transaction, write synchronously, and commit.
+
+**INV-3: No partial batch visibility.** If cancellation fires after fetching N items but before the batch transaction commits, zero items from that batch are persisted. The next sync picks up where it left off using cursor-based pagination.
+
+**INV-4: ShutdownSignal + region cancellation are complementary.** The existing `ShutdownSignal` check-before-write pattern in orchestrator loops (`if signal.is_cancelled() { break; }`) remains the first line of defense. Region cancellation is the second — it ensures in-flight HTTP tasks are drained even if the orchestrator loop has already moved past the signal check. Both mechanisms must remain active.
+
+**Test plan for invariants:**
+- INV-1: Cancellation integration test — cancel mid-batch, verify DB has zero partial rows from that batch
+- INV-2: Verify `unchecked_transaction()` commit is not interruptible by task cancellation (lab runtime test)
+- INV-3: Cancel after fetch, re-run sync, verify no duplicates and no gaps
+- INV-4: Verify both ShutdownSignal and region cancellation are triggered on Ctrl+C
+
+---
+
+## File Change Summary
+
+| File | Change | LOC |
+|------|--------|-----|
+| `Cargo.toml` | Swap deps | ~10 |
+| `rust-toolchain.toml` | NEW -- set nightly | 3 |
+| `src/http.rs` | NEW -- adapter layer | ~100 |
+| `src/main.rs` | Entrypoint macro, Cx threading, remove 4 signal handlers | ~40 |
+| `src/core/shutdown.rs` | Extract + rewrite signal handler | ~20 |
+| `src/core/error.rs` | Remove reqwest::Error, change GitLabNetworkError (Phase 0d) | ~10 |
+| `src/gitlab/client.rs` | Replace reqwest, remove tokio imports, adapt all methods | ~80 |
+| `src/gitlab/graphql.rs` | Replace reqwest | ~20 |
+| `src/embedding/ollama.rs` | Replace reqwest | ~20 |
+| `src/cli/commands/sync.rs` | Add Cx param | ~5 |
+| `src/cli/commands/ingest.rs` | Add Cx param | ~5 |
+| `src/cli/commands/embed.rs` | Add Cx param | ~5 |
+| `src/cli/commands/sync_surgical.rs` | Add Cx param | ~5 |
+| `src/ingestion/orchestrator.rs` | Add Cx param, region-wrap join_all | ~30 |
+| `src/ingestion/surgical.rs` | Add Cx param | ~10 |
+| `src/embedding/pipeline.rs` | Add Cx param | ~10 |
+| `src/core/timeline_seed_tests.rs` | Swap test macro | ~13 |
+
+**Total: ~16 files modified, 1 new file, ~400-500 LOC changed.**
+
+---
+
+## Execution Order
+
+```
+Phase 0a-0c (prep, safe, independent)
+  |
+  v
+Phase 0d (error type migration -- required before adapter compiles)
+  |
+  v
+DECISION GATE: verify nightly + asupersync + tls-native-roots compile AND behavioral smoke tests pass
+  |
+  v
+Phase 1 (adapter layer, compiles but unused) ----+
+  |                                               |
+  v                                               |  These 3 are one
+Phase 2 (migrate 3 HTTP modules to adapter) ------+  atomic commit
+  |                                               |
+  v                                               |
+Phase 3 (swap runtime, Cx threading) ------------+
+  |
+  v
+Phase 4 (test migration)
+  |
+  v
+Phase 5 (verify + harden)
+```
+
+Phase 0a-0c can be committed independently (good cleanup regardless).
+Phase 0d (error types) can also land independently, but MUST precede the adapter layer.
+**Decision gate:** After Phase 0d, create `rust-toolchain.toml` with nightly pin and verify `asupersync = "0.2"` compiles with `tls-native-roots` on macOS. Then run behavioral smoke tests in a throwaway binary or integration test:
+
+1. **TLS validation:** HTTPS GET to a public endpoint (e.g., `https://gitlab.com/api/v4/version`) succeeds with valid cert.
+2. **DNS resolution:** Request using hostname (not IP) resolves correctly.
+3. **Redirect handling:** GET to a 301/302 endpoint — verify the adapter returns the redirect status (not an opaque error) so call sites can decide whether to follow.
+4. **Timeout behavior:** Request to a slow/non-responsive endpoint times out within the configured duration.
+5. **Connection pooling:** 4 sequential requests to the same host reuse connections (verify via debug logging or `ss`/`netstat`).
+
+If compilation fails or any behavioral test reveals a showstopper (e.g., TLS doesn't work on macOS, timeouts don't fire), stop and evaluate the tokio CancellationToken fallback before investing in Phases 1-3.
+
+Compile-only gating is insufficient — this migration's failure modes are semantic (HTTP behavior parity), not just syntactic.
+
+Phases 1-3 must land together (removing reqwest requires both the adapter AND the new runtime).
+Phases 4-5 are cleanup that can be incremental.
+
+---
+
+## Rollback Strategy
+
+If the migration stalls or asupersync proves unviable after partial completion:
+
+- **Phase 0a-0c completed:** No rollback needed. These are independently valuable cleanup regardless of runtime choice.
+- **Phase 0d completed:** `GitLabNetworkError { detail }` is runtime-agnostic. Keep it.
+- **Phases 1-3 partially completed:** These must land atomically. If any phase in 1-3 fails, revert the entire atomic commit. The adapter layer (Phase 1) imports asupersync types, so it cannot exist without the runtime.
+- **Full rollback to tokio:** If asupersync is abandoned entirely, the fallback path is tokio + `CancellationToken` + `JoinSet` (see "Why not tokio CancellationToken + JoinSet?" above). The adapter layer design is still valid — swap `asupersync::http` for `reqwest` behind the same `crate::http::Client` API.
+
+**Decision point:** After Phase 0 is complete, verify asupersync compiles on the pinned nightly with `tls-native-roots` before committing to Phases 1-3. If TLS or nightly issues surface, stop and evaluate the tokio fallback.
+
+**Concrete escape hatch triggers (abandon asupersync, fall back to tokio + CancellationToken + JoinSet):**
+1. **Nightly breakage > 7 days:** If the pinned nightly breaks and no newer nightly restores compilation within 7 days, abort.
+2. **TLS incompatibility:** If `tls-native-roots` cannot validate certificates on macOS (system CA store) and `tls-webpki-roots` also fails, abort.
+3. **API instability:** If asupersync releases a breaking change to `HttpClient`, `region()`, or `Cx` APIs before our migration is complete, evaluate migration cost. If > 2 days of rework, abort.
+4. **Wiremock incompatibility:** If keeping wiremock tests on tokio while production runs asupersync causes test failures or flaky behavior that cannot be resolved in 1 day, abort.
+
+---
+
+## Risks
+
+| Risk | Severity | Mitigation |
+|------|----------|------------|
+| asupersync pre-1.0 API changes | High | Adapter layer isolates call sites. Pin exact version. |
+| Nightly Rust breakage | Medium-High | Pin nightly date in rust-toolchain.toml. CI tests on nightly. Coupling runtime + toolchain migration amplifies risk — escape hatch triggers defined in Rollback Strategy. |
+| TLS cert issues on macOS | Medium | Test early in Phase 5. Fallback: `tls-webpki-roots` (Mozilla bundle). |
+| Connection pool behavior under load | Medium | Stress test with `join_all` of 8+ concurrent requests in Phase 5. |
+| async-stream nightly compat | Low | Widely used crate, likely fine. Fallback: manual Stream impl. |
+| Build time increase | Low | Measure before/after. asupersync may be heavier than tokio. |
+| Reqwest behavioral drift | Medium | reqwest has implicit redirect/proxy/compression handling. Audit each (see Phase 5 table). GitLab API doesn't redirect, so low actual risk. |
+| Partial ingestion on cancel | Medium | Region cancellation can fire between HTTP fetch and DB write. Verify transaction boundaries align with region scope (see Phase 5). |
+| Unbounded response body buffering | Low | Adapter buffers full response bodies. Mitigated by 64 MiB size guard in adapter `execute()`. |
+| Manual URL/header handling correctness | Low-Medium | `append_query_params` and case-insensitive header scans replicate reqwest behavior manually. Mitigated by unit tests for edge cases (existing query params, fragments, repeated keys, case folding). |

plans/init-refresh-flag.md

@@ -0,0 +1,137 @@
+# Plan: `lore init --refresh`
+
+**Created:** 2026-03-02
+**Status:** Complete
+
+## Problem
+
+When new repos are added to the config file, `lore sync` doesn't pick them up because project discovery only happens during `lore init`. Currently, users must use `--force` to overwrite their config, which is awkward.
+
+## Solution
+
+Add `--refresh` flag to `lore init` that reads the existing config and updates the database to match, without overwriting the config file.
+
+---
+
+## Implementation Plan
+
+### 1. CLI Changes (`src/cli/mod.rs`)
+
+Add to init subcommand:
+- `--refresh` flag (conflicts with `--force`)
+- Ensure `--robot` / `-J` propagates to init
+
+### 2. Update `InitOptions` struct
+
+```rust
+pub struct InitOptions {
+    pub config_path: Option<String>,
+    pub force: bool,
+    pub non_interactive: bool,
+    pub refresh: bool,       // NEW
+    pub robot_mode: bool,    // NEW
+}
+```
+
+### 3. New `RefreshResult` struct
+
+```rust
+pub struct RefreshResult {
+    pub user: UserInfo,
+    pub projects_registered: Vec<ProjectInfo>,
+    pub projects_failed: Vec<ProjectFailure>,  // path + error message
+    pub orphans_found: Vec<String>,            // paths in DB but not config
+    pub orphans_deleted: Vec<String>,          // if user said yes
+}
+
+pub struct ProjectFailure {
+    pub path: String,
+    pub error: String,
+}
+```
+
+### 4. Main logic: `run_init_refresh()` (new function)
+
+```
+1. Load config via Config::load()
+2. Resolve token, call get_current_user() → validate auth
+3. For each project in config.projects:
+   - Call client.get_project(path)
+   - On success: collect for DB upsert
+   - On failure: collect in projects_failed
+4. Query DB for all existing projects
+5. Compute orphans = DB projects - config projects
+6. If orphans exist:
+   - Robot mode: include in output, no prompt, no delete
+   - Interactive: prompt "Delete N orphan projects? [y/N]"
+     - Default N → skip deletion
+     - Y → delete from DB
+7. Upsert validated projects into DB
+8. Return RefreshResult
+```
+
+### 5. Improve existing init error message
+
+In `run_init()`, when config exists and neither `--refresh` nor `--force`:
+
+**Current:**
+> Config file exists at ~/.config/lore/config.json. Use --force to overwrite.
+
+**New:**
+> Config already exists at ~/.config/lore/config.json.
+> - Use `--refresh` to register new projects from config
+> - Use `--force` to overwrite the config file
+
+### 6. Robot mode output
+
+```json
+{
+  "ok": true,
+  "data": {
+    "mode": "refresh",
+    "user": { "username": "...", "name": "..." },
+    "projects_registered": [...],
+    "projects_failed": [...],
+    "orphans_found": ["old/project"],
+    "orphans_deleted": []
+  },
+  "meta": { "elapsed_ms": 123 }
+}
+```
+
+### 7. Human output
+
+```
+  ✓ Authenticated as @username (Full Name)
+
+  Projects
+    ✓ group/project-a          registered
+    ✓ group/project-b          registered
+    ✗ group/nonexistent        not found
+
+  Orphans
+    • old/removed-project
+
+  Delete 1 orphan project from database? [y/N]: n
+
+  Registered 2 projects (1 failed, 1 orphan kept)
+```
+
+---
+
+## Files to Touch
+
+1. **`src/cli/mod.rs`** — add `--refresh` and `--robot` to init subcommand args
+2. **`src/cli/commands/init.rs`** — add `RefreshResult`, `run_init_refresh()`, update error message
+3. **`src/main.rs`** (or CLI dispatch) — route `--refresh` to new function
+
+---
+
+## Acceptance Criteria
+
+- [x] `lore init --refresh` reads existing config and registers projects
+- [x] Validates GitLab auth before processing
+- [x] Orphan projects prompt with default N (interactive mode)
+- [x] Robot mode outputs JSON, no prompts, includes orphans in output
+- [x] Existing `lore init` (no flags) suggests `--refresh` when config exists
+- [x] `--refresh` and `--force` are mutually exclusive

plans/lore-service.feedback-1.md

@@ -1,186 +0,0 @@
-1. **Isolate scheduled behavior from manual `sync`**
-Reasoning: Your current plan injects backoff into `handle_sync_cmd`, which affects all `lore sync` calls (including manual recovery runs). Scheduled behavior should be isolated so humans aren’t unexpectedly blocked by service backoff.
-
-```diff
-@@ Context
--`lore sync` runs a 4-stage pipeline (issues, MRs, docs, embeddings) that takes 2-4 minutes.
-+`lore sync` remains the manual/operator command.
-+`lore service run` (hidden/internal) is the scheduled execution entrypoint.
-
-@@ Commands & User Journeys
-+### `lore service run` (hidden/internal)
-+**What it does:** Executes one scheduled sync attempt with service-only policy:
-+- applies service backoff policy
-+- records service run state
-+- invokes sync pipeline with configured profile
-+- updates retry state on success/failure
-+
-+**Invocation:** scheduler always runs:
-+`lore --robot service run --reason timer`
-
-@@ Backoff Integration into `handle_sync_cmd`
--Insert **after** config load but **before** the dry_run check:
-+Do not add backoff checks to `handle_sync_cmd`.
-+Backoff logic lives only in `handle_service_run`.
-```
-
-2. **Use DB as source-of-truth for service state (not a standalone JSON status file)**
-Reasoning: You already have `sync_runs` in SQLite. A separate JSON status file creates split-brain and race/corruption risk. Keep JSON as optional cache/export only.
-
-```diff
-@@ Status File
--Location: `{get_data_dir()}/sync-status.json`
-+Primary state location: SQLite (`service_state` table) + existing `sync_runs`.
-+Optional mirror file: `{get_data_dir()}/sync-status.json` (best-effort export only).
-
-@@ File-by-File Implementation Details
--### `src/core/sync_status.rs` (NEW)
-+### `migrations/015_service_state.sql` (NEW)
-+CREATE TABLE service_state (
-+  id INTEGER PRIMARY KEY CHECK (id = 1),
-+  installed INTEGER NOT NULL DEFAULT 0,
-+  platform TEXT,
-+  interval_seconds INTEGER,
-+  profile TEXT NOT NULL DEFAULT 'balanced',
-+  consecutive_failures INTEGER NOT NULL DEFAULT 0,
-+  next_retry_at_ms INTEGER,
-+  last_error_code TEXT,
-+  last_error_message TEXT,
-+  updated_at_ms INTEGER NOT NULL
-+);
-+
-+### `src/core/service_state.rs` (NEW)
-+- read/write state row
-+- derive backoff/next_retry
-+- join with latest `sync_runs` for status output
-```
-
-3. **Backoff policy should be configurable, jittered, and error-aware**
-Reasoning: Fixed hardcoded backoff (`base=1800`) is wrong when user sets another interval. Also permanent failures (bad token/config) should not burn retries forever; they should enter paused/error state.
-
-```diff
-@@ Backoff Logic
--// Exponential: base * 2^failures, capped at 4 hours
-+// Exponential with jitter: base * 2^(failures-1), capped, ±20% jitter
-+// Applies only to transient errors.
-+// Permanent errors set `paused_reason` and stop retries until user action.
-
-@@ CLI Definition Changes
-+ServiceCommand::Resume,   // clear paused state / failures
-+ServiceCommand::Run,      // hidden
-
-@@ Error Types
-+ServicePaused,            // scheduler paused due to permanent error
-+ServiceCommandFailed,     // OS command failure with stderr context
-```
-
-4. **Add a pipeline-level single-flight lock**
-Reasoning: Current locking is in ingest stages; there’s still overlap risk across full sync pipelines (docs/embed can overlap with another run). Add a top-level lock for scheduled/manual sync pipeline execution.
-
-```diff
-@@ Architecture
-+Add `sync_pipeline` lock at top-level sync execution.
-+Keep existing ingest lock (`sync`) for ingest internals.
-
-@@ Backoff Integration into `handle_sync_cmd`
-+Before starting sync pipeline, acquire `AppLock` with:
-+name = "sync_pipeline"
-+stale_lock_minutes = config.sync.stale_lock_minutes
-+heartbeat_interval_seconds = config.sync.heartbeat_interval_seconds
-```
-
-5. **Don’t embed token in service files by default**
-Reasoning: Embedding PAT into unit/plist is a high-risk secret leak path. Make secure storage explicit and default-safe.
-
-```diff
-@@ `lore service install [--interval 30m]`
-+`lore service install [--interval 30m] [--token-source env-file|embedded]`
-+Default: `env-file` (0600 perms, user-owned)
-+`embedded` allowed only with explicit opt-in and warning
-
-@@ Robot output
--    "token_embedded": true
-+    "token_source": "env_file"
-
-@@ Human output
--  Note: Your GITLAB_TOKEN is embedded in the service file.
-+  Note: Token is stored in a user-private env file (0600).
-```
-
-6. **Introduce a command-runner abstraction with timeout + stderr capture**
-Reasoning: `launchctl/systemctl/schtasks` calls are failure-prone; you need consistent error mapping and deterministic tests.
-
-```diff
-@@ Platform Backends
--exports free functions that dispatch via `#[cfg(target_os)]`
-+exports backend + shared `CommandRunner`:
-+- run(cmd, args, timeout)
-+- capture stdout/stderr/exit code
-+- map failure to `ServiceCommandFailed { cmd, exit_code, stderr }`
-```
-
-7. **Persist install manifest to avoid brittle file parsing**
-Reasoning: Parsing timer/plist for interval/state is fragile and platform-format dependent. Persist a manifest with checksums and expected artifacts.
-
-```diff
-@@ Platform Backends
--Same pattern for ... `get_interval_seconds()`
-+Add manifest: `{data_dir}/service-manifest.json`
-+Stores platform, interval, profile, generated files, and command.
-+`service status` reads manifest first, then verifies platform state.
-
-@@ Acceptance criteria
-+Install is idempotent:
-+- if manifest+files already match, report `no_change: true`
-+- if drift detected, reconcile and rewrite
-```
-
-8. **Make schedule profile explicit (`fast|balanced|full`)**
-Reasoning: This makes the feature more useful and performance-tunable without requiring users to understand internal flags.
-
-```diff
-@@ `lore service install [--interval 30m]`
-+`lore service install [--interval 30m] [--profile fast|balanced|full]`
-+
-+Profiles:
-+- fast: `sync --no-docs --no-embed`
-+- balanced (default): `sync --no-embed`
-+- full: `sync`
-```
-
-9. **Upgrade `service status` to include scheduler health + recent run summary**
-Reasoning: Single last-sync snapshot is too shallow. Include recent attempts and whether scheduler is paused/backing off/running.
-
-```diff
-@@ `lore service status`
--What it does: Shows whether the service is installed, its configuration, last sync result, and next scheduled run.
-+What it does: Shows install state, scheduler state (running/backoff/paused), recent runs, and next run estimate.
-
-@@ Robot output
--    "last_sync": { ... },
--    "backoff": null
-+    "scheduler_state": "running|backoff|paused|idle",
-+    "last_sync": { ... },
-+    "recent_runs": [{"run_id":"...","status":"...","started_at_iso":"..."}],
-+    "backoff": null,
-+    "paused_reason": null
-```
-
-10. **Strengthen tests around determinism and cross-platform generation**
-Reasoning: Time-based backoff and shell quoting are classic flaky points. Add fake clock + fake command runner for deterministic tests.
-
-```diff
-@@ Testing Strategy
-+Add deterministic test seams:
-+- `Clock` trait for backoff/now calculations
-+- `CommandRunner` trait for backend command execution
-+
-+Add tests:
-+- transient vs permanent error classification
-+- backoff schedule with jitter bounds
-+- manifest drift reconciliation
-+- quoting/escaping for paths with spaces and special chars
-+- `service run` does not modify manual `sync` behavior
-```
-
-If you want, I can rewrite your full plan as a single clean revised document with these changes already integrated (instead of patch fragments).

plans/lore-service.feedback-2.md

@@ -1,182 +0,0 @@
-**High-Impact Revisions (ordered by priority)**
-
-1. **Make service identity project-scoped (avoid collisions across repos/users)**
-Analysis: Current fixed names (`com.gitlore.sync`, `LoreSync`, `lore-sync.timer`) will collide when users run multiple gitlore workspaces. This causes silent overwrites and broken uninstall/status behavior.  
-Diff:
-```diff
---- a/plan.md
-+++ b/plan.md
-@@ Commands & User Journeys / install
-- lore service install [--interval 30m] [--profile balanced] [--token-source env-file]
-+ lore service install [--interval 30m] [--profile balanced] [--token-source auto] [--name <optional>]
-@@ Install Manifest Schema
-+    /// Stable per-install identity (default derived from project root hash)
-+    pub service_id: String,
-@@ Platform Backends
-- Label: com.gitlore.sync
-+ Label: com.gitlore.sync.{service_id}
-- Task name: LoreSync
-+ Task name: LoreSync-{service_id}
-- ~/.config/systemd/user/lore-sync.service
-+ ~/.config/systemd/user/lore-sync-{service_id}.service
-```
-
-2. **Replace token model with secure per-OS defaults**
-Analysis: The current “env-file default” is not actually secure on macOS launchd (token still ends up in plist). On Windows, assumptions about inherited environment are fragile. Use OS-native secure stores by default and keep `embedded` as explicit opt-in only.  
-Diff:
-```diff
---- a/plan.md
-+++ b/plan.md
-@@ Token storage strategies
--| env-file (default) | ...
-+| auto (default) | macOS: Keychain, Linux: env-file (0600), Windows: Credential Manager |
-+| env-file | Linux/systemd only |
- | embedded | ... explicit warning ...
-@@ macOS launchd section
-- env-file strategy stores canonical token in service-env but embeds token in plist
-+ default strategy is Keychain lookup at runtime; no token persisted in plist
-+ env-file is not offered on macOS
-@@ Windows schtasks section
-- token must be in user's system environment
-+ default strategy stores token in Windows Credential Manager and injects at runtime
-```
-
-3. **Version and atomically persist manifest/status**
-Analysis: `Option<Self>` on read hides corruption, and non-atomic writes risk truncated JSON on crashes. This will create false “not installed” and scheduler confusion.  
-Diff:
-```diff
---- a/plan.md
-+++ b/plan.md
-@@ Install Manifest Schema
-+    pub schema_version: u32, // start at 1
-+    pub updated_at_iso: String,
-@@ Status File Schema
-+    pub schema_version: u32, // start at 1
-+    pub updated_at_iso: String,
-@@ Read/Write
-- read(path) -> Option<Self>
-+ read(path) -> Result<Option<Self>, LoreError>
-- write(...) -> std::io::Result<()>
-+ write_atomic(...) -> std::io::Result<()> // tmp file + fsync + rename
-```
-
-4. **Persist `next_retry_at_ms` instead of recomputing jitter**
-Analysis: Deterministic jitter from timestamp modulo is predictable and can herd retries. Persisting `next_retry_at_ms` at failure time makes status accurate, stable, and cheap to compute.  
-Diff:
-```diff
---- a/plan.md
-+++ b/plan.md
-@@ SyncStatusFile
-     pub consecutive_failures: u32,
-+    pub next_retry_at_ms: Option<i64>,
-@@ Backoff Logic
-- compute backoff from last_run.timestamp_ms and deterministic jitter each read
-+ compute backoff once on failure, store next_retry_at_ms, read-only comparison afterward
-+ jitter algorithm: full jitter in [0, cap], injectable RNG for tests
-```
-
-5. **Add circuit breaker for repeated transient failures**
-Analysis: Infinite transient retries can run forever on systemic failures (DB corruption, bad network policy). After N transient failures, pause with actionable reason.  
-Diff:
-```diff
---- a/plan.md
-+++ b/plan.md
-@@ Scheduler states
-- backoff — transient failures, waiting to retry
-+ backoff — transient failures, waiting to retry
-+ paused — permanent error OR circuit breaker tripped after N transient failures
-@@ Service run flow
-- On transient failure: increment failures, compute backoff
-+ On transient failure: increment failures, compute backoff, if failures >= max_transient_failures -> pause
-```
-
-6. **Stage-aware outcome policy (core freshness over all-or-nothing)**
-Analysis: Failing embeddings/docs should not block issues/MRs freshness. Split stage outcomes and only treat core stages as hard-fail by default. This improves reliability and practical usefulness.  
-Diff:
-```diff
---- a/plan.md
-+++ b/plan.md
-@@ Context
-- lore sync runs a 4-stage pipeline ... treated as one run result
-+ lore service run records per-stage outcomes (issues, mrs, docs, embeddings)
-@@ Status File Schema
-+    pub stage_results: Vec<StageResult>,
-@@ service run flow
-- Execute sync pipeline with flags derived from profile
-+ Execute stage-by-stage and classify severity:
-+   - critical: issues, mrs
-+   - optional: docs, embeddings
-+ optional stage failures mark run as degraded, not failed
-```
-
-7. **Replace cfg free-function backend with trait-based backend**
-Analysis: Current backend API is hard to test end-to-end without real OS commands. A `SchedulerBackend` trait enables deterministic integration tests and cleaner architecture.  
-Diff:
-```diff
---- a/plan.md
-+++ b/plan.md
-@@ Platform Backends / Architecture
-- exports free functions dispatched via #[cfg]
-+ define trait SchedulerBackend { install, uninstall, state, file_paths, next_run }
-+ provide LaunchdBackend, SystemdBackend, SchtasksBackend implementations
-+ include FakeBackend for integration tests
-```
-
-8. **Harden platform units and detect scheduler prerequisites**
-Analysis: systemd user timers often fail silently without user manager/linger; launchd context can be wrong in headless sessions. Add explicit diagnostics and unit hardening.  
-Diff:
-```diff
---- a/plan.md
-+++ b/plan.md
-@@ Linux systemd unit
- [Service]
- Type=oneshot
- ExecStart=...
-+TimeoutStartSec=900
-+NoNewPrivileges=true
-+PrivateTmp=true
-+ProtectSystem=strict
-+ProtectHome=read-only
-@@ Linux install/status
-+ detect user manager availability and linger state; surface warning/action
-@@ macOS install/status
-+ detect non-GUI bootstrap context and return actionable error
-```
-
-9. **Add operational commands: `trigger`, `doctor`, and non-interactive log tail**
-Analysis: `logs` opening an editor is weak for automation and incident response. Operators need a preflight and immediate controlled run.  
-Diff:
-```diff
---- a/plan.md
-+++ b/plan.md
-@@ ServiceCommand
-+ Trigger, // run one attempt through service policy now
-+ Doctor,  // validate scheduler, token, paths, permissions
-@@ logs
-- opens editor
-+ supports --tail <n> and --follow in human mode
-+ robot mode can return last_n lines optionally
-```
-
-10. **Fix plan inconsistencies and edge-case correctness**
-Analysis: There are internal mismatches that will cause implementation drift.  
-Diff:
-```diff
---- a/plan.md
-+++ b/plan.md
-@@ Interval Parsing
-- supports 's' suffix
-+ remove 's' suffix (acceptance only allows 5m..24h)
-@@ uninstall acceptance
-- removes ALL service files only
-+ explicitly also remove service-manifest and service-env (status/logs retained)
-@@ SyncStatusFile schema
-- pub last_run: SyncRunRecord
-+ pub last_run: Option<SyncRunRecord> // matches idle/no runs state
-```
-
----
-
-**Recommended Architecture Upgrade Summary**
-
-The strongest improvement set is: **(1) project-scoped IDs, (2) secure token defaults, (3) atomic/versioned state, (4) persisted retry schedule + circuit breaker, (5) stage-aware outcomes**. That combination materially improves correctness, multi-repo safety, security, operability, and real-world reliability without changing your core manual-vs-scheduled separation principle.

plans/lore-service.feedback-3.md

@@ -1,174 +0,0 @@
-Below are the highest-impact revisions I’d make, ordered by severity/ROI. These focus on correctness first, then security, then operability and UX.
-
-1. **Fix multi-install ambiguity (`service_id` exists, but commands can’t target one explicitly)**
-Analysis: The plan introduces `service-manifest-{service_id}.json`, but `status/uninstall/resume/logs` have no selector. In a multi-workspace or multi-name install scenario, behavior becomes ambiguous and error-prone. Add explicit targeting plus discovery.
-```diff
-@@ ## Commands & User Journeys
-+### `lore service list`
-+Lists installed services discovered from `{data_dir}/service-manifest-*.json`.
-+Robot output includes `service_id`, `platform`, `interval_seconds`, `profile`, `installed_at_iso`.
-
-@@ ### `lore service uninstall`
--### `lore service uninstall`
-+### `lore service uninstall [--service <service_id|name>] [--all]`
-@@
--2. CLI reads install manifest to find `service_id`
-+2. CLI resolves target service via `--service` or current-project-derived default.
-+3. If multiple candidates and no selector, return actionable error.
-
-@@ ### `lore service status`
--### `lore service status`
-+### `lore service status [--service <service_id|name>]`
-```
-
-2. **Make status state service-scoped (not global)**
-Analysis: A single `sync-status.json` for all services causes cross-service contamination (pause/backoff/outcome from one profile affecting another). Keep lock global, but state per service.
-```diff
-@@ ## Status File
--### Location
--`{get_data_dir()}/sync-status.json`
-+### Location
-+`{get_data_dir()}/sync-status-{service_id}.json`
-
-@@ ## Paths Module Additions
--pub fn get_service_status_path() -> PathBuf {
--    get_data_dir().join("sync-status.json")
-+pub fn get_service_status_path(service_id: &str) -> PathBuf {
-+    get_data_dir().join(format!("sync-status-{service_id}.json"))
-}
-@@
--Note: `sync-status.json` is NOT scoped by `service_id`
-+Note: status is scoped by `service_id`; lock remains global (`sync_pipeline`) to prevent overlapping writes.
-```
-
-3. **Stop classifying permanence via string matching**
-Analysis: Matching `"401 Unauthorized"` in strings is brittle and will misclassify edge cases. Carry machine codes through stage results and classify by `ErrorCode` only.
-```diff
-@@ pub struct StageResult {
--    pub error: Option<String>,
-+    pub error: Option<String>,
-+    pub error_code: Option<String>, // e.g., AUTH_FAILED, NETWORK_ERROR
-}
-@@ Error classification helpers
--fn is_permanent_error_message(msg: Option<&str>) -> bool { ...string contains... }
-+fn is_permanent_error_code(code: Option<&str>) -> bool {
-+    matches!(code, Some("TOKEN_NOT_SET" | "AUTH_FAILED" | "CONFIG_NOT_FOUND" | "CONFIG_INVALID" | "MIGRATION_FAILED"))
-+}
-```
-
-4. **Install should be transactional (manifest written last)**
-Analysis: Current order writes manifest before scheduler enable. If enable fails, you persist a false “installed” state. Use two-phase install with rollback.
-```diff
-@@ ### `lore service install` User journey
--9. CLI writes install manifest ...
--10. CLI runs the platform-specific enable command
-+9. CLI runs the platform-specific enable command
-+10. On success, CLI writes install manifest atomically
-+11. On failure, CLI removes generated files and returns `ServiceCommandFailed`
-```
-
-5. **Fix launchd token security gap (env-file currently still embeds token)**
-Analysis: Current “env-file” on macOS still writes token into plist, defeating the main security goal. Generate a private wrapper script that reads env file at runtime and execs `lore`.
-```diff
-@@ ### macOS: launchd
--<key>ProgramArguments</key>
--<array>
--    <string>{binary_path}</string>
--    <string>--robot</string>
--    <string>service</string>
--    <string>run</string>
--</array>
-+<key>ProgramArguments</key>
-+<array>
-+    <string>{data_dir}/service-run-{service_id}.sh</string>
-+</array>
-@@
--`env-file`: ... token value must still appear in plist ...
-+`env-file`: token never appears in plist; wrapper loads `{data_dir}/service-env-{service_id}` at runtime.
-```
-
-6. **Improve backoff math and add half-open circuit recovery**
-Analysis: Current jitter + min clamp makes first retry deterministic and can over-pause. Also circuit-breaker requires manual resume forever. Add cooldown + half-open probe to self-heal.
-```diff
-@@ Backoff Logic
--let backoff_secs = ((base_backoff as f64) * jitter_factor) as u64;
--let backoff_secs = backoff_secs.max(base_interval_seconds);
-+let max_backoff = base_backoff;
-+let min_backoff = base_interval_seconds;
-+let span = max_backoff.saturating_sub(min_backoff);
-+let backoff_secs = min_backoff + ((span as f64) * jitter_factor) as u64;
-
-@@ Scheduler states
--- `paused` — permanent error ... OR circuit breaker tripped ...
-+- `paused` — permanent error requiring intervention
-+- `half_open` — probe state after circuit cooldown; one trial run allowed
-
-@@ Circuit breaker
--... transitions to `paused` ... Run: lore service resume
-+... transitions to `half_open` after cooldown (default 30m). Successful probe closes breaker automatically; failed probe returns to backoff/paused.
-```
-
-7. **Promote backend trait to v1 (not v2) for deterministic integration tests**
-Analysis: This is a reliability-critical feature spanning OS schedulers. A trait abstraction now gives true behavior tests and safer refactors.
-```diff
-@@ ### Platform Backends
--> Future architecture note: A `SchedulerBackend` trait ... for v2.
-+Adopt `SchedulerBackend` trait in v1 with real backends (`launchd/systemd/schtasks`) and `FakeBackend` for tests.
-+This enables deterministic install/uninstall/status/run-path integration tests without touching host scheduler.
-```
-
-8. **Harden `run_cmd` timeout behavior**
-Analysis: If timeout occurs, child process must be killed and reaped. Otherwise you leak processes and can wedge repeated runs.
-```diff
-@@ fn run_cmd(...)
--// Wait with timeout
--let output = wait_with_timeout(output, timeout_secs)?;
-+// Wait with timeout; on timeout kill child and wait to reap
-+let output = wait_with_timeout_kill_and_reap(child, timeout_secs)?;
-```
-
-9. **Add manual control commands (`pause`, `trigger`, `repair`)**
-Analysis: These are high-utility operational controls. `trigger` helps immediate sync without waiting interval. `pause` supports maintenance windows. `repair` avoids manual file deletion for corrupt state.
-```diff
-@@ pub enum ServiceCommand {
-+    /// Pause scheduled execution without uninstalling
-+    Pause { #[arg(long)] reason: Option<String> },
-+    /// Trigger an immediate one-off run using installed profile
-+    Trigger { #[arg(long)] ignore_backoff: bool },
-+    /// Repair corrupt manifest/status by backing up and reinitializing
-+    Repair { #[arg(long)] service: Option<String> },
-}
-```
-
-10. **Make `logs` default non-interactive and add rotation policy**
-Analysis: Opening editor by default is awkward for automation/SSH and slower for normal diagnosis. Defaulting to `tail` is more practical; `--open` can preserve editor behavior.
-```diff
-@@ ### `lore service logs`
--By default, opens in the user's preferred editor.
-+By default, prints last 100 lines to stdout.
-+Use `--open` to open editor.
-@@
-+Log rotation: rotate `service-stdout.log` / `service-stderr.log` at 10 MB, keep 5 files.
-```
-
-11. **Remove destructive/shell-unsafe suggested action**
-Analysis: `actions(): ["rm {path}", ...]` is unsafe (shell injection + destructive guidance). Replace with safe command path.
-```diff
-@@ LoreError::actions()
--Self::ServiceCorruptState { path, .. } => vec![&format!("rm {path}"), "lore service install"],
-+Self::ServiceCorruptState { .. } => vec!["lore service repair", "lore service install"],
-```
-
-12. **Tighten scheduler units for real-world reliability**
-Analysis: Add explicit working directory and success-exit handling to reduce environment drift and edge failures.
-```diff
-@@ systemd service unit
- [Service]
- Type=oneshot
- ExecStart={binary_path} --robot service run
-+WorkingDirectory={data_dir}
-+SuccessExitStatus=0
- TimeoutStartSec=900
-```
-
-If you want, I can produce a single consolidated “v3 plan” markdown with these revisions already merged into your original structure.

plans/lore-service.feedback-4.md

@@ -1,190 +0,0 @@
-No `## Rejected Recommendations` section was present in the plan you shared, so the proposals below are all net-new.
-
-1. **Make scheduled runs explicitly target a single service instance**
-Analysis: right now `service run` has no selector, but the plan supports multiple installed services. That creates ambiguity and incorrect manifest/status selection. This is the most important architectural fix.
-
-```diff
-@@ `lore service install` What it does
-- runs `lore --robot service run` at the specified interval
-+ runs `lore --robot service run --service-id <service_id>` at the specified interval
-
-@@ Robot output (`install`)
-- "sync_command": "/usr/local/bin/lore --robot service run",
-+ "sync_command": "/usr/local/bin/lore --robot service run --service-id a1b2c3d4",
-
-@@ `ServiceCommand` enum
-- #[command(hide = true)]
-- Run,
-+ #[command(hide = true)]
-+ Run {
-+     /// Internal selector injected by scheduler backend
-+     #[arg(long, hide = true)]
-+     service_id: String,
-+ },
-
-@@ `handle_service_run` signature
--pub fn handle_service_run(start: std::time::Instant) -> Result<(), Box<dyn std::error::Error>>
-+pub fn handle_service_run(service_id: &str, start: std::time::Instant) -> Result<(), Box<dyn std::error::Error>>
-
-@@ run flow step 1
-- Read install manifest
-+ Read install manifest for `service_id`
-```
-
-2. **Strengthen `service_id` derivation to avoid cross-workspace collisions**
-Analysis: hashing config path alone can collide when many workspaces share one global config. Identity should represent what is being synced, not only where config lives.
-
-```diff
-@@ Key Design Principles / Project-Scoped Service Identity
-- derive from a stable hash of the config file path
-+ derive from a stable fingerprint of:
-+ - canonical workspace root
-+ - normalized configured GitLab project URLs
-+ - canonical config path
-+ then take first 12 hex chars of SHA-256
-
-@@ `compute_service_id`
-- Returns first 8 hex chars of SHA-256 of the canonical config path.
-+ Returns first 12 hex chars of SHA-256 of a canonical identity tuple
-+ (workspace_root + sorted project URLs + config_path).
-```
-
-3. **Introduce a service-state machine with a dedicated admin lock**
-Analysis: install/uninstall/pause/resume/repair/status can race each other. A lock and explicit transition table prevents invalid states and file races.
-
-```diff
-@@ New section: Service State Model
-+ All state mutations are serialized by `AppLock("service-admin-{service_id}")`.
-+ Legal transitions:
-+ - idle -> running -> success|degraded|backoff|paused
-+ - backoff -> running|paused
-+ - paused -> half_open|running (resume)
-+ - half_open -> running|paused
-+ Any invalid transition is rejected with `ServiceCorruptState`.
-
-@@ `handle_install`, `handle_uninstall`, `handle_pause`, `handle_resume`, `handle_repair`
-+ Acquire `service-admin-{service_id}` before mutating manifest/status/service files.
-```
-
-4. **Unify manual and scheduled sync execution behind one orchestrator**
-Analysis: the plan currently duplicates stage logic and error classification in `service run`, increasing drift risk. A shared orchestrator gives one authoritative pipeline behavior.
-
-```diff
-@@ Key Design Principles
-+ #### 6. Single Sync Orchestrator
-+ Both `lore sync` and `lore service run` call `SyncOrchestrator`.
-+ Service mode adds policy (backoff/circuit-breaker); manual mode bypasses policy.
-
-@@ Service Run Implementation
-- execute_sync_stages(&sync_args)
-+ SyncOrchestrator::run(SyncMode::Service { profile, policy })
-
-@@ manual sync
-- separate pipeline path
-+ SyncOrchestrator::run(SyncMode::Manual { flags })
-```
-
-5. **Add bounded in-run retries for transient core-stage failures**
-Analysis: single-shot failure handling will over-trigger backoff on temporary network blips. One short retry per core stage significantly improves freshness without much extra runtime.
-
-```diff
-@@ Stage-aware execution
-+ Core stages (`issues`, `mrs`) get up to 1 immediate retry on transient errors
-+ (jittered 1-5s). Permanent errors are never retried.
-+ Optional stages keep best-effort semantics.
-
-@@ Acceptance criteria (`service run`)
-+ Retries transient core stage failures once before counting run as failed.
-```
-
-6. **Harden persistence with full crash-safety semantics**
-Analysis: current atomic write description is good but incomplete for power-loss durability. You should fsync parent directory after rename and include lightweight integrity metadata.
-
-```diff
-@@ `write_atomic`
-- tmp file + fsync + rename
-+ tmp file + fsync(file) + rename + fsync(parent_dir)
-
-@@ `ServiceManifest` and `SyncStatusFile`
-+ pub write_seq: u64,
-+ pub content_sha256: String, // optional integrity guard for repair/doctor
-```
-
-7. **Fix token handling to avoid shell/env injection and add secure-store mode**
-Analysis: sourcing env files in shell is brittle if token contains special chars/newlines. Also, secure OS credential stores should be first-class for production reliability/security.
-
-```diff
-@@ Token storage strategies
--| `env-file` (default) ...
-+| `auto` (default) | use secure-store when available, else env-file |
-+| `secure-store` | macOS Keychain / libsecret / Windows Credential Manager |
-+| `env-file` | explicit fallback |
-
-@@ macOS wrapper script
--. "{data_dir}/service-env-{service_id}"
--export {token_env_var}
-+TOKEN_VALUE="$(cat "{data_dir}/service-token-{service_id}" )"
-+export {token_env_var}="$TOKEN_VALUE"
-
-@@ Acceptance criteria
-+ Reject token values containing `\0` or newline for env-file mode.
-+ Never eval/source untrusted token content.
-```
-
-8. **Correct platform/runtime implementation hazards**
-Analysis: there are a few correctness risks that should be fixed in-plan now.
-
-```diff
-@@ macOS install steps
-- Get UID via `unsafe { libc::getuid() }`
-+ Get UID via safe API (`nix::unistd::Uid::current()` or equivalent safe helper)
-
-@@ Command Runner Helper
-- poll try_wait and read stdout/stderr after exit
-+ avoid potential pipe backpressure deadlock:
-+ use wait-with-timeout + concurrent stdout/stderr draining
-
-@@ Linux timer
-- OnUnitActiveSec={interval_seconds}s
-+ OnUnitInactiveSec={interval_seconds}s
-+ AccuracySec=1min
-```
-
-9. **Make logs fully service-scoped**
-Analysis: you already scoped manifest/status by `service_id`; logs are still global in several places. Multi-service installs will overwrite each other’s logs.
-
-```diff
-@@ Paths Module Additions
--pub fn get_service_log_path() -> PathBuf
-+pub fn get_service_log_path(service_id: &str, stream: LogStream) -> PathBuf
-
-@@ log filenames
-- logs/service-stderr.log
-- logs/service-stdout.log
-+ logs/service-{service_id}-stderr.log
-+ logs/service-{service_id}-stdout.log
-
-@@ `service logs`
-- default path: `{data_dir}/logs/service-stderr.log`
-+ default path: `{data_dir}/logs/service-{service_id}-stderr.log`
-```
-
-10. **Resolve internal spec contradictions and rollback gaps**
-Analysis: there are a few contradictory statements and incomplete rollback behavior that will cause implementation churn.
-
-```diff
-@@ `service logs` behavior
-- default (no flags): open in editor (human)
-+ default (no flags): print last 100 lines (human and robot metadata mode)
-+ `--open` is explicit opt-in
-
-@@ install rollback
-- On failure: removes generated service files
-+ On failure: removes generated service files, env file, wrapper script, and temp manifest
-
-@@ `handle_service_run` sample code
-- let manifest_path = get_service_manifest_path();
-+ let manifest_path = get_service_manifest_path(service_id);
-```
-
-If you want, I can take these revisions and produce a single consolidated “Iteration 4” replacement plan block with all sections rewritten coherently so it’s ready to hand to an implementer.

plans/time-decay-expert-scoring.feedback-1.md

@@ -1,114 +0,0 @@
-Your plan is strong directionally, but I’d revise it in 8 key places to avoid regressions and make it significantly more useful in production.
-
-1. **Split reviewer signals into “participated” vs “assigned-only”**
-Reason: today’s inflation problem is often assignment noise. Treating `mr_reviewers` equal to real review activity still over-ranks passive reviewers.
-
-```diff
-@@ Per-signal contributions
--| Reviewer (reviewed MR touching path) | 10 | 90 days |
-+| ReviewerParticipated (left DiffNote on MR/path) | 10 | 90 days |
-+| ReviewerAssignedOnly (in mr_reviewers, no DiffNote by that user on MR/path) | 3 | 45 days |
-```
-
-```diff
-@@ Scoring Formula
--score = reviewer_mr * reviewer_weight + ...
-+score = reviewer_participated * reviewer_weight
-+      + reviewer_assigned_only * reviewer_assignment_weight
-+      + ...
-```
-
-2. **Cap/saturate note intensity per MR**
-Reason: raw per-note addition can still reward “comment storms.” Use diminishing returns.
-
-```diff
-@@ Rust-Side Aggregation
--- Notes: Vec<i64> (timestamps) from diffnote_reviewer
-+-- Notes grouped per (username, mr_id): note_count + max_ts
-+-- Note contribution per MR uses diminishing returns:
-+-- note_score_mr = note_bonus * ln(1 + note_count) * decay(now - ts, note_hl)
-```
-
-3. **Use better event timestamps than `m.updated_at` for file-change signals**
-Reason: `updated_at` is noisy (title edits, metadata touches) and creates false recency.
-
-```diff
-@@ SQL Restructure
-- signal 3/4 seen_at = m.updated_at
-+ signal 3/4 activity_ts = COALESCE(m.merged_at, m.closed_at, m.created_at, m.updated_at)
-```
-
-4. **Don’t stream raw note rows to Rust; pre-aggregate in SQL**
-Reason: current plan removes SQL grouping and can blow up memory/latency on large repos.
-
-```diff
-@@ SQL Restructure
--SELECT username, signal, mr_id, note_id, ts FROM signals
-+WITH raw_signals AS (...),
-+aggregated AS (
-+  -- 1 row per (username, signal_class, mr_id) for MR-level signals
-+  -- 1 row per (username, mr_id) for note_count + max_ts
-+)
-+SELECT username, signal_class, mr_id, qty, ts FROM aggregated
-```
-
-5. **Replace fixed `"24m"` with model-driven cutoff**
-Reason: hardcoded 24m is arbitrary and tied to current weights/half-lives only.
-
-```diff
-@@ Default --since Change
--Expert mode: "6m" -> "24m"
-+Expert mode default window derived from scoring.max_age_days (default 1095 days / 36m).
-+Formula guidance: choose max_age where max possible single-event contribution < epsilon (e.g. 0.25 points).
-+Add `--all-history` to disable cutoff for diagnostics.
-```
-
-6. **Validate scoring config explicitly**
-Reason: silent bad configs (`half_life_days = 0`, negative weights) create undefined behavior.
-
-```diff
-@@ ScoringConfig (config.rs)
- pub struct ScoringConfig {
-   pub author_weight: i64,
-   pub reviewer_weight: i64,
-   pub note_bonus: i64,
-+  pub reviewer_assignment_weight: i64,   // default: 3
-   pub author_half_life_days: u32,
-   pub reviewer_half_life_days: u32,
-   pub note_half_life_days: u32,
-+  pub reviewer_assignment_half_life_days: u32, // default: 45
-+  pub max_age_days: u32, // default: 1095
- }
-@@ Config::load_from_path
-+validate_scoring(&config.scoring)?; // weights >= 0, half_life_days > 0, max_age_days >= 30
-```
-
-7. **Keep raw float score internally; round only for display**
-Reason: rounding before sort causes avoidable ties/rank instability.
-
-```diff
-@@ Rust-Side Aggregation
--Round to i64 for Expert.score field
-+Compute `raw_score: f64`, sort by raw_score DESC.
-+Expose integer `score` for existing UX.
-+Optionally expose `score_raw` and `score_components` in robot JSON when `--explain-score`.
-```
-
-8. **Add confidence + data-completeness metadata**
-Reason: rankings are misleading if `mr_file_changes` coverage is poor.
-
-```diff
-@@ ExpertResult / Output
-+confidence: "high" | "medium" | "low"
-+coverage: { mrs_with_file_changes, total_mrs_in_window, percent }
-+warning when coverage < threshold (e.g. 70%)
-```
-
-```diff
-@@ Verification
- 4. cargo test
-+5. ubs src/cli/commands/who.rs src/core/config.rs
-+6. Benchmark query_expert on representative DB (latency + rows scanned before/after)
-```
-
-If you want, I can rewrite your full plan document into a clean “v2” version that already incorporates these diffs end-to-end.

plans/time-decay-expert-scoring.feedback-2.md

@@ -1,132 +0,0 @@
-The plan is strong, but I’d revise it in 10 places to improve correctness, scalability, and operator trust.
-
-1. **Add rename/old-path awareness (correctness gap)**
-Analysis: right now both existing code and your plan still center on `position_new_path` / `new_path` matches (`src/cli/commands/who.rs:643`, `src/cli/commands/who.rs:681`). That misses expertise on renamed/deleted paths and under-ranks long-time owners after refactors.
-
-```diff
-@@ ## Context
--This produces two compounding problems:
-+This produces three compounding problems:
-@@
- 2. **Reviewer inflation**: ...
-+3. **Path-history blindness**: Renamed/moved files lose historical expertise because matching relies on current-path fields only.
-
-@@ ### 3. SQL Restructure (who.rs)
--AND n.position_new_path {path_op}
-+AND (n.position_new_path {path_op} OR n.position_old_path {path_op})
-
--AND fc.new_path {path_op}
-+AND (fc.new_path {path_op} OR fc.old_path {path_op})
-```
-
-2. **Follow rename chains for queried paths**
-Analysis: matching `old_path` helps, but true continuity needs alias expansion (A→B→C). Without this, expertise before multi-hop renames is fragmented.
-
-```diff
-@@ ### 3. SQL Restructure (who.rs)
-+**Path alias expansion**: Before scoring, resolve a bounded rename alias set (default max depth: 20)
-+from `mr_file_changes(change_type='renamed')`. Query signals against all aliases.
-+Output includes `path_aliases_used` for transparency.
-```
-
-3. **Use hybrid SQL pre-aggregation instead of fully raw rows**
-Analysis: the “raw row” design is simpler but will degrade on large repos with heavy DiffNote volume. Pre-aggregating to `(user, mr)` for MR signals and `(user, mr, note_count)` for note signals keeps memory/latency predictable.
-
-```diff
-@@ ### 3. SQL Restructure (who.rs)
--The SQL CTE ... removes the outer GROUP BY aggregation. Instead, it returns raw signal rows:
--SELECT username, signal, mr_id, note_id, ts FROM signals
-+Use hybrid aggregation:
-+- SQL returns MR-level rows for author/reviewer signals (1 row per user+MR+signal_class)
-+- SQL returns note groups (1 row per user+MR with note_count, max_ts)
-+- Rust applies decay + ln(1+count) + final ranking.
-```
-
-4. **Make timestamp policy state-aware (merged vs opened)**
-Analysis: replacing `updated_at` with only `COALESCE(merged_at, created_at)` over-decays long-running open MRs. Open MRs need recency from active lifecycle; merged MRs should anchor to merge time.
-
-```diff
-@@ ### 3. SQL Restructure (who.rs)
--Replace m.updated_at with COALESCE(m.merged_at, m.created_at)
-+Use state-aware timestamp:
-+activity_ts =
-+  CASE
-+    WHEN m.state = 'merged' THEN COALESCE(m.merged_at, m.updated_at, m.created_at, m.last_seen_at)
-+    WHEN m.state = 'opened' THEN COALESCE(m.updated_at, m.created_at, m.last_seen_at)
-+  END
-```
-
-5. **Replace fixed `24m` with config-driven max age**
-Analysis: `24m` is reasonable now, but brittle after tuning weights/half-lives. Tie cutoff to config so model behavior remains coherent as parameters evolve.
-
-```diff
-@@ ### 1. ScoringConfig (config.rs)
-+pub max_age_days: u32,                  // default: 730 (or 1095)
-
-@@ ### 5. Default --since Change
--Expert mode: "6m" -> "24m"
-+Expert mode default window derives from `scoring.max_age_days`
-+unless user passes `--since` or `--all-history`.
-```
-
-6. **Add reproducible scoring time via `--as-of`**
-Analysis: decayed ranking is time-sensitive; debugging and tests become flaky without a fixed reference clock. This improves reliability and incident triage.
-
-```diff
-@@ ## Files to Modify
--2. src/cli/commands/who.rs
-+2. src/cli/commands/who.rs
-+3. src/cli/mod.rs
-+4. src/main.rs
-
-@@ ### 5. Default --since Change
-+Add `--as-of <RFC3339|YYYY-MM-DD>` to score at a fixed timestamp.
-+`resolved_input` includes `as_of_ms` and `as_of_iso`.
-```
-
-7. **Add explainability output (`--explain-score`)**
-Analysis: decayed multi-signal ranking will be disputed without decomposition. Show components and top evidence MRs to make results actionable and debuggable.
-
-```diff
-@@ ## Rejected Ideas (with rationale)
--- **`--explain-score` flag with component breakdown**: ... deferred
-+**Included in this iteration**: `--explain-score` adds per-user score components
-+(`author`, `review_participated`, `review_assigned`, `notes`) plus top evidence MRs.
-```
-
-8. **Add confidence/coverage metadata**
-Analysis: rankings can look precise while data is incomplete (`mr_file_changes` gaps, sparse DiffNotes). Confidence fields prevent false certainty.
-
-```diff
-@@ ### 4. Rust-Side Aggregation (who.rs)
-+Compute and emit:
-+- `coverage`: {mrs_considered, mrs_with_file_changes, mrs_with_diffnotes, percent}
-+- `confidence`: high|medium|low (threshold-based)
-```
-
-9. **Add index migration for new query shapes**
-Analysis: your new `EXISTS/NOT EXISTS` reviewer split and path dual-matching will need better indexes; current `who` indexes are not enough for author+path+time combinations.
-
-```diff
-@@ ## Files to Modify
-+3. **`migrations/021_who_decay_indexes.sql`** — indexes for decay query patterns:
-+   - notes(diffnote path + author + created_at + discussion_id) partial
-+   - notes(old_path variant) partial
-+   - mr_file_changes(project_id, new_path, merge_request_id)
-+   - mr_file_changes(project_id, old_path, merge_request_id) partial
-+   - merge_requests(state, merged_at, updated_at, created_at)
-```
-
-10. **Expand tests to invariants and determinism**
-Analysis: example-based tests are good, but ranking systems need invariant tests to avoid subtle regressions.
-
-```diff
-@@ ### 7. New Tests (TDD)
-+**`test_score_monotonicity_by_age`**: same signal, older timestamp never scores higher
-+**`test_row_order_independence`**: shuffled SQL row order yields identical ranking
-+**`test_as_of_reproducibility`**: same data + same `--as-of` => identical output
-+**`test_rename_alias_chain_scoring`**: expertise carries across A->B->C rename chain
-+**`test_overlap_participated_vs_assigned_counts`**: overlap reflects split reviewer semantics
-```
-
-If you want, I can produce a full consolidated `v2` plan doc patch (single unified diff against `plans/time-decay-expert-scoring.md`) rather than per-change snippets.

plans/time-decay-expert-scoring.feedback-3.md

@@ -1,167 +0,0 @@
-**Critical Plan Findings First**
-1. The proposed index `idx_notes_mr_path_author ON notes(noteable_id, ...)` will fail: `notes.noteable_id` does not exist in schema (`migrations/002_issues.sql:74`).
-2. Rename awareness is only applied in scoring queries, not in path resolution probes; today `build_path_query()` and `suffix_probe()` only inspect `position_new_path`/`new_path` (`src/cli/commands/who.rs:465`, `src/cli/commands/who.rs:591`), so old-path queries can still miss.
-3. A fixed `"24m"` default window is brittle once half-lives become configurable; it can silently truncate meaningful history for larger half-lives.
-
-Below are the revisions I’d make to your plan.
-
-1. **Fix migration/index architecture (blocking correctness + perf)**
-Rationale: prevents migration failure and aligns indexes to actual query shapes.
-```diff
-diff --git a/plan.md b/plan.md
-@@ ### 6. Index Migration (db.rs)
-- -- Support EXISTS subquery for reviewer participation check
-- CREATE INDEX IF NOT EXISTS idx_notes_mr_path_author
--   ON notes(noteable_id, position_new_path, author_username)
--   WHERE note_type = 'DiffNote' AND is_system = 0;
-+ -- Support reviewer participation joins (notes -> discussions -> MR)
-+ CREATE INDEX IF NOT EXISTS idx_notes_diffnote_discussion_author_created
-+   ON notes(discussion_id, author_username, created_at)
-+   WHERE note_type = 'DiffNote' AND is_system = 0;
-+
-+ -- Path-first indexes for global and project-scoped path lookups
-+ CREATE INDEX IF NOT EXISTS idx_mfc_new_path_project_mr
-+   ON mr_file_changes(new_path, project_id, merge_request_id);
-+ CREATE INDEX IF NOT EXISTS idx_mfc_old_path_project_mr
-+   ON mr_file_changes(old_path, project_id, merge_request_id)
-+   WHERE old_path IS NOT NULL;
-@@
-- -- Support state-aware timestamp selection
-- CREATE INDEX IF NOT EXISTS idx_mr_state_timestamps
--   ON merge_requests(state, merged_at, closed_at, updated_at, created_at);
-+ -- Removed: low-selectivity timestamp composite index; joins are MR-id driven.
-```
-
-2. **Restructure SQL around `matched_mrs` CTE instead of repeating OR path clauses**
-Rationale: better index use, less duplicated logic, cleaner maintenance.
-```diff
-diff --git a/plan.md b/plan.md
-@@ ### 3. SQL Restructure (who.rs)
-- WITH raw AS (
--   -- 5 UNION ALL subqueries (signals 1, 2, 3, 4a, 4b)
-- ),
-+ WITH matched_notes AS (
-+   -- DiffNotes matching new_path
-+   ...
-+   UNION ALL
-+   -- DiffNotes matching old_path
-+   ...
-+ ),
-+ matched_file_changes AS (
-+   -- file changes matching new_path
-+   ...
-+   UNION ALL
-+   -- file changes matching old_path
-+   ...
-+ ),
-+ matched_mrs AS (
-+   SELECT DISTINCT mr_id, project_id FROM matched_notes
-+   UNION
-+   SELECT DISTINCT mr_id, project_id FROM matched_file_changes
-+ ),
-+ raw AS (
-+   -- signals sourced from matched_mrs + matched_notes
-+ ),
-```
-
-3. **Replace correlated `EXISTS/NOT EXISTS` reviewer split with one precomputed participation set**
-Rationale: same semantics, lower query cost, easier reasoning.
-```diff
-diff --git a/plan.md b/plan.md
-@@ Signal 4 splits into two
-- Signal 4a uses an EXISTS subquery ...
-- Signal 4b uses NOT EXISTS ...
-+ Build `reviewer_participation(mr_id, username)` once from matched DiffNotes.
-+ Then classify `mr_reviewers` rows via LEFT JOIN:
-+ - participated: `rp.username IS NOT NULL`
-+ - assigned-only: `rp.username IS NULL`
-+ This avoids correlated EXISTS scans per reviewer row.
-```
-
-4. **Make default `--since` derived from half-life + decay floor, not hardcoded 24m**
-Rationale: remains mathematically consistent when config changes.
-```diff
-diff --git a/plan.md b/plan.md
-@@ ### 1. ScoringConfig (config.rs)
-+ pub decay_floor: f64, // default: 0.05
-@@ ### 5. Default --since Change
-- Expert mode: "6m" -> "24m"
-+ Expert mode default window is computed:
-+ default_since_days = ceil(max_half_life_days * log2(1.0 / decay_floor))
-+ With defaults (max_half_life=180, floor=0.05), this is ~26 months.
-+ CLI `--since` still overrides; `--all-history` still disables windowing.
-```
-
-5. **Use `log2(1+count)` for notes instead of `ln(1+count)`**
-Rationale: keeps 1 note ~= 1 unit (with `note_bonus=1`) while preserving diminishing returns.
-```diff
-diff --git a/plan.md b/plan.md
-@@ Scoring Formula
-- note_contribution(mr) = note_bonus * ln(1 + note_count_in_mr) * 2^(-days_elapsed / note_half_life)
-+ note_contribution(mr) = note_bonus * log2(1 + note_count_in_mr) * 2^(-days_elapsed / note_half_life)
-```
-
-6. **Guarantee deterministic float aggregation and expose `score_raw`**
-Rationale: avoids hash-order drift and explainability mismatch vs rounded integer score.
-```diff
-diff --git a/plan.md b/plan.md
-@@ ### 4. Rust-Side Aggregation (who.rs)
-- HashMap<i64, ...>
-+ BTreeMap<i64, ...> (or sort keys before accumulation) for deterministic summation order
-+ Use compensated summation (Kahan/Neumaier) for stable f64 totals
-@@
-- Sort on raw `f64` score ... round only for display
-+ Keep `score_raw` internally and expose when `--explain-score` is active.
-+ `score` remains integer for backward compatibility.
-```
-
-7. **Extend rename awareness to query resolution (not only scoring)**
-Rationale: fixes user-facing misses for old path input and suffix lookup.
-```diff
-diff --git a/plan.md b/plan.md
-@@ Path rename awareness
-- All signal subqueries match both old and new path columns
-+ Also update `build_path_query()` probes and suffix probe:
-+ - exact_exists: new_path OR old_path (notes + mr_file_changes)
-+ - prefix_exists: new_path LIKE OR old_path LIKE
-+ - suffix_probe: union of notes.position_new_path, notes.position_old_path,
-+   mr_file_changes.new_path, mr_file_changes.old_path
-```
-
-8. **Tighten CLI/output contracts for new flags**
-Rationale: avoids payload bloat/ambiguity and keeps robot clients stable.
-```diff
-diff --git a/plan.md b/plan.md
-@@ ### 5b. Score Explainability via `--explain-score`
-+ `--explain-score` conflicts with `--detail` (mutually exclusive)
-+ `resolved_input` includes `as_of_ms`, `as_of_iso`, `scoring_model_version`
-+ robot output includes `score_raw` and `components` only when explain is enabled
-```
-
-9. **Add confidence metadata (promote from rejected to accepted)**
-Rationale: makes ranking more actionable and trustworthy with sparse evidence.
-```diff
-diff --git a/plan.md b/plan.md
-@@ Rejected Ideas (with rationale)
-- Confidence/coverage metadata: ... Deferred to avoid scope creep
-+ Confidence/coverage metadata: ACCEPTED (minimal v1)
-+ Add per-user `confidence: low|medium|high` based on evidence breadth + recency.
-+ Keep implementation lightweight (no extra SQL pass).
-```
-
-10. **Upgrade test and verification scope to include query-plan and clock semantics**
-Rationale: catches regressions your current tests won’t.
-```diff
-diff --git a/plan.md b/plan.md
-@@ 8. New Tests (TDD)
-+ test_old_path_probe_exact_and_prefix
-+ test_suffix_probe_uses_old_path_sources
-+ test_since_relative_to_as_of_clock
-+ test_explain_and_detail_are_mutually_exclusive
-+ test_null_timestamp_fallback_to_created_at
-+ test_query_plan_uses_path_indexes (EXPLAIN QUERY PLAN)
-@@ Verification
-+ 7. EXPLAIN QUERY PLAN snapshots for expert query (exact + prefix) confirm index usage
-```
-
-If you want, I can produce a single consolidated “revision 3” plan document that fully merges all of the above into your original structure.

plans/time-decay-expert-scoring.feedback-4.md

@@ -1,133 +0,0 @@
-Your plan is already strong. The biggest remaining gaps are temporal correctness, indexability at scale, and ranking reliability under sparse/noisy evidence. These are the revisions I’d make.
-
-1. **Fix temporal correctness for `--as-of` (critical)**
-Analysis: Right now the plan describes `--as-of`, but the SQL only enforces lower bounds (`>= since`). If `as_of` is in the past, “future” events can still enter and get full weight (because elapsed is clamped). This breaks reproducibility.
-```diff
-@@ 3. SQL Restructure
-- AND n.created_at >= ?2
-+ AND n.created_at BETWEEN ?2 AND ?4
-@@ Signal 3/4a/4b
-- AND {state_aware_ts} >= ?2
-+ AND {state_aware_ts} BETWEEN ?2 AND ?4
-
-@@ 5a. Reproducible Scoring via --as-of
-- All decay computations use as_of_ms instead of SystemTime::now()
-+ All event selection and decay computations are bounded by as_of_ms.
-+ Query window is [since_ms, as_of_ms], never [since_ms, now_ms].
-+ Add test: test_as_of_excludes_future_events.
-```
-
-2. **Resolve `closed`-state inconsistency**
-Analysis: The CASE handles `closed`, but all signal queries filter to `('opened','merged')`, making the `closed_at` branch dead code. Either include closed MRs intentionally or remove that logic. I’d include closed with a reduced multiplier.
-```diff
-@@ ScoringConfig (config.rs)
-+ pub closed_mr_multiplier: f64, // default: 0.5
-
-@@ 3. SQL Restructure
-- AND m.state IN ('opened','merged')
-+ AND m.state IN ('opened','merged','closed')
-
-@@ 4. Rust-Side Aggregation
-+ if state == "closed" { contribution *= closed_mr_multiplier; }
-```
-
-3. **Replace `OR` path predicates with index-friendly `UNION ALL` branches**
-Analysis: `(new_path ... OR old_path ...)` often degrades index usage in SQLite. Split into two indexed branches and dedupe once. This improves planner stability and latency on large datasets.
-```diff
-@@ 3. SQL Restructure
--WITH matched_notes AS (
--  ... AND (n.position_new_path {path_op} OR n.position_old_path {path_op})
--),
-+WITH matched_notes AS (
-+  SELECT ... FROM notes n WHERE ... AND n.position_new_path {path_op}
-+  UNION ALL
-+  SELECT ... FROM notes n WHERE ... AND n.position_old_path {path_op}
-+),
-+matched_notes_dedup AS (
-+  SELECT DISTINCT id, discussion_id, author_username, created_at, project_id
-+  FROM matched_notes
-+),
-@@
-- JOIN matched_notes mn ...
-+ JOIN matched_notes_dedup mn ...
-```
-
-4. **Add canonical path identity (rename-chain support)**
-Analysis: Direct `old_path/new_path` matching only handles one-hop rename scenarios. A small alias graph/table built at ingest time gives robust expertise continuity across A→B→C chains and avoids repeated SQL complexity.
-```diff
-@@ Files to Modify
-- 3. src/core/db.rs — Add migration for indexes...
-+ 3. src/core/db.rs — Add migration for indexes + path_identity table
-+ 4. src/core/ingest/*.rs — populate path_identity on rename events
-+ 5. src/cli/commands/who.rs — resolve query path to canonical path_id first
-
-@@ Context
-- The fix has three parts:
-+ The fix has four parts:
-+ - Introduce canonical path identity so multi-hop renames preserve expertise
-```
-
-5. **Split scoring engine into a versioned core module**
-Analysis: `who.rs` is becoming a mixed CLI/query/math/output surface. Move scoring math and event normalization into `src/core/scoring/` with explicit model versions. This reduces regression risk and enables future model experiments.
-```diff
-@@ Files to Modify
-+ 4. src/core/scoring/mod.rs — model interface + shared types
-+ 5. src/core/scoring/model_v2_decay.rs — current implementation
-+ 6. src/cli/commands/who.rs — orchestration only
-
-@@ 5b. Score Explainability
-+ resolved_input includes scoring_model_version and scoring_model_name
-```
-
-6. **Add evidence confidence to reduce sparse-data rank spikes**
-Analysis: One recent MR can outrank broader, steadier expertise. Add a confidence factor derived from number of distinct evidence MRs and expose both `score_raw` and `score_adjusted`.
-```diff
-@@ Scoring Formula
-+ confidence(user) = 1 - exp(-evidence_mr_count / 6.0)
-+ score_adjusted = score_raw * confidence
-
-@@ 4. Rust-Side Aggregation
-+ compute evidence_mr_count from unique MR ids across all signals
-+ sort by score_adjusted DESC, then score_raw DESC, then last_seen DESC
-
-@@ 5b. --explain-score
-+ include confidence and evidence_mr_count
-```
-
-7. **Add first-class bot/service-account filtering**
-Analysis: Reviewer inflation is not just assignment; bots and automation users can still pollute rankings. Make exclusion explicit and configurable.
-```diff
-@@ ScoringConfig (config.rs)
-+ pub excluded_username_patterns: Vec<String>, // defaults include "*bot*", "renovate", "dependabot"
-
-@@ 3. SQL Restructure
-+ AND username NOT MATCHES excluded patterns (applied in Rust post-query or SQL where feasible)
-
-@@ CLI
-+ --include-bots (override exclusions)
-```
-
-8. **Tighten reviewer “participated” with substantive-note threshold**
-Analysis: A single “LGTM” note shouldn’t classify someone as engaged reviewer equivalent to real inline review. Use a minimum substantive threshold.
-```diff
-@@ ScoringConfig (config.rs)
-+ pub reviewer_min_note_chars: u32, // default: 20
-
-@@ reviewer_participation CTE
-- SELECT DISTINCT ... FROM matched_notes
-+ SELECT DISTINCT ... FROM matched_notes
-+ WHERE LENGTH(TRIM(body)) >= ?reviewer_min_note_chars
-```
-
-9. **Add rollout safety: model compare mode + rank-delta diagnostics**
-Analysis: This is a scoring-model migration. You need safe rollout mechanics, not just tests. Add a compare mode so you can inspect rank deltas before forcing v2.
-```diff
-@@ CLI (who)
-+ --scoring-model v1|v2|compare   (default: v2)
-+ --max-rank-delta-report N       (compare mode diagnostics)
-
-@@ Robot output
-+ include v1_score, v2_score, rank_delta when --scoring-model compare
-```
-
-If you want, I can produce a single consolidated “plan v4” document that applies all nine diffs cleanly into your original markdown.

plans/tui-prd-v2-frankentui.feedback-1.md

@@ -1,209 +0,0 @@
-No `## Rejected Recommendations` section was present, so these are all net-new improvements.
-
-1. Keep core `lore` stable; isolate nightly to a TUI crate  
-Rationale: the current plan says “whole project nightly” but later assumes TUI is feature-gated. Isolating nightly removes unnecessary risk from non-TUI users, CI, and release cadence.
-
-```diff
-@@ 3.2 Nightly Rust Strategy
--- The entire gitlore project moves to pinned nightly, not just the TUI feature.
-+- Keep core `lore` on stable Rust.
-+- Add workspace member `lore-tui` pinned to nightly for FrankenTUI.
-+- Ship `lore tui` only when `--features tui` (or separate `lore-tui` binary) is enabled.
-
-@@ 10.1 New Files
-+- crates/lore-tui/Cargo.toml
-+- crates/lore-tui/src/main.rs
-
-@@ 11. Assumptions
--17. TUI module is feature-gated.
-+17. TUI is isolated in a workspace crate and feature-gated in root CLI integration.
-```
-
-2. Add a framework adapter boundary from day 1  
-Rationale: the “3-day ratatui escape hatch” is optimistic without a strict interface. A tiny `UiRuntime` + screen renderer trait makes fallback real, not aspirational.
-
-```diff
-@@ 4. Architecture
-+### 4.9 UI Runtime Abstraction
-+Introduce `UiRuntime` trait (`run`, `send`, `subscribe`) and `ScreenRenderer` trait.
-+FrankenTUI implementation is default; ratatui adapter can be dropped in with no state/action rewrite.
-
-@@ 3.5 Escape Hatch
--- The migration cost to ratatui is ~3 days
-+- Migration cost target is ~3-5 days, validated by one ratatui spike screen in Phase 1.
-```
-
-3. Stop using CLI command modules as the TUI query API  
-Rationale: coupling TUI to CLI output-era structs creates long-term friction and accidental regressions. Create a shared domain query layer used by both CLI and TUI.
-
-```diff
-@@ 10.20 Refactor: Extract Query Functions
--- extract query_* from cli/commands/*
-+- introduce `src/domain/query/*` as the canonical read model API.
-+- CLI and TUI both depend on domain query layer.
-+- CLI modules retain formatting/output only.
-
-@@ 10.2 Modified Files
-+- src/domain/query/mod.rs
-+- src/domain/query/issues.rs
-+- src/domain/query/mrs.rs
-+- src/domain/query/search.rs
-+- src/domain/query/who.rs
-```
-
-4. Replace single `Arc<Mutex<Connection>>` with connection manager  
-Rationale: one locked connection serializes everything and hurts responsiveness, especially during sync. Use separate read pool + writer connection with WAL and busy timeout.
-
-```diff
-@@ 4.4 App — Implementing the Model Trait
-- pub db: Arc<Mutex<Connection>>,
-+ pub db: Arc<DbManager>, // read pool + single writer coordination
-
-@@ 4.5 Async Action System
-- Each Cmd::task closure locks the mutex, runs the query, and returns a Msg
-+ Reads use pooled read-only connections.
-+ Sync/write path uses dedicated writer connection.
-+ Enforce WAL, busy_timeout, and retry policy for SQLITE_BUSY.
-```
-
-5. Make debouncing/cancellation explicit and correct  
-Rationale: “runtime coalesces rapid keypresses” is not a safe correctness guarantee. Add request IDs and stale-response dropping to prevent flicker and wrong data.
-
-```diff
-@@ 4.3 Core Types (Msg)
-+ SearchRequestStarted { request_id: u64, query: String }
-- SearchExecuted(SearchResults),
-+ SearchExecuted { request_id: u64, results: SearchResults },
-
-@@ 4.4 maybe_debounced_query()
-- runtime coalesces rapid keypresses
-+ use explicit 200ms debounce timer + monotonic request_id
-+ ignore results whose request_id != current_search_request_id
-```
-
-6. Implement true streaming sync, not batch-at-end pseudo-streaming  
-Rationale: the plan promises real-time logs/progress but code currently returns one completion message. This gap will disappoint users and complicate cancellation.
-
-```diff
-@@ 4.4 start_sync_task()
-- Pragmatic approach: run sync synchronously, collect all progress events, return summary.
-+ Use event channel subscription for `SyncProgress`/`SyncLogLine` streaming.
-+ Keep `SyncCompleted` only as terminal event.
-+ Add cooperative cancel token mapped to `Esc` while running.
-
-@@ 5.9 Sync
-+ Add "Resume from checkpoint" option for interrupted syncs.
-```
-
-7. Fix entity identity ambiguity across projects  
-Rationale: using `iid` alone is unsafe in multi-project datasets. Navigation and cross-refs should key by `(project_id, iid)` or global ID.
-
-```diff
-@@ 4.3 Core Types
-- IssueDetail(i64)
-- MrDetail(i64)
-+ IssueDetail(EntityKey)
-+ MrDetail(EntityKey)
-
-+ pub struct EntityKey { pub project_id: i64, pub iid: i64, pub kind: EntityKind }
-
-@@ 10.12.4 Cross-Reference Widget
-- parse "group/project#123" -> iid only
-+ parse into `{project_path, iid, kind}` then resolve to `project_id` before navigation
-```
-
-8. Resolve keybinding conflicts and formalize keymap precedence  
-Rationale: current spec conflicts (`Tab` sort vs focus filter; `gg` vs go-prefix). A deterministic keymap contract prevents UX bugs.
-
-```diff
-@@ 8.2 List Screens
-- Tab | Cycle sort column
-- f   | Focus filter bar
-+ Tab | Focus filter bar
-+ S   | Cycle sort column
-+ /   | Focus filter bar (alias)
-
-@@ 4.4 interpret_key()
-+ Add explicit precedence table:
-+ 1) modal/palette
-+ 2) focused input
-+ 3) global
-+ 4) screen-local
-+ Add configurable go-prefix timeout (default 500ms) with cancel feedback.
-```
-
-9. Add performance SLOs and DB/index plan  
-Rationale: “fast enough” is vague. Add measurable budgets, required indexes, and query-plan gates in CI for predictable performance.
-
-```diff
-@@ 3.1 Risk Matrix
-+ Add risk: "Query latency regressions on large datasets"
-
-@@ 9.3 Phase 0 — Toolchain Gate
-+7. p95 list query latency < 75ms on 100k issues synthetic fixture
-+8. p95 search latency < 200ms on 1M docs (lexical mode)
-
-@@ 11. Assumptions
--5. SQLite queries are fast enough for interactive use (<50ms for filtered results).
-+5. Performance budgets are enforced by benchmark fixtures and query-plan checks.
-+6. Required indexes documented and migration-backed before TUI GA.
-```
-
-10. Add reliability/observability model (error classes, retries, tracing)  
-Rationale: one string toast is not enough for production debugging. Add typed errors, retry policy, and an in-TUI diagnostics pane.
-
-```diff
-@@ 4.3 Core Types (Msg)
-- Error(String),
-+ Error(AppError),
-
-+ pub enum AppError {
-+   DbBusy, DbCorruption, NetworkRateLimited, NetworkUnavailable,
-+   AuthFailed, ParseError, Internal(String)
-+ }
-
-@@ 5.11 Doctor / Stats
-+ Add "Diagnostics" tab:
-+ - last 100 errors
-+ - retry counts
-+ - current sync/backoff state
-+ - DB contention metrics
-```
-
-11. Add “Saved Views + Watchlist” as high-value product features  
-Rationale: this makes the TUI compelling daily, not just navigable. Users can persist filters and monitor critical slices (e.g., “P1 auth issues updated in last 24h”).
-
-```diff
-@@ 1. Executive Summary
-+ - Saved Views (named filters and layouts)
-+ - Watchlist panel (tracked queries with delta badges)
-
-@@ 5. Screen Taxonomy
-+### 5.12 Saved Views / Watchlist
-+Persistent named filters for Issues/MRs/Search.
-+Dashboard shows per-watchlist deltas since last session.
-
-@@ 6. User Flows
-+### 6.9 Flow: "Run morning watchlist triage"
-+Dashboard -> Watchlist -> filtered IssueList/MRList -> detail drilldown
-```
-
-12. Strengthen testing plan with deterministic behavior and chaos cases  
-Rationale: snapshot tests alone won’t catch race/staleness/cancellation issues. Add concurrency, cancellation, and flaky terminal behavior tests.
-
-```diff
-@@ 9.2 Phases
-+Phase 5.5 Reliability Test Pack (2d)
-+ - stale response drop tests
-+ - sync cancel/resume tests
-+ - SQLITE_BUSY retry tests
-+ - resize storm and rapid key-chord tests
-
-@@ 10.9 Snapshot Test Example
-+ Add non-snapshot tests:
-+ - property tests for navigation invariants
-+ - integration tests for request ordering correctness
-+ - benchmark tests for query budgets
-```
-
-If you want, I can produce a consolidated “PRD v2.1 patch” with all of the above merged into one coherent updated document structure.

plans/tui-prd-v2-frankentui.feedback-2.md

@@ -1,203 +0,0 @@
-I excluded the two items in your `## Rejected Recommendations` and focused on net-new improvements.  
-These are the highest-impact revisions I’d make.
-
-### 1. Fix the package graph now (avoid a hard Cargo cycle)
-Your current plan has `root -> optional lore-tui` and `lore-tui -> lore (root)`, which creates a cyclic dependency risk. Split shared logic into a dedicated core crate so CLI and TUI both depend downward.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ ## 9.1 Dependency Changes
--[workspace]
--members = [".", "crates/lore-tui"]
-+[workspace]
-+members = [".", "crates/lore-core", "crates/lore-tui"]
-
-@@
--[dependencies]
--lore-tui = { path = "crates/lore-tui", optional = true }
-+[dependencies]
-+lore-core = { path = "crates/lore-core" }
-+lore-tui = { path = "crates/lore-tui", optional = true }
-
-@@ # crates/lore-tui/Cargo.toml
--lore = { path = "../.." }  # Core lore library
-+lore-core = { path = "../lore-core" }  # Shared domain/query crate (acyclic graph)
-```
-
-### 2. Stop coupling TUI to `cli/commands/*` internals
-Calling CLI command modules from TUI is brittle and will drift. Introduce a shared query/service layer with DTOs owned by core.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ ## 4.1 Module Structure
--    action.rs                     # Async action runners (DB queries, GitLab calls)
-+    action.rs                     # Task dispatch only
-+    service/
-+      mod.rs
-+      query.rs                    # Shared read services (CLI + TUI)
-+      sync.rs                     # Shared sync orchestration facade
-+      dto.rs                      # UI-agnostic data contracts
-
-@@ ## 10.2 Modified Files
--src/cli/commands/list.rs               # Extract query_issues(), query_mrs() as pub fns
--src/cli/commands/show.rs               # Extract query_issue_detail(), query_mr_detail() as pub fns
--src/cli/commands/who.rs                # Extract query_experts(), etc. as pub fns
--src/cli/commands/search.rs             # Extract run_search_query() as pub fn
-+crates/lore-core/src/query/issues.rs   # Canonical issue queries
-+crates/lore-core/src/query/mrs.rs      # Canonical MR queries
-+crates/lore-core/src/query/show.rs     # Canonical detail queries
-+crates/lore-core/src/query/who.rs      # Canonical people queries
-+crates/lore-core/src/query/search.rs   # Canonical search queries
-+src/cli/commands/*.rs                  # Consume lore-core query services
-+crates/lore-tui/src/action.rs          # Consume lore-core query services
-```
-
-### 3. Add a real task supervisor (dedupe + cancellation + priority)
-Right now tasks are ad hoc and can overrun each other. Add a scheduler keyed by screen+intent.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ ## 4.5 Async Action System
--The `Cmd::task(|| { ... })` pattern runs a blocking closure on a background thread pool.
-+The TUI uses a `TaskSupervisor`:
-+- Keyed tasks (`TaskKey`) to dedupe redundant requests
-+- Priority lanes (`Input`, `Navigation`, `Background`)
-+- Cooperative cancellation tokens per task
-+- Late-result drop via generation IDs (not just search)
-
-@@ ## 4.3 Core Types
-+pub enum TaskKey {
-+    LoadScreen(Screen),
-+    Search { generation: u64 },
-+    SyncStream,
-+}
-```
-
-### 4. Correct sync streaming architecture (current sketch loses streamed events)
-The sample creates `tx/rx` then drops `rx`; events never reach update loop. Define an explicit stream subscription with bounded queue and backpressure policy.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ ## 4.4 App — Implementing the Model Trait
--        let (tx, _rx) = std::sync::mpsc::channel::<Msg>();
-+        let (tx, rx) = std::sync::mpsc::sync_channel::<Msg>(1024);
-+        // rx is registered via Subscription::from_receiver("sync-stream", rx)
-
-@@
--            let result = crate::ingestion::orchestrator::run_sync(
-+            let result = crate::ingestion::orchestrator::run_sync(
-                 &config,
-                 &conn,
-                 |event| {
-@@
--                    let _ = tx.send(Msg::SyncProgress(event.clone()));
--                    let _ = tx.send(Msg::SyncLogLine(format!("{event:?}")));
-+                    if tx.try_send(Msg::SyncProgress(event.clone())).is_err() {
-+                        let _ = tx.try_send(Msg::SyncBackpressureDrop);
-+                    }
-+                    let _ = tx.try_send(Msg::SyncLogLine(format!("{event:?}")));
-                 },
-             );
-```
-
-### 5. Upgrade data-plane performance plan (keyset pagination + index contracts)
-Virtualized list without keyset paging still forces expensive scans. Add explicit keyset pagination and query-plan CI checks.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ ## 9.3 Phase 0 — Toolchain Gate
--7. p95 list query latency < 75ms on synthetic fixture (10k issues, 5k MRs)
-+7. p95 list page fetch latency < 75ms using keyset pagination (10k issues, 5k MRs)
-+8. EXPLAIN QUERY PLAN must show index usage for top 10 TUI queries
-+9. No full table scan on issues/MRs/discussions under default filters
-
-@@
--8. p95 search latency < 200ms on synthetic fixture (50k documents, lexical mode)
-+10. p95 search latency < 200ms on synthetic fixture (50k documents, lexical mode)
-
-+## 9.4 Required Indexes (GA blocker)
-+- `issues(project_id, state, updated_at DESC, iid DESC)`
-+- `merge_requests(project_id, state, updated_at DESC, iid DESC)`
-+- `discussions(project_id, entity_type, entity_iid, created_at DESC)`
-+- `notes(discussion_id, created_at ASC)`
-```
-
-### 6. Enforce `EntityKey` everywhere (remove bare IID paths)
-You correctly identified multi-project IID collisions, but many message/state signatures still use `i64`. Make `EntityKey` mandatory in all navigation and detail loaders.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ ## 4.3 Core Types
--    IssueSelected(i64),
-+    IssueSelected(EntityKey),
-@@
--    MrSelected(i64),
-+    MrSelected(EntityKey),
-@@
--    IssueDetailLoaded(IssueDetail),
-+    IssueDetailLoaded { key: EntityKey, detail: IssueDetail },
-@@
--    MrDetailLoaded(MrDetail),
-+    MrDetailLoaded { key: EntityKey, detail: MrDetail },
-
-@@ ## 10.10 State Module — Complete
--                Cmd::msg(Msg::NavigateTo(Screen::IssueDetail(iid)))
-+                Cmd::msg(Msg::NavigateTo(Screen::IssueDetail(entity_key)))
-```
-
-### 7. Harden filter/search semantics (strict parser + inline diagnostics + explain scores)
-Current filter parser silently ignores unknown fields; that causes hidden mistakes. Add strict parse diagnostics and search score explainability.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ ## 10.12.1 Filter Bar Widget
--                _ => {} // Unknown fields silently ignored
-+                _ => self.errors.push(format!("Unknown filter field: {}", token.field))
-
-+    pub errors: Vec<String>,   // inline parse/validation errors
-+    pub warnings: Vec<String>, // non-fatal coercions
-
-@@ ## 5.6 Search
--- **Live preview:** Selected result shows snippet + metadata in right pane
-+- **Live preview:** Selected result shows snippet + metadata in right pane
-+- **Explain score:** Optional breakdown (lexical, semantic, recency, boosts) for trust/debug
-```
-
-### 8. Add operational resilience: safe mode + panic report + startup fallback
-TUI failures should degrade gracefully, not block usage.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ ## 3.1 Risk Matrix
-+| Runtime panic leaves user blocked | High | Medium | Panic hook writes crash report, restores terminal, offers fallback CLI command |
-
-@@ ## 10.3 Entry Point
-+pub fn launch_tui(config: Config, db_path: &Path) -> Result<(), LoreError> {
-+    install_panic_hook_for_tui(); // terminal restore + crash dump path
-+    ...
-+}
-
-@@ ## 8.1 Global (Available Everywhere)
-+| `:` | Show fallback equivalent CLI command for current screen/action |
-```
-
-### 9. Add a “jump list” (forward/back navigation, not only stack pop)
-Current model has only push/pop and reset. Add browser-like history for investigation workflows.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ ## 4.7 Navigation Stack Implementation
- pub struct NavigationStack {
--    stack: Vec<Screen>,
-+    back_stack: Vec<Screen>,
-+    current: Screen,
-+    forward_stack: Vec<Screen>,
-+    jump_list: Vec<Screen>, // recent entity/detail hops
- }
-
-@@ ## 8.1 Global (Available Everywhere)
-+| `Ctrl+o` | Jump backward in jump list |
-+| `Ctrl+i` | Jump forward in jump list |
-```
-
-If you want, I can produce a single consolidated “PRD v2.1” patch that applies all nine revisions coherently section-by-section.

plans/tui-prd-v2-frankentui.feedback-3.md

@@ -1,163 +0,0 @@
-I excluded everything already listed in `## Rejected Recommendations`.  
-These are the highest-impact net-new revisions I’d make.
-
-1. **Enforce Entity Identity Consistency End-to-End (P0)**
-Analysis: The PRD defines `EntityKey`, but many code paths still pass bare `iid` (`IssueSelected(item.iid)`, timeline refs, search refs). In multi-project datasets this will cause wrong-entity navigation and subtle data corruption in cached state. Make `EntityKey` mandatory in every navigation message and add compile-time constructors.
-```diff
-@@ 4.3 Core Types
- pub struct EntityKey {
-     pub project_id: i64,
-     pub iid: i64,
-     pub kind: EntityKind,
- }
-+impl EntityKey {
-+    pub fn issue(project_id: i64, iid: i64) -> Self { Self { project_id, iid, kind: EntityKind::Issue } }
-+    pub fn mr(project_id: i64, iid: i64) -> Self { Self { project_id, iid, kind: EntityKind::MergeRequest } }
-+}
-
-@@ 10.10 state/issue_list.rs
-- .map(|item| Msg::IssueSelected(item.iid))
-+ .map(|item| Msg::IssueSelected(EntityKey::issue(item.project_id, item.iid)))
-
-@@ 10.10 state/mr_list.rs
-- .map(|item| Msg::MrSelected(item.iid))
-+ .map(|item| Msg::MrSelected(EntityKey::mr(item.project_id, item.iid)))
-```
-
-2. **Make TaskSupervisor Mandatory for All Background Work (P0)**
-Analysis: The plan introduces `TaskSupervisor` but still dispatches many direct `Cmd::task` calls. That will reintroduce stale updates, duplicate queries, and priority inversion under rapid input. Centralize all background task creation through one spawn path that enforces dedupe, cancellation tokening, and generation checks.
-```diff
-@@ 4.5.1 Task Supervisor (Dedup + Cancellation + Priority)
--The supervisor is owned by `LoreApp` and consulted before dispatching any `Cmd::task`.
-+The supervisor is owned by `LoreApp` and is the ONLY allowed path for background work.
-+All task launches use `LoreApp::spawn_task(TaskKey, TaskPriority, closure)`.
-
-@@ 4.4 App — Implementing the Model Trait
-- Cmd::task(move || { ... })
-+ self.spawn_task(TaskKey::LoadScreen(screen.clone()), TaskPriority::Navigation, move |token| { ... })
-```
-
-3. **Remove the Sync Streaming TODO and Make Real-Time Streaming a GA Gate (P0)**
-Analysis: Current text admits sync progress is buffered with a TODO. That undercuts one of the main value props. Make streaming progress/log delivery non-optional, with bounded buffers and dropped-line accounting.
-```diff
-@@ 4.4 start_sync_task()
-- // TODO: Register rx as subscription when FrankenTUI supports it.
-- // For now, the task returns the final Msg and progress is buffered.
-+ // Register rx as a live subscription (`Subscription::from_receiver` adapter).
-+ // Progress and logs must render in real time (no batch-at-end fallback).
-+ // Keep a bounded ring buffer (N=5000) and surface `dropped_log_lines` in UI.
-
-@@ 9.3 Phase 0 — Toolchain Gate
-+11. Real-time sync stream verified: progress updates visible during run, not only at completion.
-```
-
-4. **Upgrade List/Search Data Strategy to Windowed Keyset + Prefetch (P0)**
-Analysis: “Virtualized list” alone does not solve query/transfer cost if full result sets are loaded. Move to fixed-size keyset windows with next-window prefetch and fast first paint; this keeps latency predictable on 100k+ records.
-```diff
-@@ 5.2 Issue List
-- Pagination: Virtual scrolling for large result sets
-+ Pagination: Windowed keyset pagination (window=200 rows) with background prefetch of next window.
-+ First paint uses current window only; no full-result materialization.
-
-@@ 5.4 MR List
-+ Same windowed keyset pagination strategy as Issue List.
-
-@@ 9.3 Success criteria
-- 7. p95 list page fetch latency < 75ms using keyset pagination on synthetic fixture (10k issues, 5k MRs)
-+ 7. p95 first-paint latency < 50ms and p95 next-window fetch < 75ms on synthetic fixture (100k issues, 50k MRs)
-```
-
-5. **Add Resumable Sync Checkpoints + Per-Project Fault Isolation (P1)**
-Analysis: If sync is interrupted or one project fails, current design mostly falls back to cancel/fail. Add checkpoints so long runs can resume, and isolate failures to project/resource scope while continuing others.
-```diff
-@@ 3.1 Risk Matrix
-+| Interrupted sync loses progress | High | Medium | Persist phase checkpoints and offer resume |
-
-@@ 5.9 Sync
-+Running mode: failed project/resource lanes are marked degraded while other lanes continue.
-+Summary mode: offer `[R]esume interrupted sync` from last checkpoint.
-
-@@ 11 Assumptions
--16. No new SQLite tables needed (but required indexes must be verified — see Performance SLOs).
-+16. Add minimal internal tables for reliability: `sync_runs` and `sync_checkpoints` (append-only metadata).
-```
-
-6. **Add Capability-Adaptive Rendering Modes (P1)**
-Analysis: Terminal compatibility is currently test-focused, but runtime adaptation is under-specified. Add explicit degradations for no-truecolor, no-unicode, slow SSH/tmux paths to reduce rendering artifacts and support incidents.
-```diff
-@@ 3.4 Terminal Compatibility Testing
-+Add capability matrix validation: truecolor/256/16 color, unicode/ascii glyphs, alt-screen on/off.
-
-@@ 10.19 CLI Integration
-+Tui {
-+  #[arg(long, default_value="auto")] render_mode: String, // auto|full|minimal
-+  #[arg(long)] ascii: bool,
-+  #[arg(long)] no_alt_screen: bool,
-+}
-```
-
-7. **Harden Browser/Open and Log Privacy (P1)**
-Analysis: `open_current_in_browser` currently trusts stored URLs; sync logs may expose tokens/emails from upstream messages. Add host allowlisting and redaction pipeline by default.
-```diff
-@@ 4.4 open_current_in_browser()
-- if let Some(url) = url { ... open ... }
-+ if let Some(url) = url {
-+   if !self.state.security.is_allowed_gitlab_url(&url) {
-+     self.state.set_error("Blocked non-GitLab URL".into());
-+     return;
-+   }
-+   ... open ...
-+ }
-
-@@ 5.9 Sync
-+Log stream passes through redaction (tokens, auth headers, email local-parts) before render/storage.
-```
-
-8. **Add “My Workbench” Screen for Daily Pull (P1, new feature)**
-Analysis: The PRD is strong on exploration, weaker on “what should I do now?”. Add a focused operator screen aggregating assigned issues, requested reviews, unresolved threads mentioning me, and stale approvals. This makes the TUI habit-forming.
-```diff
-@@ 5. Screen Taxonomy
-+### 5.12 My Workbench
-+Single-screen triage cockpit:
-+- Assigned-to-me open issues/MRs
-+- Review requests awaiting action
-+- Threads mentioning me and unresolved
-+- Recently stale approvals / blocked MRs
-
-@@ 8.1 Global
-+| `gb` | Go to My Workbench |
-
-@@ 9.2 Phases
-+section Phase 3.5 — Daily Workflow
-+My Workbench screen + queries :p35a, after p3d, 2d
-```
-
-9. **Add Rollout, SLO Telemetry, and Kill-Switch Plan (P0)**
-Analysis: You have implementation phases but no production rollout control. Add explicit experiment flags, health telemetry, and rollback criteria so risk is operationally bounded.
-```diff
-@@ Table of Contents
--11. [Assumptions](#11-assumptions)
-+11. [Assumptions](#11-assumptions)
-+12. [Rollout & Telemetry](#12-rollout--telemetry)
-
-@@ NEW SECTION 12
-+## 12. Rollout & Telemetry
-+- Feature flags: `tui_experimental`, `tui_sync_streaming`, `tui_workbench`
-+- Metrics: startup_ms, frame_render_p95_ms, db_busy_rate, panic_free_sessions, sync_drop_events
-+- Kill-switch: disable `tui` feature path at runtime if panic rate > 0.5% sessions over 24h
-+- Canary rollout: internal only -> opt-in beta -> default-on
-```
-
-10. **Strengthen Reliability Pack with Event-Fuzz + Soak Tests (P0)**
-Analysis: Current tests are good but still light on prolonged event pressure. Add deterministic fuzzed key/resize/paste streams and a long soak to catch rare deadlocks/leaks and state corruption.
-```diff
-@@ 9.2 Phase 5.5 — Reliability Test Pack
-+Event fuzz tests (key/resize/paste interleavings) :p55g, after p55e, 1d
-+30-minute soak test (no panic, bounded memory)    :p55h, after p55g, 1d
-
-@@ 9.3 Success criteria
-+12. Event-fuzz suite passes with zero invariant violations across 10k randomized traces.
-+13. 30-minute soak: no panic, no deadlock, memory growth < 5%.
-```
-
-If you want, I can produce a single consolidated unified diff of the full PRD text next (all edits merged, ready to apply as v3).

plans/tui-prd-v2-frankentui.feedback-4.md

@@ -1,157 +0,0 @@
-Below are my strongest revisions, focused on correctness, reliability, and long-term maintainability, while avoiding all items in your `## Rejected Recommendations`.
-
-1. **Fix the Cargo/toolchain architecture (current plan has a real dependency-cycle risk and shaky per-member toolchain behavior).**  
-Analysis: The current plan has `lore -> lore-tui (optional)` and `lore-tui -> lore`, which creates a package cycle when `tui` is enabled. Also, per-member `rust-toolchain.toml` in a workspace is easy to misapply in CI/dev workflows. The cleanest robust shape is: `lore-tui` is a separate binary crate (nightly), `lore` remains stable and delegates at runtime (`lore tui` shells out to `lore-tui`).  
-```diff
---- a/Gitlore_TUI_PRD_v2.md
-+++ b/Gitlore_TUI_PRD_v2.md
-@@ 3.2 Nightly Rust Strategy
--- The `lore` binary integrates TUI via `lore tui` subcommand. The `lore-tui` crate is a library dependency feature-gated in the root.
-+- `lore-tui` is a separate binary crate built on pinned nightly.
-+- `lore` (stable) does not compile-link `lore-tui`; `lore tui` delegates by spawning `lore-tui`.
-+- This removes Cargo dependency-cycle risk and keeps stable builds nightly-free.
-@@ 9.1 Dependency Changes
--[features]
--tui = ["dep:lore-tui"]
--[dependencies]
--lore-tui = { path = "crates/lore-tui", optional = true }
-+[dependencies]
-+# no compile-time dependency on lore-tui from lore
-+# runtime delegation keeps toolchains isolated
-@@ 10.19 CLI Integration
--Add Tui match arm that directly calls crate::tui::launch_tui(...)
-+Add Tui match arm that resolves and spawns `lore-tui` with passthrough args.
-+If missing, print actionable install/build command.
-```
-
-2. **Make `TaskSupervisor` the *actual* single async path (remove contradictory direct `Cmd::task` usage in state handlers).**  
-Analysis: You declare “direct `Cmd::task` is prohibited outside supervisor,” but later `handle_screen_msg` still launches tasks directly. That contradiction will reintroduce stale-result bugs and race conditions. Make state handlers pure (intent-only); all async launch/cancel/dedup goes through one supervised API.  
-```diff
---- a/Gitlore_TUI_PRD_v2.md
-+++ b/Gitlore_TUI_PRD_v2.md
-@@ 4.5.1 Task Supervisor
--The supervisor is the ONLY allowed path for background work.
-+The supervisor is the ONLY allowed path for background work, enforced by architecture:
-+`AppState` emits intents only; `LoreApp::update` launches tasks via `spawn_task(...)`.
-@@ 10.10 State Module — Complete
--pub fn handle_screen_msg(..., db: &Arc<Mutex<Connection>>) -> Cmd<Msg>
-+pub fn handle_screen_msg(...) -> ScreenIntent
-+// no DB access, no Cmd::task in state layer
-```
-
-3. **Enforce `EntityKey` everywhere (remove raw IID navigation paths).**  
-Analysis: Multi-project identity is one of your strongest ideas, but multiple snippets still navigate by bare IID (`document_id`, `EntityRef::Issue(i64)`). That can misroute across projects and create silent correctness bugs. Make all navigation-bearing results carry `EntityKey` end-to-end.  
-```diff
---- a/Gitlore_TUI_PRD_v2.md
-+++ b/Gitlore_TUI_PRD_v2.md
-@@ 4.3 Core Types
--pub enum EntityRef { Issue(i64), MergeRequest(i64) }
-+pub enum EntityRef { Issue(EntityKey), MergeRequest(EntityKey) }
-@@ 10.10 state/search.rs
--Some(Msg::NavigateTo(Screen::IssueDetail(r.document_id)))
-+Some(Msg::NavigateTo(Screen::IssueDetail(r.entity_key.clone())))
-@@ 10.11 action.rs
--pub fn fetch_issue_detail(conn: &Connection, iid: i64) -> Result<IssueDetail, LoreError>
-+pub fn fetch_issue_detail(conn: &Connection, key: &EntityKey) -> Result<IssueDetail, LoreError>
-```
-
-4. **Introduce a shared query boundary inside the existing crate (not a new crate) to decouple TUI from CLI presentation structs.**  
-Analysis: Reusing CLI command modules directly is fast initially, but it ties TUI to output-layer types and command concerns. A minimal internal `core::query::*` module gives a stable data contract used by both CLI and TUI without the overhead of a new crate split.  
-```diff
---- a/Gitlore_TUI_PRD_v2.md
-+++ b/Gitlore_TUI_PRD_v2.md
-@@ 10.2 Modified Files
--src/cli/commands/list.rs   # extract query_issues/query_mrs as pub
--src/cli/commands/show.rs   # extract query_issue_detail/query_mr_detail as pub
-+src/core/query/mod.rs
-+src/core/query/issues.rs
-+src/core/query/mrs.rs
-+src/core/query/detail.rs
-+src/core/query/search.rs
-+src/core/query/who.rs
-+src/cli/commands/* now call core::query::* + format output
-+TUI action.rs calls core::query::* directly
-```
-
-5. **Add terminal-safety sanitization for untrusted text (ANSI/OSC injection hardening).**  
-Analysis: Issue/MR bodies, notes, and logs are untrusted text in a terminal context. Without sanitization, terminal escape/control sequences can spoof UI or trigger unintended behavior. Add explicit sanitization and a strict URL policy before rendering/opening.  
-```diff
---- a/Gitlore_TUI_PRD_v2.md
-+++ b/Gitlore_TUI_PRD_v2.md
-@@ 3.1 Risk Matrix
-+| Terminal escape/control-sequence injection via issue/note text | High | Medium | Strip ANSI/OSC/control chars before render; escape markdown output; allowlist URL scheme+host |
-@@ 4.1 Module Structure
-+    safety.rs                      # sanitize_for_terminal(), safe_url_policy()
-@@ 10.5/10.8/10.14/10.16
-+All user-sourced text passes through `sanitize_for_terminal()` before widget rendering.
-+Disable markdown raw HTML and clickable links unless URL policy passes.
-```
-
-6. **Move resumable sync checkpoints into v1 (lightweight version).**  
-Analysis: You already identify interruption risk as real. Deferring resumability to post-v1 leaves a major reliability gap in exactly the heaviest workflow. A lightweight checkpoint table (resource cursor + updated-at watermark) gives large reliability gain with modest complexity.  
-```diff
---- a/Gitlore_TUI_PRD_v2.md
-+++ b/Gitlore_TUI_PRD_v2.md
-@@ 3.1 Risk Matrix
--- Resumable checkpoints planned for post-v1
-+Resumable checkpoints included in v1 (lightweight cursors per project/resource lane)
-@@ 9.3 Success Criteria
-+14. Interrupt-and-resume test: sync resumes from checkpoint and reaches completion without full restart.
-@@ 9.3.1 Required Indexes (GA Blocker)
-+CREATE TABLE IF NOT EXISTS sync_checkpoints (
-+  project_id INTEGER NOT NULL,
-+  lane TEXT NOT NULL,
-+  cursor TEXT,
-+  updated_at_ms INTEGER NOT NULL,
-+  PRIMARY KEY (project_id, lane)
-+);
-```
-
-7. **Strengthen performance gates with tiered fixtures and memory ceilings.**  
-Analysis: Current thresholds are good, but fixture sizes are too close to mid-scale only. Add S/M/L fixtures and memory budget checks so regressions appear before real-world datasets hit them. This gives much more confidence in long-term scalability.  
-```diff
---- a/Gitlore_TUI_PRD_v2.md
-+++ b/Gitlore_TUI_PRD_v2.md
-@@ 9.3 Phase 0 — Toolchain Gate
--7. p95 first-paint latency < 50ms ... (100k issues, 50k MRs)
--10. p95 search latency < 200ms ... (50k documents)
-+7. Tiered fixtures:
-+   S: 10k issues / 5k MRs / 50k notes
-+   M: 100k issues / 50k MRs / 500k notes
-+   L: 250k issues / 100k MRs / 1M notes
-+   Enforce p95 targets per tier and memory ceiling (<250MB RSS in M tier).
-+10. Search SLO validated in S and M tiers, lexical and hybrid modes.
-```
-
-8. **Add session restore (last screen + filters + selection), with explicit `--fresh` opt-out.**  
-Analysis: This is high-value daily UX with low complexity, and it makes the TUI feel materially more “compelling/useful” without feature bloat. It also reduces friction when recovering from crash/restart.  
-```diff
---- a/Gitlore_TUI_PRD_v2.md
-+++ b/Gitlore_TUI_PRD_v2.md
-@@ 1. Executive Summary
-+- **Session restore** — resume last screen, filters, and selection on startup.
-@@ 4.1 Module Structure
-+    session.rs                    # persisted UI session state
-@@ 8.1 Global
-+| `Ctrl+R` | Reset session state for current screen |
-@@ 10.19 CLI Integration
-+`lore tui --fresh` starts without restoring prior session state.
-@@ 11. Assumptions
--12. No TUI-specific configuration initially.
-+12. Minimal TUI state file is allowed for session restore only.
-```
-
-9. **Add parity tests between TUI data panels and `--robot` outputs.**  
-Analysis: You already have `ShowCliEquivalent`; parity tests make that claim trustworthy and prevent drift between interfaces. This is a strong reliability multiplier and helps future refactors.  
-```diff
---- a/Gitlore_TUI_PRD_v2.md
-+++ b/Gitlore_TUI_PRD_v2.md
-@@ 9.2 Phases / 9.3 Success Criteria
-+Phase 5.6 — CLI/TUI Parity Pack
-+  - Dashboard count parity vs `lore --robot count/status`
-+  - List/detail parity for issues/MRs on sampled entities
-+  - Search result identity parity (top-N ids) for lexical mode
-+Success criterion: parity suite passes on CI fixtures.
-```
-
-If you want, I can produce a single consolidated patch of the PRD text (one unified diff) so you can drop it directly into the next iteration.

plans/tui-prd-v2-frankentui.feedback-5.md

@@ -1,200 +0,0 @@
-1. **Fix the structural inconsistency between `src/tui` and `crates/lore-tui/src`**
-Analysis: The PRD currently defines two different code layouts for the same system. That will cause implementation drift, wrong imports, and duplicated modules. Locking to one canonical layout early prevents execution churn and makes every snippet/action item unambiguous.
-
-```diff
-@@ 4.1 Module Structure @@
--src/
--  tui/
-+crates/lore-tui/src/
-     mod.rs
-     app.rs
-     message.rs
-@@
--### 10.5 Dashboard View (FrankenTUI Native)
--// src/tui/view/dashboard.rs
-+### 10.5 Dashboard View (FrankenTUI Native)
-+// crates/lore-tui/src/view/dashboard.rs
-@@
--### 10.6 Sync View
--// src/tui/view/sync.rs
-+### 10.6 Sync View
-+// crates/lore-tui/src/view/sync.rs
-```
-
-2. **Add a small `ui_adapter` seam to contain FrankenTUI API churn**
-Analysis: You already identified high likelihood of upstream breakage. Pinning a commit helps, but if every screen imports raw `ftui_*` types directly, churn ripples through dozens of files. A thin adapter layer reduces upgrade cost without introducing the rejected “full portability abstraction”.
-
-```diff
-@@ 3.1 Risk Matrix @@
- | API breaking changes | High | High (v0.x) | Pin exact git commit; vendor source if needed |
-+| API breakage blast radius across app code | High | High | Constrain ftui usage behind `ui_adapter/*` wrappers |
-
-@@ 4.1 Module Structure @@
-+    ui_adapter/
-+      mod.rs                    # Re-export stable local UI primitives
-+      runtime.rs                # App launch/options wrappers
-+      widgets.rs                # Table/List/Modal wrapper constructors
-+      input.rs                  # Text input + focus helpers
-
-@@ 9.3 Phase 0 — Toolchain Gate @@
-+14. `ui_adapter` compile-check: no screen module imports `ftui_*` directly (lint-enforced)
-```
-
-3. **Correct search mode behavior and replace sleep-based debounce with cancelable scheduling**
-Analysis: Current plan hardcodes `"hybrid"` in `execute_search`, so mode switching is UI-only and incorrect. Also, spawning sleeping tasks per keypress is wasteful under fast typing. Make mode a first-class query parameter and debounce via one cancelable scheduled event per input domain.
-
-```diff
-@@ 4.4 maybe_debounced_query @@
--std::thread::sleep(std::time::Duration::from_millis(200));
--match crate::tui::action::execute_search(&conn, &query, &filters) {
-+// no thread sleep; schedule SearchRequestStarted after 200ms via debounce scheduler
-+match crate::tui::action::execute_search(&conn, &query, &filters, mode) {
-
-@@ 10.11 Action Module — Query Bridge @@
--pub fn execute_search(conn: &Connection, query: &str, filters: &SearchCliFilters) -> Result<SearchResponse, LoreError> {
--    let mode_str = "hybrid"; // default; TUI mode selector overrides
-+pub fn execute_search(
-+    conn: &Connection,
-+    query: &str,
-+    filters: &SearchCliFilters,
-+    mode: SearchMode,
-+) -> Result<SearchResponse, LoreError> {
-+    let mode_str = match mode {
-+        SearchMode::Hybrid => "hybrid",
-+        SearchMode::Lexical => "lexical",
-+        SearchMode::Semantic => "semantic",
-+    };
-
-@@ 9.3 Phase 0 — Toolchain Gate @@
-+15. Search mode parity: lexical/hybrid/semantic each return mode-consistent top-N IDs on fixture
-```
-
-4. **Guarantee consistent multi-query reads and add query interruption for responsiveness**
-Analysis: Detail screens combine multiple queries that can observe mixed states during sync writes. Wrap each detail fetch in a single read transaction for snapshot consistency. Add cancellation/interrupt checks for long-running queries so UI remains responsive under heavy datasets.
-
-```diff
-@@ 4.5 Async Action System @@
-+All detail fetches (`issue_detail`, `mr_detail`, timeline expansion) run inside one read transaction
-+to guarantee snapshot consistency across subqueries.
-
-@@ 10.11 Action Module — Query Bridge @@
-+pub fn with_read_snapshot<T>(
-+    conn: &Connection,
-+    f: impl FnOnce(&rusqlite::Transaction<'_>) -> Result<T, LoreError>,
-+) -> Result<T, LoreError> { ... }
-
-+// Long queries register interrupt checks tied to CancelToken
-+// to avoid >1s uninterruptible stalls during rapid navigation/filtering.
-```
-
-5. **Formalize sync event streaming contract to prevent “stuck” states**
-Analysis: Dropping events on backpressure is acceptable, but completion must never be dropped and event ordering must be explicit. Add a typed `SyncUiEvent` stream with guaranteed terminal sentinel and progress coalescing to reduce load while preserving correctness.
-
-```diff
-@@ 4.4 start_sync_task @@
--let (tx, rx) = std::sync::mpsc::sync_channel::<Msg>(1024);
-+let (tx, rx) = std::sync::mpsc::sync_channel::<SyncUiEvent>(2048);
-
--// drop this progress update rather than blocking the sync thread
-+// coalesce progress to max 30Hz per lane; never drop terminal events
-+// always emit SyncUiEvent::StreamClosed { outcome }
-
-@@ 5.9 Sync @@
--- Log viewer with streaming output
-+- Log viewer with streaming output and explicit stream-finalization state
-+- UI shows dropped/coalesced event counters for transparency
-```
-
-6. **Version and validate session restore payloads**
-Analysis: A raw JSON session file without schema/version checks is fragile across releases and DB switches. Add schema version, DB fingerprint, and safe fallback rules so session restore never blocks startup or applies stale state incorrectly.
-
-```diff
-@@ 11. Assumptions @@
--12. Minimal TUI state file allowed for session restore only ...
-+12. Versioned TUI state file allowed for session restore only:
-+    fields include `schema_version`, `app_version`, `db_fingerprint`, `saved_at`, `state`.
-
-@@ 10.1 New Files @@
- crates/lore-tui/src/session.rs         # Lightweight session state persistence
-+                                        # + versioning, validation, corruption quarantine
-
-@@ 4.1 Module Structure @@
-     session.rs                    # Lightweight session state persistence
-+                                  # corrupted file -> `.bad-<timestamp>` and fresh start
-```
-
-7. **Harden terminal safety beyond ANSI stripping**
-Analysis: ANSI stripping is necessary but not sufficient. Bidi controls and invisible Unicode controls can still spoof displayed content. URL checks should normalize host/port and disallow deceptive variants. This closes realistic terminal spoofing vectors.
-
-```diff
-@@ 3.1 Risk Matrix @@
- | Terminal escape/control-sequence injection via issue/note text | High | Medium | Strip ANSI/OSC/control chars via sanitize_for_terminal() ... |
-+| Bidi/invisible Unicode spoofing in rendered text | High | Medium | Strip bidi overrides + zero-width controls in untrusted text |
-
-@@ 10.4.1 Terminal Safety — Untrusted Text Sanitization @@
--Strip ANSI escape sequences, OSC commands, and control characters
-+Strip ANSI/OSC/control chars, bidi overrides (RLO/LRO/PDF/RLI/LRI/FSI/PDI),
-+and zero-width/invisible controls from untrusted text
-
--pub fn is_safe_url(url: &str, allowed_hosts: &[String]) -> bool {
-+pub fn is_safe_url(url: &str, allowed_origins: &[Origin]) -> bool {
-+    // normalize host (IDNA), enforce scheme+host+port match
-```
-
-8. **Use progressive hydration for detail screens**
-Analysis: Issue/MR detail first-paint can become slow when discussions are large. Split fetch into phases: metadata first, then discussions/file changes, then deep thread content on expand. This improves perceived performance and keeps navigation snappy on large repos.
-
-```diff
-@@ 5.3 Issue Detail @@
--Data source: `lore issues <iid>` + discussions + cross-references
-+Data source (progressive):
-+1) metadata/header (first paint)
-+2) discussions summary + cross-refs
-+3) full thread bodies loaded on demand when expanded
-
-@@ 5.5 MR Detail @@
--Unique features: File changes list, Diff discussions ...
-+Unique features (progressive hydration):
-+- file change summary in first paint
-+- diff discussion bodies loaded lazily per expanded thread
-
-@@ 9.3 Phase 0 — Toolchain Gate @@
-+16. Detail first-paint p95 < 75ms on M-tier fixtures (metadata-only phase)
-```
-
-9. **Make reliability tests reproducible with deterministic clocks/seeds**
-Analysis: Relative-time rendering and fuzz tests are currently tied to wall clock/randomness, which makes CI flakes hard to diagnose. Introduce a `Clock` abstraction and deterministic fuzz seeds with failure replay output.
-
-```diff
-@@ 10.9.1 Non-Snapshot Tests @@
-+/// All time-based rendering uses injected `Clock` in tests.
-+/// Fuzz failures print deterministic seed for replay.
-
-@@ 9.2 Phase 5.5 — Reliability Test Pack @@
--Event fuzz tests (key/resize/paste):p55g
-+Event fuzz tests (key/resize/paste, deterministic seed replay):p55g
-+Deterministic clock/render tests:p55i
-```
-
-10. **Add an “Actionable Insights” dashboard panel for stronger day-to-day utility**
-Analysis: Current dashboard is informative, but not prioritizing. Adding ranked insights (stale P1s, blocked MRs, discussion hotspots) turns it into a decision surface, not just a metrics screen. This makes the TUI materially more compelling for triage workflows.
-
-```diff
-@@ 1. Executive Summary @@
- - Dashboard — sync status, project health, counts at a glance
-+- Dashboard — sync status, project health, counts, and ranked actionable insights
-
-@@ 5.1 Dashboard (Home Screen) @@
--│  Recent Activity                  │
-+│  Recent Activity                  │
-+│  Actionable Insights              │
-+│  1) 7 opened P1 issues >14d       │
-+│  2) 3 MRs blocked by unresolved   │
-+│  3) auth/ has +42% note velocity  │
-
-@@ 6. User Flows @@
-+### 6.9 Flow: "Risk-first morning sweep"
-+Dashboard -> select insight -> jump to pre-filtered list/detail
-```
-
-These 10 changes stay clear of your `Rejected Recommendations` list and materially improve correctness, operability, and product value without adding speculative architecture.

plans/tui-prd-v2-frankentui.feedback-6.md

@@ -1,150 +0,0 @@
-Your plan is strong and unusually detailed. The biggest upgrades I’d make are around build isolation, async correctness, terminal correctness, and turning existing data into sharper triage workflows.
-
-## 1) Fix toolchain isolation so stable builds cannot accidentally pull nightly
-Rationale: a `rust-toolchain.toml` inside `crates/lore-tui` is not a complete guard when running workspace commands from repo root. You should structurally prevent stable workflows from touching nightly-only code.
-
-```diff
-@@ 3.2 Nightly Rust Strategy
--[workspace]
--members = [".", "crates/lore-tui"]
-+[workspace]
-+members = ["."]
-+exclude = ["crates/lore-tui"]
-
-+`crates/lore-tui` is built as an isolated workspace/package with explicit toolchain invocation:
-+  cargo +nightly-2026-02-08 check --manifest-path crates/lore-tui/Cargo.toml
-+Core repo remains:
-+  cargo +stable check --workspace
-```
-
-## 2) Add an explicit `lore` <-> `lore-tui` compatibility contract
-Rationale: runtime delegation is correct, but version drift between binaries will become the #1 support failure mode. Add a handshake before launch.
-
-```diff
-@@ 10.19 CLI Integration — Adding `lore tui`
-+Before spawning `lore-tui`, `lore` runs:
-+  lore-tui --print-contract-json
-+and validates:
-+  - minimum_core_version
-+  - supported_db_schema_range
-+  - contract_version
-+On mismatch, print actionable remediation:
-+  cargo install --path crates/lore-tui
-```
-
-## 3) Make TaskSupervisor truly authoritative (remove split async paths)
-Rationale: the document says supervisor is the only path, but examples still use direct `Cmd::task` and `search_request_id`. Close that contradiction now to avoid stale-data races.
-
-```diff
-@@ 4.4 App — Implementing the Model Trait
--    search_request_id: u64,
-+    task_supervisor: TaskSupervisor,
-
-@@ 4.5.1 Task Supervisor
--The `search_request_id` field in `LoreApp` is superseded...
-+`search_request_id` is removed. All async work uses TaskSupervisor generations.
-+No direct `Cmd::task` from screen handlers or ad-hoc helpers.
-```
-
-## 4) Resolve keybinding conflicts and implement real go-prefix timeout
-Rationale: `Ctrl+I` collides with `Tab` in terminals. Also your 500ms go-prefix timeout is described but not enforced in code.
-
-```diff
-@@ 8.1 Global (Available Everywhere)
--| `Ctrl+I` | Jump forward in jump list (entity hops) |
-+| `Alt+o` | Jump forward in jump list (entity hops) |
-
-@@ 8.2 Keybinding precedence
-+Go-prefix timeout is enforced by timestamped state + tick check.
-+Backspace global-back behavior is implemented (currently documented but not wired).
-```
-
-## 5) Add a shared display-width text utility (Unicode-safe truncation and alignment)
-Rationale: current `truncate()` implementations use byte/char length and will misalign CJK/emoji/full-width text in tables and trees.
-
-```diff
-@@ 10.1 New Files
-+crates/lore-tui/src/text_width.rs      # grapheme-safe truncation + display width helpers
-
-@@ 10.5 Dashboard View / 10.13 Issue List / 10.16 Who View
--fn truncate(s: &str, max: usize) -> String { ... }
-+use crate::text_width::truncate_display_width;
-+// all column fitting/truncation uses terminal display width, not bytes/chars
-```
-
-## 6) Upgrade sync streaming to a QoS event bus with sequence IDs
-Rationale: today progress/log events can be dropped under load with weak observability. Keep UI responsive while guaranteeing completion semantics and visible gap accounting.
-
-```diff
-@@ 4.4 start_sync_task()
--let (tx, rx) = std::sync::mpsc::sync_channel::<SyncUiEvent>(2048);
-+let (ctrl_tx, ctrl_rx) = std::sync::mpsc::sync_channel::<SyncCtrlEvent>(256);   // never-drop
-+let (data_tx, data_rx) = std::sync::mpsc::sync_channel::<SyncDataEvent>(4096);   // coalescible
-
-+Every streamed event carries seq_no.
-+UI detects gaps and renders: "Dropped N log/progress events due to backpressure."
-+Terminal events (started/completed/failed/cancelled) remain lossless.
-```
-
-## 7) Make list pagination truly keyset-driven in state, not just in prose
-Rationale: plan text promises windowed keyset paging, but state examples still keep a single list without cursor model. Encode pagination state explicitly.
-
-```diff
-@@ 10.10 state/issue_list.rs
--pub items: Vec<IssueListRow>,
-+pub window: Vec<IssueListRow>,
-+pub next_cursor: Option<IssueCursor>,
-+pub prev_cursor: Option<IssueCursor>,
-+pub prefetch: Option<Vec<IssueListRow>>,
-+pub window_size: usize, // default 200
-
-@@ 5.2 Issue List
--Pagination: Windowed keyset pagination...
-+Pagination: Keyset cursor model is first-class state with forward/back cursors and prefetch buffer.
-```
-
-## 8) Harden session restore with atomic persistence + integrity checksum
-Rationale: versioning/quarantine is good, but you still need crash-safe write semantics and tamper/corruption detection to avoid random boot failures.
-
-```diff
-@@ 10.1 New Files
--crates/lore-tui/src/session.rs         # Versioned session state persistence + validation + corruption quarantine
-+crates/lore-tui/src/session.rs         # + atomic write (tmp->fsync->rename), checksum, max-size guard
-
-@@ 11. Assumptions
-+Session writes are atomic and checksummed.
-+Invalid checksum or oversized file triggers quarantine and fresh boot.
-```
-
-## 9) Evolve Doctor from read-only text into actionable remediation
-Rationale: your CLI already returns machine-actionable `actions`. TUI should surface those as one-key fixes; this materially increases usefulness.
-
-```diff
-@@ 5.11 Doctor / Stats (Info Screens)
--Simple read-only views rendering the output...
-+Doctor is interactive:
-+  - shows health checks + severity
-+  - exposes suggested `actions` from robot-mode errors
-+  - Enter runs selected action command (with confirmation modal)
-+Stats remains read-only.
-```
-
-## 10) Add a Dependency Lens to Issue/MR detail (high-value triage feature)
-Rationale: you already have cross-refs + discussions + timeline. A compact dependency panel (blocked-by / blocks / unresolved threads) makes this data operational for prioritization.
-
-```diff
-@@ 5.3 Issue Detail
--│ ┌─ Cross-References ─────────────────────────────────────────┐ │
-+│ ┌─ Dependency Lens ──────────────────────────────────────────┐ │
-+│ │ Blocked by: #1198 (open, stale 9d)                        │ │
-+│ │ Blocks: !458 (opened, 2 unresolved threads)               │ │
-+│ │ Risk: High (P1 + stale blocker + open MR discussion)      │ │
-+│ └────────────────────────────────────────────────────────────┘ │
-
-@@ 9.2 Phases
-+Dependency Lens (issue/mr detail, computed risk score) :p3e, after p2e, 1d
-```
-
----
-
-If you want, I can next produce a consolidated **“v2.1 patch”** of the PRD with all these edits merged into one coherent updated document structure.

plans/tui-prd-v2-frankentui.feedback-7.md

@@ -1,264 +0,0 @@
-1. **Fix a critical contradiction in workspace/toolchain isolation**
-Rationale: Section `3.2` says `crates/lore-tui` is excluded from the root workspace, but Section `9.1` currently adds it as a member. That inconsistency will cause broken CI/tooling behavior and confusion about whether stable-only workflows remain safe.
-
-```diff
---- a/PRD.md
-+++ b/PRD.md
-@@ 9.1 Dependency Changes
--# Root Cargo.toml changes
--[workspace]
--members = [".", "crates/lore-tui"]
-+# Root Cargo.toml changes
-+[workspace]
-+members = ["."]
-+exclude = ["crates/lore-tui"]
-@@
--# Add workspace member (no lore-tui dep, no tui feature)
-+# Keep lore-tui EXCLUDED from root workspace (nightly isolation boundary)
-@@ 9.3 Phase 0 — Toolchain Gate
--1. `cargo check --all-targets` passes on pinned nightly (TUI crate) and stable (core)
-+1. `cargo +stable check --workspace --all-targets` passes for root workspace
-+2. `cargo +nightly-2026-02-08 check --manifest-path crates/lore-tui/Cargo.toml --all-targets` passes
-```
-
-2. **Replace global loading spinner with per-screen stale-while-revalidate**
-Rationale: A single `is_loading` flag causes full-screen flicker and blocked context during quick refreshes. Per-screen load states keep existing data visible while background refresh runs, improving perceived performance and usability.
-
-```diff
---- a/PRD.md
-+++ b/PRD.md
-@@ 10.10 State Module — Complete
--    pub is_loading: bool,
-+    pub load_state: ScreenLoadStateMap,
-@@
--    pub fn set_loading(&mut self, loading: bool) {
--        self.is_loading = loading;
--    }
-+    pub fn set_loading(&mut self, screen: ScreenId, state: LoadState) {
-+        self.load_state.insert(screen, state);
-+    }
-+
-+pub enum LoadState {
-+    Idle,
-+    LoadingInitial,
-+    Refreshing,      // stale data remains visible
-+    Error(String),
-+}
-@@ 4.4 App — Implementing the Model Trait
--        // Loading spinner overlay (while async data is fetching)
--        if self.state.is_loading {
--            crate::tui::view::common::render_loading(frame, body);
--        } else {
--            match self.navigation.current() { ... }
--        }
-+        // Always render screen; show lightweight refresh indicator when needed.
-+        match self.navigation.current() { ... }
-+        crate::tui::view::common::render_refresh_indicator_if_needed(
-+            self.navigation.current(), &self.state.load_state, frame, body
-+        );
-```
-
-3. **Make `TaskSupervisor` a real scheduler (not just token registry)**
-Rationale: Current design declares priority lanes but still dispatches directly with `Cmd::task`, and debounce uses `thread::sleep` per keystroke (wastes worker threads). A bounded scheduler with queued tasks and timer-driven debounce will reduce contention and tail latency.
-
-```diff
---- a/PRD.md
-+++ b/PRD.md
-@@ 4.5.1 Task Supervisor (Dedup + Cancellation + Priority)
--pub struct TaskSupervisor {
--    active: HashMap<TaskKey, Arc<CancelToken>>,
--    generation: AtomicU64,
--}
-+pub struct TaskSupervisor {
-+    active: HashMap<TaskKey, Arc<CancelToken>>,
-+    generation: AtomicU64,
-+    queue: BinaryHeap<ScheduledTask>,
-+    inflight: HashMap<TaskPriority, usize>,
-+    limits: TaskLaneLimits, // e.g. Input=4, Navigation=2, Background=1
-+}
-@@
--// 200ms debounce via cancelable scheduled event (not thread::sleep).
--Cmd::task(move || {
--    std::thread::sleep(std::time::Duration::from_millis(200));
--    ...
--})
-+// Debounce via runtime timer message; no sleeping worker thread.
-+self.state.search.debounce_deadline = Some(now + 200ms);
-+Cmd::none()
-@@ 4.4 update()
-+Msg::Tick => {
-+    if self.state.search.debounce_expired(now) {
-+        return self.dispatch_supervised(TaskKey::Search, TaskPriority::Input, ...);
-+    }
-+    self.task_supervisor.dispatch_ready(now)
-+}
-```
-
-4. **Add a sync run ledger for exact “new since sync” navigation**
-Rationale: “Since last sync” based on timestamps is ambiguous with partial failures, retries, and clock drift. A lightweight `sync_runs` + `sync_deltas` ledger makes summary-mode drill-down exact and auditable without implementing full resumable checkpoints.
-
-```diff
---- a/PRD.md
-+++ b/PRD.md
-@@ 5.9 Sync
--- `i` navigates to Issue List pre-filtered to "since last sync"
--- `m` navigates to MR List pre-filtered to "since last sync"
-+- `i` navigates to Issue List pre-filtered to `sync_run_id=<last_run>`
-+- `m` navigates to MR List pre-filtered to `sync_run_id=<last_run>`
-+- Filters are driven by persisted `sync_deltas` rows (exact entity keys changed in run)
-@@ 10.1 New Files
-+src/core/migrations/00xx_add_sync_run_ledger.sql
-@@ New migration (appendix)
-+CREATE TABLE sync_runs (
-+  id INTEGER PRIMARY KEY,
-+  started_at_ms INTEGER NOT NULL,
-+  completed_at_ms INTEGER,
-+  status TEXT NOT NULL
-+);
-+CREATE TABLE sync_deltas (
-+  sync_run_id INTEGER NOT NULL,
-+  entity_kind TEXT NOT NULL,
-+  project_id INTEGER NOT NULL,
-+  iid INTEGER NOT NULL,
-+  change_kind TEXT NOT NULL
-+);
-+CREATE INDEX idx_sync_deltas_run_kind ON sync_deltas(sync_run_id, entity_kind);
-@@ 11 Assumptions
--16. No new SQLite tables needed for v1
-+16. Two small v1 tables are added: `sync_runs` and `sync_deltas` for deterministic post-sync UX.
-```
-
-5. **Expand the GA index set to match actual filter surface**
-Rationale: Current required indexes only cover default sort paths; they do not match common filters like `author`, `assignee`, `reviewer`, `target_branch`, label-based filtering. This will likely miss p95 SLOs at M tier.
-
-```diff
---- a/PRD.md
-+++ b/PRD.md
-@@ 9.3.1 Required Indexes (GA Blocker)
- CREATE INDEX IF NOT EXISTS idx_issues_list_default
-     ON issues(project_id, state, updated_at DESC, iid DESC);
-+CREATE INDEX IF NOT EXISTS idx_issues_author_updated
-+    ON issues(project_id, state, author_username, updated_at DESC, iid DESC);
-+CREATE INDEX IF NOT EXISTS idx_issues_assignee_updated
-+    ON issues(project_id, state, assignee_username, updated_at DESC, iid DESC);
-@@
- CREATE INDEX IF NOT EXISTS idx_mrs_list_default
-     ON merge_requests(project_id, state, updated_at DESC, iid DESC);
-+CREATE INDEX IF NOT EXISTS idx_mrs_reviewer_updated
-+    ON merge_requests(project_id, state, reviewer_username, updated_at DESC, iid DESC);
-+CREATE INDEX IF NOT EXISTS idx_mrs_target_updated
-+    ON merge_requests(project_id, state, target_branch, updated_at DESC, iid DESC);
-+CREATE INDEX IF NOT EXISTS idx_mrs_source_updated
-+    ON merge_requests(project_id, state, source_branch, updated_at DESC, iid DESC);
-@@
-+-- If labels are normalized through join table:
-+CREATE INDEX IF NOT EXISTS idx_issue_labels_label_issue ON issue_labels(label, issue_id);
-+CREATE INDEX IF NOT EXISTS idx_mr_labels_label_mr ON mr_labels(label, mr_id);
-@@ CI enforcement
--asserts that none show `SCAN TABLE` for the primary entity tables
-+asserts that none show full scans for primary tables under default filters AND top 8 user-facing filter combinations
-```
-
-6. **Add DB schema compatibility preflight (separate from binary compat)**
-Rationale: Binary compat (`--compat-version`) does not protect against schema mismatches. Add explicit schema version checks before booting the TUI to avoid runtime SQL errors deep in navigation paths.
-
-```diff
---- a/PRD.md
-+++ b/PRD.md
-@@ 3.2 Nightly Rust Strategy
--- **Compatibility contract:** Before spawning `lore-tui`, the `lore tui` subcommand runs `lore-tui --compat-version` ...
-+- **Compatibility contract:** Before spawning `lore-tui`, `lore tui` validates:
-+  1) binary compat version (`lore-tui --compat-version`)
-+  2) DB schema range (`lore-tui --check-schema <db-path>`)
-+If schema is out-of-range, print remediation: `lore migrate`.
-@@ 9.3 Phase 0 — Toolchain Gate
-+17. Schema preflight test: incompatible DB schema yields actionable error and non-zero exit before entering TUI loop.
-```
-
-7. **Refine terminal sanitization to preserve legitimate Unicode while blocking control attacks**
-Rationale: Current sanitizer strips zero-width joiners and similar characters, which breaks emoji/grapheme rendering and undermines your own `text_width` goals. Keep benign Unicode, remove only dangerous controls/bidi spoof vectors, and sanitize markdown link targets too.
-
-```diff
---- a/PRD.md
-+++ b/PRD.md
-@@ 10.4.1 Terminal Safety — Untrusted Text Sanitization
--- Strip bidi overrides ... and zero-width/invisible controls ...
-+- Strip ANSI/OSC/control chars and bidi spoof controls.
-+- Preserve legitimate grapheme-joining characters (ZWJ/ZWNJ/combining marks) for correct Unicode rendering.
-+- Sanitize markdown link targets with strict URL allowlist before rendering clickable links.
-@@ safety.rs
--            // Strip zero-width and invisible controls
--            '\u{200B}' | '\u{200C}' | '\u{200D}' | '\u{FEFF}' | '\u{00AD}' => {}
-+            // Preserve grapheme/emoji join behavior; remove only harmful controls.
-+            // (ZWJ/ZWNJ/combining marks are retained)
-@@ Enforcement rule
- - Search result snippets
- - Author names and labels
-+- Markdown link destinations (scheme + origin validation before render/open)
-```
-
-8. **Add key normalization layer for terminal portability**
-Rationale: Collision notes are good, but you still need a canonicalization layer because terminals emit different sequences for Alt/Meta/Backspace/Enter variants. This reduces “works in iTerm, broken in tmux/SSH” bugs.
-
-```diff
---- a/PRD.md
-+++ b/PRD.md
-@@ 8.2 List Screens
- **Terminal keybinding safety notes:**
-@@
- - `Ctrl+M` is NOT used — it collides with `Enter` ...
-+
-+**Key normalization layer (new):**
-+- Introduce `KeyNormalizer` before `interpret_key()`:
-+  - normalize Backspace variants (`^H`, `DEL`)
-+  - normalize Alt/Meta prefixes
-+  - normalize Shift+Tab vs Tab where terminal supports it
-+  - normalize kitty/CSI-u enhanced key protocols when present
-@@ 9.2 Phases
-+    Key normalization integration tests   :p5d, after p5c, 1d
-+    Terminal profile replay tests         :p5e, after p5d, 1d
-```
-
-9. **Add deterministic event-trace capture for crash reproduction**
-Rationale: Panic logs without recent event context are often insufficient for TUI race bugs. Persist last-N normalized events + active screen + task state snapshot on panic for one-command repro.
-
-```diff
---- a/PRD.md
-+++ b/PRD.md
-@@ 3.1 Risk Matrix
- | Runtime panic leaves user blocked | High | Medium | Panic hook writes crash report, restores terminal, offers fallback CLI command |
-+| Hard-to-reproduce input race bugs | Medium | Medium | Persist last 2k normalized events + state hash on panic for deterministic replay |
-@@ 10.3 Entry Point / panic hook
--        // 2. Write crash dump
-+        // 2. Write crash dump + event trace snapshot
-+        // Includes: last 2000 normalized events, current screen, in-flight task keys/generations
-@@ 10.9.1 Non-Snapshot Tests
-+/// Replay captured event trace from panic artifact and assert no panic.
-+#[test]
-+fn replay_trace_artifact_is_stable() { ... }
-```
-
-10. **Do a plan-wide consistency pass on pseudocode contracts**
-Rationale: There are internal mismatches that will create implementation churn (`search_request_id` still referenced after replacement, `items` vs `window`, keybinding mismatch `Ctrl+I` vs `Alt+o`). Tightening these now saves real engineering time later.
-
-```diff
---- a/PRD.md
-+++ b/PRD.md
-@@ 4.4 LoreApp::new
--            search_request_id: 0,
-+            // dedup generation handled by TaskSupervisor
-@@ 8.1 Global
--| `Ctrl+O` | Jump backward in jump list (entity hops) |
--| `Alt+o` | Jump forward in jump list (entity hops) |
-+| `Ctrl+O` | Jump backward in jump list (entity hops) |
-+| `Alt+o`  | Jump forward in jump list (entity hops) |
-@@ 10.10 IssueListState
--    pub fn selected_item(&self) -> Option<&IssueListRow> {
--        self.items.get(self.selected_index)
--    }
-+    pub fn selected_item(&self) -> Option<&IssueListRow> {
-+        self.window.get(self.selected_index)
-+    }
-```
-
-If you want, I can now produce a single consolidated unified diff patch of the full PRD with these revisions merged end-to-end.

plans/tui-prd-v2-frankentui.feedback-8.md

@@ -1,211 +0,0 @@
-Below are the strongest revisions I’d make. I intentionally avoided anything in your `## Rejected Recommendations`.
-
-1. **Unify commands/keybindings/help/palette into one registry**
-Rationale: your plan currently duplicates action definitions across `execute_palette_action`, `ShowCliEquivalent`, help overlay text, and status hints. That will drift quickly and create correctness bugs. A single `CommandRegistry` makes behavior consistent and testable.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ 4.1 Module Structure
-+    commands.rs                   # Single source of truth for actions, keybindings, CLI equivalents
-
-@@ 4.4 App — Implementing the Model Trait
--    fn execute_palette_action(&self, action_id: &str) -> Cmd<Msg> { ... big match ... }
-+    fn execute_palette_action(&self, action_id: &str) -> Cmd<Msg> {
-+        if let Some(spec) = self.commands.get(action_id) {
-+            return self.update(spec.to_msg(self.navigation.current()));
-+        }
-+        Cmd::none()
-+    }
-
-@@ 8. Keybinding Reference
-+All keybinding/help/status/palette definitions are generated from `commands.rs`.
-+No hardcoded duplicate maps in view/state modules.
-```
-
-2. **Replace ad-hoc key flags with explicit input state machine**
-Rationale: `pending_go` + `go_prefix_instant` is fragile and already inconsistent with documented behavior. A typed `InputMode` removes edge-case bugs and makes prefix timeout deterministic.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ 4.4 LoreApp struct
--    pending_go: bool,
--    go_prefix_instant: Option<std::time::Instant>,
-+    input_mode: InputMode, // Normal | Text | Palette | GoPrefix { started_at }
-
-@@ 8.2 List Screens
--| `g` `g` | Jump to top |
-+| `g` `g` | Jump to top (current list screen) |
-
-@@ 4.4 interpret_key
-- KeyCode::Char('g') => Msg::IssueListScrollToTop
-+ KeyCode::Char('g') => Msg::ScrollToTopCurrentScreen
-```
-
-3. **Fix TaskSupervisor contract and message schema drift**
-Rationale: the plan mixes `request_id` and `generation`, and `TaskKey::Search { generation }` defeats dedup by making every key unique. This can silently reintroduce stale-result races.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ 4.3 Core Types (Msg)
--    SearchRequestStarted { request_id: u64, query: String },
--    SearchExecuted { request_id: u64, results: SearchResults },
-+    SearchRequestStarted { generation: u64, query: String },
-+    SearchExecuted { generation: u64, results: SearchResults },
-
-@@ 4.5.1 Task Supervisor
--    Search { generation: u64 },
-+    Search,
-+    struct TaskStamp { key: TaskKey, generation: u64 }
-
-@@ 10.9.1 Non-Snapshot Tests
--    Msg::SearchExecuted { request_id: 3, ... }
-+    Msg::SearchExecuted { generation: 3, ... }
-```
-
-4. **Add a `Clock` boundary everywhere time is computed**
-Rationale: you call `SystemTime::now()` in many query/render paths, causing inconsistent relative-time labels inside one frame and flaky tests. Injected clock gives deterministic rendering and lower per-frame overhead.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ 4.1 Module Structure
-+    clock.rs                      # Clock trait: SystemClock/FakeClock
-
-@@ 4.4 LoreApp struct
-+    clock: Arc<dyn Clock>,
-
-@@ 10.11 action.rs
-- let now_ms = std::time::SystemTime::now()...
-+ let now_ms = clock.now_ms();
-
-@@ 9.3 Phase 0 success criteria
-+19. Relative-time rendering deterministic under FakeClock across snapshot runs.
-```
-
-5. **Upgrade text truncation to grapheme-safe width handling**
-Rationale: `unicode-width` alone is not enough for safe truncation; it can split grapheme clusters (emoji ZWJ sequences, skin tones, flags). You need width + grapheme segmentation together.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ 10.1 New Files
--crates/lore-tui/src/text_width.rs      # ... using unicode-width crate
-+crates/lore-tui/src/text_width.rs      # Grapheme-safe width/truncation using unicode-width + unicode-segmentation
-
-@@ 10.1 New Files
-+Cargo.toml (lore-tui): unicode-segmentation = "1"
-
-@@ 9.3 Phase 0 success criteria
-+20. Unicode rendering tests pass for CJK, emoji ZWJ, combining marks, RTL text.
-```
-
-6. **Redact sensitive values in logs and crash dumps**
-Rationale: current crash/log strategy risks storing tokens/credentials in plain text. This is a serious operational/security gap for local tooling too.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ 4.1 Module Structure
-     safety.rs                     # sanitize_for_terminal(), safe_url_policy()
-+    redact.rs                     # redact_sensitive() for logs/crash reports
-
-@@ 10.3 install_panic_hook_for_tui
-- let _ = std::fs::write(&crash_path, format!("{panic_info:#?}"));
-+ let report = redact_sensitive(format!("{panic_info:#?}"));
-+ let _ = std::fs::write(&crash_path, report);
-
-@@ 9.3 Phase 0 success criteria
-+21. Redaction tests confirm tokens/Authorization headers never appear in persisted crash/log artifacts.
-```
-
-7. **Add search capability detection and mode fallback UX**
-Rationale: semantic/hybrid mode should not silently degrade when embeddings are absent/stale. Explicit capability state increases trust and avoids “why are results weird?” confusion.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ 5.6 Search
-+Capability-aware modes:
-+- If embeddings unavailable/stale, semantic mode is disabled with inline reason.
-+- Hybrid mode auto-falls back to lexical and shows badge: "semantic unavailable".
-
-@@ 4.3 Core Types
-+    SearchCapabilitiesLoaded(SearchCapabilities)
-
-@@ 9.3 Phase 0 success criteria
-+22. Mode availability checks validated: lexical/hybrid/semantic correctly enabled/disabled by fixture capabilities.
-```
-
-8. **Define sync cancel latency SLO and enforce fine-grained checks**
-Rationale: “check cancel between phases” is too coarse on big projects. Users need fast cancel acknowledgment and bounded stop time.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ 5.9 Sync
--CANCELLATION: checked between sync phases
-+CANCELLATION: checked at page boundaries, batch upsert boundaries, and before each network request.
-+UX target: cancel acknowledged <250ms, sync stop p95 <2s after Esc.
-
-@@ 9.3 Phase 0 success criteria
-+23. Cancel latency test passes: p95 stop time <2s under M-tier fixtures.
-```
-
-9. **Add a “Hotspots” screen for risk/churn triage**
-Rationale: this is high-value and uses existing data (events, unresolved discussions, stale items). It makes the TUI more compelling without needing new sync tables or rejected features.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ 1. Executive Summary
-+- **Hotspots** — file/path risk ranking by churn × unresolved discussion pressure × staleness
-
-@@ 5. Screen Taxonomy
-+### 5.12 Hotspots
-+Shows top risky paths with drill-down to related issues/MRs/timeline.
-
-@@ 8.1 Global
-+| `gx` | Go to Hotspots |
-
-@@ 10.1 New Files
-+crates/lore-tui/src/state/hotspots.rs
-+crates/lore-tui/src/view/hotspots.rs
-```
-
-10. **Add degraded startup mode when compat/schema checks fail**
-Rationale: hard-exit on mismatch blocks users. A degraded mode that shells to `lore --robot` for read-only summary/doctor keeps the product usable and gives guided recovery.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ 3.2 Nightly Rust Strategy
-- On mismatch: actionable error and exit
-+ On mismatch: actionable error with `--degraded` option.
-+ `--degraded` launches limited TUI (Dashboard/Doctor/Stats via `lore --robot` subprocess calls).
-
-@@ 10.3 TuiCli
-+    /// Allow limited mode when schema/compat checks fail
-+    #[arg(long)]
-+    degraded: bool,
-```
-
-11. **Harden query-plan CI checks (don’t rely on `SCAN TABLE` string matching)**
-Rationale: SQLite planner text varies by version. Parse opcode structure and assert index usage semantically; otherwise CI will be flaky or miss regressions.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ 9.3.1 Required Indexes (CI enforcement)
-- asserts that none show `SCAN TABLE`
-+ parses EXPLAIN QUERY PLAN rows and asserts:
-+ - top-level loop uses expected index families
-+ - no full scan on primary entity tables under default and top filter combos
-+ - join order remains bounded (no accidental cartesian expansions)
-```
-
-12. **Enforce single-instance lock for session/state safety**
-Rationale: assumption says no concurrent TUI sessions, but accidental double-launch will still happen. Locking prevents state corruption and confusing interleaved sync actions.
-
-```diff
-diff --git a/PRD.md b/PRD.md
-@@ 10.1 New Files
-+crates/lore-tui/src/instance_lock.rs   # lock file with stale-lock recovery
-
-@@ 11. Assumptions
--21. No concurrent TUI sessions.
-+21. Concurrent sessions unsupported and actively prevented by instance lock (with clear error message).
-```
-
-If you want, I can turn this into a consolidated patched PRD (single unified diff) next.

plans/tui-prd-v2-frankentui.feedback-9.md

@@ -1,198 +0,0 @@
-I reviewed the full PRD end-to-end and avoided all items already listed in `## Rejected Recommendations`.  
-These are the highest-impact revisions I’d make.
-
-1. **Fix keybinding/state-machine correctness gaps (critical)**
-The plan currently has an internal conflict: the doc says jump-forward is `Alt+o`, but code sample uses `Ctrl+i` (which collides with `Tab` in many terminals). Also, `g`-prefix timeout depends on `Tick`, but `Tick` isn’t guaranteed when idle, so prefix mode can get “stuck.” This is a correctness bug, not polish.
-
-```diff
-@@ 8.1 Global (Available Everywhere)
--| `Ctrl+O` | Jump backward in jump list (entity hops) |
--| `Alt+o` | Jump forward in jump list (entity hops) |
-+| `Ctrl+O` | Jump backward in jump list (entity hops) |
-+| `Alt+o` | Jump forward in jump list (entity hops) |
-+| `Backspace` | Go back (when no text input is focused) |
-
-@@ 4.4 LoreApp::interpret_key
-- (KeyCode::Char('i'), m) if m.contains(Modifiers::CTRL) => {
--     return Some(Msg::JumpForward);
-- }
-+ (KeyCode::Char('o'), m) if m.contains(Modifiers::ALT) => {
-+     return Some(Msg::JumpForward);
-+ }
-+ (KeyCode::Backspace, Modifiers::NONE) => {
-+     return Some(Msg::GoBack);
-+ }
-
-@@ 4.4 Model::subscriptions
-+ // Go-prefix timeout enforcement must tick even when nothing is loading.
-+ if matches!(self.input_mode, InputMode::GoPrefix { .. }) {
-+     subs.push(Box::new(
-+         Every::with_id(2, Duration::from_millis(50), || Msg::Tick)
-+     ));
-+ }
-```
-
-2. **Make `TaskSupervisor` API internally consistent and enforceable**
-The plan uses `submit()`/`is_current()` in one place and `register()`/`next_generation()` in another. That inconsistency will cause implementation drift and stale-result bugs. Use one coherent API with a returned handle containing `{key, generation, cancel_token}`.
-
-```diff
-@@ 4.5.1 Task Supervisor (Dedup + Cancellation + Priority)
--pub struct TaskSupervisor {
--    active: HashMap<TaskKey, Arc<CancelToken>>,
--    generation: AtomicU64,
--}
-+pub struct TaskSupervisor {
-+    active: HashMap<TaskKey, TaskHandle>,
-+}
-+
-+pub struct TaskHandle {
-+    pub key: TaskKey,
-+    pub generation: u64,
-+    pub cancel: Arc<CancelToken>,
-+}
-
-- pub fn register(&mut self, key: TaskKey) -> Arc<CancelToken>
-- pub fn next_generation(&self) -> u64
-+ pub fn submit(&mut self, key: TaskKey) -> TaskHandle
-+ pub fn is_current(&self, key: &TaskKey, generation: u64) -> bool
-+ pub fn complete(&mut self, key: &TaskKey, generation: u64)
-```
-
-3. **Replace thread-sleep debounce with runtime timer messages**
-`std::thread::sleep(200ms)` inside task closures wastes pool threads under fast typing and reduces responsiveness under contention. Use timer-driven debounce messages and only fire the latest generation. This improves latency stability on large datasets.
-
-```diff
-@@ 4.3 Core Types (Msg enum)
-+ SearchDebounceArmed { generation: u64, query: String },
-+ SearchDebounceFired { generation: u64 },
-
-@@ 4.4 maybe_debounced_query
-- Cmd::task(move || {
--     std::thread::sleep(std::time::Duration::from_millis(200));
--     ...
-- })
-+ // Arm debounce only; runtime timer emits SearchDebounceFired.
-+ Cmd::msg(Msg::SearchDebounceArmed { generation, query })
-
-@@ 4.4 subscriptions()
-+ if self.state.search.debounce_pending() {
-+     subs.push(Box::new(
-+         Every::with_id(3, Duration::from_millis(200), || Msg::SearchDebounceFired { generation: ... })
-+     ));
-+ }
-```
-
-4. **Harden `DbManager` API to avoid lock-poison panics and accidental long-held guards**
-Returning raw `MutexGuard<Connection>` invites accidental lock scope expansion and `expect("lock poisoned")` panics. Move to closure-based access (`with_reader`, `with_writer`) returning `Result`, and use cached statements. This reduces deadlock risk and tail latency.
-
-```diff
-@@ 4.4 DbManager
-- pub fn reader(&self) -> MutexGuard<'_, Connection> { ...expect("reader lock poisoned") }
-- pub fn writer(&self) -> MutexGuard<'_, Connection> { ...expect("writer lock poisoned") }
-+ pub fn with_reader<T>(&self, f: impl FnOnce(&Connection) -> Result<T, LoreError>) -> Result<T, LoreError>
-+ pub fn with_writer<T>(&self, f: impl FnOnce(&Connection) -> Result<T, LoreError>) -> Result<T, LoreError>
-
-@@ 10.11 action.rs
-- let conn = db.reader();
-- match fetch_issues(&conn, &filter) { ... }
-+ match db.with_reader(|conn| fetch_issues(conn, &filter)) { ... }
-
-+ // Query hot paths use prepare_cached() to reduce parse overhead.
-```
-
-5. **Add read-path entity cache (LRU) for repeated drill-in/out workflows**
-Your core daily flow is Enter/Esc bouncing between list/detail. Without caching, identical detail payloads are re-queried repeatedly. A bounded LRU by `EntityKey` with invalidation on sync completion gives near-instant reopen behavior and reduces DB pressure.
-
-```diff
-@@ 4.1 Module Structure
-+    entity_cache.rs               # Bounded LRU cache for detail payloads
-
-@@ app.rs LoreApp fields
-+    entity_cache: EntityCache,
-
-@@ load_screen(Screen::IssueDetail / MrDetail)
-+    if let Some(cached) = self.entity_cache.get_issue(&key) {
-+        return Cmd::msg(Msg::IssueDetailLoaded { key, detail: cached.clone() });
-+    }
-
-@@ Msg::IssueDetailLoaded / Msg::MrDetailLoaded handlers
-+    self.entity_cache.put_issue(key.clone(), detail.clone());
-
-@@ Msg::SyncCompleted
-+    self.entity_cache.invalidate_all();
-```
-
-6. **Tighten sync-stream observability and drop semantics without adding heavy architecture**
-You already handle backpressure, but operators need visibility when it happens. Track dropped-progress count and max queue depth in state and surface it in running/summary views. This keeps the current simple design while making reliability measurable.
-
-```diff
-@@ 4.3 Msg
-+ SyncStreamStats { dropped_progress: u64, max_queue_depth: usize },
-
-@@ 5.9 Sync (Running mode footer)
--| Esc cancel  f full sync  e embed after  d dry-run  l log level|
-+| Esc cancel  f full sync  e embed after  d dry-run  l log level  stats:drop=12 qmax=1847 |
-
-@@ 9.3 Success criteria
-+24. Sync stream stats are emitted and rendered; terminal events (completed/failed/cancelled) delivery is 100% under induced backpressure.
-```
-
-7. **Make crash reporting match the promised diagnostic value**
-The PRD promises event replay context, but sample hook writes only panic text. Add explicit crash context capture (`last events`, `current screen`, `task handles`, `build id`, `db fingerprint`) and retention policy. This materially improves post-mortem debugging.
-
-```diff
-@@ 4.1 Module Structure
-+    crash_context.rs              # ring buffer of normalized events + task/screen snapshot
-
-@@ 10.3 install_panic_hook_for_tui()
-- let report = crate::redact::redact_sensitive(&format!("{panic_info:#?}"));
-+ let ctx = crate::crash_context::snapshot();
-+ let report = crate::redact::redact_sensitive(&format!("{panic_info:#?}\n{ctx:#?}"));
-
-+ // Retention: keep latest 20 crash files, delete oldest metadata entries only.
-```
-
-8. **Add Search Facets panel for faster triage (high-value feature, low risk)**
-Search is central, but right now filtering requires manual field edits. Add facet counts (`issues`, `MRs`, `discussions`, top labels/projects/authors) with one-key apply. This makes search more compelling and actionable without introducing schema changes.
-
-```diff
-@@ 5.6 Search
--- Layout: Split pane — results list (left) + preview (right)
-+- Layout: Three-pane on wide terminals — results (left) + preview (center) + facets (right)
-
-+**Facets panel:**
-+- Entity type counts (issue/MR/discussion)
-+- Top labels/projects/authors for current query
-+- `1/2/3` quick-apply type facet; `l` cycles top label facet
-
-@@ 8.2 List/Search keybindings
-+| `1` `2` `3` | Apply facet: Issue / MR / Discussion |
-+| `l` | Apply next top-label facet |
-```
-
-9. **Strengthen text sanitization for terminal edge cases**
-Current sanitizer is strong, but still misses some control-space edge cases (C1 controls, directional marks beyond the listed bidi set). Add those and test them. This closes spoofing/render confusion gaps with minimal complexity.
-
-```diff
-@@ 10.4.1 sanitize_for_terminal()
-+ // Strip C1 control block (U+0080..U+009F) and additional directional marks
-+ c if ('\u{0080}'..='\u{009F}').contains(&c) => {}
-+ '\u{200E}' | '\u{200F}' | '\u{061C}' => {} // LRM, RLM, ALM
-
-@@ tests
-+ #[test] fn strips_c1_controls() { ... }
-+ #[test] fn strips_lrm_rlm_alm() { ... }
-```
-
-10. **Add an explicit vertical-slice gate before broad screen expansion**
-The plan is comprehensive, but risk is still front-loaded on framework + runtime behavior. Insert a strict vertical slice gate (`Dashboard + IssueList + IssueDetail + Sync running`) with perf and stability thresholds before Phase 3 features. This reduces rework if foundational assumptions break.
-
-```diff
-@@ 9.2 Phases
-+section Phase 2.5 — Vertical Slice Gate
-+Dashboard + IssueList + IssueDetail + Sync (running) integrated :p25a, after p2c, 3d
-+Gate: p95 nav latency < 75ms on M tier; zero stuck-input-state bugs; cancel p95 < 2s :p25b, after p25a, 1d
-+Only then proceed to Search/Timeline/Who/Palette expansion.
-```
-
-If you want, I can produce a full consolidated `diff` block against the entire PRD text (single patch), but the above is the set I’d prioritize first.

plans/work-item-status-graphql.md

@@ -107,12 +107,12 @@ Each criterion is independently testable. Implementation is complete when ALL pa
 
 ### AC-7: Show Issue Display (E2E)
 
-**Human (`lore show issue 123`):**
+**Human (`lore issues 123`):**
 - [ ] New line after "State": `Status:   In progress` (colored by `status_color` hex → nearest terminal color)
 - [ ] Status line only shown when `status_name IS NOT NULL`
 - [ ] Category shown in parens when available, lowercased: `Status:   In progress (in_progress)`
 
-**Robot (`lore --robot show issue 123`):**
+**Robot (`lore --robot issues 123`):**
 - [ ] JSON includes `status_name`, `status_category`, `status_color`, `status_icon_name`, `status_synced_at` fields
 - [ ] Fields are `null` (not absent) when status not available
 - [ ] `status_synced_at` is integer (ms epoch UTC) or `null` — enables freshness checks by consumers

rust-toolchain.toml

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly-2026-03-01"

specs/SPEC_discussion_analysis.md

@@ -0,0 +1,729 @@
+# Spec: Discussion Analysis — LLM-Powered Discourse Enrichment
+
+**Parent:** SPEC_explain.md (replaces key_decisions heuristic, line 270)
+**Created:** 2026-03-11
+**Status:** DRAFT — iterating with user
+
+## Spec Status
+| Section | Status | Notes |
+|---------|--------|-------|
+| Objective | draft | Core vision defined, success metrics TBD |
+| Tech Stack | draft | Bedrock + Anthropic API dual-backend |
+| Architecture | draft | Pre-computed enrichment pipeline |
+| Schema | draft | `discussion_analysis` table with staleness detection |
+| CLI Command | draft | `lore enrich discussions` |
+| LLM Provider | draft | Configurable backend abstraction |
+| Explain Integration | draft | Replaces heuristic with DB lookup |
+| Prompt Design | draft | Thread-level discourse classification |
+| Testing Strategy | draft | Includes mock LLM for deterministic tests |
+| Boundaries | draft | |
+| Tasks | not started | Blocked on spec approval |
+
+**Definition of Complete:** All sections `complete`, Open Questions empty,
+every user journey has tasks, every task has TDD workflow and acceptance criteria.
+
+---
+
+## Open Questions (Resolve Before Implementation)
+
+1. **Bedrock model ID**: Which exact Bedrock model will be used? (Assuming `anthropic.claude-3-haiku-*` — need the org-approved ARN or model ID.)
+2. **Auth mechanism**: Does the Bedrock setup use IAM role assumption, SSO profile, or explicit access keys? This affects the SDK configuration.
+3. **Rate limiting**: What's the org's Bedrock rate limit? This determines batch concurrency.
+4. **Cost ceiling**: Should there be a per-run token budget or discussion count cap? (e.g., `--max-threads 200`)
+5. **Confidence thresholds**: Below what confidence should we discard an analysis vs. store it with low confidence?
+6. **explain integration field name**: Replace `key_decisions` entirely, or add a new `discourse_analysis` section alongside it? (Recommendation: replace `key_decisions` — the heuristic is acknowledged as inadequate.)
+
+---
+
+## Objective
+
+**Goal:** Pre-compute structured discourse analysis for discussion threads using an LLM (Claude Haiku via Bedrock or Anthropic API), storing results locally so that `lore explain` and future commands can surface meaningful decisions, answered questions, and consensus without runtime LLM calls.
+
+**Problem:** The current `key_decisions` heuristic in `explain` correlates state-change events with notes by the same actor within 60 minutes. This produces mostly empty results because real decisions happen in discussion threads, not at the moment of state changes. The heuristic cannot understand conversational semantics — whether a comment confirms a proposal, answers a question, or represents consensus.
+
+**What this enables:**
+- `lore explain issues 42` shows *actual* decisions extracted from discussion threads, not event-note temporal coincidences
+- Reusable across commands — any command can query `discussion_analysis` for pre-computed insights
+- Fully offline at query time — LLM enrichment is a batch pre-computation step
+- Incremental — only re-analyzes threads whose notes have changed (staleness via `notes_hash`)
+
+**Success metrics:**
+- `lore enrich discussions` processes 100 threads in <60s with Haiku
+- `lore explain` key_decisions section populated from enrichment data in <500ms (no LLM calls)
+- Staleness detection: re-running enrichment skips unchanged threads
+- Zero impact on users without LLM configuration — graceful degradation to empty key_decisions
+
+---
+
+## Tech Stack & Constraints
+
+| Layer | Technology | Notes |
+|-------|-----------|-------|
+| Language | Rust | nightly-2026-03-01 |
+| LLM (primary) | Claude Haiku via AWS Bedrock | Org-approved, security-compliant |
+| LLM (fallback) | Claude Haiku via Anthropic API | For personal/non-org use |
+| HTTP | asupersync `HttpClient` | Existing wrapper in `src/http.rs` |
+| Database | SQLite via rusqlite | New migration for `discussion_analysis` table |
+| Config | `~/.config/lore/config.json` | New `enrichment` section |
+
+**Constraints:**
+- Bedrock is the primary backend (org security requirement for Taylor's work context)
+- Anthropic API is an alternative for non-org users
+- `lore explain` must NEVER make runtime LLM calls — all enrichment is pre-computed
+- `lore explain` performance budget unchanged: <500ms
+- Enrichment is an explicit opt-in step (`lore enrich`), never runs during `sync`
+- Must work when no LLM is configured — `key_decisions` degrades to empty array (or falls back to heuristic as transitional behavior)
+
+---
+
+## Architecture
+
+### System Overview
+
+```
+┌─────────────────────────────────────────────────┐
+│                  lore enrich                     │
+│  (explicit user/agent command, batch operation)  │
+└──────────────────────┬──────────────────────────┘
+                       │
+         ┌─────────────▼─────────────┐
+         │    Enrichment Pipeline     │
+         │  1. Select stale threads   │
+         │  2. Build LLM prompts      │
+         │  3. Call LLM (batched)     │
+         │  4. Parse responses        │
+         │  5. Store in DB            │
+         └─────────────┬─────────────┘
+                       │
+         ┌─────────────▼─────────────┐
+         │   discussion_analysis     │
+         │   (SQLite table)          │
+         └─────────────┬─────────────┘
+                       │
+         ┌─────────────▼─────────────┐
+         │   lore explain / other    │
+         │   (simple SELECT query)   │
+         └───────────────────────────┘
+```
+
+### Data Flow
+
+1. **Staleness detection**: For each discussion, compute `SHA-256(sorted note IDs + note bodies)`. Compare against stored `notes_hash`. Skip if unchanged.
+2. **Prompt construction**: Extract the last N notes (configurable, default 5) from the thread. Build a structured prompt asking for discourse classification.
+3. **LLM call**: Send to configured backend (Bedrock or Anthropic API). Parse structured JSON response.
+4. **Storage**: Upsert into `discussion_analysis` with analysis results, model ID, timestamp, and notes_hash.
+
+### Pre-computation vs Runtime Trade-offs
+
+| Concern | Pre-computed (chosen) | Runtime |
+|---------|----------------------|---------|
+| explain latency | <500ms (DB query) | 2-5s per thread (LLM call) |
+| Offline capability | Full | None |
+| Bedrock compliance | Clean separation | Leaks into explain path |
+| Reusability | Any command can query | Tied to explain |
+| Freshness | Stale until re-enriched | Always current |
+| Cost | Batch (predictable) | Per-query (unbounded) |
+
+---
+
+## Schema
+
+### New Migration (next available version)
+
+```sql
+CREATE TABLE discussion_analysis (
+    id INTEGER PRIMARY KEY,
+    discussion_id INTEGER NOT NULL REFERENCES discussions(id),
+    analysis_type TEXT NOT NULL,  -- 'decision', 'question_answered', 'consensus', 'open_debate', 'informational'
+    confidence REAL NOT NULL,     -- 0.0 to 1.0
+    summary TEXT NOT NULL,        -- LLM-generated 1-2 sentence summary
+    evidence_note_ids TEXT,       -- JSON array of note IDs that support this analysis
+    model_id TEXT NOT NULL,       -- e.g. 'anthropic.claude-3-haiku-20240307-v1:0'
+    analyzed_at INTEGER NOT NULL, -- ms epoch
+    notes_hash TEXT NOT NULL,     -- SHA-256 of thread content for staleness detection
+
+    UNIQUE(discussion_id, analysis_type)
+);
+
+CREATE INDEX idx_discussion_analysis_discussion
+    ON discussion_analysis(discussion_id);
+
+CREATE INDEX idx_discussion_analysis_type
+    ON discussion_analysis(analysis_type);
+```
+
+**Design decisions:**
+- `UNIQUE(discussion_id, analysis_type)`: A thread can have at most one analysis per type. Re-enrichment upserts.
+- `evidence_note_ids` is a JSON array (not a junction table) because it's read-only metadata, never queried by note ID.
+- `notes_hash` enables O(1) staleness checks without re-reading all notes.
+- `confidence` allows filtering in queries (e.g., only show decisions with confidence > 0.7).
+- `analysis_type` uses lowercase snake_case strings, not an enum constraint, for forward compatibility.
+
+### Analysis Types
+
+| Type | Description | Example |
+|------|-------------|---------|
+| `decision` | A concrete decision was made or confirmed | "Team agreed to use Redis for caching" |
+| `question_answered` | A question was asked and definitively answered | "Confirmed: the API supports pagination via cursor" |
+| `consensus` | Multiple participants converged on an approach | "All reviewers approved the retry-with-backoff strategy" |
+| `open_debate` | Active disagreement or unresolved discussion | "Disagreement on whether to use gRPC vs REST" |
+| `informational` | Thread is purely informational, no actionable discourse | "Status update on deployment progress" |
+
+### Notes Hash Computation
+
+```
+notes_hash = SHA-256(
+    note_1_id + ":" + note_1_body + "\n" +
+    note_2_id + ":" + note_2_body + "\n" +
+    ...
+)
+```
+
+Notes sorted by `id` (insertion order) before hashing. This means:
+- New note added → hash changes → re-enrich
+- Note edited (body changes) → hash changes → re-enrich
+- No changes → hash matches → skip
+
+---
+
+## CLI Command
+
+### `lore enrich discussions`
+
+```bash
+# Enrich all stale discussions across all projects
+lore enrich discussions
+
+# Scope to a project
+lore enrich discussions -p group/repo
+
+# Scope to a single entity's discussions
+lore enrich discussions --issue 42 -p group/repo
+lore enrich discussions --mr 99 -p group/repo
+
+# Force re-enrichment (ignore staleness)
+lore enrich discussions --force
+
+# Dry run (show what would be enriched, don't call LLM)
+lore enrich discussions --dry-run
+
+# Limit batch size
+lore enrich discussions --max-threads 50
+
+# Robot mode
+lore -J enrich discussions
+```
+
+### Robot Mode Output
+
+```json
+{
+  "ok": true,
+  "data": {
+    "total_discussions": 1200,
+    "stale": 45,
+    "enriched": 45,
+    "skipped_unchanged": 1155,
+    "errors": 0,
+    "tokens_used": {
+      "input": 23400,
+      "output": 4500
+    }
+  },
+  "meta": { "elapsed_ms": 32000 }
+}
+```
+
+### Human Mode Output
+
+```
+Enriching discussions...
+
+  Project: vs/typescript-code
+    Discussions: 1,200 total, 45 stale
+    Enriching: ████████████████████ 45/45
+    Results: 12 decisions, 8 questions answered, 5 consensus, 3 debates, 17 informational
+    Tokens: 23.4K input, 4.5K output
+
+  Done in 32s
+```
+
+### Command Registration
+
+```rust
+/// Pre-compute discourse analysis for discussion threads using LLM
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore enrich discussions                      # Enrich all stale discussions
+  lore enrich discussions -p group/repo        # Scope to project
+  lore enrich discussions --issue 42           # Single issue's discussions
+  lore -J enrich discussions --dry-run         # Preview what would be enriched")]
+Enrich {
+    /// What to enrich: "discussions"
+    #[arg(value_parser = ["discussions"])]
+    target: String,
+
+    /// Scope to project (fuzzy match)
+    #[arg(short, long)]
+    project: Option<String>,
+
+    /// Scope to a specific issue's discussions
+    #[arg(long, conflicts_with = "mr")]
+    issue: Option<i64>,
+
+    /// Scope to a specific MR's discussions
+    #[arg(long, conflicts_with = "issue")]
+    mr: Option<i64>,
+
+    /// Re-enrich all threads regardless of staleness
+    #[arg(long)]
+    force: bool,
+
+    /// Show what would be enriched without calling LLM
+    #[arg(long)]
+    dry_run: bool,
+
+    /// Maximum threads to enrich in one run
+    #[arg(long, default_value = "500")]
+    max_threads: usize,
+},
+```
+
+---
+
+## LLM Provider Abstraction
+
+### Config Schema
+
+New `enrichment` section in `~/.config/lore/config.json`:
+
+```json
+{
+  "enrichment": {
+    "provider": "bedrock",
+    "bedrock": {
+      "region": "us-east-1",
+      "modelId": "anthropic.claude-3-haiku-20240307-v1:0",
+      "profile": "default"
+    },
+    "anthropicApi": {
+      "modelId": "claude-3-haiku-20240307"
+    },
+    "concurrency": 4,
+    "maxNotesPerThread": 5,
+    "minConfidence": 0.6
+  }
+}
+```
+
+**Provider selection:**
+- `"bedrock"` — AWS Bedrock (uses AWS SDK credential chain: env vars → profile → IAM role)
+- `"anthropic"` — Anthropic API (uses `ANTHROPIC_API_KEY` env var)
+- `null` or absent — enrichment disabled, `lore enrich` exits with informative message
+
+### Rust Abstraction
+
+```rust
+/// Trait for LLM backends. Implementations handle auth, serialization, and API specifics.
+#[async_trait]
+pub trait LlmProvider: Send + Sync {
+    /// Send a prompt and get a structured response.
+    async fn complete(&self, prompt: &str, max_tokens: u32) -> Result<LlmResponse>;
+
+    /// Provider name for logging/storage (e.g., "bedrock", "anthropic")
+    fn provider_name(&self) -> &str;
+
+    /// Model identifier for storage (e.g., "anthropic.claude-3-haiku-20240307-v1:0")
+    fn model_id(&self) -> &str;
+}
+
+pub struct LlmResponse {
+    pub content: String,
+    pub input_tokens: u32,
+    pub output_tokens: u32,
+    pub stop_reason: String,
+}
+```
+
+### Bedrock Implementation Notes
+
+- Uses AWS SDK `InvokeModel` API (not Converse) for Anthropic models on Bedrock
+- Request body follows Anthropic Messages API format, wrapped in Bedrock's envelope
+- Auth: AWS credential chain (env → profile → IMDS)
+- Region from config or `AWS_REGION` env var
+- Content type: `application/json`, accept: `application/json`
+
+### Anthropic API Implementation Notes
+
+- Standard Messages API (`POST /v1/messages`)
+- Auth: `x-api-key` header from `ANTHROPIC_API_KEY` env var
+- Model ID from config `enrichment.anthropicApi.modelId`
+
+---
+
+## Prompt Design
+
+### Thread-Level Analysis Prompt
+
+The prompt receives the last N notes from a discussion thread and classifies the discourse.
+
+```
+You are analyzing a discussion thread from a software project's issue tracker.
+
+Thread context:
+- Entity: {entity_type} #{iid} "{title}"
+- Thread started: {first_note_at}
+- Total notes in thread: {note_count}
+
+Notes (most recent {N} shown):
+
+[Note by @{author} at {timestamp}]
+{body}
+
+[Note by @{author} at {timestamp}]
+{body}
+
+...
+
+Classify this thread's discourse. Respond with JSON only:
+
+{
+  "analysis_type": "decision" | "question_answered" | "consensus" | "open_debate" | "informational",
+  "confidence": 0.0-1.0,
+  "summary": "1-2 sentence summary of what was decided/answered/debated",
+  "evidence_note_indices": [0, 2]  // indices of notes that most support this classification
+}
+
+Classification guide:
+- "decision": A concrete choice was made. Look for: "let's go with", "agreed", "approved", explicit confirmation of an approach.
+- "question_answered": A question was asked and definitively answered. Look for: question mark followed by a clear factual response.
+- "consensus": Multiple people converged. Look for: multiple approvals, "+1", "LGTM", agreement from different authors.
+- "open_debate": Active disagreement or unresolved alternatives. Look for: "but", "alternatively", "I disagree", competing proposals without resolution.
+- "informational": Status updates, FYI notes, no actionable discourse.
+
+If the thread is ambiguous, prefer "informational" with lower confidence over guessing.
+```
+
+### Prompt Design Principles
+
+1. **Structured JSON output** — Haiku is reliable at JSON generation with clear schema
+2. **Evidence-backed** — `evidence_note_indices` ties the classification to specific notes, enabling the UI to show "why"
+3. **Conservative default** — "informational" is the fallback, preventing false-positive decisions
+4. **Limited context window** — Last 5 notes (configurable) keeps token usage low per thread
+5. **No system prompt tricks** — Straightforward classification task within Haiku's strengths
+
+### Token Budget Estimation
+
+| Component | Tokens (approx) |
+|-----------|-----------------|
+| System/instruction prompt | ~300 |
+| Thread metadata | ~50 |
+| 5 notes (avg 100 words each) | ~750 |
+| Response | ~100 |
+| **Total per thread** | **~1,200** |
+
+At Haiku pricing (~$0.25/1M input, ~$1.25/1M output):
+- 100 threads ≈ $0.03 input + $0.01 output = **~$0.04**
+- 1,000 threads ≈ **~$0.40**
+
+---
+
+## Explain Integration
+
+### Current Behavior (to be replaced)
+
+`explain.rs:650` — `extract_key_decisions()` uses the 60-minute same-actor heuristic.
+
+### New Behavior
+
+When `discussion_analysis` table has data for the entity's discussions:
+
+```rust
+fn fetch_key_decisions_from_enrichment(
+    conn: &Connection,
+    entity_type: &str,
+    entity_id: i64,
+    max_decisions: usize,
+) -> Result<Vec<KeyDecision>> {
+    let id_col = id_column_for(entity_type);
+    let sql = format!(
+        "SELECT da.analysis_type, da.confidence, da.summary, da.evidence_note_ids,
+                da.analyzed_at, d.gitlab_discussion_id
+         FROM discussion_analysis da
+         JOIN discussions d ON da.discussion_id = d.id
+         WHERE d.{id_col} = ?1
+           AND da.analysis_type IN ('decision', 'question_answered', 'consensus')
+           AND da.confidence >= ?2
+         ORDER BY da.confidence DESC, da.analyzed_at DESC
+         LIMIT ?3"
+    );
+    // ... map to KeyDecision structs
+}
+```
+
+### Fallback Strategy
+
+```
+if discussion_analysis table has rows for this entity:
+    use enrichment data → key_decisions
+else if enrichment is not configured:
+    fall back to heuristic (existing behavior)
+else:
+    return empty key_decisions with a hint: "Run 'lore enrich discussions' to populate"
+```
+
+This preserves backwards compatibility during rollout. The heuristic can be removed entirely once enrichment is the established workflow.
+
+### KeyDecision Struct Changes
+
+```rust
+#[derive(Debug, Serialize)]
+pub struct KeyDecision {
+    pub timestamp: String,           // ISO 8601 (analyzed_at or note timestamp)
+    pub actor: Option<String>,       // May not be single-actor for consensus
+    pub action: String,              // analysis_type: "decision", "question_answered", "consensus"
+    pub summary: String,             // LLM-generated summary (replaces context_note)
+    pub confidence: f64,             // 0.0-1.0
+    pub discussion_id: Option<String>, // gitlab_discussion_id for linking
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<String>,      // "enrichment" or "heuristic" (transitional)
+}
+```
+
+---
+
+## Testing Strategy
+
+### Unit Tests (Mock LLM)
+
+The LLM provider trait enables deterministic testing with a mock:
+
+```rust
+struct MockLlmProvider {
+    responses: Vec<String>,  // pre-canned JSON responses
+    call_count: AtomicUsize,
+}
+
+impl LlmProvider for MockLlmProvider {
+    async fn complete(&self, _prompt: &str, _max_tokens: u32) -> Result<LlmResponse> {
+        let idx = self.call_count.fetch_add(1, Ordering::SeqCst);
+        Ok(LlmResponse {
+            content: self.responses[idx].clone(),
+            input_tokens: 100,
+            output_tokens: 50,
+            stop_reason: "end_turn".to_string(),
+        })
+    }
+}
+```
+
+### Test Cases
+
+| Test | What it validates |
+|------|-------------------|
+| `test_staleness_hash_changes_on_new_note` | notes_hash differs when note added |
+| `test_staleness_hash_stable_no_changes` | notes_hash identical on re-computation |
+| `test_enrichment_skips_unchanged_threads` | Threads with matching hash are not re-enriched |
+| `test_enrichment_force_ignores_hash` | `--force` re-enriches all threads |
+| `test_enrichment_stores_analysis` | Results persisted to `discussion_analysis` table |
+| `test_enrichment_upserts_on_rereun` | Re-enrichment updates existing rows |
+| `test_enrichment_dry_run_no_writes` | `--dry-run` produces count but writes nothing |
+| `test_enrichment_respects_max_threads` | Caps at `--max-threads` value |
+| `test_enrichment_scopes_to_project` | `-p` limits to project's discussions |
+| `test_enrichment_scopes_to_entity` | `--issue 42` limits to that issue's discussions |
+| `test_explain_uses_enrichment_data` | explain returns enrichment-sourced key_decisions |
+| `test_explain_falls_back_to_heuristic` | No enrichment data → heuristic results |
+| `test_explain_empty_when_no_data` | No enrichment, no heuristic matches → empty array |
+| `test_prompt_construction` | Prompt includes correct notes, metadata, and instruction |
+| `test_response_parsing_valid_json` | Well-formed LLM response parsed correctly |
+| `test_response_parsing_malformed` | Malformed response logged, thread skipped (not crash) |
+| `test_confidence_filter` | Only analysis above `minConfidence` shown in explain |
+| `test_provider_config_bedrock` | Bedrock config parsed and provider instantiated |
+| `test_provider_config_anthropic` | Anthropic API config parsed correctly |
+| `test_no_enrichment_config_graceful` | Missing enrichment config → informative message, exit 0 |
+
+### Integration Tests
+
+- **Real Bedrock call** (gated behind `#[ignore]` + env var `LORE_TEST_BEDROCK=1`): Sends one real prompt to Bedrock, asserts valid JSON response with expected schema.
+- **Full pipeline**: In-memory DB → insert discussions + notes → enrich with mock → verify `discussion_analysis` populated → run explain → verify key_decisions sourced from enrichment.
+
+---
+
+## Boundaries
+
+### Always (autonomous)
+- Run `cargo test` and `cargo clippy` after every code change
+- Use `MockLlmProvider` in all non-integration tests
+- Respect `--dry-run` flag — never call LLM in dry-run mode
+- Log token usage for every enrichment run
+- Graceful degradation when no enrichment config exists
+
+### Ask First (needs approval)
+- Adding AWS SDK or HTTP dependencies to Cargo.toml
+- Choosing between `aws-sdk-bedrockruntime` crate vs raw HTTP to Bedrock
+- Modifying the `Config` struct (new `enrichment` field)
+- Changing `KeyDecision` struct shape (affects robot mode API contract)
+
+### Never (hard stops)
+- No LLM calls in `lore explain` path — enrichment is pre-computed only
+- No storing API keys in config file — use env vars / credential chain
+- No automatic enrichment during `lore sync` — enrichment is always explicit
+- No sending discussion content to any service other than the configured LLM provider
+
+---
+
+## Non-Goals
+
+- **No real-time streaming** — Enrichment is batch, not streaming
+- **No multi-model ensemble** — Single model per run, configurable per config
+- **No custom fine-tuning** — Uses Haiku as-is with prompt engineering
+- **No enrichment of individual notes** — Thread-level only (the unit of discourse)
+- **No automatic re-enrichment on sync** — User/agent must explicitly run `lore enrich`
+- **No modification of discussion/notes tables** — Enrichment data lives in its own table
+- **No embedding-based approach** — This is classification, not similarity search
+
+---
+
+## User Journeys
+
+### P1 — Critical
+- **UJ-1: Agent enriches discussions before explain**
+  - Actor: AI agent (via robot mode)
+  - Flow: `lore -J enrich discussions -p group/repo` → JSON summary of enrichment run → `lore -J explain issues 42` → key_decisions populated from enrichment
+  - Error paths: No enrichment config (exit with suggestion), Bedrock auth failure (exit 5), rate limited (exit 7)
+  - Implemented by: Tasks 1-5
+
+### P2 — Important
+- **UJ-2: Human runs enrichment and checks results**
+  - Actor: Developer at terminal
+  - Flow: `lore enrich discussions` → progress bar → summary → `lore explain issues 42` → sees decisions in narrative
+  - Error paths: Same as UJ-1 but with human-readable messages
+  - Implemented by: Tasks 1-5
+
+- **UJ-3: Incremental enrichment after sync**
+  - Actor: AI agent or human
+  - Flow: `lore sync` → new notes ingested → `lore enrich discussions` → only stale threads re-enriched → fast completion
+  - Implemented by: Task 2 (staleness detection)
+
+### P3 — Nice to Have
+- **UJ-4: Dry-run to estimate cost**
+  - Actor: Cost-conscious user
+  - Flow: `lore enrich discussions --dry-run` → see thread count and estimated tokens → decide whether to proceed
+  - Implemented by: Task 4
+
+---
+
+## Tasks
+
+### Phase 1: Schema & Provider Abstraction
+
+- [ ] **Task 1:** Database migration + LLM provider trait
+  - **Implements:** Infrastructure (all UJs)
+  - **Files:** `src/core/db.rs` (migration), NEW `src/enrichment/mod.rs`, NEW `src/enrichment/provider.rs`
+  - **Depends on:** Nothing
+  - **Test-first:**
+    1. Write `test_migration_creates_discussion_analysis_table`: run migrations, verify table exists with correct columns
+    2. Write `test_provider_config_bedrock`: parse config JSON with bedrock enrichment section
+    3. Write `test_provider_config_anthropic`: parse config JSON with anthropic enrichment section
+    4. Write `test_no_enrichment_config_graceful`: parse config without enrichment section, verify `None`
+    5. Run tests — all FAIL (red)
+    6. Implement migration + `LlmProvider` trait + `EnrichmentConfig` struct + config parsing
+    7. Run tests — all PASS (green)
+  - **Acceptance:** Migration creates table. Config parses both provider variants. Missing config returns `None`.
+
+### Phase 2: Staleness & Prompt Pipeline
+
+- [ ] **Task 2:** Notes hash computation + staleness detection
+  - **Implements:** UJ-3 (incremental enrichment)
+  - **Files:** `src/enrichment/staleness.rs`
+  - **Depends on:** Task 1
+  - **Test-first:**
+    1. Write `test_staleness_hash_changes_on_new_note`
+    2. Write `test_staleness_hash_stable_no_changes`
+    3. Write `test_enrichment_skips_unchanged_threads`
+    4. Run tests — all FAIL (red)
+    5. Implement `compute_notes_hash()` + `find_stale_discussions()` query
+    6. Run tests — all PASS (green)
+  - **Acceptance:** Hash deterministic. Stale detection correct. Unchanged threads skipped.
+
+- [ ] **Task 3:** Prompt construction + response parsing
+  - **Implements:** Core enrichment logic
+  - **Files:** `src/enrichment/prompt.rs`, `src/enrichment/parser.rs`
+  - **Depends on:** Task 1
+  - **Test-first:**
+    1. Write `test_prompt_construction`: verify prompt includes notes, metadata, instruction
+    2. Write `test_response_parsing_valid_json`: well-formed response parsed
+    3. Write `test_response_parsing_malformed`: malformed response returns error (not panic)
+    4. Run tests — all FAIL (red)
+    5. Implement `build_prompt()` + `parse_analysis_response()`
+    6. Run tests — all PASS (green)
+  - **Acceptance:** Prompt is well-formed. Parser handles valid and invalid responses gracefully.
+
+### Phase 3: CLI Command & Pipeline
+
+- [ ] **Task 4:** `lore enrich discussions` command + enrichment pipeline
+  - **Implements:** UJ-1, UJ-2, UJ-4
+  - **Files:** NEW `src/cli/commands/enrich.rs`, `src/cli/mod.rs`, `src/main.rs`
+  - **Depends on:** Tasks 1, 2, 3
+  - **Test-first:**
+    1. Write `test_enrichment_stores_analysis`: mock LLM → verify rows in `discussion_analysis`
+    2. Write `test_enrichment_upserts_on_rerun`: enrich → re-enrich → verify single row updated
+    3. Write `test_enrichment_dry_run_no_writes`: dry-run → verify zero rows written
+    4. Write `test_enrichment_respects_max_threads`: 10 stale, max=3 → only 3 enriched
+    5. Write `test_enrichment_scopes_to_project`: verify project filter
+    6. Write `test_enrichment_scopes_to_entity`: verify --issue/--mr filter
+    7. Run tests — all FAIL (red)
+    8. Implement: command registration, pipeline orchestration, mock-based tests
+    9. Run tests — all PASS (green)
+  - **Acceptance:** Full pipeline works with mock. Dry-run safe. Scoping correct. Robot JSON matches schema.
+
+### Phase 4: LLM Backend Implementations
+
+- [ ] **Task 5:** Bedrock + Anthropic API provider implementations
+  - **Implements:** UJ-1, UJ-2 (actual LLM connectivity)
+  - **Files:** `src/enrichment/bedrock.rs`, `src/enrichment/anthropic.rs`
+  - **Depends on:** Task 4
+  - **Test-first:**
+    1. Write `test_bedrock_request_format`: verify request body matches Bedrock InvokeModel schema
+    2. Write `test_anthropic_request_format`: verify request body matches Messages API schema
+    3. Write integration test (gated `#[ignore]`): real Bedrock call, assert valid response
+    4. Run tests — unit FAIL (red), integration skipped
+    5. Implement both providers
+    6. Run tests — all PASS (green)
+  - **Acceptance:** Both providers construct valid requests. Auth works via standard credential chains. Integration test passes when enabled.
+
+### Phase 5: Explain Integration
+
+- [ ] **Task 6:** Replace heuristic with enrichment data in explain
+  - **Implements:** UJ-1, UJ-2 (the payoff)
+  - **Files:** `src/cli/commands/explain.rs`
+  - **Depends on:** Task 4
+  - **Test-first:**
+    1. Write `test_explain_uses_enrichment_data`: insert mock enrichment rows → explain returns them as key_decisions
+    2. Write `test_explain_falls_back_to_heuristic`: no enrichment rows → returns heuristic results
+    3. Write `test_confidence_filter`: insert rows with varying confidence → only high-confidence shown
+    4. Run tests — all FAIL (red)
+    5. Implement `fetch_key_decisions_from_enrichment()` + fallback logic
+    6. Run tests — all PASS (green)
+  - **Acceptance:** Explain uses enrichment when available. Falls back gracefully. Confidence threshold respected.
+
+---
+
+## Dependencies (New Crates — Needs Discussion)
+
+| Crate | Purpose | Alternative |
+|-------|---------|-------------|
+| `aws-sdk-bedrockruntime` | Bedrock InvokeModel API | Raw HTTP via existing `HttpClient` |
+| `sha2` | SHA-256 for notes_hash | Already in dependency tree? Check. |
+
+**Decision needed:** Use AWS SDK crate (heavier but handles auth/signing) vs. raw HTTP with SigV4 signing (lighter but more implementation work)?
+
+---
+
+## Session Log
+
+### Session 1 — 2026-03-11
+- Identified key_decisions heuristic as fundamentally inadequate (60-min same-actor window)
+- User vision: LLM-powered discourse analysis, pre-computed for offline explain
+- Key constraint: Bedrock required for org security compliance
+- Designed pre-computed enrichment architecture
+- Wrote initial spec draft for iteration

specs/SPEC_explain.md

@@ -0,0 +1,701 @@
+# Spec: lore explain — Auto-Generated Issue/MR Narratives
+
+**Bead:** bd-9lbr
+**Created:** 2026-03-10
+
+## Spec Status
+| Section | Status | Notes |
+|---------|--------|-------|
+| Objective | complete | |
+| Tech Stack | complete | |
+| Project Structure | complete | |
+| Commands | complete | |
+| Code Style | complete | UX-audited: after_help, --sections, --since, --no-timeline, --max-decisions, singular types |
+| Boundaries | complete | |
+| Testing Strategy | complete | 13 test cases (7 original + 5 UX flags + 1 singular type) |
+| Git Workflow | complete | jj-first |
+| User Journeys | complete | 3 journeys covering agent, human, pipeline use |
+| Architecture | complete | ExplainParams + section filtering + time scoping |
+| Success Criteria | complete | 15 criteria (10 original + 5 UX flags) |
+| Non-Goals | complete | |
+| Tasks | complete | 5 tasks across 3 phases, all updated for UX flags |
+
+**Definition of Complete:** All sections `complete`, Open Questions empty,
+every user journey has tasks, every task has TDD workflow and acceptance criteria.
+
+---
+
+## Quick Reference
+- [Entity Detail] (Architecture): reuse show/ query patterns (private — copy, don't import)
+- [Timeline] (Architecture): import `crate::timeline::seed::seed_timeline_direct` + `collect_events`
+- [Events] (Architecture): new inline queries against resource_state_events/resource_label_events
+- [References] (Architecture): new query against entity_references table
+- [Discussions] (Architecture): adapted from show/ patterns, add resolved/resolvable filter
+
+---
+
+## Open Questions (Resolve Before Implementation)
+<!-- All resolved -->
+
+---
+
+## Objective
+
+**Goal:** Add `lore explain issues N` / `lore explain mrs N` to auto-generate structured narratives of what happened on an issue or MR.
+
+**Problem:** Understanding the full story of an issue/MR requires reading dozens of notes, cross-referencing state changes, checking related entities, and piecing together a timeline. This is time-consuming for humans and nearly impossible for AI agents without custom orchestration.
+
+**Success metrics:**
+- Produces a complete narrative in <500ms for an issue with 50 notes
+- All 7 sections populated (entity, description_excerpt, key_decisions, activity, open_threads, related, timeline_excerpt)
+- Works fully offline (no API calls, no LLM)
+- Deterministic and reproducible (same input = same output)
+
+---
+
+## Tech Stack & Constraints
+
+| Layer | Technology | Version |
+|-------|-----------|---------|
+| Language | Rust | nightly-2026-03-01 (rust-toolchain.toml) |
+| Framework | clap (derive) | As in Cargo.toml |
+| Database | SQLite via rusqlite | Bundled |
+| Testing | cargo test | Inline #[cfg(test)] |
+| Async | asupersync | 0.2 |
+
+**Constraints:**
+- No LLM dependency — template-based, deterministic
+- No network calls — all data from local SQLite
+- Performance: <500ms for 50-note entity
+- Unsafe code forbidden (`#![forbid(unsafe_code)]`)
+
+---
+
+## Project Structure
+
+```
+src/cli/commands/
+  explain.rs            # NEW: command module (queries, heuristic, result types)
+src/cli/
+  mod.rs                # EDIT: add Explain variant to Commands enum
+src/app/
+  handlers.rs           # EDIT: add handle_explain dispatch
+  robot_docs.rs         # EDIT: register explain in robot-docs manifest
+src/main.rs             # EDIT: add Explain match arm
+```
+
+---
+
+## Commands
+
+```bash
+# Build
+cargo check --all-targets
+
+# Test
+cargo test explain
+
+# Lint
+cargo clippy --all-targets -- -D warnings
+
+# Format
+cargo fmt --check
+```
+
+---
+
+## Code Style
+
+**Command registration (from cli/mod.rs):**
+```rust
+/// Auto-generate a structured narrative of an issue or MR
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore explain issues 42                  # Narrative for issue #42
+  lore explain mrs 99 -p group/repo       # Narrative for MR !99 in specific project
+  lore -J explain issues 42               # JSON output for automation
+  lore explain issues 42 --sections key_decisions,open_threads  # Specific sections only
+  lore explain issues 42 --since 30d      # Narrative scoped to last 30 days
+  lore explain issues 42 --no-timeline    # Skip timeline (faster)")]
+Explain {
+    /// Entity type: "issues" or "mrs" (singular forms also accepted)
+    #[arg(value_parser = ["issues", "mrs", "issue", "mr"])]
+    entity_type: String,
+
+    /// Entity IID
+    iid: i64,
+
+    /// Scope to project (fuzzy match)
+    #[arg(short, long)]
+    project: Option<String>,
+
+    /// Select specific sections (comma-separated)
+    /// Valid: entity, description, key_decisions, activity, open_threads, related, timeline
+    #[arg(long, value_delimiter = ',', help_heading = "Output")]
+    sections: Option<Vec<String>>,
+
+    /// Skip timeline excerpt (faster execution)
+    #[arg(long, help_heading = "Output")]
+    no_timeline: bool,
+
+    /// Maximum key decisions to include
+    #[arg(long, default_value = "10", help_heading = "Output")]
+    max_decisions: usize,
+
+    /// Time scope for events/notes (e.g. 7d, 2w, 1m, or YYYY-MM-DD)
+    #[arg(long, help_heading = "Filters")]
+    since: Option<String>,
+},
+```
+
+**Entity type normalization:** The handler must normalize singular forms: `"issue"` -> `"issues"`, `"mr"` -> `"mrs"`. This prevents common typos from causing errors.
+
+**Query pattern (from show/issue.rs):**
+```rust
+fn find_issue(conn: &Connection, iid: i64, project_filter: Option<&str>) -> Result<IssueRow> {
+    let project_id = resolve_project(conn, project_filter)?;
+    let mut stmt = conn.prepare_cached("SELECT ... FROM issues WHERE iid = ?1 AND project_id = ?2")?;
+    // ...
+}
+```
+
+**Robot mode output (from cli/robot.rs):**
+```rust
+let response = serde_json::json!({
+    "ok": true,
+    "data": result,
+    "meta": { "elapsed_ms": elapsed.as_millis() }
+});
+println!("{}", serde_json::to_string(&response)?);
+```
+
+---
+
+## Boundaries
+
+### Always (autonomous)
+- Run `cargo test explain` and `cargo clippy` after every code change
+- Follow existing query patterns from show/issue.rs and show/mr.rs
+- Use `resolve_project()` for project resolution (fuzzy match)
+- Cap key_decisions at `--max-decisions` (default 10), timeline_excerpt at 20 events
+- Normalize singular entity types (`issue` -> `issues`, `mr` -> `mrs`)
+- Respect `--sections` filter: omit unselected sections from output (both robot and human)
+- Respect `--since` filter: scope events/notes queries with `created_at >= ?` threshold
+
+### Ask First (needs approval)
+- Adding new dependencies to Cargo.toml
+- Modifying existing query functions in show/ or timeline/
+- Changing the entity_references table schema
+
+### Never (hard stops)
+- No LLM calls — explain must be deterministic
+- No API/network calls — fully offline
+- No new database migrations — use existing schema only
+- Do not modify show/ or timeline/ modules (copy patterns instead)
+
+---
+
+## Testing Strategy (TDD — Red-Green)
+
+**Methodology:** Test-Driven Development. Write tests first, confirm red, implement, confirm green.
+
+**Framework:** cargo test, inline `#[cfg(test)]`
+**Location:** `src/cli/commands/explain.rs` (inline test module)
+
+**Test categories:**
+- Unit tests: key-decisions heuristic, activity counting, description truncation
+- Integration tests: full explain pipeline with in-memory DB
+
+**User journey test mapping:**
+| Journey | Test | Scenarios |
+|---------|------|-----------|
+| UJ-1: Agent explains issue | test_explain_issue_basic | All 7 sections present, robot JSON valid |
+| UJ-1: Agent explains MR | test_explain_mr | entity.type = "merge_request", merged_at included |
+| UJ-1: Singular entity type | test_explain_singular_entity_type | `"issue"` normalizes to `"issues"` |
+| UJ-1: Section filtering | test_explain_sections_filter_robot | Only selected sections in output |
+| UJ-1: No-timeline flag | test_explain_no_timeline_flag | timeline_excerpt is None |
+| UJ-2: Human reads narrative | (human render tested manually) | Headers, indentation, color |
+| UJ-3: Key decisions | test_explain_key_decision_heuristic | Note within 60min of state change by same actor |
+| UJ-3: No false decisions | test_explain_key_decision_ignores_unrelated_notes | Different author's note excluded |
+| UJ-3: Max decisions cap | test_explain_max_decisions | Respects `--max-decisions` parameter |
+| UJ-3: Since scopes events | test_explain_since_scopes_events | Only recent events included |
+| UJ-3: Open threads | test_explain_open_threads | Only unresolved discussions in output |
+| UJ-3: Edge case | test_explain_no_notes | Empty sections, no panic |
+| UJ-3: Activity counts | test_explain_activity_counts | Correct state/label/note counts |
+
+---
+
+## Git Workflow
+
+- **jj-first** — all VCS via jj, not git
+- **Commit format:** `feat(explain): <description>`
+- **No branches** — commit in place, use jj bookmarks to push
+
+---
+
+## User Journeys (Prioritized)
+
+### P1 — Critical
+- **UJ-1: Agent queries issue/MR narrative**
+  - Actor: AI agent (via robot mode)
+  - Flow: `lore -J explain issues 42` → JSON with 7 sections → agent parses and acts
+  - Error paths: Issue not found (exit 17), ambiguous project (exit 18)
+  - Implemented by: Task 1, 2, 3, 4
+
+### P2 — Important
+- **UJ-2: Human reads explain output**
+  - Actor: Developer at terminal
+  - Flow: `lore explain issues 42` → formatted narrative with headers, colors, indentation
+  - Error paths: Same as UJ-1 but with human-readable error messages
+  - Implemented by: Task 5
+
+### P3 — Nice to Have
+- **UJ-3: Agent uses key-decisions to understand context**
+  - Actor: AI agent making decisions
+  - Flow: Parse `key_decisions` array → understand who decided what and when → inform action
+  - Error paths: No key decisions found (empty array, not error)
+  - Implemented by: Task 3
+
+---
+
+## Architecture / Data Model
+
+### Data Assembly Pipeline (sync, no async needed)
+
+```
+1. RESOLVE    → resolve_project() + find entity by IID
+2. PARSE      → normalize entity_type, parse --since, validate --sections
+3. DETAIL     → entity metadata (title, state, author, labels, assignees, status)
+4. EVENTS     → resource_state_events + resource_label_events (optionally --since scoped)
+5. NOTES      → non-system notes via discussions join (optionally --since scoped)
+6. HEURISTIC  → key_decisions = events correlated with notes by same actor within 60min
+7. THREADS    → discussions WHERE resolvable=1 AND resolved=0
+8. REFERENCES → entity_references (both directions: source and target)
+9. TIMELINE   → seed_timeline_direct + collect_events (capped at 20, skip if --no-timeline)
+10. FILTER    → apply --sections filter: drop unselected sections before serialization
+11. ASSEMBLE  → combine into ExplainResult
+```
+
+**Section filtering:** When `--sections` is provided, only the listed sections are populated.
+Unselected sections are set to their zero-value (`None`, empty vec, etc.) and omitted
+from robot JSON via `#[serde(skip_serializing_if = "...")]`. The `entity` section is always
+included (needed for identification). Human mode skips rendering unselected sections.
+
+**Time scoping:** When `--since` is provided, parse it using `crate::core::time::parse_since()`
+(same function used by timeline, me, file-history). Add `AND created_at >= ?` to events
+and notes queries. The entity header, references, and open threads are NOT time-scoped
+(they represent current state, not historical events).
+
+### Key Types
+
+```rust
+/// Parameters controlling explain behavior.
+pub struct ExplainParams {
+    pub entity_type: String,       // "issues" or "mrs" (already normalized)
+    pub iid: i64,
+    pub project: Option<String>,
+    pub sections: Option<Vec<String>>,  // None = all sections
+    pub no_timeline: bool,
+    pub max_decisions: usize,      // default 10
+    pub since: Option<i64>,        // ms epoch threshold from --since parsing
+}
+
+#[derive(Debug, Serialize)]
+pub struct ExplainResult {
+    pub entity: EntitySummary,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description_excerpt: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub key_decisions: Option<Vec<KeyDecision>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub activity: Option<ActivitySummary>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub open_threads: Option<Vec<OpenThread>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub related: Option<RelatedEntities>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub timeline_excerpt: Option<Vec<TimelineEventSummary>>,
+}
+
+#[derive(Debug, Serialize)]
+pub struct EntitySummary {
+    #[serde(rename = "type")]
+    pub entity_type: String,    // "issue" or "merge_request"
+    pub iid: i64,
+    pub title: String,
+    pub state: String,
+    pub author: String,
+    pub assignees: Vec<String>,
+    pub labels: Vec<String>,
+    pub created_at: String,     // ISO 8601
+    pub updated_at: String,     // ISO 8601
+    pub url: Option<String>,
+    pub status_name: Option<String>,
+}
+
+#[derive(Debug, Serialize)]
+pub struct KeyDecision {
+    pub timestamp: String,      // ISO 8601
+    pub actor: String,
+    pub action: String,         // "state: opened -> closed" or "label: +bug"
+    pub context_note: String,   // truncated to 500 chars
+}
+
+#[derive(Debug, Serialize)]
+pub struct ActivitySummary {
+    pub state_changes: usize,
+    pub label_changes: usize,
+    pub notes: usize,           // non-system only
+    pub first_event: Option<String>,   // ISO 8601
+    pub last_event: Option<String>,    // ISO 8601
+}
+
+#[derive(Debug, Serialize)]
+pub struct OpenThread {
+    pub discussion_id: String,
+    pub started_by: String,
+    pub started_at: String,     // ISO 8601
+    pub note_count: usize,
+    pub last_note_at: String,   // ISO 8601
+}
+
+#[derive(Debug, Serialize)]
+pub struct RelatedEntities {
+    pub closing_mrs: Vec<ClosingMrInfo>,
+    pub related_issues: Vec<RelatedEntityInfo>,
+}
+
+#[derive(Debug, Serialize)]
+pub struct TimelineEventSummary {
+    pub timestamp: String,      // ISO 8601
+    pub event_type: String,
+    pub actor: Option<String>,
+    pub summary: String,
+}
+```
+
+### Key Decisions Heuristic
+
+The heuristic identifies notes that explain WHY state/label changes were made:
+
+1. Collect all `resource_state_events` and `resource_label_events` for the entity
+2. Merge into unified chronological list with (timestamp, actor, description)
+3. For each event, find the FIRST non-system note by the SAME actor within 60 minutes AFTER the event
+4. Pair them as a `KeyDecision`
+5. Cap at `params.max_decisions` (default 10)
+
+**SQL for state events:**
+```sql
+SELECT state, actor_username, created_at
+FROM resource_state_events
+WHERE issue_id = ?1   -- or merge_request_id = ?1
+  AND (?2 IS NULL OR created_at >= ?2)   -- --since filter
+ORDER BY created_at ASC
+```
+
+**SQL for label events:**
+```sql
+SELECT action, label_name, actor_username, created_at
+FROM resource_label_events
+WHERE issue_id = ?1   -- or merge_request_id = ?1
+  AND (?2 IS NULL OR created_at >= ?2)   -- --since filter
+ORDER BY created_at ASC
+```
+
+**SQL for non-system notes (for correlation):**
+```sql
+SELECT n.body, n.author_username, n.created_at
+FROM notes n
+JOIN discussions d ON n.discussion_id = d.id
+WHERE d.noteable_type = ?1 AND d.issue_id = ?2   -- or d.merge_request_id
+  AND n.is_system = 0
+  AND (?3 IS NULL OR n.created_at >= ?3)   -- --since filter
+ORDER BY n.created_at ASC
+```
+
+**Entity ID resolution:** The `discussions` table uses `issue_id` / `merge_request_id` columns (CHECK constraint: exactly one non-NULL). The `resource_state_events` and `resource_label_events` tables use the same pattern.
+
+### Cross-References Query
+
+```sql
+-- Outgoing references (this entity references others)
+SELECT target_entity_type, target_entity_id, target_project_path,
+       target_entity_iid, reference_type, source_method
+FROM entity_references
+WHERE source_entity_type = ?1 AND source_entity_id = ?2
+
+-- Incoming references (others reference this entity)
+SELECT source_entity_type, source_entity_id,
+       reference_type, source_method
+FROM entity_references
+WHERE target_entity_type = ?1 AND target_entity_id = ?2
+```
+
+**Note:** For closing MRs, reuse the pattern from show/issue.rs `get_closing_mrs()` which queries entity_references with `reference_type = 'closes'`.
+
+### Open Threads Query
+
+```sql
+SELECT d.gitlab_discussion_id, d.first_note_at, d.last_note_at
+FROM discussions d
+WHERE d.issue_id = ?1   -- or d.merge_request_id
+  AND d.resolvable = 1
+  AND d.resolved = 0
+ORDER BY d.last_note_at DESC
+```
+
+Then for each discussion, fetch the first note's author:
+```sql
+SELECT author_username, created_at
+FROM notes
+WHERE discussion_id = ?1
+ORDER BY created_at ASC
+LIMIT 1
+```
+
+And count notes per discussion:
+```sql
+SELECT COUNT(*) FROM notes WHERE discussion_id = ?1 AND is_system = 0
+```
+
+### Robot Mode Output Schema
+
+```json
+{
+  "ok": true,
+  "data": {
+    "entity": {
+      "type": "issue", "iid": 3864, "title": "...", "state": "opened",
+      "author": "teernisse", "assignees": ["teernisse"],
+      "labels": ["customer:BNSF"], "created_at": "2026-01-10T...",
+      "updated_at": "2026-02-12T...", "url": "...", "status_name": "In progress"
+    },
+    "description_excerpt": "First 500 chars...",
+    "key_decisions": [{
+      "timestamp": "2026-01-15T...",
+      "actor": "teernisse",
+      "action": "state: opened -> closed",
+      "context_note": "Starting work on the integration..."
+    }],
+    "activity": {
+      "state_changes": 3, "label_changes": 5, "notes": 42,
+      "first_event": "2026-01-10T...", "last_event": "2026-02-12T..."
+    },
+    "open_threads": [{
+      "discussion_id": "abc123",
+      "started_by": "cseiber",
+      "started_at": "2026-02-01T...",
+      "note_count": 5,
+      "last_note_at": "2026-02-10T..."
+    }],
+    "related": {
+      "closing_mrs": [{ "iid": 200, "title": "...", "state": "merged" }],
+      "related_issues": [{ "iid": 3800, "title": "Rail Break Card", "type": "related" }]
+    },
+    "timeline_excerpt": [
+      { "timestamp": "...", "event_type": "state_changed", "actor": "teernisse", "summary": "State changed to closed" }
+    ]
+  },
+  "meta": { "elapsed_ms": 350 }
+}
+```
+
+---
+
+## Success Criteria
+
+| # | Criterion | Input | Expected Output |
+|---|-----------|-------|----------------|
+| 1 | Issue explain produces all 7 sections | `lore -J explain issues N` | JSON with entity, description_excerpt, key_decisions, activity, open_threads, related, timeline_excerpt |
+| 2 | MR explain produces all 7 sections | `lore -J explain mrs N` | Same shape, entity.type = "merge_request" |
+| 3 | Key decisions captures correlated notes | State change + note by same actor within 60min | KeyDecision with action + context_note |
+| 4 | Key decisions ignores unrelated notes | Note by different author near state change | Not in key_decisions array |
+| 5 | Open threads filters correctly | 2 discussions: 1 resolved, 1 unresolved | Only unresolved in open_threads |
+| 6 | Activity counts are accurate | 3 state events, 2 label events, 10 notes | Matching counts in activity section |
+| 7 | Performance | Issue with 50 notes | <500ms |
+| 8 | Entity not found | Non-existent IID | Exit code 17, suggestion to sync |
+| 9 | Ambiguous project | IID exists in multiple projects, no -p | Exit code 18, suggestion to use -p |
+| 10 | Human render | `lore explain issues N` (no -J) | Formatted narrative with headers |
+| 11 | Singular entity type accepted | `lore explain issue 42` | Same as `lore explain issues 42` |
+| 12 | Section filtering works | `--sections key_decisions,activity` | Only those 2 sections + entity in JSON |
+| 13 | No-timeline skips timeline | `--no-timeline` | timeline_excerpt absent, faster execution |
+| 14 | Max-decisions caps output | `--max-decisions 3` | At most 3 key_decisions |
+| 15 | Since scopes events/notes | `--since 30d` | Only events/notes from last 30 days in activity, key_decisions |
+
+---
+
+## Non-Goals
+
+- **No LLM summarization** — This is template-based v1. LLM enhancement is a separate future feature.
+- **No new database migrations** — Uses existing schema (resource_state_events, resource_label_events, discussions, notes, entity_references tables all exist).
+- **No modification of show/ or timeline/ modules** — Copy patterns, don't refactor existing code. If we later want to share code, that's a separate refactoring bead.
+- **No interactive mode** — Output only, no prompts or follow-up questions.
+- **No MR diff analysis** — No file-level change summaries. Use `file-history` or `trace` for that.
+- **No assignee/reviewer history** — Activity summary counts events but doesn't track assignment changes over time.
+
+---
+
+## Tasks
+
+### Phase 1: Setup & Registration
+
+- [ ] **Task 1:** Register explain command in CLI and wire dispatch
+  - **Implements:** Infrastructure (UJ-1, UJ-2 prerequisite)
+  - **Files:** `src/cli/mod.rs`, `src/cli/commands/mod.rs`, `src/main.rs`, `src/app/handlers.rs`, NEW `src/cli/commands/explain.rs`
+  - **Depends on:** Nothing
+  - **Test-first:**
+    1. Write `test_explain_issue_basic` in explain.rs: insert a minimal issue + project + 1 discussion + 1 note + 1 state event into in-memory DB, call `run_explain()` with default ExplainParams, assert all 7 top-level sections present in result
+    2. Write `test_explain_mr` in explain.rs: insert MR with merged_at, call `run_explain()`, assert `entity.type == "merge_request"` and merged_at is populated
+    3. Write `test_explain_singular_entity_type`: call with `entity_type: "issue"`, assert it resolves same as `"issues"`
+    4. Run tests — all must FAIL (red)
+    5. Implement: Explain variant in Commands enum (with all flags: `--sections`, `--no-timeline`, `--max-decisions`, `--since`, singular entity type acceptance), handle_explain in handlers.rs (normalize entity_type, parse --since, build ExplainParams), skeleton `run_explain()` in explain.rs
+    6. Run tests — all must PASS (green)
+  - **Acceptance:** `cargo test explain::tests::test_explain_issue_basic`, `test_explain_mr`, and `test_explain_singular_entity_type` pass. Command registered in CLI help with after_help examples block.
+  - **Implementation notes:**
+    - Use inline args pattern (like Drift) with all flags from Code Style section
+    - `entity_type` validated by `#[arg(value_parser = ["issues", "mrs", "issue", "mr"])]`
+    - Normalize in handler: `"issue"` -> `"issues"`, `"mr"` -> `"mrs"`
+    - Parse `--since` using `crate::core::time::parse_since()` — returns ms epoch threshold
+    - Validate `--sections` values against allowed set: `["entity", "description", "key_decisions", "activity", "open_threads", "related", "timeline"]`
+    - Copy the `find_issue`/`find_mr` and `get_*` query patterns from show/issue.rs and show/mr.rs — they're private functions so can't be imported
+    - Use `resolve_project()` from `crate::core::project` for project resolution
+    - Use `ms_to_iso()` from `crate::core::time` for timestamp conversion
+
+### Phase 2: Core Logic
+
+- [ ] **Task 2:** Implement key-decisions heuristic
+  - **Implements:** UJ-3
+  - **Files:** `src/cli/commands/explain.rs`
+  - **Depends on:** Task 1
+  - **Test-first:**
+    1. Write `test_explain_key_decision_heuristic`: insert state change event at T, insert note by SAME author at T+30min, call `extract_key_decisions()`, assert 1 decision with correct action + context_note
+    2. Write `test_explain_key_decision_ignores_unrelated_notes`: insert state change by alice, insert note by bob at T+30min, assert 0 decisions
+    3. Write `test_explain_key_decision_label_event`: insert label add event + correlated note, assert decision.action starts with "label: +"
+    4. Run tests — all must FAIL (red)
+    4. Write `test_explain_max_decisions`: insert 5 correlated event+note pairs, call with `max_decisions: 3`, assert exactly 3 decisions returned
+    5. Write `test_explain_since_scopes_events`: insert event at T-60d and event at T-10d, call with `since: Some(T-30d)`, assert only recent event appears
+    6. Run tests — all must FAIL (red)
+    7. Implement `extract_key_decisions()` function:
+       - Query resource_state_events and resource_label_events for entity (with optional `--since` filter)
+       - Merge into unified chronological list
+       - For each event, find first non-system note by same actor within 60min (notes also `--since` filtered)
+       - Cap at `params.max_decisions`
+    8. Run tests — all must PASS (green)
+  - **Acceptance:** All 5 tests pass. Heuristic correctly correlates events with explanatory notes. `--max-decisions` and `--since` respected.
+  - **Implementation notes:**
+    - State events query: `SELECT state, actor_username, created_at FROM resource_state_events WHERE {id_col} = ?1 AND (?2 IS NULL OR created_at >= ?2) ORDER BY created_at`
+    - Label events query: `SELECT action, label_name, actor_username, created_at FROM resource_label_events WHERE {id_col} = ?1 AND (?2 IS NULL OR created_at >= ?2) ORDER BY created_at`
+    - Notes query: `SELECT n.body, n.author_username, n.created_at FROM notes n JOIN discussions d ON n.discussion_id = d.id WHERE d.{id_col} = ?1 AND n.is_system = 0 AND (?2 IS NULL OR n.created_at >= ?2) ORDER BY n.created_at`
+    - The `{id_col}` is either `issue_id` or `merge_request_id` based on entity_type
+    - Pass `params.since` (Option<i64>) as the `?2` parameter — NULL means no filter
+    - Use `crate::core::time::ms_to_iso()` for timestamp conversion in output
+    - Truncate context_note to 500 chars using `crate::cli::render::truncate()` or a local helper
+
+- [ ] **Task 3:** Implement open threads, activity summary, and cross-references
+  - **Implements:** UJ-1
+  - **Files:** `src/cli/commands/explain.rs`
+  - **Depends on:** Task 1
+  - **Test-first:**
+    1. Write `test_explain_open_threads`: insert 2 discussions (1 with resolved=0 resolvable=1, 1 with resolved=1 resolvable=1), assert only unresolved appears in open_threads
+    2. Write `test_explain_activity_counts`: insert 3 state events + 2 label events + 10 non-system notes, assert activity.state_changes=3, label_changes=2, notes=10
+    3. Write `test_explain_no_notes`: insert issue with zero notes and zero events, assert empty key_decisions, empty open_threads, activity all zeros, description_excerpt = "(no description)" if description is NULL
+    4. Run tests — all must FAIL (red)
+    5. Implement:
+       - `fetch_open_threads()`: query discussions WHERE resolvable=1 AND resolved=0, fetch first note author + note count per thread
+       - `build_activity_summary()`: count state events, label events, non-system notes, find min/max timestamps
+       - `fetch_related_entities()`: query entity_references in both directions (source and target)
+       - Description excerpt: first 500 chars of description, or "(no description)" if NULL
+    6. Run tests — all must PASS (green)
+  - **Acceptance:** All 3 tests pass. Open threads correctly filtered. Activity counts accurate. Empty entity handled gracefully.
+  - **Implementation notes:**
+    - Open threads query: `SELECT d.gitlab_discussion_id, d.first_note_at, d.last_note_at FROM discussions d WHERE d.{id_col} = ?1 AND d.resolvable = 1 AND d.resolved = 0 ORDER BY d.last_note_at DESC`
+    - For first note author: `SELECT author_username FROM notes WHERE discussion_id = ?1 ORDER BY created_at ASC LIMIT 1`
+    - For note count: `SELECT COUNT(*) FROM notes WHERE discussion_id = ?1 AND is_system = 0`
+    - Cross-references: both outgoing and incoming from entity_references table
+    - For closing MRs, reuse the query pattern from show/issue.rs `get_closing_mrs()`
+
+- [ ] **Task 4:** Wire timeline excerpt using existing pipeline
+  - **Implements:** UJ-1
+  - **Files:** `src/cli/commands/explain.rs`
+  - **Depends on:** Task 1
+  - **Test-first:**
+    1. Write `test_explain_timeline_excerpt`: insert issue + state events + notes, call run_explain() with `no_timeline: false`, assert timeline_excerpt is Some and non-empty and capped at 20 events
+    2. Write `test_explain_no_timeline_flag`: call run_explain() with `no_timeline: true`, assert timeline_excerpt is None
+    3. Run tests — both must FAIL (red)
+    4. Implement: when `!params.no_timeline` and `--sections` includes "timeline" (or is None), call `seed_timeline_direct()` with entity type + IID, then `collect_events()`, convert first 20 TimelineEvents into TimelineEventSummary structs. Otherwise set timeline_excerpt to None.
+    5. Run tests — both must PASS (green)
+  - **Acceptance:** Timeline excerpt present with max 20 events when enabled. Skipped entirely when `--no-timeline`. Uses existing timeline pipeline (no reimplementation).
+  - **Implementation notes:**
+    - Import: `use crate::timeline::seed::seed_timeline_direct;` and `use crate::timeline::collect::collect_events;`
+    - `seed_timeline_direct()` takes `(conn, entity_type, iid, project_id)` — verify exact signature before implementing
+    - `collect_events()` returns `Vec<TimelineEvent>` — map to simplified `TimelineEventSummary` (timestamp, event_type string, actor, summary)
+    - Timeline pipeline uses `EntityRef` struct from `crate::timeline::types` — needs entity's local DB id and project_path
+    - Cap at 20 events: `events.truncate(20)` after collection
+    - `--no-timeline` takes precedence over `--sections timeline` (if both specified, skip timeline)
+
+### Phase 3: Output Rendering
+
+- [ ] **Task 5:** Robot mode JSON output and human-readable rendering
+  - **Implements:** UJ-1, UJ-2
+  - **Files:** `src/cli/commands/explain.rs`, `src/app/robot_docs.rs`
+  - **Depends on:** Task 1, 2, 3, 4
+  - **Test-first:**
+    1. Write `test_explain_robot_output_shape`: call run_explain() with all sections, serialize to JSON, assert all 7 top-level keys present
+    2. Write `test_explain_sections_filter_robot`: call run_explain() with `sections: Some(vec!["key_decisions", "activity"])`, serialize, assert only `entity` + `key_decisions` + `activity` keys present (entity always included), assert `description_excerpt`, `open_threads`, `related`, `timeline_excerpt` are absent
+    3. Run tests — both must FAIL (red)
+    4. Implement:
+       - Robot mode: `print_explain_json()` wrapping ExplainResult in `{"ok": true, "data": ..., "meta": {...}}` envelope. `#[serde(skip_serializing_if = "Option::is_none")]` on optional sections handles filtering automatically.
+       - Human mode: `print_explain()` with section headers, colored output, indented key decisions, truncated descriptions. Check `params.sections` before rendering each section.
+       - Register in robot-docs manifest (include `--sections`, `--no-timeline`, `--max-decisions`, `--since` flags)
+    5. Run tests — both must PASS (green)
+  - **Acceptance:** Robot JSON matches schema. Section filtering works in both robot and human mode. Command appears in `lore robot-docs`.
+  - **Implementation notes:**
+    - Robot envelope: use `serde_json::json!()` with `RobotMeta` from `crate::cli::robot`
+    - Human rendering: use `Theme::bold()`, `Icons`, `render::truncate()` from `crate::cli::render`
+    - Follow timeline.rs rendering pattern: header with entity info -> separator line -> sections
+    - Register in robot_docs.rs following the existing pattern for other commands
+    - Section filtering: the `run_explain()` function should already return None for unselected sections. The serializer skips them. Human renderer checks `is_some()` before rendering.
+
+---
+
+## Corrections from Original Bead
+
+The bead (bd-9lbr) was created before a codebase rearchitecture. Key corrections:
+
+1. **`src/core/events_db.rs` does not exist** — Event storage is in `src/ingestion/storage/events.rs` (insert only). Event queries are inline in `timeline/collect.rs`. Explain needs its own inline queries.
+
+2. **`ResourceStateEvent` / `ResourceLabelEvent` structs don't exist** — The timeline queries raw rows directly. Explain should define lightweight local structs or use tuples.
+
+3. **`run_show_issue()` / `run_show_mr()` are private** — They live in `include!()` files inside show/mod.rs. Cannot be imported. Copy the query patterns instead.
+
+4. **bd-2g50 blocker is CLOSED** — `IssueDetail` already has `closed_at`, `references_full`, `user_notes_count`, `confidential`. No blocker.
+
+5. **Clap registration pattern** — The bead shows args directly on the enum variant, which is correct for explain's simple args (matches Drift, Related pattern). No need for a separate ExplainArgs struct.
+
+6. **entity_references has no fetch query** — Only `insert_entity_reference()` and `count_references_for_source()` exist. Explain needs a new SELECT query (inline in explain.rs).
+
+---
+
+## Session Log
+
+### Session 1 — 2026-03-10
+- Read bead bd-9lbr thoroughly — exceptionally detailed but written before rearchitecture
+- Verified infrastructure: show/ (private functions, copy patterns), timeline/ (importable pipeline), events (inline SQL, no typed structs), xref (no fetch query), discussions (resolvable/resolved confirmed in migration 028)
+- Discovered bd-2g50 blocker is CLOSED — no dependency
+- Decided: two positional args (`lore explain issues N`) over single query syntax
+- Decided: formalize + gap-fill approach (bead is thorough, just needs updating)
+- Documented 6 corrections from original bead to current codebase state
+- Drafted complete spec with 5 tasks across 3 phases
+
+### Session 1b — 2026-03-10 (CLI UX Audit)
+- Audited full CLI surface (30+ commands) against explain's proposed UX
+- Identified 8 improvements, user selected 6 to incorporate:
+  1. **after_help examples block** — every other lore command has this, explain was missing it
+  2. **--sections flag** — robot token efficiency, skip unselected sections entirely
+  4. **Singular entity type tolerance** — accept `issue`/`mr` alongside `issues`/`mrs`
+  5. **--no-timeline flag** — skip heaviest section for faster execution
+  7. **--max-decisions N flag** — user control over key_decisions cap (default 10)
+  8. **--since flag** — time-scope events/notes for long-lived entities
+- Skipped: #3 (command aliases ex/narrative), #6 (#42/!99 shorthand)
+- Updated: Code Style, Boundaries, Architecture (ExplainParams + ExplainResult types, section filtering, time scoping, SQL queries), Success Criteria (+5 new), Testing Strategy (+5 new tests), all 5 Tasks
+- ExplainResult sections now `Option<T>` with `skip_serializing_if` for section filtering
+- All sections remain complete — spec is ready for implementation

src/app/dispatch.rs

@@ -0,0 +1,3 @@
+include!("errors.rs");
+include!("handlers.rs");
+include!("robot_docs.rs");

src/app/errors.rs

@@ -0,0 +1,486 @@
+#[derive(Serialize)]
+struct FallbackErrorOutput {
+    error: FallbackError,
+}
+
+#[derive(Serialize)]
+struct FallbackError {
+    code: String,
+    message: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    suggestion: Option<String>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    actions: Vec<String>,
+}
+
+fn handle_error(e: Box<dyn std::error::Error>, robot_mode: bool) -> ! {
+    if let Some(gi_error) = e.downcast_ref::<LoreError>() {
+        if robot_mode {
+            let output = RobotErrorOutput::from(gi_error);
+            eprintln!(
+                "{}",
+                serde_json::to_string(&output).unwrap_or_else(|_| {
+                    let fallback = FallbackErrorOutput {
+                        error: FallbackError {
+                            code: "INTERNAL_ERROR".to_string(),
+                            message: gi_error.to_string(),
+                            suggestion: None,
+                            actions: Vec::new(),
+                        },
+                    };
+                    serde_json::to_string(&fallback)
+                        .unwrap_or_else(|_| r#"{"error":{"code":"INTERNAL_ERROR","message":"Serialization failed"}}"#.to_string())
+                })
+            );
+            std::process::exit(gi_error.exit_code());
+        } else {
+            eprintln!();
+            eprintln!(
+                "  {}  {}",
+                Theme::error().render(Icons::error()),
+                Theme::error().bold().render(&gi_error.to_string())
+            );
+            if let Some(suggestion) = gi_error.suggestion() {
+                eprintln!();
+                eprintln!("     {suggestion}");
+            }
+            let actions = gi_error.actions();
+            if !actions.is_empty() {
+                eprintln!();
+                for action in &actions {
+                    eprintln!(
+                        "     {} {}",
+                        Theme::dim().render("\u{2192}"),
+                        Theme::bold().render(action)
+                    );
+                }
+            }
+            eprintln!();
+            std::process::exit(gi_error.exit_code());
+        }
+    }
+
+    if robot_mode {
+        let output = FallbackErrorOutput {
+            error: FallbackError {
+                code: "INTERNAL_ERROR".to_string(),
+                message: e.to_string(),
+                suggestion: None,
+                actions: Vec::new(),
+            },
+        };
+        eprintln!(
+            "{}",
+            serde_json::to_string(&output).unwrap_or_else(|_| {
+                r#"{"error":{"code":"INTERNAL_ERROR","message":"Serialization failed"}}"#
+                    .to_string()
+            })
+        );
+    } else {
+        eprintln!();
+        eprintln!(
+            "  {}  {}",
+            Theme::error().render(Icons::error()),
+            Theme::error().bold().render(&e.to_string())
+        );
+        eprintln!();
+    }
+    std::process::exit(1);
+}
+
+/// Emit stderr warnings for any corrections applied during Phase 1.5.
+fn emit_correction_warnings(result: &CorrectionResult, robot_mode: bool) {
+    if robot_mode {
+        #[derive(Serialize)]
+        struct CorrectionWarning<'a> {
+            warning: CorrectionWarningInner<'a>,
+        }
+        #[derive(Serialize)]
+        struct CorrectionWarningInner<'a> {
+            r#type: &'static str,
+            corrections: &'a [autocorrect::Correction],
+            teaching: Vec<String>,
+        }
+
+        let teaching: Vec<String> = result
+            .corrections
+            .iter()
+            .map(autocorrect::format_teaching_note)
+            .collect();
+
+        let warning = CorrectionWarning {
+            warning: CorrectionWarningInner {
+                r#type: "ARG_CORRECTED",
+                corrections: &result.corrections,
+                teaching,
+            },
+        };
+        if let Ok(json) = serde_json::to_string(&warning) {
+            eprintln!("{json}");
+        }
+    } else {
+        for c in &result.corrections {
+            eprintln!(
+                "{} {}",
+                Theme::warning().render("Auto-corrected:"),
+                autocorrect::format_teaching_note(c)
+            );
+        }
+    }
+}
+
+/// Phase 1 & 4: Handle clap parsing errors with structured JSON output in robot mode.
+/// Also includes fuzzy command matching and flag-level suggestions.
+fn handle_clap_error(e: clap::Error, robot_mode: bool, corrections: &CorrectionResult) -> ! {
+    use clap::error::ErrorKind;
+
+    // Always let clap handle --help and --version normally (print and exit 0).
+    // These are intentional user actions, not errors, even when stdout is redirected.
+    if matches!(e.kind(), ErrorKind::DisplayHelp | ErrorKind::DisplayVersion) {
+        e.exit()
+    }
+
+    if robot_mode {
+        let error_code = map_clap_error_kind(e.kind());
+        let full_msg = e.to_string();
+        let message = full_msg
+            .lines()
+            .take(3)
+            .collect::<Vec<_>>()
+            .join("; ")
+            .trim()
+            .to_string();
+
+        let (suggestion, correction, valid_values) = match e.kind() {
+            // Phase 4: Suggest similar command for unknown subcommands
+            ErrorKind::InvalidSubcommand => {
+                let suggestion = if let Some(invalid_cmd) = extract_invalid_subcommand(&e) {
+                    suggest_similar_command(&invalid_cmd)
+                } else {
+                    "Run 'lore robot-docs' for valid commands".to_string()
+                };
+                (suggestion, None, None)
+            }
+            // Flag-level fuzzy matching for unknown flags
+            ErrorKind::UnknownArgument => {
+                let invalid_flag = extract_invalid_flag(&e);
+                let similar = invalid_flag
+                    .as_deref()
+                    .and_then(|flag| autocorrect::suggest_similar_flag(flag, &corrections.args));
+                let suggestion = if let Some(ref s) = similar {
+                    format!("Did you mean '{s}'? Run 'lore robot-docs' for all flags")
+                } else {
+                    "Run 'lore robot-docs' for valid flags".to_string()
+                };
+                (suggestion, similar, None)
+            }
+            // Value-level suggestions for invalid enum values
+            ErrorKind::InvalidValue => {
+                let (flag, valid_vals) = extract_invalid_value_context(&e);
+                let suggestion = if let Some(vals) = &valid_vals {
+                    format!(
+                        "Valid values: {}. Run 'lore robot-docs' for details",
+                        vals.join(", ")
+                    )
+                } else if let Some(ref f) = flag {
+                    if let Some(vals) = autocorrect::valid_values_for_flag(f) {
+                        format!("Valid values for {f}: {}", vals.join(", "))
+                    } else {
+                        "Run 'lore robot-docs' for valid values".to_string()
+                    }
+                } else {
+                    "Run 'lore robot-docs' for valid values".to_string()
+                };
+                let vals_vec = valid_vals.or_else(|| {
+                    flag.as_deref()
+                        .and_then(autocorrect::valid_values_for_flag)
+                        .map(|v| v.iter().map(|s| (*s).to_string()).collect())
+                });
+                (suggestion, None, vals_vec)
+            }
+            ErrorKind::MissingRequiredArgument => {
+                let suggestion = format!(
+                    "A required argument is missing. {}",
+                    if let Some(subcmd) = extract_subcommand_from_context(&e) {
+                        format!(
+                            "Example: {}. Run 'lore {subcmd} --help' for required arguments",
+                            command_example(&subcmd)
+                        )
+                    } else {
+                        "Run 'lore robot-docs' for command reference".to_string()
+                    }
+                );
+                (suggestion, None, None)
+            }
+            ErrorKind::MissingSubcommand => {
+                let suggestion =
+                    "No command specified. Common commands: issues, mrs, search, sync, \
+                     timeline, who, me. Run 'lore robot-docs' for the full list"
+                        .to_string();
+                (suggestion, None, None)
+            }
+            ErrorKind::TooFewValues | ErrorKind::TooManyValues => {
+                let suggestion = if let Some(subcmd) = extract_subcommand_from_context(&e) {
+                    format!(
+                        "Example: {}. Run 'lore {subcmd} --help' for usage",
+                        command_example(&subcmd)
+                    )
+                } else {
+                    "Run 'lore robot-docs' for command reference".to_string()
+                };
+                (suggestion, None, None)
+            }
+            _ => (
+                "Run 'lore robot-docs' for valid commands".to_string(),
+                None,
+                None,
+            ),
+        };
+
+        let output = RobotErrorWithSuggestion {
+            error: RobotErrorSuggestionData {
+                code: error_code.to_string(),
+                message,
+                suggestion,
+                correction,
+                valid_values,
+            },
+        };
+        eprintln!(
+            "{}",
+            serde_json::to_string(&output).unwrap_or_else(|_| {
+                r#"{"error":{"code":"PARSE_ERROR","message":"Parse error"}}"#.to_string()
+            })
+        );
+        std::process::exit(2);
+    } else {
+        e.exit()
+    }
+}
+
+/// Map clap ErrorKind to semantic error codes
+fn map_clap_error_kind(kind: clap::error::ErrorKind) -> &'static str {
+    use clap::error::ErrorKind;
+    match kind {
+        ErrorKind::InvalidSubcommand => "UNKNOWN_COMMAND",
+        ErrorKind::UnknownArgument => "UNKNOWN_FLAG",
+        ErrorKind::MissingRequiredArgument => "MISSING_REQUIRED",
+        ErrorKind::InvalidValue => "INVALID_VALUE",
+        ErrorKind::ValueValidation => "INVALID_VALUE",
+        ErrorKind::TooManyValues => "TOO_MANY_VALUES",
+        ErrorKind::TooFewValues => "TOO_FEW_VALUES",
+        ErrorKind::ArgumentConflict => "ARGUMENT_CONFLICT",
+        ErrorKind::MissingSubcommand => "MISSING_COMMAND",
+        ErrorKind::DisplayHelp | ErrorKind::DisplayVersion => "HELP_REQUESTED",
+        _ => "PARSE_ERROR",
+    }
+}
+
+/// Extract the invalid subcommand from a clap error (Phase 4)
+fn extract_invalid_subcommand(e: &clap::Error) -> Option<String> {
+    // Parse the error message to find the invalid subcommand
+    // Format is typically: "error: unrecognized subcommand 'foo'"
+    let msg = e.to_string();
+    if let Some(start) = msg.find('\'')
+        && let Some(end) = msg[start + 1..].find('\'')
+    {
+        return Some(msg[start + 1..start + 1 + end].to_string());
+    }
+    None
+}
+
+/// Extract the invalid flag from a clap UnknownArgument error.
+/// Format is typically: "error: unexpected argument '--xyzzy' found"
+fn extract_invalid_flag(e: &clap::Error) -> Option<String> {
+    let msg = e.to_string();
+    if let Some(start) = msg.find('\'')
+        && let Some(end) = msg[start + 1..].find('\'')
+    {
+        let value = &msg[start + 1..start + 1 + end];
+        if value.starts_with('-') {
+            return Some(value.to_string());
+        }
+    }
+    None
+}
+
+/// Extract flag name and valid values from a clap InvalidValue error.
+/// Returns (flag_name, valid_values_if_listed_in_error).
+fn extract_invalid_value_context(e: &clap::Error) -> (Option<String>, Option<Vec<String>>) {
+    let msg = e.to_string();
+
+    // Try to find the flag name from "[possible values: ...]" pattern or from the arg info
+    // Clap format: "error: invalid value 'opend' for '--state <STATE>'"
+    let flag = if let Some(for_pos) = msg.find("for '") {
+        let after_for = &msg[for_pos + 5..];
+        if let Some(end) = after_for.find('\'') {
+            let raw = &after_for[..end];
+            // Strip angle-bracket value placeholder: "--state <STATE>" -> "--state"
+            Some(raw.split_whitespace().next().unwrap_or(raw).to_string())
+        } else {
+            None
+        }
+    } else {
+        None
+    };
+
+    // Try to extract possible values from the error message
+    // Clap format: "[possible values: opened, closed, merged, locked, all]"
+    let valid_values = if let Some(pv_pos) = msg.find("[possible values: ") {
+        let after_pv = &msg[pv_pos + 18..];
+        after_pv.find(']').map(|end| {
+            after_pv[..end]
+                .split(", ")
+                .map(|s| s.trim().to_string())
+                .collect()
+        })
+    } else {
+        // Fall back to our static registry
+        flag.as_deref()
+            .and_then(autocorrect::valid_values_for_flag)
+            .map(|v| v.iter().map(|s| (*s).to_string()).collect())
+    };
+
+    (flag, valid_values)
+}
+
+/// Extract the subcommand context from a clap error for better suggestions.
+/// Looks at the error message to find which command was being invoked.
+fn extract_subcommand_from_context(e: &clap::Error) -> Option<String> {
+    let msg = e.to_string();
+
+    let known = [
+        "issues",
+        "mrs",
+        "notes",
+        "search",
+        "sync",
+        "ingest",
+        "count",
+        "status",
+        "auth",
+        "doctor",
+        "stats",
+        "timeline",
+        "who",
+        "me",
+        "drift",
+        "related",
+        "trace",
+        "file-history",
+        "generate-docs",
+        "embed",
+        "token",
+        "cron",
+        "init",
+        "migrate",
+    ];
+    for cmd in known {
+        if msg.contains(&format!("lore {cmd}")) || msg.contains(&format!("'{cmd}'")) {
+            return Some(cmd.to_string());
+        }
+    }
+    None
+}
+
+/// Phase 4: Suggest similar command using fuzzy matching
+fn suggest_similar_command(invalid: &str) -> String {
+    // Primary commands + common aliases for fuzzy matching
+    const VALID_COMMANDS: &[(&str, &str)] = &[
+        ("issues", "issues"),
+        ("issue", "issues"),
+        ("mrs", "mrs"),
+        ("mr", "mrs"),
+        ("merge-requests", "mrs"),
+        ("search", "search"),
+        ("find", "search"),
+        ("query", "search"),
+        ("sync", "sync"),
+        ("ingest", "ingest"),
+        ("count", "count"),
+        ("status", "status"),
+        ("auth", "auth"),
+        ("doctor", "doctor"),
+        ("version", "version"),
+        ("init", "init"),
+        ("stats", "stats"),
+        ("stat", "stats"),
+        ("generate-docs", "generate-docs"),
+        ("embed", "embed"),
+        ("migrate", "migrate"),
+        ("health", "health"),
+        ("robot-docs", "robot-docs"),
+        ("completions", "completions"),
+        ("timeline", "timeline"),
+        ("who", "who"),
+        ("notes", "notes"),
+        ("note", "notes"),
+        ("drift", "drift"),
+        ("file-history", "file-history"),
+        ("trace", "trace"),
+        ("related", "related"),
+        ("me", "me"),
+        ("token", "token"),
+        ("cron", "cron"),
+        // Hidden but may be known to agents
+        ("list", "list"),
+        ("show", "show"),
+        ("reset", "reset"),
+        ("backup", "backup"),
+    ];
+
+    let invalid_lower = invalid.to_lowercase();
+
+    // Find the best match using Jaro-Winkler similarity
+    let best_match = VALID_COMMANDS
+        .iter()
+        .map(|(alias, canonical)| (*canonical, jaro_winkler(&invalid_lower, alias)))
+        .max_by(|a, b| a.1.partial_cmp(&b.1).unwrap_or(std::cmp::Ordering::Equal));
+
+    if let Some((cmd, score)) = best_match
+        && score > 0.7
+    {
+        let example = command_example(cmd);
+        return format!(
+            "Did you mean 'lore {cmd}'? Example: {example}. Run 'lore robot-docs' for all commands"
+        );
+    }
+
+    "Run 'lore robot-docs' for valid commands. Common: issues, mrs, search, sync, timeline, who"
+        .to_string()
+}
+
+/// Return a contextual usage example for a command.
+fn command_example(cmd: &str) -> &'static str {
+    match cmd {
+        "issues" => "lore --robot issues -n 10",
+        "mrs" => "lore --robot mrs -n 10",
+        "search" => "lore --robot search \"auth bug\"",
+        "sync" => "lore --robot sync",
+        "ingest" => "lore --robot ingest issues",
+        "notes" => "lore --robot notes --for-issue 123",
+        "count" => "lore --robot count issues",
+        "status" => "lore --robot status",
+        "stats" => "lore --robot stats",
+        "timeline" => "lore --robot timeline \"auth flow\"",
+        "who" => "lore --robot who --path src/",
+        "health" => "lore --robot health",
+        "generate-docs" => "lore --robot generate-docs",
+        "embed" => "lore --robot embed",
+        "robot-docs" => "lore robot-docs",
+        "trace" => "lore --robot trace src/main.rs",
+        "init" => "lore init",
+        "related" => "lore --robot related issues 42 -n 5",
+        "me" => "lore --robot me",
+        "drift" => "lore --robot drift issues 42",
+        "file-history" => "lore --robot file-history src/main.rs",
+        "token" => "lore --robot token show",
+        "cron" => "lore --robot cron status",
+        "auth" => "lore --robot auth",
+        "doctor" => "lore --robot doctor",
+        "migrate" => "lore --robot migrate",
+        "completions" => "lore completions bash",
+        _ => "lore --robot <command>",
+    }
+}
+

src/app/robot_docs.rs

@@ -0,0 +1,795 @@
+#[derive(Serialize)]
+struct RobotDocsOutput {
+    ok: bool,
+    data: RobotDocsData,
+}
+
+#[derive(Serialize)]
+struct RobotDocsData {
+    name: String,
+    version: String,
+    description: String,
+    activation: RobotDocsActivation,
+    quick_start: serde_json::Value,
+    commands: serde_json::Value,
+    /// Deprecated command aliases (old -> new)
+    aliases: serde_json::Value,
+    /// Pre-clap error tolerance: what the CLI auto-corrects
+    error_tolerance: serde_json::Value,
+    exit_codes: serde_json::Value,
+    /// Error codes emitted by clap parse failures
+    clap_error_codes: serde_json::Value,
+    error_format: String,
+    workflows: serde_json::Value,
+    config_notes: serde_json::Value,
+}
+
+#[derive(Serialize)]
+struct RobotDocsActivation {
+    flags: Vec<String>,
+    env: String,
+    auto: String,
+}
+
+fn handle_robot_docs(robot_mode: bool, brief: bool) -> Result<(), Box<dyn std::error::Error>> {
+    let version = env!("CARGO_PKG_VERSION").to_string();
+
+    let commands = serde_json::json!({
+        "init": {
+            "description": "Initialize configuration and database",
+            "flags": ["--force", "--non-interactive", "--gitlab-url <URL>", "--token-env-var <VAR>", "--projects <paths>", "--default-project <path>"],
+            "robot_flags": ["--gitlab-url", "--token-env-var", "--projects", "--default-project"],
+            "example": "lore --robot init --gitlab-url https://gitlab.com --token-env-var GITLAB_TOKEN --projects group/project,other/repo --default-project group/project",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"config_path": "string", "data_dir": "string", "user": {"username": "string", "name": "string"}, "projects": "[{path:string, name:string}]", "default_project": "string?"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "health": {
+            "description": "Quick pre-flight check: config, database, schema version",
+            "flags": [],
+            "example": "lore --robot health",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"healthy": "bool", "config_found": "bool", "db_found": "bool", "schema_current": "bool", "schema_version": "int"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "auth": {
+            "description": "Verify GitLab authentication",
+            "flags": [],
+            "example": "lore --robot auth",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"authenticated": "bool", "username": "string", "name": "string", "gitlab_url": "string"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "doctor": {
+            "description": "Full environment health check (config, auth, DB, Ollama)",
+            "flags": [],
+            "example": "lore --robot doctor",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"success": "bool", "checks": "{config:object, auth:object, database:object, ollama:object}"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "ingest": {
+            "description": "Sync data from GitLab",
+            "flags": ["--project <path>", "--force", "--no-force", "--full", "--no-full", "--dry-run", "--no-dry-run", "<entity: issues|mrs>"],
+            "example": "lore --robot ingest issues --project group/repo",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"resource_type": "string", "projects_synced": "int", "issues_fetched?": "int", "mrs_fetched?": "int", "upserted": "int", "labels_created": "int", "discussions_fetched": "int", "notes_upserted": "int"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "sync": {
+            "description": "Full sync pipeline: ingest -> generate-docs -> embed. Supports surgical per-IID mode.",
+            "flags": ["--full", "--no-full", "--force", "--no-force", "--no-embed", "--no-docs", "--no-events", "--no-file-changes", "--no-status", "--dry-run", "--no-dry-run", "-t/--timings", "--lock", "--issue <IID>", "--mr <IID>", "-p/--project <path>", "--preflight-only"],
+            "example": "lore --robot sync",
+            "surgical_mode": {
+                "description": "Sync specific issues or MRs by IID. Runs a scoped pipeline: preflight -> TOCTOU check -> ingest -> dependents -> docs -> embed.",
+                "flags": ["--issue <IID> (repeatable)", "--mr <IID> (repeatable)", "-p/--project <path> (required)", "--preflight-only"],
+                "examples": [
+                    "lore --robot sync --issue 7 -p group/project",
+                    "lore --robot sync --issue 7 --issue 42 --mr 10 -p group/project",
+                    "lore --robot sync --issue 7 -p group/project --preflight-only"
+                ],
+                "constraints": ["--issue/--mr requires -p/--project (or defaultProject in config)", "--full and --issue/--mr are incompatible", "--preflight-only requires --issue or --mr", "Max 100 total targets"],
+                "entity_result_outcomes": ["synced", "skipped_stale", "not_found", "preflight_failed", "error"]
+            },
+            "response_schema": {
+                "normal": {
+                    "ok": "bool",
+                    "data": {"issues_updated": "int", "mrs_updated": "int", "documents_regenerated": "int", "documents_embedded": "int", "resource_events_synced": "int", "resource_events_failed": "int"},
+                    "meta": {"elapsed_ms": "int", "stages?": "[{name:string, elapsed_ms:int, items_processed:int}]"}
+                },
+                "surgical": {
+                    "ok": "bool",
+                    "data": {"surgical_mode": "true", "surgical_iids": "{issues:[int], merge_requests:[int]}", "entity_results": "[{entity_type:string, iid:int, outcome:string, error?:string, toctou_reason?:string}]", "preflight_only?": "bool", "issues_updated": "int", "mrs_updated": "int", "documents_regenerated": "int", "documents_embedded": "int", "discussions_fetched": "int"},
+                    "meta": {"elapsed_ms": "int"}
+                }
+            }
+        },
+        "issues": {
+            "description": "List issues, or view detail with <IID>",
+            "flags": ["<IID>", "-n/--limit", "--fields <list>", "-s/--state", "--status <name>", "-p/--project", "-a/--author", "-A/--assignee", "-l/--label", "-m/--milestone", "--since", "--due-before", "--has-due", "--no-has-due", "--sort", "--asc", "--no-asc", "-o/--open", "--no-open"],
+            "example": "lore --robot issues --state opened --limit 10",
+            "notes": {
+                "status_filter": "--status filters by work item status NAME (case-insensitive). Valid values are in meta.available_statuses of any issues list response.",
+                "status_name": "status_name is the board column label (e.g. 'In review', 'Blocked'). This is the canonical status identifier for filtering."
+            },
+            "response_schema": {
+                "list": {
+                    "ok": "bool",
+                    "data": {"issues": "[{iid:int, title:string, state:string, author_username:string, labels:[string], assignees:[string], discussion_count:int, unresolved_count:int, created_at_iso:string, updated_at_iso:string, web_url:string?, project_path:string, status_name:string?}]", "total_count": "int", "showing": "int"},
+                    "meta": {"elapsed_ms": "int", "available_statuses": "[string] — all distinct status names in the database, for use with --status filter"}
+                },
+                "detail": {
+                    "ok": "bool",
+                    "data": "IssueDetail (full entity with description, discussions, notes, events)",
+                    "meta": {"elapsed_ms": "int"}
+                }
+            },
+            "example_output": {"list": {"ok":true,"data":{"issues":[{"iid":3864,"title":"Switch Health Card","state":"opened","status_name":"In progress","labels":["customer:BNSF"],"assignees":["teernisse"],"discussion_count":12,"updated_at_iso":"2026-02-12T..."}],"total_count":1,"showing":1},"meta":{"elapsed_ms":42}}},
+            "fields_presets": {"minimal": ["iid", "title", "state", "updated_at_iso"]}
+        },
+        "mrs": {
+            "description": "List merge requests, or view detail with <IID>",
+            "flags": ["<IID>", "-n/--limit", "--fields <list>", "-s/--state", "-p/--project", "-a/--author", "-A/--assignee", "-r/--reviewer", "-l/--label", "--since", "-d/--draft", "-D/--no-draft", "--target", "--source", "--sort", "--asc", "--no-asc", "-o/--open", "--no-open"],
+            "example": "lore --robot mrs --state opened",
+            "response_schema": {
+                "list": {
+                    "ok": "bool",
+                    "data": {"mrs": "[{iid:int, title:string, state:string, author_username:string, labels:[string], draft:bool, target_branch:string, source_branch:string, discussion_count:int, unresolved_count:int, created_at_iso:string, updated_at_iso:string, web_url:string?, project_path:string, reviewers:[string]}]", "total_count": "int", "showing": "int"},
+                    "meta": {"elapsed_ms": "int"}
+                },
+                "detail": {
+                    "ok": "bool",
+                    "data": "MrDetail (full entity with description, discussions, notes, events)",
+                    "meta": {"elapsed_ms": "int"}
+                }
+            },
+            "example_output": {"list": {"ok":true,"data":{"mrs":[{"iid":200,"title":"Add throw time chart","state":"opened","draft":false,"author_username":"teernisse","target_branch":"main","source_branch":"feat/throw-time","reviewers":["cseiber"],"discussion_count":5,"updated_at_iso":"2026-02-11T..."}],"total_count":1,"showing":1},"meta":{"elapsed_ms":38}}},
+            "fields_presets": {"minimal": ["iid", "title", "state", "updated_at_iso"]}
+        },
+        "search": {
+            "description": "Search indexed documents (lexical, hybrid, semantic)",
+            "flags": ["<QUERY>", "--mode", "--type", "--author", "-p/--project", "--label", "--path", "--since", "--updated-since", "-n/--limit", "--fields <list>", "--explain", "--no-explain", "--fts-mode"],
+            "example": "lore --robot search 'authentication bug' --mode hybrid --limit 10",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"results": "[{document_id:int, source_type:string, title:string, snippet:string, score:float, url:string?, author:string?, created_at:string?, updated_at:string?, project_path:string, labels:[string], paths:[string]}]", "total_results": "int", "query": "string", "mode": "string", "warnings": "[string]"},
+                "meta": {"elapsed_ms": "int"}
+            },
+            "example_output": {"ok":true,"data":{"query":"throw time","mode":"hybrid","total_results":3,"results":[{"document_id":42,"source_type":"issue","title":"Switch Health Card","score":0.92,"snippet":"...throw time data from BNSF...","project_path":"vs/typescript-code"}],"warnings":[]},"meta":{"elapsed_ms":85}},
+            "fields_presets": {"minimal": ["document_id", "title", "source_type", "score"]}
+        },
+        "count": {
+            "description": "Count entities in local database",
+            "flags": ["<entity: issues|mrs|discussions|notes|events>", "-f/--for <issue|mr>"],
+            "example": "lore --robot count issues",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"entity": "string", "count": "int", "system_excluded?": "int", "breakdown?": {"opened": "int", "closed": "int", "merged?": "int", "locked?": "int"}},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "stats": {
+            "description": "Show document and index statistics",
+            "flags": ["--check", "--no-check", "--repair", "--dry-run", "--no-dry-run"],
+            "example": "lore --robot stats",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"total_documents": "int", "indexed_documents": "int", "embedded_documents": "int", "stale_documents": "int", "integrity?": "object"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "status": {
+            "description": "Show sync state (cursors, last sync times)",
+            "flags": [],
+            "example": "lore --robot status",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"projects": "[{path:string, issues_cursor:string?, mrs_cursor:string?, last_sync:string?}]"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "generate-docs": {
+            "description": "Generate searchable documents from ingested data",
+            "flags": ["--full", "-p/--project <path>"],
+            "example": "lore --robot generate-docs --full",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"generated": "int", "updated": "int", "unchanged": "int", "deleted": "int"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "embed": {
+            "description": "Generate vector embeddings for documents via Ollama",
+            "flags": ["--full", "--no-full", "--retry-failed", "--no-retry-failed"],
+            "example": "lore --robot embed",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"embedded": "int", "skipped": "int", "failed": "int", "total_chunks": "int"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "migrate": {
+            "description": "Run pending database migrations",
+            "flags": [],
+            "example": "lore --robot migrate",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"before_version": "int", "after_version": "int", "migrated": "bool"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "version": {
+            "description": "Show version information",
+            "flags": [],
+            "example": "lore --robot version",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"version": "string", "git_hash?": "string"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "completions": {
+            "description": "Generate shell completions",
+            "flags": ["<shell: bash|zsh|fish|powershell>"],
+            "example": "lore completions bash > ~/.local/share/bash-completion/completions/lore"
+        },
+        "timeline": {
+            "description": "Chronological timeline of events matching a keyword query or entity reference",
+            "flags": ["<QUERY>", "-p/--project", "--since <duration>", "--depth <n>", "--no-mentions", "-n/--limit", "--fields <list>", "--max-seeds", "--max-entities", "--max-evidence"],
+            "query_syntax": {
+                "search": "Any text -> hybrid search seeding (FTS5 + vector)",
+                "entity_direct": "issue:N, i:N, mr:N, m:N -> direct entity seeding (no search, no Ollama)"
+            },
+            "example": "lore --robot timeline issue:42",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"entities": "[{type:string, iid:int, title:string, project_path:string}]", "events": "[{timestamp:string, type:string, entity_type:string, entity_iid:int, detail:string}]", "total_events": "int"},
+                "meta": {"elapsed_ms": "int", "search_mode": "string (hybrid|lexical|direct)"}
+            },
+            "fields_presets": {"minimal": ["timestamp", "type", "entity_iid", "detail"]}
+        },
+        "who": {
+            "description": "People intelligence: experts, workload, active discussions, overlap, review patterns",
+            "flags": ["<target>", "--path <path>", "--active", "--overlap <path>", "--reviews", "--since <duration>", "-p/--project", "-n/--limit", "--fields <list>", "--detail", "--no-detail", "--as-of <date>", "--explain-score", "--include-bots", "--include-closed", "--all-history"],
+            "modes": {
+                "expert": "lore who <file-path> -- Who knows about this area? (also: --path for root files)",
+                "workload": "lore who <username> -- What is someone working on?",
+                "reviews": "lore who <username> --reviews -- Review pattern analysis",
+                "active": "lore who --active -- Active unresolved discussions",
+                "overlap": "lore who --overlap <path> -- Who else is touching these files?"
+            },
+            "example": "lore --robot who src/features/auth/",
+            "response_schema": {
+                "ok": "bool",
+                "data": {
+                    "mode": "string",
+                    "input": {"target": "string|null", "path": "string|null", "project": "string|null", "since": "string|null", "limit": "int"},
+                    "resolved_input": {"mode": "string", "project_id": "int|null", "project_path": "string|null", "since_ms": "int", "since_iso": "string", "since_mode": "string (default|explicit|none)", "limit": "int"},
+                    "...": "mode-specific fields"
+                },
+                "meta": {"elapsed_ms": "int"}
+            },
+            "example_output": {"expert": {"ok":true,"data":{"mode":"expert","result":{"experts":[{"username":"teernisse","score":42,"note_count":15,"diff_note_count":8}]}},"meta":{"elapsed_ms":65}}},
+            "fields_presets": {
+                "expert_minimal": ["username", "score"],
+                "workload_minimal": ["entity_type", "iid", "title", "state"],
+                "active_minimal": ["entity_type", "iid", "title", "participants"]
+            }
+        },
+        "trace": {
+            "description": "Trace why code was introduced: file -> MR -> issue -> discussion. Follows rename chains by default.",
+            "flags": ["<path>", "-p/--project <path>", "--discussions", "--no-follow-renames", "-n/--limit <N>"],
+            "example": "lore --robot trace src/main.rs -p group/repo",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"path": "string", "resolved_paths": "[string]", "trace_chains": "[{mr_iid:int, mr_title:string, mr_state:string, mr_author:string, change_type:string, merged_at_iso:string?, updated_at_iso:string, web_url:string?, issues:[{iid:int, title:string, state:string, reference_type:string, web_url:string?}], discussions:[{discussion_id:string, mr_iid:int, author_username:string, body_snippet:string, path:string, created_at_iso:string}]}]"},
+                "meta": {"tier": "string (api_only)", "line_requested": "int?", "elapsed_ms": "int", "total_chains": "int", "renames_followed": "bool"}
+            }
+        },
+        "file-history": {
+            "description": "Show MRs that touched a file, with rename chain resolution and optional DiffNote discussions",
+            "flags": ["<path>", "-p/--project <path>", "--discussions", "--no-follow-renames", "--merged", "-n/--limit <N>"],
+            "example": "lore --robot file-history src/main.rs -p group/repo",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"path": "string", "rename_chain": "[string]?", "merge_requests": "[{iid:int, title:string, state:string, author_username:string, change_type:string, merged_at_iso:string?, updated_at_iso:string, merge_commit_sha:string?, web_url:string?}]", "discussions": "[{discussion_id:string, author_username:string, body_snippet:string, path:string, created_at_iso:string}]?"},
+                "meta": {"elapsed_ms": "int", "total_mrs": "int", "renames_followed": "bool", "paths_searched": "int"}
+            }
+        },
+        "drift": {
+            "description": "Detect discussion divergence from original issue intent",
+            "flags": ["<entity_type: issues>", "<IID>", "--threshold <0.0-1.0>", "-p/--project <path>"],
+            "example": "lore --robot drift issues 42 --threshold 0.4",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"entity_type": "string", "iid": "int", "title": "string", "threshold": "float", "divergent_discussions": "[{discussion_id:string, similarity:float, snippet:string}]"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "explain": {
+            "description": "Auto-generate a structured narrative of an issue or MR",
+            "flags": ["<entity_type: issues|mrs>", "<IID>", "-p/--project <path>", "--sections <comma-list>", "--no-timeline", "--max-decisions <N>", "--since <period>"],
+            "valid_sections": ["entity", "description", "key_decisions", "activity", "open_threads", "related", "timeline"],
+            "example": "lore --robot explain issues 42 --sections key_decisions,activity --since 30d",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"entity": "{type:string, iid:int, title:string, state:string, author:string, assignees:[string], labels:[string], created_at:string, updated_at:string, url:string?, status_name:string?}", "description_excerpt": "string?", "key_decisions": "[{timestamp:string, actor:string, action:string, context_note:string}]?", "activity": "{state_changes:int, label_changes:int, notes:int, first_event:string?, last_event:string?}?", "open_threads": "[{discussion_id:string, started_by:string, started_at:string, note_count:int, last_note_at:string}]?", "related": "{closing_mrs:[{iid:int, title:string, state:string, web_url:string?}], related_issues:[{entity_type:string, iid:int, title:string?, reference_type:string}]}?", "timeline_excerpt": "[{timestamp:string, event_type:string, actor:string?, summary:string}]?"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "notes": {
+            "description": "List notes from discussions with rich filtering",
+            "flags": ["--limit/-n <N>", "--author/-a <username>", "--note-type <type>", "--contains <text>", "--for-issue <iid>", "--for-mr <iid>", "-p/--project <path>", "--since <period>", "--until <period>", "--path <filepath>", "--resolution <any|unresolved|resolved>", "--sort <created|updated>", "--asc", "--include-system", "--note-id <id>", "--gitlab-note-id <id>", "--discussion-id <id>", "--fields <list|minimal>", "--open"],
+            "robot_flags": ["--format json", "--fields minimal"],
+            "example": "lore --robot notes --author jdefting --since 1y --format json --fields minimal",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"notes": "[NoteListRowJson]", "total_count": "int", "showing": "int"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "cron": {
+            "description": "Manage cron-based automatic syncing (Unix only)",
+            "subcommands": {
+                "install": {"flags": ["--interval <minutes>"], "default_interval": 8},
+                "uninstall": {"flags": []},
+                "status": {"flags": []}
+            },
+            "example": "lore --robot cron status",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"action": "string (install|uninstall|status)", "installed?": "bool", "interval_minutes?": "int", "entry?": "string", "log_path?": "string", "replaced?": "bool", "was_installed?": "bool", "last_run_iso?": "string"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "token": {
+            "description": "Manage stored GitLab token",
+            "subcommands": {
+                "set": {"flags": ["--token <value>"], "note": "Reads from stdin if --token omitted in non-interactive mode"},
+                "show": {"flags": ["--unmask"]}
+            },
+            "example": "lore --robot token show",
+            "response_schema": {
+                "ok": "bool",
+                "data": {"action": "string (set|show)", "token_masked?": "string", "token?": "string", "valid?": "bool", "username?": "string"},
+                "meta": {"elapsed_ms": "int"}
+            }
+        },
+        "me": {
+            "description": "Personal work dashboard: open issues, authored/reviewing MRs, @mentioned-in items, activity feed, and cursor-based since-last-check inbox with computed attention states",
+            "flags": ["--issues", "--mrs", "--mentions", "--activity", "--since <period>", "-p/--project <path>", "--all", "--user <username>", "--fields <list|minimal>", "--reset-cursor"],
+            "example": "lore --robot me",
+            "response_schema": {
+                "ok": "bool",
+                "data": {
+                    "username": "string",
+                    "since_iso": "string?",
+                    "summary": {"project_count": "int", "open_issue_count": "int", "authored_mr_count": "int", "reviewing_mr_count": "int", "mentioned_in_count": "int", "needs_attention_count": "int"},
+                    "since_last_check": "{cursor_iso:string, total_event_count:int, groups:[{entity_type:string, entity_iid:int, entity_title:string, project:string, events:[{timestamp_iso:string, event_type:string, actor:string?, summary:string, body_preview:string?}]}]}?",
+                    "open_issues": "[{project:string, iid:int, title:string, state:string, attention_state:string, attention_reason:string, status_name:string?, labels:[string], updated_at_iso:string, web_url:string?}]",
+                    "open_mrs_authored": "[{project:string, iid:int, title:string, state:string, attention_state:string, attention_reason:string, draft:bool, detailed_merge_status:string?, author_username:string?, labels:[string], updated_at_iso:string, web_url:string?}]",
+                    "reviewing_mrs": "[same as open_mrs_authored]",
+                    "mentioned_in": "[{entity_type:string, project:string, iid:int, title:string, state:string, attention_state:string, attention_reason:string, updated_at_iso:string, web_url:string?}]",
+                    "activity": "[{timestamp_iso:string, event_type:string, entity_type:string, entity_iid:int, project:string, actor:string?, is_own:bool, summary:string, body_preview:string?}]"
+                },
+                "meta": {"elapsed_ms": "int", "gitlab_base_url": "string (GitLab instance URL for constructing entity links: {base_url}/{project}/-/issues/{iid})"}
+            },
+            "fields_presets": {
+                "me_items_minimal": ["iid", "title", "attention_state", "attention_reason", "updated_at_iso"],
+                "me_mentions_minimal": ["entity_type", "iid", "title", "state", "attention_state", "attention_reason", "updated_at_iso"],
+                "me_activity_minimal": ["timestamp_iso", "event_type", "entity_iid", "actor"]
+            },
+            "notes": {
+                "attention_states": "needs_attention | not_started | awaiting_response | stale | not_ready",
+                "event_types": "note | status_change | label_change | assign | unassign | review_request | milestone_change",
+                "section_flags": "If none of --issues/--mrs/--mentions/--activity specified, all sections returned",
+                "since_default": "1d for activity feed",
+                "issue_filter": "Only In Progress / In Review status issues shown",
+                "since_last_check": "Cursor-based inbox showing events since last run. Null on first run (no cursor yet). Groups events by entity (issue/MR). Sources: others' comments on your items, @mentions, assignment/review-request notes. Cursor auto-advances after each run. Use --reset-cursor to clear.",
+                "cursor_persistence": "Stored per user in ~/.local/share/lore/me_cursor_<username>.json. --project filters display only for since-last-check; cursor still advances for all projects for that user.",
+                "url_construction": "Use meta.gitlab_base_url + project + entity_type + iid to build links: {gitlab_base_url}/{project}/-/{issues|merge_requests}/{iid}"
+            }
+        },
+        "robot-docs": {
+            "description": "This command (agent self-discovery manifest)",
+            "flags": ["--brief"],
+            "example": "lore robot-docs --brief"
+        }
+    });
+
+    let quick_start = serde_json::json!({
+        "glab_equivalents": [
+            { "glab": "glab issue list", "lore": "lore -J issues -n 50", "note": "Richer: includes labels, status, closing MRs, discussion counts" },
+            { "glab": "glab issue view 123", "lore": "lore -J issues 123", "note": "Includes full discussions, work-item status, cross-references" },
+            { "glab": "glab issue list -l bug", "lore": "lore -J issues --label bug", "note": "AND logic for multiple --label flags" },
+            { "glab": "glab mr list", "lore": "lore -J mrs", "note": "Includes draft status, reviewers, discussion counts" },
+            { "glab": "glab mr view 456", "lore": "lore -J mrs 456", "note": "Includes discussions, review threads, source/target branches" },
+            { "glab": "glab mr list -s opened", "lore": "lore -J mrs -s opened", "note": "States: opened, merged, closed, locked, all" },
+            { "glab": "glab api '/projects/:id/issues'", "lore": "lore -J issues -p project", "note": "Fuzzy project matching (suffix or substring)" }
+        ],
+        "lore_exclusive": [
+            "search: FTS5 + vector hybrid search across all entities",
+            "who: Expert/workload/reviews analysis per file path or person",
+            "timeline: Chronological event reconstruction across entities",
+            "trace: Code provenance chains (file -> MR -> issue -> discussion)",
+            "file-history: MR history per file with rename resolution",
+            "notes: Rich note listing with author, type, resolution, path, and discussion filters",
+            "stats: Database statistics with document/note/discussion counts",
+            "count: Entity counts with state breakdowns",
+            "embed: Generate vector embeddings for semantic search via Ollama",
+            "cron: Automated sync scheduling (Unix)",
+            "token: Secure token management with masked display",
+            "me: Personal work dashboard with attention states, activity feed, cursor-based since-last-check inbox, and needs-attention triage"
+        ],
+        "read_write_split": "lore = ALL reads (issues, MRs, search, who, timeline, intelligence). glab = ALL writes (create, update, approve, merge, CI/CD)."
+    });
+
+    // --brief: strip response_schema and example_output from every command (~60% smaller)
+    let mut commands = commands;
+    if brief {
+        strip_schemas(&mut commands);
+    }
+
+    let exit_codes = serde_json::json!({
+        "0": "Success",
+        "1": "Internal error",
+        "2": "Usage error (invalid flags or arguments)",
+        "3": "Config invalid",
+        "4": "Token not set",
+        "5": "GitLab auth failed",
+        "6": "Resource not found",
+        "7": "Rate limited",
+        "8": "Network error",
+        "9": "Database locked",
+        "10": "Database error",
+        "11": "Migration failed",
+        "12": "I/O error",
+        "13": "Transform error",
+        "14": "Ollama unavailable",
+        "15": "Ollama model not found",
+        "16": "Embedding failed",
+        "17": "Not found",
+        "18": "Ambiguous match",
+        "19": "Health check failed",
+        "20": "Config not found",
+        "21": "Embeddings not built"
+    });
+
+    let workflows = serde_json::json!({
+        "first_setup": [
+            "lore --robot init --gitlab-url https://gitlab.com --token-env-var GITLAB_TOKEN --projects group/project",
+            "lore --robot doctor",
+            "lore --robot sync"
+        ],
+        "daily_sync": [
+            "lore --robot sync"
+        ],
+        "search": [
+            "lore --robot search 'query' --mode hybrid"
+        ],
+        "pre_flight": [
+            "lore --robot health"
+        ],
+        "temporal_intelligence": [
+            "lore --robot sync",
+            "lore --robot timeline '<keyword>' --since 30d",
+            "lore --robot timeline '<keyword>' --depth 2"
+        ],
+        "people_intelligence": [
+            "lore --robot who src/path/to/feature/",
+            "lore --robot who @username",
+            "lore --robot who @username --reviews",
+            "lore --robot who --active --since 7d",
+            "lore --robot who --overlap src/path/",
+            "lore --robot who --path README.md"
+        ],
+        "surgical_sync": [
+            "lore --robot sync --issue 7 -p group/project",
+            "lore --robot sync --issue 7 --mr 10 -p group/project",
+            "lore --robot sync --issue 7 -p group/project --preflight-only"
+        ],
+        "personal_dashboard": [
+            "lore --robot me",
+            "lore --robot me --issues",
+            "lore --robot me --activity --since 7d",
+            "lore --robot me --project group/repo",
+            "lore --robot me --fields minimal",
+            "lore --robot me --reset-cursor"
+        ]
+    });
+
+    // Phase 3: Deprecated command aliases
+    let aliases = serde_json::json!({
+        "deprecated_commands": {
+            "list issues": "issues",
+            "list mrs": "mrs",
+            "show issue <IID>": "issues <IID>",
+            "show mr <IID>": "mrs <IID>",
+            "auth-test": "auth",
+            "sync-status": "status"
+        },
+        "command_aliases": {
+            "issue": "issues",
+            "mr": "mrs",
+            "merge-requests": "mrs",
+            "merge-request": "mrs",
+            "mergerequests": "mrs",
+            "mergerequest": "mrs",
+            "generate-docs": "generate-docs",
+            "generatedocs": "generate-docs",
+            "gendocs": "generate-docs",
+            "gen-docs": "generate-docs",
+            "robot-docs": "robot-docs",
+            "robotdocs": "robot-docs"
+        },
+        "pre_clap_aliases": {
+            "note": "Underscore/no-separator forms auto-corrected before parsing",
+            "merge_requests": "mrs",
+            "merge_request": "mrs",
+            "mergerequests": "mrs",
+            "mergerequest": "mrs",
+            "generate_docs": "generate-docs",
+            "generatedocs": "generate-docs",
+            "gendocs": "generate-docs",
+            "gen-docs": "generate-docs",
+            "robot-docs": "robot-docs",
+            "robotdocs": "robot-docs"
+        },
+        "prefix_matching": "Enabled via infer_subcommands. Unambiguous prefixes work: 'iss' -> issues, 'time' -> timeline, 'sea' -> search"
+    });
+
+    let error_tolerance = serde_json::json!({
+        "note": "The CLI auto-corrects common mistakes before parsing. Corrections are applied silently with a teaching note on stderr.",
+        "auto_corrections": [
+            {"type": "single_dash_long_flag", "example": "-robot -> --robot", "mode": "all"},
+            {"type": "case_normalization", "example": "--Robot -> --robot, --State -> --state", "mode": "all"},
+            {"type": "flag_prefix", "example": "--proj -> --project (when unambiguous)", "mode": "all"},
+            {"type": "fuzzy_flag", "example": "--projct -> --project", "mode": "all (threshold 0.9 in robot, 0.8 in human)"},
+            {"type": "subcommand_alias", "example": "merge_requests -> mrs, robotdocs -> robot-docs", "mode": "all"},
+            {"type": "subcommand_fuzzy", "example": "issuess -> issues, timline -> timeline, serach -> search", "mode": "all (threshold 0.85)"},
+            {"type": "flag_as_subcommand", "example": "--robot-docs -> robot-docs, --generate-docs -> generate-docs", "mode": "all"},
+            {"type": "value_normalization", "example": "--state Opened -> --state opened", "mode": "all"},
+            {"type": "value_fuzzy", "example": "--state opend -> --state opened", "mode": "all"},
+            {"type": "prefix_matching", "example": "lore iss -> lore issues, lore time -> lore timeline", "mode": "all (via clap infer_subcommands)"}
+        ],
+        "teaching_notes": "Auto-corrections emit a JSON warning on stderr: {\"warning\":{\"type\":\"ARG_CORRECTED\",\"corrections\":[...],\"teaching\":[...]}}"
+    });
+
+    // Phase 3: Clap error codes (emitted by handle_clap_error)
+    let clap_error_codes = serde_json::json!({
+        "UNKNOWN_COMMAND": "Unrecognized subcommand (includes fuzzy suggestion)",
+        "UNKNOWN_FLAG": "Unrecognized command-line flag",
+        "MISSING_REQUIRED": "Required argument not provided",
+        "INVALID_VALUE": "Invalid value for argument",
+        "TOO_MANY_VALUES": "Too many values provided",
+        "TOO_FEW_VALUES": "Too few values provided",
+        "ARGUMENT_CONFLICT": "Conflicting arguments",
+        "MISSING_COMMAND": "No subcommand provided (in non-robot mode, shows help)",
+        "HELP_REQUESTED": "Help or version flag used",
+        "PARSE_ERROR": "General parse error"
+    });
+
+    let config_notes = serde_json::json!({
+        "defaultProject": {
+            "type": "string?",
+            "description": "Fallback project path used when -p/--project is omitted. Must match a configured project path (exact or suffix). CLI -p always overrides.",
+            "example": "group/project"
+        }
+    });
+
+    let output = RobotDocsOutput {
+        ok: true,
+        data: RobotDocsData {
+            name: "lore".to_string(),
+            version,
+            description: "Local GitLab data management with semantic search".to_string(),
+            activation: RobotDocsActivation {
+                flags: vec!["--robot".to_string(), "-J".to_string(), "--json".to_string()],
+                env: "LORE_ROBOT=1".to_string(),
+                auto: "Non-TTY stdout".to_string(),
+            },
+            quick_start,
+            commands,
+            aliases,
+            error_tolerance,
+            exit_codes,
+            clap_error_codes,
+            error_format: "stderr JSON: {\"error\":{\"code\":\"...\",\"message\":\"...\",\"suggestion\":\"...\",\"actions\":[\"...\"]}}".to_string(),
+            workflows,
+            config_notes,
+        },
+    };
+
+    if robot_mode {
+        println!("{}", serde_json::to_string(&output)?);
+    } else {
+        println!("{}", serde_json::to_string_pretty(&output)?);
+    }
+
+    Ok(())
+}
+
+fn handle_who(
+    config_override: Option<&str>,
+    mut args: WhoArgs,
+    robot_mode: bool,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let start = std::time::Instant::now();
+    let config = Config::load(config_override)?;
+    if args.project.is_none() {
+        args.project = config.default_project.clone();
+    }
+    let run = run_who(&config, &args)?;
+    let elapsed_ms = start.elapsed().as_millis() as u64;
+
+    if robot_mode {
+        print_who_json(&run, &args, elapsed_ms);
+    } else {
+        print_who_human(&run.result, run.resolved_input.project_path.as_deref());
+    }
+    Ok(())
+}
+
+fn handle_me(
+    config_override: Option<&str>,
+    args: MeArgs,
+    robot_mode: bool,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let config = Config::load(config_override)?;
+    run_me(&config, &args, robot_mode)?;
+    Ok(())
+}
+
+async fn handle_drift(
+    config_override: Option<&str>,
+    entity_type: &str,
+    iid: i64,
+    threshold: f32,
+    project: Option<&str>,
+    robot_mode: bool,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let start = std::time::Instant::now();
+    let config = Config::load(config_override)?;
+    let effective_project = config.effective_project(project);
+    let response = run_drift(&config, entity_type, iid, threshold, effective_project).await?;
+    let elapsed_ms = start.elapsed().as_millis() as u64;
+
+    if robot_mode {
+        print_drift_json(&response, elapsed_ms);
+    } else {
+        print_drift_human(&response);
+    }
+    Ok(())
+}
+
+async fn handle_related(
+    config_override: Option<&str>,
+    query_or_type: &str,
+    iid: Option<i64>,
+    limit: usize,
+    project: Option<&str>,
+    robot_mode: bool,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let start = std::time::Instant::now();
+    let config = Config::load(config_override)?;
+    let effective_project = config.effective_project(project);
+    let response = run_related(&config, query_or_type, iid, limit, effective_project).await?;
+    let elapsed_ms = start.elapsed().as_millis() as u64;
+
+    if robot_mode {
+        print_related_json(&response, elapsed_ms);
+    } else {
+        print_related_human(&response);
+    }
+    Ok(())
+}
+
+#[allow(clippy::too_many_arguments)]
+async fn handle_list_compat(
+    config_override: Option<&str>,
+    entity: &str,
+    limit: usize,
+    project_filter: Option<&str>,
+    state_filter: Option<&str>,
+    author_filter: Option<&str>,
+    assignee_filter: Option<&str>,
+    label_filter: Option<&[String]>,
+    milestone_filter: Option<&str>,
+    since_filter: Option<&str>,
+    due_before_filter: Option<&str>,
+    has_due_date: bool,
+    sort: &str,
+    order: &str,
+    open_browser: bool,
+    json_output: bool,
+    draft: bool,
+    no_draft: bool,
+    reviewer_filter: Option<&str>,
+    target_branch_filter: Option<&str>,
+    source_branch_filter: Option<&str>,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let start = std::time::Instant::now();
+    let config = Config::load(config_override)?;
+    let project_filter = config.effective_project(project_filter);
+
+    let state_normalized = state_filter.map(str::to_lowercase);
+    match entity {
+        "issues" => {
+            let filters = ListFilters {
+                limit,
+                project: project_filter,
+                state: state_normalized.as_deref(),
+                author: author_filter,
+                assignee: assignee_filter,
+                labels: label_filter,
+                milestone: milestone_filter,
+                since: since_filter,
+                due_before: due_before_filter,
+                has_due_date,
+                statuses: &[],
+                sort,
+                order,
+            };
+
+            let result = run_list_issues(&config, filters)?;
+
+            if open_browser {
+                open_issue_in_browser(&result);
+            } else if json_output {
+                print_list_issues_json(&result, start.elapsed().as_millis() as u64, None);
+            } else {
+                print_list_issues(&result);
+            }
+
+            Ok(())
+        }
+        "mrs" => {
+            let filters = MrListFilters {
+                limit,
+                project: project_filter,
+                state: state_normalized.as_deref(),
+                author: author_filter,
+                assignee: assignee_filter,
+                reviewer: reviewer_filter,
+                labels: label_filter,
+                since: since_filter,
+                draft,
+                no_draft,
+                target_branch: target_branch_filter,
+                source_branch: source_branch_filter,
+                sort,
+                order,
+            };
+
+            let result = run_list_mrs(&config, filters)?;
+
+            if open_browser {
+                open_mr_in_browser(&result);
+            } else if json_output {
+                print_list_mrs_json(&result, start.elapsed().as_millis() as u64, None);
+            } else {
+                print_list_mrs(&result);
+            }
+
+            Ok(())
+        }
+        _ => {
+            eprintln!(
+                "{}",
+                Theme::error().render(&format!("Unknown entity: {entity}"))
+            );
+            std::process::exit(1);
+        }
+    }
+}
+

src/cli/args.rs

@@ -0,0 +1,870 @@
+use clap::{Args, Parser, Subcommand};
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore issues -n 10                     # List 10 most recently updated issues
+  lore issues -s opened -l bug          # Open issues labeled 'bug'
+  lore issues 42 -p group/repo          # Show issue #42 in a specific project
+  lore issues --since 7d -a jsmith      # Issues updated in last 7 days by jsmith")]
+pub struct IssuesArgs {
+    /// Issue IID (omit to list, provide to show details)
+    pub iid: Option<i64>,
+
+    /// Maximum results
+    #[arg(
+        short = 'n',
+        long = "limit",
+        default_value = "50",
+        help_heading = "Output"
+    )]
+    pub limit: usize,
+
+    /// Select output fields (comma-separated, or 'minimal' preset: iid,title,state,updated_at_iso)
+    #[arg(long, help_heading = "Output", value_delimiter = ',')]
+    pub fields: Option<Vec<String>>,
+
+    /// Filter by state (opened, closed, all)
+    #[arg(short = 's', long, help_heading = "Filters", value_parser = ["opened", "closed", "all"])]
+    pub state: Option<String>,
+
+    /// Filter by project path
+    #[arg(short = 'p', long, help_heading = "Filters")]
+    pub project: Option<String>,
+
+    /// Filter by author username
+    #[arg(short = 'a', long, help_heading = "Filters")]
+    pub author: Option<String>,
+
+    /// Filter by assignee username
+    #[arg(short = 'A', long, help_heading = "Filters")]
+    pub assignee: Option<String>,
+
+    /// Filter by label (repeatable, AND logic)
+    #[arg(short = 'l', long, help_heading = "Filters")]
+    pub label: Option<Vec<String>>,
+
+    /// Filter by milestone title
+    #[arg(short = 'm', long, help_heading = "Filters")]
+    pub milestone: Option<String>,
+
+    /// Filter by work-item status name (repeatable, OR logic)
+    #[arg(long, help_heading = "Filters")]
+    pub status: Vec<String>,
+
+    /// Filter by time (7d, 2w, 1m, or YYYY-MM-DD)
+    #[arg(long, help_heading = "Filters")]
+    pub since: Option<String>,
+
+    /// Filter by due date (before this date, YYYY-MM-DD)
+    #[arg(long = "due-before", help_heading = "Filters")]
+    pub due_before: Option<String>,
+
+    /// Show only issues with a due date
+    #[arg(
+        long = "has-due",
+        help_heading = "Filters",
+        overrides_with = "no_has_due"
+    )]
+    pub has_due: bool,
+
+    #[arg(long = "no-has-due", hide = true, overrides_with = "has_due")]
+    pub no_has_due: bool,
+
+    /// Sort field (updated, created, iid)
+    #[arg(long, value_parser = ["updated", "created", "iid"], default_value = "updated", help_heading = "Sorting")]
+    pub sort: String,
+
+    /// Sort ascending (default: descending)
+    #[arg(long, help_heading = "Sorting", overrides_with = "no_asc")]
+    pub asc: bool,
+
+    #[arg(long = "no-asc", hide = true, overrides_with = "asc")]
+    pub no_asc: bool,
+
+    /// Open first matching item in browser
+    #[arg(
+        short = 'o',
+        long,
+        help_heading = "Actions",
+        overrides_with = "no_open"
+    )]
+    pub open: bool,
+
+    #[arg(long = "no-open", hide = true, overrides_with = "open")]
+    pub no_open: bool,
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore mrs -s opened                    # List open merge requests
+  lore mrs -s merged --since 2w         # MRs merged in the last 2 weeks
+  lore mrs 99 -p group/repo             # Show MR !99 in a specific project
+  lore mrs -D --reviewer jsmith         # Non-draft MRs reviewed by jsmith")]
+pub struct MrsArgs {
+    /// MR IID (omit to list, provide to show details)
+    pub iid: Option<i64>,
+
+    /// Maximum results
+    #[arg(
+        short = 'n',
+        long = "limit",
+        default_value = "50",
+        help_heading = "Output"
+    )]
+    pub limit: usize,
+
+    /// Select output fields (comma-separated, or 'minimal' preset: iid,title,state,updated_at_iso)
+    #[arg(long, help_heading = "Output", value_delimiter = ',')]
+    pub fields: Option<Vec<String>>,
+
+    /// Filter by state (opened, merged, closed, locked, all)
+    #[arg(short = 's', long, help_heading = "Filters", value_parser = ["opened", "merged", "closed", "locked", "all"])]
+    pub state: Option<String>,
+
+    /// Filter by project path
+    #[arg(short = 'p', long, help_heading = "Filters")]
+    pub project: Option<String>,
+
+    /// Filter by author username
+    #[arg(short = 'a', long, help_heading = "Filters")]
+    pub author: Option<String>,
+
+    /// Filter by assignee username
+    #[arg(short = 'A', long, help_heading = "Filters")]
+    pub assignee: Option<String>,
+
+    /// Filter by reviewer username
+    #[arg(short = 'r', long, help_heading = "Filters")]
+    pub reviewer: Option<String>,
+
+    /// Filter by label (repeatable, AND logic)
+    #[arg(short = 'l', long, help_heading = "Filters")]
+    pub label: Option<Vec<String>>,
+
+    /// Filter by time (7d, 2w, 1m, or YYYY-MM-DD)
+    #[arg(long, help_heading = "Filters")]
+    pub since: Option<String>,
+
+    /// Show only draft MRs
+    #[arg(
+        short = 'd',
+        long,
+        conflicts_with = "no_draft",
+        help_heading = "Filters"
+    )]
+    pub draft: bool,
+
+    /// Exclude draft MRs
+    #[arg(
+        short = 'D',
+        long = "no-draft",
+        conflicts_with = "draft",
+        help_heading = "Filters"
+    )]
+    pub no_draft: bool,
+
+    /// Filter by target branch
+    #[arg(long, help_heading = "Filters")]
+    pub target: Option<String>,
+
+    /// Filter by source branch
+    #[arg(long, help_heading = "Filters")]
+    pub source: Option<String>,
+
+    /// Sort field (updated, created, iid)
+    #[arg(long, value_parser = ["updated", "created", "iid"], default_value = "updated", help_heading = "Sorting")]
+    pub sort: String,
+
+    /// Sort ascending (default: descending)
+    #[arg(long, help_heading = "Sorting", overrides_with = "no_asc")]
+    pub asc: bool,
+
+    #[arg(long = "no-asc", hide = true, overrides_with = "asc")]
+    pub no_asc: bool,
+
+    /// Open first matching item in browser
+    #[arg(
+        short = 'o',
+        long,
+        help_heading = "Actions",
+        overrides_with = "no_open"
+    )]
+    pub open: bool,
+
+    #[arg(long = "no-open", hide = true, overrides_with = "open")]
+    pub no_open: bool,
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore notes                                  # List 50 most recent notes
+  lore notes --author alice --since 7d        # Notes by alice in last 7 days
+  lore notes --for-issue 42 -p group/repo     # Notes on issue #42
+  lore notes --path src/ --resolution unresolved  # Unresolved diff notes in src/")]
+pub struct NotesArgs {
+    /// Maximum results
+    #[arg(
+        short = 'n',
+        long = "limit",
+        default_value = "50",
+        help_heading = "Output"
+    )]
+    pub limit: usize,
+
+    /// Select output fields (comma-separated, or 'minimal' preset: id,author_username,body,created_at_iso)
+    #[arg(long, help_heading = "Output", value_delimiter = ',')]
+    pub fields: Option<Vec<String>>,
+
+    /// Filter by author username
+    #[arg(short = 'a', long, help_heading = "Filters")]
+    pub author: Option<String>,
+
+    /// Filter by note type (DiffNote, DiscussionNote)
+    #[arg(long, help_heading = "Filters")]
+    pub note_type: Option<String>,
+
+    /// Filter by body text (substring match)
+    #[arg(long, help_heading = "Filters")]
+    pub contains: Option<String>,
+
+    /// Filter by internal note ID
+    #[arg(long, help_heading = "Filters")]
+    pub note_id: Option<i64>,
+
+    /// Filter by GitLab note ID
+    #[arg(long, help_heading = "Filters")]
+    pub gitlab_note_id: Option<i64>,
+
+    /// Filter by discussion ID
+    #[arg(long, help_heading = "Filters")]
+    pub discussion_id: Option<String>,
+
+    /// Include system notes (excluded by default)
+    #[arg(long, help_heading = "Filters")]
+    pub include_system: bool,
+
+    /// Filter to notes on a specific issue IID (requires --project or default_project)
+    #[arg(long, conflicts_with = "for_mr", help_heading = "Filters")]
+    pub for_issue: Option<i64>,
+
+    /// Filter to notes on a specific MR IID (requires --project or default_project)
+    #[arg(long, conflicts_with = "for_issue", help_heading = "Filters")]
+    pub for_mr: Option<i64>,
+
+    /// Filter by project path
+    #[arg(short = 'p', long, help_heading = "Filters")]
+    pub project: Option<String>,
+
+    /// Filter by time (7d, 2w, 1m, or YYYY-MM-DD)
+    #[arg(long, help_heading = "Filters")]
+    pub since: Option<String>,
+
+    /// Filter until date (YYYY-MM-DD, inclusive end-of-day)
+    #[arg(long, help_heading = "Filters")]
+    pub until: Option<String>,
+
+    /// Filter by file path (exact match or prefix with trailing /)
+    #[arg(long, help_heading = "Filters")]
+    pub path: Option<String>,
+
+    /// Filter by resolution status (any, unresolved, resolved)
+    #[arg(
+        long,
+        value_parser = ["any", "unresolved", "resolved"],
+        help_heading = "Filters"
+    )]
+    pub resolution: Option<String>,
+
+    /// Sort field (created, updated)
+    #[arg(
+        long,
+        value_parser = ["created", "updated"],
+        default_value = "created",
+        help_heading = "Sorting"
+    )]
+    pub sort: String,
+
+    /// Sort ascending (default: descending)
+    #[arg(long, help_heading = "Sorting")]
+    pub asc: bool,
+
+    /// Open first matching item in browser
+    #[arg(long, help_heading = "Actions")]
+    pub open: bool,
+}
+
+#[derive(Parser)]
+pub struct IngestArgs {
+    /// Entity to ingest (issues, mrs). Omit to ingest everything
+    #[arg(value_parser = ["issues", "mrs"])]
+    pub entity: Option<String>,
+
+    /// Filter to single project
+    #[arg(short = 'p', long)]
+    pub project: Option<String>,
+
+    /// Override stale sync lock
+    #[arg(short = 'f', long, overrides_with = "no_force")]
+    pub force: bool,
+
+    #[arg(long = "no-force", hide = true, overrides_with = "force")]
+    pub no_force: bool,
+
+    /// Full re-sync: reset cursors and fetch all data from scratch
+    #[arg(long, overrides_with = "no_full")]
+    pub full: bool,
+
+    #[arg(long = "no-full", hide = true, overrides_with = "full")]
+    pub no_full: bool,
+
+    /// Preview what would be synced without making changes
+    #[arg(long, overrides_with = "no_dry_run")]
+    pub dry_run: bool,
+
+    #[arg(long = "no-dry-run", hide = true, overrides_with = "dry_run")]
+    pub no_dry_run: bool,
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore stats                              # Show document and index statistics
+  lore stats --check                      # Run integrity checks
+  lore stats --repair --dry-run           # Preview what repair would fix
+  lore --robot stats                      # JSON output for automation")]
+pub struct StatsArgs {
+    /// Run integrity checks
+    #[arg(long, overrides_with = "no_check")]
+    pub check: bool,
+
+    #[arg(long = "no-check", hide = true, overrides_with = "check")]
+    pub no_check: bool,
+
+    /// Repair integrity issues (auto-enables --check)
+    #[arg(long)]
+    pub repair: bool,
+
+    /// Preview what would be repaired without making changes (requires --repair)
+    #[arg(long, overrides_with = "no_dry_run")]
+    pub dry_run: bool,
+
+    #[arg(long = "no-dry-run", hide = true, overrides_with = "dry_run")]
+    pub no_dry_run: bool,
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore search 'authentication bug'               # Hybrid search (default)
+  lore search 'deploy' --mode lexical --type mr   # Lexical search, MRs only
+  lore search 'API rate limit' --since 30d        # Recent results only
+  lore search 'config' -p group/repo --explain    # With ranking explanation")]
+pub struct SearchArgs {
+    /// Search query string
+    pub query: String,
+
+    /// Search mode (lexical, hybrid, semantic)
+    #[arg(long, default_value = "hybrid", value_parser = ["lexical", "hybrid", "semantic"], help_heading = "Mode")]
+    pub mode: String,
+
+    /// Filter by source type (issue, mr, discussion, note)
+    #[arg(long = "type", value_name = "TYPE", value_parser = ["issue", "mr", "discussion", "note"], help_heading = "Filters")]
+    pub source_type: Option<String>,
+
+    /// Filter by author username
+    #[arg(long, help_heading = "Filters")]
+    pub author: Option<String>,
+
+    /// Filter by project path
+    #[arg(short = 'p', long, help_heading = "Filters")]
+    pub project: Option<String>,
+
+    /// Filter by label (repeatable, AND logic)
+    #[arg(long, action = clap::ArgAction::Append, help_heading = "Filters")]
+    pub label: Vec<String>,
+
+    /// Filter by file path (trailing / for prefix match)
+    #[arg(long, help_heading = "Filters")]
+    pub path: Option<String>,
+
+    /// Filter by created since (7d, 2w, or YYYY-MM-DD)
+    #[arg(long, help_heading = "Filters")]
+    pub since: Option<String>,
+
+    /// Filter by updated since (7d, 2w, or YYYY-MM-DD)
+    #[arg(long = "updated-since", help_heading = "Filters")]
+    pub updated_since: Option<String>,
+
+    /// Maximum results (default 20, max 100)
+    #[arg(
+        short = 'n',
+        long = "limit",
+        default_value = "20",
+        help_heading = "Output"
+    )]
+    pub limit: usize,
+
+    /// Select output fields (comma-separated, or 'minimal' preset: document_id,title,source_type,score)
+    #[arg(long, help_heading = "Output", value_delimiter = ',')]
+    pub fields: Option<Vec<String>>,
+
+    /// Show ranking explanation per result
+    #[arg(long, help_heading = "Output", overrides_with = "no_explain")]
+    pub explain: bool,
+
+    #[arg(long = "no-explain", hide = true, overrides_with = "explain")]
+    pub no_explain: bool,
+
+    /// FTS query mode: safe (default) or raw
+    #[arg(long = "fts-mode", default_value = "safe", value_parser = ["safe", "raw"], help_heading = "Mode")]
+    pub fts_mode: String,
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore generate-docs                      # Generate docs for dirty entities
+  lore generate-docs --full               # Full rebuild of all documents
+  lore generate-docs --full -p group/repo # Full rebuild for one project")]
+pub struct GenerateDocsArgs {
+    /// Full rebuild: seed all entities into dirty queue, then drain
+    #[arg(long)]
+    pub full: bool,
+
+    /// Filter to single project
+    #[arg(short = 'p', long)]
+    pub project: Option<String>,
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore sync                             # Full pipeline: ingest + docs + embed
+  lore sync --no-embed                  # Skip embedding step
+  lore sync --no-status                 # Skip work-item status enrichment
+  lore sync --full --force              # Full re-sync, override stale lock
+  lore sync --dry-run                   # Preview what would change
+  lore sync --issue 42 -p group/repo    # Surgically sync one issue
+  lore sync --mr 10 --mr 20 -p g/r     # Surgically sync two MRs")]
+pub struct SyncArgs {
+    /// Reset cursors, fetch everything
+    #[arg(long, overrides_with = "no_full")]
+    pub full: bool,
+
+    #[arg(long = "no-full", hide = true, overrides_with = "full")]
+    pub no_full: bool,
+
+    /// Override stale lock
+    #[arg(long, overrides_with = "no_force")]
+    pub force: bool,
+
+    #[arg(long = "no-force", hide = true, overrides_with = "force")]
+    pub no_force: bool,
+
+    /// Skip embedding step
+    #[arg(long)]
+    pub no_embed: bool,
+
+    /// Skip document regeneration
+    #[arg(long)]
+    pub no_docs: bool,
+
+    /// Skip resource event fetching (overrides config)
+    #[arg(long = "no-events")]
+    pub no_events: bool,
+
+    /// Skip MR file change fetching (overrides config)
+    #[arg(long = "no-file-changes")]
+    pub no_file_changes: bool,
+
+    /// Skip work-item status enrichment via GraphQL (overrides config)
+    #[arg(long = "no-status")]
+    pub no_status: bool,
+
+    /// Preview what would be synced without making changes
+    #[arg(long, overrides_with = "no_dry_run")]
+    pub dry_run: bool,
+
+    #[arg(long = "no-dry-run", hide = true, overrides_with = "dry_run")]
+    pub no_dry_run: bool,
+
+    /// Show detailed timing breakdown for sync stages
+    #[arg(short = 't', long = "timings")]
+    pub timings: bool,
+
+    /// Acquire file lock before syncing (skip if another sync is running)
+    #[arg(long)]
+    pub lock: bool,
+
+    /// Surgically sync specific issues by IID (repeatable, must be positive)
+    #[arg(long, value_parser = clap::value_parser!(u64).range(1..), action = clap::ArgAction::Append)]
+    pub issue: Vec<u64>,
+
+    /// Surgically sync specific merge requests by IID (repeatable, must be positive)
+    #[arg(long, value_parser = clap::value_parser!(u64).range(1..), action = clap::ArgAction::Append)]
+    pub mr: Vec<u64>,
+
+    /// Scope to a single project (required when --issue or --mr is used)
+    #[arg(short = 'p', long)]
+    pub project: Option<String>,
+
+    /// Validate remote entities exist without DB writes (preflight only)
+    #[arg(long)]
+    pub preflight_only: bool,
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore embed                              # Embed new/changed documents
+  lore embed --full                       # Re-embed all documents from scratch
+  lore embed --retry-failed               # Retry previously failed embeddings")]
+pub struct EmbedArgs {
+    /// Re-embed all documents (clears existing embeddings first)
+    #[arg(long, overrides_with = "no_full")]
+    pub full: bool,
+
+    #[arg(long = "no-full", hide = true, overrides_with = "full")]
+    pub no_full: bool,
+
+    /// Retry previously failed embeddings
+    #[arg(long, overrides_with = "no_retry_failed")]
+    pub retry_failed: bool,
+
+    #[arg(long = "no-retry-failed", hide = true, overrides_with = "retry_failed")]
+    pub no_retry_failed: bool,
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore timeline 'deployment'                          # Search-based seeding
+  lore timeline issue:42                              # Direct: issue #42 and related entities
+  lore timeline i:42                                  # Shorthand for issue:42
+  lore timeline mr:99                                 # Direct: MR !99 and related entities
+  lore timeline 'auth' --since 30d -p group/repo      # Scoped to project and time
+  lore timeline 'migration' --depth 2              # Deep cross-reference expansion
+  lore timeline 'auth' --no-mentions               # Only 'closes' and 'related' edges")]
+pub struct TimelineArgs {
+    /// Search text or entity reference (issue:N, i:N, mr:N, m:N)
+    pub query: String,
+
+    /// Scope to a specific project (fuzzy match)
+    #[arg(short = 'p', long, help_heading = "Filters")]
+    pub project: Option<String>,
+
+    /// Only show events after this date (e.g. "6m", "2w", "2024-01-01")
+    #[arg(long, help_heading = "Filters")]
+    pub since: Option<String>,
+
+    /// Cross-reference expansion depth (0 = no expansion)
+    #[arg(long, default_value = "1", help_heading = "Expansion")]
+    pub depth: u32,
+
+    /// Skip 'mentioned' edges during expansion (only follow 'closes' and 'related')
+    #[arg(long = "no-mentions", help_heading = "Expansion")]
+    pub no_mentions: bool,
+
+    /// Maximum number of events to display
+    #[arg(
+        short = 'n',
+        long = "limit",
+        default_value = "100",
+        help_heading = "Output"
+    )]
+    pub limit: usize,
+
+    /// Select output fields (comma-separated, or 'minimal' preset: timestamp,type,entity_iid,detail)
+    #[arg(long, help_heading = "Output", value_delimiter = ',')]
+    pub fields: Option<Vec<String>>,
+
+    /// Maximum seed entities from search
+    #[arg(long = "max-seeds", default_value = "10", help_heading = "Expansion")]
+    pub max_seeds: usize,
+
+    /// Maximum expanded entities via cross-references
+    #[arg(
+        long = "max-entities",
+        default_value = "50",
+        help_heading = "Expansion"
+    )]
+    pub max_entities: usize,
+
+    /// Maximum evidence notes included
+    #[arg(
+        long = "max-evidence",
+        default_value = "10",
+        help_heading = "Expansion"
+    )]
+    pub max_evidence: usize,
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore who src/features/auth/           # Who knows about this area?
+  lore who @asmith                      # What is asmith working on?
+  lore who @asmith --reviews            # What review patterns does asmith have?
+  lore who --active                     # What discussions need attention?
+  lore who --overlap src/features/auth/ # Who else is touching these files?
+  lore who --path README.md             # Expert lookup for a root file
+  lore who --path Makefile              # Expert lookup for a dotless root file")]
+pub struct WhoArgs {
+    /// Username or file path (path if contains /)
+    pub target: Option<String>,
+
+    /// Force expert mode for a file/directory path.
+    /// Root files (README.md, LICENSE, Makefile) are treated as exact matches.
+    /// Use a trailing `/` to force directory-prefix matching.
+    #[arg(long, help_heading = "Mode", conflicts_with_all = ["active", "overlap", "reviews"])]
+    pub path: Option<String>,
+
+    /// Show active unresolved discussions
+    #[arg(long, help_heading = "Mode", conflicts_with_all = ["target", "overlap", "reviews", "path"])]
+    pub active: bool,
+
+    /// Find users with MRs/notes touching this file path
+    #[arg(long, help_heading = "Mode", conflicts_with_all = ["target", "active", "reviews", "path"])]
+    pub overlap: Option<String>,
+
+    /// Show review pattern analysis (requires username target)
+    #[arg(long, help_heading = "Mode", requires = "target", conflicts_with_all = ["active", "overlap", "path"])]
+    pub reviews: bool,
+
+    /// Time window (7d, 2w, 6m, YYYY-MM-DD). Default varies by mode.
+    #[arg(long, help_heading = "Filters")]
+    pub since: Option<String>,
+
+    /// Scope to a project (supports fuzzy matching)
+    #[arg(short = 'p', long, help_heading = "Filters")]
+    pub project: Option<String>,
+
+    /// Maximum results per section (1..=500); omit for unlimited
+    #[arg(
+        short = 'n',
+        long = "limit",
+        value_parser = clap::value_parser!(u16).range(1..=500),
+        help_heading = "Output"
+    )]
+    pub limit: Option<u16>,
+
+    /// Select output fields (comma-separated, or 'minimal' preset; varies by mode)
+    #[arg(long, help_heading = "Output", value_delimiter = ',')]
+    pub fields: Option<Vec<String>>,
+
+    /// Show per-MR detail breakdown (expert mode only)
+    #[arg(
+        long,
+        help_heading = "Output",
+        overrides_with = "no_detail",
+        conflicts_with = "explain_score"
+    )]
+    pub detail: bool,
+
+    #[arg(long = "no-detail", hide = true, overrides_with = "detail")]
+    pub no_detail: bool,
+
+    /// Score as if "now" is this date (ISO 8601 or duration like 30d). Expert mode only.
+    #[arg(long = "as-of", help_heading = "Scoring")]
+    pub as_of: Option<String>,
+
+    /// Show per-component score breakdown in output. Expert mode only.
+    #[arg(long = "explain-score", help_heading = "Scoring")]
+    pub explain_score: bool,
+
+    /// Include bot users in results (normally excluded via scoring.excluded_usernames).
+    #[arg(long = "include-bots", help_heading = "Scoring")]
+    pub include_bots: bool,
+
+    /// Include discussions on closed issues and merged/closed MRs
+    #[arg(long, help_heading = "Filters")]
+    pub include_closed: bool,
+
+    /// Remove the default time window (query all history). Conflicts with --since.
+    #[arg(
+        long = "all-history",
+        help_heading = "Filters",
+        conflicts_with = "since"
+    )]
+    pub all_history: bool,
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore me                                 # Full dashboard (default project or all)
+  lore me --issues                        # Issues section only
+  lore me --mrs                           # MRs section only
+  lore me --activity                      # Activity feed only
+  lore me --all                           # All synced projects
+  lore me --since 2d                      # Activity window (default: 30d)
+  lore me --project group/repo            # Scope to one project
+  lore me --user jdoe                     # Override configured username")]
+pub struct MeArgs {
+    /// Show open issues section
+    #[arg(long, help_heading = "Sections")]
+    pub issues: bool,
+
+    /// Show authored + reviewing MRs section
+    #[arg(long, help_heading = "Sections")]
+    pub mrs: bool,
+
+    /// Show activity feed section
+    #[arg(long, help_heading = "Sections")]
+    pub activity: bool,
+
+    /// Show items you're @mentioned in (not assigned/authored/reviewing)
+    #[arg(long, help_heading = "Sections")]
+    pub mentions: bool,
+
+    /// Activity window (e.g. 7d, 2w, 30d). Default: 30d. Only affects activity section.
+    #[arg(long, help_heading = "Filters")]
+    pub since: Option<String>,
+
+    /// Scope to a project (supports fuzzy matching)
+    #[arg(short = 'p', long, help_heading = "Filters", conflicts_with = "all")]
+    pub project: Option<String>,
+
+    /// Show all synced projects (overrides default_project)
+    #[arg(long, help_heading = "Filters", conflicts_with = "project")]
+    pub all: bool,
+
+    /// Override configured username
+    #[arg(long = "user", help_heading = "Filters")]
+    pub user: Option<String>,
+
+    /// Select output fields (comma-separated, or 'minimal' preset)
+    #[arg(long, help_heading = "Output", value_delimiter = ',')]
+    pub fields: Option<Vec<String>>,
+
+    /// Reset the since-last-check cursor (next run shows no new events)
+    #[arg(long, help_heading = "Output")]
+    pub reset_cursor: bool,
+}
+
+impl MeArgs {
+    /// Returns true if no section flags were passed (show all sections).
+    pub fn show_all_sections(&self) -> bool {
+        !self.issues && !self.mrs && !self.activity && !self.mentions
+    }
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore file-history src/main.rs                  # MRs that touched this file
+  lore file-history src/auth/ -p group/repo      # Scoped to project
+  lore file-history src/foo.rs --discussions      # Include DiffNote snippets
+  lore file-history src/bar.rs --no-follow-renames  # Skip rename chain")]
+pub struct FileHistoryArgs {
+    /// File path to trace history for
+    pub path: String,
+
+    /// Scope to a specific project (fuzzy match)
+    #[arg(short = 'p', long, help_heading = "Filters")]
+    pub project: Option<String>,
+
+    /// Include discussion snippets from DiffNotes on this file
+    #[arg(long, help_heading = "Output")]
+    pub discussions: bool,
+
+    /// Disable rename chain resolution
+    #[arg(long = "no-follow-renames", help_heading = "Filters")]
+    pub no_follow_renames: bool,
+
+    /// Only show merged MRs
+    #[arg(long, help_heading = "Filters")]
+    pub merged: bool,
+
+    /// Maximum results
+    #[arg(
+        short = 'n',
+        long = "limit",
+        default_value = "50",
+        help_heading = "Output"
+    )]
+    pub limit: usize,
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore trace src/main.rs                      # Why was this file changed?
+  lore trace src/auth/ -p group/repo          # Scoped to project
+  lore trace src/foo.rs --discussions          # Include DiffNote context
+  lore trace src/bar.rs:42                    # Line hint (Tier 2 warning)")]
+pub struct TraceArgs {
+    /// File path to trace (supports :line suffix for future Tier 2)
+    pub path: String,
+
+    /// Scope to a specific project (fuzzy match)
+    #[arg(short = 'p', long, help_heading = "Filters")]
+    pub project: Option<String>,
+
+    /// Include DiffNote discussion snippets
+    #[arg(long, help_heading = "Output")]
+    pub discussions: bool,
+
+    /// Disable rename chain resolution
+    #[arg(long = "no-follow-renames", help_heading = "Filters")]
+    pub no_follow_renames: bool,
+
+    /// Maximum trace chains to display
+    #[arg(
+        short = 'n',
+        long = "limit",
+        default_value = "20",
+        help_heading = "Output"
+    )]
+    pub limit: usize,
+}
+
+#[derive(Parser)]
+#[command(after_help = "\x1b[1mExamples:\x1b[0m
+  lore count issues                       # Total issues in local database
+  lore count notes --for mr               # Notes on merge requests only
+  lore count discussions --for issue       # Discussions on issues only")]
+pub struct CountArgs {
+    /// Entity type to count (issues, mrs, discussions, notes, events)
+    #[arg(value_parser = ["issues", "mrs", "discussions", "notes", "events"])]
+    pub entity: String,
+
+    /// Parent type filter: issue or mr (for discussions/notes)
+    #[arg(short = 'f', long = "for", value_parser = ["issue", "mr"])]
+    pub for_entity: Option<String>,
+}
+
+#[derive(Parser)]
+pub struct CronArgs {
+    #[command(subcommand)]
+    pub action: CronAction,
+}
+
+#[derive(Subcommand)]
+pub enum CronAction {
+    /// Install cron job for automatic syncing
+    Install {
+        /// Sync interval in minutes (default: 8)
+        #[arg(long, default_value = "8")]
+        interval: u32,
+    },
+
+    /// Remove cron job
+    Uninstall,
+
+    /// Show current cron configuration
+    Status,
+}
+
+#[derive(Args)]
+pub struct TokenArgs {
+    #[command(subcommand)]
+    pub action: TokenAction,
+}
+
+#[derive(Subcommand)]
+pub enum TokenAction {
+    /// Store a GitLab token in the config file
+    Set {
+        /// Token value (reads from stdin if omitted in non-interactive mode)
+        #[arg(long)]
+        token: Option<String>,
+    },
+
+    /// Show the current token (masked by default)
+    Show {
+        /// Show the full unmasked token
+        #[arg(long)]
+        unmask: bool,
+    },
+}

src/cli/autocorrect.rs

@@ -22,6 +22,10 @@ pub enum CorrectionRule {
     CaseNormalization,
     FuzzyFlag,
     SubcommandAlias,
+    /// Fuzzy subcommand match: "issuess" → "issues"
+    SubcommandFuzzy,
+    /// Flag-style subcommand: "--robot-docs" → "robot-docs"
+    FlagAsSubcommand,
     ValueNormalization,
     ValueFuzzy,
     FlagPrefix,
@@ -205,6 +209,16 @@ const COMMAND_FLAGS: &[(&str, &[&str])] = &[
         ],
     ),
     ("drift", &["--threshold", "--project"]),
+    (
+        "explain",
+        &[
+            "--project",
+            "--sections",
+            "--no-timeline",
+            "--max-decisions",
+            "--since",
+        ],
+    ),
     (
         "notes",
         &[
@@ -232,6 +246,7 @@ const COMMAND_FLAGS: &[(&str, &[&str])] = &[
     (
         "init",
         &[
+            "--refresh",
             "--force",
             "--non-interactive",
             "--gitlab-url",
@@ -285,7 +300,6 @@ const COMMAND_FLAGS: &[(&str, &[&str])] = &[
             "--source-branch",
         ],
     ),
-    ("show", &["--project"]),
     ("reset", &["--yes"]),
     (
         "me",
@@ -293,6 +307,7 @@ const COMMAND_FLAGS: &[(&str, &[&str])] = &[
             "--issues",
             "--mrs",
             "--activity",
+            "--mentions",
             "--since",
             "--project",
             "--all",
@@ -350,6 +365,51 @@ const FUZZY_FLAG_THRESHOLD: f64 = 0.8;
 /// avoid misleading agents. Still catches obvious typos like `--projct`.
 const FUZZY_FLAG_THRESHOLD_STRICT: f64 = 0.9;
 
+/// Fuzzy subcommand threshold — higher than flags because subcommand names
+/// are shorter words where JW scores inflate more easily.
+const FUZZY_SUBCMD_THRESHOLD: f64 = 0.85;
+
+/// All canonical subcommand names for fuzzy matching and flag-as-subcommand
+/// detection. Includes hidden commands so agents that know about them can
+/// still benefit from typo correction.
+const CANONICAL_SUBCOMMANDS: &[&str] = &[
+    "issues",
+    "mrs",
+    "notes",
+    "ingest",
+    "count",
+    "status",
+    "auth",
+    "doctor",
+    "version",
+    "init",
+    "search",
+    "stats",
+    "generate-docs",
+    "embed",
+    "sync",
+    "migrate",
+    "health",
+    "robot-docs",
+    "completions",
+    "timeline",
+    "who",
+    "me",
+    "file-history",
+    "trace",
+    "drift",
+    "explain",
+    "related",
+    "cron",
+    "token",
+    // Hidden but still valid
+    "backup",
+    "reset",
+    "list",
+    "auth-test",
+    "sync-status",
+];
+
 // ---------------------------------------------------------------------------
 // Core logic
 // ---------------------------------------------------------------------------
@@ -473,13 +533,15 @@ pub fn correct_args(raw: Vec<String>, strict: bool) -> CorrectionResult {
     }
 }
 
-/// Phase A: Replace subcommand aliases with their canonical names.
+/// Phase A: Replace subcommand aliases with their canonical names, fuzzy-match
+/// typo'd subcommands, and detect flag-style subcommands (`--robot-docs`).
 ///
-/// Handles forms that can't be expressed as clap `alias`/`visible_alias`
+/// Three-step pipeline:
-/// (underscores, no-separator forms). Case-insensitive matching.
+/// - A1: Exact alias match (underscore/no-separator forms)
+/// - A2: Fuzzy subcommand match ("issuess" → "issues")
+/// - A3: Flag-as-subcommand ("--robot-docs" → "robot-docs")
 fn correct_subcommand(mut args: Vec<String>, corrections: &mut Vec<Correction>) -> Vec<String> {
-    // Find the subcommand position index, then check the alias map.
+    // Find the subcommand position index.
-    // Can't use iterators easily because we need to mutate args[i].
     let mut skip_next = false;
     let mut subcmd_idx = None;
     for (i, arg) in args.iter().enumerate().skip(1) {
@@ -499,8 +561,10 @@ fn correct_subcommand(mut args: Vec<String>, corrections: &mut Vec<Correction>)
         subcmd_idx = Some(i);
         break;
     }
-    if let Some(i) = subcmd_idx
+
-        && let Some((_, canonical)) = SUBCOMMAND_ALIASES
+    if let Some(i) = subcmd_idx {
+        // A1: Exact alias match (existing logic)
+        if let Some((_, canonical)) = SUBCOMMAND_ALIASES
             .iter()
             .find(|(alias, _)| alias.eq_ignore_ascii_case(&args[i]))
         {
@@ -512,6 +576,91 @@ fn correct_subcommand(mut args: Vec<String>, corrections: &mut Vec<Correction>)
             });
             args[i] = (*canonical).to_string();
         }
+        // A2: Fuzzy subcommand match — only if not already a canonical name
+        else {
+            let lower = args[i].to_lowercase();
+            if !CANONICAL_SUBCOMMANDS.contains(&lower.as_str()) {
+                // Guard: don't fuzzy-match words that look like misplaced global flags
+                // (e.g., "robot" should not match "robot-docs")
+                let as_flag = format!("--{lower}");
+                let is_flag_word = GLOBAL_FLAGS
+                    .iter()
+                    .any(|f| f.eq_ignore_ascii_case(&as_flag));
+
+                // Guard: don't fuzzy-match if it's a valid prefix of a canonical command
+                // (clap's infer_subcommands handles prefix resolution)
+                let is_prefix = CANONICAL_SUBCOMMANDS
+                    .iter()
+                    .any(|cmd| cmd.starts_with(&*lower) && *cmd != lower);
+
+                if !is_flag_word && !is_prefix {
+                    let best = CANONICAL_SUBCOMMANDS
+                        .iter()
+                        .map(|cmd| (*cmd, jaro_winkler(&lower, cmd)))
+                        .max_by(|a, b| a.1.partial_cmp(&b.1).unwrap_or(std::cmp::Ordering::Equal));
+
+                    if let Some((cmd, score)) = best
+                        && score >= FUZZY_SUBCMD_THRESHOLD
+                    {
+                        corrections.push(Correction {
+                            original: args[i].clone(),
+                            corrected: cmd.to_string(),
+                            rule: CorrectionRule::SubcommandFuzzy,
+                            confidence: score,
+                        });
+                        args[i] = cmd.to_string();
+                    }
+                }
+            }
+        }
+    } else {
+        // A3: No subcommand detected — check for flag-style subcommands.
+        // Agents sometimes type `--robot-docs` or `--generate-docs` as flags.
+        let mut flag_as_subcmd: Option<(usize, String)> = None;
+        let mut flag_skip = false;
+        for (i, arg) in args.iter().enumerate().skip(1) {
+            if flag_skip {
+                flag_skip = false;
+                continue;
+            }
+            if !arg.starts_with("--") || arg.contains('=') {
+                continue;
+            }
+
+            let arg_lower = arg.to_lowercase();
+            // Skip clap built-in flags (--help, --version)
+            if CLAP_BUILTINS
+                .iter()
+                .any(|b| b.eq_ignore_ascii_case(&arg_lower))
+            {
+                continue;
+            }
+            // Skip known global flags
+            if GLOBAL_FLAGS.iter().any(|f| f.to_lowercase() == arg_lower) {
+                if matches!(arg_lower.as_str(), "--config" | "--color" | "--log-format") {
+                    flag_skip = true;
+                }
+                continue;
+            }
+
+            let stripped = arg_lower[2..].to_string();
+            if CANONICAL_SUBCOMMANDS.contains(&stripped.as_str()) {
+                flag_as_subcmd = Some((i, stripped));
+                break;
+            }
+        }
+
+        if let Some((i, subcmd)) = flag_as_subcmd {
+            corrections.push(Correction {
+                original: args[i].clone(),
+                corrected: subcmd.clone(),
+                rule: CorrectionRule::FlagAsSubcommand,
+                confidence: 1.0,
+            });
+            args[i] = subcmd;
+        }
+    }
+
     args
 }
 
@@ -887,6 +1036,18 @@ pub fn format_teaching_note(correction: &Correction) -> String {
                 correction.corrected, correction.original
             )
         }
+        CorrectionRule::SubcommandFuzzy => {
+            format!(
+                "Correct command spelling: lore {} (not lore {})",
+                correction.corrected, correction.original
+            )
+        }
+        CorrectionRule::FlagAsSubcommand => {
+            format!(
+                "Commands are positional, not flags: lore {} (not lore --{})",
+                correction.corrected, correction.corrected
+            )
+        }
         CorrectionRule::ValueNormalization => {
             format!(
                 "Values are lowercase: {} (not {})",
@@ -1450,6 +1611,198 @@ mod tests {
         assert_eq!(detect_subcommand(&args("lore --robot")), None);
     }
 
+    // ---- Fuzzy subcommand matching (A2) ----
+
+    #[test]
+    fn fuzzy_subcommand_issuess() {
+        let result = correct_args(args("lore --robot issuess -n 10"), false);
+        assert!(
+            result
+                .corrections
+                .iter()
+                .any(|c| c.rule == CorrectionRule::SubcommandFuzzy && c.corrected == "issues"),
+            "expected 'issuess' to fuzzy-match 'issues'"
+        );
+        assert!(result.args.contains(&"issues".to_string()));
+    }
+
+    #[test]
+    fn fuzzy_subcommand_timline() {
+        let result = correct_args(args("lore timline \"auth\""), false);
+        assert!(
+            result.corrections.iter().any(|c| c.corrected == "timeline"),
+            "expected 'timline' to fuzzy-match 'timeline'"
+        );
+    }
+
+    #[test]
+    fn fuzzy_subcommand_serach() {
+        let result = correct_args(args("lore --robot serach \"auth bug\""), false);
+        assert!(
+            result.corrections.iter().any(|c| c.corrected == "search"),
+            "expected 'serach' to fuzzy-match 'search'"
+        );
+    }
+
+    #[test]
+    fn fuzzy_subcommand_already_valid_untouched() {
+        let result = correct_args(args("lore issues -n 10"), false);
+        assert!(
+            !result
+                .corrections
+                .iter()
+                .any(|c| c.rule == CorrectionRule::SubcommandFuzzy)
+        );
+    }
+
+    #[test]
+    fn fuzzy_subcommand_robot_not_matched_to_robot_docs() {
+        // "robot" looks like a misplaced --robot flag, not a typo for "robot-docs"
+        let result = correct_args(args("lore robot issues"), false);
+        assert!(
+            !result
+                .corrections
+                .iter()
+                .any(|c| c.rule == CorrectionRule::SubcommandFuzzy),
+            "expected 'robot' NOT to fuzzy-match 'robot-docs' (it's a misplaced flag)"
+        );
+    }
+
+    #[test]
+    fn fuzzy_subcommand_prefix_deferred_to_clap() {
+        // "iss" is a prefix of "issues" — clap's infer_subcommands handles this
+        let result = correct_args(args("lore iss -n 10"), false);
+        assert!(
+            !result
+                .corrections
+                .iter()
+                .any(|c| c.rule == CorrectionRule::SubcommandFuzzy),
+            "expected prefix 'iss' NOT to be fuzzy-matched (clap handles it)"
+        );
+    }
+
+    #[test]
+    fn fuzzy_subcommand_wildly_wrong_not_matched() {
+        let result = correct_args(args("lore xyzzyplugh"), false);
+        assert!(
+            !result
+                .corrections
+                .iter()
+                .any(|c| c.rule == CorrectionRule::SubcommandFuzzy),
+            "expected gibberish NOT to fuzzy-match any command"
+        );
+    }
+
+    // ---- Flag-as-subcommand (A3) ----
+
+    #[test]
+    fn flag_as_subcommand_robot_docs() {
+        let result = correct_args(args("lore --robot-docs"), false);
+        assert!(
+            result
+                .corrections
+                .iter()
+                .any(|c| c.rule == CorrectionRule::FlagAsSubcommand && c.corrected == "robot-docs"),
+            "expected '--robot-docs' to be corrected to 'robot-docs'"
+        );
+        assert!(result.args.contains(&"robot-docs".to_string()));
+    }
+
+    #[test]
+    fn flag_as_subcommand_generate_docs() {
+        let result = correct_args(args("lore --generate-docs"), false);
+        assert!(
+            result
+                .corrections
+                .iter()
+                .any(|c| c.corrected == "generate-docs"),
+            "expected '--generate-docs' to be corrected to 'generate-docs'"
+        );
+    }
+
+    #[test]
+    fn flag_as_subcommand_with_robot_flag() {
+        // `lore --robot --robot-docs` — --robot is a valid global flag, --robot-docs is not
+        let result = correct_args(args("lore --robot --robot-docs"), false);
+        assert!(
+            result
+                .corrections
+                .iter()
+                .any(|c| c.corrected == "robot-docs"),
+        );
+        assert_eq!(result.args, args("lore --robot robot-docs"));
+    }
+
+    #[test]
+    fn flag_as_subcommand_does_not_touch_real_flags() {
+        // --robot is a real global flag, should NOT be rewritten to "robot"
+        let result = correct_args(args("lore --robot issues"), false);
+        assert!(
+            !result
+                .corrections
+                .iter()
+                .any(|c| c.rule == CorrectionRule::FlagAsSubcommand),
+        );
+    }
+
+    #[test]
+    fn flag_as_subcommand_not_triggered_when_subcommand_present() {
+        // A subcommand IS detected, so A3 shouldn't activate
+        let result = correct_args(args("lore issues --robot-docs"), false);
+        assert!(
+            !result
+                .corrections
+                .iter()
+                .any(|c| c.rule == CorrectionRule::FlagAsSubcommand),
+            "expected A3 not to trigger when subcommand is already present"
+        );
+    }
+
+    // ---- Teaching notes for new rules ----
+
+    #[test]
+    fn teaching_note_subcommand_fuzzy() {
+        let c = Correction {
+            original: "issuess".to_string(),
+            corrected: "issues".to_string(),
+            rule: CorrectionRule::SubcommandFuzzy,
+            confidence: 0.92,
+        };
+        let note = format_teaching_note(&c);
+        assert!(note.contains("spelling"));
+        assert!(note.contains("issues"));
+    }
+
+    #[test]
+    fn teaching_note_flag_as_subcommand() {
+        let c = Correction {
+            original: "--robot-docs".to_string(),
+            corrected: "robot-docs".to_string(),
+            rule: CorrectionRule::FlagAsSubcommand,
+            confidence: 1.0,
+        };
+        let note = format_teaching_note(&c);
+        assert!(note.contains("positional"));
+        assert!(note.contains("robot-docs"));
+    }
+
+    // ---- Canonical subcommands registry drift test ----
+
+    #[test]
+    fn canonical_subcommands_covers_clap() {
+        use clap::CommandFactory;
+        let cmd = crate::cli::Cli::command();
+
+        for sub in cmd.get_subcommands() {
+            let name = sub.get_name();
+            assert!(
+                CANONICAL_SUBCOMMANDS.contains(&name),
+                "Clap subcommand '{name}' is missing from CANONICAL_SUBCOMMANDS. \
+                 Add it to autocorrect.rs."
+            );
+        }
+    }
+
     // ---- Registry drift test ----
     // This test uses clap introspection to verify our static registry covers
     // all long flags defined in the Cli struct.

src/cli/commands/count.rs

@@ -6,8 +6,8 @@ use crate::Config;
 use crate::cli::robot::RobotMeta;
 use crate::core::db::create_connection;
 use crate::core::error::Result;
-use crate::core::events_db::{self, EventCounts};
 use crate::core::paths::get_db_path;
+use crate::ingestion::storage::events::{EventCounts, count_events};
 
 pub struct CountResult {
     pub entity: String,
@@ -208,7 +208,7 @@ struct CountJsonBreakdown {
 pub fn run_count_events(config: &Config) -> Result<EventCounts> {
     let db_path = get_db_path(config.storage.db_path.as_deref());
     let conn = create_connection(&db_path)?;
-    events_db::count_events(&conn)
+    count_events(&conn)
 }
 
 #[derive(Serialize)]
@@ -254,7 +254,7 @@ pub fn print_event_count_json(counts: &EventCounts, elapsed_ms: u64) {
             },
             total: counts.total(),
         },
-        meta: RobotMeta { elapsed_ms },
+        meta: RobotMeta::new(elapsed_ms),
     };
 
     match serde_json::to_string(&output) {
@@ -325,7 +325,7 @@ pub fn print_count_json(result: &CountResult, elapsed_ms: u64) {
             system_excluded: result.system_count,
             breakdown,
         },
-        meta: RobotMeta { elapsed_ms },
+        meta: RobotMeta::new(elapsed_ms),
     };
 
     match serde_json::to_string(&output) {

src/cli/commands/cron.rs

@@ -9,6 +9,7 @@ use crate::core::cron::{
 };
 use crate::core::db::create_connection;
 use crate::core::error::Result;
+use crate::core::ollama_mgmt::{OllamaStatusBrief, ollama_status_brief};
 use crate::core::paths::get_db_path;
 use crate::core::time::ms_to_iso;
 
@@ -80,7 +81,7 @@ pub fn print_cron_install_json(result: &CronInstallResult, elapsed_ms: u64) {
             log_path: result.log_path.display().to_string(),
             replaced: result.replaced,
         },
-        meta: RobotMeta { elapsed_ms },
+        meta: RobotMeta::new(elapsed_ms),
     };
     if let Ok(json) = serde_json::to_string(&output) {
         println!("{json}");
@@ -128,7 +129,7 @@ pub fn print_cron_uninstall_json(result: &CronUninstallResult, elapsed_ms: u64)
             action: "uninstall",
             was_installed: result.was_installed,
         },
-        meta: RobotMeta { elapsed_ms },
+        meta: RobotMeta::new(elapsed_ms),
     };
     if let Ok(json) = serde_json::to_string(&output) {
         println!("{json}");
@@ -143,12 +144,20 @@ pub fn run_cron_status(config: &Config) -> Result<CronStatusInfo> {
     // Query last sync run from DB
     let last_sync = get_last_sync_time(config).unwrap_or_default();
 
-    Ok(CronStatusInfo { status, last_sync })
+    // Quick ollama health check
+    let ollama = ollama_status_brief(&config.embedding.base_url);
+
+    Ok(CronStatusInfo {
+        status,
+        last_sync,
+        ollama,
+    })
 }
 
 pub struct CronStatusInfo {
     pub status: CronStatusResult,
     pub last_sync: Option<LastSyncInfo>,
+    pub ollama: OllamaStatusBrief,
 }
 
 pub struct LastSyncInfo {
@@ -236,6 +245,32 @@ pub fn print_cron_status(info: &CronStatusInfo) {
             last.status
         );
     }
+
+    // Ollama status
+    if info.ollama.installed {
+        if info.ollama.running {
+            println!(
+                "  {} running (auto-started by cron if needed)",
+                Theme::dim().render("ollama:")
+            );
+        } else {
+            println!(
+                "  {} {}",
+                Theme::warning().render("ollama:"),
+                Theme::warning()
+                    .render("installed but not running (will attempt start on next sync)")
+            );
+        }
+    } else {
+        println!(
+            "  {} {}",
+            Theme::error().render("ollama:"),
+            Theme::error().render("not installed — embeddings unavailable")
+        );
+        if let Some(ref hint) = info.ollama.install_hint {
+            println!("            {hint}");
+        }
+    }
     println!();
 }
 
@@ -264,6 +299,7 @@ struct CronStatusData {
     last_sync_at: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     last_sync_status: Option<String>,
+    ollama: OllamaStatusBrief,
 }
 
 pub fn print_cron_status_json(info: &CronStatusInfo, elapsed_ms: u64) {
@@ -283,8 +319,9 @@ pub fn print_cron_status_json(info: &CronStatusInfo, elapsed_ms: u64) {
             cron_entry: info.status.cron_entry.clone(),
             last_sync_at: info.last_sync.as_ref().map(|s| s.started_at_iso.clone()),
             last_sync_status: info.last_sync.as_ref().map(|s| s.status.clone()),
+            ollama: info.ollama.clone(),
         },
-        meta: RobotMeta { elapsed_ms },
+        meta: RobotMeta::new(elapsed_ms),
     };
     if let Ok(json) = serde_json::to_string(&output) {
         println!("{json}");

src/cli/commands/doctor.rs

@@ -385,25 +385,11 @@ async fn check_ollama(config: Option<&Config>) -> OllamaCheck {
     let base_url = &config.embedding.base_url;
     let model = &config.embedding.model;
 
-    let client = match reqwest::Client::builder()
+    let client = crate::http::Client::with_timeout(std::time::Duration::from_secs(2));
-        .timeout(std::time::Duration::from_secs(2))
+    let url = format!("{base_url}/api/tags");
-        .build()
-    {
-        Ok(client) => client,
-        Err(e) => {
-            return OllamaCheck {
-                result: CheckResult {
-                    status: CheckStatus::Warning,
-                    message: Some(format!("Failed to build HTTP client: {e}")),
-                },
-                url: Some(base_url.clone()),
-                model: Some(model.clone()),
-            };
-        }
-    };
 
-    match client.get(format!("{base_url}/api/tags")).send().await {
+    match client.get(&url, &[]).await {
-        Ok(response) if response.status().is_success() => {
+        Ok(response) if response.is_success() => {
             #[derive(serde::Deserialize)]
             struct TagsResponse {
                 models: Option<Vec<ModelInfo>>,
@@ -413,7 +399,7 @@ async fn check_ollama(config: Option<&Config>) -> OllamaCheck {
                 name: String,
             }
 
-            match response.json::<TagsResponse>().await {
+            match response.json::<TagsResponse>() {
                 Ok(data) => {
                     let models = data.models.unwrap_or_default();
                     let model_names: Vec<&str> = models
@@ -462,7 +448,7 @@ async fn check_ollama(config: Option<&Config>) -> OllamaCheck {
         Ok(response) => OllamaCheck {
             result: CheckResult {
                 status: CheckStatus::Warning,
-                message: Some(format!("Ollama responded with {}", response.status())),
+                message: Some(format!("Ollama responded with {}", response.status)),
             },
             url: Some(base_url.clone()),
             model: Some(model.clone()),

src/cli/commands/drift.rs

@@ -468,7 +468,7 @@ pub fn print_drift_human(response: &DriftResponse) {
 }
 
 pub fn print_drift_json(response: &DriftResponse, elapsed_ms: u64) {
-    let meta = RobotMeta { elapsed_ms };
+    let meta = RobotMeta::new(elapsed_ms);
     let output = serde_json::json!({
         "ok": true,
         "data": response,

src/cli/commands/embed.rs

@@ -135,7 +135,7 @@ pub fn print_embed_json(result: &EmbedCommandResult, elapsed_ms: u64) {
     let output = EmbedJsonOutput {
         ok: true,
         data: result,
-        meta: RobotMeta { elapsed_ms },
+        meta: RobotMeta::new(elapsed_ms),
     };
     match serde_json::to_string(&output) {
         Ok(json) => println!("{json}"),

src/cli/commands/file_history.rs

@@ -5,7 +5,7 @@ use tracing::info;
 use crate::Config;
 use crate::cli::render::{self, Icons, Theme};
 use crate::core::db::create_connection;
-use crate::core::error::Result;
+use crate::core::error::{LoreError, Result};
 use crate::core::file_history::resolve_rename_chain;
 use crate::core::paths::get_db_path;
 use crate::core::project::resolve_project;
@@ -391,7 +391,7 @@ pub fn print_file_history(result: &FileHistoryResult) {
 
 // ── Robot (JSON) output ─────────────────────────────────────────────────────
 
-pub fn print_file_history_json(result: &FileHistoryResult, elapsed_ms: u64) {
+pub fn print_file_history_json(result: &FileHistoryResult, elapsed_ms: u64) -> Result<()> {
     let output = serde_json::json!({
         "ok": true,
         "data": {
@@ -409,5 +409,10 @@ pub fn print_file_history_json(result: &FileHistoryResult, elapsed_ms: u64) {
         }
     });
 
-    println!("{}", serde_json::to_string(&output).unwrap_or_default());
+    println!(
+        "{}",
+        serde_json::to_string(&output)
+            .map_err(|e| LoreError::Other(format!("JSON serialization failed: {e}")))?
+    );
+    Ok(())
 }

src/cli/commands/generate_docs.rs

@@ -257,7 +257,7 @@ pub fn print_generate_docs_json(result: &GenerateDocsResult, elapsed_ms: u64) {
             unchanged: result.unchanged,
             errored: result.errored,
         },
-        meta: RobotMeta { elapsed_ms },
+        meta: RobotMeta::new(elapsed_ms),
     };
     match serde_json::to_string(&output) {
         Ok(json) => println!("{json}"),

src/cli/commands/ingest/mod.rs

@@ -0,0 +1,26 @@
+use std::sync::Arc;
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+use crate::cli::render::Theme;
+use indicatif::{ProgressBar, ProgressStyle};
+use rusqlite::Connection;
+use serde::Serialize;
+
+use tracing::Instrument;
+
+use crate::Config;
+use crate::cli::robot::RobotMeta;
+use crate::core::db::create_connection;
+use crate::core::error::{LoreError, Result};
+use crate::core::lock::{AppLock, LockOptions};
+use crate::core::paths::get_db_path;
+use crate::core::project::resolve_project;
+use crate::core::shutdown::ShutdownSignal;
+use crate::gitlab::GitLabClient;
+use crate::ingestion::{
+    IngestMrProjectResult, IngestProjectResult, ProgressEvent, ingest_project_issues_with_progress,
+    ingest_project_merge_requests_with_progress,
+};
+
+include!("run.rs");
+include!("render.rs");

src/cli/commands/ingest/render.rs

@@ -0,0 +1,331 @@
+fn print_issue_project_summary(path: &str, result: &IngestProjectResult) {
+    let labels_str = if result.labels_created > 0 {
+        format!(", {} new labels", result.labels_created)
+    } else {
+        String::new()
+    };
+
+    println!(
+        "  {}: {} issues fetched{}",
+        Theme::info().render(path),
+        result.issues_upserted,
+        labels_str
+    );
+
+    if result.issues_synced_discussions > 0 {
+        println!(
+            "    {} issues -> {} discussions, {} notes",
+            result.issues_synced_discussions, result.discussions_fetched, result.notes_upserted
+        );
+    }
+
+    if result.issues_skipped_discussion_sync > 0 {
+        println!(
+            "    {} unchanged issues (discussion sync skipped)",
+            Theme::dim().render(&result.issues_skipped_discussion_sync.to_string())
+        );
+    }
+}
+
+fn print_mr_project_summary(path: &str, result: &IngestMrProjectResult) {
+    let labels_str = if result.labels_created > 0 {
+        format!(", {} new labels", result.labels_created)
+    } else {
+        String::new()
+    };
+
+    let assignees_str = if result.assignees_linked > 0 || result.reviewers_linked > 0 {
+        format!(
+            ", {} assignees, {} reviewers",
+            result.assignees_linked, result.reviewers_linked
+        )
+    } else {
+        String::new()
+    };
+
+    println!(
+        "  {}: {} MRs fetched{}{}",
+        Theme::info().render(path),
+        result.mrs_upserted,
+        labels_str,
+        assignees_str
+    );
+
+    if result.mrs_synced_discussions > 0 {
+        let diffnotes_str = if result.diffnotes_count > 0 {
+            format!(" ({} diff notes)", result.diffnotes_count)
+        } else {
+            String::new()
+        };
+        println!(
+            "    {} MRs -> {} discussions, {} notes{}",
+            result.mrs_synced_discussions,
+            result.discussions_fetched,
+            result.notes_upserted,
+            diffnotes_str
+        );
+    }
+
+    if result.mrs_skipped_discussion_sync > 0 {
+        println!(
+            "    {} unchanged MRs (discussion sync skipped)",
+            Theme::dim().render(&result.mrs_skipped_discussion_sync.to_string())
+        );
+    }
+}
+
+#[derive(Serialize)]
+struct IngestJsonOutput {
+    ok: bool,
+    data: IngestJsonData,
+    meta: RobotMeta,
+}
+
+#[derive(Serialize)]
+struct IngestJsonData {
+    resource_type: String,
+    projects_synced: usize,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    issues: Option<IngestIssueStats>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    merge_requests: Option<IngestMrStats>,
+    labels_created: usize,
+    discussions_fetched: usize,
+    notes_upserted: usize,
+    resource_events_fetched: usize,
+    resource_events_failed: usize,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    status_enrichment: Vec<StatusEnrichmentJson>,
+    status_enrichment_errors: usize,
+}
+
+#[derive(Serialize)]
+struct StatusEnrichmentJson {
+    mode: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    reason: Option<String>,
+    seen: usize,
+    enriched: usize,
+    cleared: usize,
+    without_widget: usize,
+    partial_errors: usize,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    first_partial_error: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    error: Option<String>,
+}
+
+#[derive(Serialize)]
+struct IngestIssueStats {
+    fetched: usize,
+    upserted: usize,
+    synced_discussions: usize,
+    skipped_discussion_sync: usize,
+}
+
+#[derive(Serialize)]
+struct IngestMrStats {
+    fetched: usize,
+    upserted: usize,
+    synced_discussions: usize,
+    skipped_discussion_sync: usize,
+    assignees_linked: usize,
+    reviewers_linked: usize,
+    diffnotes_count: usize,
+}
+
+pub fn print_ingest_summary_json(result: &IngestResult, elapsed_ms: u64) {
+    let (issues, merge_requests) = if result.resource_type == "issues" {
+        (
+            Some(IngestIssueStats {
+                fetched: result.issues_fetched,
+                upserted: result.issues_upserted,
+                synced_discussions: result.issues_synced_discussions,
+                skipped_discussion_sync: result.issues_skipped_discussion_sync,
+            }),
+            None,
+        )
+    } else {
+        (
+            None,
+            Some(IngestMrStats {
+                fetched: result.mrs_fetched,
+                upserted: result.mrs_upserted,
+                synced_discussions: result.mrs_synced_discussions,
+                skipped_discussion_sync: result.mrs_skipped_discussion_sync,
+                assignees_linked: result.assignees_linked,
+                reviewers_linked: result.reviewers_linked,
+                diffnotes_count: result.diffnotes_count,
+            }),
+        )
+    };
+
+    let status_enrichment: Vec<StatusEnrichmentJson> = result
+        .status_enrichment_projects
+        .iter()
+        .map(|p| StatusEnrichmentJson {
+            mode: p.mode.clone(),
+            reason: p.reason.clone(),
+            seen: p.seen,
+            enriched: p.enriched,
+            cleared: p.cleared,
+            without_widget: p.without_widget,
+            partial_errors: p.partial_errors,
+            first_partial_error: p.first_partial_error.clone(),
+            error: p.error.clone(),
+        })
+        .collect();
+
+    let output = IngestJsonOutput {
+        ok: true,
+        data: IngestJsonData {
+            resource_type: result.resource_type.clone(),
+            projects_synced: result.projects_synced,
+            issues,
+            merge_requests,
+            labels_created: result.labels_created,
+            discussions_fetched: result.discussions_fetched,
+            notes_upserted: result.notes_upserted,
+            resource_events_fetched: result.resource_events_fetched,
+            resource_events_failed: result.resource_events_failed,
+            status_enrichment,
+            status_enrichment_errors: result.status_enrichment_errors,
+        },
+        meta: RobotMeta::new(elapsed_ms),
+    };
+
+    match serde_json::to_string(&output) {
+        Ok(json) => println!("{json}"),
+        Err(e) => eprintln!("Error serializing to JSON: {e}"),
+    }
+}
+
+pub fn print_ingest_summary(result: &IngestResult) {
+    println!();
+
+    if result.resource_type == "issues" {
+        println!(
+            "{}",
+            Theme::success().render(&format!(
+                "Total: {} issues, {} discussions, {} notes",
+                result.issues_upserted, result.discussions_fetched, result.notes_upserted
+            ))
+        );
+
+        if result.issues_skipped_discussion_sync > 0 {
+            println!(
+                "{}",
+                Theme::dim().render(&format!(
+                    "Skipped discussion sync for {} unchanged issues.",
+                    result.issues_skipped_discussion_sync
+                ))
+            );
+        }
+    } else {
+        let diffnotes_str = if result.diffnotes_count > 0 {
+            format!(" ({} diff notes)", result.diffnotes_count)
+        } else {
+            String::new()
+        };
+
+        println!(
+            "{}",
+            Theme::success().render(&format!(
+                "Total: {} MRs, {} discussions, {} notes{}",
+                result.mrs_upserted,
+                result.discussions_fetched,
+                result.notes_upserted,
+                diffnotes_str
+            ))
+        );
+
+        if result.mrs_skipped_discussion_sync > 0 {
+            println!(
+                "{}",
+                Theme::dim().render(&format!(
+                    "Skipped discussion sync for {} unchanged MRs.",
+                    result.mrs_skipped_discussion_sync
+                ))
+            );
+        }
+    }
+
+    if result.resource_events_fetched > 0 || result.resource_events_failed > 0 {
+        println!(
+            "  Resource events: {} fetched{}",
+            result.resource_events_fetched,
+            if result.resource_events_failed > 0 {
+                format!(", {} failed", result.resource_events_failed)
+            } else {
+                String::new()
+            }
+        );
+    }
+}
+
+pub fn print_dry_run_preview(preview: &DryRunPreview) {
+    println!(
+        "{} {}",
+        Theme::info().bold().render("Dry Run Preview"),
+        Theme::warning().render("(no changes will be made)")
+    );
+    println!();
+
+    let type_label = if preview.resource_type == "issues" {
+        "issues"
+    } else {
+        "merge requests"
+    };
+
+    println!("  Resource type: {}", Theme::bold().render(type_label));
+    println!(
+        "  Sync mode: {}",
+        if preview.sync_mode == "full" {
+            Theme::warning().render("full (all data will be re-fetched)")
+        } else {
+            Theme::success().render("incremental (only changes since last sync)")
+        }
+    );
+    println!("  Projects: {}", preview.projects.len());
+    println!();
+
+    println!("{}", Theme::info().bold().render("Projects to sync:"));
+    for project in &preview.projects {
+        let sync_status = if !project.has_cursor {
+            Theme::warning().render("initial sync")
+        } else {
+            Theme::success().render("incremental")
+        };
+
+        println!(
+            "  {} ({})",
+            Theme::bold().render(&project.path),
+            sync_status
+        );
+        println!("    Existing {}: {}", type_label, project.existing_count);
+
+        if let Some(ref last_synced) = project.last_synced {
+            println!("    Last synced: {}", last_synced);
+        }
+    }
+}
+
+#[derive(Serialize)]
+struct DryRunJsonOutput {
+    ok: bool,
+    dry_run: bool,
+    data: DryRunPreview,
+}
+
+pub fn print_dry_run_preview_json(preview: &DryRunPreview) {
+    let output = DryRunJsonOutput {
+        ok: true,
+        dry_run: true,
+        data: preview.clone(),
+    };
+
+    match serde_json::to_string(&output) {
+        Ok(json) => println!("{json}"),
+        Err(e) => eprintln!("Error serializing to JSON: {e}"),
+    }
+}

src/cli/commands/ingest/run.rs

@@ -1,27 +1,3 @@
-use std::sync::Arc;
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-use crate::cli::render::Theme;
-use indicatif::{ProgressBar, ProgressStyle};
-use rusqlite::Connection;
-use serde::Serialize;
-
-use tracing::Instrument;
-
-use crate::Config;
-use crate::cli::robot::RobotMeta;
-use crate::core::db::create_connection;
-use crate::core::error::{LoreError, Result};
-use crate::core::lock::{AppLock, LockOptions};
-use crate::core::paths::get_db_path;
-use crate::core::project::resolve_project;
-use crate::core::shutdown::ShutdownSignal;
-use crate::gitlab::GitLabClient;
-use crate::ingestion::{
-    IngestMrProjectResult, IngestProjectResult, ProgressEvent, ingest_project_issues_with_progress,
-    ingest_project_merge_requests_with_progress,
-};
-
 #[derive(Default)]
 pub struct IngestResult {
     pub resource_type: String,
@@ -295,11 +271,11 @@ async fn run_ingest_inner(
 
     let token = config.gitlab.resolve_token()?;
 
-    let client = GitLabClient::new(
+    let client = Arc::new(GitLabClient::new(
         &config.gitlab.base_url,
         &token,
         Some(config.sync.requests_per_second),
-    );
+    ));
 
     let projects = get_projects_to_sync(&conn, &config.projects, project_filter)?;
 
@@ -376,7 +352,7 @@ async fn run_ingest_inner(
 
     let project_results: Vec<Result<ProjectIngestOutcome>> = stream::iter(projects.iter())
         .map(|(local_project_id, gitlab_project_id, path)| {
-            let client = client.clone();
+            let client = Arc::clone(&client);
             let db_path = db_path.clone();
             let config = config.clone();
             let resource_type = resource_type_owned.clone();
@@ -783,334 +759,3 @@ fn get_projects_to_sync(
     Ok(projects)
 }
 
-fn print_issue_project_summary(path: &str, result: &IngestProjectResult) {
-    let labels_str = if result.labels_created > 0 {
-        format!(", {} new labels", result.labels_created)
-    } else {
-        String::new()
-    };
-
-    println!(
-        "  {}: {} issues fetched{}",
-        Theme::info().render(path),
-        result.issues_upserted,
-        labels_str
-    );
-
-    if result.issues_synced_discussions > 0 {
-        println!(
-            "    {} issues -> {} discussions, {} notes",
-            result.issues_synced_discussions, result.discussions_fetched, result.notes_upserted
-        );
-    }
-
-    if result.issues_skipped_discussion_sync > 0 {
-        println!(
-            "    {} unchanged issues (discussion sync skipped)",
-            Theme::dim().render(&result.issues_skipped_discussion_sync.to_string())
-        );
-    }
-}
-
-fn print_mr_project_summary(path: &str, result: &IngestMrProjectResult) {
-    let labels_str = if result.labels_created > 0 {
-        format!(", {} new labels", result.labels_created)
-    } else {
-        String::new()
-    };
-
-    let assignees_str = if result.assignees_linked > 0 || result.reviewers_linked > 0 {
-        format!(
-            ", {} assignees, {} reviewers",
-            result.assignees_linked, result.reviewers_linked
-        )
-    } else {
-        String::new()
-    };
-
-    println!(
-        "  {}: {} MRs fetched{}{}",
-        Theme::info().render(path),
-        result.mrs_upserted,
-        labels_str,
-        assignees_str
-    );
-
-    if result.mrs_synced_discussions > 0 {
-        let diffnotes_str = if result.diffnotes_count > 0 {
-            format!(" ({} diff notes)", result.diffnotes_count)
-        } else {
-            String::new()
-        };
-        println!(
-            "    {} MRs -> {} discussions, {} notes{}",
-            result.mrs_synced_discussions,
-            result.discussions_fetched,
-            result.notes_upserted,
-            diffnotes_str
-        );
-    }
-
-    if result.mrs_skipped_discussion_sync > 0 {
-        println!(
-            "    {} unchanged MRs (discussion sync skipped)",
-            Theme::dim().render(&result.mrs_skipped_discussion_sync.to_string())
-        );
-    }
-}
-
-#[derive(Serialize)]
-struct IngestJsonOutput {
-    ok: bool,
-    data: IngestJsonData,
-    meta: RobotMeta,
-}
-
-#[derive(Serialize)]
-struct IngestJsonData {
-    resource_type: String,
-    projects_synced: usize,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    issues: Option<IngestIssueStats>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    merge_requests: Option<IngestMrStats>,
-    labels_created: usize,
-    discussions_fetched: usize,
-    notes_upserted: usize,
-    resource_events_fetched: usize,
-    resource_events_failed: usize,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    status_enrichment: Vec<StatusEnrichmentJson>,
-    status_enrichment_errors: usize,
-}
-
-#[derive(Serialize)]
-struct StatusEnrichmentJson {
-    mode: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    reason: Option<String>,
-    seen: usize,
-    enriched: usize,
-    cleared: usize,
-    without_widget: usize,
-    partial_errors: usize,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    first_partial_error: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    error: Option<String>,
-}
-
-#[derive(Serialize)]
-struct IngestIssueStats {
-    fetched: usize,
-    upserted: usize,
-    synced_discussions: usize,
-    skipped_discussion_sync: usize,
-}
-
-#[derive(Serialize)]
-struct IngestMrStats {
-    fetched: usize,
-    upserted: usize,
-    synced_discussions: usize,
-    skipped_discussion_sync: usize,
-    assignees_linked: usize,
-    reviewers_linked: usize,
-    diffnotes_count: usize,
-}
-
-pub fn print_ingest_summary_json(result: &IngestResult, elapsed_ms: u64) {
-    let (issues, merge_requests) = if result.resource_type == "issues" {
-        (
-            Some(IngestIssueStats {
-                fetched: result.issues_fetched,
-                upserted: result.issues_upserted,
-                synced_discussions: result.issues_synced_discussions,
-                skipped_discussion_sync: result.issues_skipped_discussion_sync,
-            }),
-            None,
-        )
-    } else {
-        (
-            None,
-            Some(IngestMrStats {
-                fetched: result.mrs_fetched,
-                upserted: result.mrs_upserted,
-                synced_discussions: result.mrs_synced_discussions,
-                skipped_discussion_sync: result.mrs_skipped_discussion_sync,
-                assignees_linked: result.assignees_linked,
-                reviewers_linked: result.reviewers_linked,
-                diffnotes_count: result.diffnotes_count,
-            }),
-        )
-    };
-
-    let status_enrichment: Vec<StatusEnrichmentJson> = result
-        .status_enrichment_projects
-        .iter()
-        .map(|p| StatusEnrichmentJson {
-            mode: p.mode.clone(),
-            reason: p.reason.clone(),
-            seen: p.seen,
-            enriched: p.enriched,
-            cleared: p.cleared,
-            without_widget: p.without_widget,
-            partial_errors: p.partial_errors,
-            first_partial_error: p.first_partial_error.clone(),
-            error: p.error.clone(),
-        })
-        .collect();
-
-    let output = IngestJsonOutput {
-        ok: true,
-        data: IngestJsonData {
-            resource_type: result.resource_type.clone(),
-            projects_synced: result.projects_synced,
-            issues,
-            merge_requests,
-            labels_created: result.labels_created,
-            discussions_fetched: result.discussions_fetched,
-            notes_upserted: result.notes_upserted,
-            resource_events_fetched: result.resource_events_fetched,
-            resource_events_failed: result.resource_events_failed,
-            status_enrichment,
-            status_enrichment_errors: result.status_enrichment_errors,
-        },
-        meta: RobotMeta { elapsed_ms },
-    };
-
-    match serde_json::to_string(&output) {
-        Ok(json) => println!("{json}"),
-        Err(e) => eprintln!("Error serializing to JSON: {e}"),
-    }
-}
-
-pub fn print_ingest_summary(result: &IngestResult) {
-    println!();
-
-    if result.resource_type == "issues" {
-        println!(
-            "{}",
-            Theme::success().render(&format!(
-                "Total: {} issues, {} discussions, {} notes",
-                result.issues_upserted, result.discussions_fetched, result.notes_upserted
-            ))
-        );
-
-        if result.issues_skipped_discussion_sync > 0 {
-            println!(
-                "{}",
-                Theme::dim().render(&format!(
-                    "Skipped discussion sync for {} unchanged issues.",
-                    result.issues_skipped_discussion_sync
-                ))
-            );
-        }
-    } else {
-        let diffnotes_str = if result.diffnotes_count > 0 {
-            format!(" ({} diff notes)", result.diffnotes_count)
-        } else {
-            String::new()
-        };
-
-        println!(
-            "{}",
-            Theme::success().render(&format!(
-                "Total: {} MRs, {} discussions, {} notes{}",
-                result.mrs_upserted,
-                result.discussions_fetched,
-                result.notes_upserted,
-                diffnotes_str
-            ))
-        );
-
-        if result.mrs_skipped_discussion_sync > 0 {
-            println!(
-                "{}",
-                Theme::dim().render(&format!(
-                    "Skipped discussion sync for {} unchanged MRs.",
-                    result.mrs_skipped_discussion_sync
-                ))
-            );
-        }
-    }
-
-    if result.resource_events_fetched > 0 || result.resource_events_failed > 0 {
-        println!(
-            "  Resource events: {} fetched{}",
-            result.resource_events_fetched,
-            if result.resource_events_failed > 0 {
-                format!(", {} failed", result.resource_events_failed)
-            } else {
-                String::new()
-            }
-        );
-    }
-}
-
-pub fn print_dry_run_preview(preview: &DryRunPreview) {
-    println!(
-        "{} {}",
-        Theme::info().bold().render("Dry Run Preview"),
-        Theme::warning().render("(no changes will be made)")
-    );
-    println!();
-
-    let type_label = if preview.resource_type == "issues" {
-        "issues"
-    } else {
-        "merge requests"
-    };
-
-    println!("  Resource type: {}", Theme::bold().render(type_label));
-    println!(
-        "  Sync mode: {}",
-        if preview.sync_mode == "full" {
-            Theme::warning().render("full (all data will be re-fetched)")
-        } else {
-            Theme::success().render("incremental (only changes since last sync)")
-        }
-    );
-    println!("  Projects: {}", preview.projects.len());
-    println!();
-
-    println!("{}", Theme::info().bold().render("Projects to sync:"));
-    for project in &preview.projects {
-        let sync_status = if !project.has_cursor {
-            Theme::warning().render("initial sync")
-        } else {
-            Theme::success().render("incremental")
-        };
-
-        println!(
-            "  {} ({})",
-            Theme::bold().render(&project.path),
-            sync_status
-        );
-        println!("    Existing {}: {}", type_label, project.existing_count);
-
-        if let Some(ref last_synced) = project.last_synced {
-            println!("    Last synced: {}", last_synced);
-        }
-    }
-}
-
-#[derive(Serialize)]
-struct DryRunJsonOutput {
-    ok: bool,
-    dry_run: bool,
-    data: DryRunPreview,
-}
-
-pub fn print_dry_run_preview_json(preview: &DryRunPreview) {
-    let output = DryRunJsonOutput {
-        ok: true,
-        dry_run: true,
-        data: preview.clone(),
-    };
-
-    match serde_json::to_string(&output) {
-        Ok(json) => println!("{json}"),
-        Err(e) => eprintln!("Error serializing to JSON: {e}"),
-    }
-}

src/cli/commands/init.rs

@@ -38,6 +38,159 @@ pub struct ProjectInfo {
     pub name: String,
 }
 
+// ── Refresh types ──
+
+pub struct RefreshOptions {
+    pub config_path: Option<String>,
+    pub non_interactive: bool,
+}
+
+pub struct RefreshResult {
+    pub user: UserInfo,
+    pub projects_registered: Vec<ProjectInfo>,
+    pub projects_failed: Vec<ProjectFailure>,
+    pub orphans_found: Vec<String>,
+    pub orphans_deleted: Vec<String>,
+}
+
+pub struct ProjectFailure {
+    pub path: String,
+    pub error: String,
+}
+
+/// Re-read existing config and register any new projects in the database.
+/// Does NOT modify the config file.
+pub async fn run_init_refresh(options: RefreshOptions) -> Result<RefreshResult> {
+    let config_path = get_config_path(options.config_path.as_deref());
+
+    if !config_path.exists() {
+        return Err(LoreError::ConfigNotFound {
+            path: config_path.display().to_string(),
+        });
+    }
+
+    let config = Config::load(options.config_path.as_deref())?;
+    let token = config.gitlab.resolve_token()?;
+    let client = GitLabClient::new(&config.gitlab.base_url, &token, None);
+
+    // Validate auth
+    let gitlab_user = client.get_current_user().await.map_err(|e| {
+        if matches!(e, LoreError::GitLabAuthFailed) {
+            LoreError::Other(format!(
+                "Authentication failed for {}",
+                config.gitlab.base_url
+            ))
+        } else {
+            e
+        }
+    })?;
+
+    let user = UserInfo {
+        username: gitlab_user.username,
+        name: gitlab_user.name,
+    };
+
+    // Validate each project
+    let mut validated_projects: Vec<(ProjectInfo, GitLabProject)> = Vec::new();
+    let mut failed_projects: Vec<ProjectFailure> = Vec::new();
+
+    for project_config in &config.projects {
+        match client.get_project(&project_config.path).await {
+            Ok(project) => {
+                validated_projects.push((
+                    ProjectInfo {
+                        path: project_config.path.clone(),
+                        name: project.name.clone().unwrap_or_else(|| {
+                            project_config
+                                .path
+                                .split('/')
+                                .next_back()
+                                .unwrap_or(&project_config.path)
+                                .to_string()
+                        }),
+                    },
+                    project,
+                ));
+            }
+            Err(e) => {
+                let error_msg = if matches!(e, LoreError::GitLabNotFound { .. }) {
+                    "not found".to_string()
+                } else {
+                    e.to_string()
+                };
+                failed_projects.push(ProjectFailure {
+                    path: project_config.path.clone(),
+                    error: error_msg,
+                });
+            }
+        }
+    }
+
+    // Open database
+    let data_dir = get_data_dir();
+    let db_path = data_dir.join("lore.db");
+    let conn = create_connection(&db_path)?;
+    run_migrations(&conn)?;
+
+    // Find orphans: projects in DB but not in config
+    let config_paths: std::collections::HashSet<&str> =
+        config.projects.iter().map(|p| p.path.as_str()).collect();
+
+    let mut stmt = conn.prepare("SELECT path_with_namespace FROM projects")?;
+    let db_projects: Vec<String> = stmt
+        .query_map([], |row| row.get(0))?
+        .filter_map(|r| r.ok())
+        .collect();
+
+    let orphans: Vec<String> = db_projects
+        .into_iter()
+        .filter(|p| !config_paths.contains(p.as_str()))
+        .collect();
+
+    // Upsert validated projects
+    for (_, gitlab_project) in &validated_projects {
+        conn.execute(
+            "INSERT INTO projects (gitlab_project_id, path_with_namespace, default_branch, web_url)
+             VALUES (?, ?, ?, ?)
+             ON CONFLICT(gitlab_project_id) DO UPDATE SET
+               path_with_namespace = excluded.path_with_namespace,
+               default_branch = excluded.default_branch,
+               web_url = excluded.web_url",
+            (
+                gitlab_project.id,
+                &gitlab_project.path_with_namespace,
+                &gitlab_project.default_branch,
+                &gitlab_project.web_url,
+            ),
+        )?;
+    }
+
+    Ok(RefreshResult {
+        user,
+        projects_registered: validated_projects.into_iter().map(|(p, _)| p).collect(),
+        projects_failed: failed_projects,
+        orphans_found: orphans,
+        orphans_deleted: Vec::new(), // Caller handles deletion after user prompt
+    })
+}
+
+/// Delete orphan projects from the database.
+pub fn delete_orphan_projects(config_path: Option<&str>, orphans: &[String]) -> Result<usize> {
+    let data_dir = get_data_dir();
+    let db_path = data_dir.join("lore.db");
+    let conn = create_connection(&db_path)?;
+
+    let _ = config_path; // Reserved for future use
+
+    let mut deleted = 0;
+    for path in orphans {
+        let rows = conn.execute("DELETE FROM projects WHERE path_with_namespace = ?", [path])?;
+        deleted += rows;
+    }
+
+    Ok(deleted)
+}
+
 pub async fn run_init(inputs: InitInputs, options: InitOptions) -> Result<InitResult> {
     let config_path = get_config_path(options.config_path.as_deref());
     let data_dir = get_data_dir();

src/cli/commands/list/issues.rs

@@ -0,0 +1,443 @@
+use crate::cli::render::{self, Align, Icons, StyledCell, Table as LoreTable, Theme};
+use rusqlite::Connection;
+use serde::Serialize;
+
+use crate::Config;
+use crate::cli::robot::{expand_fields_preset, filter_fields};
+use crate::core::db::create_connection;
+use crate::core::error::{LoreError, Result};
+use crate::core::paths::get_db_path;
+use crate::core::project::resolve_project;
+use crate::core::time::{ms_to_iso, parse_since};
+
+use super::render_helpers::{format_assignees, format_discussions};
+
+#[derive(Debug, Serialize)]
+pub struct IssueListRow {
+    pub iid: i64,
+    pub title: String,
+    pub state: String,
+    pub author_username: String,
+    pub created_at: i64,
+    pub updated_at: i64,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub web_url: Option<String>,
+    pub project_path: String,
+    pub labels: Vec<String>,
+    pub assignees: Vec<String>,
+    pub discussion_count: i64,
+    pub unresolved_count: i64,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_name: Option<String>,
+    #[serde(skip_serializing)]
+    pub status_category: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_color: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_icon_name: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_synced_at: Option<i64>,
+}
+
+#[derive(Serialize)]
+pub struct IssueListRowJson {
+    pub iid: i64,
+    pub title: String,
+    pub state: String,
+    pub author_username: String,
+    pub labels: Vec<String>,
+    pub assignees: Vec<String>,
+    pub discussion_count: i64,
+    pub unresolved_count: i64,
+    pub created_at_iso: String,
+    pub updated_at_iso: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub web_url: Option<String>,
+    pub project_path: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_name: Option<String>,
+    #[serde(skip_serializing)]
+    pub status_category: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_color: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_icon_name: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status_synced_at_iso: Option<String>,
+}
+
+impl From<&IssueListRow> for IssueListRowJson {
+    fn from(row: &IssueListRow) -> Self {
+        Self {
+            iid: row.iid,
+            title: row.title.clone(),
+            state: row.state.clone(),
+            author_username: row.author_username.clone(),
+            labels: row.labels.clone(),
+            assignees: row.assignees.clone(),
+            discussion_count: row.discussion_count,
+            unresolved_count: row.unresolved_count,
+            created_at_iso: ms_to_iso(row.created_at),
+            updated_at_iso: ms_to_iso(row.updated_at),
+            web_url: row.web_url.clone(),
+            project_path: row.project_path.clone(),
+            status_name: row.status_name.clone(),
+            status_category: row.status_category.clone(),
+            status_color: row.status_color.clone(),
+            status_icon_name: row.status_icon_name.clone(),
+            status_synced_at_iso: row.status_synced_at.map(ms_to_iso),
+        }
+    }
+}
+
+#[derive(Serialize)]
+pub struct ListResult {
+    pub issues: Vec<IssueListRow>,
+    pub total_count: usize,
+    pub available_statuses: Vec<String>,
+}
+
+#[derive(Serialize)]
+pub struct ListResultJson {
+    pub issues: Vec<IssueListRowJson>,
+    pub total_count: usize,
+    pub showing: usize,
+}
+
+impl From<&ListResult> for ListResultJson {
+    fn from(result: &ListResult) -> Self {
+        Self {
+            issues: result.issues.iter().map(IssueListRowJson::from).collect(),
+            total_count: result.total_count,
+            showing: result.issues.len(),
+        }
+    }
+}
+
+pub struct ListFilters<'a> {
+    pub limit: usize,
+    pub project: Option<&'a str>,
+    pub state: Option<&'a str>,
+    pub author: Option<&'a str>,
+    pub assignee: Option<&'a str>,
+    pub labels: Option<&'a [String]>,
+    pub milestone: Option<&'a str>,
+    pub since: Option<&'a str>,
+    pub due_before: Option<&'a str>,
+    pub has_due_date: bool,
+    pub statuses: &'a [String],
+    pub sort: &'a str,
+    pub order: &'a str,
+}
+
+pub fn run_list_issues(config: &Config, filters: ListFilters) -> Result<ListResult> {
+    let db_path = get_db_path(config.storage.db_path.as_deref());
+    let conn = create_connection(&db_path)?;
+
+    let mut result = query_issues(&conn, &filters)?;
+    result.available_statuses = query_available_statuses(&conn)?;
+    Ok(result)
+}
+
+fn query_available_statuses(conn: &Connection) -> Result<Vec<String>> {
+    let mut stmt = conn.prepare(
+        "SELECT DISTINCT status_name FROM issues WHERE status_name IS NOT NULL ORDER BY status_name",
+    )?;
+    let statuses = stmt
+        .query_map([], |row| row.get::<_, String>(0))?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+    Ok(statuses)
+}
+
+fn query_issues(conn: &Connection, filters: &ListFilters) -> Result<ListResult> {
+    let mut where_clauses = Vec::new();
+    let mut params: Vec<Box<dyn rusqlite::ToSql>> = Vec::new();
+
+    if let Some(project) = filters.project {
+        let project_id = resolve_project(conn, project)?;
+        where_clauses.push("i.project_id = ?");
+        params.push(Box::new(project_id));
+    }
+
+    if let Some(state) = filters.state
+        && state != "all"
+    {
+        where_clauses.push("i.state = ?");
+        params.push(Box::new(state.to_string()));
+    }
+
+    if let Some(author) = filters.author {
+        let username = author.strip_prefix('@').unwrap_or(author);
+        where_clauses.push("i.author_username = ?");
+        params.push(Box::new(username.to_string()));
+    }
+
+    if let Some(assignee) = filters.assignee {
+        let username = assignee.strip_prefix('@').unwrap_or(assignee);
+        where_clauses.push(
+            "EXISTS (SELECT 1 FROM issue_assignees ia
+             WHERE ia.issue_id = i.id AND ia.username = ?)",
+        );
+        params.push(Box::new(username.to_string()));
+    }
+
+    if let Some(since_str) = filters.since {
+        let cutoff_ms = parse_since(since_str).ok_or_else(|| {
+            LoreError::Other(format!(
+                "Invalid --since value '{}'. Use relative (7d, 2w, 1m) or absolute (YYYY-MM-DD) format.",
+                since_str
+            ))
+        })?;
+        where_clauses.push("i.updated_at >= ?");
+        params.push(Box::new(cutoff_ms));
+    }
+
+    if let Some(labels) = filters.labels {
+        for label in labels {
+            where_clauses.push(
+                "EXISTS (SELECT 1 FROM issue_labels il
+                 JOIN labels l ON il.label_id = l.id
+                 WHERE il.issue_id = i.id AND l.name = ?)",
+            );
+            params.push(Box::new(label.clone()));
+        }
+    }
+
+    if let Some(milestone) = filters.milestone {
+        where_clauses.push("i.milestone_title = ?");
+        params.push(Box::new(milestone.to_string()));
+    }
+
+    if let Some(due_before) = filters.due_before {
+        where_clauses.push("i.due_date IS NOT NULL AND i.due_date <= ?");
+        params.push(Box::new(due_before.to_string()));
+    }
+
+    if filters.has_due_date {
+        where_clauses.push("i.due_date IS NOT NULL");
+    }
+
+    let status_in_clause;
+    if filters.statuses.len() == 1 {
+        where_clauses.push("i.status_name = ? COLLATE NOCASE");
+        params.push(Box::new(filters.statuses[0].clone()));
+    } else if filters.statuses.len() > 1 {
+        let placeholders: Vec<&str> = filters.statuses.iter().map(|_| "?").collect();
+        status_in_clause = format!(
+            "i.status_name COLLATE NOCASE IN ({})",
+            placeholders.join(", ")
+        );
+        where_clauses.push(&status_in_clause);
+        for s in filters.statuses {
+            params.push(Box::new(s.clone()));
+        }
+    }
+
+    let where_sql = if where_clauses.is_empty() {
+        String::new()
+    } else {
+        format!("WHERE {}", where_clauses.join(" AND "))
+    };
+
+    let count_sql = format!(
+        "SELECT COUNT(*) FROM issues i
+         JOIN projects p ON i.project_id = p.id
+         {where_sql}"
+    );
+
+    let param_refs: Vec<&dyn rusqlite::ToSql> = params.iter().map(|p| p.as_ref()).collect();
+    let total_count: i64 = conn.query_row(&count_sql, param_refs.as_slice(), |row| row.get(0))?;
+    let total_count = total_count as usize;
+
+    let sort_column = match filters.sort {
+        "created" => "i.created_at",
+        "iid" => "i.iid",
+        _ => "i.updated_at",
+    };
+    let order = if filters.order == "asc" {
+        "ASC"
+    } else {
+        "DESC"
+    };
+
+    let query_sql = format!(
+        "SELECT
+            i.iid,
+            i.title,
+            i.state,
+            i.author_username,
+            i.created_at,
+            i.updated_at,
+            i.web_url,
+            p.path_with_namespace,
+            (SELECT GROUP_CONCAT(l.name, X'1F')
+             FROM issue_labels il
+             JOIN labels l ON il.label_id = l.id
+             WHERE il.issue_id = i.id) AS labels_csv,
+            (SELECT GROUP_CONCAT(ia.username, X'1F')
+             FROM issue_assignees ia
+             WHERE ia.issue_id = i.id) AS assignees_csv,
+            (SELECT COUNT(*) FROM discussions d
+             WHERE d.issue_id = i.id) AS discussion_count,
+            (SELECT COUNT(*) FROM discussions d
+             WHERE d.issue_id = i.id AND d.resolvable = 1 AND d.resolved = 0) AS unresolved_count,
+            i.status_name,
+            i.status_category,
+            i.status_color,
+            i.status_icon_name,
+            i.status_synced_at
+         FROM issues i
+         JOIN projects p ON i.project_id = p.id
+         {where_sql}
+         ORDER BY {sort_column} {order}
+         LIMIT ?"
+    );
+
+    params.push(Box::new(filters.limit as i64));
+    let param_refs: Vec<&dyn rusqlite::ToSql> = params.iter().map(|p| p.as_ref()).collect();
+
+    let mut stmt = conn.prepare(&query_sql)?;
+    let issues: Vec<IssueListRow> = stmt
+        .query_map(param_refs.as_slice(), |row| {
+            let labels_csv: Option<String> = row.get(8)?;
+            let labels = labels_csv
+                .map(|s| s.split('\x1F').map(String::from).collect())
+                .unwrap_or_default();
+
+            let assignees_csv: Option<String> = row.get(9)?;
+            let assignees = assignees_csv
+                .map(|s| s.split('\x1F').map(String::from).collect())
+                .unwrap_or_default();
+
+            Ok(IssueListRow {
+                iid: row.get(0)?,
+                title: row.get(1)?,
+                state: row.get(2)?,
+                author_username: row.get(3)?,
+                created_at: row.get(4)?,
+                updated_at: row.get(5)?,
+                web_url: row.get(6)?,
+                project_path: row.get(7)?,
+                labels,
+                assignees,
+                discussion_count: row.get(10)?,
+                unresolved_count: row.get(11)?,
+                status_name: row.get(12)?,
+                status_category: row.get(13)?,
+                status_color: row.get(14)?,
+                status_icon_name: row.get(15)?,
+                status_synced_at: row.get(16)?,
+            })
+        })?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    Ok(ListResult {
+        issues,
+        total_count,
+        available_statuses: Vec::new(),
+    })
+}
+
+pub fn print_list_issues(result: &ListResult) {
+    if result.issues.is_empty() {
+        println!("No issues found.");
+        return;
+    }
+
+    println!(
+        "{}  {} of {}\n",
+        Theme::bold().render("Issues"),
+        result.issues.len(),
+        result.total_count
+    );
+
+    let has_any_status = result.issues.iter().any(|i| i.status_name.is_some());
+
+    let mut headers = vec!["IID", "Title", "State"];
+    if has_any_status {
+        headers.push("Status");
+    }
+    headers.extend(["Assignee", "Labels", "Disc", "Updated"]);
+
+    let mut table = LoreTable::new().headers(&headers).align(0, Align::Right);
+
+    for issue in &result.issues {
+        let title = render::truncate(&issue.title, 45);
+        let relative_time = render::format_relative_time_compact(issue.updated_at);
+        let labels = render::format_labels_bare(&issue.labels, 2);
+        let assignee = format_assignees(&issue.assignees);
+        let discussions = format_discussions(issue.discussion_count, issue.unresolved_count);
+
+        let (icon, state_style) = if issue.state == "opened" {
+            (Icons::issue_opened(), Theme::success())
+        } else {
+            (Icons::issue_closed(), Theme::dim())
+        };
+        let state_cell = StyledCell::styled(format!("{icon} {}", issue.state), state_style);
+
+        let mut row = vec![
+            StyledCell::styled(format!("#{}", issue.iid), Theme::info()),
+            StyledCell::plain(title),
+            state_cell,
+        ];
+        if has_any_status {
+            match &issue.status_name {
+                Some(status) => {
+                    row.push(StyledCell::plain(render::style_with_hex(
+                        status,
+                        issue.status_color.as_deref(),
+                    )));
+                }
+                None => {
+                    row.push(StyledCell::plain(""));
+                }
+            }
+        }
+        row.extend([
+            StyledCell::styled(assignee, Theme::accent()),
+            StyledCell::styled(labels, Theme::warning()),
+            discussions,
+            StyledCell::styled(relative_time, Theme::dim()),
+        ]);
+        table.add_row(row);
+    }
+
+    println!("{}", table.render());
+}
+
+pub fn print_list_issues_json(result: &ListResult, elapsed_ms: u64, fields: Option<&[String]>) {
+    let json_result = ListResultJson::from(result);
+    let output = serde_json::json!({
+        "ok": true,
+        "data": json_result,
+        "meta": {
+            "elapsed_ms": elapsed_ms,
+            "available_statuses": result.available_statuses,
+        },
+    });
+    let mut output = output;
+    if let Some(f) = fields {
+        let expanded = expand_fields_preset(f, "issues");
+        filter_fields(&mut output, "issues", &expanded);
+    }
+    match serde_json::to_string(&output) {
+        Ok(json) => println!("{json}"),
+        Err(e) => eprintln!("Error serializing to JSON: {e}"),
+    }
+}
+
+pub fn open_issue_in_browser(result: &ListResult) -> Option<String> {
+    let first_issue = result.issues.first()?;
+    let url = first_issue.web_url.as_ref()?;
+
+    match open::that(url) {
+        Ok(()) => {
+            println!("Opened: {url}");
+            Some(url.clone())
+        }
+        Err(e) => {
+            eprintln!("Failed to open browser: {e}");
+            None
+        }
+    }
+}

src/cli/commands/list/list_tests.rs

@@ -1,6 +1,9 @@
 use super::*;
 use crate::cli::render;
 use crate::core::time::now_ms;
+use crate::test_support::{
+    insert_project as insert_test_project, setup_test_db as setup_note_test_db, test_config,
+};
 
 #[test]
 fn truncate_leaves_short_strings_alone() {
@@ -82,34 +85,6 @@ fn format_discussions_with_unresolved() {
 // Note query layer tests
 // -----------------------------------------------------------------------
 
-use std::path::Path;
-
-use crate::core::config::{
-    Config, EmbeddingConfig, GitLabConfig, LoggingConfig, ProjectConfig, ScoringConfig,
-    StorageConfig, SyncConfig,
-};
-use crate::core::db::{create_connection, run_migrations};
-
-fn test_config(default_project: Option<&str>) -> Config {
-    Config {
-        gitlab: GitLabConfig {
-            base_url: "https://gitlab.example.com".to_string(),
-            token_env_var: "GITLAB_TOKEN".to_string(),
-            token: None,
-            username: None,
-        },
-        projects: vec![ProjectConfig {
-            path: "group/project".to_string(),
-        }],
-        default_project: default_project.map(String::from),
-        sync: SyncConfig::default(),
-        storage: StorageConfig::default(),
-        embedding: EmbeddingConfig::default(),
-        logging: LoggingConfig::default(),
-        scoring: ScoringConfig::default(),
-    }
-}
-
 fn default_note_filters() -> NoteListFilters {
     NoteListFilters {
         limit: 50,
@@ -132,26 +107,6 @@ fn default_note_filters() -> NoteListFilters {
     }
 }
 
-fn setup_note_test_db() -> Connection {
-    let conn = create_connection(Path::new(":memory:")).unwrap();
-    run_migrations(&conn).unwrap();
-    conn
-}
-
-fn insert_test_project(conn: &Connection, id: i64, path: &str) {
-    conn.execute(
-        "INSERT INTO projects (id, gitlab_project_id, path_with_namespace, web_url)
-         VALUES (?1, ?2, ?3, ?4)",
-        rusqlite::params![
-            id,
-            id * 100,
-            path,
-            format!("https://gitlab.example.com/{path}")
-        ],
-    )
-    .unwrap();
-}
-
 fn insert_test_issue(conn: &Connection, id: i64, project_id: i64, iid: i64, title: &str) {
     conn.execute(
         "INSERT INTO issues (id, gitlab_id, project_id, iid, title, state, author_username,

src/cli/commands/list/mod.rs

@@ -0,0 +1,28 @@
+mod issues;
+mod mrs;
+mod notes;
+mod render_helpers;
+
+pub use issues::{
+    IssueListRow, IssueListRowJson, ListFilters, ListResult, ListResultJson, open_issue_in_browser,
+    print_list_issues, print_list_issues_json, run_list_issues,
+};
+pub use mrs::{
+    MrListFilters, MrListResult, MrListResultJson, MrListRow, MrListRowJson, open_mr_in_browser,
+    print_list_mrs, print_list_mrs_json, run_list_mrs,
+};
+pub use notes::{
+    NoteListFilters, NoteListResult, NoteListResultJson, NoteListRow, NoteListRowJson,
+    print_list_notes, print_list_notes_json, query_notes,
+};
+
+#[cfg(test)]
+use crate::core::path_resolver::escape_like as note_escape_like;
+#[cfg(test)]
+use render_helpers::{format_discussions, format_note_parent, format_note_type, truncate_body};
+#[cfg(test)]
+use rusqlite::Connection;
+
+#[cfg(test)]
+#[path = "list_tests.rs"]
+mod tests;

src/cli/commands/list/mrs.rs

@@ -0,0 +1,404 @@
+use crate::cli::render::{self, Align, Icons, StyledCell, Table as LoreTable, Theme};
+use rusqlite::Connection;
+use serde::Serialize;
+
+use crate::Config;
+use crate::cli::robot::{RobotMeta, expand_fields_preset, filter_fields};
+use crate::core::db::create_connection;
+use crate::core::error::{LoreError, Result};
+use crate::core::paths::get_db_path;
+use crate::core::project::resolve_project;
+use crate::core::time::{ms_to_iso, parse_since};
+
+use super::render_helpers::{format_branches, format_discussions};
+
+#[derive(Debug, Serialize)]
+pub struct MrListRow {
+    pub iid: i64,
+    pub title: String,
+    pub state: String,
+    pub draft: bool,
+    pub author_username: String,
+    pub source_branch: String,
+    pub target_branch: String,
+    pub created_at: i64,
+    pub updated_at: i64,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub web_url: Option<String>,
+    pub project_path: String,
+    pub labels: Vec<String>,
+    pub assignees: Vec<String>,
+    pub reviewers: Vec<String>,
+    pub discussion_count: i64,
+    pub unresolved_count: i64,
+}
+
+#[derive(Serialize)]
+pub struct MrListRowJson {
+    pub iid: i64,
+    pub title: String,
+    pub state: String,
+    pub draft: bool,
+    pub author_username: String,
+    pub source_branch: String,
+    pub target_branch: String,
+    pub labels: Vec<String>,
+    pub assignees: Vec<String>,
+    pub reviewers: Vec<String>,
+    pub discussion_count: i64,
+    pub unresolved_count: i64,
+    pub created_at_iso: String,
+    pub updated_at_iso: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub web_url: Option<String>,
+    pub project_path: String,
+}
+
+impl From<&MrListRow> for MrListRowJson {
+    fn from(row: &MrListRow) -> Self {
+        Self {
+            iid: row.iid,
+            title: row.title.clone(),
+            state: row.state.clone(),
+            draft: row.draft,
+            author_username: row.author_username.clone(),
+            source_branch: row.source_branch.clone(),
+            target_branch: row.target_branch.clone(),
+            labels: row.labels.clone(),
+            assignees: row.assignees.clone(),
+            reviewers: row.reviewers.clone(),
+            discussion_count: row.discussion_count,
+            unresolved_count: row.unresolved_count,
+            created_at_iso: ms_to_iso(row.created_at),
+            updated_at_iso: ms_to_iso(row.updated_at),
+            web_url: row.web_url.clone(),
+            project_path: row.project_path.clone(),
+        }
+    }
+}
+
+#[derive(Serialize)]
+pub struct MrListResult {
+    pub mrs: Vec<MrListRow>,
+    pub total_count: usize,
+}
+
+#[derive(Serialize)]
+pub struct MrListResultJson {
+    pub mrs: Vec<MrListRowJson>,
+    pub total_count: usize,
+    pub showing: usize,
+}
+
+impl From<&MrListResult> for MrListResultJson {
+    fn from(result: &MrListResult) -> Self {
+        Self {
+            mrs: result.mrs.iter().map(MrListRowJson::from).collect(),
+            total_count: result.total_count,
+            showing: result.mrs.len(),
+        }
+    }
+}
+
+pub struct MrListFilters<'a> {
+    pub limit: usize,
+    pub project: Option<&'a str>,
+    pub state: Option<&'a str>,
+    pub author: Option<&'a str>,
+    pub assignee: Option<&'a str>,
+    pub reviewer: Option<&'a str>,
+    pub labels: Option<&'a [String]>,
+    pub since: Option<&'a str>,
+    pub draft: bool,
+    pub no_draft: bool,
+    pub target_branch: Option<&'a str>,
+    pub source_branch: Option<&'a str>,
+    pub sort: &'a str,
+    pub order: &'a str,
+}
+
+pub fn run_list_mrs(config: &Config, filters: MrListFilters) -> Result<MrListResult> {
+    let db_path = get_db_path(config.storage.db_path.as_deref());
+    let conn = create_connection(&db_path)?;
+
+    let result = query_mrs(&conn, &filters)?;
+    Ok(result)
+}
+
+fn query_mrs(conn: &Connection, filters: &MrListFilters) -> Result<MrListResult> {
+    let mut where_clauses = Vec::new();
+    let mut params: Vec<Box<dyn rusqlite::ToSql>> = Vec::new();
+
+    if let Some(project) = filters.project {
+        let project_id = resolve_project(conn, project)?;
+        where_clauses.push("m.project_id = ?");
+        params.push(Box::new(project_id));
+    }
+
+    if let Some(state) = filters.state
+        && state != "all"
+    {
+        where_clauses.push("m.state = ?");
+        params.push(Box::new(state.to_string()));
+    }
+
+    if let Some(author) = filters.author {
+        let username = author.strip_prefix('@').unwrap_or(author);
+        where_clauses.push("m.author_username = ?");
+        params.push(Box::new(username.to_string()));
+    }
+
+    if let Some(assignee) = filters.assignee {
+        let username = assignee.strip_prefix('@').unwrap_or(assignee);
+        where_clauses.push(
+            "EXISTS (SELECT 1 FROM mr_assignees ma
+             WHERE ma.merge_request_id = m.id AND ma.username = ?)",
+        );
+        params.push(Box::new(username.to_string()));
+    }
+
+    if let Some(reviewer) = filters.reviewer {
+        let username = reviewer.strip_prefix('@').unwrap_or(reviewer);
+        where_clauses.push(
+            "EXISTS (SELECT 1 FROM mr_reviewers mr
+             WHERE mr.merge_request_id = m.id AND mr.username = ?)",
+        );
+        params.push(Box::new(username.to_string()));
+    }
+
+    if let Some(since_str) = filters.since {
+        let cutoff_ms = parse_since(since_str).ok_or_else(|| {
+            LoreError::Other(format!(
+                "Invalid --since value '{}'. Use relative (7d, 2w, 1m) or absolute (YYYY-MM-DD) format.",
+                since_str
+            ))
+        })?;
+        where_clauses.push("m.updated_at >= ?");
+        params.push(Box::new(cutoff_ms));
+    }
+
+    if let Some(labels) = filters.labels {
+        for label in labels {
+            where_clauses.push(
+                "EXISTS (SELECT 1 FROM mr_labels ml
+                 JOIN labels l ON ml.label_id = l.id
+                 WHERE ml.merge_request_id = m.id AND l.name = ?)",
+            );
+            params.push(Box::new(label.clone()));
+        }
+    }
+
+    if filters.draft {
+        where_clauses.push("m.draft = 1");
+    } else if filters.no_draft {
+        where_clauses.push("m.draft = 0");
+    }
+
+    if let Some(target_branch) = filters.target_branch {
+        where_clauses.push("m.target_branch = ?");
+        params.push(Box::new(target_branch.to_string()));
+    }
+
+    if let Some(source_branch) = filters.source_branch {
+        where_clauses.push("m.source_branch = ?");
+        params.push(Box::new(source_branch.to_string()));
+    }
+
+    let where_sql = if where_clauses.is_empty() {
+        String::new()
+    } else {
+        format!("WHERE {}", where_clauses.join(" AND "))
+    };
+
+    let count_sql = format!(
+        "SELECT COUNT(*) FROM merge_requests m
+         JOIN projects p ON m.project_id = p.id
+         {where_sql}"
+    );
+
+    let param_refs: Vec<&dyn rusqlite::ToSql> = params.iter().map(|p| p.as_ref()).collect();
+    let total_count: i64 = conn.query_row(&count_sql, param_refs.as_slice(), |row| row.get(0))?;
+    let total_count = total_count as usize;
+
+    let sort_column = match filters.sort {
+        "created" => "m.created_at",
+        "iid" => "m.iid",
+        _ => "m.updated_at",
+    };
+    let order = if filters.order == "asc" {
+        "ASC"
+    } else {
+        "DESC"
+    };
+
+    let query_sql = format!(
+        "SELECT
+            m.iid,
+            m.title,
+            m.state,
+            m.draft,
+            m.author_username,
+            m.source_branch,
+            m.target_branch,
+            m.created_at,
+            m.updated_at,
+            m.web_url,
+            p.path_with_namespace,
+            (SELECT GROUP_CONCAT(l.name, X'1F')
+             FROM mr_labels ml
+             JOIN labels l ON ml.label_id = l.id
+             WHERE ml.merge_request_id = m.id) AS labels_csv,
+            (SELECT GROUP_CONCAT(ma.username, X'1F')
+             FROM mr_assignees ma
+             WHERE ma.merge_request_id = m.id) AS assignees_csv,
+            (SELECT GROUP_CONCAT(mr.username, X'1F')
+             FROM mr_reviewers mr
+             WHERE mr.merge_request_id = m.id) AS reviewers_csv,
+            (SELECT COUNT(*) FROM discussions d
+             WHERE d.merge_request_id = m.id) AS discussion_count,
+            (SELECT COUNT(*) FROM discussions d
+             WHERE d.merge_request_id = m.id AND d.resolvable = 1 AND d.resolved = 0) AS unresolved_count
+         FROM merge_requests m
+         JOIN projects p ON m.project_id = p.id
+         {where_sql}
+         ORDER BY {sort_column} {order}
+         LIMIT ?"
+    );
+
+    params.push(Box::new(filters.limit as i64));
+    let param_refs: Vec<&dyn rusqlite::ToSql> = params.iter().map(|p| p.as_ref()).collect();
+
+    let mut stmt = conn.prepare(&query_sql)?;
+    let mrs: Vec<MrListRow> = stmt
+        .query_map(param_refs.as_slice(), |row| {
+            let labels_csv: Option<String> = row.get(11)?;
+            let labels = labels_csv
+                .map(|s| s.split('\x1F').map(String::from).collect())
+                .unwrap_or_default();
+
+            let assignees_csv: Option<String> = row.get(12)?;
+            let assignees = assignees_csv
+                .map(|s| s.split('\x1F').map(String::from).collect())
+                .unwrap_or_default();
+
+            let reviewers_csv: Option<String> = row.get(13)?;
+            let reviewers = reviewers_csv
+                .map(|s| s.split('\x1F').map(String::from).collect())
+                .unwrap_or_default();
+
+            let draft_int: i64 = row.get(3)?;
+
+            Ok(MrListRow {
+                iid: row.get(0)?,
+                title: row.get(1)?,
+                state: row.get(2)?,
+                draft: draft_int == 1,
+                author_username: row.get(4)?,
+                source_branch: row.get(5)?,
+                target_branch: row.get(6)?,
+                created_at: row.get(7)?,
+                updated_at: row.get(8)?,
+                web_url: row.get(9)?,
+                project_path: row.get(10)?,
+                labels,
+                assignees,
+                reviewers,
+                discussion_count: row.get(14)?,
+                unresolved_count: row.get(15)?,
+            })
+        })?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    Ok(MrListResult { mrs, total_count })
+}
+
+pub fn print_list_mrs(result: &MrListResult) {
+    if result.mrs.is_empty() {
+        println!("No merge requests found.");
+        return;
+    }
+
+    println!(
+        "{}  {} of {}\n",
+        Theme::bold().render("Merge Requests"),
+        result.mrs.len(),
+        result.total_count
+    );
+
+    let mut table = LoreTable::new()
+        .headers(&[
+            "IID", "Title", "State", "Author", "Branches", "Disc", "Updated",
+        ])
+        .align(0, Align::Right);
+
+    for mr in &result.mrs {
+        let title = if mr.draft {
+            format!("{} {}", Icons::mr_draft(), render::truncate(&mr.title, 42))
+        } else {
+            render::truncate(&mr.title, 45)
+        };
+
+        let relative_time = render::format_relative_time_compact(mr.updated_at);
+        let branches = format_branches(&mr.target_branch, &mr.source_branch, 25);
+        let discussions = format_discussions(mr.discussion_count, mr.unresolved_count);
+
+        let (icon, style) = match mr.state.as_str() {
+            "opened" => (Icons::mr_opened(), Theme::success()),
+            "merged" => (Icons::mr_merged(), Theme::accent()),
+            "closed" => (Icons::mr_closed(), Theme::error()),
+            "locked" => (Icons::mr_opened(), Theme::warning()),
+            _ => (Icons::mr_opened(), Theme::dim()),
+        };
+        let state_cell = StyledCell::styled(format!("{icon} {}", mr.state), style);
+
+        table.add_row(vec![
+            StyledCell::styled(format!("!{}", mr.iid), Theme::info()),
+            StyledCell::plain(title),
+            state_cell,
+            StyledCell::styled(
+                format!("@{}", render::truncate(&mr.author_username, 12)),
+                Theme::accent(),
+            ),
+            StyledCell::styled(branches, Theme::info()),
+            discussions,
+            StyledCell::styled(relative_time, Theme::dim()),
+        ]);
+    }
+
+    println!("{}", table.render());
+}
+
+pub fn print_list_mrs_json(result: &MrListResult, elapsed_ms: u64, fields: Option<&[String]>) {
+    let json_result = MrListResultJson::from(result);
+    let meta = RobotMeta::new(elapsed_ms);
+    let output = serde_json::json!({
+        "ok": true,
+        "data": json_result,
+        "meta": meta,
+    });
+    let mut output = output;
+    if let Some(f) = fields {
+        let expanded = expand_fields_preset(f, "mrs");
+        filter_fields(&mut output, "mrs", &expanded);
+    }
+    match serde_json::to_string(&output) {
+        Ok(json) => println!("{json}"),
+        Err(e) => eprintln!("Error serializing to JSON: {e}"),
+    }
+}
+
+pub fn open_mr_in_browser(result: &MrListResult) -> Option<String> {
+    let first_mr = result.mrs.first()?;
+    let url = first_mr.web_url.as_ref()?;
+
+    match open::that(url) {
+        Ok(()) => {
+            println!("Opened: {url}");
+            Some(url.clone())
+        }
+        Err(e) => {
+            eprintln!("Failed to open browser: {e}");
+            None
+        }
+    }
+}

src/cli/commands/list/notes.rs

@@ -0,0 +1,470 @@
+use crate::cli::render::{self, Align, StyledCell, Table as LoreTable, Theme};
+use rusqlite::Connection;
+use serde::Serialize;
+
+use crate::Config;
+use crate::cli::robot::{RobotMeta, expand_fields_preset, filter_fields};
+use crate::core::error::{LoreError, Result};
+use crate::core::path_resolver::escape_like as note_escape_like;
+use crate::core::project::resolve_project;
+use crate::core::time::{iso_to_ms, ms_to_iso, parse_since};
+
+use super::render_helpers::{
+    format_note_parent, format_note_path, format_note_type, truncate_body,
+};
+
+#[derive(Debug, Serialize)]
+pub struct NoteListRow {
+    pub id: i64,
+    pub gitlab_id: i64,
+    pub author_username: String,
+    pub body: Option<String>,
+    pub note_type: Option<String>,
+    pub is_system: bool,
+    pub created_at: i64,
+    pub updated_at: i64,
+    pub position_new_path: Option<String>,
+    pub position_new_line: Option<i64>,
+    pub position_old_path: Option<String>,
+    pub position_old_line: Option<i64>,
+    pub resolvable: bool,
+    pub resolved: bool,
+    pub resolved_by: Option<String>,
+    pub noteable_type: Option<String>,
+    pub parent_iid: Option<i64>,
+    pub parent_title: Option<String>,
+    pub project_path: String,
+}
+
+#[derive(Serialize)]
+pub struct NoteListRowJson {
+    pub id: i64,
+    pub gitlab_id: i64,
+    pub author_username: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub body: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub note_type: Option<String>,
+    pub is_system: bool,
+    pub created_at_iso: String,
+    pub updated_at_iso: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub position_new_path: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub position_new_line: Option<i64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub position_old_path: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub position_old_line: Option<i64>,
+    pub resolvable: bool,
+    pub resolved: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub resolved_by: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub noteable_type: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub parent_iid: Option<i64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub parent_title: Option<String>,
+    pub project_path: String,
+}
+
+impl From<&NoteListRow> for NoteListRowJson {
+    fn from(row: &NoteListRow) -> Self {
+        Self {
+            id: row.id,
+            gitlab_id: row.gitlab_id,
+            author_username: row.author_username.clone(),
+            body: row.body.clone(),
+            note_type: row.note_type.clone(),
+            is_system: row.is_system,
+            created_at_iso: ms_to_iso(row.created_at),
+            updated_at_iso: ms_to_iso(row.updated_at),
+            position_new_path: row.position_new_path.clone(),
+            position_new_line: row.position_new_line,
+            position_old_path: row.position_old_path.clone(),
+            position_old_line: row.position_old_line,
+            resolvable: row.resolvable,
+            resolved: row.resolved,
+            resolved_by: row.resolved_by.clone(),
+            noteable_type: row.noteable_type.clone(),
+            parent_iid: row.parent_iid,
+            parent_title: row.parent_title.clone(),
+            project_path: row.project_path.clone(),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct NoteListResult {
+    pub notes: Vec<NoteListRow>,
+    pub total_count: i64,
+}
+
+#[derive(Serialize)]
+pub struct NoteListResultJson {
+    pub notes: Vec<NoteListRowJson>,
+    pub total_count: i64,
+    pub showing: usize,
+}
+
+impl From<&NoteListResult> for NoteListResultJson {
+    fn from(result: &NoteListResult) -> Self {
+        Self {
+            notes: result.notes.iter().map(NoteListRowJson::from).collect(),
+            total_count: result.total_count,
+            showing: result.notes.len(),
+        }
+    }
+}
+
+pub struct NoteListFilters {
+    pub limit: usize,
+    pub project: Option<String>,
+    pub author: Option<String>,
+    pub note_type: Option<String>,
+    pub include_system: bool,
+    pub for_issue_iid: Option<i64>,
+    pub for_mr_iid: Option<i64>,
+    pub note_id: Option<i64>,
+    pub gitlab_note_id: Option<i64>,
+    pub discussion_id: Option<String>,
+    pub since: Option<String>,
+    pub until: Option<String>,
+    pub path: Option<String>,
+    pub contains: Option<String>,
+    pub resolution: Option<String>,
+    pub sort: String,
+    pub order: String,
+}
+
+pub fn print_list_notes(result: &NoteListResult) {
+    if result.notes.is_empty() {
+        println!("No notes found.");
+        return;
+    }
+
+    println!(
+        "{}  {} of {}\n",
+        Theme::bold().render("Notes"),
+        result.notes.len(),
+        result.total_count
+    );
+
+    let mut table = LoreTable::new()
+        .headers(&[
+            "ID",
+            "Author",
+            "Type",
+            "Body",
+            "Path:Line",
+            "Parent",
+            "Created",
+        ])
+        .align(0, Align::Right);
+
+    for note in &result.notes {
+        let body = note
+            .body
+            .as_deref()
+            .map(|b| truncate_body(b, 60))
+            .unwrap_or_default();
+        let path = format_note_path(note.position_new_path.as_deref(), note.position_new_line);
+        let parent = format_note_parent(note.noteable_type.as_deref(), note.parent_iid);
+        let relative_time = render::format_relative_time_compact(note.created_at);
+        let note_type = format_note_type(note.note_type.as_deref());
+
+        table.add_row(vec![
+            StyledCell::styled(note.gitlab_id.to_string(), Theme::info()),
+            StyledCell::styled(
+                format!("@{}", render::truncate(&note.author_username, 12)),
+                Theme::accent(),
+            ),
+            StyledCell::plain(note_type),
+            StyledCell::plain(body),
+            StyledCell::plain(path),
+            StyledCell::plain(parent),
+            StyledCell::styled(relative_time, Theme::dim()),
+        ]);
+    }
+
+    println!("{}", table.render());
+}
+
+pub fn print_list_notes_json(result: &NoteListResult, elapsed_ms: u64, fields: Option<&[String]>) {
+    let json_result = NoteListResultJson::from(result);
+    let meta = RobotMeta::new(elapsed_ms);
+    let output = serde_json::json!({
+        "ok": true,
+        "data": json_result,
+        "meta": meta,
+    });
+    let mut output = output;
+    if let Some(f) = fields {
+        let expanded = expand_fields_preset(f, "notes");
+        filter_fields(&mut output, "notes", &expanded);
+    }
+    match serde_json::to_string(&output) {
+        Ok(json) => println!("{json}"),
+        Err(e) => eprintln!("Error serializing to JSON: {e}"),
+    }
+}
+
+pub fn query_notes(
+    conn: &Connection,
+    filters: &NoteListFilters,
+    config: &Config,
+) -> Result<NoteListResult> {
+    let mut where_clauses: Vec<String> = Vec::new();
+    let mut params: Vec<Box<dyn rusqlite::ToSql>> = Vec::new();
+
+    if let Some(ref project) = filters.project {
+        let project_id = resolve_project(conn, project)?;
+        where_clauses.push("n.project_id = ?".to_string());
+        params.push(Box::new(project_id));
+    }
+
+    if let Some(ref author) = filters.author {
+        let username = author.strip_prefix('@').unwrap_or(author);
+        where_clauses.push("n.author_username = ? COLLATE NOCASE".to_string());
+        params.push(Box::new(username.to_string()));
+    }
+
+    if let Some(ref note_type) = filters.note_type {
+        where_clauses.push("n.note_type = ?".to_string());
+        params.push(Box::new(note_type.clone()));
+    }
+
+    if !filters.include_system {
+        where_clauses.push("n.is_system = 0".to_string());
+    }
+
+    let since_ms = if let Some(ref since_str) = filters.since {
+        let ms = parse_since(since_str).ok_or_else(|| {
+            LoreError::Other(format!(
+                "Invalid --since value '{}'. Use relative (7d, 2w, 1m) or absolute (YYYY-MM-DD) format.",
+                since_str
+            ))
+        })?;
+        where_clauses.push("n.created_at >= ?".to_string());
+        params.push(Box::new(ms));
+        Some(ms)
+    } else {
+        None
+    };
+
+    if let Some(ref until_str) = filters.until {
+        let until_ms = if until_str.len() == 10
+            && until_str.chars().filter(|&c| c == '-').count() == 2
+        {
+            let iso_full = format!("{until_str}T23:59:59.999Z");
+            iso_to_ms(&iso_full).ok_or_else(|| {
+                LoreError::Other(format!(
+                    "Invalid --until value '{}'. Use YYYY-MM-DD or relative format.",
+                    until_str
+                ))
+            })?
+        } else {
+            parse_since(until_str).ok_or_else(|| {
+                LoreError::Other(format!(
+                    "Invalid --until value '{}'. Use relative (7d, 2w, 1m) or absolute (YYYY-MM-DD) format.",
+                    until_str
+                ))
+            })?
+        };
+
+        if let Some(s) = since_ms
+            && s > until_ms
+        {
+            return Err(LoreError::Other(
+                "Invalid time window: --since is after --until.".to_string(),
+            ));
+        }
+
+        where_clauses.push("n.created_at <= ?".to_string());
+        params.push(Box::new(until_ms));
+    }
+
+    if let Some(ref path) = filters.path {
+        if let Some(prefix) = path.strip_suffix('/') {
+            let escaped = note_escape_like(prefix);
+            where_clauses.push("n.position_new_path LIKE ? ESCAPE '\\'".to_string());
+            params.push(Box::new(format!("{escaped}%")));
+        } else {
+            where_clauses.push("n.position_new_path = ?".to_string());
+            params.push(Box::new(path.clone()));
+        }
+    }
+
+    if let Some(ref contains) = filters.contains {
+        let escaped = note_escape_like(contains);
+        where_clauses.push("n.body LIKE ? ESCAPE '\\' COLLATE NOCASE".to_string());
+        params.push(Box::new(format!("%{escaped}%")));
+    }
+
+    if let Some(ref resolution) = filters.resolution {
+        match resolution.as_str() {
+            "unresolved" => {
+                where_clauses.push("n.resolvable = 1 AND n.resolved = 0".to_string());
+            }
+            "resolved" => {
+                where_clauses.push("n.resolvable = 1 AND n.resolved = 1".to_string());
+            }
+            other => {
+                return Err(LoreError::Other(format!(
+                    "Invalid --resolution value '{}'. Use 'resolved' or 'unresolved'.",
+                    other
+                )));
+            }
+        }
+    }
+
+    if let Some(iid) = filters.for_issue_iid {
+        let project_str = filters
+            .project
+            .as_deref()
+            .or(config.default_project.as_deref())
+            .ok_or_else(|| {
+                LoreError::Other(
+                    "Cannot filter by issue IID without a project context. Use --project or set defaultProject in config."
+                        .to_string(),
+                )
+            })?;
+        let project_id = resolve_project(conn, project_str)?;
+        where_clauses.push(
+            "d.issue_id = (SELECT id FROM issues WHERE project_id = ? AND iid = ?)".to_string(),
+        );
+        params.push(Box::new(project_id));
+        params.push(Box::new(iid));
+    }
+
+    if let Some(iid) = filters.for_mr_iid {
+        let project_str = filters
+            .project
+            .as_deref()
+            .or(config.default_project.as_deref())
+            .ok_or_else(|| {
+                LoreError::Other(
+                    "Cannot filter by MR IID without a project context. Use --project or set defaultProject in config."
+                        .to_string(),
+                )
+            })?;
+        let project_id = resolve_project(conn, project_str)?;
+        where_clauses.push(
+            "d.merge_request_id = (SELECT id FROM merge_requests WHERE project_id = ? AND iid = ?)"
+                .to_string(),
+        );
+        params.push(Box::new(project_id));
+        params.push(Box::new(iid));
+    }
+
+    if let Some(id) = filters.note_id {
+        where_clauses.push("n.id = ?".to_string());
+        params.push(Box::new(id));
+    }
+
+    if let Some(gitlab_id) = filters.gitlab_note_id {
+        where_clauses.push("n.gitlab_id = ?".to_string());
+        params.push(Box::new(gitlab_id));
+    }
+
+    if let Some(ref disc_id) = filters.discussion_id {
+        where_clauses.push("d.gitlab_discussion_id = ?".to_string());
+        params.push(Box::new(disc_id.clone()));
+    }
+
+    let where_sql = if where_clauses.is_empty() {
+        String::new()
+    } else {
+        format!("WHERE {}", where_clauses.join(" AND "))
+    };
+
+    let count_sql = format!(
+        "SELECT COUNT(*) FROM notes n
+         JOIN discussions d ON n.discussion_id = d.id
+         JOIN projects p ON n.project_id = p.id
+         LEFT JOIN issues i ON d.issue_id = i.id
+         LEFT JOIN merge_requests m ON d.merge_request_id = m.id
+         {where_sql}"
+    );
+
+    let param_refs: Vec<&dyn rusqlite::ToSql> = params.iter().map(|p| p.as_ref()).collect();
+    let total_count: i64 = conn.query_row(&count_sql, param_refs.as_slice(), |row| row.get(0))?;
+
+    let sort_column = match filters.sort.as_str() {
+        "updated" => "n.updated_at",
+        _ => "n.created_at",
+    };
+    let order = if filters.order == "asc" {
+        "ASC"
+    } else {
+        "DESC"
+    };
+
+    let query_sql = format!(
+        "SELECT
+            n.id,
+            n.gitlab_id,
+            n.author_username,
+            n.body,
+            n.note_type,
+            n.is_system,
+            n.created_at,
+            n.updated_at,
+            n.position_new_path,
+            n.position_new_line,
+            n.position_old_path,
+            n.position_old_line,
+            n.resolvable,
+            n.resolved,
+            n.resolved_by,
+            d.noteable_type,
+            COALESCE(i.iid, m.iid) AS parent_iid,
+            COALESCE(i.title, m.title) AS parent_title,
+            p.path_with_namespace AS project_path
+         FROM notes n
+         JOIN discussions d ON n.discussion_id = d.id
+         JOIN projects p ON n.project_id = p.id
+         LEFT JOIN issues i ON d.issue_id = i.id
+         LEFT JOIN merge_requests m ON d.merge_request_id = m.id
+         {where_sql}
+         ORDER BY {sort_column} {order}, n.id {order}
+         LIMIT ?"
+    );
+
+    params.push(Box::new(filters.limit as i64));
+    let param_refs: Vec<&dyn rusqlite::ToSql> = params.iter().map(|p| p.as_ref()).collect();
+
+    let mut stmt = conn.prepare(&query_sql)?;
+    let notes: Vec<NoteListRow> = stmt
+        .query_map(param_refs.as_slice(), |row| {
+            let is_system_int: i64 = row.get(5)?;
+            let resolvable_int: i64 = row.get(12)?;
+            let resolved_int: i64 = row.get(13)?;
+
+            Ok(NoteListRow {
+                id: row.get(0)?,
+                gitlab_id: row.get(1)?,
+                author_username: row.get::<_, Option<String>>(2)?.unwrap_or_default(),
+                body: row.get(3)?,
+                note_type: row.get(4)?,
+                is_system: is_system_int == 1,
+                created_at: row.get(6)?,
+                updated_at: row.get(7)?,
+                position_new_path: row.get(8)?,
+                position_new_line: row.get(9)?,
+                position_old_path: row.get(10)?,
+                position_old_line: row.get(11)?,
+                resolvable: resolvable_int == 1,
+                resolved: resolved_int == 1,
+                resolved_by: row.get(14)?,
+                noteable_type: row.get(15)?,
+                parent_iid: row.get(16)?,
+                parent_title: row.get(17)?,
+                project_path: row.get(18)?,
+            })
+        })?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    Ok(NoteListResult { notes, total_count })
+}

src/cli/commands/list/render_helpers.rs

@@ -0,0 +1,73 @@
+use crate::cli::render::{self, StyledCell, Theme};
+
+pub(crate) fn format_assignees(assignees: &[String]) -> String {
+    if assignees.is_empty() {
+        return "-".to_string();
+    }
+
+    let max_shown = 2;
+    let shown: Vec<String> = assignees
+        .iter()
+        .take(max_shown)
+        .map(|s| format!("@{}", render::truncate(s, 10)))
+        .collect();
+    let overflow = assignees.len().saturating_sub(max_shown);
+
+    if overflow > 0 {
+        format!("{} +{}", shown.join(", "), overflow)
+    } else {
+        shown.join(", ")
+    }
+}
+
+pub(crate) fn format_discussions(total: i64, unresolved: i64) -> StyledCell {
+    if total == 0 {
+        return StyledCell::plain(String::new());
+    }
+
+    if unresolved > 0 {
+        let text = format!("{total}/");
+        let warn = Theme::warning().render(&format!("{unresolved}!"));
+        StyledCell::plain(format!("{text}{warn}"))
+    } else {
+        StyledCell::plain(format!("{total}"))
+    }
+}
+
+pub(crate) fn format_branches(target: &str, source: &str, max_width: usize) -> String {
+    let full = format!("{} <- {}", target, source);
+    render::truncate(&full, max_width)
+}
+
+pub(crate) fn truncate_body(body: &str, max_len: usize) -> String {
+    if body.chars().count() <= max_len {
+        body.to_string()
+    } else {
+        let truncated: String = body.chars().take(max_len).collect();
+        format!("{truncated}...")
+    }
+}
+
+pub(crate) fn format_note_type(note_type: Option<&str>) -> &'static str {
+    match note_type {
+        Some("DiffNote") => "Diff",
+        Some("DiscussionNote") => "Disc",
+        _ => "-",
+    }
+}
+
+pub(crate) fn format_note_path(path: Option<&str>, line: Option<i64>) -> String {
+    match (path, line) {
+        (Some(p), Some(l)) => format!("{p}:{l}"),
+        (Some(p), None) => p.to_string(),
+        _ => "-".to_string(),
+    }
+}
+
+pub(crate) fn format_note_parent(noteable_type: Option<&str>, parent_iid: Option<i64>) -> String {
+    match (noteable_type, parent_iid) {
+        (Some("Issue"), Some(iid)) => format!("Issue #{iid}"),
+        (Some("MergeRequest"), Some(iid)) => format!("MR !{iid}"),
+        _ => "-".to_string(),
+    }
+}

src/cli/commands/me/me_tests.rs

@@ -1,32 +1,11 @@
 use super::*;
 use crate::cli::commands::me::types::{ActivityEventType, AttentionState};
-use crate::core::db::{create_connection, run_migrations};
 use crate::core::time::now_ms;
+use crate::test_support::{insert_project, setup_test_db};
 use rusqlite::Connection;
-use std::path::Path;
 
 // ─── Helpers ────────────────────────────────────────────────────────────────
 
-fn setup_test_db() -> Connection {
-    let conn = create_connection(Path::new(":memory:")).unwrap();
-    run_migrations(&conn).unwrap();
-    conn
-}
-
-fn insert_project(conn: &Connection, id: i64, path: &str) {
-    conn.execute(
-        "INSERT INTO projects (id, gitlab_project_id, path_with_namespace, web_url)
-         VALUES (?1, ?2, ?3, ?4)",
-        rusqlite::params![
-            id,
-            id * 100,
-            path,
-            format!("https://git.example.com/{path}")
-        ],
-    )
-    .unwrap();
-}
-
 fn insert_issue(conn: &Connection, id: i64, project_id: i64, iid: i64, author: &str) {
     insert_issue_with_status(
         conn,
@@ -648,6 +627,115 @@ fn activity_is_own_flag() {
     assert!(results[0].is_own);
 }
 
+// ─── Activity on Closed/Merged Items ─────────────────────────────────────────
+
+#[test]
+fn activity_note_on_merged_authored_mr() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_mr(&conn, 10, 1, 99, "alice", "merged", false);
+
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, Some(10), None);
+    let t = now_ms() - 1000;
+    insert_note_at(
+        &conn,
+        200,
+        disc_id,
+        1,
+        "bob",
+        false,
+        "follow-up question",
+        t,
+    );
+
+    let results = query_activity(&conn, "alice", &[], 0).unwrap();
+    assert_eq!(
+        results.len(),
+        1,
+        "should see activity on merged MR authored by user"
+    );
+    assert_eq!(results[0].entity_iid, 99);
+    assert_eq!(results[0].entity_type, "mr");
+}
+
+#[test]
+fn activity_note_on_closed_mr_as_reviewer() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_mr(&conn, 10, 1, 99, "bob", "closed", false);
+    insert_reviewer(&conn, 10, "alice");
+
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, Some(10), None);
+    let t = now_ms() - 1000;
+    insert_note_at(&conn, 200, disc_id, 1, "bob", false, "can you re-check?", t);
+
+    let results = query_activity(&conn, "alice", &[], 0).unwrap();
+    assert_eq!(
+        results.len(),
+        1,
+        "should see activity on closed MR where user is reviewer"
+    );
+}
+
+#[test]
+fn activity_note_on_closed_assigned_issue() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_issue_with_state(&conn, 10, 1, 42, "someone", "closed");
+    insert_assignee(&conn, 10, "alice");
+
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, None, Some(10));
+    let t = now_ms() - 1000;
+    insert_note_at(
+        &conn,
+        200,
+        disc_id,
+        1,
+        "bob",
+        false,
+        "reopening discussion",
+        t,
+    );
+
+    let results = query_activity(&conn, "alice", &[], 0).unwrap();
+    assert_eq!(
+        results.len(),
+        1,
+        "should see activity on closed issue assigned to user"
+    );
+}
+
+#[test]
+fn since_last_check_includes_comment_on_merged_mr() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_mr(&conn, 10, 1, 99, "alice", "merged", false);
+
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, Some(10), None);
+    let t = now_ms() - 1000;
+    insert_note_at(
+        &conn,
+        200,
+        disc_id,
+        1,
+        "bob",
+        false,
+        "post-merge question",
+        t,
+    );
+
+    let groups = query_since_last_check(&conn, "alice", 0).unwrap();
+    let total_events: usize = groups.iter().map(|g| g.events.len()).sum();
+    assert_eq!(
+        total_events, 1,
+        "should see others' comments on merged MR in inbox"
+    );
+}
+
 // ─── Assignment Detection Tests (Task #12) ─────────────────────────────────
 
 #[test]
@@ -835,8 +923,337 @@ fn since_last_check_ignores_domain_like_text() {
     );
 }
 
+// ─── Mentioned In Tests ─────────────────────────────────────────────────────
+
+#[test]
+fn mentioned_in_finds_mention_on_unassigned_issue() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_issue(&conn, 10, 1, 42, "someone");
+    // alice is NOT assigned to issue 42
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, None, Some(10));
+    let t = now_ms() - 1000;
+    insert_note_at(
+        &conn,
+        200,
+        disc_id,
+        1,
+        "bob",
+        false,
+        "hey @alice can you look?",
+        t,
+    );
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, 0).unwrap();
+    assert_eq!(results.len(), 1);
+    assert_eq!(results[0].entity_type, "issue");
+    assert_eq!(results[0].iid, 42);
+}
+
+#[test]
+fn mentioned_in_excludes_assigned_issue() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_issue(&conn, 10, 1, 42, "someone");
+    insert_assignee(&conn, 10, "alice"); // alice IS assigned
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, None, Some(10));
+    let t = now_ms() - 1000;
+    insert_note_at(&conn, 200, disc_id, 1, "bob", false, "hey @alice", t);
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, 0).unwrap();
+    assert!(results.is_empty(), "should exclude assigned issues");
+}
+
+#[test]
+fn mentioned_in_excludes_authored_issue() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_issue(&conn, 10, 1, 42, "alice"); // alice IS author
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, None, Some(10));
+    let t = now_ms() - 1000;
+    insert_note_at(&conn, 200, disc_id, 1, "bob", false, "hey @alice", t);
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, 0).unwrap();
+    assert!(results.is_empty(), "should exclude authored issues");
+}
+
+#[test]
+fn mentioned_in_finds_mention_on_non_authored_mr() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_mr(&conn, 10, 1, 99, "bob", "opened", false);
+    // alice is NOT author or reviewer
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, Some(10), None);
+    let t = now_ms() - 1000;
+    insert_note_at(&conn, 200, disc_id, 1, "bob", false, "cc @alice", t);
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, 0).unwrap();
+    assert_eq!(results.len(), 1);
+    assert_eq!(results[0].entity_type, "mr");
+    assert_eq!(results[0].iid, 99);
+}
+
+#[test]
+fn mentioned_in_excludes_authored_mr() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_mr(&conn, 10, 1, 99, "alice", "opened", false); // alice IS author
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, Some(10), None);
+    let t = now_ms() - 1000;
+    insert_note_at(&conn, 200, disc_id, 1, "bob", false, "@alice thoughts?", t);
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, 0).unwrap();
+    assert!(results.is_empty(), "should exclude authored MRs");
+}
+
+#[test]
+fn mentioned_in_excludes_reviewer_mr() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_mr(&conn, 10, 1, 99, "bob", "opened", false);
+    insert_reviewer(&conn, 10, "alice"); // alice IS reviewer
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, Some(10), None);
+    let t = now_ms() - 1000;
+    insert_note_at(&conn, 200, disc_id, 1, "charlie", false, "@alice fyi", t);
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, 0).unwrap();
+    assert!(
+        results.is_empty(),
+        "should exclude MRs where user is reviewer"
+    );
+}
+
+#[test]
+fn mentioned_in_includes_recently_closed_issue() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_issue_with_state(&conn, 10, 1, 42, "someone", "closed");
+    // Update updated_at to recent (within 7-day window)
+    conn.execute(
+        "UPDATE issues SET updated_at = ?1 WHERE id = 10",
+        rusqlite::params![now_ms() - 2 * 24 * 3600 * 1000], // 2 days ago
+    )
+    .unwrap();
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, None, Some(10));
+    let t = now_ms() - 1000;
+    insert_note_at(&conn, 200, disc_id, 1, "bob", false, "hey @alice", t);
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, 0).unwrap();
+    assert_eq!(results.len(), 1, "recently closed issue should be included");
+    assert_eq!(results[0].state, "closed");
+}
+
+#[test]
+fn mentioned_in_excludes_old_closed_issue() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_issue_with_state(&conn, 10, 1, 42, "someone", "closed");
+    // Update updated_at to old (outside 7-day window)
+    conn.execute(
+        "UPDATE issues SET updated_at = ?1 WHERE id = 10",
+        rusqlite::params![now_ms() - 30 * 24 * 3600 * 1000], // 30 days ago
+    )
+    .unwrap();
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, None, Some(10));
+    let t = now_ms() - 1000;
+    insert_note_at(&conn, 200, disc_id, 1, "bob", false, "hey @alice", t);
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, 0).unwrap();
+    assert!(results.is_empty(), "old closed issue should be excluded");
+}
+
+#[test]
+fn mentioned_in_attention_needs_attention_when_unreplied() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_issue(&conn, 10, 1, 42, "someone");
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, None, Some(10));
+    let t = now_ms() - 1000;
+    insert_note_at(
+        &conn,
+        200,
+        disc_id,
+        1,
+        "bob",
+        false,
+        "@alice please review",
+        t,
+    );
+    // alice has NOT replied
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, 0).unwrap();
+    assert_eq!(results.len(), 1);
+    assert_eq!(results[0].attention_state, AttentionState::NeedsAttention);
+}
+
+#[test]
+fn mentioned_in_attention_awaiting_when_replied() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_issue(&conn, 10, 1, 42, "someone");
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, None, Some(10));
+    let t1 = now_ms() - 5000;
+    let t2 = now_ms() - 1000;
+    insert_note_at(
+        &conn,
+        200,
+        disc_id,
+        1,
+        "bob",
+        false,
+        "@alice please review",
+        t1,
+    );
+    insert_note_at(&conn, 201, disc_id, 1, "alice", false, "looks good", t2);
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, 0).unwrap();
+    assert_eq!(results.len(), 1);
+    assert_eq!(results[0].attention_state, AttentionState::AwaitingResponse);
+}
+
+#[test]
+fn mentioned_in_project_filter() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo-a");
+    insert_project(&conn, 2, "group/repo-b");
+    insert_issue(&conn, 10, 1, 42, "someone");
+    insert_issue(&conn, 11, 2, 43, "someone");
+    let disc_a = 100;
+    let disc_b = 101;
+    insert_discussion(&conn, disc_a, 1, None, Some(10));
+    insert_discussion(&conn, disc_b, 2, None, Some(11));
+    let t = now_ms() - 1000;
+    insert_note_at(&conn, 200, disc_a, 1, "bob", false, "@alice", t);
+    insert_note_at(&conn, 201, disc_b, 2, "bob", false, "@alice", t);
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[1], recency_cutoff, 0).unwrap();
+    assert_eq!(results.len(), 1);
+    assert_eq!(results[0].project_path, "group/repo-a");
+}
+
+#[test]
+fn mentioned_in_deduplicates_multiple_mentions_same_entity() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_issue(&conn, 10, 1, 42, "someone");
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, None, Some(10));
+    let t1 = now_ms() - 5000;
+    let t2 = now_ms() - 1000;
+    // Two different people mention alice on the same issue
+    insert_note_at(&conn, 200, disc_id, 1, "bob", false, "@alice thoughts?", t1);
+    insert_note_at(&conn, 201, disc_id, 1, "charlie", false, "@alice +1", t2);
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, 0).unwrap();
+    assert_eq!(results.len(), 1, "should deduplicate to one entity");
+}
+
+#[test]
+fn mentioned_in_rejects_false_positive_email() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_issue(&conn, 10, 1, 42, "someone");
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, None, Some(10));
+    let t = now_ms() - 1000;
+    insert_note_at(
+        &conn,
+        200,
+        disc_id,
+        1,
+        "bob",
+        false,
+        "email foo@alice.com",
+        t,
+    );
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, 0).unwrap();
+    assert!(results.is_empty(), "email-like text should not match");
+}
+
+#[test]
+fn mentioned_in_excludes_old_mention_on_open_issue() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_issue(&conn, 10, 1, 42, "someone");
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, None, Some(10));
+    // Mention from 45 days ago — outside 30-day mention window
+    let t = now_ms() - 45 * 24 * 3600 * 1000;
+    insert_note_at(&conn, 200, disc_id, 1, "bob", false, "hey @alice", t);
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let mention_cutoff = now_ms() - 30 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, mention_cutoff).unwrap();
+    assert!(
+        results.is_empty(),
+        "mentions older than 30 days should be excluded"
+    );
+}
+
+#[test]
+fn mentioned_in_includes_recent_mention_on_open_issue() {
+    let conn = setup_test_db();
+    insert_project(&conn, 1, "group/repo");
+    insert_issue(&conn, 10, 1, 42, "someone");
+    let disc_id = 100;
+    insert_discussion(&conn, disc_id, 1, None, Some(10));
+    // Mention from 5 days ago — within 30-day window
+    let t = now_ms() - 5 * 24 * 3600 * 1000;
+    insert_note_at(&conn, 200, disc_id, 1, "bob", false, "hey @alice", t);
+
+    let recency_cutoff = now_ms() - 7 * 24 * 3600 * 1000;
+    let mention_cutoff = now_ms() - 30 * 24 * 3600 * 1000;
+    let results = query_mentioned_in(&conn, "alice", &[], recency_cutoff, mention_cutoff).unwrap();
+    assert_eq!(results.len(), 1, "recent mentions should be included");
+}
+
 // ─── Helper Tests ──────────────────────────────────────────────────────────
 
+#[test]
+fn mentioned_in_sql_materializes_core_ctes() {
+    let sql = build_mentioned_in_sql("");
+    assert!(
+        sql.contains("candidate_issues AS MATERIALIZED"),
+        "candidate_issues should be materialized"
+    );
+    assert!(
+        sql.contains("candidate_mrs AS MATERIALIZED"),
+        "candidate_mrs should be materialized"
+    );
+    assert!(
+        sql.contains("note_ts_issue AS MATERIALIZED"),
+        "note_ts_issue should be materialized"
+    );
+    assert!(
+        sql.contains("note_ts_mr AS MATERIALIZED"),
+        "note_ts_mr should be materialized"
+    );
+}
+
 #[test]
 fn parse_attention_state_all_variants() {
     assert_eq!(
@@ -856,6 +1273,67 @@ fn parse_attention_state_all_variants() {
     assert_eq!(parse_attention_state("unknown"), AttentionState::NotStarted);
 }
 
+#[test]
+fn format_attention_reason_not_started() {
+    let reason = format_attention_reason(&AttentionState::NotStarted, None, None, None);
+    assert_eq!(reason, "No discussion yet");
+}
+
+#[test]
+fn format_attention_reason_not_ready() {
+    let reason = format_attention_reason(&AttentionState::NotReady, None, None, None);
+    assert_eq!(reason, "Draft with no reviewers assigned");
+}
+
+#[test]
+fn format_attention_reason_stale_with_timestamp() {
+    let stale_ts = now_ms() - 35 * 24 * 3600 * 1000; // 35 days ago
+    let reason = format_attention_reason(&AttentionState::Stale, None, None, Some(stale_ts));
+    assert!(reason.starts_with("No activity for"), "got: {reason}");
+    // 35 days = 1 month in our duration bucketing
+    assert!(reason.contains("1 month"), "got: {reason}");
+}
+
+#[test]
+fn format_attention_reason_needs_attention_both_timestamps() {
+    let my_ts = now_ms() - 2 * 86_400_000; // 2 days ago
+    let others_ts = now_ms() - 3_600_000; // 1 hour ago
+    let reason = format_attention_reason(
+        &AttentionState::NeedsAttention,
+        Some(my_ts),
+        Some(others_ts),
+        Some(others_ts),
+    );
+    assert!(reason.contains("Others replied"), "got: {reason}");
+    assert!(reason.contains("you last commented"), "got: {reason}");
+}
+
+#[test]
+fn format_attention_reason_needs_attention_no_self_comment() {
+    let others_ts = now_ms() - 3_600_000; // 1 hour ago
+    let reason = format_attention_reason(
+        &AttentionState::NeedsAttention,
+        None,
+        Some(others_ts),
+        Some(others_ts),
+    );
+    assert!(reason.contains("Others commented"), "got: {reason}");
+    assert!(reason.contains("you haven't replied"), "got: {reason}");
+}
+
+#[test]
+fn format_attention_reason_awaiting_response() {
+    let my_ts = now_ms() - 7_200_000; // 2 hours ago
+    let reason = format_attention_reason(
+        &AttentionState::AwaitingResponse,
+        Some(my_ts),
+        None,
+        Some(my_ts),
+    );
+    assert!(reason.contains("You replied"), "got: {reason}");
+    assert!(reason.contains("awaiting others"), "got: {reason}");
+}
+
 #[test]
 fn parse_event_type_all_variants() {
     assert_eq!(parse_event_type("note"), ActivityEventType::Note);

src/cli/commands/me/mod.rs

@@ -17,7 +17,7 @@ use crate::core::project::resolve_project;
 use crate::core::time::parse_since;
 
 use self::queries::{
-    query_activity, query_authored_mrs, query_open_issues, query_reviewing_mrs,
+    query_activity, query_authored_mrs, query_mentioned_in, query_open_issues, query_reviewing_mrs,
     query_since_last_check,
 };
 use self::types::{AttentionState, MeDashboard, MeSummary, SinceLastCheck};
@@ -25,6 +25,10 @@ use self::types::{AttentionState, MeDashboard, MeSummary, SinceLastCheck};
 /// Default activity lookback: 1 day in milliseconds.
 const DEFAULT_ACTIVITY_SINCE_DAYS: i64 = 1;
 const MS_PER_DAY: i64 = 24 * 60 * 60 * 1000;
+/// Recency window for closed/merged items in the "Mentioned In" section: 7 days.
+const RECENCY_WINDOW_MS: i64 = 7 * MS_PER_DAY;
+/// Only show mentions from notes created within this window (30 days).
+const MENTION_WINDOW_MS: i64 = 30 * MS_PER_DAY;
 
 /// Resolve the effective username from CLI flag or config.
 ///
@@ -126,6 +130,7 @@ pub fn run_me(config: &Config, args: &MeArgs, robot_mode: bool) -> Result<()> {
     let want_issues = show_all || args.issues;
     let want_mrs = show_all || args.mrs;
     let want_activity = show_all || args.activity;
+    let want_mentions = show_all || args.mentions;
 
     // 6. Run queries for requested sections
     let open_issues = if want_issues {
@@ -146,6 +151,20 @@ pub fn run_me(config: &Config, args: &MeArgs, robot_mode: bool) -> Result<()> {
         Vec::new()
     };
 
+    let mentioned_in = if want_mentions {
+        let recency_cutoff = crate::core::time::now_ms() - RECENCY_WINDOW_MS;
+        let mention_cutoff = crate::core::time::now_ms() - MENTION_WINDOW_MS;
+        query_mentioned_in(
+            &conn,
+            username,
+            &project_ids,
+            recency_cutoff,
+            mention_cutoff,
+        )?
+    } else {
+        Vec::new()
+    };
+
     let activity = if want_activity {
         query_activity(&conn, username, &project_ids, since_ms)?
     } else {
@@ -187,6 +206,10 @@ pub fn run_me(config: &Config, args: &MeArgs, robot_mode: bool) -> Result<()> {
             .filter(|m| m.attention_state == AttentionState::NeedsAttention)
             .count()
         + reviewing_mrs
+            .iter()
+            .filter(|m| m.attention_state == AttentionState::NeedsAttention)
+            .count()
+        + mentioned_in
             .iter()
             .filter(|m| m.attention_state == AttentionState::NeedsAttention)
             .count();
@@ -202,12 +225,16 @@ pub fn run_me(config: &Config, args: &MeArgs, robot_mode: bool) -> Result<()> {
     for m in &reviewing_mrs {
         project_paths.insert(&m.project_path);
     }
+    for m in &mentioned_in {
+        project_paths.insert(&m.project_path);
+    }
 
     let summary = MeSummary {
         project_count: project_paths.len(),
         open_issue_count: open_issues.len(),
         authored_mr_count: open_mrs_authored.len(),
         reviewing_mr_count: reviewing_mrs.len(),
+        mentioned_in_count: mentioned_in.len(),
         needs_attention_count,
     };
 
@@ -219,6 +246,7 @@ pub fn run_me(config: &Config, args: &MeArgs, robot_mode: bool) -> Result<()> {
         open_issues,
         open_mrs_authored,
         reviewing_mrs,
+        mentioned_in,
         activity,
         since_last_check,
     };
@@ -228,7 +256,7 @@ pub fn run_me(config: &Config, args: &MeArgs, robot_mode: bool) -> Result<()> {
 
     if robot_mode {
         let fields = args.fields.as_deref();
-        render_robot::print_me_json(&dashboard, elapsed_ms, fields)?;
+        render_robot::print_me_json(&dashboard, elapsed_ms, fields, &config.gitlab.base_url)?;
     } else if show_all {
         render_human::print_me_dashboard(&dashboard, single_project);
     } else {
@@ -237,6 +265,7 @@ pub fn run_me(config: &Config, args: &MeArgs, robot_mode: bool) -> Result<()> {
             single_project,
             want_issues,
             want_mrs,
+            want_mentions,
             want_activity,
         );
     }
@@ -313,6 +342,7 @@ mod tests {
             issues: false,
             mrs: false,
             activity: false,
+            mentions: false,
             since: None,
             project: None,
             all: false,

src/cli/commands/me/queries.rs

@@ -12,13 +12,77 @@ use regex::Regex;
 use std::collections::HashMap;
 
 use super::types::{
-    ActivityEventType, AttentionState, MeActivityEvent, MeIssue, MeMr, SinceCheckEvent,
+    ActivityEventType, AttentionState, MeActivityEvent, MeIssue, MeMention, MeMr, SinceCheckEvent,
     SinceCheckGroup,
 };
 
 /// Stale threshold: items with no activity for 30 days are marked "stale".
 const STALE_THRESHOLD_MS: i64 = 30 * 24 * 3600 * 1000;
 
+// ─── Attention Reason ───────────────────────────────────────────────────────
+
+/// Format a human-readable duration from a millisecond epoch to now.
+/// Returns e.g. "3 hours", "2 days", "1 week".
+fn relative_duration(ms_epoch: i64) -> String {
+    let diff = crate::core::time::now_ms() - ms_epoch;
+    if diff < 60_000 {
+        return "moments".to_string();
+    }
+    let (n, unit) = match diff {
+        d if d < 3_600_000 => (d / 60_000, "minute"),
+        d if d < 86_400_000 => (d / 3_600_000, "hour"),
+        d if d < 604_800_000 => (d / 86_400_000, "day"),
+        d if d < 2_592_000_000 => (d / 604_800_000, "week"),
+        d => (d / 2_592_000_000, "month"),
+    };
+    if n == 1 {
+        format!("1 {unit}")
+    } else {
+        format!("{n} {unit}s")
+    }
+}
+
+/// Build a human-readable reason explaining why the attention state was set.
+pub(super) fn format_attention_reason(
+    state: &AttentionState,
+    my_ts: Option<i64>,
+    others_ts: Option<i64>,
+    any_ts: Option<i64>,
+) -> String {
+    match state {
+        AttentionState::NotReady => "Draft with no reviewers assigned".to_string(),
+        AttentionState::Stale => {
+            if let Some(ts) = any_ts {
+                format!("No activity for {}", relative_duration(ts))
+            } else {
+                "No activity for over 30 days".to_string()
+            }
+        }
+        AttentionState::NeedsAttention => {
+            let others_ago = others_ts
+                .map(|ts| format!("{} ago", relative_duration(ts)))
+                .unwrap_or_else(|| "recently".to_string());
+            if let Some(ts) = my_ts {
+                format!(
+                    "Others replied {}; you last commented {} ago",
+                    others_ago,
+                    relative_duration(ts)
+                )
+            } else {
+                format!("Others commented {}; you haven't replied", others_ago)
+            }
+        }
+        AttentionState::AwaitingResponse => {
+            if let Some(ts) = my_ts {
+                format!("You replied {} ago; awaiting others", relative_duration(ts))
+            } else {
+                "Awaiting response from others".to_string()
+            }
+        }
+        AttentionState::NotStarted => "No discussion yet".to_string(),
+    }
+}
+
 // ─── Open Issues (AC-5.1, Task #7) ─────────────────────────────────────────
 
 /// Query open issues assigned to the user via issue_assignees.
@@ -51,7 +115,8 @@ pub fn query_open_issues(
                 WHEN nt.my_ts IS NOT NULL AND nt.my_ts >= COALESCE(nt.others_ts, 0)
                     THEN 'awaiting_response'
                 ELSE 'not_started'
-            END AS attention_state
+            END AS attention_state,
+            nt.my_ts, nt.others_ts, nt.any_ts
         FROM issues i
         JOIN issue_assignees ia ON ia.issue_id = i.id
         JOIN projects p ON i.project_id = p.id
@@ -84,6 +149,11 @@ pub fn query_open_issues(
     let mut stmt = conn.prepare(&sql)?;
     let rows = stmt.query_map(param_refs.as_slice(), |row| {
         let attention_str: String = row.get(6)?;
+        let my_ts: Option<i64> = row.get(7)?;
+        let others_ts: Option<i64> = row.get(8)?;
+        let any_ts: Option<i64> = row.get(9)?;
+        let state = parse_attention_state(&attention_str);
+        let reason = format_attention_reason(&state, my_ts, others_ts, any_ts);
         Ok(MeIssue {
             iid: row.get(0)?,
             title: row.get::<_, Option<String>>(1)?.unwrap_or_default(),
@@ -91,7 +161,8 @@ pub fn query_open_issues(
             status_name: row.get(3)?,
             updated_at: row.get(4)?,
             web_url: row.get(5)?,
-            attention_state: parse_attention_state(&attention_str),
+            attention_state: state,
+            attention_reason: reason,
             labels: Vec::new(),
         })
     })?;
@@ -135,7 +206,8 @@ pub fn query_authored_mrs(
                 WHEN nt.my_ts IS NOT NULL AND nt.my_ts >= COALESCE(nt.others_ts, 0)
                     THEN 'awaiting_response'
                 ELSE 'not_started'
-            END AS attention_state
+            END AS attention_state,
+            nt.my_ts, nt.others_ts, nt.any_ts
         FROM merge_requests m
         JOIN projects p ON m.project_id = p.id
         LEFT JOIN note_ts nt ON nt.merge_request_id = m.id
@@ -163,6 +235,11 @@ pub fn query_authored_mrs(
     let mut stmt = conn.prepare(&sql)?;
     let rows = stmt.query_map(param_refs.as_slice(), |row| {
         let attention_str: String = row.get(7)?;
+        let my_ts: Option<i64> = row.get(8)?;
+        let others_ts: Option<i64> = row.get(9)?;
+        let any_ts: Option<i64> = row.get(10)?;
+        let state = parse_attention_state(&attention_str);
+        let reason = format_attention_reason(&state, my_ts, others_ts, any_ts);
         Ok(MeMr {
             iid: row.get(0)?,
             title: row.get::<_, Option<String>>(1)?.unwrap_or_default(),
@@ -171,7 +248,8 @@ pub fn query_authored_mrs(
             detailed_merge_status: row.get(4)?,
             updated_at: row.get(5)?,
             web_url: row.get(6)?,
-            attention_state: parse_attention_state(&attention_str),
+            attention_state: state,
+            attention_reason: reason,
             author_username: None,
             labels: Vec::new(),
         })
@@ -214,7 +292,8 @@ pub fn query_reviewing_mrs(
                 WHEN nt.my_ts IS NOT NULL AND nt.my_ts >= COALESCE(nt.others_ts, 0)
                     THEN 'awaiting_response'
                 ELSE 'not_started'
-            END AS attention_state
+            END AS attention_state,
+            nt.my_ts, nt.others_ts, nt.any_ts
         FROM merge_requests m
         JOIN mr_reviewers r ON r.merge_request_id = m.id
         JOIN projects p ON m.project_id = p.id
@@ -242,6 +321,11 @@ pub fn query_reviewing_mrs(
     let mut stmt = conn.prepare(&sql)?;
     let rows = stmt.query_map(param_refs.as_slice(), |row| {
         let attention_str: String = row.get(8)?;
+        let my_ts: Option<i64> = row.get(9)?;
+        let others_ts: Option<i64> = row.get(10)?;
+        let any_ts: Option<i64> = row.get(11)?;
+        let state = parse_attention_state(&attention_str);
+        let reason = format_attention_reason(&state, my_ts, others_ts, any_ts);
         Ok(MeMr {
             iid: row.get(0)?,
             title: row.get::<_, Option<String>>(1)?.unwrap_or_default(),
@@ -251,7 +335,8 @@ pub fn query_reviewing_mrs(
             author_username: row.get(5)?,
             updated_at: row.get(6)?,
             web_url: row.get(7)?,
-            attention_state: parse_attention_state(&attention_str),
+            attention_state: state,
+            attention_reason: reason,
             labels: Vec::new(),
         })
     })?;
@@ -277,19 +362,18 @@ pub fn query_activity(
     let project_clause = build_project_clause_at("p.id", project_ids, 3);
 
     // Build the "my items" subquery fragments for issue/MR association checks.
-    // These ensure we only see activity on items CURRENTLY associated with the user
+    // These ensure we only see activity on items associated with the user,
-    // AND currently open (AC-3.6). Without the state filter, activity would include
+    // regardless of state (open, closed, or merged). Comments on merged MRs
-    // events on closed/merged items that don't appear in the dashboard lists.
+    // and closed issues are still relevant (follow-up discussions, post-merge
+    // questions, etc.).
     let my_issue_check = "EXISTS (
         SELECT 1 FROM issue_assignees ia
-        JOIN issues i2 ON ia.issue_id = i2.id
+        WHERE ia.issue_id = {entity_issue_id} AND ia.username = ?1
-        WHERE ia.issue_id = {entity_issue_id} AND ia.username = ?1 AND i2.state = 'opened'
     )";
     let my_mr_check = "(
-        EXISTS (SELECT 1 FROM merge_requests mr2 WHERE mr2.id = {entity_mr_id} AND mr2.author_username = ?1 AND mr2.state = 'opened')
+        EXISTS (SELECT 1 FROM merge_requests mr2 WHERE mr2.id = {entity_mr_id} AND mr2.author_username = ?1)
         OR EXISTS (SELECT 1 FROM mr_reviewers rv
-            JOIN merge_requests mr3 ON rv.merge_request_id = mr3.id
+            WHERE rv.merge_request_id = {entity_mr_id} AND rv.username = ?1)
-            WHERE rv.merge_request_id = {entity_mr_id} AND rv.username = ?1 AND mr3.state = 'opened')
     )";
 
     // Source 1: Human comments on my items
@@ -489,7 +573,7 @@ struct RawSinceCheckRow {
 
 /// Query actionable events from others since `cursor_ms`.
 /// Returns events from three sources:
-/// 1. Others' comments on my open items
+/// 1. Others' comments on my items (any state)
 /// 2. @mentions on any item (not restricted to my items)
 /// 3. Assignment/review-request system notes mentioning me
 pub fn query_since_last_check(
@@ -498,19 +582,18 @@ pub fn query_since_last_check(
     cursor_ms: i64,
 ) -> Result<Vec<SinceCheckGroup>> {
     // Build the "my items" subquery fragments (reused from activity).
+    // No state filter: comments on closed/merged items are still actionable.
     let my_issue_check = "EXISTS (
         SELECT 1 FROM issue_assignees ia
-        JOIN issues i2 ON ia.issue_id = i2.id
+        WHERE ia.issue_id = {entity_issue_id} AND ia.username = ?1
-        WHERE ia.issue_id = {entity_issue_id} AND ia.username = ?1 AND i2.state = 'opened'
     )";
     let my_mr_check = "(
-        EXISTS (SELECT 1 FROM merge_requests mr2 WHERE mr2.id = {entity_mr_id} AND mr2.author_username = ?1 AND mr2.state = 'opened')
+        EXISTS (SELECT 1 FROM merge_requests mr2 WHERE mr2.id = {entity_mr_id} AND mr2.author_username = ?1)
         OR EXISTS (SELECT 1 FROM mr_reviewers rv
-            JOIN merge_requests mr3 ON rv.merge_request_id = mr3.id
+            WHERE rv.merge_request_id = {entity_mr_id} AND rv.username = ?1)
-            WHERE rv.merge_request_id = {entity_mr_id} AND rv.username = ?1 AND mr3.state = 'opened')
     )";
 
-    // Source 1: Others' comments on my open items
+    // Source 1: Others' comments on my items (any state)
     let source1 = format!(
         "SELECT n.created_at, 'note',
             CASE WHEN d.issue_id IS NOT NULL THEN 'issue' ELSE 'mr' END,
@@ -687,6 +770,223 @@ fn group_since_check_events(rows: Vec<RawSinceCheckRow>) -> Vec<SinceCheckGroup>
     result
 }
 
+// ─── Mentioned In (issues/MRs where user is @mentioned but not formally associated)
+
+/// Raw row from the mentioned-in query.
+struct RawMentionRow {
+    entity_type: String,
+    iid: i64,
+    title: String,
+    project_path: String,
+    state: String,
+    updated_at: i64,
+    web_url: Option<String>,
+    my_ts: Option<i64>,
+    others_ts: Option<i64>,
+    any_ts: Option<i64>,
+    mention_body: String,
+}
+
+fn build_mentioned_in_sql(project_clause: &str) -> String {
+    format!(
+        "WITH candidate_issues AS MATERIALIZED (
+            SELECT i.id, i.iid, i.title, p.path_with_namespace, i.state,
+                   i.updated_at, i.web_url
+            FROM issues i
+            JOIN projects p ON i.project_id = p.id
+            WHERE (i.state = 'opened' OR (i.state = 'closed' AND i.updated_at > ?2))
+              AND (i.author_username IS NULL OR i.author_username != ?1)
+              AND NOT EXISTS (
+                SELECT 1 FROM issue_assignees ia
+                WHERE ia.issue_id = i.id AND ia.username = ?1
+              )
+              {project_clause}
+        ),
+        candidate_mrs AS MATERIALIZED (
+            SELECT m.id, m.iid, m.title, p.path_with_namespace, m.state,
+                   m.updated_at, m.web_url
+            FROM merge_requests m
+            JOIN projects p ON m.project_id = p.id
+            WHERE (m.state = 'opened'
+                   OR (m.state IN ('merged', 'closed') AND m.updated_at > ?2))
+              AND m.author_username != ?1
+              AND NOT EXISTS (
+                SELECT 1 FROM mr_reviewers rv
+                WHERE rv.merge_request_id = m.id AND rv.username = ?1
+              )
+              {project_clause}
+        ),
+        note_ts_issue AS MATERIALIZED (
+            SELECT d.issue_id,
+                MAX(CASE WHEN n.author_username = ?1 THEN n.created_at END) AS my_ts,
+                MAX(CASE WHEN n.author_username != ?1 THEN n.created_at END) AS others_ts,
+                MAX(n.created_at) AS any_ts
+            FROM notes n
+            JOIN discussions d ON n.discussion_id = d.id
+            JOIN candidate_issues ci ON ci.id = d.issue_id
+            WHERE n.is_system = 0
+            GROUP BY d.issue_id
+        ),
+        note_ts_mr AS MATERIALIZED (
+            SELECT d.merge_request_id,
+                MAX(CASE WHEN n.author_username = ?1 THEN n.created_at END) AS my_ts,
+                MAX(CASE WHEN n.author_username != ?1 THEN n.created_at END) AS others_ts,
+                MAX(n.created_at) AS any_ts
+            FROM notes n
+            JOIN discussions d ON n.discussion_id = d.id
+            JOIN candidate_mrs cm ON cm.id = d.merge_request_id
+            WHERE n.is_system = 0
+            GROUP BY d.merge_request_id
+        )
+        -- Issue mentions (scoped to candidate entities only)
+        SELECT 'issue', ci.iid, ci.title, ci.path_with_namespace, ci.state,
+               ci.updated_at, ci.web_url,
+               nt.my_ts, nt.others_ts, nt.any_ts,
+               n.body
+        FROM notes n
+        JOIN discussions d ON n.discussion_id = d.id
+        JOIN candidate_issues ci ON ci.id = d.issue_id
+        LEFT JOIN note_ts_issue nt ON nt.issue_id = ci.id
+        WHERE n.is_system = 0
+          AND n.author_username != ?1
+          AND n.created_at > ?3
+          AND LOWER(n.body) LIKE '%@' || LOWER(?1) || '%'
+        UNION ALL
+        -- MR mentions (scoped to candidate entities only)
+        SELECT 'mr', cm.iid, cm.title, cm.path_with_namespace, cm.state,
+               cm.updated_at, cm.web_url,
+               nt.my_ts, nt.others_ts, nt.any_ts,
+               n.body
+        FROM notes n
+        JOIN discussions d ON n.discussion_id = d.id
+        JOIN candidate_mrs cm ON cm.id = d.merge_request_id
+        LEFT JOIN note_ts_mr nt ON nt.merge_request_id = cm.id
+        WHERE n.is_system = 0
+          AND n.author_username != ?1
+          AND n.created_at > ?3
+          AND LOWER(n.body) LIKE '%@' || LOWER(?1) || '%'
+        ORDER BY 6 DESC
+        LIMIT 500",
+    )
+}
+
+/// Query issues and MRs where the user is @mentioned but not assigned/authored/reviewing.
+///
+/// Includes open items unconditionally, plus recently-closed/merged items
+/// (where `updated_at > recency_cutoff_ms`). Only considers mentions in notes
+/// created after `mention_cutoff_ms` (typically 30 days ago).
+///
+/// Returns deduplicated results sorted by attention priority then recency.
+pub fn query_mentioned_in(
+    conn: &Connection,
+    username: &str,
+    project_ids: &[i64],
+    recency_cutoff_ms: i64,
+    mention_cutoff_ms: i64,
+) -> Result<Vec<MeMention>> {
+    let project_clause = build_project_clause_at("p.id", project_ids, 4);
+    // Materialized CTEs avoid pathological query plans for project-scoped mentions.
+    let sql = build_mentioned_in_sql(&project_clause);
+
+    let mut params: Vec<Box<dyn rusqlite::types::ToSql>> = Vec::new();
+    params.push(Box::new(username.to_string()));
+    params.push(Box::new(recency_cutoff_ms));
+    params.push(Box::new(mention_cutoff_ms));
+    for &pid in project_ids {
+        params.push(Box::new(pid));
+    }
+    let param_refs: Vec<&dyn rusqlite::types::ToSql> = params.iter().map(|p| p.as_ref()).collect();
+
+    let mention_re = build_exact_mention_regex(username);
+
+    let mut stmt = conn.prepare(&sql)?;
+    let rows = stmt.query_map(param_refs.as_slice(), |row| {
+        Ok(RawMentionRow {
+            entity_type: row.get(0)?,
+            iid: row.get(1)?,
+            title: row.get::<_, Option<String>>(2)?.unwrap_or_default(),
+            project_path: row.get(3)?,
+            state: row.get(4)?,
+            updated_at: row.get(5)?,
+            web_url: row.get(6)?,
+            my_ts: row.get(7)?,
+            others_ts: row.get(8)?,
+            any_ts: row.get(9)?,
+            mention_body: row.get::<_, Option<String>>(10)?.unwrap_or_default(),
+        })
+    })?;
+
+    let raw: Vec<RawMentionRow> = rows.collect::<std::result::Result<Vec<_>, _>>()?;
+
+    // Post-filter with exact mention regex and deduplicate by entity
+    let mut seen: HashMap<(String, i64, String), RawMentionRow> = HashMap::new();
+    for row in raw {
+        if !contains_exact_mention(&row.mention_body, &mention_re) {
+            continue;
+        }
+        let key = (row.entity_type.clone(), row.iid, row.project_path.clone());
+        // Keep the first occurrence (most recent due to ORDER BY updated_at DESC)
+        seen.entry(key).or_insert(row);
+    }
+
+    let mut mentions: Vec<MeMention> = seen
+        .into_values()
+        .map(|row| {
+            let state = compute_mention_attention(row.my_ts, row.others_ts, row.any_ts);
+            let reason = format_attention_reason(&state, row.my_ts, row.others_ts, row.any_ts);
+            MeMention {
+                entity_type: row.entity_type,
+                iid: row.iid,
+                title: row.title,
+                project_path: row.project_path,
+                state: row.state,
+                attention_state: state,
+                attention_reason: reason,
+                updated_at: row.updated_at,
+                web_url: row.web_url,
+            }
+        })
+        .collect();
+
+    // Sort by attention priority (needs_attention first), then by updated_at DESC
+    mentions.sort_by(|a, b| {
+        a.attention_state
+            .cmp(&b.attention_state)
+            .then_with(|| b.updated_at.cmp(&a.updated_at))
+    });
+
+    Ok(mentions)
+}
+
+/// Compute attention state for a mentioned-in item.
+/// Same logic as the other sections, but without the not_ready variant
+/// since it's less relevant for mention-only items.
+fn compute_mention_attention(
+    my_ts: Option<i64>,
+    others_ts: Option<i64>,
+    any_ts: Option<i64>,
+) -> AttentionState {
+    // Stale check
+    if let Some(ts) = any_ts
+        && ts < crate::core::time::now_ms() - STALE_THRESHOLD_MS
+    {
+        return AttentionState::Stale;
+    }
+    // Others commented after me (or I never engaged but others have)
+    if let Some(ots) = others_ts
+        && my_ts.is_none_or(|mts| ots > mts)
+    {
+        return AttentionState::NeedsAttention;
+    }
+    // I replied and my reply is >= others' latest
+    if let Some(mts) = my_ts
+        && mts >= others_ts.unwrap_or(0)
+    {
+        return AttentionState::AwaitingResponse;
+    }
+    AttentionState::NotStarted
+}
+
 // ─── Helpers ────────────────────────────────────────────────────────────────
 
 /// Parse attention state string from SQL CASE result.

src/cli/commands/me/render_human.rs

@@ -1,8 +1,8 @@
 use crate::cli::render::{self, Align, GlyphMode, Icons, LoreRenderer, StyledCell, Table, Theme};
 
 use super::types::{
-    ActivityEventType, AttentionState, MeActivityEvent, MeDashboard, MeIssue, MeMr, MeSummary,
+    ActivityEventType, AttentionState, MeActivityEvent, MeDashboard, MeIssue, MeMention, MeMr,
-    SinceLastCheck,
+    MeSummary, SinceLastCheck,
 };
 
 // ─── Layout Helpers ─────────────────────────────────────────────────────────
@@ -164,12 +164,19 @@ pub fn print_summary_header(summary: &MeSummary, username: &str) {
         Theme::dim().render("0 need attention")
     };
 
+    let mentioned = if summary.mentioned_in_count > 0 {
+        format!("  {} mentioned", summary.mentioned_in_count)
+    } else {
+        String::new()
+    };
+
     println!(
-        "  {} projects  {} issues  {} authored MRs  {} reviewing MRs  {}",
+        "  {} projects  {} issues  {} authored MRs  {} reviewing MRs{}  {}",
         summary.project_count,
         summary.open_issue_count,
         summary.authored_mr_count,
         summary.reviewing_mr_count,
+        mentioned,
         needs,
     );
 
@@ -342,6 +349,53 @@ pub fn print_reviewing_mrs_section(mrs: &[MeMr], single_project: bool) {
     }
 }
 
+// ─── Mentioned In Section ────────────────────────────────────────────────
+
+/// Print the "Mentioned In" section for items where user is @mentioned but
+/// not assigned, authored, or reviewing.
+pub fn print_mentioned_in_section(mentions: &[MeMention], single_project: bool) {
+    if mentions.is_empty() {
+        return;
+    }
+
+    println!(
+        "{}",
+        render::section_divider(&format!("Mentioned In ({})", mentions.len()))
+    );
+
+    for item in mentions {
+        let attn = styled_attention(&item.attention_state);
+        let ref_str = match item.entity_type.as_str() {
+            "issue" => format!("#{}", item.iid),
+            "mr" => format!("!{}", item.iid),
+            _ => format!("{}:{}", item.entity_type, item.iid),
+        };
+        let ref_style = match item.entity_type.as_str() {
+            "issue" => Theme::issue_ref(),
+            "mr" => Theme::mr_ref(),
+            _ => Theme::bold(),
+        };
+        let state_tag = match item.state.as_str() {
+            "opened" => String::new(),
+            other => format!(" [{}]", other),
+        };
+        let time = render::format_relative_time(item.updated_at);
+
+        println!(
+            "    {} {}  {}{}  {}",
+            attn,
+            ref_style.render(&ref_str),
+            render::truncate(&item.title, title_width(43)),
+            Theme::dim().render(&state_tag),
+            Theme::dim().render(&time),
+        );
+
+        if !single_project {
+            println!("      {}", Theme::dim().render(&item.project_path));
+        }
+    }
+}
+
 // ─── Activity Feed ───────────────────────────────────────────────────────────
 
 /// Print the activity feed section (Task #17).
@@ -587,6 +641,7 @@ pub fn print_me_dashboard(dashboard: &MeDashboard, single_project: bool) {
     print_issues_section(&dashboard.open_issues, single_project);
     print_authored_mrs_section(&dashboard.open_mrs_authored, single_project);
     print_reviewing_mrs_section(&dashboard.reviewing_mrs, single_project);
+    print_mentioned_in_section(&dashboard.mentioned_in, single_project);
     print_activity_section(&dashboard.activity, single_project);
     println!();
 }
@@ -597,6 +652,7 @@ pub fn print_me_dashboard_filtered(
     single_project: bool,
     show_issues: bool,
     show_mrs: bool,
+    show_mentions: bool,
     show_activity: bool,
 ) {
     if let Some(ref since) = dashboard.since_last_check {
@@ -611,6 +667,9 @@ pub fn print_me_dashboard_filtered(
         print_authored_mrs_section(&dashboard.open_mrs_authored, single_project);
         print_reviewing_mrs_section(&dashboard.reviewing_mrs, single_project);
     }
+    if show_mentions {
+        print_mentioned_in_section(&dashboard.mentioned_in, single_project);
+    }
     if show_activity {
         print_activity_section(&dashboard.activity, single_project);
     }

src/cli/commands/me/render_robot.rs

@@ -4,8 +4,8 @@ use crate::cli::robot::RobotMeta;
 use crate::core::time::ms_to_iso;
 
 use super::types::{
-    ActivityEventType, AttentionState, MeActivityEvent, MeDashboard, MeIssue, MeMr, MeSummary,
+    ActivityEventType, AttentionState, MeActivityEvent, MeDashboard, MeIssue, MeMention, MeMr,
-    SinceCheckEvent, SinceCheckGroup, SinceLastCheck,
+    MeSummary, SinceCheckEvent, SinceCheckGroup, SinceLastCheck,
 };
 
 // ─── Robot JSON Output (Task #18) ────────────────────────────────────────────
@@ -15,11 +15,12 @@ pub fn print_me_json(
     dashboard: &MeDashboard,
     elapsed_ms: u64,
     fields: Option<&[String]>,
+    gitlab_base_url: &str,
 ) -> crate::core::error::Result<()> {
     let envelope = MeJsonEnvelope {
         ok: true,
         data: MeDataJson::from_dashboard(dashboard),
-        meta: RobotMeta { elapsed_ms },
+        meta: RobotMeta::with_base_url(elapsed_ms, gitlab_base_url),
     };
 
     let mut value = serde_json::to_value(&envelope)
@@ -28,11 +29,15 @@ pub fn print_me_json(
     // Apply --fields filtering (Task #19)
     if let Some(f) = fields {
         let expanded = crate::cli::robot::expand_fields_preset(f, "me_items");
-        // Filter all item arrays
+        // Filter issue/MR arrays with the items preset
         for key in &["open_issues", "open_mrs_authored", "reviewing_mrs"] {
             crate::cli::robot::filter_fields(&mut value, key, &expanded);
         }
 
+        // Mentioned-in gets its own preset (needs entity_type + state to disambiguate)
+        let mentions_expanded = crate::cli::robot::expand_fields_preset(f, "me_mentions");
+        crate::cli::robot::filter_fields(&mut value, "mentioned_in", &mentions_expanded);
+
         // Activity gets its own minimal preset
         let activity_expanded = crate::cli::robot::expand_fields_preset(f, "me_activity");
         crate::cli::robot::filter_fields(&mut value, "activity", &activity_expanded);
@@ -84,6 +89,7 @@ struct MeDataJson {
     open_issues: Vec<IssueJson>,
     open_mrs_authored: Vec<MrJson>,
     reviewing_mrs: Vec<MrJson>,
+    mentioned_in: Vec<MentionJson>,
     activity: Vec<ActivityJson>,
 }
 
@@ -97,6 +103,7 @@ impl MeDataJson {
             open_issues: d.open_issues.iter().map(IssueJson::from).collect(),
             open_mrs_authored: d.open_mrs_authored.iter().map(MrJson::from).collect(),
             reviewing_mrs: d.reviewing_mrs.iter().map(MrJson::from).collect(),
+            mentioned_in: d.mentioned_in.iter().map(MentionJson::from).collect(),
             activity: d.activity.iter().map(ActivityJson::from).collect(),
         }
     }
@@ -110,6 +117,7 @@ struct SummaryJson {
     open_issue_count: usize,
     authored_mr_count: usize,
     reviewing_mr_count: usize,
+    mentioned_in_count: usize,
     needs_attention_count: usize,
 }
 
@@ -120,6 +128,7 @@ impl From<&MeSummary> for SummaryJson {
             open_issue_count: s.open_issue_count,
             authored_mr_count: s.authored_mr_count,
             reviewing_mr_count: s.reviewing_mr_count,
+            mentioned_in_count: s.mentioned_in_count,
             needs_attention_count: s.needs_attention_count,
         }
     }
@@ -134,6 +143,7 @@ struct IssueJson {
     title: String,
     state: String,
     attention_state: String,
+    attention_reason: String,
     status_name: Option<String>,
     labels: Vec<String>,
     updated_at_iso: String,
@@ -148,6 +158,7 @@ impl From<&MeIssue> for IssueJson {
             title: i.title.clone(),
             state: "opened".to_string(),
             attention_state: attention_state_str(&i.attention_state),
+            attention_reason: i.attention_reason.clone(),
             status_name: i.status_name.clone(),
             labels: i.labels.clone(),
             updated_at_iso: ms_to_iso(i.updated_at),
@@ -165,6 +176,7 @@ struct MrJson {
     title: String,
     state: String,
     attention_state: String,
+    attention_reason: String,
     draft: bool,
     detailed_merge_status: Option<String>,
     author_username: Option<String>,
@@ -181,6 +193,7 @@ impl From<&MeMr> for MrJson {
             title: m.title.clone(),
             state: "opened".to_string(),
             attention_state: attention_state_str(&m.attention_state),
+            attention_reason: m.attention_reason.clone(),
             draft: m.draft,
             detailed_merge_status: m.detailed_merge_status.clone(),
             author_username: m.author_username.clone(),
@@ -191,6 +204,37 @@ impl From<&MeMr> for MrJson {
     }
 }
 
+// ─── Mention ─────────────────────────────────────────────────────────────
+
+#[derive(Serialize)]
+struct MentionJson {
+    entity_type: String,
+    project: String,
+    iid: i64,
+    title: String,
+    state: String,
+    attention_state: String,
+    attention_reason: String,
+    updated_at_iso: String,
+    web_url: Option<String>,
+}
+
+impl From<&MeMention> for MentionJson {
+    fn from(m: &MeMention) -> Self {
+        Self {
+            entity_type: m.entity_type.clone(),
+            project: m.project_path.clone(),
+            iid: m.iid,
+            title: m.title.clone(),
+            state: m.state.clone(),
+            attention_state: attention_state_str(&m.attention_state),
+            attention_reason: m.attention_reason.clone(),
+            updated_at_iso: ms_to_iso(m.updated_at),
+            web_url: m.web_url.clone(),
+        }
+    }
+}
+
 // ─── Activity ────────────────────────────────────────────────────────────────
 
 #[derive(Serialize)]
@@ -365,6 +409,7 @@ mod tests {
             title: "Fix auth bug".to_string(),
             project_path: "group/repo".to_string(),
             attention_state: AttentionState::NeedsAttention,
+            attention_reason: "Others commented recently; you haven't replied".to_string(),
             status_name: Some("In progress".to_string()),
             labels: vec!["bug".to_string()],
             updated_at: 1_700_000_000_000,
@@ -373,6 +418,10 @@ mod tests {
         let json = IssueJson::from(&issue);
         assert_eq!(json.iid, 42);
         assert_eq!(json.attention_state, "needs_attention");
+        assert_eq!(
+            json.attention_reason,
+            "Others commented recently; you haven't replied"
+        );
         assert_eq!(json.state, "opened");
         assert_eq!(json.status_name, Some("In progress".to_string()));
     }
@@ -384,6 +433,7 @@ mod tests {
             title: "Add feature".to_string(),
             project_path: "group/repo".to_string(),
             attention_state: AttentionState::AwaitingResponse,
+            attention_reason: "You replied moments ago; awaiting others".to_string(),
             draft: true,
             detailed_merge_status: Some("mergeable".to_string()),
             author_username: Some("alice".to_string()),
@@ -394,6 +444,10 @@ mod tests {
         let json = MrJson::from(&mr);
         assert_eq!(json.iid, 99);
         assert_eq!(json.attention_state, "awaiting_response");
+        assert_eq!(
+            json.attention_reason,
+            "You replied moments ago; awaiting others"
+        );
         assert!(json.draft);
         assert_eq!(json.author_username, Some("alice".to_string()));
     }
@@ -425,4 +479,107 @@ mod tests {
         assert_eq!(value["data"]["cursor_reset"], serde_json::json!(true));
         assert_eq!(value["meta"]["elapsed_ms"], serde_json::json!(17));
     }
+
+    /// Integration test: full envelope serialization includes gitlab_base_url in meta.
+    /// Guards against drift where the wiring from run_me -> print_me_json -> JSON
+    /// could silently lose the base URL field.
+    #[test]
+    fn me_envelope_includes_gitlab_base_url_in_meta() {
+        let dashboard = MeDashboard {
+            username: "testuser".to_string(),
+            since_ms: Some(1_700_000_000_000),
+            summary: MeSummary {
+                project_count: 1,
+                open_issue_count: 0,
+                authored_mr_count: 0,
+                reviewing_mr_count: 0,
+                mentioned_in_count: 0,
+                needs_attention_count: 0,
+            },
+            open_issues: vec![],
+            open_mrs_authored: vec![],
+            reviewing_mrs: vec![],
+            mentioned_in: vec![],
+            activity: vec![],
+            since_last_check: None,
+        };
+
+        let envelope = MeJsonEnvelope {
+            ok: true,
+            data: MeDataJson::from_dashboard(&dashboard),
+            meta: RobotMeta::with_base_url(42, "https://gitlab.example.com"),
+        };
+
+        let value = serde_json::to_value(&envelope).unwrap();
+        assert_eq!(value["ok"], serde_json::json!(true));
+        assert_eq!(value["meta"]["elapsed_ms"], serde_json::json!(42));
+        assert_eq!(
+            value["meta"]["gitlab_base_url"],
+            serde_json::json!("https://gitlab.example.com")
+        );
+    }
+
+    /// Verify activity events carry the fields needed for URL construction
+    /// (entity_type, entity_iid, project) so consumers can combine with
+    /// meta.gitlab_base_url to build links.
+    #[test]
+    fn activity_event_carries_url_construction_fields() {
+        let dashboard = MeDashboard {
+            username: "testuser".to_string(),
+            since_ms: Some(1_700_000_000_000),
+            summary: MeSummary {
+                project_count: 1,
+                open_issue_count: 0,
+                authored_mr_count: 0,
+                reviewing_mr_count: 0,
+                mentioned_in_count: 0,
+                needs_attention_count: 0,
+            },
+            open_issues: vec![],
+            open_mrs_authored: vec![],
+            reviewing_mrs: vec![],
+            mentioned_in: vec![],
+            activity: vec![MeActivityEvent {
+                timestamp: 1_700_000_000_000,
+                event_type: ActivityEventType::Note,
+                entity_type: "mr".to_string(),
+                entity_iid: 99,
+                project_path: "group/repo".to_string(),
+                actor: Some("alice".to_string()),
+                is_own: false,
+                summary: "Commented on MR".to_string(),
+                body_preview: None,
+            }],
+            since_last_check: None,
+        };
+
+        let envelope = MeJsonEnvelope {
+            ok: true,
+            data: MeDataJson::from_dashboard(&dashboard),
+            meta: RobotMeta::with_base_url(0, "https://gitlab.example.com"),
+        };
+
+        let value = serde_json::to_value(&envelope).unwrap();
+        let event = &value["data"]["activity"][0];
+
+        // These three fields + meta.gitlab_base_url = complete URL
+        assert_eq!(event["entity_type"], "mr");
+        assert_eq!(event["entity_iid"], 99);
+        assert_eq!(event["project"], "group/repo");
+
+        // Consumer constructs: https://gitlab.example.com/group/repo/-/merge_requests/99
+        let base = value["meta"]["gitlab_base_url"].as_str().unwrap();
+        let project = event["project"].as_str().unwrap();
+        let entity_path = match event["entity_type"].as_str().unwrap() {
+            "issue" => "issues",
+            "mr" => "merge_requests",
+            other => panic!("unexpected entity_type: {other}"),
+        };
+        let iid = event["entity_iid"].as_i64().unwrap();
+        let url = format!("{base}/{project}/-/{entity_path}/{iid}");
+        assert_eq!(
+            url,
+            "https://gitlab.example.com/group/repo/-/merge_requests/99"
+        );
+    }
 }

src/cli/commands/me/types.rs

@@ -44,6 +44,7 @@ pub struct MeSummary {
     pub open_issue_count: usize,
     pub authored_mr_count: usize,
     pub reviewing_mr_count: usize,
+    pub mentioned_in_count: usize,
     pub needs_attention_count: usize,
 }
 
@@ -53,6 +54,7 @@ pub struct MeIssue {
     pub title: String,
     pub project_path: String,
     pub attention_state: AttentionState,
+    pub attention_reason: String,
     pub status_name: Option<String>,
     pub labels: Vec<String>,
     pub updated_at: i64,
@@ -65,6 +67,7 @@ pub struct MeMr {
     pub title: String,
     pub project_path: String,
     pub attention_state: AttentionState,
+    pub attention_reason: String,
     pub draft: bool,
     pub detailed_merge_status: Option<String>,
     pub author_username: Option<String>,
@@ -114,6 +117,21 @@ pub struct SinceLastCheck {
     pub total_event_count: usize,
 }
 
+/// An issue or MR where the user is @mentioned but not formally associated.
+pub struct MeMention {
+    /// "issue" or "mr"
+    pub entity_type: String,
+    pub iid: i64,
+    pub title: String,
+    pub project_path: String,
+    /// "opened", "closed", or "merged"
+    pub state: String,
+    pub attention_state: AttentionState,
+    pub attention_reason: String,
+    pub updated_at: i64,
+    pub web_url: Option<String>,
+}
+
 /// The complete dashboard result.
 pub struct MeDashboard {
     pub username: String,
@@ -122,6 +140,7 @@ pub struct MeDashboard {
     pub open_issues: Vec<MeIssue>,
     pub open_mrs_authored: Vec<MeMr>,
     pub reviewing_mrs: Vec<MeMr>,
+    pub mentioned_in: Vec<MeMention>,
     pub activity: Vec<MeActivityEvent>,
     pub since_last_check: Option<SinceLastCheck>,
 }

src/cli/commands/mod.rs

@@ -5,6 +5,7 @@ pub mod cron;
 pub mod doctor;
 pub mod drift;
 pub mod embed;
+pub mod explain;
 pub mod file_history;
 pub mod generate_docs;
 pub mod ingest;
@@ -17,7 +18,6 @@ pub mod show;
 pub mod stats;
 pub mod sync;
 pub mod sync_status;
-pub mod sync_surgical;
 pub mod timeline;
 pub mod trace;
 pub mod who;
@@ -36,13 +36,17 @@ pub use cron::{
 pub use doctor::{DoctorChecks, print_doctor_results, run_doctor};
 pub use drift::{DriftResponse, print_drift_human, print_drift_json, run_drift};
 pub use embed::{print_embed, print_embed_json, run_embed};
+pub use explain::{handle_explain, print_explain, print_explain_json, run_explain};
 pub use file_history::{print_file_history, print_file_history_json, run_file_history};
 pub use generate_docs::{print_generate_docs, print_generate_docs_json, run_generate_docs};
 pub use ingest::{
     DryRunPreview, IngestDisplay, print_dry_run_preview, print_dry_run_preview_json,
     print_ingest_summary, print_ingest_summary_json, run_ingest, run_ingest_dry_run,
 };
-pub use init::{InitInputs, InitOptions, InitResult, run_init, run_token_set, run_token_show};
+pub use init::{
+    InitInputs, InitOptions, InitResult, RefreshOptions, RefreshResult, delete_orphan_projects,
+    run_init, run_init_refresh, run_token_set, run_token_show,
+};
 pub use list::{
     ListFilters, MrListFilters, NoteListFilters, open_issue_in_browser, open_mr_in_browser,
     print_list_issues, print_list_issues_json, print_list_mrs, print_list_mrs_json,
@@ -58,9 +62,8 @@ pub use show::{
     run_show_mr,
 };
 pub use stats::{print_stats, print_stats_json, run_stats};
-pub use sync::{SyncOptions, SyncResult, print_sync, print_sync_json, run_sync};
+pub use sync::{SyncOptions, SyncResult, print_sync, print_sync_json, run_sync, run_sync_surgical};
 pub use sync_status::{print_sync_status, print_sync_status_json, run_sync_status};
-pub use sync_surgical::run_sync_surgical;
 pub use timeline::{TimelineParams, print_timeline, print_timeline_json_with_meta, run_timeline};
 pub use trace::{parse_trace_path, print_trace, print_trace_json};
 pub use who::{WhoRun, print_who_human, print_who_json, run_who};

src/cli/commands/related.rs

@@ -558,7 +558,7 @@ pub fn print_related_human(response: &RelatedResponse) {
 }
 
 pub fn print_related_json(response: &RelatedResponse, elapsed_ms: u64) {
-    let meta = RobotMeta { elapsed_ms };
+    let meta = RobotMeta::new(elapsed_ms);
     let output = serde_json::json!({
         "ok": true,
         "data": response,

src/cli/commands/search.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use crate::cli::render::Theme;
+use crate::cli::render::{self, Theme};
 use serde::Serialize;
 
 use crate::Config;
@@ -20,11 +20,16 @@ use crate::search::{
 pub struct SearchResultDisplay {
     pub document_id: i64,
     pub source_type: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_entity_iid: Option<i64>,
     pub title: String,
     pub url: Option<String>,
     pub author: Option<String>,
     pub created_at: Option<String>,
     pub updated_at: Option<String>,
+    /// Raw epoch ms for human rendering; not serialized to JSON.
+    #[serde(skip)]
+    pub updated_at_ms: Option<i64>,
     pub project_path: String,
     pub labels: Vec<String>,
     pub paths: Vec<String>,
@@ -216,11 +221,13 @@ pub async fn run_search(
         results.push(SearchResultDisplay {
             document_id: row.document_id,
             source_type: row.source_type.clone(),
+            source_entity_iid: row.source_entity_iid,
             title: row.title.clone().unwrap_or_default(),
             url: row.url.clone(),
             author: row.author.clone(),
             created_at: row.created_at.map(ms_to_iso),
             updated_at: row.updated_at.map(ms_to_iso),
+            updated_at_ms: row.updated_at,
             project_path: row.project_path.clone(),
             labels: row.labels.clone(),
             paths: row.paths.clone(),
@@ -242,6 +249,7 @@ pub async fn run_search(
 struct HydratedRow {
     document_id: i64,
     source_type: String,
+    source_entity_iid: Option<i64>,
     title: Option<String>,
     url: Option<String>,
     author: Option<String>,
@@ -268,7 +276,26 @@ fn hydrate_results(conn: &rusqlite::Connection, document_ids: &[i64]) -> Result<
                (SELECT json_group_array(dl.label_name)
                 FROM document_labels dl WHERE dl.document_id = d.id) AS labels_json,
                (SELECT json_group_array(dp.path)
-                FROM document_paths dp WHERE dp.document_id = d.id) AS paths_json
+                FROM document_paths dp WHERE dp.document_id = d.id) AS paths_json,
+               CASE d.source_type
+                 WHEN 'issue' THEN
+                   (SELECT i.iid FROM issues i WHERE i.id = d.source_id)
+                 WHEN 'merge_request' THEN
+                   (SELECT m.iid FROM merge_requests m WHERE m.id = d.source_id)
+                 WHEN 'discussion' THEN
+                   (SELECT COALESCE(
+                     (SELECT i.iid FROM issues i WHERE i.id = disc.issue_id),
+                     (SELECT m.iid FROM merge_requests m WHERE m.id = disc.merge_request_id)
+                   ) FROM discussions disc WHERE disc.id = d.source_id)
+                 WHEN 'note' THEN
+                   (SELECT COALESCE(
+                     (SELECT i.iid FROM issues i WHERE i.id = disc.issue_id),
+                     (SELECT m.iid FROM merge_requests m WHERE m.id = disc.merge_request_id)
+                   ) FROM notes n
+                   JOIN discussions disc ON disc.id = n.discussion_id
+                   WHERE n.id = d.source_id)
+                 ELSE NULL
+               END AS source_entity_iid
         FROM json_each(?1) AS j
         JOIN documents d ON d.id = j.value
         JOIN projects p ON p.id = d.project_id
@@ -293,6 +320,7 @@ fn hydrate_results(conn: &rusqlite::Connection, document_ids: &[i64]) -> Result<
                 project_path: row.get(8)?,
                 labels: parse_json_array(&labels_json),
                 paths: parse_json_array(&paths_json),
+                source_entity_iid: row.get(11)?,
             })
         })?
         .collect::<std::result::Result<Vec<_>, _>>()?;
@@ -309,6 +337,96 @@ fn parse_json_array(json: &str) -> Vec<String> {
         .collect()
 }
 
+/// Collapse newlines and runs of whitespace in a snippet into single spaces.
+///
+/// Document `content_text` includes multi-line metadata (Project:, URL:, Labels:, etc.).
+/// FTS5 snippet() preserves these newlines, causing unindented lines when rendered.
+fn collapse_newlines(s: &str) -> String {
+    let mut result = String::with_capacity(s.len());
+    let mut prev_was_space = false;
+    for c in s.chars() {
+        if c.is_whitespace() {
+            if !prev_was_space {
+                result.push(' ');
+                prev_was_space = true;
+            }
+        } else {
+            result.push(c);
+            prev_was_space = false;
+        }
+    }
+    result
+}
+
+/// Truncate a snippet to `max_visible` visible characters, respecting `<mark>` tag boundaries.
+///
+/// Counts only visible text (not tags) toward the limit, and ensures we never cut
+/// inside a `<mark>...</mark>` pair (which would break `render_snippet` highlighting).
+fn truncate_snippet(snippet: &str, max_visible: usize) -> String {
+    if max_visible < 4 {
+        return snippet.to_string();
+    }
+
+    let mut visible_count = 0;
+    let mut result = String::new();
+    let mut remaining = snippet;
+
+    while !remaining.is_empty() {
+        if let Some(start) = remaining.find("<mark>") {
+            // Count visible chars before the tag
+            let before = &remaining[..start];
+            let before_len = before.chars().count();
+            if visible_count + before_len >= max_visible.saturating_sub(3) {
+                // Truncate within the pre-tag text
+                let take = max_visible.saturating_sub(3).saturating_sub(visible_count);
+                let truncated: String = before.chars().take(take).collect();
+                result.push_str(&truncated);
+                result.push_str("...");
+                return result;
+            }
+            result.push_str(before);
+            visible_count += before_len;
+
+            // Find matching </mark>
+            let after_open = &remaining[start + 6..];
+            if let Some(end) = after_open.find("</mark>") {
+                let highlighted = &after_open[..end];
+                let hl_len = highlighted.chars().count();
+                if visible_count + hl_len >= max_visible.saturating_sub(3) {
+                    // Truncate within the highlighted text
+                    let take = max_visible.saturating_sub(3).saturating_sub(visible_count);
+                    let truncated: String = highlighted.chars().take(take).collect();
+                    result.push_str("<mark>");
+                    result.push_str(&truncated);
+                    result.push_str("</mark>...");
+                    return result;
+                }
+                result.push_str(&remaining[start..start + 6 + end + 7]);
+                visible_count += hl_len;
+                remaining = &after_open[end + 7..];
+            } else {
+                // Unclosed <mark> — treat rest as plain text
+                result.push_str(&remaining[start..]);
+                break;
+            }
+        } else {
+            // No more tags — handle remaining plain text
+            let rest_len = remaining.chars().count();
+            if visible_count + rest_len > max_visible && max_visible > 3 {
+                let take = max_visible.saturating_sub(3).saturating_sub(visible_count);
+                let truncated: String = remaining.chars().take(take).collect();
+                result.push_str(&truncated);
+                result.push_str("...");
+                return result;
+            }
+            result.push_str(remaining);
+            break;
+        }
+    }
+
+    result
+}
+
 /// Render FTS snippet with `<mark>` tags as terminal highlight style.
 fn render_snippet(snippet: &str) -> String {
     let mut result = String::new();
@@ -326,7 +444,7 @@ fn render_snippet(snippet: &str) -> String {
     result
 }
 
-pub fn print_search_results(response: &SearchResponse) {
+pub fn print_search_results(response: &SearchResponse, explain: bool) {
     if !response.warnings.is_empty() {
         for w in &response.warnings {
             eprintln!("{} {}", Theme::warning().render("Warning:"), w);
@@ -341,11 +459,13 @@ pub fn print_search_results(response: &SearchResponse) {
         return;
     }
 
+    // Phase 6: section divider header
     println!(
-        "\n   {} results for '{}'  {}",
+        "{}",
-        Theme::bold().render(&response.total_results.to_string()),
+        render::section_divider(&format!(
-        Theme::bold().render(&response.query),
+            "{} results for '{}'  {}",
-        Theme::muted().render(&response.mode)
+            response.total_results, response.query, response.mode
+        ))
     );
 
     for (i, result) in response.results.iter().enumerate() {
@@ -359,22 +479,75 @@ pub fn print_search_results(response: &SearchResponse) {
             _ => Theme::muted().render(&format!("{:>5}", &result.source_type)),
         };
 
-        // Title line: rank, type badge, title
+        // Phase 1: entity ref (e.g. #42 or !99)
-        println!(
+        let entity_ref = result
-            "  {:>3}.  {}  {}",
+            .source_entity_iid
-            Theme::muted().render(&(i + 1).to_string()),
+            .map(|iid| match result.source_type.as_str() {
-            type_badge,
+                "issue" | "discussion" | "note" => Theme::issue_ref().render(&format!("#{iid}")),
-            Theme::bold().render(&result.title)
+                "merge_request" => Theme::mr_ref().render(&format!("!{iid}")),
-        );
+                _ => String::new(),
+            });
 
-        // Metadata: project, author, labels — compact middle-dot line
+        // Phase 3: relative time
+        let time_str = result
+            .updated_at_ms
+            .map(|ms| Theme::dim().render(&render::format_relative_time_compact(ms)));
+
+        // Phase 2: build prefix, compute indent from its visible width
+        let prefix = format!("  {:>3}.  {}  ", i + 1, type_badge);
+        let indent = " ".repeat(render::visible_width(&prefix));
+
+        // Title line: rank, type badge, entity ref, title, relative time
+        let mut title_line = prefix;
+        if let Some(ref eref) = entity_ref {
+            title_line.push_str(eref);
+            title_line.push_str("  ");
+        }
+        title_line.push_str(&Theme::bold().render(&result.title));
+        if let Some(ref time) = time_str {
+            title_line.push_str("  ");
+            title_line.push_str(time);
+        }
+        println!("{title_line}");
+
+        // Metadata: project, author — compact middle-dot line
         let sep = Theme::muted().render(" \u{b7} ");
         let mut meta_parts: Vec<String> = Vec::new();
         meta_parts.push(Theme::muted().render(&result.project_path));
         if let Some(ref author) = result.author {
             meta_parts.push(Theme::username().render(&format!("@{author}")));
         }
-        if !result.labels.is_empty() {
+        println!("{indent}{}", meta_parts.join(&sep));
+
+        // Phase 5: limit snippet to ~2 terminal lines.
+        // First collapse newlines — content_text includes multi-line metadata
+        // (Project:, URL:, Labels:, etc.) that would print at column 0.
+        let collapsed = collapse_newlines(&result.snippet);
+        // Truncate based on visible text length (excluding <mark></mark> tags)
+        // to avoid cutting inside a highlight tag pair.
+        let max_snippet_width =
+            render::terminal_width().saturating_sub(render::visible_width(&indent));
+        let max_snippet_chars = max_snippet_width.saturating_mul(2);
+        let snippet = truncate_snippet(&collapsed, max_snippet_chars);
+        let rendered = render_snippet(&snippet);
+        println!("{indent}{rendered}");
+
+        if let Some(ref explain_data) = result.explain {
+            let mut explain_line = format!(
+                "{indent}{} vec={} fts={} rrf={:.4}",
+                Theme::accent().render("explain"),
+                explain_data
+                    .vector_rank
+                    .map(|r| r.to_string())
+                    .unwrap_or_else(|| "-".into()),
+                explain_data
+                    .fts_rank
+                    .map(|r| r.to_string())
+                    .unwrap_or_else(|| "-".into()),
+                explain_data.rrf_score
+            );
+            // Phase 5: labels shown only in explain mode
+            if explain && !result.labels.is_empty() {
                 let label_str = if result.labels.len() <= 3 {
                     result.labels.join(", ")
                 } else {
@@ -384,27 +557,26 @@ pub fn print_search_results(response: &SearchResponse) {
                         result.labels.len() - 2
                     )
                 };
-            meta_parts.push(Theme::muted().render(&label_str));
+                explain_line.push_str(&format!("  {}", Theme::muted().render(&label_str)));
+            }
+            println!("{explain_line}");
+        }
     }
-        println!("        {}", meta_parts.join(&sep));
 
-        // Snippet with highlight styling
+    // Phase 4: drill-down hint footer
-        let rendered = render_snippet(&result.snippet);
+    if let Some(first) = response.results.first()
-        println!("        {rendered}");
+        && let Some(iid) = first.source_entity_iid
-
+    {
-        if let Some(ref explain) = result.explain {
+        let cmd = match first.source_type.as_str() {
+            "issue" | "discussion" | "note" => Some(format!("lore issues {iid}")),
+            "merge_request" => Some(format!("lore mrs {iid}")),
+            _ => None,
+        };
+        if let Some(cmd) = cmd {
             println!(
-                "        {} vec={} fts={} rrf={:.4}",
+                "\n  {} {}",
-                Theme::accent().render("explain"),
+                Theme::dim().render("Tip:"),
-                explain
+                Theme::dim().render(&format!("{cmd} for details"))
-                    .vector_rank
-                    .map(|r| r.to_string())
-                    .unwrap_or_else(|| "-".into()),
-                explain
-                    .fts_rank
-                    .map(|r| r.to_string())
-                    .unwrap_or_else(|| "-".into()),
-                explain.rrf_score
             );
         }
     }
@@ -434,7 +606,13 @@ pub fn print_search_results_json(
         data: response,
         meta: SearchMeta { elapsed_ms },
     };
-    let mut value = serde_json::to_value(&output).unwrap();
+    let mut value = match serde_json::to_value(&output) {
+        Ok(v) => v,
+        Err(e) => {
+            eprintln!("Error serializing search response: {e}");
+            return;
+        }
+    };
     if let Some(f) = fields {
         let expanded = crate::cli::robot::expand_fields_preset(f, "search");
         crate::cli::robot::filter_fields(&mut value, "results", &expanded);
@@ -444,3 +622,89 @@ pub fn print_search_results_json(
         Err(e) => eprintln!("Error serializing to JSON: {e}"),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn truncate_snippet_short_text_unchanged() {
+        let s = "hello world";
+        assert_eq!(truncate_snippet(s, 100), "hello world");
+    }
+
+    #[test]
+    fn truncate_snippet_plain_text_truncated() {
+        let s = "this is a long string that exceeds the limit";
+        let result = truncate_snippet(s, 20);
+        assert!(result.ends_with("..."), "got: {result}");
+        // Visible chars should be <= 20
+        assert!(result.chars().count() <= 20, "got: {result}");
+    }
+
+    #[test]
+    fn truncate_snippet_preserves_mark_tags() {
+        let s = "some text <mark>keyword</mark> and more text here that is long";
+        let result = truncate_snippet(s, 30);
+        // Should not cut inside a <mark> pair
+        let open_count = result.matches("<mark>").count();
+        let close_count = result.matches("</mark>").count();
+        assert_eq!(open_count, close_count, "unbalanced tags in: {result}");
+    }
+
+    #[test]
+    fn truncate_snippet_cuts_before_mark_tag() {
+        let s = "a]very long prefix that exceeds the limit <mark>word</mark>";
+        let result = truncate_snippet(s, 15);
+        assert!(result.ends_with("..."), "got: {result}");
+        // The <mark> tag should not appear since we truncated before reaching it
+        assert!(
+            !result.contains("<mark>"),
+            "should not include tag: {result}"
+        );
+    }
+
+    #[test]
+    fn truncate_snippet_does_not_count_tags_as_visible() {
+        // With tags, raw length is 42 chars. Without tags, visible is 29.
+        let s = "prefix <mark>keyword</mark> suffix text";
+        // If max_visible = 35, the visible text (29 chars) fits — should NOT truncate
+        let result = truncate_snippet(s, 35);
+        assert_eq!(result, s, "should not truncate when visible text fits");
+    }
+
+    #[test]
+    fn truncate_snippet_small_limit_returns_as_is() {
+        let s = "text <mark>x</mark>";
+        // Very small limit should return as-is (guard clause)
+        assert_eq!(truncate_snippet(s, 3), s);
+    }
+
+    #[test]
+    fn collapse_newlines_flattens_multiline_metadata() {
+        let s = "[[Issue]] #4018: Remove math.js\nProject: vs/typescript-code\nURL: https://example.com\nLabels: []";
+        let result = collapse_newlines(s);
+        assert!(
+            !result.contains('\n'),
+            "should not contain newlines: {result}"
+        );
+        assert_eq!(
+            result,
+            "[[Issue]] #4018: Remove math.js Project: vs/typescript-code URL: https://example.com Labels: []"
+        );
+    }
+
+    #[test]
+    fn collapse_newlines_preserves_mark_tags() {
+        let s = "first line\n<mark>keyword</mark>\nsecond line";
+        let result = collapse_newlines(s);
+        assert_eq!(result, "first line <mark>keyword</mark> second line");
+    }
+
+    #[test]
+    fn collapse_newlines_collapses_runs_of_whitespace() {
+        let s = "a  \n\n  b\t\tc";
+        let result = collapse_newlines(s);
+        assert_eq!(result, "a b c");
+    }
+}

src/cli/commands/show/issue.rs

@@ -0,0 +1,312 @@
+#[derive(Debug, Clone, Serialize)]
+pub struct ClosingMrRef {
+    pub iid: i64,
+    pub title: String,
+    pub state: String,
+    pub web_url: Option<String>,
+}
+
+#[derive(Debug, Serialize)]
+pub struct IssueDetail {
+    pub id: i64,
+    pub iid: i64,
+    pub title: String,
+    pub description: Option<String>,
+    pub state: String,
+    pub author_username: String,
+    pub created_at: i64,
+    pub updated_at: i64,
+    pub closed_at: Option<String>,
+    pub confidential: bool,
+    pub web_url: Option<String>,
+    pub project_path: String,
+    pub references_full: String,
+    pub labels: Vec<String>,
+    pub assignees: Vec<String>,
+    pub due_date: Option<String>,
+    pub milestone: Option<String>,
+    pub user_notes_count: i64,
+    pub merge_requests_count: usize,
+    pub closing_merge_requests: Vec<ClosingMrRef>,
+    pub discussions: Vec<DiscussionDetail>,
+    pub status_name: Option<String>,
+    pub status_category: Option<String>,
+    pub status_color: Option<String>,
+    pub status_icon_name: Option<String>,
+    pub status_synced_at: Option<i64>,
+}
+
+#[derive(Debug, Serialize)]
+pub struct DiscussionDetail {
+    pub notes: Vec<NoteDetail>,
+    pub individual_note: bool,
+}
+
+#[derive(Debug, Serialize)]
+pub struct NoteDetail {
+    pub gitlab_id: i64,
+    pub author_username: String,
+    pub body: String,
+    pub created_at: i64,
+    pub is_system: bool,
+}
+
+pub fn run_show_issue(
+    config: &Config,
+    iid: i64,
+    project_filter: Option<&str>,
+) -> Result<IssueDetail> {
+    let db_path = get_db_path(config.storage.db_path.as_deref());
+    let conn = create_connection(&db_path)?;
+
+    let issue = find_issue(&conn, iid, project_filter)?;
+
+    let labels = get_issue_labels(&conn, issue.id)?;
+
+    let assignees = get_issue_assignees(&conn, issue.id)?;
+
+    let closing_mrs = get_closing_mrs(&conn, issue.id)?;
+
+    let discussions = get_issue_discussions(&conn, issue.id)?;
+
+    let references_full = format!("{}#{}", issue.project_path, issue.iid);
+    let merge_requests_count = closing_mrs.len();
+
+    Ok(IssueDetail {
+        id: issue.id,
+        iid: issue.iid,
+        title: issue.title,
+        description: issue.description,
+        state: issue.state,
+        author_username: issue.author_username,
+        created_at: issue.created_at,
+        updated_at: issue.updated_at,
+        closed_at: issue.closed_at,
+        confidential: issue.confidential,
+        web_url: issue.web_url,
+        project_path: issue.project_path,
+        references_full,
+        labels,
+        assignees,
+        due_date: issue.due_date,
+        milestone: issue.milestone_title,
+        user_notes_count: issue.user_notes_count,
+        merge_requests_count,
+        closing_merge_requests: closing_mrs,
+        discussions,
+        status_name: issue.status_name,
+        status_category: issue.status_category,
+        status_color: issue.status_color,
+        status_icon_name: issue.status_icon_name,
+        status_synced_at: issue.status_synced_at,
+    })
+}
+
+#[derive(Debug)]
+struct IssueRow {
+    id: i64,
+    iid: i64,
+    title: String,
+    description: Option<String>,
+    state: String,
+    author_username: String,
+    created_at: i64,
+    updated_at: i64,
+    closed_at: Option<String>,
+    confidential: bool,
+    web_url: Option<String>,
+    project_path: String,
+    due_date: Option<String>,
+    milestone_title: Option<String>,
+    user_notes_count: i64,
+    status_name: Option<String>,
+    status_category: Option<String>,
+    status_color: Option<String>,
+    status_icon_name: Option<String>,
+    status_synced_at: Option<i64>,
+}
+
+fn find_issue(conn: &Connection, iid: i64, project_filter: Option<&str>) -> Result<IssueRow> {
+    let (sql, params): (&str, Vec<Box<dyn rusqlite::ToSql>>) = match project_filter {
+        Some(project) => {
+            let project_id = resolve_project(conn, project)?;
+            (
+                "SELECT i.id, i.iid, i.title, i.description, i.state, i.author_username,
+                        i.created_at, i.updated_at, i.closed_at, i.confidential,
+                        i.web_url, p.path_with_namespace,
+                        i.due_date, i.milestone_title,
+                        (SELECT COUNT(*) FROM notes n
+                         JOIN discussions d ON n.discussion_id = d.id
+                         WHERE d.noteable_type = 'Issue' AND d.issue_id = i.id AND n.is_system = 0) AS user_notes_count,
+                        i.status_name, i.status_category, i.status_color,
+                        i.status_icon_name, i.status_synced_at
+                 FROM issues i
+                 JOIN projects p ON i.project_id = p.id
+                 WHERE i.iid = ? AND i.project_id = ?",
+                vec![Box::new(iid), Box::new(project_id)],
+            )
+        }
+        None => (
+            "SELECT i.id, i.iid, i.title, i.description, i.state, i.author_username,
+                    i.created_at, i.updated_at, i.closed_at, i.confidential,
+                    i.web_url, p.path_with_namespace,
+                    i.due_date, i.milestone_title,
+                    (SELECT COUNT(*) FROM notes n
+                     JOIN discussions d ON n.discussion_id = d.id
+                     WHERE d.noteable_type = 'Issue' AND d.issue_id = i.id AND n.is_system = 0) AS user_notes_count,
+                    i.status_name, i.status_category, i.status_color,
+                    i.status_icon_name, i.status_synced_at
+             FROM issues i
+             JOIN projects p ON i.project_id = p.id
+             WHERE i.iid = ?",
+            vec![Box::new(iid)],
+        ),
+    };
+
+    let param_refs: Vec<&dyn rusqlite::ToSql> = params.iter().map(|p| p.as_ref()).collect();
+
+    let mut stmt = conn.prepare(sql)?;
+    let issues: Vec<IssueRow> = stmt
+        .query_map(param_refs.as_slice(), |row| {
+            let confidential_val: i64 = row.get(9)?;
+            Ok(IssueRow {
+                id: row.get(0)?,
+                iid: row.get(1)?,
+                title: row.get(2)?,
+                description: row.get(3)?,
+                state: row.get(4)?,
+                author_username: row.get(5)?,
+                created_at: row.get(6)?,
+                updated_at: row.get(7)?,
+                closed_at: row.get(8)?,
+                confidential: confidential_val != 0,
+                web_url: row.get(10)?,
+                project_path: row.get(11)?,
+                due_date: row.get(12)?,
+                milestone_title: row.get(13)?,
+                user_notes_count: row.get(14)?,
+                status_name: row.get(15)?,
+                status_category: row.get(16)?,
+                status_color: row.get(17)?,
+                status_icon_name: row.get(18)?,
+                status_synced_at: row.get(19)?,
+            })
+        })?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    match issues.len() {
+        0 => Err(LoreError::NotFound(format!("Issue #{} not found", iid))),
+        1 => Ok(issues.into_iter().next().unwrap()),
+        _ => {
+            let projects: Vec<String> = issues.iter().map(|i| i.project_path.clone()).collect();
+            Err(LoreError::Ambiguous(format!(
+                "Issue #{} exists in multiple projects: {}. Use --project to specify.",
+                iid,
+                projects.join(", ")
+            )))
+        }
+    }
+}
+
+fn get_issue_labels(conn: &Connection, issue_id: i64) -> Result<Vec<String>> {
+    let mut stmt = conn.prepare(
+        "SELECT l.name FROM labels l
+         JOIN issue_labels il ON l.id = il.label_id
+         WHERE il.issue_id = ?
+         ORDER BY l.name",
+    )?;
+
+    let labels: Vec<String> = stmt
+        .query_map([issue_id], |row| row.get(0))?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    Ok(labels)
+}
+
+fn get_issue_assignees(conn: &Connection, issue_id: i64) -> Result<Vec<String>> {
+    let mut stmt = conn.prepare(
+        "SELECT username FROM issue_assignees
+         WHERE issue_id = ?
+         ORDER BY username",
+    )?;
+
+    let assignees: Vec<String> = stmt
+        .query_map([issue_id], |row| row.get(0))?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    Ok(assignees)
+}
+
+fn get_closing_mrs(conn: &Connection, issue_id: i64) -> Result<Vec<ClosingMrRef>> {
+    let mut stmt = conn.prepare(
+        "SELECT mr.iid, mr.title, mr.state, mr.web_url
+         FROM entity_references er
+         JOIN merge_requests mr ON mr.id = er.source_entity_id
+         WHERE er.target_entity_type = 'issue'
+           AND er.target_entity_id = ?
+           AND er.source_entity_type = 'merge_request'
+           AND er.reference_type = 'closes'
+         ORDER BY mr.iid",
+    )?;
+
+    let mrs: Vec<ClosingMrRef> = stmt
+        .query_map([issue_id], |row| {
+            Ok(ClosingMrRef {
+                iid: row.get(0)?,
+                title: row.get(1)?,
+                state: row.get(2)?,
+                web_url: row.get(3)?,
+            })
+        })?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    Ok(mrs)
+}
+
+fn get_issue_discussions(conn: &Connection, issue_id: i64) -> Result<Vec<DiscussionDetail>> {
+    let mut disc_stmt = conn.prepare(
+        "SELECT id, individual_note FROM discussions
+         WHERE issue_id = ?
+         ORDER BY first_note_at",
+    )?;
+
+    let disc_rows: Vec<(i64, bool)> = disc_stmt
+        .query_map([issue_id], |row| {
+            let individual: i64 = row.get(1)?;
+            Ok((row.get(0)?, individual == 1))
+        })?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    let mut note_stmt = conn.prepare(
+        "SELECT gitlab_id, author_username, body, created_at, is_system
+         FROM notes
+         WHERE discussion_id = ?
+         ORDER BY position",
+    )?;
+
+    let mut discussions = Vec::new();
+    for (disc_id, individual_note) in disc_rows {
+        let notes: Vec<NoteDetail> = note_stmt
+            .query_map([disc_id], |row| {
+                let is_system: i64 = row.get(4)?;
+                Ok(NoteDetail {
+                    gitlab_id: row.get(0)?,
+                    author_username: row.get(1)?,
+                    body: row.get(2)?,
+                    created_at: row.get(3)?,
+                    is_system: is_system == 1,
+                })
+            })?
+            .collect::<std::result::Result<Vec<_>, _>>()?;
+
+        let has_user_notes = notes.iter().any(|n| !n.is_system);
+        if has_user_notes || notes.is_empty() {
+            discussions.push(DiscussionDetail {
+                notes,
+                individual_note,
+            });
+        }
+    }
+
+    Ok(discussions)
+}

src/cli/commands/show/mod.rs

@@ -0,0 +1,19 @@
+use crate::cli::render::{self, Icons, Theme};
+use rusqlite::Connection;
+use serde::Serialize;
+
+use crate::Config;
+use crate::cli::robot::RobotMeta;
+use crate::core::db::create_connection;
+use crate::core::error::{LoreError, Result};
+use crate::core::paths::get_db_path;
+use crate::core::project::resolve_project;
+use crate::core::time::ms_to_iso;
+
+include!("issue.rs");
+include!("mr.rs");
+include!("render.rs");
+
+#[cfg(test)]
+#[path = "show_tests.rs"]
+mod tests;

src/cli/commands/show/mr.rs

@@ -0,0 +1,285 @@
+#[derive(Debug, Serialize)]
+pub struct MrDetail {
+    pub id: i64,
+    pub iid: i64,
+    pub title: String,
+    pub description: Option<String>,
+    pub state: String,
+    pub draft: bool,
+    pub author_username: String,
+    pub source_branch: String,
+    pub target_branch: String,
+    pub created_at: i64,
+    pub updated_at: i64,
+    pub merged_at: Option<i64>,
+    pub closed_at: Option<i64>,
+    pub web_url: Option<String>,
+    pub project_path: String,
+    pub labels: Vec<String>,
+    pub assignees: Vec<String>,
+    pub reviewers: Vec<String>,
+    pub discussions: Vec<MrDiscussionDetail>,
+}
+
+#[derive(Debug, Serialize)]
+pub struct MrDiscussionDetail {
+    pub notes: Vec<MrNoteDetail>,
+    pub individual_note: bool,
+}
+
+#[derive(Debug, Serialize)]
+pub struct MrNoteDetail {
+    pub gitlab_id: i64,
+    pub author_username: String,
+    pub body: String,
+    pub created_at: i64,
+    pub is_system: bool,
+    pub position: Option<DiffNotePosition>,
+}
+
+#[derive(Debug, Clone, Serialize)]
+pub struct DiffNotePosition {
+    pub old_path: Option<String>,
+    pub new_path: Option<String>,
+    pub old_line: Option<i64>,
+    pub new_line: Option<i64>,
+    pub position_type: Option<String>,
+}
+pub fn run_show_mr(config: &Config, iid: i64, project_filter: Option<&str>) -> Result<MrDetail> {
+    let db_path = get_db_path(config.storage.db_path.as_deref());
+    let conn = create_connection(&db_path)?;
+
+    let mr = find_mr(&conn, iid, project_filter)?;
+
+    let labels = get_mr_labels(&conn, mr.id)?;
+
+    let assignees = get_mr_assignees(&conn, mr.id)?;
+
+    let reviewers = get_mr_reviewers(&conn, mr.id)?;
+
+    let discussions = get_mr_discussions(&conn, mr.id)?;
+
+    Ok(MrDetail {
+        id: mr.id,
+        iid: mr.iid,
+        title: mr.title,
+        description: mr.description,
+        state: mr.state,
+        draft: mr.draft,
+        author_username: mr.author_username,
+        source_branch: mr.source_branch,
+        target_branch: mr.target_branch,
+        created_at: mr.created_at,
+        updated_at: mr.updated_at,
+        merged_at: mr.merged_at,
+        closed_at: mr.closed_at,
+        web_url: mr.web_url,
+        project_path: mr.project_path,
+        labels,
+        assignees,
+        reviewers,
+        discussions,
+    })
+}
+
+struct MrRow {
+    id: i64,
+    iid: i64,
+    title: String,
+    description: Option<String>,
+    state: String,
+    draft: bool,
+    author_username: String,
+    source_branch: String,
+    target_branch: String,
+    created_at: i64,
+    updated_at: i64,
+    merged_at: Option<i64>,
+    closed_at: Option<i64>,
+    web_url: Option<String>,
+    project_path: String,
+}
+
+fn find_mr(conn: &Connection, iid: i64, project_filter: Option<&str>) -> Result<MrRow> {
+    let (sql, params): (&str, Vec<Box<dyn rusqlite::ToSql>>) = match project_filter {
+        Some(project) => {
+            let project_id = resolve_project(conn, project)?;
+            (
+                "SELECT m.id, m.iid, m.title, m.description, m.state, m.draft,
+                        m.author_username, m.source_branch, m.target_branch,
+                        m.created_at, m.updated_at, m.merged_at, m.closed_at,
+                        m.web_url, p.path_with_namespace
+                 FROM merge_requests m
+                 JOIN projects p ON m.project_id = p.id
+                 WHERE m.iid = ? AND m.project_id = ?",
+                vec![Box::new(iid), Box::new(project_id)],
+            )
+        }
+        None => (
+            "SELECT m.id, m.iid, m.title, m.description, m.state, m.draft,
+                    m.author_username, m.source_branch, m.target_branch,
+                    m.created_at, m.updated_at, m.merged_at, m.closed_at,
+                    m.web_url, p.path_with_namespace
+             FROM merge_requests m
+             JOIN projects p ON m.project_id = p.id
+             WHERE m.iid = ?",
+            vec![Box::new(iid)],
+        ),
+    };
+
+    let param_refs: Vec<&dyn rusqlite::ToSql> = params.iter().map(|p| p.as_ref()).collect();
+
+    let mut stmt = conn.prepare(sql)?;
+    let mrs: Vec<MrRow> = stmt
+        .query_map(param_refs.as_slice(), |row| {
+            let draft_val: i64 = row.get(5)?;
+            Ok(MrRow {
+                id: row.get(0)?,
+                iid: row.get(1)?,
+                title: row.get(2)?,
+                description: row.get(3)?,
+                state: row.get(4)?,
+                draft: draft_val == 1,
+                author_username: row.get(6)?,
+                source_branch: row.get(7)?,
+                target_branch: row.get(8)?,
+                created_at: row.get(9)?,
+                updated_at: row.get(10)?,
+                merged_at: row.get(11)?,
+                closed_at: row.get(12)?,
+                web_url: row.get(13)?,
+                project_path: row.get(14)?,
+            })
+        })?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    match mrs.len() {
+        0 => Err(LoreError::NotFound(format!("MR !{} not found", iid))),
+        1 => Ok(mrs.into_iter().next().unwrap()),
+        _ => {
+            let projects: Vec<String> = mrs.iter().map(|m| m.project_path.clone()).collect();
+            Err(LoreError::Ambiguous(format!(
+                "MR !{} exists in multiple projects: {}. Use --project to specify.",
+                iid,
+                projects.join(", ")
+            )))
+        }
+    }
+}
+
+fn get_mr_labels(conn: &Connection, mr_id: i64) -> Result<Vec<String>> {
+    let mut stmt = conn.prepare(
+        "SELECT l.name FROM labels l
+         JOIN mr_labels ml ON l.id = ml.label_id
+         WHERE ml.merge_request_id = ?
+         ORDER BY l.name",
+    )?;
+
+    let labels: Vec<String> = stmt
+        .query_map([mr_id], |row| row.get(0))?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    Ok(labels)
+}
+
+fn get_mr_assignees(conn: &Connection, mr_id: i64) -> Result<Vec<String>> {
+    let mut stmt = conn.prepare(
+        "SELECT username FROM mr_assignees
+         WHERE merge_request_id = ?
+         ORDER BY username",
+    )?;
+
+    let assignees: Vec<String> = stmt
+        .query_map([mr_id], |row| row.get(0))?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    Ok(assignees)
+}
+
+fn get_mr_reviewers(conn: &Connection, mr_id: i64) -> Result<Vec<String>> {
+    let mut stmt = conn.prepare(
+        "SELECT username FROM mr_reviewers
+         WHERE merge_request_id = ?
+         ORDER BY username",
+    )?;
+
+    let reviewers: Vec<String> = stmt
+        .query_map([mr_id], |row| row.get(0))?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    Ok(reviewers)
+}
+
+fn get_mr_discussions(conn: &Connection, mr_id: i64) -> Result<Vec<MrDiscussionDetail>> {
+    let mut disc_stmt = conn.prepare(
+        "SELECT id, individual_note FROM discussions
+         WHERE merge_request_id = ?
+         ORDER BY first_note_at",
+    )?;
+
+    let disc_rows: Vec<(i64, bool)> = disc_stmt
+        .query_map([mr_id], |row| {
+            let individual: i64 = row.get(1)?;
+            Ok((row.get(0)?, individual == 1))
+        })?
+        .collect::<std::result::Result<Vec<_>, _>>()?;
+
+    let mut note_stmt = conn.prepare(
+        "SELECT gitlab_id, author_username, body, created_at, is_system,
+                position_old_path, position_new_path, position_old_line,
+                position_new_line, position_type
+         FROM notes
+         WHERE discussion_id = ?
+         ORDER BY position",
+    )?;
+
+    let mut discussions = Vec::new();
+    for (disc_id, individual_note) in disc_rows {
+        let notes: Vec<MrNoteDetail> = note_stmt
+            .query_map([disc_id], |row| {
+                let is_system: i64 = row.get(4)?;
+                let old_path: Option<String> = row.get(5)?;
+                let new_path: Option<String> = row.get(6)?;
+                let old_line: Option<i64> = row.get(7)?;
+                let new_line: Option<i64> = row.get(8)?;
+                let position_type: Option<String> = row.get(9)?;
+
+                let position = if old_path.is_some()
+                    || new_path.is_some()
+                    || old_line.is_some()
+                    || new_line.is_some()
+                {
+                    Some(DiffNotePosition {
+                        old_path,
+                        new_path,
+                        old_line,
+                        new_line,
+                        position_type,
+                    })
+                } else {
+                    None
+                };
+
+                Ok(MrNoteDetail {
+                    gitlab_id: row.get(0)?,
+                    author_username: row.get(1)?,
+                    body: row.get(2)?,
+                    created_at: row.get(3)?,
+                    is_system: is_system == 1,
+                    position,
+                })
+            })?
+            .collect::<std::result::Result<Vec<_>, _>>()?;
+
+        let has_user_notes = notes.iter().any(|n| !n.is_system);
+        if has_user_notes || notes.is_empty() {
+            discussions.push(MrDiscussionDetail {
+                notes,
+                individual_note,
+            });
+        }
+    }
+
+    Ok(discussions)
+}
+

src/cli/commands/show/render.rs

@@ -0,0 +1,584 @@
+fn format_date(ms: i64) -> String {
+    render::format_date(ms)
+}
+
+fn wrap_text(text: &str, width: usize, indent: &str) -> String {
+    render::wrap_indent(text, width, indent)
+}
+
+pub fn print_show_issue(issue: &IssueDetail) {
+    // Title line
+    println!(
+        "   Issue #{}: {}",
+        issue.iid,
+        Theme::bold().render(&issue.title),
+    );
+
+    // Details section
+    println!("{}", render::section_divider("Details"));
+
+    println!(
+        "     Ref        {}",
+        Theme::muted().render(&issue.references_full)
+    );
+    println!(
+        "     Project    {}",
+        Theme::info().render(&issue.project_path)
+    );
+
+    let (icon, state_style) = if issue.state == "opened" {
+        (Icons::issue_opened(), Theme::success())
+    } else {
+        (Icons::issue_closed(), Theme::dim())
+    };
+    println!(
+        "     State      {}",
+        state_style.render(&format!("{icon} {}", issue.state))
+    );
+
+    if let Some(status) = &issue.status_name {
+        println!(
+            "     Status     {}",
+            render::style_with_hex(status, issue.status_color.as_deref())
+        );
+    }
+
+    if issue.confidential {
+        println!("     {}", Theme::error().bold().render("CONFIDENTIAL"));
+    }
+
+    println!("     Author     @{}", issue.author_username);
+
+    if !issue.assignees.is_empty() {
+        let label = if issue.assignees.len() > 1 {
+            "Assignees"
+        } else {
+            "Assignee"
+        };
+        println!(
+            "     {}{} {}",
+            label,
+            " ".repeat(12 - label.len()),
+            issue
+                .assignees
+                .iter()
+                .map(|a| format!("@{a}"))
+                .collect::<Vec<_>>()
+                .join(", ")
+        );
+    }
+
+    println!(
+        "     Created    {}  ({})",
+        format_date(issue.created_at),
+        render::format_relative_time_compact(issue.created_at),
+    );
+    println!(
+        "     Updated    {}  ({})",
+        format_date(issue.updated_at),
+        render::format_relative_time_compact(issue.updated_at),
+    );
+
+    if let Some(closed_at) = &issue.closed_at {
+        println!("     Closed     {closed_at}");
+    }
+
+    if let Some(due) = &issue.due_date {
+        println!("     Due        {due}");
+    }
+
+    if let Some(ms) = &issue.milestone {
+        println!("     Milestone  {ms}");
+    }
+
+    if !issue.labels.is_empty() {
+        println!(
+            "     Labels     {}",
+            render::format_labels_bare(&issue.labels, issue.labels.len())
+        );
+    }
+
+    if let Some(url) = &issue.web_url {
+        println!("     URL        {}", Theme::muted().render(url));
+    }
+
+    // Development section
+    if !issue.closing_merge_requests.is_empty() {
+        println!("{}", render::section_divider("Development"));
+        for mr in &issue.closing_merge_requests {
+            let (mr_icon, mr_style) = match mr.state.as_str() {
+                "merged" => (Icons::mr_merged(), Theme::accent()),
+                "opened" => (Icons::mr_opened(), Theme::success()),
+                "closed" => (Icons::mr_closed(), Theme::error()),
+                _ => (Icons::mr_opened(), Theme::dim()),
+            };
+            println!(
+                "     {} !{}  {}   {}",
+                mr_style.render(mr_icon),
+                mr.iid,
+                mr.title,
+                mr_style.render(&mr.state),
+            );
+        }
+    }
+
+    // Description section
+    println!("{}", render::section_divider("Description"));
+    if let Some(desc) = &issue.description {
+        let wrapped = wrap_text(desc, 72, "     ");
+        println!("     {wrapped}");
+    } else {
+        println!("     {}", Theme::muted().render("(no description)"));
+    }
+
+    // Discussions section
+    let user_discussions: Vec<&DiscussionDetail> = issue
+        .discussions
+        .iter()
+        .filter(|d| d.notes.iter().any(|n| !n.is_system))
+        .collect();
+
+    if user_discussions.is_empty() {
+        println!("\n     {}", Theme::muted().render("No discussions"));
+    } else {
+        println!(
+            "{}",
+            render::section_divider(&format!("Discussions ({})", user_discussions.len()))
+        );
+
+        for discussion in user_discussions {
+            let user_notes: Vec<&NoteDetail> =
+                discussion.notes.iter().filter(|n| !n.is_system).collect();
+
+            if let Some(first_note) = user_notes.first() {
+                println!(
+                    "     {}  {}",
+                    Theme::info().render(&format!("@{}", first_note.author_username)),
+                    format_date(first_note.created_at),
+                );
+                let wrapped = wrap_text(&first_note.body, 68, "     ");
+                println!("     {wrapped}");
+                println!();
+
+                for reply in user_notes.iter().skip(1) {
+                    println!(
+                        "       {}  {}",
+                        Theme::info().render(&format!("@{}", reply.author_username)),
+                        format_date(reply.created_at),
+                    );
+                    let wrapped = wrap_text(&reply.body, 66, "       ");
+                    println!("       {wrapped}");
+                    println!();
+                }
+            }
+        }
+    }
+}
+
+pub fn print_show_mr(mr: &MrDetail) {
+    // Title line
+    let draft_prefix = if mr.draft {
+        format!("{} ", Icons::mr_draft())
+    } else {
+        String::new()
+    };
+    println!(
+        "   MR !{}: {}{}",
+        mr.iid,
+        draft_prefix,
+        Theme::bold().render(&mr.title),
+    );
+
+    // Details section
+    println!("{}", render::section_divider("Details"));
+
+    println!("     Project    {}", Theme::info().render(&mr.project_path));
+
+    let (icon, state_style) = match mr.state.as_str() {
+        "opened" => (Icons::mr_opened(), Theme::success()),
+        "merged" => (Icons::mr_merged(), Theme::accent()),
+        "closed" => (Icons::mr_closed(), Theme::error()),
+        _ => (Icons::mr_opened(), Theme::dim()),
+    };
+    println!(
+        "     State      {}",
+        state_style.render(&format!("{icon} {}", mr.state))
+    );
+
+    println!(
+        "     Branches   {} -> {}",
+        Theme::info().render(&mr.source_branch),
+        Theme::warning().render(&mr.target_branch)
+    );
+
+    println!("     Author     @{}", mr.author_username);
+
+    if !mr.assignees.is_empty() {
+        println!(
+            "     Assignees  {}",
+            mr.assignees
+                .iter()
+                .map(|a| format!("@{a}"))
+                .collect::<Vec<_>>()
+                .join(", ")
+        );
+    }
+
+    if !mr.reviewers.is_empty() {
+        println!(
+            "     Reviewers  {}",
+            mr.reviewers
+                .iter()
+                .map(|r| format!("@{r}"))
+                .collect::<Vec<_>>()
+                .join(", ")
+        );
+    }
+
+    println!(
+        "     Created    {}  ({})",
+        format_date(mr.created_at),
+        render::format_relative_time_compact(mr.created_at),
+    );
+    println!(
+        "     Updated    {}  ({})",
+        format_date(mr.updated_at),
+        render::format_relative_time_compact(mr.updated_at),
+    );
+
+    if let Some(merged_at) = mr.merged_at {
+        println!(
+            "     Merged     {}  ({})",
+            format_date(merged_at),
+            render::format_relative_time_compact(merged_at),
+        );
+    }
+
+    if let Some(closed_at) = mr.closed_at {
+        println!(
+            "     Closed     {}  ({})",
+            format_date(closed_at),
+            render::format_relative_time_compact(closed_at),
+        );
+    }
+
+    if !mr.labels.is_empty() {
+        println!(
+            "     Labels     {}",
+            render::format_labels_bare(&mr.labels, mr.labels.len())
+        );
+    }
+
+    if let Some(url) = &mr.web_url {
+        println!("     URL        {}", Theme::muted().render(url));
+    }
+
+    // Description section
+    println!("{}", render::section_divider("Description"));
+    if let Some(desc) = &mr.description {
+        let wrapped = wrap_text(desc, 72, "     ");
+        println!("     {wrapped}");
+    } else {
+        println!("     {}", Theme::muted().render("(no description)"));
+    }
+
+    // Discussions section
+    let user_discussions: Vec<&MrDiscussionDetail> = mr
+        .discussions
+        .iter()
+        .filter(|d| d.notes.iter().any(|n| !n.is_system))
+        .collect();
+
+    if user_discussions.is_empty() {
+        println!("\n     {}", Theme::muted().render("No discussions"));
+    } else {
+        println!(
+            "{}",
+            render::section_divider(&format!("Discussions ({})", user_discussions.len()))
+        );
+
+        for discussion in user_discussions {
+            let user_notes: Vec<&MrNoteDetail> =
+                discussion.notes.iter().filter(|n| !n.is_system).collect();
+
+            if let Some(first_note) = user_notes.first() {
+                if let Some(pos) = &first_note.position {
+                    print_diff_position(pos);
+                }
+
+                println!(
+                    "     {}  {}",
+                    Theme::info().render(&format!("@{}", first_note.author_username)),
+                    format_date(first_note.created_at),
+                );
+                let wrapped = wrap_text(&first_note.body, 68, "     ");
+                println!("     {wrapped}");
+                println!();
+
+                for reply in user_notes.iter().skip(1) {
+                    println!(
+                        "       {}  {}",
+                        Theme::info().render(&format!("@{}", reply.author_username)),
+                        format_date(reply.created_at),
+                    );
+                    let wrapped = wrap_text(&reply.body, 66, "       ");
+                    println!("       {wrapped}");
+                    println!();
+                }
+            }
+        }
+    }
+}
+
+fn print_diff_position(pos: &DiffNotePosition) {
+    let file = pos.new_path.as_ref().or(pos.old_path.as_ref());
+
+    if let Some(file_path) = file {
+        let line_str = match (pos.old_line, pos.new_line) {
+            (Some(old), Some(new)) if old == new => format!(":{}", new),
+            (Some(old), Some(new)) => format!(":{}→{}", old, new),
+            (None, Some(new)) => format!(":+{}", new),
+            (Some(old), None) => format!(":-{}", old),
+            (None, None) => String::new(),
+        };
+
+        println!(
+            "  {} {}{}",
+            Theme::dim().render("\u{1f4cd}"),
+            Theme::warning().render(file_path),
+            Theme::dim().render(&line_str)
+        );
+    }
+}
+
+#[derive(Serialize)]
+pub struct IssueDetailJson {
+    pub id: i64,
+    pub iid: i64,
+    pub title: String,
+    pub description: Option<String>,
+    pub state: String,
+    pub author_username: String,
+    pub created_at: String,
+    pub updated_at: String,
+    pub closed_at: Option<String>,
+    pub confidential: bool,
+    pub web_url: Option<String>,
+    pub project_path: String,
+    pub references_full: String,
+    pub labels: Vec<String>,
+    pub assignees: Vec<String>,
+    pub due_date: Option<String>,
+    pub milestone: Option<String>,
+    pub user_notes_count: i64,
+    pub merge_requests_count: usize,
+    pub closing_merge_requests: Vec<ClosingMrRefJson>,
+    pub discussions: Vec<DiscussionDetailJson>,
+    pub status_name: Option<String>,
+    #[serde(skip_serializing)]
+    pub status_category: Option<String>,
+    pub status_color: Option<String>,
+    pub status_icon_name: Option<String>,
+    pub status_synced_at: Option<String>,
+}
+
+#[derive(Serialize)]
+pub struct ClosingMrRefJson {
+    pub iid: i64,
+    pub title: String,
+    pub state: String,
+    pub web_url: Option<String>,
+}
+
+#[derive(Serialize)]
+pub struct DiscussionDetailJson {
+    pub notes: Vec<NoteDetailJson>,
+    pub individual_note: bool,
+}
+
+#[derive(Serialize)]
+pub struct NoteDetailJson {
+    pub gitlab_id: i64,
+    pub author_username: String,
+    pub body: String,
+    pub created_at: String,
+    pub is_system: bool,
+}
+
+impl From<&IssueDetail> for IssueDetailJson {
+    fn from(issue: &IssueDetail) -> Self {
+        Self {
+            id: issue.id,
+            iid: issue.iid,
+            title: issue.title.clone(),
+            description: issue.description.clone(),
+            state: issue.state.clone(),
+            author_username: issue.author_username.clone(),
+            created_at: ms_to_iso(issue.created_at),
+            updated_at: ms_to_iso(issue.updated_at),
+            closed_at: issue.closed_at.clone(),
+            confidential: issue.confidential,
+            web_url: issue.web_url.clone(),
+            project_path: issue.project_path.clone(),
+            references_full: issue.references_full.clone(),
+            labels: issue.labels.clone(),
+            assignees: issue.assignees.clone(),
+            due_date: issue.due_date.clone(),
+            milestone: issue.milestone.clone(),
+            user_notes_count: issue.user_notes_count,
+            merge_requests_count: issue.merge_requests_count,
+            closing_merge_requests: issue
+                .closing_merge_requests
+                .iter()
+                .map(|mr| ClosingMrRefJson {
+                    iid: mr.iid,
+                    title: mr.title.clone(),
+                    state: mr.state.clone(),
+                    web_url: mr.web_url.clone(),
+                })
+                .collect(),
+            discussions: issue.discussions.iter().map(|d| d.into()).collect(),
+            status_name: issue.status_name.clone(),
+            status_category: issue.status_category.clone(),
+            status_color: issue.status_color.clone(),
+            status_icon_name: issue.status_icon_name.clone(),
+            status_synced_at: issue.status_synced_at.map(ms_to_iso),
+        }
+    }
+}
+
+impl From<&DiscussionDetail> for DiscussionDetailJson {
+    fn from(disc: &DiscussionDetail) -> Self {
+        Self {
+            notes: disc.notes.iter().map(|n| n.into()).collect(),
+            individual_note: disc.individual_note,
+        }
+    }
+}
+
+impl From<&NoteDetail> for NoteDetailJson {
+    fn from(note: &NoteDetail) -> Self {
+        Self {
+            gitlab_id: note.gitlab_id,
+            author_username: note.author_username.clone(),
+            body: note.body.clone(),
+            created_at: ms_to_iso(note.created_at),
+            is_system: note.is_system,
+        }
+    }
+}
+
+#[derive(Serialize)]
+pub struct MrDetailJson {
+    pub id: i64,
+    pub iid: i64,
+    pub title: String,
+    pub description: Option<String>,
+    pub state: String,
+    pub draft: bool,
+    pub author_username: String,
+    pub source_branch: String,
+    pub target_branch: String,
+    pub created_at: String,
+    pub updated_at: String,
+    pub merged_at: Option<String>,
+    pub closed_at: Option<String>,
+    pub web_url: Option<String>,
+    pub project_path: String,
+    pub labels: Vec<String>,
+    pub assignees: Vec<String>,
+    pub reviewers: Vec<String>,
+    pub discussions: Vec<MrDiscussionDetailJson>,
+}
+
+#[derive(Serialize)]
+pub struct MrDiscussionDetailJson {
+    pub notes: Vec<MrNoteDetailJson>,
+    pub individual_note: bool,
+}
+
+#[derive(Serialize)]
+pub struct MrNoteDetailJson {
+    pub gitlab_id: i64,
+    pub author_username: String,
+    pub body: String,
+    pub created_at: String,
+    pub is_system: bool,
+    pub position: Option<DiffNotePosition>,
+}
+
+impl From<&MrDetail> for MrDetailJson {
+    fn from(mr: &MrDetail) -> Self {
+        Self {
+            id: mr.id,
+            iid: mr.iid,
+            title: mr.title.clone(),
+            description: mr.description.clone(),
+            state: mr.state.clone(),
+            draft: mr.draft,
+            author_username: mr.author_username.clone(),
+            source_branch: mr.source_branch.clone(),
+            target_branch: mr.target_branch.clone(),
+            created_at: ms_to_iso(mr.created_at),
+            updated_at: ms_to_iso(mr.updated_at),
+            merged_at: mr.merged_at.map(ms_to_iso),
+            closed_at: mr.closed_at.map(ms_to_iso),
+            web_url: mr.web_url.clone(),
+            project_path: mr.project_path.clone(),
+            labels: mr.labels.clone(),
+            assignees: mr.assignees.clone(),
+            reviewers: mr.reviewers.clone(),
+            discussions: mr.discussions.iter().map(|d| d.into()).collect(),
+        }
+    }
+}
+
+impl From<&MrDiscussionDetail> for MrDiscussionDetailJson {
+    fn from(disc: &MrDiscussionDetail) -> Self {
+        Self {
+            notes: disc.notes.iter().map(|n| n.into()).collect(),
+            individual_note: disc.individual_note,
+        }
+    }
+}
+
+impl From<&MrNoteDetail> for MrNoteDetailJson {
+    fn from(note: &MrNoteDetail) -> Self {
+        Self {
+            gitlab_id: note.gitlab_id,
+            author_username: note.author_username.clone(),
+            body: note.body.clone(),
+            created_at: ms_to_iso(note.created_at),
+            is_system: note.is_system,
+            position: note.position.clone(),
+        }
+    }
+}
+
+pub fn print_show_issue_json(issue: &IssueDetail, elapsed_ms: u64) {
+    let json_result = IssueDetailJson::from(issue);
+    let meta = RobotMeta::new(elapsed_ms);
+    let output = serde_json::json!({
+        "ok": true,
+        "data": json_result,
+        "meta": meta,
+    });
+    match serde_json::to_string(&output) {
+        Ok(json) => println!("{json}"),
+        Err(e) => eprintln!("Error serializing to JSON: {e}"),
+    }
+}
+
+pub fn print_show_mr_json(mr: &MrDetail, elapsed_ms: u64) {
+    let json_result = MrDetailJson::from(mr);
+    let meta = RobotMeta::new(elapsed_ms);
+    let output = serde_json::json!({
+        "ok": true,
+        "data": json_result,
+        "meta": meta,
+    });
+    match serde_json::to_string(&output) {
+        Ok(json) => println!("{json}"),
+        Err(e) => eprintln!("Error serializing to JSON: {e}"),
+    }
+}

src/cli/commands/show/show_tests.rs

@@ -0,0 +1,353 @@
+use super::*;
+use crate::core::db::run_migrations;
+use std::path::Path;
+
+fn setup_test_db() -> Connection {
+    let conn = create_connection(Path::new(":memory:")).unwrap();
+    run_migrations(&conn).unwrap();
+    conn
+}
+
+fn seed_project(conn: &Connection) {
+    conn.execute(
+            "INSERT INTO projects (id, gitlab_project_id, path_with_namespace, web_url, created_at, updated_at)
+             VALUES (1, 100, 'group/repo', 'https://gitlab.example.com', 1000, 2000)",
+            [],
+        )
+        .unwrap();
+}
+
+fn seed_issue(conn: &Connection) {
+    seed_project(conn);
+    conn.execute(
+        "INSERT INTO issues (id, gitlab_id, iid, project_id, title, state, author_username,
+             created_at, updated_at, last_seen_at)
+             VALUES (1, 200, 10, 1, 'Test issue', 'opened', 'author', 1000, 2000, 2000)",
+        [],
+    )
+    .unwrap();
+}
+
+fn seed_second_project(conn: &Connection) {
+    conn.execute(
+            "INSERT INTO projects (id, gitlab_project_id, path_with_namespace, web_url, created_at, updated_at)
+             VALUES (2, 101, 'other/repo', 'https://gitlab.example.com/other', 1000, 2000)",
+            [],
+        )
+        .unwrap();
+}
+
+fn seed_discussion_with_notes(
+    conn: &Connection,
+    issue_id: i64,
+    project_id: i64,
+    user_notes: usize,
+    system_notes: usize,
+) {
+    let disc_id: i64 = conn
+        .query_row(
+            "SELECT COALESCE(MAX(id), 0) + 1 FROM discussions",
+            [],
+            |r| r.get(0),
+        )
+        .unwrap();
+    conn.execute(
+            "INSERT INTO discussions (id, gitlab_discussion_id, project_id, issue_id, noteable_type, first_note_at, last_note_at, last_seen_at)
+             VALUES (?1, ?2, ?3, ?4, 'Issue', 1000, 2000, 2000)",
+            rusqlite::params![disc_id, format!("disc-{}", disc_id), project_id, issue_id],
+        )
+        .unwrap();
+    for i in 0..user_notes {
+        conn.execute(
+                "INSERT INTO notes (gitlab_id, discussion_id, project_id, author_username, body, created_at, updated_at, last_seen_at, is_system, position)
+                 VALUES (?1, ?2, ?3, 'user1', 'comment', 1000, 2000, 2000, 0, ?4)",
+                rusqlite::params![1000 + disc_id * 100 + i as i64, disc_id, project_id, i as i64],
+            )
+            .unwrap();
+    }
+    for i in 0..system_notes {
+        conn.execute(
+                "INSERT INTO notes (gitlab_id, discussion_id, project_id, author_username, body, created_at, updated_at, last_seen_at, is_system, position)
+                 VALUES (?1, ?2, ?3, 'system', 'status changed', 1000, 2000, 2000, 1, ?4)",
+                rusqlite::params![2000 + disc_id * 100 + i as i64, disc_id, project_id, (user_notes + i) as i64],
+            )
+            .unwrap();
+    }
+}
+
+// --- find_issue tests ---
+
+#[test]
+fn test_find_issue_basic() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    let row = find_issue(&conn, 10, None).unwrap();
+    assert_eq!(row.iid, 10);
+    assert_eq!(row.title, "Test issue");
+    assert_eq!(row.state, "opened");
+    assert_eq!(row.author_username, "author");
+    assert_eq!(row.project_path, "group/repo");
+}
+
+#[test]
+fn test_find_issue_with_project_filter() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    let row = find_issue(&conn, 10, Some("group/repo")).unwrap();
+    assert_eq!(row.iid, 10);
+    assert_eq!(row.project_path, "group/repo");
+}
+
+#[test]
+fn test_find_issue_not_found() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    let err = find_issue(&conn, 999, None).unwrap_err();
+    assert!(matches!(err, LoreError::NotFound(_)));
+}
+
+#[test]
+fn test_find_issue_wrong_project_filter() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    seed_second_project(&conn);
+    // Issue 10 only exists in project 1, not project 2
+    let err = find_issue(&conn, 10, Some("other/repo")).unwrap_err();
+    assert!(matches!(err, LoreError::NotFound(_)));
+}
+
+#[test]
+fn test_find_issue_ambiguous_without_project() {
+    let conn = setup_test_db();
+    seed_issue(&conn); // issue iid=10 in project 1
+    seed_second_project(&conn);
+    conn.execute(
+            "INSERT INTO issues (id, gitlab_id, iid, project_id, title, state, author_username,
+             created_at, updated_at, last_seen_at)
+             VALUES (2, 201, 10, 2, 'Same iid different project', 'opened', 'author', 1000, 2000, 2000)",
+            [],
+        )
+        .unwrap();
+    let err = find_issue(&conn, 10, None).unwrap_err();
+    assert!(matches!(err, LoreError::Ambiguous(_)));
+}
+
+#[test]
+fn test_find_issue_ambiguous_resolved_with_project() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    seed_second_project(&conn);
+    conn.execute(
+            "INSERT INTO issues (id, gitlab_id, iid, project_id, title, state, author_username,
+             created_at, updated_at, last_seen_at)
+             VALUES (2, 201, 10, 2, 'Same iid different project', 'opened', 'author', 1000, 2000, 2000)",
+            [],
+        )
+        .unwrap();
+    let row = find_issue(&conn, 10, Some("other/repo")).unwrap();
+    assert_eq!(row.title, "Same iid different project");
+}
+
+#[test]
+fn test_find_issue_user_notes_count_zero() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    let row = find_issue(&conn, 10, None).unwrap();
+    assert_eq!(row.user_notes_count, 0);
+}
+
+#[test]
+fn test_find_issue_user_notes_count_excludes_system() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    // 2 user notes + 3 system notes = should count only 2
+    seed_discussion_with_notes(&conn, 1, 1, 2, 3);
+    let row = find_issue(&conn, 10, None).unwrap();
+    assert_eq!(row.user_notes_count, 2);
+}
+
+#[test]
+fn test_find_issue_user_notes_count_across_discussions() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    seed_discussion_with_notes(&conn, 1, 1, 3, 0); // 3 user notes
+    seed_discussion_with_notes(&conn, 1, 1, 1, 2); // 1 user note + 2 system
+    let row = find_issue(&conn, 10, None).unwrap();
+    assert_eq!(row.user_notes_count, 4);
+}
+
+#[test]
+fn test_find_issue_notes_count_ignores_other_issues() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    // Add a second issue
+    conn.execute(
+        "INSERT INTO issues (id, gitlab_id, iid, project_id, title, state, author_username,
+             created_at, updated_at, last_seen_at)
+             VALUES (2, 201, 20, 1, 'Other issue', 'opened', 'author', 1000, 2000, 2000)",
+        [],
+    )
+    .unwrap();
+    // Notes on issue 2, not issue 1
+    seed_discussion_with_notes(&conn, 2, 1, 5, 0);
+    let row = find_issue(&conn, 10, None).unwrap();
+    assert_eq!(row.user_notes_count, 0); // Issue 10 has no notes
+}
+
+#[test]
+fn test_ansi256_from_rgb() {
+    // Moved to render.rs — keeping basic hex sanity check
+    let result = render::style_with_hex("test", Some("#ff0000"));
+    assert!(!result.is_empty());
+}
+
+#[test]
+fn test_get_issue_assignees_empty() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    let result = get_issue_assignees(&conn, 1).unwrap();
+    assert!(result.is_empty());
+}
+
+#[test]
+fn test_get_issue_assignees_single() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    conn.execute(
+        "INSERT INTO issue_assignees (issue_id, username) VALUES (1, 'charlie')",
+        [],
+    )
+    .unwrap();
+    let result = get_issue_assignees(&conn, 1).unwrap();
+    assert_eq!(result, vec!["charlie"]);
+}
+
+#[test]
+fn test_get_issue_assignees_multiple_sorted() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    conn.execute(
+        "INSERT INTO issue_assignees (issue_id, username) VALUES (1, 'bob')",
+        [],
+    )
+    .unwrap();
+    conn.execute(
+        "INSERT INTO issue_assignees (issue_id, username) VALUES (1, 'alice')",
+        [],
+    )
+    .unwrap();
+    let result = get_issue_assignees(&conn, 1).unwrap();
+    assert_eq!(result, vec!["alice", "bob"]); // alphabetical
+}
+
+#[test]
+fn test_get_closing_mrs_empty() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    let result = get_closing_mrs(&conn, 1).unwrap();
+    assert!(result.is_empty());
+}
+
+#[test]
+fn test_get_closing_mrs_single() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    conn.execute(
+            "INSERT INTO merge_requests (id, gitlab_id, iid, project_id, title, state, author_username,
+             source_branch, target_branch, created_at, updated_at, last_seen_at)
+             VALUES (1, 300, 5, 1, 'Fix the bug', 'merged', 'dev', 'fix', 'main', 1000, 2000, 2000)",
+            [],
+        )
+        .unwrap();
+    conn.execute(
+        "INSERT INTO entity_references (project_id, source_entity_type, source_entity_id,
+             target_entity_type, target_entity_id, reference_type, source_method, created_at)
+             VALUES (1, 'merge_request', 1, 'issue', 1, 'closes', 'api', 3000)",
+        [],
+    )
+    .unwrap();
+    let result = get_closing_mrs(&conn, 1).unwrap();
+    assert_eq!(result.len(), 1);
+    assert_eq!(result[0].iid, 5);
+    assert_eq!(result[0].title, "Fix the bug");
+    assert_eq!(result[0].state, "merged");
+}
+
+#[test]
+fn test_get_closing_mrs_ignores_mentioned() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    // Add a 'mentioned' reference that should be ignored
+    conn.execute(
+        "INSERT INTO merge_requests (id, gitlab_id, iid, project_id, title, state, author_username,
+             source_branch, target_branch, created_at, updated_at, last_seen_at)
+             VALUES (1, 300, 5, 1, 'Some MR', 'opened', 'dev', 'feat', 'main', 1000, 2000, 2000)",
+        [],
+    )
+    .unwrap();
+    conn.execute(
+        "INSERT INTO entity_references (project_id, source_entity_type, source_entity_id,
+             target_entity_type, target_entity_id, reference_type, source_method, created_at)
+             VALUES (1, 'merge_request', 1, 'issue', 1, 'mentioned', 'note_parse', 3000)",
+        [],
+    )
+    .unwrap();
+    let result = get_closing_mrs(&conn, 1).unwrap();
+    assert!(result.is_empty()); // 'mentioned' refs not included
+}
+
+#[test]
+fn test_get_closing_mrs_multiple_sorted() {
+    let conn = setup_test_db();
+    seed_issue(&conn);
+    conn.execute(
+            "INSERT INTO merge_requests (id, gitlab_id, iid, project_id, title, state, author_username,
+             source_branch, target_branch, created_at, updated_at, last_seen_at)
+             VALUES (1, 300, 8, 1, 'Second fix', 'opened', 'dev', 'fix2', 'main', 1000, 2000, 2000)",
+            [],
+        )
+        .unwrap();
+    conn.execute(
+        "INSERT INTO merge_requests (id, gitlab_id, iid, project_id, title, state, author_username,
+             source_branch, target_branch, created_at, updated_at, last_seen_at)
+             VALUES (2, 301, 5, 1, 'First fix', 'merged', 'dev', 'fix1', 'main', 1000, 2000, 2000)",
+        [],
+    )
+    .unwrap();
+    conn.execute(
+        "INSERT INTO entity_references (project_id, source_entity_type, source_entity_id,
+             target_entity_type, target_entity_id, reference_type, source_method, created_at)
+             VALUES (1, 'merge_request', 1, 'issue', 1, 'closes', 'api', 3000)",
+        [],
+    )
+    .unwrap();
+    conn.execute(
+        "INSERT INTO entity_references (project_id, source_entity_type, source_entity_id,
+             target_entity_type, target_entity_id, reference_type, source_method, created_at)
+             VALUES (1, 'merge_request', 2, 'issue', 1, 'closes', 'api', 3000)",
+        [],
+    )
+    .unwrap();
+    let result = get_closing_mrs(&conn, 1).unwrap();
+    assert_eq!(result.len(), 2);
+    assert_eq!(result[0].iid, 5); // Lower iid first
+    assert_eq!(result[1].iid, 8);
+}
+
+#[test]
+fn wrap_text_single_line() {
+    assert_eq!(wrap_text("hello world", 80, "  "), "hello world");
+}
+
+#[test]
+fn wrap_text_multiple_lines() {
+    let result = wrap_text("one two three four five", 10, "  ");
+    assert!(result.contains('\n'));
+}
+
+#[test]
+fn format_date_extracts_date_part() {
+    let ms = 1705276800000;
+    let date = format_date(ms);
+    assert!(date.starts_with("2024-01-15"));
+}

src/cli/commands/stats.rs

@@ -583,7 +583,7 @@ pub fn print_stats_json(result: &StatsResult, elapsed_ms: u64) {
                 }),
             }),
         },
-        meta: RobotMeta { elapsed_ms },
+        meta: RobotMeta::new(elapsed_ms),
     };
     match serde_json::to_string(&output) {
         Ok(json) => println!("{json}"),

src/cli/commands/sync/mod.rs

@@ -0,0 +1,24 @@
+pub mod surgical;
+pub use surgical::run_sync_surgical;
+
+use crate::cli::render::{self, Icons, Theme, format_number};
+use serde::Serialize;
+use std::time::Instant;
+use tracing::Instrument;
+use tracing::{debug, warn};
+
+use crate::Config;
+use crate::cli::progress::{format_stage_line, nested_progress, stage_spinner_v2};
+use crate::core::error::Result;
+use crate::core::metrics::{MetricsLayer, StageTiming};
+use crate::core::shutdown::ShutdownSignal;
+
+use super::embed::run_embed;
+use super::generate_docs::run_generate_docs;
+use super::ingest::{
+    DryRunPreview, IngestDisplay, ProjectStatusEnrichment, ProjectSummary, run_ingest,
+    run_ingest_dry_run,
+};
+
+include!("run.rs");
+include!("render.rs");

src/cli/commands/sync/render.rs

@@ -0,0 +1,533 @@
+pub fn print_sync(
+    result: &SyncResult,
+    elapsed: std::time::Duration,
+    metrics: Option<&MetricsLayer>,
+    show_timings: bool,
+) {
+    let has_data = result.issues_updated > 0
+        || result.mrs_updated > 0
+        || result.discussions_fetched > 0
+        || result.resource_events_fetched > 0
+        || result.mr_diffs_fetched > 0
+        || result.documents_regenerated > 0
+        || result.documents_embedded > 0
+        || result.statuses_enriched > 0;
+    let has_failures = result.resource_events_failed > 0
+        || result.mr_diffs_failed > 0
+        || result.status_enrichment_errors > 0
+        || result.documents_errored > 0
+        || result.embedding_failed > 0;
+
+    if !has_data && !has_failures {
+        println!(
+            "\n  {} ({})\n",
+            Theme::dim().render("Already up to date"),
+            Theme::timing().render(&format!("{:.1}s", elapsed.as_secs_f64()))
+        );
+    } else {
+        let headline = if has_failures {
+            Theme::warning().bold().render("Sync completed with issues")
+        } else {
+            Theme::success().bold().render("Synced")
+        };
+        println!(
+            "\n  {} {} issues and {} MRs in {}",
+            headline,
+            Theme::info()
+                .bold()
+                .render(&result.issues_updated.to_string()),
+            Theme::info().bold().render(&result.mrs_updated.to_string()),
+            Theme::timing().render(&format!("{:.1}s", elapsed.as_secs_f64()))
+        );
+
+        // Detail: supporting counts, compact middle-dot format, zero-suppressed
+        let mut details: Vec<String> = Vec::new();
+        if result.discussions_fetched > 0 {
+            details.push(format!(
+                "{} {}",
+                Theme::info().render(&result.discussions_fetched.to_string()),
+                Theme::dim().render("discussions")
+            ));
+        }
+        if result.resource_events_fetched > 0 {
+            details.push(format!(
+                "{} {}",
+                Theme::info().render(&result.resource_events_fetched.to_string()),
+                Theme::dim().render("events")
+            ));
+        }
+        if result.mr_diffs_fetched > 0 {
+            details.push(format!(
+                "{} {}",
+                Theme::info().render(&result.mr_diffs_fetched.to_string()),
+                Theme::dim().render("diffs")
+            ));
+        }
+        if result.statuses_enriched > 0 {
+            details.push(format!(
+                "{} {}",
+                Theme::info().render(&result.statuses_enriched.to_string()),
+                Theme::dim().render("statuses updated")
+            ));
+        }
+        if !details.is_empty() {
+            let sep = Theme::dim().render(" \u{b7} ");
+            println!("  {}", details.join(&sep));
+        }
+
+        // Documents: regeneration + embedding as a second detail line
+        let mut doc_parts: Vec<String> = Vec::new();
+        if result.documents_regenerated > 0 {
+            doc_parts.push(format!(
+                "{} {}",
+                Theme::info().render(&result.documents_regenerated.to_string()),
+                Theme::dim().render("docs regenerated")
+            ));
+        }
+        if result.documents_embedded > 0 {
+            doc_parts.push(format!(
+                "{} {}",
+                Theme::info().render(&result.documents_embedded.to_string()),
+                Theme::dim().render("embedded")
+            ));
+        }
+        if result.documents_errored > 0 {
+            doc_parts
+                .push(Theme::error().render(&format!("{} doc errors", result.documents_errored)));
+        }
+        if !doc_parts.is_empty() {
+            let sep = Theme::dim().render(" \u{b7} ");
+            println!("  {}", doc_parts.join(&sep));
+        }
+
+        // Errors: visually prominent, only if non-zero
+        let mut errors: Vec<String> = Vec::new();
+        if result.resource_events_failed > 0 {
+            errors.push(format!("{} event failures", result.resource_events_failed));
+        }
+        if result.mr_diffs_failed > 0 {
+            errors.push(format!("{} diff failures", result.mr_diffs_failed));
+        }
+        if result.status_enrichment_errors > 0 {
+            errors.push(format!("{} status errors", result.status_enrichment_errors));
+        }
+        if result.embedding_failed > 0 {
+            errors.push(format!("{} embedding failures", result.embedding_failed));
+        }
+        if !errors.is_empty() {
+            println!("  {}", Theme::error().render(&errors.join(" \u{b7} ")));
+        }
+
+        println!();
+    }
+
+    if let Some(metrics) = metrics {
+        let stages = metrics.extract_timings();
+        if should_print_timings(show_timings, &stages) {
+            print_timing_summary(&stages);
+        }
+    }
+}
+
+fn issue_sub_rows(projects: &[ProjectSummary]) -> Vec<String> {
+    projects
+        .iter()
+        .map(|p| {
+            let mut parts: Vec<String> = Vec::new();
+            parts.push(format!(
+                "{} {}",
+                p.items_upserted,
+                if p.items_upserted == 1 {
+                    "issue"
+                } else {
+                    "issues"
+                }
+            ));
+            if p.discussions_synced > 0 {
+                parts.push(format!("{} discussions", p.discussions_synced));
+            }
+            if p.statuses_seen > 0 || p.statuses_enriched > 0 {
+                parts.push(format!("{} statuses updated", p.statuses_enriched));
+            }
+            if p.events_fetched > 0 {
+                parts.push(format!("{} events", p.events_fetched));
+            }
+            if p.status_errors > 0 {
+                parts.push(Theme::warning().render(&format!("{} status errors", p.status_errors)));
+            }
+            if p.events_failed > 0 {
+                parts.push(Theme::warning().render(&format!("{} event failures", p.events_failed)));
+            }
+            let sep = Theme::dim().render(" \u{b7} ");
+            let detail = parts.join(&sep);
+            let path = Theme::muted().render(&format!("{:<30}", p.path));
+            format!("      {path} {detail}")
+        })
+        .collect()
+}
+
+fn status_sub_rows(projects: &[ProjectStatusEnrichment]) -> Vec<String> {
+    projects
+        .iter()
+        .map(|p| {
+            let total_errors = p.partial_errors + usize::from(p.error.is_some());
+            let mut parts: Vec<String> = vec![format!("{} statuses updated", p.enriched)];
+            if p.cleared > 0 {
+                parts.push(format!("{} cleared", p.cleared));
+            }
+            if p.seen > 0 {
+                parts.push(format!("{} seen", p.seen));
+            }
+            if total_errors > 0 {
+                parts.push(Theme::warning().render(&format!("{} errors", total_errors)));
+            } else if p.mode == "skipped" {
+                if let Some(reason) = &p.reason {
+                    parts.push(Theme::dim().render(&format!("skipped ({reason})")));
+                } else {
+                    parts.push(Theme::dim().render("skipped"));
+                }
+            }
+            let sep = Theme::dim().render(" \u{b7} ");
+            let detail = parts.join(&sep);
+            let path = Theme::muted().render(&format!("{:<30}", p.path));
+            format!("      {path} {detail}")
+        })
+        .collect()
+}
+
+fn mr_sub_rows(projects: &[ProjectSummary]) -> Vec<String> {
+    projects
+        .iter()
+        .map(|p| {
+            let mut parts: Vec<String> = Vec::new();
+            parts.push(format!(
+                "{} {}",
+                p.items_upserted,
+                if p.items_upserted == 1 { "MR" } else { "MRs" }
+            ));
+            if p.discussions_synced > 0 {
+                parts.push(format!("{} discussions", p.discussions_synced));
+            }
+            if p.mr_diffs_fetched > 0 {
+                parts.push(format!("{} diffs", p.mr_diffs_fetched));
+            }
+            if p.events_fetched > 0 {
+                parts.push(format!("{} events", p.events_fetched));
+            }
+            if p.mr_diffs_failed > 0 {
+                parts
+                    .push(Theme::warning().render(&format!("{} diff failures", p.mr_diffs_failed)));
+            }
+            if p.events_failed > 0 {
+                parts.push(Theme::warning().render(&format!("{} event failures", p.events_failed)));
+            }
+            let sep = Theme::dim().render(" \u{b7} ");
+            let detail = parts.join(&sep);
+            let path = Theme::muted().render(&format!("{:<30}", p.path));
+            format!("      {path} {detail}")
+        })
+        .collect()
+}
+
+fn emit_stage_line(
+    pb: &indicatif::ProgressBar,
+    icon: &str,
+    label: &str,
+    summary: &str,
+    elapsed: std::time::Duration,
+) {
+    pb.finish_and_clear();
+    print_static_lines(&[format_stage_line(icon, label, summary, elapsed)]);
+}
+
+fn emit_stage_block(
+    pb: &indicatif::ProgressBar,
+    icon: &str,
+    label: &str,
+    summary: &str,
+    elapsed: std::time::Duration,
+    sub_rows: &[String],
+) {
+    pb.finish_and_clear();
+    let mut lines = Vec::with_capacity(1 + sub_rows.len());
+    lines.push(format_stage_line(icon, label, summary, elapsed));
+    lines.extend(sub_rows.iter().cloned());
+    print_static_lines(&lines);
+}
+
+fn print_static_lines(lines: &[String]) {
+    crate::cli::progress::multi().suspend(|| {
+        for line in lines {
+            println!("{line}");
+        }
+    });
+}
+
+fn should_print_timings(show_timings: bool, stages: &[StageTiming]) -> bool {
+    show_timings && !stages.is_empty()
+}
+
+fn append_failures(summary: &mut String, failures: &[(&str, usize)]) {
+    let rendered: Vec<String> = failures
+        .iter()
+        .filter_map(|(label, count)| {
+            (*count > 0).then_some(Theme::warning().render(&format!("{count} {label}")))
+        })
+        .collect();
+    if !rendered.is_empty() {
+        summary.push_str(&format!(" ({})", rendered.join(", ")));
+    }
+}
+
+fn summarize_status_enrichment(projects: &[ProjectStatusEnrichment]) -> (String, bool) {
+    let statuses_enriched: usize = projects.iter().map(|p| p.enriched).sum();
+    let statuses_seen: usize = projects.iter().map(|p| p.seen).sum();
+    let statuses_cleared: usize = projects.iter().map(|p| p.cleared).sum();
+    let status_errors: usize = projects
+        .iter()
+        .map(|p| p.partial_errors + usize::from(p.error.is_some()))
+        .sum();
+    let skipped = projects.iter().filter(|p| p.mode == "skipped").count();
+
+    let mut parts = vec![format!(
+        "{} statuses updated",
+        format_number(statuses_enriched as i64)
+    )];
+    if statuses_cleared > 0 {
+        parts.push(format!(
+            "{} cleared",
+            format_number(statuses_cleared as i64)
+        ));
+    }
+    if statuses_seen > 0 {
+        parts.push(format!("{} seen", format_number(statuses_seen as i64)));
+    }
+    if status_errors > 0 {
+        parts.push(format!("{} errors", format_number(status_errors as i64)));
+    } else if projects.is_empty() || skipped == projects.len() {
+        parts.push("skipped".to_string());
+    }
+
+    (parts.join(" \u{b7} "), status_errors > 0)
+}
+
+fn section(title: &str) {
+    println!("{}", render::section_divider(title));
+}
+
+fn print_timing_summary(stages: &[StageTiming]) {
+    section("Timing");
+    for stage in stages {
+        for sub in &stage.sub_stages {
+            print_stage_line(sub, 1);
+        }
+    }
+}
+
+fn print_stage_line(stage: &StageTiming, depth: usize) {
+    let indent = "  ".repeat(depth);
+    let name = if let Some(ref project) = stage.project {
+        format!("{} ({})", stage.name, project)
+    } else {
+        stage.name.clone()
+    };
+    let pad_width = 30_usize.saturating_sub(indent.len() + name.len());
+    let dots = Theme::dim().render(&".".repeat(pad_width.max(2)));
+
+    let time_str = Theme::bold().render(&format!("{:.1}s", stage.elapsed_ms as f64 / 1000.0));
+
+    let mut parts: Vec<String> = Vec::new();
+    if stage.items_processed > 0 {
+        parts.push(format!("{} items", stage.items_processed));
+    }
+    if stage.errors > 0 {
+        parts.push(Theme::error().render(&format!("{} errors", stage.errors)));
+    }
+    if stage.rate_limit_hits > 0 {
+        parts.push(Theme::warning().render(&format!("{} rate limits", stage.rate_limit_hits)));
+    }
+
+    if parts.is_empty() {
+        println!("{indent}{name} {dots} {time_str}");
+    } else {
+        let suffix = parts.join(" \u{b7} ");
+        println!("{indent}{name} {dots} {time_str} ({suffix})");
+    }
+
+    for sub in &stage.sub_stages {
+        print_stage_line(sub, depth + 1);
+    }
+}
+
+#[derive(Serialize)]
+struct SyncJsonOutput<'a> {
+    ok: bool,
+    data: &'a SyncResult,
+    meta: SyncMeta,
+}
+
+#[derive(Serialize)]
+struct SyncMeta {
+    run_id: String,
+    elapsed_ms: u64,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    stages: Vec<StageTiming>,
+}
+
+pub fn print_sync_json(result: &SyncResult, elapsed_ms: u64, metrics: Option<&MetricsLayer>) {
+    let stages = metrics.map_or_else(Vec::new, MetricsLayer::extract_timings);
+    let output = SyncJsonOutput {
+        ok: true,
+        data: result,
+        meta: SyncMeta {
+            run_id: result.run_id.clone(),
+            elapsed_ms,
+            stages,
+        },
+    };
+    match serde_json::to_string(&output) {
+        Ok(json) => println!("{json}"),
+        Err(e) => eprintln!("Error serializing to JSON: {e}"),
+    }
+}
+
+#[derive(Debug, Default, Serialize)]
+pub struct SyncDryRunResult {
+    pub issues_preview: DryRunPreview,
+    pub mrs_preview: DryRunPreview,
+    pub would_generate_docs: bool,
+    pub would_embed: bool,
+}
+
+async fn run_sync_dry_run(config: &Config, options: &SyncOptions) -> Result<SyncResult> {
+    // Get dry run previews for both issues and MRs
+    let issues_preview = run_ingest_dry_run(config, "issues", None, options.full)?;
+    let mrs_preview = run_ingest_dry_run(config, "mrs", None, options.full)?;
+
+    let dry_result = SyncDryRunResult {
+        issues_preview,
+        mrs_preview,
+        would_generate_docs: !options.no_docs,
+        would_embed: !options.no_embed,
+    };
+
+    if options.robot_mode {
+        print_sync_dry_run_json(&dry_result);
+    } else {
+        print_sync_dry_run(&dry_result);
+    }
+
+    // Return an empty SyncResult since this is just a preview
+    Ok(SyncResult::default())
+}
+
+pub fn print_sync_dry_run(result: &SyncDryRunResult) {
+    println!(
+        "\n  {} {}",
+        Theme::info().bold().render("Dry run"),
+        Theme::dim().render("(no changes will be made)")
+    );
+
+    print_dry_run_entity("Issues", &result.issues_preview);
+    print_dry_run_entity("Merge Requests", &result.mrs_preview);
+
+    // Pipeline stages
+    section("Pipeline");
+    let mut stages: Vec<String> = Vec::new();
+    if result.would_generate_docs {
+        stages.push("generate-docs".to_string());
+    } else {
+        stages.push(Theme::dim().render("generate-docs (skip)"));
+    }
+    if result.would_embed {
+        stages.push("embed".to_string());
+    } else {
+        stages.push(Theme::dim().render("embed (skip)"));
+    }
+    println!("  {}", stages.join(" \u{b7} "));
+}
+
+fn print_dry_run_entity(label: &str, preview: &DryRunPreview) {
+    section(label);
+    let mode = if preview.sync_mode == "full" {
+        Theme::warning().render("full")
+    } else {
+        Theme::success().render("incremental")
+    };
+    println!("  {} \u{b7} {} projects", mode, preview.projects.len());
+    for project in &preview.projects {
+        let sync_status = if !project.has_cursor {
+            Theme::warning().render("initial sync")
+        } else {
+            Theme::success().render("incremental")
+        };
+        if project.existing_count > 0 {
+            println!(
+                "    {} \u{b7} {} \u{b7} {} existing",
+                &project.path, sync_status, project.existing_count
+            );
+        } else {
+            println!("    {} \u{b7} {}", &project.path, sync_status);
+        }
+    }
+}
+
+#[derive(Serialize)]
+struct SyncDryRunJsonOutput {
+    ok: bool,
+    dry_run: bool,
+    data: SyncDryRunJsonData,
+}
+
+#[derive(Serialize)]
+struct SyncDryRunJsonData {
+    stages: Vec<SyncDryRunStage>,
+}
+
+#[derive(Serialize)]
+struct SyncDryRunStage {
+    name: String,
+    would_run: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    preview: Option<DryRunPreview>,
+}
+
+pub fn print_sync_dry_run_json(result: &SyncDryRunResult) {
+    let output = SyncDryRunJsonOutput {
+        ok: true,
+        dry_run: true,
+        data: SyncDryRunJsonData {
+            stages: vec![
+                SyncDryRunStage {
+                    name: "ingest_issues".to_string(),
+                    would_run: true,
+                    preview: Some(result.issues_preview.clone()),
+                },
+                SyncDryRunStage {
+                    name: "ingest_mrs".to_string(),
+                    would_run: true,
+                    preview: Some(result.mrs_preview.clone()),
+                },
+                SyncDryRunStage {
+                    name: "generate_docs".to_string(),
+                    would_run: result.would_generate_docs,
+                    preview: None,
+                },
+                SyncDryRunStage {
+                    name: "embed".to_string(),
+                    would_run: result.would_embed,
+                    preview: None,
+                },
+            ],
+        },
+    };
+
+    match serde_json::to_string(&output) {
+        Ok(json) => println!("{json}"),
+        Err(e) => eprintln!("Error serializing to JSON: {e}"),
+    }
+}
+
+#[cfg(test)]
+#[path = "sync_tests.rs"]
+mod tests;

src/cli/commands/sync/run.rs

@@ -0,0 +1,380 @@
+#[derive(Debug, Default)]
+pub struct SyncOptions {
+    pub full: bool,
+    pub force: bool,
+    pub no_embed: bool,
+    pub no_docs: bool,
+    pub no_events: bool,
+    pub robot_mode: bool,
+    pub dry_run: bool,
+    pub issue_iids: Vec<u64>,
+    pub mr_iids: Vec<u64>,
+    pub project: Option<String>,
+    pub preflight_only: bool,
+}
+
+impl SyncOptions {
+    pub const MAX_SURGICAL_TARGETS: usize = 100;
+
+    pub fn is_surgical(&self) -> bool {
+        !self.issue_iids.is_empty() || !self.mr_iids.is_empty()
+    }
+}
+
+#[derive(Debug, Default, Serialize)]
+pub struct SurgicalIids {
+    pub issues: Vec<u64>,
+    pub merge_requests: Vec<u64>,
+}
+
+#[derive(Debug, Serialize)]
+pub struct EntitySyncResult {
+    pub entity_type: String,
+    pub iid: u64,
+    pub outcome: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub toctou_reason: Option<String>,
+}
+
+#[derive(Debug, Default, Serialize)]
+pub struct SyncResult {
+    #[serde(skip)]
+    pub run_id: String,
+    pub issues_updated: usize,
+    pub mrs_updated: usize,
+    pub discussions_fetched: usize,
+    pub resource_events_fetched: usize,
+    pub resource_events_failed: usize,
+    pub mr_diffs_fetched: usize,
+    pub mr_diffs_failed: usize,
+    pub documents_regenerated: usize,
+    pub documents_errored: usize,
+    pub documents_embedded: usize,
+    pub embedding_failed: usize,
+    pub status_enrichment_errors: usize,
+    pub statuses_enriched: usize,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub surgical_mode: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub surgical_iids: Option<SurgicalIids>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub entity_results: Option<Vec<EntitySyncResult>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub preflight_only: Option<bool>,
+    #[serde(skip)]
+    pub issue_projects: Vec<ProjectSummary>,
+    #[serde(skip)]
+    pub mr_projects: Vec<ProjectSummary>,
+}
+
+/// Alias for [`Theme::color_icon`] to keep call sites concise.
+fn color_icon(icon: &str, has_errors: bool) -> String {
+    Theme::color_icon(icon, has_errors)
+}
+
+pub async fn run_sync(
+    config: &Config,
+    options: SyncOptions,
+    run_id: Option<&str>,
+    signal: &ShutdownSignal,
+) -> Result<SyncResult> {
+    // Surgical dispatch: if any IIDs specified, route to surgical pipeline
+    if options.is_surgical() {
+        return run_sync_surgical(config, options, run_id, signal).await;
+    }
+
+    let generated_id;
+    let run_id = match run_id {
+        Some(id) => id,
+        None => {
+            generated_id = uuid::Uuid::new_v4().simple().to_string();
+            &generated_id[..8]
+        }
+    };
+    let span = tracing::info_span!("sync", %run_id);
+
+    async move {
+        let mut result = SyncResult {
+            run_id: run_id.to_string(),
+            ..SyncResult::default()
+        };
+
+        // Handle dry_run mode - show preview without making any changes
+        if options.dry_run {
+            return run_sync_dry_run(config, &options).await;
+        }
+
+        let ingest_display = if options.robot_mode {
+            IngestDisplay::silent()
+        } else {
+            IngestDisplay::progress_only()
+        };
+
+        // ── Stage: Issues ──
+        let stage_start = Instant::now();
+        let spinner = stage_spinner_v2(Icons::sync(), "Issues", "fetching...", options.robot_mode);
+        debug!("Sync: ingesting issues");
+        let issues_result = run_ingest(
+            config,
+            "issues",
+            None,
+            options.force,
+            options.full,
+            false, // dry_run - sync has its own dry_run handling
+            ingest_display,
+            Some(spinner.clone()),
+            signal,
+        )
+        .await?;
+        result.issues_updated = issues_result.issues_upserted;
+        result.discussions_fetched += issues_result.discussions_fetched;
+        result.resource_events_fetched += issues_result.resource_events_fetched;
+        result.resource_events_failed += issues_result.resource_events_failed;
+        result.status_enrichment_errors += issues_result.status_enrichment_errors;
+        for sep in &issues_result.status_enrichment_projects {
+            result.statuses_enriched += sep.enriched;
+        }
+        result.issue_projects = issues_result.project_summaries;
+        let issues_elapsed = stage_start.elapsed();
+        if !options.robot_mode {
+            let (status_summary, status_has_errors) =
+                summarize_status_enrichment(&issues_result.status_enrichment_projects);
+            let status_icon = color_icon(
+                if status_has_errors {
+                    Icons::warning()
+                } else {
+                    Icons::success()
+                },
+                status_has_errors,
+            );
+            let mut status_lines = vec![format_stage_line(
+                &status_icon,
+                "Status",
+                &status_summary,
+                issues_elapsed,
+            )];
+            status_lines.extend(status_sub_rows(&issues_result.status_enrichment_projects));
+            print_static_lines(&status_lines);
+        }
+        let mut issues_summary = format!(
+            "{} issues from {} {}",
+            format_number(result.issues_updated as i64),
+            issues_result.projects_synced,
+            if issues_result.projects_synced == 1 { "project" } else { "projects" }
+        );
+        append_failures(
+            &mut issues_summary,
+            &[
+                ("event failures", issues_result.resource_events_failed),
+                ("status errors", issues_result.status_enrichment_errors),
+            ],
+        );
+        let issues_icon = color_icon(
+            if issues_result.resource_events_failed > 0 || issues_result.status_enrichment_errors > 0
+            {
+                Icons::warning()
+            } else {
+                Icons::success()
+            },
+            issues_result.resource_events_failed > 0 || issues_result.status_enrichment_errors > 0,
+        );
+        if options.robot_mode {
+            emit_stage_line(&spinner, &issues_icon, "Issues", &issues_summary, issues_elapsed);
+        } else {
+            let sub_rows = issue_sub_rows(&result.issue_projects);
+            emit_stage_block(
+                &spinner,
+                &issues_icon,
+                "Issues",
+                &issues_summary,
+                issues_elapsed,
+                &sub_rows,
+            );
+        }
+
+        if signal.is_cancelled() {
+            debug!("Shutdown requested after issues stage, returning partial sync results");
+            return Ok(result);
+        }
+
+        // ── Stage: MRs ──
+        let stage_start = Instant::now();
+        let spinner = stage_spinner_v2(Icons::sync(), "MRs", "fetching...", options.robot_mode);
+        debug!("Sync: ingesting merge requests");
+        let mrs_result = run_ingest(
+            config,
+            "mrs",
+            None,
+            options.force,
+            options.full,
+            false, // dry_run - sync has its own dry_run handling
+            ingest_display,
+            Some(spinner.clone()),
+            signal,
+        )
+        .await?;
+        result.mrs_updated = mrs_result.mrs_upserted;
+        result.discussions_fetched += mrs_result.discussions_fetched;
+        result.resource_events_fetched += mrs_result.resource_events_fetched;
+        result.resource_events_failed += mrs_result.resource_events_failed;
+        result.mr_diffs_fetched += mrs_result.mr_diffs_fetched;
+        result.mr_diffs_failed += mrs_result.mr_diffs_failed;
+        result.mr_projects = mrs_result.project_summaries;
+        let mrs_elapsed = stage_start.elapsed();
+        let mut mrs_summary = format!(
+            "{} merge requests from {} {}",
+            format_number(result.mrs_updated as i64),
+            mrs_result.projects_synced,
+            if mrs_result.projects_synced == 1 { "project" } else { "projects" }
+        );
+        append_failures(
+            &mut mrs_summary,
+            &[
+                ("event failures", mrs_result.resource_events_failed),
+                ("diff failures", mrs_result.mr_diffs_failed),
+            ],
+        );
+        let mrs_icon = color_icon(
+            if mrs_result.resource_events_failed > 0 || mrs_result.mr_diffs_failed > 0 {
+                Icons::warning()
+            } else {
+                Icons::success()
+            },
+            mrs_result.resource_events_failed > 0 || mrs_result.mr_diffs_failed > 0,
+        );
+        if options.robot_mode {
+            emit_stage_line(&spinner, &mrs_icon, "MRs", &mrs_summary, mrs_elapsed);
+        } else {
+            let sub_rows = mr_sub_rows(&result.mr_projects);
+            emit_stage_block(&spinner, &mrs_icon, "MRs", &mrs_summary, mrs_elapsed, &sub_rows);
+        }
+
+        if signal.is_cancelled() {
+            debug!("Shutdown requested after MRs stage, returning partial sync results");
+            return Ok(result);
+        }
+
+        // ── Stage: Docs ──
+        if !options.no_docs {
+            let stage_start = Instant::now();
+            let spinner = stage_spinner_v2(Icons::sync(), "Docs", "generating...", options.robot_mode);
+            debug!("Sync: generating documents");
+
+            let docs_bar = nested_progress("Docs", 0, options.robot_mode);
+            let docs_bar_clone = docs_bar.clone();
+            let docs_cb: Box<dyn Fn(usize, usize)> = Box::new(move |processed, total| {
+                if total > 0 {
+                    docs_bar_clone.set_length(total as u64);
+                    docs_bar_clone.set_position(processed as u64);
+                }
+            });
+            let docs_result = run_generate_docs(config, options.full, None, Some(docs_cb))?;
+            result.documents_regenerated = docs_result.regenerated;
+            result.documents_errored = docs_result.errored;
+            docs_bar.finish_and_clear();
+            let mut docs_summary = format!(
+                "{} documents generated",
+                format_number(result.documents_regenerated as i64),
+            );
+            append_failures(&mut docs_summary, &[("errors", docs_result.errored)]);
+            let docs_icon = color_icon(
+                if docs_result.errored > 0 {
+                    Icons::warning()
+                } else {
+                    Icons::success()
+                },
+                docs_result.errored > 0,
+            );
+            emit_stage_line(&spinner, &docs_icon, "Docs", &docs_summary, stage_start.elapsed());
+        } else {
+            debug!("Sync: skipping document generation (--no-docs)");
+        }
+
+        // ── Stage: Embed ──
+        if !options.no_embed {
+            let stage_start = Instant::now();
+            let spinner = stage_spinner_v2(Icons::sync(), "Embed", "preparing...", options.robot_mode);
+            debug!("Sync: embedding documents");
+
+            let embed_bar = nested_progress("Embed", 0, options.robot_mode);
+            let embed_bar_clone = embed_bar.clone();
+            let embed_cb: Box<dyn Fn(usize, usize)> = Box::new(move |processed, total| {
+                if total > 0 {
+                    embed_bar_clone.set_length(total as u64);
+                    embed_bar_clone.set_position(processed as u64);
+                }
+            });
+            match run_embed(config, options.full, false, Some(embed_cb), signal).await {
+                Ok(embed_result) => {
+                    result.documents_embedded = embed_result.docs_embedded;
+                    result.embedding_failed = embed_result.failed;
+                    embed_bar.finish_and_clear();
+                    let mut embed_summary = format!(
+                        "{} chunks embedded",
+                        format_number(embed_result.chunks_embedded as i64),
+                    );
+                    let mut tail_parts = Vec::new();
+                    if embed_result.failed > 0 {
+                        tail_parts.push(format!("{} failed", embed_result.failed));
+                    }
+                    if embed_result.skipped > 0 {
+                        tail_parts.push(format!("{} skipped", embed_result.skipped));
+                    }
+                    if !tail_parts.is_empty() {
+                        embed_summary.push_str(&format!(" ({})", tail_parts.join(", ")));
+                    }
+                    let embed_icon = color_icon(
+                        if embed_result.failed > 0 {
+                            Icons::warning()
+                        } else {
+                            Icons::success()
+                        },
+                        embed_result.failed > 0,
+                    );
+                    emit_stage_line(
+                        &spinner,
+                        &embed_icon,
+                        "Embed",
+                        &embed_summary,
+                        stage_start.elapsed(),
+                    );
+                }
+                Err(e) => {
+                    embed_bar.finish_and_clear();
+                    let warn_summary = format!("skipped ({})", e);
+                    let warn_icon = color_icon(Icons::warning(), true);
+                    emit_stage_line(
+                        &spinner,
+                        &warn_icon,
+                        "Embed",
+                        &warn_summary,
+                        stage_start.elapsed(),
+                    );
+                    warn!(error = %e, "Embedding stage failed (Ollama may be unavailable), continuing");
+                }
+            }
+        } else {
+            debug!("Sync: skipping embedding (--no-embed)");
+        }
+
+        debug!(
+            issues = result.issues_updated,
+            mrs = result.mrs_updated,
+            discussions = result.discussions_fetched,
+            resource_events = result.resource_events_fetched,
+            resource_events_failed = result.resource_events_failed,
+            mr_diffs = result.mr_diffs_fetched,
+            mr_diffs_failed = result.mr_diffs_failed,
+            docs = result.documents_regenerated,
+            embedded = result.documents_embedded,
+            "Sync pipeline complete"
+        );
+
+        Ok(result)
+    }
+    .instrument(span)
+    .await
+}
+