skalpel 2.0.17 → 2.0.19

package/dist/cli/index.js

@@ -4,6 +4,54 @@ var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
 
+// src/proxy/codex-oauth.ts
+import { readFileSync } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+function authFilePath() {
+  return join(homedir(), ".codex", "auth.json");
+}
+function readCodexAuth() {
+  const path17 = authFilePath();
+  let raw;
+  try {
+    raw = readFileSync(path17, "utf-8");
+  } catch (err) {
+    const code = err?.code;
+    if (code !== "ENOENT") {
+      process.stderr.write(`skalpel: codex-oauth: cannot read auth file (${code ?? "unknown"})
+`);
+    }
+    return null;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    process.stderr.write("skalpel: codex-oauth: auth file is not valid JSON\n");
+    return null;
+  }
+  if (parsed === null || typeof parsed !== "object" || typeof parsed.access_token !== "string" || typeof parsed.refresh_token !== "string" || typeof parsed.expires_at !== "string") {
+    process.stderr.write("skalpel: codex-oauth: auth file missing required fields\n");
+    return null;
+  }
+  const obj = parsed;
+  const auth = {
+    access_token: obj.access_token,
+    refresh_token: obj.refresh_token,
+    expires_at: obj.expires_at
+  };
+  if (typeof obj.account_id === "string") {
+    auth.account_id = obj.account_id;
+  }
+  return auth;
+}
+var init_codex_oauth = __esm({
+  "src/proxy/codex-oauth.ts"() {
+    "use strict";
+  }
+});
+
 // src/proxy/dispatcher.ts
 import { Agent } from "undici";
 var skalpelDispatcher;
@@ -85,10 +133,19 @@ var init_streaming = __esm({
 
 // src/proxy/ws-client.ts
 import { EventEmitter } from "events";
+import https from "https";
+import http from "http";
 import WebSocket2 from "ws";
+var H1_HTTPS_AGENT, H1_HTTP_AGENT;
 var init_ws_client = __esm({
   "src/proxy/ws-client.ts"() {
     "use strict";
+    init_codex_oauth();
+    H1_HTTPS_AGENT = new https.Agent({
+      ALPNProtocols: ["http/1.1"],
+      keepAlive: true
+    });
+    H1_HTTP_AGENT = new http.Agent({ keepAlive: true });
   }
 });
 
@@ -100,6 +157,7 @@ var init_handler = __esm({
     init_dispatcher();
     init_envelope();
     init_ws_client();
+    init_codex_oauth();
     init_recovery();
     init_fetch_error();
   }
@@ -115,6 +173,7 @@ import * as fs2 from "fs";
 import * as path2 from "path";
 
 // src/cli/utils.ts
+init_codex_oauth();
 import * as fs from "fs";
 import * as path from "path";
 function detectProjectType() {
@@ -157,6 +216,25 @@ function detectAiSdks(projectType) {
 function validateApiKey(key) {
   return key.startsWith("sk-skalpel-") && key.length >= 20;
 }
+function validateCodexOAuth() {
+  try {
+    const auth = readCodexAuth();
+    if (auth !== null) {
+      return { present: true };
+    }
+  } catch (err) {
+    return { present: false, reason: `other: ${err.message}` };
+  }
+  const candidatePath = path.join(
+    process.env.HOME ?? process.env.USERPROFILE ?? "",
+    ".codex",
+    "auth.json"
+  );
+  if (!fs.existsSync(candidatePath)) {
+    return { present: false, reason: "file missing" };
+  }
+  return { present: false, reason: "malformed JSON" };
+}
 function generateCodeSample(config) {
   if (config.integrationMethod === "wrapper") {
     if (config.providers.includes("openai")) {
@@ -1525,6 +1603,12 @@ function configureCodex(agent, proxyConfig, direct = false) {
     content = removeCodexDirectProvider(content);
   }
   fs9.writeFileSync(configPath, content);
+  const oauth = validateCodexOAuth();
+  if (!oauth.present) {
+    process.stderr.write("OAuth not configured. Run: codex login\n");
+    process.stderr.write("   Then re-run: skalpel configure\n");
+    process.stderr.write("   (Skalpel will fall back to OPENAI_API_KEY env var if OAuth missing.)\n");
+  }
 }
 function getCursorConfigDir() {
   if (process.platform === "darwin") {
@@ -1817,7 +1901,7 @@ import { execSync as execSync5 } from "child_process";
 
 // src/proxy/server.ts
 init_handler();
-import http from "http";
+import http2 from "http";
 
 // src/proxy/logger.ts
 import fs11 from "fs";
@@ -1833,6 +1917,7 @@ var wss = new WebSocketServer({
 });
 
 // src/proxy/server.ts
+init_codex_oauth();
 var proxyStartTime = 0;
 function stopProxy(config) {
   const pid = readPid(config.pidFile);
@@ -2240,10 +2325,13 @@ async function runWizard(options) {
       }
       print11("");
       const codexConfigured = agentsToConfigure.some((a) => a.name === "codex");
-      if (codexConfigured && !process.env.OPENAI_API_KEY) {
-        print11("  [!] Codex expects OPENAI_API_KEY to be set. The Skalpel proxy ignores the value,");
-        print11("      so any non-empty string works, e.g.:");
-        print11("        export OPENAI_API_KEY=sk-codex-placeholder-skalpel");
+      if (codexConfigured) {
+        print11("  [!] Codex auth: recommended -> run 'codex login' first to enable ChatGPT plan billing.");
+        print11("         The OPENAI_API_KEY env var (placeholder OK) is still required for Codex startup");
+        print11("         but is ignored by Skalpel when OAuth is present.");
+        if (!process.env.OPENAI_API_KEY) {
+          print11("         example:  export OPENAI_API_KEY=sk-codex-placeholder-skalpel");
+        }
         print11("");
       }
     }
@@ -2462,7 +2550,7 @@ function clearNpxCache() {
 }
 
 // src/cli/auth/callback-server.ts
-import * as http2 from "http";
+import * as http3 from "http";
 import * as net2 from "net";
 
 // src/cli/auth/session-storage.ts
@@ -2591,7 +2679,7 @@ async function startCallbackServer(port, timeoutMsOrOptions = DEFAULT_TIMEOUT_MS
   return new Promise((resolve2, reject) => {
     let settled = false;
     let timer;
-    const server = http2.createServer((req, res) => {
+    const server = http3.createServer((req, res) => {
       const origin = req.headers.origin;
       const corsHeaders = buildCorsHeaders(origin);
       if (req.method === "OPTIONS") {