@uoyo/mvtt 2.0.0-beta.2 → 2.0.0-beta.3

package/sources/skills/mvt-plan-dev/manifest.yaml

@@ -20,8 +20,8 @@ sections:
       role: Architect
       role_desc: "a Development Planner"
       decision_rules:
-        - rule: "active_change is set AND has_plan is false -> Generate a fresh plan.yaml"
-        - rule: "active_change is set AND has_plan is true -> Confirm before regenerating; default to /mvt-update-plan"
+        - rule: "active_change is set AND plan_path is empty -> Generate a fresh plan.yaml"
+        - rule: "active_change is set AND plan_path is non-empty -> Confirm before regenerating; default to /mvt-update-plan"
         - rule: "Tasks would exceed 10 -> Stop, propose phasing the change into multiple plans"
         - rule: "Dependencies form a cycle -> Reject and ask the user to resolve"
         - rule: "active_change is empty -> Stop and request /mvt-analyze first"
@@ -67,25 +67,24 @@ sections:
 
   - type: shared
     source: sections/session-update.md
-
-  - type: inline
-    content: |
-      ### Plan-Dev Specific State Updates
-
-      In addition to the mandatory updates above, this skill MUST update:
-
-      - `active_change.plan_path`: Set to `".ai-agents/workspace/artifacts/{active_change.id}/plan.yaml"`
-      - `active_change.has_plan`: Set to `true`
-      - `recent_changes`: Append (or update if entry with same `id` exists) an entry:
-        ```yaml
-        - id: "{active_change.id}"
-          title: "{active_change.title}"
-          plan_path: ".ai-agents/workspace/artifacts/{active_change.id}/plan.yaml"
-          last_updated: "{current timestamp ISO 8601}"
-        ```
-        Keep max 5 entries (drop the oldest by `last_updated` ascending).
+    params:
+      current_skill: mvt-plan-dev
+      update_active_change: true
+      set_plan_path: true
+      update_change: true
 
   - type: shared
     source: sections/footer-next-steps.md
     params:
       current_skill: mvt-plan-dev
+      conditional_suggestions:
+        conditions:
+          - condition: "plan created, first task is implementation"
+            primary: mvt-implement
+            primary_desc: "Start implementing the first task"
+          - condition: "plan created, first task is design"
+            primary: mvt-design
+            primary_desc: "Design the architecture for the first task"
+          - condition: "plan created, first task is testing"
+            primary: mvt-test
+            primary_desc: "Write tests for the first task"

package/sources/skills/mvt-quick-dev/business.md

@@ -84,7 +84,8 @@
   - Verification status: type-check result, test suggestion
 - **No artifact is written. No document is generated.** This is a conversation-only skill.
 
-### Step 8: (session update handled by shared section)
+### Step 8: State Update
+Apply the State Update rules defined in the **State Update** section below.
 
 ## Edge Cases & Errors
 

package/sources/skills/mvt-quick-dev/manifest.yaml

@@ -50,20 +50,35 @@ sections:
 
   - type: inline
     content: |
-      ### Shortcut Operation Rules
-      - Can execute at any time without checking workflow prerequisites
-      - Do NOT update `progress` (this is a shortcut operation, not a workflow phase)
-      - Do NOT create an `active_change` if one doesn't already exist
-      - Do NOT write any artifact or document — results are conversation-only
-      - Do NOT interact with plan.yaml in any way — this skill is plan-independent
+      ## Operation Mode: Shortcut
+
+      This skill operates as a shortcut — it can execute at any time without checking workflow prerequisites.
+      - Do NOT update `active_change` fields (this is a shortcut operation, not a workflow phase).
+      - Do NOT create an `active_change` if one doesn't already exist.
+      - Do NOT write any artifact or document — results are conversation-only.
+      - Do NOT interact with plan.yaml in any way — this skill is plan-independent.
 
   - type: file
     source: ./business.md
 
   - type: shared
     source: sections/session-update.md
+    params:
+      current_skill: mvt-quick-dev
+      no_change: true
 
   - type: shared
     source: sections/footer-next-steps.md
     params:
       current_skill: mvt-quick-dev
+      conditional_suggestions:
+        conditions:
+          - condition: "change applied, tests exist for affected code"
+            primary: mvt-test
+            primary_desc: "Run tests on the changed code"
+          - condition: "change applied, no tests exist"
+            primary: mvt-review
+            primary_desc: "Quick review of the change"
+          - condition: "change was more complex than expected"
+            primary: mvt-analyze
+            primary_desc: "Do a full analysis for this change"

package/sources/skills/mvt-refactor/business.md

@@ -88,7 +88,8 @@
   - `Verification Result` -- tests run, pass/fail counts; or manual checks recommended.
   - `Follow-ups` -- deferred behavior changes spotted during refactoring.
 
-### Step 10: (session update handled by shared section)
+### Step 10: State Update
+Apply the State Update rules defined in the **State Update** section below.
 
 ## Edge Cases & Errors
 

package/sources/skills/mvt-refactor/manifest.yaml

@@ -67,11 +67,16 @@ sections:
 
   - type: inline
     content: |
-      ### Step 3: Pre-flight Checks
+      ### Step 4: Pre-flight Checks
       - No blocking checks required (shortcut operation).
 
-      ### Shortcut Operation Rules
-      - Can execute at any time without checking workflow prerequisites
+  - type: inline
+    content: |
+      ## Operation Mode: Shortcut
+
+      This skill operates as a shortcut — it can execute at any time without checking workflow prerequisites.
+      - Do NOT update `active_change` fields.
+      - Write a `history` entry only (via State Update).
 
   - type: file
     source: ./business.md
@@ -79,8 +84,21 @@ sections:
 
   - type: shared
     source: sections/session-update.md
+    params:
+      current_skill: mvt-refactor
 
   - type: shared
     source: sections/footer-next-steps.md
     params:
       current_skill: mvt-refactor
+      conditional_suggestions:
+        conditions:
+          - condition: "refactoring complete, tests exist"
+            primary: mvt-test
+            primary_desc: "Run tests to verify behavior is preserved"
+          - condition: "refactoring complete, no tests exist"
+            primary: mvt-review
+            primary_desc: "Review the refactored code"
+          - condition: "refactoring revealed design issues"
+            primary: mvt-design
+            primary_desc: "Redesign the affected module"

package/sources/skills/mvt-resume/business.md

@@ -3,31 +3,29 @@
 ### Step 1: Read Session State
 
 Extract from the already-loaded session context:
-- `active_change` -- the current change-id (if any), its phase, plan_path, has_plan
-- `recent_changes` -- list of changes with active plans
-- `skill_history` -- last 10 entries (skill name, timestamp, status, change_id)
-- `recent_actions` -- last 5 entries (what was done, when, outcome)
-- `last_command` and `last_skill` -- most recent invocation
+- `active_change` -- the current change-id (if any), plan_path
+- `changes` -- list of changes with active plans
+- `history` -- last 20 entries (skill name, timestamp, change_id)
 
-If session.yaml is missing or empty, jump to Step 6 with the "no session" branch.
+If session.yaml is missing or empty, jump to Step 8 with the "no session" branch.
 
-### Step 1.5: Discover Pending Plans
+### Step 2: Discover Pending Plans
 
 Scan for in-progress plans using two sources:
 
-1. **Index path**: For each entry in `recent_changes[]`, read its `plan_path` if the file exists.
-2. **Fallback scan**: Glob `.ai-agents/workspace/artifacts/*/plan.yaml`, read any files not already covered by (1).
+1. **Index path**: For each entry in `changes[]`, read its `plan_path` if the file exists.
+2. **Fallback scan**: Glob `.ai-agents/workspace/artifacts/*/plan.yaml`, read any files not already covered by (1). **Skip any paths under `artifacts/_archived/`** — those are completed changes archived by `/mvt-cleanup` and should not appear as resume candidates.
 
 For each found plan.yaml, read and filter:
 - Include only plans where `plan.status == "in_progress"`.
 - Capture: `change_id`, `title`, task progress (`done_count / total_count`), `updated_at`.
 - Sort candidates by `updated_at` descending.
 
-### Step 1.6: Select Target Change
+### Step 3: Select Target Change
 
 | Candidates | Behavior |
 |------------|----------|
-| 0          | Skip to Step 2 — use legacy `active_change` / `skill_history` flow (no plan context). |
+| 0          | Jump to Step 8 with the "no plans" edge case — report no active plans and suggest `/mvt-plan-dev` or `/mvt-analyze`. |
 | 1          | Auto-select. Print: "Found one active plan: **{title}** ({progress}). Resuming." |
 | ≥2         | **Pause and prompt**. Display candidate table and wait for user input. |
 
@@ -36,9 +34,9 @@ For each found plan.yaml, read and filter:
 ```
 Found {N} active plans. Select which to resume:
 
-| # | change-id | title | progress | last_updated |
-|---|-----------|-------|----------|--------------|
-| 1 | {id}      | {t}   | {d}/{n}  | {relative}   |
+| # | change-id | title | progress | updated_at |
+|---|-----------|-------|----------|------------|
+| 1 | {id}      | {t}   | {d}/{n}  | {relative} |
 | ...
 
 Enter a number, a change-id, or "none" to skip plan context:
@@ -46,62 +44,25 @@ Enter a number, a change-id, or "none" to skip plan context:
 
 **Explicit argument override**: If the user invoked `/mvt-resume {change-id}`, use that change-id directly — skip the table, locate and load its plan.yaml (error if not found or not in_progress).
 
-After selection, set `selected_change_id` for use in subsequent steps. If "none" or 0 candidates, `selected_change_id = null`.
+After selection, set `selected_change_id` for use in subsequent steps.
 
-### Step 2: Inspect Recent Artifacts
+### Step 4: Inspect Recent Artifacts
 
-If `selected_change_id` is set:
-- List files under `.ai-agents/workspace/artifacts/{selected_change_id}/`, sorted by mtime descending
+List files under `.ai-agents/workspace/artifacts/{selected_change_id}/`, sorted by mtime descending:
 - Exclude `plan.yaml` from the artifact list (it gets its own section)
 - Take the top 5
 
-Else if `active_change.id` is set (no-plan fallback):
-- List files under `.ai-agents/workspace/artifacts/{active_change.id}/`, sorted by mtime descending
-- Take the top 5
-
-Otherwise:
-- List all files under `.ai-agents/workspace/artifacts/` (recursive), sorted by mtime descending
-- Take the top 5
-
 For each artifact, capture: file path, mtime, size (in tokens estimate = chars / 4), and the change-id it belongs to.
 
-### Step 3: Determine Resume Point
-
-**Plan-aware path** (when `selected_change_id` has a valid plan.yaml):
+### Step 5: Determine Resume Point
 
 Read the plan's `current_task`. The resume point = that task. Next-step recommendation = the task's `skill_hint` (or infer from task title if skill_hint is absent).
 
-Also filter `skill_history` to entries matching `change_id == selected_change_id` (entries with empty change_id are excluded from this filtered view).
-
-**Legacy path** (no plan):
-
-Pick the **resume point** by precedence:
-
-| Condition | Resume point | Phase label |
-|-----------|--------------|-------------|
-| `active_change` is set with non-empty `phase` | `{active_change.phase}` | from session |
-| `active_change` is set without phase | inferred from last skill in history | inferred |
-| `skill_history[0]` exists | last skill | last skill |
-| Nothing | `none` | new project |
-
-Map skill -> next-step recommendation:
-
-| Last skill | Suggested next |
-|-----------|----------------|
-| mvt-init | mvt-analyze-code (if has code) or mvt-analyze (if requirements available) |
-| mvt-analyze | mvt-design |
-| mvt-analyze-code | mvt-analyze (if requirements pending) or mvt-design |
-| mvt-design | mvt-plan-dev (if change is large) or mvt-implement |
-| mvt-implement | mvt-review |
-| mvt-review | mvt-fix (if findings) or mvt-test |
-| mvt-fix | mvt-review (re-review) or mvt-test |
-| mvt-test | mvt-cleanup or next change |
-| mvt-cleanup | new change via mvt-analyze |
-| (other) | mvt-status |
+Also filter `history` to entries matching `change_id == selected_change_id` (entries with empty change_id are excluded from this filtered view).
 
-### Step 4: Load Plan Progress (plan-aware path only)
+### Step 6: Load Plan Progress
 
-If `selected_change_id` has a plan, generate the **Plan Progress** section:
+Generate the **Plan Progress** section:
 
 - Read all tasks from plan.yaml.
 - Build a compact status table: `| # | id | title | status | skill_hint |`
@@ -116,22 +77,21 @@ And the **Current Task Detail** section:
 - `notes` (if non-empty)
 - `skill_hint` -> recommendation
 
-### Step 5: Generate Resume Report
+### Step 7: Generate Resume Report
 
 Render via the `resume-output.md` template. Sections to fill:
 
-1. **Active Task** -- name, change-id, phase, started_at (from active_change or selected plan)
-2. **Plan Progress** -- (only when plan exists) task table + counts + current task detail
-3. **Recent Skill History** -- last 5 entries from skill_history (filtered to selected change if applicable)
-4. **Recent Artifacts** -- the top 5 artifacts collected in Step 2 (path, mtime, size)
+1. **Active Task** -- name, change-id, started_at (from selected plan)
+2. **Plan Progress** -- task table + counts + current task detail
+3. **Recent Skill History** -- last 5 entries from history (filtered to selected change if applicable)
+4. **Recent Artifacts** -- the top 5 artifacts collected in Step 4 (path, mtime, size)
 5. **Resume Point** -- a one-paragraph natural-language summary of "where we are"
-6. **Recommended Next Step** -- the mapped next skill from Step 3, with justification
+6. **Recommended Next Step** -- the mapped next skill from Step 5, with justification
 
-### Step 6: Edge Cases
+### Step 8: Edge Cases
 
 - **No session**: report "No session found. Run `/mvt-init` to start a project."
-- **No active_change AND no history AND no plans**: report "No active task. Suggested entry points: `/mvt-init`, `/mvt-analyze`, `/mvt-status`."
-- **active_change set but referenced artifacts missing**: warn "Artifact directory `{path}` not found -- task state may be stale. Verify with `/mvt-status` or run `/mvt-cleanup`."
-- **Last skill ended in failure** (skill_history entry status=failed): surface the failure summary first, suggest retry of that skill rather than advancing.
+- **No active plans**: report "No active plans found. Start a new change with `/mvt-analyze` or run `/mvt-status` to check project state."
+- **Selected change but referenced artifacts missing**: warn "Artifact directory `{path}` not found -- task state may be stale. Verify with `/mvt-status` or run `/mvt-cleanup`."
 - **Plan exists but plan.yaml is invalid** (parse error or schema violation): warn "plan.yaml is corrupted or invalid. Run `/mvt-plan-dev` to regenerate, or `/mvt-status` to inspect."
 - **Stale task warning**: If plan's `current_task` has status `in_progress` but the plan's `updated_at` is more than 5 days old, append a notice: "Current task has been in_progress for {N} days without updates. Consider running `/mvt-update-plan` to refresh status."

package/sources/skills/mvt-resume/manifest.yaml

@@ -3,7 +3,7 @@ output: .claude/skills/mvt-resume/SKILL.md
 
 frontmatter:
   name: mvt-resume
-  description: "Resume an in-progress development task in a new conversation. Reads session.yaml (active_change, skill_history, recent_actions) and recent artifacts to reconstruct context. Does not read git state."
+  description: "Resume an in-progress development task in a new conversation. Reads session.yaml (active_change, history) and recent artifacts to reconstruct context. Does not read git state."
 
 sections:
   - type: inline
@@ -28,11 +28,11 @@ sections:
       decision_rules:
         - rule: "Multiple in_progress plans found -> Pause and display candidate table, wait for user selection"
         - rule: "Exactly one in_progress plan found -> Auto-select it and proceed"
-        - rule: "No plans found BUT active_change is set -> Fall back to legacy skill_history-based resume"
-        - rule: "active_change is empty AND skill_history is empty AND no plans -> Recommend `/mvt-init` or `/mvt-status`"
+        - rule: "No plans found -> Report no active plans, suggest `/mvt-analyze` or `/mvt-plan-dev`"
+        - rule: "active_change is empty AND history is empty AND no plans -> Recommend `/mvt-init` or `/mvt-status`"
         - rule: "Plan exists and has current_task -> Use current_task's skill_hint as next-step recommendation"
         - rule: "Plan's current_task has been in_progress for >5 days -> Surface stale warning"
-        - rule: "Last skill failed or was interrupted -> Surface the failure context, suggest retry"
+        - rule: "Last skill was interrupted -> Surface the context, suggest retry"
       boundaries:
         - scope: "read git state (branch, diff, commits)"
           skill: "(Out of scope -- this skill is session-state only)"
@@ -47,9 +47,6 @@ sections:
   - type: shared
     source: sections/activation-load-config.md
 
-  - type: shared
-    source: sections/output-language-constraint.md
-
   - type: shared
     source: sections/activation-preflight.md
     params:
@@ -64,8 +61,21 @@ sections:
 
   - type: shared
     source: sections/session-update.md
+    params:
+      read_only: true
 
   - type: shared
     source: sections/footer-next-steps.md
     params:
       current_skill: mvt-resume
+      conditional_suggestions:
+        conditions:
+          - condition: "plan has current_task with skill_hint"
+            primary: mvt-implement
+            primary_desc: "Continue with the next planned task (use skill_hint)"
+          - condition: "no active plans found"
+            primary: mvt-analyze
+            primary_desc: "Start a new feature"
+          - condition: "plan stale (>5 days without updates)"
+            primary: mvt-update-plan
+            primary_desc: "Refresh plan status before continuing"

package/sources/skills/mvt-review/business.md

@@ -81,8 +81,7 @@
 - Each finding must include: file, line range, severity, observation, recommendation.
 
 ### Step 6: Write Artifact
-- **Path**: `.ai-agents/workspace/artifacts/{active_change.id}/review.md` if `active_change` exists; else `.ai-agents/workspace/artifacts/_ad-hoc-review-{YYYY-MM-DD-HHMM}/review.md`.
-- **Template**: `.ai-agents/skills/_templates/review-output.md` (custom override at `_templates/custom/...` takes precedence).
+- **Path and template**: as defined in the **Artifact Structure** section below. If no `active_change` exists, use `.ai-agents/workspace/artifacts/_ad-hoc-review-{YYYY-MM-DD-HHMM}/review.md`.
 - **Required content** (mapped to template headings):
   - `Review Scope` -- file list, depth, aspect filter, fallbacks applied (e.g., "design.md missing -> Group A skipped").
   - `Summary` -- counts per severity + one-paragraph overall verdict (Approve / Approve with comments / Request changes / Block).
@@ -98,7 +97,8 @@
 - Critical = 0, Warnings <= 5, Suggestions only -> verdict is `Approve`.
 - Code-only review (design.md missing) -> verdict cannot be higher than `Approve with comments` (call it out explicitly).
 
-### Step 8: (session update handled by shared section)
+### Step 8: State Update
+Apply the State Update rules defined in the **State Update** section below.
 
 ## Edge Cases & Errors
 

package/sources/skills/mvt-review/manifest.yaml

@@ -48,6 +48,14 @@ sections:
 
       Usage: `/mvt-review` or `/mvt-review --aspect {type}`
 
+  - type: shared
+    source: sections/activation-load-context.md
+    params:
+      extended_context:
+        - ".ai-agents/workspace/artifacts/{active_change.id}/analysis.md -- Requirements analysis"
+        - ".ai-agents/workspace/artifacts/{active_change.id}/design.md -- Architecture design"
+        - ".ai-agents/workspace/artifacts/{active_change.id}/implementation.md -- Implementation record"
+
   - type: shared
     source: sections/activation-load-config.md
 
@@ -63,7 +71,7 @@ sections:
           level: "WARN"
           message: "Session not initialized. Run `/mvt-init` first."
         - order: "2"
-          field: "no code to review"
+          field: "review target (user args, implementation.md, or git diff)"
           level: "WARN"
           message: "No code to review. Run `/mvt-implement` first or specify files."
 
@@ -80,8 +88,21 @@ sections:
 
   - type: shared
     source: sections/session-update.md
+    params:
+      current_skill: mvt-review
 
   - type: shared
     source: sections/footer-next-steps.md
     params:
       current_skill: mvt-review
+      conditional_suggestions:
+        conditions:
+          - condition: "critical issues found"
+            primary: mvt-fix
+            primary_desc: "Fix the critical issues before merge"
+          - condition: "review approved, tests not written"
+            primary: mvt-test
+            primary_desc: "Add test coverage"
+          - condition: "review approved, all checks passed"
+            primary: mvt-update-plan
+            primary_desc: "Mark review task done in the plan"

package/sources/skills/mvt-status/business.md

@@ -9,24 +9,24 @@
   - If `session.yaml` exists but is empty (zero keys), treat as `not initialized` -> recommend `/mvt-init`.
 
 ### Step 2: Build Activity Timeline
-- **What**: produce the most-recent-first list of skill_history entries with derived metadata.
+- **What**: produce the most-recent-first list of history entries with derived metadata.
 - **How**:
-  1. Read `skill_history` from `session.yaml`.
+  1. Read `history` from `session.yaml`.
   2. For each entry, attach: relative time (e.g., "2h ago"), `change_id` (if present), and the originating skill name.
   3. Limit to the last 10 entries for the rendered table; keep full count separately for the summary line.
 
 ### Step 3: Discover All Plans (Multi-Change Dashboard)
 - **What**: produce the canonical plan list across the workspace.
 - **How**:
-  1. Iterate `recent_changes[]` from `session.yaml`. For each entry with a `plan_path`, attempt to read the plan file.
-  2. Glob `.ai-agents/workspace/artifacts/*/plan.yaml` to find any plans not registered in `recent_changes` (mark them `unindexed`).
+  1. Iterate `changes[]` from `session.yaml`. For each entry with a `plan_path`, attempt to read the plan file.
+  2. Glob `.ai-agents/workspace/artifacts/*/plan.yaml` to find any plans not registered in `changes` (mark them `unindexed`). **Exclude paths under `artifacts/_archived/`** — those are completed changes archived by `/mvt-cleanup`.
   3. For each plan, extract: `change_id`, `title`, `status`, `current_task`, task progress (`done/total`), `updated_at`, `skill_hint` (from current task if present).
   4. If a plan file is present but malformed, include a row with `(corrupt)` in the status column and mark the file path; do not abort.
 - **Branches**:
 
   | Condition | Action |
   |-----------|--------|
-  | No plans found anywhere | Skip the Changes Overview section entirely; render only legacy `active_change` summary |
+  | No plans found anywhere | Skip the Changes Overview section entirely; render "No active changes." |
   | One plan found | Render Changes Overview with one row |
   | Multiple plans found | Render Changes Overview sorted: `in_progress` desc by `updated_at` first, then `done` desc by `updated_at`, then `abandoned` last |
   | Any plan over the cap (more than ~12 rows) | Show top 10 rows; print a `+N older changes hidden -- see artifacts/` line |
@@ -37,35 +37,31 @@
   1. **Header** -- one-line summary: project name (from `project-context.yaml`), framework version, last synced timestamp.
   2. **Projects** -- table: name | type | tech stack (truncated). Cap at 10 rows; collapse the rest into `+N more`.
   3. **Semantic Context** -- one line: `project-context.md present` / `missing -- run /mvt-analyze-code`.
-  4. **Active Change** -- if `active_change` exists: id, title, current phase, start time. Else: `none`.
+  4. **Active Change** -- if `active_change` exists: id, title, start time. Else: `none`.
   5. **Changes Overview** -- table from Step 3 (skip if no plans). Render with these columns:
 
-     | change-id | title | status | progress | current_task | last_updated |
-     |-----------|-------|--------|----------|--------------|--------------|
+     | change-id | title | status | progress | current_task | updated_at |
+     |-----------|-------|--------|----------|--------------|------------|
   6. **Skill History** -- last 5 rows of the timeline from Step 2.
-  7. **Recent Actions** -- compact list (max 5).
 
-- Hard cap: total rendered output should not exceed ~120 lines. If it would, truncate Skill History and Recent Actions first; never truncate the active change or Changes Overview header rows.
+- Hard cap: total rendered output should not exceed ~120 lines. If it would, truncate Skill History first; never truncate the active change or Changes Overview header rows.
 
 ### Step 5: Suggest Next Step
 - Resolution order (first match wins):
   1. `active_change` has a plan in `in_progress`, `current_task` is set -> suggest the task's `skill_hint` (or, if missing, recommend `/mvt-update-plan` to set `current_task`).
-  2. `active_change` exists but no plan -> infer next workflow phase from `skill_history` (last completed phase determines next).
-  3. No `active_change`, but `project-context.md` is missing -> suggest `/mvt-analyze-code`.
-  4. No `active_change`, no missing context -> suggest `/mvt-analyze` to start a new feature OR `/mvt-help` to browse the catalog.
+  2. `project-context.md` is missing -> suggest `/mvt-analyze-code`.
+  3. No `active_change` or no active plan -> suggest `/mvt-analyze` to start a new feature OR `/mvt-help` to browse the catalog.
 - The suggestion must be a single line: skill command + one-clause reason.
 
-### Step 6: (session update handled by shared section)
-
 ## Edge Cases & Errors
 
 | Case | Handling |
 |------|----------|
 | `session.yaml` missing entirely | Render a minimal report (Projects section if available) and recommend `/mvt-init` |
-| `session.yaml` corrupt (parse error) | Surface error with file path, render Projects only, recommend `/mvt-sync-context` |
-| `recent_changes[]` references a `plan_path` that no longer exists | Include in Changes Overview with `(missing)` marker; do not delete the index entry from this skill |
+| `session.yaml` corrupt (parse error) | Surface error with file path, render Projects only, recommend `/mvt-init` to reinitialize |
+| `changes[]` references a `plan_path` that no longer exists | Include in Changes Overview with `(missing)` marker; do not delete the index entry from this skill |
 | Plan file's `current_task` references a task id not in `tasks[]` | Render `current_task` as `(invalid: <id>)`; do not attempt to fix |
 | Plan file's `status` is not one of the known values | Render the raw value verbatim; flag in skip-checks of the report |
-| Both `recent_changes[]` and the artifact glob find the same plan | Deduplicate by `change_id`; prefer the indexed entry's metadata |
+| Both `changes[]` and the artifact glob find the same plan | Deduplicate by `change_id`; prefer the indexed entry's metadata |
 | Multiple `in_progress` plans | All rendered in Changes Overview; Step 5's suggestion picks the most recently updated; mention the count in the suggestion line |
 | Workspace contains zero projects | Render header only with a single suggestion: `/mvt-init` |

package/sources/skills/mvt-status/manifest.yaml

@@ -40,9 +40,6 @@ sections:
   - type: shared
     source: sections/activation-load-config.md
 
-  - type: shared
-    source: sections/output-language-constraint.md
-
   - type: shared
     source: sections/activation-preflight.md
     params:
@@ -64,3 +61,14 @@ sections:
     source: sections/footer-next-steps.md
     params:
       current_skill: mvt-status
+      conditional_suggestions:
+        conditions:
+          - condition: "active change with current_task"
+            primary: mvt-resume
+            primary_desc: "Resume work on the current task"
+          - condition: "project-context.md missing"
+            primary: mvt-analyze-code
+            primary_desc: "Generate semantic project context"
+          - condition: "no active change"
+            primary: mvt-analyze
+            primary_desc: "Start analyzing a new feature"

package/sources/skills/mvt-sync-context/business.md

@@ -3,10 +3,12 @@
 ### Step 1: Identify Completed Changes
 - **What**: produce a candidate list of change-ids whose artifacts will be aggregated.
 - **How**:
-  1. Read `session.yaml`. Collect `recent_changes[]` entries with `status: completed`.
+  1. Read `session.yaml`. Collect `changes[]` entries with `status: done`.
   2. For each candidate, verify `.ai-agents/workspace/artifacts/{change-id}/` exists AND contains at least one of `analysis.md` or `design.md`. Drop entries with only `plan.yaml`.
-  3. (Fallback) If `recent_changes[]` is empty, scan `.ai-agents/workspace/artifacts/*/` directly; offer those with `analysis.md` or `design.md`, marked `unindexed`.
-  4. Exclude any change-id whose directory contains an `_archive/` subfolder (already archived).
+  3. (Fallback) If `changes[]` is empty, scan `.ai-agents/workspace/artifacts/*/` directly; offer those with `analysis.md` or `design.md`, marked `unindexed`.
+  4. Exclude already-archived or irrelevant changes:
+     - **Indexed changes**: exclude any `changes[]` entry with `status: abandoned`. For `status: done` entries, Step 1.2's directory existence check already filters out those whose artifacts have been moved to `artifacts/_archived/` by `/mvt-cleanup`.
+     - **Fallback scan**: when scanning `artifacts/*/` directly, skip any path under `artifacts/_archived/` (the unified archive directory managed by `/mvt-cleanup`).
   5. Exclude `active_change.id` (work in flight).
 
 - **Present** the list:
@@ -38,10 +40,9 @@ This step establishes the **target structure** that aggregated content must fit
 
 - **What**: from each selected change-id, extract atomic knowledge items and classify them against the section map from Step 2.
 - **How**:
-  1. For each selected change-id, read available artifacts (`analysis.md`, `design.md`, `implementation.md`).
+  1. For each selected change-id, read available artifacts (`analysis.md`, `implementation.md`).
   2. Extract atomic items. Typical sources:
      - `analysis.md` -> domain terms, actors, business rules, constraints
-     - `design.md` -> modules, layers, dependency rules, key interfaces, ADRs
      - `implementation.md` -> files added/changed (informs `.yaml` source_paths), realized vs deviated design points
   3. For each item, match to a section from the Step 2 map:
      - Match by semantic similarity to **section title + 1-line summary**, not by exact string.
@@ -126,14 +127,18 @@ If user skips verification: proceed directly to Step 7 with Step 5 selections.
 1. **Applied summary** -- counts: items added / modified / skipped / orphaned-into-new-section
 2. **Files changed** -- paths + byte deltas
 3. **Backup paths** -- so user can manually revert
-4. **Out-of-scope reminder** (always print):
+4. **Synced changes** -- list all change-ids whose knowledge was aggregated in this run:
+   > The following changes have been synced and can be safely archived: {change-id-1}, {change-id-2}, ...
+   > Last synced at: {last_synced_at} (updated by this run)
+5. **Out-of-scope reminder** (always print):
    > This skill processes additions and modifications only. Module deletions, renames, and large refactors are NOT detected here. Run `/mvt-analyze-code` periodically to rebuild from ground truth.
-5. **Suggested next**:
+6. **Suggested next**:
    - Aggregated >= 1 change -> "Run `/mvt-cleanup` to archive these completed changes."
    - Verification flagged code-only entities -> "Run `/mvt-analyze-code` to capture missing entities."
 
-### Step 9: (session update handled by shared section)
-- Refresh `session.last_synced_at` to current ISO timestamp.
+### Step 9: State Update
+Apply the State Update rules defined in the **State Update** section below.
+- The `--set-synced` parameter updates `session.last_synced_at`.
 
 ## Edge Cases & Errors
 

package/sources/skills/mvt-sync-context/manifest.yaml

@@ -78,6 +78,9 @@ sections:
 
   - type: shared
     source: sections/session-update.md
+    params:
+      current_skill: mvt-sync-context
+      set_synced: true
 
   - type: shared
     source: sections/footer-next-steps.md

package/sources/skills/mvt-template/business.md

@@ -82,8 +82,6 @@
 
   3. Never write outside the project root unless an absolute path was explicitly provided by the user.
 
-### Step 5: (session update handled by shared section)
-
 ## Edge Cases & Errors
 
 | Case | Handling |