mixdog 0.9.173 → 0.9.174

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

@@ -119,10 +119,8 @@ export function createSessionLifecycle(deps) {
     isCloseRequested: () => rt.closeRequested,
     getActiveTurnCount: () => rt.activeTurnCount,
     getSessionCreatePromise: () => rt.sessionCreatePromise,
-    getSession: () => rt.session,
     hasActiveAutomation,
     getCodeGraphModule,
-    createCurrentSession,
     channels,
     envFlag,
     delays: {

package/src/session-runtime/session-route-policy.mjs

@@ -1,7 +1,8 @@
 import { SUMMARY_PREFIX } from '../runtime/agent/orchestrator/session/compact.mjs';
 import { hasUserConversationMessage } from '../runtime/agent/orchestrator/session/manager/prompt-utils.mjs';
 
-function hasRouteHistoryMessage(messages) {
+/** A real user exchange, or the summary anchor a compaction left behind. */
+export function hasRouteHistoryMessage(messages) {
   const list = Array.isArray(messages) ? messages : [];
   return (
     hasUserConversationMessage(list) ||

package/src/session-runtime/session-text.mjs

@@ -89,11 +89,12 @@ export function cleanSessionPreview(text, max = 160) {
     .slice(0, limit);
 }
 
-// Stable sentinel carried in every late-tool (deferred MCP) announcement
-// reminder — must stay byte-identical to LATE_TOOL_REMINDER_SENTINEL in
-// src/session-runtime/tool-catalog.mjs. Detection keys on this exact string
-// (never fuzzy matching) so the raw announcement block can be hidden from
-// user-facing surfaces while the model context stays untouched.
+// Stable sentinel carried in late-tool (deferred MCP) announcement reminders.
+// Nothing in this repository emits it any more (late tools now travel as a
+// deferred_tools_delta), but stored transcripts may still hold such blocks.
+// Detection keys on this exact string (never fuzzy matching) so the raw
+// announcement block stays hidden from user-facing surfaces while the model
+// context stays untouched.
 const LATE_TOOL_ANNOUNCEMENT_SENTINEL = 'connected after this session started';
 
 export function isLateToolAnnouncement(text) {

package/src/session-runtime/session-title.mjs

@@ -85,6 +85,10 @@ function greetingTitle(source) {
   return '';
 }
 
+function errorText(error) {
+  return error instanceof Error ? error.stack || error.message : String(error);
+}
+
 function resolvedSystemLocale() {
   try {
     return Intl.DateTimeFormat().resolvedOptions().locale || '';
@@ -195,9 +199,7 @@ export function createSessionTitleController(deps = {}) {
       // Release the one-shot marker: a timed-out/failed generation may retry
       // on the next trigger (next completed turn for stage three).
       attempts?.delete(sessionId);
-      log(
-        `failed id=${sessionId} stage=${stage} error=${error instanceof Error ? error.stack || error.message : String(error)}`
-      );
+      log(`failed id=${sessionId} stage=${stage} error=${errorText(error)}`);
     });
   };
 
@@ -224,9 +226,7 @@ export function createSessionTitleController(deps = {}) {
       log(`generated id=${sessionId} stage=first title=${JSON.stringify(greeting)} deterministic=greeting`);
       void promote(sessionId, greeting, 'first').catch((error) => {
         firstAttempts.delete(sessionId);
-        log(
-          `failed id=${sessionId} stage=first error=${error instanceof Error ? error.stack || error.message : String(error)}`
-        );
+        log(`failed id=${sessionId} stage=first error=${errorText(error)}`);
       });
       return true;
     }

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

@@ -5,15 +5,16 @@
 // `this.*` resolve against the spread target, so cross-member calls (e.g.
 // setProfile -> this.getProfile) keep working when spread into the facade.
 //
-// The members live in four topic modules: profile/onboarding/skills,
-// compaction/auto-clear, built-in tool modules, and system (channels, shell,
-// updates); the local provider's own methods come from
+// The members live in five topic modules: profile/onboarding/skills,
+// compaction/auto-clear, built-in tool modules, system (channels, shell,
+// updates) and developer options; the local provider's own methods come from
 // local-provider-settings.mjs.
 import { createLocalProviderSettings } from './local-provider-settings.mjs';
 import { createProfileSettings } from './settings-profile-api.mjs';
 import { createCompactionSettings } from './settings-compaction-api.mjs';
 import { createBuiltinToolSettings } from './settings-builtin-tools-api.mjs';
 import { createSystemSettings } from './settings-system-api.mjs';
+import { createDeveloperSettings } from './settings-developer-api.mjs';
 
 export function createSettingsApi(deps) {
   // Optional: callers without a live local provider / gate fall back to the
@@ -35,5 +36,6 @@ export function createSettingsApi(deps) {
     ...createCompactionSettings(shared),
     ...createBuiltinToolSettings(shared, localSettings),
     ...createSystemSettings(shared),
+    ...createDeveloperSettings(shared),
   };
 }

package/src/session-runtime/settings-developer-api.mjs

@@ -0,0 +1,22 @@
+// Settings → Developer: the data-driven developer options
+// (runtime/shared/developer-options.mjs). Values persist at agent config
+// `developer.<optionId>`.
+import { developerOption, developerSettingsView } from '../runtime/shared/developer-options.mjs';
+
+export function createDeveloperSettings({ getConfig, saveConfigAndAdopt, syncDeveloperOption }) {
+  return {
+    getDeveloperSettings() {
+      // In-memory adopted config: current even while its debounced save is pending.
+      return developerSettingsView(getConfig()?.developer);
+    },
+    async setDeveloperOption(id, enabled) {
+      if (!developerOption(id)) throw new TypeError(`Unknown developer option "${id}".`);
+      if (typeof enabled !== 'boolean') throw new TypeError('Developer option value must be a boolean.');
+      const config = getConfig() || {};
+      saveConfigAndAdopt({ ...config, developer: { ...(config.developer || {}), [id]: enabled } });
+      // Flushes the save and applies live effects (e.g. the provider registry).
+      await syncDeveloperOption?.(id);
+      return this.getDeveloperSettings();
+    },
+  };
+}

package/src/session-runtime/setup-tool/executor.mjs

@@ -7,7 +7,7 @@ import { builtinFeatureActive, builtinFirstUseApproval } from '../builtin-featur
 import { ORCHESTRATION_MODES } from '../../runtime/shared/orchestration.mjs';
 import { SETUP_DESKTOP_DOMAINS, SETUP_HANDOFFS } from './settings-contract.mjs';
 import { executeExtendedSetupAction, publicAutomation, validateMcpInput } from './extended-actions.mjs';
-import { createSetupUiRequests } from './ui-requests.mjs';
+import { SETUP_DESKTOP_UNCLAIMED, createSetupUiRequests } from './ui-requests.mjs';
 import {
   SETUP_ACTIONS,
   SETUP_ACTION_FIELDS,
@@ -17,8 +17,8 @@ import {
   SETUP_BUILTIN_TOGGLE_FEATURES,
 } from './tool-defs.mjs';
 import { schemaValueError } from '../../runtime/shared/schema-value-error.mjs';
+import { clean } from '../session-text.mjs';
 
-const clean = (value) => String(value ?? '').trim();
 const ACTION_APPLIES_TO = {
   set_recap_enabled: 'background Memory cycles; no restart required',
   set_auto_update: 'subsequent automatic update checks',
@@ -165,8 +165,6 @@ async function automationStatus(rt, { domain }) {
   };
 }
 
-// status readers per non-desktop domain: (rt, { domain, getConfig }) → the
-// public status shape. Desktop-hosted domains never reach this table.
 function featureFlags(rt) {
   return Object.fromEntries(
     Object.entries(rt.getToolModuleSettings?.() || {}).map(([name, settings]) => [
@@ -176,6 +174,8 @@ function featureFlags(rt) {
   );
 }
 
+// status readers per non-desktop domain: (rt, { domain, getConfig }) → the
+// public status shape. Desktop-hosted domains never reach this table.
 const SETUP_STATUS_READERS = {
   capabilities: () => ({
     actions: SETUP_ACTION_FIELDS,
@@ -288,6 +288,10 @@ function mcpServerInput(args) {
 }
 
 const DESKTOP_HOSTED_FEATURES = ['browser', 'computer', 'voice'];
+// Git and Office installs bring their system dependency (Git, LibreOffice) in
+// through the Desktop's guided installers, the same steps as the Built-in card.
+// A request no Desktop window takes keeps the runtime-only install.
+const DESKTOP_PREPARED_FEATURES = ['git', 'office'];
 const SETUP_INSTALLABLE_FEATURES = ['git', 'memory', 'office', 'tidy', 'localProvider', 'browser', 'computer', 'voice'];
 
 // Action handlers: (rt, args, { requestDesktop, readStatus, openSurface }).
@@ -363,9 +367,16 @@ const SETUP_ACTION_HANDLERS = {
     const name = requireEnum(args.name, ['browser', 'computer'], 'name');
     return rt.setBridgeFirstUseApproval(name, requireBoolean(args.enabled));
   },
-  install_builtin: (rt, args, { requestDesktop }) => {
+  install_builtin: async (rt, args, { requestDesktop }) => {
     const name = requireEnum(args.name, SETUP_INSTALLABLE_FEATURES, 'name');
     if (DESKTOP_HOSTED_FEATURES.includes(name)) return requestDesktop(args);
+    if (DESKTOP_PREPARED_FEATURES.includes(name)) {
+      try {
+        return await requestDesktop(args);
+      } catch (error) {
+        if (error?.code !== SETUP_DESKTOP_UNCLAIMED) throw error;
+      }
+    }
     return rt.installBuiltinFeature(name);
   },
   install_local_model: async (rt, args) =>

package/src/session-runtime/setup-tool/ui-requests.mjs

@@ -1,5 +1,15 @@
 import { randomUUID } from 'node:crypto';
 
+/** Error code of a request no Desktop window took: nothing ran, so a caller
+ *  with a runtime-only route may still take it. */
+export const SETUP_DESKTOP_UNCLAIMED = 'SETUP_DESKTOP_UNCLAIMED';
+
+function unclaimed(message) {
+  const error = new Error(message);
+  error.code = SETUP_DESKTOP_UNCLAIMED;
+  return error;
+}
+
 /** One addressed request, one desktop claimant, one receipt. Snapshot replay
  * carries only an id; it cannot replay a mutation after expiry or completion. */
 export function createSetupUiRequests({
@@ -15,7 +25,7 @@ export function createSetupUiRequests({
     pending.delete(id);
     clearTimeout(entry.timer);
     entry.signal?.removeEventListener('abort', entry.abort);
-    if (error) entry.reject(new Error(error));
+    if (error) entry.reject(error instanceof Error ? error : new Error(error));
     else entry.resolve(result);
     return true;
   }
@@ -23,7 +33,7 @@ export function createSetupUiRequests({
     if (signal?.aborted) return Promise.reject(new Error('setup: cancelled before Desktop execution'));
     const sessionId = String(getSessionId?.() || '');
     if (!sessionId)
-      return Promise.reject(new Error('setup: open this conversation in Desktop to change desktop-host settings'));
+      return Promise.reject(unclaimed('setup: open this conversation in Desktop to change desktop-host settings'));
     const id = randomUUID();
     return new Promise((resolve, reject) => {
       const entry = {
@@ -36,14 +46,14 @@ export function createSetupUiRequests({
         abort: () => finish(id, 'setup: cancelled. If Desktop already started, inspect its state before retrying.'),
         expiresAt: Date.now() + claimTimeoutMs,
         timer: setTimeout(
-          () => finish(id, 'setup: no Desktop window claimed the request; nothing was changed'),
+          () => finish(id, unclaimed('setup: no Desktop window claimed the request; nothing was changed')),
           claimTimeoutMs
         ),
       };
       pending.set(id, entry);
       signal?.addEventListener('abort', entry.abort, { once: true });
       if (notifySessionUi?.(sessionId, 'Desktop settings request', { kind: 'setup-ui', id }) !== true) {
-        finish(id, 'setup: no attached Desktop surface; nothing was changed');
+        finish(id, unclaimed('setup: no attached Desktop surface; nothing was changed'));
       }
     });
   }

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

@@ -85,7 +85,7 @@ export function createSkillsApi({ contextMod, getCwd, getTools = () => [] }) {
     const missingFeature =
       typeof contextMod.skillMissingFeature === 'function' ? contextMod.skillMissingFeature(skillName) : null;
     if (missingFeature) {
-      return `Error: skill "${skillName}" needs the ${missingFeature} built-in feature, which is not installed or is switched off in Settings → Built-in`;
+      return `Error: skill "${skillName}" needs the ${missingFeature} built-in feature, which is not installed or is switched off in Extensions → Plugin → Built-in`;
     }
     if (typeof contextMod.isSkillDisabled === 'function' && contextMod.isSkillDisabled(skillName)) {
       return `Error: skill "${skillName}" is disabled`;
@@ -116,7 +116,7 @@ export function createSkillsApi({ contextMod, getCwd, getTools = () => [] }) {
     mkdirSync(dir, { recursive: true });
     writeFileSync(filePath, createSkillDocument({ name, description, whenToUse, body }), 'utf8');
     if (dependencies !== undefined) saveSkillToolDependencies(filePath, dependencies);
-    contextMod.invalidateSkillsCache?.(getCwd());
+    invalidateSkills();
     return { name, filePath };
   }
 
@@ -132,7 +132,7 @@ export function createSkillsApi({ contextMod, getCwd, getTools = () => [] }) {
     if (input.dependenciesOnly === true) {
       if (dependencies === undefined) throw new Error('Skill tool dependencies are required.');
       saveSkillToolDependencies(resource.filePath, dependencies);
-      contextMod.invalidateSkillsCache?.(getCwd());
+      invalidateSkills();
       return { originalName, name: originalName, filePath: resource.filePath };
     }
     const name = validateSkillName(input.name);
@@ -166,7 +166,7 @@ export function createSkillsApi({ contextMod, getCwd, getTools = () => [] }) {
       body.trim() === parsed.body.trim()
     ) {
       if (dependencies !== undefined) saveSkillToolDependencies(resource.filePath, dependencies);
-      contextMod.invalidateSkillsCache?.(getCwd());
+      invalidateSkills();
       return { originalName, name, filePath: resource.filePath };
     }
     const updated = updateSkillDocument(source, { name, description, whenToUse, body });
@@ -187,7 +187,7 @@ export function createSkillsApi({ contextMod, getCwd, getTools = () => [] }) {
     else if (filePath !== resource.filePath && resource.dependencySource === 'override') {
       saveSkillToolDependencies(filePath, resource.toolDependencies || []);
     }
-    contextMod.invalidateSkillsCache?.(getCwd());
+    invalidateSkills();
     return { originalName, name, filePath };
   }
 

package/src/session-runtime/tool-catalog-data.mjs

@@ -65,8 +65,9 @@ export const DEFERRED_DEFAULT_LEAD_TOOLS = Object.freeze([
   'code_graph',
   'read',
   // cwd / web_fetch demoted to the deferred manifest 2026-08:
-  // 0 / 10 calls in a 3-day 7.6k-call trace window; they auto-load on
-  // first direct call.
+  // 0 / 10 calls in a 3-day 7.6k-call trace window. The model loads them
+  // with load_tool; a direct call anyway is absorbed by the runtime
+  // call-through (deferred-call-through.mjs) as a safety net.
   'edit',
   'apply_patch',
   'git',
@@ -87,7 +88,7 @@ export const READONLY_TOOL_NAMES = new Set([
   'web_search',
   'web_fetch',
   'recall',
-  'memory',
+  // memory is not listed: it adds, edits and deletes standing memories.
   'Skill',
 ]);
 

package/src/session-runtime/tool-catalog.mjs

@@ -49,6 +49,29 @@ export {
   MEASURED_TOOL_USAGE,
 } from './tool-catalog-data.mjs';
 
+// Provider modes whose whole catalog is the active surface (no deferred pool).
+const FIXED_SURFACE_MODES = new Set(['full', 'manifest', 'canonical']);
+
+function isMcpToolName(name) {
+  return typeof name === 'string' && name.startsWith('mcp__');
+}
+
+function toolParameters(tool) {
+  if (tool?.inputSchema && typeof tool.inputSchema === 'object') return tool.inputSchema;
+  return { type: 'object', properties: {} };
+}
+
+// The rendered BP2 manifest text, or '' when no system message carries one.
+function renderedDeferredManifest(session) {
+  const system = session.messages?.find(
+    (message) =>
+      message?.role === 'system' &&
+      typeof message.content === 'string' &&
+      message.content.includes('<available-deferred-tools>')
+  );
+  return system?.content ?? '';
+}
+
 export function filterDisallowedTools(tools, disallowed = []) {
   // Old session catalogs must not resurrect the separate staging schema.
   const deny = new Set(['git_stage', ...(Array.isArray(disallowed) ? disallowed : [])].map(clean).filter(Boolean));
@@ -118,8 +141,7 @@ function openAILoadableToolSpec(tool, provider = '') {
     name: clean(tool?.name),
     description: clean(tool?.description),
     defer_loading: true,
-    parameters:
-      tool?.inputSchema && typeof tool.inputSchema === 'object' ? tool.inputSchema : { type: 'object', properties: {} },
+    parameters: toolParameters(tool),
   };
 }
 
@@ -157,14 +179,7 @@ function activeToolSchemas(catalog, session, names) {
       const name = clean(tool?.name);
       if (!name || !wanted.has(name) || seen.has(name)) continue;
       seen.add(name);
-      specs.push({
-        name,
-        description: clean(tool?.description),
-        parameters:
-          tool?.inputSchema && typeof tool.inputSchema === 'object'
-            ? tool.inputSchema
-            : { type: 'object', properties: {} },
-      });
+      specs.push({ name, description: clean(tool?.description), parameters: toolParameters(tool) });
     }
   }
   return specs;
@@ -226,13 +241,7 @@ function setDeferredToolState(session, names) {
 }
 
 function deferredPoolToolNames(session) {
-  if (
-    !session ||
-    session.deferredProviderMode === 'full' ||
-    session.deferredProviderMode === 'manifest' ||
-    session.deferredProviderMode === 'canonical'
-  )
-    return [];
+  if (!session || FIXED_SURFACE_MODES.has(session.deferredProviderMode)) return [];
   const catalog = Array.isArray(session.deferredToolCatalog) ? session.deferredToolCatalog : [];
   const active = new Set([
     ...(session.tools || []).map((tool) => clean(tool?.name)).filter(Boolean),
@@ -303,7 +312,7 @@ export function applyDeferredToolSurface(session, mode, extraTools = [], options
   const catalog = sortedCatalogByMeasuredUsage([...byName.values()]);
   const defaultNames = defaultDeferredToolNames(catalog, mode);
   const storedNames = providerMode === 'native' ? [] : storedDeferredToolNames(session);
-  const fixedSurface = ['full', 'manifest', 'canonical'].includes(providerMode);
+  const fixedSurface = FIXED_SURFACE_MODES.has(providerMode);
   let selectedNames = fixedSurface
     ? sortedNamesByMeasuredUsage(catalog.map((tool) => clean(tool?.name)).filter(Boolean))
     : [];
@@ -373,15 +382,8 @@ export function rebuildDeferredToolSurfaceForProvider(session, provider) {
     if (session.deferredProviderMode === 'native') {
       session.mcpServerInstructions = getMcpServerInstructionsMap(session.mcpScopeId);
       applyInitialDeferredToolManifestToBp2(session, deferredPoolToolNames(session), { rebuild: true });
-      const rendered = session.messages?.find(
-        (message) =>
-          message?.role === 'system' &&
-          typeof message.content === 'string' &&
-          message.content.includes('<available-deferred-tools>')
-      )?.content;
-      session.deferredAnnouncedTools = deferredPoolToolNames(session).filter(
-        (name) => typeof rendered === 'string' && rendered.includes(name)
-      );
+      const rendered = renderedDeferredManifest(session);
+      session.deferredAnnouncedTools = deferredPoolToolNames(session).filter((name) => rendered.includes(name));
     } else if (previousMode === 'native') {
       for (const system of session.messages?.filter((message) => message?.role === 'system') || []) {
         if (typeof system.content === 'string') system.content = stripDeferredToolManifestBlock(system.content);
@@ -408,7 +410,6 @@ export function rebuildDeferredToolSurfaceForProvider(session, provider) {
 export function refreshInitialDeferredMcpSurface(session, liveMcpTools) {
   if (!session || !Array.isArray(session.messages)) return false;
   if (session.deferredProviderMode === 'full') return false;
-  const isMcp = (name) => typeof name === 'string' && name.startsWith('mcp__');
   const live = filterDisallowedTools(Array.isArray(liveMcpTools) ? liveMcpTools : [], session.disallowedTools);
   const byName = new Map();
   for (const tool of Array.isArray(session.deferredToolCatalog) ? session.deferredToolCatalog : []) {
@@ -418,7 +419,7 @@ export function refreshInitialDeferredMcpSurface(session, liveMcpTools) {
   let added = false;
   for (const tool of live) {
     const name = clean(tool?.name);
-    if (!name || !isMcp(name) || byName.has(name)) continue;
+    if (!name || !isMcpToolName(name) || byName.has(name)) continue;
     byName.set(name, activeToolForSurface(tool));
     added = true;
   }
@@ -444,12 +445,7 @@ export function refreshInitialDeferredMcpSurface(session, liveMcpTools) {
   // Pre-mark ONLY the names that ACTUALLY landed in the rebuilt BP2 manifest as
   // announced; anything the manifest could not advertise stays un-announced so
   // the turn-boundary late reminder can still surface it.
-  const rendered = (() => {
-    const sys = session.messages.find(
-      (m) => m?.role === 'system' && typeof m.content === 'string' && m.content.includes('<available-deferred-tools>')
-    );
-    return typeof sys?.content === 'string' ? sys.content : '';
-  })();
+  const rendered = renderedDeferredManifest(session);
   session.deferredAnnouncedTools = deferredPoolToolNames(session).filter((name) => rendered.includes(name));
   session.updatedAt = Date.now();
   return true;
@@ -472,7 +468,6 @@ export function refreshInitialDeferredMcpSurface(session, liveMcpTools) {
  */
 export function reconcileDeferredMcpToolCatalog(session, liveMcpTools) {
   if (!session || !Array.isArray(session.tools)) return null;
-  const isMcp = (name) => typeof name === 'string' && name.startsWith('mcp__');
   const live = filterDisallowedTools(Array.isArray(liveMcpTools) ? liveMcpTools : [], session.disallowedTools);
   const hadSnapshot = Array.isArray(session.deferredMcpToolNames);
   const previousNames = new Set(
@@ -480,18 +475,18 @@ export function reconcileDeferredMcpToolCatalog(session, liveMcpTools) {
       ? session.deferredMcpToolNames
       : [...(session.deferredToolCatalog || []), ...(session.deferredLateToolCatalog || [])]
           .map((tool) => clean(tool?.name))
-          .filter(isMcp)
+          .filter(isMcpToolName)
   );
-  session.deferredMcpToolNames = [...new Set(live.map((tool) => clean(tool?.name)).filter(isMcp))];
-  if (['full', 'manifest', 'canonical'].includes(session.deferredProviderMode)) {
+  session.deferredMcpToolNames = [...new Set(live.map((tool) => clean(tool?.name)).filter(isMcpToolName))];
+  if (FIXED_SURFACE_MODES.has(session.deferredProviderMode)) {
     const byName = new Map();
     for (const tool of Array.isArray(session.deferredToolCatalog) ? session.deferredToolCatalog : []) {
       const name = clean(tool?.name);
-      if (name && !isMcp(name)) byName.set(name, tool);
+      if (name && !isMcpToolName(name)) byName.set(name, tool);
     }
     for (const tool of live) {
       const name = clean(tool?.name);
-      if (name && isMcp(name)) byName.set(name, activeToolForSurface(tool));
+      if (name && isMcpToolName(name)) byName.set(name, activeToolForSurface(tool));
     }
     const catalog = sortedCatalogByMeasuredUsage([...byName.values()]);
     const next = catalog.filter((tool) => session.deferredSurfaceMode !== 'readonly' || isReadonlySelectable(tool));
@@ -513,7 +508,7 @@ export function reconcileDeferredMcpToolCatalog(session, liveMcpTools) {
   const liveMcpByName = new Map();
   for (const tool of live) {
     const name = clean(tool?.name);
-    if (!name || !isMcp(name) || liveMcpByName.has(name)) continue;
+    if (!name || !isMcpToolName(name) || liveMcpByName.has(name)) continue;
     liveMcpByName.set(name, activeToolForSurface(tool));
   }
 
@@ -538,13 +533,11 @@ export function reconcileDeferredMcpToolCatalog(session, liveMcpTools) {
   // schema/handler track the live connection. Swap ONLY when the serialized
   // surface actually changed, so a steady reconnect never perturbs the tools
   // request param or its cache hash.
-  if (Array.isArray(session.tools)) {
-    for (let i = 0; i < session.tools.length; i += 1) {
-      const name = clean(session.tools[i]?.name);
-      if (!name || !isMcp(name) || !liveMcpByName.has(name)) continue;
-      const freshTool = liveMcpByName.get(name);
-      if (JSON.stringify(freshTool) !== JSON.stringify(session.tools[i])) session.tools[i] = freshTool;
-    }
+  for (let i = 0; i < session.tools.length; i += 1) {
+    const name = clean(session.tools[i]?.name);
+    if (!name || !isMcpToolName(name) || !liveMcpByName.has(name)) continue;
+    const freshTool = liveMcpByName.get(name);
+    if (JSON.stringify(freshTool) !== JSON.stringify(session.tools[i])) session.tools[i] = freshTool;
   }
 
   const nextNames = new Set(session.deferredMcpToolNames);
@@ -552,7 +545,7 @@ export function reconcileDeferredMcpToolCatalog(session, liveMcpTools) {
   const added = [];
   for (const tool of liveMcpByName.values()) {
     const name = clean(tool?.name);
-    if (!name || !isMcp(name)) continue;
+    if (!name || !isMcpToolName(name)) continue;
     if (previousNames.has(name) || (!hadSnapshot && (active.has(name) || startupNames.has(name)))) continue;
     added.push({ name, description: lateAnnouncementDescription(tool?.description) });
   }

package/src/session-runtime/tool-defs.mjs

@@ -18,7 +18,7 @@ export const TOOL_SEARCH_TOOL = {
     type: 'object',
     properties: {
       names: {
-        anyOf: [{ type: 'string' }, { type: 'array', items: { type: 'string' } }],
+        anyOf: [{ type: 'string' }, { type: 'array', items: { type: 'string' }, minItems: 1 }],
         description: 'Exact name(s)/aliases.',
       },
     },

package/src/session-runtime/turn/turn-run/snapshot-tracker.mjs

@@ -12,6 +12,9 @@ export function createSnapshotTrackerFactory({
 }) {
   return function createSnapshotTracker(options) {
     const tracker = { sessionId: null, promise: null };
+    // A completion wake continues the user turn whose review already exists;
+    // aborting the wake seals that review instead of discarding it.
+    const continueTurn = options.continueTurn === true;
     const cancel = () => {
       try {
         cancelTurnSnapshotForTurn(tracker.sessionId);
@@ -27,12 +30,13 @@ export function createSnapshotTrackerFactory({
             // The first submitted row is the outer prompt. Mid-loop steering
             // is drained inside this ask() and deliberately keeps this ID.
             checkpointId: String(options.id || '').trim(),
+            continueTurn,
           })
         )
         .catch(() => undefined);
     };
     tracker.finish = async (signal, awaitTurn) => {
-      if (signal.aborted) {
+      if (signal.aborted && !continueTurn) {
         cancel();
         void Promise.resolve(tracker.promise).catch(() => {});
         return;
@@ -44,7 +48,7 @@ export function createSnapshotTrackerFactory({
       } catch {
         /* optional review cleanup never overrides turn settlement */
       }
-      if (signal.aborted) cancel();
+      if (signal.aborted && !continueTurn) cancel();
     };
     return tracker;
   };

package/src/session-runtime/turn/turn-run/transcript.mjs

@@ -35,8 +35,7 @@ export function createTurnTranscript({ getTranscriptWriter, getLastAppendedAssis
   // re-write the parts into the transcript.
   function appendFinalAssistant(result) {
     if (!getTranscriptWriter()) return;
-    const finalSource = result?.historyContent ?? result?.content;
-    const finalText = finalSource != null ? String(finalSource) : '';
+    const finalText = transcriptText(result?.historyContent ?? result?.content);
     if (finalText.trim() && finalText !== getLastAppendedAssistant()) {
       append('appendAssistant', finalText, 'final append failed');
       setLastAppendedAssistant(finalText);