volute 0.50.0 → 0.52.0

package/dist/daemon.js

@@ -6,7 +6,7 @@ import {
   readBackupState,
   resticVersion,
   runBackup
-} from "./chunk-WBBKYUGF.js";
+} from "./chunk-EDR47UE2.js";
 import {
   acceptPending,
   formatFileSize,
@@ -14,44 +14,44 @@ import {
   rejectPending,
   stageFile,
   validateFilePath
-} from "./chunk-QFVGPKJI.js";
+} from "./chunk-DMK5ASKV.js";
 import {
   findOpenClawSession,
   importOpenClawConnectors,
   importPiSession,
   parseNameFromIdentity
-} from "./chunk-77IZUVBB.js";
+} from "./chunk-I7U5EEZC.js";
 import {
   SPIRIT_NOTICE_PREFIX,
   ensureSpiritAvailable
-} from "./chunk-MLZBBLMT.js";
+} from "./chunk-CW7BQKF6.js";
 import {
   isHomeOnlyArchive
-} from "./chunk-KAEZOVP6.js";
+} from "./chunk-FLIEXG2T.js";
 import {
   evaluateSeedChecklist
-} from "./chunk-5PKFJHCR.js";
+} from "./chunk-JHKBALS2.js";
 import {
   isTemplateStale
-} from "./chunk-SSNZ6ZNN.js";
+} from "./chunk-CV6BNGFK.js";
 import {
   computeTemplateHash
-} from "./chunk-C3KLHJDB.js";
+} from "./chunk-HTRSSOHY.js";
 import {
   cleanupVariant
-} from "./chunk-HW6Q7AMB.js";
+} from "./chunk-ITK6HV47.js";
 import {
   checkForUpdate,
   checkForUpdateCached,
   getCurrentVersion
-} from "./chunk-AFSLNUTT.js";
+} from "./chunk-LAUCO2HC.js";
 import {
   PLATFORMS,
   echoTextToChannel,
   fixModelEscapes,
   getPlatformDriver,
   routeOutboundBridge
-} from "./chunk-636GFQNE.js";
+} from "./chunk-XRWUQPCA.js";
 import {
   getBridgeConfig,
   readBridgesConfig,
@@ -60,7 +60,7 @@ import {
   resolveChannelMapping,
   setBridgeConfig,
   setChannelMapping
-} from "./chunk-7XDOTN4R.js";
+} from "./chunk-L7BKTZ5U.js";
 import {
   SESSION_MAX_AGE,
   announceSprout,
@@ -86,9 +86,11 @@ import {
   installNpmExtension,
   invalidateMindUserCache,
   invalidateSessionCache,
+  issueApiToken,
   joinSystemChannel,
   joinSystemChannelForMind,
   linkToolResultToTurn,
+  listApiTokens,
   loadAllExtensions,
   notifyExtensionsDaemonStart,
   notifyExtensionsDaemonStop,
@@ -97,13 +99,14 @@ import {
   requireAdmin,
   requireAdminOrSystem,
   requireSelf,
+  revokeApiToken,
   setExtensionEnabled,
   startMindFull,
   stopMindFull,
   uninstallNpmExtension,
   writeSystemsConfig
-} from "./chunk-EQKSRVDE.js";
-import "./chunk-SFRYRW37.js";
+} from "./chunk-ZEZQNP2G.js";
+import "./chunk-K2F237KS.js";
 import {
   applyInitFiles,
   applyTemplateHomeFiles,
@@ -112,11 +115,11 @@ import {
   findTemplatesRoot,
   isKnownTemplate,
   listFiles
-} from "./chunk-RRZ4RQQU.js";
+} from "./chunk-X67BDDZR.js";
 import {
   getScheduler,
   initScheduler
-} from "./chunk-7FDWPQCU.js";
+} from "./chunk-SW2U6HRB.js";
 import {
   checkStaleSend,
   formatHoldNotice,
@@ -125,7 +128,7 @@ import {
   initDeliveryManager,
   isConversationId,
   publishTypingForChannels
-} from "./chunk-JI67D7O2.js";
+} from "./chunk-RU74YG46.js";
 import {
   MindStartupError,
   RestartTracker,
@@ -135,10 +138,10 @@ import {
   initMindManager,
   syncProviderToMinds,
   tryGetMindManager
-} from "./chunk-ALIVXDM4.js";
+} from "./chunk-724DVYHU.js";
 import {
   extractTextContent
-} from "./chunk-6BM2I736.js";
+} from "./chunk-UDZLPR34.js";
 import {
   SYSTEM_MIND,
   assignSession,
@@ -158,7 +161,7 @@ import {
   takeErrored,
   trackToolUse,
   utcDateTimeStr
-} from "./chunk-7DXLIYPY.js";
+} from "./chunk-YVR6EHWL.js";
 import {
   SEED_SKILLS,
   STANDARD_SKILLS,
@@ -180,12 +183,13 @@ import {
   syncBuiltinSkills,
   uninstallSkill,
   updateSkill
-} from "./chunk-TGJHGVBZ.js";
+} from "./chunk-RPPTGPYF.js";
 import {
   approveUser,
   changePassword,
   countAdmins,
   createUser,
+  deleteExternalMindUser,
   deleteMindUser as deleteMindUser2,
   deleteUser,
   getDisplayNames,
@@ -201,9 +205,10 @@ import {
   updateUserProfile,
   verifyUser,
   withSenderDisplayNames
-} from "./chunk-UC6BNMGT.js";
+} from "./chunk-7LT3YZUR.js";
 import {
   captureReflection,
+  cleanExpiredEvents,
   clearDeliveredEvents,
   deliverEvent,
   drainEvents,
@@ -214,7 +219,7 @@ import {
   listEvents,
   parseMeta,
   recordNotice
-} from "./chunk-7OZWKHA3.js";
+} from "./chunk-AXFLY5GU.js";
 import {
   publish as publish2,
   subscribe as subscribe2,
@@ -227,11 +232,11 @@ import {
   getPrompt,
   getPromptIfCustom,
   substitute
-} from "./chunk-5TPC4KCV.js";
+} from "./chunk-FXWBFDQR.js";
 import {
   isSandboxEnabled,
   wrapForSandbox
-} from "./chunk-ZUG76D3P.js";
+} from "./chunk-5Y54AE3L.js";
 import {
   addMessage,
   createChannel,
@@ -267,22 +272,22 @@ import {
   subscribe as subscribe3,
   subscribeParticipantAdded,
   updateChannelSettings
-} from "./chunk-574M6I7F.js";
+} from "./chunk-TPX6E6PL.js";
 import {
   getActiveMinds,
   onMindEvent,
   stopAll
-} from "./chunk-E5S3ILVA.js";
+} from "./chunk-UFTDRTCP.js";
 import {
   broadcast,
   getEventsSince,
   nextEventId,
   publish,
   subscribe
-} from "./chunk-3BAFMGCJ.js";
+} from "./chunk-U54PJPTB.js";
 import {
   normalizeAvatar
-} from "./chunk-X67VT4QO.js";
+} from "./chunk-ICXY54ZC.js";
 import {
   safeResolveWithinBase
 } from "./chunk-DW4TRDOZ.js";
@@ -290,7 +295,7 @@ import {
   readVoluteConfig,
   writeVoluteConfig
 } from "./chunk-WCFSBH33.js";
-import "./chunk-5FVANDON.js";
+import "./chunk-6NLW72HP.js";
 import {
   chownMindDir,
   chownMindFile,
@@ -302,15 +307,16 @@ import {
   isIsolationEnabled,
   resolveVoluteBin,
   wrapForIsolation
-} from "./chunk-AJWFDIEY.js";
+} from "./chunk-M77B73VV.js";
 import {
   loadMergedEnv,
   mindEnvPath,
   readEnv,
   sharedEnvPath,
   writeEnv
-} from "./chunk-7UWXAJMK.js";
+} from "./chunk-GLM7TVWP.js";
 import {
+  OAuthRefreshError,
   addCustomModel,
   aiCompleteUtility,
   buildCustomModel,
@@ -334,7 +340,7 @@ import {
   setProviderRefreshHook,
   setUtilityModel,
   unqualifyModelId
-} from "./chunk-632FJ23O.js";
+} from "./chunk-EGV6R6UF.js";
 import {
   logBuffer,
   logger_default
@@ -374,7 +380,7 @@ import {
   voluteHome,
   voluteSystemDir,
   writeGlobalConfig
-} from "./chunk-CAIYV33P.js";
+} from "./chunk-H6X6CKDN.js";
 import {
   activity,
   channels,
@@ -386,14 +392,14 @@ import {
   systemPrompts,
   turns,
   users
-} from "./chunk-5IIVOWSP.js";
+} from "./chunk-2RNMBXD2.js";
 import "./chunk-K3NQKI34.js";
 
 // packages/daemon/src/daemon.ts
 import { randomBytes as randomBytes3 } from "crypto";
 import { chmodSync, mkdirSync as mkdirSync10, readFileSync as readFileSync12, unlinkSync as unlinkSync2, writeFileSync as writeFileSync10 } from "fs";
 import { homedir as homedir3 } from "os";
-import { resolve as resolve18 } from "path";
+import { resolve as resolve20 } from "path";
 import { format } from "util";
 
 // packages/daemon/src/lib/daemon/backup-manager.ts
@@ -504,7 +510,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-A6IGCEC3.js");
+    const { deliverEvent: deliverEvent2 } = await import("./system-events-V43HDA3T.js");
     await deliverEvent2(getSpiritName(), {
       type: "notice",
       meta: { subtype: "backup" },
@@ -728,8 +734,8 @@ var BridgeManager = class {
     if (!tracked) return;
     this.stopping.add(platform);
     this.bridges.delete(platform);
-    await new Promise((resolve19) => {
-      tracked.child.on("exit", () => resolve19());
+    await new Promise((resolve21) => {
+      tracked.child.on("exit", () => resolve21());
       try {
         if (tracked.child.pid) {
           process.kill(-tracked.child.pid, "SIGTERM");
@@ -740,7 +746,7 @@ var BridgeManager = class {
         if (err instanceof Error && err.code !== "ESRCH") {
           blog2.warn(`failed to stop bridge ${platform}`, logger_default.errorData(err));
         }
-        resolve19();
+        resolve21();
       }
       setTimeout(() => {
         try {
@@ -751,7 +757,7 @@ var BridgeManager = class {
           }
         } catch {
         }
-        resolve19();
+        resolve21();
       }, 5e3);
     });
     this.stopping.delete(platform);
@@ -861,6 +867,11 @@ async function runMaintenance() {
   } catch (err) {
     logger_default.warn("maintenance: failed to clean expired logs", logger_default.errorData(err));
   }
+  try {
+    await cleanExpiredEvents();
+  } catch (err) {
+    logger_default.warn("maintenance: failed to clean expired events", logger_default.errorData(err));
+  }
 }
 function startMaintenanceInterval(intervalMs = MAINTENANCE_INTERVAL_MS, task = runMaintenance) {
   const handle = setInterval(() => void task(), intervalMs);
@@ -1112,6 +1123,7 @@ async function xaiSearch(_query, _cred) {
 }
 
 // packages/daemon/src/lib/services/imagegen.ts
+var igLog = logger_default.child("imagegen");
 var PROVIDERS = {
   replicate: {
     envVar: "REPLICATE_API_TOKEN",
@@ -1275,12 +1287,19 @@ async function resolveCredential(providerId) {
   const config2 = readGlobalConfig();
   const configKey = config2.imagegen?.providers?.[providerId]?.apiKey;
   if (configKey) return { kind: "api_key", token: configKey };
-  const oauth = await resolveOAuthCredentials(aiProviderId);
-  if (oauth) return { kind: "oauth", token: oauth.access };
+  let oauthError;
+  try {
+    const oauth = await resolveOAuthCredentials(aiProviderId);
+    if (oauth) return { kind: "oauth", token: oauth.access };
+  } catch (err) {
+    if (!(err instanceof OAuthRefreshError)) throw err;
+    oauthError = err;
+  }
   const aiKey = config2.ai?.providers?.[aiProviderId]?.apiKey;
   if (aiKey) return { kind: "api_key", token: aiKey };
   const envKey = provider.envVar ? process.env[provider.envVar] : void 0;
   if (envKey) return { kind: "api_key", token: envKey };
+  if (oauthError) throw oauthError;
   return void 0;
 }
 function getEnabledModels2() {
@@ -1315,12 +1334,27 @@ async function searchModels(query, provider) {
     return providerDef.search(query || "text to image", cred);
   }
   const searches = [];
+  let transientError;
   for (const [id, def] of Object.entries(PROVIDERS)) {
-    const cred = await resolveCredential(id);
+    let cred;
+    try {
+      cred = await resolveCredential(id);
+    } catch (err) {
+      if (!(err instanceof OAuthRefreshError)) throw err;
+      igLog.warn(`skipping ${id} in model search: OAuth temporarily unavailable`);
+      transientError = err;
+      continue;
+    }
     if (!cred) continue;
-    searches.push(def.search(query || "text to image", cred).catch(() => []));
+    searches.push(
+      def.search(query || "text to image", cred).catch((err) => {
+        igLog.warn(`model search failed for ${id}`, logger_default.errorData(err));
+        return [];
+      })
+    );
   }
   if (searches.length === 0) {
+    if (transientError) throw transientError;
     throw new Error("No imagegen providers configured");
   }
   return (await Promise.all(searches)).flat();
@@ -1382,7 +1416,7 @@ async function generateImage(model, prompt, signal) {
 
 // packages/daemon/src/web/api/system.ts
 var DEFAULT_API_URL = "https://volute.systems";
-var igLog = logger_default.child("imagegen");
+var igLog2 = logger_default.child("imagegen");
 var app = new Hono().post("/restart", requireAdmin, (c) => {
   setTimeout(() => process.exit(1), 200);
   return c.json({ ok: true });
@@ -1400,10 +1434,10 @@ var app = new Hono().post("/restart", requireAdmin, (c) => {
       stream.writeSSE({ data: JSON.stringify(entry) }).catch(() => {
       });
     });
-    await new Promise((resolve19) => {
+    await new Promise((resolve21) => {
       stream.onAbort(() => {
         unsubscribe();
-        resolve19();
+        resolve21();
       });
     });
   });
@@ -1428,7 +1462,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-IL5EMWYZ.js");
+    const { notifySpiritSystemChange } = await import("./spirit-4ECYIVGE.js");
     await notifySpiritSystemChange();
   }
   return c.json({ name: config2.name ?? null });
@@ -1621,7 +1655,7 @@ var app = new Hono().post("/restart", requireAdmin, (c) => {
     const results = await searchModels(q || void 0, provider || void 0);
     return c.json(results);
   } catch (err) {
-    igLog.error("model search failed", logger_default.errorData(err));
+    igLog2.error("model search failed", logger_default.errorData(err));
     return c.json({ error: err instanceof Error ? err.message : "Search failed" }, 500);
   }
 }).post(
@@ -1638,7 +1672,7 @@ var app = new Hono().post("/restart", requireAdmin, (c) => {
         }
       });
     } catch (err) {
-      igLog.error("image generation failed", logger_default.errorData(err));
+      igLog2.error("image generation failed", logger_default.errorData(err));
       return c.json({ error: err instanceof Error ? err.message : "Generation failed" }, 500);
     }
   }
@@ -1787,8 +1821,8 @@ var app = new Hono().post("/restart", requireAdmin, (c) => {
       createdAt: Date.now()
     };
     oauthFlows.set(flowId, flow);
-    const promptPromise = needsManualCode ? new Promise((resolve19) => {
-      flow.resolveCode = resolve19;
+    const promptPromise = needsManualCode ? new Promise((resolve21) => {
+      flow.resolveCode = resolve21;
     }) : void 0;
     oauthProvider.login({
       onAuth: (info) => {
@@ -1827,7 +1861,7 @@ var app = new Hono().post("/restart", requireAdmin, (c) => {
         existing.error = err instanceof Error ? err.message : String(err);
       }
     });
-    await new Promise((resolve19) => setTimeout(resolve19, 2e3));
+    await new Promise((resolve21) => setTimeout(resolve21, 2e3));
     const state = oauthFlows.get(flowId);
     return c.json({
       flowId,
@@ -2088,8 +2122,8 @@ var app2 = new Hono2().get("/events", async (c) => {
         });
       }, 15e3);
       cleanups.push(() => clearInterval(keepAlive));
-      await new Promise((resolve19) => {
-        stream.onAbort(() => resolve19());
+      await new Promise((resolve21) => {
+        stream.onAbort(() => resolve21());
       });
     } finally {
       for (const cleanup of cleanups) {
@@ -2122,6 +2156,11 @@ function isNotModified(c, etag) {
 }
 
 // packages/daemon/src/web/api/auth.ts
+async function withExternalFlag(list) {
+  if (!list.some((u) => u.user_type === "mind")) return list;
+  const local = new Set((await readAllMinds()).map((m) => m.name));
+  return list.map((u) => u.user_type === "mind" ? { ...u, external: !local.has(u.username) } : u);
+}
 function tryJoinSystem(userId) {
   if (!process.env.VOLUTE_DAEMON_TOKEN) return;
   joinSystemChannel(userId).catch(() => {
@@ -2145,6 +2184,12 @@ var profileSchema = z2.object({
   display_name: z2.string().max(100).nullable().optional(),
   description: z2.string().max(500).nullable().optional()
 });
+var registerMindSchema = z2.object({
+  name: z2.string().min(1),
+  displayName: z2.string().max(100).optional(),
+  description: z2.string().max(500).optional(),
+  tokenLabel: z2.string().max(100).optional()
+});
 var AVATAR_MIME = {
   ".png": "image/png",
   ".jpg": "image/jpeg",
@@ -2156,7 +2201,39 @@ var MAX_AVATAR_SIZE = 2 * 1024 * 1024;
 function avatarsDir() {
   return resolve3(voluteHome(), "avatars");
 }
-var authenticated = new Hono3().use(authMiddleware).post("/change-password", zValidator2("json", changePasswordSchema), async (c) => {
+var authenticated = new Hono3().use(authMiddleware).post("/minds", requireAdmin, zValidator2("json", registerMindSchema), async (c) => {
+  const { name, displayName, description, tokenLabel } = c.req.valid("json");
+  const invalid = validateMindName(name);
+  if (invalid) return c.json({ error: invalid }, 400);
+  if (await getUserByUsername(name)) {
+    return c.json({ error: `"${name}" is already taken` }, 409);
+  }
+  const db = await getDb();
+  let user;
+  try {
+    [user] = await db.insert(users).values({
+      username: name,
+      password_hash: "!mind",
+      role: "user",
+      user_type: "mind",
+      display_name: displayName ?? null,
+      description: description ?? null
+    }).returning({
+      id: users.id,
+      username: users.username,
+      user_type: users.user_type,
+      role: users.role,
+      display_name: users.display_name
+    });
+  } catch (err) {
+    if (await getUserByUsername(name)) {
+      return c.json({ error: `"${name}" is already taken` }, 409);
+    }
+    throw err;
+  }
+  const { id: tokenId, token } = await issueApiToken(user.id, tokenLabel);
+  return c.json({ name, user, token, tokenId }, 201);
+}).post("/change-password", zValidator2("json", changePasswordSchema), async (c) => {
   const user = c.get("user");
   const { currentPassword, newPassword } = c.req.valid("json");
   const ok = await changePassword(user.id, currentPassword, newPassword);
@@ -2237,9 +2314,9 @@ var admin = new Hono3().use(authMiddleware).get("/users", async (c) => {
   }
   const type = c.req.query("type");
   if (type === "human" || type === "mind") {
-    return c.json(await listUsersByType(type));
+    return c.json(await withExternalFlag(await listUsersByType(type)));
   }
-  return c.json(await listUsers());
+  return c.json(await withExternalFlag(await listUsers()));
 }).get("/users/pending", async (c) => {
   const user = c.get("user");
   if (user.role !== "admin") return c.json({ error: "Forbidden" }, 403);
@@ -2272,7 +2349,42 @@ var admin = new Hono3().use(authMiddleware).get("/users", async (c) => {
     await setUserRole(id, role);
     return c.json({ ok: true });
   }
-).put("/users/:id/profile", zValidator2("json", profileSchema), async (c) => {
+).post(
+  "/users/:id/tokens",
+  requireAdmin,
+  zValidator2("json", z2.object({ label: z2.string().max(200).optional() })),
+  async (c) => {
+    const id = parseInt(c.req.param("id"), 10);
+    if (Number.isNaN(id)) return c.json({ error: "Invalid user ID" }, 400);
+    const target = await getUser(id);
+    if (!target) return c.json({ error: "User not found" }, 404);
+    const { label } = c.req.valid("json");
+    const issued = await issueApiToken(id, label);
+    return c.json(
+      {
+        id: issued.id,
+        token: issued.token,
+        label: issued.label,
+        createdAt: issued.created_at
+      },
+      201
+    );
+  }
+).get("/users/:id/tokens", requireAdmin, async (c) => {
+  const id = parseInt(c.req.param("id"), 10);
+  if (Number.isNaN(id)) return c.json({ error: "Invalid user ID" }, 400);
+  const target = await getUser(id);
+  if (!target) return c.json({ error: "User not found" }, 404);
+  const tokens = await listApiTokens(id);
+  return c.json(tokens.map((t) => ({ id: t.id, label: t.label, createdAt: t.created_at })));
+}).delete("/users/:id/tokens/:tokenId", requireAdmin, async (c) => {
+  const id = parseInt(c.req.param("id"), 10);
+  const tokenId = parseInt(c.req.param("tokenId"), 10);
+  if (Number.isNaN(id) || Number.isNaN(tokenId)) return c.json({ error: "Invalid ID" }, 400);
+  const revoked = await revokeApiToken(id, tokenId);
+  if (!revoked) return c.json({ error: "Token not found" }, 404);
+  return c.json({ ok: true });
+}).put("/users/:id/profile", zValidator2("json", profileSchema), async (c) => {
   const user = c.get("user");
   if (user.role !== "admin") return c.json({ error: "Forbidden" }, 403);
   const id = parseInt(c.req.param("id"), 10);
@@ -2301,7 +2413,11 @@ var admin = new Hono3().use(authMiddleware).get("/users", async (c) => {
     if (adminCount <= 1) return c.json({ error: "Cannot delete the last admin" }, 400);
   }
   if (target.user_type === "mind") {
-    return c.json({ error: "Use the mind deletion API to delete minds" }, 400);
+    if (await findMind(target.username)) {
+      return c.json({ error: "Use the mind deletion API to delete minds" }, 400);
+    }
+    await deleteExternalMindUser(id);
+    return c.json({ ok: true });
   }
   await deleteUser(id);
   return c.json({ ok: true });
@@ -2557,15 +2673,18 @@ async function fanOutToMinds(opts) {
   const isDM = opts.isDM ?? participants.length === 2;
   const manager = getMindManager();
   const sm = getSleepManagerIfReady();
+  const registeredMinds = new Set((await readAllMinds()).map((m) => m.name));
   const targetMinds = mindParticipants.map((ap) => {
     const key = opts.targetName ? opts.targetName(ap.username) : ap.username;
     if (manager.isRunning(key) || sm?.isSleeping(ap.username)) return ap.username;
     if (ap.username !== opts.senderName) {
-      logger_default.warn(
-        `fan-out: skipping ${ap.username} (not running) for conversation ${opts.conversationId}`
-      );
+      if (registeredMinds.has(ap.username)) {
+        logger_default.warn(
+          `fan-out: skipping ${ap.username} (not running) for conversation ${opts.conversationId}`
+        );
+      }
       if (ap.userType === "system") {
-        import("./spirit-availability-YFEGJNJ2.js").then(({ ensureSpiritAvailable: ensureSpiritAvailable2 }) => ensureSpiritAvailable2()).catch((err) => logger_default.warn("fan-out: on-demand spirit start failed", logger_default.errorData(err)));
+        import("./spirit-availability-Y54Y3675.js").then(({ ensureSpiritAvailable: ensureSpiritAvailable2 }) => ensureSpiritAvailable2()).catch((err) => logger_default.warn("fan-out: on-demand spirit start failed", logger_default.errorData(err)));
       }
     }
     return null;
@@ -2668,7 +2787,7 @@ var app4 = new Hono5().post("/:platform/inbound", zValidator4("json", inboundSch
   }
   const participants = await getParticipants(channel.id);
   if (!participants.some((p) => p.userId === puppet.id)) {
-    const { addParticipant } = await import("./conversations-S2232Y5I.js");
+    const { addParticipant } = await import("./conversations-ZL6PHROD.js");
     await addParticipant(channel.id, puppet.id);
   }
   const contentBlocks = body.content;
@@ -2952,7 +3071,7 @@ async function notifyMind(mindName, message) {
   const entry = await findMind(mindName);
   if (!entry) return;
   try {
-    const { deliverEvent: deliverEvent2 } = await import("./system-events-A6IGCEC3.js");
+    const { deliverEvent: deliverEvent2 } = await import("./system-events-V43HDA3T.js");
     await deliverEvent2(mindName, { type: "file-share", body: message });
   } catch (err) {
     logger_default.warn(`[file-sharing] notify mind ${mindName} failed`, logger_default.errorData(err));
@@ -3923,9 +4042,9 @@ var app11 = new Hono14().get("/:name/logs", requireSelf(), async (c) => {
     stream.onAbort(() => {
       tail.kill();
     });
-    await new Promise((resolve19) => {
-      tail.on("exit", resolve19);
-      stream.onAbort(resolve19);
+    await new Promise((resolve21) => {
+      tail.on("exit", resolve21);
+      stream.onAbort(resolve21);
     });
   });
 }).get("/:name/logs/tail", requireSelf(), async (c) => {
@@ -3943,8 +4062,8 @@ var app11 = new Hono14().get("/:name/logs", requireSelf(), async (c) => {
   tail.stdout.on("data", (data) => {
     output += data.toString();
   });
-  await new Promise((resolve19) => {
-    tail.on("exit", resolve19);
+  await new Promise((resolve21) => {
+    tail.on("exit", resolve21);
   });
   return c.text(output);
 });
@@ -4037,14 +4156,14 @@ var mind_skills_default = app12;
 // packages/daemon/src/web/api/minds.ts
 import {
   cpSync,
-  existsSync as existsSync7,
+  existsSync as existsSync8,
   mkdirSync as mkdirSync6,
   readdirSync as readdirSync2,
   readFileSync as readFileSync9,
   rmSync as rmSync3,
   writeFileSync as writeFileSync8
 } from "fs";
-import { relative, resolve as resolve11 } from "path";
+import { relative, resolve as resolve13 } 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";
@@ -4487,6 +4606,49 @@ 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",
@@ -4529,6 +4691,8 @@ function deriveThinkingLevel(config2) {
 }
 
 // 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)) {
@@ -4541,6 +4705,55 @@ function validateBranchName(branch) {
 }
 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 = "";
@@ -4743,7 +4956,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 resolve10 } from "path";
+import { resolve as resolve12 } from "path";
 function convertSession(opts) {
   const lines = readFileSync8(opts.sessionPath, "utf-8").trim().split("\n");
   const sessionId = randomUUID();
@@ -4859,9 +5072,9 @@ function convertSession(opts) {
     }
   }
   const projectId = opts.projectDir.replace(/\//g, "-");
-  const sdkDir = resolve10(homedir(), ".claude", "projects", projectId);
+  const sdkDir = resolve12(homedir(), ".claude", "projects", projectId);
   mkdirSync5(sdkDir, { recursive: true });
-  const sdkPath = resolve10(sdkDir, `${sessionId}.jsonl`);
+  const sdkPath = resolve12(sdkDir, `${sessionId}.jsonl`);
   writeFileSync7(sdkPath, `${sdkEvents.join("\n")}
 `);
   console.log(`Converted ${sdkEvents.length} messages \u2192 ${sdkPath}`);
@@ -4928,7 +5141,7 @@ async function getMindStatus(name, port, registryRunning, seed) {
   let status = "stopped";
   let wakeAt = null;
   try {
-    const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-LIEPO6WG.js");
+    const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-OFP2GFXF.js");
     const sleepManager = getSleepManagerIfReady2();
     if (sleepManager?.isSleeping(name)) {
       status = "sleeping";
@@ -5007,7 +5220,7 @@ async function initTemplateBranch(projectRoot, composedDir, manifest, mindName,
   await gitExec(["commit", "-m", "initial commit"], opts);
 }
 async function updateTemplateBranch(projectRoot, template, mindName) {
-  const tempWorktree = resolve11(projectRoot, ".variants", "_template_update");
+  const tempWorktree = resolve13(projectRoot, ".variants", "_template_update");
   let branchExists = false;
   try {
     await gitExec(["rev-parse", "--verify", TEMPLATE_BRANCH], { cwd: projectRoot });
@@ -5018,7 +5231,7 @@ async function updateTemplateBranch(projectRoot, template, mindName) {
     await gitExec(["worktree", "remove", "--force", tempWorktree], { cwd: projectRoot });
   } catch {
   }
-  if (existsSync7(tempWorktree)) {
+  if (existsSync8(tempWorktree)) {
     rmSync3(tempWorktree, { recursive: true, force: true });
   }
   const templatesRoot = findTemplatesRoot();
@@ -5039,15 +5252,15 @@ async function updateTemplateBranch(projectRoot, template, mindName) {
       });
     }
     copyTemplateToDir(composedDir, tempWorktree, mindName, manifest);
-    const initDir = resolve11(tempWorktree, ".init");
-    if (existsSync7(initDir)) {
+    const initDir = resolve13(tempWorktree, ".init");
+    if (existsSync8(initDir)) {
       rmSync3(initDir, { recursive: true, force: true });
     }
-    const homeDir = resolve11(tempWorktree, "home");
-    if (existsSync7(homeDir)) {
+    const homeDir = resolve13(tempWorktree, "home");
+    if (existsSync8(homeDir)) {
       for (const entry of readdirSync2(homeDir)) {
         if (entry !== "VOLUTE.md") {
-          rmSync3(resolve11(homeDir, entry), { recursive: true, force: true });
+          rmSync3(resolve13(homeDir, entry), { recursive: true, force: true });
         }
       }
     }
@@ -5062,7 +5275,7 @@ async function updateTemplateBranch(projectRoot, template, mindName) {
       await gitExec(["worktree", "remove", "--force", tempWorktree], { cwd: projectRoot });
     } catch {
     }
-    if (existsSync7(tempWorktree)) {
+    if (existsSync8(tempWorktree)) {
       rmSync3(tempWorktree, { recursive: true, force: true });
     }
     rmSync3(composedDir, { recursive: true, force: true });
@@ -5085,14 +5298,6 @@ async function mergeTemplateBranch(worktreeDir) {
     throw e;
   }
 }
-async function npmInstallAsMind(cwd, mindName) {
-  if (isIsolationEnabled()) {
-    const [cmd, args] = await wrapForIsolation("npm", ["install"], mindName);
-    await exec(cmd, args, { cwd, env: { ...process.env, HOME: resolve11(cwd, "home") } });
-  } else {
-    await exec("npm", ["install"], { cwd });
-  }
-}
 async function mergeUpgradeAndRestart(mindName, dir, worktreeDir, upgradeVariantName, upgradeBranch, template, oldTemplate) {
   const templateChanged = template !== oldTemplate;
   const mainStatus = (await gitExec(["status", "--porcelain"], { cwd: dir })).trim();
@@ -5100,9 +5305,10 @@ async function mergeUpgradeAndRestart(mindName, dir, worktreeDir, upgradeVariant
     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, dir, worktreeDir);
+    await cleanupVariant(upgradeVariantName, mindName, dir, worktreeDir);
   } catch (err) {
     logger_default.warn(`failed to clean up upgrade worktree for ${mindName}`, logger_default.errorData(err));
   }
@@ -5113,7 +5319,7 @@ async function mergeUpgradeAndRestart(mindName, dir, worktreeDir, upgradeVariant
   let switchWarning;
   if (templateChanged) {
     try {
-      applyTemplateHomeFiles(resolve11(dir, "home"), template);
+      applyTemplateHomeFiles(resolve13(dir, "home"), template);
       const migratedSkills = migrateSkillsToTemplate(dir, oldTemplate, template);
       await gitExec(["add", "home/"], { cwd: dir });
       try {
@@ -5140,14 +5346,18 @@ async function mergeUpgradeAndRestart(mindName, dir, worktreeDir, upgradeVariant
   } catch (err) {
     logger_default.warn(`failed to update template for ${mindName}`, logger_default.errorData(err));
   }
-  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.`
-    };
+  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 {
@@ -5155,7 +5365,7 @@ async function mergeUpgradeAndRestart(mindName, dir, worktreeDir, upgradeVariant
       await manager.stopMind(mindName);
     }
     manager.setPendingContext(mindName, { type: "upgraded" });
-    await manager.startMind(mindName);
+    await manager.startMind(mindName, { healthTimeoutMs: 12e4 });
   } catch (e) {
     return {
       ok: true,
@@ -5165,8 +5375,8 @@ async function mergeUpgradeAndRestart(mindName, dir, worktreeDir, upgradeVariant
   return { ok: true, warning: switchWarning };
 }
 async function importFromArchive(c, tempDir, nameOverride, manifest) {
-  const extractedMindDir = resolve11(tempDir, "mind");
-  if (!existsSync7(extractedMindDir)) {
+  const extractedMindDir = resolve13(tempDir, "mind");
+  if (!existsSync8(extractedMindDir)) {
     return c.json({ error: "Invalid archive: missing mind/ directory" }, 400);
   }
   if (!manifest?.includes || !manifest.name || !manifest.template) {
@@ -5184,7 +5394,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 (existsSync7(dest)) return c.json({ error: "Mind directory already exists" }, 409);
+  if (existsSync8(dest)) return c.json({ error: "Mind directory already exists" }, 409);
   try {
     cpSync(extractedMindDir, dest, { recursive: true });
     if (!manifest.includes.identity) {
@@ -5192,9 +5402,9 @@ async function importFromFullArchive(c, tempDir, extractedMindDir, nameOverride,
     }
     const state = stateDir(name);
     mkdirSync6(state, { recursive: true });
-    const envJson = resolve11(tempDir, "state/env.json");
-    if (existsSync7(envJson)) {
-      cpSync(envJson, resolve11(state, "env.json"));
+    const envJson = resolve13(tempDir, "state/env.json");
+    if (existsSync8(envJson)) {
+      cpSync(envJson, resolve13(state, "env.json"));
     }
     const port = await nextPort();
     await addMind(name, port, manifest.stage, manifest.template);
@@ -5203,30 +5413,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 = resolve11(dest, "home");
+    const homeDir = resolve13(dest, "home");
     ensureVoluteGroup();
     createMindUser(name, homeDir);
     await chownMindDir(dest, name);
     await npmInstallAsMind(dest, name);
     await importHistoryFromArchive(name, tempDir);
     importSessionsFromArchive(dest, tempDir);
-    if (!existsSync7(resolve11(dest, ".git"))) {
+    if (!existsSync8(resolve13(dest, ".git"))) {
       try {
-        const env = isIsolationEnabled() ? { ...process.env, HOME: resolve11(dest, "home") } : void 0;
+        const env = isIsolationEnabled() ? { ...process.env, HOME: resolve13(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(resolve11(dest, ".git"), { recursive: true, force: true });
+        rmSync3(resolve13(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 (existsSync7(dest)) rmSync3(dest, { recursive: true, force: true });
+    if (existsSync8(dest)) rmSync3(dest, { recursive: true, force: true });
     try {
       await removeMind(name);
     } catch (cleanupErr) {
@@ -5243,7 +5453,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 (existsSync7(dest)) return c.json({ error: "Mind directory already exists" }, 409);
+  if (existsSync8(dest)) return c.json({ error: "Mind directory already exists" }, 409);
   const templatesRoot = findTemplatesRoot();
   const { composedDir, manifest: templateManifest } = composeTemplate(
     templatesRoot,
@@ -5252,36 +5462,36 @@ async function importFromHomeOnlyArchive(c, tempDir, extractedMindDir, nameOverr
   try {
     copyTemplateToDir(composedDir, dest, name, templateManifest);
     applyInitFiles(dest);
-    const extractedHome = resolve11(extractedMindDir, "home");
-    if (existsSync7(extractedHome)) {
-      cpSync(extractedHome, resolve11(dest, "home"), { recursive: true });
+    const extractedHome = resolve13(extractedMindDir, "home");
+    if (existsSync8(extractedHome)) {
+      cpSync(extractedHome, resolve13(dest, "home"), { recursive: true });
     }
-    const extractedMindInternal = resolve11(extractedMindDir, ".mind");
-    if (existsSync7(extractedMindInternal)) {
-      cpSync(extractedMindInternal, resolve11(dest, ".mind"), { recursive: true });
+    const extractedMindInternal = resolve13(extractedMindDir, ".mind");
+    if (existsSync8(extractedMindInternal)) {
+      cpSync(extractedMindInternal, resolve13(dest, ".mind"), { recursive: true });
     }
-    const identityDir = resolve11(dest, ".mind/identity");
+    const identityDir = resolve13(dest, ".mind/identity");
     let publicKeyPem;
-    if (!manifest.includes.identity || !existsSync7(resolve11(identityDir, "private.pem"))) {
+    if (!manifest.includes.identity || !existsSync8(resolve13(identityDir, "private.pem"))) {
       ({ publicKeyPem } = generateIdentity(dest));
     } else {
-      publicKeyPem = readFileSync9(resolve11(identityDir, "public.pem"), "utf-8");
+      publicKeyPem = readFileSync9(resolve13(identityDir, "public.pem"), "utf-8");
     }
-    const promptsPath = resolve11(dest, "home/.config/prompts.json");
-    if (!existsSync7(promptsPath)) {
+    const promptsPath = resolve13(dest, "home/.config/prompts.json");
+    if (!existsSync8(promptsPath)) {
       const mindPrompts = await getMindPromptDefaults();
       writeFileSync8(promptsPath, `${JSON.stringify(mindPrompts, null, 2)}
 `);
     }
     const state = stateDir(name);
     mkdirSync6(state, { recursive: true });
-    const envJson = resolve11(tempDir, "state/env.json");
-    if (existsSync7(envJson)) {
-      cpSync(envJson, resolve11(state, "env.json"));
+    const envJson = resolve13(tempDir, "state/env.json");
+    if (existsSync8(envJson)) {
+      cpSync(envJson, resolve13(state, "env.json"));
     }
     const port = await nextPort();
     await addMind(name, port, manifest.stage, manifest.template);
-    const homeDir = resolve11(dest, "home");
+    const homeDir = resolve13(dest, "home");
     ensureVoluteGroup();
     createMindUser(name, homeDir);
     await chownMindDir(dest, name);
@@ -5294,7 +5504,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(resolve11(dest, ".git"), { recursive: true, force: true });
+      rmSync3(resolve13(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();
@@ -5324,7 +5534,7 @@ async function importFromHomeOnlyArchive(c, tempDir, extractedMindDir, nameOverr
       ...skillWarnings.length > 0 && { skillWarnings }
     });
   } catch (err) {
-    if (existsSync7(dest)) rmSync3(dest, { recursive: true, force: true });
+    if (existsSync8(dest)) rmSync3(dest, { recursive: true, force: true });
     try {
       await removeMind(name);
     } catch (cleanupErr) {
@@ -5337,8 +5547,8 @@ async function importFromHomeOnlyArchive(c, tempDir, extractedMindDir, nameOverr
   }
 }
 async function importHistoryFromArchive(name, tempDir) {
-  const historyJsonl = resolve11(tempDir, "history.jsonl");
-  if (!existsSync7(historyJsonl)) return;
+  const historyJsonl = resolve13(tempDir, "history.jsonl");
+  if (!existsSync8(historyJsonl)) return;
   try {
     const db = await getDb();
     const lines = readFileSync9(historyJsonl, "utf-8").trim().split("\n");
@@ -5378,13 +5588,13 @@ async function importHistoryFromArchive(name, tempDir) {
   }
 }
 function importSessionsFromArchive(dest, tempDir) {
-  const sessionsDir = resolve11(tempDir, "sessions");
-  if (!existsSync7(sessionsDir)) return;
+  const sessionsDir = resolve13(tempDir, "sessions");
+  if (!existsSync8(sessionsDir)) return;
   try {
-    const destSessions = resolve11(dest, ".mind/sessions");
+    const destSessions = resolve13(dest, ".mind/sessions");
     mkdirSync6(destSessions, { recursive: true });
     for (const file of readdirSync2(sessionsDir)) {
-      cpSync(resolve11(sessionsDir, file), resolve11(destSessions, file));
+      cpSync(resolve13(sessionsDir, file), resolve13(destSessions, file));
     }
   } catch (err) {
     logger_default.error("Failed to import sessions from archive", logger_default.errorData(err));
@@ -5458,13 +5668,13 @@ var app13 = new Hono16().post("/", requireAdminOrSystem, zValidator6("json", cre
     );
   }
   {
-    const { mindLimitError, readGlobalConfig: readGlobalConfig2 } = await import("./setup-CAJFOR2N.js");
+    const { mindLimitError, readGlobalConfig: readGlobalConfig2 } = await import("./setup-WZSXHHRJ.js");
     const limitError = mindLimitError(await countCappedMinds(), readGlobalConfig2().maxMinds);
     if (limitError) return c.json({ error: limitError }, 409);
   }
   ensureVoluteHome();
   const dest = mindDir(name);
-  if (existsSync7(dest)) return c.json({ error: "Mind directory already exists" }, 409);
+  if (existsSync8(dest)) return c.json({ error: "Mind directory already exists" }, 409);
   const templatesRoot = findTemplatesRoot();
   const { composedDir, manifest } = composeTemplate(templatesRoot, template);
   try {
@@ -5473,7 +5683,7 @@ var app13 = new Hono16().post("/", requireAdminOrSystem, zValidator6("json", cre
     const { publicKeyPem } = generateIdentity(dest);
     let effectiveModel = body.model;
     {
-      const { readGlobalConfig: readGlobal } = await import("./setup-CAJFOR2N.js");
+      const { readGlobalConfig: readGlobal } = await import("./setup-WZSXHHRJ.js");
       const mindDefaults = readGlobal().mindDefaults;
       const config2 = readVoluteConfig(dest);
       if (!config2) throw new Error("Failed to read volute.json after identity generation");
@@ -5501,9 +5711,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 = resolve11(dest, "home/.config/config.json");
+      const sdkConfigPath = resolve13(dest, "home/.config/config.json");
       if (modelId || cog?.compaction) {
-        const existing = existsSync7(sdkConfigPath) ? JSON.parse(readFileSync9(sdkConfigPath, "utf-8")) : {};
+        const existing = existsSync8(sdkConfigPath) ? JSON.parse(readFileSync9(sdkConfigPath, "utf-8")) : {};
         if (modelId) {
           existing.model = template === "pi" ? qualifyModelId(modelId) : unqualifyModelId(modelId);
         }
@@ -5516,7 +5726,7 @@ var app13 = new Hono16().post("/", requireAdminOrSystem, zValidator6("json", cre
     }
     const mindPrompts = await getMindPromptDefaults();
     writeFileSync8(
-      resolve11(dest, "home/.config/prompts.json"),
+      resolve13(dest, "home/.config/prompts.json"),
       `${JSON.stringify(mindPrompts, null, 2)}
 `
     );
@@ -5528,7 +5738,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 = resolve11(dest, "home");
+    const homeDir = resolve13(dest, "home");
     ensureVoluteGroup();
     createMindUser(name, homeDir);
     await chownMindDir(dest, name);
@@ -5541,7 +5751,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(resolve11(dest, ".git"), { recursive: true, force: true });
+      rmSync3(resolve13(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") {
@@ -5550,11 +5760,11 @@ 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(resolve11(dest, "home/SOUL.md"), seedSoul);
+      writeFileSync8(resolve13(dest, "home/SOUL.md"), seedSoul);
     }
     let skillSet = body.skills ?? (body.stage === "seed" ? SEED_SKILLS : getStandardSkillsWithExtensions());
     if (body.stage === "seed" && !body.skills) {
-      const { isImagegenEnabled } = await import("./setup-CAJFOR2N.js");
+      const { isImagegenEnabled } = await import("./setup-WZSXHHRJ.js");
       if (isImagegenEnabled()) {
         skillSet = [...skillSet, "imagegen"];
       }
@@ -5576,7 +5786,7 @@ Your creator described you as: "${body.description}"
         const spiritName = getSpiritName();
         const spiritEntry = await findMind(spiritName);
         if (spiritEntry) {
-          const { spiritDir } = await import("./spirit-IL5EMWYZ.js");
+          const { spiritDir } = await import("./spirit-4ECYIVGE.js");
           const sDir = spiritEntry.dir ?? spiritDir();
           const spiritConfig = readVoluteConfig(sDir) ?? {};
           const schedules = spiritConfig.schedules ?? [];
@@ -5591,7 +5801,7 @@ Your creator described you as: "${body.description}"
             });
             spiritConfig.schedules = schedules;
             writeVoluteConfig(sDir, spiritConfig);
-            const { getScheduler: getScheduler2 } = await import("./scheduler-UV6RUJ7P.js");
+            const { getScheduler: getScheduler2 } = await import("./scheduler-JTTWZDYU.js");
             getScheduler2().loadSchedules(spiritName, sDir);
           }
         }
@@ -5602,11 +5812,11 @@ Your creator described you as: "${body.description}"
     if (body.stage !== "seed") {
       const customSoul = await getPromptIfCustom("default_soul");
       if (customSoul) {
-        writeFileSync8(resolve11(dest, "home/SOUL.md"), customSoul.replace(/\{\{name\}\}/g, name));
+        writeFileSync8(resolve13(dest, "home/SOUL.md"), customSoul.replace(/\{\{name\}\}/g, name));
       }
       const customMemory = await getPromptIfCustom("default_memory");
       if (customMemory) {
-        writeFileSync8(resolve11(dest, "home/MEMORY.md"), customMemory);
+        writeFileSync8(resolve13(dest, "home/MEMORY.md"), customMemory);
       }
     }
     await chownMindDir(dest, name);
@@ -5624,8 +5834,9 @@ Your creator described you as: "${body.description}"
         description: body.description
       }
     });
-    announceToSystem(`${name} has joined`).catch(() => {
-    });
+    announceToSystem(`${name} has joined`).catch(
+      (err) => logger_default.warn(`failed to announce ${name} joining #system`, logger_default.errorData(err))
+    );
     const credentialWarning = await missingCredentialWarning(
       template,
       effectiveModel,
@@ -5645,10 +5856,11 @@ Your creator described you as: "${body.description}"
       ...skillWarnings.length > 0 && { skillWarnings }
     });
   } catch (err) {
-    if (existsSync7(dest)) rmSync3(dest, { recursive: true, force: true });
+    if (existsSync8(dest)) rmSync3(dest, { recursive: true, force: true });
     try {
       await removeMind(name);
-    } catch {
+    } catch (cleanupErr) {
+      logger_default.warn(`failed to clean up registry for ${name}`, logger_default.errorData(cleanupErr));
     }
     return c.json({ error: err instanceof Error ? err.message : "Failed to create mind" }, 500);
   } finally {
@@ -5665,13 +5877,13 @@ Your creator described you as: "${body.description}"
     return importFromArchive(c, body.archivePath, body.name, body.manifest);
   }
   const wsDir = body.workspacePath;
-  if (!wsDir || !existsSync7(resolve11(wsDir, "SOUL.md")) || !existsSync7(resolve11(wsDir, "IDENTITY.md"))) {
+  if (!wsDir || !existsSync8(resolve13(wsDir, "SOUL.md")) || !existsSync8(resolve13(wsDir, "IDENTITY.md"))) {
     return c.json({ error: "Invalid workspace: missing SOUL.md or IDENTITY.md" }, 400);
   }
-  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 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 name = body.name ?? parseNameFromIdentity(identity) ?? "imported-mind";
   const template = body.template ?? "claude";
   const nameErr = validateMindName(name);
@@ -5691,33 +5903,33 @@ ${user.trimEnd()}
 ` : "";
   ensureVoluteHome();
   const dest = mindDir(name);
-  if (existsSync7(dest)) return c.json({ error: "Mind directory already exists" }, 409);
+  if (existsSync8(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(resolve11(dest, "home/SOUL.md"), mergedSoul);
-    const wsMemoryPath = resolve11(wsDir, "MEMORY.md");
-    const hasMemory = existsSync7(wsMemoryPath);
+    writeFileSync8(resolve13(dest, "home/SOUL.md"), mergedSoul);
+    const wsMemoryPath = resolve13(wsDir, "MEMORY.md");
+    const hasMemory = existsSync8(wsMemoryPath);
     if (hasMemory) {
       const existingMemory = readFileSync9(wsMemoryPath, "utf-8");
       writeFileSync8(
-        resolve11(dest, "home/MEMORY.md"),
+        resolve13(dest, "home/MEMORY.md"),
         `${existingMemory.trimEnd()}${mergedMemoryExtra}`
       );
     } else if (user) {
-      writeFileSync8(resolve11(dest, "home/MEMORY.md"), `${user.trimEnd()}
+      writeFileSync8(resolve13(dest, "home/MEMORY.md"), `${user.trimEnd()}
 `);
     }
-    const wsMemoryDir = resolve11(wsDir, "memory");
+    const wsMemoryDir = resolve13(wsDir, "memory");
     let dailyLogCount = 0;
-    if (existsSync7(wsMemoryDir)) {
-      const destMemoryDir = resolve11(dest, "home/memory");
+    if (existsSync8(wsMemoryDir)) {
+      const destMemoryDir = resolve13(dest, "home/memory");
       const files = readdirSync2(wsMemoryDir).filter((f) => f.endsWith(".md"));
       for (const file of files) {
-        cpSync(resolve11(wsMemoryDir, file), resolve11(destMemoryDir, file));
+        cpSync(resolve13(wsMemoryDir, file), resolve13(destMemoryDir, file));
       }
       dailyLogCount = files.length;
     }
@@ -5728,7 +5940,7 @@ ${user.trimEnd()}
     } catch (err) {
       logger_default.warn(`failed to set template hash for ${name}`, logger_default.errorData(err));
     }
-    const homeDir = resolve11(dest, "home");
+    const homeDir = resolve13(dest, "home");
     ensureVoluteGroup();
     createMindUser(name, homeDir);
     await chownMindDir(dest, name);
@@ -5736,20 +5948,20 @@ ${user.trimEnd()}
     if (!hasMemory && dailyLogCount > 0) {
       await consolidateMemory(dest);
     }
-    const env = isIsolationEnabled() ? { ...process.env, HOME: resolve11(dest, "home") } : void 0;
+    const env = isIsolationEnabled() ? { ...process.env, HOME: resolve13(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 ? resolve11(body.sessionPath) : findOpenClawSession(wsDir);
-    if (sessionFile && existsSync7(sessionFile)) {
+    const sessionFile = body.sessionPath ? resolve13(body.sessionPath) : findOpenClawSession(wsDir);
+    if (sessionFile && existsSync8(sessionFile)) {
       if (template === "pi") {
         importPiSession(sessionFile, dest);
       } else if (template === "claude") {
         const sessionId = convertSession({ sessionPath: sessionFile, projectDir: dest });
-        const mindRuntimeDir = resolve11(dest, ".mind");
+        const mindRuntimeDir = resolve13(dest, ".mind");
         mkdirSync6(mindRuntimeDir, { recursive: true });
-        writeFileSync8(resolve11(mindRuntimeDir, "session.json"), JSON.stringify({ sessionId }));
+        writeFileSync8(resolve13(mindRuntimeDir, "session.json"), JSON.stringify({ sessionId }));
       }
     }
     importOpenClawConnectors(name, dest);
@@ -5759,10 +5971,11 @@ ${user.trimEnd()}
     );
     return c.json({ ok: true, name, port, message: `Imported mind: ${name} (port ${port})` });
   } catch (err) {
-    if (existsSync7(dest)) rmSync3(dest, { recursive: true, force: true });
+    if (existsSync8(dest)) rmSync3(dest, { recursive: true, force: true });
     try {
       await removeMind(name);
-    } catch {
+    } catch (cleanupErr) {
+      logger_default.warn(`failed to clean up registry for ${name}`, logger_default.errorData(cleanupErr));
     }
     return c.json({ error: err instanceof Error ? err.message : "Failed to import mind" }, 500);
   } finally {
@@ -5794,7 +6007,7 @@ ${user.trimEnd()}
         stage: entry.stage,
         dir: entry.dir
       });
-      const hasPages = existsSync7(resolve11(mindDir(entry.name), "home", "pages"));
+      const hasPages = existsSync8(resolve13(mindDir(entry.name), "home", "pages"));
       const lastActiveAt = lastActiveMap.get(entry.name) ?? null;
       if (!privileged) return toPublicMind(entry, mindStatus, { hasPages, lastActiveAt });
       return {
@@ -5812,12 +6025,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 (!existsSync7(dir)) return c.json({ error: "Mind directory missing" }, 404);
+  if (!existsSync8(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 = existsSync7(resolve11(mindDir(name), "home", "pages"));
+  const hasPages = existsSync8(resolve13(mindDir(name), "home", "pages"));
   if (!isPrivileged(c)) {
     return c.json(toPublicMind(entry, mindStatus, { hasPages }));
   }
@@ -5857,7 +6070,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 (!existsSync7(projectDir)) {
+  } else if (!existsSync8(projectDir)) {
     return c.json({ error: "Mind directory missing" }, 404);
   }
   if (getMindManager().isRunning(name)) {
@@ -5878,7 +6091,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 (!existsSync7(projectDir)) {
+  } else if (!existsSync8(projectDir)) {
     return c.json({ error: "Mind directory missing" }, 404);
   }
   let context;
@@ -5894,7 +6107,7 @@ ${user.trimEnd()}
   const manager = getMindManager();
   try {
     if (context?.type === "reload") {
-      const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-LIEPO6WG.js");
+      const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-OFP2GFXF.js");
       const sleepState = getSleepManagerIfReady2()?.getState(name);
       if (sleepState?.sleeping) {
         logger_default.info(`skipping reload for ${name} during sleep \u2014 will apply on next wake`);
@@ -5914,7 +6127,8 @@ ${user.trimEnd()}
       const variantEntry = await findMind(mergeVariantName);
       if (variantEntry && variantEntry.parent === baseName && variantEntry.dir && variantEntry.branch) {
         const projectRoot = mindDir(baseName);
-        if (existsSync7(variantEntry.dir)) {
+        const discardUnresolved = context.discardUnresolvedHomeFiles === true;
+        if (existsSync8(variantEntry.dir)) {
           const status = (await gitExec(["status", "--porcelain"], { cwd: variantEntry.dir })).trim();
           if (status) {
             try {
@@ -5941,13 +6155,44 @@ ${user.trimEnd()}
             logger_default.error(`failed to auto-commit main worktree for ${baseName}`, logger_default.errorData(e));
           }
         }
+        const preMergeHead = (await gitExec(["rev-parse", "HEAD"], { cwd: projectRoot })).trim();
         const memoryDelta = await mergeVariantExcludingMemory(projectRoot, variantEntry.branch);
-        if (memoryDelta && context) context.memoryDelta = memoryDelta;
-        await cleanupVariant(mergeVariantName, projectRoot, variantEntry.dir);
-        try {
-          await npmInstallAsMind(projectRoot, baseName);
-        } catch (e) {
-          logger_default.error(`npm install failed after merge for ${baseName}`, logger_default.errorData(e));
+        let unresolvedNotice;
+        if (existsSync8(variantEntry.dir) && !discardUnresolved) {
+          try {
+            const unresolved = await findUnresolvedHomeFiles(variantEntry.dir);
+            if (unresolved.totalCount > 0) {
+              unresolvedNotice = formatUnresolvedHomeFilesMessage(mergeVariantName, unresolved);
+            }
+          } catch (err) {
+            unresolvedNotice = `Could not verify variant ${mergeVariantName} has no unresolved home/ files: ${err instanceof Error ? err.message : String(err)}. Variant left intact \u2014 retry the join.`;
+          }
+        }
+        if (unresolvedNotice) {
+          logger_default.warn(
+            `variant join blocked for ${baseName}: ${mergeVariantName} \u2014 ${unresolvedNotice}`
+          );
+          await recordNotice({
+            mind: baseName,
+            thread: "main",
+            kind: "join_blocked",
+            reason: "unresolved_variant_files",
+            detail: unresolvedNotice
+          });
+          if (context) {
+            context.type = "restart";
+            context.name = void 0;
+          }
+        } else {
+          if (memoryDelta && context) context.memoryDelta = memoryDelta;
+          await cleanupVariant(mergeVariantName, baseName, projectRoot, variantEntry.dir);
+          if (await npmInstallNeeded(projectRoot, preMergeHead)) {
+            try {
+              await npmInstallAsMind(projectRoot, baseName);
+            } catch (e) {
+              logger_default.error(`npm install failed after merge for ${baseName}`, logger_default.errorData(e));
+            }
+          }
         }
       }
     }
@@ -5989,6 +6234,7 @@ ${user.trimEnd()}
     );
     return c.json({ ok: true, port: targetPort });
   } catch (err) {
+    logger_default.error(`failed to restart mind ${name}`, logger_default.errorData(err));
     return c.json({ error: err instanceof Error ? err.message : "Failed to restart mind" }, 500);
   }
 }).post("/:name/stop", requireSelf(), async (c) => {
@@ -6003,13 +6249,14 @@ ${user.trimEnd()}
     await stopMindFull(name);
     return c.json({ ok: true });
   } catch (err) {
+    logger_default.error(`failed to stop mind ${name}`, logger_default.errorData(err));
     return c.json({ error: err instanceof Error ? err.message : "Failed to stop mind" }, 500);
   }
 }).get("/:name/sleep", requireSelf(), async (c) => {
   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-LIEPO6WG.js");
+  const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-OFP2GFXF.js");
   const sm = getSleepManagerIfReady2();
   if (!sm) return c.json({ error: "Sleep manager not initialized" }, 503);
   return c.json(sm.getState(name));
@@ -6017,7 +6264,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-LIEPO6WG.js");
+  const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-OFP2GFXF.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);
@@ -6037,7 +6284,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-LIEPO6WG.js");
+  const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-OFP2GFXF.js");
   const sm = getSleepManagerIfReady2();
   if (!sm) return c.json({ error: "Sleep manager not initialized" }, 503);
   const sleepState = sm.getState(name);
@@ -6052,7 +6299,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-LIEPO6WG.js");
+  const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-OFP2GFXF.js");
   const sm = getSleepManagerIfReady2();
   if (!sm) return c.json({ error: "Sleep manager not initialized" }, 503);
   const flushed = await sm.flushQueuedMessages(name);
@@ -6068,19 +6315,19 @@ ${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 = resolve11(dir, "home");
+    const homeDir = resolve13(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 (!existsSync7(avatarPath)) {
+    if (!existsSync8(avatarPath)) {
       return c.json({ error: `Avatar file not found: ${relative(homeDir, avatarPath)}` }, 400);
     }
     profile.avatar = relative(homeDir, avatarPath);
   }
   config2.profile = profile;
   writeVoluteConfig(dir, config2);
-  const { syncMindProfile: syncMindProfile2 } = await import("./auth-DT7GY7EZ.js");
+  const { syncMindProfile: syncMindProfile2 } = await import("./auth-KRDSM55Q.js");
   await syncMindProfile2(name, profile);
   broadcast({ type: "profile_updated", mind: name, summary: `${name} profile updated` });
   return c.json({ ok: true });
@@ -6124,7 +6371,7 @@ ${user.trimEnd()}
     });
   }
   if (!force) {
-    const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-LIEPO6WG.js");
+    const { getSleepManagerIfReady: getSleepManagerIfReady2 } = await import("./sleep-manager-OFP2GFXF.js");
     if (getSleepManagerIfReady2()?.isSleeping(name)) {
       return c.json({ output: "" });
     }
@@ -6179,7 +6426,7 @@ ${user.trimEnd()}
     }
   }
   const dir = entry.dir ?? mindDir(name);
-  const { evaluateSeedChecklist: evaluateSeedChecklist2 } = await import("./seed-readiness-QRA46ZJQ.js");
+  const { evaluateSeedChecklist: evaluateSeedChecklist2 } = await import("./seed-readiness-DYOVCYHN.js");
   const checklist = evaluateSeedChecklist2(dir);
   const done = [];
   const remaining = [];
@@ -6221,7 +6468,7 @@ ${user.trimEnd()}
   try {
     const sproutedDir = entry.dir ?? mindDir(name);
     if (setupDefaultDreaming(sproutedDir).schedulesChanged) {
-      const { getScheduler: getScheduler2 } = await import("./scheduler-UV6RUJ7P.js");
+      const { getScheduler: getScheduler2 } = await import("./scheduler-JTTWZDYU.js");
       getScheduler2().loadSchedules(name, sproutedDir);
     }
   } catch (err) {
@@ -6231,7 +6478,7 @@ ${user.trimEnd()}
     const spiritName = getSpiritName();
     const spiritEntry = await findMind(spiritName);
     if (spiritEntry) {
-      const { firstWeekSchedules, spiritDir } = await import("./spirit-IL5EMWYZ.js");
+      const { firstWeekSchedules, spiritDir } = await import("./spirit-4ECYIVGE.js");
       const sDir = spiritEntry.dir ?? spiritDir();
       const spiritConfig = readVoluteConfig(sDir);
       if (spiritConfig) {
@@ -6245,7 +6492,7 @@ ${user.trimEnd()}
         spiritConfig.schedules = schedules;
         writeVoluteConfig(sDir, spiritConfig);
         try {
-          const { getScheduler: getScheduler2 } = await import("./scheduler-UV6RUJ7P.js");
+          const { getScheduler: getScheduler2 } = await import("./scheduler-JTTWZDYU.js");
           getScheduler2().loadSchedules(spiritName, sDir);
         } catch (err) {
           logger_default.warn(
@@ -6267,26 +6514,42 @@ ${user.trimEnd()}
   const name = c.req.param("name");
   const entry = await findMind(name);
   if (!entry) return c.json({ error: "Mind not found" }, 404);
+  const manager = getMindManager();
+  if (entry.parent) {
+    if (!entry.dir) return c.json({ error: `Variant ${name} has no directory` }, 500);
+    const parentEntry = await findMind(entry.parent);
+    if (!parentEntry) return c.json({ error: `Parent mind ${entry.parent} not found` }, 404);
+    if (manager.isRunning(name)) {
+      await stopMindFull(name);
+    }
+    await cleanupVariant(name, entry.parent, parentEntry.dir ?? mindDir(entry.parent), entry.dir);
+    invalidateMindUserCache(name);
+    fireWebhook({
+      event: "mind_deleted",
+      mind: name,
+      data: { port: entry.port, stage: entry.stage, template: entry.template }
+    });
+    return c.json({ ok: true, variant: true });
+  }
   const dir = mindDir(name);
   const force = c.req.query("force") === "true";
-  const manager = getMindManager();
   if (manager.isRunning(name)) {
     await stopMindFull(name);
   }
   const variants = await findVariants(name);
   for (const s of variants) {
     if (s.dir) {
-      await cleanupVariant(s.name, dir, s.dir, { stop: true });
+      await cleanupVariant(s.name, name, dir, s.dir, { stop: true });
     }
   }
   await removeMind(name);
   await deleteMindUser2(name);
   invalidateMindUserCache(name);
   const state = stateDir(name);
-  if (existsSync7(state)) {
+  if (existsSync8(state)) {
     rmSync3(state, { recursive: true, force: true });
   }
-  if (force && existsSync7(dir)) {
+  if (force && existsSync8(dir)) {
     rmSync3(dir, { recursive: true, force: true });
     deleteMindUser(name);
   }
@@ -6301,7 +6564,7 @@ ${user.trimEnd()}
   const entry = await findMind(mindName);
   if (!entry) return c.json({ error: "Mind not found" }, 404);
   const dir = mindDir(mindName);
-  if (!existsSync7(dir)) return c.json({ error: "Mind directory missing" }, 404);
+  if (!existsSync8(dir)) return c.json({ error: "Mind directory missing" }, 404);
   let body = {};
   try {
     body = await c.req.json();
@@ -6314,21 +6577,21 @@ ${user.trimEnd()}
   }
   const UPGRADE_BRANCH = "upgrade";
   const upgradeVariantName = `${mindName}-upgrade`;
-  const worktreeDir = resolve11(dir, ".variants", UPGRADE_BRANCH);
+  const worktreeDir = resolve13(dir, ".variants", UPGRADE_BRANCH);
   if (body.abort) {
-    if (!existsSync7(worktreeDir)) {
+    if (!existsSync8(worktreeDir)) {
       return c.json({ error: "No upgrade in progress" }, 400);
     }
     try {
       try {
-        const gitDirContent = readFileSync9(resolve11(worktreeDir, ".git"), "utf-8").trim();
+        const gitDirContent = readFileSync9(resolve13(worktreeDir, ".git"), "utf-8").trim();
         const gitDir = gitDirContent.replace("gitdir: ", "");
-        if (existsSync7(resolve11(gitDir, "MERGE_HEAD"))) {
+        if (existsSync8(resolve13(gitDir, "MERGE_HEAD"))) {
           await gitExec(["merge", "--abort"], { cwd: worktreeDir });
         }
       } catch {
       }
-      await cleanupVariant(upgradeVariantName, dir, worktreeDir, { stop: true });
+      await cleanupVariant(upgradeVariantName, mindName, dir, worktreeDir, { stop: true });
       try {
         await gitExec(["branch", "-D", UPGRADE_BRANCH], { cwd: dir });
       } catch {
@@ -6342,7 +6605,7 @@ ${user.trimEnd()}
     }
   }
   if (body.continue) {
-    if (!existsSync7(worktreeDir)) {
+    if (!existsSync8(worktreeDir)) {
       return c.json({ error: "No upgrade in progress" }, 400);
     }
     const status = await gitExec(["status", "--porcelain"], { cwd: worktreeDir });
@@ -6392,9 +6655,9 @@ ${user.trimEnd()}
     }
   }
   if (body.accept) {
-    if (existsSync7(worktreeDir)) {
+    if (existsSync8(worktreeDir)) {
       try {
-        await cleanupVariant(upgradeVariantName, dir, worktreeDir, { stop: true });
+        await cleanupVariant(upgradeVariantName, mindName, dir, worktreeDir, { stop: true });
       } catch (err) {
         logger_default.warn(`failed to clean up legacy upgrade variant for ${mindName}`, logger_default.errorData(err));
       }
@@ -6407,7 +6670,7 @@ ${user.trimEnd()}
   }
   if (body.diff) {
     try {
-      if (!existsSync7(resolve11(dir, ".git"))) {
+      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);
@@ -6425,22 +6688,22 @@ ${user.trimEnd()}
       );
     }
   }
-  if (existsSync7(worktreeDir)) {
+  if (existsSync8(worktreeDir)) {
     return c.json(
       { error: "Upgrade variant already exists. Use continue or delete it first." },
       409
     );
   }
-  if (!existsSync7(resolve11(dir, ".git"))) {
+  if (!existsSync8(resolve13(dir, ".git"))) {
     try {
-      const env = isIsolationEnabled() ? { ...process.env, HOME: resolve11(dir, "home") } : void 0;
+      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(resolve11(dir, ".git"), { recursive: true, force: true });
+      rmSync3(resolve13(dir, ".git"), { recursive: true, force: true });
       return c.json(
         {
           error: `Git initialization failed: ${err instanceof Error ? err.message : String(err)}`
@@ -6455,8 +6718,8 @@ ${user.trimEnd()}
   } catch {
   }
   await updateTemplateBranch(dir, template, mindName);
-  const parentDir = resolve11(dir, ".variants");
-  if (!existsSync7(parentDir)) {
+  const parentDir = resolve13(dir, ".variants");
+  if (!existsSync8(parentDir)) {
     mkdirSync6(parentDir, { recursive: true });
   }
   await gitExec(["worktree", "add", "-b", UPGRADE_BRANCH, worktreeDir], { cwd: dir });
@@ -6519,7 +6782,7 @@ ${user.trimEnd()}
     return c.json(result);
   } catch (err) {
     try {
-      await cleanupVariant(upgradeVariantName, dir, worktreeDir);
+      await cleanupVariant(upgradeVariantName, mindName, dir, worktreeDir);
     } catch (cleanupErr) {
       logger_default.warn(`cleanup failed after upgrade error for ${mindName}`, logger_default.errorData(cleanupErr));
     }
@@ -6589,11 +6852,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 (!existsSync7(dir)) return c.json({ error: "Mind directory missing" }, 404);
+  if (!existsSync8(dir)) return c.json({ error: "Mind directory missing" }, 404);
   let config2 = readVoluteConfig(dir);
   if (!config2 && entry.template === "pi") {
-    const piConfigPath = resolve11(dir, "home/.config/config.json");
-    if (existsSync7(piConfigPath)) {
+    const piConfigPath = resolve13(dir, "home/.config/config.json");
+    if (existsSync8(piConfigPath)) {
       try {
         config2 = JSON.parse(readFileSync9(piConfigPath, "utf-8"));
       } catch {
@@ -6601,8 +6864,8 @@ ${user.trimEnd()}
     }
   }
   let templateConfig = {};
-  const configJsonPath = resolve11(dir, "home/.config/config.json");
-  if (existsSync7(configJsonPath)) {
+  const configJsonPath = resolve13(dir, "home/.config/config.json");
+  if (existsSync8(configJsonPath)) {
     try {
       templateConfig = JSON.parse(readFileSync9(configJsonPath, "utf-8"));
     } catch {
@@ -6644,7 +6907,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 (!existsSync7(dir)) return c.json({ error: "Mind directory missing" }, 404);
+    if (!existsSync8(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;
@@ -6670,14 +6933,14 @@ ${user.trimEnd()}
     }
     writeVoluteConfig(dir, existing);
     if (body.unescapeNewlines !== void 0) {
-      const { clearEchoTextCache } = await import("./echo-text-WYAAODBV.js");
+      const { clearEchoTextCache } = await import("./echo-text-PEEV7FQU.js");
       clearEchoTextCache(name);
     }
     const needsConfigJson = body.model !== void 0 || body.thinkingLevel !== void 0 || body.compaction !== void 0;
     if (needsConfigJson) {
-      const configJsonPath = resolve11(dir, "home/.config/config.json");
+      const configJsonPath = resolve13(dir, "home/.config/config.json");
       let templateConfig = {};
-      if (existsSync7(configJsonPath)) {
+      if (existsSync8(configJsonPath)) {
         try {
           templateConfig = JSON.parse(readFileSync9(configJsonPath, "utf-8"));
         } catch {
@@ -6707,7 +6970,7 @@ ${user.trimEnd()}
     }
     if (entry.mindType === "spirit" && body.model !== void 0) {
       try {
-        const { readGlobalConfig: readGlobalConfig2, writeGlobalConfig: writeGlobalConfig2 } = await import("./setup-CAJFOR2N.js");
+        const { readGlobalConfig: readGlobalConfig2, writeGlobalConfig: writeGlobalConfig2 } = await import("./setup-WZSXHHRJ.js");
         const globalConfig = readGlobalConfig2();
         globalConfig.spiritModel = body.model;
         writeGlobalConfig2(globalConfig);
@@ -6750,7 +7013,7 @@ ${user.trimEnd()}
   if (!body.systemPrompt || !body.message) {
     return c.json({ error: "systemPrompt and message required" }, 400);
   }
-  const { aiComplete: aiCompleteFn, isAiConfigured: isAiConfigured2 } = await import("./ai-service-V4CTNGI3.js");
+  const { aiComplete: aiCompleteFn, isAiConfigured: isAiConfigured2 } = await import("./ai-service-YW5SWCSB.js");
   if (!isAiConfigured2()) {
     return c.json({ error: "AI service not configured" }, 503);
   }
@@ -7444,7 +7707,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-A6IGCEC3.js");
+  const { deliverEvent: deliverEvent2 } = await import("./system-events-V43HDA3T.js");
   const { id, delivered } = await deliverEvent2(name, {
     type: "webhook",
     body,
@@ -7462,14 +7725,14 @@ var schedules_default = app15;
 // packages/daemon/src/web/api/setup.ts
 import { mkdirSync as mkdirSync7 } from "fs";
 import { homedir as homedir2 } from "os";
-import { resolve as resolve12 } from "path";
+import { resolve as resolve14 } 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 ?? resolve12(homedir2(), ".volute");
-  const mindsDir = resolve12(configHome, "minds");
+  const configHome = process.env.VOLUTE_HOME ?? resolve14(homedir2(), ".volute");
+  const mindsDir = resolve14(configHome, "minds");
   mkdirSync7(configHome, { recursive: true });
   mkdirSync7(mindsDir, { recursive: true });
   const existingConfig = readGlobalConfig();
@@ -7503,11 +7766,11 @@ setup.get("/status", async (c) => {
   let hasAccount = false;
   if (hasSystem) {
     try {
-      const { listUsersByType: listUsersByType2 } = await import("./auth-DT7GY7EZ.js");
+      const { listUsersByType: listUsersByType2 } = await import("./auth-KRDSM55Q.js");
       const brains = await listUsersByType2("human");
       hasAccount = brains.length > 0;
     } catch (err) {
-      logger_default.debug("could not check for existing accounts during setup status", logger_default.errorData(err));
+      logger_default.error("could not check for existing accounts during setup status", logger_default.errorData(err));
     }
   }
   return c.json({
@@ -7715,7 +7978,7 @@ setup.post("/account", async (c) => {
     }
   }
   try {
-    const { createUser: createUser2, updateUserProfile: updateUserProfile2 } = await import("./auth-DT7GY7EZ.js");
+    const { createUser: createUser2, updateUserProfile: updateUserProfile2 } = await import("./auth-KRDSM55Q.js");
     const user = await createUser2(body.username.trim(), body.password);
     if (body.displayName?.trim()) {
       await updateUserProfile2(user.id, { display_name: body.displayName.trim() });
@@ -7761,7 +8024,7 @@ setup.post("/models", async (c) => {
     return c.json({ error: "Spirit model is required" }, 400);
   }
   try {
-    const { setEnabledModels: setEnabledModels3, setUtilityModel: setUtilityModel2 } = await import("./ai-service-V4CTNGI3.js");
+    const { setEnabledModels: setEnabledModels3, setUtilityModel: setUtilityModel2 } = await import("./ai-service-YW5SWCSB.js");
     setEnabledModels3(body.models);
     const config2 = readGlobalConfig();
     config2.spiritModel = body.spiritModel.trim();
@@ -7808,15 +8071,15 @@ setup.post("/complete", async (c) => {
     return c.json({ error: "Setup already complete" }, 400);
   }
   try {
-    const { ensureSpiritProject, syncSpiritTemplate } = await import("./spirit-IL5EMWYZ.js");
-    const { startSpiritFull } = await import("./mind-service-5TA7UJAT.js");
+    const { ensureSpiritProject, syncSpiritTemplate } = await import("./spirit-4ECYIVGE.js");
+    const { startSpiritFull } = await import("./mind-service-E26ZQXDS.js");
     await ensureSpiritProject();
     await syncSpiritTemplate();
     const warnings = [];
     const config2 = readGlobalConfig();
     if (config2.setup?.service && config2.setup?.type === "local") {
       try {
-        const { installUserService } = await import("./service-install-MOKTEG7B.js");
+        const { installUserService } = await import("./service-install-2EWD7KXD.js");
         const installed = await installUserService(config2.port, config2.hostname);
         if (!installed) {
           warnings.push("Service installation is not supported on this platform.");
@@ -7846,8 +8109,8 @@ setup.post("/complete", async (c) => {
     }
     let spiritConversationId;
     try {
-      const { getOrCreateMindUser: getOrCreateMindUser2, listUsersByType: listUsersByType2 } = await import("./auth-DT7GY7EZ.js");
-      const { createConversation: createConversation2, findDMConversation: findDMConversation2 } = await import("./conversations-S2232Y5I.js");
+      const { getOrCreateMindUser: getOrCreateMindUser2, listUsersByType: listUsersByType2 } = await import("./auth-KRDSM55Q.js");
+      const { createConversation: createConversation2, findDMConversation: findDMConversation2 } = await import("./conversations-ZL6PHROD.js");
       const spiritUser = await getOrCreateMindUser2(spiritName);
       const brains = await listUsersByType2("human");
       const admin2 = brains.find((u) => u.role === "admin");
@@ -7869,8 +8132,8 @@ setup.post("/complete", async (c) => {
     logger_default.info("setup complete state", { spiritConversationId, spiritStarted });
     if (spiritConversationId && spiritStarted) {
       try {
-        const { deliverMessage: deliverMessage2 } = await import("./message-delivery-3456PXB7.js");
-        const { listUsersByType: listUsers2 } = await import("./auth-DT7GY7EZ.js");
+        const { deliverMessage: deliverMessage2 } = await import("./message-delivery-7URC52ME.js");
+        const { listUsersByType: listUsers2 } = await import("./auth-KRDSM55Q.js");
         const admins = await listUsers2("human");
         const admin2 = admins.find((u) => u.role === "admin");
         if (admin2) {
@@ -7911,9 +8174,9 @@ setup.post("/complete", async (c) => {
 var setup_default = setup;
 
 // packages/daemon/src/web/api/skills.ts
-import { existsSync as existsSync8, mkdtempSync, readdirSync as readdirSync3, rmSync as rmSync4 } from "fs";
+import { existsSync as existsSync9, mkdtempSync, readdirSync as readdirSync3, rmSync as rmSync4 } from "fs";
 import { tmpdir } from "os";
-import { join, resolve as resolve13 } from "path";
+import { join, resolve as resolve15 } from "path";
 import AdmZip from "adm-zip";
 import { Hono as Hono20 } from "hono";
 var app16 = new Hono20().get("/", async (c) => {
@@ -7989,19 +8252,19 @@ var app16 = new Hono20().get("/", async (c) => {
   try {
     const zip = new AdmZip(buffer);
     for (const entry of zip.getEntries()) {
-      const target = resolve13(tmpDir, entry.entryName);
+      const target = resolve15(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 (existsSync8(join(tmpDir, "SKILL.md"))) {
+    if (existsSync9(join(tmpDir, "SKILL.md"))) {
       skillDir = tmpDir;
     } else {
       const entries = readdirSync3(tmpDir, { withFileTypes: true }).filter((e) => e.isDirectory());
       for (const entry of entries) {
-        if (existsSync8(join(tmpDir, entry.name, "SKILL.md"))) {
+        if (existsSync9(join(tmpDir, entry.name, "SKILL.md"))) {
           skillDir = join(tmpDir, entry.name);
           break;
         }
@@ -8363,8 +8626,8 @@ var app20 = new Hono24().use("*", authMiddleware).get("/", async (c) => {
         });
       }, 15e3);
       cleanups.push(() => clearInterval(keepAlive));
-      await new Promise((resolve19) => {
-        stream.onAbort(() => resolve19());
+      await new Promise((resolve21) => {
+        stream.onAbort(() => resolve21());
       });
     } finally {
       for (const cleanup of cleanups) {
@@ -8382,7 +8645,7 @@ var events_default = app20;
 import { Hono as Hono25 } from "hono";
 
 // packages/daemon/src/lib/events/feed.ts
-import { and as and6, desc as desc5, eq as eq8, gte as gte3, inArray as inArray3, sql as sql5 } from "drizzle-orm";
+import { and as and6, desc as desc5, eq as eq8, gte as gte3, inArray as inArray3, ne, sql as sql5 } from "drizzle-orm";
 var BURST_GAP_MS = 45 * 6e4;
 var FEED_WINDOW_MS = 7 * 24 * 60 * 60 * 1e3;
 var LIFECYCLE_TYPES = [
@@ -8459,7 +8722,13 @@ async function getChatFeedEvents(opts) {
     content: messages.content,
     created_at: messages.created_at,
     conversation_type: conversations.type
-  }).from(messages).innerJoin(conversations, eq8(conversations.id, messages.conversation_id)).where(and6(gte3(messages.created_at, cutoff), eq8(conversations.private, 0))).orderBy(desc5(messages.id)).limit(5e3);
+  }).from(messages).innerJoin(conversations, eq8(conversations.id, messages.conversation_id)).where(
+    and6(
+      gte3(messages.created_at, cutoff),
+      eq8(conversations.private, 0),
+      ne(messages.role, "event")
+    )
+  ).orderBy(desc5(messages.id)).limit(5e3);
   const ascending = rows.reverse();
   const bursts = splitIntoBursts(ascending);
   bursts.sort((a, b) => {
@@ -8639,23 +8908,23 @@ var app21 = new Hono25().use("*", authMiddleware).get("/", async (c) => {
 var feed_default = app21;
 
 // packages/daemon/src/web/api/variants.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync9, writeFileSync as writeFileSync9 } from "fs";
-import { resolve as resolve16 } from "path";
+import { existsSync as existsSync11, mkdirSync as mkdirSync9, writeFileSync as writeFileSync9 } from "fs";
+import { resolve as resolve18 } from "path";
 import { Hono as Hono26 } from "hono";
 
 // packages/daemon/src/lib/mind/farewell.ts
-import { existsSync as existsSync9, readFileSync as readFileSync10, rmSync as rmSync5 } from "fs";
-import { resolve as resolve14 } from "path";
+import { existsSync as existsSync10, readFileSync as readFileSync10, rmSync as rmSync5 } from "fs";
+import { resolve as resolve16 } 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 resolve14(variantDir, FAREWELL_RELPATH);
+  return resolve16(variantDir, FAREWELL_RELPATH);
 }
 function readFarewell(variantDir) {
   const path = farewellPath(variantDir);
-  if (!existsSync9(path)) return void 0;
+  if (!existsSync10(path)) return void 0;
   try {
     const text = readFileSync10(path, "utf-8").trim();
     return text || void 0;
@@ -8678,7 +8947,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 (existsSync9(farewellPath(variantDir))) cleanup();
+    if (existsSync10(farewellPath(variantDir))) cleanup();
   });
   return { done, cancel: cleanup };
 }
@@ -8711,8 +8980,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 statSync3 } from "fs";
-import { resolve as resolve15 } from "path";
+import { closeSync, mkdirSync as mkdirSync8, openSync, readFileSync as readFileSync11, statSync as statSync4 } from "fs";
+import { resolve as resolve17 } 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)];
@@ -8733,34 +9002,34 @@ function spawnAttached(cmd, args, cwd) {
     cwd,
     stdio: ["ignore", "pipe", "pipe"]
   });
-  return new Promise((resolve19) => {
-    const timeout = setTimeout(() => resolve19(null), 3e4);
+  return new Promise((resolve21) => {
+    const timeout = setTimeout(() => resolve21(null), 3e4);
     function checkOutput(data) {
       const match = data.toString().match(/listening on :(\d+)/);
       if (match) {
         clearTimeout(timeout);
-        resolve19({ child, actualPort: parseInt(match[1], 10) });
+        resolve21({ child, actualPort: parseInt(match[1], 10) });
       }
     }
     child.stdout?.on("data", checkOutput);
     child.stderr?.on("data", checkOutput);
     child.on("error", () => {
       clearTimeout(timeout);
-      resolve19(null);
+      resolve21(null);
     });
     child.on("exit", () => {
       clearTimeout(timeout);
-      resolve19(null);
+      resolve21(null);
     });
   });
 }
 function spawnDetached(cmd, args, cwd, logDir) {
-  const logsDir = logDir ?? resolve15(cwd, ".mind", "logs");
+  const logsDir = logDir ?? resolve17(cwd, ".mind", "logs");
   mkdirSync8(logsDir, { recursive: true });
-  const logPath = resolve15(logsDir, "mind.log");
+  const logPath = resolve17(logsDir, "mind.log");
   let startOffset = 0;
   try {
-    startOffset = statSync3(logPath).size;
+    startOffset = statSync4(logPath).size;
   } catch {
   }
   const logFd = openSync(logPath, "a");
@@ -8898,11 +9167,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 = resolve16(projectRoot, ".variants", variantName);
-  if (existsSync10(variantDir)) {
+  const variantDir = resolve18(projectRoot, ".variants", variantName);
+  if (existsSync11(variantDir)) {
     return c.json({ error: `Variant directory already exists: ${variantDir}` }, 409);
   }
-  mkdirSync9(resolve16(projectRoot, ".variants"), { recursive: true });
+  mkdirSync9(resolve18(projectRoot, ".variants"), { recursive: true });
   try {
     await gitExec(["worktree", "add", "-b", variantName, variantDir], { cwd: projectRoot });
   } catch (e) {
@@ -8921,18 +9190,10 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
   }
   const rollbackSplit = async () => {
     try {
-      await cleanupVariant(variantName, projectRoot, variantDir, { stop: true });
+      await cleanupVariant(variantName, mindName, projectRoot, variantDir, { stop: true });
     } catch (err2) {
       logger_default.warn(`failed to roll back split of ${variantName}`, logger_default.errorData(err2));
     }
-    try {
-      await chownMindDir(projectRoot, mindName);
-    } catch (err2) {
-      logger_default.warn(
-        `failed to restore ${mindName} ownership after split rollback`,
-        logger_default.errorData(err2)
-      );
-    }
   };
   try {
     await chownMindDir(projectRoot, mindName);
@@ -8946,7 +9207,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: resolve16(variantDir, "home") }
+        env: { ...process.env, HOME: resolve18(variantDir, "home") }
       });
     } else {
       await exec("npm", ["install"], { cwd: variantDir });
@@ -8957,7 +9218,7 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
     return c.json({ error: `npm install failed: ${msg}` }, 500);
   }
   if (body.soul) {
-    writeFileSync9(resolve16(variantDir, "home/SOUL.md"), body.soul);
+    writeFileSync9(resolve18(variantDir, "home/SOUL.md"), body.soul);
   }
   const variantPort = body.port ?? await nextPort();
   try {
@@ -9010,7 +9271,7 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
   } catch {
   }
   const projectRoot = parentEntry.dir ?? mindDir(mindName);
-  const failAfterGitWrite = async (message, extra) => {
+  const failAfterGitWrite = async (message, extra, status = 500) => {
     try {
       await chownMindDir(projectRoot, mindName);
     } catch (err) {
@@ -9026,7 +9287,7 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
         500
       );
     }
-    return c.json({ error: message, ...extra }, 500);
+    return c.json({ error: message, ...extra }, status);
   };
   let farewell;
   try {
@@ -9040,7 +9301,7 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
     logger_default.warn(`farewell turn failed for ${variantName}`, logger_default.errorData(err));
   }
   try {
-    if (existsSync10(variantEntry.dir)) {
+    if (existsSync11(variantEntry.dir)) {
       const status = (await gitExec(["status", "--porcelain"], { cwd: variantEntry.dir })).trim();
       if (status) {
         try {
@@ -9098,12 +9359,33 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
         { conflicts: err.conflicts }
       );
     }
-    await cleanupVariant(variantName, projectRoot, variantEntry.dir, { stop: true });
+    if (existsSync11(variantEntry.dir) && !body.discardUnresolved) {
+      let unresolved;
+      try {
+        unresolved = await findUnresolvedHomeFiles(variantEntry.dir);
+      } catch (err) {
+        return failAfterGitWrite(
+          `Could not verify variant ${variantName} has no unresolved home/ files: ${err instanceof Error ? err.message : String(err)}. Variant left intact \u2014 retry the join.`
+        );
+      }
+      if (unresolved.totalCount > 0) {
+        return failAfterGitWrite(
+          formatUnresolvedHomeFilesMessage(variantName, unresolved),
+          {
+            unresolvedFiles: unresolved.files,
+            unresolvedCount: unresolved.totalCount,
+            unresolvedBytes: unresolved.totalBytes
+          },
+          409
+        );
+      }
+    }
+    await cleanupVariant(variantName, mindName, projectRoot, variantEntry.dir, { stop: true });
     await chownMindDir(projectRoot, mindName);
     if (variantName.endsWith("-upgrade") || variantName === "upgrade") {
       try {
-        const { computeTemplateHash: computeTemplateHash2 } = await import("./template-hash-GSOUARW4.js");
-        const { setMindTemplateHash: setMindTemplateHash2 } = await import("./registry-4UF6OCOE.js");
+        const { computeTemplateHash: computeTemplateHash2 } = await import("./template-hash-YKWMVYMM.js");
+        const { setMindTemplateHash: setMindTemplateHash2 } = await import("./registry-TRC2HJXR.js");
         const tmpl = parentEntry.template ?? "claude";
         await setMindTemplateHash2(mindName, computeTemplateHash2(tmpl));
       } catch (err) {
@@ -9116,7 +9398,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: resolve16(projectRoot, "home") }
+          env: { ...process.env, HOME: resolve18(projectRoot, "home") }
         });
       } else {
         await exec("npm", ["install"], { cwd: projectRoot });
@@ -9164,7 +9446,7 @@ var app22 = new Hono26().get("/:name/variants", async (c) => {
   }
   if (!variantEntry.dir) return c.json({ error: `Variant ${variantName} has no directory` }, 500);
   const projectRoot = parentEntry.dir ?? mindDir(mindName);
-  await cleanupVariant(variantName, projectRoot, variantEntry.dir, { stop: true });
+  await cleanupVariant(variantName, mindName, projectRoot, variantEntry.dir, { stop: true });
   return c.json({ ok: true });
 });
 var variants_default = app22;
@@ -9603,11 +9885,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((resolve19) => {
+    await new Promise((resolve21) => {
       stream.onAbort(() => {
         unsubscribe();
         clearInterval(keepAlive);
-        resolve19();
+        resolve21();
       });
     });
   });
@@ -9824,10 +10106,10 @@ app26.route("/api/conversations", conversations_default);
 var app_default = app26;
 
 // packages/daemon/src/web/server.ts
-import { existsSync as existsSync11 } from "fs";
+import { existsSync as existsSync12 } 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 resolve17 } from "path";
+import { dirname as dirname3, extname as extname3, resolve as resolve19 } from "path";
 import { serve } from "@hono/node-server";
 var MIME_TYPES2 = {
   ".html": "text/html",
@@ -9846,8 +10128,8 @@ async function startServer({
   let assetsDir = "";
   let searchDir = dirname3(new URL(import.meta.url).pathname);
   for (let i = 0; i < 5; i++) {
-    const candidate = resolve17(searchDir, "dist", "web-assets");
-    if (existsSync11(candidate)) {
+    const candidate = resolve19(searchDir, "dist", "web-assets");
+    if (existsSync12(candidate)) {
       assetsDir = candidate;
       break;
     }
@@ -9857,7 +10139,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 = resolve17(assetsDir, urlPath.slice(1));
+      const filePath = resolve19(assetsDir, urlPath.slice(1));
       if (!filePath.startsWith(assetsDir)) return c.text("Forbidden", 403);
       const s = await stat2(filePath).catch(() => null);
       if (s?.isFile()) {
@@ -9870,7 +10152,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 = resolve17(assetsDir, "index.html");
+      const indexPath = resolve19(assetsDir, "index.html");
       const indexStat = await stat2(indexPath).catch(() => null);
       if (indexStat?.isFile()) {
         const body = await readFile2(indexPath, "utf-8");
@@ -9887,10 +10169,10 @@ async function startServer({
       createServer: createHttpsServer,
       serverOptions: { key: tls.key, cert: tls.cert }
     });
-    await new Promise((resolve19, reject) => {
+    await new Promise((resolve21, reject) => {
       server2.on("listening", () => {
         logger_default.info("Volute UI running (https)", { hostname, port });
-        resolve19();
+        resolve21();
       });
       server2.on("error", (err) => {
         reject(err);
@@ -9898,13 +10180,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((resolve19, reject) => {
+    await new Promise((resolve21, reject) => {
       internalServer.on("listening", () => {
         logger_default.info("Volute API running (http, internal)", {
           hostname: "127.0.0.1",
           port: internalPort
         });
-        resolve19();
+        resolve21();
       });
       internalServer.on("error", (err) => {
         reject(err);
@@ -9913,10 +10195,10 @@ async function startServer({
     return { server: server2, internalPort };
   }
   const server = serve({ fetch: app_default.fetch, port, hostname });
-  await new Promise((resolve19, reject) => {
+  await new Promise((resolve21, reject) => {
     server.on("listening", () => {
       logger_default.info("Volute API running (http)", { hostname, port });
-      resolve19();
+      resolve21();
     });
     server.on("error", (err) => {
       reject(err);
@@ -9927,17 +10209,17 @@ async function startServer({
 
 // packages/daemon/src/daemon.ts
 if (!process.env.VOLUTE_HOME) {
-  process.env.VOLUTE_HOME = resolve18(homedir3(), ".volute");
+  process.env.VOLUTE_HOME = resolve20(homedir3(), ".volute");
 }
 if (process.env.VOLUTE_TIMEZONE && !process.env.TZ) {
   process.env.TZ = process.env.VOLUTE_TIMEZONE;
 }
 function writeDaemonConfig(systemDir, config2, token) {
-  const configPath = resolve18(systemDir, "daemon.json");
+  const configPath = resolve20(systemDir, "daemon.json");
   writeFileSync10(configPath, `${JSON.stringify(config2, null, 2)}
 `, { mode: 420 });
   chmodSync(configPath, 420);
-  const tokenPath = resolve18(systemDir, "daemon-token");
+  const tokenPath = resolve20(systemDir, "daemon-token");
   writeFileSync10(tokenPath, `${token}
 `, { mode: 384 });
   chmodSync(tokenPath, 384);
@@ -9948,7 +10230,7 @@ async function startDaemon(opts) {
   const home = voluteHome();
   const systemDir = voluteSystemDir();
   if (!opts.foreground) {
-    const rotatingLog = new RotatingLog(resolve18(systemDir, "daemon.log"));
+    const rotatingLog = new RotatingLog(resolve20(systemDir, "daemon.log"));
     logger_default.setOutput((line) => rotatingLog.write(`${line}
 `));
     const write = (...args) => rotatingLog.write(`${format(...args)}
@@ -9958,38 +10240,38 @@ async function startDaemon(opts) {
     console.warn = write;
     console.info = write;
   }
-  const DAEMON_PID_PATH = resolve18(systemDir, "daemon.pid");
-  const DAEMON_JSON_PATH = resolve18(systemDir, "daemon.json");
-  const DAEMON_TOKEN_PATH = resolve18(systemDir, "daemon-token");
+  const DAEMON_PID_PATH = resolve20(systemDir, "daemon.pid");
+  const DAEMON_JSON_PATH = resolve20(systemDir, "daemon.json");
+  const DAEMON_TOKEN_PATH = resolve20(systemDir, "daemon-token");
   mkdirSync10(home, { recursive: true });
   ensureSystemDir();
-  const { migrateConfigSecrets, migrateSetupCompleted } = await import("./setup-CAJFOR2N.js");
+  const { migrateConfigSecrets, migrateSetupCompleted } = await import("./setup-WZSXHHRJ.js");
   migrateConfigSecrets();
   migrateSetupCompleted();
-  const { migrateAiModelQualification } = await import("./ai-service-V4CTNGI3.js");
+  const { migrateAiModelQualification } = await import("./ai-service-YW5SWCSB.js");
   migrateAiModelQualification();
-  await (await import("./db-QAY45Z56.js")).getDb();
+  await (await import("./db-BONH4SUG.js")).getDb();
   try {
     const { eq: eq9, and: and7 } = await import("drizzle-orm");
-    const { users: users2 } = await import("./schema-C2GIPD4V.js");
-    const db = await (await import("./db-QAY45Z56.js")).getDb();
+    const { users: users2 } = await import("./schema-ZZQVM4GR.js");
+    const db = await (await import("./db-BONH4SUG.js")).getDb();
     await db.update(users2).set({ role: "system" }).where(and7(eq9(users2.user_type, "system"), eq9(users2.role, "user")));
   } catch (err) {
     logger_default.warn("failed to migrate system user role", logger_default.errorData(err));
   }
   try {
-    const { migrateAvatarSizes } = await import("./avatar-image-QEPAP3A5.js");
+    const { migrateAvatarSizes } = await import("./avatar-image-52WGXLHV.js");
     await migrateAvatarSizes();
   } catch (err) {
     logger_default.warn("avatar size migration failed", logger_default.errorData(err));
   }
   try {
-    const { migrateThreadConfigs } = await import("./migrate-thread-config-4A5LW36Z.js");
+    const { migrateThreadConfigs } = await import("./migrate-thread-config-EQSEP2XG.js");
     await migrateThreadConfigs();
   } catch (err) {
     logger_default.warn("session\u2192thread config migration failed", logger_default.errorData(err));
   }
-  const { initSandbox } = await import("./sandbox-EGEU5GGE.js");
+  const { initSandbox } = await import("./sandbox-NNWCTHRI.js");
   await initSandbox();
   try {
     await syncBuiltinSkills();
@@ -10021,7 +10303,7 @@ async function startDaemon(opts) {
     logger_default.warn("failed to backfill minds into #system", logger_default.errorData(err));
   }
   try {
-    const { getOrCreateSystemUser: getOrCreateSystemUser2 } = await import("./auth-DT7GY7EZ.js");
+    const { getOrCreateSystemUser: getOrCreateSystemUser2 } = await import("./auth-KRDSM55Q.js");
     await getOrCreateSystemUser2();
   } catch (err) {
     logger_default.warn(
@@ -10030,12 +10312,12 @@ async function startDaemon(opts) {
     );
   }
   const token = process.env.VOLUTE_DAEMON_TOKEN || randomBytes3(32).toString("hex");
-  const { readGlobalConfig: readGlobalConfig2 } = await import("./setup-CAJFOR2N.js");
+  const { readGlobalConfig: readGlobalConfig2 } = await import("./setup-WZSXHHRJ.js");
   const globalCfg = readGlobalConfig2();
   let tls;
   if (opts.tailscale || globalCfg.tailscale) {
     try {
-      const { getTailscaleTls } = await import("./tailscale-SJUW2ETR.js");
+      const { getTailscaleTls } = await import("./tailscale-KHNZFC7L.js");
       const tlsConfig = await getTailscaleTls();
       tls = { key: tlsConfig.key, cert: tlsConfig.cert };
       logger_default.info("Tailscale HTTPS enabled", { hostname: tlsConfig.hostname });
@@ -10089,7 +10371,7 @@ async function startDaemon(opts) {
   const orphanedTurns = await completeOrphanedTurns();
   summarizeOrphanedTurns(orphanedTurns);
   try {
-    const { reconcileVariants } = await import("./variant-cleanup-HJ7Z75R6.js");
+    const { reconcileVariants } = await import("./variant-cleanup-STC6B5HR.js");
     await reconcileVariants();
   } catch (err) {
     logger_default.error("failed to reconcile variants", logger_default.errorData(err));
@@ -10123,15 +10405,15 @@ async function startDaemon(opts) {
     await Promise.all(workers);
   }
   try {
-    const { isSetupComplete: isSetupComplete2, getSpiritName: getSpiritName2 } = await import("./setup-CAJFOR2N.js");
+    const { isSetupComplete: isSetupComplete2, getSpiritName: getSpiritName2 } = await import("./setup-WZSXHHRJ.js");
     if (isSetupComplete2()) {
-      const { ensureSpiritProject, syncSpiritTemplate } = await import("./spirit-IL5EMWYZ.js");
-      const { startSpiritFull } = await import("./mind-service-5TA7UJAT.js");
+      const { ensureSpiritProject, syncSpiritTemplate } = await import("./spirit-4ECYIVGE.js");
+      const { startSpiritFull } = await import("./mind-service-E26ZQXDS.js");
       await ensureSpiritProject();
       const spiritName = getSpiritName2();
       const spiritEntry = await findMind(spiritName);
       if (spiritEntry?.dir) {
-        const { registerMindDir } = await import("./delivery-router-JE7SHYNU.js");
+        const { registerMindDir } = await import("./delivery-router-RHANNTAC.js");
         registerMindDir(spiritName, spiritEntry.dir);
       }
       await syncSpiritTemplate();
@@ -10145,7 +10427,7 @@ async function startDaemon(opts) {
   bridgeManager.startBridges(daemonPort).catch((err) => {
     logger_default.warn("failed to start bridges", logger_default.errorData(err));
   });
-  import("./cloud-sync-IDJFVDEP.js").then(
+  import("./cloud-sync-H7EWZASD.js").then(
     ({ consumeQueuedMessages }) => consumeQueuedMessages().catch((err) => {
       logger_default.warn("failed to consume queued cloud messages", logger_default.errorData(err));
     })
@@ -10153,7 +10435,7 @@ 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-7BUHWZNT.js");
+    const { backfillTemplateHashes, notifyVersionUpdate, warnStaleTemplates } = await import("./version-notify-LBVHH5YV.js");
     backfillTemplateHashes().then(() => warnStaleTemplates()).catch((err) => {
       logger_default.warn("failed to check template staleness", logger_default.errorData(err));
     });