march-cli 0.1.21 → 0.1.22

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

@@ -1,130 +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;
-}
-
+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/fast-model.mjs

@@ -1,36 +1,36 @@
-const FAST_PROVIDERS = new Set(["openai", "openai-codex"]);
-const FAST_ID_SUFFIX = "__fast";
-
-export function isFastProvider(provider) {
-  return FAST_PROVIDERS.has(provider);
-}
-
-export function createFastModelEntry(baseModel) {
-  return {
-    model: {
-      ...baseModel,
-      id: baseModel.id + FAST_ID_SUFFIX,
-      name: baseModel.name + " Fast",
-      __isFast: true,
-      __baseId: baseModel.id,
-    },
-  };
-}
-
-export function appendFastVariants(scopedModels) {
-  const result = [];
-  for (const entry of scopedModels) {
-    result.push(entry);
-    if (isFastProvider(entry.model.provider)) {
-      result.push(createFastModelEntry(entry.model));
-    }
-  }
-  return result;
-}
-
-export function fromFastEntryModel(model) {
-  if (model.__isFast) {
-    return { baseId: model.__baseId, isFast: true };
-  }
-  return { baseId: model.id, isFast: false };
-}
+const FAST_PROVIDERS = new Set(["openai", "openai-codex"]);
+const FAST_ID_SUFFIX = "__fast";
+
+export function isFastProvider(provider) {
+  return FAST_PROVIDERS.has(provider);
+}
+
+export function createFastModelEntry(baseModel) {
+  return {
+    model: {
+      ...baseModel,
+      id: baseModel.id + FAST_ID_SUFFIX,
+      name: baseModel.name + " Fast",
+      __isFast: true,
+      __baseId: baseModel.id,
+    },
+  };
+}
+
+export function appendFastVariants(scopedModels) {
+  const result = [];
+  for (const entry of scopedModels) {
+    result.push(entry);
+    if (isFastProvider(entry.model.provider)) {
+      result.push(createFastModelEntry(entry.model));
+    }
+  }
+  return result;
+}
+
+export function fromFastEntryModel(model) {
+  if (model.__isFast) {
+    return { baseId: model.__baseId, isFast: true };
+  }
+  return { baseId: model.id, isFast: false };
+}

package/src/agent/runner/runner-cleanup.mjs

@@ -1,12 +1,12 @@
-export async function runRunnerCleanup(cleanups) {
-  const errors = [];
-  for (const cleanup of cleanups) {
-    try {
-      await cleanup();
-    } catch (err) {
-      errors.push(err);
-    }
-  }
-  if (errors.length === 1) throw errors[0];
-  if (errors.length > 1) throw new AggregateError(errors, "Runner cleanup failed");
-}
+export async function runRunnerCleanup(cleanups) {
+  const errors = [];
+  for (const cleanup of cleanups) {
+    try {
+      await cleanup();
+    } catch (err) {
+      errors.push(err);
+    }
+  }
+  if (errors.length === 1) throw errors[0];
+  if (errors.length > 1) throw new AggregateError(errors, "Runner cleanup failed");
+}

package/src/agent/runner/runner-init.mjs

@@ -1,15 +1,15 @@
-import { SessionManager } from "@earendil-works/pi-coding-agent";
-
-export function createDefaultSessionManager(cwd) {
-  return SessionManager.inMemory(cwd);
-}
-
-export function resolveRunnerSessionManager(cwd, sessionManager = null) {
-  return sessionManager ?? createDefaultSessionManager(cwd);
-}
-
-export function resolveInitialModel({ modelRegistry, provider, modelId }) {
-  const available = modelRegistry.getAvailable?.() ?? [];
-  if (provider && modelId) return available.find((model) => model.provider === provider && model.id === modelId) ?? null;
-  return available[0] ?? null;
-}
+import { SessionManager } from "@earendil-works/pi-coding-agent";
+
+export function createDefaultSessionManager(cwd) {
+  return SessionManager.inMemory(cwd);
+}
+
+export function resolveRunnerSessionManager(cwd, sessionManager = null) {
+  return sessionManager ?? createDefaultSessionManager(cwd);
+}
+
+export function resolveInitialModel({ modelRegistry, provider, modelId }) {
+  const available = modelRegistry.getAvailable?.() ?? [];
+  if (provider && modelId) return available.find((model) => model.provider === provider && model.id === modelId) ?? null;
+  return available[0] ?? null;
+}

package/src/agent/runner/runner-session-state.mjs

@@ -1,40 +1,40 @@
-export function getRunnerSessionStats(activeSession, runtimeHost) {
-  const stats = activeSession.getSessionStats();
-  const manager = activeSession.sessionManager;
-  return {
-    ...stats,
-    runtimeHost: Boolean(runtimeHost),
-    piSessionSwitching: Boolean(runtimeHost),
-    persisted: manager?.isPersisted?.() ?? Boolean(activeSession.sessionFile),
-    sessionFile: manager?.getSessionFile?.() ?? activeSession.sessionFile,
-  };
-}
-
-export function syncEngineSessionState(engine, session) {
-  bindToolDefs(engine, session);
-  engine.setRuntimeState({
-    modelId: session.model?.id,
-    provider: session.model?.provider,
-    thinkingLevel: session.thinkingLevel,
-  });
-}
-
-function bindToolDefs(engine, session) {
-  engine.setToolDefs(session.getActiveToolNames().map((name) => {
-    const tool = session.getToolDefinition(name);
-    return {
-      name,
-      description: tool?.description ?? "",
-      parameters: tool?.parameters ? describeParams(tool.parameters) : null,
-    };
-  }));
-}
-
-function describeParams(schema) {
-  if (!schema || !schema.properties) return {};
-  const out = {};
-  for (const [key, prop] of Object.entries(schema.properties)) {
-    out[key] = prop.description ?? key;
-  }
-  return out;
-}
+export function getRunnerSessionStats(activeSession, runtimeHost) {
+  const stats = activeSession.getSessionStats();
+  const manager = activeSession.sessionManager;
+  return {
+    ...stats,
+    runtimeHost: Boolean(runtimeHost),
+    piSessionSwitching: Boolean(runtimeHost),
+    persisted: manager?.isPersisted?.() ?? Boolean(activeSession.sessionFile),
+    sessionFile: manager?.getSessionFile?.() ?? activeSession.sessionFile,
+  };
+}
+
+export function syncEngineSessionState(engine, session) {
+  bindToolDefs(engine, session);
+  engine.setRuntimeState({
+    modelId: session.model?.id,
+    provider: session.model?.provider,
+    thinkingLevel: session.thinkingLevel,
+  });
+}
+
+function bindToolDefs(engine, session) {
+  engine.setToolDefs(session.getActiveToolNames().map((name) => {
+    const tool = session.getToolDefinition(name);
+    return {
+      name,
+      description: tool?.description ?? "",
+      parameters: tool?.parameters ? describeParams(tool.parameters) : null,
+    };
+  }));
+}
+
+function describeParams(schema) {
+  if (!schema || !schema.properties) return {};
+  const out = {};
+  for (const [key, prop] of Object.entries(schema.properties)) {
+    out[key] = prop.description ?? key;
+  }
+  return out;
+}

package/src/agent/runner/runner-utils.mjs

@@ -1,24 +1,24 @@
-export function providerContextToPayload(providerContext) {
-  return {
-    messages: [
-      { role: "system", content: providerContext.system },
-      ...(providerContext.userMessages ?? []).map((message) => ({ role: "user", content: message.content })),
-    ],
-  };
-}
-
-export async function notifyTurnEndBestEffort(turnNotifier, event) {
-  if (!turnNotifier?.notifyTurnEnd) return { ok: false, reason: "not-configured", results: [] };
-  try {
-    return await turnNotifier.notifyTurnEnd(event);
-  } catch (err) {
-    // Notification must never change turn behavior.
-    return { ok: false, reason: err?.message ?? String(err), results: [] };
-  }
-}
-
-export function notifyTurnEndDetached(turnNotifier, event, onResult = () => {}) {
-  const pending = notifyTurnEndBestEffort(turnNotifier, event);
-  pending.then(onResult, () => {});
-  return pending;
-}
+export function providerContextToPayload(providerContext) {
+  return {
+    messages: [
+      { role: "system", content: providerContext.system },
+      ...(providerContext.userMessages ?? []).map((message) => ({ role: "user", content: message.content })),
+    ],
+  };
+}
+
+export async function notifyTurnEndBestEffort(turnNotifier, event) {
+  if (!turnNotifier?.notifyTurnEnd) return { ok: false, reason: "not-configured", results: [] };
+  try {
+    return await turnNotifier.notifyTurnEnd(event);
+  } catch (err) {
+    // Notification must never change turn behavior.
+    return { ok: false, reason: err?.message ?? String(err), results: [] };
+  }
+}
+
+export function notifyTurnEndDetached(turnNotifier, event, onResult = () => {}) {
+  const pending = notifyTurnEndBestEffort(turnNotifier, event);
+  pending.then(onResult, () => {});
+  return pending;
+}