@skaile/workspaces 5.12.0 → 5.14.0

package/dist/{chunk-N5M2EISA.js → chunk-PAUM35HD.js}

@@ -1,35 +1,37 @@
-import { WorkspacePlugin } from './chunk-YQU2BPQD.js';
-import { buildWorkspaceToolDefs } from './chunk-X6LKA3TJ.js';
-import { findAiAssetsRoot } from './chunk-QCEKGYHF.js';
+import { WorkspacePlugin } from './chunk-PGVSOHWE.js';
+import { buildWorkspaceToolDefs } from './chunk-MCLT3BJG.js';
+import { findAiAssetsRoot } from './chunk-2BIESC6S.js';
+import { startModelEndpoint } from './chunk-OKQXY6FS.js';
 import { WebSocketServerTransport } from './chunk-OQ5MKDS3.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
 import { prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-PHRNUTSG.js';
-import { resolveFlowPath } from './chunk-2X3JBVGD.js';
-import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-DCHQ6BAZ.js';
-import { ConnectFailureCarryOver, registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, driveOrchestratorTurn, buildSdkFlowTools } from './chunk-27L6BBAT.js';
-import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, isKnownSecretRef, EnvSecretProvider, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, deriveSingleMaterializedConnectorDeclaration } from './chunk-ICIYSJBQ.js';
-import { EventNormalizer } from './chunk-NDF24LYP.js';
-import { probeResumeTranscript, transcriptStoreForRuntime } from './chunk-2JFIFDDO.js';
+import { resolveFlowPath } from './chunk-7LGNJJ76.js';
+import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-ZU24LWBI.js';
+import { ConnectFailureCarryOver, registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, driveOrchestratorTurn, buildSdkFlowTools } from './chunk-VTXXBYB3.js';
+import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, isKnownSecretRef, EnvSecretProvider, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, deriveSingleMaterializedConnectorDeclaration } from './chunk-UK3LRPJ5.js';
+import { EventNormalizer } from './chunk-5NVDOEWX.js';
+import { probeResumeTranscript, transcriptStoreForRuntime } from './chunk-YTZFSKWL.js';
 import { CodexNativeStateUnavailable } from './chunk-LOO5CB5M.js';
-import { dispatchCapability } from './chunk-2H73V6XR.js';
+import { dispatchCapability } from './chunk-PW3TYWOI.js';
 import { classifyClaudeSdkError } from './chunk-B4X2N7JQ.js';
 import { agentExecRequested } from './chunk-YROR332M.js';
-import { unresolvedProviderCredentials, driverCapabilities, toAgentEffort, createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv, AI_PROVIDER_PRESETS, supportsLiveToolUpdates } from './chunk-MF54ZHWT.js';
-import { loadFlow } from './chunk-7XWUJC3A.js';
+import { toAgentEffort, toMergedRegistry } from './chunk-DWRYUWOK.js';
+import { unresolvedProviderCredentials, driverCapabilities, createDriver, catalogLayer, providerCredentialEnvName, registryCredentialEnv, AI_PROVIDER_PRESETS, supportsLiveToolUpdates } from './chunk-6VIVUBNN.js';
+import { loadFlow } from './chunk-QELQDY5K.js';
 import { parseFlowDefinition } from './chunk-X3RMRJNR.js';
 import { renderStimulusPrompt } from './chunk-M3WPBTGJ.js';
-import { TERMINAL_AGENT_RUN_STATUSES, withActivityLabelJsonSchema, TOOL_ACTIVITY_PROMPT_SECTION, SESSION_ROOT_CONNECTOR_ID, PLATFORM_BLOCKS_RUNTIME_FEATURE, PROTOCOL_VERSION, deliveryClassOf } from './chunk-F4NJDSR7.js';
-import { knowledgeKindProvider, scanLibraryRoot } from './chunk-C3BMXXTN.js';
-import { createDefaultKindRegistry } from './chunk-7CR2OZPA.js';
-import { BindingSchema, effectiveComposes, AgentManifestSchema, AgentTriggerSchema } from './chunk-6VLHITAM.js';
-import { readLock, buildAgentPromptSections, resolveSettings, loadProviderRegistry, resolveLibraryDir } from './chunk-T5TSLSRO.js';
-import { resolveRuntimeAssets } from './chunk-SHQMPGOL.js';
+import { TERMINAL_AGENT_RUN_STATUSES, withActivityLabelJsonSchema, TOOL_ACTIVITY_PROMPT_SECTION, SESSION_ROOT_CONNECTOR_ID, PLATFORM_BLOCKS_RUNTIME_FEATURE, PROTOCOL_VERSION, deliveryClassOf } from './chunk-D5WTOVLG.js';
+import { knowledgeKindProvider, scanLibraryRoot } from './chunk-ODQGLELI.js';
+import { createDefaultKindRegistry } from './chunk-NVO6WECE.js';
+import { BindingSchema, effectiveComposes, AgentManifestSchema, AgentTriggerSchema } from './chunk-57SF6W6E.js';
+import { readLock, buildAgentPromptSections, resolveSettings, loadProviderRegistry, resolveLibraryDir } from './chunk-OX2W5YF3.js';
+import { resolveRuntimeAssets } from './chunk-TYUJPQNX.js';
 import { DEFAULT_DRIVER_ID, resolveDriverPaths } from './chunk-5BEFNLOR.js';
-import { matchPin, DEFAULT_AGENT_INSTANCE_ID, effectiveAgentInstances, resolveSkWorkspaceConfig, resolveAgentDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, getGlobalCacheDir, sourceCacheKey, resolveAgentDefinitionDir, AgentRefResolutionError, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill, STAGED_SKILL_MARKER } from './chunk-PNOGX36L.js';
+import { matchPin, DEFAULT_AGENT_INSTANCE_ID, effectiveAgentInstances, resolveSkWorkspaceConfig, resolveAgentDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, getGlobalCacheDir, sourceCacheKey, resolveAgentDefinitionDir, AgentRefResolutionError, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill, STAGED_SKILL_MARKER } from './chunk-CAPKENNF.js';
 import { globalSkaileDir } from './chunk-L5VSIPQD.js';
-import { driverTargetForDriver, SUPPORTED_DRIVER_TARGETS, DRIVER_TARGETS } from './chunk-CPSIPIX7.js';
-import { withFsDeadline, FsDeadlineError, fsDeadlineMs, parseFrontmatter, tryWithFsDeadline } from './chunk-XTVSNWLL.js';
-import { parseAssetRef } from './chunk-PNTXHTBC.js';
+import { driverTargetForDriver, SUPPORTED_DRIVER_TARGETS, DRIVER_TARGETS } from './chunk-IG5LZ3WU.js';
+import { withFsDeadline, FsDeadlineError, fsDeadlineMs, parseFrontmatter, tryWithFsDeadline } from './chunk-M3P4BYRK.js';
+import { parseAssetRef } from './chunk-J4OYIYFQ.js';
 import { resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink, resolveLogsRetention, enforceLogsRetention } from './chunk-DKXNKFKP.js';
 import { pickRegistryEntries, registryEntries, resolveEntryBaseUrl, parseModelRef, isEntryEnabled, parseCredentialRef } from './chunk-MJHSLODD.js';
 import { getLogStore, registerLogStore, createLogger, resetLogStore, isUnwritableStreamError, markStreamBroken, isBrokenPipeError, redactCredentials } from './chunk-BOFL7GIF.js';
@@ -43,7 +45,7 @@ import * as z5 from 'zod';
 import { z } from 'zod';
 import fs8, { readFile, readdir, lstat, stat, rm, unlink, mkdir, writeFile, realpath, rename, open, readlink, mkdtemp } from 'fs/promises';
 import { parse } from 'yaml';
-import { constants, unlinkSync, readFileSync, readdirSync, statSync, existsSync, lstatSync, realpathSync, mkdirSync, writeFileSync, watch, chmodSync, accessSync } from 'fs';
+import { constants, unlinkSync, readFileSync, readdirSync, statSync, existsSync, lstatSync, realpathSync, mkdirSync, writeFileSync, watch, chmodSync, accessSync, rmSync } from 'fs';
 import { Ajv2020 } from 'ajv/dist/2020.js';
 import { execFile } from 'child_process';
 import { promisify } from 'util';
@@ -3924,11 +3926,15 @@ async function createStandaloneAgentSurface(opts) {
 }
 
 // runner/src/composition/prompt-sections.ts
-function buildRunnerAgentSections(resolved, promptExtensions) {
+function buildRunnerAgentSections(resolved, promptExtensions, options = {}) {
   const blocks = resolved?.inlineBlocks ?? [];
+  const memory = resolved?.memoryBlocks ?? [];
+  const seedsFromSoul = memory.some((m) => m.source?.replace(/^\.\//, "") === "SOUL.md");
+  const soul = options.includeSoul && !seedsFromSoul ? blocks.filter((block) => block.implicit && block.kind === "soul").map((block) => block.content.trim()).filter(Boolean).join("\n\n") : "";
   const duties = blocks.filter((block) => block.implicit && block.kind === "prompt").map((block) => block.content.trim()).filter(Boolean).join("\n\n");
   return buildAgentPromptSections({
-    memory: resolved?.memoryBlocks ?? [],
+    soul,
+    memory,
     duties,
     composed: blocks.filter((block) => !block.implicit).map((block) => ({ text: block.content, source: block.ref })),
     promptExtensions: promptExtensions.map((e) => ({ text: e.value, source: e.source }))
@@ -6055,6 +6061,94 @@ function toSdkMcpServerConfig(decl, secrets) {
   }
   return null;
 }
+var MODEL_ENDPOINT_PROVIDER_ID = "skaile-endpoint";
+var MODEL_ENDPOINT_URL_ENV = "SKAILE_MODEL_ENDPOINT_URL";
+var MODEL_ENDPOINT_TOKEN_ENV = "SKAILE_MODEL_ENDPOINT_TOKEN";
+function modelEndpointEnv({ url, token }) {
+  return {
+    [MODEL_ENDPOINT_URL_ENV]: url,
+    [MODEL_ENDPOINT_TOKEN_ENV]: token,
+    [providerCredentialEnvName(MODEL_ENDPOINT_PROVIDER_ID)]: token
+  };
+}
+function modelEndpointLayer({ url }) {
+  return {
+    layer: "catalog",
+    providers: {
+      [MODEL_ENDPOINT_PROVIDER_ID]: {
+        kind: "llm",
+        surface: "openai-completions",
+        base_url: url,
+        credential: { kind: "bearer", ref: `env:${MODEL_ENDPOINT_TOKEN_ENV}` },
+        label: "Skaile model endpoint",
+        enabled: true
+      }
+    }
+  };
+}
+function withoutEndpointEntry(registry) {
+  if (!registry.providers[MODEL_ENDPOINT_PROVIDER_ID]) return registry;
+  return pickRegistryEntries(
+    registry,
+    registry.order.filter((id) => id !== MODEL_ENDPOINT_PROVIDER_ID)
+  );
+}
+function modelEndpointFile(projectDir) {
+  return join(projectDir, ".skaile", "model-endpoint.json");
+}
+function writeModelEndpointFile(projectDir, address) {
+  const file = modelEndpointFile(projectDir);
+  mkdirSync(join(projectDir, ".skaile"), { recursive: true });
+  rmSync(file, { force: true });
+  writeFileSync(file, `${JSON.stringify({ ...address, pid: process.pid }, null, 2)}
+`, {
+    mode: 384,
+    flag: "wx"
+  });
+}
+function removeModelEndpointFile(projectDir) {
+  rmSync(modelEndpointFile(projectDir), { force: true });
+}
+async function startRunnerModelEndpoint(options) {
+  const token = process.env[MODEL_ENDPOINT_TOKEN_ENV] || randomBytes(32).toString("hex");
+  const host = options.config.host ?? "127.0.0.1";
+  const handle = await startModelEndpoint({
+    getRegistry: () => withoutEndpointEntry(options.getRegistry()),
+    getLookupEnv: options.getLookupEnv,
+    ...options.getRoles ? { getRoles: options.getRoles } : {},
+    token,
+    host,
+    port: options.config.port ?? 0,
+    log: options.log
+  });
+  if (!isLoopbackHost(host)) {
+    options.log(
+      `WARNING: bound to non-loopback host ${host}: anyone who can reach it and holds the token spends this session's provider credentials`
+    );
+  }
+  const address = { url: handle.url, token };
+  try {
+    writeModelEndpointFile(options.projectDir, address);
+  } catch (error) {
+    await handle.close();
+    throw error;
+  }
+  let closed;
+  return {
+    ...address,
+    close: () => {
+      closed ??= (async () => {
+        removeModelEndpointFile(options.projectDir);
+        await handle.close();
+      })();
+      return closed;
+    }
+  };
+}
+function isLoopbackHost(host) {
+  const bare = host.replace(/^\[|\]$/g, "").toLowerCase();
+  return bare === "localhost" || bare === "::1" || /^127(\.\d{1,3}){3}$/.test(bare);
+}
 
 // runner/src/session-builder.ts
 async function createAgentSession(config) {
@@ -6100,9 +6194,18 @@ async function createAgentSession(config) {
   });
   const driverType = (managed ? config.driver : settings.driver) ?? DEFAULT_DRIVER_ID;
   const model = managed ? config.model : settings.model;
-  const registry = loadSessionRegistry(projectDir, config.registry, config.providers, sessionLog);
+  const registry = loadSessionRegistry(
+    projectDir,
+    config.registry,
+    config.providers,
+    sessionLog,
+    config.modelEndpoint
+  );
   const modelRef = config.modelRef?.trim() || model?.trim() || void 0;
-  const credentialEnv = { ...config.credentialEnv };
+  const credentialEnv = {
+    ...config.credentialEnv,
+    ...config.modelEndpoint ? modelEndpointEnv(config.modelEndpoint) : {}
+  };
   const manifest = agentDir ? await loadAgentManifest(agentDir) : void 0;
   const {
     resourceManager,
@@ -6168,7 +6271,9 @@ async function createAgentSession(config) {
     log: sessionLog
   }) : null;
   composition = await withHostMemory(composition, config.loadHostMemory, sessionLog);
-  const agentSections = buildRunnerAgentSections(composition, promptExtensions);
+  const agentSections = buildRunnerAgentSections(composition, promptExtensions, {
+    includeSoul: driverType === "omp"
+  });
   const disposeManagedTools = managed ? await registerCodexResourceTools({
     registry: config.capabilityRegistry,
     manager: resourceManager,
@@ -6308,10 +6413,11 @@ function createManagedCodexSubpromptDriver(config, model, cwd, privateDirectory)
     }
   });
 }
-function loadSessionRegistry(projectDir, sessionRegistry, providers, log) {
+function loadSessionRegistry(projectDir, sessionRegistry, providers, log, modelEndpoint) {
   const extraLayers = [];
   if (sessionRegistry && Object.keys(sessionRegistry).length > 0)
     extraLayers.push({ layer: "session", providers: sessionRegistry });
+  if (modelEndpoint) extraLayers.push(modelEndpointLayer(modelEndpoint));
   const first = loadProviderRegistry({ projectDir, extraLayers });
   const catalog = catalogLayer(first.patches);
   const final = Object.keys(catalog.providers).length === 0 ? first : loadProviderRegistry({ projectDir, extraLayers: [...extraLayers, catalog] });
@@ -6320,14 +6426,17 @@ function loadSessionRegistry(projectDir, sessionRegistry, providers, log) {
     if (diagnostic.severity === "error") log.error(message, void 0, { code: diagnostic.code });
     else log.warn(message, { code: diagnostic.code });
   }
-  if (providers === void 0 || providers.length === 0) return final.registry;
-  for (const id of providers) {
+  const picked = providers === void 0 || providers.length === 0 ? final.registry : pickRegistryEntries(
+    final.registry,
+    modelEndpoint ? [...providers, MODEL_ENDPOINT_PROVIDER_ID] : providers
+  );
+  for (const id of providers ?? []) {
     if (final.registry.providers[id] === void 0)
       log.warn(`providers registry: --providers names '${id}' which no layer defines`, {
         code: "unknown_provider"
       });
   }
-  return pickRegistryEntries(final.registry, providers);
+  return picked.order.every((id) => id === MODEL_ENDPOINT_PROVIDER_ID) ? withoutEndpointEntry(picked) : picked;
 }
 async function loadPromptExtensions(paths, projectDir, log) {
   if (!paths?.length) return [];
@@ -6503,7 +6612,7 @@ function createSessionDriver(args) {
 // runner/src/agent.ts
 var PROMPT_AGENT = `${pc.magenta(pc.bold("agent"))} ${pc.dim("\u25B6")} `;
 function stderrWarnings(line) {
-  if (line.startsWith("[warn]") || line.startsWith("[error]")) {
+  if (line.startsWith("[warn]")) {
     process.stderr.write(`${line}
 `);
   }
@@ -6543,9 +6652,15 @@ async function runAgentChat(opts) {
     console.error(`  ${pc.yellow("!")} ${notice}`);
   }
   await driver.start();
+  const bareAnswer = process.stdout.isTTY !== true;
+  let plainAnswer = "";
   let firstChunk = true;
   const mdStream = new MarkdownStreamer();
   const writeText = (text2) => {
+    if (bareAnswer) {
+      plainAnswer += text2;
+      return;
+    }
     if (firstChunk) {
       process.stdout.write(PROMPT_AGENT);
       firstChunk = false;
@@ -6560,7 +6675,13 @@ async function runAgentChat(opts) {
       const delta = event._textDelta;
       if (delta) writeText(delta);
     } else if (event.type === "message_retract") {
-      mdStream.retract(event.text);
+      if (bareAnswer) {
+        if (plainAnswer.endsWith(event.text)) {
+          plainAnswer = plainAnswer.slice(0, plainAnswer.length - event.text.length);
+        }
+      } else {
+        mdStream.retract(event.text);
+      }
     }
   });
   let message = opts.message;
@@ -6576,8 +6697,14 @@ ${message}`;
         if (event.type === "agent_end") {
           settled = true;
           driver.off("agent-event", onEvent);
-          mdStream.end();
-          process.stdout.write("\n");
+          if (bareAnswer) {
+            const answer = plainAnswer.trim();
+            if (answer) process.stdout.write(`${answer}
+`);
+          } else {
+            mdStream.end();
+            process.stdout.write("\n");
+          }
           driver.kill();
           resolve4();
         } else if (event.type === "error" && event.retrying !== true) {
@@ -11740,6 +11867,18 @@ function takeRunnerWsAuthToken(env = process.env, fs9 = nodeFs) {
   return { source: "none" };
 }
 
+// runner/src/ws-auth-warning.ts
+function isLoopbackHost2(host) {
+  const h = host.startsWith("[") && host.endsWith("]") ? host.slice(1, -1) : host;
+  return h === "localhost" || h === "::1" || /^127(?:\.\d{1,3}){3}$/.test(h);
+}
+function wsNoAuthWarning(port, host) {
+  if (host !== void 0 && isLoopbackHost2(host)) {
+    return `WARNING: the WebSocket server on port ${port} listens on ${host}; local processes can drive this agent. Set SKAILE_WS_AUTH_TOKEN for a token.`;
+  }
+  return `WARNING: the WebSocket server on port ${port} listens on ${host ?? "all interfaces"} without authentication: any host that can reach the port can drive this agent. Set SKAILE_WS_AUTH_TOKEN, or bind 127.0.0.1 with --host.`;
+}
+
 // runner/src/serve.ts
 function getSessionCatalogEntries(session) {
   return session?.runtimeAssets?.catalogEntries ?? [];
@@ -12593,9 +12732,7 @@ async function startAgentServer(opts) {
     source: opts.authToken ? "caller" : takenAuthToken.source
   });
   if (!opts.transport && !authToken) {
-    serverLog.warn(
-      `WARNING: the WebSocket server on port ${opts.port ?? 8080} listens on ${opts.host ?? "all interfaces"} without authentication: any host that can reach the port can drive this agent. Set SKAILE_WS_AUTH_TOKEN, or bind 127.0.0.1 with --host.`
-    );
+    serverLog.warn(wsNoAuthWarning(opts.port ?? 8080, opts.host));
   }
   if (takenAuthToken.unlinkError)
     serverLog.warn("ws auth token file could not be removed", {
@@ -12624,8 +12761,14 @@ async function startAgentServer(opts) {
   const agentDir = opts.agentDir ?? resolveAgentDir(opts.projectDir);
   if (agentDir) {
     serverLog.info("agent dir resolved", { agentDir });
+  } else if (wsConfig.agent?.definition) {
+    serverLog.warn(
+      `agent.definition "${wsConfig.agent.definition}" in skaile.yaml did not resolve to a directory`
+    );
   } else {
-    serverLog.warn("no agent definition found in skaile.yaml");
+    serverLog.debug(
+      "no agent definition (agent.definition) in skaile.yaml; running without a persona"
+    );
   }
   const transport = opts.transport ?? new WebSocketServerTransport({
     port,
@@ -13028,6 +13171,8 @@ async function startAgentServer(opts) {
       // secrets map, keyed by the `SKAILE_AIP_<ID>_KEY` name each registry
       // entry references. Omitted entirely when nothing resolved.
       ...credentialEnv && Object.keys(credentialEnv).length > 0 ? { credentialEnv } : {},
+      // The runner's loopback model endpoint: registry entry + child env.
+      ...modelEndpoint ? { modelEndpoint: { url: modelEndpoint.url, token: modelEndpoint.token } } : {},
       ...wireAgentConfig?.thinking ? { thinking: wireAgentConfig.thinking } : {},
       ...wireEffort ? { effort: wireEffort } : {},
       // Every claude-sdk driver carries the flow tools, so a run can start mid-turn.
@@ -13118,6 +13263,7 @@ async function startAgentServer(opts) {
   });
   let sessionConfig;
   let agentSession;
+  let modelEndpoint;
   const contextWindows = new ContextWindowResolver({
     seat: () => aiProviderConfigId,
     warn: (line) => serverLog.warn(line)
@@ -13224,16 +13370,39 @@ async function startAgentServer(opts) {
     liveAttachedMcpDeclarations.set(decl.id, decl);
     bakedMcpServerIds = /* @__PURE__ */ new Set([...bakedMcpServerIds, decl.id]);
   };
+  const modelEndpointConfig = {
+    ...wsConfig.model_endpoint,
+    ...opts.modelEndpoint
+  };
+  if (!managedHost && modelEndpointConfig.enabled === true) {
+    const bootRegistry = loadProviderRegistry({ projectDir: opts.projectDir }).registry;
+    modelEndpoint = await startRunnerModelEndpoint({
+      projectDir: opts.projectDir,
+      config: modelEndpointConfig,
+      // agentSession is reassigned at every (re)build, so a session_init swap
+      // is picked up on the next request.
+      getRegistry: () => agentSession?.registry ?? bootRegistry,
+      getLookupEnv: () => ({ ...process.env, ...agentSession?.credentialEnv }),
+      getRoles: () => wsConfig.roles,
+      log: (line) => log(`[model-endpoint] ${line}`)
+    });
+    log(`[serve] model endpoint listening on ${modelEndpoint.url}`);
+  }
   if (secretsMode === "provisioned") {
     log("[serve] secrets mode: provisioned \u2014 waiting for provision_secrets command");
   } else {
-    sessionConfig = buildSessionConfig(new EnvSecretProvider());
-    await refreshAgentSurface(null);
-    agentSession = await createAgentSession(sessionConfig);
-    emitSystemPromptComposed(agentSession, sendEvent);
-    noteAgentSessionBuilt(sessionConfig.resumeSessionId);
-    registerSessionComposition(agentSession);
-    await refreshAgentSurface(agentSession);
+    try {
+      sessionConfig = buildSessionConfig(new EnvSecretProvider());
+      await refreshAgentSurface(null);
+      agentSession = await createAgentSession(sessionConfig);
+      emitSystemPromptComposed(agentSession, sendEvent);
+      noteAgentSessionBuilt(sessionConfig.resumeSessionId);
+      registerSessionComposition(agentSession);
+      await refreshAgentSurface(agentSession);
+    } catch (error) {
+      await modelEndpoint?.close();
+      throw error;
+    }
     resolveSessionReady();
     captureBakedMcpServers();
   }
@@ -13849,6 +14018,8 @@ async function startAgentServer(opts) {
       } catch {
       }
     }
+    await modelEndpoint?.close().catch(() => {
+    });
   }
   async function awaitSessionReadyOrFail() {
     try {
@@ -13935,6 +14106,29 @@ async function startAgentServer(opts) {
       return false;
     }
   }
+  function wireRunnerCapabilities() {
+    wireSessionCapabilities({
+      capabilityRegistry,
+      remoteCapabilityInvoker,
+      getResourceManager: () => resourceManager,
+      getPreMintedSecrets: () => preMintedSecrets,
+      emitResourcesAvailable,
+      driverPicksUpToolsLive,
+      getOrCreateMcpManager: () => agentSession?.getOrCreateExternalMcpManager() ?? null,
+      getCompactionOrchestrator: () => compactionOrchestrator,
+      getProjectDir: () => opts.projectDir,
+      attachSkillInstance,
+      detachSkillInstance,
+      registerLiveAttachedMcp,
+      scheduleDriverRestartForToolChanges,
+      getDriver: () => driver ?? null,
+      rememberReconfigure: (patch) => {
+        liveReconfigurePatch = { ...liveReconfigurePatch, ...patch };
+        applyReconfigurePatch(sessionConfig, patch);
+      },
+      log
+    });
+  }
   async function buildSessionFromInit(secrets, fallbackConnectorDeclarations) {
     const wireRegistry = managedCodex ? void 0 : wireAgentConfig?.registry;
     const credentialEnv = wireRegistry ? registryCredentialEnv(wireRegistry, {
@@ -13989,27 +14183,6 @@ async function startAgentServer(opts) {
       needsWireAgentConfigRecreate = true;
       appliedWireAgentConfigKey = wireKey;
     }
-    wireSessionCapabilities({
-      capabilityRegistry,
-      remoteCapabilityInvoker,
-      getResourceManager: () => resourceManager,
-      getPreMintedSecrets: () => preMintedSecrets,
-      emitResourcesAvailable,
-      driverPicksUpToolsLive,
-      getOrCreateMcpManager: () => agentSession?.getOrCreateExternalMcpManager() ?? null,
-      getCompactionOrchestrator: () => compactionOrchestrator,
-      getProjectDir: () => opts.projectDir,
-      attachSkillInstance,
-      detachSkillInstance,
-      registerLiveAttachedMcp,
-      scheduleDriverRestartForToolChanges,
-      getDriver: () => driver ?? null,
-      rememberReconfigure: (patch) => {
-        liveReconfigurePatch = { ...liveReconfigurePatch, ...patch };
-        applyReconfigurePatch(sessionConfig, patch);
-      },
-      log
-    });
     return { needsWireFallbackRecreate, needsWireAgentConfigRecreate };
   }
   async function recreateAgentSession(overrides) {
@@ -14489,6 +14662,7 @@ async function startAgentServer(opts) {
     registerInitClientCapabilities(cmd.capabilities ?? []);
     capabilityRegistry.setRemoteInvoker(remoteCapabilityInvoker);
     await refreshAgentSurface(null);
+    wireRunnerCapabilities();
     sendEvent({
       type: "protocol_info",
       version: PROTOCOL_VERSION,
@@ -15214,7 +15388,12 @@ async function startAgentServer(opts) {
     if (!initAcknowledged || managedCodex || aiProviderConfigId === void 0) return;
     aiCredentialRefreshScheduler.ensureArmed();
   });
-  await transport.listen();
+  try {
+    await transport.listen();
+  } catch (error) {
+    await modelEndpoint?.close();
+    throw error;
+  }
   if (secretsMode === "env" && agentSession) {
     agentSession.startWatching();
   }
@@ -15421,5 +15600,5 @@ function touchSession(state) {
 }
 
 export { AgentRunError, CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CONNECTOR_MUTATE_NOT_READY, CapabilityRegistry, CompileManifestEntrySchema, CompositionError, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, DEFAULT_FLOW_MUTATE_CONNECTOR_WAIT_MS, DEFAULT_MAX_FINISHED_TREES, DEFAULT_RUN_LIMITS, MOUNT_LIST_MAX_DEPTH, MOUNT_LIST_MAX_ENTRIES, MOUNT_READ_DEADLINE_FACTOR, MOUNT_READ_MAX_CHUNK_BYTES, MOUNT_STAT_BUDGET_MS, MOUNT_STAT_MAX_ENTRIES, MOUNT_TREE_OP_DEADLINE_FACTOR, MOUNT_WRITE_MAX_CHUNK_BYTES, MarkdownStreamer, PreInitRingSink, ResourceOperationError, SESSION_ROOT_WRITABLE_DIRS, SESSION_ROOT_WRITABLE_FILES, UnknownCompositionKindError, WRITE_RANGE_PARTIAL_TTL_MS, WS_AUTH_TOKEN_ENV, WS_AUTH_TOKEN_FILE_ENV, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildCompositionRunSnapshot, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildRunnerAgentSections, buildStoreSnapshotReplay, builtinCapabilities, canonicalJson, capabilityLogInstance, capabilitySignatureInputs, clearPreInitRingSink, clearSession, compileComposition, compositionRunSnapshotPath, computeCapabilitySignature, computeDirectoryTotals, computeRevisionHash, connectorRefreshKind, createAgentSession, createCompositionContentSource, createFinalTextFallback, createFlowConnectorReadiness, createInMemoryRunStore, createManagedCodexSubpromptDriver, createRunController, createSessionStimulusBus, defineCapability, deleteSession, describeComposition, dispatchResourceRequest, dispatchRunnerCapabilityInvocation, driverActiveAfterTurnEnd, emitSystemPromptComposed, ensureClaudeSettingsDisablesConnectors, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, flowStartNeedsDriverRestart, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, handleSessionRootResourceRequest, hasNonTerminalFlow, hashAgentFiles, hashContent, hostOpResumeStimulus, installPreInitRingSink, instanceForSession, isCompositionError, isEmptyKnowledgeIndex, isSessionRootPathAllowed, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadCompositionRunSnapshot, loadKnowledgeDir, loadManagedCodexHostConfig, loadSession, loadSessionById, mcpAuthSecretKey, newSession, nulTailPaddingLength, pickChatFlowTarget, pickFlowToolTarget, pickRepointedManager, planFlowMutate, prepareCodexTools, reconcilePendingDecisions, reconnectedRunNeedsAgentTurn, recreateKeepingLiveFlows, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, rejectPendingCapabilityCallsOnDisconnect, resetRunnerLogStore, resolveAgentInstance, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, restoredRunHasWorkToResume, runAgentChat, saveCompositionRunSnapshot, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, stripFrontmatter, takeRunnerWsAuthToken, toActiveFlowTarget, touchSession, unresolvedCredentialNotices, validateInputResponse, verifyConventionItems, writeClaudeCodeCredentialsFile, writeRangeChunk, writeRangePartialPath };
-//# sourceMappingURL=chunk-N5M2EISA.js.map
-//# sourceMappingURL=chunk-N5M2EISA.js.map
+//# sourceMappingURL=chunk-PAUM35HD.js.map
+//# sourceMappingURL=chunk-PAUM35HD.js.map