@skaile/workspaces 5.16.0 → 5.18.0

package/dist/{chunk-CQFVKN6S.js → chunk-V4RV2NJF.js}

@@ -1,37 +1,37 @@
-import { WorkspacePlugin } from './chunk-DQOAPR4M.js';
-import { buildWorkspaceToolDefs } from './chunk-A7AZ3RL5.js';
-import { findAiAssetsRoot } from './chunk-PGZDSDOB.js';
-import { startModelEndpoint } from './chunk-72KZJE3G.js';
-import { WebSocketServerTransport } from './chunk-L6UMSKDF.js';
+import { WorkspacePlugin } from './chunk-ZNN7ONJX.js';
+import { buildWorkspaceToolDefs } from './chunk-JJ7LDI3S.js';
+import { findAiAssetsRoot } from './chunk-6Z5KTFJT.js';
+import { startModelEndpoint } from './chunk-PZ6NF5DE.js';
+import { WebSocketServerTransport } from './chunk-LW7ZI6EQ.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
 import { prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-PHRNUTSG.js';
-import { resolveFlowPath } from './chunk-E634MBP6.js';
-import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-AP24HESN.js';
-import { ConnectFailureCarryOver, registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, driveOrchestratorTurn, buildSdkFlowTools } from './chunk-OJHPG6HK.js';
-import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, isKnownSecretRef, EnvSecretProvider, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, deriveSingleMaterializedConnectorDeclaration } from './chunk-FSSRBWYL.js';
-import { EventNormalizer } from './chunk-TKI7YDWE.js';
-import { approvalCardOf, APPROVE_ONCE, DENY, probeResumeTranscript, transcriptStoreForRuntime } from './chunk-NSNM2ZXF.js';
+import { resolveFlowPath } from './chunk-ODDATIII.js';
+import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-H6UVIKQ2.js';
+import { ConnectFailureCarryOver, registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, driveOrchestratorTurn, buildSdkFlowTools } from './chunk-EELKR2WP.js';
+import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, isKnownSecretRef, EnvSecretProvider, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, deriveSingleMaterializedConnectorDeclaration } from './chunk-WJCQFNF6.js';
+import { EventNormalizer } from './chunk-L6IFN6ER.js';
+import { approvalCardOf, APPROVE_ONCE, DENY, probeResumeTranscript, transcriptStoreForRuntime } from './chunk-3KMREAR2.js';
 import { CodexNativeStateUnavailable } from './chunk-LOO5CB5M.js';
-import { dispatchCapability } from './chunk-PW3TYWOI.js';
+import { dispatchCapability } from './chunk-AJ7EGIFR.js';
 import { classifyClaudeSdkError } from './chunk-B4X2N7JQ.js';
 import { agentExecRequested } from './chunk-YROR332M.js';
-import { toAgentEffort, toMergedRegistry } from './chunk-HG52NGAV.js';
-import { unresolvedProviderCredentials, driverCapabilities, createDriver, catalogLayer, providerCredentialEnvName, registryCredentialEnv, AI_PROVIDER_PRESETS, supportsLiveToolUpdates } from './chunk-6Q7NKTDG.js';
-import { loadFlow } from './chunk-SPV2CXJ3.js';
-import { parseFlowDefinition } from './chunk-X3RMRJNR.js';
+import { toAgentEffort, toMergedRegistry } from './chunk-YU6AURJY.js';
+import { unresolvedProviderCredentials, driverCapabilities, createDriver, catalogLayer, providerCredentialEnvName, registryCredentialEnv, AI_PROVIDER_PRESETS, supportsLiveToolUpdates } from './chunk-X54YR4AW.js';
+import { loadFlow } from './chunk-D6UBEYQH.js';
 import { renderStimulusPrompt } from './chunk-M3WPBTGJ.js';
-import { TERMINAL_AGENT_RUN_STATUSES, withActivityLabelJsonSchema, TOOL_ACTIVITY_PROMPT_SECTION, SESSION_ROOT_CONNECTOR_ID, PLATFORM_BLOCKS_RUNTIME_FEATURE, PROTOCOL_VERSION, deliveryClassOf } from './chunk-D5WTOVLG.js';
-import { knowledgeKindProvider, scanLibraryRoot, LocalIndex } from './chunk-D3PU3C6F.js';
-import { createDefaultKindRegistry } from './chunk-ES6ARJPQ.js';
-import { BindingSchema, effectiveComposes, AgentManifestSchema, AgentTriggerSchema, ANTHROPIC_MODEL_ALIASES } from './chunk-YK3XLEQJ.js';
-import { readLock, buildAgentPromptSections, resolveSettings, loadProviderRegistry, resolveLibraryDir } from './chunk-PIC23DDE.js';
-import { resolveRuntimeAssets } from './chunk-5RDZ5JHH.js';
+import { TERMINAL_AGENT_RUN_STATUSES, withActivityLabelJsonSchema, TOOL_ACTIVITY_PROMPT_SECTION, SESSION_ROOT_CONNECTOR_ID, PLATFORM_BLOCKS_RUNTIME_FEATURE, PROTOCOL_VERSION, deliveryClassOf } from './chunk-Y56YIT6J.js';
+import { knowledgeKindProvider, scanLibraryRoot, LocalIndex } from './chunk-VKPBUPH7.js';
+import { createDefaultKindRegistry } from './chunk-HPVMTX6M.js';
+import { parseFlowDefinition } from './chunk-X3RMRJNR.js';
+import { BindingSchema, effectiveComposes, AgentManifestSchema, AgentTriggerSchema, ANTHROPIC_MODEL_ALIASES } from './chunk-CKNIYIV2.js';
+import { readLock, buildAgentPromptSections, resolveSettings, loadProviderRegistry, resolveLibraryDir } from './chunk-T2TQAH2X.js';
+import { resolveRuntimeAssets } from './chunk-KC6HGWXN.js';
 import { DEFAULT_DRIVER_ID, resolveDriverPaths } from './chunk-5BEFNLOR.js';
-import { matchPin, DEFAULT_AGENT_INSTANCE_ID, effectiveAgentInstances, resolveAgentDefinitionDir, AgentRefResolutionError, resolveSkWorkspaceConfig, resolveAgentDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, getGlobalCacheDir, sourceCacheKey, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill, STAGED_SKILL_MARKER } from './chunk-ZVZTCDUN.js';
+import { matchPin, DEFAULT_AGENT_INSTANCE_ID, effectiveAgentInstances, resolveAgentDefinitionDir, AgentRefResolutionError, resolveSkWorkspaceConfig, resolveAgentDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, getGlobalCacheDir, sourceCacheKey, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill, STAGED_SKILL_MARKER } from './chunk-2NOLF7B2.js';
 import { globalSkaileDir } from './chunk-L5VSIPQD.js';
 import { driverTargetForDriver, SUPPORTED_DRIVER_TARGETS, DRIVER_TARGETS } from './chunk-IG5LZ3WU.js';
-import { withFsDeadline, FsDeadlineError, fsDeadlineMs, parseFrontmatter, tryWithFsDeadline } from './chunk-YW2BNDSE.js';
-import { parseAssetRef } from './chunk-FT4ZHLYR.js';
+import { withFsDeadline, FsDeadlineError, fsDeadlineMs, parseFrontmatter, tryWithFsDeadline } from './chunk-GOCWM7FN.js';
+import { parseAssetRef } from './chunk-WDXZA7QW.js';
 import { resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink, resolveLogsRetention, enforceLogsRetention } from './chunk-DKXNKFKP.js';
 import { pickRegistryEntries, registryEntries, resolveEntryBaseUrl, parseModelRef, isEntryEnabled, parseCredentialRef } from './chunk-MJHSLODD.js';
 import { getLogStore, registerLogStore, createLogger, resetLogStore, isUnwritableStreamError, markStreamBroken, isBrokenPipeError, redactCredentials } from './chunk-BOFL7GIF.js';
@@ -6803,7 +6803,9 @@ ${message}`;
           settled = true;
           driver.off("agent-event", onEvent);
           const err = Object.assign(new Error(String(event.error)), {
-            detail: event.detail
+            detail: event.detail,
+            // The records of this turn sit in the log db under this id (`skaile session logs`).
+            logSessionId: sessionId
           });
           chatLog.error("agent emitted error event", err);
           driver.kill();
@@ -6817,7 +6819,7 @@ ${message}`;
         driver.off("agent-event", onEvent);
         chatLog.error("prompt failed", err);
         driver.kill();
-        reject(err);
+        reject(Object.assign(err, { logSessionId: sessionId }));
       });
     });
   } finally {
@@ -6910,10 +6912,23 @@ async function dispatchRunnerCapabilityInvocation(cmd, deps) {
     const result = await deps.invoke(cmd.name, cmd.input);
     deps.emit({ type: "capability_result", callId: cmd.callId, result });
   } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    deps.emit({ type: "capability_result", callId: cmd.callId, result: { error: message } });
+    deps.emit({
+      type: "capability_result",
+      callId: cmd.callId,
+      result: { error: capabilityErrorText(cmd.name, err) }
+    });
   }
 }
+function capabilityErrorText(name, err) {
+  if (err instanceof Error && err.name === "ZodError" && "issues" in err) {
+    const issues = err.issues;
+    const parts = issues.map(
+      (i) => `${i.path.length > 0 ? `${i.path.map(String).join(".")}: ` : ""}${i.message}`
+    );
+    return `invalid input for ${name}: ${parts.join("; ")}`;
+  }
+  return err instanceof Error ? err.message : String(err);
+}
 function resolveCapabilityResult(pending, cmd) {
   const entry = pending.get(cmd.callId);
   if (!entry) return false;
@@ -8466,6 +8481,46 @@ function createCoalescedTask(lock, fn) {
     return run;
   };
 }
+
+// runner/src/coalesced-restart.ts
+function createCoalescedRestartScheduler(deps) {
+  const quietMs = deps.quietMs ?? 250;
+  const maxWaitMs = deps.maxWaitMs ?? 2e3;
+  const now = deps.now ?? Date.now;
+  const sleep = deps.sleep ?? ((ms) => new Promise((resolve4) => setTimeout(resolve4, ms)));
+  let open4 = null;
+  return (reason) => {
+    if (open4) {
+      open4.reasons.push(reason);
+      open4.lastJoinedAt = now();
+      return;
+    }
+    const state = { reasons: [reason], lastJoinedAt: now() };
+    open4 = state;
+    const close = () => {
+      if (open4 === state) open4 = null;
+    };
+    const batch = {
+      settle: async () => {
+        const deadline = now() + maxWaitMs;
+        for (; ; ) {
+          const wait = Math.min(state.lastJoinedAt + quietMs, deadline) - now();
+          if (wait <= 0 || open4 !== state) break;
+          await sleep(wait);
+        }
+        close();
+      },
+      reasons: () => state.reasons
+    };
+    let started;
+    try {
+      started = deps.start(batch);
+    } catch (err) {
+      started = Promise.reject(err);
+    }
+    void started.catch((err) => deps.onError(state.reasons, err)).finally(close);
+  };
+}
 async function recordStagedSkills(staged, projectDir, skillsDir, names, timeoutMs) {
   for (const name of names) {
     const path11 = join(projectDir, skillsDir, name);
@@ -9563,11 +9618,32 @@ DROP (omit entirely):
 - Redundant back-and-forth (corrections already applied)
 - Transient UI state
 
+## Conversation Language
+
+Write the summary in the language the user writes in, not in English by
+default. If the user writes German, the whole summary is in German, section
+headings included. When users write in more than one language, use the
+language of the most recent message a user wrote before this compaction
+request (this request itself does not count). Do this even when a previous
+summary below is in another language: restate it in the conversation's
+language.
+
+Keep file paths, code identifiers, commands, error messages and quoted user
+text exactly as they were -- never translate them.
+
+Record the language explicitly in the "Conversation Language" section of the
+summary, so the agent keeps replying in it after the session is restored.
+
 ## Format
 
 Write a structured summary using these sections. Omit any section that
 has no content.
 
+### Conversation Language
+The language the user writes in (for example "German"). Always include this
+section. If users write in more than one language, name each and say which
+one to reply in.
+
 ### Goal
 What the user is trying to accomplish.
 
@@ -11084,9 +11160,9 @@ function asDeclaration(declaration) {
   }
   return null;
 }
-function isLive(rm3, id) {
+function isLive(rm4, id) {
   try {
-    return typeof rm3.has === "function" && rm3.has(id);
+    return typeof rm4.has === "function" && rm4.has(id);
   } catch {
     return false;
   }
@@ -11097,8 +11173,8 @@ function toPreMinted(token) {
 function buildSessionResourceHandlers(deps) {
   const { getResourceManager, getPreMintedSecrets, emitResourcesAvailable, log, getProjectDir } = deps;
   async function add(kind, input) {
-    const rm3 = getResourceManager();
-    if (!rm3) return { ok: false, code: "no_session", message: "session resources not ready" };
+    const rm4 = getResourceManager();
+    if (!rm4) return { ok: false, code: "no_session", message: "session resources not ready" };
     const decl = asDeclaration(input.declaration);
     if (!decl) {
       return { ok: false, code: "invalid_declaration", message: "declaration missing id/driver" };
@@ -11111,14 +11187,14 @@ function buildSessionResourceHandlers(deps) {
           `[session-resource] preMintedToken provided but secret store not ready \u2014 ${kind}:${decl.id}`
         );
     }
-    const wasLive = isLive(rm3, decl.id);
+    const wasLive = isLive(rm4, decl.id);
     try {
-      await rm3.connect(decl);
+      await rm4.connect(decl);
     } catch (err) {
       if (input.preMintedToken) {
         getPreMintedSecrets()?.unset(kind, decl.id);
       }
-      if (wasLive && !isLive(rm3, decl.id)) emitResourcesAvailable();
+      if (wasLive && !isLive(rm4, decl.id)) emitResourcesAvailable();
       const message = err instanceof Error ? err.message : String(err);
       log(`[session-resource] runner.add_${kind} failed for ${decl.id}: ${message}`);
       return { ok: false, code: "connect_failed", message };
@@ -11151,8 +11227,8 @@ function buildSessionResourceHandlers(deps) {
         message: `no materialized connector at ${join(root, name)}`
       };
     }
-    const rm3 = getResourceManager();
-    if (!rm3) return { ok: false, code: "no_session", message: "session resources not ready" };
+    const rm4 = getResourceManager();
+    if (!rm4) return { ok: false, code: "no_session", message: "session resources not ready" };
     if (preMintedToken) {
       const ps = getPreMintedSecrets();
       if (ps) ps.set("connector", decl.id, toPreMinted(preMintedToken));
@@ -11161,14 +11237,14 @@ function buildSessionResourceHandlers(deps) {
           `[session-resource] preMintedToken provided but secret store not ready \u2014 connector:${decl.id}`
         );
     }
-    const wasLive = isLive(rm3, decl.id);
+    const wasLive = isLive(rm4, decl.id);
     try {
-      await rm3.connect(decl);
+      await rm4.connect(decl);
     } catch (err) {
       if (preMintedToken) {
         getPreMintedSecrets()?.unset("connector", decl.id);
       }
-      if (wasLive && !isLive(rm3, decl.id)) emitResourcesAvailable();
+      if (wasLive && !isLive(rm4, decl.id)) emitResourcesAvailable();
       const message = err instanceof Error ? err.message : String(err);
       log(`[session-resource] runner.attach_instance connector failed for ${decl.id}: ${message}`);
       return { ok: false, code: "connector_connect_failed", message };
@@ -11182,13 +11258,13 @@ function buildSessionResourceHandlers(deps) {
     addMount: (input) => add("mount", input),
     attachConnectorInstance,
     removeResource: async (input) => {
-      const rm3 = getResourceManager();
-      if (!rm3) return { ok: false, code: "no_session", message: "session resources not ready" };
-      if (!rm3.has(input.id)) {
+      const rm4 = getResourceManager();
+      if (!rm4) return { ok: false, code: "no_session", message: "session resources not ready" };
+      if (!rm4.has(input.id)) {
         return { ok: false, code: "not_found", message: `no resource with id ${input.id}` };
       }
       try {
-        await rm3.disconnect(input.id);
+        await rm4.disconnect(input.id);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         log(`[session-resource] runner.remove_resource failed for ${input.id}: ${message}`);
@@ -11204,8 +11280,8 @@ function buildSessionResourceHandlers(deps) {
     updateCredential: async (input) => {
       const ps = getPreMintedSecrets();
       if (!ps) return { ok: false, code: "no_session", message: "session resources not ready" };
-      const rm3 = getResourceManager();
-      if (rm3 && !rm3.has(input.id)) {
+      const rm4 = getResourceManager();
+      if (rm4 && !rm4.has(input.id)) {
         return { ok: false, code: "not_found", message: `no resource with id ${input.id}` };
       }
       ps.set(input.kind, input.id, input.mint);
@@ -11216,6 +11292,13 @@ function buildSessionResourceHandlers(deps) {
 }
 
 // runner/src/mcp-runtime-handlers.ts
+function invalidAssetName(name) {
+  if (!name) return "name is required";
+  if (name === "." || name.includes("/") || name.includes("\\") || name.includes("..")) {
+    return "name must not contain path separators or traversal segments";
+  }
+  return null;
+}
 function buildMcpRuntimeHandlers(deps) {
   const resolveManager = () => {
     try {
@@ -11274,16 +11357,8 @@ function buildMcpRuntimeHandlers(deps) {
           message: `attach_instance supports mcp-server only; '${input.kind}' is not yet supported`
         };
       }
-      if (!input.name) {
-        return { ok: false, code: "invalid_input", message: "name is required" };
-      }
-      if (input.name.includes("/") || input.name.includes("\\") || input.name.includes("..")) {
-        return {
-          ok: false,
-          code: "invalid_input",
-          message: "name must not contain path separators or traversal segments"
-        };
-      }
+      const invalidName = invalidAssetName(input.name);
+      if (invalidName) return { ok: false, code: "invalid_input", message: invalidName };
       if (!deps.getProjectDir) {
         return { ok: false, code: "no_project_dir", message: "getProjectDir not configured" };
       }
@@ -11315,6 +11390,65 @@ function buildMcpRuntimeHandlers(deps) {
         const code = err instanceof McpServerAlreadyRegisteredError ? "mcp_already_registered" : "mcp_connect_failed";
         return { ok: false, code, message };
       }
+    },
+    // Order matters: the on-disk asset and the live-attach record go first, so
+    // a session rebuild that starts meanwhile cannot respawn the server.
+    detachInstance: async (input) => {
+      if (input.kind !== "mcp-server") {
+        return {
+          ok: false,
+          code: "unsupported_kind",
+          message: `detach_instance supports mcp-server here; '${input.kind}' is not`
+        };
+      }
+      const invalid = invalidAssetName(input.name);
+      if (invalid) return { ok: false, code: "invalid_input", message: invalid };
+      if (!deps.unregisterLiveAttachedMcp) {
+        return {
+          ok: false,
+          code: "not_implemented",
+          message: "detach_instance for mcp-server is not configured"
+        };
+      }
+      const mgr = resolveManager();
+      if (!mgr) return { ok: false, code: "no_session", message: "session resources not ready" };
+      const id = input.name;
+      if (deps.getProjectDir) {
+        const assetDir = join(deps.getProjectDir(), ".skaile/assets/mcp-server", id);
+        try {
+          await rm(assetDir, { recursive: true, force: true });
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          deps.log(`[mcp-runtime] runner.detach_instance could not remove ${assetDir}: ${message}`);
+          return { ok: false, code: "asset_remove_failed", message };
+        }
+      }
+      deps.unregisterLiveAttachedMcp(id);
+      const wasConnected = mgr.listServers().some((s) => s.id === id);
+      try {
+        await mgr.removeServer(id);
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        deps.log(`[mcp-runtime] runner.detach_instance failed to remove ${id}: ${message}`);
+        return { ok: false, code: "mcp_remove_failed", message };
+      }
+      deps.getPreMintedSecrets()?.unset("mcp", id);
+      let live = true;
+      if (wasConnected && !deps.driverPicksUpToolsLive()) {
+        live = false;
+        try {
+          deps.scheduleDriverRestartForToolChanges(`MCP server '${id}' removal`);
+        } catch (err) {
+          deps.log(
+            `[mcp-runtime] scheduling the restart for ${id} failed: ${err instanceof Error ? err.message : String(err)}`
+          );
+        }
+      }
+      deps.emitResourcesAvailable();
+      deps.log(
+        wasConnected ? `[mcp-runtime] runner.detach_instance removed ${id}${live ? "" : " (driver restart queued)"}` : `[mcp-runtime] runner.detach_instance: ${id} was not connected; records cleared`
+      );
+      return { ok: true, id, removed: wasConnected, live };
     }
   };
 }
@@ -11424,7 +11558,6 @@ function buildRunnerCapabilities(handlers) {
         });
       }
     }),
-    // TODO(mcp-detach): no runner.remove_mcp_server yet — live MCP detach + mcp: credential cleanup deferred with the attach-by-ref rework.
     defineCapability({
       name: "runner.add_mcp_server",
       displayName: "Add MCP server",
@@ -11463,7 +11596,7 @@ function buildRunnerCapabilities(handlers) {
     defineCapability({
       name: "runner.detach_instance",
       displayName: "Detach instance",
-      description: "Unload an instance the platform unassigned from the live session. Skills only: removes the runner-staged copy and materialized asset, then restarts the driver without killing an in-flight turn. A same-named dir the runner did not stage is left in place (reason: not_staged).",
+      description: "Unload an instance the platform unassigned from the live session. kind 'skill': removes the runner-staged copy and materialized asset, then restarts the driver without killing an in-flight turn; a same-named dir the runner did not stage is left in place (reason: not_staged). kind 'mcp-server': removes the server's tools, its mcp: credential and its materialized asset; restarts the driver (once per burst of detaches) only when the driver cannot drop tools live.",
       side: "agent",
       origin: RUNNER_CAP_ORIGIN,
       audience: ["runtime"],
@@ -11597,6 +11730,7 @@ function wireSessionCapabilities(deps) {
     attachSkillInstance,
     detachSkillInstance,
     registerLiveAttachedMcp,
+    unregisterLiveAttachedMcp,
     scheduleDriverRestartForToolChanges,
     getDriver,
     rememberReconfigure,
@@ -11615,6 +11749,7 @@ function wireSessionCapabilities(deps) {
     getPreMintedSecrets: () => getPreMintedSecrets() ?? null,
     driverPicksUpToolsLive,
     registerLiveAttachedMcp,
+    unregisterLiveAttachedMcp,
     scheduleDriverRestartForToolChanges,
     emitResourcesAvailable,
     log,
@@ -11639,12 +11774,15 @@ function wireSessionCapabilities(deps) {
         message: "attach_instance handler not configured"
       };
     },
-    // Only skills have a live unload path; a connector or mount detaches
-    // through remove_resource, and MCP servers have no detach yet.
+    // Skills and MCP servers have a live unload path; a connector or mount
+    // detaches through remove_resource.
     detachInstance: async (input) => {
       if (input.kind === "skill") {
         return detachSkillInstance(input.name);
       }
+      if (input.kind === "mcp-server" && mcpHandlers.detachInstance) {
+        return mcpHandlers.detachInstance(input);
+      }
       return {
         ok: false,
         code: "unsupported_kind",
@@ -11653,16 +11791,16 @@ function wireSessionCapabilities(deps) {
     },
     // setLogLevel left undefined (the cap self-falls-back to getLogStore).
     setState: async (input) => {
-      const rm3 = getResourceManager();
-      if (!rm3) return { ok: false, code: "no_session", message: "session resources not ready" };
-      if (!isSharedStateStore(input.store) || !rm3.has(input.store)) {
+      const rm4 = getResourceManager();
+      if (!rm4) return { ok: false, code: "no_session", message: "session resources not ready" };
+      if (!isSharedStateStore(input.store) || !rm4.has(input.store)) {
         return {
           ok: false,
           code: "store_not_found",
           message: `no shared state store "${input.store}" \u2014 declare it in session_init.sharedState`
         };
       }
-      const connector = rm3.get(input.store).connector;
+      const connector = rm4.get(input.store).connector;
       if (typeof connector.onStoreChange !== "function") {
         return {
           ok: false,
@@ -11671,7 +11809,7 @@ function wireSessionCapabilities(deps) {
         };
       }
       try {
-        await rm3.executeOp(input.store, "set", {
+        await rm4.executeOp(input.store, "set", {
           key: input.key,
           value: typeof input.value === "string" ? JSON.stringify(input.value) : input.value
         });
@@ -13540,6 +13678,12 @@ async function startAgentServer(opts) {
     liveAttachedMcpDeclarations.set(decl.id, decl);
     bakedMcpServerIds = /* @__PURE__ */ new Set([...bakedMcpServerIds, decl.id]);
   };
+  const unregisterLiveAttachedMcp = (id) => {
+    liveAttachedMcpDeclarations.delete(id);
+    if (bakedMcpServerIds.has(id)) {
+      bakedMcpServerIds = new Set([...bakedMcpServerIds].filter((baked) => baked !== id));
+    }
+  };
   const modelEndpointConfig = {
     ...wsConfig.model_endpoint,
     ...opts.modelEndpoint
@@ -13701,6 +13845,7 @@ async function startAgentServer(opts) {
     logPhase
   });
   let driverRestartChain = Promise.resolve();
+  let toolRestartScheduler;
   let liveDriverActiveAfterTurn = false;
   let driver = secretsMode === "env" ? agentSession.driver : void 0;
   let secretsProvisioned = secretsMode === "env";
@@ -14292,6 +14437,7 @@ async function startAgentServer(opts) {
       attachSkillInstance,
       detachSkillInstance,
       registerLiveAttachedMcp,
+      unregisterLiveAttachedMcp,
       scheduleDriverRestartForToolChanges,
       getDriver: () => driver ?? null,
       rememberReconfigure: (patch) => {
@@ -14357,8 +14503,9 @@ async function startAgentServer(opts) {
     }
     return { needsWireFallbackRecreate, needsWireAgentConfigRecreate };
   }
-  async function recreateAgentSession(overrides) {
+  async function recreateAgentSession(overrides, opts2) {
     return turnScheduler.runSwap(async () => {
+      await opts2?.settle?.();
       const resolved = typeof overrides === "function" ? overrides() : overrides;
       if (!resolved) return false;
       await recreateAgentSessionInner(resolved);
@@ -14671,20 +14818,27 @@ async function startAgentServer(opts) {
     return detachStagedSkill(skillStagingDeps, name);
   }
   async function restartDriverForToolChanges(reason) {
+    const batch = typeof reason === "string" ? void 0 : reason;
+    const label = () => batch ? batch.reasons().join(", ") : reason;
     if (!driverStarted) {
-      log(`[serve] ${reason} applied before driver start \u2014 picked up on the first prompt`);
+      log(`[serve] ${label()} applied before driver start \u2014 picked up on the first prompt`);
       return;
     }
-    await recreateAgentSession(() => {
-      if (!driverStarted) {
-        log(`[serve] ${reason} applied after an earlier recreate \u2014 picked up on the first prompt`);
-        return null;
-      }
-      const prevSessionId = driver.runtimeSessionId;
-      log(`[serve] restarting driver to pick up ${reason} (resume=${prevSessionId ?? "none"})`);
-      markPhase(`driver restart: ${reason}`);
-      return { resumeSessionId: prevSessionId };
-    });
+    await recreateAgentSession(
+      () => {
+        if (!driverStarted) {
+          log(
+            `[serve] ${label()} applied after an earlier recreate \u2014 picked up on the first prompt`
+          );
+          return null;
+        }
+        const prevSessionId = driver.runtimeSessionId;
+        log(`[serve] restarting driver to pick up ${label()} (resume=${prevSessionId ?? "none"})`);
+        markPhase(`driver restart: ${label()}`);
+        return { resumeSessionId: prevSessionId };
+      },
+      batch ? { settle: () => batch.settle() } : void 0
+    );
   }
   function enqueueDriverRestart(reason) {
     const next = driverRestartChain.then(() => restartDriverForToolChanges(reason));
@@ -14693,11 +14847,13 @@ async function startAgentServer(opts) {
     return next;
   }
   function scheduleDriverRestartForToolChanges(reason) {
-    void enqueueDriverRestart(reason).catch((err) => {
-      log(
-        `[serve] background driver restart for ${reason} failed: ${err instanceof Error ? err.message : String(err)}`
-      );
+    toolRestartScheduler ??= createCoalescedRestartScheduler({
+      start: (batch) => enqueueDriverRestart(batch),
+      onError: (reasons, err) => log(
+        `[serve] background driver restart for ${reasons.join(", ")} failed: ${err instanceof Error ? err.message : String(err)}`
+      )
     });
+    toolRestartScheduler(reason);
   }
   async function restartDriverForSkillChanges(catalogActions) {
     const restarted = driverStarted;
@@ -15814,5 +15970,5 @@ function touchSession(state) {
 }
 
 export { AgentRunError, CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CONNECTOR_MUTATE_NOT_READY, CapabilityRegistry, CompileManifestEntrySchema, CompositionError, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, DEFAULT_FLOW_MUTATE_CONNECTOR_WAIT_MS, DEFAULT_MAX_FINISHED_TREES, DEFAULT_RUN_LIMITS, MOUNT_LIST_MAX_DEPTH, MOUNT_LIST_MAX_ENTRIES, MOUNT_READ_DEADLINE_FACTOR, MOUNT_READ_MAX_CHUNK_BYTES, MOUNT_STAT_BUDGET_MS, MOUNT_STAT_MAX_ENTRIES, MOUNT_TREE_OP_DEADLINE_FACTOR, MOUNT_WRITE_MAX_CHUNK_BYTES, MarkdownStreamer, PreInitRingSink, ResourceOperationError, SESSION_ROOT_WRITABLE_DIRS, SESSION_ROOT_WRITABLE_FILES, UnknownCompositionKindError, WRITE_RANGE_PARTIAL_TTL_MS, WS_AUTH_TOKEN_ENV, WS_AUTH_TOKEN_FILE_ENV, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildCompositionRunSnapshot, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildRunnerAgentSections, buildStoreSnapshotReplay, builtinCapabilities, canonicalJson, capabilityLogInstance, capabilitySignatureInputs, clearPreInitRingSink, clearSession, compileComposition, compositionRunSnapshotPath, computeCapabilitySignature, computeDirectoryTotals, computeRevisionHash, connectorRefreshKind, createAgentSession, createCompositionContentSource, createFinalTextFallback, createFlowConnectorReadiness, createInMemoryRunStore, createManagedCodexSubpromptDriver, createRunController, createSessionStimulusBus, defineCapability, deleteSession, describeComposition, dispatchResourceRequest, dispatchRunnerCapabilityInvocation, driverActiveAfterTurnEnd, emitSystemPromptComposed, ensureClaudeSettingsDisablesConnectors, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, flowStartNeedsDriverRestart, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, handleSessionRootResourceRequest, hasNonTerminalFlow, hashAgentFiles, hashContent, hostOpResumeStimulus, installPreInitRingSink, instanceForSession, instanceSessionOverrides, isCompositionError, isEmptyKnowledgeIndex, isSessionRootPathAllowed, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadCompositionRunSnapshot, loadKnowledgeDir, loadManagedCodexHostConfig, loadSession, loadSessionById, manifestModelForDriver, mcpAuthSecretKey, newSession, nulTailPaddingLength, pickChatFlowTarget, pickFlowToolTarget, pickRepointedManager, planFlowMutate, prepareCodexTools, reconcilePendingDecisions, reconnectedRunNeedsAgentTurn, recreateKeepingLiveFlows, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, rejectPendingCapabilityCallsOnDisconnect, resetRunnerLogStore, resolveAgentInstance, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveInstanceAgentDir, resolveMixin, resolveSessionId, restoredRunHasWorkToResume, runAgentChat, saveCompositionRunSnapshot, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, stripFrontmatter, takeRunnerWsAuthToken, toActiveFlowTarget, touchSession, unresolvedCredentialNotices, validateInputResponse, verifyConventionItems, writeClaudeCodeCredentialsFile, writeRangeChunk, writeRangePartialPath };
-//# sourceMappingURL=chunk-CQFVKN6S.js.map
-//# sourceMappingURL=chunk-CQFVKN6S.js.map
+//# sourceMappingURL=chunk-V4RV2NJF.js.map
+//# sourceMappingURL=chunk-V4RV2NJF.js.map