sortie-dogs 0.9.6 → 0.9.7

package/README.md

@@ -24,7 +24,7 @@ Requirements: Node.js 22.6 or newer, npm, and OpenCode.
 
 Guides: [日本語](docs/guide-ja.md) · [简体中文](docs/guide-zh-CN.md) · [CLI testing](docs/cli-testing.md)
 
-Release: [v0.9.6](https://github.com/zufall-upon/Sortie-dogs/releases/tag/v0.9.6)
+Release: [v0.9.7](https://github.com/zufall-upon/Sortie-dogs/releases/tag/v0.9.7)
 
 ## Quick start
 
@@ -417,7 +417,12 @@ older runtime files, and records the installed version in
 untouched and initialization stops safely. User-owned configuration—including
 `.opencode/sortie-dogs.json`—and standard OpenCode files are preserved.
 
-## Safe manual removal
+## Maintainer releases
+
+The [release batch guide](docs/release-batch.md) covers fixed-tarball CLI verification,
+global application, resumable GitHub publication, and manual npm publication checks.
+
+## Safe manual removal
 
 There is no supported Sortie-dogs uninstall command. Remove the npm dependency
 separately, then follow the [safe manual removal guide](docs/uninstall.md) to

package/dist/plugin/continuation.js

@@ -12,6 +12,7 @@
  * identity fails closed into "no automatic continuation" rather than into a guess.
  */
 import { openCodeModel } from "./model-routing-hook.js";
+import { terminalRunOutcome } from "./run-metrics.js";
 /** Plugin tool name the coordinator asset names as the direct continuation capability. */
 export const CONTINUATION_CAPABILITY = "sortie_compact_and_continue";
 /** Fallback marker, used only when the direct capability is unavailable. */
@@ -445,8 +446,8 @@ export function createContinuationHooks(client, directory, policySource, timings
         return firstCheckpoint(text)?.status;
     }
     function terminalCheckpoint(text) {
-        const status = checkpointStatus(text);
-        return status === "DONE" || status === "NEED_DECISION" || (status === "BLOCKED" && trueBlockerReport(text));
+        // Use the same terminal vocabulary as the receipt/debrief path, including INTERRUPTED.
+        return terminalRunOutcome(text) !== undefined;
     }
     function trueBlockerReport(text) {
         const checkpoint = firstCheckpoint(text);

package/dist/plugin/index.js

@@ -1130,6 +1130,7 @@ export const SortieDogsPlugin = async (input, options) => {
     const goalLedgerFiles = new Map();
     const goalLedgerDirectories = new Set();
     const goalReservations = new Map();
+    const goalReservationRecoveries = new Map();
     const hostGoalExecutions = new Map();
     const goalValidationDefects = new Set();
     const goalDeclarationAuthority = new Map();
@@ -1435,7 +1436,69 @@ export const SortieDogsPlugin = async (input, options) => {
             startedAt: observedStartedAt, endedAt, exitCode: exitCode ?? null,
             ...(outcome === undefined ? {} : { outcome }), ...(immutableRef === undefined ? {} : { immutableRef }), fresh });
     }
+    async function recoverCompletedGoalReservations(sessionID) {
+        const root = goalRoot(sessionID);
+        const active = goalReservationRecoveries.get(root);
+        if (active !== undefined)
+            return active;
+        const recovery = (async () => {
+            const ledger = await goalLedger(sessionID);
+            const state = (await ledger.readGoal()).state;
+            const pending = state.outstanding_reservations.filter(reservation => ![...goalReservations.values()].some(live => live.reservationID === reservation.reservation_id));
+            if (pending.length === 0 || state.goal_id === null || input.client?.session?.messages === undefined)
+                return;
+            const messages = input.client.session.messages;
+            const response = await messages.call(input.client.session, { path: { id: root },
+                query: { directory: input.directory, limit: 1000 } }).catch(() => undefined);
+            const data = isRecord(response) ? response.data : undefined;
+            if (!Array.isArray(data))
+                return;
+            for (const reservation of pending) {
+                const matches = [];
+                for (const message of data.slice(-1000)) {
+                    if (!isRecord(message) || !isRecord(message.info) || message.info.role !== "assistant" ||
+                        message.info.sessionID !== root || !Array.isArray(message.parts))
+                        continue;
+                    for (const part of message.parts) {
+                        if (!isRecord(part) || part.type !== "tool" || part.tool !== "task" || typeof part.callID !== "string" ||
+                            !isRecord(part.state) || !["completed", "error"].includes(String(part.state.status)) ||
+                            !isRecord(part.state.input) || typeof part.state.input.prompt !== "string" ||
+                            !["dog-worker", "dog-luna-worker"].includes(String(part.state.input.subagent_type)))
+                            continue;
+                        const unitID = handoffValue(handoffEntries(part.state.input.prompt), ["task_id"]) ?? part.callID;
+                        if (unitID !== reservation.unit_id || goalFingerprint({ goal_id: state.goal_id, unit_id: unitID,
+                            call_id: part.callID }) !== reservation.reservation_id)
+                            continue;
+                        const time = isRecord(part.state.time) ? part.state.time : undefined;
+                        const elapsed = typeof time?.start === "number" && typeof time.end === "number" &&
+                            Number.isFinite(time.start) && Number.isFinite(time.end) && time.end >= time.start ? time.end - time.start : null;
+                        matches.push({ callID: part.callID, status: String(part.state.status), elapsed });
+                    }
+                }
+                if (matches.length !== 1)
+                    continue;
+                const match = matches[0];
+                // Reconcile lifecycle accounting only. Lost in-memory validation bindings cannot be
+                // reconstructed from worker prose and must not manufacture acceptance evidence.
+                await ledger.appendGoal({ kind: "unit.settled", at: new Date().toISOString(),
+                    reservation_id: reservation.reservation_id,
+                    receipt_id: goalFingerprint({ recovered_host_task: match.callID, reservation: reservation.reservation_id }),
+                    goal_id: state.goal_id, unit_id: reservation.unit_id,
+                    disposition: match.status === "completed" ? "succeeded" : "cancelled", result_class: "process-defect",
+                    progress_fingerprint: null, evidence: [], elapsed_ms: match.elapsed, cost_usd: null });
+                appLogInfo("goal.reservation-recovered", root, { unitID: reservation.unit_id, hostStatus: match.status });
+            }
+        })();
+        goalReservationRecoveries.set(root, recovery);
+        try {
+            await recovery;
+        }
+        finally {
+            goalReservationRecoveries.delete(root);
+        }
+    }
     async function acceptRealGoalTurn(sessionID, messageID, selectedAgent, parts) {
+        await recoverCompletedGoalReservations(sessionID);
         const ledger = await goalLedger(sessionID);
         const state = (await ledger.readGoal()).state;
         if (state.latest_user_message_id === messageID)
@@ -1824,6 +1887,17 @@ export const SortieDogsPlugin = async (input, options) => {
         let state = await bindGoalDeclaration(sessionID, prompt) ?? (await ledger.readGoal()).state;
         if (state.goal_id === null)
             return; // Legacy already-authorized roots may settle without inventing authority.
+        const budgetDenied = (dimension) => new Error("SORTIE_GOAL_CONTROL_DENIED: stop_budget\n" + JSON.stringify({
+            goal_id: state.goal_id, revision: state.revision, exhausted_dimension: dimension,
+            budget: state.budget, consumed_units: state.consumed_units,
+            reserved_units: state.outstanding_reservations.length,
+            remaining_units: state.budget === null ? null : Math.max(0, state.budget.max_units - state.consumed_units - state.outstanding_reservations.length),
+            consumed_time_ms: state.consumed_time_ms, consumed_cost_usd: state.consumed_cost_usd,
+            validation_consumed: state.validation_budget.consumed, validation_limit: state.validation_budget.limit,
+            remedy: "goal_budget_units is the cumulative limit across this goal's revisions, not an added allowance. " +
+                "Use these host counters when requesting an explicit budget revision. Renaming task_id or contracts does not create a new goal. " +
+                "If the user holds or stops, report status: INTERRUPTED and do not redispatch."
+        }));
         if (state.phase === "terminal" || state.receipt !== null) {
             throw new Error("SORTIE_GOAL_CONTROL_DENIED: terminal");
         }
@@ -1837,17 +1911,17 @@ export const SortieDogsPlugin = async (input, options) => {
         }
         if (state.budget !== null && state.consumed_units + state.outstanding_reservations.length >= state.budget.max_units) {
             await terminalGoal(sessionID, "stop_budget", "stopped");
-            throw new Error("SORTIE_GOAL_CONTROL_DENIED: stop_budget");
+            throw budgetDenied("units");
         }
         if (state.budget !== null && state.budget.time_ms !== null &&
             (state.consumed_time_ms === null || state.consumed_time_ms >= state.budget.time_ms)) {
             await terminalGoal(sessionID, "stop_budget", "stopped");
-            throw new Error("SORTIE_GOAL_CONTROL_DENIED: stop_budget");
+            throw budgetDenied("time_ms");
         }
         if (state.budget !== null && state.budget.cost_usd !== null &&
             (state.consumed_cost_usd === null || state.consumed_cost_usd >= state.budget.cost_usd)) {
             await terminalGoal(sessionID, "stop_budget", "stopped");
-            throw new Error("SORTIE_GOAL_CONTROL_DENIED: stop_budget");
+            throw budgetDenied("cost_usd");
         }
         if (state.goal_id === null)
             return;

package/package.json

@@ -1,62 +1,62 @@
-{
-  "name": "sortie-dogs",
-  "version": "0.9.6",
+{
+  "name": "sortie-dogs",
+  "version": "0.9.7",
   "description": "Bounded agent harness and validated orchestration loop plugin for OpenCode",
-  "keywords": [
-    "opencode",
-    "opencode-plugin",
-    "ai-orchestration",
+  "keywords": [
+    "opencode",
+    "opencode-plugin",
+    "ai-orchestration",
     "multi-agent",
     "agent-harness",
     "harness-engineering",
     "coding-agent",
     "agentic-coding"
-  ],
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/zufall-upon/Sortie-dogs.git"
-  },
-  "bugs": {
-    "url": "https://github.com/zufall-upon/Sortie-dogs/issues"
-  },
-  "homepage": "https://github.com/zufall-upon/Sortie-dogs#readme",
-  "publishConfig": {
-    "access": "public"
-  },
-  "type": "module",
-  "engines": {
-    "node": ">=22.6.0"
-  },
-  "files": [
-    "dist"
-  ],
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
-    },
-    "./plugin": {
-      "types": "./dist/plugin/opencode.d.ts",
-      "import": "./dist/plugin/opencode.js"
-    },
-    "./server": {
-      "types": "./dist/plugin/opencode.d.ts",
-      "import": "./dist/plugin/opencode.js"
-    },
-    "./assets": {
-      "types": "./dist/runtime-assets.d.ts",
-      "import": "./dist/runtime-assets.js"
-    }
-  },
-  "bin": {
-    "sortie-dogs": "dist/cli/main.js"
+  ],
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zufall-upon/Sortie-dogs.git"
+  },
+  "bugs": {
+    "url": "https://github.com/zufall-upon/Sortie-dogs/issues"
+  },
+  "homepage": "https://github.com/zufall-upon/Sortie-dogs#readme",
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "module",
+  "engines": {
+    "node": ">=22.6.0"
+  },
+  "files": [
+    "dist"
+  ],
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./plugin": {
+      "types": "./dist/plugin/opencode.d.ts",
+      "import": "./dist/plugin/opencode.js"
+    },
+    "./server": {
+      "types": "./dist/plugin/opencode.d.ts",
+      "import": "./dist/plugin/opencode.js"
+    },
+    "./assets": {
+      "types": "./dist/runtime-assets.d.ts",
+      "import": "./dist/runtime-assets.js"
+    }
+  },
+  "bin": {
+    "sortie-dogs": "dist/cli/main.js"
   },
   "scripts": {
     "prebuild": "node --input-type=module --eval \"import { rmSync } from 'node:fs'; rmSync('dist', { recursive: true, force: true });\"",
     "build": "tsc -p tsconfig.json",
-    "postbuild": "node --input-type=module --eval \"import fs from 'node:fs'; const path = 'dist/cli/main.js'; const source = fs.readFileSync(path, 'utf8'); if (!source.startsWith('#!')) fs.writeFileSync(path, '#!/usr/bin/env node\\n' + source); if (process.platform !== 'win32') fs.chmodSync(path, 0o755);\"",
-    "prepack": "npm run build",
+    "postbuild": "node --input-type=module --eval \"import fs from 'node:fs'; const path = 'dist/cli/main.js'; const source = fs.readFileSync(path, 'utf8'); if (!source.startsWith('#!')) fs.writeFileSync(path, '#!/usr/bin/env node\\n' + source); if (process.platform !== 'win32') fs.chmodSync(path, 0o755);\"",
+    "prepack": "npm run build",
     "pretest": "npm run build",
     "test": "node --experimental-strip-types --import ./test/setup.ts --test \"test/plugin.test.ts\" \"test/continuation.test.ts\" \"test/fast-lane.test.ts\"",
     "pretest:dispatch": "npm run build",
@@ -65,13 +65,13 @@
     "test:integration": "node --experimental-strip-types --import ./test/setup.ts --test --test-timeout=1200000 --test-reporter=spec \"test/integration/worktree-parallel-dispatch.test.ts\"",
     "pretest:full": "npm run build",
     "test:full": "node --experimental-strip-types test/helpers/full-test-runner.ts"
-  },
-  "dependencies": {
-    "ajv": "^8.17.1",
-    "ajv-formats": "^3.0.1"
-  },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "typescript": "^5.9.0"
-  }
-}
+  },
+  "dependencies": {
+    "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1"
+  },
+  "devDependencies": {
+    "@types/node": "^22.0.0",
+    "typescript": "^5.9.0"
+  }
+}