codex-copilot-dx 0.4.20 → 0.4.21

package/README.md

@@ -93,8 +93,8 @@ Environment variables:
 | `CCDX_UPSTREAM_RETRY_DELAY_MS` | `300` | Initial upstream retry backoff in milliseconds; capped at `5000` |
 | `CCDX_LOG_PATH` | unset | Mirror terminal logs to a file; set to `1` for `~/.local/share/codex-copilot-dx/debug.log` |
 | `CCDX_LOG_LEVEL` | `info` | Set to `debug` to include upstream request attempts, status codes, retry causes, and timings |
-| `CCDX_IMG_MAX_DIM` | `2048` | Max long edge in pixels for optional image downscaling |
-| `CCDX_IMG_QUALITY` | `85` | WebP quality used when optional image re-encoding is available |
+| `CCDX_IMG_MAX_DIM` | `2048` | Max long edge in pixels for image downscaling |
+| `CCDX_IMG_QUALITY` | `85` | WebP quality used when re-encoding images |
 | `CCDX_IMG_MIN_BYTES` | `100000` | Images smaller than this are left untouched |
 | `CCDX_IMG_CONCURRENCY` | `4` | Concurrent image optimization tasks; values above `12` are capped at `12` |
 | `CCDX_DISABLE_IMG_OPT` | unset | Set to `1` to disable image optimization |
@@ -127,7 +127,7 @@ codex-copilot-dx usage
 
 Long computer-use sessions can accumulate screenshots inside the conversation history. Each screenshot is shipped on later turns, and GitHub Copilot's `/responses` endpoint can reject oversized requests with `413 Payload Too Large`.
 
-When the optional `sharp` package is available, the adapter downsamples embedded screenshots to long-edge <= 2048 px and re-encodes them as WebP before forwarding `/v1/responses`. `sharp` is not installed by default so the CLI stays lightweight and avoids native package install stalls; install it alongside `codex-copilot-dx` if you want this optimization.
+The adapter automatically downsamples embedded screenshots to long-edge <= 2048 px and re-encodes them as WebP before forwarding `/v1/responses`.
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-copilot-dx",
-  "version": "0.4.20",
+  "version": "0.4.21",
   "description": "Use Codex Desktop, Claude Code, and Claude App with GitHub Copilot",
   "type": "module",
   "bin": {
@@ -27,5 +27,9 @@
   "license": "MIT",
   "scripts": {
     "test": "node --test"
+  },
+  "dependencies": {
+    "gpt-tokenizer": "^3.4.0",
+    "sharp": "^0.34.5"
   }
 }

package/src/anthropic.mjs

@@ -1,4 +1,5 @@
 import { randomUUID } from "node:crypto";
+import { encode } from "gpt-tokenizer";
 
 // Anthropic Messages API to OpenAI chat/completions translation.
 // Pure functions only; network calls stay in adapter.mjs and copilot.mjs.
@@ -237,19 +238,7 @@ export async function streamAnthropicFromLines(lineIterator, emit, model, option
   await emit("message_stop", { type: "message_stop" });
 }
 
-function estimateTokens(text) {
-  if (!text) return 0;
-  let asciiChars = 0;
-  let nonAsciiChars = 0;
-  for (const ch of text) {
-    if (/\s/.test(ch)) continue;
-    if (ch.codePointAt(0) <= 0x7f) asciiChars += 1;
-    else nonAsciiChars += 1;
-  }
-  return Math.max(1, Math.ceil(asciiChars / 4) + nonAsciiChars);
-}
-
-// Copilot has no count_tokens endpoint; estimate locally without install-time dependencies.
+// Copilot has no count_tokens endpoint; estimate locally with gpt-tokenizer.
 export function countTokens(body) {
   const parts = [];
   const sys = systemToText(body.system);
@@ -274,5 +263,5 @@ export function countTokens(body) {
   }
 
   const text = parts.join("\n");
-  return { input_tokens: estimateTokens(text) };
+  return { input_tokens: encode(text).length };
 }

package/src/copilot.mjs

@@ -21,8 +21,6 @@ const IMG_CONCURRENCY = parseImageConcurrency(process.env.CCDX_IMG_CONCURRENCY);
 const UPSTREAM_RETRIES = parseUpstreamRetries(process.env.CCDX_UPSTREAM_RETRIES);
 const UPSTREAM_RETRY_DELAY_MS = parseUpstreamRetryDelayMs(process.env.CCDX_UPSTREAM_RETRY_DELAY_MS);
 let sharpImport = null;
-let sharpUnavailable = false;
-let sharpUnavailableLogged = false;
 
 export function parseImageConcurrency(value) {
   const n = Number.parseInt(value, 10);
@@ -175,16 +173,9 @@ export async function fetchCopilotUpstream(
 }
 
 async function sharp() {
-  if (sharpUnavailable) return null;
-  try {
-    sharpImport ||= import("sharp");
-    const mod = await sharpImport;
-    return mod.default || mod;
-  } catch {
-    sharpUnavailable = true;
-    sharpImport = null;
-    return null;
-  }
+  sharpImport ||= import("sharp");
+  const mod = await sharpImport;
+  return mod.default || mod;
 }
 
 export async function optimizeImageDataUrl(dataUrl) {
@@ -198,13 +189,6 @@ export async function optimizeImageDataUrl(dataUrl) {
 
   try {
     const resize = await sharp();
-    if (!resize) {
-      if (!sharpUnavailableLogged) {
-        sharpUnavailableLogged = true;
-        console.warn(status("warn", "image optimization skipped because optional dependency sharp is not installed"));
-      }
-      return dataUrl;
-    }
     const out = await resize(raw, { failOn: "none" })
       .rotate()
       .resize(IMG_MAX_DIM, IMG_MAX_DIM, { fit: "inside", withoutEnlargement: true })