mixdog 0.9.152 → 0.9.154

package/src/session-runtime/lifecycle-api.mjs

@@ -1,6 +1,10 @@
 import { cancelBackgroundTasks } from '../runtime/shared/background-tasks.mjs';
 import { hasUserConversationMessage } from '../runtime/agent/orchestrator/session/manager/prompt-utils.mjs';
 import { isAgentOwner } from '../runtime/agent/orchestrator/agent-owner.mjs';
+import {
+  isAgentOnlySession,
+  isRootLeadSession,
+} from '../runtime/agent/orchestrator/session/store-summary-visibility.mjs';
 import { writeStatuslineRoute } from './statusline-route.mjs';
 import {
   sessionMessageText,
@@ -16,6 +20,7 @@ import {
   listSessionHeartbeatMtimes,
 } from '../runtime/agent/orchestrator/session/store/paths-heartbeat.mjs';
 import { SessionClosedError } from '../runtime/agent/orchestrator/session/manager/session-errors.mjs';
+import { releaseComputerSession } from '../runtime/computer-bridge/client.mjs';
 import { saveSession } from '../runtime/agent/orchestrator/session/store.mjs';
 
 export function resolveResumeCwd(session, currentCwd) {
@@ -100,8 +105,14 @@ export function createLifecycleApi(deps) {
     return mgr.listSessions({
       refreshFromStorage: options?.refreshFromStorage === true,
     }).map(s => {
+    // Durable visibility is the catalog boundary. Apply it before the legacy
+    // lead-shape heuristics so an explicitly agent-only child cannot leak just
+    // because its owner field looks ordinary.
+    if (isAgentOnlySession(s)) return null;
     const owner = clean(s.owner || 'user').toLowerCase();
-    if (owner && !['cli', 'user', 'mixdog'].includes(owner)) return null;
+    // A root Lead can carry Agent ownership plus a self-link after recovery;
+    // it remains an ordinary resumable session, not a child dispatch.
+    if (!isRootLeadSession(s) && owner && !['cli', 'user', 'mixdog'].includes(owner)) return null;
     const sourceType = clean(s.sourceType || '').toLowerCase();
     const sourceName = clean(s.sourceName || '').toLowerCase();
     const agent = clean(s.agent || '').toLowerCase();
@@ -192,6 +203,17 @@ export function createLifecycleApi(deps) {
     } catch { /* best-effort: memory ingest must never break lifecycle paths */ }
   }
   return {
+    /** Plant the ordinary manager/store tombstone barrier for a canonical
+     *  child session without running whole-process teardown. */
+    closeCanonicalSession(reason = 'canonical-session-close') {
+      const session = getSession?.();
+      if (!session?.id || session.remoteAttached === true) return false;
+      const closed = mgr.closeSession(session.id, reason, { tombstone: true }) === true;
+      if (!closed) return false;
+      setSession?.(null);
+      invalidateContextStatusCache?.();
+      return true;
+    },
     async close(reason = 'cli-exit', options = {}) {
       const detach = options?.detach === true || options?.wait === false || options?.waitForExit === false;
       // Desktop multi-engine hosts dispose idle engines while other sessions
@@ -365,11 +387,18 @@ export function createLifecycleApi(deps) {
           .then(() => closeNativeToolTransports?.(reason))
           .catch(() => {})
         : null;
+      // Computer Use pins a host-side worker plus window claims for the closing
+      // session, and the runtime's deferred release timer is unref'd. A real
+      // teardown releases them here; a keepBackgroundWork eviction leaves the
+      // lease to that timer so a re-materialized session keeps its refs.
+      const computerStop = teardownReapsWork && closingSessionId
+        ? Promise.resolve(releaseComputerSession(closingSessionId)).catch(() => false)
+        : null;
       if (detach) {
         try { await withTeardownDeadline(channelStop, 300, false); } catch {}
         try { await withTeardownDeadline(shellJobsStop, 300, false); } catch {}
         try { await withTeardownDeadline(memoryStop, 1500, false); } catch {}
-        for (const stop of [mcpStop, openaiWsStop, patchStop, nativeToolStop]) {
+        for (const stop of [mcpStop, openaiWsStop, patchStop, nativeToolStop, computerStop]) {
           Promise.resolve(stop).catch(() => {});
         }
         onProcessExit();
@@ -383,6 +412,7 @@ export function createLifecycleApi(deps) {
         withTeardownDeadline(memoryStop, 5500, false),
         withTeardownDeadline(shellJobsStop, 1500, false),
         withTeardownDeadline(nativeToolStop, 1500, false),
+        withTeardownDeadline(computerStop, 1500, false),
       ]);
       onProcessExit();
       return ok;
@@ -573,6 +603,23 @@ export function createLifecycleApi(deps) {
         },
       );
       setRoute(resumedRoute);
+      // resumeSession refreshes only the bootstrap/base bundle. Reapply the
+      // persisted deferred selection synchronously with current definitions
+      // before this resume becomes observable; waiting for asynchronous route
+      // preparation temporarily dropped loaded tools and invalidated the
+      // provider-aligned context baseline.
+      const restoreResumedToolSurface = (target, targetRoute) => {
+        applyDeferredToolSurface(
+          target,
+          deferredSurfaceModeForLead(getMode()),
+          getStandaloneTools(),
+          {
+            provider: targetRoute.provider,
+            model: targetRoute.model,
+          },
+        );
+      };
+      restoreResumedToolSurface(resumed, resumedRoute);
       const finishRoutePreparation = async () => {
         const preparedRoute = await refreshRouteEffort(null, resumedRoute);
         // Session or route changed while provider metadata was loading.
@@ -581,12 +628,7 @@ export function createLifecycleApi(deps) {
         activeSession.effort = getRoute().effectiveEffort || null;
         activeSession.fast = getRoute().fast === true;
         activeSession.cwd = getCurrentCwd();
-        applyDeferredToolSurface(
-          activeSession,
-          deferredSurfaceModeForLead(getMode()),
-          getStandaloneTools(),
-          { provider: getRoute().provider },
-        );
+        restoreResumedToolSurface(activeSession, getRoute());
         writeStatuslineRoute(statusRoutes, activeSession, getRoute());
         return true;
       };

package/src/session-runtime/provider-request-snapshot.mjs

@@ -1,5 +1,5 @@
 // Provider request-tool resolution + JSON-safe snapshot machinery, extracted from tool-catalog.mjs.
-import { clean, LATE_TOOL_ANNOUNCEMENT_SENTINEL } from './session-text.mjs';
+import { clean } from './session-text.mjs';
 import { estimateToolSchemaTokens, toolSchemaSignature } from '../runtime/agent/orchestrator/session/context-utils.mjs';
 import {
   applyInitialDeferredToolManifestToBp2,
@@ -50,7 +50,15 @@ export function resolveProviderRequestTools({
   }
   if (discovered.size === 0) return activeTools;
   const activeNames = new Set(activeTools.map((tool) => clean(tool?.name)).filter(Boolean));
-  const catalog = Array.isArray(session?.deferredToolCatalog) ? session.deferredToolCatalog : [];
+  const catalogByName = new Map();
+  for (const tool of [
+    ...(Array.isArray(session?.deferredToolCatalog) ? session.deferredToolCatalog : []),
+    ...(Array.isArray(session?.deferredLateToolCatalog) ? session.deferredLateToolCatalog : []),
+  ]) {
+    const name = clean(tool?.name);
+    if (name) catalogByName.set(name, tool);
+  }
+  const catalog = [...catalogByName.values()];
   const deferredTools = catalog
     .filter((tool) => {
       const name = clean(tool?.name);
@@ -306,15 +314,31 @@ export function snapshotProviderRequestTools(options = {}) {
     || names.size === 0) {
     return finish();
   }
-  // Anthropic tools precede every cache_control breakpoint. Adding a schema
-  // after tool_search therefore invalidates the whole provider cache prefix.
-  // Send the complete defer_loading catalog from the first request instead;
-  // tool_search controls callability, not provider-visible schema membership.
+  const discovered = new Set(
+    parseToolSelection(session?.deferredDiscoveredTools),
+  );
+  for (const message of Array.isArray(messages) ? messages : []) {
+    const native = message?.nativeToolSearch;
+    const source = clean(native?.provider).toLowerCase();
+    if (source && source !== normalizedProvider
+      && !(ANTHROPIC_NATIVE_PROVIDERS.has(source)
+        && ANTHROPIC_NATIVE_PROVIDERS.has(normalizedProvider))) continue;
+    for (const name of parseToolSelection(native?.toolReferences)) discovered.add(name);
+  }
+  if (discovered.size === 0) return finish();
+  // Claude-compatible deferred loading: the catalog stays metadata-only until
+  // tool_search/load_tool selects a name. Only selected schemas join the next
+  // request, marked defer_loading; active schemas continue to win by name.
   const seenCatalogRefs = new WeakSet();
-  const catalog = [
+  const catalogByName = new Map();
+  for (const tool of [
     ...(Array.isArray(session?.deferredToolCatalog) ? session.deferredToolCatalog : []),
     ...(Array.isArray(session?.deferredLateToolCatalog) ? session.deferredLateToolCatalog : []),
-  ];
+  ]) {
+    const name = clean(tool?.name);
+    if (name) catalogByName.set(name, tool);
+  }
+  const catalog = [...catalogByName.values()];
   for (const tool of catalog) {
     if (tool && typeof tool === 'object') {
       if (activeCandidateRefs.has(tool) || seenCatalogRefs.has(tool)) continue;
@@ -322,7 +346,7 @@ export function snapshotProviderRequestTools(options = {}) {
     }
     const capturedName = tool?.name;
     const selectionName = typeof capturedName === 'string' ? clean(capturedName) : '';
-    if (!selectionName || names.has(selectionName)) continue;
+    if (!selectionName || !discovered.has(selectionName) || names.has(selectionName)) continue;
     appendSnapshot(tool, capturedName, true);
   }
   return finish();

package/src/session-runtime/resource-api.mjs

@@ -5,7 +5,6 @@ import {
   toolResponseText,
   isEmptyRecallText,
   currentSessionRecallRows,
-  tombstoneOnClose,
 } from './session-text.mjs';
 import {
   publishGlobalExtensionChange,
@@ -31,41 +30,30 @@ import {
 // and the runtime injects live state getters plus the closure callbacks.
 export function createResourceApi(deps) {
   const {
-    getConfig, getSession, getCurrentCwd,
-    cfgMod, mgr, hooks, STANDALONE_DATA_DIR,
+    getConfig, getCurrentCwd,
+    cfgMod, hooks, STANDALONE_DATA_DIR,
     saveConfigAndAdopt, connectConfiguredMcp, invalidatePreSessionToolSurface,
-    recreateCurrentSessionIfReady, normalizeMcpServerInput, mcpStatus, getMcpServerConfig,
+    refreshEmptySessionToolPolicy, normalizeMcpServerInput, mcpStatus, getMcpServerConfig,
     skillsStatus, skillContent, addGlobalSkill, saveSkillDocument, invalidateSkills,
     getDisabledSkills, setDisabledSkills, pluginsStatus, getMemoryModule,
-    reloadFullConfig, flushSkillsSave, awaitKeychainPrewarm, getActiveTurnCount,
+    reloadFullConfig, flushSkillsSave, awaitKeychainPrewarm,
   } = deps;
   // Per-server MCP toggle serialization. The synchronous config adopt in
   // setMcpServerEnabled has already made the intent durable; the heavy
-  // connectConfiguredMcp (process spawn/handshake) + session close/recreate
-  // run here off the toggle's critical path. Rapid re-toggles on one server
+  // connectConfiguredMcp process spawn/handshake runs here off the toggle's
+  // critical path. Rapid re-toggles on one server
   // update `desired` and ride the in-flight chain so it converges to the last
-  // requested state, closing/recreating the session only once at the end.
+  // requested state without replacing any addressed session.
   const mcpToggleChains = new Map(); // name -> { desired, running }
-  let globalRefreshTimer = null;
-  function applyGlobalExtensionRecreate(kind) {
-    if (typeof getActiveTurnCount === 'function' && getActiveTurnCount() > 0) {
-      if (!globalRefreshTimer) {
-        globalRefreshTimer = setTimeout(() => {
-          globalRefreshTimer = null;
-          applyGlobalExtensionRecreate(kind);
-        }, 250);
-        globalRefreshTimer.unref?.();
-      }
-      return;
-    }
+  async function refreshGlobalExtensionSurface(kind) {
     invalidatePreSessionToolSurface();
-    const session = getSession();
-    if (session?.id) {
-      mgr.closeSession(session.id, `global-${kind}-refresh`, { tombstone: tombstoneOnClose(session) });
+    // Existing conversations retain their stable prompt/session identity.
+    // Empty sessions can safely rebuild their policy in place; MCP has its own
+    // first-turn/late-tool reconciliation against the live connection registry.
+    if ((kind === 'skills' || kind === 'plugins')
+      && typeof refreshEmptySessionToolPolicy === 'function') {
+      await refreshEmptySessionToolPolicy();
     }
-    void recreateCurrentSessionIfReady().catch((err) => {
-      process.stderr.write(`[extensions] session recreate failed: ${err?.message || err}\n`);
-    });
   }
   async function refreshGlobalExtensionState(kind) {
     reloadFullConfig?.();
@@ -73,30 +61,12 @@ export function createResourceApi(deps) {
     if (kind === 'mcp' || kind === 'plugins') {
       await connectConfiguredMcp({ reset: true });
     }
-    applyGlobalExtensionRecreate(kind);
+    await refreshGlobalExtensionSurface(kind);
   }
   const globalExtensionSubscription = subscribeGlobalExtensionChanges(refreshGlobalExtensionState);
   const publishGlobalChange = (kind) => (
     publishGlobalExtensionChange(kind, globalExtensionSubscription.id)
   );
-  // Close/recreate the live session only at a turn boundary: a background
-  // toggle must never abort an in-flight turn. If a turn is active, poll until
-  // it ends, then swap the session so it picks up the new tool surface.
-  function applyMcpToggleRecreate(serverName) {
-    if (typeof getActiveTurnCount === 'function' && getActiveTurnCount() > 0) {
-      const timer = setTimeout(() => applyMcpToggleRecreate(serverName), 250);
-      timer.unref?.();
-      return;
-    }
-    invalidatePreSessionToolSurface();
-    const session = getSession();
-    if (session?.id) mgr.closeSession(session.id, 'cli-mcp-toggle', { tombstone: tombstoneOnClose(session) });
-    // Recreate off the critical path (see removeMcpServer notes): the next
-    // on-demand createCurrentSession dedupes onto this in-flight create.
-    void recreateCurrentSessionIfReady().catch((err) => {
-      process.stderr.write(`[mcp] session recreate after toggle failed: ${err?.message || err}\n`);
-    });
-  }
   function scheduleMcpToggle(serverName, enabled) {
     const chain = mcpToggleChains.get(serverName) || { desired: enabled, running: null };
     chain.desired = enabled;
@@ -110,8 +80,7 @@ export function createResourceApi(deps) {
             want = chain.desired;
             status = await connectConfiguredMcp({ only: serverName, enabled: want });
           } while (chain.desired !== want);
-          // Turn-safe: defers until any active turn ends (never aborts it).
-          applyMcpToggleRecreate(serverName);
+          await refreshGlobalExtensionSurface('mcp');
         } finally {
           chain.running = null;
         }
@@ -149,10 +118,7 @@ export function createResourceApi(deps) {
       await awaitKeychainPrewarm();
       reloadFullConfig();
       const status = await connectConfiguredMcp({ reset: true });
-      invalidatePreSessionToolSurface();
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-mcp-reconnect', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      await refreshGlobalExtensionSurface('mcp');
       await publishGlobalChange('mcp');
       return status;
     },
@@ -166,10 +132,7 @@ export function createResourceApi(deps) {
       };
       saveConfigAndAdopt(nextConfig);
       const status = await connectConfiguredMcp({ reset: true });
-      invalidatePreSessionToolSurface();
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-mcp-add', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      await refreshGlobalExtensionSurface('mcp');
       await publishGlobalChange('mcp');
       return { name, status };
     },
@@ -197,10 +160,7 @@ export function createResourceApi(deps) {
       nextConfig.mcpServers = servers;
       saveConfigAndAdopt(nextConfig);
       const status = await connectConfiguredMcp({ reset: true });
-      invalidatePreSessionToolSurface();
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-mcp-save', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      await refreshGlobalExtensionSurface('mcp');
       await publishGlobalChange('mcp');
       return { name, source: 'config', status };
     },
@@ -218,10 +178,7 @@ export function createResourceApi(deps) {
       delete nextConfig.mcpProjectOverrides;
       saveConfigAndAdopt({ ...nextConfig, mcpServers: current });
       const status = await connectConfiguredMcp({ reset: true });
-      invalidatePreSessionToolSurface();
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-mcp-remove', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      await refreshGlobalExtensionSurface('mcp');
       await publishGlobalChange('mcp');
       return status;
     },
@@ -255,9 +212,7 @@ export function createResourceApi(deps) {
     async addSkill(input = {}) {
       const skill = addGlobalSkill(input);
       invalidateSkills?.();
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-skill-add', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      await refreshGlobalExtensionSurface('skills');
       await publishGlobalChange('skills');
       return { skill, status: skillsStatus() };
     },
@@ -271,9 +226,7 @@ export function createResourceApi(deps) {
           flushSkillsSave?.();
         }
       }
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-skill-save', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      await refreshGlobalExtensionSurface('skills');
       await publishGlobalChange('skills');
       return { skill, status: skillsStatus() };
     },
@@ -281,15 +234,13 @@ export function createResourceApi(deps) {
       const result = setDisabledSkills?.(names);
       flushSkillsSave?.();
       invalidateSkills?.();
-      applyGlobalExtensionRecreate('skills');
+      await refreshGlobalExtensionSurface('skills');
       await publishGlobalChange('skills');
       return result;
     },
     async reloadSkills() {
       invalidateSkills?.();
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-skills-reload', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      await refreshGlobalExtensionSurface('skills');
       await publishGlobalChange('skills');
       return skillsStatus();
     },
@@ -297,9 +248,8 @@ export function createResourceApi(deps) {
       return pluginsStatus();
     },
     async reloadPlugins() {
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-plugins-reload', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      invalidateSkills?.();
+      await refreshGlobalExtensionSurface('plugins');
       await publishGlobalChange('plugins');
       return pluginsStatus();
     },
@@ -307,9 +257,7 @@ export function createResourceApi(deps) {
       const dataDir = cfgMod.getPluginData?.();
       const plugin = registryAddPlugin(source, { dataDir });
       invalidateSkills?.();
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-plugin-add', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      await refreshGlobalExtensionSurface('plugins');
       await publishGlobalChange('plugins');
       return { plugin, status: pluginsStatus() };
     },
@@ -318,9 +266,7 @@ export function createResourceApi(deps) {
       const dataDir = cfgMod.getPluginData?.();
       const updated = registryUpdatePlugin(key, { dataDir });
       invalidateSkills?.();
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-plugin-update', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      await refreshGlobalExtensionSurface('plugins');
       await publishGlobalChange('plugins');
       return { plugin: updated, status: pluginsStatus() };
     },
@@ -353,9 +299,7 @@ export function createResourceApi(deps) {
         invalidatePreSessionToolSurface();
       }
       invalidateSkills?.();
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-plugin-toggle', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      await refreshGlobalExtensionSurface('plugins');
       await publishGlobalChange('plugins');
       return { plugin: updated, status: pluginsStatus() };
     },
@@ -379,9 +323,7 @@ export function createResourceApi(deps) {
         invalidatePreSessionToolSurface();
       }
       invalidateSkills?.();
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-plugin-remove', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      await refreshGlobalExtensionSurface('plugins');
       await publishGlobalChange('plugins');
       return { plugin: removed, status: pluginsStatus() };
     },
@@ -435,16 +377,11 @@ export function createResourceApi(deps) {
       }
       saveConfigAndAdopt(nextConfig);
       const status = await connectConfiguredMcp({ reset: true });
-      invalidatePreSessionToolSurface();
-      const session = getSession();
-      if (session?.id) mgr.closeSession(session.id, 'cli-plugin-mcp-enable', { tombstone: tombstoneOnClose(session) });
-      await recreateCurrentSessionIfReady();
+      await refreshGlobalExtensionSurface('mcp');
       await publishGlobalChange('mcp');
       return { serverName, status };
     },
     disposeGlobalExtensionSubscription() {
-      if (globalRefreshTimer) clearTimeout(globalRefreshTimer);
-      globalRefreshTimer = null;
       globalExtensionSubscription.unsubscribe();
     },
     hooksStatus() {