sortie-dogs 0.9.5 → 0.9.6

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.5](https://github.com/zufall-upon/Sortie-dogs/releases/tag/v0.9.5)
+Release: [v0.9.6](https://github.com/zufall-upon/Sortie-dogs/releases/tag/v0.9.6)
 
 ## Quick start
 

package/dist/core/goal-bound.d.ts

@@ -113,6 +113,7 @@ export type GoalFlightEvent = (GoalEventBase & {
     readonly delivery: GoalDeliveryMode;
     readonly budget: GoalBudget;
     readonly acceptance_contract: GoalAcceptanceContract | null;
+    readonly reset_no_progress?: boolean;
 }) | (GoalEventBase & {
     readonly kind: "ticket.issued";
     readonly ticket_id: string;

package/dist/core/goal-bound.js

@@ -106,6 +106,8 @@ function addUnique(values, value) {
 }
 export function reduceGoalFlight(records) {
     let state = initial();
+    let replanRevision = null;
+    let legacyResetRevision = false;
     let previous = null;
     for (const [index, record] of records.entries()) {
         requireState(record.sequence === index + 1 && record.previous_hash === previous && HASH.test(record.event_hash), "invalid", "Goal ledger chain is malformed.");
@@ -126,6 +128,8 @@ export function reduceGoalFlight(records) {
                 latest_user_message_id: event.origin_user_message_id, selected_agent: event.selected_agent,
                 delivery: event.delivery, budget: event.budget, acceptance_contract: event.acceptance_contract, phase: "active",
                 session_ids: [event.origin_session_id] };
+            replanRevision = null;
+            legacyResetRevision = false;
             continue;
         }
         requireState(state.goal_id !== null && event.goal_id === state.goal_id, "transition", "Goal identity mismatch.");
@@ -139,7 +143,8 @@ export function reduceGoalFlight(records) {
             requireState(state.phase !== "terminal" && event.revision === state.revision + 1 && event.scope_epoch === state.scope_epoch + 1 &&
                 HASH.test(event.acceptance_fingerprint) && event.budget.max_units >= state.consumed_units &&
                 event.budget.max_units >= state.validation_budget.consumed &&
-                validAcceptanceContract(event.acceptance_contract), "transition", "Scope revision is stale or resets consumed budget.");
+                validAcceptanceContract(event.acceptance_contract) &&
+                (event.reset_no_progress === undefined || typeof event.reset_no_progress === "boolean"), "transition", "Scope revision is stale or resets consumed budget.");
             state = { ...state, revision: event.revision, scope_epoch: event.scope_epoch,
                 acceptance_fingerprint: event.acceptance_fingerprint, latest_user_message_id: event.origin_user_message_id,
                 selected_agent: event.selected_agent, delivery: event.delivery, budget: event.budget,
@@ -147,7 +152,12 @@ export function reduceGoalFlight(records) {
                     limit: state.validation_budget.limit === null ? null : event.budget.max_units },
                 acceptance_contract: event.acceptance_contract,
                 session_ids: addUnique(state.session_ids, event.session_id), phase: "active", stop_reason: null,
-                receipt: null, tickets: [] };
+                receipt: null, tickets: [], ...(event.reset_no_progress === true
+                    ? { no_progress_results: 0, replan_required: false, replan_used: false }
+                    : {}) };
+            if (event.reset_no_progress === true)
+                replanRevision = null;
+            legacyResetRevision = event.reset_no_progress === undefined;
         }
         else if (event.kind === "ticket.issued") {
             requireState(state.phase === "active" && event.revision === state.revision && event.scope_epoch === state.scope_epoch &&
@@ -165,6 +175,13 @@ export function reduceGoalFlight(records) {
                 session_ids: addUnique(state.session_ids, event.session_id) };
         }
         else if (event.kind === "dispatch.reserved") {
+            // A short-lived pre-marker runtime reset no-progress on revision but persisted no flag.
+            // A later accepted dispatch proves that reset; older revisions followed by an explicit
+            // replan retain their original semantics.
+            if (legacyResetRevision && state.replan_required && state.replan_used && replanRevision !== null && state.revision > replanRevision) {
+                state = { ...state, no_progress_results: 0, replan_required: false, replan_used: false };
+                replanRevision = null;
+            }
             requireState(state.phase === "active" && !state.replan_required, "transition", "Dispatch requires terminal handling or one bounded replan.");
             requireState(state.budget !== null && state.consumed_units + state.outstanding_reservations.length < state.budget.max_units, "budget", "Goal unit budget exhausted.");
             requireState(state.budget.time_ms === null || (state.consumed_time_ms !== null && state.consumed_time_ms < state.budget.time_ms), "budget", "Goal time budget is exhausted or usage is unknown.");
@@ -222,6 +239,7 @@ export function reduceGoalFlight(records) {
         else if (event.kind === "goal.replanned") {
             requireState(state.phase === "active" && state.replan_required && !state.replan_used && event.revision === state.revision, "transition", "Bounded replan is unavailable.");
             state = { ...state, replan_used: true, replan_required: false, no_progress_results: 0 };
+            replanRevision = event.revision;
         }
         else if (event.kind === "goal.terminal") {
             const allAccepted = state.acceptance_contract !== null && state.acceptance_contract.criteria.every(({ criterion_id }) => state.satisfied_criteria.includes(criterion_id));

package/dist/core/scope-lease-registry.js

@@ -472,13 +472,16 @@ export class ScopeLeaseRegistry {
             await rmdir(this.lockPath).catch(() => undefined);
             return;
         }
-        if (names.length !== 1)
+        const owners = names.filter((name) => OWNER_FILE.test(name));
+        if (owners.length !== 1 || names.length > MAX_TEMP_CLEANUP + 1 ||
+            names.some((name) => name !== owners[0] && !TEMP_FILE.test(name)))
             return;
-        const match = OWNER_FILE.exec(names[0]);
+        const ownerName = owners[0];
+        const match = OWNER_FILE.exec(ownerName);
         if (match === null || !UUID.test(match[1]))
             return;
         const owner = match[1];
-        const ownerPath = join(this.lockPath, names[0]);
+        const ownerPath = join(this.lockPath, ownerName);
         const before = await this.mutexSnapshot(ownerPath);
         if (before === undefined || Date.now() - before.mtimeMs <= this.options.mutexStaleMs || before.content !== owner)
             return;
@@ -490,7 +493,7 @@ export class ScopeLeaseRegistry {
         catch {
             return;
         }
-        const movedOwnerPath = join(quarantine, names[0]);
+        const movedOwnerPath = join(quarantine, ownerName);
         const after = await this.mutexSnapshot(movedOwnerPath);
         if (after === undefined || !this.sameMutexSnapshot(before, after)) {
             // The whole-directory rename already fenced this owner. Keep its quarantine until a later

package/dist/plugin/gate.d.ts

@@ -69,5 +69,5 @@ export declare function canonicalManifestWriteScopes(project: ProjectPaths, mani
 export declare function canonicalManifestReadScopes(project: ProjectPaths, manifest: OperationManifest): Promise<readonly string[]>;
 export declare function writeScopesOverlap(left: readonly string[], right: readonly string[]): boolean;
 export declare function createProjectPaths(rootCandidate: string): Promise<ProjectPaths>;
-export declare function createWriteGate(project: ProjectPaths, value: unknown): Promise<WriteGate>;
+export declare function createWriteGate(project: ProjectPaths, value: unknown, toolDirectory?: string): Promise<WriteGate>;
 export {};

package/dist/plugin/gate.js

@@ -964,7 +964,7 @@ export async function createProjectPaths(rootCandidate) {
         },
     };
 }
-export async function createWriteGate(project, value) {
+export async function createWriteGate(project, value, toolDirectory = project.root) {
     const validated = validateOperationManifestSchema(value);
     if (!validated.ok)
         throw new WriteDeniedError("manifest-unavailable", "<unknown>");
@@ -1189,8 +1189,20 @@ export async function createWriteGate(project, value) {
                 }
                 throw new WriteDeniedError("path-required", "<missing-path>");
             }
-            for (const path of extracted.paths)
-                await checkPath(path);
+            // OpenCode resolves native file-tool paths against its instance directory, not the
+            // manifest root. Check the same destination without rewriting the tool arguments.
+            const nativeFileTool = /^(?:write|edit)(?:$|[_-])/iu.test(_input.tool) || /patch/iu.test(_input.tool);
+            for (const path of extracted.paths) {
+                if (nativeFileTool) {
+                    try {
+                        normalizeManifestPath(path);
+                    }
+                    catch (error) {
+                        throw new WriteDeniedError("project-boundary", path, { cause: error });
+                    }
+                }
+                await checkPath(nativeFileTool ? resolve(toolDirectory, path) : path);
+            }
             if (extracted.gitCommit)
                 await checkCachedSet();
         },

package/dist/plugin/index.js

@@ -1813,7 +1813,7 @@ export const SortieDogsPlugin = async (input, options) => {
             delivery: declaration.delivery, budget: { max_units: maxUnits,
                 time_ms: timeBudget, cost_usd: costBudget,
                 source: Number.isSafeInteger(units) ? "accepted-plan" : state.budget?.source ?? "policy-default" },
-            acceptance_contract: declaration.contract });
+            acceptance_contract: declaration.contract, reset_no_progress: true });
         goalDeclarationAuthority.delete(sessionID);
         return state;
     }
@@ -2130,7 +2130,7 @@ export const SortieDogsPlugin = async (input, options) => {
                     throw new WriteDeniedError("manifest-unavailable", "<unknown>");
                 loaded.manifest = validation.value;
                 loaded.manifestFingerprint = inspectionFingerprint(validation.value, undefined);
-                loaded.gate = await createWriteGate(project, validation.value);
+                loaded.gate = await createWriteGate(project, validation.value, input.directory);
                 bootstrapRequired = false;
                 bootstrapCompleted = true;
                 loadFailure = undefined;
@@ -4057,7 +4057,7 @@ export const SortieDogsPlugin = async (input, options) => {
                     });
                 }
                 manifest = manifestValidation.value;
-                authorizationGate = await createWriteGate(candidateProject, manifest);
+                authorizationGate = await createWriteGate(candidateProject, manifest, input.directory);
                 inspectedProjectRoot = candidateProject.root;
             }
             catch (error) {
@@ -4352,7 +4352,7 @@ export const SortieDogsPlugin = async (input, options) => {
                     idempotent: true,
                 });
             }
-            const gate = await createWriteGate(candidate, validation.value);
+            const gate = await createWriteGate(candidate, validation.value, input.directory);
             const readScopes = await canonicalManifestReadScopes(candidate, validation.value);
             const writeScopes = await canonicalManifestWriteScopes(candidate, validation.value);
             // Keep conflict detection and registration in one JavaScript turn so competing binds fail closed.
@@ -6407,6 +6407,8 @@ export const SortieDogsPlugin = async (input, options) => {
             }
             catch (error) {
                 activeState?.inFlightCalls.delete(toolInput.callID);
+                if (error instanceof WriteDeniedError)
+                    goalValidationDefects.add(toolInput.sessionID);
                 if (!(error instanceof WriteDeniedError) || error.reason === "repeated-denial")
                     throw error;
                 const signature = denialSignature(toolInput, output, error.reason);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sortie-dogs",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "description": "Bounded agent harness and validated orchestration loop plugin for OpenCode",
   "keywords": [
     "opencode",