instar 1.3.592 → 1.3.594

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "instar",
-  "version": "1.3.592",
+  "version": "1.3.594",
   "description": "Coherence infrastructure for self-evolving AI agents — on the Claude Code or Codex subscription you already have.",
   "type": "module",
   "main": "dist/index.js",

package/scripts/safe-merge.mjs

@@ -137,7 +137,7 @@ export function capabilities() {
       'strict-argv', 'repo-param', 'json-checks', 'head-pinning',
       'required-contexts-cross-check', 'producer-binding', 'floor',
       'reviews-required-refusal', 'classified-exits', 'delete-branch', 'deadline-ms',
-      'native-auto-merge',
+      'native-auto-merge', 'auto-arm-unavailable-detection',
     ],
     exitCodes: { merged: 0, refused: 1, usageOrError: 2, alreadyMerged: 3, closed: 4, autoMergeArmed: 5 },
   };
@@ -236,6 +236,23 @@ export function classifyMergeFailure(stderrText, status, signal) {
   return 'error:merge-command-failed';
 }
 
+/**
+ * The auto-merge-disabled discriminator (mergerunner-auto-arm-handoff §
+ * "auto-merge-unavailable — terminal-non-ladder"). `classifyMergeFailure`
+ * collapses BOTH "auto-merge is OFF on the repo" (a PERMANENT condition) and a
+ * generic transient gh failure into `error:merge-command-failed`. The
+ * orchestrator must be able to tell those apart so it does not burn three
+ * pointless ladder attempts on a repo setting that will never flip on its own.
+ * On the --auto refusal path ONLY, we match gh's stderr against the
+ * auto-merge-disabled signature; on a match the result slug becomes the DISTINCT
+ * `refused:auto-arm-unavailable` (the orchestrator keys terminal-non-ladder on
+ * exactly this slug). A generic gh error keeps `refused:auto-arm-error:*`.
+ */
+export function isAutoMergeUnavailable(stderrText) {
+  const text = String(stderrText ?? '');
+  return /auto.?merge.*(not\s*(allowed|enabled))|allow\s*auto-?merge/i.test(text);
+}
+
 // ---------------------------------------------------------------------------
 // gh invocation layer (sync is fine — this is a standalone CLI, not server code)
 // ---------------------------------------------------------------------------
@@ -406,6 +423,15 @@ async function main() {
       const cls = classifyMergeFailure(a.stderr, a.status, a.signal);
       if (cls === 'already-merged') { result({ result: 'already-merged', pr: Number(pr) }); process.exit(3); }
       if (cls === 'closed') { result({ result: 'closed', pr: Number(pr) }); process.exit(4); }
+      // Distinguish "auto-merge is disabled on the repo" (a PERMANENT condition →
+      // terminal-non-ladder for the orchestrator) from a generic transient gh
+      // failure. The discriminator is a REAL stderr-signature match, not the
+      // human-only console.error hint below.
+      if (isAutoMergeUnavailable(a.stderr)) {
+        result({ result: 'refused:auto-arm-unavailable', raw: cls });
+        console.error('safe-merge: could not arm auto-merge — "Allow auto-merge" appears DISABLED on the repo settings. Enable it, or run with --admin.');
+        process.exit(1);
+      }
       result({ result: `refused:auto-arm-${cls}`, raw: cls });
       console.error(`safe-merge: could not arm auto-merge (${cls}). Is "Allow auto-merge" enabled on the repo settings?`);
       process.exit(1);

package/src/data/builtin-manifest.json

@@ -1,8 +1,8 @@
 {
   "$schema": "./builtin-manifest.schema.json",
   "schemaVersion": 1,
-  "generatedAt": "2026-06-16T08:21:53.499Z",
-  "instarVersion": "1.3.592",
+  "generatedAt": "2026-06-16T09:33:12.134Z",
+  "instarVersion": "1.3.594",
   "entryCount": 201,
   "entries": {
     "hook:session-start": {
@@ -11,7 +11,7 @@
       "domain": "identity",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/session-start.sh",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:dangerous-command-guard": {
@@ -20,7 +20,7 @@
       "domain": "safety",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/dangerous-command-guard.sh",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:grounding-before-messaging": {
@@ -29,7 +29,7 @@
       "domain": "safety",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/grounding-before-messaging.sh",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:compaction-recovery": {
@@ -38,7 +38,7 @@
       "domain": "identity",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/compaction-recovery.sh",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:external-operation-gate": {
@@ -47,7 +47,7 @@
       "domain": "safety",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/external-operation-gate.js",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:deferral-detector": {
@@ -56,7 +56,7 @@
       "domain": "safety",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/deferral-detector.js",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:self-stop-guard": {
@@ -65,7 +65,7 @@
       "domain": "coherence",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/self-stop-guard.js",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:post-action-reflection": {
@@ -74,7 +74,7 @@
       "domain": "evolution",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/post-action-reflection.js",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:external-communication-guard": {
@@ -83,7 +83,7 @@
       "domain": "safety",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/external-communication-guard.js",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:scope-coherence-collector": {
@@ -92,7 +92,7 @@
       "domain": "coherence",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/scope-coherence-collector.js",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:scope-coherence-checkpoint": {
@@ -101,7 +101,7 @@
       "domain": "coherence",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/scope-coherence-checkpoint.js",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:free-text-guard": {
@@ -110,7 +110,7 @@
       "domain": "safety",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/free-text-guard.sh",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:claim-intercept": {
@@ -119,7 +119,7 @@
       "domain": "coherence",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/claim-intercept.js",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:claim-intercept-response": {
@@ -128,7 +128,7 @@
       "domain": "coherence",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/claim-intercept-response.js",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:stop-gate-router": {
@@ -137,7 +137,7 @@
       "domain": "safety",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/stop-gate-router.js",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "hook:auto-approve-permissions": {
@@ -146,7 +146,7 @@
       "domain": "safety",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
       "installedPath": ".instar/hooks/instar/auto-approve-permissions.js",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "job:health-check": {
@@ -418,7 +418,7 @@
       "type": "route-group",
       "domain": "monitoring",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:agents": {
@@ -426,7 +426,7 @@
       "type": "route-group",
       "domain": "sessions",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:backups": {
@@ -434,7 +434,7 @@
       "type": "route-group",
       "domain": "operations",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:git": {
@@ -442,7 +442,7 @@
       "type": "route-group",
       "domain": "coordination",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:memory": {
@@ -450,7 +450,7 @@
       "type": "route-group",
       "domain": "memory",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:semantic": {
@@ -458,7 +458,7 @@
       "type": "route-group",
       "domain": "memory",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:status": {
@@ -466,7 +466,7 @@
       "type": "route-group",
       "domain": "monitoring",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:capabilities": {
@@ -474,7 +474,7 @@
       "type": "route-group",
       "domain": "mapping",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:project-map": {
@@ -482,7 +482,7 @@
       "type": "route-group",
       "domain": "mapping",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:coherence": {
@@ -490,7 +490,7 @@
       "type": "route-group",
       "domain": "coherence",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:topic-bindings": {
@@ -498,7 +498,7 @@
       "type": "route-group",
       "domain": "sessions",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:context": {
@@ -506,7 +506,7 @@
       "type": "route-group",
       "domain": "context",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:scope-coherence": {
@@ -514,7 +514,7 @@
       "type": "route-group",
       "domain": "coherence",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:canonical-state": {
@@ -522,7 +522,7 @@
       "type": "route-group",
       "domain": "state",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:ci": {
@@ -530,7 +530,7 @@
       "type": "route-group",
       "domain": "monitoring",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:sessions": {
@@ -538,7 +538,7 @@
       "type": "route-group",
       "domain": "sessions",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:jobs": {
@@ -546,7 +546,7 @@
       "type": "route-group",
       "domain": "scheduling",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:skip-ledger": {
@@ -554,7 +554,7 @@
       "type": "route-group",
       "domain": "scheduling",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:telegram": {
@@ -562,7 +562,7 @@
       "type": "route-group",
       "domain": "communication",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:attention": {
@@ -570,7 +570,7 @@
       "type": "route-group",
       "domain": "communication",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:relationships": {
@@ -578,7 +578,7 @@
       "type": "route-group",
       "domain": "relationships",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:feedback": {
@@ -586,7 +586,7 @@
       "type": "route-group",
       "domain": "feedback",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:updates": {
@@ -594,7 +594,7 @@
       "type": "route-group",
       "domain": "updates",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:dispatches": {
@@ -602,7 +602,7 @@
       "type": "route-group",
       "domain": "dispatches",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:quota": {
@@ -610,7 +610,7 @@
       "type": "route-group",
       "domain": "monitoring",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:publishing": {
@@ -618,7 +618,7 @@
       "type": "route-group",
       "domain": "publishing",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:private-views": {
@@ -626,7 +626,7 @@
       "type": "route-group",
       "domain": "publishing",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:tunnel": {
@@ -634,7 +634,7 @@
       "type": "route-group",
       "domain": "networking",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:events": {
@@ -642,7 +642,7 @@
       "type": "route-group",
       "domain": "networking",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:evolution": {
@@ -650,7 +650,7 @@
       "type": "route-group",
       "domain": "evolution",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:watchdog": {
@@ -658,7 +658,7 @@
       "type": "route-group",
       "domain": "monitoring",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:topic-memory": {
@@ -666,7 +666,7 @@
       "type": "route-group",
       "domain": "memory",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:state-sync": {
@@ -674,7 +674,7 @@
       "type": "route-group",
       "domain": "coordination",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:intent": {
@@ -682,7 +682,7 @@
       "type": "route-group",
       "domain": "intent",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:triage": {
@@ -690,7 +690,7 @@
       "type": "route-group",
       "domain": "safety",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:operations": {
@@ -698,7 +698,7 @@
       "type": "route-group",
       "domain": "safety",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:sentinel": {
@@ -706,7 +706,7 @@
       "type": "route-group",
       "domain": "safety",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:trust": {
@@ -714,7 +714,7 @@
       "type": "route-group",
       "domain": "safety",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:monitoring": {
@@ -722,7 +722,7 @@
       "type": "route-group",
       "domain": "monitoring",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:commitments": {
@@ -730,7 +730,7 @@
       "type": "route-group",
       "domain": "commitments",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:episodes": {
@@ -738,7 +738,7 @@
       "type": "route-group",
       "domain": "memory",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:messages": {
@@ -746,7 +746,7 @@
       "type": "route-group",
       "domain": "coordination",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:system-reviews": {
@@ -754,7 +754,7 @@
       "type": "route-group",
       "domain": "monitoring",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "route-group:machine-mesh": {
@@ -770,7 +770,7 @@
       "type": "route-group",
       "domain": "security",
       "sourcePath": "src/server/routes.ts",
-      "contentHash": "f7fa3615e3f3dd14f8f4e69d73abd4c2fdbd17a6a586d04dc608254aba812ad0",
+      "contentHash": "47cfed114e0ad5ad66b38af39c8f7fd9bce52b116252c4c65c7f0a2c03861368",
       "since": "2025-01-01"
     },
     "cli:init": {
@@ -1554,7 +1554,7 @@
       "type": "subsystem",
       "domain": "updates",
       "sourcePath": "src/core/PostUpdateMigrator.ts",
-      "contentHash": "d826941965df272821a0431080a6ace14aa1cefeab8253b3b1c4abe2324fd8f2",
+      "contentHash": "84e7bf6381fe52188f83ebad00a58673e905ed63aa99c5b9084192853e93db33",
       "since": "2025-01-01"
     },
     "subsystem:scheduler": {

package/upgrades/1.3.593.md

@@ -0,0 +1,28 @@
+# Upgrade Guide — vNEXT
+
+<!-- assembled-by: assemble-next-md -->
+<!-- bump: patch -->
+
+## What Changed
+
+The green-PR auto-merge watcher (the background machinery that merges an agent's own green, mergeable, non-held PRs without a human clicking merge) now **arms GitHub's native auto-merge and hands off**, instead of running a merge command and synchronously watching it land inside a time-boxed helper. Once armed, GitHub merges the PR itself the instant every required check passes; the watcher confirms the landed merge on a later reconciliation tick. This frees the watcher's single-work slot in seconds instead of holding it for up to 25 minutes, and it survives the watcher's own merge triggering a server restart (GitHub owns the merge, so a restart can't kill it).
+
+Because GitHub now owns an armed merge, the operator's stop controls were upgraded to actually reach in-flight merges: rollback, emergency-pause, pool-disarm, and an explicit per-PR HOLD now actively turn OFF auto-merge on each armed PR. A new honest signal flags the one accepted residual risk (a write-capable push landing between arm and merge could merge an un-vetted head — surfaced post-hoc, never silent). Ships dark (off fleet-wide; armed per dev agent; soaks in dry-run first).
+
+## What to Tell Your User
+
+If your agent runs the green-PR auto-merge watcher, it now hands each merge to GitHub's own auto-merge instead of babysitting it — so a server restart in the middle no longer leaves a merge in limbo, and the watcher frees up faster. One important behavior change for operators: once a merge is armed on GitHub, simply pausing the watcher or adding a hold label no longer stops it — so the stop controls now actively turn the armed auto-merge off for you. The feature ships off by default and soaks in a no-op dry-run mode first, so nothing changes for you unless you explicitly run this watcher.
+
+## Summary of New Capabilities
+
+- The auto-merge watcher arms GitHub native auto-merge and hands off, surviving a restart-mid-merge and freeing its work slot in seconds.
+- Operator stop controls (rollback, emergency-pause, per-PR hold) now actively disarm in-flight armed merges.
+- An armed-but-stuck PR keeps being watched and re-surfaces rather than being silently dropped, and a merge at an unexpected commit is flagged.
+
+## Evidence
+
+- `src/monitoring/MergeRunner.ts`, `GreenPrAutoMerger.ts`, `greenPrLogic.ts`, `greenPrAutomergeWiring.ts` — the arm path, the new armed/armed-overdue states, the reconciliation tick, the disarm reach, the config threading.
+- `scripts/safe-merge.mjs` — a distinct refused-auto-arm-unavailable result so the watcher can tell "repo setting off" from a transient failure.
+- `src/server/routes.ts`, `src/core/PostUpdateMigrator.ts`, `src/core/types.ts`, `src/commands/server.ts` — observability, the content-sniff CLAUDE.md migration for existing agents, config defaults, wiring.
+- 302 tests across 10 suites green (unit + integration + wiring-integrity + migration); tsc clean; full lint clean (dark-gate, guard-manifest, capabilities-discoverability).
+- Spec `docs/specs/mergerunner-auto-arm-handoff.md` — CONVERGED over 3 review rounds (6 internal lenses + conformance gate each).