@moretea-labs/forge 1.5.1 → 1.7.0

package/assets/templates/helpers/migrate-project-template.sh

@@ -1,54 +1,31 @@
 #!/bin/bash
-# Delegate workflow migrations to the canonical upstream forge.
-#
-# Generated projects keep installed workflow runtime state under .ai/. The
-# template source lives in AGENTIC_DEV_ROOT, AGENTIC_DEV_SKILL_ROOT, or
-# ~/Projects/forge. Retired legacy install paths are not
-# searched.
+# Run the canonical Forge adoption path without guessing a developer checkout.
 
 set -euo pipefail
 
-resolve_agentic_dev_root() {
-  if [[ -n "${AGENTIC_DEV_ROOT:-}" ]]; then
-    printf '%s\n' "$AGENTIC_DEV_ROOT"
-    return 0
-  fi
-
-  if [[ -n "${AGENTIC_DEV_SKILL_ROOT:-}" ]]; then
-    printf '%s\n' "$AGENTIC_DEV_SKILL_ROOT"
-    return 0
-  fi
-
-  if [[ -n "${HOME:-}" ]]; then
-    local roots=(
-      "$HOME/Projects/forge"
-      "$HOME/.codex/skills/forge"
-      "$HOME/.claude/skills/forge"
-      "$HOME/.agents/skills/forge"
-    )
-
-    local root
-    for root in "${roots[@]}"; do
-      if [[ -d "$root" ]]; then
-        printf '%s\n' "$root"
-        return 0
-      fi
-    done
-
-    printf '%s\n' "${roots[0]}"
-    return 0
-  fi
-
-  printf '%s\n' ".forge/skills/forge"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SELF_SOURCE_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+SOURCE_ROOT="${FORGE_SOURCE_ROOT:-${AGENTIC_DEV_ROOT:-${AGENTIC_DEV_SKILL_ROOT:-}}}"
+
+run_source_root() {
+  local root="$1"
+  shift
+  [[ -f "$root/src/cli/index.ts" ]] || return 1
+  command -v bun >/dev/null 2>&1 || {
+    echo "[migrate] bun is required to run Forge from source: $root" >&2
+    exit 1
+  }
+  exec bun "$root/src/cli/index.ts" adopt "$@" --no-codegraph --no-verify
 }
 
-UPSTREAM_ROOT="$(resolve_agentic_dev_root)"
-UPSTREAM_SCRIPT="$UPSTREAM_ROOT/scripts/migrate-project-template.sh"
+run_source_root "$SELF_SOURCE_ROOT" "$@"
+if [[ -n "$SOURCE_ROOT" ]]; then
+  run_source_root "$SOURCE_ROOT" "$@"
+fi
 
-if [[ ! -f "$UPSTREAM_SCRIPT" ]]; then
-  echo "[migrate] Upstream forge migration script not found: $UPSTREAM_SCRIPT" >&2
-  echo "[migrate] Set AGENTIC_DEV_ROOT or AGENTIC_DEV_SKILL_ROOT to the skill root." >&2
-  exit 1
+if command -v forge >/dev/null 2>&1; then
+  exec forge adopt "$@" --no-codegraph --no-verify
 fi
 
-exec bash "$UPSTREAM_SCRIPT" "$@"
+echo "[migrate] Missing Forge CLI; set FORGE_SOURCE_ROOT to a Forge source checkout." >&2
+exit 1

package/assets/templates/helpers/new-plan.sh

@@ -141,7 +141,7 @@ Complete this inventory before implementation. If any line is unknown, keep the
 
 - **State/progress path**:
 - **Verification evidence**:
-- **Evaluator rubric**:
+- **Impact review**:
 - **Stop condition**:
 - **Rollback surface**:
 

package/assets/templates/helpers/plan-to-todo.sh

@@ -63,7 +63,7 @@ plan_evidence_contract_error() {
   fi
 
   local label line value
-  for label in "State/progress path" "Verification evidence" "Evaluator rubric" "Stop condition" "Rollback surface"; do
+  for label in "State/progress path" "Verification evidence" "Impact review|Evaluator rubric" "Stop condition" "Rollback surface"; do
     line="$(printf '%s\n' "$section" | grep -Ei "^[[:space:]]*-[[:space:]]*(\\*\\*)?${label}(\\*\\*)?[[:space:]]*:" | head -1 || true)"
     if [[ -z "$line" ]]; then
       echo "missing field: ${label}"
@@ -323,7 +323,7 @@ Describe the exact outcome this task must deliver.
 - Checks file: `.ai/harness/checks/latest.json`
 - Run snapshots: `.ai/harness/runs/`
 - Scope gate: edit only paths listed under `allowed_paths`; update this contract before widening scope.
-- Completion gate: `scripts/verify-sprint.sh` must see this contract pass, the review recommend pass, and `## External Acceptance Advice` pass or record a manual override.
+- Completion evidence: `scripts/verify-sprint.sh` reports this contract's direct checks and declared scope. Then perform a fresh semantic impact review.
 
 ## Allowed Paths
 
@@ -377,7 +377,7 @@ exit_criteria:
   tests_pass:
     - path: tests/unit/{{TASK_SLUG}}.test.ts
   commands_succeed:
-    - bun run typecheck
+    - bun run check:type
   files_contain:
     - path: src/modules/{{TASK_SLUG}}/index.ts
       pattern: "export"
@@ -691,19 +691,15 @@ else
 > **Notes File**: {{NOTES_FILE}}
 > **Checks File**: {{CHECKS_FILE}}
 > **Last Updated**: {{TIMESTAMP}}
-> **Recommendation**: fail
+> **Summary**:
 
-## Human Review Card
+## Semantic Impact Review
 
-- Verdict: pending
-- Change type: code-change | docs-only | ledger-closeout | migration | eval-only | delegated-run
-- Intended files changed:
-- Actual files changed:
-- Commands passed:
-- External acceptance: unavailable
-- Residual risks:
-- Reviewer action required: inspect diff and card
-- Rollback:
+- User intent:
+- Affected domains and downstream consumers:
+- State transitions and persistence/restart impact:
+- Missing impact areas or uncertainty:
+- Residual risks and recovery:
 
 ## Mode Evidence
 
@@ -713,26 +709,14 @@ else
 
 ## Verification Evidence
 
-- Forge /review run:
+- Focused/full checks:
 - Commands run:
 - Manual checks:
 - Supporting artifacts:
 - Implementation notes reviewed:
 - Run snapshot:
 
-## External Acceptance Advice
-
-> **External Acceptance**: unavailable
-> **External Reviewer**:
-> **External Source**:
-> **External Started**:
-> **External Completed**:
-
-- P1 blockers:
-- P2 advisories:
-- Acceptance checklist:
-
-## Behavior Diff Notes
+## Scenario Evidence
 
 - ...
 
@@ -740,15 +724,6 @@ else
 
 - ...
 
-## Scorecard
-
-| Dimension | Score | Notes |
-|-----------|-------|-------|
-| Functionality | 0/10 | |
-| Product depth | 0/10 | |
-| Design quality | 0/10 | |
-| Code quality | 0/10 | |
-
 ## Failing Items
 
 - ...

package/assets/templates/helpers/ship-worktrees.sh

@@ -224,19 +224,8 @@ active_slug_or_empty() {
   plan_slug_from_path "$active_plan"
 }
 
-review_recommends_pass_fallback() {
-  local review_file="$1"
-  grep -Eq '^> \*\*Recommendation\*\*:[[:space:]]*pass([[:space:]]*)$' "$review_file"
-}
-
-external_acceptance_pass_fallback() {
-  local review_file="$1"
-  grep -Eq '^> \*\*External Acceptance\*\*:[[:space:]]*(pass|manual_override)([[:space:]]*)$' "$review_file" \
-    && grep -Eq '^-?[[:space:]]*P1 blockers:[[:space:]]*none([[:space:]]*)$' "$review_file"
-}
-
 require_finish_ready() {
-  local contract_file="" review_file="" checks_file=".ai/harness/checks/latest.json" checks_error=""
+  local contract_file="" checks_file=".ai/harness/checks/latest.json" checks_error=""
 
   [[ -x "scripts/contract-worktree.sh" ]] || fail "scripts/contract-worktree.sh is missing or not executable"
   [[ -x "scripts/verify-sprint.sh" ]] || fail "scripts/verify-sprint.sh is missing or not executable"
@@ -245,27 +234,11 @@ require_finish_ready() {
   if declare -F workflow_active_contract >/dev/null 2>&1; then
     contract_file="$(workflow_active_contract 2>/dev/null || true)"
   fi
-  if declare -F workflow_active_review >/dev/null 2>&1; then
-    review_file="$(workflow_active_review 2>/dev/null || true)"
-  fi
   if declare -F workflow_checks_file >/dev/null 2>&1; then
     checks_file="$(workflow_checks_file)"
   fi
 
   [[ -n "$contract_file" && -f "$contract_file" ]] || fail "active sprint contract is missing"
-  [[ -n "$review_file" && -f "$review_file" ]] || fail "active sprint review is missing"
-
-  if declare -F workflow_review_recommends_pass >/dev/null 2>&1; then
-    workflow_review_recommends_pass "$review_file" || fail "$review_file does not recommend pass"
-  else
-    review_recommends_pass_fallback "$review_file" || fail "$review_file does not recommend pass"
-  fi
-
-  if declare -F workflow_external_acceptance_pass >/dev/null 2>&1; then
-    workflow_external_acceptance_pass "$review_file" || fail "$review_file has no passing external acceptance"
-  else
-    external_acceptance_pass_fallback "$review_file" || fail "$review_file has no passing external acceptance"
-  fi
 
   run_cmd bash "scripts/verify-sprint.sh"
   if [[ "$DRY_RUN" -eq 1 ]]; then
@@ -273,7 +246,7 @@ require_finish_ready() {
   fi
 
   if declare -F workflow_checks_pass >/dev/null 2>&1; then
-    if ! checks_error="$(workflow_checks_pass "$checks_file" "$contract_file" "$review_file")"; then
+    if ! checks_error="$(workflow_checks_pass "$checks_file" "$contract_file")"; then
       fail "$checks_error"
     fi
   elif ! grep -Eq '"status"[[:space:]]*:[[:space:]]*"pass"' "$checks_file"; then

package/assets/templates/helpers/sprint-backlog.sh

@@ -21,11 +21,11 @@ Usage:
 
 Program-level sprint backlog helper. PRDs live in plans/prds/ as the upper
 planning layer; sprints live in plans/sprints/ as ordered execution backlogs.
-Each backlog row is expanded with $think before the existing plan -> contract
+Each backlog row is expanded with /plan 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 Forge \`/plan\` output with \`scripts/capture-plan.sh --source forge-plan --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
 

package/assets/templates/helpers/verify-contract.sh

@@ -69,24 +69,6 @@ read_contract_status() {
   awk '/^> \*\*Status\*\*:/ {sub(/^.*> \*\*Status\*\*: */, ""); gsub(/\r/, ""); print; exit}' "$file" | xargs
 }
 
-read_contract_review_file() {
-  local file="$1"
-  local line=""
-  local value=""
-
-  line="$(grep -m 1 -E '^> \*\*Review File\*\*:' "$file" || true)"
-  [[ -n "$line" ]] || return 0
-
-  if [[ "$line" == *\`* ]]; then
-    value="${line#*\`}"
-    value="${value%%\`*}"
-  else
-    value="${line#*> **Review File**:}"
-  fi
-
-  printf '%s' "$value" | tr -d '\r' | sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//'
-}
-
 read_contract_task_profile() {
   local file="$1"
   awk '/^> \*\*Task Profile\*\*:/ {sub(/^.*> \*\*Task Profile\*\*:[[:space:]]*/, ""); gsub(/\r/, ""); print; exit}' "$file" | xargs
@@ -130,36 +112,6 @@ contract_allowed_paths() {
   '
 }
 
-review_recommends_pass() {
-  local review_file="$1"
-  [[ -n "$review_file" && -f "$review_file" ]] || return 1
-  grep -Eq '^> \*\*Recommendation\*\*:[[:space:]]*pass[[:space:]]*$' "$review_file"
-}
-
-review_score() {
-  local review_file="$1"
-  local dimension="$2"
-
-  [[ -n "$review_file" && -f "$review_file" ]] || return 1
-
-  awk -F'|' -v wanted="$dimension" '
-    function trim(s) {
-      gsub(/^[[:space:]]+/, "", s)
-      gsub(/[[:space:]]+$/, "", s)
-      return s
-    }
-    BEGIN { wanted = tolower(wanted) }
-    /^\|/ {
-      dim = tolower(trim($2))
-      score = trim($3)
-      if (dim == wanted && match(score, /[0-9]+/)) {
-        print substr(score, RSTART, RLENGTH)
-        exit
-      }
-    }
-  ' "$review_file"
-}
-
 update_contract_status() {
   local file="$1"
   local status="$2"
@@ -385,14 +337,9 @@ declare -a contain_patterns=()
 declare -a files_not_exist=()
 declare -a not_contain_paths=()
 declare -a not_contain_patterns=()
-declare -a qa_dimensions=()
-declare -a qa_mins=()
-declare -a manual_checks=()
 
 section=""
 pending_path=""
-pending_dimension=""
-review_file="$(read_contract_review_file "$contract_file" || true)"
 task_profile="$(read_contract_task_profile "$contract_file" || true)"
 declare -a allowed_paths=()
 while IFS= read -r allowed_path; do
@@ -443,21 +390,10 @@ while IFS= read -r raw_line; do
       pending_path=""
       continue
       ;;
-    qa_scores:)
-      section="qa_scores"
-      pending_path=""
-      pending_dimension=""
-      continue
-      ;;
-    manual_checks:)
-      section="manual_checks"
-      pending_path=""
-      continue
-      ;;
   esac
 
   case "$section" in
-    files_exist|commands_succeed|files_not_exist|artifacts_exist|manual_checks)
+    files_exist|commands_succeed|files_not_exist|artifacts_exist)
       if [[ "$trimmed" =~ ^-[[:space:]]*(.+)$ ]]; then
         item="$(strip_quotes "${BASH_REMATCH[1]}")"
         [[ -n "$item" ]] || continue
@@ -467,8 +403,6 @@ while IFS= read -r raw_line; do
           commands_succeed+=("$item")
         elif [[ "$section" == "artifacts_exist" ]]; then
           artifacts_exist+=("$item")
-        elif [[ "$section" == "manual_checks" ]]; then
-          manual_checks+=("$item")
         else
           files_not_exist+=("$item")
         fi
@@ -497,19 +431,6 @@ while IFS= read -r raw_line; do
         fi
       fi
       ;;
-    qa_scores)
-      if [[ "$trimmed" =~ ^-[[:space:]]*dimension:[[:space:]]*(.+)$ ]]; then
-        pending_dimension="$(strip_quotes "${BASH_REMATCH[1]}")"
-      elif [[ "$trimmed" =~ ^dimension:[[:space:]]*(.+)$ ]]; then
-        pending_dimension="$(strip_quotes "${BASH_REMATCH[1]}")"
-      elif [[ "$trimmed" =~ ^min:[[:space:]]*([0-9]+)$ ]]; then
-        if [[ -n "$pending_dimension" ]]; then
-          qa_dimensions+=("$pending_dimension")
-          qa_mins+=("${BASH_REMATCH[1]}")
-          pending_dimension=""
-        fi
-      fi
-      ;;
   esac
 done <<< "$yaml_block"
 if ((${#tests_pass[@]} || ${#commands_succeed[@]})); then
@@ -602,37 +523,6 @@ if ((${#commands_succeed[@]})); then
   done
 fi
 
-if ((${#qa_dimensions[@]})); then
-  for idx in "${!qa_dimensions[@]}"; do
-    dimension="${qa_dimensions[$idx]}"
-    min_score="${qa_mins[$idx]}"
-    score="$(review_score "$review_file" "$dimension" || true)"
-
-    if [[ "$score" =~ ^[0-9]+$ && "$score" -ge "$min_score" ]]; then
-      pass "qa_scores" "$dimension" "qa_scores: $dimension ${score}/${min_score}"
-    else
-      fail "qa_scores" "$dimension" "qa_scores: $dimension score ${score:-missing} < $min_score"
-    fi
-  done
-fi
-
-if ((${#manual_checks[@]})); then
-  for check in "${manual_checks[@]}"; do
-    case "$check" in
-      "Evaluator review file recommends pass")
-        if review_recommends_pass "$review_file"; then
-          pass "manual_checks" "$check" "manual_checks: $check"
-        else
-          fail "manual_checks" "$check" "manual_checks: $check"
-        fi
-        ;;
-      *)
-        fail "manual_checks" "$check" "manual_checks unsupported: $check"
-        ;;
-    esac
-  done
-fi
-
 if ((${#contain_paths[@]})); then
   for idx in "${!contain_paths[@]}"; do
     path="${contain_paths[$idx]}"