opencode-swarm 7.172.4 → 7.173.0

package/dist/turbo/lean/merge-back.d.ts

@@ -2,4 +2,4 @@ import type { LeanTurboConfig } from '../../config/schema';
 import { _internals, attemptMergeBackFromDirty, cleanupOrphanedBranches, handleMergeConflict, mergeLaneBranch, postMergeCleanup, startupOrphanRecovery } from '../../worktree/merge';
 export { _internals, attemptMergeBackFromDirty, cleanupOrphanedBranches, handleMergeConflict, mergeLaneBranch, postMergeCleanup, startupOrphanRecovery, };
 export type { CleanupFailure, CleanupSuccess, ConflictHandlingError, ConflictInfo, DirtyMergeFailure, DirtyMergePartial, DirtyMergeSuccess, MergeConflict, MergeFailure, MergeSuccess, OrphanCleanupResult, StartupRecoveryResult, } from '../../worktree/merge';
-export declare function getMergeStrategy(config: LeanTurboConfig): import("../../worktree").MergeStrategy;
+export declare function getMergeStrategy(config: LeanTurboConfig): "merge" | "rebase" | "cherry-pick";

package/dist/workflow/coder-settlement.d.ts

@@ -24,6 +24,8 @@ export declare function settleCoderDispatch(options: {
     accepted: boolean;
     testEngineerExempt: boolean;
     settlementFailed?: boolean;
+    /** #2508: landed via squash-unstaged — retain the lane branch at cleanup. */
+    landedUnstaged?: boolean;
 }): Promise<CoderSettlementResult>;
 /**
  * Abort a DISPATCHED settlement (issue #2214): the settlement's launch

package/dist/worktree/merge.d.ts

@@ -69,7 +69,7 @@ export declare const SOURCE_WORKTREE_GONE_STAGE = "source-worktree-gone";
 export declare const SOURCE_WORKTREE_UNCERTAIN_STAGE = "source-worktree-uncertain";
 export interface MergeSuccess {
     merged: true;
-    strategy: string;
+    strategy: MergeStrategy;
 }
 export interface MergeConflict {
     conflict: true;
@@ -97,7 +97,7 @@ export interface ConflictHandlingError {
 }
 export interface DirtyMergeSuccess {
     merged: true;
-    strategy: string;
+    strategy: MergeStrategy;
     autoCommitted: boolean;
     cleaned: boolean;
     /** True when a resumed operation was already present on the target. */
@@ -112,6 +112,10 @@ export interface DirtyMergePartial {
     cleaned: boolean;
     message: string;
     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 DirtyMergeFailure {
@@ -132,7 +136,12 @@ export interface MergeOperationProvenance {
     sourceHead: string;
     targetHeadBefore: string;
     branchName: string;
-    strategy: MergeStrategy;
+    /**
+     * Always the PASSED dispatch strategy, never the internal
+     * `'squash-unstaged'` landing value (#2508): this struct is persisted into
+     * the settlement WAL, whose schema only accepts the three legacy values.
+     */
+    strategy: Exclude<MergeStrategy, 'squash-unstaged'>;
 }
 /**
  * Git object ids as written by `git rev-parse HEAD`: sha1 (40) today, sha256 (64)
@@ -153,7 +162,7 @@ export interface MergeOperationProvenance {
 export declare const GIT_OBJECT_ID_PATTERN: RegExp;
 export type MergeReconciliationResult = {
     landed: true;
-    method: 'ancestry' | 'cherry-pick-trailer';
+    method: 'ancestry' | 'cherry-pick-trailer' | 'worktree-match';
 } | {
     landed: false;
     error?: string;
@@ -168,7 +177,11 @@ export interface ImmutableMergeRecoveryCoordinates {
     sourceBaseOid: string;
     sourceHeadOid: string;
     targetHeadOid: string;
-    strategy: MergeStrategy;
+    /**
+     * Persisted recovery identity — always one of the three legacy dispatch
+     * strategies, never the internal `'squash-unstaged'` landing value (#2508).
+     */
+    strategy: Exclude<MergeStrategy, 'squash-unstaged'>;
 }
 export type ImmutableMergeRecoveryResult = (MergeSuccess & {
     sourceCommitOrder?: string[];
@@ -183,6 +196,13 @@ export interface DirtyMergeOptions {
     operationId?: string;
     /** Previously persisted provenance when resuming a `settling` operation. */
     resume?: MergeOperationProvenance;
+    /**
+     * #2508: opt OUT of the squash-merge-unstaged default landing for a
+     * `'merge'` dispatch. Callers that own their own committed-merge cleanup
+     * (Lean Turbo merge-back) pass `true` to keep `git merge --no-edit`.
+     * `'rebase'` and `'cherry-pick'` always land committed regardless.
+     */
+    commitLanding?: boolean;
     /**
      * Awaited after auto-commit and HEAD capture, but before the Git merge.
      * A rejection fails closed without invoking the merge.
@@ -239,9 +259,9 @@ export interface StartupRecoveryResult {
  * @returns The merge strategy to use: `'merge'`, `'rebase'`, or `'cherry-pick'`.
  */
 export declare function getMergeStrategy(config: {
-    mergeStrategy?: MergeStrategy;
-    merge_strategy?: MergeStrategy;
-}): MergeStrategy;
+    mergeStrategy?: Exclude<MergeStrategy, 'squash-unstaged'>;
+    merge_strategy?: Exclude<MergeStrategy, 'squash-unstaged'>;
+}): Exclude<MergeStrategy, 'squash-unstaged'>;
 /**
  * Merges a lane branch back into the primary worktree using the specified
  * strategy.
@@ -343,7 +363,14 @@ export declare function handleMergeConflict(primaryDir: string, _branchName: str
  * @param strategy     - Merge strategy to use.
  * @returns Discriminated union: success, partial, or failure.
  */
-export declare function attemptMergeBackFromDirty(worktreePath: string, branchName: string, primaryDir: string, strategy: MergeStrategy, options?: DirtyMergeOptions): Promise<DirtyMergeSuccess | DirtyMergePartial | DirtyMergeFailure>;
+export declare function attemptMergeBackFromDirty(worktreePath: string, branchName: string, primaryDir: string, 
+/**
+ * The PASSED dispatch strategy (persisted identity). `'squash-unstaged'` is
+ * produced internally by the #2508 landing remap and is never a valid
+ * input — callers that want the committed merge pass `'merge'` with
+ * `options.commitLanding: true`.
+ */
+strategy: Exclude<MergeStrategy, 'squash-unstaged'>, options?: DirtyMergeOptions): Promise<DirtyMergeSuccess | DirtyMergePartial | DirtyMergeFailure>;
 /**
  * Extracts the session ID from a swarm-lane branch name.
  *

package/dist/worktree/types.d.ts

@@ -1,5 +1,12 @@
 export type WorktreePurpose = 'lane' | 'session';
-export type MergeStrategy = 'merge' | 'rebase' | 'cherry-pick';
+/**
+ * Landing strategies. The three legacy values are the persisted/config surface
+ * (workflow WAL, pending-delegation checkpoints, recovery records all validate
+ * against exactly these). `'squash-unstaged'` is an internal landing mode
+ * (#2508): `attemptMergeBackFromDirty` remaps a `'merge'` dispatch to it unless
+ * the caller opts into a committed landing — it must never be persisted.
+ */
+export type MergeStrategy = 'merge' | 'rebase' | 'cherry-pick' | 'squash-unstaged';
 export type DependencyPreparationStrategy = 'skip' | 'copy' | 'link';
 /**
  * FR-201: Per-lane runtime profile injected into spawned child processes.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "opencode-swarm",
-	"version": "7.172.4",
+	"version": "7.173.0",
 	"description": "Architect-centric agentic swarm plugin for OpenCode - hub-and-spoke orchestration with SME consultation, code generation, and QA review",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/dist/cli/curator-llm-factory-pchm0j1e.js

@@ -1,72 +0,0 @@
-// @bun
-import {
-  createCuratorLLMDelegate
-} from "./index-fn7ny88p.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-txdagbh7.js";
-import"./index-z2deqhpp.js";
-import"./index-fpbcxykc.js";
-import"./index-zpksgw8w.js";
-import"./index-2negdnww.js";
-import"./index-zfzbn9a7.js";
-import"./index-fyfbpz4f.js";
-import"./index-rxakec16.js";
-import"./index-0hgmsyfp.js";
-import"./index-zsrtt42s.js";
-import"./index-1c119trs.js";
-import"./index-a1187fx5.js";
-import"./index-j7zrvqnf.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-2s7dvzff.js";
-import"./index-her1kqcr.js";
-import"./index-efbdfkw9.js";
-import"./index-rtry5xyf.js";
-import"./index-3rkjybes.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-rdm3px0g.js";
-import"./index-ry16d01s.js";
-import"./index-yxegcfy5.js";
-import"./index-szezqd2a.js";
-import"./index-vzm6zre7.js";
-import"./index-ae75rja9.js";
-import"./index-ksjpc8s8.js";
-import"./index-01mjyjdt.js";
-import"./index-7g4c7s5r.js";
-import"./index-jmn35na4.js";
-import"./index-8p30wyx0.js";
-import"./index-1xnse449.js";
-import"./index-c1ggtmpm.js";
-import"./index-gqkfha6x.js";
-import"./index-0mhftbpp.js";
-import"./index-a1w58b47.js";
-import"./index-d21qcjr6.js";
-import"./index-5frh43fj.js";
-import"./index-bk5tah7q.js";
-import"./index-gknz3bv1.js";
-import"./index-zpsr8rpc.js";
-import"./index-76qm2c2y.js";
-import"./index-yzjaj53h.js";
-import"./index-zgwm4ryv.js";
-import"./index-a76rekgs.js";
-export {
-  createCuratorLLMDelegate
-};

package/dist/cli/guardrail-explain-dmyf8vc9.js

@@ -1,73 +0,0 @@
-// @bun
-import {
-  handleGuardrailExplain
-} from "./index-pkgshf8r.js";
-import"./index-fn7ny88p.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-txdagbh7.js";
-import"./index-z2deqhpp.js";
-import"./index-fpbcxykc.js";
-import"./index-zpksgw8w.js";
-import"./index-2negdnww.js";
-import"./index-zfzbn9a7.js";
-import"./index-fyfbpz4f.js";
-import"./index-rxakec16.js";
-import"./index-0hgmsyfp.js";
-import"./index-zsrtt42s.js";
-import"./index-1c119trs.js";
-import"./index-a1187fx5.js";
-import"./index-j7zrvqnf.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-2s7dvzff.js";
-import"./index-her1kqcr.js";
-import"./index-efbdfkw9.js";
-import"./index-rtry5xyf.js";
-import"./index-3rkjybes.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-rdm3px0g.js";
-import"./index-ry16d01s.js";
-import"./index-yxegcfy5.js";
-import"./index-szezqd2a.js";
-import"./index-vzm6zre7.js";
-import"./index-ae75rja9.js";
-import"./index-ksjpc8s8.js";
-import"./index-01mjyjdt.js";
-import"./index-7g4c7s5r.js";
-import"./index-jmn35na4.js";
-import"./index-8p30wyx0.js";
-import"./index-1xnse449.js";
-import"./index-c1ggtmpm.js";
-import"./index-gqkfha6x.js";
-import"./index-0mhftbpp.js";
-import"./index-a1w58b47.js";
-import"./index-d21qcjr6.js";
-import"./index-5frh43fj.js";
-import"./index-bk5tah7q.js";
-import"./index-gknz3bv1.js";
-import"./index-zpsr8rpc.js";
-import"./index-76qm2c2y.js";
-import"./index-yzjaj53h.js";
-import"./index-zgwm4ryv.js";
-import"./index-a76rekgs.js";
-export {
-  handleGuardrailExplain
-};