@pqpo/pragma 0.1.0-next.8 → 0.1.0-next.9

package/dist/cli.js

@@ -36965,7 +36965,7 @@ async function runExpertInvocation(options2) {
     ]
   });
   const formattedPrompt = formatExpertPromptWithAttachments(options2.prompt, options2.attachments ?? []);
-  await appendUserMessage(options2, formattedPrompt, `invocation-user-message:${options2.invocationId}`);
+  await appendUserMessage(options2, formattedPrompt, options2.isRecovery === true ? `invocation-recovery-user-message:${options2.invocationId}` : `invocation-user-message:${options2.invocationId}`);
   const invocationSignal = options2.controller.signalForInvocation(options2.invocationId, options2.parentInvocationId);
   throwIfAborted(invocationSignal, options2.invocationId);
   const modelSelection = options2.modelSelection ?? options2.context.modelSelection;
@@ -37175,6 +37175,9 @@ async function runExpertInvocation(options2) {
       const invocationOutput = await contextOutputs.normalize(options2.invocationId, options2.context.contextId, turn.output);
       await appendInvocationFinalMessage(options2, turn.runId, turn.finalMessage, invocationOutput);
       while (true) {
+        const checkpoint = options2.controller.getHumanInteractionCheckpoint(options2.invocationId);
+        if (checkpoint !== void 0)
+          throw checkpoint;
         const currentExecution = await requireExecution2(options2.store, options2.executionId);
         const currentInvocation = await options2.store.getInvocation(options2.executionId, options2.invocationId);
         if (currentInvocation === void 0) {
@@ -37661,6 +37664,9 @@ async function submitRuntimeTurn(options2) {
     const result = await handle.result;
     await drain;
     await usagePreview;
+    const checkpoint = options2.options.controller.getHumanInteractionCheckpoint(options2.options.invocationId);
+    if (checkpoint !== void 0)
+      throw checkpoint;
     const output = result.result.output;
     const finalMessage = completedRootAssistant ?? rootMessageAccumulator.complete(output, result.result.usage);
     await settleRuntimeTurnUsage(options2, result.result.usage);
@@ -37674,7 +37680,7 @@ async function submitRuntimeTurn(options2) {
     const usage = await handle.usage?.catch(() => void 0);
     await usagePreview;
     await settleRuntimeTurnUsage(options2, usage);
-    throw error52;
+    throw options2.options.controller.getHumanInteractionCheckpoint(options2.options.invocationId) ?? error52;
   } finally {
     await drain.catch(() => void 0);
     options2.options.controller.unregisterRuntimeSubmission(options2.options.invocationId, handle.runId);
@@ -37992,6 +37998,7 @@ var init_expert_runner = __esm({
       linkedInvocationSignals = /* @__PURE__ */ new Map();
       orchestrators = /* @__PURE__ */ new Map();
       pendingInteractions = /* @__PURE__ */ new Map();
+      checkpointedInvocations = /* @__PURE__ */ new Map();
       humanResponseOperations = /* @__PURE__ */ new Map();
       cancelled = false;
       cancellationReason;
@@ -38065,8 +38072,28 @@ var init_expert_runner = __esm({
           }
         }
         const checkpoint = new HumanInteractionCheckpointError(this.executionId);
+        const invocationIds = new Set(pending.map((interaction) => interaction.invocationId));
+        const runtimeStops = [];
+        for (const invocationId of invocationIds) {
+          this.checkpointedInvocations.set(invocationId, checkpoint);
+          const signal = this.invocationSignals.get(invocationId);
+          if (signal !== void 0 && !signal.signal.aborted)
+            signal.abort(checkpoint);
+          const submission = this.activeRuntimeSubmissions.get(invocationId);
+          if (submission !== void 0) {
+            runtimeStops.push(Promise.resolve().then(async () => await submission.handle.cancel()));
+          }
+        }
         for (const interaction of pending)
           interaction.reject(checkpoint);
+        await Promise.allSettled(runtimeStops);
+      }
+      /**
+       * Returns the durable checkpoint reason for an invocation whose Runtime turn
+       * must not be converted into a terminal failure or success.
+       */
+      getHumanInteractionCheckpoint(invocationId) {
+        return this.checkpointedInvocations.get(invocationId);
       }
       signalForInvocation(invocationId, parentInvocationId) {
         const linked = this.linkedInvocationSignals.get(invocationId);
@@ -38105,6 +38132,9 @@ var init_expert_runner = __esm({
       registerRuntimeSubmission(invocationId, contextId, session, handle, supportsSteer) {
         const submission = { invocationId, contextId, session, handle, supportsSteer };
         this.activeRuntimeSubmissions.set(invocationId, submission);
+        if (this.checkpointedInvocations.has(invocationId)) {
+          void Promise.resolve().then(async () => await handle.cancel()).catch(() => void 0);
+        }
         const waiters = this.runtimeSubmissionWaiters.get(contextId);
         if (waiters === void 0)
           return;
@@ -38218,6 +38248,9 @@ var init_expert_runner = __esm({
         return descendants;
       }
       async requestHumanInteraction(invocationId, request, requestedInteractionId) {
+        const checkpoint = this.getHumanInteractionCheckpoint(invocationId);
+        if (checkpoint !== void 0)
+          throw checkpoint;
         if (this.cancelled)
           throw new Error("Execution was cancelled.");
         const signal = this.signalForInvocation(invocationId);
@@ -38459,6 +38492,7 @@ var init_expert_runner = __esm({
       finish() {
         this.rejectRuntimeSubmissionWaiters(new Error("ExpertTurn completed before its Runtime submission became active."));
         this.activeRuntimeSubmissions.clear();
+        this.checkpointedInvocations.clear();
         this.invocationSignals.clear();
         this.linkedInvocationSignals.clear();
         this.orchestrators.clear();
@@ -39851,6 +39885,7 @@ var init_expert_session = __esm({
           output = InvocationOutputSchema.parse(await runExpertInvocation({
             executionId: prompt.executionId,
             invocationId: prompt.executionId,
+            isRecovery: this.recoveredExecutionId === prompt.executionId,
             expert: this.expert,
             prompt: this.recoveredExecutionId === prompt.executionId ? recoveryPrompt(prompt.content) : prompt.content,
             attachments: promptInput.attachments,
@@ -73821,6 +73856,8 @@ function registerLocalTool(server, runtimeName, tool, options2) {
       });
       return toCallToolResult(result);
     } catch (error52) {
+      if (isHumanInteractionCheckpointError(error52))
+        throw error52;
       const message = error52 instanceof Error ? error52.message : String(error52);
       const payload = {
         ok: false,
@@ -74022,6 +74059,7 @@ var init_expert_tools_mcp_server = __esm({
   "packages/core/dist/expert-tools-mcp-server.js"() {
     "use strict";
     init_dist5();
+    init_expert_runner();
     init_execution_tools();
     RUNTIME_PERMISSION_APPROVAL_REASON = "Runtime requested tool approval.";
     SESSION_MCP_PATH_PATTERN = /^\/sessions\/([A-Za-z0-9_-]{43})\/mcp$/;
@@ -421616,7 +421654,7 @@ init_dist13();
 init_integration();
 
 // apps/cli/src/version.ts
-var CLI_VERSION = false ? "0.0.0" : "0.1.0-next.8";
+var CLI_VERSION = false ? "0.0.0" : "0.1.0-next.9";
 
 // apps/cli/src/composition/default.ts
 function createCliLocalHost(input = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pqpo/pragma",
-  "version": "0.1.0-next.8",
+  "version": "0.1.0-next.9",
   "description": "Pragma command-line interface",
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",