pleumrouter 0.5.50 → 0.5.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pleumrouter",
-  "version": "0.5.50",
+  "version": "0.5.53",
   "description": "Official PleumRouter terminal CLI — launch any coding agent against PleumRouter.",
   "type": "module",
   "bin": {

package/src/completion.mjs

@@ -46,6 +46,7 @@ _pleum() {
     completion) compadd zsh bash;;
   esac
 }
+compdef _pleum pleum 2>/dev/null || true
 _pleum "$@"`;
 }
 

package/src/config.mjs

@@ -173,7 +173,7 @@ export async function requireAuth() {
   process.exit(1);
 }
 
-export async function refreshAccessToken(cfg = readConfig()) {
+export async function refreshAccessToken(cfg = readConfig(), { signal, clearOnReject = true } = {}) {
   if (!cfg?.refresh_token) return null;
   const base = (cfg.base_url || ROOT).replace(/\/+$/, "").replace(/\/v1$/, "");
   try {
@@ -181,9 +181,10 @@ export async function refreshAccessToken(cfg = readConfig()) {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ refresh_token: cfg.refresh_token }),
+      signal,
     });
     if (!res.ok) {
-      if (res.status === 401 || res.status === 403) {
+      if (clearOnReject && (res.status === 401 || res.status === 403)) {
         writeConfig(clearCredentials(cfg));
       }
       return null;

package/src/health.mjs

@@ -1,7 +1,8 @@
 // `pleum health` — 게이트웨이 연결성 + 로그인 상태 한눈에.
 // 셀프호스트/스테이징(PLEUM_BASE_URL) 점검·고객지원 트리아지용. 공개 /v1/health 재사용.
 
-import { ROOT, V1, readConfig, isLoggedIn } from "./config.mjs";
+import { ROOT, V1, readConfig, isLoggedIn, refreshAccessToken } from "./config.mjs";
+import { formatKrwCredit } from "./balance.mjs";
 import { style, divider } from "./ansi.mjs";
 import { t } from "./i18n.mjs";
 
@@ -14,7 +15,7 @@ const warn = (s) => `${style.yellow("●")} ${s}`;
 export const isHealthy = (v) => v === true || v === "ok" || (typeof v === "string" && v.startsWith("ok:"));
 
 // health 응답 + 로컬 상태 → 표시 문자열(순수 함수 — fixture 테스트 대상).
-export function renderHealth({ root, health, error, ms, keyPrefix }, styler = style) {
+export function renderHealth({ root, health, error, ms, keyPrefix, credit }, styler = style) {
   const lines = [];
   lines.push(`${styler.bold(styler.plum("pleum health"))} ${styler.dim(`· ${root}`)}`);
   lines.push(divider(undefined, styler));
@@ -35,12 +36,45 @@ export function renderHealth({ root, health, error, ms, keyPrefix }, styler = st
   }
   lines.push(
     keyPrefix
-      ? ok(`${t("Logged in")} ${styler.dim(`(${keyPrefix === "oauth" ? t("OAuth session") : `${t("key")} ${keyPrefix}…`})`)}`)
+      ? ok(`${t("Local credentials found")} ${styler.dim(`(${keyPrefix === "oauth" ? t("OAuth session") : `${t("key")} ${keyPrefix}…`})`)}`)
       : warn(`${t("Not logged in")} ${styler.dim("— pleum login")}`),
   );
+  if (credit?.personal) {
+    lines.push(ok(t("Personal credit: {amount} credits", { amount: formatKrwCredit(credit.personal.balance_krw) })));
+    lines.push(styler.dim(t("Personal credit does not indicate workspace availability or model access.")));
+  } else if (credit?.error) {
+    lines.push(warn(t("Credit check failed: {error}", { error: credit.error })));
+  } else {
+    lines.push(warn(t("Credit check skipped. Run pleum login.")));
+  }
   return lines.join("\n");
 }
 
+export async function fetchHealthCredit(cfg, { fetchFn = fetch, refresh = refreshAccessToken } = {}) {
+  if (!isLoggedIn(cfg)) return null;
+  const loginRoot = (cfg.base_url || "https://apirouter.pleum.ai").replace(/\/+$/, "").replace(/\/v1$/, "");
+  if (loginRoot !== ROOT) return { error: t("Login server differs from the diagnostic server. Run pleum login for this server.") };
+  try {
+    const get = (token) => fetchFn(`${V1}/credits`, {
+      headers: { Authorization: `Bearer ${token}` },
+      signal: AbortSignal.timeout(HEALTH_TIMEOUT_MS),
+    });
+    let res = await get(cfg.access_token);
+    if (res.status === 401) {
+      const token = await refresh(cfg, { signal: AbortSignal.timeout(HEALTH_TIMEOUT_MS), clearOnReject: false });
+      if (token) res = await get(token);
+    }
+    if (!res.ok) return { error: `HTTP ${res.status}` };
+    const personal = await res.json();
+    if (typeof personal.balance_krw !== "number" || !Number.isFinite(personal.balance_krw)) {
+      return { error: t("Invalid credit response") };
+    }
+    return { personal };
+  } catch {
+    return { error: t("Unable to reach the credit service") };
+  }
+}
+
 // 게이트웨이 응답 대기 상한. 없으면 서버·네트워크가 멈췄을 때 끝없이(79초 실측) 기다린다.
 export const HEALTH_TIMEOUT_MS = 15_000;
 
@@ -60,7 +94,7 @@ export async function fetchHealth(url, timeoutMs = HEALTH_TIMEOUT_MS) {
 
 export async function health({ exitOnError = true } = {}) {
   const cfg = readConfig();
-  const keyPrefix = isLoggedIn(cfg)
+  const keyPrefix = cfg?.access_token && cfg?.refresh_token
     ? "oauth"
     : cfg?.key
       ? cfg.key.slice(0, 8)
@@ -68,6 +102,7 @@ export async function health({ exitOnError = true } = {}) {
   const t0 = Date.now();
   const { data, error } = await fetchHealth(`${V1}/health`);
   const ms = Date.now() - t0;
-  console.log(renderHealth({ root: ROOT, health: data, error, ms, keyPrefix }));
+  const credit = await fetchHealthCredit(cfg);
+  console.log(renderHealth({ root: ROOT, health: data, error, ms, keyPrefix, credit }));
   if (error && exitOnError) process.exit(1);
 }

package/src/locales/es.mjs

@@ -1,5 +1,14 @@
 // Diccionario en español — la clave es el texto original en inglés (mantener los marcadores {name} tal cual).
 export const ES = {
+  "Login server differs from the diagnostic server. Run pleum login for this server.": "El servidor de inicio de sesión no coincide con el servidor de diagnóstico. Ejecuta pleum login para este servidor.",
+  "Local credentials found": "Credenciales locales encontradas",
+  "Personal credit: {amount} credits": "Crédito personal: {amount}",
+  "Personal credit does not indicate workspace availability or model access.": "El crédito personal no indica el saldo disponible del espacio de trabajo ni el acceso a modelos.",
+  "Credit check failed: {error}": "Error al consultar el crédito: {error}",
+  "Credit check skipped. Run pleum login.": "Consulta de crédito omitida. Ejecuta pleum login.",
+  "Unable to reach the credit service": "No se puede conectar al servicio de crédito",
+  "Invalid credit response": "Respuesta de crédito no válida",
+
   "'{bin}' not found. Install:\n  {install}": "'{bin}' no encontrado. Instalar:\n  {install}",
   "(incl. {pct}% markup)": "(incl. {pct}% de margen)",
   "(no args) interactive launcher menu — keyboard only (TTY only)": "(sin argumentos) menú de lanzador interactivo — solo teclado (solo TTY)",

package/src/locales/ja.mjs

@@ -1,5 +1,14 @@
 // 日本語辞書 — キーは英語原文（プレースホルダーは {name} 形式のまま保持）。
 export const JA = {
+  "Login server differs from the diagnostic server. Run pleum login for this server.": "ログインサーバーと診断サーバーが異なります。このサーバーで pleum login を実行してください。",
+  "Local credentials found": "ローカル認証情報あり",
+  "Personal credit: {amount} credits": "個人クレジット: {amount}",
+  "Personal credit does not indicate workspace availability or model access.": "個人クレジットはワークスペースの利用可能額やモデルへのアクセス権を示しません。",
+  "Credit check failed: {error}": "クレジット確認失敗: {error}",
+  "Credit check skipped. Run pleum login.": "クレジット確認をスキップしました。pleum login を実行してください。",
+  "Unable to reach the credit service": "クレジットサービスに接続できません",
+  "Invalid credit response": "無効なクレジット応答",
+
   "'{bin}' not found. Install:\n  {install}": "'{bin}' が見つかりません。インストール:\n  {install}",
   "(incl. {pct}% markup)": "({pct}% マークアップ込み)",
   "(no args) interactive launcher menu — keyboard only (TTY only)": "(引数なし) 対話式ランチャーメニュー — キーボード操作のみ (TTYのみ)",

package/src/locales/ko.mjs

@@ -1,6 +1,15 @@
 // 한국어 사전 — 키는 영어 원문(placeholders는 {name} 형태로 보존).
 // 값은 i18n 도입 전 이 CLI가 실제로 출력하던 원문 한국어 그대로다.
 export const KO = {
+  "Login server differs from the diagnostic server. Run pleum login for this server.": "로그인 서버와 진단 서버가 다릅니다. 이 서버에서 pleum login을 실행하세요.",
+  "Local credentials found": "로컬 자격증명 있음",
+  "Personal credit: {amount} credits": "개인 크레딧: {amount}",
+  "Personal credit does not indicate workspace availability or model access.": "개인 크레딧은 워크스페이스 사용 가능액이나 모델 접근 권한을 뜻하지 않습니다.",
+  "Credit check failed: {error}": "크레딧 조회 실패: {error}",
+  "Credit check skipped. Run pleum login.": "크레딧 조회를 건너뛰었습니다. pleum login을 실행하세요.",
+  "Unable to reach the credit service": "크레딧 서비스에 연결할 수 없습니다",
+  "Invalid credit response": "잘못된 크레딧 응답",
+
   // config.mjs
   "Login required. Run this first:\n  pleum login": "로그인이 필요합니다. 먼저 실행하세요:\n  pleum login",
 

package/src/locales/zh.mjs

@@ -1,5 +1,14 @@
 // 中文词典 — 键为英文原文（占位符保持 {name} 格式）。
 export const ZH = {
+  "Login server differs from the diagnostic server. Run pleum login for this server.": "登录服务器与诊断服务器不同。请在此服务器运行 pleum login。",
+  "Local credentials found": "已找到本地凭据",
+  "Personal credit: {amount} credits": "个人额度：{amount}",
+  "Personal credit does not indicate workspace availability or model access.": "个人额度不代表工作空间可用额度或模型访问权限。",
+  "Credit check failed: {error}": "额度查询失败：{error}",
+  "Credit check skipped. Run pleum login.": "已跳过额度查询。请运行 pleum login。",
+  "Unable to reach the credit service": "无法连接额度服务",
+  "Invalid credit response": "额度响应无效",
+
   "'{bin}' not found. Install:\n  {install}": "未找到 '{bin}'。安装：\n  {install}",
   "(incl. {pct}% markup)": "（含 {pct}% 加价）",
   "(no args) interactive launcher menu — keyboard only (TTY only)": "（无参数）交互式启动菜单 — 仅键盘操作（仅限 TTY）",

package/src/login.mjs

@@ -1,7 +1,7 @@
 import { createServer } from "node:http";
 import { randomUUID } from "node:crypto";
 import { spawn } from "node:child_process";
-import { ROOT, SITE_ROOT, V1, readConfig, writeConfig, mergeLoginConfig, clearCredentials, setActiveContext, refreshAccessToken, accessTokenIsStale } from "./config.mjs";
+import { ROOT, SITE_ROOT, V1, readConfig, writeConfig, mergeLoginConfig, clearCredentials, setActiveContext, refreshAccessToken, accessTokenIsStale, readJwtExp } from "./config.mjs";
 import { t } from "./i18n.mjs";
 import { sanitizeTerminalText } from "./ansi.mjs";
 
@@ -30,13 +30,16 @@ function openBrowser(url) {
   }
 }
 
-function saveTokens({ access_token, refresh_token, expires_in }) {
+export function saveTokens({ access_token, refresh_token, expires_in }) {
   const existing = readConfig() || {};
   const { key: _legacy, ...rest } = existing;
+  const exp = readJwtExp(access_token);
   const token_expires_at =
-    typeof expires_in === "number"
-      ? Date.now() + expires_in * 1000
-      : undefined;
+    exp != null
+      ? exp * 1000
+      : typeof expires_in === "number"
+        ? Date.now() + expires_in * 1000
+        : undefined;
   writeConfig(
     mergeLoginConfig(rest, {
       access_token,
@@ -151,10 +154,31 @@ export async function login() {
   console.log(`✓ ${t("Logged in. Saved the session to ~/.pleum/config.json.")}`);
 }
 
+export function retryAfterSeconds(response) {
+  const value = response.headers.get("Retry-After");
+  const seconds = value === null ? NaN : Number(value);
+  return Number.isFinite(seconds) && seconds > 0 ? Math.ceil(seconds) : 60;
+}
+
 // device-code 로그인 — 브라우저 없는 환경(SSH·CI).
 // 1) code 발급 → 2) 사용자가 /device에서 확인 → 3) CLI가 폴링으로 JWT 수신.
 export async function loginDevice() {
-  const res = await fetch(`${V1}/auth/device/code`, { method: "POST" });
+  const codeDeadline = Date.now() + 120_000;
+  let res;
+  while (true) {
+    try {
+      res = await fetch(`${V1}/auth/device/code`, { method: "POST", signal: AbortSignal.timeout(Math.max(1, codeDeadline - Date.now())) });
+    } catch (error) {
+      if (error.name !== "TimeoutError") throw error;
+      console.error(t("Login timed out (2 minutes)"));
+      process.exit(1);
+    }
+    if (res.status !== 429) break;
+    const wait = retryAfterSeconds(res) * 1000;
+    if (Date.now() + wait >= codeDeadline) break;
+    console.error(t("Failed to issue a device code (server responded {status})", { status: res.status }));
+    await new Promise((r) => setTimeout(r, wait));
+  }
   if (!res.ok) {
     console.error(t("Failed to issue a device code (server responded {status})", { status: res.status }));
     process.exit(1);
@@ -170,19 +194,26 @@ export async function loginDevice() {
   const expiresIn = Number(expires_in) || 600;
   const pollInterval = Math.max(1, Number(interval) || 5);
   const deadline = Date.now() + expiresIn * 1000;
-  while (Date.now() < deadline) {
-    await new Promise((r) => setTimeout(r, pollInterval * 1000));
+  let nextWait = pollInterval * 1000;
+  while (Date.now() + nextWait < deadline) {
+    await new Promise((r) => setTimeout(r, nextWait));
+    nextWait = pollInterval * 1000;
     let poll;
     try {
       poll = await fetch(`${V1}/auth/device/token`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ device_code }),
+        signal: AbortSignal.timeout(Math.max(1, deadline - Date.now())),
       });
     } catch {
       continue; // Transient network error; retry on next poll tick
     }
     if (poll.status === 202) continue; // authorization_pending
+    if (poll.status === 429) {
+      nextWait = Math.max(pollInterval, retryAfterSeconds(poll)) * 1000;
+      continue;
+    }
     if (!poll.ok) {
       const e = await poll.json().catch(() => ({}));
       if (e.detail === "expired_token") { console.error(t("The code has expired.")); process.exit(1); }