@skaile/workspaces 5.0.0 → 5.1.1

package/dist/{chunk-YOWFUJO7.js → chunk-57DVX53V.js}

@@ -1,29 +1,29 @@
-import { WorkspacePlugin } from './chunk-TVYLXZTT.js';
-import { buildWorkspaceToolDefs } from './chunk-RSHMAEK3.js';
+import { WorkspacePlugin } from './chunk-G47EV3V6.js';
+import { buildWorkspaceToolDefs } from './chunk-AYNPGPT5.js';
 import { findAiAssetsRoot } from './chunk-TYUJB336.js';
 import { WebSocketServerTransport } from './chunk-5LKOAX7I.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
 import { prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-HCYS7GFP.js';
-import { resolveFlowPath } from './chunk-GFPG27HK.js';
+import { resolveFlowPath } from './chunk-2EOPGGLY.js';
 import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-VDJKWKH2.js';
-import { ConnectFailureCarryOver, registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, driveOrchestratorTurn, buildSdkFlowTools } from './chunk-53WMBXSL.js';
-import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, isKnownSecretRef, EnvSecretProvider, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, deriveSingleMaterializedConnectorDeclaration } from './chunk-H5G3OYY6.js';
-import { EventNormalizer } from './chunk-KREXWKVX.js';
+import { ConnectFailureCarryOver, registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, driveOrchestratorTurn, buildSdkFlowTools } from './chunk-QFZFZXQW.js';
+import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, isKnownSecretRef, EnvSecretProvider, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, deriveSingleMaterializedConnectorDeclaration } from './chunk-WKIOWDLQ.js';
+import { EventNormalizer } from './chunk-YIVB7GIP.js';
 import { probeResumeTranscript, transcriptStoreForRuntime } from './chunk-TVOODIZE.js';
 import { scopeReconfigureModel } from './chunk-EINLFFP6.js';
 import { CodexNativeStateUnavailable } from './chunk-LOO5CB5M.js';
 import { dispatchCapability } from './chunk-RDYI4MML.js';
 import { classifyClaudeSdkError } from './chunk-XBSQ4KMC.js';
 import { agentExecRequested } from './chunk-YROR332M.js';
-import { toAgentEffort, createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv, AI_PROVIDER_PRESETS, AgentDriver } from './chunk-RP4B4HVX.js';
-import { loadFlow } from './chunk-22DN3DB2.js';
+import { toAgentEffort, createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv, AI_PROVIDER_PRESETS, AgentDriver } from './chunk-RDTHJSGY.js';
+import { loadFlow } from './chunk-UMSWQKCY.js';
 import { parseFlowDefinition } from './chunk-QZLWJETK.js';
 import { renderStimulusPrompt } from './chunk-XUUYAS3Z.js';
 import { withActivityLabelJsonSchema, TOOL_ACTIVITY_PROMPT_SECTION, SESSION_ROOT_CONNECTOR_ID, PROTOCOL_VERSION } from './chunk-IDEA6CYI.js';
-import { resolveLibraryDir, resolveSettings, loadProviderRegistry } from './chunk-MBVNMPG7.js';
-import { resolveRuntimeAssets } from './chunk-CGJ7B6MZ.js';
+import { resolveLibraryDir, resolveSettings, loadProviderRegistry } from './chunk-IWCCZL7C.js';
+import { resolveRuntimeAssets } from './chunk-YDJZRLGN.js';
 import { resolveDriverPaths } from './chunk-K5GBV4SA.js';
-import { resolveSkWorkspaceConfig, resolveAgentDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill, STAGED_SKILL_MARKER } from './chunk-HWE3FXF4.js';
+import { resolveSkWorkspaceConfig, resolveAgentDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill, STAGED_SKILL_MARKER } from './chunk-MXXKTQXJ.js';
 import { globalSkaileDir } from './chunk-TLKM4M47.js';
 import { withFsDeadline, FsDeadlineError, fsDeadlineMs, parseFrontmatter, tryWithFsDeadline } from './chunk-DXUQCMVT.js';
 import { parseAssetRef } from './chunk-43ZBF3WH.js';
@@ -1828,13 +1828,14 @@ var RESERVED_MCP_SERVER_IDS = /* @__PURE__ */ new Set([
   "skaile-workspace",
   "skaile-capabilities"
 ]);
-async function resolveExternalMcpDeclarations(projectDir, sessionId, managedCodex = false) {
+async function resolveExternalMcpDeclarations(projectDir, sessionId, managedCodex = false, loadedIds) {
   const mcpLog = createLogger({
     kind: "mcp",
     subkind: "wiring",
     instance: sessionId ?? "no-session"
   });
   const mcpDeclarations = await loadMcpServerDeclarations(projectDir);
+  for (const decl of mcpDeclarations) loadedIds?.add(decl.id);
   if (managedCodex && mcpDeclarations.length > 0)
     throw new Error("CODEX_MANAGED_PROJECT_MCP_UNSUPPORTED");
   mcpLog.debug("loaded MCP declarations", { count: mcpDeclarations.length });
@@ -1867,6 +1868,10 @@ async function resolveExternalMcpDeclarations(projectDir, sessionId, managedCode
     env: substituteWorkspaceTokenMap(decl.env, projectDir)
   }));
 }
+async function findUnknownMcpDeclarationIds(projectDir, known) {
+  const declared = await loadMcpServerDeclarations(projectDir);
+  return declared.map((decl) => decl.id).filter((id) => !RESERVED_MCP_SERVER_IDS.has(id) && !known.has(id));
+}
 async function resolveRecipeDeclaration(decl, nixFlakeRef, recipeCache) {
   const recipe = decl.recipe;
   const recipeLogKey = recipe.flake ? { flake: recipe.flake } : { attr: recipe.attr };
@@ -2345,7 +2350,8 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
       throw new Error("external MCP manager unavailable \u2014 no capability registry (CLI/flow mode)");
     },
     getExternalMcpManager: () => null,
-    mcpPromptSection: ""
+    mcpPromptSection: "",
+    unloadedMcpDeclarationIds: async () => []
   };
   try {
     registerBuiltinConnectors();
@@ -2388,6 +2394,7 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
     let workspacePluginToShutdown = null;
     let externalMcpManager = null;
     let externalMcpDeclarations;
+    const loadedMcpIds = /* @__PURE__ */ new Set();
     const mcpSecretChain = preMintedSecrets ? new SecretProviderChain(
       [preMintedSecrets, secretProvider].filter(
         Boolean
@@ -2420,9 +2427,15 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
     }
     if (capabilityRegistry) {
       externalMcpDeclarations = mergeExtraMcpDeclarations(
-        managedProjectMcp ?? await resolveExternalMcpDeclarations(projectDir, sessionMeta?.sessionId),
+        managedProjectMcp ?? await resolveExternalMcpDeclarations(
+          projectDir,
+          sessionMeta?.sessionId,
+          false,
+          loadedMcpIds
+        ),
         extraMcpDeclarations
       );
+      for (const decl of externalMcpDeclarations) loadedMcpIds.add(decl.id);
       externalMcpManager = await startExternalMcpServers(
         capabilityRegistry,
         externalMcpDeclarations,
@@ -2499,7 +2512,13 @@ async function buildAgentResources(projectDir, driverType, _onLog, watch, secret
       startWatching,
       getOrCreateExternalMcpManager,
       getExternalMcpManager: () => externalMcpManager,
-      mcpPromptSection
+      mcpPromptSection,
+      unloadedMcpDeclarationIds: async () => {
+        if (!capabilityRegistry || sessionMeta?.managedCodex) return [];
+        const known = new Set(loadedMcpIds);
+        for (const server of externalMcpManager?.listServers() ?? []) known.add(server.id);
+        return findUnknownMcpDeclarationIds(projectDir, known);
+      }
     };
   } catch {
     return noopResult;
@@ -2759,7 +2778,8 @@ async function createAgentSession(config) {
     startWatching,
     getOrCreateExternalMcpManager,
     getExternalMcpManager,
-    mcpPromptSection
+    mcpPromptSection,
+    unloadedMcpDeclarationIds
   } = await buildAgentResources(
     projectDir,
     driverType,
@@ -2895,6 +2915,8 @@ async function createAgentSession(config) {
     startWatching,
     getOrCreateExternalMcpManager,
     getExternalMcpManager,
+    unloadedMcpDeclarationIds,
+    resumeSessionId,
     telemetry,
     systemPromptSections
   };
@@ -6519,6 +6541,28 @@ function rewriteFileChangedPath(event, cwd, mounts) {
   return event;
 }
 
+// runner/src/late-mcp-rebuild.ts
+async function rebuildForLateMcpDeclarations(deps) {
+  if (deps.driverStarted()) return false;
+  let late;
+  try {
+    late = await deps.unloadedMcpDeclarationIds();
+  } catch (err) {
+    deps.warn(
+      `[serve] late MCP declaration check failed (non-fatal): ${err instanceof Error ? err.message : String(err)}`
+    );
+    return false;
+  }
+  if (late.length === 0) return false;
+  return deps.recreate(() => {
+    if (deps.driverStarted()) return null;
+    deps.log(
+      `[serve] rebuilding the session before the first turn for MCP server(s) declared after the build: ${late.join(", ")}`
+    );
+    return { resumeSessionId: deps.resumeSessionId() };
+  });
+}
+
 // runner/src/process-safety-net.ts
 var BROKEN_PIPE_EXIT_CODE = 141;
 function resolveOptions(opts) {
@@ -6612,11 +6656,16 @@ function parseFleetHealthBody(body) {
 async function dispatchFleetHealthFlag(dir, fileName, manager, log) {
   if (!manager) return;
   const connectorId = fileName;
-  if (!connectorId || connectorId.startsWith(".")) return;
+  if (!connectorId || connectorId.startsWith(".") || connectorId.endsWith(".tmp")) return;
   let verdict;
   try {
     verdict = parseFleetHealthBody(await readFile(join(dir, connectorId), "utf8"));
-  } catch {
+  } catch (err) {
+    if (err.code === "ENOENT" && manager.clearFleetHealth) {
+      manager.clearFleetHealth(connectorId);
+      log.debug("fleet-health flag removed", { connectorId });
+      return;
+    }
     verdict = "error";
   }
   try {
@@ -11226,6 +11275,21 @@ async function startAgentServer(opts) {
     await driverSwapGate.awaitSwap();
     if (!await awaitCompactionIdle("prompt")) return;
     await restageMaterializedSkills(true);
+    try {
+      await rebuildForLateMcpDeclarations({
+        driverStarted: () => driverStarted,
+        unloadedMcpDeclarationIds: () => agentSession.unloadedMcpDeclarationIds(),
+        resumeSessionId: () => agentSession.resumeSessionId,
+        recreate: (overrides) => recreateAgentSession(overrides),
+        log,
+        warn: (line) => serverLog.warn(line)
+      });
+    } catch (err) {
+      const errMsg = err instanceof Error ? err.message : String(err);
+      serverLog.warn(`[serve] session rebuild for late MCP servers failed: ${errMsg}`);
+      sendEvent({ type: "error", message: `Session rebuild failed: ${errMsg}`, fatal: true });
+      return;
+    }
     const activeFlow = pickChatFlowTarget(activeFlows.values());
     if (activeFlow) {
       leaveQueue();
@@ -11931,5 +11995,5 @@ function touchSession(state) {
 }
 
 export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CONNECTOR_MUTATE_NOT_READY, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, DEFAULT_FLOW_MUTATE_CONNECTOR_WAIT_MS, 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, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, capabilitySignatureInputs, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, computeDirectoryTotals, connectorRefreshKind, createAgentSession, createFlowConnectorReadiness, createManagedCodexSubpromptDriver, createSessionStimulusBus, defineCapability, deleteSession, dispatchResourceRequest, dispatchRunnerCapabilityInvocation, driverActiveAfterTurnEnd, emitSystemPromptComposed, ensureClaudeSettingsDisablesConnectors, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, flowRunDrivesTurns, flowStartNeedsDriverRestart, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, handleSessionRootResourceRequest, hasNonTerminalFlow, hostOpResumeStimulus, installPreInitRingSink, isSessionRootPathAllowed, isTerminalFlowStatus, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadManagedCodexHostConfig, loadSession, loadSessionById, mcpAuthSecretKey, newSession, nulTailPaddingLength, pickChatFlowTarget, pickFlowToolTarget, pickRepointedManager, planFlowMutate, prepareCodexTools, reconcilePendingDecisions, reconnectedRunNeedsAgentTurn, recreateKeepingLiveFlows, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, rejectPendingCapabilityCallsOnDisconnect, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, restoredRunHasWorkToResume, runAgentChat, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, supportsLiveToolUpdates, takeRunnerWsAuthToken, toActiveFlowTarget, touchSession, validateInputResponse, writeClaudeCodeCredentialsFile, writeRangeChunk, writeRangePartialPath };
-//# sourceMappingURL=chunk-YOWFUJO7.js.map
-//# sourceMappingURL=chunk-YOWFUJO7.js.map
+//# sourceMappingURL=chunk-57DVX53V.js.map
+//# sourceMappingURL=chunk-57DVX53V.js.map