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

package/assets/hooks/post-edit-guard.sh

@@ -172,85 +172,16 @@ esac
 
 active_plan="$(get_active_plan || true)"
 if [[ "$FILE_PATH" == "tasks/todos.md" && -z "$active_plan" ]] && grep -Eq '^> \*\*Status\*\*:[[:space:]]*Backlog[[:space:]]*$' tasks/todos.md; then
-  rm -f "$(workflow_task_state_file)" ".claude/.task-handoff.md"
-  echo "[TaskHandoff] Deferred-goal ledger updated; active execution remains in the plan Task Breakdown."
+  rm -f "$(workflow_task_state_file)"
+  echo "[SessionContinuation] Deferred-goal ledger updated; no active execution state was created."
   exit 0
 fi
 
-mkdir -p .claude
-
-STATE_FILE="$(workflow_task_state_file)"
-HANDOFF_FILE=".claude/.task-handoff.md"
-
 if [[ "$FILE_PATH" == "tasks/todos.md" ]] && [[ -f "tasks/todos.md" ]] && ! grep -Eq '^> \*\*Status\*\*:[[:space:]]*Backlog[[:space:]]*$' tasks/todos.md; then
-  workflow_sync_task_state_from_todo "tasks/todos.md" "$STATE_FILE"
-fi
-
-task_state="$(workflow_plan_task_state "$active_plan")"
-IFS=$'\t' read -r total_tasks done_tasks next_pending <<< "$task_state"
-done_tasks="${done_tasks:-0}"
-total_tasks="${total_tasks:-0}"
-next_pending="${next_pending:-"(none)"}"
-
-next_action="$(workflow_next_action)"
-next_stage="$(printf '%s\n' "$next_action" | cut -f1)"
-next_command="$(printf '%s\n' "$next_action" | cut -f2)"
-next_message="$(printf '%s\n' "$next_action" | cut -f3-)"
-[[ "${next_command:-}" == "-" ]] && next_command=""
-next_stage="${next_stage:-none}"
-next_message="${next_message:-(none)}"
-
-diff_stat="$(git diff --shortstat HEAD 2>/dev/null | tr -d '\n')"
-diff_stat="${diff_stat:-no uncommitted diff against HEAD}"
-
-if [[ -z "$active_plan" ]]; then
-  active_plan="(none)"
-fi
-
-plan_status="(unknown)"
-if [[ "$active_plan" != "(none)" && -f "$active_plan" ]]; then
-  plan_status="$(awk '/^\> \*\*Status\*\*:/ {sub(/^.*\> \*\*Status\*\*: */, ""); gsub(/\r/, ""); print; exit}' "$active_plan" | xargs)"
-  plan_status="${plan_status:-(unknown)}"
+  workflow_sync_task_state_from_todo "tasks/todos.md" "$(workflow_task_state_file)"
 fi
 
-changed_files="$(git diff --name-only HEAD 2>/dev/null | head -10)"
-changed_files="${changed_files:-(none)}"
-
-cat > "$HANDOFF_FILE" <<EOF_HANDOFF
-# Task Handoff Summary
-
-> **Generated**: $(date '+%Y-%m-%d %H:%M:%S')
-> **Progress**: ${done_tasks}/${total_tasks}
-> **Active Plan**: ${active_plan}
-
-## Plan Status
-
-- ${plan_status}
-
-## Current Task
-
-- ${next_pending}
-
-## Next Actions
-
-- Stage: ${next_stage}
-- Action: ${next_message}
-- Command: ${next_command:-(none)}
-
-## Key Artifacts
-
-\`\`\`
-${changed_files}
-\`\`\`
-
-## Working Tree Snapshot
-
-- ${diff_stat}
-EOF_HANDOFF
-
-echo "[TaskHandoff] Workflow next action is ${next_stage}. Wrote ${HANDOFF_FILE}."
-
-workflow_write_handoff "task-progress" || true
-if [[ -f "$(workflow_handoff_file)" ]]; then
-  echo "[HarnessHandoff] Refreshed $(workflow_handoff_file)."
+workflow_write_session_continuation "task-progress" || true
+if [[ -f "$(workflow_session_continuation_file)" ]]; then
+  echo "[SessionContinuation] Refreshed non-authoritative session cache $(workflow_session_continuation_file)."
 fi

package/assets/hooks/prompt-guard.sh

@@ -557,11 +557,24 @@ emit_agentic_packaging_hint() {
 }
 
 resolve_codegraph_bin() {
+  local common_git_dir canonical_root candidate
   if [[ -x "node_modules/.bin/codegraph" ]]; then
     printf '%s\n' "node_modules/.bin/codegraph"
     return 0
   fi
 
+  # Linked worktrees normally reuse the canonical checkout's dependency tree.
+  # Resolve it before falling back to a user-global CodeGraph installation.
+  common_git_dir="$(git rev-parse --path-format=absolute --git-common-dir 2>/dev/null || true)"
+  if [[ -n "$common_git_dir" ]]; then
+    canonical_root="$(dirname "$common_git_dir")"
+    candidate="$canonical_root/node_modules/.bin/codegraph"
+    if [[ -x "$candidate" ]]; then
+      printf '%s\n' "$candidate"
+      return 0
+    fi
+  fi
+
   command -v codegraph 2>/dev/null || return 1
 }
 
@@ -625,25 +638,24 @@ emit_codegraph_route_hint() {
   fi
 }
 
-emit_waza_route_hint() {
+emit_forge_route_hint() {
   if pg_fact AGENTIC_PACKAGING; then
     return
   fi
 
   if pg_fact THINK_PLAN_START; then
-    echo "[WazaRoute] Planning intent detected. Default route: Waza /think."
+    echo "[ForgeRoute] Planning intent detected. Use /plan for plan-only work; optional external skills may refine the plan when installed."
     return
   fi
 
-  # /health needs a health/audit/diagnostic verb plus a tooling noun (joint
-  # condition lives in the TypeScript classifier); reviews fall to /check.
+  # Workflow/tooling health problems route through Forge /debug; reviews route through /review.
   if pg_fact HEALTH_ROUTE; then
-    echo "[WazaRoute] Agent workflow/tooling intent detected. Default route: Waza /health."
+    echo "[ForgeRoute] Agent workflow/tooling issue detected. Use /debug to diagnose before mutation."
     return
   fi
 
   if pg_fact REVIEW_RELEASE; then
-    echo "[WazaRoute] Review/release intent detected. Default route: Waza /check."
+    echo "[ForgeRoute] Review/release intent detected. Use /review first; use /release only after review evidence is clear."
     emit_external_acceptance_prompt review
     emit_cross_review_hint merge
   fi
@@ -689,7 +701,7 @@ emit_external_acceptance_prompt() {
   review_file="$(workflow_active_review || true)"
   checks_file="$(workflow_checks_file)"
 
-  echo "[ExternalAcceptance] Review/release intent detected. Start peer acceptance in parallel with local /check."
+  echo "[ExternalAcceptance] Review/release intent detected. Start peer acceptance in parallel with local /review and focused checks."
   echo "[ExternalAcceptance] Mode: $mode"
   echo "[ExternalAcceptance] Current active plan: ${active_plan_local:-"(none)"}"
   echo "[ExternalAcceptance] Current contract: ${contract_file_local:-"(none)"}"
@@ -699,7 +711,7 @@ emit_external_acceptance_prompt() {
   echo "[ExternalAcceptance] Diff scope for peer: branch diff against target, staged diff, unstaged diff, and untracked files."
   cat <<EOF_EXTERNAL_ACCEPTANCE
 [ExternalAcceptance] Prompt to send with $command:
-Review the current sprint for acceptance only. Do not run /check. Do not edit files. Do not write files. Inspect the diff scope, contract, review evidence, and checks evidence, then return only a Markdown block that can be pasted into ${review_file:-tasks/reviews/<slug>.review.md}.
+Review the current sprint for acceptance only. Do not run Forge /review or local checks. Do not edit files. Do not write files. Inspect the diff scope, contract, review evidence, and checks evidence, then return only a Markdown block that can be pasted into ${review_file:-tasks/reviews/<slug>.review.md}.
 
 ## External Acceptance Advice
 > **External Acceptance**: pass
@@ -752,7 +764,7 @@ render_prompt_guard_action() {
       echo "[PlanCaptureGate] Approval detected before an active plan artifact exists."
       echo "[PlanCaptureGate] Let the agent run the approved-plan capture path now:"
       echo "  git status --short --branch -uall"
-      echo "  printf '%s\n' '<approved plan body>' | bash scripts/capture-plan.sh --slug <slug> --title <title> --status Approved --source waza-think --route planning --execute"
+      echo "  printf '%s\n' '<approved plan body>' | bash scripts/capture-plan.sh --slug <slug> --title <title> --status Approved --source forge-plan --route planning --execute"
       exit 0
       ;;
     plan_status_no_active_block)
@@ -880,7 +892,7 @@ if [[ "$PG_ENGINE_STATE" != "ok" ]]; then
 fi
 
 emit_agentic_packaging_hint
-emit_waza_route_hint
+emit_forge_route_hint
 emit_codegraph_route_hint
 emit_pending_orchestration_discussion
 
@@ -956,7 +968,7 @@ if [ "$done_intent" -eq 1 ]; then
     hook_structured_error \
       "ReviewGuard" \
       "Done intent detected without a sprint review artifact." \
-      "Run Waza /check after verification and record its evaluator recommendation in tasks/reviews/<slug>.review.md before marking work done." \
+      "Run Forge /review after verification and record the evaluator recommendation in tasks/reviews/<slug>.review.md before marking work done." \
       "quality_gate"
     exit 2
   fi
@@ -966,7 +978,7 @@ if [ "$done_intent" -eq 1 ]; then
     hook_structured_error \
       "ReviewGuard" \
       "Sprint review is missing a passing recommendation." \
-      "Run Waza /check with fresh verification evidence and record a pass recommendation before marking work done." \
+      "Run Forge /review with fresh verification evidence and record a pass recommendation before marking work done." \
       "quality_gate"
     exit 2
   fi

package/assets/hooks/session-start-context.sh

@@ -56,18 +56,18 @@ file_mtime() {
   stat -c '%Y' "$file" 2>/dev/null
 }
 
-resume_current_for_handoff() {
-  local handoff_file resume_mtime handoff_mtime
+resume_current_for_continuation() {
+  local continuation_file resume_mtime continuation_mtime
   resume_available || return 1
 
-  handoff_file="$(workflow_handoff_file)"
-  [[ -f "$handoff_file" ]] || return 0
+  continuation_file="$(workflow_session_continuation_file)"
+  [[ -f "$continuation_file" ]] || return 0
 
   resume_mtime="$(file_mtime "$resume_file" || true)"
-  handoff_mtime="$(file_mtime "$handoff_file" || true)"
-  [[ -n "$resume_mtime" && -n "$handoff_mtime" ]] || return 0
+  continuation_mtime="$(file_mtime "$continuation_file" || true)"
+  [[ -n "$resume_mtime" && -n "$continuation_mtime" ]] || return 0
 
-  [[ "$resume_mtime" -ge "$handoff_mtime" ]]
+  [[ "$resume_mtime" -ge "$continuation_mtime" ]]
 }
 
 active_plan_exists() {
@@ -246,11 +246,11 @@ tooling_update_advisory_context() {
   fi
 }
 
-handoff_section_has_signal() {
+continuation_section_has_signal() {
   local header="$1"
-  local handoff_file
-  handoff_file="$(workflow_handoff_file)"
-  [[ -f "$handoff_file" ]] || return 1
+  local continuation_file
+  continuation_file="$(workflow_session_continuation_file)"
+  [[ -f "$continuation_file" ]] || return 1
 
   awk -v header="$header" '
     $0 == header { in_section = 1; next }
@@ -265,7 +265,7 @@ handoff_section_has_signal() {
       found = 1
     }
     END { exit found ? 0 : 1 }
-  ' "$handoff_file"
+  ' "$continuation_file"
 }
 
 capability_context_pending() {
@@ -489,8 +489,8 @@ active_sprint_context() {
 
 - Sprint: \`${sprint_file}\` status=${status:-unknown} backlog=${progress}
 - Next sprint task: ${next_task}
-- Rule: a Sprint is a long-task container. Use \`\$think\` to expand the next sprint task into a detailed \`plans/plan-*.md\`, then run the existing plan -> contract -> worktree flow. \`tasks/todos.md\` stays the deferred-goal ledger.
-- Entrypoint: inspect with \`${sprint_script} next\`; after \`\$think\` produces an approved plan, capture it with \`${capture_script} --source waza-think --source-ref sprint:${sprint_file}#${next_task}\`.
+- Rule: a Sprint is a long-task container. Use \`/plan\` to expand the next sprint task into a detailed \`plans/plan-*.md\`, then run the existing plan -> contract -> worktree flow. \`tasks/todos.md\` stays the deferred-goal ledger.
+- Entrypoint: inspect with \`${sprint_script} next\`; after \`/plan\` produces an approved plan, capture it with \`${capture_script} --source forge-plan --source-ref sprint:${sprint_file}#${next_task}\`.
 EOF_CONTEXT
 }
 
@@ -503,11 +503,11 @@ EOF_CONTEXT
 }
 
 context=""
-if resume_current_for_handoff; then
+if resume_current_for_continuation; then
   if active_plan_exists \
     || active_todo_exists \
-    || handoff_section_has_signal "## Blockers" \
-    || handoff_section_has_signal "## Changed Files"; then
+    || continuation_section_has_signal "## Blockers" \
+    || continuation_section_has_signal "## Changed Files"; then
     context="$(awk 'length(total) < 12000 { total = total $0 "\n" } END { printf "%s", total }' "$resume_file")"
   fi
 fi

package/assets/hooks/stop-orchestrator.sh

@@ -132,8 +132,8 @@ emit_stop_block_json() {
 }
 
 refresh_handoff() {
-  workflow_write_handoff "session-stop"
-  echo "[FinalizeHandoff] Refreshed $(workflow_handoff_file)." >&2
+  workflow_write_session_continuation "session-stop"
+  echo "[SessionContinuation] Refreshed $(workflow_session_continuation_file)." >&2
 }
 
 should_run_plan_completeness_gate() {

package/assets/partials/04-project-structure.partial.md

@@ -40,17 +40,17 @@
 - Commit explicitly after green checks; no automatic checkpoint hook in the shared preset.
 - Keep stable product truth in `docs/spec.md`.
 - Keep sprint done definitions in `tasks/contracts/`, `tasks/reviews/`, and task-local implementation notes in `tasks/notes/`.
-- Keep resumable state in `.ai/harness/handoff/current.md`.
+- Keep resumable state in `.ai/harness/session/continuation.md`.
 - Treat `_ref/` as an occasional ignored external reference checkout cache; read or refresh it for comparison, but keep it out of commits and cite repo+commit/tag+path in `tasks/notes/` or `docs/researches/` when it influences a decision.
 - Treat `deploy/` as the trackable deployment and operations surface for runbooks, submission materials, release checklists, helper scripts, ordered SQL files under `deploy/sql/`, and env examples.
 - Treat `_ops/` as ignored local operations state for secrets, real env files, provider state, artifacts, logs, and scratch files; do not commit or agent-edit `_ops/*`.
-- Treat contract-level execution as worktree-first: `.ai/harness/scripts/plan-to-todo.sh --plan <approved-plan>` starts a linked `codex/<slug>` worktree when policy enables it, and `.ai/harness/scripts/contract-worktree.sh finish` merges back only after Waza `/check` and sprint verification pass.
-- Capture decision-complete Codex Plan mode, Waza `/think`, or `forge-plan` outputs with `.ai/harness/scripts/capture-plan.sh --slug <slug> --title <title>` so planning becomes a `plans/` artifact before implementation.
-- Route product discovery to gstack `office-hours`, complex engineering plans to gstack `plan-eng-review`, design plans to gstack `plan-design-review`, and daily small/medium planning, bug hunts, and checks to Waza `/think`, `/hunt`, and `/check`.
+- Treat contract-level execution as worktree-first: `.ai/harness/scripts/plan-to-todo.sh --plan <approved-plan>` starts a linked `codex/<slug>` worktree when policy enables it, and `.ai/harness/scripts/contract-worktree.sh finish` merges back only after Forge `/review` and sprint verification pass.
+- Capture decision-complete Codex Plan mode, Forge `/plan`, or `forge-plan` outputs with `.ai/harness/scripts/capture-plan.sh --slug <slug> --title <title>` so planning becomes a `plans/` artifact before implementation.
+- Route product discovery to gstack `office-hours`, complex engineering plans to gstack `plan-eng-review`, design plans to gstack `plan-design-review`, and daily small/medium planning, bug hunts, and checks to Forge `/plan`, `/hunt`, and `/check`.
 - Route knowledge sync and handoff retrieval to `gbrain`.
 - Register valuable repo-authored docs in `.ai/harness/brain-manifest.json` with `sync.direction=repo-to-brain`; `.ai/harness/scripts/sync-brain-docs.sh` and the PostEdit hook mirror only those explicit entries into the default brain vault.
 - Codex automation profile is runtime-referenced, not vendored: required skills are `health`, `check`, and `mermaid` from `~/.codex/skills`.
 - CodeGraph is required agent readiness for code navigation; keep `.codegraph/` ignored and use it for P1/P2 discovery, not hook correctness.
-- Treat Waza as Codex-first: `~/.codex/skills` is the Codex runtime source; `~/.agents/skills` is skills CLI staging/cache only.
+- Treat third-party host skills as optional. Their installation state must not change Forge workflow correctness.
 - Use `docs/reference-configs/agentic-development-flow.md` for routing details and `docs/reference-configs/external-tooling.md` plus `bash .ai/harness/scripts/check-agent-tooling.sh --host both --check-updates` for environment checks.
-- If repo state conflicts with the task, use an isolated `codex/<task-slug>` worktree, validate with Waza `/check`, and merge back to `main` without unrelated dirty changes.
+- If repo state conflicts with the task, use an isolated `codex/<task-slug>` worktree, validate with Forge `/review`, and merge back to `main` without unrelated dirty changes.

package/assets/partials/05-workflow.partial.md

@@ -22,7 +22,7 @@ PLAN_LOOP:
   NOTES_DIR: tasks/notes/
   POLICY_FILE: .ai/harness/policy.json
   CHECKS_FILE: .ai/harness/checks/latest.json
-  HANDOFF_FILE: .ai/harness/handoff/current.md
+  HANDOFF_FILE: .ai/harness/session/continuation.md
   EVENTS_FILE: .ai/harness/events.jsonl
   RUNS_DIR: .ai/harness/runs/
   LESSONS_FILE: tasks/lessons.md
@@ -30,7 +30,7 @@ PLAN_LOOP:
   ANNOTATION_GUARD: do not implement until plan Status is "Approved"
   CONTRACT_GUARD: do not mark done until contract exit criteria pass and review recommends pass
   EXECUTION_CONTEXT: contract-level work starts in a linked codex/<slug> worktree when policy enables it; primary worktree warning by default; enforce via .claude/.require-worktree
-  CONTRACT_WORKTREE_FINISH: run Waza /check, fill the review artifact from that verdict, then .ai/harness/scripts/contract-worktree.sh finish
+  CONTRACT_WORKTREE_FINISH: run Forge /review, fill the review artifact from that verdict, then .ai/harness/scripts/contract-worktree.sh finish
   COMMIT_POLICY: explicit commits after green checks; no automatic checkpoint hook
 ```
 
@@ -39,12 +39,12 @@ PLAN_LOOP:
 - Product discovery, early demand shaping, or "is this worth building" -> gstack `office-hours`.
 - Complex engineering plans, architecture lock-in, or cross-module refactors -> gstack `plan-eng-review`.
 - UI/UX or design-system plans -> gstack `plan-design-review`.
-- Small or medium feature plans -> Waza `/think`.
-- Bugs, regressions, crashes, errors, or failing tests -> Waza `/hunt`.
-- Implemented diffs, pre-merge checks, or release follow-through -> Waza `/check`.
+- Small or medium feature plans -> Forge `/plan`.
+- Bugs, regressions, crashes, errors, or failing tests -> Forge `/debug`.
+- Implemented diffs, pre-merge checks, or release follow-through -> Forge `/review`.
 - Architecture diagrams or system-flow diagrams -> Markdown Mermaid first, `mermaid` for optional human HTML.
 - Use P1/P2/P3 as the shared due-diligence protocol; report it explicitly for `plan-eng-review`, `/hunt`, risky refactors, deployments, auth/payment/data work, and shared contracts.
-- Hooks may emit advisory Waza `/check` and `/health` route hints, but must not auto-run skills or vendor skill bodies.
+- Hooks may emit advisory Forge `/review` and `/health` route hints, but must not auto-run skills or vendor skill bodies.
 
 ### Task Management Protocol
 

package/assets/partials/07-footer.partial.md

@@ -6,7 +6,7 @@ CLAUDE.md is a routing card. Keep context minimal and load only what the current
 
 - `docs/spec.md`: stable product truth
 - `tasks/todos.md`: deferred-goal ledger (tradeoff + revisit trigger); the active checklist lives in the plan's `## Task Breakdown`
-- `.ai/harness/handoff/current.md`: resumable cross-session state
+- `.ai/harness/session/continuation.md`: resumable cross-session state
 
 ### Load On Demand
 

package/assets/partials/08-orchestration.partial.md

@@ -14,7 +14,7 @@
 ### 3. Plan Node Default
 - Enter plan mode for non-trivial tasks.
 - If no stable product truth exists, run `bash .ai/harness/scripts/new-spec.sh`.
-- When Codex Plan mode or Waza `/think` reaches a decision-complete plan, capture it with `bash .ai/harness/scripts/capture-plan.sh --slug <slug> --title <title>` and the plan text on stdin.
+- When Codex Plan mode or Forge `/plan` reaches a decision-complete plan, capture it with `bash .ai/harness/scripts/capture-plan.sh --slug <slug> --title <title>` and the plan text on stdin.
 - If no captured active execution plan exists, run `bash .ai/harness/scripts/new-plan.sh --slug <slug> --title <title>` or capture a finished planning note with `bash .ai/harness/scripts/capture-plan.sh`.
 - If the user asks for a Sprint backlog, run `bash .ai/harness/scripts/new-sprint.sh --slug <slug> --title <title>`; it writes `plans/sprints/*.sprint.md`, not `plans/plan-*.md`.
 - When the user approves implementation, run `bash .ai/harness/scripts/plan-to-todo.sh --plan <active-plan>` or capture the approved plan with `--status Approved --execute`; this creates contract/review/notes scaffolding and leaves plan tasks in `## Task Breakdown`.
@@ -36,7 +36,7 @@
 ### 6b. Contract Verification
 - Define per-sprint contract files in `tasks/contracts/`.
 - Verify contract exit criteria before claiming completion.
-- Require Waza `/check` to produce the matching evaluator review before any done/completed response.
+- Require Forge `/review` to produce the matching evaluator review before any done/completed response.
 - Use `.ai/harness/scripts/verify-contract.sh --contract tasks/contracts/{plan-stem}.contract.md --strict`.
 
 ### 7. Balanced Elegance

package/assets/partials-agents/02-operating-mode.partial.md

@@ -15,7 +15,7 @@
 - Evaluator verdicts: `tasks/reviews/`.
 - Implementation notes: `tasks/notes/`.
 - Structured checks: `.ai/harness/checks/latest.json`.
-- Session handoff: `.ai/harness/handoff/current.md`.
+- Session continuation: `.ai/harness/session/continuation.md`.
 - Harness policy: `.ai/harness/policy.json`.
 - Context map: `.ai/context/context-map.json`.
 - Lessons contract: `tasks/lessons.md`.
@@ -28,7 +28,7 @@
 - External reference cache: `_ref/` is an occasional ignored external checkout cache, read/refresh-only comparison material, and must stay out of commits; decisions based on it must cite repo+commit/tag+path in notes or research.
 - Deployment operations workspace: `deploy/` is commit-ready for runbooks, submission materials, release checklists, helper scripts, ordered SQL files under `deploy/sql/`, and env examples.
 - Local operations state: `_ops/` is ignored and private for secrets, real env files, provider state, artifacts, logs, and scratch files; do not commit or agent-edit `_ops/*`.
-- Agentic skill routing: product discovery -> gstack `office-hours`; complex engineering plans -> gstack `plan-eng-review`; design plans -> gstack `plan-design-review`; daily small/medium planning, bug hunts, and checks -> Waza `/think`, `/hunt`, `/check`.
+- Agentic skill routing: product discovery -> gstack `office-hours`; complex engineering plans -> gstack `plan-eng-review`; design plans -> gstack `plan-design-review`; daily small/medium planning, bug hunts, and checks -> Forge `/plan`, `/hunt`, `/check`.
 - Knowledge sync and handoff retrieval -> `gbrain`.
 - Codex automation profile: required `health`, `check`, and `mermaid` from `~/.codex/skills`; do not vendor skill bodies.
 - CodeGraph readiness: required for agent code navigation; keep `.codegraph/` ignored and use `codegraph sync/context/query/callers/callees/impact` for P1/P2 discovery.
@@ -37,8 +37,8 @@
 - Environment check: `bash .ai/harness/scripts/check-agent-tooling.sh --host both --check-updates`.
 - After substantive repo changes, run `bash .ai/harness/scripts/check-task-sync.sh` and `bash .ai/harness/scripts/check-task-workflow.sh --strict`.
 - Primary worktree warns by default; enforce via `.claude/.require-worktree`.
-- Contract-level execution is worktree-first: `.ai/harness/scripts/plan-to-todo.sh --plan <approved-plan>` starts a linked `codex/<slug>` worktree when policy enables it, and `.ai/harness/scripts/contract-worktree.sh finish` merges back only after Waza `/check` and sprint verification pass.
-- After Codex Plan mode, Waza `/think`, or `forge-plan` produces a decision-complete plan, capture it with `.ai/harness/scripts/capture-plan.sh --slug <slug> --title <title>`; if implementation is already approved, capture with `--status Approved --execute` or run `.ai/harness/scripts/plan-to-todo.sh --plan <active-plan>`.
-- If repo state conflicts with the task, use an isolated `codex/<task-slug>` worktree, validate with Waza `/check`, and merge back to `main` without unrelated dirty changes.
+- Contract-level execution is worktree-first: `.ai/harness/scripts/plan-to-todo.sh --plan <approved-plan>` starts a linked `codex/<slug>` worktree when policy enables it, and `.ai/harness/scripts/contract-worktree.sh finish` merges back only after Forge `/review` and sprint verification pass.
+- After Codex Plan mode, Forge `/plan`, or `forge-plan` produces a decision-complete plan, capture it with `.ai/harness/scripts/capture-plan.sh --slug <slug> --title <title>`; if implementation is already approved, capture with `--status Approved --execute` or run `.ai/harness/scripts/plan-to-todo.sh --plan <active-plan>`.
+- If repo state conflicts with the task, use an isolated `codex/<task-slug>` worktree, validate with Forge `/review`, and merge back to `main` without unrelated dirty changes.
 
 ---

package/assets/partials-agents/03-orchestration.partial.md

@@ -12,7 +12,7 @@
 ### 3. Plan Node Default
 - Enter plan mode for non-trivial tasks.
 - If `docs/spec.md` is missing, run `bash .ai/harness/scripts/new-spec.sh` first.
-- Capture decision-complete Codex Plan mode or Waza `/think` output with `bash .ai/harness/scripts/capture-plan.sh --slug <slug> --title <title>`; if no captured active execution plan exists, use `new-plan.sh`; after approval, run `plan-to-todo.sh` or capture with `--status Approved --execute`.
+- Capture decision-complete Codex Plan mode or Forge `/plan` output with `bash .ai/harness/scripts/capture-plan.sh --slug <slug> --title <title>`; if no captured active execution plan exists, use `new-plan.sh`; after approval, run `plan-to-todo.sh` or capture with `--status Approved --execute`.
 - Use `new-sprint.sh` only for Sprint backlogs; it writes `plans/sprints/*.sprint.md`, while PRDs stay in `plans/prds/`.
 - Keep active checklist items in the active plan's `## Task Breakdown`; record only deferred goals in `tasks/todos.md`.
 
@@ -23,7 +23,7 @@
 
 ### 4b. Durable Handoff
 - Treat auto-compact as an unreliable fallback.
-- Before switching sessions or worktrees, refresh `.ai/harness/handoff/current.md` and `.ai/harness/handoff/resume.md`, then resume from the filesystem artifacts.
+- Before switching sessions or worktrees, refresh `.ai/harness/session/continuation.md` and `.ai/harness/session/resume.md`, then resume from the filesystem artifacts.
 
 ### 5. Self-Improvement Loop
 - After correction, append prevention rule to `tasks/lessons.md`.
@@ -34,7 +34,7 @@
 ### 6b. Contract Verification
 - Use task contracts in `tasks/contracts/` as completion gates.
 - Use implementation notes in `tasks/notes/` for task-local decisions that should not automatically become memory.
-- Validate exit criteria and the Waza `/check` review recommendation before any done/completed response.
+- Validate exit criteria and the Forge `/review` review recommendation before any done/completed response.
 
 ### 7. Balanced Elegance
 - Redesign hacky non-trivial fixes before shipping.

package/assets/partials-agents/04-task-protocol.partial.md

@@ -10,7 +10,7 @@ TASK_SOURCES:
   - tasks/notes/
   - tasks/lessons.md
   - .ai/harness/checks/latest.json
-  - .ai/harness/handoff/current.md
+  - .ai/harness/session/continuation.md
   - plans/
 
 PHASES: research -> spec -> plan -> contract -> implement -> verify -> check -> review -> handoff
@@ -30,7 +30,7 @@ RULES:
   - Process annotation notes before implementing
   - Project approved plans with .ai/harness/scripts/plan-to-todo.sh; the execution checklist stays in the plan ## Task Breakdown
   - Define task contracts in tasks/contracts/{plan-stem}.contract.md
-  - Fill tasks/reviews/{plan-stem}.review.md from Waza /check after verification
+  - Fill tasks/reviews/{plan-stem}.review.md from Forge /review after verification
   - Record only non-obvious implementation decisions, deviations, tradeoffs, and open questions in tasks/notes/{plan-stem}.notes.md
   - Verify contracts before claiming completion
   - Require review pass before claiming completion
@@ -44,7 +44,7 @@ RULES:
   - Treat `.ai/hooks/` as the shared automation entrypoint when repo scripts reference hook-backed workflow checks
   - Treat user-level `~/.claude/settings.json` and `~/.codex/hooks.json` as host adapters; do not add repo-local project hook adapters unless explicitly migrating legacy config
   - For Codex sessions, treat `bash .ai/harness/scripts/check-task-sync.sh` and `bash .ai/harness/scripts/check-task-workflow.sh --strict` as required repo-local checks
-  - Before ending a session, refresh `.ai/harness/handoff/current.md` when the task state changed
+  - Before ending a session, refresh `.ai/harness/session/continuation.md` when the task state changed
   - Update `tasks/workstreams/` only when durable capability progress changes
   - Archive completed/abandoned plans and todos with metadata
 {{#IF FACTOR_FACTORY_ENABLED}}

package/assets/partials-agents/08-deep-docs.partial.md

@@ -3,7 +3,7 @@
 ### Always Read First
 - `docs/spec.md`: stable product truth
 - `tasks/todos.md`: deferred-goal ledger only
-- `.ai/harness/handoff/current.md`: resumable session state
+- `.ai/harness/session/continuation.md`: resumable session state
 - `.ai/harness/policy.json`: machine-readable workflow contract
 
 ### Load On Demand