@skaile/workspaces 6.16.0 → 6.16.1

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

@@ -4,7 +4,7 @@ import { findAiAssetsRoot } from './chunk-3A7JUOY2.js';
 import { startModelEndpoint, ModelEndpointError } from './chunk-3UYKT62L.js';
 import { WebSocketServerTransport } from './chunk-CU5WY6HN.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
-import { resolveFlowPath } from './chunk-6KV34G6A.js';
+import { resolveFlowPath } from './chunk-K4763755.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';
@@ -3498,6 +3498,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 +3652,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 +3666,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 +3708,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 +3736,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 +3796,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 +3880,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 +3911,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 {
@@ -16394,5 +16428,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-U6UFPOEK.js.map
+//# sourceMappingURL=chunk-U6UFPOEK.js.map