@turmind/halo 1.5.2-alpha → 1.5.4

package/dist/index.js

@@ -508,7 +508,7 @@ function generalSection() {
       { key: "session.max_queue_size", type: "int", globalOnly: true, description: "Maximum queued messages per session", description_zh: "\u6BCF\u4E2A\u4F1A\u8BDD\u6700\u5927\u6392\u961F\u6D88\u606F\u6570", default: "256" },
       { key: "session.max_nesting_depth", type: "int", globalOnly: true, description: "Maximum session nesting depth for agent delegation", description_zh: "Agent \u59D4\u6D3E\u7684\u6700\u5927\u4F1A\u8BDD\u5D4C\u5957\u6DF1\u5EA6", default: "16" },
       // compact
-      { key: "compact.compress_at", type: "float", globalOnly: true, description: "Auto-compact threshold as a fraction of max context (e.g. 0.8 = compact when 80% full)", description_zh: "\u81EA\u52A8\u538B\u7F29\u9608\u503C\uFF0C\u6700\u5927\u4E0A\u4E0B\u6587\u7684\u6BD4\u4F8B\uFF08\u5982 0.8 \u8868\u793A\u7528\u6EE1 80% \u65F6\u538B\u7F29\uFF09", default: "0.8" },
+      { key: "compact.compress_at", type: "float", globalOnly: true, description: "Auto-compact threshold as a fraction of max context (e.g. 0.9 = compact when 90% full)", description_zh: "\u81EA\u52A8\u538B\u7F29\u9608\u503C\uFF0C\u6700\u5927\u4E0A\u4E0B\u6587\u7684\u6BD4\u4F8B\uFF08\u5982 0.9 \u8868\u793A\u7528\u6EE1 90% \u65F6\u538B\u7F29\uFF09", default: "0.9" },
       { key: "compact.keep_messages", type: "int", globalOnly: true, description: "Recent messages kept intact during compaction", description_zh: "\u538B\u7F29\u65F6\u4FDD\u7559\u6700\u540E\u591A\u5C11\u6761\u6D88\u606F\u4E0D\u52A8", default: "5" },
       { key: "compact.max_summary_input", type: "int", globalOnly: true, description: "Max chars fed into local truncation fallback", description_zh: "\u672C\u5730\u622A\u65AD\u515C\u5E95\u65F6\u7684\u603B\u8F93\u5165\u5B57\u7B26\u4E0A\u9650", default: "15000" },
       { key: "compact.max_message_slice", type: "int", globalOnly: true, description: "Max chars kept per old message during local truncation", description_zh: "\u672C\u5730\u622A\u65AD\u515C\u5E95\u65F6\u6BCF\u6761\u65E7\u6D88\u606F\u4FDD\u7559\u7684\u6700\u5927\u5B57\u7B26\u6570", default: "800" },
@@ -1102,7 +1102,7 @@ var init_config = __esm({
       // value is a fraction of `maxContextTokens`; auto-compact triggers when
       // the running context exceeds `maxContextTokens * compressAt`.
       model: {
-        maxContextTokens: envInt("HALO_MAX_CONTEXT_TOKENS", 2e5),
+        maxContextTokens: envInt("HALO_MAX_CONTEXT_TOKENS", 272e3),
         get compressAt() {
           const raw = settingsValue("general.compact.compress_at");
           if (raw !== void 0) {
@@ -1110,7 +1110,7 @@ var init_config = __esm({
             if (Number.isFinite(n) && n > 0 && n <= 1)
               return n;
           }
-          return 0.8;
+          return 0.9;
         }
       },
       /** System language preference. `general.language` in settings.yaml stores
@@ -2621,7 +2621,7 @@ var init_init = __esm({
       path8.resolve(__dirname, "..", "bundled-docs"),
       path8.resolve(__dirname, "..", "..", "..", ".halo", "docs")
     ];
-    TEMPLATE_VERSION = 76;
+    TEMPLATE_VERSION = 78;
     VERSION_FILE = ".template-version";
     SKIP_NAMES = /* @__PURE__ */ new Set([".DS_Store", "schema.sql", "__pycache__", ".pytest_cache"]);
     BUILTIN_AGENT_IDS = /* @__PURE__ */ new Set([
@@ -7265,9 +7265,10 @@ var init_session_ui_store = __esm({
        *  taskId: `state.subSessionLogs[id]`, which holds the sub's full history —
        *  see loadSubHistory — plus the in-flight turn as a temp assistant, the
        *  same snapshot the root writes). `archive` is passed ONLY by
-       *  archiveOldMessages (the commit step of an archive write): `count` is the
-       *  new segment count and `userDelta` the main user turns leaving the active
-       *  file. Every other call leaves both on-disk values alone. */
+       *  archiveOldMessages (the commit step of an archive write, root or sub
+       *  alike): `count` is the new segment count and `userDelta` the main user
+       *  turns leaving the active file. Every other call leaves both on-disk
+       *  values alone. */
       persistLog(id, state, archive) {
         const rootId = this.findRootSessionId(id);
         const sub = id === rootId ? void 0 : state.subSessionLogs.get(id);
@@ -7290,7 +7291,9 @@ var init_session_ui_store = __esm({
               agentName: sub.agentName,
               source: "delegated",
               description: sub.description,
-              parentSessionId: parts.slice(0, -1).join(">")
+              parentSessionId: parts.slice(0, -1).join(">"),
+              archiveCount: archive?.count,
+              archivedUserDelta: archive?.userDelta
             });
             return;
           }
@@ -7316,10 +7319,14 @@ var init_session_ui_store = __esm({
         }
       }
       /**
-       * Move a root session's UI log out into a gzipped archive segment, keeping
-       * only the newest main exchange in the active file. Called from the compact
+       * Move a session's UI log out into a gzipped archive segment, keeping only
+       * the newest main exchange in the active file. Called from the compact
        * path — the only place that already accepts "history shrinks here".
        *
+       * Root and sub-session alike: a sub's log lives in its root's UIState
+       * (`subSessionLogs`, keyed by the full `root>…` id) but is written to the
+       * sub's own file, so archiving it never touches the parent's log or file.
+       *
        * Gated on the active file's SIZE (`ARCHIVE_SIZE_THRESHOLD`), not its exchange
        * count: bytes are what make a log slow to load, and per-exchange size varies
        * by orders of magnitude. Under the threshold this returns 0 after a single
@@ -7340,35 +7347,36 @@ var init_session_ui_store = __esm({
        */
       archiveOldMessages(sessionId) {
         const rootId = this.findRootSessionId(sessionId);
-        if (this.host.isSessionDeleted(rootId))
+        const isRoot = sessionId === rootId;
+        if (this.host.isSessionDeleted(rootId) || this.host.isSessionDeleted(sessionId))
+          return 0;
+        const state = isRoot ? this.ensureUIState(rootId) : this.uiStates.get(rootId);
+        const log2 = isRoot ? state : state?.subSessionLogs.get(sessionId);
+        if (!state || !log2)
           return 0;
-        const state = this.ensureUIState(rootId);
         try {
-          const inMem = this.host.getSession(rootId);
-          const row = inMem ? null : this.db.select().from(agentSessions).where(eq6(agentSessions.id, rootId)).get();
-          const agentId = inMem?.agentId ?? row?.agentId ?? "default";
-          const dir = getSessionDir(agentId, this.uiStateProjectPaths.get(rootId) ?? this.host.workspaceRoot);
-          const seg = fileSegment(rootId);
+          const dir = getSessionDir(this.resolveAgentId(sessionId), this.uiStateProjectPaths.get(rootId) ?? this.host.workspaceRoot);
+          const seg = fileSegment(sessionId);
           if (activeFileSize(dir, seg) <= ARCHIVE_SIZE_THRESHOLD)
             return 0;
-          const cut = archiveSplitIndex(state.messageLog, 1);
+          const cut = archiveSplitIndex(log2.messageLog, 1);
           if (cut === 0)
             return 0;
-          const older = state.messageLog.slice(0, cut);
-          const kept = state.messageLog.slice(cut);
+          const older = log2.messageLog.slice(0, cut);
+          const kept = log2.messageLog.slice(cut);
           const n = readArchiveCount(dir, seg) + 1;
           writeArchiveSegment(dir, seg, n, older);
-          state.messageLog = kept;
-          this.persistLog(rootId, state, { count: n, userDelta: countMainUserMessages(older) });
+          log2.messageLog = kept;
+          this.persistLog(sessionId, state, { count: n, userDelta: countMainUserMessages(older) });
           if (readArchiveCount(dir, seg) < n) {
-            state.messageLog = [...older, ...kept];
-            console.warn(`[SessionUIStore] archive commit for ${rootId} segment ${n} did not land \u2014 rolled back`);
+            log2.messageLog = [...older, ...kept];
+            console.warn(`[SessionUIStore] archive commit for ${sessionId} segment ${n} did not land \u2014 rolled back`);
             return 0;
           }
-          console.debug(`[SessionUIStore] archived ${older.length} UI messages of ${rootId} into segment ${n}`);
+          console.debug(`[SessionUIStore] archived ${older.length} UI messages of ${sessionId} into segment ${n}`);
           return older.length;
         } catch (err) {
-          console.error(`[SessionUIStore] archiveOldMessages failed for ${rootId}: ${err instanceof Error ? err.message : String(err)}`);
+          console.error(`[SessionUIStore] archiveOldMessages failed for ${sessionId}: ${err instanceof Error ? err.message : String(err)}`);
           return 0;
         }
       }
@@ -12061,7 +12069,7 @@ ${roster}`;
       buildModelRuntime(args) {
         const { yamlConfig, modelId, endpoint, providerId, sessionId, systemPrompt, tools } = args;
         const contextConfig = {
-          // Priority: explicit agent.yaml config > model registry contextWindow > global default (200K).
+          // Priority: explicit agent.yaml config > model registry contextWindow > global default (272K).
           maxTokens: yamlConfig?.context?.maxTokens ?? resolveContextWindow(modelId) ?? config.model.maxContextTokens,
           compressAt: yamlConfig?.context?.compressAt ?? config.model.compressAt
         };
@@ -12273,7 +12281,7 @@ var init_session_state_store = __esm({
             existing.agentName = session.agentName;
           if (session.parentId)
             existing.parentSessionId = session.parentId;
-          if (!existing.title)
+          if (!existing.title && session.parentId)
             existing.title = session.description?.slice(0, 60) || `${session.agentId} session`;
           if (!existing.createdAt)
             existing.createdAt = now;
@@ -12369,7 +12377,7 @@ async function initObservability() {
     return true;
   }
   const { registerSdk: registerSdk2 } = await Promise.resolve().then(() => (init_otel_sdk(), otel_sdk_exports));
-  providers = registerSdk2(process.env.OTEL_SERVICE_NAME, "1.5.2-alpha");
+  providers = registerSdk2(process.env.OTEL_SERVICE_NAME, "1.5.4");
   console.log(`[Observability] OTLP export \u2192 ${process.env.OTEL_EXPORTER_OTLP_ENDPOINT} (service.name=${process.env.OTEL_SERVICE_NAME}, capture_content=${config.observability.captureContent})`);
   return true;
 }
@@ -14561,8 +14569,7 @@ ${summaryText}` }]
           const finalTail = tailMicro.compacted ? tailMicro.messages : cleanRecent;
           session.agent.messages = [summaryMsg, ...finalTail];
           rebuilt = true;
-          if (!session.parentId)
-            this.uiStore.archiveOldMessages(session.id);
+          this.uiStore.archiveOldMessages(session.id);
           const estimatedTokens = estimateMessageTokens(session.agent.messages) + estimateMessageTokens([{ role: "user", content: session.systemPrompt }]);
           return { summary: summaryText, olderCount, estimatedTokens };
         } finally {
@@ -15222,6 +15229,11 @@ function listSessions(workspace) {
   const { sessions } = sm.listSessions({ limit: 200 });
   return sessions.map((s) => ({ id: s.id, description: s.description, createdAt: s.createdAt }));
 }
+async function agentSupportsImage(sm, workspace, agentId) {
+  const agents = await scanAvailableAgents(workspace, getDisabledSet(sm.getDb(), "agent"));
+  const entry = agents.find((a) => a.id === agentId);
+  return entry ? modelSupportsImage(entry.model) : false;
+}
 async function createHarness(opts) {
   const initialPath = path32.resolve(opts.workspace);
   if (!fs26.existsSync(initialPath)) {
@@ -15257,10 +15269,7 @@ async function createHarness(opts) {
     }
     activeOverrides2.set(USER_ID, sessionId);
     const sessionAgentId = sm.getSessionById(sessionId)?.agentId ?? agentId;
-    const disabledSet = getDisabledSet(sm.getDb(), "agent");
-    const agents = await scanAvailableAgents(workspace, disabledSet);
-    const agentEntry = agents.find((a) => a.id === agentId);
-    const supportsImage = agentEntry ? modelSupportsImage(agentEntry.model) : false;
+    const supportsImage = await agentSupportsImage(sm, workspace, sessionAgentId);
     const unsubPersistent = sm.registerEventListener(sessionId, (event) => {
       for (const h of eventHandlers) h(event);
     });
@@ -15328,10 +15337,12 @@ async function createHarness(opts) {
     if (result?.switchTo) {
       activeOverrides2.set(USER_ID, result.switchTo);
       state.unsubPersistent();
+      const switchedAgentId = state.sm.getSessionById(result.switchTo)?.agentId ?? agentId;
       state = {
         ...state,
         sessionId: result.switchTo,
-        agentId: state.sm.getSessionById(result.switchTo)?.agentId ?? agentId,
+        agentId: switchedAgentId,
+        supportsImage: await agentSupportsImage(state.sm, state.workspace, switchedAgentId),
         unsubPersistent: state.sm.registerEventListener(result.switchTo, (event) => {
           for (const h of eventHandlers) h(event);
         })
@@ -18028,7 +18039,7 @@ var init_app = __esm({
     init_input_box();
     init_log_navigator();
     init_log_viewer();
-    MAX_CONTEXT_TOKENS_FALLBACK = 2e5;
+    MAX_CONTEXT_TOKENS_FALLBACK = 272e3;
     blockSeq = 0;
     ANSI2 = {
       reset: "\x1B[0m",
@@ -18099,6 +18110,7 @@ async function runCli(harness, message, opts) {
   let turnAll = "";
   const toolCalls = [];
   let errorText = "";
+  const notices = [];
   let usage = null;
   let lastToolName = "";
   let hadMeta = false;
@@ -18219,6 +18231,16 @@ ${tag}${formatUsageLine(event)}
 `);
         hadMeta = true;
         break;
+      case "system":
+        if (!event.text) break;
+        if (opts.verbose) {
+          stopSpinner();
+          process.stderr.write(`${tag}\x1B[2m[system] ${event.text}\x1B[0m
+`);
+          hadMeta = true;
+        }
+        if (!event.taskId && !event.agentName) notices.push(event.text);
+        break;
       case "complete":
         stopSpinner();
         break;
@@ -18227,6 +18249,9 @@ ${tag}${formatUsageLine(event)}
   stopSpinner();
   const answer = turnFinal || turnAll;
   if (opts.format === "text") {
+    if (notices.length > 0) {
+      process.stdout.write(notices.map((n) => `\u2139\uFE0F ${n}`).join("\n") + (answer ? "\n\n" : "\n"));
+    }
     if (answer) {
       const out = process.stdout.isTTY ? renderMarkdown(answer) : answer;
       process.stdout.write(out.endsWith("\n") ? out : out + "\n");
@@ -18234,6 +18259,7 @@ ${tag}${formatUsageLine(event)}
   } else {
     const result = {
       text: answer,
+      notices,
       sessionId: harness.sessionId,
       toolCalls,
       usage: usage ? {
@@ -21608,7 +21634,11 @@ function createSessionRoutes(smRegistry) {
         totalOutputTokens,
         // Goal-mode: non-null while this session is the bound worker of an
         // active goal — session lists render a 🎯 badge off this.
-        goalSessionId: s.goalSessionId
+        goalSessionId: s.goalSessionId,
+        // Running flag for an Explorer chat tab that hasn't loaded yet (a
+        // loaded tab tracks its own stream). A root with a running sub-session
+        // counts as running.
+        status: s.status
       };
     };
     const enriched = [...rows.map(enrich), ...descendants.map(enrich)];
@@ -23953,11 +23983,11 @@ function sendWsNotification(event, state, turnId, ctx) {
       break;
     case "system":
       if (!taskId && /^Compacting context \(\d+K tokens\)…$/.test(event.text ?? "")) {
-        sendJson(ctx.ws, { type: "compact:started" });
+        sendJson(ctx.ws, { type: "compact:started", sessionId });
       }
       sendJson(ctx.ws, { type: "chat:system", text: event.text ?? "", taskId, agentName, sessionId });
       if (event.compactEnd && !taskId) {
-        sendJson(ctx.ws, { type: "compact:done" });
+        sendJson(ctx.ws, { type: "compact:done", sessionId });
       }
       break;
     case "error":
@@ -23970,28 +24000,28 @@ function sendWsNotification(event, state, turnId, ctx) {
       break;
     case "compacted":
       if (!taskId) {
-        sendJson(ctx.ws, { type: "compact:done" });
-        sendJson(ctx.ws, { type: "session:compacted", contextTokens: event.totalTokens ?? state.contextTokens });
+        sendJson(ctx.ws, { type: "compact:done", sessionId });
+        sendJson(ctx.ws, { type: "session:compacted", contextTokens: event.totalTokens ?? state.contextTokens, sessionId });
       }
       break;
   }
 }
-function bufferDetachedNotification(event, pendingEvents) {
+function bufferDetachedNotification(event, pendingEvents, sessionId) {
   const agentName = event.agentName ?? "default";
   const taskId = event.taskId;
   switch (event.type) {
     case "agent_start":
-      pendingEvents.push({ type: "agent:start", agentName, task: event.text, taskId });
+      pendingEvents.push({ type: "agent:start", agentName, task: event.text, taskId, sessionId });
       break;
     case "agent_done":
-      pendingEvents.push({ type: "agent:done", agentName, taskId });
+      pendingEvents.push({ type: "agent:done", agentName, taskId, sessionId });
       break;
     case "error":
-      pendingEvents.push({ type: "error", error: event.error, agentName, taskId });
+      pendingEvents.push({ type: "error", error: event.error, agentName, taskId, sessionId });
       break;
     case "followup_start":
     case "queued_message":
-      pendingEvents.push({ type: "chat:followup", agentName });
+      pendingEvents.push({ type: "chat:followup", agentName, sessionId });
       break;
     case "complete":
       pendingEvents.length = 0;
@@ -24276,10 +24306,10 @@ function setupWebSocketHandler(deps) {
   function getSessionManager(workspacePath) {
     return registry2.getOrCreate(workspacePath);
   }
-  function getState(client) {
-    if (!client.sessionManager || !client.sessionId)
+  function getState(client, sessionId) {
+    if (!client.sessionManager)
       return null;
-    return client.sessionManager.getCachedUIState(client.sessionId);
+    return client.sessionManager.getCachedUIState(sessionId);
   }
   function archiveCountFor(client, sessionId, agentId) {
     if (!agentId || !client.projectId)
@@ -24289,21 +24319,21 @@ function setupWebSocketHandler(deps) {
       return 0;
     return readArchiveCount(getSessionDir(agentId, projectPath), fileSegment(sessionId));
   }
-  function saveSession(client) {
-    if (!client.sessionId || !client.projectId || !client.sessionManager)
+  function saveSession(client, sessionId) {
+    if (!client.projectId || !client.sessionManager)
       return;
-    const state = getState(client);
+    const state = getState(client, sessionId);
     if (!state)
       return;
-    if (!client.sessionManager.isUIStateDirty(client.sessionId))
+    if (!client.sessionManager.isUIStateDirty(sessionId))
       return;
     const projectPath = resolveProjectPath2(client.projectId);
     const snapshot2 = createSaveSnapshot(state);
     if (snapshot2.length === 0)
       return;
-    const sessionInfo = client.sessionManager.getSessionById(client.sessionId);
+    const sessionInfo = client.sessionManager.getSessionById(sessionId);
     client.sessionManager.persistSessionFile({
-      sessionId: client.sessionId,
+      sessionId,
       projectPath,
       messages: snapshot2,
       contextTokens: state.contextTokens,
@@ -24314,10 +24344,8 @@ function setupWebSocketHandler(deps) {
   }
   const wsActiveOverrides = /* @__PURE__ */ new Map();
   let nextCommandUserId = 1;
-  function buildSharedCommandContext(client) {
-    const sid = client.sessionId ?? "";
-    if (sid)
-      wsActiveOverrides.set(client.commandUserId, sid);
+  function buildSharedCommandContext(client, sessionId) {
+    wsActiveOverrides.set(client.commandUserId, sessionId);
     return {
       sm: client.sessionManager,
       userId: client.commandUserId,
@@ -24329,19 +24357,8 @@ function setupWebSocketHandler(deps) {
       lang: "en"
     };
   }
-  async function handleSessionClear(client, ws, msg) {
-    const prevSessionId = msg.sessionId ?? client.sessionId;
-    saveSession(client);
-    if (prevSessionId && client.sessionId && client.sessionManager) {
-      client.unsubscribeEvents?.();
-      client.unsubscribeEvents = null;
-      client.backgroundSaves.set(prevSessionId, () => saveSession(client));
-    }
-    client.sessionId = null;
-    sendJson(ws, { type: "session:cleared" });
-  }
   async function handleSessionDelete(client, ws, msg) {
-    const delSessionId = msg.sessionId ?? client.sessionId;
+    const delSessionId = frameSessionId(client, msg);
     if (!delSessionId) {
       sendJson(ws, { type: "error", error: "session:delete requires sessionId" });
       return;
@@ -24350,14 +24367,12 @@ function setupWebSocketHandler(deps) {
     const projectPath = requestedProjectId ? resolveProjectPath2(requestedProjectId) : null;
     const sm = projectPath ? getSessionManager(projectPath) : client.sessionManager;
     if (!sm) {
-      sendJson(ws, { type: "error", error: "No workspace context for delete" });
+      sendJson(ws, { type: "error", error: "No workspace context for delete", sessionId: delSessionId });
       return;
     }
     await sm.deleteSession(delSessionId);
-    if (delSessionId === client.sessionId) {
-      client.sessionId = null;
-    }
-    client.backgroundSaves.delete(delSessionId);
+    client.subscriptions.get(delSessionId)?.();
+    client.subscriptions.delete(delSessionId);
     sendJson(ws, { type: "session:deleted", sessionId: delSessionId });
   }
   async function handleExchangeDelete(client, ws, msg) {
@@ -24370,62 +24385,85 @@ function setupWebSocketHandler(deps) {
     const projectPath = requestedProjectId ? resolveProjectPath2(requestedProjectId) : null;
     const sm = projectPath ? getSessionManager(projectPath) : client.sessionManager;
     if (!sm) {
-      sendJson(ws, { type: "error", error: "No workspace context for exchange:delete" });
+      sendJson(ws, { type: "error", error: "No workspace context for exchange:delete", sessionId: targetSessionId });
       return;
     }
     const result = await sm.deleteExchange(targetSessionId, msg.userOrdinal, msg.archiveCount ?? 0);
     if (result === "running") {
-      sendJson(ws, { type: "error", error: "Cannot delete while the agent is running" });
+      sendJson(ws, { type: "error", error: "Cannot delete while the agent is running", sessionId: targetSessionId });
       return;
     }
     if (result === "compacting") {
-      sendJson(ws, { type: "error", error: "Cannot delete while compacting" });
+      sendJson(ws, { type: "error", error: "Cannot delete while compacting", sessionId: targetSessionId });
       return;
     }
     if (result === "archived") {
-      sendJson(ws, { type: "error", code: "archived", error: "This session archived history since it was opened \u2014 reopen it to delete individual turns." });
+      sendJson(ws, { type: "error", code: "archived", error: "This session archived history since it was opened \u2014 reopen it to delete individual turns.", sessionId: targetSessionId });
       return;
     }
     if (result === "not_found" || result === "no_exchange") {
-      sendJson(ws, { type: "error", error: "Exchange not found" });
+      sendJson(ws, { type: "error", error: "Exchange not found", sessionId: targetSessionId });
       return;
     }
-    if (client.sessionId && client.sessionId === targetSessionId) {
-      const state = getState(client);
+    if (client.subscriptions.has(targetSessionId)) {
+      const state = getState(client, targetSessionId);
       const messages2 = state ? [...createSaveSnapshot(state)] : [];
-      sendJson(ws, { type: "state:snapshot", snapshot: { recentMessages: messages2, sessionId: client.sessionId } });
+      sendJson(ws, { type: "state:snapshot", snapshot: { recentMessages: messages2, sessionId: targetSessionId } });
     }
   }
-  function createEventListener(client) {
+  function createEventListener(client, sessionId) {
     return (event, state, turnId) => {
-      sendWsNotification(event, state, turnId, {
-        ws: client.ws,
-        sessionId: client.sessionId
-      });
+      sendWsNotification(event, state, turnId, { ws: client.ws, sessionId });
     };
   }
+  function subscribeSession(client, sm, sessionId) {
+    if (client.subscriptions.has(sessionId))
+      return;
+    client.subscriptions.set(sessionId, sm.registerEventListener(sessionId, createEventListener(client, sessionId)));
+  }
+  function frameSessionId(client, msg) {
+    if (msg.sessionId !== void 0)
+      return msg.sessionId;
+    return client.subscriptions.size === 1 ? client.subscriptions.keys().next().value ?? null : null;
+  }
+  function unsubscribeSession(client, sessionId) {
+    const unsubscribe = client.subscriptions.get(sessionId);
+    if (!unsubscribe)
+      return;
+    saveSession(client, sessionId);
+    unsubscribe();
+    client.subscriptions.delete(sessionId);
+  }
+  function setClientProject(client, projectId) {
+    if (client.projectId === projectId)
+      return;
+    for (const sid of [...client.subscriptions.keys()])
+      unsubscribeSession(client, sid);
+    client.projectId = projectId;
+  }
   function reclaimIfAbandoned(client) {
-    if (!client.unsubscribeEvents)
+    if (client.subscriptions.size === 0)
       return;
     const closed = client.ws.readyState === client.ws.CLOSED;
     if (!closed && Date.now() - client.lastClientPingAt <= CLIENT_SILENCE_LIMIT_MS)
       return;
-    client.unsubscribeEvents();
-    client.unsubscribeEvents = null;
-    console.debug(`[WS] Released listener for ${closed ? "closed" : "abandoned"} connection session=${client.sessionId}`);
-    sendJson(client.ws, { type: "listener:released", sessionId: client.sessionId });
+    const released = [...client.subscriptions.keys()];
+    for (const unsubscribe of client.subscriptions.values())
+      unsubscribe();
+    client.subscriptions.clear();
+    console.debug(`[WS] Released listeners for ${closed ? "closed" : "abandoned"} connection sessions=${released.join(",")}`);
+    for (const sessionId of released)
+      sendJson(client.ws, { type: "listener:released", sessionId });
   }
   wss2.on("connection", (ws) => {
     const terminalManager = new TerminalManager(ws);
     const client = {
       ws,
-      sessionId: null,
+      subscriptions: /* @__PURE__ */ new Map(),
       projectId: null,
       sessionManager: null,
       agentId: "default",
       terminalManager,
-      backgroundSaves: /* @__PURE__ */ new Map(),
-      unsubscribeEvents: null,
       lastClientPingAt: Date.now(),
       commandUserId: `ws-${nextCommandUserId++}`
     };
@@ -24474,14 +24512,18 @@ function setupWebSocketHandler(deps) {
               await handleChat(client, msg);
               break;
             case "chat:stop":
-              handleChatStop(client);
+              handleChatStop(client, msg);
               break;
             case "chat:interrupt":
-              handleChatInterrupt(client);
+              handleChatInterrupt(client, msg);
               break;
             case "subscribe":
               await handleSubscribe(client, msg);
               break;
+            case "unsubscribe":
+              if (msg.sessionId)
+                unsubscribeSession(client, msg.sessionId);
+              break;
             case "terminal:start":
               handleTerminalStart(client, msg);
               break;
@@ -24495,9 +24537,6 @@ function setupWebSocketHandler(deps) {
             case "terminal:reattach":
               terminalManager.reattachAll(msg.browserId ?? "", msg.workspacePath ?? "");
               break;
-            case "session:clear":
-              await handleSessionClear(client, ws, msg);
-              break;
             case "session:delete":
               await handleSessionDelete(client, ws, msg);
               break;
@@ -24510,51 +24549,48 @@ function setupWebSocketHandler(deps) {
                 break;
               }
               const cmdName = msg.type.slice("command:".length);
-              await bindOrCreateSession(client, msg);
+              const sid = msg.sessionId === void 0 ? frameSessionId(client, msg) : await bindOrCreateSession(client, msg);
               const sm = client.sessionManager;
-              const sid = client.sessionId;
               if (!sm || !sid) {
                 sendJson(ws, { type: "error", error: "No active session" });
                 break;
               }
               if (cmdName === "session" && (msg.message ?? "").trim().split(/\s+/)[0] === "compact") {
                 sm.compactSession(sid, {
-                  onProgress: (status) => sendJson(ws, { type: `compact:${status}` })
+                  onProgress: (status) => sendJson(ws, { type: `compact:${status}`, sessionId: sid })
                 }).then((result2) => {
                   if (result2 === "no_session")
-                    sendJson(ws, { type: "error", error: "No active session to compact" });
+                    sendJson(ws, { type: "error", error: "No active session to compact", sessionId: sid });
                   else if (result2 === "running")
-                    sendJson(ws, { type: "error", error: "Cannot compact while agent is running" });
+                    sendJson(ws, { type: "error", error: "Cannot compact while agent is running", sessionId: sid });
                   else if (result2 === "already")
-                    sendJson(ws, { type: "error", error: "Compact already in progress" });
+                    sendJson(ws, { type: "error", error: "Compact already in progress", sessionId: sid });
                   else if (result2 === "nothing") {
                     const state = sm.getCachedUIState(sid);
-                    sendJson(ws, { type: "session:compacted", message: "Nothing to compact", contextTokens: state?.contextTokens ?? 0 });
+                    sendJson(ws, { type: "session:compacted", message: "Nothing to compact", contextTokens: state?.contextTokens ?? 0, sessionId: sid });
                   }
                 }).catch((err) => {
-                  sendJson(ws, { type: "error", error: `Compact failed: ${err instanceof Error ? err.message : String(err)}` });
+                  sendJson(ws, { type: "error", error: `Compact failed: ${err instanceof Error ? err.message : String(err)}`, sessionId: sid });
                 });
                 break;
               }
-              const sharedCtx = buildSharedCommandContext(client);
+              const sharedCtx = buildSharedCommandContext(client, sid);
               const result = await dispatchCommand(sharedCtx, `/${cmdName}`, (msg.message ?? "").trim(), { channelName: "ws" });
               if (result) {
-                sendJson(ws, { type: "chat:system", text: result.text });
+                sendJson(ws, { type: "chat:system", text: result.text, sessionId: sid });
                 if (result.switchTo) {
-                  client.unsubscribeEvents?.();
-                  client.sessionId = result.switchTo;
-                  client.unsubscribeEvents = sm.registerEventListener(result.switchTo, createEventListener(client));
-                  sendJson(ws, { type: "session:switched", sessionId: result.switchTo });
+                  subscribeSession(client, sm, result.switchTo);
+                  sendJson(ws, { type: "session:switched", sessionId: result.switchTo, fromSessionId: sid });
                 }
               } else {
-                sendJson(ws, { type: "error", error: `Unknown command: ${cmdName}` });
+                sendJson(ws, { type: "error", error: `Unknown command: ${cmdName}`, sessionId: sid });
               }
             }
           }
         } catch (err) {
           const errorMessage = err instanceof Error ? err.message : String(err);
           console.debug(`[WS] Error handling message: ${errorMessage}`);
-          sendJson(ws, { type: "error", error: errorMessage });
+          sendJson(ws, { type: "error", error: errorMessage, ...msg.sessionId ? { sessionId: msg.sessionId } : {} });
         }
       });
     });
@@ -24565,23 +24601,24 @@ function setupWebSocketHandler(deps) {
       terminalManager.detachAll();
       wsActiveOverrides.delete(client.commandUserId);
       const sm = client.sessionManager;
-      const sid = client.sessionId;
-      const hasActiveWork = sid && sm && (sm.isSessionRunning(sid) || sm.hasRunningSessions());
-      if (client.sessionId && hasActiveWork && sm && sid) {
-        console.debug(`[WS] Detaching active session: ${client.sessionId}`);
-        client.unsubscribeEvents?.();
-        client.unsubscribeEvents = null;
+      for (const [sid, unsubscribeLive] of client.subscriptions) {
+        unsubscribeLive();
+        if (!sm || !sm.hasActiveWorkInTree(sid) || detachedSessions.has(sid)) {
+          saveSession(client, sid);
+          continue;
+        }
+        console.debug(`[WS] Detaching active session: ${sid}`);
         const pendingEvents = [];
         const bgHandler = (_event, _state, _turnId) => {
-          bufferDetachedNotification(_event, pendingEvents);
+          bufferDetachedNotification(_event, pendingEvents, sid);
         };
         const unsubscribe = sm.registerEventListener(sid, bgHandler);
         const graceTimer = setTimeout(() => {
-          detachedSessions.delete(client.sessionId);
-          saveSession(client);
+          detachedSessions.delete(sid);
+          saveSession(client, sid);
           unsubscribe();
         }, config.timeout.sessionGrace);
-        detachedSessions.set(client.sessionId, {
+        detachedSessions.set(sid, {
           sessionManager: sm,
           sessionId: sid,
           projectId: client.projectId ?? "",
@@ -24589,15 +24626,8 @@ function setupWebSocketHandler(deps) {
           pendingEvents,
           unsubscribe
         });
-      } else {
-        client.unsubscribeEvents?.();
-        client.unsubscribeEvents = null;
-        saveSession(client);
-      }
-      for (const [sid2, saveFn] of client.backgroundSaves) {
-        saveFn();
-        client.backgroundSaves.delete(sid2);
       }
+      client.subscriptions.clear();
       watchers.detach(ws);
       console.debug(`[WS] Client disconnected (total: ${clients.size})`);
     }
@@ -24610,7 +24640,7 @@ function setupWebSocketHandler(deps) {
       const projectId = msg.projectId ?? client2.projectId;
       if (!msg.sessionId || !projectId)
         return null;
-      client2.projectId = projectId;
+      setClientProject(client2, projectId);
       const agentId = msg.agentId ?? client2.agentId;
       const projectPath = resolveProjectPath2(projectId);
       if (projectPath) {
@@ -24620,19 +24650,17 @@ function setupWebSocketHandler(deps) {
       if (!client2.sessionManager)
         return null;
       const sm = client2.sessionManager;
-      const existing = sm.getSessionById(msg.sessionId);
+      const sid = msg.sessionId;
+      const existing = sm.getSessionById(sid);
       if (!existing) {
-        client2.unsubscribeEvents?.();
-        client2.sessionId = await sm.createSession(agentId, null, "Explorer chat", void 0, msg.sessionId);
-        client2.unsubscribeEvents = sm.registerEventListener(client2.sessionId, createEventListener(client2));
-        const ctxConfig = await sm.getContextConfig(client2.sessionId);
-        sendJson(ws, { type: "state:snapshot", snapshot: { recentMessages: [], sessionId: client2.sessionId, maxContextTokens: ctxConfig.maxTokens, agentId } });
-      } else if (client2.sessionId !== msg.sessionId || !client2.unsubscribeEvents) {
-        client2.unsubscribeEvents?.();
-        client2.sessionId = msg.sessionId;
-        client2.unsubscribeEvents = sm.registerEventListener(client2.sessionId, createEventListener(client2));
-      }
-      return client2.sessionId;
+        await sm.createSession(agentId, null, "Explorer chat", void 0, sid);
+        subscribeSession(client2, sm, sid);
+        const ctxConfig = await sm.getContextConfig(sid);
+        sendJson(ws, { type: "state:snapshot", snapshot: { recentMessages: [], sessionId: sid, maxContextTokens: ctxConfig.maxTokens, agentId } });
+      } else {
+        subscribeSession(client2, sm, sid);
+      }
+      return sid;
     }
     function rememberChat(msg) {
       if (msg.clientMsgId)
@@ -24656,17 +24684,16 @@ function setupWebSocketHandler(deps) {
       const projectPath = resolveProjectPath2(msg.projectId);
       let sid = await bindOrCreateSession(client2, msg);
       if (!sid || !client2.sessionManager) {
-        sendJson(ws, { type: "error", error: "Cannot resolve project path" });
+        sendJson(ws, { type: "error", error: "Cannot resolve project path", sessionId: msg.sessionId });
         return;
       }
       const sm = client2.sessionManager;
       const goalRouted = resolveGoalRoute(sm.getDb(), sid);
       if (goalRouted !== sid) {
+        const fromSessionId = sid;
         sid = goalRouted;
-        client2.unsubscribeEvents?.();
-        client2.sessionId = sid;
-        client2.unsubscribeEvents = sm.registerEventListener(sid, createEventListener(client2));
-        sendJson(ws, { type: "session:switched", sessionId: sid });
+        subscribeSession(client2, sm, sid);
+        sendJson(ws, { type: "session:switched", sessionId: sid, fromSessionId, clientMsgId: msg.clientMsgId });
       }
       let uiMessage = msg.message;
       if (msg.images?.length && projectPath) {
@@ -24699,7 +24726,7 @@ ${msg.message}` : markers.join("\n");
         await sm.enqueueUserMessage(sid, msg.message, msg.images);
         ackChat(msg);
         const queuedText = sm.isSessionRunning(sid) ? "Context compacting, message queued \u2014 will process after the compact and the current step finish." : "Context compacting, message queued \u2014 will process after compact completes.";
-        sendJson(ws, { type: "chat:queued", reason: "compact", message: queuedText });
+        sendJson(ws, { type: "chat:queued", reason: "compact", message: queuedText, sessionId: sid });
         return;
       }
       if (sm.isSessionRunning(sid)) {
@@ -24717,67 +24744,59 @@ ${msg.message}` : markers.join("\n");
       const accessLevel = msg.accessLevel === void 0 ? void 0 : msg.accessLevel === "full" || getSandboxBackend() === null ? null : msg.accessLevel;
       sm.sendUserMessage(sid, msg.message, msg.images, accessLevel).catch((err) => {
         console.debug(`[WS] Chat error: ${err instanceof Error ? err.message : String(err)}`);
-        sendJson(ws, { type: "error", error: err instanceof Error ? err.message : String(err) });
-        saveSession(client2);
+        sendJson(ws, { type: "error", error: err instanceof Error ? err.message : String(err), sessionId: sid });
+        saveSession(client2, sid);
       });
     }
-    function handleChatStop(client2) {
-      console.debug(`[WS] Stop requested for session=${client2.sessionId}`);
+    function handleChatStop(client2, msg) {
+      const sid = frameSessionId(client2, msg);
+      console.debug(`[WS] Stop requested for session=${sid}`);
       const sm = client2.sessionManager;
-      const sid = client2.sessionId;
       if (!sm || !sid)
         return;
       if (sm.isSessionCompacting(sid) && !sm.isSessionRunning(sid)) {
         sm.cancelCompact(sid);
-        sendJson(ws, { type: "chat:stopped", sessionId: client2.sessionId });
+        sendJson(ws, { type: "chat:stopped", sessionId: sid });
         return;
       }
       sm.stopUserSession(sid);
-      sendJson(ws, { type: "chat:stopped", sessionId: client2.sessionId });
-      saveSession(client2);
+      sendJson(ws, { type: "chat:stopped", sessionId: sid });
+      saveSession(client2, sid);
     }
-    function handleChatInterrupt(client2) {
-      console.debug(`[WS] Interrupt requested for session=${client2.sessionId}`);
+    function handleChatInterrupt(client2, msg) {
+      const sid = frameSessionId(client2, msg);
+      console.debug(`[WS] Interrupt requested for session=${sid}`);
       const sm = client2.sessionManager;
-      const sid = client2.sessionId;
       if (!sm || !sid)
         return;
       if (sm.isSessionCompacting(sid) && !sm.isSessionRunning(sid)) {
         sm.cancelCompact(sid);
-        sendJson(ws, { type: "chat:stopped", sessionId: client2.sessionId });
+        sendJson(ws, { type: "chat:stopped", sessionId: sid });
         return;
       }
       sm.interruptSession(sid);
     }
     async function handleSubscribe(client2, msg) {
-      if (client2.sessionId && client2.sessionId !== msg.sessionId) {
-        saveSession(client2);
-      }
-      if (client2.sessionId) {
-        client2.unsubscribeEvents?.();
-        client2.unsubscribeEvents = null;
-        client2.sessionId = null;
-      }
-      if (msg.sessionId)
-        client2.sessionId = msg.sessionId;
       if (msg.projectId)
-        client2.projectId = msg.projectId;
-      const detached = msg.sessionId ? detachedSessions.get(msg.sessionId) : void 0;
-      if (detached && msg.sessionId) {
+        setClientProject(client2, msg.projectId);
+      const sid = msg.sessionId || null;
+      const detached = sid ? detachedSessions.get(sid) : void 0;
+      if (detached && sid) {
         clearTimeout(detached.timer);
-        detachedSessions.delete(msg.sessionId);
-        console.debug(`[WS] Reattaching detached session: ${msg.sessionId}`);
+        detachedSessions.delete(sid);
+        console.debug(`[WS] Reattaching detached session: ${sid}`);
+        if (detached.projectId)
+          setClientProject(client2, detached.projectId);
         client2.sessionManager = detached.sessionManager;
-        client2.sessionId = detached.sessionId;
-        client2.projectId = detached.projectId;
-        const state2 = getState(client2);
-        const ctxConfig = await client2.sessionManager.getContextConfig(client2.sessionId);
-        const running = client2.sessionManager.isSessionRunning(client2.sessionId);
+        const sm = detached.sessionManager;
+        const state2 = getState(client2, sid);
+        const ctxConfig = await sm.getContextConfig(sid);
+        const running = sm.isSessionRunning(sid);
         const messages3 = state2 ? running ? [...state2.messageLog] : [...createSaveSnapshot(state2)] : [];
-        const detachedSession = client2.sessionManager.getSessionById(client2.sessionId);
-        sendJson(ws, { type: "state:snapshot", snapshot: { recentMessages: messages3, sessionId: msg.sessionId, maxContextTokens: ctxConfig.maxTokens, agentId: detachedSession?.agentId, archiveCount: archiveCountFor(client2, client2.sessionId, detachedSession?.agentId), accessLevel: detachedSession?.accessLevel ?? null } });
+        const detachedSession = sm.getSessionById(sid);
+        sendJson(ws, { type: "state:snapshot", snapshot: { recentMessages: messages3, sessionId: sid, maxContextTokens: ctxConfig.maxTokens, agentId: detachedSession?.agentId, archiveCount: archiveCountFor(client2, sid, detachedSession?.agentId), accessLevel: detachedSession?.accessLevel ?? null } });
         if (state2 && state2.contextTokens > 0) {
-          sendJson(ws, { type: "chat:usage", contextTokens: state2.contextTokens, outputTokens: state2.outputTokens });
+          sendJson(ws, { type: "chat:usage", contextTokens: state2.contextTokens, outputTokens: state2.outputTokens, sessionId: sid });
         }
         while (detached.pendingEvents.length > 0) {
           const batch = detached.pendingEvents.splice(0, detached.pendingEvents.length);
@@ -24785,11 +24804,11 @@ ${msg.message}` : markers.join("\n");
             sendJson(ws, evt);
         }
         detached.unsubscribe();
-        client2.unsubscribeEvents = client2.sessionManager.registerEventListener(client2.sessionId, createEventListener(client2));
+        subscribeSession(client2, sm, sid);
         if (state2 && running) {
           console.debug(`[WS] Session still running \u2014 synthesizing in-progress state`);
           const agentName = detachedSession?.agentName ?? (state2.streamingAgent || "default");
-          const sessionId = client2.sessionId;
+          const sessionId = sid;
           sendJson(ws, { type: "chat:followup", agentName, replay: true, sessionId });
           for (const block of state2.turnContentBlocks) {
             if (block.type === "thinking") {
@@ -24812,36 +24831,28 @@ ${msg.message}` : markers.join("\n");
         client2.sessionManager = getSessionManager(subProjectPath);
         watchers.attach(ws, subProjectPath);
       }
-      if (msg.sessionId) {
-        const pendingSave = client2.backgroundSaves.get(msg.sessionId);
-        if (pendingSave) {
-          pendingSave();
-          client2.backgroundSaves.delete(msg.sessionId);
-        }
-      }
       let agentId;
       let accessLevel;
-      if (msg.sessionId && client2.sessionManager) {
-        const existingSession = client2.sessionManager.getSessionById(msg.sessionId);
+      if (sid && client2.sessionManager) {
+        const existingSession = client2.sessionManager.getSessionById(sid);
         if (existingSession) {
-          client2.sessionId = msg.sessionId;
-          client2.unsubscribeEvents = client2.sessionManager.registerEventListener(msg.sessionId, createEventListener(client2));
+          subscribeSession(client2, client2.sessionManager, sid);
           agentId = existingSession.agentId;
           accessLevel = existingSession.accessLevel ?? null;
         }
       }
       let maxContextTokens = config.model.maxContextTokens;
-      if (msg.sessionId && client2.sessionManager) {
-        const view = await client2.sessionManager.getSessionView(msg.sessionId);
+      if (sid && client2.sessionManager) {
+        const view = await client2.sessionManager.getSessionView(sid);
         if (view) {
           maxContextTokens = view.maxContextTokens;
         }
       }
-      const state = getState(client2);
+      const state = sid ? getState(client2, sid) : null;
       const messages2 = state ? [...createSaveSnapshot(state)] : [];
-      sendJson(ws, { type: "state:snapshot", snapshot: { recentMessages: messages2, sessionId: msg.sessionId, maxContextTokens, agentId, archiveCount: msg.sessionId ? archiveCountFor(client2, msg.sessionId, agentId) : 0, accessLevel } });
+      sendJson(ws, { type: "state:snapshot", snapshot: { recentMessages: messages2, sessionId: sid, maxContextTokens, agentId, archiveCount: sid ? archiveCountFor(client2, sid, agentId) : 0, accessLevel } });
       if (state && state.contextTokens > 0) {
-        sendJson(ws, { type: "chat:usage", contextTokens: state.contextTokens, outputTokens: state.outputTokens });
+        sendJson(ws, { type: "chat:usage", contextTokens: state.contextTokens, outputTokens: state.outputTokens, sessionId: sid });
       }
     }
     function handleTerminalStart(client2, msg) {
@@ -33015,7 +33026,7 @@ var init_dist2 = __esm({
     init_git_ssh();
     __dirname3 = path72.dirname(fileURLToPath3(import.meta.url));
     PORT = config.server.port;
-    HALO_VERSION = "1.5.2-alpha";
+    HALO_VERSION = "1.5.4";
     PROJECT_ROOT = findProjectRoot();
     HALO_HOME4 = path72.join(homedir24(), ".halo");
     GIT_SHA = readGitSha();
@@ -33946,7 +33957,7 @@ import path73 from "node:path";
 import fs67 from "node:fs";
 import { homedir as homedir25 } from "node:os";
 import { parseArgs as parseArgs2 } from "node:util";
-var VERSION = "1.5.2-alpha";
+var VERSION = "1.5.4";
 var HELP_TOP = `Usage: halo <command> [options]
 
 Commands: