@oxagen/cli 3.0.1-34 → 3.0.1-44

package/oxagen.mjs

@@ -10042,7 +10042,7 @@ function translateCursorPayload(raw) {
   }
   if (typeof toolName4 === "string") {
     out["tool_name"] = cursorToolName(toolName4, raw["mcp_server_name"]);
-    out["cursor_tool_name"] = toolName4;
+    out["harness_tool_name"] = toolName4;
   }
   if (isRecord(toolInput2)) out["tool_input"] = toolInput2;
   else if (typeof toolInput2 === "string") {
@@ -11626,6 +11626,9 @@ function isRecord2(value) {
 function str2(value) {
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
+function harnessToolNameOf(input) {
+  return str2(input["harness_tool_name"]) ?? str2(input["cursor_tool_name"]);
+}
 function count(value) {
   return typeof value === "number" && Number.isFinite(value) && value >= 0 ? Math.round(value) : void 0;
 }
@@ -11700,7 +11703,7 @@ function backgroundTasksOf(value) {
 function sessionCronsOf(value) {
   return pickEach(value, SESSION_CRON_MEMBERS);
 }
-var ORIGIN_MEMBERS, ORIGIN_HOP_CHAIN, BACKGROUND_TASK_MEMBERS, SESSION_CRON_MEMBERS, MEMBER_MAX, HOP_CHAIN_MAX, ERROR_CLASS_MAX, EXIT_CODE_PREFIX, ATTR_KEY_MAX, ATTR_MAX, ATTR_CUT;
+var ORIGIN_MEMBERS, ORIGIN_HOP_CHAIN, BACKGROUND_TASK_MEMBERS, SESSION_CRON_MEMBERS, MEMBER_MAX, HOP_CHAIN_MAX, HARNESS_TOOL_NAME_ATTR, ERROR_CLASS_MAX, EXIT_CODE_PREFIX, ATTR_KEY_MAX, ATTR_MAX, ATTR_CUT;
 var init_payload_members = __esm({
   "../../packages/tacho/src/claude-code/payload-members.ts"() {
     "use strict";
@@ -11730,6 +11733,7 @@ var init_payload_members = __esm({
     SESSION_CRON_MEMBERS = ["id", "schedule", "recurring"];
     MEMBER_MAX = 512;
     HOP_CHAIN_MAX = 32;
+    HARNESS_TOOL_NAME_ATTR = "oxagen.harness_tool_name";
     ERROR_CLASS_MAX = 128;
     EXIT_CODE_PREFIX = /^(?:Error: )?Exit code (-?\d+)\b/;
     ATTR_KEY_MAX = 256;
@@ -11940,6 +11944,8 @@ function translateStellaPayload(raw, pid, instance) {
       out["tool_read_only"] = tool["read_only"];
   }
   if (toolResult2 !== void 0) out["tool_response"] = toolResult2;
+  const exitCode = isRecord2(tool) ? stellaExitCode(tool["name"], toolResult2) : void 0;
+  if (exitCode !== void 0) out["exit_code"] = exitCode;
   if (finalText !== void 0) out["last_assistant_message"] = finalText;
   if (subagentResult !== void 0) out["subagent_result"] = subagentResult;
   const subagent = rest["subagent"];
@@ -11950,6 +11956,23 @@ function translateStellaPayload(raw, pid, instance) {
   }
   return out;
 }
+function stellaExitCode(name, result2) {
+  if (typeof name !== "string" || typeof result2 !== "string") return void 0;
+  let match = null;
+  if (name === "bash") {
+    const at2 = result2.lastIndexOf(BASH_EXIT_MARKER);
+    if (at2 === -1) return void 0;
+    match = /^\n\[exit code: (-?\d+)\]/.exec(result2.slice(at2, at2 + 32));
+  } else {
+    const opening = `custom tool \`${name}\` exited with code `;
+    if (!result2.startsWith(opening)) return void 0;
+    match = /^(-?\d+)(?:\n|$)/.exec(
+      result2.slice(opening.length, opening.length + 16)
+    );
+  }
+  const code = match?.[1] === void 0 ? void 0 : Number(match[1]);
+  return isExitCode(code) ? code : void 0;
+}
 function digestSubagentInstruction(subagent) {
   const { instructionPreview, ...keep } = subagent;
   if (typeof instructionPreview !== "string") return keep;
@@ -12010,7 +12033,7 @@ function tryParseAnswerBody(body2) {
     return void 0;
   }
 }
-var SHELLS, STELLA_PID_ENV, STELLA_PS_BUDGET_MS, STELLA_PS_FLOOR_MS, STELLA_IDENTITY_FRESH_MS, STELLA_IDENTITY_TRUST_MS, identityCacheSchema;
+var SHELLS, STELLA_PID_ENV, STELLA_PS_BUDGET_MS, STELLA_PS_FLOOR_MS, STELLA_IDENTITY_FRESH_MS, STELLA_IDENTITY_TRUST_MS, identityCacheSchema, BASH_EXIT_MARKER;
 var init_stella_adapter = __esm({
   "../../packages/tacho/src/claude-code/stella-adapter.ts"() {
     "use strict";
@@ -12042,6 +12065,7 @@ var init_stella_adapter = __esm({
       check: external_exports.string().min(1).optional(),
       confirmed_at: external_exports.number()
     });
+    BASH_EXIT_MARKER = "\n[exit code: ";
   }
 });
 
@@ -12926,6 +12950,10 @@ function effortFactOf(value) {
   const effort = str2(value);
   return effort !== void 0 ? { effort } : {};
 }
+function harnessToolNameAttr(input) {
+  const name = harnessToolNameOf(input);
+  return name === void 0 ? {} : { [HARNESS_TOOL_NAME_ATTR]: attrValue(name) };
+}
 function normalizeHook(raw, env, options) {
   const input = hookInputSchema.parse(raw);
   const repairs = payloadRepairs(raw);
@@ -12933,6 +12961,7 @@ function normalizeHook(raw, env, options) {
     hook_event_name: input.hook_event_name,
     attrs: {
       ...leftovers(input),
+      ...harnessToolNameAttr(input),
       ...repairs !== void 0 ? { [PAYLOAD_REPAIRS_ATTR]: attrValue(repairs) } : {}
     },
     ...input.agent_id !== void 0 ? {
@@ -13543,6 +13572,10 @@ var init_hooks = __esm({
       // The exit code an adapter read from its harness's tool output. It is the
       // `tool_exit_code` fact, never an attribute.
       "exit_code",
+      // The tool's name as its harness sent it, when an adapter renamed the
+      // tool. Both spellings land on `HARNESS_TOOL_NAME_ATTR` (#7188).
+      "harness_tool_name",
+      "cursor_tool_name",
       // What a payload cut to fit said of the whole response (`fitHookPayload`):
       // the `tool_output_bytes` and `tool_output_digest` facts.
       TOOL_RESPONSE_ORIGINAL_BYTES,
@@ -13786,14 +13819,15 @@ function evaluateToolPermission(host, local, now, eventName, toolName4, toolInpu
   };
 }
 function decideLocally(host, input, now, match = localMatchContext(), cedar) {
+  const harnessTool = harnessToolNameOf(input);
   const cedarFor = (action) => host.bundle.cedar === void 0 ? void 0 : {
     runtime: cedar?.runtime ?? null,
     harness: cedar?.agent !== void 0 ? "custom" : cedar?.harness ?? "claude-code",
     ...cedar?.agent !== void 0 ? { agent: cedar.agent } : {},
     ...input.agent_type !== void 0 ? { skill: input.agent_type } : {},
     ...action !== void 0 ? { action } : {},
-    // Cursor's adapter renames `Shell` to `Bash` and keeps Cursor's own name here.
-    ...typeof input["cursor_tool_name"] === "string" ? { harness_tool: input["cursor_tool_name"] } : {}
+    // Cursor's adapter renames `Shell` to `Bash` and keeps Cursor's own name.
+    ...harnessTool !== void 0 ? { harness_tool: harnessTool } : {}
   };
   const bundleVerified = verifyBundle(
     host.bundle,
@@ -14310,6 +14344,7 @@ var init_hook_client = __esm({
     init_runtime();
     init_hook_payload_fit();
     init_hooks();
+    init_payload_members();
     init_stella_adapter();
     CURSOR_UNREADABLE_PAYLOAD = "Oxagen could not read this hook payload, so it cannot say what this agent is permitted to do. Run `oxagen agent status` and check that the wrapper matches this version of Cursor.";
     UNREADABLE_ENROLLMENT = "Oxagen cannot read this machine's enrollment, so it cannot say what this agent is permitted to do. Run `oxagen agent status` to repair it.";
@@ -16242,12 +16277,13 @@ function readLine(line, state, fallbackTs, inputs) {
       return { normalized: NOTHING, state };
   }
 }
-var KNOWN_RECORDS, INPUT_ITEMS, TOOL_ITEMS, LOCAL_TOOL_ITEMS, OUTPUT_ITEMS, TURN_EVENTS, UNKNOWN_TYPES_MAX, UNKNOWN_TYPE_CHARS, KINDS_MAX, CALLS_MAX, PENDING_CALLS_MAX, HELD_INPUT_BYTES_MAX, HARNESS_TOOL_NAME_ATTR, COMMAND_TOOL, BARE2, SINGLE, DOUBLE, heldInputs, NOTHING;
+var KNOWN_RECORDS, INPUT_ITEMS, TOOL_ITEMS, LOCAL_TOOL_ITEMS, OUTPUT_ITEMS, TURN_EVENTS, UNKNOWN_TYPES_MAX, UNKNOWN_TYPE_CHARS, KINDS_MAX, CALLS_MAX, PENDING_CALLS_MAX, HELD_INPUT_BYTES_MAX, COMMAND_TOOL, BARE2, SINGLE, DOUBLE, heldInputs, NOTHING;
 var init_rollout = __esm({
   "../../packages/tacho/src/codex/rollout.ts"() {
     "use strict";
     init_digest();
     init_frame_body();
+    init_payload_members();
     init_replay_grade();
     init_wire();
     KNOWN_RECORDS = /* @__PURE__ */ new Set([
@@ -16302,7 +16338,6 @@ var init_rollout = __esm({
     CALLS_MAX = 32;
     PENDING_CALLS_MAX = 32;
     HELD_INPUT_BYTES_MAX = 2 * TACHO_MAX_BODY_BYTES;
-    HARNESS_TOOL_NAME_ATTR = "oxagen.harness_tool_name";
     COMMAND_TOOL = "Bash";
     BARE2 = 1;
     SINGLE = 2;
@@ -28007,7 +28042,7 @@ import { readFileSync as readFileSync10 } from "node:fs";
 import { dirname as dirname9, resolve as resolve3 } from "node:path";
 import { fileURLToPath } from "node:url";
 function readVersion() {
-  if (true) return "3.0.1-34";
+  if (true) return "3.0.1-44";
   try {
     const here = dirname9(fileURLToPath(import.meta.url));
     const pkg = JSON.parse(
@@ -45617,6 +45652,7 @@ async function cedarCallFor(view, record, input, deps, toolName4, action) {
   if (view.bundle.cedar === void 0) return void 0;
   const custom2 = record.customAgent;
   const facts = policyRunFacts(record);
+  const harnessTool = harnessToolNameOf(input);
   return {
     ...oxagenServerVerified(view, record, input, deps, toolName4) ? { oxagenServerVerified: true } : {},
     // No loader means no evaluator: a mutating tool is refused rather than
@@ -45626,8 +45662,8 @@ async function cedarCallFor(view, record, input, deps, toolName4, action) {
     ...custom2 !== void 0 ? { agent: custom2 } : {},
     ...input.agent_type !== void 0 ? { skill: input.agent_type } : {},
     ...action !== void 0 ? { action } : {},
-    // Cursor's adapter renames `Shell` to `Bash` and keeps Cursor's own name here.
-    ...typeof input["cursor_tool_name"] === "string" ? { harness_tool: input["cursor_tool_name"] } : {},
+    // Cursor's adapter renames `Shell` to `Bash` and keeps Cursor's own name.
+    ...harnessTool !== void 0 ? { harness_tool: harnessTool } : {},
     // The taint and prior calls of the calls that ran in the session (#4666).
     facts
   };
@@ -46413,6 +46449,7 @@ var init_hook_handler = __esm({
     "use strict";
     init_hooks();
     init_context();
+    init_payload_members();
     init_tools();
     init_steering_manifest();
     init_frame_body();
@@ -68265,7 +68302,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@oxagen/cli",
-      version: "3.0.1-34",
+      version: "3.0.1-44",
       description: "Oxagen governance CLI: spend, source tracking, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
       type: "module",
       main: "./dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxagen/cli",
-  "version": "3.0.1-34",
+  "version": "3.0.1-44",
   "description": "Oxagen governance CLI: spend, source tracking, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
   "type": "module",
   "bin": {