forge-orkes 0.50.1 → 0.55.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-orkes",
-  "version": "0.50.1",
+  "version": "0.55.0",
   "description": "Set up the Forge meta-prompting framework for Claude Code in your project",
   "bin": {
     "create-forge": "./bin/create-forge.js"

package/template/.claude/hooks/forge-reserve.sh

@@ -51,8 +51,10 @@ case "$kind" in
   def) prefix="DEF" ;;
   fr)  prefix="FR" ;;
   nfr) prefix="NFR" ;;
-  "") printf 'forge-reserve: missing kind (adr|def|fr|nfr)\n' >&2; exit 2 ;;
-  *) printf 'forge-reserve: unknown kind: %s (expected adr|def|fr|nfr)\n' "$kind" >&2; exit 2 ;;
+  milestone) prefix="M" ;;      # ADR-023 — unpadded (M-26); ids used bare across the framework
+  refactor)  prefix="R" ;;      # ADR-023 — zero-padded R0NN, matching the backlog format
+  "") printf 'forge-reserve: missing kind (adr|def|fr|nfr|milestone|refactor)\n' >&2; exit 2 ;;
+  *) printf 'forge-reserve: unknown kind: %s (expected adr|def|fr|nfr|milestone|refactor)\n' "$kind" >&2; exit 2 ;;
 esac
 [ -n "$milestone" ] || { printf 'forge-reserve: --milestone <id> is required\n' >&2; exit 2; }
 
@@ -99,33 +101,67 @@ trap 'rmdir "$lock" 2>/dev/null || true' EXIT INT TERM
 # Everything numeric goes through awk (n+0) so leading-zero ids like 021 are read
 # as decimal 21, never octal — no shell $(( )) octal trap.
 
-# (a) ledger — same-machine siblings, INCLUDING uncommitted (the ADR-016-blind input)
+# (a) ledger — same-machine siblings, INCLUDING uncommitted (the ADR-016-blind input).
+# Extract the trailing number by stripping non-digits, NOT by split on "-": refactor
+# ids (R100) carry no hyphen (ADR-023), so a hyphen-split would read them as 0 and
+# reallocate a live id. gsub handles ADR-014, M-26, R100, FR-023 uniformly.
 ledger_max=0
 if [ -f "$ledger" ]; then
   ledger_max="$(awk -F'\t' -v k="$kind" \
-    '$1==k { split($2,a,"-"); n=a[2]+0; if(n>m)m=n } END{print m+0}' "$ledger")"
+    '$1==k { x=$2; gsub(/[^0-9]/,"",x); n=x+0; if(n>m)m=n } END{print m+0}' "$ledger")"
 fi
 
 # (b) in-tree — landed ids in THIS worktree. Exact-prefix match in awk ($1==p) so
-# FR does not swallow NFR (FR is a substring of NFR).
-if [ "$kind" = "adr" ]; then
-  intree_max="$(ls "$top/docs/decisions" 2>/dev/null \
-    | awk -F- '/^ADR-[0-9]/ { n=$2+0; if(n>m)m=n } END{print m+0}')"
-else
-  intree_max="$(grep -rhoE '[A-Z]+-[0-9]+' "$top/.forge/requirements/" 2>/dev/null \
-    | awk -F- -v p="$prefix" '$1==p { n=$2+0; if(n>m)m=n } END{print m+0}')"
-fi
+# FR does not swallow NFR (FR is a substring of NFR). milestone + refactor (ADR-023)
+# each scan BOTH live and archive locations so a burned id is never reallocated.
+case "$kind" in
+  adr)
+    intree_max="$(ls "$top/docs/decisions" 2>/dev/null \
+      | awk -F- '/^ADR-[0-9]/ { n=$2+0; if(n>m)m=n } END{print m+0}')"
+    ;;
+  milestone)
+    # live state/milestone-<N>.yml  ∪  archived .forge/archive/milestone-<N>/
+    intree_max="$( { ls "$top/.forge/state"/milestone-*.yml 2>/dev/null; \
+                     ls -d "$top/.forge/archive"/milestone-*/ 2>/dev/null; } \
+      | grep -oE 'milestone-[0-9]+' \
+      | awk -F- '{ n=$2+0; if(n>m)m=n } END{print m+0}')"
+    ;;
+  refactor)
+    # live refactor-backlog.yml  ∪  refactor-backlog-archive.yml
+    intree_max="$(grep -hoE 'R[0-9]+' \
+        "$top/.forge/refactor-backlog.yml" \
+        "$top/.forge/refactor-backlog-archive.yml" 2>/dev/null \
+      | awk '{ n=substr($0,2)+0; if(n>m)m=n } END{print m+0}')"
+    ;;
+  *)
+    intree_max="$(grep -rhoE '[A-Z]+-[0-9]+' "$top/.forge/requirements/" 2>/dev/null \
+      | awk -F- -v p="$prefix" '$1==p { n=$2+0; if(n>m)m=n } END{print m+0}')"
+    ;;
+esac
 
 # (c) main:reservations.yml — cross-machine / cold-start floor (survives a
 # .git/forge wipe; carries another machine's MERGED reservations). Absent → 0.
+# Hyphen is OPTIONAL in the token ([A-Z]+-?[0-9]+): refactor ids (R100) carry none
+# (ADR-023), so requiring a hyphen would hide them and drop the floor to 0. Split the
+# alpha prefix from the digits in awk so R does not match e.g. FR (anchor ^prefix$).
 main_max="$(git show main:.forge/reservations.yml 2>/dev/null \
-  | grep -oE '[A-Z]+-[0-9]+' \
-  | awk -F- -v p="$prefix" '$1==p { n=$2+0; if(n>m)m=n } END{print m+0}')"
+  | grep -oE '[A-Z]+-?[0-9]+' \
+  | awk -v p="$prefix" '{ a=$0; sub(/[-0-9].*$/,"",a); d=$0; gsub(/[^0-9]/,"",d);
+                          if(a==p){ n=d+0; if(n>m)m=n } } END{print m+0}')"
 [ -n "$main_max" ] || main_max=0
 
 next="$(awk -v a="$ledger_max" -v b="$intree_max" -v c="$main_max" \
   'BEGIN{m=a; if(b>m)m=b; if(c>m)m=c; print m+1}')"
-id="$(printf '%s-%03d' "$prefix" "$next")"
+# Per-kind id format (ADR-023). The prefix-hyphen-paddednumber form (ADR-021's
+# ADR-014, FR-023) is NOT universal:
+#   milestone → M-26  : hyphen, UNPADDED — ids are used bare (milestone-26.yml, m-26)
+#   refactor  → R064  : NO hyphen, zero-padded 3-wide — matches the backlog convention
+#   adr/def/fr/nfr → ADR-014 : hyphen, zero-padded 3-wide (unchanged)
+case "$kind" in
+  milestone) id="$(printf '%s-%d' "$prefix" "$next")" ;;
+  refactor)  id="$(printf '%s%03d' "$prefix" "$next")" ;;
+  *)         id="$(printf '%s-%03d' "$prefix" "$next")" ;;
+esac
 
 # --- 6. dual-write (still under the lock) -----------------------------------
 now="$(date -u +%Y-%m-%dT%H:%M:%SZ)"

package/template/.claude/hooks/forge-slice-notify.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env sh
+# forge-slice-notify.sh <type> <payload> — the DEFAULT notify channel for
+# forge-slice-runner.sh. Delivers a §8 ping to the operator's phone via the
+# PushNotification agent tool through a thin headless `claude -p` micro-call, and
+# ALSO appends the ping to a local log so a suppressed/undelivered push is never
+# silently lost.
+#
+# The runner calls this as `${FORGE_SLICE_NOTIFY:-forge-slice-notify.sh} <type>
+# <payload>`; the whole channel is swappable via that env (tests use notify-stub.sh).
+#
+#   type     one of the §8 surface: ambiguity | irreversible | fork | budget | done
+#            (plus `halt`, the failure slice-end). The runner has already validated
+#            the type before calling; this script just delivers it.
+#   payload  the ping body. For a design `fork` it is a PATH to a sketch/mockup the
+#            operator LOOKS AT (§8) — passed through so the notification names the file.
+#
+# BEST-EFFORT by contract: this must exit 0 even when delivery is impossible (no
+# `claude` on PATH, no CLAUDE_CODE_OAUTH_TOKEN, the tool suppressed while the
+# operator is active). The runner treats a non-zero exit as a best-effort miss, not
+# a slice failure — so never hard-fail here.
+#
+# ── DEFERRED phone-delivery caveat (context.md M29, 2026-07-15) ───────────────
+# A PushNotification SENT from a DETACHED one-shot `claude -p` returns success but
+# may NOT buzz the phone — this is the Claude-app Remote-Control DEVICE-pairing
+# side (an ephemeral unpaired session), not this code. It is a known open item,
+# fixed later. The channel is swappable precisely so that fix can land without
+# touching the runner. Escalate only if delivery turns out to need Remote-Control
+# state a detached runner cannot satisfy.
+# ──────────────────────────────────────────────────────────────────────────────
+set -eu
+
+TYPE="${1:-note}"
+PAYLOAD="${2:-}"
+
+# 1) Durable local record — always, before any delivery attempt. Never lost even
+#    if the phone channel is down. Default location travels with the slice.
+LOG="${FORGE_SLICE_NOTIFY_LOG:-${FORGE_SLICE_WORK_DIR:-.}/notify.log}"
+mkdir -p "$(dirname "$LOG")" 2>/dev/null || true
+printf '%s\t%s\t%s\n' "$(date -u '+%Y-%m-%dT%H:%M:%SZ' 2>/dev/null || echo now)" "$TYPE" "$PAYLOAD" >> "$LOG" 2>/dev/null || true
+
+# 2) Best-effort phone delivery via PushNotification. Skip cleanly if headless
+#    `claude` or its credential is absent (dev boxes, CI) — that is a miss, not a
+#    failure. A design fork's payload is a path, so name it in the body.
+LAUNCHER="${FORGE_SLICE_NOTIFY_LAUNCHER:-claude}"
+if command -v "$LAUNCHER" >/dev/null 2>&1 \
+   && { [ -n "${CLAUDE_CODE_OAUTH_TOKEN:-}" ] || [ -n "${ANTHROPIC_API_KEY:-}" ]; }; then
+  _title="Forge slice: ${TYPE}"
+  case "$TYPE" in
+    fork) _body="Design fork — review the sketch: ${PAYLOAD}" ;;
+    done) _body="Slice complete. ${PAYLOAD}" ;;
+    *)    _body="${PAYLOAD}" ;;
+  esac
+  # One-shot: ask the headless agent to fire PushNotification with the title/body.
+  printf 'Send a push notification with title "%s" and body "%s". Use only the PushNotification tool; do nothing else.\n' \
+    "$_title" "$_body" \
+  | "$LAUNCHER" -p \
+      --allowedTools PushNotification \
+      --permission-mode bypassPermissions \
+      --output-format json \
+      >/dev/null 2>&1 \
+    || printf 'forge-slice-notify: push delivery best-effort miss for %s (logged locally at %s)\n' "$TYPE" "$LOG" >&2
+else
+  printf 'forge-slice-notify: no headless claude/credential — %s ping logged locally only (%s)\n' "$TYPE" "$LOG" >&2
+fi
+
+exit 0