march-cli 0.1.16 → 0.1.18

package/package.json

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

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

@@ -0,0 +1,65 @@
+import { getOpenAICodexWebSocketDebugStats } from "@earendil-works/pi-ai/openai-codex-responses";
+
+export function getCodexTransportDebugSnapshot(session) {
+  if (!isCodexTransportDebugEnabled()) return null;
+  const sessionId = session?.sessionId;
+  return sessionId ? (getOpenAICodexWebSocketDebugStats(sessionId) ?? null) : null;
+}
+
+export function dumpCodexTransportDebug({ before, session, ui, logger }) {
+  if (!isCodexTransportDebugEnabled()) return;
+  const sessionId = session?.sessionId;
+  const after = sessionId ? (getOpenAICodexWebSocketDebugStats(sessionId) ?? null) : null;
+  const fields = formatCodexTransportDebugFields(sessionId, before, after);
+  logger?.event("codex.transport", fields);
+  writeCodexTransportDebug(ui, formatCodexTransportDebugLines(fields));
+}
+
+function isCodexTransportDebugEnabled() {
+  const value = process.env.MARCH_CODEX_TRANSPORT_DEBUG;
+  return value === "1" || value === "true" || value === "yes";
+}
+
+function formatCodexTransportDebugFields(sessionId, before, after) {
+  const delta = (key) => (after?.[key] ?? 0) - (before?.[key] ?? 0);
+  return {
+    sessionId: sessionId ?? "unknown",
+    requests: delta("requests"),
+    totalRequests: after?.requests ?? 0,
+    connectionsCreated: delta("connectionsCreated"),
+    connectionsReused: delta("connectionsReused"),
+    cachedContextRequests: delta("cachedContextRequests"),
+    storeTrueRequests: delta("storeTrueRequests"),
+    fullContextRequests: delta("fullContextRequests"),
+    deltaRequests: delta("deltaRequests"),
+    websocketFailures: delta("websocketFailures"),
+    sseFallbacks: delta("sseFallbacks"),
+    websocketFallbackActive: Boolean(after?.websocketFallbackActive),
+    lastInputItems: after?.lastInputItems ?? 0,
+    lastDeltaInputItems: after?.lastDeltaInputItems ?? 0,
+    lastWebSocketError: after?.lastWebSocketError ?? null,
+    hasStats: Boolean(after),
+  };
+}
+
+function formatCodexTransportDebugLines(fields) {
+  if (!fields.hasStats) return [`[codex-transport] sessionId=${fields.sessionId} no Codex WebSocket stats`];
+  return [
+    `[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}`,
+    `  lastInputItems=${fields.lastInputItems} lastDeltaInputItems=${fields.lastDeltaInputItems}`,
+    ...(fields.lastWebSocketError ? [`  lastWebSocketError=${fields.lastWebSocketError}`] : []),
+  ];
+}
+
+function writeCodexTransportDebug(ui, lines) {
+  if (ui?.debugLines) {
+    ui.debugLines(lines);
+    return;
+  }
+  if (!ui?.writeln) return;
+  for (const line of lines) ui.writeln(line);
+}

package/src/agent/runner.mjs

@@ -5,14 +5,14 @@ import { createMarchLifecycleAdapter } from "../extensions/lifecycle-adapter.mjs
 import { syncPiSessionSidecar } from "../session/sidecar-sync.mjs";
 import { LspService } from "../lsp/service.mjs";
 import { formatLspServiceEvent } from "../lsp/status-message.mjs";
-import { formatRecallHints } from "../memory/markdown-store.mjs";
-import { appendProviderUserMessage, estimateProviderPayloadTokens, installModelPayloadDumper, replaceProviderContextMessages } from "./model-payload-dumper.mjs";
+import { estimateProviderPayloadTokens, installModelPayloadDumper, replaceProviderContextMessages } from "./model-payload-dumper.mjs";
 import { resolveInitialModel, resolveRunnerSessionManager } from "./runner/runner-init.mjs";
 import { runRunnerCleanup } from "./runner/runner-cleanup.mjs";
 import { createRunnerRuntimeHost } from "./runtime/runner-runtime-host.mjs";
 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 { resolveRunnerSessionOptions } from "./session/session-options.mjs";
 import { createSessionBinding } from "./session/session-binding.mjs";
 import { maybeAutoNameSession } from "./session/session-auto-name.mjs";
@@ -55,7 +55,6 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
   let currentModelCallKind = "model", currentTurnId = null, currentPromptForContext = "";
   let currentTurnContextMode = "rebuild";
   let nextTurnContextMode = "rebuild";
-  let pendingMidTurnRecallHints = [];
   let lastNotificationResult = null, runtimeHost = null, lifecycleAdapter = null;
   let _currentFastEntry = null;
   if (useRuntimeHost) {
@@ -111,8 +110,8 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
       const contextMode = nextTurnContextMode;
       currentTurnContextMode = contextMode;
       nextTurnContextMode = "rebuild";
-      pendingMidTurnRecallHints = [];
       const turnStartedAt = Date.now();
+      const codexTransportStatsBefore = getCodexTransportDebugSnapshot(sessionBinding.get());
       const turnLog = beginLoggedTurn({ logger, engine, modelId, provider, contextMode, userMessage, userRecallHints, startedAt: turnStartedAt }); currentTurnId = turnLog.turnId;
       try {
         const result = await runRunnerTurn({
@@ -121,7 +120,6 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
           setModelCallKind: (kind) => { currentModelCallKind = kind; },
           logger: turnLog.logger,
           setPhase: turnLog.setPhase,
-          onMidTurnRecallHints: (hints) => { pendingMidTurnRecallHints.push(...hints); },
           syncCurrentPiSidecar,
           autoNameSession,
           contextMode,
@@ -144,6 +142,7 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
         turnLog.endError(err);
         throw err;
       } finally {
+        dumpCodexTransportDebug({ before: codexTransportStatsBefore, session: sessionBinding.get(), ui: runtimeUi, logger });
         currentTurnId = null;
         currentTurnContextMode = "rebuild";
       }
@@ -289,10 +288,6 @@ export async function createRunner({ cwd, modelId = null, provider = null, provi
       : replaceProviderContextMessages(payload, engine.buildProviderContext(currentPromptForContext));
     nextPayload = injectHostedTools(nextPayload, model, hostedTools);
     if (_currentFastEntry) nextPayload = { ...nextPayload, service_tier: "priority" };
-    if (pendingMidTurnRecallHints.length > 0) {
-      nextPayload = appendProviderUserMessage(nextPayload, formatRecallHints("assistant", pendingMidTurnRecallHints));
-      pendingMidTurnRecallHints = [];
-    }
     return nextPayload;
   }
 }

package/src/agent/runtime/remote-ui-client.mjs

@@ -12,6 +12,7 @@ export function createRemoteRuntimeUiClient(peer) {
     retryStart: (event) => peer.notify("uiEvent", { type: "retry_start", ...event }),
     retryEnd: (event) => peer.notify("uiEvent", { type: "retry_end", ...event }),
     status: (text) => peer.notify("uiEvent", { type: "status", text }),
+    debugLines: (lines) => peer.notify("uiEvent", { type: "debug_lines", lines }),
     memoryHint: ({ source, hints }) => peer.notify("uiEvent", { type: "memory_hint", source, hints }),
     editDiff: (path, diffLines) => peer.notify("uiEvent", { type: "edit_diff", path, diffLines }),
     requestPermission: (request) => peer.call("uiRequest", { type: "permission_request", ...request }),

package/src/agent/runtime/ui-event-bridge.mjs

@@ -49,6 +49,7 @@ export function createRuntimeUiClient(eventBus) {
     retryStart: (event) => eventBus.emit({ type: "retry_start", ...event }),
     retryEnd: (event) => eventBus.emit({ type: "retry_end", ...event }),
     status: (text) => eventBus.emit({ type: "status", text }),
+    debugLines: (lines) => eventBus.emit({ type: "debug_lines", lines }),
     memoryHint: ({ source, hints }) => eventBus.emit({ type: "memory_hint", source, hints }),
     editDiff: (path, diffLines) => eventBus.emit({ type: "edit_diff", path, diffLines }),
     requestPermission: (request) => eventBus.request({ type: "permission_request", ...request }),
@@ -69,6 +70,7 @@ export function dispatchRuntimeUiEvent(ui, event) {
     case "retry_start": return ui.retryStart?.(pickRetryStart(event));
     case "retry_end": return ui.retryEnd?.(pickRetryEnd(event));
     case "status": return ui.status?.(event.text);
+    case "debug_lines": return writeDebugLines(ui, event.lines);
     case "memory_hint": return ui.memoryHint?.({ source: event.source, hints: event.hints });
     case "edit_diff": return ui.editDiff?.(event.path, event.diffLines);
     case "permission_request": return ui.requestPermission?.({ toolName: event.toolName, params: event.params, category: event.category });
@@ -76,6 +78,14 @@ export function dispatchRuntimeUiEvent(ui, event) {
   }
 }
 
+function writeDebugLines(ui, lines) {
+  if (!Array.isArray(lines)) return undefined;
+  if (ui?.debugLines) return ui.debugLines(lines);
+  if (!ui?.writeln) return undefined;
+  for (const line of lines) ui.writeln(line);
+  return undefined;
+}
+
 function pickRetryStart({ attempt, maxAttempts, delayMs, errorMessage }) {
   return { attempt, maxAttempts, delayMs, errorMessage };
 }

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

@@ -1,3 +1,4 @@
+import { formatRecallHints } from "../../memory/markdown-store.mjs";
 import { resolveImageAttachmentReferences } from "../../session/attachment-references.mjs";
 import { closeAssistantReply, compactAssistantContext, createTurnEventState, handleRunnerSessionEvent } from "./turn-events.mjs";
 
@@ -13,7 +14,6 @@ export async function runRunnerTurn({
   setModelCallKind,
   logger = null,
   setPhase = null,
-  onMidTurnRecallHints,
   syncCurrentPiSidecar,
   autoNameSession,
   contextMode = "rebuild",
@@ -41,7 +41,7 @@ export async function runRunnerTurn({
       const hints = flushAssistantRecall({ memoryStore, engine, turnState, currentProject });
       if (hints.length > 0) {
         midTurnRecallHints.push(...hints);
-        onMidTurnRecallHints?.(hints);
+        queueMidTurnRecallHints(activeSession, hints, logger);
         ui.memoryHint?.({ source: "assistant", hints });
       }
     }
@@ -89,6 +89,20 @@ export async function runRunnerTurn({
   }
 }
 
+function queueMidTurnRecallHints(session, hints, logger) {
+  const content = formatRecallHints("assistant", hints);
+  if (!content) return;
+  const injected = session.sendCustomMessage?.({
+    customType: "march.memory_hint",
+    content,
+    display: false,
+    details: { source: "assistant" },
+  }, { deliverAs: "steer" });
+  void injected?.catch?.((err) => {
+    logger?.debug("memory.mid_turn_recall.inject_failed", { errorMessage: err?.message ?? String(err) });
+  });
+}
+
 function logSessionEvent(logger, event) {
   if (!logger) return;
   if (event.type === "message_update") {