sortie-dogs 0.5.8 → 0.5.12

package/README.md

@@ -20,7 +20,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.5.8](https://github.com/zufall-upon/Sortie-dogs/releases/tag/v0.5.8)
+Release: [v0.5.12](https://github.com/zufall-upon/Sortie-dogs/releases/tag/v0.5.12)
 
 ## Quick start
 
@@ -164,13 +164,19 @@ options. OpenCode plugin normalization may omit factory options, so use the
 global file for durable global settings.
 
 - `operationManifestPath` moves the manifest; the path is project-relative.
-- `handoffPaths` lists the handoff files the plugin inspects. A worker can only
+- `handoffPaths` lists the handoff files the plugin inspects. A worker can only
   bind after one of these files passes inspection, so an empty list disables
   binding entirely. Relative entries are also candidate-relative in a nested
   repository: a child candidate may use its own `handoff.json` while OpenCode is
   opened at the parent workspace. For operational work the coordinator creates
   that valid handoff before dispatch and sends its exact absolute path; the
-  binding child must use the built-in Read tool on it immediately before bind.
+  binding child must use the built-in Read tool on it immediately before bind.
+  New coordinator contracts are emitted under the candidate-relative
+  `.sortie-dogs/contracts/` directory as `handoff.<id>.json` and
+  `<id>.operation-manifest.json`. The directory is ignored by this repository's
+  `.gitignore`; legacy root/scoped paths and configured custom paths remain
+  readable and preflight-compatible, but are never moved or deleted.
+  Remove the directory only when no Sortie run is active.
 - `readOnlyTools` adds host-specific tool names that never change files, such as
   MCP tools. Unknown tools are denied for a bound session by default.
 - `dedicatedWorkerModel` selects the single model every worker role resolves to.

package/dist/asset-version.d.ts

@@ -2,5 +2,5 @@
  * Version of the installable runtime assets. Kept in its own module so the plugin can compare an
  * installed project marker without importing every asset body.
  */
-export declare const RUNTIME_ASSET_VERSION = "0.3.38-terra-high-coordinator-v1";
+export declare const RUNTIME_ASSET_VERSION = "0.3.46-contract-directory-v1";
 export type RuntimeAssetVersion = typeof RUNTIME_ASSET_VERSION;

package/dist/asset-version.js

@@ -2,4 +2,4 @@
  * Version of the installable runtime assets. Kept in its own module so the plugin can compare an
  * installed project marker without importing every asset body.
  */
-export const RUNTIME_ASSET_VERSION = "0.3.38-terra-high-coordinator-v1";
+export const RUNTIME_ASSET_VERSION = "0.3.46-contract-directory-v1";

package/dist/core/worktree-commit-artifact.js

@@ -749,6 +749,8 @@ async function status(context, staged) {
     const controls = new Set([
         `handoff.${context.descriptor.task_id}.json`,
         `${context.descriptor.task_id}.operation-manifest.json`,
+        `.sortie-dogs/contracts/handoff.${context.descriptor.task_id}.json`,
+        `.sortie-dogs/contracts/${context.descriptor.task_id}.operation-manifest.json`,
     ]);
     return entries.filter(({ code, path }) => code !== "A" || !controls.has(path));
 }

package/dist/plugin/continuation.js

@@ -33,8 +33,6 @@ export const DEFAULT_MAX_AUTO_CONTINUES = 10;
  */
 export const STEP_EXHAUSTED_PATTERN = /(?:最大step(?:s|数)?(?:に)?到達|step(?:s)?\s*(?:limit|budget)\s*(?:reached|exhausted)|maximum\s+steps?\s+reached)[\s\S]{0,2500}(?:残作業|未完了|未完|次action|next\s+action|remaining\s+work)/iu;
 const MAX_TRACKED_SESSIONS = 256;
-const MAX_STEP_CONTINUES_PER_SEGMENT = 2;
-const MAX_STEP_CONTINUES_PER_TURN = 4;
 const DEFAULT_TIMINGS = {
     /** Compaction is expensive; one rollover per minute per session is the canonical ceiling. */
     cooldownMilliseconds: 60_000,
@@ -271,8 +269,6 @@ export function createContinuationHooks(client, directory, policySource, timings
             resumeAttempts: 0,
             textCompleting: false,
             directUsed: false,
-            stepContinueCount: 0,
-            stepContinueTotal: 0,
             stepContinueIssuing: false,
             touched: Date.now(),
         };
@@ -383,18 +379,18 @@ export function createContinuationHooks(client, directory, policySource, timings
         if (/➡️\s*(?:次action|next_action)\s*:\s*\S/iu.test(text))
             return true;
         const percent = latestProgressPercent(text);
-        return percent !== undefined && (percent < 100 || batchHasIndependentRemainder(text));
+        if (percent !== undefined)
+            return percent < 100 || batchHasIndependentRemainder(text);
+        // Coordinators sometimes omit the optional percentage while retaining a localized progress label.
+        return /📊\s*(?:進行中|处理中|in[ -]?progress)(?:\s|[:：]|$)/iu.test(latestProgressLine(text) ?? "");
     }
     async function issueStepContinue(sessionID, state, report, agent) {
         const resume = client?.session?.promptAsync;
         const active = policy();
         if (resume === undefined || !active.enabled || active.agent !== agent || state.stepContinueIssuing ||
-            state.stepContinueCount >= MAX_STEP_CONTINUES_PER_SEGMENT ||
-            state.stepContinueTotal >= MAX_STEP_CONTINUES_PER_TURN)
+            state.lastStepContinueReport === report)
             return;
         state.stepContinueIssuing = true;
-        state.stepContinueCount += 1;
-        state.stepContinueTotal += 1;
         state.latestCoordinatorReport = undefined;
         try {
             const resumed = await resume.call(client.session, {
@@ -411,10 +407,9 @@ export function createContinuationHooks(client, directory, policySource, timings
             });
             if (!promptCallSucceeded(resumed))
                 throw new Error("step continuation request rejected");
+            state.lastStepContinueReport = report;
         }
         catch (error) {
-            state.stepContinueCount -= 1;
-            state.stepContinueTotal -= 1;
             state.latestCoordinatorReport = report;
             console.error("[sortie-continuation] step resume failed", sessionID, error);
         }
@@ -453,9 +448,6 @@ export function createContinuationHooks(client, directory, policySource, timings
             state.continueReport = undefined;
             state.preserveCompactionScope = false;
             state.recoverySummaryValidated = false;
-            // A successful rollover starts a new bounded context segment. Keep ordinary synthetic turns
-            // from resetting this guard, but allow two fresh progress recoveries after compaction.
-            state.stepContinueCount = 0;
             // The accepted prompt now belongs to the host loop, not this rollover request.
             state.active = false;
             return true;
@@ -892,14 +884,13 @@ export function createContinuationHooks(client, directory, policySource, timings
                 state.attempts = 0;
             state.directUsed = false;
             state.latestCoordinatorReport = undefined;
+            if (!synthetic)
+                state.lastStepContinueReport = undefined;
             state.compactingEpoch = undefined;
             state.model = { providerID: model.providerID, modelID: model.modelID };
             state.turnRevision += 1;
-            if (!synthetic) {
-                state.stepContinueCount = 0;
-                state.stepContinueTotal = 0;
+            if (!synthetic)
                 state.limitCompacted = false;
-            }
         },
         blocksTool(sessionID) {
             const state = sessions.get(sessionID);

package/dist/plugin/fast-lane.js

@@ -121,8 +121,7 @@ export class FastLaneController {
     }
     manualCompactionForbidden(sessionID) {
         const state = this.sessions.get(sessionID);
-        return state !== undefined &&
-            (!state.backlogDrain || state.totalWorkerDispatches >= state.workerLimit);
+        return state !== undefined && !state.backlogDrain;
     }
     terminalInstructionRequired(sessionID) {
         const state = this.sessions.get(sessionID);
@@ -134,8 +133,8 @@ export class FastLaneController {
     }
     backlogContinuationAllowed(sessionID) {
         const state = this.sessions.get(sessionID);
-        return state?.backlogDrain === true && state.workerDispatches === 1 &&
-            state.totalWorkerDispatches < state.workerLimit && !state.continuationPending;
+        return state?.backlogDrain === true && state.workerDispatches >= 1 &&
+            !state.continuationPending;
     }
     enableBacklogDrain(sessionID, maxUnits) {
         const state = this.sessions.get(sessionID);
@@ -238,10 +237,6 @@ export class FastLaneController {
                     throw new FastLaneDeniedError("WORKER_LIMIT");
                 }
             }
-            else if (state.backlogDrain &&
-                (state.workerDispatches >= 1 || state.totalWorkerDispatches >= state.workerLimit)) {
-                throw new FastLaneDeniedError("WORKER_LIMIT");
-            }
             else if (state.workerInFlight) {
                 throw new FastLaneDeniedError("WORKER_LIMIT");
             }

package/dist/plugin/gate.js

@@ -1,6 +1,6 @@
 import { execFile } from "node:child_process";
 import { lstat, realpath } from "node:fs/promises";
-import { basename, dirname, isAbsolute, relative, resolve } from "node:path";
+import { basename, dirname, isAbsolute, relative, resolve, win32 } from "node:path";
 import { promisify } from "node:util";
 import { RelativePathError, normalizeManifestPath, normalizeRelativePath } from "../core/path.js";
 import { validateOperationManifestSchema } from "../core/validate-schema.js";
@@ -377,6 +377,22 @@ function depthOnePowerShellLiteral(source) {
 function commandIssue(segment, cause, hint) {
     return { segment: segment.trim().slice(0, 240), cause, hint };
 }
+function isLiteralPowerShellPath(value) {
+    return value.length > 0 && !/[\u0000-\u001f\u007f$*?\[\]@(){},;|&`<>]/u.test(value);
+}
+function robocopyOutput(tokens) {
+    if (tokens.length !== 4)
+        return undefined;
+    const source = tokens[1];
+    const destination = tokens[2];
+    const file = tokens[3];
+    const literal = (value) => value.length > 0 && !/[\u0000-\u001f\u007f$*?]/u.test(value);
+    if (!literal(source) || !literal(destination) || !literal(file) ||
+        file === "." || file === ".." || /[\\/]/u.test(file) ||
+        source.startsWith("/") || destination.startsWith("/") || file.startsWith("/"))
+        return undefined;
+    return win32.join(destination, file);
+}
 function shellPaths(command, powershell, depth = 0) {
     const paths = [];
     let applies = false;
@@ -486,6 +502,18 @@ function shellPaths(command, powershell, depth = 0) {
             if (destination !== undefined)
                 requiredDirectories.push(dirname(destination));
         }
+        else if (/^robocopy(?:\.exe)?$/u.test(executable)) {
+            applies = true;
+            const destination = robocopyOutput(tokens);
+            if (destination === undefined) {
+                ambiguous = true;
+                issue ??= commandIssue(source, "unsupported-robocopy-form", "use literal Robocopy.exe <source-dir> <destination-dir> <single-file>");
+            }
+            else {
+                paths.push(destination);
+                requiredDirectories.push(dirname(destination));
+            }
+        }
         else if (executable === "tar") {
             const mode = tarMode(tokens);
             if (mode === undefined) {
@@ -502,6 +530,68 @@ function shellPaths(command, powershell, depth = 0) {
         else if (executable === "find" && isDirectFindHash(tokens)) {
             // Exact member lookup plus sha256sum is read-only; a following tee owns any output path.
         }
+        else if (executable === "copy-item") {
+            applies = true;
+            const destinations = [];
+            const sources = [];
+            const positional = [];
+            let unsupported = false;
+            let force = false;
+            for (let index = 1; index < tokens.length; index += 1) {
+                const token = tokens[index];
+                if (/^-(?:path|literalpath)$/iu.test(token)) {
+                    const candidate = tokens[index + 1];
+                    if (candidate !== undefined && !candidate.startsWith("-"))
+                        sources.push(candidate);
+                    else
+                        unsupported = true;
+                    index += 1;
+                }
+                else if (/^-destination$/iu.test(token)) {
+                    const candidate = tokens[index + 1];
+                    if (candidate !== undefined && !candidate.startsWith("-"))
+                        destinations.push(candidate);
+                    else
+                        unsupported = true;
+                    index += 1;
+                }
+                else if (/^-force$/iu.test(token)) {
+                    if (force)
+                        unsupported = true;
+                    force = true;
+                }
+                else if (token.startsWith("-")) {
+                    unsupported = true;
+                }
+                else if (!token.startsWith("-")) {
+                    positional.push(token);
+                }
+            }
+            const namedForm = sources.length === 1 && destinations.length === 1 && positional.length === 0;
+            const namedSourceForm = sources.length === 1 && destinations.length === 0 && positional.length === 1;
+            const namedDestinationForm = sources.length === 0 && destinations.length === 1 && positional.length === 1;
+            const positionalForm = sources.length === 0 && destinations.length === 0 && positional.length === 2;
+            const copySource = namedForm || namedSourceForm
+                ? sources[0]
+                : namedDestinationForm || positionalForm
+                    ? positional[0]
+                    : undefined;
+            const destination = namedForm || namedDestinationForm
+                ? destinations[0]
+                : namedSourceForm || positionalForm
+                    ? positional.at(-1)
+                    : undefined;
+            if (unsupported
+                || copySource === undefined
+                || destination === undefined
+                || !isLiteralPowerShellPath(copySource)
+                || !isLiteralPowerShellPath(destination)) {
+                ambiguous = true;
+                issue ??= commandIssue(source, "unsupported-copy-item-form", "use one literal source, one literal destination, and optional -Force");
+            }
+            else
+                paths.push(destination);
+        }
         else if (POWERSHELL_WRITE_COMMANDS.has(executable)) {
             applies = true;
             const named = [];
@@ -701,7 +791,10 @@ export function normalizeCommand(command) {
             normalized += character;
         }
     }
-    return normalized;
+    const callOperator = /^& (["'])((?:[A-Za-z]:[\\/]|\\\\|\/)[^\s"']+)\1(?= |$)/u.exec(normalized);
+    return callOperator === null
+        ? normalized
+        : `${callOperator[2]}${normalized.slice(callOperator[0].length)}`;
 }
 /** Unbound sessions may invoke only tools whose complete input is known to be read-only. */
 export function isKnownReadOnlyTool(tool, args, additionalReadOnlyTools = new Set()) {