pennyrouter 0.3.20 → 0.3.22

package/package.json

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

package/src/cli.js

@@ -209,7 +209,7 @@ async function profiles(flags) {
   console.log("Switch with: pennyrouter profiles <name>   (or penny claude --penny-profile <name>)");
 }
 
-function parseArgs(argv) {
+export function parseArgs(argv) {
   const command = argv[0] && !argv[0].startsWith("-") ? argv[0] : "install";
   const rest = command === argv[0] ? argv.slice(1) : argv;
   const flags = {};
@@ -260,6 +260,8 @@ function parseArgs(argv) {
     // clobbering the cloud credentials that `penny claude` uses by default.
     else if (arg === "--profile") flags.profile = rest[++i] || "";
     else if (arg.startsWith("--profile=")) flags.profile = arg.slice("--profile=".length);
+    else if (arg === "--private") flags.profile = "private";
+    else if (arg === "--cloud") flags.profile = "cloud";
     else if (arg === "--harness") flags.harness = rest[++i] || "";
     else if (arg.startsWith("--harness=")) flags.harness = arg.slice("--harness=".length);
     // --private-gateway [url]: install against a self-hosted gateway. Unlike
@@ -320,9 +322,12 @@ function parseArgs(argv) {
 
   if (flags.configPath) applyConfigFile(flags);
 
-  // A self-hosted gateway is a distinct identity with its own key store, so give it its own
-  // profile unless one was named. Hosted installs keep the default profile.
-  if (!flags.profile) flags.profile = flags.privateGateway ? "private" : DEFAULT_PROFILE;
+  // Install chooses a destination profile when none was named: hosted installs go to cloud,
+  // while self-hosted installs go to private. Operational commands such as update and auth
+  // should instead leave the profile unset so loadPennyConfig() resolves active_profile.
+  if (!flags.profile && command === "install") {
+    flags.profile = flags.privateGateway ? "private" : DEFAULT_PROFILE;
+  }
 
   return { command, flags };
 }
@@ -925,10 +930,11 @@ export async function install(flags = {}) {
         record.launch_available = true;
         const launchConfigPath = harness.id === "claude-code"
           ? claudeLaunchSettingsPath()
-          : harness.id === "codex" ? codexLaunchProfilePath() : null;
+          : harness.id === "codex" ? codexLaunchProfilePath(flags.profile) : null;
         record.launch_config_path = launchConfigPath ? compactHome(launchConfigPath) : null;
         record.default_routing = Boolean(makeDefault);
       }
+      record.profile = flags.profile;
       if (harness.id === "claude-code" && claudeSubscriptionAuth) {
         record.anthropic_oauth = true;
         record.anthropic_token_stored = true;
@@ -1256,6 +1262,12 @@ async function update(flags) {
     if (record.disabled) return false;
     if (flags.all || requested.length === 0) return true;
     return requested.includes(record.harness);
+  }).filter((record) => {
+    if (!flags.profile) return true;
+    const recordProfile = record.profile || profileFromManifestRecord(record);
+    // Records written before profile ownership was added have no reliable Claude profile
+    // marker, so leave them eligible for an explicit profile as a compatibility fallback.
+    return !recordProfile || recordProfile === flags.profile;
   });
 
   if (records.length === 0) {
@@ -1266,25 +1278,32 @@ async function update(flags) {
     return;
   }
 
-  const launchConfig = await loadPennyConfig({ profile: flags.profile });
-  const globalAuth = await readClaudeCodeGatewayAuth();
-  const apiKey = flags.pennyKey || launchConfig.api_key || globalAuth.apiKey;
-  const gatewayBaseUrl = flags.gatewayBaseUrl
-    || launchConfig.gateway_base_url
-    || globalAuth.gatewayBaseUrl
-    || process.env.PENNYROUTER_GATEWAY_BASE_URL
-    || DEFAULT_GATEWAY_BASE_URL;
-
-  if (!apiKey) {
-    throw new Error(
-      "Could not find your PennyRouter key in the local config. Pass `--penny-key pr-...`, "
-      + "or run `npx pennyrouter install` to re-authorize.",
-    );
+  const updateContexts = new Map();
+  for (const record of targets) {
+    const profile = record.profile || profileFromManifestRecord(record) || flags.profile;
+    const launchConfig = await loadPennyConfig({ profile });
+    const globalAuth = await readClaudeCodeGatewayAuth();
+    const apiKey = flags.pennyKey || launchConfig.api_key || globalAuth.apiKey;
+    const gatewayBaseUrl = flags.gatewayBaseUrl
+      || launchConfig.gateway_base_url
+      || globalAuth.gatewayBaseUrl
+      || process.env.PENNYROUTER_GATEWAY_BASE_URL
+      || DEFAULT_GATEWAY_BASE_URL;
+    if (!apiKey) {
+      const suffix = profile ? ` for profile "${profile}"` : "";
+      throw new Error(
+        `Could not find your PennyRouter key in the local config${suffix}. `
+        + "Pass `--penny-key pr-...`, or run `npx pennyrouter install` to re-authorize.",
+      );
+    }
+    updateContexts.set(record, { profile, apiKey, gatewayBaseUrl });
   }
 
   console.log("PennyRouter update");
   console.log("");
-  console.log(`Key ${maskKey(apiKey)} · gateway ${gatewayBaseUrl}`);
+  for (const { profile, apiKey, gatewayBaseUrl } of updateContexts.values()) {
+    console.log(`${profile ? `Profile ${profile} · ` : ""}Key ${maskKey(apiKey)} · gateway ${gatewayBaseUrl}`);
+  }
   console.log("Subscription and API keys are left untouched.");
   console.log("");
 
@@ -1307,6 +1326,7 @@ async function update(flags) {
   for (const record of targets) {
     const harness = HARNESS_BY_ID[record.harness];
     if (!harness) continue;
+    const { profile, apiKey, gatewayBaseUrl } = updateContexts.get(record);
 
     await runHarnessJob(failures, record.harness, "update", async () => {
       const supportsPennyCommand = LAUNCHABLE_HARNESS_IDS.includes(record.harness);
@@ -1333,7 +1353,7 @@ async function update(flags) {
             ? claudeSubscriptionAuth
             : codexSubscriptionAuth,
           models: record.harness === "claude-code" ? CLAUDE_CODE_MODELS : null,
-          profile: flags.profile,
+          profile,
         });
       }
 
@@ -1368,9 +1388,13 @@ async function update(flags) {
   // and `pennyrouter mcp uninstall` removes it for good.
   if (!flags.dryRun && !flags.noMcp) {
     const wanted = targets.filter((record) => MCP_HARNESS_IDS.includes(record.harness));
-    const results = await registerMcp(wanted.map((record) => record.harness), {
-      gatewayBaseUrl: customGatewayBaseUrl(gatewayBaseUrl),
-    });
+    const results = [];
+    for (const record of wanted) {
+      const context = updateContexts.get(record);
+      results.push(...await registerMcp([record.harness], {
+        gatewayBaseUrl: customGatewayBaseUrl(context.gatewayBaseUrl),
+      }));
+    }
     const added = results.filter((r) => r.changed).map((r) => HARNESS_BY_ID[r.harness]?.name);
     if (added.length) console.log(`Registered the Threads MCP server on ${added.join(" and ")}.`);
     for (const result of results.filter((r) => r.error)) {
@@ -2277,6 +2301,14 @@ function upsertManifestRecord(manifest, record) {
   manifest.installations.push(record);
 }
 
+// Older manifests predate profile ownership. Codex's per-profile launch filename gives us a
+// reliable migration signal; Claude's launch settings are shared, so it follows active_profile.
+function profileFromManifestRecord(record) {
+  const launchPath = String(record.launch_config_path || "");
+  const match = launchPath.match(/pennyrouter-([^/\\.]+)\.config\.toml$/);
+  return match ? match[1] : null;
+}
+
 function pruneUnsupportedManifestRecords(manifest) {
   manifest.installations ||= [];
   const kept = manifest.installations.filter((record) => HARNESS_BY_ID[record.harness]);
@@ -2442,7 +2474,7 @@ function printHelp() {
 
 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] [--openai-proxy-base-url URL --openai-proxy-api-key KEY] [--openrouter-api-key KEY] [--anthropic-proxy-base-url URL --anthropic-proxy-api-key KEY] [--proxy-base-url URL --proxy-api-key KEY] [--private-gateway|--private-server[=URL] [--email you@example.com]] [--gateway-base-url URL] [--private-key pr-...] [--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 update [--harness ${SUPPORTED_HARNESS_IDS}] [--all] [--dry-run] [--penny-key pr-...] [--profile NAME|--private|--cloud] [--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]
   pennyrouter enable [--harness ${SUPPORTED_HARNESS_IDS}] [--all] [--yes]

package/src/cli.test.js

@@ -4,7 +4,8 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import test from "node:test";
 import {
-  applyConfigFile, harnessFundingChanged, INSTALL_MANIFEST, main, SUPPORTED_HARNESS_IDS,
+  applyConfigFile, harnessFundingChanged, INSTALL_MANIFEST, main, parseArgs,
+  SUPPORTED_HARNESS_IDS,
 } from "./cli.js";
 
 // --config lets a GUI installer (the macOS DMG) answer install questions up front instead of
@@ -29,6 +30,14 @@ function captureLogs(run) {
   return run().finally(() => { console.log = original; }).then(() => lines);
 }
 
+test("update uses the active profile unless one is explicitly selected", () => {
+  assert.equal(parseArgs(["update"]).flags.profile, undefined);
+  assert.equal(parseArgs(["update", "--profile", "private"]).flags.profile, "private");
+  assert.equal(parseArgs(["update", "--cloud"]).flags.profile, "cloud");
+  assert.equal(parseArgs(["install"]).flags.profile, "cloud");
+  assert.equal(parseArgs(["install", "--private-gateway"]).flags.profile, "private");
+});
+
 test("--config selects harnesses without prompting", async () => {
   await withConfigFile({ harnesses: ["claude-code"] }, async (path) => {
     const lines = await captureLogs(() => main(["install", "--config", path, "--dry-run"]));

package/src/launch.js

@@ -806,9 +806,26 @@ export function startPennyTerminalTitle({ gatewayBaseUrl, apiKey, titleSessionId
   };
 }
 
-async function writeClaudeLaunchSettings() {
+async function writeClaudeLaunchSettings({ gatewayBaseUrl, apiKey } = {}) {
   const native = (await readJsonFile(join(homeDir(), ".claude", "settings.json"), null)) || {};
-  const overlay = { disableClaudeAiConnectors: true };
+  // Claude Code gives values from --settings precedence over the parent process
+  // environment. Keep this overlay authoritative so a separately-managed
+  // ~/.claude/settings.json (for example scripts/proxy/claude-proxy.sh) cannot
+  // redirect a `penny claude` session away from the selected Penny profile.
+  const overlay = {
+    disableClaudeAiConnectors: true,
+    ...(gatewayBaseUrl && apiKey
+      ? {
+          env: {
+            ANTHROPIC_BASE_URL: gatewayBaseUrl,
+            ANTHROPIC_AUTH_TOKEN: apiKey,
+            // An empty value is treated as unset by Claude Code, and prevents a
+            // stale API key in the shared settings from creating dual auth.
+            ANTHROPIC_API_KEY: "",
+          },
+        }
+      : {}),
+  };
   if (native.statusLine) overlay.statusLine = native.statusLine;
   await configureClaudeCodeStatusline(overlay);
   await privateWrite(claudeLaunchSettingsPath(), `${JSON.stringify(overlay, null, 2)}\n`);
@@ -874,7 +891,7 @@ export async function configurePennyHarness(harness, {
   config.harnesses ||= {};
   if (harness === "claude-code") {
     await writeClaudeUserSkill();
-    await writeClaudeLaunchSettings();
+    await writeClaudeLaunchSettings({ gatewayBaseUrl, apiKey });
     config.harnesses.claude = {
       enabled: true,
       subscription_auth: Boolean(subscriptionAuth),
@@ -1268,6 +1285,14 @@ export async function runPenny(argv = process.argv.slice(2)) {
       profile: config.profile,
     });
   }
+  if (harness === "claude") {
+    // Refresh on every launch so profile selection is honored immediately,
+    // including --private, --cloud, and named profiles.
+    await writeClaudeLaunchSettings({
+      gatewayBaseUrl: config.gateway_base_url,
+      apiKey: config.api_key,
+    });
+  }
   const models = harness === "opencode" ? await resolveOpenCodeLaunchModels(config) : null;
   const invocation = buildPennyInvocation(harness, argv.slice(1), config, models);
   const child = spawn(invocation.command, invocation.args, {

package/src/launch.test.js

@@ -123,6 +123,14 @@ async function main() {
     });
 
     assert.equal(fs.readFileSync(path.join(home, ".claude", "settings.json"), "utf8"), nativeClaude);
+    const claudeLaunchSettings = JSON.parse(
+      fs.readFileSync(claudeLaunchSettingsPath(), "utf8"),
+    );
+    assert.deepEqual(claudeLaunchSettings.env, {
+      ANTHROPIC_BASE_URL: "https://gateway.example/",
+      ANTHROPIC_AUTH_TOKEN: "pr-super-secret",
+      ANTHROPIC_API_KEY: "",
+    });
     assert.equal(fs.readFileSync(path.join(home, ".codex", "config.toml"), "utf8"), nativeCodex);
     assert.equal(await fileMode(pennyConfigPath()), 0o600);
     assert.equal(await fileMode(claudeLaunchSettingsPath()), 0o600);