@oxagen/cli 2.1.4-489 → 2.1.4-494

package/oxagen.mjs

@@ -5615,7 +5615,7 @@ function bundleSkillChars(skill) {
   for (const file of skill.files) chars += file.path.length + file.content.length;
   return chars;
 }
-var TACHO_BATCH_SCHEMA, TACHO_BUNDLE_SCHEMA, TACHO_COMMANDS_SCHEMA, TACHO_ENROLLMENT_CLAIMS_SCHEMA, TACHO_ENFORCEMENT_TIER_ATTR, TACHO_GATEWAY_TIER, TACHO_GATEWAY_SESSION_HEADER, TACHO_GATEWAY_GENESIS_HEADER, TACHO_METERING_ATTR, TACHO_METERING_OBSERVED, TACHO_MODEL_SESSION_HEADER, TACHO_CREDENTIAL_BASIS_ATTR, TACHO_CREDENTIAL_GATEWAY_BROKERED, TACHO_CREDENTIAL_HARNESS_HELD, TACHO_CREDENTIAL_BASES, TACHO_RUN_TOKEN_ATTR, BUNDLE_FEATURE_GATEWAY_TOOLS, BUNDLE_FEATURE_MODEL_PRICES, BUNDLE_FEATURE_MODEL_ALLOWLIST, BUNDLE_FEATURE_INDEPENDENT_MODELS, BUNDLE_FEATURE_HOOK_FAIL_OPEN, BUNDLE_FEATURE_STEERING_MANIFEST, BUNDLE_FEATURE_CONTAINMENT, BUNDLE_FEATURE_DAILY_BUDGET, BUNDLE_FEATURE_STEER_NEXT_STEP, BUNDLE_FEATURE_UNBOUND_REPO, BUNDLE_FEATURE_CEDAR, BUNDLE_FEATURE_SKILLS, BUNDLE_FEATURE_CACHE_KEEP_ALIVE, BUNDLE_FEATURE_WORK_ORDERS, TACHO_BUNDLE_FEATURES, bundleFeaturesSchema, hostEnrollmentIdSchema, tachoPlatformSchema, tachoHarnessSchema, TACHO_HARNESS_LABELS, TACHO_HARNESS_TIERS, WRAPPED_HARNESSES, CONNECTED_HARNESSES, HARNESS_BINARY, MODEL_HARNESS_ROUTES, MODEL_ROUTED_HARNESSES, BROKERABLE_HARNESSES, BROKERABLE_HARNESS_PROVIDER, TACHO_TIER_SUMMARY, CUSTOM_AGENT_NAME_PATTERN, RESERVED_AGENT_NAMES, customAgentNameSchema, tachoHostStatusSchema, tachoBundleModeSchema, tachoCommandSchema, tachoCommandStatusSchema, tachoCommandAckStatusSchema, tachoDeliveryModeSchema, denyGenerationSchema, deliveredCommandSchema, deliveredCommandResponseSchema, WORK_ORDER_ID_PATTERN, WORK_ITEM_ID_PATTERN, workOrderCommandPayloadSchema, WORK_ORDER_CLAIM_PATH, WORK_ORDER_REJECT_PATH, workOrderClaimResponseSchema, workOrderRejectResponseSchema, WORK_ORDER_ENV, WORK_ORDER_ATTR, steeringForceSchema, steeringItemKindSchema, steeringCutReasonSchema, steeringManifestItemSchema, STEERING_MANIFEST_SCHEMA, steeringManifestSchema, steeringManifestFrameSchema, cedarIdSchema, cedarPrincipalSchema, cedarToolSchema, cedarBundleSchema, BUNDLE_SKILLS_MAX, BUNDLE_SKILL_FILES_MAX, BUNDLE_SKILLS_CHARS_MAX, BASE64_PATTERN, bundleSkillFileSchema, bundleSkillSchema, policyBundleSchema, enrollmentClaimsSchema, tachoEventWireSchema, daemonHealthSchema, TACHO_MAX_BATCH, TACHO_MAX_BODY_BYTES, TACHO_MAX_REQUEST_BYTES, TACHO_REQUEST_ENVELOPE_BYTES, tachoBodySchema, tachoBatchSchema, agentDaySpendSchema, controlEnvelopeSchema, ingestResponseSchema, bundleResponseSchema, commandAcknowledgementSchema, commandsResponseSchema, enrollmentResponseSchema, tokenEnrollmentResponseSchema;
+var TACHO_BATCH_SCHEMA, TACHO_BUNDLE_SCHEMA, TACHO_COMMANDS_SCHEMA, TACHO_ENROLLMENT_CLAIMS_SCHEMA, TACHO_ENFORCEMENT_TIER_ATTR, TACHO_GATEWAY_TIER, TACHO_GATEWAY_SESSION_HEADER, TACHO_GATEWAY_GENESIS_HEADER, MCP_STREAMABLE_HTTP_ACCEPT, TACHO_METERING_ATTR, TACHO_METERING_OBSERVED, TACHO_MODEL_SESSION_HEADER, TACHO_CREDENTIAL_BASIS_ATTR, TACHO_CREDENTIAL_GATEWAY_BROKERED, TACHO_CREDENTIAL_HARNESS_HELD, TACHO_CREDENTIAL_BASES, TACHO_RUN_TOKEN_ATTR, BUNDLE_FEATURE_GATEWAY_TOOLS, BUNDLE_FEATURE_MODEL_PRICES, BUNDLE_FEATURE_MODEL_ALLOWLIST, BUNDLE_FEATURE_INDEPENDENT_MODELS, BUNDLE_FEATURE_HOOK_FAIL_OPEN, BUNDLE_FEATURE_STEERING_MANIFEST, BUNDLE_FEATURE_CONTAINMENT, BUNDLE_FEATURE_DAILY_BUDGET, BUNDLE_FEATURE_STEER_NEXT_STEP, BUNDLE_FEATURE_UNBOUND_REPO, BUNDLE_FEATURE_CEDAR, BUNDLE_FEATURE_SKILLS, BUNDLE_FEATURE_CACHE_KEEP_ALIVE, BUNDLE_FEATURE_WORK_ORDERS, TACHO_BUNDLE_FEATURES, bundleFeaturesSchema, hostEnrollmentIdSchema, tachoPlatformSchema, tachoHarnessSchema, TACHO_HARNESS_LABELS, TACHO_HARNESS_TIERS, WRAPPED_HARNESSES, CONNECTED_HARNESSES, HARNESS_BINARY, MODEL_HARNESS_ROUTES, MODEL_ROUTED_HARNESSES, BROKERABLE_HARNESSES, BROKERABLE_HARNESS_PROVIDER, TACHO_TIER_SUMMARY, CUSTOM_AGENT_NAME_PATTERN, RESERVED_AGENT_NAMES, customAgentNameSchema, tachoHostStatusSchema, tachoBundleModeSchema, tachoCommandSchema, tachoCommandStatusSchema, tachoCommandAckStatusSchema, tachoDeliveryModeSchema, denyGenerationSchema, deliveredCommandSchema, deliveredCommandResponseSchema, WORK_ORDER_ID_PATTERN, WORK_ITEM_ID_PATTERN, workOrderCommandPayloadSchema, WORK_ORDER_CLAIM_PATH, WORK_ORDER_REJECT_PATH, workOrderClaimResponseSchema, workOrderRejectResponseSchema, WORK_ORDER_ENV, WORK_ORDER_ATTR, steeringForceSchema, steeringItemKindSchema, steeringCutReasonSchema, steeringManifestItemSchema, STEERING_MANIFEST_SCHEMA, steeringManifestSchema, steeringManifestFrameSchema, cedarIdSchema, cedarPrincipalSchema, cedarToolSchema, cedarBundleSchema, BUNDLE_SKILLS_MAX, BUNDLE_SKILL_FILES_MAX, BUNDLE_SKILLS_CHARS_MAX, BASE64_PATTERN, bundleSkillFileSchema, bundleSkillSchema, policyBundleSchema, enrollmentClaimsSchema, tachoEventWireSchema, daemonHealthSchema, TACHO_MAX_BATCH, TACHO_MAX_BODY_BYTES, TACHO_MAX_REQUEST_BYTES, TACHO_REQUEST_ENVELOPE_BYTES, tachoBodySchema, tachoBatchSchema, agentDaySpendSchema, controlEnvelopeSchema, ingestResponseSchema, bundleResponseSchema, commandAcknowledgementSchema, commandsResponseSchema, enrollmentResponseSchema, tokenEnrollmentResponseSchema;
 var init_wire = __esm({
   "../../packages/tacho/src/wire.ts"() {
     "use strict";
@@ -5631,6 +5631,7 @@ var init_wire = __esm({
     TACHO_GATEWAY_TIER = "gateway";
     TACHO_GATEWAY_SESSION_HEADER = "x-tacho-gateway-session";
     TACHO_GATEWAY_GENESIS_HEADER = "x-tacho-gateway-genesis";
+    MCP_STREAMABLE_HTTP_ACCEPT = "application/json, text/event-stream";
     TACHO_METERING_ATTR = "oxagen.metering";
     TACHO_METERING_OBSERVED = "observed";
     TACHO_MODEL_SESSION_HEADER = "x-oxagen-session";
@@ -23363,7 +23364,7 @@ import { readFileSync as readFileSync11 } from "node:fs";
 import { dirname as dirname8, resolve as resolve2 } from "node:path";
 import { fileURLToPath } from "node:url";
 function readVersion() {
-  if (true) return "2.1.4-489";
+  if (true) return "2.1.4-494";
   try {
     const here = dirname8(fileURLToPath(import.meta.url));
     const pkg = JSON.parse(
@@ -28339,16 +28340,20 @@ function requestedMcpEndpoint(deps, warnings) {
   }
   return request3.pinned;
 }
-function repointCommands(host, runtime) {
-  const same = host.hook_command === runtime.hookCommand && sameArgv(host.daemon_command, runtime.daemonCommand) && sameArgv(host.mcp_stdio_command ?? [], runtime.mcpStdioCommand);
-  if (same) return void 0;
+function repointCommands(host, runtime, wrapperVersion) {
+  if (sameCommands(host, runtime) && host.wrapper_version === wrapperVersion)
+    return void 0;
   return {
     ...host,
     hook_command: runtime.hookCommand,
     daemon_command: runtime.daemonCommand,
-    mcp_stdio_command: runtime.mcpStdioCommand
+    mcp_stdio_command: runtime.mcpStdioCommand,
+    wrapper_version: wrapperVersion
   };
 }
+function sameCommands(host, runtime) {
+  return host.hook_command === runtime.hookCommand && sameArgv(host.daemon_command, runtime.daemonCommand) && sameArgv(host.mcp_stdio_command ?? [], runtime.mcpStdioCommand);
+}
 function sameArgv(a, b5) {
   return a.length === b5.length && a.every((part2, i2) => part2 === b5[i2]);
 }
@@ -28557,7 +28562,7 @@ ${problems.map((problem) => `  ${problem}`).join("\n")}`
       writeHostFile(deps.paths.hostFile, host);
       deps.out(`      MCP endpoint pinned to ${pinned} (TACHO_MCP_ENDPOINT)`);
     }
-    const repointed = repointCommands(host, deps.runtime);
+    const repointed = repointCommands(host, deps.runtime, deps.wrapperVersion);
     if (repointed !== void 0) {
       if (deps.runtime.transient !== void 0) {
         warnings.push(
@@ -28570,9 +28575,14 @@ ${problems.map((problem) => `  ${problem}`).join("\n")}`
       } else {
         host = { ...repointed, harness_files: harnessFilesRecord(deps.paths) };
         writeHostFile(deps.paths.hostFile, host);
-        deps.out(
-          `      service and hooks now run from ${deps.runtime.binDir} (was ${existing.hook_command})`
-        );
+        if (!sameCommands(existing, deps.runtime))
+          deps.out(
+            `      service and hooks now run from ${deps.runtime.binDir} (was ${existing.hook_command})`
+          );
+        if (existing.wrapper_version !== deps.wrapperVersion)
+          deps.out(
+            `      host.json now records version ${deps.wrapperVersion} (was ${existing.wrapper_version})`
+          );
       }
     }
   } else {
@@ -29906,6 +29916,11 @@ function shimError(id, message) {
     error: { code: -32002, message }
   };
 }
+function answersNoRequest(message) {
+  if (Array.isArray(message) || !("error" in message)) return false;
+  const id = message.id;
+  return id === null || id === void 0;
+}
 function resolveTarget(options, deps) {
   const paths = agentPathsForEnrollment(
     tachoHome(deps.env, deps.home),
@@ -29937,8 +29952,9 @@ async function runMcpStdio(options, deps) {
     const text4 = line.trim();
     if (text4.length === 0) continue;
     let id;
+    let method;
     try {
-      id = JSON.parse(text4).id;
+      ({ id, method } = JSON.parse(text4));
     } catch {
       deps.stdout.write(
         `${JSON.stringify(shimError(null, "the shim received a line that is not JSON"))}
@@ -29946,7 +29962,7 @@ async function runMcpStdio(options, deps) {
       );
       continue;
     }
-    const expectsReply = id !== void 0;
+    const expectsReply = id !== void 0 && typeof method === "string";
     const reply2 = (document) => {
       if (expectsReply) deps.stdout.write(`${JSON.stringify(document)}
 `);
@@ -29961,7 +29977,9 @@ async function runMcpStdio(options, deps) {
         headers: {
           Authorization: `Bearer ${target2.token}`,
           "Content-Type": "application/json",
-          Accept: "application/json",
+          // The two media types the MCP transport requires of a client. The
+          // local gateway always answers with JSON, which this accepts.
+          Accept: MCP_STREAMABLE_HTTP_ACCEPT,
           // Loopback, so this is not a real origin check — it is here so the
           // gateway's guard sees a Host it recognises even behind a proxy
           // that rewrites one.
@@ -29983,8 +30001,12 @@ async function runMcpStdio(options, deps) {
         parsed = void 0;
       }
       if (typeof parsed === "object" && parsed !== null) {
-        if (expectsReply || response.ok) deps.stdout.write(`${body2}
+        if (expectsReply && answersNoRequest(parsed)) {
+          reply2({ ...parsed, id });
+        } else if (expectsReply) {
+          deps.stdout.write(`${body2}
 `);
+        }
       } else if (!response.ok || expectsReply && body2.length > 0) {
         deps.stderr.write(
           `oxagen mcp-stdio: the gateway answered ${response.status}: ${body2.slice(0, 200)}
@@ -30018,6 +30040,7 @@ var init_mcp_stdio = __esm({
     init_agents();
     init_host_file();
     init_paths();
+    init_wire();
     GATEWAY_TIMEOUT_MS = 5 * 6e4;
   }
 });
@@ -34674,12 +34697,45 @@ function readRpcBody(text4) {
     return JSON.parse(trimmed);
   }
   let last;
-  for (const line of trimmed.split(/\r?\n/)) {
-    if (line.startsWith("data:")) last = line.slice(5).trim();
+  for (const event of trimmed.split(/\r?\n\r?\n/)) {
+    const data = event.split(/\r?\n/).filter((line) => line.startsWith("data:")).map((line) => line.slice(line.startsWith("data: ") ? 6 : 5));
+    const payload = data.join("\n");
+    if (payload.trim().length > 0) last = payload;
   }
   if (last === void 0) return void 0;
   return JSON.parse(last);
 }
+function isRpcErrorObject(value) {
+  if (value === null || typeof value !== "object") return false;
+  const error = value;
+  return typeof error["code"] === "number" && typeof error["message"] === "string";
+}
+function answerFor(id, upstream) {
+  const { status: status2, body: body2 } = upstream;
+  const ok = status2 >= 200 && status2 < 300;
+  const message = body2 !== null && typeof body2 === "object" && !Array.isArray(body2) ? body2 : void 0;
+  const error = message?.["error"];
+  if (isRpcErrorObject(error)) {
+    if (message?.["id"] === id) return { status: status2, body: body2 };
+    return {
+      status: status2,
+      body: { jsonrpc: "2.0", id, error }
+    };
+  }
+  if (ok && message !== void 0 && "result" in message) {
+    if (message["id"] === id) return { status: status2, body: body2 };
+  }
+  const flat = upstream.text.replace(/\s+/g, " ").trim();
+  const what = flat.length === 0 ? "with no body" : `with a body that is not a JSON-RPC answer to this request: ${flat.slice(0, UPSTREAM_EXCERPT_MAX)}`;
+  return {
+    status: ok ? 502 : status2,
+    body: rpcError(
+      id,
+      RPC_INTERNAL_ERROR,
+      `the Oxagen control plane answered HTTP ${status2} ${what}`
+    )
+  };
+}
 function outcomeOf(status2, rpc) {
   if (rpc?.error !== void 0)
     return rpc.error.code === RPC_REFUSED ? "rejected" : "error";
@@ -34733,10 +34789,11 @@ function createMcpGateway(deps) {
         headers: {
           Authorization: `Bearer ${attribution2.apiKey}`,
           "Content-Type": "application/json",
-          // JSON only: the gateway answers one request at a time and has no
-          // stream to hand a client. A server that streams anyway is handled
-          // by `readRpcBody`.
-          Accept: "application/json",
+          // Both media types, as the MCP transport requires. The hosted
+          // server refuses any other Accept with a 406 (#5356). It answers
+          // with an event stream, and `readRpcBody` reads the response out of
+          // it, so the client still gets one JSON answer.
+          Accept: MCP_STREAMABLE_HTTP_ACCEPT,
           "User-Agent": "oxagen-local-gateway",
           "X-Tacho-Host": attribution2.hostEnrollmentId,
           // Which chain this call belongs to. The control plane takes the
@@ -34756,7 +34813,13 @@ function createMcpGateway(deps) {
         signal: controller.signal
       });
       const text4 = await response.text();
-      return { status: response.status, body: readRpcBody(text4) };
+      let body2;
+      try {
+        body2 = readRpcBody(text4);
+      } catch {
+        body2 = void 0;
+      }
+      return { status: response.status, body: body2, text: text4 };
     } finally {
       clearTimeout(timer);
     }
@@ -34809,9 +34872,9 @@ function createMcpGateway(deps) {
         if (name !== void 0) clients.set(context.sessionId, name);
       }
       const startedAt = now();
-      let response;
+      let upstream;
       try {
-        response = await forward(request3, attribution2);
+        upstream = await forward(request3, attribution2);
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         log(`mcp gateway forward failed: ${message}`);
@@ -34825,6 +34888,17 @@ function createMcpGateway(deps) {
           )
         };
       }
+      let response = typeof request3.id === "string" || typeof request3.id === "number" ? answerFor(request3.id, upstream) : { status: upstream.status, body: upstream.body };
+      if (response.body !== upstream.body) {
+        const said = response.body.error?.message;
+        log(
+          `mcp gateway gave ${request3.method} an error with the request's id after HTTP ${upstream.status}: ${said ?? "no message"}`
+        );
+      } else if (upstream.status < 200 || upstream.status >= 300) {
+        log(
+          `mcp gateway: the control plane answered ${request3.method} with HTTP ${upstream.status}`
+        );
+      }
       const rpc = response.body;
       if (request3.method === "tools/list" && rpc?.result !== void 0) {
         const bundle2 = deps.bundle?.();
@@ -34944,7 +35018,7 @@ function toolNameOf(params) {
   const name = params?.["name"];
   return typeof name === "string" && name.length > 0 ? name : "unknown";
 }
-var RPC_INVALID_REQUEST, RPC_INTERNAL_ERROR, RPC_REFUSED, CLAUDE_CODE_TOOL_USE_ID_META, MAX_TOOL_USE_ID_LENGTH, DEFAULT_TIMEOUT_MS3, REFUSAL_RULES_MAX, REFUSAL_RULE_MAX;
+var RPC_INVALID_REQUEST, RPC_INTERNAL_ERROR, RPC_REFUSED, CLAUDE_CODE_TOOL_USE_ID_META, MAX_TOOL_USE_ID_LENGTH, DEFAULT_TIMEOUT_MS3, UPSTREAM_EXCERPT_MAX, REFUSAL_RULES_MAX, REFUSAL_RULE_MAX;
 var init_mcp_gateway = __esm({
   "../../packages/tacho/src/collector/mcp-gateway.ts"() {
     "use strict";
@@ -34958,6 +35032,7 @@ var init_mcp_gateway = __esm({
     CLAUDE_CODE_TOOL_USE_ID_META = "claudecode/toolUseId";
     MAX_TOOL_USE_ID_LENGTH = 512;
     DEFAULT_TIMEOUT_MS3 = 3e4;
+    UPSTREAM_EXCERPT_MAX = 200;
     REFUSAL_RULES_MAX = 64;
     REFUSAL_RULE_MAX = 512;
   }
@@ -47228,7 +47303,17 @@ async function initializeDaemon(options, server, port, ready) {
       `no enrollment at ${paths.hostFile}; run \`oxagen agent enroll\` first`
     );
   }
-  let host = loaded;
+  let host = loaded.wrapper_version === TACHO_VERSION ? loaded : { ...loaded, wrapper_version: TACHO_VERSION };
+  const onDisk = readHostFileLenient(paths.hostFile).host;
+  if (onDisk !== void 0 && onDisk.host_enrollment_id === host.host_enrollment_id && onDisk.wrapper_version !== TACHO_VERSION) {
+    log(
+      `host.json now records version ${TACHO_VERSION} (was ${onDisk.wrapper_version})`
+    );
+    writeHostFile(paths.hostFile, {
+      ...onDisk,
+      wrapper_version: TACHO_VERSION
+    });
+  }
   for (const dir of [paths.dir, paths.wal, paths.spool, paths.quarantine])
     ensureDir(dir);
   const recallMemories = options.memoryRecall ?? options.listen ?? true ? createMemoryRecall({
@@ -47517,10 +47602,10 @@ async function initializeDaemon(options, server, port, ready) {
     const marked = new Set(marks.map(({ session }) => session));
     const unmarked = registry2.list().filter((session) => within4(session) && !marked.has(session));
     if (unmarked.length > 0) {
-      const onDisk = new Set(wal.sessions());
+      const onDisk2 = new Set(wal.sessions());
       for (const session of unmarked) {
         const recorder = session.recorder;
-        if (!onDisk.has(recorder.sessionUuid)) {
+        if (!onDisk2.has(recorder.sessionUuid)) {
           recorder.rollbackToBirth();
           continue;
         }
@@ -47612,8 +47697,8 @@ async function initializeDaemon(options, server, port, ready) {
       bundle_etag: host.bundle.etag,
       // What this daemon's `policyBundleSchema` names, so the control plane
       // can send a gated bundle field without breaking hosts that predate it.
-      // Reported from the running code rather than from `host.json`, which
-      // `enroll` writes once and no upgrade rewrites.
+      // Reported from the running code rather than read off `version`, which
+      // a daemon older than #5365 took from the enrollment, not the upgrade.
       bundle_features: [...TACHO_BUNDLE_FEATURES],
       // Omitted until a read succeeds: absent means nothing was said, and a
       // daemon that could not read the files has nothing to say.
@@ -49811,6 +49896,7 @@ var init_daemon = __esm({
     init_work_orders();
     init_ids();
     init_timestamp();
+    init_version();
     init_wire();
     init_backfill2();
     init_detector();
@@ -52035,7 +52121,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@oxagen/cli",
-      version: "2.1.4-489",
+      version: "2.1.4-494",
       description: "Oxagen governance CLI \u2014 spend, lineage, 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": "2.1.4-489",
+  "version": "2.1.4-494",
   "description": "Oxagen governance CLI — spend, lineage, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
   "type": "module",
   "bin": {