@skaile/workspaces 0.36.0 → 0.37.0

package/dist/{chunk-FDLVPYSN.js → chunk-DAEYSPOC.js}

@@ -1,4 +1,4 @@
-import { WorkspacePlugin } from './chunk-YPRW2ROJ.js';
+import { WorkspacePlugin } from './chunk-CCQ3EMJT.js';
 import { WebSocketServerTransport } from './chunk-WQ7DE5UC.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
 import { PROTOCOL_VERSION } from './chunk-TDSRLMDB.js';
@@ -6,12 +6,12 @@ import { EventNormalizer } from './chunk-5IXCNMMU.js';
 import { classifyClaudeSdkError } from './chunk-GAH4YRCI.js';
 import { createDriver } from './chunk-KM6DCR7A.js';
 import { deployCatalogEntry, undeployCatalogEntry } from './chunk-LV2HPH3C.js';
-import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools } from './chunk-JNH6TTIO.js';
-import { loadConnectorDeclarations, SecretProviderChain, PreMintedSecretProvider, InMemorySecretProvider } from './chunk-MCQ4TJ3P.js';
+import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools } from './chunk-3HR6IN5B.js';
+import { loadConnectorDeclarations, SecretProviderChain, PreMintedSecretProvider, InMemorySecretProvider } from './chunk-CC5ZHSHJ.js';
 import { renderStimulusPrompt, buildOrchestratorPrompt } from './chunk-DEYYRFQU.js';
-import { resolveSettings, resolveApiKey, providerEnvKey } from './chunk-2Q6OY3SU.js';
-import { resolveRuntimeAssets } from './chunk-5DPQ766L.js';
-import { resolveSkWorkspaceConfig, resolveAgentDir, stageMaterializedSkills, loadMcpServerDeclarations, COMPACTION_DEFAULTS, validateAssetRecipeAttr } from './chunk-56YT6CWS.js';
+import { resolveSettings, resolveApiKey, providerEnvKey } from './chunk-FBIQ4QPF.js';
+import { resolveRuntimeAssets } from './chunk-CFCSDZYF.js';
+import { resolveSkWorkspaceConfig, resolveAgentDir, stageMaterializedSkills, loadMcpServerDeclarations, COMPACTION_DEFAULTS, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration } from './chunk-HL66R2P2.js';
 import { parseAssetRef } from './chunk-BM7XANVN.js';
 import { resolveDriverPaths } from './chunk-K5GBV4SA.js';
 import { getLogStore, resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink, registerLogStore, resetLogStore, createLogger } from './chunk-JB35MVBN.js';
@@ -882,6 +882,14 @@ function validateSubstitutedPaths(command, args) {
 }
 
 // runner/src/external-mcp.ts
+var McpServerAlreadyRegisteredError = class extends Error {
+  constructor(id) {
+    super(`MCP server '${id}' is already registered`);
+    this.id = id;
+    this.name = "McpServerAlreadyRegisteredError";
+  }
+  id;
+};
 function resolveRecordSecrets(record, secrets) {
   if (!secrets) return record;
   const resolved = {};
@@ -1086,7 +1094,7 @@ var ExternalMcpManager = class {
    */
   async addServer(decl) {
     if (this.servers.some((s) => s.id === decl.id)) {
-      throw new Error(`MCP server '${decl.id}' is already registered`);
+      throw new McpServerAlreadyRegisteredError(decl.id);
     }
     const client = await this.connectWithReauth(decl);
     const server = { id: decl.id, decl, client, toolNames: [] };
@@ -3040,7 +3048,57 @@ function buildMcpRuntimeHandlers(deps) {
       } catch (err) {
         deps.getPreMintedSecrets()?.unset("mcp", decl.id);
         const message = err instanceof Error ? err.message : String(err);
-        const code = message.includes("already registered") ? "mcp_already_registered" : "mcp_connect_failed";
+        const code = err instanceof McpServerAlreadyRegisteredError ? "mcp_already_registered" : "mcp_connect_failed";
+        return { ok: false, code, message };
+      }
+    },
+    attachInstance: async (input) => {
+      if (input.kind !== "mcp-server") {
+        return {
+          ok: false,
+          code: "unsupported_kind",
+          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"
+        };
+      }
+      if (!deps.getProjectDir) {
+        return { ok: false, code: "no_project_dir", message: "getProjectDir not configured" };
+      }
+      const subDir = join(deps.getProjectDir(), ".skaile/assets/mcp-server", input.name);
+      const decl = deriveSingleMaterializedMcpDeclaration(subDir, input.name);
+      if (!decl) {
+        return {
+          ok: false,
+          code: "not_materialized",
+          message: `no materialized mcp-server at ${subDir}`
+        };
+      }
+      const mgr = deps.getOrCreateMcpManager();
+      if (!mgr) return { ok: false, code: "no_session", message: "session resources not ready" };
+      try {
+        const { toolNames } = await mgr.addServer(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
+        };
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        const code = err instanceof McpServerAlreadyRegisteredError ? "mcp_already_registered" : "mcp_connect_failed";
         return { ok: false, code, message };
       }
     }
@@ -3141,6 +3199,10 @@ var addMcpServerInputSchema = z5.strictObject({
   declaration: requiredUnknown,
   preMintedToken: preMintedTokenSchema
 });
+var attachInstanceInputSchema = z5.strictObject({
+  kind: z5.string(),
+  name: z5.string()
+});
 var removeResourceInput = z5.strictObject({
   id: z5.string()
 });
@@ -3219,6 +3281,20 @@ function buildRunnerCapabilities(handlers) {
         });
       }
     }),
+    defineCapability({
+      name: "runner.attach_instance",
+      displayName: "Attach instance",
+      description: "Materialize-then-attach-by-ref: the platform writes the asset to .skaile/assets/ then invokes this cap; the runner self-derives the declaration from disk and attaches it live.",
+      side: "agent",
+      origin: RUNNER_CAP_ORIGIN,
+      audience: ["runtime"],
+      kind: "effect",
+      input: attachInstanceInputSchema,
+      handler: async (input) => {
+        if (!handlers.attachInstance) return notImplemented("runner.attach_instance");
+        return handlers.attachInstance({ kind: input.kind, name: input.name });
+      }
+    }),
     defineCapability({
       name: "runner.remove_resource",
       displayName: "Remove resource",
@@ -4294,14 +4370,15 @@ async function startAgentServer(opts) {
           emitResourcesAvailable,
           log
         }),
-        // runner.add_mcp_server — wired to the live session's lazily-created
-        // ExternalMcpManager + PreMintedSecretProvider.
+        // runner.add_mcp_server + runner.attach_instance — wired to the live
+        // session's lazily-created ExternalMcpManager + PreMintedSecretProvider.
         ...buildMcpRuntimeHandlers({
           getOrCreateMcpManager: () => agentSession?.getOrCreateExternalMcpManager() ?? null,
           getPreMintedSecrets: () => preMintedSecrets ?? null,
           driverPicksUpToolsLive,
           emitResourcesAvailable,
-          log
+          log,
+          getProjectDir: () => opts.projectDir
         }),
         // setLogLevel left undefined (the cap self-falls-back to getLogStore);
         // setState remains a stub (not resource hot-plug).
@@ -5195,5 +5272,5 @@ function touchSession(state) {
 }
 
 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-FDLVPYSN.js.map
-//# sourceMappingURL=chunk-FDLVPYSN.js.map
+//# sourceMappingURL=chunk-DAEYSPOC.js.map
+//# sourceMappingURL=chunk-DAEYSPOC.js.map