@skaile/workspaces 0.41.5 → 0.42.0

package/dist/{chunk-JILPU5VI.js → chunk-VGAHSWDE.js}

@@ -1,17 +1,17 @@
-import { WorkspacePlugin } from './chunk-IODU6UDT.js';
+import { WorkspacePlugin } from './chunk-2MVQ7UAT.js';
 import { WebSocketServerTransport } from './chunk-WQ7DE5UC.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
 import { PROTOCOL_VERSION } from './chunk-TDSRLMDB.js';
-import { EventNormalizer } from './chunk-5IXCNMMU.js';
+import { EventNormalizer } from './chunk-5C3QJSOD.js';
 import { classifyClaudeSdkError } from './chunk-GAH4YRCI.js';
-import { createDriver } from './chunk-KM6DCR7A.js';
+import { createDriver } from './chunk-OCAQH66V.js';
 import { deployCatalogEntry, undeployCatalogEntry } from './chunk-LV2HPH3C.js';
-import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools } from './chunk-2ZI2FFFN.js';
-import { loadConnectorDeclarations, SecretProviderChain, PreMintedSecretProvider, InMemorySecretProvider, deriveSingleMaterializedConnectorDeclaration } from './chunk-X4FCLBI7.js';
+import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools } from './chunk-U3RYXSI4.js';
+import { loadConnectorDeclarations, SecretProviderChain, PreMintedSecretProvider, InMemorySecretProvider, deriveSingleMaterializedConnectorDeclaration } from './chunk-R4H6EJW5.js';
 import { renderStimulusPrompt, buildOrchestratorPrompt } from './chunk-DEYYRFQU.js';
-import { resolveSettings, resolveApiKey, providerEnvKey } from './chunk-MVXXAXDW.js';
-import { resolveRuntimeAssets } from './chunk-JAOXG3LL.js';
-import { resolveSkWorkspaceConfig, resolveAgentDir, stageMaterializedSkills, loadMcpServerDeclarations, COMPACTION_DEFAULTS, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration } from './chunk-NQDJQ7WB.js';
+import { resolveSettings, resolveApiKey, providerEnvKey } from './chunk-KYQNWFJV.js';
+import { resolveRuntimeAssets } from './chunk-HVCZLD5Z.js';
+import { resolveSkWorkspaceConfig, resolveAgentDir, stageMaterializedSkills, loadMcpServerDeclarations, COMPACTION_DEFAULTS, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration } from './chunk-GJI6FZ56.js';
 import { parseAssetRef } from './chunk-GEEW6SY2.js';
 import { resolveDriverPaths } from './chunk-K5GBV4SA.js';
 import { getLogStore, resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink, registerLogStore, resetLogStore, createLogger } from './chunk-JB35MVBN.js';
@@ -19,7 +19,7 @@ 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, openSync, readSync, closeSync } from 'fs';
+import { readdirSync, existsSync, readFileSync, statSync, rmSync, unlinkSync, mkdirSync, writeFileSync, watch, chmodSync } from 'fs';
 import path4, { join, resolve, relative, sep, isAbsolute, dirname, basename } from 'path';
 import { homedir } from 'os';
 import * as z5 from 'zod';
@@ -1286,6 +1286,21 @@ var ExternalMcpManager = class {
   }
 };
 
+// runner/src/mcp-prompt.ts
+function buildMcpPromptSection(declarations) {
+  const withGuidance = declarations.filter(
+    (d) => !!d.instructions && d.instructions.trim().length > 0
+  );
+  if (withGuidance.length === 0) return "";
+  const lines = ["## MCP server guidance", ""];
+  for (const d of withGuidance) {
+    lines.push(`Guidance for \`${d.id}\`:`);
+    lines.push(d.instructions.trim());
+    lines.push("");
+  }
+  return lines.join("\n").trimEnd();
+}
+
 // runner/src/resources.ts
 async function buildAgentResources(projectDir, driverType, _onLog, watch, secretProvider, sessionMeta, tokenMediator, preMintedSecrets, deferFilesystemMounts, capabilityRegistry) {
   const resLog = createLogger({
@@ -1305,7 +1320,8 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
     getOrCreateExternalMcpManager: () => {
       throw new Error("external MCP manager unavailable \u2014 no capability registry (CLI/flow mode)");
     },
-    getExternalMcpManager: () => null
+    getExternalMcpManager: () => null,
+    mcpPromptSection: ""
   };
   try {
     registerBuiltinConnectors();
@@ -1333,6 +1349,7 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
     let mcpServers;
     let workspacePluginToShutdown = null;
     let externalMcpManager = null;
+    let externalMcpDeclarations;
     const mcpSecretChain = preMintedSecrets ? new SecretProviderChain(
       [preMintedSecrets, secretProvider].filter(
         Boolean
@@ -1364,16 +1381,24 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
       workspacePluginToShutdown = inProcess.workspacePluginToShutdown;
     }
     if (capabilityRegistry) {
+      externalMcpDeclarations = resolveExternalMcpDeclarations(
+        projectDir,
+        sessionMeta?.sessionId
+      );
       externalMcpManager = await startExternalMcpServers(
         capabilityRegistry,
-        projectDir,
+        externalMcpDeclarations,
         mcpSecretChain,
         sessionMeta
       );
     } else if (driverType === "claude-sdk") {
+      externalMcpDeclarations = resolveExternalMcpDeclarations(
+        projectDir,
+        sessionMeta?.sessionId
+      );
       mcpServers = wireExternalMcpServersForSdk(
         mcpServers,
-        projectDir,
+        externalMcpDeclarations,
         secretProvider,
         sessionMeta
       );
@@ -1415,6 +1440,7 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
       } catch {
       }
     };
+    const mcpPromptSection = buildMcpPromptSection(externalMcpDeclarations ?? []);
     return {
       resourceManager,
       resourcePromptSection,
@@ -1423,7 +1449,8 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
       dispose,
       startWatching,
       getOrCreateExternalMcpManager,
-      getExternalMcpManager: () => externalMcpManager
+      getExternalMcpManager: () => externalMcpManager,
+      mcpPromptSection
     };
   } catch {
     return noopResult;
@@ -1505,8 +1532,7 @@ async function buildInProcessMcpServers(resourceManager, projectDir, driverType,
   }
   return { mcpServers, workspacePluginToShutdown: workspacePlugin };
 }
-async function startExternalMcpServers(capabilityRegistry, projectDir, secretProvider, sessionMeta) {
-  const resolvedDecls = resolveExternalMcpDeclarations(projectDir, sessionMeta?.sessionId);
+async function startExternalMcpServers(capabilityRegistry, resolvedDecls, secretProvider, sessionMeta) {
   if (resolvedDecls.length === 0) return null;
   const mgr = createExternalMcpManager(capabilityRegistry, secretProvider, sessionMeta);
   await mgr.start(resolvedDecls);
@@ -1550,13 +1576,12 @@ function buildMcpReauthorizer(capabilityRegistry, secretProvider, sessionId) {
     return true;
   };
 }
-function wireExternalMcpServersForSdk(mcpServers, projectDir, secretProvider, sessionMeta) {
+function wireExternalMcpServersForSdk(mcpServers, resolvedDecls, secretProvider, sessionMeta) {
   const mcpLog = createLogger({
     kind: "mcp",
     subkind: "wiring",
     instance: sessionMeta?.sessionId ?? "no-session"
   });
-  const resolvedDecls = resolveExternalMcpDeclarations(projectDir, sessionMeta?.sessionId);
   for (const decl of resolvedDecls) {
     const serverConfig = toSdkMcpServerConfig(
       decl,
@@ -1643,7 +1668,8 @@ async function createAgentSession(config) {
     dispose,
     startWatching,
     getOrCreateExternalMcpManager,
-    getExternalMcpManager
+    getExternalMcpManager,
+    mcpPromptSection
   } = await buildAgentResources(
     projectDir,
     driverType,
@@ -1682,6 +1708,7 @@ async function createAgentSession(config) {
     userPromptSection,
     environmentSection,
     resourcePromptSection,
+    mcpPromptSection,
     promptExtensions,
     compositionBlocks,
     additionalSections
@@ -1691,6 +1718,7 @@ async function createAgentSession(config) {
     userPromptSection,
     environmentSection,
     resourcePromptSection,
+    mcpPromptSection,
     ...promptExtensions.map((e) => e.value),
     ...compositionBlocks.map((b) => b.content),
     ...additionalSections
@@ -1776,6 +1804,7 @@ function buildSystemPromptSections(parts) {
     userPromptSection,
     environmentSection,
     resourcePromptSection,
+    mcpPromptSection,
     promptExtensions,
     compositionBlocks,
     additionalSections
@@ -1787,6 +1816,8 @@ function buildSystemPromptSections(parts) {
     systemPromptSections.push({ label: "environment", value: environmentSection });
   if (resourcePromptSection)
     systemPromptSections.push({ label: "resources", value: resourcePromptSection });
+  if (mcpPromptSection)
+    systemPromptSections.push({ label: "mcp-guidance", value: mcpPromptSection });
   for (const ext of promptExtensions) {
     systemPromptSections.push({
       label: "prompt-extensions",
@@ -2400,27 +2431,18 @@ async function handleResourceRequest(command, manager, emit) {
 function getMimeType(filename) {
   return mime.getType(filename) ?? "application/octet-stream";
 }
-var HTML_CLOSE_TAG_RE = /<\/html>/i;
-function stripStaleHtmlTail(content, contentType) {
-  if (!contentType.toLowerCase().startsWith("text/html")) return content;
-  const m = HTML_CLOSE_TAG_RE.exec(content);
-  return m ? content.slice(0, m.index + m[0].length) : content;
-}
-function isBinaryFile(filePath) {
-  try {
-    const fd = openSync(filePath, "r");
-    const buf = Buffer.alloc(8192);
-    const bytesRead = readSync(fd, buf, 0, 8192, 0);
-    closeSync(fd);
-    for (let i = 0; i < bytesRead; i++) {
-      if (buf[i] === 0) return true;
-    }
-    return false;
-  } catch {
-    return false;
+function isBinaryBuffer(buf) {
+  const limit = Math.min(buf.length, 8192);
+  for (let i = 0; i < limit; i++) {
+    if (buf[i] === 0) return true;
   }
+  return false;
 }
-function handleMountResourceRequest(command, manager, emit) {
+function getAuthoritativeSize(state) {
+  const provider = state;
+  return typeof provider?.authoritativeSize === "function" ? (relPath) => provider.authoritativeSize(relPath) : void 0;
+}
+async function handleMountResourceRequest(command, manager, emit) {
   const { requestId, connectorId: mountId, operation, path: reqPath, options, content } = command;
   try {
     const entry = manager.get(mountId);
@@ -2464,16 +2486,24 @@ function handleMountResourceRequest(command, manager, emit) {
       }
       case "read": {
         const contentType = getMimeType(basename(targetPath));
-        if (isBinaryFile(targetPath)) {
-          const buf = readFileSync(targetPath);
+        const buf = readFileSync(targetPath);
+        let bytes = buf;
+        const sizeFn = getAuthoritativeSize(entry.handle.state);
+        if (sizeFn) {
+          const authSize = await sizeFn(reqPath ?? "");
+          if (authSize !== null && authSize >= 0 && authSize < buf.length) {
+            bytes = buf.subarray(0, authSize);
+          }
+        }
+        if (isBinaryBuffer(bytes)) {
           data = {
-            data: buf.toString("base64"),
+            data: bytes.toString("base64"),
             contentType,
             encoding: "binary"
           };
         } else {
           data = {
-            data: stripStaleHtmlTail(readFileSync(targetPath, "utf-8"), contentType),
+            data: bytes.toString("utf-8"),
             contentType,
             encoding: "utf-8"
           };
@@ -3290,7 +3320,10 @@ function buildMcpRuntimeHandlers(deps) {
   };
 }
 function parseFleetHealthBody(body) {
-  return body.trim().toLowerCase() === "healthy" ? "healthy" : "error";
+  const trimmed = body.trim().toLowerCase();
+  if (trimmed === "healthy") return "healthy";
+  if (trimmed === "degraded") return "degraded";
+  return "error";
 }
 async function dispatchFleetHealthFlag(dir, fileName, manager, log) {
   if (!manager) return;
@@ -3782,9 +3815,12 @@ function splitConnectorsForWire(manager) {
   }
   return { mounts, connectors };
 }
-function buildResourcesAvailablePayload(manager, mcpManager, driverLive) {
+function buildResourcesAvailablePayload(manager, mcpManager, driverLive, bakedServerIds) {
   const { mounts, connectors } = splitConnectorsForWire(manager);
-  const mcp_servers = (mcpManager?.listServers() ?? []).map((s) => ({ ...s, live: driverLive }));
+  const mcp_servers = (mcpManager?.listServers() ?? []).map((s) => ({
+    ...s,
+    live: driverLive || (bakedServerIds?.has(s.id) ?? false)
+  }));
   return { type: "resources_available", mounts, connectors, mcp_servers };
 }
 function findAiAssetsRoot(startDir) {
@@ -4128,6 +4164,11 @@ async function startAgentServer(opts) {
     } catch {
     }
   }
+  let bakedMcpServerIds = /* @__PURE__ */ new Set();
+  const captureBakedMcpServers = () => {
+    const servers = agentSession?.getExternalMcpManager()?.listServers() ?? [];
+    bakedMcpServerIds = new Set(servers.map((s) => s.id));
+  };
   if (secretsMode === "provisioned") {
     log("[serve] secrets mode: provisioned \u2014 waiting for provision_secrets command");
   } else {
@@ -4136,6 +4177,7 @@ async function startAgentServer(opts) {
     emitSystemPromptComposed(agentSession, sendEvent);
     registerSessionComposition(agentSession);
     resolveSessionReady();
+    captureBakedMcpServers();
   }
   let resourceManager = secretsMode === "env" ? agentSession.resourceManager : null;
   if (secretsMode === "env") {
@@ -4392,6 +4434,7 @@ async function startAgentServer(opts) {
             normalizer.reset();
             driverStarted = false;
             rebuildCompactionOrchestrator();
+            captureBakedMcpServers();
           }
           driver.config.mcpServers = { "skaile-connectors": server };
           log(`[serve] rebuilt MCP connector tools for flow ${connectorId}`);
@@ -4568,9 +4611,11 @@ async function startAgentServer(opts) {
         buildResourcesAvailablePayload(
           resourceManager,
           agentSession?.getExternalMcpManager(),
-          driverPicksUpToolsLive()
+          driverPicksUpToolsLive(),
+          bakedMcpServerIds
         )
       );
+      captureBakedMcpServers();
       emitResourcesAvailable();
       agentSession.startWatching();
       capabilityRegistry.setRemoteInvoker(remoteCapabilityInvoker);
@@ -4634,6 +4679,7 @@ async function startAgentServer(opts) {
     normalizer.reset();
     driverStarted = false;
     rebuildCompactionOrchestrator();
+    captureBakedMcpServers();
   }
   async function applyInitSharedState(sharedState) {
     if (!ensureResourceManagerForSharedState()) {
@@ -4822,6 +4868,7 @@ async function startAgentServer(opts) {
     normalizer.reset();
     driverStarted = false;
     rebuildCompactionOrchestrator();
+    captureBakedMcpServers();
     sendEvent({
       type: "skills_changed",
       skills: catalogActions.map((a) => ({
@@ -5025,7 +5072,7 @@ async function startAgentServer(opts) {
   async function handleResourceRequestCommand(cmd) {
     if (!await awaitSessionReadyOrFail()) return;
     if (resourceManager?.has(cmd.connectorId)) {
-      handleMountResourceRequest(cmd, resourceManager, sendEvent);
+      await handleMountResourceRequest(cmd, resourceManager, sendEvent);
       return;
     }
     if (!resourceManager) {
@@ -5349,7 +5396,8 @@ async function startAgentServer(opts) {
       const payload = buildResourcesAvailablePayload(
         resourceManager,
         agentSession?.getExternalMcpManager() ?? null,
-        driverLive
+        driverLive,
+        bakedMcpServerIds
       );
       log(
         `[serve] emitting resources_available: ${payload.mounts.length} mount(s), ${payload.connectors.length} connector(s)`
@@ -5537,6 +5585,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, MarkdownStreamer, PreInitRingSink, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, builtinCapabilities, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, createAgentSession, createSessionStimulusBus, defineCapability, deleteSession, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureGitConfigInclude, extractClaudeAiOauthExpiresAt, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, installPreInitRingSink, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadSession, loadSessionById, mcpAuthSecretKey, newSession, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveMixin, runAgentChat, saveSession, setCurrentSession, startAgentServer, stripStaleHtmlTail, touchSession, writeClaudeCodeCredentialsFile };
-//# sourceMappingURL=chunk-JILPU5VI.js.map
-//# sourceMappingURL=chunk-JILPU5VI.js.map
+export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, MarkdownStreamer, PreInitRingSink, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, builtinCapabilities, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, createAgentSession, createSessionStimulusBus, defineCapability, deleteSession, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureGitConfigInclude, extractClaudeAiOauthExpiresAt, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, installPreInitRingSink, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadSession, loadSessionById, mcpAuthSecretKey, newSession, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveMixin, runAgentChat, saveSession, setCurrentSession, startAgentServer, touchSession, writeClaudeCodeCredentialsFile };
+//# sourceMappingURL=chunk-VGAHSWDE.js.map
+//# sourceMappingURL=chunk-VGAHSWDE.js.map