skalpel 2.0.13 → 2.0.14

package/dist/cli/index.js

@@ -319,6 +319,69 @@ function detectAgents() {
 function print2(msg) {
   console.log(msg);
 }
+function codexConfigPath() {
+  return process.platform === "win32" ? path4.join(os2.homedir(), "AppData", "Roaming", "codex", "config.toml") : path4.join(os2.homedir(), ".codex", "config.toml");
+}
+function checkCodexConfig(config) {
+  const cfgPath = codexConfigPath();
+  if (!fs4.existsSync(cfgPath)) {
+    return {
+      name: "Codex config",
+      status: "warn",
+      message: `${cfgPath} not found \u2014 run "npx skalpel" to configure Codex`
+    };
+  }
+  let content = "";
+  try {
+    content = fs4.readFileSync(cfgPath, "utf-8");
+  } catch {
+    return {
+      name: "Codex config",
+      status: "warn",
+      message: `cannot read ${cfgPath}`
+    };
+  }
+  const requiredLines = [
+    `openai_base_url = "http://localhost:${config.openaiPort}"`,
+    `model_provider = "skalpel-proxy"`,
+    `[model_providers.skalpel-proxy]`,
+    `wire_api = "responses"`,
+    `base_url = "http://localhost:${config.openaiPort}/v1"`
+  ];
+  const missing = requiredLines.filter((line) => !content.includes(line));
+  if (missing.length === 0) {
+    return {
+      name: "Codex config",
+      status: "ok",
+      message: `skalpel-proxy provider pinned (wire_api=responses) on port ${config.openaiPort}`
+    };
+  }
+  return {
+    name: "Codex config",
+    status: "fail",
+    message: `missing TOML: ${missing.map((m) => m.split("\n")[0]).join("; ")}`
+  };
+}
+async function checkCodexProxyProbe(config) {
+  const url = `http://localhost:${config.openaiPort}/v1/responses`;
+  try {
+    const res = await fetch(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/json", Authorization: "Bearer sk-codex-placeholder-skalpel" },
+      body: JSON.stringify({ model: "gpt-5-codex", input: "ping", stream: false }),
+      signal: AbortSignal.timeout(5e3)
+    });
+    if (res.status === 405) {
+      return { name: "Codex proxy probe", status: "error", message: "backend rejected POST \u2014 run the fix in docs/codex-integration-fix.md" };
+    }
+    if (res.status === 401 || res.status >= 200 && res.status < 300) {
+      return { name: "Codex proxy probe", status: "ok", message: `POST /v1/responses returned ${res.status}` };
+    }
+    return { name: "Codex proxy probe", status: "warn", message: `unexpected status ${res.status}` };
+  } catch {
+    return { name: "Codex proxy probe", status: "warn", message: "proxy not reachable (is it running?)" };
+  }
+}
 function loadConfigApiKey() {
   try {
     const configPath = path4.join(os2.homedir(), ".skalpel", "config.json");
@@ -436,12 +499,21 @@ async function runDoctor() {
       checks.push({ name: agent.name, status: "warn", message: "Not installed" });
     }
   }
-  const icons = { ok: "+", warn: "!", fail: "x" };
+  let openaiPort = 18101;
+  try {
+    const raw = JSON.parse(fs4.readFileSync(skalpelConfigPath, "utf-8"));
+    if (typeof raw.openaiPort === "number") openaiPort = raw.openaiPort;
+  } catch {
+  }
+  const config = { openaiPort };
+  checks.push(checkCodexConfig(config));
+  checks.push(await checkCodexProxyProbe(config));
+  const icons = { ok: "+", warn: "!", fail: "x", error: "x" };
   for (const check of checks) {
     const icon = icons[check.status];
     print2(`  [${icon}] ${check.name}: ${check.message}`);
   }
-  const failures = checks.filter((c) => c.status === "fail");
+  const failures = checks.filter((c) => c.status === "fail" || c.status === "error");
   const warnings = checks.filter((c) => c.status === "warn");
   print2("");
   if (failures.length > 0) {
@@ -1305,6 +1377,7 @@ import os7 from "os";
 var CURSOR_API_BASE_URL_KEY = "openai.apiBaseUrl";
 var DIRECT_MODE_BASE_URL = "https://api.skalpel.ai";
 var CODEX_DIRECT_PROVIDER_ID = "skalpel";
+var CODEX_PROXY_PROVIDER_ID = "skalpel-proxy";
 function ensureDir(dir) {
   fs11.mkdirSync(dir, { recursive: true });
 }
@@ -1396,6 +1469,39 @@ function removeCodexDirectProvider(content) {
   const rest = content.slice(end).replace(/^\n+/, "");
   return before.length > 0 && rest.length > 0 ? before + "\n" + rest : before + rest;
 }
+function buildCodexProxyProviderBlock(port) {
+  return [
+    `[model_providers.skalpel-proxy]`,
+    `name = "Skalpel Proxy"`,
+    `base_url = "http://localhost:${port}/v1"`,
+    `wire_api = "responses"`,
+    `env_key = "OPENAI_API_KEY"`
+  ].join("\n");
+}
+function upsertCodexProxyProvider(content, port) {
+  const sectionHeader = `[model_providers.${CODEX_PROXY_PROVIDER_ID}]`;
+  const block = buildCodexProxyProviderBlock(port);
+  const idx = content.indexOf(sectionHeader);
+  if (idx === -1) {
+    const separator = content.length > 0 && !content.endsWith("\n") ? "\n\n" : content.length > 0 ? "\n" : "";
+    return content + separator + block + "\n";
+  }
+  const after = content.slice(idx + sectionHeader.length);
+  const nextHeaderMatch = after.match(/\n\[[^\]]+\]/);
+  const end = nextHeaderMatch && nextHeaderMatch.index !== void 0 ? idx + sectionHeader.length + nextHeaderMatch.index : content.length;
+  return content.slice(0, idx) + block + content.slice(end);
+}
+function removeCodexProxyProvider(content) {
+  const sectionHeader = `[model_providers.${CODEX_PROXY_PROVIDER_ID}]`;
+  const idx = content.indexOf(sectionHeader);
+  if (idx === -1) return content;
+  const after = content.slice(idx + sectionHeader.length);
+  const nextHeaderMatch = after.match(/\n\[[^\]]+\]/);
+  const end = nextHeaderMatch && nextHeaderMatch.index !== void 0 ? idx + sectionHeader.length + nextHeaderMatch.index : content.length;
+  const before = content.slice(0, idx).replace(/\n+$/, "");
+  const rest = content.slice(end).replace(/^\n+/, "");
+  return before.length > 0 && rest.length > 0 ? before + "\n" + rest : before + rest;
+}
 function configureCodex(agent, proxyConfig, direct = false) {
   const configDir = process.platform === "win32" ? path12.join(os7.homedir(), "AppData", "Roaming", "codex") : path12.join(os7.homedir(), ".codex");
   const configPath = agent.configPath ?? path12.join(configDir, "config.toml");
@@ -1408,7 +1514,8 @@ function configureCodex(agent, proxyConfig, direct = false) {
     content = upsertCodexDirectProvider(content, proxyConfig.apiKey);
   } else {
     content = setTomlKey(content, "openai_base_url", `http://localhost:${proxyConfig.openaiPort}`);
-    content = removeTomlKey(content, "model_provider");
+    content = setTomlKey(content, "model_provider", CODEX_PROXY_PROVIDER_ID);
+    content = upsertCodexProxyProvider(content, proxyConfig.openaiPort);
     content = removeCodexDirectProvider(content);
   }
   fs11.writeFileSync(configPath, content);
@@ -1482,6 +1589,7 @@ function unconfigureCodex(agent) {
     content = removeTomlKey(content, "openai_base_url");
     content = removeTomlKey(content, "model_provider");
     content = removeCodexDirectProvider(content);
+    content = removeCodexProxyProvider(content);
     fs11.writeFileSync(configPath, content);
   }
   const backupPath = `${configPath}.skalpel-backup`;
@@ -1901,6 +2009,13 @@ async function runWizard(options) {
         print11(`  Configured ${agent.name}${agent.configPath ? ` (${agent.configPath})` : ""}`);
       }
       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");
+        print11("");
+      }
     }
     print11("  Installing proxy as system service...");
     try {