pleumrouter 0.5.42 → 0.5.43

package/README.md

@@ -45,6 +45,7 @@ SSH/CI에서는 `pleum login --device`를 쓰세요.
 | `pleum models <id> --info` | 모델 상세 — 가격·컨텍스트·provider별 지연/처리량/업타임·주간 사용량·형제 모델 |
 | `pleum top [--period daily\|weekly\|monthly]` | 라우터 전체 모델 리더보드 + 제공자 점유율(공개 통계) |
 | `pleum balance [--switch]` | 크레딧 잔액 조회 · 워크스페이스(개인/팀) 전환 |
+| `pleum workspace [switch <name\|id\|personal>]` | 활성 크레딧 워크스페이스(개인/공유 팀 워크스페이스) 표시 · 전환. 초대받은 공유 워크스페이스에서 실행하면 호출은 소유자 계정으로 청구된다 |
 | `pleum usage [--by model\|provider\|api_key\|day\|tag\|user] [--days N]` | 내 지출 리포트(막대 차트) — OAuth 로그인 세션 필요 |
 | `pleum health` | 공개 게이트웨이 상태·로그인 상태 점검. DB·Redis·환율 상세는 관리자 전용 |
 | `pleum lang [code]` | 표시 언어 조회/변경 — `en`(기본)·`ko`·`ja`·`zh`·`es`. 인자 없이 TTY면 화살표로 선택, `PLEUM_LANG` 환경변수로도 덮어쓰기 가능 |
@@ -88,6 +89,7 @@ env·실행 인자 또는 일부 도구의 격리 홈(`PI_CODING_AGENT_DIR` / `C
 ## 환경변수
 
 - `PLEUM_BASE_URL` — 게이트웨이 루트 덮어쓰기(API 호출용 기본 `https://apirouter.pleum.ai`, 브라우저 로그인 URL용 기본 `https://router.pleum.ai` 둘 다에 적용됨). 셀프호스트/스테이징용.
+- `PLEUM_SITE_URL` — 브라우저 로그인 페이지 base만 덮어쓰기(`PLEUM_BASE_URL`보다 우선). API와 프론트 호스트가 다를 때 쓴다(예: API `http://localhost:8400`, 로그인 페이지 `http://localhost:3114`).
 
 ## 개발
 

package/bin/pleum.mjs

@@ -10,6 +10,7 @@ import { wire, unwire, wireHelp, unwireHelp } from "../src/wire.mjs";
 import { run } from "../src/run.mjs";
 import { listModels } from "../src/models.mjs";
 import { balance } from "../src/balance.mjs";
+import { workspace } from "../src/workspace.mjs";
 import { usage } from "../src/usage.mjs";
 import { top } from "../src/top.mjs";
 import { health } from "../src/health.mjs";
@@ -44,6 +45,7 @@ function buildHelp() {
     ["pleum models <id> --info", t("Model detail (price, perf, per-provider uptime)")],
     ["pleum top [--period weekly]", t("Model leaderboard · provider share (daily|weekly|monthly)")],
     ["pleum balance [--switch]", t("Check your credit balance")],
+    ["pleum workspace [switch <name|id>]", t("Show or switch the credit workspace (team study group)")],
     ["pleum usage [--by model] [--days 30]", t("Your spend report (model|provider|api_key|day|tag|user)")],
     ["pleum health", t("Check gateway connectivity and login status")],
     ["pleum lang [code]", t("Show/change display language (en|ko|ja|zh|es)")],
@@ -151,6 +153,13 @@ try {
       await balance({ interactive: isSwitch, switchOnly: isSwitch });
       break;
     }
+    case "workspace":
+      if (rest[0] === "-h" || rest[0] === "--help") {
+        console.log(t("Usage: pleum workspace [switch <name|id|personal>]"));
+      } else {
+        await workspace(rest);
+      }
+      break;
     case "usage":
       await usage(rest);
       break;

package/package.json

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

package/src/balance.mjs

@@ -59,7 +59,7 @@ export async function fetchCreditSummary() {
 
 export function buildCreditOptions({ personal, teams = [], activeContext = { type: "personal" } }) {
   const options = [];
-  const isPersonalActive = activeContext.type === "personal" || !activeContext.org_id;
+  const isPersonalActive = activeContext.type === "personal";
   const personalBalanceStr = `${formatKrwCredit(personal.balance_krw)} ${t("credits")}${
     personal.balance_usd != null ? ` / $${personal.balance_usd.toFixed(4)}` : ""
   }`;

package/src/completion.mjs

@@ -3,7 +3,7 @@
 import { t } from "./i18n.mjs";
 import { launchToolNames } from "./recipes.mjs";
 
-const COMMANDS = "claude codex agy antigravity opencode login logout lang launch wire unwire run models top balance usage health version update upgrade completion help";
+const COMMANDS = "claude codex agy antigravity opencode login logout lang launch wire unwire run models top balance workspace usage health version update upgrade completion help";
 const TOOLS = launchToolNames().join(" ");
 
 function bash() {

package/src/config.mjs

@@ -15,7 +15,9 @@ export const V1 = `${ROOT}/v1`;
 // 브라우저가 여는 /cli-auth 는 Next.js 프론트 도메인에만 존재한다 — API 도메인(ROOT)과 분리해야
 // 한다(과거 ROOT를 공유해서 쓰다가 apirouter로 기본값이 바뀌며 로그인이 깨진 적 있음).
 // 셀프호스트(PLEUM_BASE_URL 지정)는 같은 도메인이 프론트도 서빙한다고 가정해 ROOT를 재사용한다.
-export const SITE_ROOT = (overrideBase ?? "https://router.pleum.ai")
+// 프론트·API 호스트가 다르면 PLEUM_SITE_URL이 최우선이다(예: API http://localhost:8400,
+// 로그인 페이지 http://localhost:3114).
+export const SITE_ROOT = (process.env.PLEUM_SITE_URL ?? overrideBase ?? "https://router.pleum.ai")
   .replace(/\/+$/, "")
   .replace(/\/v1$/, "");
 
@@ -206,6 +208,13 @@ export async function refreshAccessToken(cfg = readConfig()) {
 /** 활성 크레딧/워크스페이스 컨텍스트 조회 (기본값 personal) */
 export function getActiveContext(cfg = readConfig()) {
   const ctx = cfg?.active_context;
+  if (ctx && ctx.type === "workspace" && ctx.workspace_id) {
+    return {
+      type: "workspace",
+      workspace_id: ctx.workspace_id,
+      workspace_name: ctx.workspace_name || ctx.workspace_id,
+    };
+  }
   if (ctx && ctx.type === "team" && ctx.org_id) {
     return { type: "team", org_id: ctx.org_id, org_name: ctx.org_name || ctx.org_id };
   }
@@ -215,7 +224,13 @@ export function getActiveContext(cfg = readConfig()) {
 /** 활성 크레딧/워크스페이스 컨텍스트 저장 */
 export function setActiveContext(context, cfg = readConfig()) {
   const updated = { ...(cfg ?? {}) };
-  if (!context || context.type === "personal" || !context.org_id) {
+  if (context?.type === "workspace" && context.workspace_id) {
+    updated.active_context = {
+      type: "workspace",
+      workspace_id: context.workspace_id,
+      workspace_name: context.workspace_name || null,
+    };
+  } else if (!context || context.type === "personal" || !context.org_id) {
     updated.active_context = { type: "personal" };
   } else {
     updated.active_context = {

package/src/launch.mjs

@@ -316,9 +316,11 @@ export async function launch(tool, model, passthrough, {
   };
 
   const activeCtx = getActiveContext();
-  const creditMsg = activeCtx.type === "team"
-    ? `${t("Team")}: ${activeCtx.org_name}`
-    : t("Personal");
+  const creditMsg = activeCtx.type === "workspace"
+    ? `${t("Workspace")}: ${sanitizeTerminalText(activeCtx.workspace_name)}`
+    : activeCtx.type === "team"
+      ? `${t("Team")}: ${activeCtx.org_name}`
+      : t("Personal");
   console.log(`ℹ ${t("Credit:")} ${creditMsg}`);
 
   const args = [...r.args(model), ...passthrough];

package/src/locales/es.mjs

@@ -264,6 +264,15 @@ export const ES = {
   "by tag": "por etiqueta",
   "by user": "por usuario",
   "Failed to fetch balance ({status})": "Error al obtener el saldo ({status})",
+  "Workspace": "Espacio",
+  "Using workspace: {name}": "Usando el espacio: {name}",
+  "You belong to multiple workspaces. Run `pleum workspace` to choose one.": "Perteneces a varios espacios. Ejecuta `pleum workspace` para elegir uno.",
+  "Failed to fetch workspace context ({status})": "Error al obtener el contexto del espacio ({status})",
+  "Failed to switch workspace ({status})": "Error al cambiar de espacio ({status})",
+  "Usage: pleum workspace [switch <name|id|personal>]": "Uso: pleum workspace [switch <nombre|id|personal>]",
+  "No workspace matches: {query}": "Ningún espacio coincide: {query}",
+  "Multiple workspaces match {query}: {list}": "Varios espacios coinciden con {query}: {list}",
+  "Show or switch the credit workspace (team study group)": "Mostrar o cambiar el espacio de crédito (grupo de estudio del equipo)",
 
   "This install command needs a shell pipe; run it manually:": "Este comando de instalación requiere una tubería de shell; ejecútalo manualmente:",
 

package/src/locales/ja.mjs

@@ -264,6 +264,15 @@ export const JA = {
   "by tag": "タグ別",
   "by user": "ユーザー別",
   "Failed to fetch balance ({status})": "残高の取得に失敗しました ({status})",
+  "Workspace": "ワークスペース",
+  "Using workspace: {name}": "ワークスペースを使用: {name}",
+  "You belong to multiple workspaces. Run `pleum workspace` to choose one.": "複数のワークスペースに所属しています。`pleum workspace` で選択してください。",
+  "Failed to fetch workspace context ({status})": "ワークスペースコンテキストの取得に失敗 ({status})",
+  "Failed to switch workspace ({status})": "ワークスペースの切り替えに失敗 ({status})",
+  "Usage: pleum workspace [switch <name|id|personal>]": "使い方: pleum workspace [switch <名前|id|personal>]",
+  "No workspace matches: {query}": "一致するワークスペースがありません: {query}",
+  "Multiple workspaces match {query}: {list}": "複数のワークスペースが一致します {query}: {list}",
+  "Show or switch the credit workspace (team study group)": "クレジットワークスペースの表示・切り替え（チーム学習グループ）",
 
   "This install command needs a shell pipe; run it manually:": "シェルパイプが必要なインストールコマンドです。手動で実行してください:",
 

package/src/locales/ko.mjs

@@ -323,6 +323,15 @@ export const KO = {
   "by tag": "태그별",
   "by user": "사용자별",
   "Failed to fetch balance ({status})": "잔액 조회 실패 ({status})",
+  "Workspace": "워크스페이스",
+  "Using workspace: {name}": "워크스페이스 사용: {name}",
+  "You belong to multiple workspaces. Run `pleum workspace` to choose one.": "소속된 워크스페이스가 여러 개입니다. `pleum workspace` 명령으로 선택하세요.",
+  "Failed to fetch workspace context ({status})": "워크스페이스 컨텍스트 조회 실패 ({status})",
+  "Failed to switch workspace ({status})": "워크스페이스 전환 실패 ({status})",
+  "Usage: pleum workspace [switch <name|id|personal>]": "사용법: pleum workspace [switch <이름|id|personal>]",
+  "No workspace matches: {query}": "일치하는 워크스페이스가 없습니다: {query}",
+  "Multiple workspaces match {query}: {list}": "여러 워크스페이스가 일치합니다 {query}: {list}",
+  "Show or switch the credit workspace (team study group)": "크레딧 워크스페이스 표시·전환 (팀 스터디 그룹)",
 
   "This install command needs a shell pipe; run it manually:": "셸 파이프가 필요한 설치 명령입니다 — 직접 실행해 주세요:",
 

package/src/locales/zh.mjs

@@ -264,6 +264,15 @@ export const ZH = {
   "by tag": "按标签",
   "by user": "按用户",
   "Failed to fetch balance ({status})": "获取余额失败 ({status})",
+  "Workspace": "工作区",
+  "Using workspace: {name}": "正在使用工作区：{name}",
+  "You belong to multiple workspaces. Run `pleum workspace` to choose one.": "你属于多个工作区。请运行 `pleum workspace` 选择一个。",
+  "Failed to fetch workspace context ({status})": "获取工作区上下文失败 ({status})",
+  "Failed to switch workspace ({status})": "切换工作区失败 ({status})",
+  "Usage: pleum workspace [switch <name|id|personal>]": "用法：pleum workspace [switch <名称|id|personal>]",
+  "No workspace matches: {query}": "没有匹配的工作区：{query}",
+  "Multiple workspaces match {query}: {list}": "多个工作区匹配 {query}：{list}",
+  "Show or switch the credit workspace (team study group)": "显示或切换积分工作区（团队学习小组）",
 
   "This install command needs a shell pipe; run it manually:": "此安装命令需要 shell 管道，请手动运行:",
 

package/src/login.mjs

@@ -47,17 +47,36 @@ function saveTokens({ access_token, refresh_token, expires_in }) {
   );
 }
 
-export async function syncCliContext(accessToken) {
+export async function syncCliContext(accessToken, { fetchImpl = fetch, save = setActiveContext } = {}) {
   if (!accessToken) return;
   try {
-    const res = await fetch(`${V1}/auth/cli-context`, {
+    const res = await fetchImpl(`${V1}/auth/cli-context`, {
       headers: { Authorization: `Bearer ${accessToken}` },
     });
-    if (res.ok) {
-      const data = await res.json();
-      if (data?.active_context) {
-        setActiveContext(data.active_context);
+    if (!res.ok) return;
+    const data = await res.json();
+    if (!data?.active_context) return;
+    let context = data.active_context;
+    const candidates = Array.isArray(data.workspace_candidates) ? data.workspace_candidates : [];
+    // 초대받은 멤버가 별도 조작 없이 소유자 잔액으로 실행되게 — 후보가 하나뿐이면 자동 바인딩.
+    if (context.type === "personal" && candidates.length === 1) {
+      const bound = await fetchImpl(`${V1}/auth/cli-context`, {
+        method: "POST",
+        headers: { Authorization: `Bearer ${accessToken}`, "Content-Type": "application/json" },
+        body: JSON.stringify({ workspace_id: candidates[0].workspace_id }),
+      });
+      if (bound.ok) {
+        const boundData = await bound.json().catch(() => null);
+        if (boundData?.active_context) context = boundData.active_context;
       }
+    } else if (context.type === "personal" && candidates.length > 1) {
+      console.log(`ℹ ${t("You belong to multiple workspaces. Run `pleum workspace` to choose one.")}`);
+    }
+    save(context);
+    if (context.type === "workspace") {
+      console.log(
+        `✓ ${t("Using workspace: {name}", { name: sanitizeTerminalText(context.workspace_name || context.workspace_id) })}`,
+      );
     }
   } catch {}
 }

package/src/settings.mjs

@@ -28,9 +28,11 @@ export function buildSettingsItems({
   activeContext = { type: "personal" },
   latestVersion = null,
 }) {
-  const contextDesc = activeContext?.type === "team"
-    ? `${t("Team")}: ${activeContext.org_name || activeContext.org_id}`
-    : t("Personal Credit");
+  const contextDesc = activeContext?.type === "workspace"
+    ? `${t("Workspace")}: ${sanitizeTerminalText(activeContext.workspace_name || activeContext.workspace_id)}`
+    : activeContext?.type === "team"
+      ? `${t("Team")}: ${activeContext.org_name || activeContext.org_id}`
+      : t("Personal Credit");
   const updateDesc = latestVersion && isNewerVersion(version, latestVersion)
     ? `${t("Current version: {version}", { version })} → v${latestVersion} (${t("Update available")})`
     : t("Current version: {version}", { version });

package/src/wire.mjs

@@ -1,7 +1,7 @@
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
-import { ROOT, V1, authFetch } from "./config.mjs";
+import { ROOT, V1, authFetch, getActiveContext } from "./config.mjs";
 import { tomlBasicString } from "./recipes.mjs";
 import { t } from "./i18n.mjs";
 
@@ -177,7 +177,10 @@ function parseJsonBody(res) {
 export async function ensureWireKey({
   auth = authFetch,
   paths = wirePaths(),
+  activeContext = getActiveContext(),
 } = {}) {
+  const targetWorkspaceId =
+    activeContext?.type === "workspace" ? activeContext.workspace_id : null;
   const stored = (() => {
     try {
       return JSON.parse(readText(paths.wire) ?? "");
@@ -191,7 +194,27 @@ export async function ensureWireKey({
       const data = await parseJsonBody(listed);
       const items = Array.isArray(data.items) ? data.items : [];
       const found = items.find((item) => String(item.id) === String(stored.id));
-      if (found && found.is_active !== false) return stored;
+      if (found && found.is_active !== false) {
+        if (
+          targetWorkspaceId &&
+          String(found.workspace_id ?? "") !== String(targetWorkspaceId)
+        ) {
+          const moved = await auth(`/workspaces/keys/${stored.id}/move`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ target_workspace_id: targetWorkspaceId }),
+          });
+          if (moved.ok) {
+            const movedRecord = { ...stored, workspace_id: targetWorkspaceId };
+            writeSecretFile(paths.wire, `${JSON.stringify(movedRecord, null, 2)}\n`);
+            return movedRecord;
+          }
+          // 이동은 keys.manage_all 보유자(소유자/관리자)만 가능하다 — 일반 멤버는
+          // 아래 새 키 발급으로 공간 귀속 키를 만든다(과금 오귀속보다 키 재발급이 낫다).
+        } else {
+          return stored;
+        }
+      }
     } else if (listed.status !== 404) {
       return stored;
     }
@@ -200,7 +223,10 @@ export async function ensureWireKey({
   const created = await auth("/keys", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ name: WIRE_KEY_NAME }),
+    body: JSON.stringify({
+      name: WIRE_KEY_NAME,
+      ...(targetWorkspaceId ? { workspace_id: targetWorkspaceId } : {}),
+    }),
   });
   if (!created.ok) {
     throw new Error(t("Failed to create a desktop API key (HTTP {status})", { status: created.status }));
@@ -209,7 +235,12 @@ export async function ensureWireKey({
   if (!data.key || !data.id) {
     throw new Error(t("Failed to create a desktop API key (HTTP {status})", { status: created.status }));
   }
-  const record = { id: data.id, key: data.key, name: data.name ?? WIRE_KEY_NAME };
+  const record = {
+    id: data.id,
+    key: data.key,
+    name: data.name ?? WIRE_KEY_NAME,
+    ...(targetWorkspaceId ? { workspace_id: targetWorkspaceId } : {}),
+  };
   writeSecretFile(paths.wire, `${JSON.stringify(record, null, 2)}\n`);
   return record;
 }

package/src/workspace.mjs

@@ -0,0 +1,98 @@
+import { authFetch, getActiveContext, setActiveContext } from "./config.mjs";
+import { sanitizeTerminalText, style } from "./ansi.mjs";
+import { t } from "./i18n.mjs";
+
+// 서버가 계산한 활성 컨텍스트 = CLI 세션 키의 workspace_id(과금 귀속 진실).
+export async function fetchWorkspaceContext(auth = authFetch) {
+  const res = await auth("/auth/cli-context");
+  if (!res.ok) {
+    throw new Error(t("Failed to fetch workspace context ({status})", { status: res.status }));
+  }
+  return res.json();
+}
+
+// workspaceId=null이면 personal 복귀(서버가 키 바인딩을 리셋한다).
+export async function bindWorkspaceContext(workspaceId, auth = authFetch) {
+  const res = await auth("/auth/cli-context", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ workspace_id: workspaceId }),
+  });
+  if (!res.ok) {
+    throw new Error(t("Failed to switch workspace ({status})", { status: res.status }));
+  }
+  const data = await res.json().catch(() => ({}));
+  return data?.active_context ?? { type: "personal" };
+}
+
+// 후보 매칭 — 전체 UUID > UUID 접두 > 이름 부분일치. 모호하면 던진다(조용한 오바인딩 금지).
+export function matchWorkspaceCandidate(candidates, query) {
+  const q = String(query ?? "").trim().toLowerCase();
+  if (!q) throw new Error(t("Usage: pleum workspace [switch <name|id|personal>]"));
+  let hits = candidates.filter((c) => String(c.workspace_id).toLowerCase() === q);
+  if (hits.length === 0) {
+    hits = candidates.filter((c) => String(c.workspace_id).toLowerCase().startsWith(q));
+  }
+  if (hits.length === 0) {
+    hits = candidates.filter((c) => String(c.name).toLowerCase().includes(q));
+  }
+  if (hits.length === 0) throw new Error(t("No workspace matches: {query}", { query }));
+  if (hits.length > 1) {
+    throw new Error(
+      t("Multiple workspaces match {query}: {list}", {
+        query,
+        list: hits.map((c) => c.workspace_id).join(", "),
+      }),
+    );
+  }
+  return hits[0];
+}
+
+export function workspaceLabel(context) {
+  if (context?.type === "workspace") {
+    return `${t("Workspace")}: ${sanitizeTerminalText(context.workspace_name || context.workspace_id)}`;
+  }
+  return t("Personal");
+}
+
+export function formatWorkspaceList(context, candidates = []) {
+  const activeId = context?.type === "workspace" ? String(context.workspace_id) : null;
+  const lines = [`${t("Credit workspace")}: ${workspaceLabel(context)}`];
+  for (const candidate of candidates) {
+    const mark = String(candidate.workspace_id) === activeId ? style.bold(style.plum("▸ ")) : "  ";
+    lines.push(
+      `${mark}${candidate.workspace_id}  ${sanitizeTerminalText(candidate.name)}  (${candidate.role})`,
+    );
+  }
+  return lines.join("\n");
+}
+
+export async function workspace(args = [], { auth = authFetch, save = setActiveContext } = {}) {
+  const [sub, ...rest] = args;
+  if (sub !== undefined && sub !== "switch") {
+    console.error(t("Usage: pleum workspace [switch <name|id|personal>]"));
+    process.exit(1);
+  }
+
+  const data = await fetchWorkspaceContext(auth);
+  const context = data?.active_context ?? getActiveContext();
+
+  if (sub !== "switch") {
+    console.log(formatWorkspaceList(context, data?.workspace_candidates ?? []));
+    return context;
+  }
+
+  const query = rest[0];
+  if (query && query.toLowerCase() === "personal") {
+    const next = await bindWorkspaceContext(null, auth);
+    save(next);
+    console.log(`✓ ${t("Active credit set to: {name}", { name: t("Personal") })}`);
+    return next;
+  }
+
+  const hit = matchWorkspaceCandidate(data?.workspace_candidates ?? [], query);
+  const next = await bindWorkspaceContext(hit.workspace_id, auth);
+  save(next);
+  console.log(`✓ ${t("Active credit set to: {name}", { name: workspaceLabel(next) })}`);
+  return next;
+}