@moretea-labs/forge 1.7.1 → 1.8.0

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

@@ -206,7 +206,7 @@ if [[ -z "$(printf '%s' "$body" | tr -d '[:space:]')" ]]; then
 fi
 
 timestamp="$(date +%Y%m%d-%H%M)"
-mkdir -p plans plans/archive .claude
+mkdir -p plans .claude
 
 plan_file="plans/plan-${timestamp}-${slug}.md"
 counter=2
@@ -291,7 +291,7 @@ See captured planning output.
 - Implementation notes file: \`tasks/notes/${artifact_stem}.notes.md\`
 - Template: \`.claude/templates/contract.template.md\`
 - Verification command: \`bash scripts/verify-contract.sh --contract tasks/contracts/${artifact_stem}.contract.md --strict\`
-- Active plan rule: this captured plan is written to \`.ai/harness/active-plan\`, the owning worktree is written to \`.ai/harness/active-worktree\`, and the plan is mirrored to \`.claude/.active-plan\` unless --no-active is used. Do not infer active execution from the latest non-archived plan.
+- Active plan rule: this captured plan is written to \`.ai/harness/active-plan\`, the owning worktree is written to \`.ai/harness/active-worktree\`, and the plan is mirrored to \`.claude/.active-plan\` unless --no-active is used. Do not infer active execution from plan filename order, recency, or mere presence.
 
 ## Handoff
 

package/assets/templates/helpers/check-architecture-sync.sh

@@ -257,15 +257,7 @@ if [[ -z "$changed_files" ]]; then
   exit 0
 fi
 
-matches_json="$(printf '%s\n' "$changed_files" | bun scripts/capability-resolver.ts match --paths-from - --format json)"
-capabilities="$(
-  MATCHES_JSON="$matches_json" node -e '
-const matches = JSON.parse(process.env.MATCHES_JSON || "[]");
-const ids = new Set();
-for (const item of matches) ids.add(item.capability_id || "root");
-for (const id of [...ids].sort()) console.log(id);
-'
-)"
+capabilities="$(printf '%s\n' "$changed_files" | bun scripts/capability-resolver.ts match --paths-from - --format ids)"
 changed_count="$(printf '%s\n' "$capabilities" | sed '/^$/d' | wc -l | tr -d ' ')"
 blocking_lines="$(pending_requests_for_capabilities "$threshold" "$capabilities")"
 blocking_count="$(printf '%s\n' "$blocking_lines" | sed '/^$/d' | wc -l | tr -d ' ')"

package/assets/templates/helpers/check-task-sync.sh

@@ -16,6 +16,76 @@ get_changed_files() {
   git ls-files --others --exclude-standard
 }
 
+current_status_field() {
+  local file="$1"
+  local label="$2"
+  awk -v label="$label" '
+    $0 ~ "^> \\*\\*" label "\\*\\*:" {
+      sub("^> \\*\\*" label "\\*\\*: *", "")
+      gsub(/\r/, "")
+      print
+      exit
+    }
+  ' "$file" | xargs
+}
+
+current_status_updated_epoch() {
+  local value="$1"
+  if date -d "$value" '+%s' >/dev/null 2>&1; then
+    date -d "$value" '+%s'
+    return 0
+  fi
+  date -j -f '%Y-%m-%dT%H:%M:%S%z' "$value" '+%s' 2>/dev/null
+}
+
+validate_current_status_snapshot() {
+  local file="tasks/current.md"
+  local updated stale_after amount unit multiplier updated_epoch now_epoch
+
+  if [[ ! -f "$file" ]]; then
+    echo "[task-sync] Substantive repo changes require a refreshed tasks/current.md projection."
+    return 1
+  fi
+  if ! grep -Fq '<!-- generated-by: forge refresh-current-status v1 -->' "$file"; then
+    echo "[task-sync] tasks/current.md is not a Forge-generated current-status projection."
+    return 1
+  fi
+
+  updated="$(current_status_field "$file" "Updated At" 2>/dev/null || true)"
+  stale_after="$(current_status_field "$file" "Stale After" 2>/dev/null || true)"
+  if [[ -z "$updated" || -z "$stale_after" ]]; then
+    echo "[task-sync] tasks/current.md is missing Updated At or Stale After metadata."
+    return 1
+  fi
+  if [[ ! "$stale_after" =~ ^([0-9]+)([smhd])$ ]]; then
+    echo "[task-sync] tasks/current.md has an invalid Stale After freshness contract: $stale_after"
+    return 1
+  fi
+  amount="${BASH_REMATCH[1]}"
+  unit="${BASH_REMATCH[2]}"
+  case "$unit" in
+    s) multiplier=1 ;;
+    m) multiplier=60 ;;
+    h) multiplier=3600 ;;
+    d) multiplier=86400 ;;
+  esac
+
+  updated_epoch="$(current_status_updated_epoch "$updated" || true)"
+  if [[ ! "$updated_epoch" =~ ^[0-9]+$ ]]; then
+    echo "[task-sync] tasks/current.md has an invalid Updated At timestamp: $updated"
+    return 1
+  fi
+  now_epoch="${FORGE_CURRENT_STATUS_NOW_EPOCH:-$(date '+%s')}"
+  if [[ ! "$now_epoch" =~ ^[0-9]+$ ]]; then
+    echo "[task-sync] Unable to evaluate tasks/current.md freshness."
+    return 1
+  fi
+  if (( now_epoch - updated_epoch >= amount * multiplier )); then
+    echo "[task-sync] tasks/current.md is stale; refresh the generated current-status projection."
+    return 1
+  fi
+}
+
 changed_files=()
 while IFS= read -r line; do
   [[ -n "$line" ]] && changed_files+=("$line")
@@ -28,16 +98,15 @@ fi
 
 has_non_task_change=0
 has_task_sync_change=0
+has_current_status_change=0
 
 for file in "${changed_files[@]}"; do
   case "$file" in
-    tasks/archive/*)
-      has_non_task_change=1
-      ;;
-    tasks/*)
+    tasks/current.md)
       has_task_sync_change=1
+      has_current_status_change=1
       ;;
-    docs/researches/*)
+    tasks/*|docs/researches/*)
       has_task_sync_change=1
       ;;
     *)
@@ -55,11 +124,13 @@ if [[ "$has_non_task_change" -eq 0 ]]; then
   exit 0
 fi
 
-if [[ "$has_task_sync_change" -eq 1 ]]; then
-  echo "[task-sync] Repo changes include synchronized tasks/ updates."
-  exit 0
+if [[ "$has_current_status_change" -ne 1 ]]; then
+  echo "[task-sync] Substantive repo changes detected without a refreshed tasks/current.md projection."
+  echo "[task-sync] Run scripts/refresh-current-status.sh --write; unrelated task/research updates do not satisfy current-projection freshness."
+  exit 1
 fi
 
-echo "[task-sync] Substantive repo changes detected without tasks/ synchronization."
-echo "[task-sync] Update tasks/current.md, tasks/todos.md, tasks/lessons.md, docs/researches/*.md, tasks/notes/*.md, or an active tasks/contracts/*.md file."
-exit 1
+validate_current_status_snapshot
+
+echo "[task-sync] Repo changes include a fresh generated tasks/current.md projection."
+exit 0

package/assets/templates/helpers/check-task-workflow.sh

@@ -675,7 +675,7 @@ check_helper_runtime_files() {
       switch-plan.sh workflow-contract.ts
       inspect-project-state.ts migrate-workflow-docs.ts migrate-project-template.sh
       capability-resolver.ts architecture-event.ts capability-config.ts architecture-queue.sh
-      archive-architecture-request.sh context-contract-sync.sh workstream-sync.sh
+      context-contract-sync.sh workstream-sync.sh
       prepare-codex-handoff.sh codex-handoff-resume.sh
     )
   fi
@@ -735,11 +735,9 @@ if [[ -f "$policy_file" ]] && command -v jq >/dev/null 2>&1; then
 fi
 
 check_required_dir "plans"
-check_required_dir "plans/archive"
 check_required_dir "plans/prds"
 check_required_dir "$sprints_dir"
 check_required_dir "tasks"
-check_required_dir "tasks/archive"
 check_required_dir "$contracts_dir"
 check_required_dir "$reviews_dir"
 check_required_dir "$notes_dir"

package/assets/templates/helpers/context-contract-sync.sh

@@ -439,8 +439,6 @@ semantic_diagram_source="$architecture_module"
 if [[ "$latest_snapshot" != "(none yet)" ]]; then
   semantic_diagram_source="$latest_snapshot"
 fi
-active_workstreams="$(format_active_workstreams "$workstream_dir")"
-
 block_tmp="$(mktemp)"
 cat > "$block_tmp" <<EOF_BLOCK
 <!-- BEGIN ARCHITECTURE CONTRACT -->
@@ -467,16 +465,7 @@ cat > "$block_tmp" <<EOF_BLOCK
 - Semantic diagram source: \`${semantic_diagram_source}\`
 - Latest human diagram: \`${latest_human_diagram}\`
 - Pending architecture request: \`${request_file:-unknown}\`
-
-## Active Workstreams
-
-${active_workstreams}
-
-## Current Session Projection
-
-- Durable progress lives under \`${workstream_dir}\`.
-- \`tasks/current.md\` is the tracked derived status snapshot; it is not a live lock or task source.
-- \`tasks/todos.md\` is the deferred-goal ledger; current execution slices stay in the active plan's \`## Task Breakdown\`.
+- Runtime progress authority: Forge Controller Home Requirement/Plan/Work/Evidence; this repository block contains authored architecture context only.
 <!-- END ARCHITECTURE CONTRACT -->
 EOF_BLOCK
 

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

@@ -401,14 +401,14 @@ latest_plan_for_slug() {
   printf '%s' "$latest"
 }
 
-archive_finished_workflow() {
+close_finished_workflow() {
   local plan_file="$1"
 
-  [[ -n "$plan_file" ]] || { echo "contract-worktree: no active plan found to archive" >&2; exit 1; }
-  [[ -f "$plan_file" ]] || { echo "contract-worktree: active plan not found for archive: $plan_file" >&2; exit 1; }
+  [[ -n "$plan_file" ]] || { echo "contract-worktree: no active plan found to close" >&2; exit 1; }
+  [[ -f "$plan_file" ]] || { echo "contract-worktree: active plan not found for closeout: $plan_file" >&2; exit 1; }
   [[ -x "scripts/archive-workflow.sh" ]] || { echo "contract-worktree: scripts/archive-workflow.sh is missing or not executable" >&2; exit 1; }
 
-  echo "[ContractWorktree] Archiving completed workflow before merge: $plan_file"
+  echo "[ContractWorktree] Closing completed repo-local workflow after committed evidence: $plan_file"
   bash "scripts/archive-workflow.sh" --plan "$plan_file" --outcome Completed
 }
 
@@ -488,15 +488,23 @@ finish_worktree() {
   check_architecture_freshness "$target_branch"
   bash "scripts/verify-sprint.sh"
   check_scope_against_contract "$contract_file"
-  archive_finished_workflow "$active_plan"
-  clean_local_runtime_markers
   backfill_sprint_backlog "$active_plan" || true
 
+  # Preserve the exact terminal evidence in Git before deleting repo-local
+  # lifecycle artifacts. This makes Git history a real archive rather than a
+  # slogan and prevents closeout from erasing unique uncommitted evidence.
   if ! git diff --quiet || ! git diff --cached --quiet || [[ -n "$(git ls-files --others --exclude-standard)" ]]; then
     git add -A
     git commit -m "$commit_message"
   else
-    echo "[ContractWorktree] No tracked changes to commit."
+    echo "[ContractWorktree] Terminal evidence already represented by HEAD."
+  fi
+
+  close_finished_workflow "$active_plan"
+  clean_local_runtime_markers
+  if ! git diff --quiet || ! git diff --cached --quiet; then
+    git add -A
+    git commit -m "chore(workflow): close ${slug}"
   fi
 
   if [[ "$merge_back" -eq 0 ]]; then
@@ -519,28 +527,21 @@ finish_worktree() {
 }
 
 # Warn-only sprint backlog back-fill: plans captured via sprint-backlog
-# start-task carry "> **Source Ref**: sprint:<file>#<task>". After the
-# workflow archives, flip that backlog row so the update merges with the
-# slice. Any failure warns and never blocks finish.
+# start-task carry "> **Source Ref**: sprint:<file>#<task>". Read that source
+# reference before workflow closeout deletes the repo-local plan. Completed
+# rows record the historical plan path explicitly as Git history, not as a
+# broken link to a maintained archive file.
 backfill_sprint_backlog() {
   local plan_file="$1"
-  local archived_plan source_ref sprint_path task_ref
+  local source_ref sprint_path task_ref history_ref
 
   [[ -f "scripts/sprint-backlog.sh" ]] || return 0
-
-  archived_plan="plans/archive/$(basename "$plan_file")"
-  if [[ ! -f "$archived_plan" ]]; then
-    # Archive may have renamed on collision (-vN suffix); fall back to the
-    # newest archived file sharing the stem, then to the original path.
-    archived_plan="$(find plans/archive -maxdepth 1 -type f -name "$(basename "$plan_file" .md)*.md" 2>/dev/null | sort | tail -1)"
-  fi
-  [[ -n "$archived_plan" && -f "$archived_plan" ]] || archived_plan="$plan_file"
-  if [[ ! -f "$archived_plan" ]]; then
-    echo "[ContractWorktree] Warning: cannot resolve archived plan for sprint back-fill: $plan_file" >&2
+  [[ -f "$plan_file" ]] || {
+    echo "[ContractWorktree] Warning: cannot read plan for sprint back-fill: $plan_file" >&2
     return 0
-  fi
+  }
 
-  source_ref="$(awk '/^> \*\*Source Ref\*\*:/ {sub(/^> \*\*Source Ref\*\*:[[:space:]]*/, ""); gsub(/\r/, ""); print; exit}' "$archived_plan" 2>/dev/null | sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//')"
+  source_ref="$(awk '/^> \*\*Source Ref\*\*:/ {sub(/^> \*\*Source Ref\*\*:[[:space:]]*/, ""); gsub(/\r/, ""); print; exit}' "$plan_file" 2>/dev/null | sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//')"
   case "$source_ref" in
     sprint:*#*)
       ;;
@@ -555,7 +556,8 @@ backfill_sprint_backlog() {
   task_ref="${sprint_path#*#}"
   sprint_path="${sprint_path%%#*}"
 
-  if bash scripts/sprint-backlog.sh complete-task --sprint "$sprint_path" --task "$task_ref" --plan "$archived_plan"; then
+  history_ref="git-history:${plan_file}"
+  if bash scripts/sprint-backlog.sh complete-task --sprint "$sprint_path" --task "$task_ref" --plan "$history_ref"; then
     echo "[ContractWorktree] Sprint backlog updated: $sprint_path ($task_ref)"
   else
     echo "[ContractWorktree] Warning: sprint backlog back-fill failed for $sprint_path ($task_ref); update the row manually." >&2

package/assets/templates/helpers/ensure-task-workflow.sh

@@ -337,7 +337,7 @@ Complete this inventory before implementation. If any line is unknown, keep the
 - Implementation notes file: `tasks/notes/{{ARTIFACT_STEM}}.notes.md`
 - Template: `.claude/templates/contract.template.md`
 - Verification command: `bash scripts/verify-contract.sh --contract tasks/contracts/{{ARTIFACT_STEM}}.contract.md --strict`
-- Active plan rule: `.ai/harness/active-plan` is authoritative for this worktree when present; `.ai/harness/active-worktree` records the owning worktree; `.claude/.active-plan` is a legacy fallback during transition. Do not infer active execution from the latest non-archived plan.
+- Active plan rule: `.ai/harness/active-plan` is authoritative for this worktree when present; `.ai/harness/active-worktree` records the owning worktree; `.claude/.active-plan` is a legacy fallback during transition. Do not infer active execution from plan filename order, recency, or mere presence.
 
 ## Handoff
 
@@ -600,7 +600,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/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
+  mkdir -p plans plans/prds plans/sprints tasks/issues 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'
@@ -741,7 +741,7 @@ CAPABILITIES_EOF
 ## Architecture Drift Flow
 
 - `scripts/architecture-queue.sh` records architecture-sensitive edits as requests.
-- `scripts/archive-architecture-request.sh` archives handled requests after an agent records the resolution status and linked artifacts.
+- `scripts/architecture-queue.sh resolve --file <request>` removes a handled request, clears stale context pointers, and reindexes the live queue; Git history is the archive.
 - `scripts/context-contract-sync.sh` keeps only the controlled architecture block in functional-block `AGENTS.md` and `CLAUDE.md` files aligned.
 - `scripts/workstream-sync.sh` keeps durable multi-session progress under `tasks/workstreams/<domain>/<capability>/` and projects only pointers into local contracts.
 - Semantic architecture diagrams live as Mermaid fenced blocks in the relevant module or snapshot Markdown.
@@ -764,7 +764,6 @@ ARCHITECTURE_INDEX_EOF
     "marker_file": ".ai/harness/active-plan",
     "legacy_marker_file": ".claude/.active-plan",
     "directory": "plans",
-    "archive_directory": "plans/archive",
     "glob": "plan-*.md",
     "active_worktree_marker_file": ".ai/harness/active-worktree",
     "source_of_truth": "per-worktree explicit marker with active-worktree owner; legacy Claude marker fallback only"
@@ -847,7 +846,7 @@ ARCHITECTURE_INDEX_EOF
     "notes": {
       "dir": "tasks/notes",
       "purpose": "task-local implementation decisions, deviations, tradeoffs, and open questions",
-      "promotion": "archive on workflow close; promote only repeated or durable findings"
+      "promotion": "promote repeated or durable findings before terminal closeout; delete task-local notes only after Git preserves their exact final state"
     },
     "evidence": {
       "latest": ".ai/harness/checks/latest.json",
@@ -943,15 +942,14 @@ ARCHITECTURE_INDEX_EOF
     "strategy_version": 1,
     "supported_legacy_versions": ["pre-tasks-first", "tasks-first-without-contract-manifest", "current-v1"],
     "action_classes": {
-      "preserve": "keep user-authored hooks, ignored reference material, private operations state, secrets, and local env files unchanged",
-      "archive": "move user-authored legacy workflow documents or checklists into archive/research surfaces before refresh",
+      "preserve": "keep user-authored legacy workflow documents, hooks, ignored reference material, private operations state, secrets, and local env files unchanged until explicitly triaged",
       "reconfigure": "merge managed config defaults without overwriting explicit repo overrides",
       "remove": "delete only workflow-contract actions marked ownership=known_generated"
     },
     "cleanup": {
       "source": ".ai/harness/workflow-contract.json#migrations.upgrade.actions",
       "remove_only_ownership": "known_generated",
-      "unknown_files": "preserve-or-archive",
+      "unknown_files": "preserve",
       "custom_hooks": "preserve",
       "ignored_reference_material": "preserve",
       "local_operations_state": "preserve",

package/assets/templates/helpers/inspect-project-state.ts

@@ -110,7 +110,7 @@ export function inspectRepo(repo: string): InspectionResult {
   const requiredDecisions: string[] = [];
   const safeDefaults = [
     "Preserve repo-local tasks-first workflow",
-    "Archive uncertain legacy content instead of overwriting it",
+    "Preserve uncertain legacy content in place until explicit currentness triage",
     "Delete only manifest-owned known_generated legacy files",
     "Distill repeated corrections into tasks/lessons.md and hidden contracts into docs/researches/",
   ];

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

@@ -4,7 +4,7 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SELF_SOURCE_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+SELF_SOURCE_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
 SOURCE_ROOT="${FORGE_SOURCE_ROOT:-${AGENTIC_DEV_ROOT:-${AGENTIC_DEV_SKILL_ROOT:-}}}"
 
 run_source_root() {