@skaile/workspaces 3.21.0 → 3.22.1

package/dist/{chunk-FWFHCERM.js → chunk-SYHMXGLF.js}

@@ -4,7 +4,7 @@ import { WorkspacePlugin } from './chunk-IUOXPQA3.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
 import { WebSocketServerTransport } from './chunk-WQ7DE5UC.js';
 import { prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-T3YLZQS4.js';
-import { resolveFlowPath } from './chunk-EJ76MKTF.js';
+import { resolveFlowPath } from './chunk-V7QZ7QIE.js';
 import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-7BUZQVRR.js';
 import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools, buildConnectorToolDefs, buildFlowToolDefs, driveOrchestratorTurn, SessionNodeExecutor, SessionSubpromptRunner, SessionInlineSubFlowRunner, buildSdkFlowTools } from './chunk-PLLVREB2.js';
 import { loadConnectorDeclarations, SecretProviderChain, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, isKnownSecretRef, deriveSingleMaterializedConnectorDeclaration } from './chunk-SIREWRZE.js';
@@ -3925,6 +3925,16 @@ var DriverSwapGate = class {
   }
 };
 
+// runner/src/reply-routing.ts
+async function routeReply(deps) {
+  const current = deps.getDriver();
+  if (current.hasPendingQuestion()) {
+    return current.answerQuestion(deps.answer, deps.question, deps.requestId) ? "answered" : "fresh-turn";
+  }
+  await deps.awaitSwap();
+  return "fresh-turn";
+}
+
 // runner/src/compaction/prompt.ts
 var DEFAULT_COMPACTION_PROMPT = `You are being asked to compact this conversation into a structured summary.
 This summary will replace the full conversation history when the session
@@ -6132,6 +6142,12 @@ async function startAgentServer(opts) {
       transport.send(event);
     }
   }
+  let initAcknowledged = false;
+  let initGeneration = 0;
+  function emitInitAck(ack) {
+    initAcknowledged = true;
+    sendEvent(ack);
+  }
   const capabilityRegistry = new CapabilityRegistry(
     createLogger({
       kind: "runner",
@@ -6468,9 +6484,16 @@ async function startAgentServer(opts) {
   }
   let resolveSessionReady;
   let rejectSessionReady;
+  let sessionReadyOutcome = "pending";
   const sessionReady = new Promise((resolve5, reject) => {
-    resolveSessionReady = resolve5;
-    rejectSessionReady = reject;
+    resolveSessionReady = () => {
+      if (sessionReadyOutcome === "pending") sessionReadyOutcome = "resolved";
+      resolve5();
+    };
+    rejectSessionReady = (err) => {
+      if (sessionReadyOutcome === "pending") sessionReadyOutcome = "rejected";
+      reject(err);
+    };
   });
   let sessionConfig;
   let agentSession;
@@ -7028,6 +7051,7 @@ async function startAgentServer(opts) {
   }
   async function cleanup() {
     if (managedHost) managedBootstrapClosed = true;
+    initAcknowledged = false;
     try {
       await Promise.race([
         sessionReady,
@@ -7416,7 +7440,9 @@ async function startAgentServer(opts) {
       }
       log(`[serve] runner.attach_instance staged skill(s): ${staged.join(", ")}`);
       const live = driverStarted;
-      await restartDriverForSkillChanges(staged.map((s) => ({ name: s, action: "add" })));
+      scheduleDriverRestartForSkillChanges(
+        staged.map((s) => ({ name: s, action: "add" }))
+      );
       return { ok: true, id: name, live, toolCount: 0 };
     } catch (err) {
       return {
@@ -7460,9 +7486,18 @@ async function startAgentServer(opts) {
       }))
     });
   }
+  function scheduleDriverRestartForSkillChanges(catalogActions) {
+    void restartDriverForSkillChanges(catalogActions).catch((err) => {
+      serverLog.warn(
+        `[serve] background driver restart for skill changes failed: ${err instanceof Error ? err.message : String(err)}`
+      );
+    });
+  }
   let runtimeRejected = false;
   async function handleSessionInit(cmd) {
     const initReceivedAt = Date.now();
+    const thisInit = ++initGeneration;
+    initAcknowledged = false;
     if (cmd.protocolVersion.major !== PROTOCOL_VERSION.major) {
       log(
         `[serve] incompatible protocol: agent=${PROTOCOL_VERSION.major} platform=${cmd.protocolVersion.major}`
@@ -7516,7 +7551,7 @@ async function startAgentServer(opts) {
         if (managedInitFingerprint) {
           if (managedInitFingerprint !== fingerprint) throw new Error("AI_PROFILE_INVALID");
           if (managedInitComplete)
-            sendEvent({
+            emitInitAck({
               type: "session_init_ack",
               capabilitySignature: computeCapabilitySignature(capabilityRegistry.list())
             });
@@ -7573,7 +7608,7 @@ async function startAgentServer(opts) {
     }
     const resumeProbe = !managedCodex && cmd.resume?.sessionId ? await probeResumeTranscript(cmd.resume.sessionId) : void 0;
     if (!managedCodex)
-      sendEvent({
+      emitInitAck({
         type: "session_init_ack",
         capabilitySignature: computeCapabilitySignature(capabilityRegistry.list()),
         ...resumeProbe ? { resumeProbe } : {}
@@ -7663,7 +7698,7 @@ async function startAgentServer(opts) {
         }
         if (managedBootstrapClosed || !driverStarted) throw new Error("CODEX_RUNTIME_UNSUPPORTED");
         managedInitComplete = true;
-        sendEvent({
+        emitInitAck({
           type: "session_init_ack",
           capabilitySignature: computeCapabilitySignature(capabilityRegistry.list())
         });
@@ -7672,6 +7707,7 @@ async function startAgentServer(opts) {
     };
     void buildSession().catch((err) => {
       const errMsg = err instanceof Error ? err.message : String(err);
+      if (thisInit === initGeneration) initAcknowledged = false;
       logPhase("session_ready", initReceivedAt, { ready: false });
       log(`[serve] session_init failed to build session: ${errMsg}`);
       sendEvent({ type: "error", message: errMsg, fatal: true });
@@ -7762,9 +7798,14 @@ async function startAgentServer(opts) {
   async function handleReply(cmd) {
     if (!await awaitSessionReadyOrFail()) return;
     log(`[serve] reply: ${cmd.answer.slice(0, 80)}...`);
-    await driverSwapGate.awaitSwap();
-    if (driver.hasPendingQuestion() && driver.answerQuestion(cmd.answer, cmd.question, cmd.requestId))
-      return;
+    const routed = await routeReply({
+      getDriver: () => driver,
+      awaitSwap: () => driverSwapGate.awaitSwap(),
+      answer: cmd.answer,
+      question: cmd.question,
+      requestId: cmd.requestId
+    });
+    if (routed === "answered") return;
     if (!driver.acceptsReplyAsPrompt) return;
     if (!await awaitCompactionIdle("reply")) return;
     const endTurn = driverSwapGate.beginTurn();
@@ -8102,6 +8143,15 @@ async function startAgentServer(opts) {
   transport.onCommand((cmd) => {
     void handleCommand(cmd);
   });
+  transport.onConnect(() => {
+    if (!initAcknowledged || sessionReadyOutcome === "rejected") return;
+    serverLog.debug("[serve] replaying session_init_ack on connect");
+    sendEvent({
+      type: "session_init_ack",
+      capabilitySignature: computeCapabilitySignature(capabilityRegistry.list()),
+      replayed: true
+    });
+  });
   transport.onConnect(() => {
     sendEvent(turnStatus.snapshot());
   });
@@ -8320,5 +8370,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_TREE_OP_DEADLINE_FACTOR, MarkdownStreamer, PreInitRingSink, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, connectorRefreshKind, createAgentSession, createFlowConnectorReadiness, createManagedCodexSubpromptDriver, createSessionStimulusBus, defineCapability, deleteSession, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureClaudeSettingsDisablesConnectors, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, hasNonTerminalFlow, hostOpResumeStimulus, installPreInitRingSink, isTerminalFlowStatus, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadManagedCodexHostConfig, loadSession, loadSessionById, mcpAuthSecretKey, newSession, nulTailPaddingLength, pickRepointedManager, planFlowMutate, prepareCodexTools, reconcilePendingDecisions, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, runAgentChat, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, supportsLiveToolUpdates, touchSession, validateInputResponse, writeClaudeCodeCredentialsFile };
-//# sourceMappingURL=chunk-FWFHCERM.js.map
-//# sourceMappingURL=chunk-FWFHCERM.js.map
+//# sourceMappingURL=chunk-SYHMXGLF.js.map
+//# sourceMappingURL=chunk-SYHMXGLF.js.map