@skaile/workspaces 6.9.1 → 6.11.0

package/dist/bridge/harnesses/omp.js

@@ -1,18 +1,18 @@
 import { checkToolInputSchema } from '../../chunk-3X7VTCPG.js';
-import { materializeOmpProviders, isCredentialOmissionWarning, materializeOmpIdentityDir, registryModelEntries } from '../../chunk-CPMLMNI5.js';
-import { dispatchCapability } from '../../chunk-YEOG7CWQ.js';
+import { materializeOmpProviders, isCredentialOmissionWarning, materializeOmpIdentityDir, registryModelEntries } from '../../chunk-4NJVF3DV.js';
+import { dispatchCapability } from '../../chunk-7ZL23M3X.js';
 import { HARNESS_BINARIES } from '../../chunk-WWSRIT3J.js';
-import '../../chunk-RP3ML3QD.js';
+import '../../chunk-CLMIZ4N6.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-5J6N6LHL.js';
-import { BUILTIN_HARNESS_CATALOG } from '../../chunk-7TF5MNFK.js';
+import { AgentHarness, getBridgeLogger, TOOL_ALLOWLIST_UNSUPPORTED, registryHarnessConfig } from '../../chunk-PZS55HOX.js';
+import { BUILTIN_HARNESS_CATALOG } from '../../chunk-S6NS3I3P.js';
 import '../../chunk-G5SUWZEU.js';
 import '../../chunk-6UP2EDFN.js';
-import { withActivityLabelJsonSchema } from '../../chunk-7NN3P6VF.js';
+import { withActivityLabelJsonSchema } from '../../chunk-342UX2MG.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';
@@ -118,6 +118,15 @@ function buildOmpToolArgs(tools) {
   return ["--tools", effective.join(",")];
 }
 var OMP_HOST_TOOL_NAME_MAX = 64;
+function hostAllowedPatternToRegExp(pattern) {
+  const body = pattern.split("*").map((part) => part.replace(/[.+?^${}()|[\]\\/-]/g, "\\$&")).join(".*");
+  return new RegExp(`^${body}$`, "s");
+}
+function filterHostTools(tools, hostAllowed) {
+  if (hostAllowed === void 0) return [...tools];
+  const patterns = hostAllowed.map(hostAllowedPatternToRegExp);
+  return tools.filter((tool) => patterns.some((re) => re.test(tool.name)));
+}
 function buildOmpHostTools(tools) {
   const taken = new Set(OMP_BUILTIN_TOOLS);
   const out = { definitions: [], capabilityNames: /* @__PURE__ */ new Map(), dropped: [] };
@@ -128,7 +137,7 @@ function buildOmpHostTools(tools) {
       out.dropped.push({ tool: tool.name, reason });
       continue;
     }
-    const base = tool.name.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, OMP_HOST_TOOL_NAME_MAX) || "capability";
+    const base = tool.name.replace(/[^a-zA-Z0-9_-]/g, "_").replace(/^mcp__/, "host__").slice(0, OMP_HOST_TOOL_NAME_MAX) || "capability";
     let name = base;
     for (let n = 2; taken.has(name); n++) {
       const suffix = `_${n}`;
@@ -184,6 +193,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 +249,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;
@@ -584,6 +606,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,
@@ -593,10 +617,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", {
@@ -624,7 +648,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 });
@@ -700,7 +724,9 @@ var OmpHarness = class extends AgentHarness {
   async syncHostTools() {
     const hooks = this.config.capabilities;
     if (!hooks || !this.proc) return;
-    const set = buildOmpHostTools(hooks.composeTools());
+    const set = buildOmpHostTools(
+      filterHostTools(hooks.composeTools(), this.config.tools?.host_allowed)
+    );
     for (const { tool, reason } of set.dropped) {
       const key = `${tool}\0${reason}`;
       if (this.warnedDroppedHostTools.has(key)) continue;
@@ -738,8 +764,28 @@ var OmpHarness = class extends AgentHarness {
     const id = event.id;
     if (typeof id !== "string") return;
     const hostName = typeof event.toolName === "string" ? event.toolName : "";
-    const name = this.hostToolCapabilities.get(hostName) ?? hostName;
     const callId = typeof event.toolCallId === "string" ? event.toolCallId : id;
+    const name = this.hostToolCapabilities.get(hostName);
+    if (name === void 0) {
+      this.log.warn("host tool call rejected: not registered", { tool: hostName });
+      try {
+        this.send({
+          type: "host_tool_result",
+          id,
+          result: {
+            content: [{ type: "text", text: `Error: host tool "${hostName}" is not available` }]
+          },
+          isError: true
+        });
+      } catch (err) {
+        this.log.warn("host tool result undeliverable", {
+          tool: hostName,
+          callId,
+          error: String(err)
+        });
+      }
+      return;
+    }
     const input = event.arguments ?? {};
     const hooks = this.config.capabilities;
     const controller = new AbortController();
@@ -1031,6 +1077,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;
@@ -1581,6 +1628,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();
@@ -1605,6 +1653,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, filterHostTools, ompCredentialMessage, ompHarnessTarget, ompStartFailureCause, ompThinkingLevel, splitOmpModel };
 //# sourceMappingURL=omp.js.map
 //# sourceMappingURL=omp.js.map