@skaile/workspaces 6.9.0 → 6.10.0

package/dist/bridge/harnesses/omp.js

@@ -1,18 +1,18 @@
 import { checkToolInputSchema } from '../../chunk-3X7VTCPG.js';
-import { materializeOmpProviders, isCredentialOmissionWarning, materializeOmpIdentityDir, registryModelEntries } from '../../chunk-5AQLCRR7.js';
+import { materializeOmpProviders, isCredentialOmissionWarning, materializeOmpIdentityDir, registryModelEntries } from '../../chunk-JDZUQFN7.js';
 import { dispatchCapability } from '../../chunk-YEOG7CWQ.js';
 import { HARNESS_BINARIES } from '../../chunk-WWSRIT3J.js';
-import '../../chunk-4WB4KSSQ.js';
+import '../../chunk-RTFH2QR2.js';
 import { RUNNER_AGENT_ENV_KEYS, ReconfigureLedger, stripRunnerPrivateEnv, classifyGenericErrorMessage } from '../../chunk-5DE3DGVR.js';
 import { wrapAgentCommand, resolveAgentExec } from '../../chunk-7DN6JKP2.js';
-import { AgentHarness, getBridgeLogger, TOOL_ALLOWLIST_UNSUPPORTED, registryHarnessConfig } from '../../chunk-CFTTXUM2.js';
-import { BUILTIN_HARNESS_CATALOG } from '../../chunk-SQMDFM4N.js';
+import { AgentHarness, getBridgeLogger, TOOL_ALLOWLIST_UNSUPPORTED, registryHarnessConfig } from '../../chunk-NFFBYG2W.js';
+import { BUILTIN_HARNESS_CATALOG } from '../../chunk-KE5HDORU.js';
 import '../../chunk-G5SUWZEU.js';
 import '../../chunk-6UP2EDFN.js';
 import { withActivityLabelJsonSchema } from '../../chunk-7NN3P6VF.js';
 import '../../chunk-VSX2G7LA.js';
 import '../../chunk-RXGPFAMN.js';
-import '../../chunk-MDCI4RSG.js';
+import '../../chunk-RZL4TOK3.js';
 import '../../chunk-C3CAXQMA.js';
 import '../../chunk-BOFL7GIF.js';
 import '../../chunk-NSBPE2FW.js';
@@ -184,6 +184,17 @@ function ompStartFailureCause(lines) {
   }
   return clean.at(-1) ?? "";
 }
+function describeOmpEvent(event) {
+  if (!event) return "none (omp sent no event)";
+  const sub = event.assistantMessageEvent;
+  const subType = sub && typeof sub === "object" && "type" in sub && typeof sub.type === "string" ? sub.type : void 0;
+  const message = event.message;
+  const role = typeof message?.role === "string" ? message.role : void 0;
+  const tool = typeof event.toolName === "string" ? event.toolName : void 0;
+  const command = typeof event.command === "string" ? event.command : void 0;
+  const detail = subType ?? role ?? tool ?? command;
+  return detail ? `${event.type} (${detail})` : event.type;
+}
 var KILLED_EXIT_WAIT_MS = 5e3;
 var EarlyOmpExit = class extends Error {
   constructor(code, signal) {
@@ -229,6 +240,8 @@ var OmpHarness = class extends AgentHarness {
   ready = false;
   startPromise = null;
   stderrBuffer = [];
+  /** The last frame omp sent: what an exit with nothing on stderr names as its last sign of life. */
+  lastEvent = null;
   prevText = "";
   /** OMP session ID captured via `get_state` after each turn. */
   _ompSessionId;
@@ -249,6 +262,10 @@ var OmpHarness = class extends AgentHarness {
    * `get_state.contextUsage.tokens` replaces it once that reply lands.
    */
   _lastContextTokens = null;
+  /** USD cost of the most recent turn, summed like {@link _lastTokens}. */
+  _lastTurnCostUsd = 0;
+  /** The current turn's request failed (`message_end` with `stopReason: "error"`). */
+  turnFailed = false;
   /** Context window of the active model, from `get_state.contextUsage`. */
   _contextWindow = null;
   /** Per-spawn file holding the system prompt omp was started with; removed with the process. */
@@ -580,6 +597,8 @@ var OmpHarness = class extends AgentHarness {
         const resumeAttempt = !wasReady && this.exitResumeSessionId !== void 0 && this.config.resumeSessionId === this.exitResumeSessionId;
         const wouldDuplicate = this.turnUserMessageSeen && this.config.resumeSessionId !== void 0;
         const retryEarly = (crashed || signal !== null) && wasReady && !betweenTurns && !this.turnOutputSeen && !wouldDuplicate && !this.promptRetried && !resumeAttempt;
+        const lastEventText = `its last event was ${describeOmpEvent(this.lastEvent)}`;
+        const crashMessage = `omp process crashed (exit code ${code}): ${lastStderr || `omp wrote nothing to stderr; ${lastEventText}`}`;
         if (retryEarly) {
           this.log.warn("omp exited in a turn before its first output", {
             code,
@@ -589,10 +608,10 @@ var OmpHarness = class extends AgentHarness {
         } else if (crashed && !betweenTurns && !resumeAttempt) {
           const sessionDir2 = path.join(this.config.cwd, ".omp", "sessions");
           const detail = {
-            message: `omp process crashed (exit code ${code})${lastStderr ? `: ${lastStderr}` : ""}`,
+            message: crashMessage,
             category: "process",
             retryable: true,
-            hint: lastStderr || `omp exited with code ${code}${signal ? ` (signal ${signal})` : ""} and wrote nothing to stderr; its session files are in ${sessionDir2}. Try sending your prompt again.`
+            hint: lastStderr || `omp exited with code ${code}${signal ? ` (signal ${signal})` : ""} and wrote nothing to stderr; ${lastEventText}; its session files are in ${sessionDir2}. Try sending your prompt again.`
           };
           if (!lastStderr) {
             this.log.warn("omp exited with no stderr", {
@@ -620,7 +639,7 @@ var OmpHarness = class extends AgentHarness {
         this.cleanup();
         this.rejectTurn(
           retryEarly ? new EarlyOmpExit(code, signal) : new Error(
-            crashed ? `omp process crashed (exit code ${code})` : `omp process exited before the turn completed${signal ? ` (signal ${signal})` : ""}`
+            crashed ? crashMessage : `omp process exited before the turn completed${signal ? ` (signal ${signal})` : ""}; ${lastEventText}`
           )
         );
         this.emit("exit", { code, signal });
@@ -1027,6 +1046,7 @@ var OmpHarness = class extends AgentHarness {
     this.log.debug("discovered slash commands", { count: commands.length });
   }
   handleEvent(event) {
+    this.lastEvent = event;
     if (event.type === "ready") {
       this.emit("ready");
       return;
@@ -1107,13 +1127,22 @@ var OmpHarness = class extends AgentHarness {
       this.prevText = "";
     }
     if (event.type === "message_end") this.recordMessageUsage(event.message);
+    if (event.type === "tool_execution_start") this.announceToolExecution(event);
     if (event.type === "message_end" && event.message?.role === "assistant" && event.message.stopReason === "error") {
       const error = event.message.errorMessage || "omp request failed";
       const detail = this.classifyErrorMessage(error);
       this.log.error("omp request failed", new Error(error), { detail });
       this.emit("agent-event", { type: "error", error: detail.message, detail });
+      this.turnFailed = true;
     }
     if (event.type === "agent_end") {
+      this.emit("agent-event", {
+        type: "result",
+        subtype: "success",
+        summary: this.turnFailed ? "Turn failed" : "Turn completed",
+        costUsd: this._lastTurnCostUsd,
+        ...this._lastTokens ? { tokens: { ...this._lastTokens } } : {}
+      });
       void this.captureState();
     }
     const turnEnded = event.type === "agent_end";
@@ -1193,6 +1222,25 @@ var OmpHarness = class extends AgentHarness {
   beginUsageTurn() {
     this._lastTokens = null;
     this._lastContextTokens = null;
+    this._lastTurnCostUsd = 0;
+    this.turnFailed = false;
+  }
+  /**
+   * omp announces a tool run as `tool_execution_start`; its assistant message names the
+   * call only in `message_end`, after the run. Publish it as `tool_call` here, like a host
+   * tool call. Host tools already got theirs from `host_tool_call`, and `ask` becomes a
+   * `question` through its dialog.
+   */
+  announceToolExecution(event) {
+    const name = typeof event.toolName === "string" ? event.toolName : "";
+    if (!name || name === "ask" || this.hostToolCapabilities.has(name)) return;
+    this.emit("agent-event", {
+      type: "tool_call",
+      name,
+      tool: { name },
+      ...typeof event.toolCallId === "string" ? { toolCallId: event.toolCallId } : {},
+      input: event.args ?? {}
+    });
   }
   /**
    * Fold one finished assistant message into the turn's usage. Only the
@@ -1222,6 +1270,8 @@ var OmpHarness = class extends AgentHarness {
     add("reasoningTokens", reasoning);
     add("totalTokens", total);
     this._lastTokens = turn;
+    const cost = count(message.usage.cost?.total);
+    if (cost !== void 0) this._lastTurnCostUsd += cost;
     if (callContext > 0) this._lastContextTokens = callContext;
   }
   nextId() {
@@ -1458,6 +1508,7 @@ ${input.text}` : input.text;
     this.config = { ...this.config, resumeSessionId: void 0 };
     this._lastTokens = null;
     this._lastContextTokens = null;
+    this._lastTurnCostUsd = 0;
     this._contextWindow = null;
     await this.start();
   }
@@ -1546,6 +1597,7 @@ ${input.text}` : input.text;
     this.reconfig.setSnapshot(null);
     this.startPromise = null;
     this.stderrBuffer = [];
+    this.lastEvent = null;
     this.unsubscribeToolsChanged?.();
     this.unsubscribeToolsChanged = null;
     this.hostToolCapabilities = /* @__PURE__ */ new Map();
@@ -1570,6 +1622,6 @@ var ompHarnessTarget = {
   }).listModels()
 };
 
-export { OMP_BUILTIN_TOOLS, OMP_DEFAULT_TOOLS, OMP_THINKING_LEVELS, OmpHarness, buildOmpChildEnv, buildOmpHostTools, buildOmpToolArgs, ompCredentialMessage, ompHarnessTarget, ompStartFailureCause, ompThinkingLevel, splitOmpModel };
+export { OMP_BUILTIN_TOOLS, OMP_DEFAULT_TOOLS, OMP_THINKING_LEVELS, OmpHarness, buildOmpChildEnv, buildOmpHostTools, buildOmpToolArgs, describeOmpEvent, ompCredentialMessage, ompHarnessTarget, ompStartFailureCause, ompThinkingLevel, splitOmpModel };
 //# sourceMappingURL=omp.js.map
 //# sourceMappingURL=omp.js.map