march-cli 0.1.18 → 0.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "march-cli",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "March CLI — terminal-native coding agent with context reconstruction",
   "type": "module",
   "main": "./src/main.mjs",

package/src/agent/runner/codex-transport-debug.mjs

@@ -1,4 +1,5 @@
 import { getOpenAICodexWebSocketDebugStats } from "@earendil-works/pi-ai/openai-codex-responses";
+import { getCodexWebSocketLastEvent } from "./codex-websocket-event-debug.mjs";
 
 export function getCodexTransportDebugSnapshot(session) {
   if (!isCodexTransportDebugEnabled()) return null;
@@ -12,7 +13,7 @@ export function dumpCodexTransportDebug({ before, session, ui, logger }) {
   const after = sessionId ? (getOpenAICodexWebSocketDebugStats(sessionId) ?? null) : null;
   const fields = formatCodexTransportDebugFields(sessionId, before, after);
   logger?.event("codex.transport", fields);
-  writeCodexTransportDebug(ui, formatCodexTransportDebugLines(fields));
+  writeCodexTransportDebug(ui, formatCodexTransportDebugLines(fields, logger?.path));
 }
 
 function isCodexTransportDebugEnabled() {
@@ -20,6 +21,11 @@ function isCodexTransportDebugEnabled() {
   return value === "1" || value === "true" || value === "yes";
 }
 
+function isCodexTransportDebugEventsVisible() {
+  const value = process.env.MARCH_CODEX_TRANSPORT_DEBUG_EVENTS;
+  return value === "1" || value === "true" || value === "yes";
+}
+
 function formatCodexTransportDebugFields(sessionId, before, after) {
   const delta = (key) => (after?.[key] ?? 0) - (before?.[key] ?? 0);
   return {
@@ -38,21 +44,60 @@ function formatCodexTransportDebugFields(sessionId, before, after) {
     lastInputItems: after?.lastInputItems ?? 0,
     lastDeltaInputItems: after?.lastDeltaInputItems ?? 0,
     lastWebSocketError: after?.lastWebSocketError ?? null,
+    lastWebSocketEvent: getCodexWebSocketLastEvent(sessionId),
     hasStats: Boolean(after),
   };
 }
 
-function formatCodexTransportDebugLines(fields) {
+function formatCodexTransportDebugLines(fields, logPath) {
   if (!fields.hasStats) return [`[codex-transport] sessionId=${fields.sessionId} no Codex WebSocket stats`];
-  return [
+  const lines = [
     `[codex-transport] sessionId=${fields.sessionId}`,
     `  requests=${fields.requests} totalRequests=${fields.totalRequests}`,
     `  wsConnections created=${fields.connectionsCreated} reused=${fields.connectionsReused}`,
     `  modes full=${fields.fullContextRequests} delta=${fields.deltaRequests} cached=${fields.cachedContextRequests} storeTrue=${fields.storeTrueRequests}`,
     `  fallback websocketFailures=${fields.websocketFailures} sseFallbacks=${fields.sseFallbacks} active=${fields.websocketFallbackActive}`,
+    `  error lastWebSocketError=${formatDebugValue(fields.lastWebSocketError)}`,
     `  lastInputItems=${fields.lastInputItems} lastDeltaInputItems=${fields.lastDeltaInputItems}`,
-    ...(fields.lastWebSocketError ? [`  lastWebSocketError=${fields.lastWebSocketError}`] : []),
   ];
+  if (isCodexTransportDebugEventsVisible()) {
+    lines.push(...formatWebSocketEventLines(fields.lastWebSocketEvent));
+  } else if (fields.lastWebSocketEvent && logPath) {
+    lines.push(`  rawWebSocketEventLog=${formatDebugValue(logPath)}`);
+  }
+  return lines;
+}
+
+function formatWebSocketEventLines(events) {
+  if (!events) return ["  wsEvent none"];
+  return [
+    ...formatSingleWebSocketEvent("wsEvent", events.lastEvent),
+    ...formatSingleWebSocketEvent("wsError", events.lastErrorEvent),
+    ...formatSingleWebSocketCloseEvent(events.lastCloseEvent),
+  ];
+}
+
+function formatSingleWebSocketEvent(prefix, event) {
+  if (!event) return [`  ${prefix} none`];
+  return [
+    `  ${prefix} phase=${formatDebugValue(event.phase)} type=${formatDebugValue(event.type)} keys=${formatDebugValue(event.eventKeys)} readyState=${formatDebugValue(event.readyState)}`,
+    `  ${prefix} errorName=${formatDebugValue(event.errorName)} errorMessage=${formatDebugValue(event.errorMessage)} errorCode=${formatDebugValue(event.errorCode)} errorString=${formatDebugValue(event.errorString)} eventMessage=${formatDebugValue(event.eventMessage)}`,
+  ];
+}
+
+function formatSingleWebSocketCloseEvent(event) {
+  if (!event) return ["  wsClose none"];
+  return [`  wsClose code=${formatDebugValue(event.closeCode)} reason=${formatDebugValue(event.closeReason)} wasClean=${formatDebugValue(event.closeWasClean)} readyState=${formatDebugValue(event.readyState)}`];
+}
+
+function formatDebugValue(value) {
+  if (value === null || value === undefined || value === "") return "none";
+  if (typeof value === "string") return JSON.stringify(value);
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return JSON.stringify(String(value));
+  }
 }
 
 function writeCodexTransportDebug(ui, lines) {

package/src/agent/runner/codex-websocket-event-debug.mjs

@@ -0,0 +1,130 @@
+const SOCKET_SESSION_ID = Symbol.for("march.codex.websocket.sessionId");
+const SOCKET_LISTENERS = Symbol.for("march.codex.websocket.listeners");
+const DEBUG_EVENTS_KEY = Symbol.for("march.codex.websocket.debugEvents");
+const ORIGINAL_WEBSOCKET_KEY = Symbol.for("march.codex.websocket.originalConstructor");
+
+export function installCodexWebSocketEventDebug() {
+  if (!isCodexTransportDebugEnabled()) return;
+  const OriginalWebSocket = globalThis.WebSocket;
+  if (typeof OriginalWebSocket !== "function") return;
+  if (globalThis[ORIGINAL_WEBSOCKET_KEY]) return;
+
+  globalThis[DEBUG_EVENTS_KEY] = globalThis[DEBUG_EVENTS_KEY] ?? new Map();
+  globalThis[ORIGINAL_WEBSOCKET_KEY] = OriginalWebSocket;
+
+  class MarchDebugWebSocket extends OriginalWebSocket {
+    constructor(...args) {
+      super(...args);
+      this[SOCKET_SESSION_ID] = extractSessionId(args[1]) ?? extractSessionId(args[2]) ?? null;
+      this[SOCKET_LISTENERS] = new Map();
+    }
+
+    addEventListener(type, listener, options) {
+      if ((type !== "error" && type !== "close") || !listener) {
+        return super.addEventListener(type, listener, options);
+      }
+      const wrapped = wrapListener(this, type, listener);
+      rememberWrappedListener(this, type, listener, wrapped);
+      return super.addEventListener(type, wrapped, options);
+    }
+
+    removeEventListener(type, listener, options) {
+      const wrapped = takeWrappedListener(this, type, listener) ?? listener;
+      return super.removeEventListener(type, wrapped, options);
+    }
+  }
+
+  globalThis.WebSocket = MarchDebugWebSocket;
+}
+
+export function getCodexWebSocketLastEvent(sessionId) {
+  if (!sessionId) return null;
+  return globalThis[DEBUG_EVENTS_KEY]?.get(sessionId) ?? null;
+}
+
+function isCodexTransportDebugEnabled() {
+  const value = process.env.MARCH_CODEX_TRANSPORT_DEBUG;
+  return value === "1" || value === "true" || value === "yes";
+}
+
+function extractSessionId(options) {
+  const headers = options?.headers;
+  if (!headers || typeof headers !== "object") return null;
+  const value = headers.session_id ?? headers["session_id"] ?? headers["x-client-request-id"] ?? headers["X-Client-Request-Id"];
+  return typeof value === "string" && value.length > 0 ? value : null;
+}
+
+function wrapListener(socket, type, listener) {
+  return function marchCodexWebSocketDebugListener(event) {
+    recordWebSocketEvent(socket, type, event);
+    if (typeof listener === "function") return listener.call(this, event);
+    return listener.handleEvent?.(event);
+  };
+}
+
+function rememberWrappedListener(socket, type, listener, wrapped) {
+  let byType = socket[SOCKET_LISTENERS].get(type);
+  if (!byType) {
+    byType = new Map();
+    socket[SOCKET_LISTENERS].set(type, byType);
+  }
+  byType.set(listener, wrapped);
+}
+
+function takeWrappedListener(socket, type, listener) {
+  const byType = socket[SOCKET_LISTENERS]?.get(type);
+  if (!byType) return null;
+  const wrapped = byType.get(listener);
+  byType.delete(listener);
+  return wrapped ?? null;
+}
+
+function recordWebSocketEvent(socket, type, event) {
+  const sessionId = socket[SOCKET_SESSION_ID];
+  if (!sessionId) return;
+  const events = globalThis[DEBUG_EVENTS_KEY].get(sessionId) ?? {};
+  const summary = summarizeWebSocketEvent(socket, type, event);
+  events.lastEvent = summary;
+  if (type === "error") events.lastErrorEvent = summary;
+  if (type === "close") events.lastCloseEvent = summary;
+  globalThis[DEBUG_EVENTS_KEY].set(sessionId, events);
+}
+
+function summarizeWebSocketEvent(socket, type, event) {
+  const nestedError = event && typeof event === "object" && "error" in event ? event.error : null;
+  return {
+    phase: type,
+    type: readString(event, "type") ?? type,
+    eventKeys: getEventKeys(event),
+    eventMessage: readString(event, "message"),
+    errorName: readString(nestedError, "name"),
+    errorMessage: readString(nestedError, "message"),
+    errorCode: readString(nestedError, "code") ?? readNumber(nestedError, "code"),
+    errorString: nestedError ? String(nestedError) : undefined,
+    closeCode: readNumber(event, "code"),
+    closeReason: readString(event, "reason"),
+    closeWasClean: readBoolean(event, "wasClean"),
+    readyState: typeof socket.readyState === "number" ? socket.readyState : undefined,
+  };
+}
+
+function getEventKeys(event) {
+  if (!event || typeof event !== "object") return [];
+  return [...new Set([...Object.keys(event), "type", "message", "error", "code", "reason", "wasClean"].filter((key) => key in event))];
+}
+
+function readString(value, key) {
+  const field = value && typeof value === "object" ? value[key] : undefined;
+  return typeof field === "string" && field.length > 0 ? field : undefined;
+}
+
+function readNumber(value, key) {
+  const field = value && typeof value === "object" ? value[key] : undefined;
+  return typeof field === "number" ? field : undefined;
+}
+
+function readBoolean(value, key) {
+  const field = value && typeof value === "object" ? value[key] : undefined;
+  return typeof field === "boolean" ? field : undefined;
+}
+

package/src/agent/runner.mjs

@@ -13,6 +13,7 @@ import { createRuntimeUiBridge } from "./runtime/ui-event-bridge.mjs";
 import { getRunnerSessionStats, syncEngineSessionState } from "./runner/runner-session-state.mjs";
 import { notifyTurnEndBestEffort, notifyTurnEndDetached, providerContextToPayload } from "./runner/runner-utils.mjs";
 import { dumpCodexTransportDebug, getCodexTransportDebugSnapshot } from "./runner/codex-transport-debug.mjs";
+import { installCodexWebSocketEventDebug } from "./runner/codex-websocket-event-debug.mjs";
 import { resolveRunnerSessionOptions } from "./session/session-options.mjs";
 import { createSessionBinding } from "./session/session-binding.mjs";
 import { maybeAutoNameSession } from "./session/session-auto-name.mjs";
@@ -28,6 +29,7 @@ export { installModelPayloadDumper } from "./model-payload-dumper.mjs";
 export { createDefaultSessionManager, resolveRunnerSessionManager } from "./runner/runner-init.mjs";
 export { getRunnerSessionStats, syncEngineSessionState } from "./runner/runner-session-state.mjs";
 export async function createRunner({ cwd, modelId = null, provider = null, providers = {}, stateRoot, ui, memoryRoot = null, profilePaths = null, memoryStore = null, memoryTools = [], shellRuntime = null, mcpTools = [], mcpInjections = [], mcpClientManager = null, webTools = [], namespace = "", sessionManager = null, useRuntimeHost = false, projectMarchDir = null, syncPiSidecar = false, extensionPaths = [], lifecycleHooks = [], lifecycleDiagnostics = [], authStorage = null, permissionController = null, modelContextDumper = null, turnNotifier = null, logger = null, onModelPayload = null, createAgentSessionImpl = createAgentSession, createAgentSessionRuntimeImpl, createRuntimeServices, createRuntimeSessionFromServices, maxTurns, trimBatch, serviceTier = null, hostedTools = {} }) {
+  installCodexWebSocketEventDebug();
   if (!useRuntimeHost && extensionPaths.length > 0) {
     throw new Error("--extension requires the default pi runtime host path");
   }