skalpel 2.0.18 → 2.0.20

package/dist/cli/index.js

@@ -133,11 +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 });
   }
 });
 
@@ -1713,6 +1721,7 @@ function unconfigureAgent(agent) {
 import fs10 from "fs";
 import path11 from "path";
 import os8 from "os";
+import crypto from "crypto";
 var BEGIN_MARKER = "# BEGIN SKALPEL PROXY - do not edit manually";
 var END_MARKER = "# END SKALPEL PROXY";
 var PS_BEGIN_MARKER = "# BEGIN SKALPEL PROXY - do not edit manually";
@@ -1737,11 +1746,18 @@ function getPowerShellProfilePath() {
   if (fs10.existsSync(wpProfile)) return wpProfile;
   return psProfile;
 }
+function randomPlaceholder() {
+  return `sk-codex-skalpel-${crypto.randomBytes(8).toString("hex")}`;
+}
 function generateUnixBlock(proxyConfig) {
   return [
     BEGIN_MARKER,
     `export ANTHROPIC_BASE_URL="http://localhost:${proxyConfig.anthropicPort}"`,
     `export OPENAI_BASE_URL="http://localhost:${proxyConfig.openaiPort}"`,
+    // `:-` only evaluates the default when OPENAI_API_KEY is unset or empty,
+    // so a user-provided key always wins. Bash, zsh, and POSIX sh all
+    // support this syntax.
+    `export OPENAI_API_KEY="\${OPENAI_API_KEY:-${randomPlaceholder()}}"`,
     END_MARKER
   ].join("\n");
 }
@@ -1750,6 +1766,9 @@ function generatePowerShellBlock(proxyConfig) {
     PS_BEGIN_MARKER,
     `$env:ANTHROPIC_BASE_URL = "http://localhost:${proxyConfig.anthropicPort}"`,
     `$env:OPENAI_BASE_URL = "http://localhost:${proxyConfig.openaiPort}"`,
+    // Conditional assignment — only set when the user hasn't already
+    // exported OPENAI_API_KEY in their session or parent profile.
+    `if (-not $env:OPENAI_API_KEY) { $env:OPENAI_API_KEY = "${randomPlaceholder()}" }`,
     PS_END_MARKER
   ].join("\n");
 }
@@ -1893,7 +1912,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";
@@ -2318,12 +2337,10 @@ async function runWizard(options) {
       print11("");
       const codexConfigured = agentsToConfigure.some((a) => a.name === "codex");
       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("  [!] Codex auth: recommended -> run 'codex login' to enable ChatGPT plan billing.");
+        print11("         Without OAuth, Skalpel uses the OPENAI_API_KEY env var; if not already set,");
+        print11("         Skalpel exports a placeholder so Codex starts. A real sk-... key is only");
+        print11("         needed if you have no ChatGPT plan and want pay-as-you-go API billing.");
         print11("");
       }
     }
@@ -2542,7 +2559,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
@@ -2671,7 +2688,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") {