swarm-code 0.1.22 → 0.1.23

package/dist/core/rlm.js

@@ -171,6 +171,7 @@ export async function runRlmLoop(options) {
     const { context, query, model, repl, signal, onProgress, onSubQueryStart, onSubQuery, systemPrompt, threadHandler, mergeHandler, } = options;
     let totalSubQueries = 0;
     let iterationSubQueries = 0;
+    let mergedAlready = false;
     const llmQueryHandler = async (subContext, instruction) => {
         if (signal?.aborted)
             throw new Error("Aborted");
@@ -217,7 +218,10 @@ export async function runRlmLoop(options) {
             repl.setThreadHandler(threadHandler);
         }
         if (mergeHandler) {
-            repl.setMergeHandler(mergeHandler);
+            repl.setMergeHandler(async () => {
+                mergedAlready = true;
+                return mergeHandler();
+            });
         }
     }
     await initRepl();
@@ -374,7 +378,7 @@ export async function runRlmLoop(options) {
         });
         if (execResult.hasFinal && execResult.finalValue !== null) {
             // Auto-merge any unmerged thread branches before returning
-            if (mergeHandler) {
+            if (mergeHandler && !mergedAlready) {
                 try {
                     await mergeHandler();
                 }
@@ -422,7 +426,7 @@ export async function runRlmLoop(options) {
         });
     }
     // Auto-merge any remaining thread branches even though FINAL was never called
-    if (mergeHandler) {
+    if (mergeHandler && !mergedAlready) {
         try {
             await mergeHandler();
         }

package/dist/interactive-swarm.js

@@ -757,8 +757,11 @@ export async function runInteractiveSwarm(rawArgs) {
         logError(`Directory "${args.dir}" does not exist`);
         process.exit(1);
     }
-    // First-run onboarding
+    // First-run onboarding (may create ~/.swarm/config.yaml with user's chosen model)
     await runOnboarding();
+    // Reload config to pick up any changes from onboarding
+    // (onboarding writes ~/.swarm/config.yaml but loadConfig() already ran before it)
+    Object.assign(config, loadConfig());
     // Override config with CLI args
     if (args.agent)
         config.default_agent = args.agent;
@@ -960,6 +963,22 @@ export async function runInteractiveSwarm(rawArgs) {
         else if (merged > 0) {
             logSuccess(`Merged ${merged} branches`);
         }
+        // Clean up merged worktrees
+        if (config.auto_cleanup_worktrees) {
+            for (const r of results) {
+                if (r.success) {
+                    const thread = threads.find((t) => t.branchName === r.branch);
+                    if (thread) {
+                        try {
+                            await threadManager.destroyWorktree(thread.id);
+                        }
+                        catch {
+                            // Non-fatal
+                        }
+                    }
+                }
+            }
+        }
         const summary = results
             .map((r) => (r.success ? `Merged ${r.branch}: ${r.message}` : `FAILED ${r.branch}: ${r.message}`))
             .join("\n");

package/dist/threads/manager.d.ts

@@ -80,6 +80,7 @@ export declare class ThreadManager {
     };
     /** Cleanup all worktrees. */
     cleanup(): Promise<void>;
-    private cleanupWorktree;
+    /** Destroy a specific thread's worktree and branch. */
+    destroyWorktree(threadId: string): Promise<void>;
     private failResult;
 }

package/dist/threads/manager.js

@@ -486,7 +486,7 @@ export class ThreadManager {
                 state.status = "cancelled";
                 state.phase = "cancelled";
                 state.completedAt = Date.now();
-                await this.cleanupWorktree(threadId);
+                await this.destroyWorktree(threadId);
                 return this.failResult(state, "Thread cancelled during execution");
             }
             // Capture diff
@@ -570,7 +570,7 @@ export class ThreadManager {
             const { cost } = this.budget.recordCost(threadId, errModel);
             state.estimatedCostUsd = cost;
             // Cleanup worktree on failure
-            await this.cleanupWorktree(threadId);
+            await this.destroyWorktree(threadId);
             return this.failResult(state, errorMsg);
         }
         finally {
@@ -637,7 +637,8 @@ export class ThreadManager {
             await this.worktreeManager.destroyAll();
         }
     }
-    async cleanupWorktree(threadId) {
+    /** Destroy a specific thread's worktree and branch. */
+    async destroyWorktree(threadId) {
         try {
             await this.worktreeManager.destroy(threadId, true);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swarm-code",
-  "version": "0.1.22",
+  "version": "0.1.23",
   "description": "Open-source swarm-native coding agent orchestrator — spawns parallel coding agents in isolated git worktrees, built on RLM (arXiv:2512.24601)",
   "type": "module",
   "bin": {