march-cli 0.1.21 → 0.1.22

package/src/agent/provider/payload-messages.mjs

@@ -1,138 +1,138 @@
-export function replaceProviderSystemPrompt(payload, systemPrompt) {
-  if (!payload || typeof payload !== "object" || !systemPrompt) return payload;
-  if (payload.body && typeof payload.body === "object") {
-    const body = replaceProviderSystemPrompt(payload.body, systemPrompt);
-    return body === payload.body ? payload : { ...payload, body };
-  }
-  if (typeof payload.body === "string") {
-    try {
-      const body = JSON.parse(payload.body);
-      const replaced = replaceProviderSystemPrompt(body, systemPrompt);
-      return replaced === body ? payload : { ...payload, body: JSON.stringify(replaced) };
-    } catch {
-      return payload;
-    }
-  }
-  if (!Array.isArray(payload.messages)) return payload;
-  return {
-    ...payload,
-    messages: [
-      { role: "system", content: systemPrompt },
-      ...payload.messages.filter((message) => message?.role !== "system"),
-    ],
-  };
-}
-
-export function replaceProviderContextMessages(payload, providerContext) {
-  if (!payload || typeof payload !== "object" || !providerContext?.system) return payload;
-  if (payload.body && typeof payload.body === "object") {
-    const body = replaceProviderContextMessages(payload.body, providerContext);
-    return body === payload.body ? payload : { ...payload, body };
-  }
-  if (typeof payload.body === "string") {
-    try {
-      const body = JSON.parse(payload.body);
-      const replaced = replaceProviderContextMessages(body, providerContext);
-      return replaced === body ? payload : { ...payload, body: JSON.stringify(replaced) };
-    } catch {
-      return payload;
-    }
-  }
-  if (Array.isArray(payload.messages)) return replaceChatMessagesPayload(payload, providerContext);
-  if (Array.isArray(payload.input) && typeof payload.instructions === "string") return replaceResponsesPayload(payload, providerContext);
-  return payload;
-}
-
-export function appendProviderUserMessage(payload, content) {
-  if (!payload || typeof payload !== "object" || !content) return payload;
-  if (payload.body && typeof payload.body === "object") {
-    const body = appendProviderUserMessage(payload.body, content);
-    return body === payload.body ? payload : { ...payload, body };
-  }
-  if (typeof payload.body === "string") {
-    try {
-      const body = JSON.parse(payload.body);
-      const appended = appendProviderUserMessage(body, content);
-      return appended === body ? payload : { ...payload, body: JSON.stringify(appended) };
-    } catch {
-      return payload;
-    }
-  }
-  if (Array.isArray(payload.messages)) {
-    return {
-      ...payload,
-      messages: [...payload.messages, { role: "user", content }],
-    };
-  }
-  if (Array.isArray(payload.input) && typeof payload.instructions === "string") {
-    return {
-      ...payload,
-      input: [...payload.input, { role: "user", content: [{ type: "input_text", text: content }] }],
-    };
-  }
-  return payload;
-}
-
-function replaceChatMessagesPayload(payload, providerContext) {
-  const originalUser = payload.messages.findLast?.((message) => message?.role === "user")
-    ?? [...payload.messages].reverse().find((message) => message?.role === "user");
-  const userMessages = (providerContext.userMessages ?? []).filter((message) => message?.content);
-  const contextMessages = userMessages.map((message, index) => ({
-    role: "user",
-    content: index === userMessages.length - 1 ? contentWithOriginalNonTextParts(message.content, originalUser) : message.content,
-  }));
-  return {
-    ...payload,
-    messages: [
-      { role: "system", content: providerContext.system },
-      ...contextMessages,
-      ...payload.messages.filter((message) => message?.role !== "system" && message?.role !== "user"),
-    ],
-  };
-}
-
-function replaceResponsesPayload(payload, providerContext) {
-  const userMessages = (providerContext.userMessages ?? []).filter((message) => message?.content);
-  const originalUser = payload.input.findLast?.((item) => item?.role === "user")
-    ?? [...payload.input].reverse().find((item) => item?.role === "user");
-  return {
-    ...payload,
-    instructions: providerContext.system,
-    input: [
-      ...userMessages.map((message, index) => ({
-        role: "user",
-        content: index === userMessages.length - 1
-          ? responsesContentWithOriginalNonTextParts(message.content, originalUser)
-          : [{ type: "input_text", text: message.content }],
-      })),
-      ...payload.input.filter((item) => item?.role !== "user"),
-    ],
-  };
-}
-
-function responsesContentWithOriginalNonTextParts(text, originalUser) {
-  return [{ type: "input_text", text }, ...responsesNonTextContentParts(originalUser?.content)];
-}
-
-function responsesNonTextContentParts(content) {
-  if (!Array.isArray(content)) return [];
-  return content.filter((part) => {
-    if (!part || typeof part !== "object") return false;
-    if (part.type === "input_text" || part.type === "text" || typeof part.text === "string") return false;
-    return true;
-  });
-}
-
-function contentWithOriginalNonTextParts(text, originalUser) {
-  const extraParts = nonTextContentParts(originalUser?.content);
-  return extraParts.length ? [{ type: "text", text }, ...extraParts] : text;
-}
-
-function nonTextContentParts(content) {
-  if (!Array.isArray(content)) return [];
-  return content.filter((part) => {
-    if (!part || typeof part !== "object") return false;
-    if (part.type === "text" || typeof part.text === "string") return false;
-    return true;
-  });
-}
+export function replaceProviderSystemPrompt(payload, systemPrompt) {
+  if (!payload || typeof payload !== "object" || !systemPrompt) return payload;
+  if (payload.body && typeof payload.body === "object") {
+    const body = replaceProviderSystemPrompt(payload.body, systemPrompt);
+    return body === payload.body ? payload : { ...payload, body };
+  }
+  if (typeof payload.body === "string") {
+    try {
+      const body = JSON.parse(payload.body);
+      const replaced = replaceProviderSystemPrompt(body, systemPrompt);
+      return replaced === body ? payload : { ...payload, body: JSON.stringify(replaced) };
+    } catch {
+      return payload;
+    }
+  }
+  if (!Array.isArray(payload.messages)) return payload;
+  return {
+    ...payload,
+    messages: [
+      { role: "system", content: systemPrompt },
+      ...payload.messages.filter((message) => message?.role !== "system"),
+    ],
+  };
+}
+
+export function replaceProviderContextMessages(payload, providerContext) {
+  if (!payload || typeof payload !== "object" || !providerContext?.system) return payload;
+  if (payload.body && typeof payload.body === "object") {
+    const body = replaceProviderContextMessages(payload.body, providerContext);
+    return body === payload.body ? payload : { ...payload, body };
+  }
+  if (typeof payload.body === "string") {
+    try {
+      const body = JSON.parse(payload.body);
+      const replaced = replaceProviderContextMessages(body, providerContext);
+      return replaced === body ? payload : { ...payload, body: JSON.stringify(replaced) };
+    } catch {
+      return payload;
+    }
+  }
+  if (Array.isArray(payload.messages)) return replaceChatMessagesPayload(payload, providerContext);
+  if (Array.isArray(payload.input) && typeof payload.instructions === "string") return replaceResponsesPayload(payload, providerContext);
+  return payload;
+}
+
+export function appendProviderUserMessage(payload, content) {
+  if (!payload || typeof payload !== "object" || !content) return payload;
+  if (payload.body && typeof payload.body === "object") {
+    const body = appendProviderUserMessage(payload.body, content);
+    return body === payload.body ? payload : { ...payload, body };
+  }
+  if (typeof payload.body === "string") {
+    try {
+      const body = JSON.parse(payload.body);
+      const appended = appendProviderUserMessage(body, content);
+      return appended === body ? payload : { ...payload, body: JSON.stringify(appended) };
+    } catch {
+      return payload;
+    }
+  }
+  if (Array.isArray(payload.messages)) {
+    return {
+      ...payload,
+      messages: [...payload.messages, { role: "user", content }],
+    };
+  }
+  if (Array.isArray(payload.input) && typeof payload.instructions === "string") {
+    return {
+      ...payload,
+      input: [...payload.input, { role: "user", content: [{ type: "input_text", text: content }] }],
+    };
+  }
+  return payload;
+}
+
+function replaceChatMessagesPayload(payload, providerContext) {
+  const originalUser = payload.messages.findLast?.((message) => message?.role === "user")
+    ?? [...payload.messages].reverse().find((message) => message?.role === "user");
+  const userMessages = (providerContext.userMessages ?? []).filter((message) => message?.content);
+  const contextMessages = userMessages.map((message, index) => ({
+    role: "user",
+    content: index === userMessages.length - 1 ? contentWithOriginalNonTextParts(message.content, originalUser) : message.content,
+  }));
+  return {
+    ...payload,
+    messages: [
+      { role: "system", content: providerContext.system },
+      ...contextMessages,
+      ...payload.messages.filter((message) => message?.role !== "system" && message?.role !== "user"),
+    ],
+  };
+}
+
+function replaceResponsesPayload(payload, providerContext) {
+  const userMessages = (providerContext.userMessages ?? []).filter((message) => message?.content);
+  const originalUser = payload.input.findLast?.((item) => item?.role === "user")
+    ?? [...payload.input].reverse().find((item) => item?.role === "user");
+  return {
+    ...payload,
+    instructions: providerContext.system,
+    input: [
+      ...userMessages.map((message, index) => ({
+        role: "user",
+        content: index === userMessages.length - 1
+          ? responsesContentWithOriginalNonTextParts(message.content, originalUser)
+          : [{ type: "input_text", text: message.content }],
+      })),
+      ...payload.input.filter((item) => item?.role !== "user"),
+    ],
+  };
+}
+
+function responsesContentWithOriginalNonTextParts(text, originalUser) {
+  return [{ type: "input_text", text }, ...responsesNonTextContentParts(originalUser?.content)];
+}
+
+function responsesNonTextContentParts(content) {
+  if (!Array.isArray(content)) return [];
+  return content.filter((part) => {
+    if (!part || typeof part !== "object") return false;
+    if (part.type === "input_text" || part.type === "text" || typeof part.text === "string") return false;
+    return true;
+  });
+}
+
+function contentWithOriginalNonTextParts(text, originalUser) {
+  const extraParts = nonTextContentParts(originalUser?.content);
+  return extraParts.length ? [{ type: "text", text }, ...extraParts] : text;
+}
+
+function nonTextContentParts(content) {
+  if (!Array.isArray(content)) return [];
+  return content.filter((part) => {
+    if (!part || typeof part !== "object") return false;
+    if (part.type === "text" || typeof part.text === "string") return false;
+    return true;
+  });
+}

package/src/agent/runner/codex-large-context-guard.mjs

@@ -1,87 +1,87 @@
-import {
-  getOpenAICodexWebSocketDebugStats,
-  resetOpenAICodexWebSocketDebugStats,
-} from "@earendil-works/pi-ai/openai-codex-responses";
-
-const FETCH_INSTALLED = Symbol.for("march.codex.largeContextGuard.fetchInstalled");
-const ORIGINAL_FETCH = Symbol.for("march.codex.largeContextGuard.originalFetch");
-const DEFAULT_MAX_HTTP_FALLBACK_BYTES = 512 * 1024;
-
-export function installCodexLargeContextGuard() {
-  if (!isGuardEnabled()) return;
-  if (globalThis[FETCH_INSTALLED]) return;
-  const originalFetch = globalThis.fetch;
-  if (typeof originalFetch !== "function") return;
-  globalThis[ORIGINAL_FETCH] = originalFetch;
-  globalThis.fetch = async function marchCodexLargeContextGuardedFetch(input, init) {
-    const bodyBytes = getBodyBytes(init?.body);
-    if (isCodexResponsesHttpRequest(input, init) && !isZstdEncoded(input, init) && bodyBytes > getMaxHttpFallbackBytes()) {
-      throw new Error(`Codex HTTP fallback blocked for uncompressed large payload (${bodyBytes} bytes); retrying WebSocket instead`);
-    }
-    return originalFetch.call(this, input, init);
-  };
-  globalThis[FETCH_INSTALLED] = true;
-}
-
-export function applyCodexLargeContextGuardToPayload(payload, { model, session } = {}) {
-  if (!isGuardEnabled() || !isCodexModel(model)) return payload;
-  const sessionId = session?.sessionId;
-  const stats = sessionId ? getOpenAICodexWebSocketDebugStats(sessionId) : null;
-  if (stats?.websocketFallbackActive) {
-    // pi-ai marks fallback session-wide. Clear it before retry payload assembly so WS gets another chance.
-    resetOpenAICodexWebSocketDebugStats(sessionId);
-  }
-  return payload;
-}
-
-function isGuardEnabled() {
-  const value = process.env.MARCH_CODEX_LARGE_CONTEXT_GUARD;
-  return value !== "0" && value !== "false" && value !== "no";
-}
-
-function getMaxHttpFallbackBytes() {
-  const raw = process.env.MARCH_CODEX_HTTP_FALLBACK_MAX_BYTES;
-  const parsed = raw ? Number.parseInt(raw, 10) : DEFAULT_MAX_HTTP_FALLBACK_BYTES;
-  return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_MAX_HTTP_FALLBACK_BYTES;
-}
-
-function isCodexModel(model) {
-  return model?.provider === "openai-codex" || model?.api === "openai-codex-responses";
-}
-
-function isCodexResponsesHttpRequest(input, init) {
-  const url = getRequestUrl(input);
-  if (!url || !url.includes("/codex/responses")) return false;
-  const method = init?.method ?? input?.method ?? "GET";
-  if (String(method).toUpperCase() !== "POST") return false;
-  return headerValue(init?.headers ?? input?.headers, "accept")?.includes("text/event-stream")
-    || headerValue(init?.headers ?? input?.headers, "OpenAI-Beta")?.includes("responses=experimental");
-}
-
-function getRequestUrl(input) {
-  if (typeof input === "string") return input;
-  if (input instanceof URL) return input.toString();
-  if (input && typeof input.url === "string") return input.url;
-  return "";
-}
-
-function isZstdEncoded(input, init) {
-  return headerValue(init?.headers ?? input?.headers, "content-encoding").toLowerCase() === "zstd";
-}
-
-function getBodyBytes(body) {
-  if (typeof body === "string") return Buffer.byteLength(body);
-  if (body instanceof Uint8Array) return body.byteLength;
-  if (body instanceof ArrayBuffer) return body.byteLength;
-  return 0;
-}
-
-function headerValue(headers, name) {
-  if (!headers) return "";
-  if (typeof headers.get === "function") return headers.get(name) ?? headers.get(name.toLowerCase()) ?? "";
-  const lowerName = name.toLowerCase();
-  for (const [key, value] of Object.entries(headers)) {
-    if (key.toLowerCase() === lowerName) return String(value ?? "");
-  }
-  return "";
-}
+import {
+  getOpenAICodexWebSocketDebugStats,
+  resetOpenAICodexWebSocketDebugStats,
+} from "@earendil-works/pi-ai/openai-codex-responses";
+
+const FETCH_INSTALLED = Symbol.for("march.codex.largeContextGuard.fetchInstalled");
+const ORIGINAL_FETCH = Symbol.for("march.codex.largeContextGuard.originalFetch");
+const DEFAULT_MAX_HTTP_FALLBACK_BYTES = 512 * 1024;
+
+export function installCodexLargeContextGuard() {
+  if (!isGuardEnabled()) return;
+  if (globalThis[FETCH_INSTALLED]) return;
+  const originalFetch = globalThis.fetch;
+  if (typeof originalFetch !== "function") return;
+  globalThis[ORIGINAL_FETCH] = originalFetch;
+  globalThis.fetch = async function marchCodexLargeContextGuardedFetch(input, init) {
+    const bodyBytes = getBodyBytes(init?.body);
+    if (isCodexResponsesHttpRequest(input, init) && !isZstdEncoded(input, init) && bodyBytes > getMaxHttpFallbackBytes()) {
+      throw new Error(`Codex HTTP fallback blocked for uncompressed large payload (${bodyBytes} bytes); retrying WebSocket instead`);
+    }
+    return originalFetch.call(this, input, init);
+  };
+  globalThis[FETCH_INSTALLED] = true;
+}
+
+export function applyCodexLargeContextGuardToPayload(payload, { model, session } = {}) {
+  if (!isGuardEnabled() || !isCodexModel(model)) return payload;
+  const sessionId = session?.sessionId;
+  const stats = sessionId ? getOpenAICodexWebSocketDebugStats(sessionId) : null;
+  if (stats?.websocketFallbackActive) {
+    // pi-ai marks fallback session-wide. Clear it before retry payload assembly so WS gets another chance.
+    resetOpenAICodexWebSocketDebugStats(sessionId);
+  }
+  return payload;
+}
+
+function isGuardEnabled() {
+  const value = process.env.MARCH_CODEX_LARGE_CONTEXT_GUARD;
+  return value !== "0" && value !== "false" && value !== "no";
+}
+
+function getMaxHttpFallbackBytes() {
+  const raw = process.env.MARCH_CODEX_HTTP_FALLBACK_MAX_BYTES;
+  const parsed = raw ? Number.parseInt(raw, 10) : DEFAULT_MAX_HTTP_FALLBACK_BYTES;
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_MAX_HTTP_FALLBACK_BYTES;
+}
+
+function isCodexModel(model) {
+  return model?.provider === "openai-codex" || model?.api === "openai-codex-responses";
+}
+
+function isCodexResponsesHttpRequest(input, init) {
+  const url = getRequestUrl(input);
+  if (!url || !url.includes("/codex/responses")) return false;
+  const method = init?.method ?? input?.method ?? "GET";
+  if (String(method).toUpperCase() !== "POST") return false;
+  return headerValue(init?.headers ?? input?.headers, "accept")?.includes("text/event-stream")
+    || headerValue(init?.headers ?? input?.headers, "OpenAI-Beta")?.includes("responses=experimental");
+}
+
+function getRequestUrl(input) {
+  if (typeof input === "string") return input;
+  if (input instanceof URL) return input.toString();
+  if (input && typeof input.url === "string") return input.url;
+  return "";
+}
+
+function isZstdEncoded(input, init) {
+  return headerValue(init?.headers ?? input?.headers, "content-encoding").toLowerCase() === "zstd";
+}
+
+function getBodyBytes(body) {
+  if (typeof body === "string") return Buffer.byteLength(body);
+  if (body instanceof Uint8Array) return body.byteLength;
+  if (body instanceof ArrayBuffer) return body.byteLength;
+  return 0;
+}
+
+function headerValue(headers, name) {
+  if (!headers) return "";
+  if (typeof headers.get === "function") return headers.get(name) ?? headers.get(name.toLowerCase()) ?? "";
+  const lowerName = name.toLowerCase();
+  for (const [key, value] of Object.entries(headers)) {
+    if (key.toLowerCase() === lowerName) return String(value ?? "");
+  }
+  return "";
+}