volute 0.53.0 → 0.54.0

package/dist/daemon.js

@@ -6,7 +6,7 @@ import {
   readBackupState,
   resticVersion,
   runBackup
-} from "./chunk-EDR47UE2.js";
+} from "./chunk-OYF25B62.js";
 import {
   acceptPending,
   formatFileSize,
@@ -15,15 +15,15 @@ import {
   stageFile,
   validateFilePath
 } from "./chunk-F6D766VQ.js";
+import {
+  getMemoryStatus
+} from "./chunk-5RBEEAKW.js";
 import {
   findOpenClawSession,
   importOpenClawConnectors,
   importPiSession,
   parseNameFromIdentity
 } from "./chunk-I7U5EEZC.js";
-import {
-  getMemoryStatus
-} from "./chunk-5RBEEAKW.js";
 import {
   checkForUpdate,
   checkForUpdateCached,
@@ -32,13 +32,25 @@ import {
 import {
   SPIRIT_NOTICE_PREFIX,
   ensureSpiritAvailable
-} from "./chunk-P2TBUKLW.js";
+} from "./chunk-LKUGUQUW.js";
 import {
-  isHomeOnlyArchive
-} from "./chunk-FLIEXG2T.js";
-import {
-  evaluateSeedChecklist
-} from "./chunk-RMADJFA7.js";
+  TEMPLATE_BRANCH,
+  UpgradeInProgressError,
+  VariantMergeError,
+  abortUpgrade,
+  configureGitIdentity,
+  continueUpgrade,
+  findUnresolvedHomeFiles,
+  formatUnresolvedHomeFilesMessage,
+  getUpgradeBlocked,
+  mergeVariantExcludingMemory,
+  npmInstallAsMind,
+  npmInstallNeeded,
+  runUpgrade,
+  upgradeDiff,
+  upgradeInProgress,
+  validateBranchName
+} from "./chunk-OT5SXF7L.js";
 import {
   isTemplateStale
 } from "./chunk-CV6BNGFK.js";
@@ -47,14 +59,20 @@ import {
 } from "./chunk-HTRSSOHY.js";
 import {
   cleanupVariant
-} from "./chunk-UO4MZQNO.js";
+} from "./chunk-OGPVJ53N.js";
+import {
+  isHomeOnlyArchive
+} from "./chunk-FLIEXG2T.js";
+import {
+  evaluateSeedChecklist
+} from "./chunk-CLCHOXLR.js";
 import {
   PLATFORMS,
   echoTextToChannel,
   fixModelEscapes,
   getPlatformDriver,
   routeOutboundBridge
-} from "./chunk-7ARONCZW.js";
+} from "./chunk-ATZF2RNJ.js";
 import {
   getBridgeConfig,
   readBridgesConfig,
@@ -97,6 +115,7 @@ import {
   loadAllExtensions,
   notifyExtensionsDaemonStart,
   notifyExtensionsDaemonStop,
+  notifyExtensionsSpiritReady,
   readSystemsConfig,
   recordOutbound,
   requireAdmin,
@@ -109,11 +128,10 @@ import {
   uninstallNpmExtension,
   willGateMessage,
   writeSystemsConfig
-} from "./chunk-HASADR3E.js";
-import "./chunk-5DBGQBQR.js";
+} from "./chunk-LGXVGIWN.js";
+import "./chunk-RGHF3OK5.js";
 import {
   applyInitFiles,
-  applyTemplateHomeFiles,
   composeTemplate,
   copyTemplateToDir,
   findTemplatesRoot,
@@ -123,11 +141,12 @@ import {
 import {
   getScheduler,
   initScheduler
-} from "./chunk-PIZDPY4G.js";
+} from "./chunk-444RR3YF.js";
 import {
   recordDeliveryFailure
-} from "./chunk-UTKUO2KY.js";
+} from "./chunk-3LHUXY3E.js";
 import {
+  UnknownChannelError,
   checkStaleSend,
   formatHoldNotice,
   getDeliveryManager,
@@ -135,7 +154,7 @@ import {
   initDeliveryManager,
   isConversationId,
   publishTypingForChannels
-} from "./chunk-RQRO6PC7.js";
+} from "./chunk-VDUCLVZI.js";
 import {
   MindStartupError,
   RestartTracker,
@@ -145,10 +164,10 @@ import {
   initMindManager,
   syncProviderToMinds,
   tryGetMindManager
-} from "./chunk-23UJGVYP.js";
+} from "./chunk-WHL6PKYP.js";
 import {
   extractTextContent
-} from "./chunk-UDZLPR34.js";
+} from "./chunk-YSRYCS3N.js";
 import {
   SYSTEM_MIND,
   assignSession,
@@ -170,7 +189,7 @@ import {
   takeErrored,
   trackToolUse,
   utcDateTimeStr
-} from "./chunk-VDZ4I4ZP.js";
+} from "./chunk-56IT2ZXF.js";
 import {
   SEED_SKILLS,
   STANDARD_SKILLS,
@@ -184,7 +203,6 @@ import {
   listFilesRecursive,
   listMindSkills,
   listSharedSkills,
-  migrateSkillsToTemplate,
   mindSkillsDir,
   publishSkill,
   removeSharedSkill,
@@ -192,7 +210,7 @@ import {
   syncBuiltinSkills,
   uninstallSkill,
   updateSkill
-} from "./chunk-TAWRJ24T.js";
+} from "./chunk-PPSN2MLC.js";
 import {
   approveUser,
   changePassword,
@@ -229,7 +247,7 @@ import {
   listEvents,
   parseMeta,
   recordNotice
-} from "./chunk-IQ7VNWH6.js";
+} from "./chunk-HKGYZVWN.js";
 import {
   publish as publish2,
   subscribe as subscribe2,
@@ -242,7 +260,7 @@ import {
   getPrompt,
   getPromptIfCustom,
   substitute
-} from "./chunk-AP2KQMMW.js";
+} from "./chunk-OAYY3WF3.js";
 import {
   isSandboxEnabled,
   wrapForSandbox
@@ -305,7 +323,7 @@ import {
   readVoluteConfig,
   writeVoluteConfig
 } from "./chunk-WCFSBH33.js";
-import "./chunk-6NLW72HP.js";
+import "./chunk-CKPAVQNK.js";
 import {
   chownMindDir,
   chownMindFile,
@@ -317,7 +335,7 @@ import {
   isIsolationEnabled,
   resolveVoluteBin,
   wrapForIsolation
-} from "./chunk-M77B73VV.js";
+} from "./chunk-OIOW3FPT.js";
 import {
   loadMergedEnv,
   mindEnvPath,
@@ -382,7 +400,6 @@ import {
   resolveMindDir,
   setMindRunning,
   setMindStage,
-  setMindTemplate,
   setMindTemplateHash,
   stateDir,
   validateMindName,
@@ -409,7 +426,7 @@ import "./chunk-K3NQKI34.js";
 import { randomBytes as randomBytes3 } from "crypto";
 import { chmodSync, mkdirSync as mkdirSync10, readFileSync as readFileSync12, unlinkSync as unlinkSync2, writeFileSync as writeFileSync11 } from "fs";
 import { homedir as homedir3 } from "os";
-import { resolve as resolve20 } from "path";
+import { resolve as resolve18 } from "path";
 import { format } from "util";
 
 // packages/daemon/src/lib/daemon/backup-manager.ts
@@ -520,7 +537,7 @@ var BackupManager = class {
     } catch (pubErr) {
       blog.error("failed to publish backup-failure activity", logger_default.errorData(pubErr));
     }
-    const { deliverEvent: deliverEvent2 } = await import("./system-events-YTOU66QI.js");
+    const { deliverEvent: deliverEvent2 } = await import("./system-events-Q7IVZ5T4.js");
     await deliverEvent2(getSpiritName(), {
       type: "notice",
       meta: { subtype: "backup" },
@@ -744,8 +761,8 @@ var BridgeManager = class {
     if (!tracked) return;
     this.stopping.add(platform);
     this.bridges.delete(platform);
-    await new Promise((resolve21) => {
-      tracked.child.on("exit", () => resolve21());
+    await new Promise((resolve19) => {
+      tracked.child.on("exit", () => resolve19());
       try {
         if (tracked.child.pid) {
           process.kill(-tracked.child.pid, "SIGTERM");
@@ -756,7 +773,7 @@ var BridgeManager = class {
         if (err instanceof Error && err.code !== "ESRCH") {
           blog2.warn(`failed to stop bridge ${platform}`, logger_default.errorData(err));
         }
-        resolve21();
+        resolve19();
       }
       setTimeout(() => {
         try {
@@ -767,7 +784,7 @@ var BridgeManager = class {
           }
         } catch {
         }
-        resolve21();
+        resolve19();
       }, 5e3);
     });
     this.stopping.delete(platform);
@@ -1444,10 +1461,10 @@ var app = new Hono().post("/restart", requireAdmin, (c) => {
       stream.writeSSE({ data: JSON.stringify(entry) }).catch(() => {
       });
     });
-    await new Promise((resolve21) => {
+    await new Promise((resolve19) => {
       stream.onAbort(() => {
         unsubscribe();
-        resolve21();
+        resolve19();
       });
     });
   });
@@ -1472,7 +1489,7 @@ var app = new Hono().post("/restart", requireAdmin, (c) => {
   config2.name = name.trim() || void 0;
   writeGlobalConfig(config2);
   if (config2.name !== previousName) {
-    const { notifySpiritSystemChange } = await import("./spirit-I5ECLGRI.js");
+    const { notifySpiritSystemChange } = await import("./spirit-Q5VGFWUI.js");
     await notifySpiritSystemChange();
   }
   return c.json({ name: config2.name ?? null });
@@ -1831,8 +1848,8 @@ var app = new Hono().post("/restart", requireAdmin, (c) => {
       createdAt: Date.now()
     };
     oauthFlows.set(flowId, flow);
-    const promptPromise = needsManualCode ? new Promise((resolve21) => {
-      flow.resolveCode = resolve21;
+    const promptPromise = needsManualCode ? new Promise((resolve19) => {
+      flow.resolveCode = resolve19;
     }) : void 0;
     oauthProvider.login({
       onAuth: (info) => {
@@ -1871,7 +1888,7 @@ var app = new Hono().post("/restart", requireAdmin, (c) => {
         existing.error = err instanceof Error ? err.message : String(err);
       }
     });
-    await new Promise((resolve21) => setTimeout(resolve21, 2e3));
+    await new Promise((resolve19) => setTimeout(resolve19, 2e3));
     const state = oauthFlows.get(flowId);
     return c.json({
       flowId,
@@ -2132,8 +2149,8 @@ var app2 = new Hono2().get("/events", async (c) => {
         });
       }, 15e3);
       cleanups.push(() => clearInterval(keepAlive));
-      await new Promise((resolve21) => {
-        stream.onAbort(() => resolve21());
+      await new Promise((resolve19) => {
+        stream.onAbort(() => resolve19());
       });
     } finally {
       for (const cleanup of cleanups) {
@@ -2714,7 +2731,7 @@ async function fanOutToMinds(opts) {
         );
       }
       if (ap.userType === "system") {
-        import("./spirit-availability-NIUUYKU2.js").then(({ ensureSpiritAvailable: ensureSpiritAvailable2 }) => ensureSpiritAvailable2()).catch((err) => logger_default.warn("fan-out: on-demand spirit start failed", logger_default.errorData(err)));
+        import("./spirit-availability-G5FMWKRH.js").then(({ ensureSpiritAvailable: ensureSpiritAvailable2 }) => ensureSpiritAvailable2()).catch((err) => logger_default.warn("fan-out: on-demand spirit start failed", logger_default.errorData(err)));
       }
     }
     return null;
@@ -3131,11 +3148,11 @@ async function notifyMind(mindName, message) {
   const entry = await findMind(mindName);
   if (!entry) return false;
   try {
-    const { deliverEvent: deliverEvent2 } = await import("./system-events-YTOU66QI.js");
+    const { deliverEvent: deliverEvent2 } = await import("./system-events-Q7IVZ5T4.js");
     const result = await deliverEvent2(mindName, { type: "file-share", body: message });
     if (result.delivered) return true;
     if (result.id == null) return false;
-    const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-NWUCRBZB.js");
+    const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-KHI65FEX.js");
     const { getBaseName: getBaseName2 } = await import("./registry-TRC2HJXR.js");
     return getSleepManagerIfReady2()?.isSleeping(await getBaseName2(mindName)) ?? false;
   } catch (err) {
@@ -4108,9 +4125,9 @@ var app11 = new Hono14().get("/:name/logs", requireSelf(), async (c) => {
     stream.onAbort(() => {
       tail.kill();
     });
-    await new Promise((resolve21) => {
-      tail.on("exit", resolve21);
-      stream.onAbort(resolve21);
+    await new Promise((resolve19) => {
+      tail.on("exit", resolve19);
+      stream.onAbort(resolve19);
     });
   });
 }).get("/:name/logs/tail", requireSelf(), async (c) => {
@@ -4128,8 +4145,8 @@ var app11 = new Hono14().get("/:name/logs", requireSelf(), async (c) => {
   tail.stdout.on("data", (data) => {
     output += data.toString();
   });
-  await new Promise((resolve21) => {
-    tail.on("exit", resolve21);
+  await new Promise((resolve19) => {
+    tail.on("exit", resolve19);
   });
   return c.text(output);
 });
@@ -4222,14 +4239,14 @@ var mind_skills_default = app12;
 // packages/daemon/src/web/api/minds.ts
 import {
   cpSync,
-  existsSync as existsSync8,
+  existsSync as existsSync7,
   mkdirSync as mkdirSync6,
   readdirSync as readdirSync2,
   readFileSync as readFileSync9,
   rmSync as rmSync3,
   writeFileSync as writeFileSync8
 } from "fs";
-import { relative, resolve as resolve13 } from "path";
+import { relative, resolve as resolve11 } from "path";
 import { zValidator as zValidator6 } from "@hono/zod-validator";
 import { and as and5, desc as desc3, eq as eq5, sql as sql3 } from "drizzle-orm";
 import { Hono as Hono16 } from "hono";
@@ -4672,49 +4689,6 @@ async function commitSrcChanges(dir, mindName) {
   glog.info(`committed known-good src changes (${dir})`);
 }
 
-// packages/daemon/src/lib/mind/npm-install.ts
-import { existsSync as existsSync7 } from "fs";
-import { resolve as resolve10 } from "path";
-var NPM_INSTALL_ARGS = [
-  "install",
-  "--no-audit",
-  "--no-fund",
-  "--prefer-offline",
-  "--loglevel=error"
-];
-function lowPriorityArgv(cmd, args, ionice) {
-  return ionice ? ["ionice", ["-c2", "-n7", "nice", "-n19", cmd, ...args]] : ["nice", ["-n19", cmd, ...args]];
-}
-function hasIonice() {
-  return process.platform === "linux" && (existsSync7("/usr/bin/ionice") || existsSync7("/bin/ionice"));
-}
-async function npmInstallAsMind(cwd, mindName) {
-  const [cmd, args] = lowPriorityArgv("npm", NPM_INSTALL_ARGS, hasIonice());
-  if (isIsolationEnabled()) {
-    const [wrappedCmd, wrappedArgs] = await wrapForIsolation(cmd, args, mindName);
-    await exec(wrappedCmd, wrappedArgs, {
-      cwd,
-      env: { ...process.env, HOME: resolve10(cwd, "home") }
-    });
-  } else {
-    await exec(cmd, args, { cwd });
-  }
-}
-async function depsChangedSince(dir, fromRef) {
-  try {
-    await gitExec(["diff", "--quiet", fromRef, "HEAD", "--", "package.json", "package-lock.json"], {
-      cwd: dir
-    });
-    return false;
-  } catch {
-    return true;
-  }
-}
-async function npmInstallNeeded(dir, preMergeRef) {
-  if (!existsSync7(resolve10(dir, "node_modules"))) return true;
-  return depsChangedSince(dir, preMergeRef);
-}
-
 // packages/daemon/src/lib/mind/thinking-config.ts
 var CLAUDE_EFFORT = {
   minimal: "low",
@@ -4756,150 +4730,6 @@ function deriveThinkingLevel(config2) {
   return null;
 }
 
-// packages/daemon/src/lib/mind/variants.ts
-import { statSync as statSync3 } from "fs";
-import { resolve as resolve11 } from "path";
-var SAFE_BRANCH_RE = /^[a-zA-Z0-9._\-/]+$/;
-function validateBranchName(branch) {
-  if (!SAFE_BRANCH_RE.test(branch)) {
-    return `Invalid branch name: ${branch}. Only alphanumeric, '.', '_', '-', '/' allowed.`;
-  }
-  if (branch.includes("..")) {
-    return `Invalid branch name: ${branch}. '..' not allowed.`;
-  }
-  return null;
-}
-var MERGE_EXCLUDED_PATHS = ["home/MEMORY.md", "home/memory/journal/"];
-var MAX_DELTA_CHARS = 12e3;
-var NEVER_REPORT_PREFIXES = ["home/.claude/", "home/.pi/", "home/.agents/"];
-var MAX_LISTED_UNRESOLVED_FILES = 20;
-async function findUnresolvedHomeFiles(cwd) {
-  const raw = await gitExec(
-    ["ls-files", "--others", "--ignored", "--exclude-standard", "-z", "--", "home"],
-    { cwd }
-  );
-  const allPaths = raw.split("\0").filter((path) => path && !NEVER_REPORT_PREFIXES.some((prefix) => path.startsWith(prefix)));
-  const files = [];
-  let totalBytes = 0;
-  for (const path of allPaths) {
-    let bytes = -1;
-    try {
-      bytes = statSync3(resolve11(cwd, path)).size;
-    } catch {
-    }
-    if (bytes > 0) totalBytes += bytes;
-    if (files.length < MAX_LISTED_UNRESOLVED_FILES) files.push({ path, bytes });
-  }
-  return { files, totalCount: allPaths.length, totalBytes };
-}
-function formatBytes(bytes) {
-  if (bytes < 0) return "size unknown";
-  if (bytes < 1024) return `${bytes} B`;
-  const units = ["KB", "MB", "GB", "TB"];
-  let value = bytes / 1024;
-  for (const unit of units) {
-    if (value < 1024) return `${value.toFixed(1)} ${unit}`;
-    value /= 1024;
-  }
-  return `${value.toFixed(1)} PB`;
-}
-function formatUnresolvedHomeFilesMessage(variantName, result) {
-  const lines = result.files.map(
-    (f) => `  - ${f.path.replace(/^home\//, "")} (${formatBytes(f.bytes)})`
-  );
-  const remaining = result.totalCount - result.files.length;
-  if (remaining > 0) lines.push(`  ...and ${remaining} more`);
-  return `Cannot join variant "${variantName}": it has ${result.totalCount} untracked file${result.totalCount === 1 ? "" : "s"} under home/ that .gitignore is hiding from git \u2014 never committed, and joining would destroy them when the variant is cleaned up (total: ${formatBytes(result.totalBytes)}):
-
-${lines.join("\n")}
-
-Before retrying the join, resolve each file in the variant \u2014 one of:
-  1. Track it: git add -f -- <path> (then commit it, or let auto-commit pick it up next turn)
-  2. Copy it out of home/ to somewhere safe, then delete it
-  3. Delete it if it's disposable
-
-Once resolved, retry the join. To join anyway and discard everything listed above, pass discardUnresolved: true.`;
-}
-async function mergeVariantExcludingMemory(projectRoot, variantBranch) {
-  const opts = { cwd: projectRoot };
-  let memoryDelta = "";
-  try {
-    const base = (await gitExec(["merge-base", "HEAD", variantBranch], opts)).trim();
-    memoryDelta = (await gitExec(["diff", `${base}..${variantBranch}`, "--", ...MERGE_EXCLUDED_PATHS], opts)).trim();
-  } catch (err) {
-    logger_default.error(
-      `variant join: failed to compute memory delta for ${variantBranch}`,
-      logger_default.errorData(err)
-    );
-    memoryDelta = `(journal delta unavailable \u2014 ${err instanceof Error ? err.message : String(err)})`;
-  }
-  if (memoryDelta.length > MAX_DELTA_CHARS) {
-    memoryDelta = `${memoryDelta.slice(0, MAX_DELTA_CHARS)}
-\u2026 (delta truncated)`;
-  }
-  try {
-    await gitExec(["merge", "--no-ff", "--no-commit", variantBranch], opts).catch(() => {
-    });
-    await gitExec(["reset", "-q", "HEAD", "--", ...MERGE_EXCLUDED_PATHS], opts);
-    for (const path of MERGE_EXCLUDED_PATHS) {
-      await gitExec(["checkout", "--", path], opts).catch(() => {
-      });
-    }
-    await gitExec(["clean", "-fdq", "--", ...MERGE_EXCLUDED_PATHS], opts);
-    await assertExcludedPathsRestored(opts);
-    if (await mergeInProgress(opts)) {
-      await gitExec(["commit", "--no-edit"], opts);
-    }
-  } catch (err) {
-    const conflicts = await listConflicts(opts);
-    const abortFailed = await gitExec(["merge", "--abort"], opts).then(
-      () => false,
-      () => true
-    );
-    throw new VariantMergeError(
-      `variant join aborted: ${err instanceof Error ? err.message : String(err)}`,
-      conflicts,
-      abortFailed
-    );
-  }
-  return memoryDelta;
-}
-var VariantMergeError = class extends Error {
-  constructor(message, conflicts, abortFailed = false) {
-    super(message);
-    this.conflicts = conflicts;
-    this.abortFailed = abortFailed;
-    this.name = "VariantMergeError";
-  }
-};
-async function mergeInProgress(opts) {
-  return gitExec(["rev-parse", "-q", "--verify", "MERGE_HEAD"], opts).then(
-    () => true,
-    () => false
-  );
-}
-async function listConflicts(opts) {
-  try {
-    const out = (await gitExec(["diff", "--name-only", "--diff-filter=U"], opts)).trim();
-    return out ? out.split("\n") : [];
-  } catch {
-    return [];
-  }
-}
-async function assertExcludedPathsRestored(opts) {
-  await gitExec(["diff", "--cached", "--quiet", "HEAD", "--", ...MERGE_EXCLUDED_PATHS], opts);
-  await gitExec(["diff", "--quiet", "HEAD", "--", ...MERGE_EXCLUDED_PATHS], opts);
-  const untracked = (await gitExec(
-    ["ls-files", "--others", "--exclude-standard", "--", ...MERGE_EXCLUDED_PATHS],
-    opts
-  )).trim();
-  if (untracked) {
-    throw new Error(
-      `untracked memory files remain after restore: ${untracked.replace(/\n/g, ", ")}`
-    );
-  }
-}
-
 // packages/daemon/src/lib/services/imagegen-jobs.ts
 import { mkdir, writeFile } from "fs/promises";
 import { dirname as dirname2 } from "path";
@@ -5022,7 +4852,7 @@ async function waitForImagegenJob(mind, id, timeoutMs) {
 import { randomUUID } from "crypto";
 import { mkdirSync as mkdirSync5, readFileSync as readFileSync8, writeFileSync as writeFileSync7 } from "fs";
 import { homedir } from "os";
-import { resolve as resolve12 } from "path";
+import { resolve as resolve10 } from "path";
 function convertSession(opts) {
   const lines = readFileSync8(opts.sessionPath, "utf-8").trim().split("\n");
   const sessionId = randomUUID();
@@ -5138,9 +4968,9 @@ function convertSession(opts) {
     }
   }
   const projectId = opts.projectDir.replace(/\//g, "-");
-  const sdkDir = resolve12(homedir(), ".claude", "projects", projectId);
+  const sdkDir = resolve10(homedir(), ".claude", "projects", projectId);
   mkdirSync5(sdkDir, { recursive: true });
-  const sdkPath = resolve12(sdkDir, `${sessionId}.jsonl`);
+  const sdkPath = resolve10(sdkDir, `${sessionId}.jsonl`);
   writeFileSync7(sdkPath, `${sdkEvents.join("\n")}
 `);
   console.log(`Converted ${sdkEvents.length} messages \u2192 ${sdkPath}`);
@@ -5201,7 +5031,7 @@ async function getMindStatus(name, port, registryRunning, seed) {
   let status = "stopped";
   let wakeAt = null;
   try {
-    const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-NWUCRBZB.js");
+    const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-KHI65FEX.js");
     const sleepManager = getSleepManagerIfReady2();
     if (sleepManager?.isSleeping(name)) {
       status = "sleeping";
@@ -5265,13 +5095,6 @@ function toPublicMind(entry, status, extras) {
     lastActiveAt: extras.lastActiveAt ?? null
   };
 }
-var TEMPLATE_BRANCH = "volute/template";
-async function configureGitIdentity(mindName, opts) {
-  const systemsConfig = readSystemsConfig();
-  const system = systemsConfig?.system ?? "local";
-  await gitExec(["config", "user.name", mindName], opts);
-  await gitExec(["config", "user.email", `${mindName}.${system}@volute.systems`], opts);
-}
 async function initTemplateBranch(projectRoot, composedDir, manifest, mindName, env) {
   const templateFiles = listFiles(composedDir).filter((f) => !f.startsWith(".init/") && !f.startsWith(".init\\")).filter((f) => !f.startsWith("home/") && !f.startsWith("home\\") || f === "home/VOLUTE.md").map((f) => manifest.rename[f] ?? f);
   const opts = { cwd: projectRoot, mindName, env };
@@ -5282,164 +5105,9 @@ async function initTemplateBranch(projectRoot, composedDir, manifest, mindName,
   await gitExec(["add", "-A"], opts);
   await gitExec(["commit", "-m", "initial commit"], opts);
 }
-async function updateTemplateBranch(projectRoot, template, mindName) {
-  const tempWorktree = resolve13(projectRoot, ".variants", "_template_update");
-  let branchExists = false;
-  try {
-    await gitExec(["rev-parse", "--verify", TEMPLATE_BRANCH], { cwd: projectRoot });
-    branchExists = true;
-  } catch {
-  }
-  try {
-    await gitExec(["worktree", "remove", "--force", tempWorktree], { cwd: projectRoot });
-  } catch {
-  }
-  if (existsSync8(tempWorktree)) {
-    rmSync3(tempWorktree, { recursive: true, force: true });
-  }
-  const templatesRoot = findTemplatesRoot();
-  const { composedDir, manifest } = composeTemplate(templatesRoot, template);
-  try {
-    if (branchExists) {
-      await gitExec(["worktree", "add", tempWorktree, TEMPLATE_BRANCH], {
-        cwd: projectRoot
-      });
-    } else {
-      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 gitExec(["rm", "-rf", "."], { cwd: tempWorktree }).catch(() => {
-      });
-    }
-    copyTemplateToDir(composedDir, tempWorktree, mindName, manifest);
-    const initDir = resolve13(tempWorktree, ".init");
-    if (existsSync8(initDir)) {
-      rmSync3(initDir, { recursive: true, force: true });
-    }
-    const homeDir = resolve13(tempWorktree, "home");
-    if (existsSync8(homeDir)) {
-      for (const entry of readdirSync2(homeDir)) {
-        if (entry !== "VOLUTE.md") {
-          rmSync3(resolve13(homeDir, entry), { recursive: true, force: true });
-        }
-      }
-    }
-    await gitExec(["add", "-A"], { cwd: tempWorktree });
-    try {
-      await gitExec(["diff", "--cached", "--quiet"], { cwd: tempWorktree });
-    } catch {
-      await gitExec(["commit", "-m", "template update"], { cwd: tempWorktree });
-    }
-  } finally {
-    try {
-      await gitExec(["worktree", "remove", "--force", tempWorktree], { cwd: projectRoot });
-    } catch {
-    }
-    if (existsSync8(tempWorktree)) {
-      rmSync3(tempWorktree, { recursive: true, force: true });
-    }
-    rmSync3(composedDir, { recursive: true, force: true });
-  }
-}
-async function mergeTemplateBranch(worktreeDir) {
-  try {
-    await gitExec(
-      ["merge", TEMPLATE_BRANCH, "--allow-unrelated-histories", "-m", "merge template update"],
-      { cwd: worktreeDir }
-    );
-    return false;
-  } catch (e) {
-    try {
-      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 {
-    }
-    throw e;
-  }
-}
-async function mergeUpgradeAndRestart(mindName, dir, worktreeDir, upgradeVariantName, upgradeBranch, template, oldTemplate) {
-  const templateChanged = template !== oldTemplate;
-  const mainStatus = (await gitExec(["status", "--porcelain"], { cwd: dir })).trim();
-  if (mainStatus) {
-    await gitExec(["add", "-A"], { cwd: dir });
-    await gitExec(["commit", "-m", "Auto-commit before upgrade merge"], { cwd: dir });
-  }
-  const preMergeHead = (await gitExec(["rev-parse", "HEAD"], { cwd: dir })).trim();
-  await gitExec(["merge", upgradeBranch], { cwd: dir });
-  try {
-    await cleanupVariant(upgradeVariantName, mindName, dir, worktreeDir);
-  } catch (err) {
-    logger_default.warn(`failed to clean up upgrade worktree for ${mindName}`, logger_default.errorData(err));
-  }
-  try {
-    await gitExec(["branch", "-D", upgradeBranch], { cwd: dir });
-  } catch {
-  }
-  let switchWarning;
-  if (templateChanged) {
-    try {
-      applyTemplateHomeFiles(resolve13(dir, "home"), template);
-      const migratedSkills = migrateSkillsToTemplate(dir, oldTemplate, template);
-      await gitExec(["add", "home/"], { cwd: dir });
-      try {
-        await gitExec(["diff", "--cached", "--quiet"], { cwd: dir });
-      } catch {
-        await gitExec(["commit", "-m", `swap template-owned home files for ${template}`], {
-          cwd: dir
-        });
-      }
-      await chownMindDir(dir, mindName);
-      const skillNote = migratedSkills.length > 0 ? ` Migrated skills to the ${template} skills dir: ${migratedSkills.join(", ")}.` : "";
-      switchWarning = `Switched ${oldTemplate}\u2192${template}: config reset to ${template} defaults, mechanics doc replaced, conversation starts fresh (sessions aren't portable across runtimes).${skillNote}`;
-    } catch (err) {
-      logger_default.warn(`failed to swap template home files for ${mindName}`, logger_default.errorData(err));
-      return {
-        ok: true,
-        warning: `Upgrade merged but template switch ${oldTemplate}\u2192${template} failed: ${err instanceof Error ? err.message : String(err)}. The mind is still registered as ${oldTemplate}; re-run the switch or fix home/ manually.`
-      };
-    }
-  }
-  try {
-    await setMindTemplateHash(mindName, computeTemplateHash(template));
-    await setMindTemplate(mindName, template);
-  } catch (err) {
-    logger_default.warn(`failed to update template for ${mindName}`, logger_default.errorData(err));
-  }
-  if (await npmInstallNeeded(dir, preMergeHead)) {
-    try {
-      await npmInstallAsMind(dir, mindName);
-    } catch (err) {
-      logger_default.warn(`npm install failed after upgrade merge for ${mindName}`, logger_default.errorData(err));
-      return {
-        ok: true,
-        warning: `Upgrade merged but npm install failed: ${err instanceof Error ? err.message : String(err)}. You may need to run npm install manually.`
-      };
-    }
-  } else {
-    logger_default.info(`skipping npm install for ${mindName} \u2014 dependencies unchanged by upgrade`);
-  }
-  const manager = getMindManager();
-  try {
-    if (manager.isRunning(mindName)) {
-      await manager.stopMind(mindName);
-    }
-    manager.setPendingContext(mindName, { type: "upgraded" });
-    await manager.startMind(mindName, { healthTimeoutMs: 12e4 });
-  } catch (e) {
-    return {
-      ok: true,
-      warning: `Upgrade merged but mind restart failed: ${e instanceof Error ? e.message : String(e)}`
-    };
-  }
-  return { ok: true, warning: switchWarning };
-}
 async function importFromArchive(c, tempDir, nameOverride, manifest) {
-  const extractedMindDir = resolve13(tempDir, "mind");
-  if (!existsSync8(extractedMindDir)) {
+  const extractedMindDir = resolve11(tempDir, "mind");
+  if (!existsSync7(extractedMindDir)) {
     return c.json({ error: "Invalid archive: missing mind/ directory" }, 400);
   }
   if (!manifest?.includes || !manifest.name || !manifest.template) {
@@ -5457,7 +5125,7 @@ async function importFromFullArchive(c, tempDir, extractedMindDir, nameOverride,
   if (await findMind(name)) return c.json({ error: `Mind already exists: ${name}` }, 409);
   ensureVoluteHome();
   const dest = mindDir(name);
-  if (existsSync8(dest)) return c.json({ error: "Mind directory already exists" }, 409);
+  if (existsSync7(dest)) return c.json({ error: "Mind directory already exists" }, 409);
   try {
     cpSync(extractedMindDir, dest, { recursive: true });
     if (!manifest.includes.identity) {
@@ -5465,9 +5133,9 @@ async function importFromFullArchive(c, tempDir, extractedMindDir, nameOverride,
     }
     const state = stateDir(name);
     mkdirSync6(state, { recursive: true });
-    const envJson = resolve13(tempDir, "state/env.json");
-    if (existsSync8(envJson)) {
-      cpSync(envJson, resolve13(state, "env.json"));
+    const envJson = resolve11(tempDir, "state/env.json");
+    if (existsSync7(envJson)) {
+      cpSync(envJson, resolve11(state, "env.json"));
     }
     const port = await nextPort();
     await addMind(name, port, manifest.stage, manifest.template);
@@ -5476,30 +5144,30 @@ async function importFromFullArchive(c, tempDir, extractedMindDir, nameOverride,
     } catch (err) {
       logger_default.warn(`failed to set template hash for ${name}`, logger_default.errorData(err));
     }
-    const homeDir = resolve13(dest, "home");
+    const homeDir = resolve11(dest, "home");
     ensureVoluteGroup();
     createMindUser(name, homeDir);
     await chownMindDir(dest, name);
     await npmInstallAsMind(dest, name);
     await importHistoryFromArchive(name, tempDir);
     importSessionsFromArchive(dest, tempDir);
-    if (!existsSync8(resolve13(dest, ".git"))) {
+    if (!existsSync7(resolve11(dest, ".git"))) {
       try {
-        const env = isIsolationEnabled() ? { ...process.env, HOME: resolve13(dest, "home") } : void 0;
+        const env = isIsolationEnabled() ? { ...process.env, HOME: resolve11(dest, "home") } : void 0;
         await gitExec(["init"], { cwd: dest, mindName: name, env });
         await configureGitIdentity(name, { cwd: dest, mindName: name, env });
         await gitExec(["add", "-A"], { cwd: dest, mindName: name, env });
         await gitExec(["commit", "-m", "import from archive"], { cwd: dest, mindName: name, env });
       } catch (err) {
         logger_default.error(`git setup failed for imported mind ${name}`, logger_default.errorData(err));
-        rmSync3(resolve13(dest, ".git"), { recursive: true, force: true });
+        rmSync3(resolve11(dest, ".git"), { recursive: true, force: true });
       }
     }
     await chownMindDir(dest, name);
     rmSync3(tempDir, { recursive: true, force: true });
     return c.json({ ok: true, name, port, message: `Imported mind: ${name} (port ${port})` });
   } catch (err) {
-    if (existsSync8(dest)) rmSync3(dest, { recursive: true, force: true });
+    if (existsSync7(dest)) rmSync3(dest, { recursive: true, force: true });
     try {
       await removeMind(name);
     } catch (cleanupErr) {
@@ -5516,7 +5184,7 @@ async function importFromHomeOnlyArchive(c, tempDir, extractedMindDir, nameOverr
   if (await findMind(name)) return c.json({ error: `Mind already exists: ${name}` }, 409);
   ensureVoluteHome();
   const dest = mindDir(name);
-  if (existsSync8(dest)) return c.json({ error: "Mind directory already exists" }, 409);
+  if (existsSync7(dest)) return c.json({ error: "Mind directory already exists" }, 409);
   const templatesRoot = findTemplatesRoot();
   const { composedDir, manifest: templateManifest } = composeTemplate(
     templatesRoot,
@@ -5525,36 +5193,36 @@ async function importFromHomeOnlyArchive(c, tempDir, extractedMindDir, nameOverr
   try {
     copyTemplateToDir(composedDir, dest, name, templateManifest);
     applyInitFiles(dest);
-    const extractedHome = resolve13(extractedMindDir, "home");
-    if (existsSync8(extractedHome)) {
-      cpSync(extractedHome, resolve13(dest, "home"), { recursive: true });
+    const extractedHome = resolve11(extractedMindDir, "home");
+    if (existsSync7(extractedHome)) {
+      cpSync(extractedHome, resolve11(dest, "home"), { recursive: true });
     }
-    const extractedMindInternal = resolve13(extractedMindDir, ".mind");
-    if (existsSync8(extractedMindInternal)) {
-      cpSync(extractedMindInternal, resolve13(dest, ".mind"), { recursive: true });
+    const extractedMindInternal = resolve11(extractedMindDir, ".mind");
+    if (existsSync7(extractedMindInternal)) {
+      cpSync(extractedMindInternal, resolve11(dest, ".mind"), { recursive: true });
     }
-    const identityDir = resolve13(dest, ".mind/identity");
+    const identityDir = resolve11(dest, ".mind/identity");
     let publicKeyPem;
-    if (!manifest.includes.identity || !existsSync8(resolve13(identityDir, "private.pem"))) {
+    if (!manifest.includes.identity || !existsSync7(resolve11(identityDir, "private.pem"))) {
       ({ publicKeyPem } = generateIdentity(dest));
     } else {
-      publicKeyPem = readFileSync9(resolve13(identityDir, "public.pem"), "utf-8");
+      publicKeyPem = readFileSync9(resolve11(identityDir, "public.pem"), "utf-8");
     }
-    const promptsPath = resolve13(dest, "home/.config/prompts.json");
-    if (!existsSync8(promptsPath)) {
+    const promptsPath = resolve11(dest, "home/.config/prompts.json");
+    if (!existsSync7(promptsPath)) {
       const mindPrompts = await getMindPromptDefaults();
       writeFileSync8(promptsPath, `${JSON.stringify(mindPrompts, null, 2)}
 `);
     }
     const state = stateDir(name);
     mkdirSync6(state, { recursive: true });
-    const envJson = resolve13(tempDir, "state/env.json");
-    if (existsSync8(envJson)) {
-      cpSync(envJson, resolve13(state, "env.json"));
+    const envJson = resolve11(tempDir, "state/env.json");
+    if (existsSync7(envJson)) {
+      cpSync(envJson, resolve11(state, "env.json"));
     }
     const port = await nextPort();
     await addMind(name, port, manifest.stage, manifest.template);
-    const homeDir = resolve13(dest, "home");
+    const homeDir = resolve11(dest, "home");
     ensureVoluteGroup();
     createMindUser(name, homeDir);
     await chownMindDir(dest, name);
@@ -5567,7 +5235,7 @@ async function importFromHomeOnlyArchive(c, tempDir, extractedMindDir, nameOverr
       await initTemplateBranch(dest, composedDir, templateManifest, name, env);
     } catch (err) {
       logger_default.error(`git setup failed for imported mind ${name}`, logger_default.errorData(err));
-      rmSync3(resolve13(dest, ".git"), { recursive: true, force: true });
+      rmSync3(resolve11(dest, ".git"), { recursive: true, force: true });
       gitWarning = "Git setup failed \u2014 variants and upgrades won't be available until git is initialized.";
     }
     const skillSet = manifest.stage === "seed" ? SEED_SKILLS : getStandardSkillsWithExtensions();
@@ -5597,7 +5265,7 @@ async function importFromHomeOnlyArchive(c, tempDir, extractedMindDir, nameOverr
       ...skillWarnings.length > 0 && { skillWarnings }
     });
   } catch (err) {
-    if (existsSync8(dest)) rmSync3(dest, { recursive: true, force: true });
+    if (existsSync7(dest)) rmSync3(dest, { recursive: true, force: true });
     try {
       await removeMind(name);
     } catch (cleanupErr) {
@@ -5610,8 +5278,8 @@ async function importFromHomeOnlyArchive(c, tempDir, extractedMindDir, nameOverr
   }
 }
 async function importHistoryFromArchive(name, tempDir) {
-  const historyJsonl = resolve13(tempDir, "history.jsonl");
-  if (!existsSync8(historyJsonl)) return;
+  const historyJsonl = resolve11(tempDir, "history.jsonl");
+  if (!existsSync7(historyJsonl)) return;
   try {
     const db = await getDb();
     const lines = readFileSync9(historyJsonl, "utf-8").trim().split("\n");
@@ -5651,13 +5319,13 @@ async function importHistoryFromArchive(name, tempDir) {
   }
 }
 function importSessionsFromArchive(dest, tempDir) {
-  const sessionsDir = resolve13(tempDir, "sessions");
-  if (!existsSync8(sessionsDir)) return;
+  const sessionsDir = resolve11(tempDir, "sessions");
+  if (!existsSync7(sessionsDir)) return;
   try {
-    const destSessions = resolve13(dest, ".mind/sessions");
+    const destSessions = resolve11(dest, ".mind/sessions");
     mkdirSync6(destSessions, { recursive: true });
     for (const file of readdirSync2(sessionsDir)) {
-      cpSync(resolve13(sessionsDir, file), resolve13(destSessions, file));
+      cpSync(resolve11(sessionsDir, file), resolve11(destSessions, file));
     }
   } catch (err) {
     logger_default.error("Failed to import sessions from archive", logger_default.errorData(err));
@@ -5737,7 +5405,7 @@ var app13 = new Hono16().post("/", requireAdminOrSystem, zValidator6("json", cre
   }
   ensureVoluteHome();
   const dest = mindDir(name);
-  if (existsSync8(dest)) return c.json({ error: "Mind directory already exists" }, 409);
+  if (existsSync7(dest)) return c.json({ error: "Mind directory already exists" }, 409);
   const templatesRoot = findTemplatesRoot();
   const { composedDir, manifest } = composeTemplate(templatesRoot, template);
   try {
@@ -5774,9 +5442,9 @@ var app13 = new Hono16().post("/", requireAdminOrSystem, zValidator6("json", cre
       writeVoluteConfig(dest, config2);
       const modelId = body.model ?? cog?.model;
       effectiveModel = modelId ? qualifyModelId(modelId) : void 0;
-      const sdkConfigPath = resolve13(dest, "home/.config/config.json");
+      const sdkConfigPath = resolve11(dest, "home/.config/config.json");
       if (modelId || cog?.compaction) {
-        const existing = existsSync8(sdkConfigPath) ? JSON.parse(readFileSync9(sdkConfigPath, "utf-8")) : {};
+        const existing = existsSync7(sdkConfigPath) ? JSON.parse(readFileSync9(sdkConfigPath, "utf-8")) : {};
         if (modelId) {
           existing.model = template === "pi" ? qualifyModelId(modelId) : unqualifyModelId(modelId);
         }
@@ -5789,7 +5457,7 @@ var app13 = new Hono16().post("/", requireAdminOrSystem, zValidator6("json", cre
     }
     const mindPrompts = await getMindPromptDefaults();
     writeFileSync8(
-      resolve13(dest, "home/.config/prompts.json"),
+      resolve11(dest, "home/.config/prompts.json"),
       `${JSON.stringify(mindPrompts, null, 2)}
 `
     );
@@ -5801,7 +5469,7 @@ var app13 = new Hono16().post("/", requireAdminOrSystem, zValidator6("json", cre
     } catch (err) {
       logger_default.warn(`failed to set template hash for ${name}`, logger_default.errorData(err));
     }
-    const homeDir = resolve13(dest, "home");
+    const homeDir = resolve11(dest, "home");
     ensureVoluteGroup();
     createMindUser(name, homeDir);
     await chownMindDir(dest, name);
@@ -5814,7 +5482,7 @@ var app13 = new Hono16().post("/", requireAdminOrSystem, zValidator6("json", cre
       await initTemplateBranch(dest, composedDir, manifest, name, env);
     } catch (err) {
       logger_default.error(`git setup failed for ${name}`, logger_default.errorData(err));
-      rmSync3(resolve13(dest, ".git"), { recursive: true, force: true });
+      rmSync3(resolve11(dest, ".git"), { recursive: true, force: true });
       gitWarning = "Git setup failed \u2014 variants and upgrades won't be available until git is initialized.";
     }
     if (body.stage === "seed") {
@@ -5823,7 +5491,7 @@ Your creator described you as: "${body.description}"
 ` : "";
       const seedSoulRaw = body.seedSoul ?? await getPrompt("seed_soul", { name, description: descLine });
       const seedSoul = body.seedSoul ? substitute(seedSoulRaw, { name, description: descLine }) : seedSoulRaw;
-      writeFileSync8(resolve13(dest, "home/SOUL.md"), seedSoul);
+      writeFileSync8(resolve11(dest, "home/SOUL.md"), seedSoul);
     }
     let skillSet = body.skills ?? (body.stage === "seed" ? SEED_SKILLS : getStandardSkillsWithExtensions());
     if (body.stage === "seed" && !body.skills) {
@@ -5849,7 +5517,7 @@ Your creator described you as: "${body.description}"
         const spiritName = getSpiritName();
         const spiritEntry = await findMind(spiritName);
         if (spiritEntry) {
-          const { spiritDir } = await import("./spirit-I5ECLGRI.js");
+          const { spiritDir } = await import("./spirit-Q5VGFWUI.js");
           const sDir = spiritEntry.dir ?? spiritDir();
           const spiritConfig = readVoluteConfig(sDir) ?? {};
           const schedules = spiritConfig.schedules ?? [];
@@ -5864,7 +5532,7 @@ Your creator described you as: "${body.description}"
             });
             spiritConfig.schedules = schedules;
             writeVoluteConfig(sDir, spiritConfig);
-            const { getScheduler: getScheduler2 } = await import("./scheduler-5X5UIQOQ.js");
+            const { getScheduler: getScheduler2 } = await import("./scheduler-73Q4MQ7Y.js");
             getScheduler2().loadSchedules(spiritName, sDir);
           }
         }
@@ -5875,11 +5543,11 @@ Your creator described you as: "${body.description}"
     if (body.stage !== "seed") {
       const customSoul = await getPromptIfCustom("default_soul");
       if (customSoul) {
-        writeFileSync8(resolve13(dest, "home/SOUL.md"), customSoul.replace(/\{\{name\}\}/g, name));
+        writeFileSync8(resolve11(dest, "home/SOUL.md"), customSoul.replace(/\{\{name\}\}/g, name));
       }
       const customMemory = await getPromptIfCustom("default_memory");
       if (customMemory) {
-        writeFileSync8(resolve13(dest, "home/MEMORY.md"), customMemory);
+        writeFileSync8(resolve11(dest, "home/MEMORY.md"), customMemory);
       }
     }
     await chownMindDir(dest, name);
@@ -5919,7 +5587,7 @@ Your creator described you as: "${body.description}"
       ...skillWarnings.length > 0 && { skillWarnings }
     });
   } catch (err) {
-    if (existsSync8(dest)) rmSync3(dest, { recursive: true, force: true });
+    if (existsSync7(dest)) rmSync3(dest, { recursive: true, force: true });
     try {
       await removeMind(name);
     } catch (cleanupErr) {
@@ -5940,13 +5608,13 @@ Your creator described you as: "${body.description}"
     return importFromArchive(c, body.archivePath, body.name, body.manifest);
   }
   const wsDir = body.workspacePath;
-  if (!wsDir || !existsSync8(resolve13(wsDir, "SOUL.md")) || !existsSync8(resolve13(wsDir, "IDENTITY.md"))) {
+  if (!wsDir || !existsSync7(resolve11(wsDir, "SOUL.md")) || !existsSync7(resolve11(wsDir, "IDENTITY.md"))) {
     return c.json({ error: "Invalid workspace: missing SOUL.md or IDENTITY.md" }, 400);
   }
-  const soul = readFileSync9(resolve13(wsDir, "SOUL.md"), "utf-8");
-  const identity = readFileSync9(resolve13(wsDir, "IDENTITY.md"), "utf-8");
-  const userPath = resolve13(wsDir, "USER.md");
-  const user = existsSync8(userPath) ? readFileSync9(userPath, "utf-8") : "";
+  const soul = readFileSync9(resolve11(wsDir, "SOUL.md"), "utf-8");
+  const identity = readFileSync9(resolve11(wsDir, "IDENTITY.md"), "utf-8");
+  const userPath = resolve11(wsDir, "USER.md");
+  const user = existsSync7(userPath) ? readFileSync9(userPath, "utf-8") : "";
   const name = body.name ?? parseNameFromIdentity(identity) ?? "imported-mind";
   const template = body.template ?? "claude";
   const nameErr = validateMindName(name);
@@ -5966,33 +5634,33 @@ ${user.trimEnd()}
 ` : "";
   ensureVoluteHome();
   const dest = mindDir(name);
-  if (existsSync8(dest)) return c.json({ error: "Mind directory already exists" }, 409);
+  if (existsSync7(dest)) return c.json({ error: "Mind directory already exists" }, 409);
   const templatesRoot = findTemplatesRoot();
   const { composedDir, manifest } = composeTemplate(templatesRoot, template);
   try {
     copyTemplateToDir(composedDir, dest, name, manifest);
     applyInitFiles(dest);
     const { publicKeyPem: importPublicKey } = generateIdentity(dest);
-    writeFileSync8(resolve13(dest, "home/SOUL.md"), mergedSoul);
-    const wsMemoryPath = resolve13(wsDir, "MEMORY.md");
-    const hasMemory = existsSync8(wsMemoryPath);
+    writeFileSync8(resolve11(dest, "home/SOUL.md"), mergedSoul);
+    const wsMemoryPath = resolve11(wsDir, "MEMORY.md");
+    const hasMemory = existsSync7(wsMemoryPath);
     if (hasMemory) {
       const existingMemory = readFileSync9(wsMemoryPath, "utf-8");
       writeFileSync8(
-        resolve13(dest, "home/MEMORY.md"),
+        resolve11(dest, "home/MEMORY.md"),
         `${existingMemory.trimEnd()}${mergedMemoryExtra}`
       );
     } else if (user) {
-      writeFileSync8(resolve13(dest, "home/MEMORY.md"), `${user.trimEnd()}
+      writeFileSync8(resolve11(dest, "home/MEMORY.md"), `${user.trimEnd()}
 `);
     }
-    const wsMemoryDir = resolve13(wsDir, "memory");
+    const wsMemoryDir = resolve11(wsDir, "memory");
     let dailyLogCount = 0;
-    if (existsSync8(wsMemoryDir)) {
-      const destMemoryDir = resolve13(dest, "home/memory");
+    if (existsSync7(wsMemoryDir)) {
+      const destMemoryDir = resolve11(dest, "home/memory");
       const files = readdirSync2(wsMemoryDir).filter((f) => f.endsWith(".md"));
       for (const file of files) {
-        cpSync(resolve13(wsMemoryDir, file), resolve13(destMemoryDir, file));
+        cpSync(resolve11(wsMemoryDir, file), resolve11(destMemoryDir, file));
       }
       dailyLogCount = files.length;
     }
@@ -6003,7 +5671,7 @@ ${user.trimEnd()}
     } catch (err) {
       logger_default.warn(`failed to set template hash for ${name}`, logger_default.errorData(err));
     }
-    const homeDir = resolve13(dest, "home");
+    const homeDir = resolve11(dest, "home");
     ensureVoluteGroup();
     createMindUser(name, homeDir);
     await chownMindDir(dest, name);
@@ -6011,20 +5679,20 @@ ${user.trimEnd()}
     if (!hasMemory && dailyLogCount > 0) {
       await consolidateMemory(dest);
     }
-    const env = isIsolationEnabled() ? { ...process.env, HOME: resolve13(dest, "home") } : void 0;
+    const env = isIsolationEnabled() ? { ...process.env, HOME: resolve11(dest, "home") } : void 0;
     await gitExec(["init"], { cwd: dest, mindName: name, env });
     await configureGitIdentity(name, { cwd: dest, mindName: name, env });
     await gitExec(["add", "-A"], { cwd: dest, mindName: name, env });
     await gitExec(["commit", "-m", "import from OpenClaw"], { cwd: dest, mindName: name, env });
-    const sessionFile = body.sessionPath ? resolve13(body.sessionPath) : findOpenClawSession(wsDir);
-    if (sessionFile && existsSync8(sessionFile)) {
+    const sessionFile = body.sessionPath ? resolve11(body.sessionPath) : findOpenClawSession(wsDir);
+    if (sessionFile && existsSync7(sessionFile)) {
       if (template === "pi") {
         importPiSession(sessionFile, dest);
       } else if (template === "claude") {
         const sessionId = convertSession({ sessionPath: sessionFile, projectDir: dest });
-        const mindRuntimeDir = resolve13(dest, ".mind");
+        const mindRuntimeDir = resolve11(dest, ".mind");
         mkdirSync6(mindRuntimeDir, { recursive: true });
-        writeFileSync8(resolve13(mindRuntimeDir, "session.json"), JSON.stringify({ sessionId }));
+        writeFileSync8(resolve11(mindRuntimeDir, "session.json"), JSON.stringify({ sessionId }));
       }
     }
     importOpenClawConnectors(name, dest);
@@ -6034,7 +5702,7 @@ ${user.trimEnd()}
     );
     return c.json({ ok: true, name, port, message: `Imported mind: ${name} (port ${port})` });
   } catch (err) {
-    if (existsSync8(dest)) rmSync3(dest, { recursive: true, force: true });
+    if (existsSync7(dest)) rmSync3(dest, { recursive: true, force: true });
     try {
       await removeMind(name);
     } catch (cleanupErr) {
@@ -6070,7 +5738,7 @@ ${user.trimEnd()}
         stage: entry.stage,
         dir: entry.dir
       });
-      const hasPages = existsSync8(resolve13(mindDir(entry.name), "home", "pages"));
+      const hasPages = existsSync7(resolve11(mindDir(entry.name), "home", "pages"));
       const lastActiveAt = lastActiveMap.get(entry.name) ?? null;
       if (!privileged) return toPublicMind(entry, mindStatus, { hasPages, lastActiveAt });
       return {
@@ -6078,6 +5746,7 @@ ${user.trimEnd()}
         ...mindStatus,
         hasPages,
         templateStale: isTemplateStale(entry),
+        upgradeBlocked: getUpgradeBlocked(entry.name)?.reason,
         lastActiveAt
       };
     })
@@ -6088,12 +5757,12 @@ ${user.trimEnd()}
   const entry = await findMind(name);
   if (!entry) return c.json({ error: "Mind not found" }, 404);
   const dir = entry.dir ?? mindDir(entry.parent ?? name);
-  if (!existsSync8(dir)) return c.json({ error: "Mind directory missing" }, 404);
+  if (!existsSync7(dir)) return c.json({ error: "Mind directory missing" }, 404);
   const mindStatus = await getMindStatus(name, entry.port, void 0, {
     stage: entry.stage,
     dir: entry.dir
   });
-  const hasPages = existsSync8(resolve13(mindDir(name), "home", "pages"));
+  const hasPages = existsSync7(resolve11(mindDir(name), "home", "pages"));
   if (!isPrivileged(c)) {
     return c.json(toPublicMind(entry, mindStatus, { hasPages }));
   }
@@ -6116,6 +5785,7 @@ ${user.trimEnd()}
     variants: variantStatuses,
     hasPages,
     templateStale: isTemplateStale(entry),
+    upgradeBlocked: getUpgradeBlocked(name)?.reason,
     ...notice && {
       lastNotice: {
         kind: notice.kind,
@@ -6133,7 +5803,7 @@ ${user.trimEnd()}
   const projectDir = entry.dir ?? mindDir(name);
   if (entry.parent) {
     if (!entry.dir) return c.json({ error: `Variant ${name} has no directory` }, 404);
-  } else if (!existsSync8(projectDir)) {
+  } else if (!existsSync7(projectDir)) {
     return c.json({ error: "Mind directory missing" }, 404);
   }
   if (getMindManager().isRunning(name)) {
@@ -6154,7 +5824,7 @@ ${user.trimEnd()}
   const projectDir = entry.dir ?? mindDir(name);
   if (entry.parent) {
     if (!entry.dir) return c.json({ error: `Variant ${name} has no directory` }, 404);
-  } else if (!existsSync8(projectDir)) {
+  } else if (!existsSync7(projectDir)) {
     return c.json({ error: "Mind directory missing" }, 404);
   }
   let context;
@@ -6170,7 +5840,7 @@ ${user.trimEnd()}
   const manager = getMindManager();
   try {
     if (context?.type === "reload") {
-      const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-NWUCRBZB.js");
+      const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-KHI65FEX.js");
       const sleepState = getSleepManagerIfReady2()?.getState(name);
       if (sleepState?.sleeping) {
         logger_default.info(`skipping reload for ${name} during sleep \u2014 will apply on next wake`);
@@ -6191,7 +5861,7 @@ ${user.trimEnd()}
       if (variantEntry && variantEntry.parent === baseName && variantEntry.dir && variantEntry.branch) {
         const projectRoot = mindDir(baseName);
         const discardUnresolved = context.discardUnresolvedHomeFiles === true;
-        if (existsSync8(variantEntry.dir)) {
+        if (existsSync7(variantEntry.dir)) {
           const status = (await gitExec(["status", "--porcelain"], { cwd: variantEntry.dir })).trim();
           if (status) {
             try {
@@ -6221,7 +5891,7 @@ ${user.trimEnd()}
         const preMergeHead = (await gitExec(["rev-parse", "HEAD"], { cwd: projectRoot })).trim();
         const memoryDelta = await mergeVariantExcludingMemory(projectRoot, variantEntry.branch);
         let unresolvedNotice;
-        if (existsSync8(variantEntry.dir) && !discardUnresolved) {
+        if (existsSync7(variantEntry.dir) && !discardUnresolved) {
           try {
             const unresolved = await findUnresolvedHomeFiles(variantEntry.dir);
             if (unresolved.totalCount > 0) {
@@ -6319,7 +5989,7 @@ ${user.trimEnd()}
   const name = c.req.param("name");
   const entry = await findMind(name);
   if (!entry) return c.json({ error: "Mind not found" }, 404);
-  const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-NWUCRBZB.js");
+  const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-KHI65FEX.js");
   const sm = getSleepManagerIfReady2();
   if (!sm) return c.json({ error: "Sleep manager not initialized" }, 503);
   return c.json(sm.getState(name));
@@ -6327,7 +5997,7 @@ ${user.trimEnd()}
   const name = c.req.param("name");
   const entry = await findMind(name);
   if (!entry) return c.json({ error: "Mind not found" }, 404);
-  const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-NWUCRBZB.js");
+  const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-KHI65FEX.js");
   const sm = getSleepManagerIfReady2();
   if (!sm) return c.json({ error: "Sleep manager not initialized" }, 503);
   if (sm.isSleeping(name)) return c.json({ error: "Mind is already sleeping" }, 409);
@@ -6347,7 +6017,7 @@ ${user.trimEnd()}
   const name = c.req.param("name");
   const entry = await findMind(name);
   if (!entry) return c.json({ error: "Mind not found" }, 404);
-  const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-NWUCRBZB.js");
+  const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-KHI65FEX.js");
   const sm = getSleepManagerIfReady2();
   if (!sm) return c.json({ error: "Sleep manager not initialized" }, 503);
   const sleepState = sm.getState(name);
@@ -6362,7 +6032,7 @@ ${user.trimEnd()}
   const name = c.req.param("name");
   const entry = await findMind(name);
   if (!entry) return c.json({ error: "Mind not found" }, 404);
-  const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-NWUCRBZB.js");
+  const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-KHI65FEX.js");
   const sm = getSleepManagerIfReady2();
   if (!sm) return c.json({ error: "Sleep manager not initialized" }, 503);
   const flushed = await sm.flushQueuedMessages(name);
@@ -6378,12 +6048,12 @@ ${user.trimEnd()}
   if (body.displayName !== void 0) profile.displayName = body.displayName;
   if (body.description !== void 0) profile.description = body.description;
   if (body.avatar !== void 0) {
-    const homeDir = resolve13(dir, "home");
+    const homeDir = resolve11(dir, "home");
     const avatarPath = safeResolveWithinBase(homeDir, body.avatar);
     if (!avatarPath) {
       return c.json({ error: "Avatar path must be inside the mind's home directory" }, 400);
     }
-    if (!existsSync8(avatarPath)) {
+    if (!existsSync7(avatarPath)) {
       return c.json({ error: `Avatar file not found: ${relative(homeDir, avatarPath)}` }, 400);
     }
     profile.avatar = relative(homeDir, avatarPath);
@@ -6434,7 +6104,7 @@ ${user.trimEnd()}
     });
   }
   if (!force) {
-    const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-NWUCRBZB.js");
+    const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-KHI65FEX.js");
     if (getSleepManagerIfReady2()?.isSleeping(name)) {
       return c.json({ output: "" });
     }
@@ -6489,7 +6159,7 @@ ${user.trimEnd()}
     }
   }
   const dir = entry.dir ?? mindDir(name);
-  const { evaluateSeedChecklist: evaluateSeedChecklist2 } = await import("./seed-readiness-WJYYRRCK.js");
+  const { evaluateSeedChecklist: evaluateSeedChecklist2 } = await import("./seed-readiness-H5TTPAQH.js");
   const checklist = evaluateSeedChecklist2(dir);
   const done = [];
   const remaining = [];
@@ -6531,7 +6201,7 @@ ${user.trimEnd()}
   try {
     const sproutedDir = entry.dir ?? mindDir(name);
     if (setupDefaultDreaming(sproutedDir).schedulesChanged) {
-      const { getScheduler: getScheduler2 } = await import("./scheduler-5X5UIQOQ.js");
+      const { getScheduler: getScheduler2 } = await import("./scheduler-73Q4MQ7Y.js");
       getScheduler2().loadSchedules(name, sproutedDir);
     }
   } catch (err) {
@@ -6541,7 +6211,7 @@ ${user.trimEnd()}
     const spiritName = getSpiritName();
     const spiritEntry = await findMind(spiritName);
     if (spiritEntry) {
-      const { firstWeekSchedules, spiritDir } = await import("./spirit-I5ECLGRI.js");
+      const { firstWeekSchedules, spiritDir } = await import("./spirit-Q5VGFWUI.js");
       const sDir = spiritEntry.dir ?? spiritDir();
       const spiritConfig = readVoluteConfig(sDir);
       if (spiritConfig) {
@@ -6555,7 +6225,7 @@ ${user.trimEnd()}
         spiritConfig.schedules = schedules;
         writeVoluteConfig(sDir, spiritConfig);
         try {
-          const { getScheduler: getScheduler2 } = await import("./scheduler-5X5UIQOQ.js");
+          const { getScheduler: getScheduler2 } = await import("./scheduler-73Q4MQ7Y.js");
           getScheduler2().loadSchedules(spiritName, sDir);
         } catch (err) {
           logger_default.warn(
@@ -6609,10 +6279,10 @@ ${user.trimEnd()}
   await deleteMindUser2(name);
   invalidateMindUserCache(name);
   const state = stateDir(name);
-  if (existsSync8(state)) {
+  if (existsSync7(state)) {
     rmSync3(state, { recursive: true, force: true });
   }
-  if (force && existsSync8(dir)) {
+  if (force && existsSync7(dir)) {
     rmSync3(dir, { recursive: true, force: true });
     deleteMindUser(name);
   }
@@ -6627,7 +6297,7 @@ ${user.trimEnd()}
   const entry = await findMind(mindName);
   if (!entry) return c.json({ error: "Mind not found" }, 404);
   const dir = mindDir(mindName);
-  if (!existsSync8(dir)) return c.json({ error: "Mind directory missing" }, 404);
+  if (!existsSync7(dir)) return c.json({ error: "Mind directory missing" }, 404);
   let body = {};
   try {
     body = await c.req.json();
@@ -6638,27 +6308,12 @@ ${user.trimEnd()}
   if (!isKnownTemplate(template)) {
     return c.json({ error: `Unknown template: ${template}` }, 400);
   }
-  const UPGRADE_BRANCH = "upgrade";
-  const upgradeVariantName = `${mindName}-upgrade`;
-  const worktreeDir = resolve13(dir, ".variants", UPGRADE_BRANCH);
   if (body.abort) {
-    if (!existsSync8(worktreeDir)) {
+    if (!upgradeInProgress(mindName)) {
       return c.json({ error: "No upgrade in progress" }, 400);
     }
     try {
-      try {
-        const gitDirContent = readFileSync9(resolve13(worktreeDir, ".git"), "utf-8").trim();
-        const gitDir = gitDirContent.replace("gitdir: ", "");
-        if (existsSync8(resolve13(gitDir, "MERGE_HEAD"))) {
-          await gitExec(["merge", "--abort"], { cwd: worktreeDir });
-        }
-      } catch {
-      }
-      await cleanupVariant(upgradeVariantName, mindName, dir, worktreeDir, { stop: true });
-      try {
-        await gitExec(["branch", "-D", UPGRADE_BRANCH], { cwd: dir });
-      } catch {
-      }
+      await abortUpgrade(mindName);
       return c.json({ ok: true });
     } catch (err) {
       return c.json(
@@ -6668,81 +6323,45 @@ ${user.trimEnd()}
     }
   }
   if (body.continue) {
-    if (!existsSync8(worktreeDir)) {
+    if (!upgradeInProgress(mindName)) {
       return c.json({ error: "No upgrade in progress" }, 400);
     }
-    const status = await gitExec(["status", "--porcelain"], { cwd: worktreeDir });
-    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 gitExec(["add", "-A"], { cwd: worktreeDir });
-      await gitExec(["commit", "-m", "merge template update"], { cwd: worktreeDir });
-    } catch (e) {
-      const msg = e instanceof Error ? e.message : String(e);
-      const stderr = e?.stderr ?? "";
-      const stdout = e?.stdout ?? "";
-      if (!msg.includes("nothing to commit") && !stderr.includes("nothing to commit") && !stdout.includes("nothing to commit"))
-        throw e;
-    }
-    try {
-      await gitExec(["add", "home/"], { cwd: worktreeDir });
-    } catch (err) {
-      logger_default.warn(`failed to re-add home files during upgrade for ${mindName}`, logger_default.errorData(err));
-    }
-    try {
-      await gitExec(["diff", "--cached", "--quiet"], { cwd: worktreeDir });
-    } catch {
-      await gitExec(["commit", "-m", "re-add allowlisted home files"], {
-        cwd: worktreeDir
-      });
-    }
-    await chownMindDir(dir, mindName);
-    try {
-      const result = await mergeUpgradeAndRestart(
-        mindName,
-        dir,
-        worktreeDir,
-        upgradeVariantName,
-        UPGRADE_BRANCH,
-        template,
-        oldTemplate
-      );
-      return c.json(result);
+      const result = await continueUpgrade(mindName, { template });
+      if (result.status === "conflicts") {
+        return c.json({
+          ok: false,
+          conflicts: true,
+          worktreeDir: result.worktreeDir,
+          files: result.files,
+          message: result.message ?? "Merge conflicts detected. Resolve them, then run with continue."
+        });
+      }
+      return c.json({ ok: true, warning: result.warning });
     } catch (err) {
-      return c.json(
-        { error: err instanceof Error ? err.message : "Failed to merge upgrade" },
-        500
-      );
+      const msg = err instanceof Error ? err.message : "Failed to merge upgrade";
+      if (msg === "Unresolved conflicts remain") {
+        return c.json({ error: msg }, 409);
+      }
+      return c.json({ error: msg }, 500);
     }
   }
   if (body.accept) {
-    if (existsSync8(worktreeDir)) {
+    if (upgradeInProgress(mindName)) {
       try {
-        await cleanupVariant(upgradeVariantName, mindName, dir, worktreeDir, { stop: true });
+        await abortUpgrade(mindName);
       } catch (err) {
         logger_default.warn(`failed to clean up legacy upgrade variant for ${mindName}`, logger_default.errorData(err));
       }
-      try {
-        await gitExec(["branch", "-D", UPGRADE_BRANCH], { cwd: dir });
-      } catch {
-      }
     }
     return c.json({ error: "Upgrades now auto-merge. Run 'volute mind upgrade' again." }, 400);
   }
   if (body.diff) {
+    if (!existsSync7(resolve11(dir, ".git"))) {
+      return c.json({ error: "Mind has no git history \u2014 nothing to diff against" }, 400);
+    }
     try {
-      if (!existsSync8(resolve13(dir, ".git"))) {
-        return c.json({ error: "Mind has no git history \u2014 nothing to diff against" }, 400);
-      }
-      await updateTemplateBranch(dir, template, mindName);
-      let diff;
-      try {
-        diff = await gitExec(["diff", "HEAD...volute/template"], { cwd: dir });
-      } catch {
-        diff = await gitExec(["diff", "HEAD", "volute/template"], { cwd: dir });
-      }
+      const diff = await upgradeDiff(mindName, template);
       return c.json({ ok: true, diff: diff || "(no changes)" });
     } catch (err) {
       return c.json(
@@ -6751,103 +6370,21 @@ ${user.trimEnd()}
       );
     }
   }
-  if (existsSync8(worktreeDir)) {
-    return c.json(
-      { error: "Upgrade variant already exists. Use continue or delete it first." },
-      409
-    );
-  }
-  if (!existsSync8(resolve13(dir, ".git"))) {
-    try {
-      const env = isIsolationEnabled() ? { ...process.env, HOME: resolve13(dir, "home") } : void 0;
-      await gitExec(["init"], { cwd: dir, mindName, env });
-      await configureGitIdentity(mindName, { cwd: dir, mindName, env });
-      await gitExec(["add", "-A"], { cwd: dir, mindName, env });
-      await gitExec(["commit", "-m", "initial commit"], { cwd: dir, mindName, env });
-      await chownMindDir(dir, mindName);
-    } catch (err) {
-      rmSync3(resolve13(dir, ".git"), { recursive: true, force: true });
-      return c.json(
-        {
-          error: `Git initialization failed: ${err instanceof Error ? err.message : String(err)}`
-        },
-        500
-      );
-    }
-  }
-  await gitExec(["worktree", "prune"], { cwd: dir });
-  try {
-    await gitExec(["branch", "-D", UPGRADE_BRANCH], { cwd: dir });
-  } catch {
-  }
-  await updateTemplateBranch(dir, template, mindName);
-  const parentDir = resolve13(dir, ".variants");
-  if (!existsSync8(parentDir)) {
-    mkdirSync6(parentDir, { recursive: true });
-  }
-  await gitExec(["worktree", "add", "-b", UPGRADE_BRANCH, worktreeDir], { cwd: dir });
-  await gitExec(["rm", "-r", "--cached", "--ignore-unmatch", "home/"], {
-    cwd: worktreeDir
-  });
-  try {
-    await gitExec(["checkout", "HEAD", "--", "home/VOLUTE.md"], { cwd: worktreeDir });
-    await gitExec(["add", "home/VOLUTE.md"], { cwd: worktreeDir });
-  } catch (err) {
-    const msg = String(err?.message ?? err);
-    if (!msg.includes("did not match")) {
-      logger_default.warn(
-        `unexpected error restoring VOLUTE.md during upgrade for ${mindName}`,
-        logger_default.errorData(err)
-      );
-    }
-  }
   try {
-    await gitExec(["diff", "--cached", "--quiet"], { cwd: worktreeDir });
-  } catch {
-    await gitExec(["commit", "-m", "prepare for home/ allowlist migration"], {
-      cwd: worktreeDir
-    });
-  }
-  const hasConflicts = await mergeTemplateBranch(worktreeDir);
-  if (!hasConflicts) {
-    try {
-      await gitExec(["add", "home/"], { cwd: worktreeDir });
-    } catch (err) {
-      logger_default.warn(`failed to re-add home files during upgrade for ${mindName}`, logger_default.errorData(err));
-    }
-    try {
-      await gitExec(["diff", "--cached", "--quiet"], { cwd: worktreeDir });
-    } catch {
-      await gitExec(["commit", "-m", "re-add allowlisted home files"], {
-        cwd: worktreeDir
+    const result = await runUpgrade(mindName, { template });
+    if (result.status === "conflicts") {
+      return c.json({
+        ok: false,
+        conflicts: true,
+        worktreeDir: result.worktreeDir,
+        files: result.files,
+        message: result.message ?? "Merge conflicts detected. Resolve them, then run with continue."
       });
     }
-  }
-  await chownMindDir(dir, mindName);
-  if (hasConflicts) {
-    return c.json({
-      ok: false,
-      conflicts: true,
-      worktreeDir,
-      message: "Merge conflicts detected. Resolve them, then run with continue."
-    });
-  }
-  try {
-    const result = await mergeUpgradeAndRestart(
-      mindName,
-      dir,
-      worktreeDir,
-      upgradeVariantName,
-      UPGRADE_BRANCH,
-      template,
-      oldTemplate
-    );
-    return c.json(result);
+    return c.json({ ok: true, warning: result.warning });
   } catch (err) {
-    try {
-      await cleanupVariant(upgradeVariantName, mindName, dir, worktreeDir);
-    } catch (cleanupErr) {
-      logger_default.warn(`cleanup failed after upgrade error for ${mindName}`, logger_default.errorData(cleanupErr));
+    if (err instanceof UpgradeInProgressError) {
+      return c.json({ error: err.message }, 409);
     }
     return c.json({ error: err instanceof Error ? err.message : "Failed to merge upgrade" }, 500);
   }
@@ -6915,11 +6452,11 @@ ${user.trimEnd()}
   const entry = await findMind(name);
   if (!entry) return c.json({ error: "Mind not found" }, 404);
   const dir = entry.dir ?? mindDir(name);
-  if (!existsSync8(dir)) return c.json({ error: "Mind directory missing" }, 404);
+  if (!existsSync7(dir)) return c.json({ error: "Mind directory missing" }, 404);
   let config2 = readVoluteConfig(dir);
   if (!config2 && entry.template === "pi") {
-    const piConfigPath = resolve13(dir, "home/.config/config.json");
-    if (existsSync8(piConfigPath)) {
+    const piConfigPath = resolve11(dir, "home/.config/config.json");
+    if (existsSync7(piConfigPath)) {
       try {
         config2 = JSON.parse(readFileSync9(piConfigPath, "utf-8"));
       } catch {
@@ -6927,8 +6464,8 @@ ${user.trimEnd()}
     }
   }
   let templateConfig = {};
-  const configJsonPath = resolve13(dir, "home/.config/config.json");
-  if (existsSync8(configJsonPath)) {
+  const configJsonPath = resolve11(dir, "home/.config/config.json");
+  if (existsSync7(configJsonPath)) {
     try {
       templateConfig = JSON.parse(readFileSync9(configJsonPath, "utf-8"));
     } catch {
@@ -6970,7 +6507,7 @@ ${user.trimEnd()}
     const entry = await findMind(name);
     if (!entry) return c.json({ error: "Mind not found" }, 404);
     const dir = entry.dir ?? mindDir(name);
-    if (!existsSync8(dir)) return c.json({ error: "Mind directory missing" }, 404);
+    if (!existsSync7(dir)) return c.json({ error: "Mind directory missing" }, 404);
     const body = c.req.valid("json");
     const existing = readVoluteConfig(dir) ?? {};
     if (body.model !== void 0) existing.model = body.model;
@@ -6996,14 +6533,14 @@ ${user.trimEnd()}
     }
     writeVoluteConfig(dir, existing);
     if (body.unescapeNewlines !== void 0) {
-      const { clearEchoTextCache } = await import("./echo-text-KU6G4Z7V.js");
+      const { clearEchoTextCache } = await import("./echo-text-73CYQRL7.js");
       clearEchoTextCache(name);
     }
     const needsConfigJson = body.model !== void 0 || body.thinkingLevel !== void 0 || body.compaction !== void 0;
     if (needsConfigJson) {
-      const configJsonPath = resolve13(dir, "home/.config/config.json");
+      const configJsonPath = resolve11(dir, "home/.config/config.json");
       let templateConfig = {};
-      if (existsSync8(configJsonPath)) {
+      if (existsSync7(configJsonPath)) {
         try {
           templateConfig = JSON.parse(readFileSync9(configJsonPath, "utf-8"));
         } catch {
@@ -7068,9 +6605,43 @@ ${user.trimEnd()}
     if (err instanceof Error && err.message.includes("not initialized")) {
       return c.json({ error: "Delivery manager not available" }, 503);
     }
+    if (err instanceof UnknownChannelError) return c.json({ error: err.message }, 400);
     logger_default.error(`failed to decline channel ${channel} for ${name}`, logger_default.errorData(err));
     return c.json({ error: "Failed to decline channel" }, 500);
   }
+}).post("/:name/gates/accept", requireSelf(), async (c) => {
+  const name = c.req.param("name");
+  const body = await c.req.json().catch(() => ({}));
+  const channel = body.channel?.trim();
+  if (!channel) return c.json({ error: "channel required" }, 400);
+  if (!await findMind(name)) return c.json({ error: "Mind not found" }, 404);
+  try {
+    const result = await getDeliveryManager().acceptChannel(name, channel, body.thread?.trim());
+    return c.json({ ok: true, channel, ...result });
+  } catch (err) {
+    if (err instanceof Error && err.message.includes("not initialized")) {
+      return c.json({ error: "Delivery manager not available" }, 503);
+    }
+    if (err instanceof Error && err.message.includes("malformed")) {
+      return c.json({ error: err.message }, 409);
+    }
+    if (err instanceof UnknownChannelError) return c.json({ error: err.message }, 400);
+    logger_default.error(`failed to accept channel ${channel} for ${name}`, logger_default.errorData(err));
+    return c.json({ error: "Failed to accept channel" }, 500);
+  }
+}).get("/:name/gates/peek", requireSelf(), async (c) => {
+  const name = c.req.param("name");
+  const channel = c.req.query("channel")?.trim();
+  if (!channel) return c.json({ error: "channel required" }, 400);
+  try {
+    return c.json(await getDeliveryManager().peekChannel(name, channel));
+  } catch (err) {
+    if (err instanceof Error && err.message.includes("not initialized")) {
+      return c.json({ error: "Delivery manager not available" }, 503);
+    }
+    logger_default.error(`failed to peek channel ${channel} for ${name}`, logger_default.errorData(err));
+    return c.json({ error: "Failed to read held messages" }, 500);
+  }
 }).post("/:name/ai/complete", requireSelf(), async (c) => {
   const body = await c.req.json();
   if (!body.systemPrompt || !body.message) {
@@ -7840,7 +7411,7 @@ var app15 = new Hono18().get("/:name/clock/status", requireSelf(), async (c) =>
   const entry = await findMind(name);
   if (!entry) return c.json({ error: "Mind not found" }, 404);
   const body = await c.req.text();
-  const { deliverEvent: deliverEvent2 } = await import("./system-events-YTOU66QI.js");
+  const { deliverEvent: deliverEvent2 } = await import("./system-events-Q7IVZ5T4.js");
   const { id, delivered } = await deliverEvent2(name, {
     type: "webhook",
     body,
@@ -7858,14 +7429,14 @@ var schedules_default = app15;
 // packages/daemon/src/web/api/setup.ts
 import { mkdirSync as mkdirSync7, rmSync as rmSync4, writeFileSync as writeFileSync9 } from "fs";
 import { homedir as homedir2 } from "os";
-import { basename, resolve as resolve14 } from "path";
+import { basename, resolve as resolve12 } from "path";
 import { Hono as Hono19 } from "hono";
 import { setCookie as setCookie2 } from "hono/cookie";
 var DEFAULT_API_URL2 = "https://volute.systems";
 var setup = new Hono19();
 function writeSetupConfig(systemName, description) {
-  const configHome = process.env.VOLUTE_HOME ?? resolve14(homedir2(), ".volute");
-  const mindsDir = resolve14(configHome, "minds");
+  const configHome = process.env.VOLUTE_HOME ?? resolve12(homedir2(), ".volute");
+  const mindsDir = resolve12(configHome, "minds");
   mkdirSync7(configHome, { recursive: true });
   mkdirSync7(mindsDir, { recursive: true });
   const existingConfig = readGlobalConfig();
@@ -8200,7 +7771,7 @@ setup.post("/spirit", async (c) => {
   config2.setup.spiritDescription = description || void 0;
   const clearOldStash = () => {
     if (config2.setup?.spiritAvatar) {
-      rmSync4(resolve14(voluteSystemDir(), basename(config2.setup.spiritAvatar)), { force: true });
+      rmSync4(resolve12(voluteSystemDir(), basename(config2.setup.spiritAvatar)), { force: true });
       config2.setup.spiritAvatar = void 0;
     }
   };
@@ -8224,7 +7795,7 @@ setup.post("/spirit", async (c) => {
     }
     clearOldStash();
     const filename = `spirit-avatar.${ext}`;
-    writeFileSync9(resolve14(voluteSystemDir(), filename), bytes);
+    writeFileSync9(resolve12(voluteSystemDir(), filename), bytes);
     config2.setup.spiritAvatar = filename;
   } else {
     clearOldStash();
@@ -8237,15 +7808,16 @@ setup.post("/complete", async (c) => {
     return c.json({ error: "Setup already complete" }, 400);
   }
   try {
-    const { ensureSpiritProject, syncSpiritTemplate } = await import("./spirit-I5ECLGRI.js");
-    const { startSpiritFull } = await import("./mind-service-WHFBUKZE.js");
+    const { ensureSpiritProject, syncSpiritTemplate } = await import("./spirit-Q5VGFWUI.js");
+    const { startSpiritFull } = await import("./mind-service-7EFIJ3ZA.js");
     await ensureSpiritProject();
     await syncSpiritTemplate();
+    await notifyExtensionsSpiritReady();
     const warnings = [];
     const config2 = readGlobalConfig();
     if (config2.setup?.service && config2.setup?.type === "local") {
       try {
-        const { installUserService } = await import("./service-install-2EWD7KXD.js");
+        const { installUserService } = await import("./service-install-R4SNYUVO.js");
         const installed = await installUserService(config2.port, config2.hostname);
         if (!installed) {
           warnings.push("Service installation is not supported on this platform.");
@@ -8298,7 +7870,7 @@ setup.post("/complete", async (c) => {
     logger_default.info("setup complete state", { spiritConversationId, spiritStarted });
     if (spiritConversationId && spiritStarted) {
       try {
-        const { deliverMessage: deliverMessage2 } = await import("./message-delivery-TUXM3AAE.js");
+        const { deliverMessage: deliverMessage2 } = await import("./message-delivery-TRKT4T2P.js");
         const { listUsersByType: listUsers2 } = await import("./auth-KRDSM55Q.js");
         const admins = await listUsers2("human");
         const admin2 = admins.find((u) => u.role === "admin");
@@ -8338,9 +7910,9 @@ setup.post("/complete", async (c) => {
 var setup_default = setup;
 
 // packages/daemon/src/web/api/skills.ts
-import { existsSync as existsSync9, mkdtempSync, readdirSync as readdirSync3, rmSync as rmSync5 } from "fs";
+import { existsSync as existsSync8, mkdtempSync, readdirSync as readdirSync3, rmSync as rmSync5 } from "fs";
 import { tmpdir } from "os";
-import { join, resolve as resolve15 } from "path";
+import { join, resolve as resolve13 } from "path";
 import AdmZip from "adm-zip";
 import { Hono as Hono20 } from "hono";
 var app16 = new Hono20().get("/", async (c) => {
@@ -8416,19 +7988,19 @@ var app16 = new Hono20().get("/", async (c) => {
   try {
     const zip = new AdmZip(buffer);
     for (const entry of zip.getEntries()) {
-      const target = resolve15(tmpDir, entry.entryName);
+      const target = resolve13(tmpDir, entry.entryName);
       if (!target.startsWith(tmpDir)) {
         return c.json({ error: "Invalid zip: paths must not escape archive" }, 400);
       }
     }
     zip.extractAllTo(tmpDir, true);
     let skillDir = null;
-    if (existsSync9(join(tmpDir, "SKILL.md"))) {
+    if (existsSync8(join(tmpDir, "SKILL.md"))) {
       skillDir = tmpDir;
     } else {
       const entries = readdirSync3(tmpDir, { withFileTypes: true }).filter((e) => e.isDirectory());
       for (const entry of entries) {
-        if (existsSync9(join(tmpDir, entry.name, "SKILL.md"))) {
+        if (existsSync8(join(tmpDir, entry.name, "SKILL.md"))) {
           skillDir = join(tmpDir, entry.name);
           break;
         }
@@ -8790,8 +8362,8 @@ var app20 = new Hono24().use("*", authMiddleware).get("/", async (c) => {
         });
       }, 15e3);
       cleanups.push(() => clearInterval(keepAlive));
-      await new Promise((resolve21) => {
-        stream.onAbort(() => resolve21());
+      await new Promise((resolve19) => {
+        stream.onAbort(() => resolve19());
       });
     } finally {
       for (const cleanup of cleanups) {
@@ -9072,23 +8644,23 @@ var app21 = new Hono25().use("*", authMiddleware).get("/", async (c) => {
 var feed_default = app21;
 
 // packages/daemon/src/web/api/variants.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync9, writeFileSync as writeFileSync10 } from "fs";
-import { resolve as resolve18 } from "path";
+import { existsSync as existsSync10, mkdirSync as mkdirSync9, writeFileSync as writeFileSync10 } from "fs";
+import { resolve as resolve16 } from "path";
 import { Hono as Hono26 } from "hono";
 
 // packages/daemon/src/lib/mind/farewell.ts
-import { existsSync as existsSync10, readFileSync as readFileSync10, rmSync as rmSync6 } from "fs";
-import { resolve as resolve16 } from "path";
+import { existsSync as existsSync9, readFileSync as readFileSync10, rmSync as rmSync6 } from "fs";
+import { resolve as resolve14 } from "path";
 var flog = logger_default.child("farewell");
 var FAREWELL_RELPATH = ".mind/farewell.md";
 var FAREWELL_MIND_PATH = "../.mind/farewell.md";
 var FAREWELL_TIMEOUT_MS = 12e4;
 function farewellPath(variantDir) {
-  return resolve16(variantDir, FAREWELL_RELPATH);
+  return resolve14(variantDir, FAREWELL_RELPATH);
 }
 function readFarewell(variantDir) {
   const path = farewellPath(variantDir);
-  if (!existsSync10(path)) return void 0;
+  if (!existsSync9(path)) return void 0;
   try {
     const text = readFileSync10(path, "utf-8").trim();
     return text || void 0;
@@ -9111,7 +8683,7 @@ function waitForFarewell(name, variantDir, timeoutMs) {
   const unsub = subscribe((event) => {
     if (event.mind !== name) return;
     if (event.type !== "mind_done" && event.type !== "mind_idle") return;
-    if (existsSync10(farewellPath(variantDir))) cleanup();
+    if (existsSync9(farewellPath(variantDir))) cleanup();
   });
   return { done, cancel: cleanup };
 }
@@ -9144,8 +8716,8 @@ async function runFarewellTurn(opts) {
 
 // packages/daemon/src/lib/mind/spawn-server.ts
 import { spawn as spawn4 } from "child_process";
-import { closeSync, mkdirSync as mkdirSync8, openSync, readFileSync as readFileSync11, statSync as statSync4 } from "fs";
-import { resolve as resolve17 } from "path";
+import { closeSync, mkdirSync as mkdirSync8, openSync, readFileSync as readFileSync11, statSync as statSync3 } from "fs";
+import { resolve as resolve15 } from "path";
 async function spawnServer(cwd, port, options) {
   let cmd = process.env.VOLUTE_NODE_PATH ?? process.execPath;
   let args = ["--import", "tsx", "src/server.ts", "--port", String(port)];
@@ -9166,34 +8738,34 @@ function spawnAttached(cmd, args, cwd) {
     cwd,
     stdio: ["ignore", "pipe", "pipe"]
   });
-  return new Promise((resolve21) => {
-    const timeout = setTimeout(() => resolve21(null), 3e4);
+  return new Promise((resolve19) => {
+    const timeout = setTimeout(() => resolve19(null), 3e4);
     function checkOutput(data) {
       const match = data.toString().match(/listening on :(\d+)/);
       if (match) {
         clearTimeout(timeout);
-        resolve21({ child, actualPort: parseInt(match[1], 10) });
+        resolve19({ child, actualPort: parseInt(match[1], 10) });
       }
     }
     child.stdout?.on("data", checkOutput);
     child.stderr?.on("data", checkOutput);
     child.on("error", () => {
       clearTimeout(timeout);
-      resolve21(null);
+      resolve19(null);
     });
     child.on("exit", () => {
       clearTimeout(timeout);
-      resolve21(null);
+      resolve19(null);
     });
   });
 }
 function spawnDetached(cmd, args, cwd, logDir) {
-  const logsDir = logDir ?? resolve17(cwd, ".mind", "logs");
+  const logsDir = logDir ?? resolve15(cwd, ".mind", "logs");
   mkdirSync8(logsDir, { recursive: true });
-  const logPath = resolve17(logsDir, "mind.log");
+  const logPath = resolve15(logsDir, "mind.log");
   let startOffset = 0;
   try {
-    startOffset = statSync4(logPath).size;
+    startOffset = statSync3(logPath).size;
   } catch {
   }
   const logFd = openSync(logPath, "a");
@@ -9331,11 +8903,11 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
     return c.json({ error: `Name already in use: ${variantName}` }, 409);
   }
   const projectRoot = entry.dir ?? mindDir(mindName);
-  const variantDir = resolve18(projectRoot, ".variants", variantName);
-  if (existsSync11(variantDir)) {
+  const variantDir = resolve16(projectRoot, ".variants", variantName);
+  if (existsSync10(variantDir)) {
     return c.json({ error: `Variant directory already exists: ${variantDir}` }, 409);
   }
-  mkdirSync9(resolve18(projectRoot, ".variants"), { recursive: true });
+  mkdirSync9(resolve16(projectRoot, ".variants"), { recursive: true });
   try {
     await gitExec(["worktree", "add", "-b", variantName, variantDir], { cwd: projectRoot });
   } catch (e) {
@@ -9371,7 +8943,7 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
       const [cmd, args] = await wrapForIsolation("npm", ["install"], mindName);
       await exec(cmd, args, {
         cwd: variantDir,
-        env: { ...process.env, HOME: resolve18(variantDir, "home") }
+        env: { ...process.env, HOME: resolve16(variantDir, "home") }
       });
     } else {
       await exec("npm", ["install"], { cwd: variantDir });
@@ -9382,7 +8954,7 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
     return c.json({ error: `npm install failed: ${msg}` }, 500);
   }
   if (body.soul) {
-    writeFileSync10(resolve18(variantDir, "home/SOUL.md"), body.soul);
+    writeFileSync10(resolve16(variantDir, "home/SOUL.md"), body.soul);
   }
   const variantPort = body.port ?? await nextPort();
   try {
@@ -9465,7 +9037,7 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
     logger_default.warn(`farewell turn failed for ${variantName}`, logger_default.errorData(err));
   }
   try {
-    if (existsSync11(variantEntry.dir)) {
+    if (existsSync10(variantEntry.dir)) {
       const status = (await gitExec(["status", "--porcelain"], { cwd: variantEntry.dir })).trim();
       if (status) {
         try {
@@ -9523,7 +9095,7 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
         { conflicts: err.conflicts }
       );
     }
-    if (existsSync11(variantEntry.dir) && !body.discardUnresolved) {
+    if (existsSync10(variantEntry.dir) && !body.discardUnresolved) {
       let unresolved;
       try {
         unresolved = await findUnresolvedHomeFiles(variantEntry.dir);
@@ -9562,7 +9134,7 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
         const [cmd, args] = await wrapForIsolation("npm", ["install"], mindName);
         await exec(cmd, args, {
           cwd: projectRoot,
-          env: { ...process.env, HOME: resolve18(projectRoot, "home") }
+          env: { ...process.env, HOME: resolve16(projectRoot, "home") }
         });
       } else {
         await exec("npm", ["install"], { cwd: projectRoot });
@@ -10057,11 +9629,11 @@ var app24 = new Hono28().get("/:name/conversations/:id/events", async (c) => {
         if (!stream.aborted) console.error("[chat] SSE ping error:", err);
       });
     }, 15e3);
-    await new Promise((resolve21) => {
+    await new Promise((resolve19) => {
       stream.onAbort(() => {
         unsubscribe();
         clearInterval(keepAlive);
-        resolve21();
+        resolve19();
       });
     });
   });
@@ -10278,10 +9850,10 @@ app26.route("/api/conversations", conversations_default);
 var app_default = app26;
 
 // packages/daemon/src/web/server.ts
-import { existsSync as existsSync12 } from "fs";
+import { existsSync as existsSync11 } from "fs";
 import { readFile as readFile2, stat as stat2 } from "fs/promises";
 import { createServer as createHttpsServer } from "https";
-import { dirname as dirname3, extname as extname3, resolve as resolve19 } from "path";
+import { dirname as dirname3, extname as extname3, resolve as resolve17 } from "path";
 import { serve } from "@hono/node-server";
 var MIME_TYPES2 = {
   ".html": "text/html",
@@ -10300,8 +9872,8 @@ async function startServer({
   let assetsDir = "";
   let searchDir = dirname3(new URL(import.meta.url).pathname);
   for (let i = 0; i < 5; i++) {
-    const candidate = resolve19(searchDir, "dist", "web-assets");
-    if (existsSync12(candidate)) {
+    const candidate = resolve17(searchDir, "dist", "web-assets");
+    if (existsSync11(candidate)) {
       assetsDir = candidate;
       break;
     }
@@ -10311,7 +9883,7 @@ async function startServer({
     app_default.get("*", async (c) => {
       const urlPath = new URL(c.req.url).pathname;
       if (urlPath.startsWith("/api/") || urlPath.startsWith("/ext/")) return c.notFound();
-      const filePath = resolve19(assetsDir, urlPath.slice(1));
+      const filePath = resolve17(assetsDir, urlPath.slice(1));
       if (!filePath.startsWith(assetsDir)) return c.text("Forbidden", 403);
       const s = await stat2(filePath).catch(() => null);
       if (s?.isFile()) {
@@ -10324,7 +9896,7 @@ async function startServer({
         const cacheControl = isHashed ? "public, max-age=31536000, immutable" : "no-cache";
         return c.body(body, 200, { "Content-Type": mime, "Cache-Control": cacheControl });
       }
-      const indexPath = resolve19(assetsDir, "index.html");
+      const indexPath = resolve17(assetsDir, "index.html");
       const indexStat = await stat2(indexPath).catch(() => null);
       if (indexStat?.isFile()) {
         const body = await readFile2(indexPath, "utf-8");
@@ -10341,10 +9913,10 @@ async function startServer({
       createServer: createHttpsServer,
       serverOptions: { key: tls.key, cert: tls.cert }
     });
-    await new Promise((resolve21, reject) => {
+    await new Promise((resolve19, reject) => {
       server2.on("listening", () => {
         logger_default.info("Volute UI running (https)", { hostname, port });
-        resolve21();
+        resolve19();
       });
       server2.on("error", (err) => {
         reject(err);
@@ -10352,13 +9924,13 @@ async function startServer({
     });
     const internalPort = port + 1;
     const internalServer = serve({ fetch: app_default.fetch, port: internalPort, hostname: "127.0.0.1" });
-    await new Promise((resolve21, reject) => {
+    await new Promise((resolve19, reject) => {
       internalServer.on("listening", () => {
         logger_default.info("Volute API running (http, internal)", {
           hostname: "127.0.0.1",
           port: internalPort
         });
-        resolve21();
+        resolve19();
       });
       internalServer.on("error", (err) => {
         reject(err);
@@ -10367,10 +9939,10 @@ async function startServer({
     return { server: server2, internalPort };
   }
   const server = serve({ fetch: app_default.fetch, port, hostname });
-  await new Promise((resolve21, reject) => {
+  await new Promise((resolve19, reject) => {
     server.on("listening", () => {
       logger_default.info("Volute API running (http)", { hostname, port });
-      resolve21();
+      resolve19();
     });
     server.on("error", (err) => {
       reject(err);
@@ -10381,17 +9953,17 @@ async function startServer({
 
 // packages/daemon/src/daemon.ts
 if (!process.env.VOLUTE_HOME) {
-  process.env.VOLUTE_HOME = resolve20(homedir3(), ".volute");
+  process.env.VOLUTE_HOME = resolve18(homedir3(), ".volute");
 }
 if (process.env.VOLUTE_TIMEZONE && !process.env.TZ) {
   process.env.TZ = process.env.VOLUTE_TIMEZONE;
 }
 function writeDaemonConfig(systemDir, config2, token) {
-  const configPath = resolve20(systemDir, "daemon.json");
+  const configPath = resolve18(systemDir, "daemon.json");
   writeFileSync11(configPath, `${JSON.stringify(config2, null, 2)}
 `, { mode: 420 });
   chmodSync(configPath, 420);
-  const tokenPath = resolve20(systemDir, "daemon-token");
+  const tokenPath = resolve18(systemDir, "daemon-token");
   writeFileSync11(tokenPath, `${token}
 `, { mode: 384 });
   chmodSync(tokenPath, 384);
@@ -10402,7 +9974,7 @@ async function startDaemon(opts) {
   const home = voluteHome();
   const systemDir = voluteSystemDir();
   if (!opts.foreground) {
-    const rotatingLog = new RotatingLog(resolve20(systemDir, "daemon.log"));
+    const rotatingLog = new RotatingLog(resolve18(systemDir, "daemon.log"));
     logger_default.setOutput((line) => rotatingLog.write(`${line}
 `));
     const write = (...args) => rotatingLog.write(`${format(...args)}
@@ -10412,9 +9984,9 @@ async function startDaemon(opts) {
     console.warn = write;
     console.info = write;
   }
-  const DAEMON_PID_PATH = resolve20(systemDir, "daemon.pid");
-  const DAEMON_JSON_PATH = resolve20(systemDir, "daemon.json");
-  const DAEMON_TOKEN_PATH = resolve20(systemDir, "daemon-token");
+  const DAEMON_PID_PATH = resolve18(systemDir, "daemon.pid");
+  const DAEMON_JSON_PATH = resolve18(systemDir, "daemon.json");
+  const DAEMON_TOKEN_PATH = resolve18(systemDir, "daemon-token");
   mkdirSync10(home, { recursive: true });
   ensureSystemDir();
   const { migrateConfigSecrets, migrateSetupCompleted } = await import("./setup-WZSXHHRJ.js");
@@ -10443,6 +10015,12 @@ async function startDaemon(opts) {
   } catch (err) {
     logger_default.warn("session\u2192thread config migration failed", logger_default.errorData(err));
   }
+  try {
+    const { migrateNamePlaceholders } = await import("./migrate-name-placeholder-C7NCNLWF.js");
+    await migrateNamePlaceholders();
+  } catch (err) {
+    logger_default.warn("{{name}} placeholder migration failed", logger_default.errorData(err));
+  }
   const { initSandbox } = await import("./sandbox-NNWCTHRI.js");
   await initSandbox();
   try {
@@ -10543,7 +10121,7 @@ async function startDaemon(opts) {
   const orphanedTurns = await completeOrphanedTurns();
   summarizeOrphanedTurns(orphanedTurns);
   try {
-    const { reconcileVariants } = await import("./variant-cleanup-CZDLIY3F.js");
+    const { reconcileVariants } = await import("./variant-cleanup-QHGGY7ND.js");
     await reconcileVariants();
   } catch (err) {
     logger_default.error("failed to reconcile variants", logger_default.errorData(err));
@@ -10579,16 +10157,17 @@ async function startDaemon(opts) {
   try {
     const { isSetupComplete: isSetupComplete2, getSpiritName: getSpiritName2 } = await import("./setup-WZSXHHRJ.js");
     if (isSetupComplete2()) {
-      const { ensureSpiritProject, syncSpiritTemplate } = await import("./spirit-I5ECLGRI.js");
-      const { startSpiritFull } = await import("./mind-service-WHFBUKZE.js");
+      const { ensureSpiritProject, syncSpiritTemplate } = await import("./spirit-Q5VGFWUI.js");
+      const { startSpiritFull } = await import("./mind-service-7EFIJ3ZA.js");
       await ensureSpiritProject();
       const spiritName = getSpiritName2();
       const spiritEntry = await findMind(spiritName);
       if (spiritEntry?.dir) {
-        const { registerMindDir } = await import("./delivery-router-RHANNTAC.js");
+        const { registerMindDir } = await import("./delivery-router-QS4NLJR6.js");
         registerMindDir(spiritName, spiritEntry.dir);
       }
       await syncSpiritTemplate();
+      if (spiritEntry) await notifyExtensionsSpiritReady();
       if (spiritEntry && !manager.isRunning(spiritName)) {
         await startSpiritFull(spiritName);
       }
@@ -10599,7 +10178,7 @@ async function startDaemon(opts) {
   bridgeManager.startBridges(daemonPort).catch((err) => {
     logger_default.warn("failed to start bridges", logger_default.errorData(err));
   });
-  import("./cloud-sync-MJVJ33LD.js").then(
+  import("./cloud-sync-52YNJRMR.js").then(
     ({ consumeQueuedMessages }) => consumeQueuedMessages().catch((err) => {
       logger_default.warn("failed to consume queued cloud messages", logger_default.errorData(err));
     })
@@ -10607,12 +10186,14 @@ async function startDaemon(opts) {
     logger_default.warn("failed to load cloud-sync module", logger_default.errorData(err));
   });
   try {
-    const { backfillTemplateHashes, notifyVersionUpdate, warnStaleTemplates } = await import("./version-notify-SJVAQLZI.js");
-    backfillTemplateHashes().then(() => warnStaleTemplates()).catch((err) => {
-      logger_default.warn("failed to check template staleness", logger_default.errorData(err));
-    });
+    const { backfillTemplateHashes, notifyVersionUpdate, warnStaleTemplates } = await import("./version-notify-VNVFX6UP.js");
     notifyVersionUpdate().catch((err) => {
       logger_default.warn("failed to send version update notifications", logger_default.errorData(err));
+    }).then(() => backfillTemplateHashes()).then(() => warnStaleTemplates()).then(async () => {
+      const { runAutoUpgrades } = await import("./auto-upgrade-HEVZKPTF.js");
+      await runAutoUpgrades();
+    }).catch((err) => {
+      logger_default.warn("template staleness/auto-upgrade pass failed", logger_default.errorData(err));
     });
   } catch (err) {
     logger_default.warn("failed to initialize version notifications", logger_default.errorData(err));
@@ -10621,6 +10202,9 @@ async function startDaemon(opts) {
     logger_default.warn("failed to restore delivery queue", logger_default.errorData(err));
   });
   delivery.startRedrive();
+  delivery.releaseGatedSweep().catch((err) => {
+    logger_default.warn("failed to sweep gated messages", logger_default.errorData(err));
+  });
   cleanExpiredSessions().catch((err) => {
     logger_default.warn("failed to clean expired sessions", logger_default.errorData(err));
   });