codex-copilot-dx 0.4.42 → 0.4.44

package/src/copilot.mjs

@@ -17,7 +17,10 @@ import {
   githubTokenFingerprint,
   normalizeGithubIdentity,
 } from "./github-identity.mjs";
-import { prepareResponsesPayload } from "./image-optimization.mjs";
+import { prepareResponsesPayload, summarizeReqBody } from "./image-optimization.mjs";
+import { enforceResponsesPayloadByteBudget } from "./responses-byte-budget.mjs";
+import { withChatStreamUsage } from "./stream-contract.mjs";
+import { markUpstreamStarted } from "./stream-performance.mjs";
 
 export {
   optimizeImageDataUrl,
@@ -316,7 +319,7 @@ export function copilotRuntimeStatus(now = Date.now()) {
 function getGithubToken({ home = os.homedir() } = {}) {
   const GITHUB_TOKEN_PATH = githubTokenPath(home);
   if (!fs.existsSync(GITHUB_TOKEN_PATH)) {
-    throw new Error("GitHub token not found. Run codex-copilot-dx again to log in.");
+    throw new Error("GitHub token not found. Run ccdx again to log in.");
   }
   const token = fs.readFileSync(GITHUB_TOKEN_PATH, "utf-8").trim();
   if (!token) throw new Error(githubReauthMessage("GitHub token file is empty."));
@@ -342,7 +345,7 @@ function cacheCopilotTokenData(data, {
   const tokenChanged = Boolean(copilotTokenGithubFingerprint && fingerprint !== copilotTokenGithubFingerprint);
   if (!allowAccountSwitch && copilotTokenGithubIdentity && identity
     && !githubIdentitiesEqual(copilotTokenGithubIdentity, identity)) {
-    throw new Error(`Refusing to switch GitHub Copilot account from ${githubIdentityLabel(copilotTokenGithubIdentity)} to ${githubIdentityLabel(identity)} while the adapter is running. Restart codex-copilot-dx to switch accounts intentionally.`);
+    throw new Error(`Refusing to switch GitHub Copilot account from ${githubIdentityLabel(copilotTokenGithubIdentity)} to ${githubIdentityLabel(identity)} while the adapter is running. Restart ccdx to switch accounts intentionally.`);
   }
   if (!allowAccountSwitch && copilotTokenGithubIdentity && tokenChanged && !identity) {
     const error = new Error("The saved GitHub token changed, but its account could not be verified. Keeping the running adapter bound to the existing GitHub account.");
@@ -500,19 +503,30 @@ export function resetCopilotTokenForTests() {
 }
 
 // chatReq is already converted by the adapter. The caller parses the raw Response.
-export async function chatCompletions(chatReq, { signal, fetchImpl, retryOptions } = {}) {
+export async function chatCompletions(chatReq, {
+  signal,
+  fetchImpl,
+  retryOptions,
+  bodyText,
+} = {}) {
   const token = await getCopilotToken({ signal });
-  const messages = chatReq.messages || [];
+  const upstreamReq = chatReq.stream === true ? withChatStreamUsage(chatReq) : chatReq;
+  const messages = upstreamReq.messages || [];
+  const serializedBody = typeof bodyText === "string" && upstreamReq === chatReq
+    ? bodyText
+    : JSON.stringify(upstreamReq);
   const headers = buildHeaders({
     token,
     version: getVSCodeVersion(),
     initiator: computeInitiator(messages),
     vision: computeVision(messages),
   });
+  headers["Content-Length"] = String(Buffer.byteLength(serializedBody));
+  if (upstreamReq.stream === true) markUpstreamStarted();
   return fetchCopilotUpstream(`${getApiBase()}/chat/completions`, {
     method: "POST",
     headers,
-    body: JSON.stringify(chatReq),
+    body: serializedBody,
     signal,
   }, { fetchImpl, ...retryOptions });
 }
@@ -582,10 +596,29 @@ export function resetModelListSingleflightForTests() {
 }
 
 // Responses-only models go directly to Copilot's /responses endpoint.
-export async function responses(reqBody, { signal, fetchImpl, retryOptions } = {}) {
+export async function responses(reqBody, {
+  signal,
+  fetchImpl,
+  retryOptions,
+  currentInputStart = 0,
+  payloadPrepared = false,
+  payloadOptions = {},
+} = {}) {
   const token = await getCopilotToken({ signal });
-  const { bodyText, bodyBytes, summary } = await prepareResponsesPayload(reqBody, { signal });
+  const preparedPayload = await prepareResponsesPayload(reqBody, {
+    ...payloadOptions,
+    currentInputStart,
+    profiles: payloadPrepared ? [] : payloadOptions.profiles,
+    skipInitialOptimization: payloadPrepared || payloadOptions.skipInitialOptimization,
+    signal,
+  });
+  const finalizedPayload = enforceResponsesPayloadByteBudget(reqBody, preparedPayload);
+  const { bodyText, bodyBytes, stage, adapted } = finalizedPayload;
+  const summary = finalizedPayload.stage === preparedPayload.stage
+    ? preparedPayload.summary
+    : summarizeReqBody(reqBody);
   console.log(status("info", `responses payload bytes=${bodyBytes} input_items=${summary.items} images=${summary.images}`));
+  if (adapted) debugLog(`responses payload adapted stage=${stage} bytes=${bodyBytes}/${preparedPayload.targetBytes}`);
   const headers = buildHeaders({
     token,
     version: getVSCodeVersion(),
@@ -597,6 +630,7 @@ export async function responses(reqBody, { signal, fetchImpl, retryOptions } = {
   headers["Accept"] = reqBody.stream ? "text/event-stream" : "application/json";
 
   try {
+    if (reqBody.stream === true) markUpstreamStarted();
     return await fetchCopilotUpstream(`${getApiBase()}${responsesEndpointPath()}`, {
       method: "POST",
       headers,

package/src/doctor.mjs

@@ -124,6 +124,15 @@ function parseResponseObject(text) {
   return response;
 }
 
+function parseCompactionResponse(text) {
+  const response = parseResponseObject(text);
+  if (response.object !== "response.compaction"
+    || !response.output.some((item) => item?.type === "compaction")) {
+    throw new Error("response body is missing valid compaction state");
+  }
+  return response;
+}
+
 export async function inspectAdapterCompatibility({
   host = "127.0.0.1",
   port = 2026,
@@ -184,7 +193,7 @@ export async function inspectAdapterCompatibility({
       stream: false,
       input: "Compact this short context.",
     }, timeoutMs);
-    parseResponseObject(text);
+    parseCompactionResponse(text);
   });
 
   if (!claudeModel) {
@@ -446,7 +455,7 @@ export async function collectDoctorChecks({
 export async function runDoctor(options = {}) {
   const log = options.log || console.log;
   const flags = [options.online ? "--online" : "", options.compat ? "--compat" : ""].filter(Boolean);
-  log(`codex-copilot-dx doctor${flags.length ? ` ${flags.join(" ")}` : ""}`);
+  log(`ccdx doctor${flags.length ? ` ${flags.join(" ")}` : ""}`);
   const checks = await collectDoctorChecks(options);
   for (const check of checks) log(status(check.kind, check.message));
   return checks;

package/src/http-transport.mjs

@@ -2,6 +2,7 @@ import { promisify } from "node:util";
 import * as zlib from "node:zlib";
 import { loadRuntimeConfig, parsePositiveInteger } from "./runtime-config.mjs";
 import { status } from "./status.mjs";
+import { safeUpstreamResponseHeaders } from "./upstream-headers.mjs";
 
 const COMPRESSED_BODY_WEIGHT_MULTIPLIER = 4;
 const gunzipAsync = promisify(zlib.gunzip);
@@ -291,12 +292,14 @@ export function sendJsonError(res, err, fallbackStatus = 400) {
     return;
   }
   res.writeHead(err?.statusCode || fallbackStatus, { "Content-Type": "application/json" });
-  res.end(JSON.stringify({ error: err?.message || "Request failed" }));
+  res.end(JSON.stringify(err?.jsonBody || { error: err?.message || "Request failed" }));
 }
 
 export function sendUpstreamError(res, response, text) {
   if (!res.headersSent) {
-    res.writeHead(response.status || 502, { "Content-Type": response.headers?.get("content-type") || "application/json" });
+    res.writeHead(response.status || 502, safeUpstreamResponseHeaders(response.headers, {
+      defaultContentType: "application/json",
+    }));
   }
   res.end(text || JSON.stringify({ error: "Upstream request failed" }));
 }