opencode-swarm 7.58.1 → 7.59.0

package/dist/agents/agent-output-schema.d.ts

@@ -4,10 +4,10 @@ export declare const AgentOutputMemorySchema: z.ZodObject<{
     memoryProposals: z.ZodOptional<z.ZodArray<z.ZodObject<{
         operation: z.ZodEnum<{
             ignore: "ignore";
+            merge: "merge";
             add: "add";
             delete: "delete";
             update: "update";
-            merge: "merge";
             supersede: "supersede";
         }>;
         kind: z.ZodOptional<z.ZodEnum<{

package/dist/cli/index.js

@@ -52,7 +52,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "opencode-swarm",
-    version: "7.58.1",
+    version: "7.59.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",
@@ -18141,9 +18141,9 @@ var init_schema = __esm(() => {
     phase_critic: exports_external.boolean().default(true),
     integrated_diff_required: exports_external.boolean().default(true),
     allow_docs_only_without_reviewer: exports_external.boolean().default(false),
-    worktree_isolation: exports_external.boolean().default(false).refine((val) => val === false, {
-      message: "worktree_isolation: true is not yet implemented. Use false (the default) for in-repo parallel execution. Full worktree isolation will be available in a future release."
-    })
+    worktree_isolation: exports_external.boolean().default(false),
+    merge_strategy: exports_external.enum(["merge", "rebase", "cherry-pick"]).default("merge").optional(),
+    worktree_dir: exports_external.string().optional()
   });
   StandardTurboConfigSchema = exports_external.object({
     strategy: exports_external.literal("standard"),

package/dist/config/constants.d.ts

@@ -74,7 +74,7 @@ export declare const FULL_AUTO_BANNER = "## \u26A1 FULL-AUTO MODE ACTIVE\n\nYou
 /**
  * Canonical default Lean Turbo configuration.
  *
- * This is the single source of truth for all 9 LeanTurboConfig fields.
+ * This is the single source of truth for all LeanTurboConfig fields.
  * Consumers MUST reference this constant instead of hardcoding their own
  * defaults — see v7.4.x config-drift fix (3 of 9 fields disagreed across
  * runner.ts, lean-turbo-plan-lanes.ts, lean-turbo-status.ts, and the

package/dist/config/schema.d.ts

@@ -835,6 +835,12 @@ export declare const LeanTurboConfigSchema: z.ZodObject<{
     integrated_diff_required: z.ZodDefault<z.ZodBoolean>;
     allow_docs_only_without_reviewer: z.ZodDefault<z.ZodBoolean>;
     worktree_isolation: z.ZodDefault<z.ZodBoolean>;
+    merge_strategy: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
+        merge: "merge";
+        rebase: "rebase";
+        "cherry-pick": "cherry-pick";
+    }>>>;
+    worktree_dir: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export type LeanTurboConfig = z.infer<typeof LeanTurboConfigSchema>;
 export declare const StandardTurboConfigSchema: z.ZodObject<{
@@ -852,6 +858,12 @@ export declare const StandardTurboConfigSchema: z.ZodObject<{
         integrated_diff_required: z.ZodDefault<z.ZodBoolean>;
         allow_docs_only_without_reviewer: z.ZodDefault<z.ZodBoolean>;
         worktree_isolation: z.ZodDefault<z.ZodBoolean>;
+        merge_strategy: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
+            merge: "merge";
+            rebase: "rebase";
+            "cherry-pick": "cherry-pick";
+        }>>>;
+        worktree_dir: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export declare const LeanTurboStrategyConfigSchema: z.ZodObject<{
@@ -869,6 +881,12 @@ export declare const LeanTurboStrategyConfigSchema: z.ZodObject<{
         integrated_diff_required: z.ZodDefault<z.ZodBoolean>;
         allow_docs_only_without_reviewer: z.ZodDefault<z.ZodBoolean>;
         worktree_isolation: z.ZodDefault<z.ZodBoolean>;
+        merge_strategy: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
+            merge: "merge";
+            rebase: "rebase";
+            "cherry-pick": "cherry-pick";
+        }>>>;
+        worktree_dir: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>;
 }, z.core.$strip>;
 export declare const TurboConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -886,6 +904,12 @@ export declare const TurboConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
         integrated_diff_required: z.ZodDefault<z.ZodBoolean>;
         allow_docs_only_without_reviewer: z.ZodDefault<z.ZodBoolean>;
         worktree_isolation: z.ZodDefault<z.ZodBoolean>;
+        merge_strategy: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
+            merge: "merge";
+            rebase: "rebase";
+            "cherry-pick": "cherry-pick";
+        }>>>;
+        worktree_dir: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
 }, z.core.$strip>, z.ZodObject<{
     strategy: z.ZodLiteral<"lean">;
@@ -902,6 +926,12 @@ export declare const TurboConfigSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
         integrated_diff_required: z.ZodDefault<z.ZodBoolean>;
         allow_docs_only_without_reviewer: z.ZodDefault<z.ZodBoolean>;
         worktree_isolation: z.ZodDefault<z.ZodBoolean>;
+        merge_strategy: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
+            merge: "merge";
+            rebase: "rebase";
+            "cherry-pick": "cherry-pick";
+        }>>>;
+        worktree_dir: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>;
 }, z.core.$strip>], "strategy">;
 export type TurboConfig = z.infer<typeof TurboConfigSchema>;
@@ -1466,6 +1496,12 @@ export declare const PluginConfigSchema: z.ZodObject<{
             integrated_diff_required: z.ZodDefault<z.ZodBoolean>;
             allow_docs_only_without_reviewer: z.ZodDefault<z.ZodBoolean>;
             worktree_isolation: z.ZodDefault<z.ZodBoolean>;
+            merge_strategy: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
+                merge: "merge";
+                rebase: "rebase";
+                "cherry-pick": "cherry-pick";
+            }>>>;
+            worktree_dir: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>;
     }, z.core.$strip>, z.ZodObject<{
         strategy: z.ZodLiteral<"lean">;
@@ -1482,6 +1518,12 @@ export declare const PluginConfigSchema: z.ZodObject<{
             integrated_diff_required: z.ZodDefault<z.ZodBoolean>;
             allow_docs_only_without_reviewer: z.ZodDefault<z.ZodBoolean>;
             worktree_isolation: z.ZodDefault<z.ZodBoolean>;
+            merge_strategy: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
+                merge: "merge";
+                rebase: "rebase";
+                "cherry-pick": "cherry-pick";
+            }>>>;
+            worktree_dir: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>;
     }, z.core.$strip>], "strategy">>;
     turbo_mode: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;