@skaile/workspaces 1.16.0 → 2.0.0

package/dist/{chunk-BG4XVMG2.js → chunk-WZPADAE7.js}

@@ -1,33 +1,35 @@
-import { WorkspacePlugin } from './chunk-C4KVFALU.js';
+import { WorkspacePlugin } from './chunk-QIQTYN7F.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
 import { WebSocketServerTransport } from './chunk-WQ7DE5UC.js';
-import { EventNormalizer } from './chunk-M5GJT3D7.js';
+import { EventNormalizer } from './chunk-OYX22NJL.js';
 import { SUPPORTED_CLOUDS, CLOUD_SECRET_ENV_KEYS } from './chunk-ISQWMBKD.js';
 import { classifyClaudeSdkError } from './chunk-GAH4YRCI.js';
-import { createDriver } from './chunk-ACWCVB5Q.js';
-import { deployCatalogEntry, undeployCatalogEntry } from './chunk-LV2HPH3C.js';
-import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools, buildSdkFlowTools } from './chunk-6POODADP.js';
-import { loadConnectorDeclarations, SecretProviderChain, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, isKnownSecretRef, deriveSingleMaterializedConnectorDeclaration } from './chunk-2TSSCHCQ.js';
+import { createDriver } from './chunk-ORZW7MMO.js';
+import { findAiAssetsRoot, deployCatalogEntry, undeployCatalogEntry } from './chunk-BEAIJRVF.js';
+import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools, buildSdkFlowTools } from './chunk-SVL4EZJT.js';
+import { loadConnectorDeclarations, SecretProviderChain, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, isKnownSecretRef, deriveSingleMaterializedConnectorDeclaration } from './chunk-CKVIN4H3.js';
 import { renderStimulusPrompt, buildOrchestratorPrompt } from './chunk-Y662DNQQ.js';
 import { PROTOCOL_VERSION } from './chunk-RDE43ORT.js';
-import { resolveSettings, resolveApiKey, providerEnvKey } from './chunk-5NZ56R63.js';
+import { resolveSettings, resolveApiKey, providerEnvKey } from './chunk-ST3DLLNZ.js';
 import { resolveDriverPaths } from './chunk-K5GBV4SA.js';
-import { resolveRuntimeAssets } from './chunk-7J7LQP6T.js';
-import { resolveSkWorkspaceConfig, resolveAgentDir, cloudConfigFromProfile, stageMaterializedSkills, loadMcpServerDeclarations, COMPACTION_DEFAULTS, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration } from './chunk-ISA7R7PK.js';
+import { resolveRuntimeAssets } from './chunk-MMD2KQ3A.js';
+import { resolveSkWorkspaceConfig, resolveAgentDir, cloudConfigFromProfile, stageMaterializedSkills, loadMcpServerDeclarations, COMPACTION_DEFAULTS, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration } from './chunk-72EOJJOM.js';
+import { withFsDeadline, fsDeadlineMs, FsDeadlineError, tryWithFsDeadline } from './chunk-DYMWJAL4.js';
 import { parseAssetRef } from './chunk-GEEW6SY2.js';
-import { getLogStore, resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink, registerLogStore, resetLogStore, createLogger } from './chunk-JB35MVBN.js';
+import { resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink } from './chunk-U5POE4BA.js';
+import { getLogStore, registerLogStore, resetLogStore, createLogger } from './chunk-7GOCNYUV.js';
 import { __require } from './chunk-NSBPE2FW.js';
 import pc from 'picocolors';
 import { Marked } from 'marked';
 import { markedTerminal } from 'marked-terminal';
-import { readdirSync, existsSync, readFileSync, statSync, rmSync, unlinkSync, mkdirSync, writeFileSync, watch, chmodSync } from 'fs';
+import fs4, { readFile, stat, rm, unlink, mkdir, writeFile, readdir, rename } from 'fs/promises';
 import path4, { join, resolve, relative, sep, isAbsolute, dirname, basename } from 'path';
+import { existsSync, readFileSync, mkdirSync, writeFileSync, watch, chmodSync, rmSync } from 'fs';
 import { homedir } from 'os';
 import * as z5 from 'zod';
 import { z } from 'zod';
-import fs4, { mkdir, writeFile, rename, readFile } from 'fs/promises';
 import { createHash, randomUUID } from 'crypto';
-import { execFile, spawnSync } from 'child_process';
+import { execFile } from 'child_process';
 import { promisify } from 'util';
 import { parse } from 'yaml';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
@@ -287,7 +289,7 @@ function findInRepos(repos, kind, name, repoQualifier) {
 async function loadKnowledgeDir(dir) {
   let entries;
   try {
-    entries = readdirSync(dir).filter((e) => e.endsWith(".md"));
+    entries = (await fs4.readdir(dir)).filter((e) => e.endsWith(".md"));
   } catch {
     return null;
   }
@@ -838,6 +840,15 @@ var FileChangedCoalescer = class {
     state.dirCapHit = false;
   }
 };
+var execFileAsync2 = promisify(execFile);
+var DEFAULT_NIX_TIMEOUT_MS = 3e4;
+var NIX_TIMEOUT_ENV_VAR = "SKAILE_NIX_TIMEOUT_MS";
+function nixTimeoutMs() {
+  const raw = process.env[NIX_TIMEOUT_ENV_VAR];
+  if (raw === void 0) return DEFAULT_NIX_TIMEOUT_MS;
+  const parsed = Number.parseInt(raw, 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_NIX_TIMEOUT_MS;
+}
 var RecipeUnavailableError = class extends Error {
   constructor(flakeRef, attr, cause) {
     super(
@@ -858,21 +869,37 @@ function recipeMapPath() {
   return process.env.SKAILE_NIX_RECIPE_MAP || DEFAULT_RECIPE_MAP_PATH;
 }
 var recipeMapMemo = null;
-function loadRecipeMap() {
+var recipeMapInFlight = null;
+async function loadRecipeMap() {
   const path5 = recipeMapPath();
-  let mtimeMs;
-  try {
-    mtimeMs = statSync(path5).mtimeMs;
-  } catch {
+  const mtimeMs = await tryWithFsDeadline(
+    `stat ${path5}`,
+    async () => (await stat(path5)).mtimeMs,
+    null
+  );
+  if (mtimeMs === null) {
     recipeMapMemo = { path: path5, mtimeMs: -1, map: null };
     return null;
   }
   if (recipeMapMemo && recipeMapMemo.path === path5 && recipeMapMemo.mtimeMs === mtimeMs) {
     return recipeMapMemo.map;
   }
+  const key = `${path5}:${mtimeMs}`;
+  if (recipeMapInFlight?.key === key) return recipeMapInFlight.promise;
+  const promise = readRecipeMap(path5, mtimeMs);
+  recipeMapInFlight = { key, promise };
+  try {
+    return await promise;
+  } finally {
+    if (recipeMapInFlight?.key === key) recipeMapInFlight = null;
+  }
+}
+async function readRecipeMap(path5, mtimeMs) {
   let map = null;
   try {
-    const parsed = JSON.parse(readFileSync(path5, "utf8"));
+    const parsed = JSON.parse(
+      await withFsDeadline(`readFile ${path5}`, () => readFile(path5, "utf8"))
+    );
     map = parsed && typeof parsed === "object" ? parsed : null;
   } catch (err) {
     createLogger({ kind: "mcp", subkind: "recipe-resolve" }).warn(
@@ -890,8 +917,8 @@ var MapRecipeProducer = class {
   }
   load;
   kind = "map";
-  resolve(_ref, attr) {
-    const map = this.load();
+  async resolve(_ref, attr) {
+    const map = await this.load();
     if (!map) return null;
     const hit = attr.split(".").reduce(
       (o, k) => o && typeof o === "object" ? o[k] : void 0,
@@ -902,21 +929,22 @@ var MapRecipeProducer = class {
 };
 var NixRecipeProducer = class {
   kind = "nix";
-  resolve(ref, attr) {
-    const result = spawnSync("nix", ["path-info", "--offline", `${ref}#${attr}`], {
-      encoding: "utf8"
-    });
-    if (result.error) throw new RecipeUnavailableError(ref, attr, result.error);
-    if (result.status !== 0) {
-      throw new RecipeUnavailableError(
-        ref,
-        attr,
-        new Error(`nix path-info exited ${result.status}: ${result.stderr.trim()}`)
-      );
+  async resolve(ref, attr) {
+    let stdout;
+    try {
+      ({ stdout } = await execFileAsync2("nix", ["path-info", "--offline", `${ref}#${attr}`], {
+        encoding: "utf8",
+        timeout: nixTimeoutMs(),
+        killSignal: "SIGKILL"
+      }));
+    } catch (err) {
+      const e = err;
+      const detail = typeof e.code === "number" ? new Error(`nix path-info exited ${e.code}: ${(e.stderr ?? "").trim()}`) : err;
+      throw new RecipeUnavailableError(ref, attr, detail);
     }
-    const outPath = result.stdout.trim().split("\n")[0];
+    const outPath = stdout.trim().split("\n")[0];
     if (!outPath?.startsWith("/nix/store/")) {
-      throw new RecipeUnavailableError(ref, attr, new Error(`Unexpected output: ${result.stdout}`));
+      throw new RecipeUnavailableError(ref, attr, new Error(`Unexpected output: ${stdout}`));
     }
     return outPath;
   }
@@ -924,7 +952,7 @@ var NixRecipeProducer = class {
 function defaultRecipeProducers() {
   return [new MapRecipeProducer(), new NixRecipeProducer()];
 }
-function resolveViaProducers(ref, attr, cache, producers = defaultRecipeProducers()) {
+async function resolveViaProducers(ref, attr, cache, producers = defaultRecipeProducers()) {
   const key = `${ref}#${attr}`;
   const cached = cache.get(key);
   if (cached) return cached;
@@ -940,7 +968,7 @@ function resolveViaProducers(ref, attr, cache, producers = defaultRecipeProducer
   const log = createLogger({ kind: "mcp", subkind: "recipe-resolve" });
   log.debug("resolving recipe", { flakeRef: ref, attr });
   for (const producer of producers) {
-    const out = producer.resolve(ref, attr);
+    const out = await producer.resolve(ref, attr);
     if (out) {
       cache.set(key, out);
       log.info("resolved recipe", { flakeRef: ref, attr, outPath: out, producer: producer.kind });
@@ -1038,13 +1066,13 @@ var RESERVED_MCP_SERVER_IDS = /* @__PURE__ */ new Set([
   "skaile-workspace",
   "skaile-capabilities"
 ]);
-function resolveExternalMcpDeclarations(projectDir, sessionId) {
+async function resolveExternalMcpDeclarations(projectDir, sessionId) {
   const mcpLog = createLogger({
     kind: "mcp",
     subkind: "wiring",
     instance: sessionId ?? "no-session"
   });
-  const mcpDeclarations = loadMcpServerDeclarations(projectDir);
+  const mcpDeclarations = await loadMcpServerDeclarations(projectDir);
   mcpLog.debug("loaded MCP declarations", { count: mcpDeclarations.length });
   const recipeCache = createRecipeCache();
   const nixFlakeRef = process.env.SKAILE_NIX_FLAKE_REF ?? "/etc/skaile/flake";
@@ -1065,7 +1093,7 @@ function resolveExternalMcpDeclarations(projectDir, sessionId) {
       });
       continue;
     }
-    const resolvedDecl = resolveRecipeDeclaration(decl, nixFlakeRef, recipeCache);
+    const resolvedDecl = await resolveRecipeDeclaration(decl, nixFlakeRef, recipeCache);
     if (resolvedDecl) resolved.push(resolvedDecl);
   }
   return resolved.map((decl) => ({
@@ -1075,13 +1103,13 @@ function resolveExternalMcpDeclarations(projectDir, sessionId) {
     env: substituteWorkspaceTokenMap(decl.env, projectDir)
   }));
 }
-function resolveRecipeDeclaration(decl, nixFlakeRef, recipeCache) {
+async function resolveRecipeDeclaration(decl, nixFlakeRef, recipeCache) {
   const recipe = decl.recipe;
   const recipeLogKey = recipe.flake ? { flake: recipe.flake } : { attr: recipe.attr };
   const recipeLog = createLogger({ kind: "mcp", subkind: decl.id, instance: "recipe-resolve" });
   try {
     const recipeKey = recipe.flake ? `mcps.${decl.id}` : recipe.attr ?? `mcps.${decl.id}`;
-    const outPath = resolveRecipePath(nixFlakeRef, recipeKey, recipeCache);
+    const outPath = await resolveRecipePath(nixFlakeRef, recipeKey, recipeCache);
     const outPaths = /* @__PURE__ */ new Map([[decl.id, outPath]]);
     const resolvedCommand = decl.command ? substituteRecipeTemplating(decl.command, outPaths) : decl.command;
     const resolvedArgs = decl.args?.map((a) => substituteRecipeTemplating(a, outPaths));
@@ -1433,12 +1461,18 @@ var ExternalMcpManager = class {
 };
 
 // runner/src/mcp-prompt.ts
-function buildMcpPromptSection(declarations) {
+function buildMcpPromptSection(declarations, connected) {
   const withGuidance = declarations.filter(
     (d) => !!d.instructions && d.instructions.trim().length > 0
   );
-  if (withGuidance.length === 0) return "";
-  const lines = ["## MCP server guidance", ""];
+  const inventory = connected ?? [];
+  if (withGuidance.length === 0 && inventory.length === 0) return "";
+  const lines = ["## MCP servers", ""];
+  if (inventory.length > 0) {
+    const listed = inventory.map((s) => `\`${s.id}\` (${s.toolCount} tool${s.toolCount === 1 ? "" : "s"})`).join(", ");
+    lines.push(`Connected: ${listed}. Call their tools as \`mcp__<server>__<tool>\`.`);
+    lines.push("");
+  }
   for (const d of withGuidance) {
     lines.push(`Guidance for \`${d.id}\`:`);
     lines.push(d.instructions.trim());
@@ -1448,7 +1482,7 @@ function buildMcpPromptSection(declarations) {
 }
 
 // runner/src/resources.ts
-async function buildAgentResources(projectDir, driverType, _onLog, watch, secretProvider, sessionMeta, tokenMediator, preMintedSecrets, deferFilesystemMounts, capabilityRegistry, fallbackConnectorDeclarations) {
+async function buildAgentResources(projectDir, driverType, _onLog, watch, secretProvider, sessionMeta, tokenMediator, preMintedSecrets, deferFilesystemMounts, capabilityRegistry, fallbackConnectorDeclarations, extraMcpDeclarations) {
   const resLog = createLogger({
     kind: "runner",
     subkind: "resources",
@@ -1533,7 +1567,10 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
       workspacePluginToShutdown = inProcess.workspacePluginToShutdown;
     }
     if (capabilityRegistry) {
-      externalMcpDeclarations = resolveExternalMcpDeclarations(projectDir, sessionMeta?.sessionId);
+      externalMcpDeclarations = mergeExtraMcpDeclarations(
+        await resolveExternalMcpDeclarations(projectDir, sessionMeta?.sessionId),
+        extraMcpDeclarations
+      );
       externalMcpManager = await startExternalMcpServers(
         capabilityRegistry,
         externalMcpDeclarations,
@@ -1541,7 +1578,10 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
         sessionMeta
       );
     } else if (driverType === "claude-sdk") {
-      externalMcpDeclarations = resolveExternalMcpDeclarations(projectDir, sessionMeta?.sessionId);
+      externalMcpDeclarations = await resolveExternalMcpDeclarations(
+        projectDir,
+        sessionMeta?.sessionId
+      );
       mcpServers = wireExternalMcpServersForSdk(
         mcpServers,
         externalMcpDeclarations,
@@ -1594,7 +1634,10 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
       } catch {
       }
     };
-    const mcpPromptSection = buildMcpPromptSection(externalMcpDeclarations ?? []);
+    const mcpPromptSection = buildMcpPromptSection(
+      externalMcpDeclarations ?? [],
+      externalMcpManager?.listServers()
+    );
     return {
       resourceManager,
       resourcePromptSection,
@@ -1687,6 +1730,11 @@ async function buildInProcessMcpServers(resourceManager, projectDir, driverType,
   }
   return { mcpServers, workspacePluginToShutdown: workspacePlugin };
 }
+function mergeExtraMcpDeclarations(diskDecls, extra) {
+  if (!extra?.length) return diskDecls;
+  const declared = new Set(diskDecls.map((d) => d.id));
+  return [...diskDecls, ...extra.filter((d) => !declared.has(d.id))];
+}
 async function startExternalMcpServers(capabilityRegistry, resolvedDecls, secretProvider, sessionMeta) {
   if (resolvedDecls.length === 0) return null;
   const mgr = createExternalMcpManager(capabilityRegistry, secretProvider, sessionMeta);
@@ -1842,13 +1890,14 @@ async function createAgentSession(config) {
     config.preMintedSecrets,
     config.deferFilesystemMounts,
     config.capabilityRegistry,
-    config.fallbackConnectorDeclarations
+    config.fallbackConnectorDeclarations,
+    config.getExtraMcpDeclarations?.()
   );
   const wsConfig = wsConfigOverride ?? resolveSkWorkspaceConfig(projectDir);
   const contextSection = buildContextSection(wsConfig.agent?.context);
   const userPromptSection = wsConfig.agent?.prompt?.trim();
   const environmentSection = await buildEnvironmentSection(projectDir);
-  const promptExtensions = loadPromptExtensions(
+  const promptExtensions = await loadPromptExtensions(
     wsConfig.agent?.["prompt-extensions"],
     projectDir,
     sessionLog
@@ -1924,26 +1973,24 @@ async function createAgentSession(config) {
     systemPromptSections
   };
 }
-function loadPromptExtensions(paths, projectDir, log) {
+async function loadPromptExtensions(paths, projectDir, log) {
   if (!paths?.length) return [];
-  const result = [];
-  for (const relPath of paths) {
-    const absPath = resolve(projectDir, relPath);
-    if (!existsSync(absPath)) {
-      log.warn("prompt-extension file not found", { relPath });
-      continue;
-    }
-    try {
-      const content = readFileSync(absPath, "utf-8").trim();
-      if (content.length > 0) result.push({ value: content, source: relPath });
-    } catch (err) {
-      log.warn("could not read prompt-extension", {
-        relPath,
-        error: err.message
-      });
-    }
-  }
-  return result;
+  const loaded = await Promise.all(
+    paths.map(async (relPath) => {
+      const absPath = resolve(projectDir, relPath);
+      try {
+        const content = (await withFsDeadline(`readFile ${absPath}`, () => readFile(absPath, "utf-8"))).trim();
+        return content.length > 0 ? { value: content, source: relPath } : null;
+      } catch (err) {
+        log.warn("could not read prompt-extension", {
+          relPath,
+          error: err instanceof Error ? err.message : String(err)
+        });
+        return null;
+      }
+    })
+  );
+  return loaded.filter((e) => e !== null);
 }
 async function resolveSessionComposition(agentDir, manifest, projectDir, log) {
   if (agentDir && manifest?.composes?.length) {
@@ -2622,6 +2669,10 @@ async function handleResourceRequest(command, manager, emit) {
     });
   }
 }
+var MOUNT_LIST_MAX_DEPTH = 32;
+var MOUNT_LIST_MAX_ENTRIES = 1e4;
+var MOUNT_TREE_OP_DEADLINE_FACTOR = 4;
+var MOUNT_READ_DEADLINE_FACTOR = 4;
 function getMimeType(filename) {
   return mime.getType(filename) ?? "application/octet-stream";
 }
@@ -2654,9 +2705,23 @@ async function handleMountResourceRequest(command, manager, emit) {
       case "list": {
         const recursive = Boolean(options?.recursive);
         const collected = [];
-        const walk = (absDir, relDir) => {
-          for (const e of readdirSync(absDir, { withFileTypes: true })) {
+        const walk = async (absDir, relDir, depth) => {
+          if (depth > MOUNT_LIST_MAX_DEPTH) {
+            throw new Error(
+              `Listing "${relDir}" exceeds the maximum depth of ${MOUNT_LIST_MAX_DEPTH} \u2014 narrow the path or list without recursion`
+            );
+          }
+          const dirents = await withFsDeadline(
+            `readdir ${absDir}`,
+            () => readdir(absDir, { withFileTypes: true })
+          );
+          for (const e of dirents) {
             if (e.name.startsWith(".")) continue;
+            if (collected.length >= MOUNT_LIST_MAX_ENTRIES) {
+              throw new Error(
+                `Listing exceeds the maximum of ${MOUNT_LIST_MAX_ENTRIES} entries \u2014 ` + (recursive ? "narrow the path or list without recursion" : "narrow the path")
+              );
+            }
             const entryRel = relDir ? `${relDir}/${e.name}` : e.name;
             const isDir = e.isDirectory();
             const result = {
@@ -2666,21 +2731,30 @@ async function handleMountResourceRequest(command, manager, emit) {
             };
             if (!isDir) {
               try {
-                result.size = statSync(join(absDir, e.name)).size;
-              } catch {
+                const st = await withFsDeadline(
+                  `stat ${join(absDir, e.name)}`,
+                  () => stat(join(absDir, e.name))
+                );
+                result.size = st.size;
+              } catch (statErr) {
+                if (statErr instanceof FsDeadlineError) throw statErr;
               }
             }
             collected.push(result);
-            if (isDir && recursive) walk(join(absDir, e.name), entryRel);
+            if (isDir && recursive) await walk(join(absDir, e.name), entryRel, depth + 1);
           }
         };
-        walk(targetPath, reqPath ?? "");
+        await walk(targetPath, reqPath ?? "", 0);
         data = collected;
         break;
       }
       case "read": {
         const contentType = getMimeType(basename(targetPath));
-        const buf = readFileSync(targetPath);
+        const buf = await withFsDeadline(
+          `readFile ${targetPath}`,
+          () => readFile(targetPath),
+          fsDeadlineMs() * MOUNT_READ_DEADLINE_FACTOR
+        );
         let bytes = buf;
         const sizeFn = getAuthoritativeSize(entry.handle.state);
         if (sizeFn) {
@@ -2705,22 +2779,27 @@ async function handleMountResourceRequest(command, manager, emit) {
         break;
       }
       case "write": {
-        mkdirSync(dirname(targetPath), { recursive: true });
+        const parentDir = dirname(targetPath);
+        await withFsDeadline(`mkdir ${parentDir}`, () => mkdir(parentDir, { recursive: true }));
         const writeContent = typeof content === "string" ? content : content?.data ?? "";
         const encoding = typeof content === "string" ? void 0 : content?.encoding;
-        if (encoding === "binary") {
-          writeFileSync(targetPath, Buffer.from(writeContent, "base64"));
-        } else {
-          writeFileSync(targetPath, writeContent, "utf-8");
-        }
+        await withFsDeadline(
+          `writeFile ${targetPath}`,
+          () => encoding === "binary" ? writeFile(targetPath, Buffer.from(writeContent, "base64")) : writeFile(targetPath, writeContent, "utf-8")
+        );
         data = true;
         break;
       }
       case "delete": {
-        if (statSync(targetPath).isDirectory()) {
-          rmSync(targetPath, { recursive: true, force: true });
+        const st = await withFsDeadline(`stat ${targetPath}`, () => stat(targetPath));
+        if (st.isDirectory()) {
+          await withFsDeadline(
+            `rm -r ${targetPath}`,
+            () => rm(targetPath, { recursive: true, force: true }),
+            fsDeadlineMs() * MOUNT_TREE_OP_DEADLINE_FACTOR
+          );
         } else {
-          unlinkSync(targetPath);
+          await withFsDeadline(`unlink ${targetPath}`, () => unlink(targetPath));
         }
         data = true;
         break;
@@ -3546,8 +3625,8 @@ function toPreMinted(token) {
 function buildSessionResourceHandlers(deps) {
   const { getResourceManager, getPreMintedSecrets, emitResourcesAvailable, log, getProjectDir } = deps;
   async function add(kind, input) {
-    const rm = getResourceManager();
-    if (!rm) return { ok: false, code: "no_session", message: "session resources not ready" };
+    const rm2 = getResourceManager();
+    if (!rm2) 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" };
@@ -3561,7 +3640,7 @@ function buildSessionResourceHandlers(deps) {
         );
     }
     try {
-      await rm.connect(decl);
+      await rm2.connect(decl);
     } catch (err) {
       if (input.preMintedToken) {
         getPreMintedSecrets()?.unset(kind, decl.id);
@@ -3598,8 +3677,8 @@ function buildSessionResourceHandlers(deps) {
         message: `no materialized connector at ${join(root, name)}`
       };
     }
-    const rm = getResourceManager();
-    if (!rm) return { ok: false, code: "no_session", message: "session resources not ready" };
+    const rm2 = getResourceManager();
+    if (!rm2) 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));
@@ -3609,7 +3688,7 @@ function buildSessionResourceHandlers(deps) {
         );
     }
     try {
-      await rm.connect(decl);
+      await rm2.connect(decl);
     } catch (err) {
       if (preMintedToken) {
         getPreMintedSecrets()?.unset("connector", decl.id);
@@ -3627,13 +3706,13 @@ function buildSessionResourceHandlers(deps) {
     addMount: (input) => add("mount", input),
     attachConnectorInstance,
     removeResource: async (input) => {
-      const rm = getResourceManager();
-      if (!rm) return { ok: false, code: "no_session", message: "session resources not ready" };
-      if (!rm.has(input.id)) {
+      const rm2 = getResourceManager();
+      if (!rm2) return { ok: false, code: "no_session", message: "session resources not ready" };
+      if (!rm2.has(input.id)) {
         return { ok: false, code: "not_found", message: `no resource with id ${input.id}` };
       }
       try {
-        await rm.disconnect(input.id);
+        await rm2.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}`);
@@ -3649,8 +3728,8 @@ function buildSessionResourceHandlers(deps) {
     updateCredential: async (input) => {
       const ps = getPreMintedSecrets();
       if (!ps) return { ok: false, code: "no_session", message: "session resources not ready" };
-      const rm = getResourceManager();
-      if (rm && !rm.has(input.id)) {
+      const rm2 = getResourceManager();
+      if (rm2 && !rm2.has(input.id)) {
         return { ok: false, code: "not_found", message: `no resource with id ${input.id}` };
       }
       ps.set(input.kind, input.id, input.mint);
@@ -3662,29 +3741,48 @@ function buildSessionResourceHandlers(deps) {
 
 // runner/src/mcp-runtime-handlers.ts
 function buildMcpRuntimeHandlers(deps) {
+  const resolveManager = () => {
+    try {
+      return deps.getOrCreateMcpManager();
+    } catch (err) {
+      deps.log(
+        `[mcp-runtime] MCP manager unavailable: ${err instanceof Error ? err.message : String(err)}`
+      );
+      return null;
+    }
+  };
+  const settleLive = (decl) => {
+    try {
+      deps.registerLiveAttachedMcp(decl);
+      if (deps.driverPicksUpToolsLive()) return true;
+      deps.scheduleDriverRestartForToolChanges(`MCP server '${decl.id}'`);
+      return true;
+    } catch (err) {
+      deps.log(
+        `[mcp-runtime] settling ${decl.id} live failed: ${err instanceof Error ? err.message : String(err)}`
+      );
+      return false;
+    }
+  };
   return {
     addMcpServer: async (input) => {
       const decl = input.declaration;
       if (!decl?.id) {
         return { ok: false, code: "invalid_declaration", message: "declaration.id is required" };
       }
-      const mgr = deps.getOrCreateMcpManager();
+      const mgr = resolveManager();
       if (!mgr) return { ok: false, code: "no_session", message: "session resources not ready" };
       if (input.preMintedToken) {
         deps.getPreMintedSecrets()?.set("mcp", decl.id, toPreMinted(input.preMintedToken));
       }
       try {
         const { toolNames } = await mgr.addServer(decl);
+        const live = settleLive(decl);
         deps.emitResourcesAvailable();
         deps.log(
           `[mcp-runtime] runner.add_mcp_server connected ${decl.id} (${toolNames.length} tools)`
         );
-        return {
-          ok: true,
-          id: decl.id,
-          live: deps.driverPicksUpToolsLive(),
-          toolCount: toolNames.length
-        };
+        return { ok: true, id: decl.id, live, toolCount: toolNames.length };
       } catch (err) {
         deps.getPreMintedSecrets()?.unset("mcp", decl.id);
         const message = err instanceof Error ? err.message : String(err);
@@ -3722,23 +3820,19 @@ function buildMcpRuntimeHandlers(deps) {
           message: `no materialized mcp-server at ${subDir}`
         };
       }
-      const mgr = deps.getOrCreateMcpManager();
+      const mgr = resolveManager();
       if (!mgr) return { ok: false, code: "no_session", message: "session resources not ready" };
       if (input.preMintedToken) {
         deps.getPreMintedSecrets()?.set("mcp", decl.id, toPreMinted(input.preMintedToken));
       }
       try {
         const { toolNames } = await mgr.addServer(decl);
+        const live = settleLive(decl);
         deps.emitResourcesAvailable();
         deps.log(
           `[mcp-runtime] runner.attach_instance connected ${decl.id} (${toolNames.length} tools)`
         );
-        return {
-          ok: true,
-          id: decl.id,
-          live: deps.driverPicksUpToolsLive(),
-          toolCount: toolNames.length
-        };
+        return { ok: true, id: decl.id, live, toolCount: toolNames.length };
       } catch (err) {
         if (input.preMintedToken) deps.getPreMintedSecrets()?.unset("mcp", decl.id);
         const message = err instanceof Error ? err.message : String(err);
@@ -3982,6 +4076,8 @@ function wireSessionCapabilities(deps) {
     getCompactionOrchestrator,
     getProjectDir,
     attachSkillInstance,
+    registerLiveAttachedMcp,
+    scheduleDriverRestartForToolChanges,
     log
   } = deps;
   capabilityRegistry.setRemoteInvoker(remoteCapabilityInvoker);
@@ -3996,6 +4092,8 @@ function wireSessionCapabilities(deps) {
     getOrCreateMcpManager,
     getPreMintedSecrets: () => getPreMintedSecrets() ?? null,
     driverPicksUpToolsLive,
+    registerLiveAttachedMcp,
+    scheduleDriverRestartForToolChanges,
     emitResourcesAvailable,
     log,
     getProjectDir
@@ -4236,15 +4334,6 @@ async function buildStoreSnapshotReplay(manager, activeFlows) {
   }
   return events;
 }
-function findAiAssetsRoot(startDir) {
-  let dir = startDir;
-  for (let i = 0; i < 6; i++) {
-    const candidate = join(dir, "ai-assets");
-    if (existsSync(candidate)) return candidate;
-    dir = join(dir, "..");
-  }
-  return null;
-}
 function ensureGitConfigInclude(managedGitconfigPath) {
   const home = process.env.HOME ?? homedir();
   if (!home) return;
@@ -5031,7 +5120,11 @@ async function startAgentServer(opts) {
       ...aiProviderConfigId ? { aiProviderConfigId } : {},
       // Disk-first fallback: only consumed when skaile.yaml + materialized
       // assets yield zero connector declarations (broker mode has no yaml).
-      ...fallbackConnectorDeclarations?.length ? { fallbackConnectorDeclarations } : {}
+      ...fallbackConnectorDeclarations?.length ? { fallbackConnectorDeclarations } : {},
+      // Read per session build, not snapshotted here: this config object is
+      // built once and reused for every recreate, and a server may be attached
+      // at any point after that.
+      getExtraMcpDeclarations: () => [...liveAttachedMcpDeclarations.values()]
     };
   }
   let resolveSessionReady;
@@ -5045,6 +5138,7 @@ async function startAgentServer(opts) {
   let secretProvider;
   let runtimeIdentity;
   let preMintedSecrets;
+  const liveAttachedMcpDeclarations = /* @__PURE__ */ new Map();
   let wireAgentConfig;
   let appliedWireAgentConfigKey;
   const stagedSkillDirs = /* @__PURE__ */ new Set();
@@ -5063,7 +5157,7 @@ async function startAgentServer(opts) {
         }
       });
       if (declared.length === 0) return;
-      const staged = stageMaterializedSkills(opts.projectDir, skillsDir, { declared });
+      const staged = await stageMaterializedSkills(opts.projectDir, skillsDir, { declared });
       const newlyStaged = staged.filter((s) => !stagedSkillDirs.has(s));
       for (const s of staged) stagedSkillDirs.add(s);
       if (newlyStaged.length === 0) return;
@@ -5084,6 +5178,10 @@ async function startAgentServer(opts) {
     const servers = agentSession?.getExternalMcpManager()?.listServers() ?? [];
     bakedMcpServerIds = new Set(servers.map((s) => s.id));
   };
+  const registerLiveAttachedMcp = (decl) => {
+    liveAttachedMcpDeclarations.set(decl.id, decl);
+    bakedMcpServerIds = /* @__PURE__ */ new Set([...bakedMcpServerIds, decl.id]);
+  };
   if (secretsMode === "provisioned") {
     log("[serve] secrets mode: provisioned \u2014 waiting for provision_secrets command");
   } else {
@@ -5206,6 +5304,7 @@ async function startAgentServer(opts) {
   }
   let driverStarted = false;
   const driverSwapGate = new DriverSwapGate();
+  let driverRestartChain = Promise.resolve();
   let driver = secretsMode === "env" ? agentSession.driver : void 0;
   let secretsProvisioned = secretsMode === "env";
   function swapDriver() {
@@ -5617,6 +5716,8 @@ async function startAgentServer(opts) {
       getCompactionOrchestrator: () => compactionOrchestrator,
       getProjectDir: () => opts.projectDir,
       attachSkillInstance,
+      registerLiveAttachedMcp,
+      scheduleDriverRestartForToolChanges,
       log
     });
     return { needsWireFallbackRecreate, needsWireAgentConfigRecreate };
@@ -5774,9 +5875,9 @@ async function startAgentServer(opts) {
     log(`[serve] aiResources catalog actions: ${catalogActions.length}`);
     try {
       const skillsDir = join(sessionConfig.projectDir ?? process.cwd(), ".claude", "skills");
-      const assetsRoot = process.env.SKAILE_ASSETS_ROOT ?? findAiAssetsRoot(sessionConfig.projectDir ?? process.cwd()) ?? "/app/ai-assets";
+      const assetsRoot = process.env.SKAILE_ASSETS_ROOT ?? await findAiAssetsRoot(sessionConfig.projectDir ?? process.cwd()) ?? "/app/ai-assets";
       for (const res of catalogActions) {
-        applyCatalogAction(res, { assetsRoot, skillsDir });
+        await applyCatalogAction(res, { assetsRoot, skillsDir });
       }
       await restartDriverForSkillChanges(catalogActions);
     } catch (err) {
@@ -5789,10 +5890,10 @@ async function startAgentServer(opts) {
       });
     }
   }
-  function applyCatalogAction(res, paths) {
+  async function applyCatalogAction(res, paths) {
     if (res.action === "add" && res.entry) {
       const entry = res.entry;
-      const result = deployCatalogEntry(entry, {
+      const result = await deployCatalogEntry(entry, {
         assetsRoot: paths.assetsRoot,
         skillsDir: paths.skillsDir,
         context: res.context
@@ -5805,7 +5906,7 @@ async function startAgentServer(opts) {
         );
       }
     } else if (res.action === "remove") {
-      const removed = undeployCatalogEntry(res.name, paths.skillsDir);
+      const removed = await undeployCatalogEntry(res.name, paths.skillsDir);
       log(`[serve] ${removed ? "removed" : "not found"} skill: ${res.name}`);
     }
   }
@@ -5814,7 +5915,7 @@ async function startAgentServer(opts) {
       const { skillsDir } = resolveDriverPaths({
         driver: opts.driver ?? wsConfig.agent_config?.default?.driver ?? wireAgentConfig?.driver ?? "claude-sdk"
       });
-      const staged = stageMaterializedSkills(opts.projectDir, skillsDir, {
+      const staged = await stageMaterializedSkills(opts.projectDir, skillsDir, {
         declared: [name]
       });
       if (staged.length === 0) {
@@ -5836,14 +5937,32 @@ async function startAgentServer(opts) {
       };
     }
   }
-  async function restartDriverForSkillChanges(catalogActions) {
+  async function restartDriverForToolChanges(reason) {
     if (!driverStarted) {
-      log("[serve] aiResources applied before driver start \u2014 skills discovered on first prompt");
+      log(`[serve] ${reason} applied before driver start \u2014 picked up on the first prompt`);
       return;
     }
     const prevSessionId = driver.runtimeSessionId;
-    log(`[serve] restarting driver to pick up skill changes (resume=${prevSessionId ?? "none"})`);
+    log(`[serve] restarting driver to pick up ${reason} (resume=${prevSessionId ?? "none"})`);
     await recreateAgentSession({ resumeSessionId: prevSessionId });
+  }
+  function enqueueDriverRestart(reason) {
+    const next = driverRestartChain.then(() => restartDriverForToolChanges(reason));
+    driverRestartChain = next.catch(() => {
+    });
+    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)}`
+      );
+    });
+  }
+  async function restartDriverForSkillChanges(catalogActions) {
+    const restarted = driverStarted;
+    await enqueueDriverRestart("skill changes");
+    if (!restarted) return;
     sendEvent({
       type: "skills_changed",
       skills: catalogActions.map((a) => ({
@@ -6566,6 +6685,6 @@ function touchSession(state) {
   return { ...state, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
 }
 
-export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, DEFAULT_FLOW_MUTATE_CONNECTOR_WAIT_MS, MarkdownStreamer, PreInitRingSink, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, connectorRefreshKind, createAgentSession, createFlowConnectorReadiness, createSessionStimulusBus, defineCapability, deleteSession, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, hasNonTerminalFlow, hostOpResumeStimulus, installPreInitRingSink, isTerminalFlowStatus, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadSession, loadSessionById, mcpAuthSecretKey, newSession, pickRepointedManager, planFlowMutate, reconcilePendingDecisions, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, runAgentChat, saveSession, setCurrentSession, startAgentServer, stimulusFromMetas, touchSession, validateInputResponse, writeClaudeCodeCredentialsFile };
-//# sourceMappingURL=chunk-BG4XVMG2.js.map
-//# sourceMappingURL=chunk-BG4XVMG2.js.map
+export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, DEFAULT_FLOW_MUTATE_CONNECTOR_WAIT_MS, MOUNT_LIST_MAX_DEPTH, MOUNT_LIST_MAX_ENTRIES, MOUNT_READ_DEADLINE_FACTOR, MOUNT_TREE_OP_DEADLINE_FACTOR, MarkdownStreamer, PreInitRingSink, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, connectorRefreshKind, createAgentSession, createFlowConnectorReadiness, createSessionStimulusBus, defineCapability, deleteSession, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, hasNonTerminalFlow, hostOpResumeStimulus, installPreInitRingSink, isTerminalFlowStatus, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadSession, loadSessionById, mcpAuthSecretKey, newSession, pickRepointedManager, planFlowMutate, reconcilePendingDecisions, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, runAgentChat, saveSession, setCurrentSession, startAgentServer, stimulusFromMetas, touchSession, validateInputResponse, writeClaudeCodeCredentialsFile };
+//# sourceMappingURL=chunk-WZPADAE7.js.map
+//# sourceMappingURL=chunk-WZPADAE7.js.map