@skaile/workspaces 4.25.0 → 4.27.0

package/dist/{chunk-2N6NQUVB.js → chunk-VQGEH6WL.js}

@@ -1,20 +1,21 @@
-import { WorkspacePlugin } from './chunk-H4XNX2FG.js';
+import { WorkspacePlugin } from './chunk-746DTX5S.js';
 import { buildWorkspaceToolDefs } from './chunk-HMUFI3L5.js';
 import { findAiAssetsRoot } from './chunk-7IH3RKKK.js';
-import { WebSocketServerTransport } from './chunk-73ZXUUL6.js';
+import { WebSocketServerTransport } from './chunk-5LKOAX7I.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
 import { prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-PE3A6FFW.js';
-import { resolveFlowPath } from './chunk-253427M3.js';
+import { resolveFlowPath } from './chunk-D5Q5MOOH.js';
 import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-Q6NDQ6BH.js';
-import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, driveOrchestratorTurn, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, buildSdkFlowTools } from './chunk-EZOFQW3G.js';
+import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, driveOrchestratorTurn, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, buildSdkFlowTools } from './chunk-2L4KARVG.js';
 import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, isKnownSecretRef, deriveSingleMaterializedConnectorDeclaration } from './chunk-2OLNNQKT.js';
-import { EventNormalizer } from './chunk-IN466NSZ.js';
+import { EventNormalizer } from './chunk-BADVX5LG.js';
 import { probeResumeTranscript, transcriptStoreForRuntime } from './chunk-6S5KL76M.js';
+import { scopeReconfigureModel } from './chunk-TJRNJVGU.js';
 import { CodexNativeStateUnavailable } from './chunk-LOO5CB5M.js';
-import { dispatchCapability } from './chunk-D3UARV3Z.js';
+import { dispatchCapability } from './chunk-TRRFUVDJ.js';
 import { classifyClaudeSdkError } from './chunk-BGY4KTU6.js';
 import { agentExecRequested } from './chunk-YROR332M.js';
-import { toAgentEffort, createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv, AI_PROVIDER_PRESETS, AgentDriver } from './chunk-IRGI7Q62.js';
+import { toAgentEffort, createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv, AI_PROVIDER_PRESETS, AgentDriver } from './chunk-IQID7X6P.js';
 import { loadFlow } from './chunk-KTCMBEEB.js';
 import { parseFlowDefinition } from './chunk-ALLCAFHQ.js';
 import { renderStimulusPrompt } from './chunk-D6YOE2DB.js';
@@ -863,7 +864,6 @@ async function prepareCodexTools(options) {
               const { result } = await cancellable(
                 dispatchCapability(
                   hooks,
-                  randomUUID(),
                   call.params.name,
                   call.params.arguments ?? {},
                   () => {
@@ -3400,13 +3400,15 @@ var CapabilityRegistry = class {
    * error still reaches the caller unchanged. `SKAILE_LOG_CONTENT=1` adds the
    * content back on a developer machine (see `log-content.ts`).
    *
-   * `baseCtx.callId` (the bridge's dispatch call id) correlates the rows; a random id is
-   * used when the caller has none.
+   * `baseCtx.callId` (the bridge's dispatch call id) correlates the rows and is
+   * forwarded to the handler as `ctx.callId`; a random id is used when the caller
+   * has none.
    *
    * @throws when the capability is unknown or the input fails validation
    */
   async invoke(name, input, baseCtx) {
     const { callId: givenCallId, ...handlerCtx } = baseCtx;
+    const callId = givenCallId ?? randomUUID();
     handlerCtx.signal?.throwIfAborted();
     const cap = this.resolve(name);
     if (!cap) {
@@ -3417,7 +3419,6 @@ var CapabilityRegistry = class {
       subkind: cap.origin.kind,
       instance: capabilityLogInstance(cap)
     });
-    const callId = givenCallId ?? randomUUID();
     const withContent = isContentLoggingEnabled();
     const startedAt = performance.now();
     const durationMs = () => Math.round(performance.now() - startedAt);
@@ -3429,7 +3430,7 @@ var CapabilityRegistry = class {
     });
     try {
       const validated = cap.inputZod.parse(input);
-      const result = await cap.handler(validated, { ...handlerCtx, log });
+      const result = await cap.handler(validated, { ...handlerCtx, callId, log });
       log.info("ok", {
         callId,
         outcome: "ok",
@@ -3513,8 +3514,8 @@ function resolveCapabilityCallTimeoutMs(cap, approvalTimeoutMs) {
 function buildClientCapabilityHandler(args) {
   const timeoutMs = args.timeoutMs ?? DEFAULT_CAPABILITY_CALL_TIMEOUT_MS;
   const gen = args.generateCallId ?? (() => `cap-${Date.now()}-${Math.floor(Math.random() * 1e9)}`);
-  return async (input) => {
-    const callId = gen();
+  return async (input, ctx) => {
+    const callId = ctx?.callId ?? gen();
     if (args.wire.fireAndForget) {
       args.emit({
         type: "capability_invoked",
@@ -3525,6 +3526,11 @@ function buildClientCapabilityHandler(args) {
       });
       return {};
     }
+    if (args.pending.has(callId)) {
+      throw new Error(
+        `Capability ${args.wire.name} (callId=${callId}) rejected: a call with this id is already in flight`
+      );
+    }
     return new Promise((resolve4, reject) => {
       const timer = setTimeout(() => {
         args.pending.delete(callId);
@@ -4512,7 +4518,8 @@ function driverAppliesReconfigure(driver) {
 function applyReconfigurePatch(config, patch) {
   if (patch.model !== void 0) {
     config.model = patch.model;
-    if (config.modelRef !== void 0) config.modelRef = patch.model;
+    if (patch.modelRef !== void 0) config.modelRef = patch.modelRef;
+    else if (config.modelRef !== void 0) config.modelRef = patch.model;
   }
   if (patch.thinking !== void 0) config.thinking = patch.thinking;
   if (patch.effort !== void 0) config.effort = patch.effort;
@@ -4523,7 +4530,7 @@ function carryLiveReconfigure(config, patch, wireAgentConfigChanged) {
   return patch;
 }
 function buildReconfigureHandler(deps) {
-  const { getDriver, rememberPatch, log } = deps;
+  const { getDriver, getModelSelection, rememberPatch, log } = deps;
   return async (patch) => {
     const fields = Object.keys(patch).join(", ");
     const driver = getDriver();
@@ -4546,8 +4553,18 @@ function buildReconfigureHandler(deps) {
         message: `The ${driverId} driver cannot change ${fields} live; the change applies when the session next starts.`
       };
     }
+    let modelRef;
+    const selection = patch.model !== void 0 ? getModelSelection?.() : void 0;
+    if (patch.model !== void 0 && selection) {
+      const scope = scopeReconfigureModel({ ...selection, model: patch.model });
+      if (!scope.ok) {
+        log(`[reconfigure] ${scope.message} (${fields} not applied)`);
+        return { ok: false, code: scope.code, message: scope.message };
+      }
+      modelRef = scope.modelRef;
+    }
     driver.reconfigure(patch);
-    rememberPatch(patch);
+    rememberPatch(modelRef === void 0 ? patch : { ...patch, modelRef });
     const model = driver.getModel() ?? null;
     log(`[reconfigure] driver ${driverId} took ${fields} (model=${model ?? "(default)"})`);
     return { ok: true, model };
@@ -4678,6 +4695,8 @@ var DriverSwapGate = class {
   activeDriverSwap = null;
   /** FIFO chain; resolves once every started turn has settled. */
   turnTail = Promise.resolve();
+  /** FIFO chain of swaps; never rejects, resolves once every queued swap settled. */
+  swapTail = Promise.resolve();
   /**
    * Mark a turn as in flight. Call at the real `driver.prompt()` dispatch — not
    * earlier — so a same-handler restart (e.g. restaging skills before the turn)
@@ -4733,6 +4752,28 @@ var DriverSwapGate = class {
     } catch {
     }
   }
+  /**
+   * Run a driver swap: queued behind every earlier swap, then behind every
+   * in-flight turn. Registers synchronously, so a prompt arriving before the
+   * swap starts already defers to it, and `isSwapping` stays true until the last
+   * queued swap settles. A rejecting swap rejects only for its own caller — the
+   * queue moves on. Never call from inside a swap: it would wait on itself.
+   */
+  runSwap(swap) {
+    const earlier = this.swapTail;
+    const run = (async () => {
+      await earlier;
+      await this.awaitActiveTurn();
+      return swap();
+    })();
+    const settled = run.then(
+      () => void 0,
+      () => void 0
+    );
+    this.swapTail = settled;
+    this.beginSwap(settled);
+    return run;
+  }
   /**
    * Register the in-flight recreate promise so concurrent prompts defer to it.
    * Auto-clears when `recreate` settles (resolve OR reject) so a failed recreate
@@ -7126,6 +7167,7 @@ function wireSessionCapabilities(deps) {
     registerLiveAttachedMcp,
     scheduleDriverRestartForToolChanges,
     getDriver,
+    getModelSelection,
     rememberReconfigure,
     log
   } = deps;
@@ -7187,6 +7229,7 @@ function wireSessionCapabilities(deps) {
     }),
     reconfigure: buildReconfigureHandler({
       getDriver,
+      getModelSelection,
       rememberPatch: rememberReconfigure,
       log
     })
@@ -8928,19 +8971,20 @@ async function startAgentServer(opts) {
     return resourceManager;
   }
   async function recreateDriverForFlowTools() {
-    if (!flowStartNeedsDriverRestart({
+    const needsRestart = () => flowStartNeedsDriverRestart({
       driverStarted,
       driverType: agentSession?.driverType,
       flowToolsBaked
-    })) {
-      return false;
-    }
-    const prevSessionId = driver.runtimeSessionId;
-    log(
-      `[serve] restarting driver to register flow connector tools (resume=${prevSessionId ?? "none"})`
-    );
-    await recreateAgentSession({ resumeSessionId: prevSessionId });
-    return true;
+    });
+    if (!needsRestart()) return false;
+    return recreateAgentSession(() => {
+      if (!needsRestart()) return null;
+      const prevSessionId = driver.runtimeSessionId;
+      log(
+        `[serve] restarting driver to register flow connector tools (resume=${prevSessionId ?? "none"})`
+      );
+      return { resumeSessionId: prevSessionId };
+    });
   }
   async function createActiveFlow(flowDef, seedOrExecution) {
     const bus = getOrCreateStimulusBus();
@@ -9330,6 +9374,11 @@ async function startAgentServer(opts) {
       registerLiveAttachedMcp,
       scheduleDriverRestartForToolChanges,
       getDriver: () => driver ?? null,
+      // The selector the live driver runs: the last scoped patch, else the build's.
+      getModelSelection: () => agentSession ? {
+        registry: agentSession.registry,
+        modelRef: liveReconfigurePatch?.modelRef ?? agentSession.modelRef
+      } : void 0,
       rememberReconfigure: (patch) => {
         liveReconfigurePatch = { ...liveReconfigurePatch, ...patch };
         applyReconfigurePatch(sessionConfig, patch);
@@ -9339,18 +9388,12 @@ async function startAgentServer(opts) {
     return { needsWireFallbackRecreate, needsWireAgentConfigRecreate };
   }
   async function recreateAgentSession(overrides) {
-    let markSwapDone;
-    driverSwapGate.beginSwap(
-      new Promise((resolve4) => {
-        markSwapDone = resolve4;
-      })
-    );
-    try {
-      await driverSwapGate.awaitActiveTurn();
-      await recreateAgentSessionInner(overrides);
-    } finally {
-      markSwapDone();
-    }
+    return driverSwapGate.runSwap(async () => {
+      const resolved = typeof overrides === "function" ? overrides() : overrides;
+      if (!resolved) return false;
+      await recreateAgentSessionInner(resolved);
+      return true;
+    });
   }
   async function recreateAgentSessionInner(overrides) {
     const disposedManager = agentSession.resourceManager;
@@ -9566,9 +9609,15 @@ async function startAgentServer(opts) {
       log(`[serve] ${reason} applied before driver start \u2014 picked up on the first prompt`);
       return;
     }
-    const prevSessionId = driver.runtimeSessionId;
-    log(`[serve] restarting driver to pick up ${reason} (resume=${prevSessionId ?? "none"})`);
-    await recreateAgentSession({ resumeSessionId: prevSessionId });
+    await recreateAgentSession(() => {
+      if (!driverStarted) {
+        log(`[serve] ${reason} applied after an earlier recreate \u2014 picked up on the first prompt`);
+        return null;
+      }
+      const prevSessionId = driver.runtimeSessionId;
+      log(`[serve] restarting driver to pick up ${reason} (resume=${prevSessionId ?? "none"})`);
+      return { resumeSessionId: prevSessionId };
+    });
   }
   function enqueueDriverRestart(reason) {
     const next = driverRestartChain.then(() => restartDriverForToolChanges(reason));
@@ -10250,7 +10299,10 @@ async function startAgentServer(opts) {
       await dispatchRunnerCapabilityInvocation(
         { callId: cmd.callId, name: cmd.name, input: cmd.input },
         {
-          invoke: (name, input) => capabilityRegistry.invoke(name, input, { sessionId, callId: cmd.callId }),
+          // No `callId` here: the platform's id belongs to the platform's pending
+          // map, and a client-origin cap would otherwise emit its own outbound
+          // `capability_invoked` under it. The registry mints a fresh one.
+          invoke: (name, input) => capabilityRegistry.invoke(name, input, { sessionId }),
           // `capability_result` is a CapabilityEvent; `sendEvent` and
           // `ServerTransport.send` are typed to AgentEvent alone though both
           // unions ride one wire. Widening that is a consumer-breaking change.
@@ -10577,5 +10629,5 @@ function touchSession(state) {
 }
 
 export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, 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_STAT_BUDGET_MS, MOUNT_STAT_MAX_ENTRIES, MOUNT_TREE_OP_DEADLINE_FACTOR, MarkdownStreamer, PreInitRingSink, ResourceOperationError, SESSION_ROOT_WRITABLE_DIRS, SESSION_ROOT_WRITABLE_FILES, WS_AUTH_TOKEN_ENV, WS_AUTH_TOKEN_FILE_ENV, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, computeDirectoryTotals, connectorRefreshKind, createAgentSession, createFlowConnectorReadiness, createManagedCodexSubpromptDriver, createSessionStimulusBus, defineCapability, deleteSession, dispatchResourceRequest, dispatchRunnerCapabilityInvocation, 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, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, rejectPendingCapabilityCallsOnDisconnect, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, runAgentChat, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, supportsLiveToolUpdates, takeRunnerWsAuthToken, touchSession, validateInputResponse, writeClaudeCodeCredentialsFile };
-//# sourceMappingURL=chunk-2N6NQUVB.js.map
-//# sourceMappingURL=chunk-2N6NQUVB.js.map
+//# sourceMappingURL=chunk-VQGEH6WL.js.map
+//# sourceMappingURL=chunk-VQGEH6WL.js.map