opencode-swarm 7.172.4 → 7.173.0

package/dist/cli/{scope-persistence-nrj3q5sk.js → scope-persistence-fh1d8vs0.js}

@@ -23,29 +23,29 @@ import {
   tombstoneScopeBinding,
   writeScopeBindingToDisk,
   writeScopeToDisk
-} from "./index-bbhgnn4j.js";
-import"./index-5tjd3cne.js";
-import"./index-kerhh5q4.js";
-import"./index-b395nw9b.js";
-import"./index-y6bqbe76.js";
-import"./index-jg2s11sg.js";
+} from "./index-3n16qq3z.js";
+import"./index-gd40ehzt.js";
+import"./index-mt8pbzda.js";
+import"./index-za1kvsa0.js";
+import"./index-fnx0jzf7.js";
+import"./index-dktpzjy9.js";
 import"./index-rdm3px0g.js";
 import"./index-ry16d01s.js";
-import"./index-yxegcfy5.js";
-import"./index-szezqd2a.js";
+import"./index-43dmpa9w.js";
+import"./index-fb5rj8sk.js";
 import"./index-vzm6zre7.js";
 import"./index-ae75rja9.js";
-import"./index-ksjpc8s8.js";
-import"./index-01mjyjdt.js";
+import"./index-yzwb6ja4.js";
+import"./index-kdyvk541.js";
 import"./index-7g4c7s5r.js";
 import"./index-jmn35na4.js";
-import"./index-8p30wyx0.js";
+import"./index-bsnpv4xd.js";
 import"./index-1xnse449.js";
 import"./index-c1ggtmpm.js";
-import"./index-gqkfha6x.js";
+import"./index-579nzg03.js";
 import"./index-0mhftbpp.js";
 import"./index-a1w58b47.js";
-import"./index-d21qcjr6.js";
+import"./index-pserzhck.js";
 import"./index-5frh43fj.js";
 import"./index-bk5tah7q.js";
 import"./index-gknz3bv1.js";

package/dist/cli/{server-zs1r7z1g.js → server-v0wfd3rk.js}

@@ -21,22 +21,22 @@ import {
   readSynonymMap,
   redactSecrets,
   symbols
-} from "./index-fn7ny88p.js";
+} from "./index-njdy6w9x.js";
 import {
   getProfileForFile
 } from "./index-hnvmj9wx.js";
 import {
   pLimit
-} from "./index-9h6zhnk0.js";
-import"./index-68bp6sak.js";
-import"./index-j8z3t7dv.js";
-import"./index-1t4v24tw.js";
+} from "./index-hhws1xkc.js";
+import"./index-ejrqyrsr.js";
+import"./index-wr4m11x4.js";
+import"./index-0y9fqm5d.js";
 import {
   _internals,
   loadPlanJsonOnly,
   saveEvidence
-} from "./index-d9g9stnf.js";
-import"./index-qzptb0gf.js";
+} from "./index-btxf9k1r.js";
+import"./index-z35ynvj4.js";
 import"./index-txdagbh7.js";
 import"./index-z2deqhpp.js";
 import {
@@ -44,47 +44,47 @@ import {
   isCanonicalPathWithinRoot,
   validateTargetWithinRoot
 } from "./index-fpbcxykc.js";
-import"./index-zpksgw8w.js";
-import"./index-2negdnww.js";
-import"./index-zfzbn9a7.js";
+import"./index-915wxcgs.js";
+import"./index-mq2y8qpg.js";
+import"./index-sftt3gdv.js";
 import"./index-fyfbpz4f.js";
-import"./index-rxakec16.js";
+import"./index-7gkdxs00.js";
 import"./index-0hgmsyfp.js";
 import"./index-zsrtt42s.js";
-import"./index-1c119trs.js";
-import"./index-a1187fx5.js";
-import"./index-j7zrvqnf.js";
+import"./index-m08ee28a.js";
+import"./index-ndvgkxpf.js";
+import"./index-0dfhahxm.js";
 import {
   getLanguageForExtension,
   getParserForFile
 } from "./index-pt7h91zc.js";
 import"./index-q7sjgr1y.js";
-import"./index-1c1n8aax.js";
-import"./index-y1qc2cpp.js";
-import"./index-36143n94.js";
+import"./index-e8tscab8.js";
+import"./index-nrsnman7.js";
+import"./index-1pnw3jkr.js";
 import {
   effectiveRetrievalOutcomes,
   newTraceId,
   readAuthoritativeKnowledgeCounterRollups,
   recordKnowledgeEvent
-} from "./index-5qfqwbvg.js";
-import"./index-2n16srdc.js";
+} from "./index-8xkr8p2b.js";
+import"./index-evf5r7bk.js";
 import"./index-2s7dvzff.js";
-import"./index-her1kqcr.js";
-import"./index-efbdfkw9.js";
+import"./index-nztmfgvw.js";
+import"./index-m51cmzxt.js";
 import"./index-rtry5xyf.js";
-import"./index-3rkjybes.js";
+import"./index-tztqvzf5.js";
 import"./index-frcemc0b.js";
 import"./index-wrt875kh.js";
-import"./index-bbhgnn4j.js";
-import"./index-5tjd3cne.js";
-import"./index-kerhh5q4.js";
-import"./index-b395nw9b.js";
-import"./index-y6bqbe76.js";
-import"./index-jg2s11sg.js";
+import"./index-3n16qq3z.js";
+import"./index-gd40ehzt.js";
+import"./index-mt8pbzda.js";
+import"./index-za1kvsa0.js";
+import"./index-fnx0jzf7.js";
+import"./index-dktpzjy9.js";
 import"./index-rdm3px0g.js";
 import"./index-ry16d01s.js";
-import"./index-yxegcfy5.js";
+import"./index-43dmpa9w.js";
 import {
   computeOutcomeSignal,
   jaccardBigram,
@@ -94,14 +94,14 @@ import {
   resolveHiveKnowledgePath,
   resolveSwarmKnowledgePath,
   wordBigrams
-} from "./index-szezqd2a.js";
+} from "./index-fb5rj8sk.js";
 import"./index-vzm6zre7.js";
 import"./index-ae75rja9.js";
-import"./index-ksjpc8s8.js";
-import"./index-01mjyjdt.js";
+import"./index-yzwb6ja4.js";
+import"./index-kdyvk541.js";
 import"./index-7g4c7s5r.js";
 import"./index-jmn35na4.js";
-import"./index-8p30wyx0.js";
+import"./index-bsnpv4xd.js";
 import"./index-1xnse449.js";
 import {
   escapeRegex
@@ -109,7 +109,7 @@ import {
 import {
   loadGateOverrides,
   loadPluginConfigWithMeta
-} from "./index-gqkfha6x.js";
+} from "./index-579nzg03.js";
 import {
   init_git_executable,
   resolveGitExecutableAsync
@@ -119,7 +119,7 @@ import {
   KnowledgeConfigSchema,
   init_schema,
   stripKnownSwarmPrefix
-} from "./index-d21qcjr6.js";
+} from "./index-pserzhck.js";
 import {
   TOOL_METADATA,
   init_tool_metadata

package/dist/cli/{skill-generator-7f0jayyp.js → skill-generator-935cmd3p.js}

@@ -33,32 +33,32 @@ import {
   sanitizeSlug,
   selectCandidateEntries,
   writeEvalStub
-} from "./index-zpksgw8w.js";
+} from "./index-915wxcgs.js";
 import"./index-q7sjgr1y.js";
-import"./index-5qfqwbvg.js";
-import"./index-2n16srdc.js";
+import"./index-8xkr8p2b.js";
+import"./index-evf5r7bk.js";
 import"./index-2s7dvzff.js";
-import"./index-her1kqcr.js";
-import"./index-efbdfkw9.js";
+import"./index-nztmfgvw.js";
+import"./index-m51cmzxt.js";
 import"./index-rtry5xyf.js";
-import"./index-3rkjybes.js";
+import"./index-tztqvzf5.js";
 import"./index-frcemc0b.js";
 import"./index-wrt875kh.js";
-import"./index-yxegcfy5.js";
-import"./index-szezqd2a.js";
+import"./index-43dmpa9w.js";
+import"./index-fb5rj8sk.js";
 import"./index-vzm6zre7.js";
 import"./index-ae75rja9.js";
-import"./index-ksjpc8s8.js";
-import"./index-01mjyjdt.js";
+import"./index-yzwb6ja4.js";
+import"./index-kdyvk541.js";
 import"./index-7g4c7s5r.js";
 import"./index-jmn35na4.js";
-import"./index-8p30wyx0.js";
+import"./index-bsnpv4xd.js";
 import"./index-1xnse449.js";
 import"./index-c1ggtmpm.js";
-import"./index-gqkfha6x.js";
+import"./index-579nzg03.js";
 import"./index-0mhftbpp.js";
 import"./index-a1w58b47.js";
-import"./index-d21qcjr6.js";
+import"./index-pserzhck.js";
 import"./index-5frh43fj.js";
 import"./index-bk5tah7q.js";
 import"./index-gknz3bv1.js";

package/dist/cli/{snapshot-coordination-init-6tz602wz.js → snapshot-coordination-init-ad8n0977.js}

@@ -8,64 +8,64 @@ import {
   markSnapshotCoordinationClosing,
   retrySnapshotCoordinationInitialization,
   startSnapshotCoordinationInitialization
-} from "./index-fn7ny88p.js";
+} from "./index-njdy6w9x.js";
 import"./index-hnvmj9wx.js";
-import"./index-9h6zhnk0.js";
-import"./index-68bp6sak.js";
-import"./index-j8z3t7dv.js";
-import"./index-1t4v24tw.js";
-import"./index-d9g9stnf.js";
-import"./index-qzptb0gf.js";
+import"./index-hhws1xkc.js";
+import"./index-ejrqyrsr.js";
+import"./index-wr4m11x4.js";
+import"./index-0y9fqm5d.js";
+import"./index-btxf9k1r.js";
+import"./index-z35ynvj4.js";
 import"./index-txdagbh7.js";
 import"./index-z2deqhpp.js";
 import"./index-fpbcxykc.js";
-import"./index-zpksgw8w.js";
-import"./index-2negdnww.js";
-import"./index-zfzbn9a7.js";
+import"./index-915wxcgs.js";
+import"./index-mq2y8qpg.js";
+import"./index-sftt3gdv.js";
 import"./index-fyfbpz4f.js";
-import"./index-rxakec16.js";
+import"./index-7gkdxs00.js";
 import"./index-0hgmsyfp.js";
 import"./index-zsrtt42s.js";
-import"./index-1c119trs.js";
-import"./index-a1187fx5.js";
-import"./index-j7zrvqnf.js";
+import"./index-m08ee28a.js";
+import"./index-ndvgkxpf.js";
+import"./index-0dfhahxm.js";
 import"./index-pt7h91zc.js";
 import"./index-q7sjgr1y.js";
-import"./index-1c1n8aax.js";
-import"./index-y1qc2cpp.js";
-import"./index-36143n94.js";
-import"./index-5qfqwbvg.js";
-import"./index-2n16srdc.js";
+import"./index-e8tscab8.js";
+import"./index-nrsnman7.js";
+import"./index-1pnw3jkr.js";
+import"./index-8xkr8p2b.js";
+import"./index-evf5r7bk.js";
 import"./index-2s7dvzff.js";
-import"./index-her1kqcr.js";
-import"./index-efbdfkw9.js";
+import"./index-nztmfgvw.js";
+import"./index-m51cmzxt.js";
 import"./index-rtry5xyf.js";
-import"./index-3rkjybes.js";
+import"./index-tztqvzf5.js";
 import"./index-frcemc0b.js";
 import"./index-wrt875kh.js";
-import"./index-bbhgnn4j.js";
-import"./index-5tjd3cne.js";
-import"./index-kerhh5q4.js";
-import"./index-b395nw9b.js";
-import"./index-y6bqbe76.js";
-import"./index-jg2s11sg.js";
+import"./index-3n16qq3z.js";
+import"./index-gd40ehzt.js";
+import"./index-mt8pbzda.js";
+import"./index-za1kvsa0.js";
+import"./index-fnx0jzf7.js";
+import"./index-dktpzjy9.js";
 import"./index-rdm3px0g.js";
 import"./index-ry16d01s.js";
-import"./index-yxegcfy5.js";
-import"./index-szezqd2a.js";
+import"./index-43dmpa9w.js";
+import"./index-fb5rj8sk.js";
 import"./index-vzm6zre7.js";
 import"./index-ae75rja9.js";
-import"./index-ksjpc8s8.js";
-import"./index-01mjyjdt.js";
+import"./index-yzwb6ja4.js";
+import"./index-kdyvk541.js";
 import"./index-7g4c7s5r.js";
 import"./index-jmn35na4.js";
-import"./index-8p30wyx0.js";
+import"./index-bsnpv4xd.js";
 import"./index-1xnse449.js";
 import"./index-c1ggtmpm.js";
-import"./index-gqkfha6x.js";
+import"./index-579nzg03.js";
 import"./index-0mhftbpp.js";
 import"./index-a1w58b47.js";
-import"./index-d21qcjr6.js";
+import"./index-pserzhck.js";
 import"./index-5frh43fj.js";
 import"./index-bk5tah7q.js";
 import"./index-gknz3bv1.js";

package/dist/cli/{workspace-snapshot-e63mg204.js → workspace-snapshot-62be4368.js}

@@ -45,10 +45,10 @@ import {
   shouldSkipSnapshot,
   switchPrFeedbackTrackingCandidateAsync,
   workspaceSnapshotMatches
-} from "./index-a1187fx5.js";
-import"./index-2n16srdc.js";
+} from "./index-ndvgkxpf.js";
+import"./index-evf5r7bk.js";
 import"./index-2s7dvzff.js";
-import"./index-8p30wyx0.js";
+import"./index-bsnpv4xd.js";
 import"./index-1xnse449.js";
 import"./index-c1ggtmpm.js";
 import"./index-0mhftbpp.js";

package/dist/cli/{worktree-collision-ownership-hqk8gc0f.js → worktree-collision-ownership-txzvv5jv.js}

@@ -9,27 +9,27 @@ import {
   WORKTREE_PROVISIONING_OWNER_LEASE_MS,
   removeWorktreeProvisioningOwner,
   scanWorktreeProvisioningOwnersForRecovery
-} from "./index-j7zrvqnf.js";
+} from "./index-0dfhahxm.js";
 import {
   scanDelegationFallbacksForRecovery,
   scanDelegationsForRecovery
-} from "./index-36143n94.js";
-import"./index-2n16srdc.js";
+} from "./index-1pnw3jkr.js";
+import"./index-evf5r7bk.js";
 import"./index-2s7dvzff.js";
-import"./index-b395nw9b.js";
-import"./index-y6bqbe76.js";
-import"./index-jg2s11sg.js";
+import"./index-za1kvsa0.js";
+import"./index-fnx0jzf7.js";
+import"./index-dktpzjy9.js";
 import"./index-rdm3px0g.js";
 import"./index-ry16d01s.js";
-import"./index-yxegcfy5.js";
-import"./index-szezqd2a.js";
+import"./index-43dmpa9w.js";
+import"./index-fb5rj8sk.js";
 import"./index-vzm6zre7.js";
 import"./index-ae75rja9.js";
-import"./index-ksjpc8s8.js";
-import"./index-01mjyjdt.js";
+import"./index-yzwb6ja4.js";
+import"./index-kdyvk541.js";
 import"./index-7g4c7s5r.js";
 import"./index-jmn35na4.js";
-import"./index-8p30wyx0.js";
+import"./index-bsnpv4xd.js";
 import {
   canonicalRootKeyFresh
 } from "./index-1xnse449.js";

package/dist/cli/{worktree-isolation-8yh97cgh.js → worktree-isolation-tv749n96.js}

@@ -21,66 +21,66 @@ import {
   sanitizeWorktreeTaskId,
   standardWorktreeByCallID,
   standardWorktreeSerializationSessions
-} from "./index-fn7ny88p.js";
+} from "./index-njdy6w9x.js";
 import"./index-hnvmj9wx.js";
-import"./index-9h6zhnk0.js";
-import"./index-68bp6sak.js";
-import"./index-j8z3t7dv.js";
-import"./index-1t4v24tw.js";
-import"./index-d9g9stnf.js";
-import"./index-qzptb0gf.js";
+import"./index-hhws1xkc.js";
+import"./index-ejrqyrsr.js";
+import"./index-wr4m11x4.js";
+import"./index-0y9fqm5d.js";
+import"./index-btxf9k1r.js";
+import"./index-z35ynvj4.js";
 import"./index-txdagbh7.js";
 import"./index-z2deqhpp.js";
 import"./index-fpbcxykc.js";
-import"./index-zpksgw8w.js";
-import"./index-2negdnww.js";
-import"./index-zfzbn9a7.js";
+import"./index-915wxcgs.js";
+import"./index-mq2y8qpg.js";
+import"./index-sftt3gdv.js";
 import"./index-fyfbpz4f.js";
-import"./index-rxakec16.js";
+import"./index-7gkdxs00.js";
 import"./index-0hgmsyfp.js";
 import"./index-zsrtt42s.js";
-import"./index-1c119trs.js";
-import"./index-a1187fx5.js";
-import"./index-j7zrvqnf.js";
+import"./index-m08ee28a.js";
+import"./index-ndvgkxpf.js";
+import"./index-0dfhahxm.js";
 import"./index-pt7h91zc.js";
 import"./index-q7sjgr1y.js";
-import"./index-1c1n8aax.js";
-import"./index-y1qc2cpp.js";
-import"./index-36143n94.js";
-import"./index-5qfqwbvg.js";
-import"./index-2n16srdc.js";
+import"./index-e8tscab8.js";
+import"./index-nrsnman7.js";
+import"./index-1pnw3jkr.js";
+import"./index-8xkr8p2b.js";
+import"./index-evf5r7bk.js";
 import"./index-2s7dvzff.js";
-import"./index-her1kqcr.js";
-import"./index-efbdfkw9.js";
+import"./index-nztmfgvw.js";
+import"./index-m51cmzxt.js";
 import"./index-rtry5xyf.js";
 import {
   resolveWorktreeIsolationConfig
-} from "./index-3rkjybes.js";
+} from "./index-tztqvzf5.js";
 import"./index-frcemc0b.js";
 import"./index-wrt875kh.js";
-import"./index-bbhgnn4j.js";
-import"./index-5tjd3cne.js";
-import"./index-kerhh5q4.js";
-import"./index-b395nw9b.js";
-import"./index-y6bqbe76.js";
-import"./index-jg2s11sg.js";
+import"./index-3n16qq3z.js";
+import"./index-gd40ehzt.js";
+import"./index-mt8pbzda.js";
+import"./index-za1kvsa0.js";
+import"./index-fnx0jzf7.js";
+import"./index-dktpzjy9.js";
 import"./index-rdm3px0g.js";
 import"./index-ry16d01s.js";
-import"./index-yxegcfy5.js";
-import"./index-szezqd2a.js";
+import"./index-43dmpa9w.js";
+import"./index-fb5rj8sk.js";
 import"./index-vzm6zre7.js";
 import"./index-ae75rja9.js";
-import"./index-ksjpc8s8.js";
-import"./index-01mjyjdt.js";
+import"./index-yzwb6ja4.js";
+import"./index-kdyvk541.js";
 import"./index-7g4c7s5r.js";
 import"./index-jmn35na4.js";
-import"./index-8p30wyx0.js";
+import"./index-bsnpv4xd.js";
 import"./index-1xnse449.js";
 import"./index-c1ggtmpm.js";
-import"./index-gqkfha6x.js";
+import"./index-579nzg03.js";
 import"./index-0mhftbpp.js";
 import"./index-a1w58b47.js";
-import"./index-d21qcjr6.js";
+import"./index-pserzhck.js";
 import"./index-5frh43fj.js";
 import"./index-bk5tah7q.js";
 import"./index-gknz3bv1.js";

package/dist/commands/close/orchestrator.d.ts

@@ -1,4 +1,37 @@
+import { type PurgeCandidate } from '../destructive-purge.js';
 import type { CloseCommandOptions, CloseStageContext } from './context.js';
+/**
+ * #2508 two-step destructive close: what the destructive portion of close
+ * would destroy, read-only. The align stage's aggressive reset discards
+ * tracked/staged work (untracked files survive); the clean stage removes
+ * active-state artifacts AFTER archiving them (recoverable, but part of the
+ * preview so the operator sees the full scope).
+ */
+export interface ClosePurgeGate {
+    /** True when git alignment would discard uncommitted tracked work. */
+    wouldDestroyTrackedWork: boolean;
+    /** Tracked-dirty repo-relative paths that alignment would discard. */
+    dirtyPaths: string[];
+    /** Digest scope: dirty paths + present active-state paths (absolute). */
+    candidates: PurgeCandidate[];
+    /** First candidate path (digest anchor for the #2527 primitive). */
+    scopeAnchor: string;
+    /**
+     * #2508 fail-closed signal: git status could not be read in a repository
+     * (spawn failure, timeout, or nonzero exit). The gate cannot prove the
+     * align stage safe, so the destructive pipeline must be refused — never
+     * treated as a clean tree. A bare `.git` marker (#2127 project root with
+     * no repository behind it) carries no git-tracked work to verify and does
+     * not trip this signal.
+     */
+    gitStatusFailed: boolean;
+}
+declare function runCloseGateGit(args: string[], cwd: string): string | null;
+/** Test seam for the #2508 gate (simulate git-status read failures). */
+export declare const _closeGateInternals: {
+    runGit: typeof runCloseGateGit;
+};
+export declare function evaluateClosePurgeGate(directory: string, swarmDir: string): ClosePurgeGate;
 export declare function archiveCloseSummary(ctx: Pick<CloseStageContext, 'archiveStageFailed' | 'archiveDir' | 'warnings'>, closeSummaryPath: string, summaryWritten: boolean): Promise<void>;
 /**
  * Handles /swarm close command - performs full terminal session finalization:
@@ -30,3 +63,4 @@ export declare function acquireFinalizeLock(directory: string): Promise<{
  * scans all sessions).
  */
 export declare function detectFullAuto(directory: string, sessionID: string): boolean;
+export {};

package/dist/commands/destructive-purge.d.ts

@@ -53,7 +53,9 @@ export declare const _internals: {
     atomicWriteSwarmFileSync: typeof atomicWriteSwarmFileSync;
     now: () => number;
     randomBytes: typeof randomBytes;
+    scopeDigest: typeof scopeDigest;
 };
+declare function scopeDigest(kind: string, candidates: PurgeCandidate[]): string;
 /**
  * Side-effect-free preview: what would be purged, the counts, the exact
  * option label the operator must echo, and the confirm token to use.
@@ -73,6 +75,18 @@ export declare function issueConfirmToken(scopeTarget: string, projectRoot: stri
     kind?: string;
     candidates?: PurgeCandidate[];
 }): string;
+/**
+ * Validate a pending confirm token WITHOUT deleting anything (#2508): the
+ * same pending-present / exact-token / digest-match / fresh-TTL checks as
+ * `executeDestructivePurge`, with the same single-use consumption of the
+ * pending record. Callers that own non-deletion destructive work (e.g.
+ * `/swarm close`'s clean + align stages) use this to gate their own
+ * pipeline on the operator's exact confirmation.
+ */
+export declare function consumeConfirmToken(scopeTarget: string, projectRoot: string, token: string, extra?: {
+    kind?: string;
+    candidates?: PurgeCandidate[];
+}): PurgeExecution;
 /**
  * Execute the pending purge under the exact token. Re-derives the CURRENT
  * scope digest: token match AND digest match AND fresh TTL required; the
@@ -83,3 +97,4 @@ export declare function executeDestructivePurge(scopeTarget: string, projectRoot
     kind?: string;
     candidates?: PurgeCandidate[];
 }): PurgeExecution;
+export {};

package/dist/hooks/delegation-gate/worktree-isolation.d.ts

@@ -15,6 +15,7 @@ import { resolveGitExecutable } from '../../utils/git-executable.js';
 import type { WorktreeHandle } from '../../worktree';
 import { attemptMergeBackFromDirty, cleanupOrphanedBranches, postMergeCleanup, provisionWorktree, pruneStaleWorktreeMetadata, recoverMergeBackFromImmutableCoordinates, removeWorktree, startupOrphanRecovery } from '../../worktree';
 import type { DirtyMergeOptions, ImmutableMergeRecoveryCoordinates, MergeOperationProvenance } from '../../worktree/merge';
+import type { MergeStrategy } from '../../worktree/types';
 import type { WorktreeProvisioningOwnerRemovalIdentity } from './worktree-provisioning-owner';
 import { recordWorktreeProvisioningOwner, removeWorktreeProvisioningOwner } from './worktree-provisioning-owner';
 import type { WorktreeRecoveryImmutableIdentityInput } from './worktree-recovery-authority';
@@ -84,7 +85,7 @@ export interface StandardWorktreeDispatch {
     /** Configured worktree-dir override, so cleanup trusts the same base. */
     worktree_dir?: string;
 }
-export interface StandardWorktreeSettlementOptions extends Pick<DirtyMergeOptions, 'operationId' | 'resume' | 'onBeforeMerge'> {
+export interface StandardWorktreeSettlementOptions extends Pick<DirtyMergeOptions, 'operationId' | 'resume' | 'onBeforeMerge' | 'commitLanding'> {
     /**
      * Awaited after Git reports success (including reconciled success) and before
      * destructive worktree/branch cleanup. A rejection preserves the lane.
@@ -93,7 +94,7 @@ export interface StandardWorktreeSettlementOptions extends Pick<DirtyMergeOption
 }
 export interface StandardWorktreeMergedSettlement {
     outcome: 'merged';
-    strategy: string;
+    strategy: MergeStrategy;
     autoCommitted: boolean;
     cleaned: boolean;
     reconciled: boolean;
@@ -106,6 +107,10 @@ export interface StandardWorktreePartialSettlement {
     autoCommitted: boolean;
     cleaned: boolean;
     conflictFiles?: string[];
+    /** #2508: stable machine-readable diagnostic code (e.g. SETTLEMENT_OVERLAP_BLOCKED). */
+    code?: string;
+    /** #2508: imperative recovery instruction in the ACTION[...] house style. */
+    recoveryHint?: string;
     provenance?: MergeOperationProvenance;
 }
 export interface StandardWorktreeFailedSettlement {
@@ -310,7 +315,17 @@ export declare function preserveDirtyWorktreeAtPath(worktreePath: string, branch
  * @param directory - The project root (required for git worktree/branch commands).
  * @param worktree_dir - Configured worktree-dir override.
  */
-export declare function cleanupStandardWorktreeForCallId(callID: string, reason: 'success' | 'denied' | 'cancelled', directory: string, worktree_dir?: string): Promise<CleanupStandardWorktreeResult>;
+export declare function cleanupStandardWorktreeForCallId(callID: string, reason: 'success' | 'denied' | 'cancelled', directory: string, worktree_dir?: string, 
+/**
+ * #2508: `retainBranch` removes the lane WORKTREE but keeps the lane
+ * BRANCH. Used after a squash-unstaged landing — the lane's work then
+ * exists only as unstaged working-tree bytes in the primary, so the
+ * branch is the recovery backup until the user commits (serves the
+ * #1970 data-loss class one level down).
+ */
+options?: {
+    retainBranch?: boolean;
+}): Promise<CleanupStandardWorktreeResult>;
 /**
  * FR-001a: Abort an in-flight standard worktree dispatch.
  *

package/dist/hooks/guardrails/index.d.ts

@@ -26,6 +26,8 @@ export declare const _internals: {
     allowUncorrelatedGateReceipts: boolean;
     MAX_PENDING_GATE_RECEIPTS_PER_SESSION: number;
     MAX_PENDING_GATE_RECEIPT_SESSIONS: number;
+    MAX_PENDING_GATE_ROUTES_PER_SESSION: number;
+    MAX_PENDING_GATE_ROUTE_SESSIONS: number;
     /**
      * Test/inspection seams for the no-op detector's bounded session state
      * (invariant 8). Production code does not call these; they exist so the