volute 0.11.1 → 0.11.2

package/dist/{agent-JGO6N7IA.js → agent-ER2OFKWQ.js}

@@ -21,14 +21,14 @@ async function run(args) {
       await import("./delete-BOTVU4YO.js").then((m) => m.run(args.slice(1)));
       break;
     case "list":
-      await import("./status-CTWXP6UW.js").then((m) => m.run(args.slice(1)));
+      await import("./status-QN5G4RRK.js").then((m) => m.run(args.slice(1)));
       break;
     case "status": {
       const rest = args.slice(1);
       if (!rest[0] && process.env.VOLUTE_AGENT) {
         rest.unshift(process.env.VOLUTE_AGENT);
       }
-      await import("./status-CTWXP6UW.js").then((m) => m.run(rest));
+      await import("./status-QN5G4RRK.js").then((m) => m.run(rest));
       break;
     }
     case "logs": {

package/dist/{agent-manager-B6EPBU45.js → agent-manager-RXNMLNUQ.js}

@@ -3,7 +3,7 @@ import {
   AgentManager,
   getAgentManager,
   initAgentManager
-} from "./chunk-ANS3UV23.js";
+} from "./chunk-SJFWB3Q3.js";
 import "./chunk-46S7YHUB.js";
 import "./chunk-QF22MYDJ.js";
 import "./chunk-DP2DX4WV.js";

package/dist/{chunk-4QMF7SNL.js → chunk-COY6TMEK.js}

@@ -4,7 +4,7 @@ import {
   modeLabel,
   pollHealth,
   startService
-} from "./chunk-25GGN3OV.js";
+} from "./chunk-ZKNBD5P3.js";
 import {
   parseArgs
 } from "./chunk-D424ZQGI.js";

package/dist/{chunk-GGLTM53H.js → chunk-RGWADNLT.js}

@@ -5,7 +5,7 @@ import {
   pollHealthDown,
   readDaemonConfig,
   stopService
-} from "./chunk-25GGN3OV.js";
+} from "./chunk-ZKNBD5P3.js";
 import {
   voluteHome
 } from "./chunk-DP2DX4WV.js";

package/dist/{chunk-ANS3UV23.js → chunk-SJFWB3Q3.js}

@@ -19,7 +19,7 @@ import {
 
 // src/lib/agent-manager.ts
 import { execFile, spawn } from "child_process";
-import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync2, rmSync as rmSync2, symlinkSync, writeFileSync as writeFileSync2 } from "fs";
+import { copyFileSync, existsSync as existsSync3, mkdirSync, readFileSync as readFileSync2, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
 import { resolve } from "path";
 import { promisify } from "util";
 
@@ -197,7 +197,7 @@ var AgentManager = class {
       VOLUTE_AGENT_PORT: String(port)
     };
     if (isIsolationEnabled() && process.env.CLAUDE_CONFIG_DIR) {
-      const agentClaudeDir = resolve(dir, ".claude-config");
+      const agentClaudeDir = resolve(dir, ".claude");
       try {
         mkdirSync(agentClaudeDir, { recursive: true });
       } catch (err) {
@@ -208,14 +208,12 @@ var AgentManager = class {
       const sharedCreds = resolve(process.env.CLAUDE_CONFIG_DIR, ".credentials.json");
       const agentCreds = resolve(agentClaudeDir, ".credentials.json");
       if (existsSync3(sharedCreds)) {
-        if (!existsSync3(agentCreds)) {
-          try {
-            symlinkSync(sharedCreds, agentCreds);
-          } catch (err) {
-            console.error(
-              `[daemon] failed to symlink credentials for ${name}: ${err instanceof Error ? err.message : err}`
-            );
-          }
+        try {
+          copyFileSync(sharedCreds, agentCreds);
+        } catch (err) {
+          throw new Error(
+            `Cannot start agent ${name}: failed to copy credentials to ${agentClaudeDir}: ${err instanceof Error ? err.message : err}`
+          );
         }
       } else {
         console.warn(

package/dist/{chunk-5C5JWR2L.js → chunk-WTJI3JVR.js}

@@ -19,6 +19,10 @@ function exec(cmd, args, options) {
     );
   });
 }
+function gitExec(args, options) {
+  const fullArgs = process.env.VOLUTE_ISOLATION === "user" ? ["-c", `safe.directory=${options.cwd}`, ...args] : args;
+  return exec("git", fullArgs, options);
+}
 function resolveVoluteBin() {
   try {
     return execFileSync("which", ["volute"], { encoding: "utf-8" }).trim();
@@ -45,6 +49,7 @@ function execInherit(cmd, args, options) {
 
 export {
   exec,
+  gitExec,
   resolveVoluteBin,
   execInherit
 };

package/dist/{chunk-25GGN3OV.js → chunk-ZKNBD5P3.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   execInherit
-} from "./chunk-5C5JWR2L.js";
+} from "./chunk-WTJI3JVR.js";
 import {
   voluteHome
 } from "./chunk-DP2DX4WV.js";

package/dist/cli.js

@@ -9,13 +9,13 @@ if (!process.env.VOLUTE_HOME) {
 var command = process.argv[2];
 var args = process.argv.slice(3);
 if (command === "--version" || command === "-v") {
-  const { default: pkg } = await import("./package-7NO4W4WX.js");
+  const { default: pkg } = await import("./package-6P4FEQHC.js");
   console.log(pkg.version);
   process.exit(0);
 }
 switch (command) {
   case "agent":
-    await import("./agent-JGO6N7IA.js").then((m) => m.run(args));
+    await import("./agent-ER2OFKWQ.js").then((m) => m.run(args));
     break;
   case "send":
     await import("./send-X6OQGSD6.js").then((m) => m.run(args));
@@ -39,25 +39,25 @@ switch (command) {
     await import("./env-CGORIKVF.js").then((m) => m.run(args));
     break;
   case "up":
-    await import("./up-IY5M3Q35.js").then((m) => m.run(args));
+    await import("./up-AZ5TUREI.js").then((m) => m.run(args));
     break;
   case "down":
-    await import("./down-XV2OQJ7O.js").then((m) => m.run(args));
+    await import("./down-O2EQJ5DO.js").then((m) => m.run(args));
     break;
   case "restart":
-    await import("./daemon-restart-UCUNJ4AD.js").then((m) => m.run(args));
+    await import("./daemon-restart-YITZ6Y2E.js").then((m) => m.run(args));
     break;
   case "setup":
-    await import("./setup-GMZOD52B.js").then((m) => m.run(args));
+    await import("./setup-7N4KYOYN.js").then((m) => m.run(args));
     break;
   case "service":
-    await import("./service-U6SN5OZO.js").then((m) => m.run(args));
+    await import("./service-UL3OCODG.js").then((m) => m.run(args));
     break;
   case "update":
-    await import("./update-BPKQX5OY.js").then((m) => m.run(args));
+    await import("./update-EZNCCKXS.js").then((m) => m.run(args));
     break;
   case "status":
-    await import("./status-CTWXP6UW.js").then((m) => m.run(args));
+    await import("./status-QN5G4RRK.js").then((m) => m.run(args));
     break;
   case "--help":
   case "-h":

package/dist/{daemon-restart-UCUNJ4AD.js → daemon-restart-YITZ6Y2E.js}

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
 import {
   run
-} from "./chunk-4QMF7SNL.js";
+} from "./chunk-COY6TMEK.js";
 import {
   stopDaemon
-} from "./chunk-GGLTM53H.js";
+} from "./chunk-RGWADNLT.js";
 import {
   getServiceMode,
   modeLabel,
   pollHealth,
   readDaemonConfig,
   restartService
-} from "./chunk-25GGN3OV.js";
-import "./chunk-5C5JWR2L.js";
+} from "./chunk-ZKNBD5P3.js";
+import "./chunk-WTJI3JVR.js";
 import "./chunk-D424ZQGI.js";
 import "./chunk-DP2DX4WV.js";
 import "./chunk-K3NQKI34.js";

package/dist/daemon.js

@@ -6,7 +6,7 @@ import {
   initAgentManager,
   loadJsonMap,
   saveJsonMap
-} from "./chunk-ANS3UV23.js";
+} from "./chunk-SJFWB3Q3.js";
 import {
   applyIsolation,
   chownAgentDir,
@@ -37,8 +37,9 @@ import {
 } from "./chunk-LIPPXNIE.js";
 import {
   exec,
+  gitExec,
   resolveVoluteBin
-} from "./chunk-5C5JWR2L.js";
+} from "./chunk-WTJI3JVR.js";
 import {
   checkForUpdate,
   checkForUpdateCached,
@@ -1604,23 +1605,23 @@ var TEMPLATE_BRANCH = "volute/template";
 async function initTemplateBranch(projectRoot, composedDir, manifest, ids, env) {
   const templateFiles = listFiles(composedDir).filter((f) => !f.startsWith(".init/") && !f.startsWith(".init\\")).map((f) => manifest.rename[f] ?? f);
   const opts = { cwd: projectRoot, uid: ids?.uid, gid: ids?.gid, env };
-  await exec("git", ["checkout", "--orphan", TEMPLATE_BRANCH], opts);
-  await exec("git", ["add", "--", ...templateFiles], opts);
-  await exec("git", ["commit", "-m", "template update"], opts);
-  await exec("git", ["checkout", "-b", "main"], opts);
-  await exec("git", ["add", "-A"], opts);
-  await exec("git", ["commit", "-m", "initial commit"], opts);
+  await gitExec(["checkout", "--orphan", TEMPLATE_BRANCH], opts);
+  await gitExec(["add", "--", ...templateFiles], opts);
+  await gitExec(["commit", "-m", "template update"], opts);
+  await gitExec(["checkout", "-b", "main"], opts);
+  await gitExec(["add", "-A"], opts);
+  await gitExec(["commit", "-m", "initial commit"], opts);
 }
 async function updateTemplateBranch(projectRoot, template, agentName) {
   const tempWorktree = resolve9(projectRoot, ".variants", "_template_update");
   let branchExists = false;
   try {
-    await exec("git", ["rev-parse", "--verify", TEMPLATE_BRANCH], { cwd: projectRoot });
+    await gitExec(["rev-parse", "--verify", TEMPLATE_BRANCH], { cwd: projectRoot });
     branchExists = true;
   } catch {
   }
   try {
-    await exec("git", ["worktree", "remove", "--force", tempWorktree], { cwd: projectRoot });
+    await gitExec(["worktree", "remove", "--force", tempWorktree], { cwd: projectRoot });
   } catch {
   }
   if (existsSync6(tempWorktree)) {
@@ -1630,17 +1631,17 @@ async function updateTemplateBranch(projectRoot, template, agentName) {
   const { composedDir, manifest } = composeTemplate(templatesRoot, template);
   try {
     if (branchExists) {
-      await exec("git", ["worktree", "add", tempWorktree, TEMPLATE_BRANCH], {
+      await gitExec(["worktree", "add", tempWorktree, TEMPLATE_BRANCH], {
         cwd: projectRoot
       });
     } else {
-      await exec("git", ["worktree", "add", "--detach", tempWorktree], { cwd: projectRoot });
-      await exec("git", ["checkout", "--orphan", TEMPLATE_BRANCH], { cwd: tempWorktree });
-      await exec("git", ["rm", "-rf", "--cached", "."], { cwd: tempWorktree });
-      await exec("git", ["clean", "-fd"], { cwd: tempWorktree });
+      await gitExec(["worktree", "add", "--detach", tempWorktree], { cwd: projectRoot });
+      await gitExec(["checkout", "--orphan", TEMPLATE_BRANCH], { cwd: tempWorktree });
+      await gitExec(["rm", "-rf", "--cached", "."], { cwd: tempWorktree });
+      await gitExec(["clean", "-fd"], { cwd: tempWorktree });
     }
     if (branchExists) {
-      await exec("git", ["rm", "-rf", "."], { cwd: tempWorktree }).catch(() => {
+      await gitExec(["rm", "-rf", "."], { cwd: tempWorktree }).catch(() => {
       });
     }
     copyTemplateToDir(composedDir, tempWorktree, agentName, manifest);
@@ -1648,15 +1649,15 @@ async function updateTemplateBranch(projectRoot, template, agentName) {
     if (existsSync6(initDir)) {
       rmSync2(initDir, { recursive: true, force: true });
     }
-    await exec("git", ["add", "-A"], { cwd: tempWorktree });
+    await gitExec(["add", "-A"], { cwd: tempWorktree });
     try {
-      await exec("git", ["diff", "--cached", "--quiet"], { cwd: tempWorktree });
+      await gitExec(["diff", "--cached", "--quiet"], { cwd: tempWorktree });
     } catch {
-      await exec("git", ["commit", "-m", "template update"], { cwd: tempWorktree });
+      await gitExec(["commit", "-m", "template update"], { cwd: tempWorktree });
     }
   } finally {
     try {
-      await exec("git", ["worktree", "remove", "--force", tempWorktree], { cwd: projectRoot });
+      await gitExec(["worktree", "remove", "--force", tempWorktree], { cwd: projectRoot });
     } catch {
     }
     if (existsSync6(tempWorktree)) {
@@ -1667,15 +1668,14 @@ async function updateTemplateBranch(projectRoot, template, agentName) {
 }
 async function mergeTemplateBranch(worktreeDir) {
   try {
-    await exec(
-      "git",
+    await gitExec(
       ["merge", TEMPLATE_BRANCH, "--allow-unrelated-histories", "-m", "merge template update"],
       { cwd: worktreeDir }
     );
     return false;
   } catch (e) {
     try {
-      const status = await exec("git", ["status", "--porcelain"], { cwd: worktreeDir });
+      const status = await gitExec(["status", "--porcelain"], { cwd: worktreeDir });
       const hasConflictMarkers = status.split("\n").some((line) => line.startsWith("UU") || line.startsWith("AA"));
       if (hasConflictMarkers) return true;
     } catch {
@@ -1712,7 +1712,7 @@ var app = new Hono().post("/", requireAdmin, async (c) => {
     await exec("npm", ["install"], { cwd: dest, uid: ids?.uid, gid: ids?.gid, env });
     let gitWarning;
     try {
-      await exec("git", ["init"], { cwd: dest, uid: ids?.uid, gid: ids?.gid, env });
+      await gitExec(["init"], { cwd: dest, uid: ids?.uid, gid: ids?.gid, env });
       await initTemplateBranch(dest, composedDir, manifest, ids, env);
     } catch {
       rmSync2(resolve9(dest, ".git"), { recursive: true, force: true });
@@ -1809,9 +1809,9 @@ ${user.trimEnd()}
     if (!hasMemory && dailyLogCount > 0) {
       await consolidateMemory(dest);
     }
-    await exec("git", ["init"], { cwd: dest, uid: ids?.uid, gid: ids?.gid, env });
-    await exec("git", ["add", "-A"], { cwd: dest, uid: ids?.uid, gid: ids?.gid, env });
-    await exec("git", ["commit", "-m", "import from OpenClaw"], {
+    await gitExec(["init"], { cwd: dest, uid: ids?.uid, gid: ids?.gid, env });
+    await gitExec(["add", "-A"], { cwd: dest, uid: ids?.uid, gid: ids?.gid, env });
+    await gitExec(["commit", "-m", "import from OpenClaw"], {
       cwd: dest,
       uid: ids?.uid,
       gid: ids?.gid,
@@ -1932,15 +1932,13 @@ ${user.trimEnd()}
       if (variant) {
         const projectRoot = agentDir(baseName);
         if (existsSync6(variant.path)) {
-          const status = (await exec("git", ["status", "--porcelain"], { cwd: variant.path })).trim();
+          const status = (await gitExec(["status", "--porcelain"], { cwd: variant.path })).trim();
           if (status) {
             try {
-              await exec("git", ["add", "-A"], { cwd: variant.path });
-              await exec(
-                "git",
-                ["commit", "-m", "Auto-commit uncommitted changes before merge"],
-                { cwd: variant.path }
-              );
+              await gitExec(["add", "-A"], { cwd: variant.path });
+              await gitExec(["commit", "-m", "Auto-commit uncommitted changes before merge"], {
+                cwd: variant.path
+              });
             } catch (e) {
               console.error(
                 `[daemon] failed to auto-commit variant worktree for ${baseName}:`,
@@ -1949,28 +1947,28 @@ ${user.trimEnd()}
             }
           }
         }
-        const mainStatus = (await exec("git", ["status", "--porcelain"], { cwd: projectRoot })).trim();
+        const mainStatus = (await gitExec(["status", "--porcelain"], { cwd: projectRoot })).trim();
         if (mainStatus) {
           try {
-            await exec("git", ["add", "-A"], { cwd: projectRoot });
-            await exec("git", ["commit", "-m", "Auto-commit uncommitted changes before merge"], {
+            await gitExec(["add", "-A"], { cwd: projectRoot });
+            await gitExec(["commit", "-m", "Auto-commit uncommitted changes before merge"], {
               cwd: projectRoot
             });
           } catch (e) {
             console.error(`[daemon] failed to auto-commit main worktree for ${baseName}:`, e);
           }
         }
-        await exec("git", ["merge", variant.branch], { cwd: projectRoot });
+        await gitExec(["merge", variant.branch], { cwd: projectRoot });
         if (existsSync6(variant.path)) {
           try {
-            await exec("git", ["worktree", "remove", "--force", variant.path], {
+            await gitExec(["worktree", "remove", "--force", variant.path], {
               cwd: projectRoot
             });
           } catch {
           }
         }
         try {
-          await exec("git", ["branch", "-D", variant.branch], { cwd: projectRoot });
+          await gitExec(["branch", "-D", variant.branch], { cwd: projectRoot });
         } catch {
         }
         removeVariant(baseName, mergeVariantName);
@@ -1979,6 +1977,7 @@ ${user.trimEnd()}
         } catch (e) {
           console.error(`[daemon] npm install failed after merge for ${baseName}:`, e);
         }
+        chownAgentDir(projectRoot, baseName);
       }
     }
     if (context) {
@@ -2055,14 +2054,14 @@ ${user.trimEnd()}
     if (!existsSync6(worktreeDir2)) {
       return c.json({ error: "No upgrade in progress" }, 400);
     }
-    const status = await exec("git", ["status", "--porcelain"], { cwd: worktreeDir2 });
+    const status = await gitExec(["status", "--porcelain"], { cwd: worktreeDir2 });
     const hasConflicts2 = status.split("\n").some((line) => line.startsWith("UU") || line.startsWith("AA"));
     if (hasConflicts2) {
       return c.json({ error: "Unresolved conflicts remain" }, 409);
     }
     try {
-      await exec("git", ["add", "-A"], { cwd: worktreeDir2 });
-      await exec("git", ["commit", "--no-edit"], { cwd: worktreeDir2 });
+      await gitExec(["add", "-A"], { cwd: worktreeDir2 });
+      await gitExec(["commit", "--no-edit"], { cwd: worktreeDir2 });
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       if (!msg.includes("nothing to commit")) throw e;
@@ -2077,6 +2076,7 @@ ${user.trimEnd()}
         port: variantPort,
         created: (/* @__PURE__ */ new Date()).toISOString()
       });
+      chownAgentDir(dir, agentName);
       await getAgentManager().startAgent(`${agentName}@${UPGRADE_VARIANT}`);
       return c.json({
         ok: true,
@@ -2090,13 +2090,21 @@ ${user.trimEnd()}
       } catch {
       }
       try {
-        await exec("git", ["worktree", "remove", "--force", worktreeDir2], { cwd: dir });
+        await gitExec(["worktree", "remove", "--force", worktreeDir2], { cwd: dir });
       } catch {
       }
       try {
-        await exec("git", ["branch", "-D", UPGRADE_VARIANT], { cwd: dir });
+        await gitExec(["branch", "-D", UPGRADE_VARIANT], { cwd: dir });
       } catch {
       }
+      try {
+        chownAgentDir(dir, agentName);
+      } catch (chownErr) {
+        console.error(
+          `[daemon] failed to fix ownership during upgrade cleanup for ${agentName}:`,
+          chownErr
+        );
+      }
       return c.json(
         { error: err instanceof Error ? err.message : "Failed to continue upgrade" },
         500
@@ -2110,9 +2118,9 @@ ${user.trimEnd()}
       409
     );
   }
-  await exec("git", ["worktree", "prune"], { cwd: dir });
+  await gitExec(["worktree", "prune"], { cwd: dir });
   try {
-    await exec("git", ["branch", "-D", UPGRADE_VARIANT], { cwd: dir });
+    await gitExec(["branch", "-D", UPGRADE_VARIANT], { cwd: dir });
   } catch {
   }
   await updateTemplateBranch(dir, template, agentName);
@@ -2120,8 +2128,9 @@ ${user.trimEnd()}
   if (!existsSync6(parentDir)) {
     mkdirSync5(parentDir, { recursive: true });
   }
-  await exec("git", ["worktree", "add", "-b", UPGRADE_VARIANT, worktreeDir], { cwd: dir });
+  await gitExec(["worktree", "add", "-b", UPGRADE_VARIANT, worktreeDir], { cwd: dir });
   const hasConflicts = await mergeTemplateBranch(worktreeDir);
+  chownAgentDir(dir, agentName);
   if (hasConflicts) {
     return c.json({
       ok: false,
@@ -2140,6 +2149,7 @@ ${user.trimEnd()}
       port: variantPort,
       created: (/* @__PURE__ */ new Date()).toISOString()
     });
+    chownAgentDir(dir, agentName);
     await getAgentManager().startAgent(`${agentName}@${UPGRADE_VARIANT}`);
     return c.json({
       ok: true,
@@ -2153,13 +2163,21 @@ ${user.trimEnd()}
     } catch {
     }
     try {
-      await exec("git", ["worktree", "remove", "--force", worktreeDir], { cwd: dir });
+      await gitExec(["worktree", "remove", "--force", worktreeDir], { cwd: dir });
     } catch {
     }
     try {
-      await exec("git", ["branch", "-D", UPGRADE_VARIANT], { cwd: dir });
+      await gitExec(["branch", "-D", UPGRADE_VARIANT], { cwd: dir });
     } catch {
     }
+    try {
+      chownAgentDir(dir, agentName);
+    } catch (chownErr) {
+      console.error(
+        `[daemon] failed to fix ownership during upgrade cleanup for ${agentName}:`,
+        chownErr
+      );
+    }
     return c.json(
       { error: err instanceof Error ? err.message : "Failed to complete upgrade" },
       500
@@ -3035,7 +3053,7 @@ var app12 = new Hono12().get("/:name/variants", async (c) => {
   }
   mkdirSync7(resolve13(projectRoot, ".variants"), { recursive: true });
   try {
-    await exec("git", ["worktree", "add", "-b", variantName, variantDir], { cwd: projectRoot });
+    await gitExec(["worktree", "add", "-b", variantName, variantDir], { cwd: projectRoot });
   } catch (e) {
     const msg = e instanceof Error ? e.message : String(e);
     return c.json({ error: `Failed to create worktree: ${msg}` }, 500);
@@ -3058,6 +3076,7 @@ var app12 = new Hono12().get("/:name/variants", async (c) => {
     created: (/* @__PURE__ */ new Date()).toISOString()
   };
   addVariant(agentName, variant);
+  chownAgentDir(projectRoot, agentName);
   if (!body.noStart) {
     try {
       await getAgentManager().startAgent(`${agentName}@${variantName}`);
@@ -3086,11 +3105,11 @@ var app12 = new Hono12().get("/:name/variants", async (c) => {
   }
   const projectRoot = agentDir(agentName);
   if (existsSync9(variant.path)) {
-    const status = (await exec("git", ["status", "--porcelain"], { cwd: variant.path })).trim();
+    const status = (await gitExec(["status", "--porcelain"], { cwd: variant.path })).trim();
     if (status) {
       try {
-        await exec("git", ["add", "-A"], { cwd: variant.path });
-        await exec("git", ["commit", "-m", "Auto-commit uncommitted changes before merge"], {
+        await gitExec(["add", "-A"], { cwd: variant.path });
+        await gitExec(["commit", "-m", "Auto-commit uncommitted changes before merge"], {
           cwd: variant.path
         });
       } catch (e) {
@@ -3123,11 +3142,11 @@ var app12 = new Hono12().get("/:name/variants", async (c) => {
       );
     }
   }
-  const mainStatus = (await exec("git", ["status", "--porcelain"], { cwd: projectRoot })).trim();
+  const mainStatus = (await gitExec(["status", "--porcelain"], { cwd: projectRoot })).trim();
   if (mainStatus) {
     try {
-      await exec("git", ["add", "-A"], { cwd: projectRoot });
-      await exec("git", ["commit", "-m", "Auto-commit uncommitted changes before merge"], {
+      await gitExec(["add", "-A"], { cwd: projectRoot });
+      await gitExec(["commit", "-m", "Auto-commit uncommitted changes before merge"], {
         cwd: projectRoot
       });
     } catch (e) {
@@ -3138,18 +3157,18 @@ var app12 = new Hono12().get("/:name/variants", async (c) => {
     }
   }
   try {
-    await exec("git", ["merge", variant.branch], { cwd: projectRoot });
+    await gitExec(["merge", variant.branch], { cwd: projectRoot });
   } catch (e) {
     return c.json({ error: "Merge failed. Resolve conflicts manually." }, 500);
   }
   if (existsSync9(variant.path)) {
     try {
-      await exec("git", ["worktree", "remove", "--force", variant.path], { cwd: projectRoot });
+      await gitExec(["worktree", "remove", "--force", variant.path], { cwd: projectRoot });
     } catch {
     }
   }
   try {
-    await exec("git", ["branch", "-D", variant.branch], { cwd: projectRoot });
+    await gitExec(["branch", "-D", variant.branch], { cwd: projectRoot });
   } catch {
   }
   removeVariant(agentName, variantName);
@@ -3157,6 +3176,7 @@ var app12 = new Hono12().get("/:name/variants", async (c) => {
     await exec("npm", ["install"], { cwd: projectRoot });
   } catch {
   }
+  chownAgentDir(projectRoot, agentName);
   const manager = getAgentManager();
   const context = {
     type: "merged",
@@ -3195,15 +3215,16 @@ var app12 = new Hono12().get("/:name/variants", async (c) => {
   }
   if (existsSync9(variant.path)) {
     try {
-      await exec("git", ["worktree", "remove", "--force", variant.path], { cwd: projectRoot });
+      await gitExec(["worktree", "remove", "--force", variant.path], { cwd: projectRoot });
     } catch {
     }
   }
   try {
-    await exec("git", ["branch", "-D", variant.branch], { cwd: projectRoot });
+    await gitExec(["branch", "-D", variant.branch], { cwd: projectRoot });
   } catch {
   }
   removeVariant(agentName, variantName);
+  chownAgentDir(projectRoot, agentName);
   return c.json({ ok: true });
 });
 var variants_default = app12;
@@ -3501,7 +3522,7 @@ var app13 = new Hono13().post("/:name/chat", zValidator3("json", chatSchema), as
   const participants = await getParticipants(conversationId);
   const agentParticipants = participants.filter((p) => p.userType === "agent");
   const participantNames = participants.map((p) => p.username);
-  const { getAgentManager: getAgentManager2 } = await import("./agent-manager-B6EPBU45.js");
+  const { getAgentManager: getAgentManager2 } = await import("./agent-manager-RXNMLNUQ.js");
   const manager = getAgentManager2();
   const runningAgents = agentParticipants.map((ap) => {
     const agentKey = ap.username === baseName ? name : ap.username;

package/dist/{down-XV2OQJ7O.js → down-O2EQJ5DO.js}

@@ -2,9 +2,9 @@
 import {
   run,
   stopDaemon
-} from "./chunk-GGLTM53H.js";
-import "./chunk-25GGN3OV.js";
-import "./chunk-5C5JWR2L.js";
+} from "./chunk-RGWADNLT.js";
+import "./chunk-ZKNBD5P3.js";
+import "./chunk-WTJI3JVR.js";
 import "./chunk-DP2DX4WV.js";
 import "./chunk-K3NQKI34.js";
 export {

package/dist/{package-7NO4W4WX.js → package-6P4FEQHC.js}

@@ -4,7 +4,7 @@ import "./chunk-K3NQKI34.js";
 // package.json
 var package_default = {
   name: "volute",
-  version: "0.11.1",
+  version: "0.11.2",
   description: "CLI for creating and managing self-modifying AI agents powered by the Claude Agent SDK",
   type: "module",
   license: "MIT",

package/dist/{service-U6SN5OZO.js → service-UL3OCODG.js}

@@ -4,10 +4,10 @@ import {
   LAUNCHD_PLIST_PATH,
   SYSTEM_SERVICE_PATH,
   USER_SYSTEMD_UNIT
-} from "./chunk-25GGN3OV.js";
+} from "./chunk-ZKNBD5P3.js";
 import {
   resolveVoluteBin
-} from "./chunk-5C5JWR2L.js";
+} from "./chunk-WTJI3JVR.js";
 import {
   parseArgs
 } from "./chunk-D424ZQGI.js";

package/dist/{setup-GMZOD52B.js → setup-7N4KYOYN.js}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import {
   SYSTEM_SERVICE_PATH
-} from "./chunk-25GGN3OV.js";
+} from "./chunk-ZKNBD5P3.js";
 import {
   ensureVoluteGroup
 } from "./chunk-46S7YHUB.js";
 import {
   resolveVoluteBin
-} from "./chunk-5C5JWR2L.js";
+} from "./chunk-WTJI3JVR.js";
 import {
   parseArgs
 } from "./chunk-D424ZQGI.js";

package/dist/{status-CTWXP6UW.js → status-QN5G4RRK.js}

@@ -4,8 +4,8 @@ import {
   getServiceMode,
   modeLabel,
   readDaemonConfig
-} from "./chunk-25GGN3OV.js";
-import "./chunk-5C5JWR2L.js";
+} from "./chunk-ZKNBD5P3.js";
+import "./chunk-WTJI3JVR.js";
 import {
   checkForUpdate
 } from "./chunk-RT6Y7AR3.js";

package/dist/{up-IY5M3Q35.js → up-AZ5TUREI.js}

@@ -2,9 +2,9 @@
 import {
   readGlobalConfig,
   run
-} from "./chunk-4QMF7SNL.js";
-import "./chunk-25GGN3OV.js";
-import "./chunk-5C5JWR2L.js";
+} from "./chunk-COY6TMEK.js";
+import "./chunk-ZKNBD5P3.js";
+import "./chunk-WTJI3JVR.js";
 import "./chunk-D424ZQGI.js";
 import "./chunk-DP2DX4WV.js";
 import "./chunk-K3NQKI34.js";

package/dist/{update-BPKQX5OY.js → update-EZNCCKXS.js}

@@ -5,12 +5,12 @@ import {
   pollHealth,
   readDaemonConfig,
   restartService
-} from "./chunk-25GGN3OV.js";
+} from "./chunk-ZKNBD5P3.js";
 import {
   exec,
   execInherit,
   resolveVoluteBin
-} from "./chunk-5C5JWR2L.js";
+} from "./chunk-WTJI3JVR.js";
 import {
   checkForUpdate
 } from "./chunk-RT6Y7AR3.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "volute",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "CLI for creating and managing self-modifying AI agents powered by the Claude Agent SDK",
   "type": "module",
   "license": "MIT",