@moretea-labs/forge 1.5.0-rc.1 → 1.5.1

package/scripts/ensure-task-workflow.sh

@@ -342,7 +342,7 @@ Complete this inventory before implementation. If any line is unknown, keep the
 ## Handoff
 
 - Checks file: `.ai/harness/checks/latest.json`
-- Session handoff: `.ai/harness/handoff/current.md`
+- Session continuation: `.ai/harness/session/continuation.md`
 
 ## Evidence Contract
 
@@ -489,7 +489,7 @@ CONTRACT_TEMPLATE_EOF
 
 ## Verification Evidence
 
-- Waza /check run:
+- Forge /review run:
 - Commands run:
 - Manual checks:
 - Supporting artifacts:
@@ -625,7 +625,7 @@ CURRENT_STATUS_EOF
 }
 
 ensure_auxiliary_files() {
-  mkdir -p plans plans/archive plans/prds plans/sprints tasks/issues tasks/archive tasks/contracts tasks/reviews tasks/notes tasks/workstreams docs/architecture/domains docs/architecture/modules docs/architecture/requests docs/architecture/snapshots docs/architecture/diagrams scripts .ai/context .ai/harness/checks .ai/harness/handoff .ai/harness/scripts .ai/harness/failures .ai/harness/security .ai/harness/planning .ai/harness/architecture .ai/harness/worktrees .ai/harness/runs .ai/harness/jobs .ai/harness/local-jobs .ai/harness/controller .ai/harness/edit-sessions
+  mkdir -p plans plans/archive plans/prds plans/sprints tasks/issues tasks/archive tasks/contracts tasks/reviews tasks/notes tasks/workstreams docs/architecture/domains docs/architecture/modules docs/architecture/requests docs/architecture/snapshots docs/architecture/diagrams scripts .ai/context .ai/harness/checks .ai/harness/session .ai/harness/controller/packets .ai/harness/projections .ai/harness/transfers .ai/harness/scripts .ai/harness/failures .ai/harness/security .ai/harness/planning .ai/harness/architecture .ai/harness/worktrees .ai/harness/runs .ai/harness/jobs .ai/harness/local-jobs .ai/harness/controller .ai/harness/edit-sessions
 
   if [[ ! -f "docs/spec.md" ]]; then
     cat > docs/spec.md <<'SPEC_EOF'
@@ -669,16 +669,16 @@ RESEARCH_README_EOF
     echo "{}" > ".ai/harness/checks/latest.json"
   fi
 
-  if [[ ! -f ".ai/harness/handoff/current.md" ]]; then
-    cat > ".ai/harness/handoff/current.md" <<'HANDOFF_EOF'
-# Harness Handoff
+  if [[ ! -f ".ai/harness/session/continuation.md" ]]; then
+    cat > ".ai/harness/session/continuation.md" <<'HANDOFF_EOF'
+# Forge Session Continuation Snapshot
 
 > **Reason**: bootstrap
 HANDOFF_EOF
   fi
 
-  if [[ ! -f ".ai/harness/handoff/resume.md" ]]; then
-    cat > ".ai/harness/handoff/resume.md" <<'RESUME_EOF'
+  if [[ ! -f ".ai/harness/session/resume.md" ]]; then
+    cat > ".ai/harness/session/resume.md" <<'RESUME_EOF'
 # Codex Resume Packet
 
 > **Reason**: bootstrap
@@ -833,7 +833,6 @@ ARCHITECTURE_INDEX_EOF
   "harness": {
     "policy_file": ".ai/harness/policy.json",
     "checks_file": ".ai/harness/checks/latest.json",
-    "handoff_file": ".ai/harness/handoff/current.md",
     "failure_log_file": ".ai/harness/failures/latest.jsonl",
     "events_file": ".ai/harness/events.jsonl",
     "architecture_events_file": ".ai/harness/architecture/events.jsonl",
@@ -899,19 +898,21 @@ ARCHITECTURE_INDEX_EOF
       "sync_rule": "only explicitly opted-in repo-to-brain manifest entries may be written to the default brain vault; pointer-only externalized stubs remain check-only"
     }
   },
-  "handoff_resume": {
-    "resume_packet_file": ".ai/harness/handoff/resume.md",
-    "global_handoff_dir": "~/.codex/handoffs",
-    "auto_start_new_session": false
+  "session": {
+    "continuation_file": ".ai/harness/session/continuation.md",
+    "resume_file": ".ai/harness/session/resume.md",
+    "global_resume_dir": "~/.codex/handoffs",
+    "auto_start_new_session": false,
+    "authority": "rebuildable-host-session-cache-only"
   },
   "plan_capture": {
     "script": "scripts/capture-plan.sh",
-    "sources": ["codex-plan-mode", "waza-think", "forge-plan"],
-    "rule": "Codex Plan mode and Waza think planning should capture decision-complete plans into plans/plan-*.md; implementation approval then projects the active approved plan through scripts/plan-to-todo.sh"
+    "sources": ["host-plan-mode", "forge-plan"],
+    "rule": "Forge /plan or host planning mode may capture decision-complete source plans into plans/plan-*.md; migrated lifecycle execution remains owned by Runtime Plan/Work state"
   },
   "planning": {
     "pending_orchestration_file": ".ai/harness/planning/pending.json",
-    "source_of_truth": "transient host planning bridge only; plans/ and .ai/harness/active-plan remain authoritative"
+    "source_of_truth": "transient host planning bridge only; captured plans are source artifacts, while migrated Runtime Plan/Work lifecycle state is authoritative in the Canonical Runtime"
   },
   "guards": {
     "edit_plan_gate": "advice",
@@ -956,7 +957,7 @@ ARCHITECTURE_INDEX_EOF
       "existing_changes_unrelated_but_would_block_review",
       "task_requires_clean_validation_surface"
     ],
-    "validation_route": "waza:check",
+    "validation_route": "forge:/review",
     "merge_back": {
       "target": "main",
       "requires_clean_check": true,
@@ -995,17 +996,18 @@ ARCHITECTURE_INDEX_EOF
   },
   "external_tooling": {
     "routing": {
-      "complex": "gstack",
-      "simple": "waza",
-      "knowledge": "gbrain"
+      "primary": "forge",
+      "optional_complex_helper": "gstack",
+      "optional_small_helper": "waza",
+      "optional_knowledge_helper": "gbrain"
     },
     "hosts": [
       "claude-code",
       "codex"
     ],
-    "mode": "agent-readiness-required",
+    "mode": "optional-enhancement",
     "detection": "init-migrate",
-    "readiness_gate": "scripts/check-agent-tooling.sh --host codex --strict-readiness",
+    "readiness_gate": "scripts/check-agent-tooling.sh --host codex",
     "waza": {
       "source_repo": "tw93/Waza",
       "source_url": "https://github.com/tw93/Waza.git",
@@ -1017,14 +1019,14 @@ ARCHITECTURE_INDEX_EOF
       "host_drift_policy": "report-per-host-version-staging-and-upstream-drift"
     },
     "codex_automation_profile": {
-      "required_skills": ["health", "check", "mermaid"],
-      "optional_skills": [],
+      "required_skills": [],
+      "optional_skills": ["health", "check", "mermaid"],
       "mode": "codex-runtime-reference",
       "source": "~/.codex/skills",
       "routes": {
-        "workflow_health": "waza:health",
-        "review_gate": "waza:check",
-        "architecture_diagram": "mermaid"
+        "workflow_health": "forge:/debug",
+        "review_gate": "forge:/review",
+        "architecture_diagram": "mermaid-if-installed"
       },
       "vendoring_policy": "do-not-vendor-skill-body"
     },
@@ -1045,7 +1047,7 @@ ARCHITECTURE_INDEX_EOF
       "codex_config_path": "~/.codex/config.toml",
       "claude_config_path": "~/.claude.json",
       "index_dir": ".codegraph",
-      "readiness": "required-for-agent-code-navigation",
+      "readiness": "optional-global-cli-mcp; bundled-rh-context-backend-is-runtime-owned",
       "hook_policy": "do-not-block-hooks",
       "install_command": "bun add -g @colbymchenry/codegraph && forge tools configure codegraph --target codex --location global",
       "project_init_command": "codegraph init -i .",
@@ -1055,16 +1057,24 @@ ARCHITECTURE_INDEX_EOF
   },
   "agentic_development": {
     "routing": {
-      "product_discovery": "gstack:office-hours",
-      "complex_engineering_plan": "gstack:plan-eng-review",
-      "design_plan": "gstack:plan-design-review",
-      "small_or_medium_plan": "waza:think",
-      "bug_or_regression": "waza:hunt",
-      "post_implementation_review": "waza:check"
+      "small_bounded_change": "forge:/direct",
+      "planning": "forge:/plan",
+      "bug_or_regression": "forge:/debug",
+      "post_implementation_review": "forge:/review",
+      "release": "forge:/release",
+      "scale": "forge:/scale"
+    },
+    "optional_enhancements": {
+      "direct": "forge:/direct",
+      "plan": "forge:/plan",
+      "debug": "forge:/debug",
+      "review": "forge:/review",
+      "release": "forge:/release",
+      "scale": "forge:/scale"
     },
     "due_diligence": {
       "levels": ["P1_GLOBAL_ARCHITECTURE", "P2_DATA_FLOW_TRACE", "P3_DESIGN_DECISION"],
-      "explicit_report_required_for": ["plan-eng-review", "hunt", "risky_refactor", "deployment", "auth_payment_data", "shared_contract"]
+      "explicit_report_required_for": ["forge:/plan", "forge:/debug", "risky_refactor", "deployment", "auth_payment_data", "shared_contract"]
     }
   },
   "enforcement": {

package/scripts/init-project.sh

@@ -213,7 +213,7 @@ create_structure() {
     mkdir -p plans/archive
     mkdir -p .ai/context
     mkdir -p .ai/harness/checks
-    mkdir -p .ai/harness/handoff
+    mkdir -p .ai/harness/session .ai/harness/controller/packets .ai/harness/projections .ai/harness/transfers
     mkdir -p .ai/harness/failures
     mkdir -p .ai/harness/runs
     mkdir -p .claude/templates
@@ -325,8 +325,8 @@ EOF
     # - .ai/harness/checks/latest.json
     # - .ai/harness/events.jsonl
     # - .ai/harness/architecture/events.jsonl
-    # - .ai/harness/handoff/current.md
-    # - .ai/harness/handoff/resume.md
+    # - .ai/harness/session/continuation.md
+    # - .ai/harness/session/resume.md
     # - .ai/harness/failures/latest.jsonl
     # - .ai/harness/security/.gitkeep
     # - .ai/harness/worktrees/.gitkeep
@@ -493,7 +493,7 @@ main() {
     echo "  1. cd $PROJECT_NAME"
     echo "  2. Copy .env.example to .env and configure"
     echo "  3. Run: $PKG_MANAGER run dev"
-    echo "  4. Use Codex Plan mode or Waza /think, then capture it with: bash scripts/capture-plan.sh --slug first-feature --title \"First Feature\""
+    echo "  4. Use Codex Plan mode or Forge /plan, then capture it with: bash scripts/capture-plan.sh --slug first-feature --title \"First Feature\""
     echo "  5. After approval, run: bash scripts/plan-to-todo.sh --plan <active-plan>"
     echo ""
     pi_print_external_tooling_report "$PWD" "apply" "$SCRIPT_DIR/check-agent-tooling.sh"

package/scripts/install-desktop-operator-registration.ts

@@ -13,7 +13,7 @@ function argument(name: string): string | undefined {
 }
 
 function usage(): never {
-  throw new Error('Usage: bun scripts/install-desktop-operator-registration.ts --controller-home <path> [--socket <absolute-path>] [--launch-agent-label <label>] [--expected-program-contains <identity>] [--version 0.1.0] [--protocol 1.0] [--expected-revision N] [--disabled]');
+  throw new Error('Usage: bun scripts/install-desktop-operator-registration.ts --controller-home <path> [--socket <absolute-path>] [--launch-agent-label <label>] [--expected-program-contains <identity>] [--version 0.2.1] [--protocol 1.0] [--expected-revision N] [--disabled]');
 }
 
 const controllerHome = argument('--controller-home') ?? process.env.FORGE_CONTROLLER_HOME?.trim();
@@ -35,7 +35,7 @@ const registration = installExternalPluginRegistration(
     socketPath,
     launchAgentLabel,
     expectedProgramContains,
-    pluginVersion: argument('--version') ?? '0.1.0',
+    pluginVersion: argument('--version') ?? '0.2.1',
     protocolVersion: argument('--protocol') ?? '1.0',
     enabled: !process.argv.includes('--disabled'),
   }),

package/scripts/lib/project-init-lib.sh

@@ -36,7 +36,6 @@ PI_DEFAULT_RUNTIME_ENTRIES=$(cat <<'EOF_RUNTIME'
 .claude/.trace.jsonl
 .claude/.session-handoff.md
 .claude/.task-state.json
-.claude/.task-handoff.md
 .claude/.codegraph-state/
 .claude/*.tmp
 .claude/*.bak
@@ -48,8 +47,8 @@ tasks/.current.md.tmp.*
 .ai/harness/events.jsonl
 .ai/harness/archive/
 .ai/harness/failures/latest.jsonl
-.ai/harness/handoff/current.md
-.ai/harness/handoff/resume.md
+.ai/harness/session/continuation.md
+.ai/harness/session/resume.md
 .ai/harness/capability-context/
 .ai/harness/security/*
 !.ai/harness/security/.gitkeep
@@ -203,7 +202,7 @@ Complete this inventory before implementation. If any line is unknown, keep the
 ## Handoff
 
 - Checks file: `.ai/harness/checks/latest.json`
-- Session handoff: `.ai/harness/handoff/current.md`
+- Session continuation: `.ai/harness/session/continuation.md`
 
 ## Evidence Contract
 
@@ -346,7 +345,7 @@ PI_TEMPLATE_REVIEW=$(cat <<'EOF_TEMPLATE_REVIEW'
 
 ## Verification Evidence
 
-- Waza /check run:
+- Forge /review run:
 - Commands run:
 - Manual checks:
 - Supporting artifacts:
@@ -1311,15 +1310,13 @@ pi_external_tooling_gbrain_mcp() {
 
 pi_external_tooling_defaults_summary() {
   cat <<'EOF_EXTERNAL_TOOLING_DEFAULTS'
-- Policy defaults: routing complex->gstack, simple->waza, knowledge->gbrain
+- Primary routing: Forge /direct, /plan, /debug, /review, /release, /scale
 - Hosts: claude-code, codex
-- Mode: agent-readiness-required
-- Detection: init-migrate
-- Waza: Codex-first, managed skills think/hunt/check/health, stage upstream in ~/.agents/skills, sync verified copies into ~/.codex/skills
-- Codex automation profile: required health/check/mermaid from ~/.codex/skills; do not vendor skill bodies
-- gbrain MCP: candidate-disabled
-- CodeGraph: required agent code-navigation readiness tool, target-aware MCP configure by explicit user command or authorized agent action, per-repo ignored .codegraph/ index; generated repos do not add it as a package dependency unless local policy opts in
-- Auto-actions: never install, upgrade, serve, sync, or enable MCP automatically
+- Mode: optional-enhancements
+- Detection: setup/readiness only
+- Waza/gstack/gbrain/Mermaid: optional host enhancements; never required for Forge correctness
+- CodeGraph: Forge bundled structural backend; global CLI/MCP is optional host integration
+- Auto-actions: never install, upgrade, serve, sync, or enable unrelated third-party tooling automatically
 EOF_EXTERNAL_TOOLING_DEFAULTS
 }
 
@@ -1936,7 +1933,6 @@ pi_write_harness_policy() {
   "harness": {
     "policy_file": ".ai/harness/policy.json",
     "checks_file": ".ai/harness/checks/latest.json",
-    "handoff_file": ".ai/harness/handoff/current.md",
     "failure_log_file": ".ai/harness/failures/latest.jsonl",
     "events_file": ".ai/harness/events.jsonl",
     "architecture_events_file": ".ai/harness/architecture/events.jsonl",
@@ -2003,19 +1999,21 @@ pi_write_harness_policy() {
       "sync_rule": "only explicitly opted-in repo-to-brain manifest entries may be written to the default brain vault; pointer-only externalized stubs remain check-only"
     }
   },
-  "handoff_resume": {
-    "resume_packet_file": ".ai/harness/handoff/resume.md",
-    "global_handoff_dir": "~/.codex/handoffs",
-    "auto_start_new_session": false
+  "session": {
+    "continuation_file": ".ai/harness/session/continuation.md",
+    "resume_file": ".ai/harness/session/resume.md",
+    "global_resume_dir": "~/.codex/handoffs",
+    "auto_start_new_session": false,
+    "authority": "rebuildable-host-session-cache-only"
   },
   "plan_capture": {
     "script": "scripts/capture-plan.sh",
-    "sources": ["codex-plan-mode", "waza-think", "forge-plan", "forge-sprint"],
-    "rule": "Codex Plan mode and Waza think planning should capture decision-complete plans into plans/plan-*.md; implementation approval then projects the active approved plan through scripts/plan-to-todo.sh; sprint backlog rows are long-task waypoints and should be expanded with \$think before capture/execution"
+    "sources": ["host-plan-mode", "forge-plan", "forge-sprint"],
+    "rule": "Forge /plan or host planning mode may capture decision-complete source plans into plans/plan-*.md; migrated lifecycle execution remains owned by Runtime Plan/Work state"
   },
   "planning": {
     "pending_orchestration_file": ".ai/harness/planning/pending.json",
-    "source_of_truth": "transient host planning bridge only; plans/ and .ai/harness/active-plan remain authoritative"
+    "source_of_truth": "transient host planning bridge only; captured plans are source artifacts, while migrated Runtime Plan/Work lifecycle state is authoritative in the Canonical Runtime"
   },
   "guards": {
     "edit_plan_gate": "advice",
@@ -2060,7 +2058,7 @@ pi_write_harness_policy() {
       "existing_changes_unrelated_but_would_block_review",
       "task_requires_clean_validation_surface"
     ],
-    "validation_route": "waza:check",
+    "validation_route": "forge:/review",
     "merge_back": {
       "target": "main",
       "requires_clean_check": true,
@@ -2099,14 +2097,15 @@ pi_write_harness_policy() {
   },
   "external_tooling": {
     "routing": {
-      "complex": "gstack",
-      "simple": "waza",
-      "knowledge": "gbrain"
+      "primary": "forge",
+      "optional_complex_helper": "gstack",
+      "optional_daily_helper": "waza",
+      "optional_knowledge_helper": "gbrain"
     },
     "hosts": $(pi_external_tooling_hosts_json),
-    "mode": "agent-readiness-required",
+    "mode": "optional-enhancements",
     "detection": "init-migrate",
-    "readiness_gate": "forge run check-agent-tooling --host codex --strict-readiness",
+    "readiness_report": "forge run check-agent-tooling --host codex",
     "waza": {
       "source_repo": "tw93/Waza",
       "source_url": "https://github.com/tw93/Waza.git",
@@ -2118,14 +2117,14 @@ pi_write_harness_policy() {
       "host_drift_policy": "report-per-host-version-staging-and-upstream-drift"
     },
     "codex_automation_profile": {
-      "required_skills": ["health", "check", "mermaid"],
-      "optional_skills": [],
-      "mode": "codex-runtime-reference",
+      "required_skills": [],
+      "optional_skills": ["health", "check", "mermaid"],
+      "mode": "optional-codex-runtime-reference",
       "source": "~/.codex/skills",
       "routes": {
-        "workflow_health": "waza:health",
-        "review_gate": "waza:check",
-        "architecture_diagram": "mermaid"
+        "workflow_health_optional": "waza:health",
+        "review_helper_optional": "waza:check",
+        "architecture_diagram_optional": "mermaid"
       },
       "vendoring_policy": "do-not-vendor-skill-body"
     },
@@ -2146,7 +2145,7 @@ pi_write_harness_policy() {
       "codex_config_path": "~/.codex/config.toml",
       "claude_config_path": "~/.claude.json",
       "index_dir": ".codegraph",
-      "readiness": "required-for-agent-code-navigation",
+      "readiness": "forge-bundled-backend; host-mcp-optional",
       "hook_policy": "do-not-block-hooks",
       "install_command": "bun add -g @colbymchenry/codegraph && forge tools configure codegraph --target codex --location global",
       "project_init_command": "codegraph init -i .",
@@ -2156,16 +2155,16 @@ pi_write_harness_policy() {
   },
   "agentic_development": {
     "routing": {
-      "product_discovery": "gstack:office-hours",
-      "complex_engineering_plan": "gstack:plan-eng-review",
-      "design_plan": "gstack:plan-design-review",
-      "small_or_medium_plan": "waza:think",
-      "bug_or_regression": "waza:hunt",
-      "post_implementation_review": "waza:check"
+      "direct": "forge:/direct",
+      "plan": "forge:/plan",
+      "debug": "forge:/debug",
+      "review": "forge:/review",
+      "release": "forge:/release",
+      "scale": "forge:/scale"
     },
     "due_diligence": {
       "levels": ["P1_GLOBAL_ARCHITECTURE", "P2_DATA_FLOW_TRACE", "P3_DESIGN_DECISION"],
-      "explicit_report_required_for": ["plan-eng-review", "hunt", "risky_refactor", "deployment", "auth_payment_data", "shared_contract"]
+      "explicit_report_required_for": ["architecture", "debug", "risky_refactor", "deployment", "auth_payment_data", "shared_contract"]
     }
   },
   "enforcement": {
@@ -2400,7 +2399,10 @@ pi_ensure_harness_state_surface() {
     "$target_dir/tasks/workstreams" \
     "$target_dir/.ai/context" \
     "$target_dir/.ai/harness/checks" \
-    "$target_dir/.ai/harness/handoff" \
+    "$target_dir/.ai/harness/session" \
+    "$target_dir/.ai/harness/controller/packets" \
+    "$target_dir/.ai/harness/projections" \
+    "$target_dir/.ai/harness/transfers" \
     "$target_dir/.ai/harness/scripts" \
     "$target_dir/.ai/harness/failures" \
     "$target_dir/.ai/harness/security" \
@@ -2419,8 +2421,8 @@ pi_ensure_harness_state_surface() {
     "$target_dir/.ai/harness/runs"
 
   [[ -f "$target_dir/.ai/harness/checks/latest.json" ]] || printf "{}\n" > "$target_dir/.ai/harness/checks/latest.json"
-  [[ -f "$target_dir/.ai/harness/handoff/current.md" ]] || printf "# Harness Handoff\n\n> **Reason**: bootstrap\n" > "$target_dir/.ai/harness/handoff/current.md"
-  [[ -f "$target_dir/.ai/harness/handoff/resume.md" ]] || printf "# Codex Resume Packet\n\n> **Reason**: bootstrap\n" > "$target_dir/.ai/harness/handoff/resume.md"
+  [[ -f "$target_dir/.ai/harness/session/continuation.md" ]] || printf "# Forge Session Continuation Snapshot\n\n> **Reason**: bootstrap\n" > "$target_dir/.ai/harness/session/continuation.md"
+  [[ -f "$target_dir/.ai/harness/session/resume.md" ]] || printf "# Codex Resume Packet\n\n> **Reason**: bootstrap\n" > "$target_dir/.ai/harness/session/resume.md"
   [[ -f "$target_dir/.ai/context/capability-source-map.json" ]] || printf '{\n  "version": 1,\n  "capabilities": {}\n}\n' > "$target_dir/.ai/context/capability-source-map.json"
   [[ -f "$target_dir/.ai/harness/events.jsonl" ]] || : > "$target_dir/.ai/harness/events.jsonl"
   [[ -f "$target_dir/.ai/harness/architecture/events.jsonl" ]] || : > "$target_dir/.ai/harness/architecture/events.jsonl"

package/scripts/migrate-project-template.sh

@@ -8,8 +8,8 @@
 # - Harness state: .ai/harness/checks/latest.json, .ai/harness/policy.json,
 #   .ai/harness/brain-manifest.json,
 #   .ai/harness/events.jsonl, .ai/harness/architecture/events.jsonl,
-#   .ai/harness/handoff/current.md,
-#   .ai/harness/handoff/resume.md,
+#   .ai/harness/session/continuation.md,
+#   .ai/harness/session/resume.md,
 #   .ai/harness/failures/latest.jsonl, .ai/harness/security/.gitkeep,
 #   .ai/harness/worktrees/.gitkeep, .ai/harness/runs/.gitkeep
 #
@@ -607,7 +607,10 @@ create_task_files_if_missing() {
     "$repo/docs/architecture/diagrams" \
     "$repo/.ai/context" \
     "$repo/.ai/harness/checks" \
-    "$repo/.ai/harness/handoff" \
+    "$repo/.ai/harness/session" \
+    "$repo/.ai/harness/controller/packets" \
+    "$repo/.ai/harness/projections" \
+    "$repo/.ai/harness/transfers" \
     "$repo/.ai/harness/failures" \
     "$repo/.ai/harness/architecture" \
     "$repo/.ai/harness/runs" \
@@ -1011,7 +1014,7 @@ migrate_workflow() {
   run_or_echo mkdir -p "$repo/tasks/workstreams"
   run_or_echo mkdir -p "$repo/docs/reference-configs"
   run_or_echo mkdir -p "$repo/.ai/harness/checks"
-  run_or_echo mkdir -p "$repo/.ai/harness/handoff"
+  run_or_echo mkdir -p "$repo/.ai/harness/session" "$repo/.ai/harness/controller/packets" "$repo/.ai/harness/projections" "$repo/.ai/harness/transfers"
   migrate_active_plan_marker "$repo"
 
   install_templates "$repo"

package/scripts/new-plan.sh

@@ -135,7 +135,7 @@ Complete this inventory before implementation. If any line is unknown, keep the
 ## Handoff
 
 - Checks file: `.ai/harness/checks/latest.json`
-- Session handoff: `.ai/harness/handoff/current.md`
+- Session continuation: `.ai/harness/session/continuation.md`
 
 ## Evidence Contract
 

package/scripts/plan-to-todo.sh

@@ -607,7 +607,7 @@ mkdir -p tasks/notes
 mkdir -p .claude
 mkdir -p .ai/context
 mkdir -p .ai/harness/checks
-mkdir -p .ai/harness/handoff
+mkdir -p .ai/harness/session .ai/harness/controller/packets .ai/harness/projections .ai/harness/transfers
 mkdir -p .ai/harness/failures
 mkdir -p .ai/harness/planning
 mkdir -p .ai/harness/runs
@@ -713,7 +713,7 @@ else
 
 ## Verification Evidence
 
-- Waza /check run:
+- Forge /review run:
 - Commands run:
 - Manual checks:
 - Supporting artifacts:

package/scripts/prepare-codex-handoff.sh

@@ -52,8 +52,8 @@ fi
 codex_home="${CODEX_HOME:-$HOME/.codex}"
 global_dir="$codex_home/handoffs"
 global_file="$global_dir/handoff-$(date '+%y%m%d').md"
-repo_handoff=".ai/harness/handoff/current.md"
-resume_file=".ai/harness/handoff/resume.md"
+repo_handoff=".ai/harness/session/continuation.md"
+resume_file=".ai/harness/session/resume.md"
 
 mkdir -p "$global_dir"
 

package/scripts/prepare-handoff.sh

@@ -45,13 +45,13 @@ if [[ -f ".ai/hooks/lib/workflow-state.sh" ]]; then
     echo "Active plan: $(get_active_plan || printf '(none)')"
     echo "Active contract: $(workflow_active_contract || printf '(none)')"
     echo "Review file: $(workflow_active_review || printf '(none)')"
-    echo "Handoff: $(workflow_handoff_file)"
+    echo "Handoff: $(workflow_session_continuation_file)"
     echo "Resume packet: $(workflow_resume_packet_file)"
     echo "Checks: $(workflow_checks_file)"
     exit 0
   fi
-  workflow_write_handoff "$reason"
-  echo "Updated $(workflow_handoff_file)"
+  workflow_write_session_continuation "$reason"
+  echo "Updated $(workflow_session_continuation_file)"
   if [[ "${FORGE_SKIP_RESUME_REFRESH:-0}" != "1" && -f "scripts/codex-handoff-resume.sh" ]]; then
     bash scripts/codex-handoff-resume.sh --cwd "$(pwd -P)" --reason "$reason" >/dev/null
   fi
@@ -62,20 +62,20 @@ if [[ "$mode" == "status" ]]; then
   echo "Active plan: (none)"
   echo "Active contract: (none)"
   echo "Review file: (none)"
-  echo "Handoff: .ai/harness/handoff/current.md"
-  echo "Resume packet: .ai/harness/handoff/resume.md"
+  echo "Handoff: .ai/harness/session/continuation.md"
+  echo "Resume packet: .ai/harness/session/resume.md"
   echo "Checks: .ai/harness/checks/latest.json"
   exit 0
 fi
 
-mkdir -p .ai/harness/handoff
-cat > .ai/harness/handoff/current.md <<EOF_HANDOFF
-# Harness Handoff
+mkdir -p .ai/harness/session .ai/harness/controller/packets .ai/harness/projections .ai/harness/transfers
+cat > .ai/harness/session/continuation.md <<EOF_HANDOFF
+# Forge Session Continuation Snapshot
 
 > **Generated**: $(date '+%Y-%m-%d %H:%M:%S')
 > **Reason**: ${reason}
 EOF_HANDOFF
-echo "Updated .ai/harness/handoff/current.md"
+echo "Updated .ai/harness/session/continuation.md"
 if [[ "${FORGE_SKIP_RESUME_REFRESH:-0}" != "1" && -f "scripts/codex-handoff-resume.sh" ]]; then
   bash scripts/codex-handoff-resume.sh --cwd "$(pwd -P)" --reason "$reason" >/dev/null
 fi

package/scripts/refresh-current-status.sh

@@ -214,7 +214,7 @@ next_plan_task() {
 
 handoff_next_step() {
   local handoff_file
-  handoff_file="$(json_get '.harness.handoff_file' '.ai/harness/handoff/current.md')"
+  handoff_file="$(json_get '.session.continuation_file' '.ai/harness/session/continuation.md')"
   [[ -f "$handoff_file" ]] || { printf '(none)'; return 0; }
   awk '
     /^## Exact Next Step[[:space:]]*$/ { in_section = 1; next }
@@ -451,7 +451,7 @@ $(git_status_files)
 - Sprints: \`$(json_get '.sprints.dir' 'plans/sprints')/*.sprint.md\`
 - Active sprint marker: \`.ai/harness/sprint/active-sprint\`
 - Workstreams: \`tasks/workstreams/**/*.md\`
-- Handoff: \`.ai/harness/handoff/current.md\`
+- Handoff: \`.ai/harness/session/continuation.md\`
 - Checks: \`.ai/harness/checks/latest.json\`
 EOF_STATUS
 }

package/scripts/setup-plugins.sh

@@ -32,12 +32,12 @@ while [[ $# -gt 0 ]]; do
 done
 
 if command -v forge >/dev/null 2>&1; then
-  exec forge init "${args[@]}"
+  exec forge install "${args[@]}"
 fi
 
 if command -v bun >/dev/null 2>&1; then
-  exec bun "$ROOT_DIR/src/cli/index.ts" init "${args[@]}"
+  exec bun "$ROOT_DIR/src/cli/index.ts" install "${args[@]}"
 fi
 
-echo "[setup-plugins] forge or bun is required to run the modern init path." >&2
+echo "[setup-plugins] forge or bun is required to run the modern install path." >&2
 exit 1

package/scripts/ship-worktrees.sh

@@ -308,7 +308,7 @@ pr_body_for_branch() {
 Automated forge ship for \`${branch}\`.
 
 Checks:
-- Waza /check review artifact recommends pass.
+- Forge /review review artifact recommends pass.
 - External acceptance is recorded in the sprint review.
 - \`bash scripts/verify-sprint.sh\` passed before \`contract-worktree.sh finish --no-merge\`.
 

package/scripts/sprint-backlog.sh

@@ -25,7 +25,7 @@ Each backlog row is expanded with $think before the existing plan -> contract
 -> worktree flow. tasks/todos.md stays the deferred-goal ledger.
 
 start-task reserves the next (or named) pending backlog row and can capture a
-thin plan seed. The coding agent must still use `$think` to expand the row into
+thin plan seed. The coding agent must still use `/plan` to expand the row into
 a decision-complete plan before code edits.
 --sprint overrides the active-sprint marker (still confined to the sprints
 dir), which finish back-fill uses inside worktrees where the runtime marker
@@ -218,7 +218,7 @@ render_sprint_file() {
 
 Program-level sprint container. The Source PRD summary and ordered backlog
 decompose product intent into task-contract slices; each backlog row is a
-long-task waypoint that must be expanded with `$think` before code edits.
+long-task waypoint that must be expanded with `/plan` before code edits.
 `tasks/todos.md` stays the deferred-goal ledger and never carries this backlog.
 
 ## PRD
@@ -740,12 +740,12 @@ Deliver backlog task \`${target_task}\` so that the acceptance line holds: ${tar
 
 ## Planning Expansion
 
-Before editing code, use \`\$think\` to expand this sprint row into a decision-complete implementation plan. The \`\$think\` pass should read the sprint file, preserve the acceptance line, name concrete files or commands, and produce the detailed \`plans/plan-*.md\` body that drives contract execution.
+Before editing code, use \`/plan\` to expand this sprint row into a decision-complete implementation plan. The \`/plan\` pass should read the sprint file, preserve the acceptance line, name concrete files or commands, and produce the detailed \`plans/plan-*.md\` body that drives contract execution.
 
 ## Task Breakdown
 
-- [ ] Run \`\$think\` for backlog task \`${target_task}\` using sprint \`${sprint_file}\` and acceptance: ${target_acceptance}
-- [ ] Capture the approved \`\$think\` output with \`scripts/capture-plan.sh --source waza-think --source-ref sprint:${sprint_file}#${target_task}\`
+- [ ] Run \`/plan\` for backlog task \`${target_task}\` using sprint \`${sprint_file}\` and acceptance: ${target_acceptance}
+- [ ] Capture the approved \`/plan\` output with \`scripts/capture-plan.sh --source forge-plan --source-ref sprint:${sprint_file}#${target_task}\`
 - [ ] Verify acceptance: ${target_acceptance}
 BODY_EOF