@skaile/workspaces 0.8.5 → 0.9.1

package/dist/{chunk-NYJKXVG6.js → chunk-QZ6PY73K.js}

@@ -1,27 +1,26 @@
-import { WorkspacePlugin } from './chunk-MJHLQRJJ.js';
+import { WorkspacePlugin } from './chunk-5IC6CJL4.js';
 import { PROTOCOL_VERSION } from './chunk-O5AE4QDX.js';
-import { WebSocketServerTransport } from './chunk-XOSBNBB6.js';
-import { EventNormalizer } from './chunk-CCKGX5AS.js';
+import { WebSocketServerTransport } from './chunk-PBWMV5GM.js';
+import { EventNormalizer } from './chunk-K3TMZI6D.js';
 import { classifyClaudeSdkError } from './chunk-EWP5HZBV.js';
-import { createDriver } from './chunk-MBBTBKAS.js';
+import { createDriver } from './chunk-AE6GCXGL.js';
 import { deployCatalogEntry, undeployCatalogEntry } from './chunk-LV2HPH3C.js';
-import { registerBuiltinConnectorAdapters, registerBuiltinMountDrivers, findMissingPackages, installNpmPackages, MountManager, MountStartupError, ConnectorManager, buildMountPromptSection, buildConnectorPromptSection, buildSdkConnectorTools } from './chunk-3W7Z74ZP.js';
-import { loadMountDeclarations, loadConnectorDeclarations, PreMintedSecretProvider, InMemorySecretProvider } from './chunk-Q5URN24L.js';
+import { registerBuiltinConnectors, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildConnectorPromptSection, buildSdkConnectorTools } from './chunk-EPGHAOEU.js';
+import { loadConnectorDeclarations, PreMintedSecretProvider, InMemorySecretProvider } from './chunk-W75ASXH4.js';
 import { renderStimulusPrompt, buildOrchestratorPrompt } from './chunk-GZWJGNNN.js';
-import { resolveSettings, resolveApiKey, providerEnvKey } from './chunk-65CYXYUW.js';
-import { resolveRuntimeAssets } from './chunk-XEGHWFAX.js';
-import { loadMcpServerDeclarations, resolveSkWorkspaceConfig, resolveAgentDir, validateAssetRecipeAttr, COMPACTION_DEFAULTS } from './chunk-CSUBFKAN.js';
-import { getLogStore, resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink, registerLogStore, resetLogStore, createLogger } from './chunk-V37HONL7.js';
+import { resolveSettings, resolveApiKey, providerEnvKey } from './chunk-4RUVG5GX.js';
+import { resolveRuntimeAssets } from './chunk-SVNFQSU3.js';
+import { loadMcpServerDeclarations, resolveSkWorkspaceConfig, resolveAgentDir, validateAssetRecipeAttr, COMPACTION_DEFAULTS } from './chunk-GAZINYCS.js';
+import { getLogStore, resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink, registerLogStore, resetLogStore, createLogger } from './chunk-24UIWON4.js';
 import { __require } from './chunk-NSBPE2FW.js';
 import pc from 'picocolors';
 import { Marked } from 'marked';
 import { markedTerminal } from 'marked-terminal';
-import { readdirSync, existsSync, readFileSync, unlinkSync, writeFileSync, statSync, mkdirSync, watch, openSync, readSync, closeSync } from 'fs';
-import path4, { join, resolve, basename, dirname, relative } from 'path';
+import { readdirSync, existsSync, readFileSync, unlinkSync, mkdirSync, writeFileSync, statSync, watch, openSync, readSync, closeSync } from 'fs';
+import path4, { join, resolve, dirname, basename, relative } from 'path';
 import { homedir } from 'os';
-import * as z4 from 'zod';
+import * as z5 from 'zod';
 import { z } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
 import fs4, { mkdir, writeFile, rename } from 'fs/promises';
 import { createHash, randomUUID } from 'crypto';
 import { execFile, spawnSync } from 'child_process';
@@ -220,8 +219,14 @@ function buildContextSection(context) {
   return lines.join("\n");
 }
 function defineCapability(args) {
-  const inputSchema = zodToJsonSchema(args.input, { $refStrategy: "none" });
-  const outputSchema = args.output ? zodToJsonSchema(args.output, { $refStrategy: "none" }) : void 0;
+  const inputSchema = z5.toJSONSchema(args.input, {
+    target: "draft-07",
+    io: "input"
+  });
+  const outputSchema = args.output ? z5.toJSONSchema(args.output, {
+    target: "draft-07",
+    io: "output"
+  }) : void 0;
   return {
     name: args.name,
     displayName: args.displayName,
@@ -560,7 +565,7 @@ function registerCompositionCapabilities(registry, entries) {
       scope: "session",
       kind: "query",
       userInvokable: false,
-      input: z4.object({}).strict(),
+      input: z5.strictObject({}),
       handler: async (_args, ctx) => {
         ctx.log.info("loading composed asset content", {
           ref: entry.ref,
@@ -815,7 +820,6 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
   });
   const noopResult = {
     resourceManager: null,
-    mountManager: null,
     resourcePromptSection: "",
     mcpServers: void 0,
     runtimeAssets: null,
@@ -825,8 +829,7 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
     }
   };
   try {
-    registerBuiltinConnectorAdapters();
-    registerBuiltinMountDrivers();
+    registerBuiltinConnectors();
     const runtimeAssets = await resolveRuntimeAssets(projectDir);
     for (const w of runtimeAssets.warnings) {
       resLog.warn("runtime asset warning", { code: w.code, message: w.message });
@@ -842,62 +845,40 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
         }
       }
     }
-    const mountDeclarations = loadMountDeclarations(projectDir);
-    let mountMgr = null;
-    if (mountDeclarations.length > 0) {
-      mountMgr = new MountManager(projectDir, {
+    const connectorDeclarations = loadConnectorDeclarations(projectDir);
+    let resourceManager = null;
+    if (connectorDeclarations.length > 0) {
+      resourceManager = new ConnectorManager(projectDir, {
         secrets: secretProvider,
         catalogEntries: runtimeAssets.catalogEntries,
         tokenMediator,
         preMintedSecrets
       });
       try {
-        const mountReport = await mountMgr.mountAll(mountDeclarations, {
+        const report = await resourceManager.connectAll(connectorDeclarations, {
           failOnReadWriteError: true
         });
-        for (const r of mountReport.results) {
-          if (r.mounted) {
-            resLog.info("mount ok", { id: r.id, mountPath: r.mountPath });
+        for (const r of report.results) {
+          if (r.connected) {
+            resLog.info("connector ok", { id: r.id, mountPath: r.mountPath });
           } else {
-            resLog.error("mount failed", void 0, { id: r.id, error: r.error });
+            resLog.error("connector failed", void 0, { id: r.id, error: r.error });
           }
         }
       } catch (err) {
-        if (err instanceof MountStartupError) {
+        if (err instanceof ConnectorStartupError) {
           for (const r of err.report.results) {
-            if (r.mounted) {
-              resLog.info("mount ok", { id: r.id, mountPath: r.mountPath });
+            if (r.connected) {
+              resLog.info("connector ok", { id: r.id, mountPath: r.mountPath });
             } else {
-              resLog.error("mount failed", void 0, { id: r.id, error: r.error });
+              resLog.error("connector failed", void 0, { id: r.id, error: r.error });
             }
           }
         }
         throw err;
       }
     }
-    const connectorDeclarations = loadConnectorDeclarations(projectDir);
-    let resourceManager = null;
-    if (connectorDeclarations.length > 0) {
-      resourceManager = new ConnectorManager(secretProvider, {
-        catalogEntries: runtimeAssets.catalogEntries
-      });
-      const report = await resourceManager.connectAll(connectorDeclarations);
-      for (const r of report.results) {
-        if (r.connected) {
-          resLog.info("connector ok", { id: r.id });
-        } else {
-          resLog.error("connector failed", void 0, { id: r.id, error: r.error });
-        }
-      }
-    }
-    const promptParts = [];
-    if (mountMgr) {
-      promptParts.push(buildMountPromptSection(mountMgr));
-    }
-    if (resourceManager) {
-      promptParts.push(buildConnectorPromptSection(resourceManager, driverType));
-    }
-    const resourcePromptSection = promptParts.filter(Boolean).join("\n\n");
+    const resourcePromptSection = resourceManager ? buildConnectorPromptSection(resourceManager) : "";
     const mcpLog = createLogger({
       kind: "mcp",
       subkind: "wiring",
@@ -925,7 +906,6 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
       }
       const workspacePlugin = new WorkspacePlugin({
         projectDir,
-        mountManager: mountMgr ?? void 0,
         connectorManager: resourceManager ?? void 0,
         driver: driverType,
         provider: sessionMeta?.provider,
@@ -1033,13 +1013,8 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
         }
       }
     }
-    if (!mountMgr && !resourceManager && driverType !== "claude-sdk") return noopResult;
+    if (!resourceManager && driverType !== "claude-sdk") return noopResult;
     const startWatching = () => {
-      if (mountMgr && watch?.onMountChanged) {
-        mountMgr.watchAll((mountId, event) => {
-          watch.onMountChanged(mountId, event);
-        });
-      }
       if (resourceManager && watch?.onFileChanged) {
         const dedupTtlMs = watch.dedupTtlMs ?? 500;
         const recentlyEmitted = /* @__PURE__ */ new Map();
@@ -1065,10 +1040,6 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
         } catch {
         }
       }
-      try {
-        await mountMgr?.unmountAll();
-      } catch {
-      }
       try {
         await resourceManager?.disconnectAll();
       } catch {
@@ -1076,7 +1047,6 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
     };
     return {
       resourceManager,
-      mountManager: mountMgr,
       resourcePromptSection,
       mcpServers,
       runtimeAssets,
@@ -1156,7 +1126,6 @@ async function createAgentSession(config) {
   const manifest = agentDir ? await loadAgentManifest(agentDir) : void 0;
   const {
     resourceManager,
-    mountManager,
     resourcePromptSection,
     mcpServers,
     runtimeAssets,
@@ -1276,7 +1245,6 @@ async function createAgentSession(config) {
   return {
     driver,
     resourceManager,
-    mountManager,
     runtimeAssets,
     composition,
     manifest,
@@ -1449,30 +1417,14 @@ function isBinaryFile(filePath) {
     return false;
   }
 }
-function handleMountResourceRequest(command, volManager, emit) {
-  const { requestId, connectorId: mountId, operation, path: reqPath, content, options } = command;
-  if (options?._customOp === "resolveWebUrl") {
-    void (async () => {
-      try {
-        const vol = volManager.get(mountId);
-        const driver = vol.driver;
-        const url = typeof driver.resolveWebUrl === "function" ? await driver.resolveWebUrl(vol.handle, reqPath ?? "") : null;
-        emit({ type: "resource_response", requestId, resourceId: mountId, operation, data: url });
-      } catch (err) {
-        emit({
-          type: "resource_response",
-          requestId,
-          resourceId: mountId,
-          operation,
-          error: err instanceof Error ? err.message : String(err)
-        });
-      }
-    })();
-    return;
-  }
+function handleMountResourceRequest(command, manager, emit) {
+  const { requestId, connectorId: mountId, operation, path: reqPath, content } = command;
   try {
-    const vol = volManager.get(mountId);
-    const mountPath = vol.handle.mountPath;
+    const entry = manager.get(mountId);
+    const mountPath = entry.handle.mountPath;
+    if (!mountPath) {
+      throw new Error(`Connector "${mountId}" has no projected mount directory`);
+    }
     const targetPath = reqPath ? resolve(mountPath, reqPath) : mountPath;
     if (!targetPath.startsWith(mountPath)) {
       throw new Error("Path traversal outside mount");
@@ -1517,8 +1469,14 @@ function handleMountResourceRequest(command, volManager, emit) {
         break;
       }
       case "write": {
+        mkdirSync(dirname(targetPath), { recursive: true });
         const writeContent = typeof content === "string" ? content : content?.data ?? "";
-        writeFileSync(targetPath, writeContent, "utf-8");
+        const encoding = typeof content === "string" ? void 0 : content?.encoding;
+        if (encoding === "binary") {
+          writeFileSync(targetPath, Buffer.from(writeContent, "base64"));
+        } else {
+          writeFileSync(targetPath, writeContent, "utf-8");
+        }
         data = true;
         break;
       }
@@ -1543,39 +1501,41 @@ function handleMountResourceRequest(command, volManager, emit) {
 }
 
 // runner/src/refresh-flag-dispatcher.ts
-async function dispatchRefreshToExposedGitMounts(mountManager, log) {
-  if (!mountManager) return;
-  let gitMounts;
+async function dispatchRefreshToExposedGitMounts(manager, log) {
+  if (!manager) return;
+  let gitConnectors;
   try {
-    gitMounts = mountManager.listGitMounts();
+    gitConnectors = manager.listGitConnectors();
   } catch (err) {
-    log.warn("listGitMounts failed during refresh-flag dispatch", {
+    log.warn("listGitConnectors failed during refresh-flag dispatch", {
       error: err instanceof Error ? err.message : String(err)
     });
     return;
   }
-  const eligible = gitMounts.filter((m) => m.exposeAccessToken === true && m.auth === "backend");
+  const eligible = gitConnectors.filter(
+    (m) => m.exposeAccessToken === true && m.auth === "backend"
+  );
   if (eligible.length === 0) {
-    log.debug("refresh-flag fired but no eligible git mounts (Tier-2 backend) found");
+    log.debug("refresh-flag fired but no eligible git connectors (Tier-2 backend) found");
     return;
   }
   log.info("refresh-flag fired -- dispatching backend mediation", {
-    mountIds: eligible.map((m) => m.id)
+    connectorIds: eligible.map((m) => m.id)
   });
   await Promise.all(
     eligible.map(async (m) => {
       try {
-        const entry = mountManager.get(m.id);
-        if (typeof entry.driver.refreshExposedCredential !== "function") {
-          log.debug("driver lacks refreshExposedCredential -- skipping", {
-            mountId: m.id
+        const entry = manager.get(m.id);
+        if (typeof entry.connector.refreshExposedCredential !== "function") {
+          log.debug("connector lacks refreshExposedCredential -- skipping", {
+            connectorId: m.id
           });
           return;
         }
-        await entry.driver.refreshExposedCredential(m.id, entry.handle);
+        await entry.connector.refreshExposedCredential(m.id, entry.handle);
       } catch (err) {
-        log.warn("refresh-flag dispatch failed for mount", {
-          mountId: m.id,
+        log.warn("refresh-flag dispatch failed for connector", {
+          connectorId: m.id,
           error: err instanceof Error ? err.message : String(err)
         });
       }
@@ -1596,11 +1556,11 @@ function keywordSearch(capabilities, query, limit) {
   return scored.slice(0, limit).map((x) => x.cap);
 }
 function builtinCapabilities(registry) {
-  const listFilterSchema = z4.object({
-    side: z4.enum(["client", "agent"]).optional(),
-    originKind: z4.enum(["framework", "client", "agent", "flow", "skill", "mcp", "connector", "mount"]).optional(),
-    scope: z4.enum(["session", "turn"]).optional()
-  }).strict();
+  const listFilterSchema = z5.strictObject({
+    side: z5.enum(["client", "agent"]).optional(),
+    originKind: z5.enum(["framework", "client", "agent", "flow", "skill", "mcp", "connector", "mount"]).optional(),
+    scope: z5.enum(["session", "turn"]).optional()
+  });
   return [
     defineCapability({
       name: "__capabilities.list",
@@ -1625,10 +1585,10 @@ function builtinCapabilities(registry) {
       origin: { kind: "framework" },
       kind: "query",
       userInvokable: false,
-      input: z4.object({
-        query: z4.string(),
-        limit: z4.number().int().positive().optional()
-      }).strict(),
+      input: z5.strictObject({
+        query: z5.string(),
+        limit: z5.number().int().positive().optional()
+      }),
       handler: async ({ query, limit }) => keywordSearch(registry.list(), query, limit ?? 10)
     }),
     defineCapability({
@@ -1639,7 +1599,7 @@ function builtinCapabilities(registry) {
       origin: { kind: "framework" },
       kind: "query",
       userInvokable: false,
-      input: z4.object({ name: z4.string() }).strict(),
+      input: z5.strictObject({ name: z5.string() }),
       handler: async ({ name }) => {
         const cap = registry.resolve(name);
         if (!cap) return null;
@@ -2354,42 +2314,42 @@ function notImplemented(name) {
     message: `${name} handler not configured`
   };
 }
-var requiredUnknown = z4.unknown().refine(() => true);
-var preMintedTokenSchema = z4.object({
-  token: z4.string(),
-  expiresAt: z4.string().nullable().optional()
+var requiredUnknown = z5.unknown().refine(() => true);
+var preMintedTokenSchema = z5.object({
+  token: z5.string(),
+  expiresAt: z5.string().nullable().optional()
 }).optional();
-var mountDeclarationInput = z4.object({
+var mountDeclarationInput = z5.strictObject({
   declaration: requiredUnknown,
   preMintedToken: preMintedTokenSchema
-}).strict();
-var connectorDeclarationInput = z4.object({
+});
+var connectorDeclarationInput = z5.strictObject({
   declaration: requiredUnknown,
   preMintedToken: preMintedTokenSchema
-}).strict();
-var removeResourceInput = z4.object({
-  id: z4.string()
-}).strict();
-var updateCredentialInput = z4.object({
-  kind: z4.enum(["mount", "connector"]),
-  id: z4.string(),
+});
+var removeResourceInput = z5.strictObject({
+  id: z5.string()
+});
+var updateCredentialInput = z5.strictObject({
+  kind: z5.enum(["mount", "connector"]),
+  id: z5.string(),
   // `CredentialMint` is a discriminated union from `@skaile/workspaces/types`.
   // We accept it as `z.unknown()` here because Zod can't easily mirror
   // a discriminated TypeScript union without duplicating the schema —
   // the platform side has already validated the shape before sending.
   mint: requiredUnknown
-}).strict();
-var setLogLevelInput = z4.object({
-  level: z4.enum(["silent", "error", "warn", "info", "debug", "trace"])
-}).strict();
-var setStateInput = z4.object({
-  store: z4.string(),
-  key: z4.string(),
+});
+var setLogLevelInput = z5.strictObject({
+  level: z5.enum(["silent", "error", "warn", "info", "debug", "trace"])
+});
+var setStateInput = z5.strictObject({
+  store: z5.string(),
+  key: z5.string(),
   value: requiredUnknown
-}).strict();
-var lifecycleInput = z4.object({
-  action: z4.enum(["hibernate", "close", "shutdown"])
-}).strict();
+});
+var lifecycleInput = z5.strictObject({
+  action: z5.enum(["hibernate", "close", "shutdown"])
+});
 var VALID_LOG_STORE_LEVELS = /* @__PURE__ */ new Set(["debug", "info", "warn", "error"]);
 function buildRunnerCapabilities(handlers) {
   return [
@@ -2629,6 +2589,36 @@ function getFrameworkVersions() {
   _frameworkVersions = versions;
   return versions;
 }
+function splitConnectorsForWire(manager) {
+  const mounts = [];
+  const connectors = [];
+  if (!manager) return { mounts, connectors };
+  for (const c of manager.listConnectors()) {
+    if (typeof c.mountPath === "string") {
+      let source = "";
+      try {
+        source = manager.get(c.id).declaration.mount?.source ?? "";
+      } catch {
+      }
+      mounts.push({
+        id: c.id,
+        driver: c.driver,
+        access: c.access,
+        mountPath: c.mountPath,
+        mounted: true,
+        source
+      });
+    } else {
+      connectors.push({
+        id: c.id,
+        driver: c.driver,
+        access: c.access,
+        operations: manager.getOperations(c.id).map((op) => op.name)
+      });
+    }
+  }
+  return { mounts, connectors };
+}
 function findAiAssetsRoot(startDir) {
   let dir = startDir;
   for (let i = 0; i < 6; i++) {
@@ -2868,19 +2858,12 @@ async function startAgentServer(opts) {
             );
           }
         },
-        onFileChanged: (_connectorId, event) => {
-          sendEvent({
-            type: "file_changed",
-            path: event.path,
-            action: event.action
-          });
-        },
-        onMountChanged: (volId, event) => {
+        onFileChanged: (connectorId, event) => {
           sendEvent({
             type: "file_changed",
             path: event.path,
             action: event.action,
-            mountId: volId
+            mountId: connectorId
           });
         }
       },
@@ -2915,7 +2898,6 @@ async function startAgentServer(opts) {
     resolveSessionReady();
   }
   let resourceManager = secretsMode === "env" ? agentSession.resourceManager : null;
-  let mountManager = secretsMode === "env" ? agentSession.mountManager : null;
   if (secretsMode === "env") {
     if (!agentSession.provider) {
       log(
@@ -2993,16 +2975,14 @@ async function startAgentServer(opts) {
         });
       }
     }
-    if (!mountManager) {
+    if (!resourceManager) {
       sendEvent(event);
       return;
     }
-    const mounts = mountManager.listMounts().map(
-      (info) => ({
-        id: info.id,
-        mountPath: mountManager.get(info.id).handle.mountPath
-      })
-    );
+    const mounts = resourceManager.listConnectors().filter((info) => typeof info.mountPath === "string").map((info) => ({
+      id: info.id,
+      mountPath: info.mountPath
+    }));
     sendEvent(rewriteFileChangedPath(event, opts.projectDir, mounts));
   }
   let driverStarted = false;
@@ -3128,8 +3108,8 @@ async function startAgentServer(opts) {
   }
   async function createActiveFlow(flowDef, seedOrExecution) {
     if (!resourceManager) {
-      registerBuiltinConnectorAdapters();
-      resourceManager = new ConnectorManager(void 0, {
+      registerBuiltinConnectors();
+      resourceManager = new ConnectorManager(opts.projectDir, {
         catalogEntries: getSessionCatalogEntries(agentSession)
       });
       log("[serve] created ConnectorManager for flow execution (no other connectors declared)");
@@ -3148,7 +3128,7 @@ async function startAgentServer(opts) {
       access: "read-write",
       options
     });
-    const adapter = resourceManager.get(connectorId).adapter;
+    const adapter = resourceManager.get(connectorId).connector;
     const runId = adapter.getExecution(handle).runId;
     adapter.onStateChange(handle, (state) => {
       sendEvent({
@@ -3211,7 +3191,7 @@ async function startAgentServer(opts) {
       const now = Date.now();
       if (now - lastRefreshAt < REFRESH_DEBOUNCE_MS) return;
       lastRefreshAt = now;
-      void dispatchRefreshToExposedGitMounts(mountManager, serverLog);
+      void dispatchRefreshToExposedGitMounts(resourceManager, serverLog);
     });
   } catch (err) {
     serverLog.warn("fs.watch on refresh-flag failed \u2014 wake-mid-401 disabled", {
@@ -3328,16 +3308,12 @@ async function startAgentServer(opts) {
             agentSession = await createAgentSession(sessionConfig);
             emitSystemPromptComposed(agentSession, sendEvent);
             resourceManager = agentSession.resourceManager;
-            mountManager = agentSession.mountManager;
             driver = agentSession.driver;
             rebuildCompactionOrchestrator();
             registerSessionComposition(agentSession);
-            const mountList = mountManager?.listMounts?.() ?? [];
-            const connectorList = resourceManager?.listConnectors?.() ?? [];
             sendEvent({
               type: "resources_available",
-              mounts: mountList,
-              connectors: connectorList
+              ...splitConnectorsForWire(resourceManager)
             });
             agentSession.startWatching();
             capabilityRegistry.setRemoteInvoker(remoteCapabilityInvoker);
@@ -3420,8 +3396,8 @@ async function startAgentServer(opts) {
         if (cfg.sharedState) {
           if (!resourceManager) {
             try {
-              registerBuiltinConnectorAdapters();
-              resourceManager = new ConnectorManager(void 0, {
+              registerBuiltinConnectors();
+              resourceManager = new ConnectorManager(opts.projectDir, {
                 catalogEntries: getSessionCatalogEntries(agentSession)
               });
               log("[serve] created ConnectorManager for sharedState (no connectors were declared)");
@@ -3464,8 +3440,8 @@ async function startAgentServer(opts) {
                 }
               });
               const entry = resourceManager.get(stateConfig.id);
-              if (typeof entry.adapter.onStoreChange === "function") {
-                entry.adapter.onStoreChange(handle, (snapshot) => {
+              if (typeof entry.connector.onStoreChange === "function") {
+                entry.connector.onStoreChange(handle, (snapshot) => {
                   sendEvent({
                     type: "state_changed",
                     store: stateConfig.id,
@@ -3713,8 +3689,8 @@ async function startAgentServer(opts) {
           });
           break;
         }
-        if (mountManager?.has(cmd.connectorId)) {
-          handleMountResourceRequest(cmd, mountManager, sendEvent);
+        if (resourceManager?.has(cmd.connectorId)) {
+          handleMountResourceRequest(cmd, resourceManager, sendEvent);
           break;
         }
         if (!resourceManager) {
@@ -3742,7 +3718,7 @@ async function startAgentServer(opts) {
         try {
           if (!resourceManager) throw new Error("connector_mutate before resources ready");
           const targetEntry = resourceManager.has?.(cmd.id) ? resourceManager.get(cmd.id) : null;
-          const isExistingFlow = targetEntry?.adapter?.name === "flow";
+          const isExistingFlow = targetEntry?.connector?.name === "flow";
           const isBareFlowId = cmd.id === "flow";
           if (cmd.op === "start") {
             if (isExistingFlow || isBareFlowId) {
@@ -3900,6 +3876,7 @@ async function startAgentServer(opts) {
         }
         disposeLogStore();
         process.exit(0);
+        break;
       }
       // Protocol v2 — capability round-trip results from the platform.
       case "capability_result": {
@@ -3973,17 +3950,12 @@ async function startAgentServer(opts) {
   }
   if (transport instanceof WebSocketServerTransport) {
     transport.onConnect(() => {
-      if (resourceManager || mountManager) {
-        const mountList = mountManager?.listMounts?.() ?? [];
-        const connectorList = resourceManager?.listConnectors?.() ?? [];
+      if (resourceManager) {
+        const wire = splitConnectorsForWire(resourceManager);
         log(
-          `[serve] emitting resources_available: ${mountList.length} mounts(s), ${connectorList.length} connector(s)`
+          `[serve] emitting resources_available: ${wire.mounts.length} mount(s), ${wire.connectors.length} connector(s)`
         );
-        sendEvent({
-          type: "resources_available",
-          mounts: mountList,
-          connectors: connectorList
-        });
+        sendEvent({ type: "resources_available", ...wire });
       }
       const commands = driver?.getSlashCommands?.() ?? [];
       if (commands.length > 0) {
@@ -4162,5 +4134,5 @@ function touchSession(state) {
 }
 
 export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, MarkdownStreamer, PreInitRingSink, agentDefinitionExists, assembleSystemPrompt, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildCapabilitiesPromptSection, buildClientCapabilityHandler, buildContextSection, buildEnvironmentSection, builtinCapabilities, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, createAgentSession, createSessionStimulusBus, defineCapability, deleteSession, emitSystemPromptComposed, ensureGitConfigInclude, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, installPreInitRingSink, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadSession, loadSessionById, newSession, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityResult, resolveComposition, resolveMixin, runAgentChat, saveSession, setCurrentSession, startAgentServer, touchSession, writeClaudeCodeCredentialsFile };
-//# sourceMappingURL=chunk-NYJKXVG6.js.map
-//# sourceMappingURL=chunk-NYJKXVG6.js.map
+//# sourceMappingURL=chunk-QZ6PY73K.js.map
+//# sourceMappingURL=chunk-QZ6PY73K.js.map