pennyrouter 0.2.33 → 0.2.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pennyrouter",
-  "version": "0.2.33",
+  "version": "0.2.35",
   "description": "Install and manage PennyRouter local coding-agent integrations.",
   "homepage": "https://pennyrouter.com",
   "bugs": {

package/src/cli.js

@@ -78,6 +78,7 @@ const CLAUDE_PROVIDER_OPTIONS = [
 const CODEX_PROVIDER_OPTIONS = [
   { id: "subscription", name: "ChatGPT subscription" },
   { id: "openai-api", name: "OpenAI API key" },
+  { id: "openai-proxy", name: "Other OpenAI-compatible proxy" },
   { id: "openrouter", name: "OpenRouter API key" },
 ];
 
@@ -171,6 +172,10 @@ function parseArgs(argv) {
     else if (arg === "--openai-api-key") flags.openaiApiKey = rest[++i] || "";
     else if (arg.startsWith("--openai-api-key=")) flags.openaiApiKey = arg.slice("--openai-api-key=".length);
     else if (arg === "--openrouter-api-key") flags.openrouterApiKey = rest[++i] || "";
+    else if (arg === "--openai-proxy-base-url") flags.openaiProxyBaseUrl = rest[++i] || "";
+    else if (arg.startsWith("--openai-proxy-base-url=")) flags.openaiProxyBaseUrl = arg.slice("--openai-proxy-base-url=".length);
+    else if (arg === "--openai-proxy-api-key") flags.openaiProxyApiKey = rest[++i] || "";
+    else if (arg.startsWith("--openai-proxy-api-key=")) flags.openaiProxyApiKey = arg.slice("--openai-proxy-api-key=".length);
     else if (arg === "--proxy-base-url") flags.proxyBaseUrl = rest[++i] || "";
     else if (arg.startsWith("--proxy-base-url=")) flags.proxyBaseUrl = arg.slice("--proxy-base-url=".length);
     else if (arg === "--proxy-api-key") flags.proxyApiKey = rest[++i] || "";
@@ -593,6 +598,19 @@ export async function install(flags = {}) {
       flags, needsAuth, claudeAnthropicAuth, claudeProviders, codexProviders);
     gatewayBaseUrl = flags.gatewayBaseUrl || claim.gateway_base_url;
 
+    // A user-supplied proxy may live on a private network that the hosted gateway cannot
+    // reach. Let interactive installs choose the gateway after they choose the proxy: blank
+    // keeps the hosted default, while a supplied URL is used for credential storage,
+    // validation, probing, and the installed harness configuration. `--local` remains the
+    // explicit localhost:8400 developer shortcut and skips this prompt.
+    if ((claudeProviders.has("anthropic-proxy") || codexProviders.has("openai-proxy")) && !flags.gatewayBaseUrl
+        && !flags.yes && input.isTTY && output.isTTY) {
+      const privateGateway = (await promptText(
+        "PennyRouter gateway URL for this proxy (blank for hosted gateway): ",
+      )).trim();
+      if (privateGateway) gatewayBaseUrl = privateGateway;
+    }
+
     for (const credential of funding.credentials) {
       await storeUpstreamCredential({
         gatewayBaseUrl,
@@ -1107,14 +1125,16 @@ async function selectCodexFundingProviders(flags, selected) {
 
   const supplied = new Set();
   if (flags.openaiApiKey || process.env.OPENAI_API_KEY) supplied.add("openai-api");
+  if ((flags.openaiProxyBaseUrl || process.env.PENNYROUTER_OPENAI_PROXY_BASE_URL)
+      && (flags.openaiProxyApiKey || process.env.PENNYROUTER_OPENAI_PROXY_API_KEY)) supplied.add("openai-proxy");
   if (flags.openrouterApiKey || process.env.OPENROUTER_API_KEY) supplied.add("openrouter");
   const hasChatgptLogin = await detectCodexChatgptAuth();
   if (hasChatgptLogin) supplied.add("subscription");
 
-  const explicit = flags.openaiApiKey || flags.openrouterApiKey;
+  const explicit = flags.openaiApiKey || flags.openaiProxyBaseUrl || flags.openaiProxyApiKey || flags.openrouterApiKey;
   if (explicit || flags.yes || !input.isTTY || !output.isTTY) return supplied;
 
-  console.log("PennyRouter can use your ChatGPT subscription, an OpenAI API key, or an OpenRouter API key to run Codex.");
+  console.log("PennyRouter can use your ChatGPT subscription, an OpenAI API key, an OpenAI-compatible proxy, or an OpenRouter API key to run Codex.");
   console.log("Choose one or more providers. PennyRouter will try them in order when available.");
   return promptFundingProviderCheckboxes(
     CODEX_PROVIDER_OPTIONS,
@@ -1196,6 +1216,12 @@ async function configureUserFunding(flags, selected, claudeAnthropicAuth,
   let openrouterApiKey = String(
     flags.openrouterApiKey || process.env.OPENROUTER_API_KEY || "",
   ).trim();
+  let openaiProxyBaseUrl = String(
+    flags.openaiProxyBaseUrl || process.env.PENNYROUTER_OPENAI_PROXY_BASE_URL || "",
+  ).trim();
+  let openaiProxyApiKey = String(
+    flags.openaiProxyApiKey || process.env.PENNYROUTER_OPENAI_PROXY_API_KEY || "",
+  ).trim();
   let proxyBaseUrl = String(
     flags.proxyBaseUrl || process.env.PENNYROUTER_PROXY_BASE_URL || "",
   ).trim();
@@ -1236,6 +1262,12 @@ async function configureUserFunding(flags, selected, claudeAnthropicAuth,
     if (!interactive) throw new Error("OpenAI API was selected, but no key was provided.");
     openaiApiKey = (await promptSecretish("OpenAI API key: ")).trim();
   }
+  if (wantsCodex && codexProviders.has("openai-proxy") && !(openaiProxyBaseUrl && openaiProxyApiKey)) {
+    if (!interactive) throw new Error("OpenAI-compatible proxy was selected, but --openai-proxy-base-url and --openai-proxy-api-key were not both provided.");
+    if (!openaiProxyBaseUrl) openaiProxyBaseUrl = await promptText("OpenAI proxy base URL (e.g. https://proxy.example.com/v1): ");
+    if (!openaiProxyApiKey) openaiProxyApiKey = (await promptSecretish("OpenAI proxy API key: ")).trim();
+    if (!openaiProxyBaseUrl || !openaiProxyApiKey) throw new Error("OpenAI-compatible proxy requires both a base URL and an API key.");
+  }
   if (wantsCodex && codexProviders.has("openrouter") && !openrouterApiKey) {
     if (!interactive) throw new Error("OpenRouter was selected, but no key was provided.");
     openrouterApiKey = (await promptSecretish("OpenRouter API key: ")).trim();
@@ -1263,11 +1295,11 @@ async function configureUserFunding(flags, selected, claudeAnthropicAuth,
     console.log("");
   }
 
-  if (wantsCodex && !codexSubscriptionAuth && !openaiApiKey && !openrouterApiKey) {
+  if (wantsCodex && !codexSubscriptionAuth && !openaiApiKey && !openaiProxyApiKey && !openrouterApiKey) {
     if (!interactive) {
       throw new Error(
         "Codex requires ChatGPT login, --openai-api-key (or OPENAI_API_KEY), "
-        + "or --openrouter-api-key (or OPENROUTER_API_KEY). Nothing was installed.",
+        + "--openai-proxy-api-key (with --openai-proxy-base-url), or --openrouter-api-key (or OPENROUTER_API_KEY). Nothing was installed.",
       );
     }
     console.log("Codex is not logged into ChatGPT and needs a user-funded provider.");
@@ -1293,6 +1325,10 @@ async function configureUserFunding(flags, selected, claudeAnthropicAuth,
   if (wantsCodex && openaiApiKey) {
     credentials.push({ provider: "openai_api", token: openaiApiKey });
   }
+  if (wantsCodex && openaiProxyBaseUrl && openaiProxyApiKey) {
+    credentials.push({ provider: "openai_proxy", token: openaiProxyApiKey,
+      metadata: { base_url: openaiProxyBaseUrl } });
+  }
   if ((wantsClaude || wantsCodex) && openrouterApiKey) {
     credentials.push({ provider: "openrouter", token: openrouterApiKey });
   }
@@ -1315,7 +1351,7 @@ async function configureUserFunding(flags, selected, claudeAnthropicAuth,
     claudeProxyBaseUrl: claudeProxyConfigured ? proxyBaseUrl : null,
     codexCredentialProvider: codexSubscriptionAuth
       ? "chatgpt-subscription"
-      : openaiApiKey ? "openai-api" : openrouterApiKey ? "openrouter" : null,
+      : openaiApiKey ? "openai-api" : openaiProxyBaseUrl ? "openai-proxy" : openrouterApiKey ? "openrouter" : null,
   };
 }
 
@@ -2031,7 +2067,7 @@ function printHelp() {
   console.log(`PennyRouter CLI
 
 Usage:
-  pennyrouter install [--harness ${SUPPORTED_HARNESS_IDS}] [--all] [--yes] [--dry-run] [--make-default|--penny-only] [--no-path-update] [--no-mcp] [--anthropic-auth|--no-anthropic-auth] [--anthropic-api-key KEY] [--openai-api-key KEY] [--openrouter-api-key KEY] [--proxy-base-url URL --proxy-api-key KEY] [--local[=URL]|--prod] [--config PATH]
+  pennyrouter install [--harness ${SUPPORTED_HARNESS_IDS}] [--all] [--yes] [--dry-run] [--make-default|--penny-only] [--no-path-update] [--no-mcp] [--anthropic-auth|--no-anthropic-auth] [--anthropic-api-key KEY] [--openai-api-key KEY] [--openai-proxy-base-url URL --openai-proxy-api-key KEY] [--openrouter-api-key KEY] [--proxy-base-url URL --proxy-api-key KEY] [--local[=URL]|--prod] [--config PATH]
   pennyrouter update [--harness ${SUPPORTED_HARNESS_IDS}] [--all] [--dry-run] [--penny-key pr-...] [--gateway-base-url URL|--local[=URL]|--prod] [--no-mcp]
   pennyrouter auth anthropic [--penny-key pr-...] [--token oauth-token] [--token-command CMD] [--gateway-base-url URL] [--forget]
   pennyrouter disable [--harness ${SUPPORTED_HARNESS_IDS}] [--all] [--yes]
@@ -2040,6 +2076,10 @@ Usage:
   pennyrouter status
   pennyrouter mcp install|uninstall|status [--harness claude-code,codex]
 
+When an interactive install selects an Anthropic or OpenAI-compatible proxy, it asks for the PennyRouter gateway
+that can reach that proxy. Leave it blank for the hosted gateway, or enter a private/self-hosted
+gateway URL. Use --gateway-base-url (or --local for localhost:8400 development) for non-interactive installs.
+
 Install and update both register the Threads MCP server with Claude Code and Codex (--no-mcp to
 skip a run). Run "pennyrouter mcp install" if you skipped it or had to rename a conflicting
 server, "pennyrouter mcp status" to see whether it is wired up, and "pennyrouter mcp uninstall"