forge-orkes 0.72.2 → 0.74.0

package/template/.forge/checks/tests/forge-jarvis-awareness.test.sh

@@ -114,5 +114,58 @@ else
   bad 'unknown flag refused loudly (exit 2)' "rc=$RC out=$OUT"
 fi
 
+# --- 9-12. BARE BRANCH LOOSENING (issue #25): a worktree glob against REAL git worktrees on
+#     bare m-<id>-slug / m<digits>-slug branches (no forge/ prefix) — FORGE_JARVIS_REPO_ROOT
+#     points the git-worktree glob at a throwaway fixture repo instead of --worktree-root's
+#     root-scan (which bypasses branch matching entirely). ------------------------------------
+GITROOT="$ROOT/git-fixture"; mkdir -p "$GITROOT/main"
+(
+  cd "$GITROOT/main" || exit 1
+  git init -q .
+  git config user.email t@t.com; git config user.name test
+  mkdir -p .forge/state
+  printf 'id: 176\n'     > .forge/state/milestone-176.yml
+  printf 'id: 167\n'     > .forge/state/milestone-167.yml
+  printf 'id: R61-002\n' > .forge/state/milestone-R61-002.yml
+  git add .forge >/dev/null 2>&1 || : > .gitkeep
+  git add -A; git commit -q -m init
+  git worktree add -q -b m-176-marcy-mcp     "$GITROOT/bare-1" >/dev/null 2>&1
+  git worktree add -q -b m167-close-sync     "$GITROOT/bare-2" >/dev/null 2>&1
+  git worktree add -q -b m-R61-002-cleanup   "$GITROOT/bare-3" >/dev/null 2>&1
+  git worktree add -q -b fix-issue-2         "$GITROOT/guard-1" >/dev/null 2>&1
+) >/dev/null 2>&1
+
+OUT="$(FORGE_JARVIS_REPO_ROOT="$GITROOT/main" FORGE_JARVIS_FOLD="$FOLDSTUB" FORGE_JARVIS_BOARD="$BOARDSTUB" \
+       sh "$AWARE" --dry-run 2>&1)"
+
+# 9. bare branch m-176-marcy-mcp discovered with milestone id m-176 (previously silently absent)
+if printf '%s' "$OUT" | grep -qE 'm-176[[:space:]]+m-176-marcy-mcp'; then
+  ok 'bare branch m-176-marcy-mcp is discovered as milestone id m-176'
+else
+  bad 'bare branch m-176-marcy-mcp is discovered as milestone id m-176' "$OUT"
+fi
+
+# 10. bare branch m167-close-sync (no hyphen after m) discovered with milestone id m-167
+if printf '%s' "$OUT" | grep -qE 'm-167[[:space:]]+m167-close-sync'; then
+  ok 'bare branch m167-close-sync is discovered as milestone id m-167'
+else
+  bad 'bare branch m167-close-sync is discovered as milestone id m-167' "$OUT"
+fi
+
+# 11. hyphenated id: m-R61-002-cleanup resolves via the longest-matching state-file prefix,
+#     not the naive first-hyphen-segment (which would wrongly stop at m-R61)
+if printf '%s' "$OUT" | grep -qE 'm-R61-002[[:space:]]+m-R61-002-cleanup'; then
+  ok 'hyphenated milestone id: m-R61-002-cleanup resolves to m-R61-002 (longest state-file prefix)'
+else
+  bad 'hyphenated milestone id: m-R61-002-cleanup resolves to m-R61-002 (longest state-file prefix)' "$OUT"
+fi
+
+# 12. GUARD: a bare-number branch (fix-issue-2, no m- token) is NEVER discovered
+if ! printf '%s' "$OUT" | grep -q 'fix-issue-2'; then
+  ok 'guard: bare-number branch fix-issue-2 (no m- token) is not discovered'
+else
+  bad 'guard: bare-number branch fix-issue-2 (no m- token) is not discovered' "$OUT"
+fi
+
 printf '\nforge-jarvis-awareness.test.sh: %s passed, %s failed\n' "$PASSED" "$FAILED"
 [ "$FAILED" -eq 0 ]

package/template/.forge/checks/tests/forge-jarvis-dispatch.test.sh

@@ -403,6 +403,56 @@ if [ "$rc" = 0 ] && printf '%s' "$err24" | grep -q 'using it as-is'; then
 else
   bad "legacy materialized order" "rc=$rc err=$err24"
 fi
+
+# --- 25-27. BARE BRANCH LOOSENING (issue #25): the branch-derived milestone-dir pick also
+#     matches a bare m-<id>-slug / m<digits>-slug branch (no forge/ prefix) — same match family
+#     as awareness/relay. A bare slug can carry several descriptive words, so the pick walks
+#     truncations of the last hyphen-segment until an existing milestone dir is found.
+
+# 25. bare branch m-176-marcy-mcp (hyphenated id + 2-word slug) picks milestone-176 among
+#     several dirs
+BSLICE="$ROOT/bare-wt"
+mkdir -p "$BSLICE/.forge/phases/milestone-176/1-num" "$BSLICE/.forge/phases/milestone-5/1-decoy"
+printf 'bare plan\n' > "$BSLICE/.forge/phases/milestone-176/1-num/plan-01.md"
+printf 'decoy\n'     > "$BSLICE/.forge/phases/milestone-5/1-decoy/plan-01.md"
+mkbranch "$BSLICE" m-176-marcy-mcp
+err25="$(sh "$DISPATCH" --slice "$BSLICE" --materialize-only 2>&1)"; rc=$?
+if [ "$rc" = 0 ] && grep -q '^  - 1-num$' "$BSLICE/slice.yml" 2>/dev/null \
+   && grep -q 'bare plan' "$BSLICE/phases/1-num/plan.md" 2>/dev/null && [ ! -d "$BSLICE/phases/1-decoy" ]; then
+  ok "bare branch m-176-marcy-mcp: branch picks milestone-176 among several dirs (no forge/ prefix)"
+else
+  bad "bare-branch pick (hyphenated id)" "rc=$rc err=$err25"
+fi
+
+# 26. bare branch m167-close-sync (no hyphen after m, 2-word slug) picks milestone-167
+CSLICE="$ROOT/bare-wt2"
+mkdir -p "$CSLICE/.forge/phases/milestone-167/1-num" "$CSLICE/.forge/phases/milestone-9/1-decoy"
+printf 'bare plan\n' > "$CSLICE/.forge/phases/milestone-167/1-num/plan-01.md"
+printf 'decoy\n'     > "$CSLICE/.forge/phases/milestone-9/1-decoy/plan-01.md"
+mkbranch "$CSLICE" m167-close-sync
+err26="$(sh "$DISPATCH" --slice "$CSLICE" --materialize-only 2>&1)"; rc=$?
+if [ "$rc" = 0 ] && grep -q '^  - 1-num$' "$CSLICE/slice.yml" 2>/dev/null \
+   && grep -q 'bare plan' "$CSLICE/phases/1-num/plan.md" 2>/dev/null && [ ! -d "$CSLICE/phases/1-decoy" ]; then
+  ok "bare branch m167-close-sync: branch picks milestone-167 among several dirs (m immediately followed by digits)"
+else
+  bad "bare-branch pick (numeric, no hyphen)" "rc=$rc err=$err26"
+fi
+
+# 27. GUARD: a bare-number branch (fix-issue-2, no m- token) does NOT resolve — several
+#     milestone dirs with no branch-derived pick still refuses as ambiguous
+NSLICE="$ROOT/guard-wt"
+mkdir -p "$NSLICE/.forge/phases/milestone-1/1-a" "$NSLICE/.forge/phases/milestone-2/1-b"
+printf 'a\n' > "$NSLICE/.forge/phases/milestone-1/1-a/plan-01.md"
+printf 'b\n' > "$NSLICE/.forge/phases/milestone-2/1-b/plan-01.md"
+mkbranch "$NSLICE" fix-issue-2
+err27="$(sh "$DISPATCH" --slice "$NSLICE" --materialize-only 2>&1)"; rc=$?
+if [ "$rc" != 0 ] && [ ! -f "$NSLICE/slice.yml" ] && printf '%s' "$err27" | grep -q 'REFUSED' \
+   && printf '%s' "$err27" | grep -q 'no forge/m-\* or bare m-<id> branch'; then
+  ok "guard: bare-number branch fix-issue-2 (no m- token) refuses ambiguous pick, names both accepted forms"
+else
+  bad "guard: bare-number branch fix-issue-2" "rc=$rc err=$err27"
+fi
+
 # --- summary -----------------------------------------------------------------
 printf '\n%s: %d passed, %d failed\n' "$(basename "$0")" "$PASSED" "$FAILED"
 [ "$FAILED" = 0 ]

package/template/.forge/checks/tests/forge-jarvis-relay.test.sh

@@ -130,6 +130,36 @@ case "$out" in
   *) bad "catchup summary" "no while-you-were-away line: $out" ;;
 esac
 
+# --- 14-15. BARE BRANCH LOOSENING (issue #25): --list-logs glob against REAL git worktrees on
+#     bare m-<id>-slug branches (no forge/ prefix) — --list-logs only needs the notify-log
+#     PATH, no id derivation, so this pins the match extension alone (FORGE_JARVIS_REPO_ROOT
+#     points the glob at a throwaway fixture repo). --------------------------------------------
+GITROOT="$ROOT/git-fixture"; mkdir -p "$GITROOT/main"
+(
+  cd "$GITROOT/main" || exit 1
+  git init -q .
+  git config user.email t@t.com; git config user.name test
+  : > .gitkeep; git add .gitkeep; git commit -q -m init
+  git worktree add -q -b m-176-marcy-mcp "$GITROOT/bare-1" >/dev/null 2>&1
+  git worktree add -q -b fix-issue-2     "$GITROOT/guard-1" >/dev/null 2>&1
+) >/dev/null 2>&1
+
+out="$(FORGE_JARVIS_REPO_ROOT="$GITROOT/main" sh "$RELAY" --list-logs 2>/dev/null)"
+
+# 14. bare branch m-176-marcy-mcp emits its notify-log path (pings reach the phone)
+if printf '%s' "$out" | grep -q "$GITROOT/bare-1/.forge/runner-work/notify.log"; then
+  ok "bare branch m-176-marcy-mcp: --list-logs emits its notify-log path"
+else
+  bad "bare branch --list-logs path" "$out"
+fi
+
+# 15. GUARD: a bare-number branch (fix-issue-2, no m- token) emits NO log path
+if ! printf '%s' "$out" | grep -q 'guard-1'; then
+  ok "guard: bare-number branch fix-issue-2 (no m- token) emits no log path"
+else
+  bad "guard: bare-number branch fix-issue-2 (no m- token) emits no log path" "$out"
+fi
+
 # --- summary -----------------------------------------------------------------
 printf '\n%s: %d passed, %d failed\n' "$(basename "$0")" "$PASSED" "$FAILED"
 [ "$FAILED" = 0 ]

package/template/.forge/templates/project.yml

@@ -154,6 +154,12 @@ models:
 #                                    #   no flag (platform default). TRUST WARNING: bypassPermissions means
 #                                    #   phone-spawned sessions act without prompts — opt in only where the
 #                                    #   phone lane carries the same trust as an attended terminal.
+#   dev_lane_cmd: ""                 # OPTIONAL. Shell command Jarvis runs (in the slice worktree) to spin up
+#                                    #   the LOCAL dev server for the operator's UAT after a `done` ping — the
+#                                    #   UAT-gated dispatch seam (m-48). Stack-specific: Forge owns no dev-server
+#                                    #   concept, so the project supplies the "how" (e.g. its `dev:all` lane).
+#                                    #   Absent → Jarvis tells the operator to start the lane manually (no failure).
+#                                    #   The PR opens only AFTER the operator's explicit in-session UAT — never here.
 
 # attribution:                       # OPT-IN Driven-by attribution (hold-waiver patch) — default OFF.
 #   driven_by: true                  # When true, the merge-floor check-quality lint

package/template/.forge/templates/state/desire-path.yml

@@ -1,46 +1,16 @@
-# Forge Desire-Path Observation — APPEND-ONLY
-#
-# One observation = one new file under state/desire-paths/. NEVER edit an
-# existing observation in place and NEVER keep a mutable occurrence counter —
-# that is what used to make state/index.yml conflict across worktrees.
-#
-# Filename: state/desire-paths/{YYYY-MM-DD}-{type}-{milestone}-{slug}.yml
-#   e.g.   state/desire-paths/2026-06-10-recurring_friction-m7-uncommitted-state.yml
-# The date+type+milestone+slug make the name unique, so concurrent agents in
-# different worktrees only ever ADD files — git never has to merge content.
-#
-# Occurrence counts are DERIVED: the `forge` skill globs this directory and
-# groups by (type + normalized note). A pattern appearing in 3+ files is a
-# candidate for framework evolution, surfaced at `forge` boot — the single
-# review owner (see ADR-012).
-#
-# SCOPE decides where a 3+ pattern's fix lands:
-#   project   = fix targets user-owned files (constitution.md, design-system.md,
-#               context.md). Stays in-project.
-#   framework = fix targets Forge's own skills/templates. Eligible for UPSTREAM
-#               transport — forge review writes a portable block to
-#               state/desire-paths/upstream/ and (when gh + forge.upstream_repo
-#               are available) offers a GH issue against the Forge repo.
-# Lazy migration: a file with no `scope` is read as `project`.
+# Forge Desire-Path Observation — one file per observation
+# Copy to .forge/state/desire-paths/{YYYY-MM-DD}-{type}-{milestone}-{slug}.yml
+# Append-only: never edit an existing observation file; recurrence is derived
+# by globbing (type + normalized note), not a counter. See FORGE.md § state/desire-paths/.
 
-type: ""                 # deviation_pattern | tier_override | skipped_step |
-                         # recurring_friction | agent_struggle | user_correction
-scope: ""                # project | framework — set AT CAPTURE by the writing
-                         # skill, from the file its suggested fix targets.
-                         # Absent ⇒ project (lazy migration).
-suggestion_target: ""    # optional: the skill/file the fix would touch
-                         # (e.g. "planning/executing skills", "constitution.md")
-milestone: ""            # e.g. "m7" (or "global" if not milestone-scoped)
-skill: ""                # skill that observed it (executing, planning, verifying, ...)
-first_seen: null         # ISO 8601 date this observation was recorded
-related_files: []        # source files involved, if any
-note: ""                 # one-line description — the grouping key for occurrence counts
-
-# Optional type-specific detail (fill what applies to `type`):
-detail:
-  detected: ""           # tier_override: what Forge detected
-  overridden_to: ""      # tier_override: what the user chose
-  rule: null             # deviation_pattern: 1 | 2 | 3
-  correction: ""         # user_correction: the repeated correction
-  failure_pattern: ""    # agent_struggle: how the task fails
-  step: ""               # skipped_step: the step skipped
+type: ""                              # recurring_friction | agent_struggle | user_correction (etc. — free-form, grouped by exact string)
+date: ""                              # ISO 8601 date the observation was made, e.g. "2026-07-23"
+milestone: ""                         # milestone id, or a short label for non-milestone work (e.g. "quick-task (...)")
+scope: project                        # project | framework — absent ⇒ project (this repo only; framework ⇒ upstream-eligible per ADR-012)
+suggestion_target: ""                 # the file/skill this observation would change if acted on
+note: >
+  What was observed — concrete enough that a future review can judge recurrence
+  (same type + normalized note) without re-reading the original session.
+suggestion: >
+  What to do about it, if a fix is proposed. Omit this key when the observation
+  has no concrete suggestion yet.