pleumrouter 0.5.5 → 0.5.7

package/src/run.mjs

@@ -1,17 +1,44 @@
 import { createInterface } from "node:readline";
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
+import { readFileSync, writeFileSync, mkdirSync, lstatSync } from "node:fs";
 import { join } from "node:path";
-import { V1, requireKey, HISTORY_FILE, SESSIONS_DIR } from "./config.mjs";
-import { fetchModels, formatTable, matchModels } from "./models.mjs";
-import { style, divider } from "./ansi.mjs";
+import { V1, requireAuth, HISTORY_FILE, SESSIONS_DIR } from "./config.mjs";
+import { fetchModels, formatTable, matchModels, formatModelLabel, safeModelText } from "./models.mjs";
+import { style, divider, sanitizeTerminalText } from "./ansi.mjs";
 import { createMarkdownStream } from "./markdown.mjs";
 import { spinner, select } from "./interactive.mjs";
 import { t } from "./i18n.mjs";
 
-const IMG_EXT = /\.(png|jpe?g|gif|webp|bmp)$/i;
+const PNG_MAGIC = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
+const JPEG_MAGIC = Buffer.from([0xff, 0xd8, 0xff]);
+const GIF87A_MAGIC = Buffer.from("GIF87a");
+const GIF89A_MAGIC = Buffer.from("GIF89a");
+const RIFF_MAGIC = Buffer.from("RIFF");
+const WEBP_MAGIC = Buffer.from("WEBP");
+const BMP_MAGIC = Buffer.from("BM");
+const startsWith = (bytes, magic, offset = 0) =>
+  bytes.length >= offset + magic.length && bytes.subarray(offset, offset + magic.length).equals(magic);
+
+const IMAGE_FORMATS = {
+  png: { mime: "image/png", matches: (bytes) => startsWith(bytes, PNG_MAGIC) },
+  jpg: { mime: "image/jpeg", matches: (bytes) => startsWith(bytes, JPEG_MAGIC) },
+  jpeg: { mime: "image/jpeg", matches: (bytes) => startsWith(bytes, JPEG_MAGIC) },
+  gif: {
+    mime: "image/gif",
+    matches: (bytes) => startsWith(bytes, GIF87A_MAGIC) || startsWith(bytes, GIF89A_MAGIC),
+  },
+  webp: {
+    mime: "image/webp",
+    matches: (bytes) => startsWith(bytes, RIFF_MAGIC) && startsWith(bytes, WEBP_MAGIC, 8),
+  },
+  bmp: { mime: "image/bmp", matches: (bytes) => startsWith(bytes, BMP_MAGIC) },
+};
+
+export const MAX_IMAGE_ATTACHMENT_BYTES = 5 * 1024 * 1024;
+const MAX_IMAGE_ATTACHMENTS = 4;
+const MAX_TOTAL_IMAGE_ATTACHMENT_BYTES = 10 * 1024 * 1024;
 
 // `pleum run [model] ["프롬프트"...] [--verbose] [--skip-cache] [--tag a,b]
-//   [--reasoning-effort LEVEL] [--service-tier TIER] [--reasoning-mode MODE]`
+//   [--attach image] [--reasoning-effort LEVEL] [--service-tier TIER] [--reasoning-mode MODE]`
 // 인자 파싱(순수 함수 — 테스트 대상).
 const REASONING_EFFORTS = new Set(["minimal", "none", "low", "medium", "high", "xhigh", "max"]);
 const SERVICE_TIERS = new Set(["auto", "default", "flex", "background", "priority"]);
@@ -24,6 +51,7 @@ export function parseRunArgs(rest = []) {
   let reasoningEffort = null;
   let serviceTier = null;
   let reasoningMode = null;
+  const attachments = [];
   const pos = [];
   for (let i = 0; i < rest.length; i++) {
     const a = rest[i];
@@ -53,6 +81,11 @@ export function parseRunArgs(rest = []) {
         reasoningMode = v;
         i++;
       }
+    } else if (a === "--attach" || a === "-a") {
+      const path = rest[i + 1];
+      if (typeof path !== "string" || !path) throw new Error("--attach requires an image path");
+      attachments.push(path);
+      i++;
     } else pos.push(a);
   }
   return {
@@ -64,19 +97,67 @@ export function parseRunArgs(rest = []) {
     reasoningEffort,
     serviceTier,
     reasoningMode,
+    attachments,
   };
 }
 
-// 입력에서 존재하는 이미지 파일 경로를 찾아 멀티모달 content로 만든다(없으면 문자열 그대로).
-// exists/read 주입 가능 — 테스트용.
-export function buildContent(text, exists = existsSync, read = readFileSync) {
-  const imgs = text.split(/\s+/).filter((t) => IMG_EXT.test(t) && exists(t));
-  if (!imgs.length) return text;
+function imageFormat(path) {
+  const ext = /\.([a-z0-9]+)$/i.exec(path)?.[1]?.toLowerCase();
+  return ext ? IMAGE_FORMATS[ext] : null;
+}
+
+function inlineAttachmentPaths(text) {
+  // REPL에서도 안전하게 쓸 수 있도록 토큰 맨 앞 @만 명시 첨부 문법으로 해석한다.
+  // 일반적인 ./photo.png 문구와 @mention은 그대로 텍스트로 남는다.
+  return text
+    .split(/\s+/)
+    .filter((token) => token.startsWith("@") && imageFormat(token.slice(1)))
+    .map((token) => token.slice(1));
+}
+
+function imagePart(path, { lstat, read }) {
+  const format = imageFormat(path);
+  if (!format) throw new Error(`Unsupported image attachment: ${path}`);
+
+  let info;
+  try {
+    info = lstat(path);
+  } catch {
+    throw new Error(`Image attachment not found: ${path}`);
+  }
+  if (info.isSymbolicLink()) throw new Error(`Refusing symlink image attachment: ${path}`);
+  if (!info.isFile()) throw new Error(`Image attachment is not a regular file: ${path}`);
+  if (!Number.isSafeInteger(info.size) || info.size < 1) throw new Error(`Image attachment has an invalid size: ${path}`);
+  if (info.size > MAX_IMAGE_ATTACHMENT_BYTES) {
+    throw new Error(`Image attachment is too large (max ${MAX_IMAGE_ATTACHMENT_BYTES} bytes): ${path}`);
+  }
+
+  const bytes = Buffer.from(read(path));
+  if (bytes.length !== info.size) throw new Error(`Image attachment changed while reading: ${path}`);
+  if (bytes.length > MAX_IMAGE_ATTACHMENT_BYTES) {
+    throw new Error(`Image attachment is too large (max ${MAX_IMAGE_ATTACHMENT_BYTES} bytes): ${path}`);
+  }
+  if (!format.matches(bytes)) throw new Error(`Image attachment does not match its file extension: ${path}`);
+  return { type: "image_url", image_url: { url: `data:${format.mime};base64,${bytes.toString("base64")}` }, size: bytes.length };
+}
+
+// Local files are uploaded only when explicitly selected with --attach or an @path REPL token.
+// lstat/read injection keeps the filesystem checks focused and regression-testable.
+export function buildContent(text, { attachments = [], lstat = lstatSync, read = readFileSync } = {}) {
+  const paths = [...new Set([...attachments, ...inlineAttachmentPaths(text)])];
+  if (!paths.length) return text;
+  if (paths.length > MAX_IMAGE_ATTACHMENTS) {
+    throw new Error(`Too many image attachments (max ${MAX_IMAGE_ATTACHMENTS})`);
+  }
   const parts = [{ type: "text", text }];
-  for (const p of imgs) {
-    const ext = p.match(IMG_EXT)[1].toLowerCase().replace("jpg", "jpeg");
-    const b64 = Buffer.from(read(p)).toString("base64");
-    parts.push({ type: "image_url", image_url: { url: `data:image/${ext};base64,${b64}` } });
+  let totalSize = 0;
+  for (const path of paths) {
+    const { size, ...part } = imagePart(path, { lstat, read });
+    totalSize += size;
+    if (totalSize > MAX_TOTAL_IMAGE_ATTACHMENT_BYTES) {
+      throw new Error(`Total image attachments are too large (max ${MAX_TOTAL_IMAGE_ATTACHMENT_BYTES} bytes)`);
+    }
+    parts.push(part);
   }
   return parts;
 }
@@ -86,17 +167,17 @@ export function formatStats({ cost, usage, ms, tokPerSec, verbose }) {
   const bits = [];
   if (cost != null && cost !== "") bits.push(`₩${fmtCost(cost)}`);
   if (verbose && usage) {
-    bits.push(`↑${usage.prompt_tokens ?? "?"} ↓${usage.completion_tokens ?? "?"} tok`);
+    bits.push(`↑${sanitizeTerminalText(usage.prompt_tokens ?? "?")} ↓${sanitizeTerminalText(usage.completion_tokens ?? "?")} tok`);
     if (tokPerSec) bits.push(`${tokPerSec.toFixed(1)} tok/s`);
   }
-  if (verbose) bits.push(`${ms}ms`);
+  if (verbose) bits.push(`${sanitizeTerminalText(ms)}ms`);
   return bits.length ? `  (${bits.join(" · ")})` : "";
 }
 
 // 비용 표시: 숫자면 소수 2자리까지(후행 0 제거), 문자열은 그대로.
 function fmtCost(v) {
   const n = Number(v);
-  return Number.isFinite(n) ? String(+n.toFixed(2)) : String(v);
+  return Number.isFinite(n) ? String(+n.toFixed(2)) : sanitizeTerminalText(v);
 }
 
 function isAbort(e) {
@@ -114,11 +195,12 @@ export async function run(rest) {
     reasoningEffort,
     serviceTier,
     reasoningMode,
+    attachments,
   } = parseRunArgs(args);
   let model = argModel;
   const piped = await readStdin();
-  const oneShot = Boolean(inlinePrompt || piped);
-  const key = requireKey();
+  const oneShot = Boolean(inlinePrompt || piped || attachments.length);
+  const key = await requireAuth();
   const callOpts = { tags, skipCache, reasoningEffort, serviceTier, reasoningMode };
 
   if (!model && !oneShot) {
@@ -137,17 +219,16 @@ export async function run(rest) {
 
   if (oneShot) {
     const prompt = [inlinePrompt, piped].filter(Boolean).join("\n\n");
-    const content = buildContent(prompt);
-    if (Array.isArray(content)) {
-      const n = content.filter((p) => p.type === "image_url").length;
-      // 프롬프트 내 로컬 이미지 경로를 자동 첨부·업송하므로 조용히 올리지 않고 명시 고지한다(M8).
-      console.error(`ℹ ${t("Attaching and uploading {n} local image(s) from the prompt.", { n })}`);
-    }
-    const messages = [{ role: "user", content }];
     try {
+      const content = buildContent(prompt, { attachments });
+      if (Array.isArray(content)) {
+        const n = content.filter((p) => p.type === "image_url").length;
+        console.error(`ℹ ${t("Attaching and uploading {n} explicit local image(s).", { n })}`);
+      }
+      const messages = [{ role: "user", content }];
       await streamChat(key, model, messages, { verbose, quiet: true, ...callOpts });
     } catch (e) {
-      console.error(`${style.red("✗")} ${e.message}`);
+      console.error(`${style.red("✗")} ${sanitizeTerminalText(e.message)}`);
       process.exit(1);
     }
     process.exit(0);
@@ -174,11 +255,14 @@ async function repl(key, initialModel, initialVerbose, {
   let rl;
 
   const send = async (text) => {
-    messages.push({ role: "user", content: buildContent(text) });
-    const req = system ? [{ role: "system", content: system }, ...messages] : messages;
-    const ac = new AbortController();
-    currentAbort = ac;
+    let added = false;
     try {
+      const content = buildContent(text);
+      messages.push({ role: "user", content });
+      added = true;
+      const req = system ? [{ role: "system", content: system }, ...messages] : messages;
+      const ac = new AbortController();
+      currentAbort = ac;
       const reply = await streamChat(key, model, req, {
         verbose,
         signal: ac.signal,
@@ -191,8 +275,8 @@ async function repl(key, initialModel, initialVerbose, {
       if (reply) messages.push({ role: "assistant", content: reply });
       else messages.pop(); // 응답 없음(즉시 중단 등) — user 턴 되돌림
     } catch (e) {
-      console.error(`\n${style.red("✗")} ${e.message}`);
-      messages.pop(); // 실패한 user 턴 제거
+      console.error(`\n${style.red("✗")} ${sanitizeTerminalText(e.message)}`);
+      if (added) messages.pop(); // 실패한 user 턴 제거
     } finally {
       currentAbort = null;
     }
@@ -310,7 +394,7 @@ async function repl(key, initialModel, initialVerbose, {
   };
 
   makeRl(loadHistory());
-  console.log(`${style.bold(style.plum("PleumRouter"))} ${style.dim("·")} ${model}`);
+  console.log(`${style.bold(style.plum("PleumRouter"))} ${style.dim("·")} ${safeModelText(model)}`);
   console.log(style.dim(t('/help for commands · /exit to quit · wrap multi-line input in """ · Ctrl+C to stop generation')));
   console.log(divider());
   rl.prompt();
@@ -329,7 +413,7 @@ const SLASH_HELP = `Commands:
   /verbose            toggle token/speed stats
   /exit, /quit        quit
   Multi-line input: a line with """ → body → a line with """
-  Images: include an image file path right in the message (e.g. describe this ./shot.png)`;
+  Images: attach explicitly with @./shot.png (or --attach ./shot.png for one-shot commands)`;
 
 async function handleSlash(text, ctx) {
   const [cmd] = text.slice(1).split(/\s+/);
@@ -354,17 +438,17 @@ async function handleSlash(text, ctx) {
     case "model":
       if (arg) {
         ctx.model = arg;
-        console.log(`${style.green("✓")} ${t("Switched model →")} ${style.plum(arg)}`);
+        console.log(`${style.green("✓")} ${t("Switched model →")} ${style.plum(safeModelText(arg))}`);
       } else if (ctx.pickModel) {
         const picked = await ctx.pickModel();
         if (picked) {
           ctx.model = picked;
-          console.log(`${style.green("✓")} ${t("Switched model →")} ${style.plum(picked)}`);
+          console.log(`${style.green("✓")} ${t("Switched model →")} ${style.plum(safeModelText(picked))}`);
         } else {
-          console.log(`${t("Current model:")} ${style.plum(ctx.model)}`);
+          console.log(`${t("Current model:")} ${style.plum(safeModelText(ctx.model))}`);
         }
       } else {
-        console.log(`${t("Current model:")} ${ctx.model}\n${t("switch: /model <id>  ·  list: /models")}`);
+        console.log(`${t("Current model:")} ${safeModelText(ctx.model)}\n${t("switch: /model <id>  ·  list: /models")}`);
       }
       break;
     case "models":
@@ -373,7 +457,7 @@ async function handleSlash(text, ctx) {
         const rows = matchModels(models, arg);
         console.log(rows.length ? formatTable(rows) : t("No matching models"));
       } catch (e) {
-        console.error(`${style.red("✗")} ${e.message}`);
+        console.error(`${style.red("✗")} ${sanitizeTerminalText(e.message)}`);
       }
       break;
     case "save":
@@ -381,13 +465,13 @@ async function handleSlash(text, ctx) {
         const name = saveSession(arg || "last", ctx.snapshot());
         console.log(`${style.green("✓")} ${t("Session saved:")} ${name}`);
       } catch (e) {
-        console.error(`${style.red("✗")} ${t("Save failed: {error}", { error: e.message })}`);
+        console.error(`${style.red("✗")} ${t("Save failed: {error}", { error: sanitizeTerminalText(e.message) })}`);
       }
       break;
     case "load":
       try {
         ctx.restore(loadSession(arg || "last"));
-        console.log(`${style.green("✓")} ${t("Session loaded (model: {model})", { model: ctx.model })}`);
+        console.log(`${style.green("✓")} ${t("Session loaded (model: {model})", { model: safeModelText(ctx.model) })}`);
       } catch {
         console.error(`${style.red("✗")} ${t("No such session: {name}", { name: arg || "last" })}`);
       }
@@ -415,7 +499,7 @@ export async function streamChat(key, model, messages, {
   fetchImpl = fetch,
 } = {}) {
   const t0 = Date.now();
-  const sp = spinner(t("{model} thinking…", { model }));
+  const sp = spinner(t("{model} thinking…", { model: sanitizeTerminalText(model) }));
   let res;
   try {
     // 게이트웨이 패리티(0095): X-Pleum-Skip-Cache 헤더 + bounded tags 본문.
@@ -443,7 +527,7 @@ export async function streamChat(key, model, messages, {
   if (!res.ok) {
     sp.stop();
     const body = await res.text().catch(() => "");
-    throw new Error(`${res.status} ${body.slice(0, 300)}`);
+    throw new Error(`${res.status} ${sanitizeTerminalText(body.slice(0, 300))}`);
   }
 
   const md = createMarkdownStream({ prefix: quiet ? "" : `${style.plum("bot")}${style.dim(">")} ` });
@@ -470,12 +554,14 @@ export async function streamChat(key, model, messages, {
           if (j.cost) cost = j.cost; // 마지막 청크 — {usd, krw, fx_rate, markup_rate}
           const delta = j.choices?.[0]?.delta?.content;
           if (delta) {
+            const safeDelta = sanitizeTerminalText(delta);
+            if (!safeDelta) continue;
             if (!firstAt) {
               firstAt = Date.now();
               sp.stop();
             }
-            md.push(delta);
-            full += delta;
+            md.push(safeDelta);
+            full += safeDelta;
           }
         } catch {
           // 부분 청크 — 무시
@@ -512,14 +598,14 @@ async function pickModel() {
   try {
     models = await fetchModels();
   } catch (e) {
-    console.error(`${style.red("✗")} ${t("Failed to fetch model list: {error}", { error: e.message })}`);
+    console.error(`${style.red("✗")} ${t("Failed to fetch model list: {error}", { error: sanitizeTerminalText(e.message) })}`);
     return null;
   }
   if (!models.length) return null;
   if (process.stdin.isTTY && process.stdout.isTTY) {
     return select(models, {
       message: t("Select a model"),
-      formatItem: (m) => `${m.id}${m.display_name ? `  ${style.dim(m.display_name)}` : ""}`,
+      formatItem: (m) => formatModelLabel(m),
       matches: matchModels,
       limit: 12,
     }).then((m) => m?.id ?? null);
@@ -536,7 +622,7 @@ async function pickModelNumbered(models) {
     for (;;) {
       const shown = pool.slice(0, 30);
       shown.forEach((m, i) =>
-        console.log(`  ${String(i + 1).padStart(2)}. ${m.id}${m.display_name ? `  (${m.display_name})` : ""}`),
+        console.log(`  ${String(i + 1).padStart(2)}. ${formatModelLabel(m, { dim: (s) => `(${s})` })}`),
       );
       if (pool.length > shown.length) console.log(`  ${t("… {n} more — narrow with a search term", { n: pool.length - shown.length })}`);
       const ans = (await ask(`\n${t("Choose a number, or search (Enter to cancel): ")}`)).trim();

package/src/settings.mjs

@@ -6,12 +6,12 @@
 // 즉시 참조하면 순환의 평가 순서에 따라 깨질 수 있다).
 
 import { readFileSync } from "node:fs";
-import { style } from "./ansi.mjs";
+import { style, sanitizeTerminalText } from "./ansi.mjs";
 import { select, confirm } from "./interactive.mjs";
 import { readConfig, writeConfig, clearCredentials } from "./config.mjs";
 import { getLocale, LANGS, t } from "./i18n.mjs";
 import { RECIPES } from "./recipes.mjs";
-import { fetchModels, matchModels } from "./models.mjs";
+import { fetchModels, matchModels, formatModelLabel } from "./models.mjs";
 import { login } from "./login.mjs";
 import { upgrade } from "./upgrade.mjs";
 import { completion } from "./completion.mjs";
@@ -26,7 +26,11 @@ export function buildSettingsItems({ lang, loggedIn, keyPrefix, version }) {
     {
       id: "settings:account",
       title: t("Account"),
-      desc: loggedIn ? `${t("Logged in")} (${t("key")} ${keyPrefix}…)` : t("Not logged in"),
+      desc: loggedIn
+        ? keyPrefix === "oauth"
+          ? `${t("Logged in")} (${t("OAuth session")})`
+          : `${t("Logged in")} (${t("key")} ${keyPrefix}…)`
+        : t("Not logged in"),
     },
     { id: "settings:update", title: t("Update CLI"), desc: t("Current version: {version}", { version }) },
     { id: "settings:completion", title: t("Shell completion"), desc: t("Print a zsh/bash completion script") },
@@ -65,8 +69,8 @@ async function settingsSelect() {
   const cfg = readConfig();
   const items = buildSettingsItems({
     lang: getLocale(),
-    loggedIn: Boolean(cfg?.key),
-    keyPrefix: cfg?.key ? cfg.key.slice(0, 8) : null,
+    loggedIn: Boolean(cfg?.access_token || cfg?.key),
+    keyPrefix: cfg?.access_token ? "oauth" : cfg?.key ? cfg.key.slice(0, 8) : null,
     version: readVersion(),
   });
   return runList(items, {
@@ -82,12 +86,12 @@ async function pickDefaultModelFor(item) {
   try {
     models = await fetchModels();
   } catch (e) {
-    console.log(`${style.red("✗")} ${t("Failed to fetch model list: {error}", { error: e.message })}`);
+    console.log(`${style.red("✗")} ${t("Failed to fetch model list: {error}", { error: sanitizeTerminalText(e.message) })}`);
     return undefined;
   }
   const picked = await select([CLEAR_OPTION, ...models], {
     message: `${item.title} — ${t("select a model")}`,
-    formatItem: (x) => (x.isClear ? style.dim(t("Use default (clear)")) : `${x.id}${x.display_name ? `  ${style.dim(x.display_name)}` : ""}`),
+    formatItem: (x) => (x.isClear ? style.dim(t("Use default (clear)")) : formatModelLabel(x)),
     matches: matchModels, // 쿼리 입력 시 CLEAR_OPTION은 자연히 필터링됨(id/display_name 불일치) — 별도 처리 불요
     limit: 12,
   });

package/src/usage.mjs

@@ -1,7 +1,7 @@
 // `pleum usage [--by model|provider|api_key|day] [--days N]` — 내 지출 리포트.
-// GET /v1/usage/report (API 키 + usage:read 스코프 — CLI 로그인 키에 기본 동봉).
+// GET /v1/usage/report (CLI OAuth JWT → 숨은 세션 키 scopes에 usage:read).
 
-import { V1, requireKey } from "./config.mjs";
+import { authFetch } from "./config.mjs";
 import { style, padDisplay, barChart, divider } from "./ansi.mjs";
 import { t } from "./i18n.mjs";
 
@@ -50,12 +50,8 @@ export function renderUsage(data, styler = style) {
 
 export async function usage(rest) {
   const { by, days } = parseUsageArgs(rest);
-  const key = requireKey();
-  const res = await fetch(`${V1}/usage/report?group_by=${by}&days=${days}`, {
-    headers: { Authorization: `Bearer ${key}` },
-  });
+  const res = await authFetch(`/usage/report?group_by=${by}&days=${days}`);
   if (res.status === 403) {
-    // 구버전 로그인 키(usage:read 스코프 없음) — 재로그인으로 새 키를 받으면 해결.
     console.error(
       `${style.red("✗")} ${t("This API key doesn't have usage:read permission.")}\n` +
         `  ${style.dim(t("Run pleum login again to get a new key (recent keys include it by default)."))}`,