pleumrouter 0.5.45 → 0.5.46

package/package.json

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

package/src/balance.mjs

@@ -1,7 +1,8 @@
-import { authFetch, getActiveContext, setActiveContext } from "./config.mjs";
+import { authFetch, getActiveContext } from "./config.mjs";
 import { style } from "./ansi.mjs";
 import { select } from "./interactive.mjs";
 import { t } from "./i18n.mjs";
+import { fetchWorkspaceContext, selectAndBindWorkspace, workspaceLabel } from "./workspace.mjs";
 
 export function formatKrwCredit(amount) {
   return Number(amount || 0).toLocaleString("ko-KR", {
@@ -10,146 +11,59 @@ export function formatKrwCredit(amount) {
   });
 }
 
-export async function fetchCreditSummary() {
-  const res = await authFetch("/credits");
+// 개인 지갑 잔액만 조회한다. 공유 공간 목록·선택은 selectAndBindWorkspace가 맡는다.
+export async function fetchCreditSummary({ auth = authFetch } = {}) {
+  const res = await auth("/credits");
   if (!res.ok) {
     const body = await res.text().catch(() => "");
     throw new Error(t("Failed to fetch balance ({status})", { status: res.status }) + (body ? `: ${body}` : ""));
   }
   const personal = await res.json();
-
-  let orgs = [];
-  try {
-    const orgRes = await authFetch("/orgs");
-    if (orgRes.ok) {
-      orgs = await orgRes.json();
-    }
-  } catch {}
-
-  let teamWallets = [];
-  if (Array.isArray(orgs) && orgs.length > 0) {
-    const results = await Promise.all(
-      orgs.map(async (org) => {
-        try {
-          const wRes = await authFetch(`/orgs/${org.id}/wallet`);
-          if (wRes.ok) {
-            const wallet = await wRes.json();
-            return {
-              id: String(org.id),
-              name: org.name,
-              role: org.role,
-              balance_krw: wallet.available_krw ?? wallet.balance_krw ?? 0,
-            };
-          }
-        } catch {}
-        return null;
-      })
-    );
-    teamWallets = results.filter(Boolean);
-  }
-
   return {
     personal: {
       balance_krw: personal.balance_krw ?? 0,
       balance_usd: personal.balance_usd,
     },
-    teams: teamWallets,
   };
 }
 
-export function buildCreditOptions({ personal, teams = [], activeContext = { type: "personal" } }) {
-  const options = [];
+export function buildCreditOptions({ personal, activeContext = { type: "personal" } }) {
   const isPersonalActive = activeContext.type === "personal";
   const personalBalanceStr = `${formatKrwCredit(personal.balance_krw)} ${t("credits")}${
     personal.balance_usd != null ? ` / $${personal.balance_usd.toFixed(4)}` : ""
   }`;
 
-  options.push({
-    id: "personal",
-    type: "personal",
-    name: t("Personal"),
-    title: t("Personal Credit"),
-    balance: personalBalanceStr,
-    isActive: isPersonalActive,
-    label: `${isPersonalActive ? "✓ " : "  "}${t("Personal Credit")}: ${personalBalanceStr}`,
-  });
-
-  for (const team of teams) {
-    const isTeamActive = activeContext.type === "team" && String(activeContext.org_id) === String(team.id);
-    const teamBalanceStr = `${formatKrwCredit(team.balance_krw)} ${t("credits")}`;
-    const roleStr = team.role ? ` (${team.role})` : "";
-    const teamTitle = `${t("Team")}: ${team.name}${roleStr}`;
-    options.push({
-      id: String(team.id),
-      type: "team",
-      name: team.name,
-      title: teamTitle,
-      balance: teamBalanceStr,
-      isActive: isTeamActive,
-      label: `${isTeamActive ? "✓ " : "  "}${teamTitle}: ${teamBalanceStr}`,
-    });
-  }
-
-  return options;
+  return [
+    {
+      id: "personal",
+      type: "personal",
+      name: t("Personal"),
+      title: t("Personal Credit"),
+      balance: personalBalanceStr,
+      isActive: isPersonalActive,
+      label: `${isPersonalActive ? "✓ " : "  "}${t("Personal Credit")}: ${personalBalanceStr}`,
+    },
+  ];
 }
 
-export async function switchCreditWorkspace({ summary, selectFn = select } = {}) {
-  let data;
-  try {
-    data = summary || (await fetchCreditSummary());
-  } catch (e) {
-    console.error(`✗ ${e.message}`);
-    return getActiveContext();
-  }
-  const active = getActiveContext();
-  const options = buildCreditOptions({
-    personal: data.personal,
-    teams: data.teams,
-    activeContext: active,
-  });
-
-  if (options.length <= 1) {
-    console.log(t("You are not a member of any team. Using personal credit."));
-    return active;
-  }
-
-  const picked = await selectFn(options, {
-    message: t("Select credit workspace"),
-    formatItem: (x) => x.label,
-    limit: 10,
-  });
-
-  if (!picked) return active;
-
-  const targetOrgId = picked.type === "team" ? picked.id : null;
+// 과금 공간 전환. 후보 선택·키 재바인딩·저장은 selectAndBindWorkspace가 한다.
+export async function switchCreditWorkspace({ selectFn = select } = {}) {
+  return selectAndBindWorkspace({ selectFn });
+}
 
+// 전환 안내는 공유 공간 후보가 있을 때만 띄운다. 조회가 실패하면 조용히 생략한다.
+async function hasWorkspaceChoices() {
   try {
-    const res = await authFetch("/auth/cli-context", {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ org_id: targetOrgId }),
-    });
-    if (!res.ok) {
-      const err = await res.text().catch(() => "");
-      console.error(`✗ ${t("Failed to update credit context")}: ${err}`);
-      return active;
-    }
-  } catch (e) {
-    console.error(`✗ ${t("Failed to update credit context")}: ${e.message}`);
-    return active;
+    const data = await fetchWorkspaceContext();
+    return (data?.workspace_candidates ?? []).length > 0;
+  } catch {
+    return false;
   }
-
-  const newContext = setActiveContext({
-    type: picked.type,
-    org_id: targetOrgId,
-    org_name: picked.type === "team" ? picked.name : null,
-  });
-
-  console.log(`✓ ${t("Active credit set to: {name}", { name: picked.title })}`);
-  return newContext;
 }
 
 export async function balance({ interactive = false, switchOnly = false, exitOnError = true } = {}) {
+  if (switchOnly) return await switchCreditWorkspace();
+
   let summary;
   try {
     summary = await fetchCreditSummary();
@@ -159,28 +73,15 @@ export async function balance({ interactive = false, switchOnly = false, exitOnE
     return;
   }
 
-  if (switchOnly) {
-    return await switchCreditWorkspace({ summary });
-  }
-
   const active = getActiveContext();
-  const options = buildCreditOptions({
-    personal: summary.personal,
-    teams: summary.teams,
-    activeContext: active,
-  });
-
-  if (!interactive || options.length <= 1) {
-    console.log(t("Credit Balance:"));
-    for (const opt of options) {
-      const mark = opt.isActive ? style.bold(style.plum("▸ [Active] ")) : "  [      ] ";
-      console.log(`${mark}${opt.title}: ${opt.balance}`);
-    }
-    if (options.length > 1 && !interactive) {
-      console.log(`\n${style.dim(t("Run `pleum balance --switch` to switch credit workspace."))}`);
-    }
-    return;
+  const [personal] = buildCreditOptions({ personal: summary.personal, activeContext: active });
+  const mark = personal.isActive ? style.bold(style.plum("▸ [Active] ")) : "  [      ] ";
+  console.log(t("Credit Balance:"));
+  console.log(`${mark}${personal.title}: ${personal.balance}`);
+  console.log(`  ${t("Credit workspace")}: ${workspaceLabel(active)}`);
+
+  if (interactive) return await switchCreditWorkspace();
+  if (await hasWorkspaceChoices()) {
+    console.log(`\n${style.dim(t("Run `pleum balance --switch` to switch credit workspace."))}`);
   }
-
-  return await switchCreditWorkspace({ summary });
 }

package/src/config.mjs

@@ -215,9 +215,7 @@ export function getActiveContext(cfg = readConfig()) {
       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 };
-  }
+  // 팀 컨텍스트는 제거됐다. 예전에 저장된 team 값도 개인으로 본다.
   return { type: "personal", org_id: null, org_name: null };
 }
 
@@ -230,29 +228,18 @@ export function setActiveContext(context, cfg = readConfig()) {
       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 = {
-      type: "team",
-      org_id: context.org_id,
-      org_name: context.org_name || null,
-    };
+    updated.active_context = { type: "personal" };
   }
   writeConfig(updated);
   return updated.active_context;
 }
 
-/** Bearer 요청 — 401이면 1회 refresh 후 재시도. 활성 팀 컨텍스트가 있으면 X-Pleum-Org 첨부. */
+/** Bearer 요청 — 401이면 1회 refresh 후 재시도. 과금 귀속은 키의 workspace_id가 정하므로 헤더를 붙이지 않는다. */
 export async function authFetch(path, init = {}) {
   const token = await requireAuth();
   const url = path.startsWith("http") ? path : `${V1}${path.startsWith("/") ? path : `/${path}`}`;
-  const ctx = getActiveContext();
-  const customHeaders = {};
-  if (ctx.type === "team" && ctx.org_id) {
-    customHeaders["X-Pleum-Org"] = ctx.org_id;
-  }
-  const headers = { ...customHeaders, ...(init.headers || {}), Authorization: `Bearer ${token}` };
+  const headers = { ...(init.headers || {}), Authorization: `Bearer ${token}` };
   let res = await fetch(url, { ...init, headers });
   if (res.status !== 401) return res;
 
@@ -261,7 +248,7 @@ export async function authFetch(path, init = {}) {
   if (!refreshed) return res;
   return fetch(url, {
     ...init,
-    headers: { ...customHeaders, ...(init.headers || {}), Authorization: `Bearer ${refreshed}` },
+    headers: { ...(init.headers || {}), Authorization: `Bearer ${refreshed}` },
   });
 }
 

package/src/launch.mjs

@@ -5,6 +5,7 @@ import { join, delimiter, dirname, resolve } from "node:path";
 import { readConfig, isLoggedIn, getActiveContext, ROOT } from "./config.mjs";
 import { login } from "./login.mjs";
 import { ensureWireKey } from "./wire.mjs";
+import { workspaceLabel } from "./workspace.mjs";
 import {
   RECIPES,
   CORE_MODELS,
@@ -316,12 +317,7 @@ export async function launch(tool, model, passthrough, {
     process.removeListener("unhandledRejection", onException);
   };
 
-  const activeCtx = getActiveContext();
-  const creditMsg = activeCtx.type === "workspace"
-    ? `${t("Workspace")}: ${sanitizeTerminalText(activeCtx.workspace_name)}`
-    : activeCtx.type === "team"
-      ? `${t("Team")}: ${activeCtx.org_name}`
-      : t("Personal");
+  const creditMsg = workspaceLabel(getActiveContext());
   console.log(`ℹ ${t("Credit:")} ${creditMsg}`);
 
   const args = [...r.args(model), ...passthrough];

package/src/locales/es.mjs

@@ -169,6 +169,8 @@ export const ES = {
   "Unsupported tool: {tool}. Use claude or codex.": "Herramienta no compatible: {tool}. Usa claude o codex.",
   "Wrote {path}": "Escrito en {path}",
   "Wired {tool}.": "Cableado {tool}.",
+  "The wire key is shared by all wired tools and launch, so a billing workspace change applies to all of them.": "La clave de conexión la comparten todas las herramientas conectadas y launch, así que cambiar el espacio de facturación se aplica a todas.",
+  "{path}: not valid JSON — fix or remove it, nothing was written": "{path}: no es JSON válido — corríjalo o elimínelo; no se escribió nada",
   "Desktop key: {prefix}…": "Clave de escritorio: {prefix}…",
   "Claude Code Desktop: Help → Troubleshooting → Enable Developer Mode → Developer → Configure Third-Party Inference. Gateway base URL {root} (no /v1), Bearer, paste the plm_ key.":
     "Claude Code Desktop: Help → Troubleshooting → Enable Developer Mode → Developer → Configure Third-Party Inference. Gateway base URL {root} (sin /v1), Bearer, pega la clave plm_.",
@@ -244,6 +246,7 @@ export const ES = {
   "↑/↓ move • enter set model • esc back": "↑/↓ mover • enter definir modelo • esc volver",
   "⏹ aborted": "⏹ abortado",
   "⏹ generation aborted — the partial reply stays in context": "⏹ generación abortada — la respuesta parcial permanece en el contexto",
+  "partial reply kept in context": "la respuesta parcial se mantuvo en el contexto",
   "✓ installed": "✓ instalado",
   "✗ not installed —": "✗ no instalado —",
   "Log out": "Cerrar sesión",

package/src/locales/ja.mjs

@@ -169,6 +169,8 @@ export const JA = {
   "Example: pleum wire": "例: pleum wire",
   "Wrote {path}": "{path} に書きました",
   "Wired {tool}.": "{tool} を配線しました。",
+  "The wire key is shared by all wired tools and launch, so a billing workspace change applies to all of them.": "配線キーは配線済みのすべてのツールと launch で共有されるため、課金ワークスペースを変更するとすべてに適用されます。",
+  "{path}: not valid JSON — fix or remove it, nothing was written": "{path}: 有効な JSON ではありません — 修正するか削除してください。何も書き込んでいません",
   "Desktop key: {prefix}…": "デスクトップキー: {prefix}…",
   "Claude Code Desktop: Help → Troubleshooting → Enable Developer Mode → Developer → Configure Third-Party Inference. Gateway base URL {root} (no /v1), Bearer, paste the plm_ key.":
     "Claude Code Desktop: Help → Troubleshooting → Enable Developer Mode → Developer → Configure Third-Party Inference. Gateway base URL {root}（/v1 なし）、Bearer、plm_ キーを貼り付けます。",
@@ -244,6 +246,7 @@ export const JA = {
   "↑/↓ move • enter set model • esc back": "↑/↓ 移動 • enter モデル設定 • esc 戻る",
   "⏹ aborted": "⏹ 中断しました",
   "⏹ generation aborted — the partial reply stays in context": "⏹ 生成を中断しました — 途中までの応答はコンテキストに残ります",
+  "partial reply kept in context": "途中まで受信した応答をコンテキストに残しました",
   "✓ installed": "✓ インストール済み",
   "✗ not installed —": "✗ 未インストール —",
   "Log out": "ログアウト",

package/src/locales/ko.mjs

@@ -233,6 +233,7 @@ export const KO = {
   "{model} thinking…": "{model} 생각 중…",
   "⏹ aborted": "⏹ 중단됨",
   "⏹ generation aborted — the partial reply stays in context": "⏹ 생성 중단됨 — 부분 응답은 컨텍스트에 유지",
+  "partial reply kept in context": "중간까지 받은 응답을 컨텍스트에 남겼습니다",
   "Select a model": "모델 선택",
   "… {n} more — narrow with a search term": "… {n}개 더 — 검색어로 좁히기",
   "Choose a number, or search (Enter to cancel): ": "번호 선택 또는 검색어 (Enter=취소): ",
@@ -275,6 +276,8 @@ export const KO = {
   "Unsupported tool: {tool}. Use claude or codex.": "지원하지 않는 도구: {tool}. claude 또는 codex를 쓰세요.",
   "Wrote {path}": "{path}에 썼습니다",
   "Wired {tool}.": "{tool}을 배선했습니다.",
+  "The wire key is shared by all wired tools and launch, so a billing workspace change applies to all of them.": "배선 키는 배선된 모든 도구와 launch가 공유하므로, 과금 공간을 바꾸면 전부에 적용됩니다.",
+  "{path}: not valid JSON — fix or remove it, nothing was written": "{path}: JSON 형식이 아닙니다 — 고치거나 삭제하세요. 아무것도 쓰지 않았습니다",
   "Desktop key: {prefix}…": "데스크톱 키: {prefix}…",
   "Claude Code Desktop: Help → Troubleshooting → Enable Developer Mode → Developer → Configure Third-Party Inference. Gateway base URL {root} (no /v1), Bearer, paste the plm_ key.":
     "Claude Code Desktop: Help → Troubleshooting → Enable Developer Mode → Developer → Configure Third-Party Inference. Gateway base URL {root} (/v1 없음), Bearer, plm_ 키를 붙여넣으세요.",

package/src/locales/zh.mjs

@@ -169,6 +169,8 @@ export const ZH = {
   "Unsupported tool: {tool}. Use claude or codex.": "不支持的工具：{tool}。请使用 claude 或 codex。",
   "Wrote {path}": "已写入 {path}",
   "Wired {tool}.": "已接线 {tool}。",
+  "The wire key is shared by all wired tools and launch, so a billing workspace change applies to all of them.": "接入密钥由所有已接入的工具和 launch 共享，因此更改计费工作区会对全部生效。",
+  "{path}: not valid JSON — fix or remove it, nothing was written": "{path}: 不是有效的 JSON — 请修复或删除，未写入任何内容",
   "Desktop key: {prefix}…": "桌面密钥：{prefix}…",
   "Claude Code Desktop: Help → Troubleshooting → Enable Developer Mode → Developer → Configure Third-Party Inference. Gateway base URL {root} (no /v1), Bearer, paste the plm_ key.":
     "Claude Code Desktop：Help → Troubleshooting → Enable Developer Mode → Developer → Configure Third-Party Inference。Gateway base URL {root}（不要 /v1），Bearer，粘贴 plm_ 密钥。",
@@ -244,6 +246,7 @@ export const ZH = {
   "↑/↓ move • enter set model • esc back": "↑/↓ 移动 • enter 设置模型 • esc 返回",
   "⏹ aborted": "⏹ 已中止",
   "⏹ generation aborted — the partial reply stays in context": "⏹ 生成已中止 — 部分回复保留在上下文中",
+  "partial reply kept in context": "已接收的部分回复已保留在上下文中",
   "✓ installed": "✓ 已安装",
   "✗ not installed —": "✗ 未安装 —",
   "Log out": "登出",

package/src/menu.mjs

@@ -16,7 +16,7 @@ import { runSettings } from "./settings.mjs";
 import { t } from "./i18n.mjs";
 import { parseInstallCommand, runInstallCommand, printManualInstall } from "./install.mjs";
 import { getWireStatus, wire, unwire, WIRE_WARNINGS } from "./wire.mjs";
-import { selectAndBindWorkspace } from "./workspace.mjs";
+import { selectAndBindWorkspace, workspaceLabel } from "./workspace.mjs";
 
 // 값은 t() 키(영어 원문)만 담는다 — 여기서 t()를 호출하면 모듈 로드 시점(import 1회)에
 // 번역이 확정돼, 같은 프로세스 안에서 언어를 바꿔도(Settings) 이 설명들만 예전 언어로 남는다.
@@ -74,9 +74,7 @@ export function buildItems({ savedModels = {}, activeContext = { type: "personal
     title: t("Chat with a model"),
     desc: `${t("Start an interactive chat")}${savedModels.chat ? ` · ${t("model")}: ${savedModels.chat}` : ""}`,
   });
-  const contextDesc = activeContext?.type === "team" && activeContext.org_name
-    ? `${t("Team")}: ${activeContext.org_name}`
-    : t("Personal");
+  const contextDesc = workspaceLabel(activeContext);
   items.push(
     { id: "models", title: t("Model list"), desc: t("All models — price and context included") },
     { id: "balance", title: t("Balance"), desc: `${t("Check your credit balance")} · ${contextDesc}` },
@@ -624,7 +622,7 @@ export async function runWireMenu({ loop = true } = {}) {
       if (selectedModels.length > 1) {
         const defaultChoice = await select(selectedModels.map((id) => ({ id })), {
           message: `${r.label} — ${t("Select default startup model")}`,
-          formatItem: (x) => x.id,
+          formatItem: (x) => sanitizeTerminalText(x.id),
         });
         if (defaultChoice) selectedModel = defaultChoice.id;
       } else if (selectedModels.length === 1) {

package/src/run.mjs

@@ -254,6 +254,7 @@ async function repl(initialModel, initialVerbose, {
   let lastSigint = 0;
   let pickerActive = false; // /model 셀렉터가 rl을 잠시 닫는 동안 close 핸들러 무시
   let rl;
+  let queue = Promise.resolve(); // 입력 직렬화 큐 — /model 피커가 rl을 다시 만들어도 유지된다
 
   const send = async (text) => {
     let added = false;
@@ -277,7 +278,11 @@ async function repl(initialModel, initialVerbose, {
       else messages.pop(); // 응답 없음(즉시 중단 등) — user 턴 되돌림
     } catch (e) {
       console.error(`\n${style.red("✗")} ${sanitizeTerminalText(e.message)}`);
-      if (added) messages.pop(); // 실패한 user 턴 제거
+      if (e.partialText) {
+        // 중간에 끊긴 답도 맥락에 남겨 다음 질문이 이어받게 한다.
+        messages.push({ role: "assistant", content: e.partialText });
+        console.error(style.dim(t("partial reply kept in context")));
+      } else if (added) messages.pop(); // 실패한 user 턴 제거
     } finally {
       currentAbort = null;
     }
@@ -388,7 +393,10 @@ async function repl(initialModel, initialVerbose, {
       history,
       historySize: 1000,
     });
-    rl.on("line", onLine);
+    // 생성 중 입력은 순서대로 대기한다. 여러 줄을 한 질문으로 보내려면 """ 로 감싼다.
+    rl.on("line", (l) => {
+      queue = queue.then(() => onLine(l)).catch((e) => console.error(`✗ ${sanitizeTerminalText(e.message)}`));
+    });
     rl.on("close", onClose);
     rl.on("SIGINT", onSigint);
     return rl;
@@ -542,6 +550,7 @@ export async function streamChat(model, messages, {
   let cost = null;
   let firstAt = 0;
   let aborted = false;
+  let streamError = null; // 서버가 스트림 중간에 보낸 에러 프레임
   const decoder = new TextDecoder();
   try {
     for await (const chunk of res.body) {
@@ -555,6 +564,8 @@ export async function streamChat(model, messages, {
         if (data === "[DONE]") continue;
         try {
           const j = JSON.parse(data);
+          // 여기서 throw하면 아래 catch가 삼키므로 기록만 해 두고 루프 뒤에 던진다.
+          if (j.error) streamError = { message: j.error.message || "stream error", partial: j.error.partial === true };
           if (j.usage) usage = j.usage;
           if (j.cost) cost = j.cost; // 마지막 청크 — {usd, krw, fx_rate, markup_rate}
           const delta = j.choices?.[0]?.delta?.content;
@@ -583,6 +594,12 @@ export async function streamChat(model, messages, {
   sp.stop();
   md.finish();
   if (aborted) console.error(style.dim(t("⏹ generation aborted — the partial reply stays in context")));
+  if (streamError) {
+    // 받은 부분 응답을 함께 실어, REPL이 끊긴 답도 맥락에 남길 수 있게 한다.
+    const err = new Error(sanitizeTerminalText(streamError.message));
+    err.partialText = full;
+    throw err;
+  }
 
   const ms = Date.now() - t0;
   const genSec = (Date.now() - (firstAt || t0)) / 1000;

package/src/settings.mjs

@@ -6,7 +6,7 @@
 // 즉시 참조하면 순환의 평가 순서에 따라 깨질 수 있다).
 
 import { readFileSync } from "node:fs";
-import { style, sanitizeTerminalText } from "./ansi.mjs";
+import { style } from "./ansi.mjs";
 import { select, confirm } from "./interactive.mjs";
 import { readConfig, writeConfig, isLoggedIn, getActiveContext } from "./config.mjs";
 import { getLocale, LANGS, t } from "./i18n.mjs";
@@ -16,6 +16,7 @@ import { login, logout } from "./login.mjs";
 import { completion } from "./completion.mjs";
 import { lang } from "./lang.mjs";
 import { switchCreditWorkspace } from "./balance.mjs";
+import { workspaceLabel } from "./workspace.mjs";
 import { runList, saveModel } from "./menu.mjs";
 import { checkLatestVersion, isNewerVersion, runUpdateCommand } from "./update.mjs";
 
@@ -28,11 +29,7 @@ export function buildSettingsItems({
   activeContext = { type: "personal" },
   latestVersion = null,
 }) {
-  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 contextDesc = activeContext?.type === "workspace" ? workspaceLabel(activeContext) : 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,9 +1,22 @@
 import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
+import { dirname, isAbsolute, join, resolve } from "node:path";
+import {
+  chmodSync,
+  existsSync,
+  lstatSync,
+  mkdirSync,
+  readFileSync,
+  readlinkSync,
+  realpathSync,
+  renameSync,
+  statSync,
+  unlinkSync,
+  writeFileSync,
+} from "node:fs";
 import { ROOT, V1, authFetch, getActiveContext } from "./config.mjs";
 import { tomlBasicString, RECIPES } from "./recipes.mjs";
 import { t } from "./i18n.mjs";
+import { selectAndBindWorkspace, workspaceLabel } from "./workspace.mjs";
 
 export const WIRE_DEFAULT_TOOLS = ["claude", "codex"];
 export const WIRE_TOOLS = [
@@ -99,6 +112,35 @@ function readText(path) {
   }
 }
 
+// 파싱이 깨진 설정 파일은 덮어쓰지 않고 멈춘다(사용자 설정을 {}로 날리지 않게).
+class InvalidConfigError extends Error {}
+
+function parseJsonObject(text) {
+  if (!text || !text.trim()) return {};
+  let obj;
+  try {
+    obj = JSON.parse(text);
+  } catch {
+    throw new InvalidConfigError("invalid JSON");
+  }
+  if (obj === null || typeof obj !== "object" || Array.isArray(obj)) {
+    throw new InvalidConfigError("not a JSON object");
+  }
+  return obj;
+}
+
+// 설정 파일을 읽어 변환한다. 깨졌으면 경로를 붙여 던지고, 호출자는 백업·쓰기 전에 이것을 쓴다.
+function transformConfig(path, transform) {
+  try {
+    return transform(readText(path));
+  } catch (e) {
+    if (e instanceof InvalidConfigError) {
+      throw new Error(t("{path}: not valid JSON — fix or remove it, nothing was written", { path }));
+    }
+    throw e;
+  }
+}
+
 export function writeSecretFile(path, contents, mode = 0o600) {
   mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
   const tmp = `${path}.pleum-tmp-${process.pid}`;
@@ -156,13 +198,7 @@ function removeRootValue(toml, name) {
 
 // ── Claude settings.json ──────────────────────────────────────────
 export function wireClaudeSettings(existingJson, { root, key, model } = {}) {
-  let obj = {};
-  if (existingJson && existingJson.trim()) {
-    try {
-      obj = JSON.parse(existingJson);
-    } catch {}
-    if (obj === null || typeof obj !== "object" || Array.isArray(obj)) obj = {};
-  }
+  const obj = parseJsonObject(existingJson);
   obj.env = {
     ...(obj.env && typeof obj.env === "object" && !Array.isArray(obj.env) ? obj.env : {}),
     ANTHROPIC_BASE_URL: root,
@@ -193,14 +229,7 @@ export function wireClaudeSettings(existingJson, { root, key, model } = {}) {
 }
 
 export function unwireClaudeSettings(existingJson) {
-  if (!existingJson || !existingJson.trim()) return `${JSON.stringify({}, null, 2)}\n`;
-  let obj = {};
-  try {
-    obj = JSON.parse(existingJson);
-  } catch {}
-  if (obj === null || typeof obj !== "object" || Array.isArray(obj)) {
-    return `${JSON.stringify({}, null, 2)}\n`;
-  }
+  const obj = parseJsonObject(existingJson);
   if (obj.env && typeof obj.env === "object" && !Array.isArray(obj.env)) {
     for (const envKey of CLAUDE_ENV_KEYS) delete obj.env[envKey];
     if (Object.keys(obj.env).length === 0) delete obj.env;
@@ -216,18 +245,21 @@ export function wireCodexToml(existingToml, { v1, key, model = "gpt-6.1-sol", bi
   const src = existingToml ?? "";
   const previousProvider = previousValue(src, "model_provider");
   const previousModel = previousValue(src, "model");
-  const targetModel = billingOnly && previousModel ? previousModel : model;
 
   let body = stripWireBlock(src);
   body = removeTomlTable(body, "model_providers.pleum.http_headers");
   body = removeTomlTable(body, "model_providers.pleum");
   body = removeRootValue(removeRootValue(body, "model_provider"), "model");
 
+  // billing-only는 사용자 모델을 유지한다. previousModel은 이미 TOML 값("...")이라 따옴표를 다시 씌우지 않고,
+  // 원래 모델이 없었으면 model 줄을 생략해 Codex 기본값을 쓴다.
+  const modelLine = billingOnly
+    ? (previousModel ? `model = ${previousModel}\n` : "")
+    : `model = ${tomlBasicString(model)}\n`;
   const rootBlock = `${WIRE_MARKER_START}
 # previous_model_provider = ${previousProvider}
 # previous_model = ${previousModel}
-model = ${tomlBasicString(targetModel)}
-model_provider = "pleum"
+${modelLine}model_provider = "pleum"
 ${WIRE_MARKER_END}
 `;
   const providerBlock = `[model_providers.pleum]
@@ -260,13 +292,7 @@ export function unwireCodexToml(existingToml) {
 
 // ── OpenCode (opencode.json & auth.json) ──────────────────────────
 export function wireOpenCodeJson(existingJson, { v1, models = [], defaultModel } = {}) {
-  let obj = {};
-  if (existingJson && existingJson.trim()) {
-    try {
-      obj = JSON.parse(existingJson);
-    } catch {}
-  }
-  if (!obj || typeof obj !== "object" || Array.isArray(obj)) obj = {};
+  const obj = parseJsonObject(existingJson);
 
   obj.provider = obj.provider || {};
   const modelEntries = Object.fromEntries(models.map((id) => [id, {}]));
@@ -292,12 +318,7 @@ export function wireOpenCodeJson(existingJson, { v1, models = [], defaultModel }
 }
 
 export function unwireOpenCodeJson(existingJson) {
-  if (!existingJson || !existingJson.trim()) return `${JSON.stringify({}, null, 2)}\n`;
-  let obj = {};
-  try {
-    obj = JSON.parse(existingJson);
-  } catch {}
-  if (!obj || typeof obj !== "object" || Array.isArray(obj)) return `${JSON.stringify({}, null, 2)}\n`;
+  const obj = parseJsonObject(existingJson);
 
   if (obj.provider && obj.provider.pleum) {
     delete obj.provider.pleum;
@@ -315,24 +336,13 @@ export function unwireOpenCodeJson(existingJson) {
 }
 
 export function wireOpenCodeAuth(existingJson, key) {
-  let obj = {};
-  if (existingJson && existingJson.trim()) {
-    try {
-      obj = JSON.parse(existingJson);
-    } catch {}
-  }
-  if (!obj || typeof obj !== "object" || Array.isArray(obj)) obj = {};
+  const obj = parseJsonObject(existingJson);
   obj.pleum = { type: "api", key };
   return `${JSON.stringify(obj, null, 2)}\n`;
 }
 
 export function unwireOpenCodeAuth(existingJson) {
-  if (!existingJson || !existingJson.trim()) return `${JSON.stringify({}, null, 2)}\n`;
-  let obj = {};
-  try {
-    obj = JSON.parse(existingJson);
-  } catch {}
-  if (!obj || typeof obj !== "object" || Array.isArray(obj)) return `${JSON.stringify({}, null, 2)}\n`;
+  const obj = parseJsonObject(existingJson);
   delete obj.pleum;
   return `${JSON.stringify(obj, null, 2)}\n`;
 }
@@ -366,13 +376,7 @@ export function unwireAiderYaml(existingYaml = "") {
 
 // ── Crush ~/.config/crush/crush.json ──────────────────────────────
 export function wireCrushConfig(existingJson, { v1, key, models = [] } = {}) {
-  let obj = {};
-  if (existingJson && existingJson.trim()) {
-    try {
-      obj = JSON.parse(existingJson);
-    } catch {}
-  }
-  if (!obj || typeof obj !== "object" || Array.isArray(obj)) obj = {};
+  const obj = parseJsonObject(existingJson);
   obj.providers = obj.providers || {};
   obj.providers.pleum = {
     type: "openai-compat",
@@ -384,12 +388,7 @@ export function wireCrushConfig(existingJson, { v1, key, models = [] } = {}) {
 }
 
 export function unwireCrushConfig(existingJson) {
-  if (!existingJson || !existingJson.trim()) return `${JSON.stringify({}, null, 2)}\n`;
-  let obj = {};
-  try {
-    obj = JSON.parse(existingJson);
-  } catch {}
-  if (!obj || typeof obj !== "object" || Array.isArray(obj)) return `${JSON.stringify({}, null, 2)}\n`;
+  const obj = parseJsonObject(existingJson);
   if (obj.providers && obj.providers.pleum) {
     delete obj.providers.pleum;
     if (Object.keys(obj.providers).length === 0) delete obj.providers;
@@ -399,13 +398,7 @@ export function unwireCrushConfig(existingJson) {
 
 // ── Pi ~/.pi/agent/models.json ────────────────────────────────────
 export function wirePiConfig(existingJson, { v1, key, models = [] } = {}) {
-  let obj = {};
-  if (existingJson && existingJson.trim()) {
-    try {
-      obj = JSON.parse(existingJson);
-    } catch {}
-  }
-  if (!obj || typeof obj !== "object" || Array.isArray(obj)) obj = {};
+  const obj = parseJsonObject(existingJson);
   obj.providers = obj.providers || {};
   obj.providers.pleum = {
     baseUrl: v1,
@@ -417,12 +410,7 @@ export function wirePiConfig(existingJson, { v1, key, models = [] } = {}) {
 }
 
 export function unwirePiConfig(existingJson) {
-  if (!existingJson || !existingJson.trim()) return `${JSON.stringify({}, null, 2)}\n`;
-  let obj = {};
-  try {
-    obj = JSON.parse(existingJson);
-  } catch {}
-  if (!obj || typeof obj !== "object" || Array.isArray(obj)) return `${JSON.stringify({}, null, 2)}\n`;
+  const obj = parseJsonObject(existingJson);
   if (obj.providers && obj.providers.pleum) {
     delete obj.providers.pleum;
     if (Object.keys(obj.providers).length === 0) delete obj.providers;
@@ -432,45 +420,106 @@ export function unwirePiConfig(existingJson) {
 
 // ── Antigravity ~/.gemini/antigravity-cli/settings.json ────────────
 export function wireAgySettings(existingJson, { model } = {}) {
-  let obj = {};
-  if (existingJson && existingJson.trim()) {
-    try {
-      obj = JSON.parse(existingJson);
-    } catch {}
-  }
-  if (!obj || typeof obj !== "object" || Array.isArray(obj)) obj = {};
+  const obj = parseJsonObject(existingJson);
   obj.modelProvider = "gemini";
   if (model) obj.model = model;
   return `${JSON.stringify(obj, null, 2)}\n`;
 }
 
 export function unwireAgySettings(existingJson) {
-  if (!existingJson || !existingJson.trim()) return `${JSON.stringify({}, null, 2)}\n`;
-  let obj = {};
-  try {
-    obj = JSON.parse(existingJson);
-  } catch {}
-  if (!obj || typeof obj !== "object" || Array.isArray(obj)) return `${JSON.stringify({}, null, 2)}\n`;
+  const obj = parseJsonObject(existingJson);
   if (obj.modelProvider === "gemini") delete obj.modelProvider;
   delete obj.model;
   return `${JSON.stringify(obj, null, 2)}\n`;
 }
 
 // ── Shell function wrapper (rc files) ─────────────────────────────
-export function wireShellWrapper(existingRc = "", { tool, bin, envMap = {} } = {}) {
+// POSIX single quotes. `'\''` ends the quote, inserts a literal quote, and reopens it.
+export function posixSingleQuote(value) {
+  return "'" + String(value).replace(/'/g, "'\\''") + "'";
+}
+
+export function formatShellEnv(envMap = {}) {
+  const lines = Object.entries(envMap).map(
+    ([key, value]) => `export ${key}=${posixSingleQuote(value)}`,
+  );
+  return lines.length ? `${lines.join("\n")}\n` : "";
+}
+
+function shellEnvFile(paths, tool) {
+  const safe = String(tool).replace(/[^A-Za-z0-9._-]/g, "_");
+  return join(paths.home, ".pleum", "wire-env", `${safe}.env`);
+}
+
+function shellRcTarget(path) {
+  let st;
+  try {
+    st = lstatSync(path);
+  } catch {
+    return { dest: path, mode: 0o600, present: false };
+  }
+  if (!st.isSymbolicLink()) {
+    return { dest: path, mode: st.mode & 0o777, present: true };
+  }
+  let dest;
+  try {
+    dest = realpathSync(path);
+  } catch {
+    const link = readlinkSync(path);
+    dest = isAbsolute(link) ? link : resolve(dirname(path), link);
+  }
+  let mode = 0o600;
+  try {
+    mode = statSync(dest).mode & 0o777;
+  } catch {
+    // Dangling link: the file we create is new, so it gets the new-file mode.
+  }
+  return { dest, mode, present: true };
+}
+
+function readShellRc(path) {
+  const { dest, present } = shellRcTarget(path);
+  if (!present) return "";
+  return readText(dest) || "";
+}
+
+function writeShellRc(path, contents) {
+  // Rename onto the symlink path would replace the link. Write the target.
+  const { dest, mode } = shellRcTarget(path);
+  writeSecretFile(dest, contents, mode);
+}
+
+function wireShellTool(paths, tool, { bin, envMap }) {
+  const envFile = shellEnvFile(paths, tool);
+  writeSecretFile(envFile, formatShellEnv(envMap));
+  const nextRc = wireShellWrapper(readShellRc(paths.shellRc), { tool, bin, envFile });
+  writeShellRc(paths.shellRc, nextRc);
+}
+
+function unwireShellTool(paths, tool) {
+  if (shellRcTarget(paths.shellRc).present) {
+    writeShellRc(paths.shellRc, unwireShellWrapper(readShellRc(paths.shellRc), tool));
+  }
+  try {
+    unlinkSync(shellEnvFile(paths, tool));
+  } catch {
+    // Already removed.
+  }
+}
+
+export function wireShellWrapper(existingRc = "", { tool, bin, envFile } = {}) {
   const startMarker = `# pleum-wire:${tool}-start`;
   const endMarker = `# pleum-wire:${tool}-end`;
   const clean = (existingRc || "")
     .replace(new RegExp(`${startMarker}[\\s\\S]*?${endMarker}\\n?`, "g"), "")
     .trim();
 
-  const envAssignments = Object.entries(envMap)
-    .map(([k, v]) => `${k}=${JSON.stringify(String(v))}`)
-    .join(" ");
-
+  const source = envFile ? `. ${posixSingleQuote(envFile)}\n    ` : "";
   const block = `${startMarker}
 ${tool}() {
-  ${envAssignments} command ${bin || tool} "$@"
+  (
+    ${source}command ${bin || tool} "$@"
+  )
 }
 ${endMarker}`;
 
@@ -612,13 +661,34 @@ function parseJsonBody(res) {
   return res.json().catch(() => ({}));
 }
 
+// 개인 과금은 소유자의 기본 공간이다. 조회가 실패하거나 없으면 null.
+async function findDefaultWorkspaceId(auth) {
+  try {
+    const res = await auth("/workspaces");
+    if (!res.ok) return null;
+    const data = await parseJsonBody(res);
+    const items = Array.isArray(data) ? data : [];
+    return items.find((w) => w.is_default === true && w.role === "owner")?.id ?? null;
+  } catch {
+    return null;
+  }
+}
+
+// 개인 키 레코드에는 workspace_id 필드를 두지 않는다(공유 공간일 때만 남긴다).
+function withWorkspace(record, workspaceId) {
+  const next = { ...record };
+  delete next.workspace_id;
+  if (workspaceId) next.workspace_id = workspaceId;
+  return next;
+}
+
 export async function ensureWireKey({
   auth = authFetch,
   paths = wirePaths(),
   activeContext = getActiveContext(),
 } = {}) {
-  const targetWorkspaceId =
-    activeContext?.type === "workspace" ? activeContext.workspace_id : null;
+  // 과금 귀속은 키의 workspace_id가 정한다. 공유 공간이면 그 공간, 개인이면 소유자의 기본 공간.
+  const shared = activeContext?.type === "workspace" ? activeContext.workspace_id : null;
   const stored = (() => {
     try {
       return JSON.parse(readText(paths.wire) ?? "");
@@ -633,23 +703,23 @@ export async function ensureWireKey({
       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) {
-        if (
-          targetWorkspaceId &&
-          String(found.workspace_id ?? "") !== String(targetWorkspaceId)
-        ) {
+        const target = shared ?? (await findDefaultWorkspaceId(auth));
+        const current = String(found.workspace_id ?? "");
+        if (target && current !== String(target)) {
           const moved = await auth(`/workspaces/keys/${stored.id}/move`, {
             method: "POST",
             headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ target_workspace_id: targetWorkspaceId }),
+            body: JSON.stringify({ target_workspace_id: target }),
           });
           if (moved.ok) {
-            const movedRecord = { ...stored, workspace_id: targetWorkspaceId };
+            const movedRecord = withWorkspace(stored, shared);
             writeSecretFile(paths.wire, `${JSON.stringify(movedRecord, null, 2)}\n`);
             return movedRecord;
           }
-        } else {
+        } else if (target || !current) {
           return stored;
         }
+        // 그 밖(개인인데 기본 공간을 못 찾았고 키가 공유 공간에 묶인 경우)은 아래에서 새로 발급한다.
       }
     } else if (listed.status !== 404) {
       return stored;
@@ -659,9 +729,10 @@ export async function ensureWireKey({
   const created = await auth("/keys", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
+    // workspace_id를 생략하면 서버가 소유자의 기본 공간에 키를 만든다.
     body: JSON.stringify({
       name: WIRE_KEY_NAME,
-      ...(targetWorkspaceId ? { workspace_id: targetWorkspaceId } : {}),
+      ...(shared ? { workspace_id: shared } : {}),
     }),
   });
   if (!created.ok) {
@@ -675,7 +746,7 @@ export async function ensureWireKey({
     id: data.id,
     key: data.key,
     name: data.name ?? WIRE_KEY_NAME,
-    ...(targetWorkspaceId ? { workspace_id: targetWorkspaceId } : {}),
+    ...(shared ? { workspace_id: shared } : {}),
   };
   writeSecretFile(paths.wire, `${JSON.stringify(record, null, 2)}\n`);
   return record;
@@ -742,8 +813,9 @@ export function applyToolWiring(tool, paths, { key, model, models = [], billingO
 
   switch (tool) {
     case "claude": {
+      // 파싱이 끝나야 백업·쓰기로 간다 — 깨진 파일이면 .pleum.bak도 남기지 않는다.
+      const next = transformConfig(paths.claude, (text) => wireClaudeSettings(text, { root: ROOT, key, model: billingOnly ? undefined : model }));
       backupOnce(paths.claude, paths.claudeBak);
-      const next = wireClaudeSettings(readText(paths.claude), { root: ROOT, key, model: billingOnly ? undefined : model });
       writeSecretFile(paths.claude, next);
       console.log(t("Wrote {path}", { path: paths.claude }));
       break;
@@ -756,10 +828,10 @@ export function applyToolWiring(tool, paths, { key, model, models = [], billingO
       break;
     }
     case "opencode": {
+      const nextJson = transformConfig(paths.opencode, (text) => wireOpenCodeJson(text, { v1: V1, models, defaultModel: model }));
+      const nextAuth = transformConfig(paths.opencodeAuth, (text) => wireOpenCodeAuth(text, key));
       backupOnce(paths.opencode, paths.opencodeBak);
-      const nextJson = wireOpenCodeJson(readText(paths.opencode), { v1: V1, models, defaultModel: model });
       writeSecretFile(paths.opencode, nextJson);
-      const nextAuth = wireOpenCodeAuth(readText(paths.opencodeAuth), key);
       writeSecretFile(paths.opencodeAuth, nextAuth);
       console.log(t("Wrote {path}", { path: paths.opencode }));
       break;
@@ -772,26 +844,24 @@ export function applyToolWiring(tool, paths, { key, model, models = [], billingO
       break;
     }
     case "crush": {
+      const next = transformConfig(paths.crush, (text) => wireCrushConfig(text, { v1: V1, key, models }));
       backupOnce(paths.crush, paths.crushBak);
-      const next = wireCrushConfig(readText(paths.crush), { v1: V1, key, models });
       writeSecretFile(paths.crush, next);
       console.log(t("Wrote {path}", { path: paths.crush }));
       break;
     }
     case "pi": {
+      const next = transformConfig(paths.pi, (text) => wirePiConfig(text, { v1: V1, key, models }));
       backupOnce(paths.pi, paths.piBak);
-      const next = wirePiConfig(readText(paths.pi), { v1: V1, key, models });
       writeSecretFile(paths.pi, next);
       console.log(t("Wrote {path}", { path: paths.pi }));
       break;
     }
     case "agy": {
+      const nextAgy = transformConfig(paths.agy, (text) => wireAgySettings(text, { model: billingOnly ? undefined : model }));
       backupOnce(paths.agy, paths.agyBak);
-      const nextAgy = wireAgySettings(readText(paths.agy), { model: billingOnly ? undefined : model });
       writeSecretFile(paths.agy, nextAgy);
-      const rcContent = readText(paths.shellRc) || "";
-      const nextRc = wireShellWrapper(rcContent, {
-        tool: "agy",
+      wireShellTool(paths, "agy", {
         bin: "agy",
         envMap: {
           GOOGLE_GEMINI_BASE_URL: ROOT,
@@ -799,17 +869,13 @@ export function applyToolWiring(tool, paths, { key, model, models = [], billingO
           GOOGLE_API_KEY: key,
         },
       });
-      writeSecretFile(paths.shellRc, nextRc, 0o644);
       console.log(t("Wrote {path}", { path: paths.agy }));
       break;
     }
     default: {
       const r = RECIPES[tool];
       if (r) {
-        const rcContent = readText(paths.shellRc) || "";
-        const envMap = r.env(key, model);
-        const nextRc = wireShellWrapper(rcContent, { tool, bin: r.bin, envMap });
-        writeSecretFile(paths.shellRc, nextRc, 0o644);
+        wireShellTool(paths, tool, { bin: r.bin, envMap: r.env(key, model) });
         console.log(t("Wrote {path}", { path: paths.shellRc }));
       }
       break;
@@ -833,7 +899,7 @@ export function revertToolWiring(tool, paths) {
   switch (tool) {
     case "claude": {
       if (existsSync(paths.claude)) {
-        writeSecretFile(paths.claude, unwireClaudeSettings(readText(paths.claude)));
+        writeSecretFile(paths.claude, transformConfig(paths.claude, unwireClaudeSettings));
         console.log(t("Removed PleumRouter settings from {path}.", { path: paths.claude }));
       }
       break;
@@ -846,12 +912,11 @@ export function revertToolWiring(tool, paths) {
       break;
     }
     case "opencode": {
-      if (existsSync(paths.opencode)) {
-        writeSecretFile(paths.opencode, unwireOpenCodeJson(readText(paths.opencode)));
-      }
-      if (existsSync(paths.opencodeAuth)) {
-        writeSecretFile(paths.opencodeAuth, unwireOpenCodeAuth(readText(paths.opencodeAuth)));
-      }
+      // 두 파일 모두 파싱이 끝난 뒤에 쓴다(하나만 깨졌을 때 반쪽만 바뀌지 않게).
+      const nextJson = existsSync(paths.opencode) ? transformConfig(paths.opencode, unwireOpenCodeJson) : null;
+      const nextAuth = existsSync(paths.opencodeAuth) ? transformConfig(paths.opencodeAuth, unwireOpenCodeAuth) : null;
+      if (nextJson !== null) writeSecretFile(paths.opencode, nextJson);
+      if (nextAuth !== null) writeSecretFile(paths.opencodeAuth, nextAuth);
       console.log(t("Removed PleumRouter settings from {path}.", { path: paths.opencode }));
       break;
     }
@@ -864,31 +929,30 @@ export function revertToolWiring(tool, paths) {
     }
     case "crush": {
       if (existsSync(paths.crush)) {
-        writeSecretFile(paths.crush, unwireCrushConfig(readText(paths.crush)));
+        writeSecretFile(paths.crush, transformConfig(paths.crush, unwireCrushConfig));
         console.log(t("Removed PleumRouter settings from {path}.", { path: paths.crush }));
       }
       break;
     }
     case "pi": {
       if (existsSync(paths.pi)) {
-        writeSecretFile(paths.pi, unwirePiConfig(readText(paths.pi)));
+        writeSecretFile(paths.pi, transformConfig(paths.pi, unwirePiConfig));
         console.log(t("Removed PleumRouter settings from {path}.", { path: paths.pi }));
       }
       break;
     }
     case "agy": {
       if (existsSync(paths.agy)) {
-        writeSecretFile(paths.agy, unwireAgySettings(readText(paths.agy)));
-      }
-      if (existsSync(paths.shellRc)) {
-        writeSecretFile(paths.shellRc, unwireShellWrapper(readText(paths.shellRc), "agy"), 0o644);
+        writeSecretFile(paths.agy, transformConfig(paths.agy, unwireAgySettings));
       }
+      unwireShellTool(paths, "agy");
       console.log(t("Removed PleumRouter settings from {path}.", { path: paths.agy }));
       break;
     }
     default: {
-      if (existsSync(paths.shellRc)) {
-        writeSecretFile(paths.shellRc, unwireShellWrapper(readText(paths.shellRc), tool), 0o644);
+      const hadRc = shellRcTarget(paths.shellRc).present;
+      unwireShellTool(paths, tool);
+      if (hadRc) {
         console.log(t("Removed PleumRouter settings from {path}.", { path: paths.shellRc }));
       }
       break;
@@ -899,42 +963,66 @@ export function revertToolWiring(tool, paths) {
   writeWiredState(paths, state);
 }
 
+// 과금 공간은 wire 때 고른다. 대화형 터미널이면 묻고, 파이프·CI에서는 저장된 값을 쓴다.
+async function pickBillingContext(auth) {
+  const interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY && typeof process.stdin.setRawMode === "function");
+  return interactive ? selectAndBindWorkspace({ auth }) : getActiveContext();
+}
+
 export async function wire(args = [], {
   auth = authFetch,
   home = homedir(),
   model,
   models,
   billingOnly = false,
-  activeContext = getActiveContext(),
+  activeContext,
 } = {}) {
   const parsed = parseWireArgs(args);
   const tools = parsed.tools;
   const isBilling = billingOnly || parsed.billingOnly;
   const targetModel = model || parsed.model;
   const paths = wirePaths(home);
-  const record = await ensureWireKey({ auth, paths, activeContext });
+  // 메뉴 경로는 호출자가 이미 고른 값을 넘긴다(중복 질문 방지).
+  const billing = activeContext ?? (await pickBillingContext(auth));
+  const record = await ensureWireKey({ auth, paths, activeContext: billing });
 
+  // 한 도구가 깨져도 나머지는 배선한다. 실패 목록은 마지막에 한 번에 던져 exit 1이 되게 한다.
+  const failures = [];
   for (const tool of tools) {
-    applyToolWiring(tool, paths, {
-      key: record.key,
-      model: targetModel,
-      models,
-      billingOnly: isBilling,
-      activeContext,
-    });
-    console.log(t("Wired {tool}.", { tool }));
+    try {
+      applyToolWiring(tool, paths, {
+        key: record.key,
+        model: targetModel,
+        models,
+        billingOnly: isBilling,
+        activeContext: billing,
+      });
+      console.log(t("Wired {tool}.", { tool }));
+    } catch (e) {
+      failures.push(e.message);
+    }
   }
 
+  console.log(`ℹ ${t("Credit workspace")}: ${workspaceLabel(billing)}`);
+  console.log(t("The wire key is shared by all wired tools and launch, so a billing workspace change applies to all of them."));
   printDesktopHints(record);
+  if (failures.length) throw new Error(failures.join("\n"));
 }
 
 export async function unwire(args = [], { auth = authFetch, home = homedir() } = {}) {
   const { tools, revoke } = parseWireArgs(args);
   const paths = wirePaths(home);
 
+  const failures = [];
   for (const tool of tools) {
-    revertToolWiring(tool, paths);
+    try {
+      revertToolWiring(tool, paths);
+    } catch (e) {
+      failures.push(e.message);
+    }
   }
+  // 실패가 있으면 키는 폐기하지 않는다(고친 뒤 다시 unwire할 수 있게).
+  if (failures.length) throw new Error(failures.join("\n"));
 
   if (!revoke) return;
 

package/src/workspace.mjs

@@ -62,7 +62,7 @@ export function formatWorkspaceList(context, candidates = []) {
   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})`,
+      `${mark}${candidate.workspace_id}  ${sanitizeTerminalText(candidate.name)}  (${sanitizeTerminalText(candidate.role)})`,
     );
   }
   return lines.join("\n");
@@ -130,8 +130,8 @@ export async function selectAndBindWorkspace({
       type: "workspace",
       workspace_id: c.workspace_id,
       name: c.name,
-      title: `${c.name} (${c.role})`,
-      label: `${activeId === String(c.workspace_id) ? "✓ " : "  "}${sanitizeTerminalText(c.name)} (${c.role})`,
+      title: `${sanitizeTerminalText(c.name)} (${sanitizeTerminalText(c.role)})`,
+      label: `${activeId === String(c.workspace_id) ? "✓ " : "  "}${sanitizeTerminalText(c.name)} (${sanitizeTerminalText(c.role)})`,
     })),
   ];