forge-orkes 0.72.2 → 0.73.1

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/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.