@skaile/workspaces 6.16.0 → 6.17.0

package/dist/{chunk-ZII54C3E.js → chunk-F6EPGAES.js}

@@ -1,32 +1,33 @@
-import { WorkspacePlugin } from './chunk-NNJQQYHY.js';
-import { buildWorkspaceToolDefs } from './chunk-Z23I2JA6.js';
+import { WorkspacePlugin } from './chunk-URN4G32O.js';
+import { buildWorkspaceToolDefs } from './chunk-4CVRFWEY.js';
 import { findAiAssetsRoot } from './chunk-3A7JUOY2.js';
-import { startModelEndpoint, ModelEndpointError } from './chunk-3UYKT62L.js';
-import { WebSocketServerTransport } from './chunk-CU5WY6HN.js';
+import { startModelEndpoint, ModelEndpointError } from './chunk-N2XZSIJW.js';
+import { WebSocketServerTransport } from './chunk-VAO3XYN3.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
-import { resolveFlowPath } from './chunk-6KV34G6A.js';
+import { resolveFlowPath } from './chunk-AVB7NLO6.js';
 import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-SFBLZOV5.js';
-import { ConnectFailureCarryOver, registerBuiltinConnectors, listConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, fleetMountConnectingMessage, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, TRUSTED_GIT_CA_ENV, writeUserGitconfigInclude, buildFlowToolDefs, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, driveOrchestratorTurn, buildSdkFlowTools } from './chunk-QUIK7L3Z.js';
-import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, isKnownSecretRef, EnvSecretProvider, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, deriveSingleMaterializedConnectorDeclaration } from './chunk-H3PY5DFL.js';
-import { EventNormalizer } from './chunk-PRB67LCK.js';
-import { sessionSurfaceNotice, approvalCardOf, APPROVE_ONCE, DENY, probeResumeTranscript, transcriptStoreForRuntime } from './chunk-OD4N5O7V.js';
-import { codexLoginFallbackNotice, prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-72DYHOO2.js';
+import { ConnectFailureCarryOver, registerBuiltinConnectors, listConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, fleetMountConnectingMessage, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, TRUSTED_GIT_CA_ENV, writeUserGitconfigInclude, buildFlowToolDefs, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, driveOrchestratorTurn, buildSdkFlowTools } from './chunk-WNT54WWX.js';
+import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, isKnownSecretRef, EnvSecretProvider, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, deriveSingleMaterializedConnectorDeclaration } from './chunk-PC54LSZP.js';
+import { EventNormalizer } from './chunk-E2VPBB7C.js';
+import { sessionSurfaceNotice, approvalCardOf, APPROVE_ONCE, DENY, probeResumeTranscript, transcriptStoreForRuntime } from './chunk-OLGQHP4R.js';
+import { codexLoginFallbackNotice, prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-6CTRJADR.js';
 import { CodexNativeStateUnavailable } from './chunk-5KSGZP3E.js';
 import { dispatchCapability } from './chunk-HXST2IYJ.js';
 import { classifyClaudeSdkError } from './chunk-5DE3DGVR.js';
 import { agentExecRequested } from './chunk-7DN6JKP2.js';
-import { toAgentEffort, toMergedRegistry } from './chunk-NAQXDTF3.js';
-import { unresolvedProviderCredentials, harnessCapabilities, createHarness, providerCredentialEnvName, registryCredentialEnv, supportsLiveToolUpdates } from './chunk-S3UOZBGE.js';
+import { toAgentEffort, toMergedRegistry } from './chunk-EFCRBVHL.js';
+import { unresolvedProviderCredentials, harnessCapabilities, createHarness, providerCredentialEnvName, registryCredentialEnv, supportsLiveToolUpdates } from './chunk-SOAQP4BI.js';
+import { pluginRegistry } from './chunk-3ZY6W7CL.js';
 import { catalogLayer, AI_PROVIDER_PRESETS } from './chunk-6UP2EDFN.js';
-import { loadFlow } from './chunk-2ZDZJ7XQ.js';
+import { loadFlow } from './chunk-3O3HWR23.js';
 import { renderStimulusPrompt } from './chunk-WD3L5QSU.js';
 import { TURN_VISIBILITY_EVENT_TYPES, withActivityLabelJsonSchema, TOOL_ACTIVITY_PROMPT_SECTION, TERMINAL_AGENT_RUN_STATUSES, SESSION_ROOT_CONNECTOR_ID, PLATFORM_BLOCKS_RUNTIME_FEATURE, TURN_VISIBILITY_RUNTIME_FEATURE, TURN_IDS_RUNTIME_FEATURE, PROTOCOL_VERSION, TURN_IDS_MAX_COUNT, TURN_ID_MAX_LENGTH, deliveryClassOf } from './chunk-JPV4WE5L.js';
 import { parseFlowDefinition } from './chunk-JRN5QF4C.js';
-import { CompileManifestEntrySchema, resolveBinding, CompositionError, isEmptyKnowledgeIndex, hashContent, loadCompileManifestFromDir, createCompositionContentSource, assembleRunnerAgent, readNativeAgentFile, nativeAgentFilePath, COMPILE_MANIFEST_FILENAME } from './chunk-4ZNKEDYH.js';
-import { resolveSettings, loadProviderRegistry, modelForHarness, AGENT_PROMPT_CARRIER_LABELS, AGENT_PROMPT_CARRIERS, resolveLibraryDir } from './chunk-U7P22GEB.js';
-import { resolveRuntimeAssets } from './chunk-ETGC2MEM.js';
+import { CompileManifestEntrySchema, resolveBinding, CompositionError, isEmptyKnowledgeIndex, hashContent, loadCompileManifestFromDir, createCompositionContentSource, assembleRunnerAgent, readNativeAgentFile, nativeAgentFilePath, COMPILE_MANIFEST_FILENAME } from './chunk-AS4SKSXJ.js';
+import { resolveSettings, loadProviderRegistry, modelForHarness, AGENT_PROMPT_CARRIER_LABELS, AGENT_PROMPT_CARRIERS, resolveLibraryDir } from './chunk-ZHI3YMGQ.js';
+import { resolveRuntimeAssets } from './chunk-52HUF3DF.js';
 import { DEFAULT_HARNESS_ID, resolveHarnessPaths } from './chunk-C5HFK34M.js';
-import { DEFAULT_AGENT_INSTANCE_ID, effectiveAgentInstances, resolveAgentDefinitionDir, AgentRefResolutionError, resolveSkWorkspaceConfig, resolveAgentDir, agentSourceCacheDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill, STAGED_SKILL_MARKER } from './chunk-BRAOB37W.js';
+import { DEFAULT_AGENT_INSTANCE_ID, effectiveAgentInstances, resolveAgentDefinitionDir, AgentRefResolutionError, resolveSkWorkspaceConfig, resolveAgentDir, agentSourceCacheDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill, STAGED_SKILL_MARKER } from './chunk-GXW4B5SE.js';
 import { globalSkaileDir, globalCacheRoot } from './chunk-L5VSIPQD.js';
 import { harnessNameForHarnessId, SUPPORTED_HARNESSES, HARNESS_TARGETS } from './chunk-VTETQCR6.js';
 import { withFsDeadline, FsDeadlineError, fsDeadlineMs, parseFrontmatter, tryWithFsDeadline } from './chunk-2MTRRK37.js';
@@ -3498,6 +3499,8 @@ function warnUnresolvedRecipeMarkers(recipeLog, declId, resolvedCommand, resolve
 var PASSTHROUGH_INPUT_ZOD = {
   parse: (v) => v
 };
+var MCP_TOOL_CALL_TIMEOUT_MS = 15 * 6e4;
+var MCP_TOOL_CALL_MAX_TOTAL_MS = 2 * 60 * 6e4;
 function isMcpAuthError(err) {
   if (!err || typeof err !== "object") return false;
   const code = err.code ?? err.status;
@@ -3650,7 +3653,8 @@ var ExternalMcpManager = class {
     const snapshot = lazy ? await readMcpToolsSnapshot(decl) : void 0;
     if (snapshot) return this.registerFromSnapshot(decl, snapshot);
     const client = await this.connectWithReauth(decl);
-    const server = { id: decl.id, decl, client, tools: [], toolNames: [] };
+    const server = { id: decl.id, decl, tools: [], toolNames: [] };
+    this.adoptClient(server, client);
     const toolNames = [];
     try {
       const { tools } = await client.listTools();
@@ -3663,6 +3667,7 @@ var ExternalMcpManager = class {
       if (lazy) await writeMcpToolsSnapshot(decl, tools);
     } catch (err) {
       for (const name of toolNames) this.registry.deregister(name);
+      server.removed = true;
       try {
         await client.close();
       } catch {
@@ -3704,25 +3709,27 @@ var ExternalMcpManager = class {
     return { id: decl.id, toolNames: [...server.toolNames] };
   }
   /**
-   * The server's live client, starting a lazy server on first use. Concurrent
-   * first calls share one connect; a failed connect is not cached, so the next
-   * call tries again.
+   * The server's live client, starting it on first use (a lazy server) or after
+   * its connection closed. Concurrent calls share one connect; a failed connect
+   * is not cached, so the next call tries again.
    */
   ensureClient(server) {
     if (server.client) return Promise.resolve(server.client);
     if (server.removed) return Promise.reject(new Error(`MCP server '${server.id}' was removed`));
-    server.connectInFlight ??= this.startLazyServer(server).finally(() => {
+    server.connectInFlight ??= this.startServer(server).finally(() => {
       server.connectInFlight = void 0;
     });
     return server.connectInFlight;
   }
-  async startLazyServer(server) {
+  async startServer(server) {
+    const restart = server.closedAt !== void 0;
+    const what = restart ? "restart" : "lazy start";
     let client;
     let tools;
     try {
       client = await this.connectWithReauth(server.decl);
     } catch (err) {
-      this.log.error("MCP server lazy start failed", err, { id: server.id });
+      this.log.error(`MCP server ${what} failed`, err, { id: server.id });
       throw new Error(`MCP server '${server.id}' failed to start: ${errMessage(err)}`);
     }
     try {
@@ -3730,28 +3737,54 @@ var ExternalMcpManager = class {
     } catch (err) {
       await client.close().catch(() => {
       });
-      this.log.error("MCP server lazy start failed", err, { id: server.id });
+      this.log.error(`MCP server ${what} failed`, err, { id: server.id });
       throw new Error(`MCP server '${server.id}' failed to start: ${errMessage(err)}`);
     }
-    server.client = client;
+    const downMs = restart ? Date.now() - server.closedAt : void 0;
+    this.adoptClient(server, client);
     if (server.removed) throw new Error(`MCP server '${server.id}' was removed`);
     if (!sameToolList(server.tools, tools)) this.reregisterTools(server, tools);
-    this.log.info("MCP server registered (runner-managed)", {
-      id: server.id,
-      transport: "stdio",
-      toolCount: server.toolNames.length,
-      tools: server.toolNames,
-      lazy: true,
-      started: true
-    });
+    this.log.info(
+      restart ? "MCP server restarted (runner-managed)" : "MCP server registered (runner-managed)",
+      {
+        id: server.id,
+        transport: server.decl.transport ?? "stdio",
+        toolCount: server.toolNames.length,
+        tools: server.toolNames,
+        ...restart ? { downMs } : { lazy: true, started: true }
+      }
+    );
     return client;
   }
+  /**
+   * Make `client` the server's live client and watch it: when its transport
+   * closes on its own (the stdio process exited), drop it so the next tool call
+   * starts the server again instead of failing with `Not connected` for the
+   * rest of the session. The client it replaces (401 reconnect, or a restart
+   * racing one) is closed, and its close is ignored.
+   */
+  adoptClient(server, client) {
+    const previous = server.client;
+    server.client = client;
+    server.closedAt = void 0;
+    if (previous && previous !== client) void previous.close().catch(() => {
+    });
+    client.onclose = () => {
+      if (server.client !== client || server.removed) return;
+      server.client = void 0;
+      server.closedAt = Date.now();
+      this.log.warn("MCP server connection closed; the next tool call restarts it", {
+        id: server.id,
+        transport: server.decl.transport ?? "stdio"
+      });
+    };
+  }
   /**
    * The snapshot disagreed with what the started server advertises: replace the
    * registered capabilities with the live list and rewrite the snapshot.
    */
   reregisterTools(server, tools) {
-    this.log.warn("MCP tools snapshot is stale; re-registering from the live server", {
+    this.log.warn("MCP tool list changed; re-registering from the live server", {
       id: server.id,
       snapshotCount: server.tools.length,
       liveCount: tools.length
@@ -3764,7 +3797,7 @@ var ExternalMcpManager = class {
       this.registry.register(cap, "agent");
       server.toolNames.push(cap.name);
     }
-    void writeMcpToolsSnapshot(server.decl, tools);
+    if (isLazyDeclaration(server.decl)) void writeMcpToolsSnapshot(server.decl, tools);
   }
   /**
    * Deregister a running MCP server's tools and close its client.
@@ -3848,12 +3881,7 @@ var ExternalMcpManager = class {
       this.log.warn("MCP reconnect after 401 failed", { id: server.id, error: errMessage(err) });
       return false;
     }
-    const old = server.client;
-    server.client = next;
-    try {
-      await old?.close();
-    } catch {
-    }
+    this.adoptClient(server, next);
     this.log.info("MCP server reconnected after 401 re-mint", { id: server.id });
     return true;
   }
@@ -3884,7 +3912,14 @@ var ExternalMcpManager = class {
         const call = { name: tool.name, arguments: input ?? {} };
         const invoke = async () => {
           const client = await untilAborted(this.ensureClient(server), ctx.signal);
-          return ctx.signal ? client.callTool(call, void 0, { signal: ctx.signal }) : client.callTool(call);
+          return client.callTool(call, void 0, {
+            ...ctx.signal ? { signal: ctx.signal } : {},
+            timeout: MCP_TOOL_CALL_TIMEOUT_MS,
+            resetTimeoutOnProgress: true,
+            maxTotalTimeout: MCP_TOOL_CALL_MAX_TOTAL_MS,
+            onprogress: () => {
+            }
+          });
         };
         let result;
         try {
@@ -4452,7 +4487,8 @@ function modelEndpointLayer({ url }) {
         base_url: url,
         credential: { kind: "bearer", ref: `env:${MODEL_ENDPOINT_TOKEN_ENV}` },
         label: "Skaile model endpoint",
-        enabled: true
+        enabled: true,
+        discovery: { type: "openai-models-list" }
       }
     }
   };
@@ -4491,6 +4527,12 @@ async function startRunnerModelEndpoint(options) {
     token,
     host,
     port: options.config.port ?? 0,
+    transforms: buildModelTransforms(
+      options.config.transforms,
+      { projectDir: options.projectDir },
+      pluginRegistry
+    ),
+    enabledTransforms: Object.keys(options.config.transforms ?? {}),
     projectDir: options.projectDir,
     log: options.log
   });
@@ -4518,6 +4560,39 @@ async function startRunnerModelEndpoint(options) {
     }
   };
 }
+function mergeModelEndpointConfig(fromYaml, fromFlag) {
+  const { transforms: _replaced, ...scalars } = { ...fromYaml, ...fromFlag };
+  const transforms = { ...fromFlag?.transforms, ...fromYaml?.transforms };
+  return Object.keys(transforms).length > 0 ? { ...scalars, transforms } : scalars;
+}
+function buildModelTransforms(configured, ctx, registry) {
+  const factories = {};
+  for (const { id } of registry.list("modelTransform")) {
+    const target = registry.get("modelTransform", id);
+    if (!target) continue;
+    const config = configured?.[id];
+    factories[id] = config ? () => target.create(target.configSchema.parse(config), ctx) : () => Promise.reject(
+      new ModelEndpointError(
+        404,
+        `model transform '${id}' is installed but not enabled: add model_endpoint.transforms.${id} to skaile.yaml or pass --model-endpoint-transform ${id}`,
+        "model_not_found",
+        "not_found_error"
+      )
+    );
+  }
+  for (const id of Object.keys(configured ?? {})) {
+    if (id in factories) continue;
+    factories[id] = () => Promise.reject(
+      new ModelEndpointError(
+        500,
+        `model transform '${id}' is enabled in model_endpoint.transforms but no installed plugin registers it (skaile plugin install @skaile/transform-${id})`,
+        "transform_not_installed",
+        "server_error"
+      )
+    );
+  }
+  return factories;
+}
 function isLoopbackHost(host) {
   const bare = host.replace(/^\[|\]$/g, "").toLowerCase();
   return bare === "localhost" || bare === "::1" || /^127(\.\d{1,3}){3}$/.test(bare);
@@ -14010,10 +14085,7 @@ async function startAgentServer(opts) {
       bakedMcpServerIds = new Set([...bakedMcpServerIds].filter((baked) => baked !== id));
     }
   };
-  const modelEndpointConfig = {
-    ...wsConfig.model_endpoint,
-    ...opts.modelEndpoint
-  };
+  const modelEndpointConfig = mergeModelEndpointConfig(wsConfig.model_endpoint, opts.modelEndpoint);
   if (!managedHost && modelEndpointConfig.enabled === true) {
     const bootRegistry = loadProviderRegistry({ projectDir: opts.projectDir }).registry;
     modelEndpoint = await startRunnerModelEndpoint({
@@ -16394,5 +16466,5 @@ function touchSession(state) {
 }
 
 export { AgentRunError, CLAUDE_CODE_CREDENTIALS_KEY, CONNECTOR_MUTATE_NOT_READY, CapabilityRegistry, 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, WRITE_RANGE_PARTIAL_TTL_MS, WS_AUTH_TOKEN_ENV, WS_AUTH_TOKEN_FILE_ENV, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildCompositionRunSnapshot, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, canonicalJson, capabilityLogInstance, capabilitySignatureInputs, clearPreInitRingSink, clearSession, compositionRunSnapshotPath, computeCapabilitySignature, computeDirectoryTotals, computeRevisionHash, connectorRefreshKind, createAgentSession, createFinalTextFallback, createFlowConnectorReadiness, createInMemoryRunStore, createManagedCodexSubpromptHarness, createRunController, createSessionStimulusBus, defineCapability, deleteSession, describeComposition, dispatchResourceRequest, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureClaudeSettingsDisablesConnectors, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, flowStartNeedsHarnessRestart, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, handleSessionRootResourceRequest, harnessActiveAfterTurnEnd, hasNonTerminalFlow, hashAgentFiles, hostOpResumeStimulus, installPreInitRingSink, instanceForSession, instanceSessionOverrides, isSessionRootPathAllowed, listSessions, loadAgentManifest, loadCompositionRunSnapshot, loadManagedCodexHostConfig, loadSession, loadSessionById, logConnectorReport, manifestModelForHarness, mcpAuthSecretKey, newSession, nulTailPaddingLength, pickChatFlowTarget, pickFlowToolTarget, pickRepointedManager, planFlowMutate, prepareCodexTools, reconcilePendingDecisions, reconnectedRunNeedsAgentTurn, recreateKeepingLiveFlows, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, rejectPendingCapabilityCallsOnDisconnect, resetRunnerLogStore, resolveAgentInstance, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveInstanceAgentDir, resolveSessionId, restoredRunHasWorkToResume, runAgentChat, saveCompositionRunSnapshot, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, takeRunnerWsAuthToken, toActiveFlowTarget, touchSession, unresolvedCredentialNotices, validateInputResponse, verifyConventionItems, writeClaudeCodeCredentialsFile, writeRangeChunk, writeRangePartialPath };
-//# sourceMappingURL=chunk-ZII54C3E.js.map
-//# sourceMappingURL=chunk-ZII54C3E.js.map
+//# sourceMappingURL=chunk-F6EPGAES.js.map
+//# sourceMappingURL=chunk-F6EPGAES.js.map