pleumrouter 0.5.36 → 0.5.39

package/src/recipes.mjs

@@ -34,15 +34,10 @@ export const RECIPES = {
     label: "Claude Code",
     bin: "claude",
     type: "env",
-    unsetEnv: ["ANTHROPIC_API_KEY"],
-    resolveModel: (explicit, cfg) => {
-      if (explicit && typeof explicit === "object") return explicit;
-      return {
-        sonnet: explicit || cfg?.launch_models?.claude || cfg?.claude_tiers?.sonnet || "claude-sonnet-5",
-        opus: cfg?.claude_tiers?.opus || "claude-opus-5-5",
-        haiku: cfg?.claude_tiers?.haiku || "claude-haiku-4-5",
-      };
-    },
+    unsetEnv: ["ANTHROPIC_API_KEY", "ANTHROPIC_CUSTOM_MODEL_OPTION", "ANTHROPIC_CUSTOM_MODEL_OPTION_NAME", "ANTHROPIC_CUSTOM_MODEL_OPTION_DESCRIPTION"],
+    resolveModel: (explicit) => explicit && typeof explicit === "object"
+      ? explicit
+      : explicit ? { mode: "custom", model: explicit } : { mode: "native" },
     install: "npm i -g @anthropic-ai/claude-code",
     // 앱 랭킹 귀속 메타 — 백엔드 featured_agents / UA fallback과 동기화.
     attribution: {
@@ -51,11 +46,7 @@ export const RECIPES = {
     },
     // 함정: ANTHROPIC_BASE_URL은 반드시 루트(/v1 없이) — CLI가 /v1/messages를 스스로 덧붙인다.
     // /v1을 넣으면 /v1/v1/messages가 되어 실패.
-    env: (key, m) => {
-      const isObj = m && typeof m === "object";
-      const sonnet = (isObj ? m.sonnet : m) || "claude-sonnet-5";
-      const opus = (isObj ? m.opus : null) || "claude-opus-5-5";
-      const haiku = (isObj ? m.haiku : null) || "claude-haiku-4-5";
+    env: (key, selection) => {
       // Claude 모델의 provider-qualified ID만 보정한다. 다른 회사 모델에
       // anthropic/을 붙이면 카탈로그에 없는 ID가 되어 요청이 실패한다.
       const toAnthropic = (x) => /^claude-/.test(x) ? `anthropic/${x}` : x;
@@ -65,30 +56,40 @@ export const RECIPES = {
         // CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY는 의도적으로 설정하지 않는다:
         // 활성화 시 Claude Code가 GET /v1/models를 호출해 카탈로그 200+개 모델을
         // /model 메뉴에 쏟아부어 화면이 난잡해지는 원인이 된다.
-        ANTHROPIC_DEFAULT_SONNET_MODEL: toAnthropic(sonnet),
+        ANTHROPIC_DEFAULT_SONNET_MODEL: toAnthropic("claude-sonnet-5"),
         ANTHROPIC_DEFAULT_SONNET_MODEL_NAME: "Sonnet",
         ANTHROPIC_DEFAULT_SONNET_MODEL_DESCRIPTION: "Sonnet 5 · Efficient for routine tasks",
-        ANTHROPIC_DEFAULT_OPUS_MODEL: toAnthropic(opus),
+        ANTHROPIC_DEFAULT_OPUS_MODEL: toAnthropic("claude-opus-5-5"),
         ANTHROPIC_DEFAULT_OPUS_MODEL_NAME: "Opus",
         ANTHROPIC_DEFAULT_OPUS_MODEL_DESCRIPTION: "Opus 5.5 · Best for everyday, complex tasks",
-        ANTHROPIC_DEFAULT_HAIKU_MODEL: toAnthropic(haiku),
+        ANTHROPIC_DEFAULT_FABLE_MODEL: toAnthropic("claude-fable-5-1"),
+        ANTHROPIC_DEFAULT_FABLE_MODEL_NAME: "Fable",
+        ANTHROPIC_DEFAULT_FABLE_MODEL_DESCRIPTION: "Fable 5.1 · Long-running tasks",
+        ANTHROPIC_DEFAULT_HAIKU_MODEL: toAnthropic("claude-haiku-4-5"),
         ANTHROPIC_DEFAULT_HAIKU_MODEL_NAME: "Haiku",
         ANTHROPIC_DEFAULT_HAIKU_MODEL_DESCRIPTION: "Haiku 4.5 · Fastest for quick answers",
-        ANTHROPIC_SMALL_MODEL: toAnthropic(haiku),
+        ANTHROPIC_SMALL_MODEL: toAnthropic("claude-haiku-4-5"),
+        ...(selection?.mode === "custom" ? {
+          ANTHROPIC_CUSTOM_MODEL_OPTION: toAnthropic(selection.model),
+          ANTHROPIC_CUSTOM_MODEL_OPTION_NAME: `Pleum · ${selection.model}`,
+          ANTHROPIC_CUSTOM_MODEL_OPTION_DESCRIPTION: "Selected in Pleum for this session",
+          CLAUDE_CODE_SUBAGENT_MODEL: "sonnet",
+          CLAUDE_CODE_SUBAGENT_MODEL_FORCE: "1",
+        } : {}),
       };
     },
-    // CLI 인자에 임의의 --model을 넘기지 않고 Claude Code의 내장 티어(Default/Opus)로 기동하게 하여
-    // /model 화면에 깨끗한 5개 표준 항목(Default, Opus, Fable, Sonnet, Haiku)만 표시되도록 한다.
-    args: () => [],
+    args: (selection) => ["--model", selection?.mode === "custom"
+      ? (/^claude-/.test(selection.model) ? `anthropic/${selection.model}` : selection.model)
+      : "sonnet"],
   },
   codex: {
     label: "Codex CLI",
     bin: "codex",
     type: "env",
     defaultModel: "gpt-6-sol",
-    resolveModel: (explicit, cfg) => explicit && typeof explicit === "object"
+    resolveModel: (explicit) => explicit && typeof explicit === "object"
       ? explicit
-      : { model: explicit || cfg?.launch_models?.codex || "gpt-6-sol", effort: cfg?.codex_effort || "medium" },
+      : { mode: explicit ? "custom" : "native", model: explicit || "gpt-6-sol" },
     install: "npm i -g @openai/codex",
     attribution: {
       title: "Codex",
@@ -97,7 +98,6 @@ export const RECIPES = {
     env: (key) => ({ PLEUM_API_KEY: key }),
     args: (model) => {
       const m = model && typeof model === "object" ? model.model : model;
-      const effort = model && typeof model === "object" ? model.effort : null;
       const provider = {
         name: "PleumRouter",
         base_url: V1,
@@ -110,7 +110,6 @@ export const RECIPES = {
         "-c", 'model_provider="pleum"',
         "-c", `model_providers.pleum=${providerToml}`,
         "--model", m || "gpt-6-sol",
-        ...(effort ? ["-c", `model_reasoning_effort=${tomlBasicString(effort)}`] : []),
       ];
     },
   },
@@ -118,12 +117,11 @@ export const RECIPES = {
     label: "Antigravity CLI",
     bin: "agy",
     type: "agy-settings",
-    defaultModel: "gemini-3.8-flash",
-    resolveModel: (explicit, cfg) => explicit && typeof explicit === "object"
+    resolveModel: (explicit) => explicit && typeof explicit === "object"
       ? explicit
-      : { model: explicit || cfg?.launch_models?.agy || "gemini-3.8-flash", effort: cfg?.agy_effort || "high" },
+      : explicit ? { mode: "custom", model: explicit } : { mode: "native" },
     install: "https://antigravity.google/cli/install.sh",
-    note: "Writes modelProvider=gemini into ~/.gemini/antigravity-cli/settings.json. Routes any coding model via PleumRouter.",
+    note: "Writes modelProvider=gemini into ~/.gemini/antigravity-cli/settings.json. Supported Gemini models route via PleumRouter.",
     attribution: {
       title: "Antigravity CLI",
       referer: "https://www.antigravity.google/docs/cli/install",
@@ -134,14 +132,9 @@ export const RECIPES = {
       GOOGLE_API_KEY: key,
     }),
     args: (m) => {
-      const isObj = m && typeof m === "object";
-      const model = (isObj ? m.model : m) || "gemini-3.8-flash";
-      const effort = isObj ? m.effort : null;
-      // agy의 --model은 내장 Gemini 모델만 받는다. 다른 카탈로그 ID는
-      // settings.json model로 전달하고 CLI 인자에는 싣지 않는다.
-      return /^(?:google\/)?gemini-/.test(model)
-        ? ["--model", model.replace(/^google\//, ""), "--effort", effort || "high"]
-        : [];
+      if (!m || m.mode === "native") return [];
+      const model = typeof m === "object" ? (m.cliModel || m.model) : m;
+      return ["--model", model.replace(/^google\//, "")];
     },
   },
   opencode: {
@@ -159,19 +152,22 @@ export const RECIPES = {
       title: "opencode",
       referer: "https://opencode.ai",
     },
-    env: (key, model) => {
+    env: (key, model, catalog = []) => {
       const active = model || "gpt-6-sol";
-      const models = Object.fromEntries(CORE_MODELS.map((id) => [id, {}]));
+      const models = Object.fromEntries(catalog.map(({ id }) => [id, {}]));
       models[active] = {};
       return {
         PLEUM_API_KEY: key,
         OPENCODE_CONFIG_CONTENT: JSON.stringify({
+          enabled_providers: ["openai"],
+          disabled_providers: [],
           provider: {
             openai: {
               npm: "@ai-sdk/openai",
               name: "PleumRouter",
               options: { baseURL: V1, apiKey: "{env:PLEUM_API_KEY}" },
               models,
+              whitelist: Object.keys(models),
             },
           },
         }),
@@ -469,9 +465,11 @@ export function mergeAgySettings(existingJson, model) {
       throw new Error("agy settings.json must be a JSON object");
     }
   }
-  const isObj = model && typeof model === "object";
-  const m = (isObj ? model.model : model) || "gemini-3.8-flash";
-  return { ...obj, modelProvider: "gemini", model: m };
+  const m = typeof model === "object" ? model?.cliModel || model?.model : model;
+  const settings = { ...obj, modelProvider: "gemini" };
+  if (m) settings.model = m;
+  else delete settings.model;
+  return settings;
 }
 
 export function piModelsJson(model) {

package/src/settings.mjs

@@ -13,7 +13,6 @@ import { getLocale, LANGS, t } from "./i18n.mjs";
 import { RECIPES } from "./recipes.mjs";
 import { fetchModels, matchModels, formatModelLabel } from "./models.mjs";
 import { login, logout } from "./login.mjs";
-import { upgrade } from "./upgrade.mjs";
 import { completion } from "./completion.mjs";
 import { lang } from "./lang.mjs";
 import { switchCreditWorkspace } from "./balance.mjs";

package/src/update.mjs

@@ -3,6 +3,7 @@ import { readFileSync, writeFileSync, existsSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
 import { t } from "./i18n.mjs";
+import { resolveLaunchCommand } from "./launch.mjs";
 
 const REGISTRY_URL = "https://registry.npmjs.org/pleumrouter/latest";
 const CHECK_INTERVAL_MS = 60 * 60 * 1000; // 1시간 캐시
@@ -112,10 +113,14 @@ export async function checkLatestVersion({
   };
 }
 
-export function performUpdate({ bin = null } = {}) {
-  const npmCmd = bin || (process.platform === "win32" ? "npm.cmd" : "npm");
+export function performUpdate({ bin = null, resolve = resolveLaunchCommand, spawn: spawnImpl = spawn } = {}) {
+  // Windows에서 npm.cmd 를 shell 없이 spawn 하면 EINVAL(Node 18.20+) — 공용
+  // 경로로 node 진입점을 찾아 우회한다(#10). 비윈도는 명령을 그대로 둔다.
+  const target = bin
+    ? { command: bin, args: ["install", "-g", "pleumrouter@latest"] }
+    : resolve("npm", ["install", "-g", "pleumrouter@latest"]);
   return new Promise((resolve) => {
-    const child = spawn(npmCmd, ["install", "-g", "pleumrouter@latest"], {
+    const child = spawnImpl(target.command, target.args, {
       stdio: "inherit",
       shell: false,
     });

package/src/wire.mjs

@@ -1,6 +1,6 @@
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
 import { ROOT, V1, authFetch } from "./config.mjs";
 import { tomlBasicString } from "./recipes.mjs";
 import { t } from "./i18n.mjs";
@@ -40,9 +40,19 @@ function readText(path) {
   }
 }
 
-function writeSecretFile(path, contents, mode = 0o600) {
+export function writeSecretFile(path, contents, mode = 0o600) {
   mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
-  writeFileSync(path, contents, { mode });
+  // 기존 파일이 0644 등으로 있으면 writeFileSync의 mode는 무시된다(#41) —
+  // tmp(강제 chmod) + rename 원자적 교체로 결과물이 항상 mode가 되게 한다.
+  const tmp = `${path}.pleum-tmp-${process.pid}`;
+  writeFileSync(tmp, contents, { mode });
+  try {
+    chmodSync(tmp, mode);
+    renameSync(tmp, path);
+  } catch (e) {
+    try { unlinkSync(tmp); } catch {} // 키 평문 잔여를 남기지 않는다
+    throw e;
+  }
 }
 
 function backupOnce(src, bak) {

package/src/upgrade.mjs

@@ -1,10 +0,0 @@
-import { performUpdate, runUpdateCommand } from "./update.mjs";
-
-export { performUpdate, runUpdateCommand };
-
-// 최신 버전으로 전역 재설치. 하위 호환을 위해 유지하며 process.exit() 호출 규약을 보존한다.
-export async function upgrade() {
-  const code = await runUpdateCommand(["--force"], { exit: false });
-  process.exit(code ?? 0);
-}
-