agentlas 1.0.65 → 1.0.67

package/engine/commands/list.cjs

@@ -7,6 +7,10 @@
 const { activeRuntimeRow, listAvailableCliRuntimes } = require("../runtimes/detect.cjs");
 const { resolvedModelRole } = require("../runtimes/roles.cjs");
 const { listAgents } = require("../agents/registry.cjs");
+const { render, single } = require("../cli-output.cjs");
+
+const LIST_OUTPUT_SCHEMA = Object.freeze({ idField: "slug", columns: [] });
+const LIST_OUTPUT_FLAGS = new Set(["--json", "--yaml", "--quiet", "-q", "--no-headers", "--no-color"]);
 
 function roleRuntimeLabel(selection, role, en) {
   if (!selection) return en ? "(not set)" : "(미설정)";
@@ -25,6 +29,12 @@ function roleRuntimeLabel(selection, role, en) {
 }
 
 function run(ctx, args = []) {
+  const invalidArgs = args.filter((arg) => !LIST_OUTPUT_FLAGS.has(arg));
+  if (invalidArgs.length) {
+    const error = new Error(`Usage: agentlas list [--json|--yaml|--quiet|--no-headers|--no-color]. Unknown argument: ${invalidArgs[0]}`);
+    error.code = "INVALID_ARGUMENT";
+    throw error;
+  }
   const db = ctx.db();
   // 프라이버시 정책(웹 전용/백그라운드 제외)은 registry가 소유한다 — 직접 SQL 금지.
   const agents = listAgents(db).map((a) => ({
@@ -33,18 +43,40 @@ function run(ctx, args = []) {
   const firms = ctx.tableExists(db, "firms")
     ? db.prepare("SELECT id, slug, name FROM firms ORDER BY name").all()
     : [];
+  const output = ctx.output || {};
+  let format = output.format || "table";
+  for (const arg of args) {
+    if (arg === "--json") format = "json";
+    if (arg === "--yaml") format = "yaml";
+  }
+  const quiet = Boolean(output.quiet) || args.includes("--quiet") || args.includes("-q");
+  const noHeaders = Boolean(output.noHeaders) || args.includes("--no-headers");
+  const noColor = Boolean(output.noColor) || args.includes("--no-color");
+  const payload = () => ({
+    agents,
+    firms,
+    modelRoles: {
+      orchestrator: resolvedModelRole(db, "orchestrator"),
+      worker: resolvedModelRole(db, "worker"),
+      multimodal: resolvedModelRole(db, "multimodal"),
+    },
+  });
 
-  // clig.dev: 스크립트 소비자는 사람용 표를 파싱하게 두지 말 것 — --json 은
-  // 사람용 출력과 같은 사실을 기계 계약으로 준다.
-  if (ctx.output?.format === "json" || args.includes("--json")) {
-    const orchestrator = resolvedModelRole(db, "orchestrator");
-    const worker = resolvedModelRole(db, "worker");
-    ctx.out(JSON.stringify({ agents, firms, modelRoles: { orchestrator, worker } }, null, 2));
+  // clig.dev: 스크립트 소비자는 사람용 표를 파싱하게 두지 말 것 — 공통 출력
+  // renderer가 quiet 우선과 JSON/YAML 형식을 한 곳에서 해석한다.
+  if (quiet) {
+    const ids = agents.map((agent) => agent.slug).concat(firms.map((firm) => firm.slug || firm.id));
+    if (ids.length) ctx.out(ids.join("\n"));
+    return 0;
+  }
+  if (format === "json" || format === "yaml") {
+    ctx.out(render(single(payload(), LIST_OUTPUT_SCHEMA), { ...output, format, quiet: false }));
     return 0;
   }
 
   const en = ctx.lang === "en";
-  ctx.out(ctx.ui.bold(en ? "Installed agents" : "설치된 에이전트"));
+  const paint = (name, value) => noColor ? String(value) : ctx.ui[name](value);
+  if (!noHeaders) ctx.out(paint("bold", en ? "Installed agents" : "설치된 에이전트"));
   if (!agents.length) {
     ctx.out("  " + (en ? "(none yet — try: agentlas search \"what you need\")" : "  (아직 없음 — agentlas search \"필요한 것\" 으로 찾아보세요)"));
   }
@@ -104,31 +136,39 @@ function run(ctx, args = []) {
     // 2 indent + slug + space + name + " — " + tagline must fit one line.
     const budget = Math.max(20, cols - (2 + slugWidth + 1 + displayWidth(name) + 3));
     const shown = tag ? clampTag(tag, budget) : "";
-    ctx.out(`  ${ctx.ui.accent(clampSlug(a.slug))} ${name}${shown ? ctx.ui.dim(" — " + shown) : ""}`);
+    ctx.out(`  ${paint("accent", clampSlug(a.slug))} ${name}${shown ? paint("dim", " — " + shown) : ""}`);
   }
   if (firms.length) {
-    ctx.out("");
-    ctx.out(ctx.ui.bold(en ? "Companies" : "회사"));
+    if (!noHeaders) {
+      ctx.out("");
+      ctx.out(paint("bold", en ? "Companies" : "회사"));
+    }
     for (const f of firms) {
       const callable = String(f.slug || f.id);
-      ctx.out(`  ${ctx.ui.accent(callable.padEnd(28))} ${f.name}`);
+      ctx.out(`  ${paint("accent", callable.padEnd(28))} ${f.name}`);
     }
-    ctx.out(ctx.ui.dim(en
+    ctx.out(paint("dim", en
       ? "  Run one with: agentlas firm <company-key> \"<task>\""
       : "  실행: agentlas firm <회사 키> \"<작업>\""));
   }
 
   const active = activeRuntimeRow(db);
   const clis = listAvailableCliRuntimes();
-  ctx.out("");
-  ctx.out(ctx.ui.bold(en ? "Model roles" : "모델 역할"));
+  if (!noHeaders) {
+    ctx.out("");
+    ctx.out(paint("bold", en ? "Model roles" : "모델 역할"));
+  }
   const orchestrator = resolvedModelRole(db, "orchestrator");
   const worker = resolvedModelRole(db, "worker");
+  const multimodal = resolvedModelRole(db, "multimodal");
   ctx.out(`  orchestrator: ${roleRuntimeLabel(orchestrator, "orchestrator", en)}`);
   ctx.out(`  worker:       ${roleRuntimeLabel(worker, "worker", en)}`);
+  ctx.out(`  multimodal:   ${roleRuntimeLabel(multimodal, "multimodal", en)}`);
 
-  ctx.out("");
-  ctx.out(ctx.ui.bold(en ? "Legacy runtime compatibility" : "레거시 런타임 호환"));
+  if (!noHeaders) {
+    ctx.out("");
+    ctx.out(paint("bold", en ? "Legacy runtime compatibility" : "레거시 런타임 호환"));
+  }
   if (active) {
     ctx.out(`  active: ${active.kind}${active.model ? ` (${active.model})` : ""}${active.backend ? ` via ${active.backend}` : ""}`);
   } else {

package/engine/commands/login.cjs

@@ -9,6 +9,11 @@ const auth = require("../cloud/auth.cjs");
 
 async function run(ctx, args = []) {
   const ko = ctx.lang === "ko";
+  if (args.some((arg) => arg !== "--force") || args.filter((arg) => arg === "--force").length > 1) {
+    const error = new Error("usage: agentlas login [--force]");
+    error.code = "INVALID_ARGUMENT";
+    throw error;
+  }
   const force = args.includes("--force");
   if (!force) {
     const existing = auth.cloudSessionCookie();

package/engine/commands/logout.cjs

@@ -5,8 +5,13 @@
  */
 const auth = require("../cloud/auth.cjs");
 
-function run(ctx) {
+function run(ctx, args = []) {
   const ko = ctx.lang === "ko";
+  if (args.length) {
+    const error = new Error("usage: agentlas logout");
+    error.code = "INVALID_ARGUMENT";
+    throw error;
+  }
   let result;
   try {
     result = auth.deleteCliSession();

package/engine/commands/mcp.cjs

@@ -13,35 +13,124 @@
 const { userDataDir } = require("../core/paths.cjs");
 const { materializeTrustedSystemMcpServer } = require("../mcp/inventory.cjs");
 const { probeSystemMcpServerConnection } = require("../mcp/probe.cjs");
+const {
+  DEFAULT_OPTIONS,
+  list: outputList,
+  render,
+  single,
+  parseOutputFlags,
+  displayWidth,
+  terminalTextOf,
+} = require("../cli-output.cjs");
+
+const OUTPUT_FLAGS = new Set(["--json", "--yaml", "--quiet", "-q", "--no-headers", "--no-color"]);
+
+function commandError(message, code = "INVALID_ARGUMENT", details) {
+  const error = new Error(message);
+  error.code = code;
+  if (details !== undefined) error.details = details;
+  return error;
+}
+
+function withOutputFlags(ctx, args) {
+  if (!args.some((arg) => OUTPUT_FLAGS.has(arg))) return { ctx, args };
+  const parsed = parseOutputFlags(args);
+  return {
+    ctx: { ...ctx, output: { ...(ctx.output || DEFAULT_OPTIONS), ...parsed.options } },
+    args: parsed.rest,
+  };
+}
+
+function emit(ctx, result) {
+  if (typeof ctx.emit === "function") {
+    ctx.emit(result);
+    return;
+  }
+  ctx.out(render(result, ctx.output || DEFAULT_OPTIONS));
+}
+
+function ansi(options, code, value) {
+  const text = String(value);
+  return options?.noColor ? text : `\u001b[${code}m${text}\u001b[0m`;
+}
+
+function isMachineOutput(ctx) {
+  const output = ctx.output || DEFAULT_OPTIONS;
+  return output.quiet || output.format === "json" || output.format === "yaml";
+}
+
+function mcpListSchema(en) {
+  return Object.freeze({
+    idField: "id",
+    columns: [
+      { header: "id", field: "id" },
+      { header: en ? "name" : "이름", field: "name" },
+    ],
+    renderHuman(result, options = {}) {
+      const rows = Array.isArray(result.data) ? result.data : [];
+      if (!rows.length) {
+        return options.noHeaders ? "" : (en ? "No MCP servers registered." : "등록된 MCP 서버가 없습니다.");
+      }
+      const lines = [];
+      if (!options.noHeaders) lines.push(ansi(options, 1, en ? "MCP servers" : "MCP 서버"));
+      for (const row of rows) {
+        const id = terminalTextOf(row.id, 256);
+        const name = terminalTextOf(row.name, 4096);
+        const padding = " ".repeat(Math.max(1, 28 - displayWidth(id)));
+        lines.push(`  ${ansi(options, 36, id)}${padding}${name}`);
+      }
+      return lines.join("\n");
+    },
+  });
+}
+
+function mcpProbeSchema(en) {
+  return Object.freeze({
+    idField: "serverId",
+    columns: [
+      { header: en ? "server" : "서버", field: "serverId" },
+      { header: en ? "status" : "상태", field: "status" },
+      { header: en ? "tools" : "툴", field: "toolCount" },
+    ],
+    renderHuman(result, options = {}) {
+      const row = result.data || {};
+      const serverId = terminalTextOf(row.serverId, 256);
+      const toolCount = Number.isSafeInteger(row.toolCount) ? row.toolCount : 0;
+      const status = row.connected ? ansi(options, 32, en ? "connected" : "연결됨") : ansi(options, 31, en ? "failed" : "실패");
+      const toolLabel = en ? `${toolCount} tool(s) listed` : `툴 ${toolCount}개 확인`;
+      const note = en
+        ? "Preflight only: connection readiness does not imply tool-call success."
+        : "프리플라이트일 뿐입니다: 연결 준비됨 ≠ 툴 호출 성공.";
+      return [
+        `${status} ${ansi(options, 1, serverId)} · ${toolLabel}`,
+        ansi(options, 2, note),
+      ].join("\n");
+    },
+  });
+}
 
 function list(ctx) {
   const en = ctx.lang === "en";
   const db = ctx.db();
-  if (!ctx.tableExists(db, "mcp_servers")) {
-    ctx.out(en ? "No MCP servers registered." : "등록된 MCP 서버가 없습니다.");
-    return 0;
-  }
-  const rows = db.prepare("SELECT id, name FROM mcp_servers ORDER BY name").all();
-  if (!rows.length) {
-    ctx.out(en ? "No MCP servers registered." : "등록된 MCP 서버가 없습니다.");
-    return 0;
-  }
-  ctx.out(ctx.ui.bold(en ? "MCP servers" : "MCP 서버"));
-  for (const r of rows) ctx.out(`  ${ctx.ui.accent(String(r.id).padEnd(28))} ${r.name || ""}`);
+  const rows = ctx.tableExists(db, "mcp_servers")
+    ? db.prepare("SELECT id, name FROM mcp_servers ORDER BY name").all().map((row) => ({
+      id: String(row.id || ""),
+      name: String(row.name || ""),
+    }))
+    : [];
+  emit(ctx, outputList(rows, mcpListSchema(en)));
   return 0;
 }
 
 async function probe(ctx, args) {
   const en = ctx.lang === "en";
   const ref = String(args[0] || "").trim();
-  if (!ref) {
-    ctx.err(en ? "Usage: agentlas mcp probe <server-id|catalog-id>" : "사용법: agentlas mcp probe <server-id|catalog-id>");
-    return 1;
+  if (!ref || args.length !== 1 || ref.startsWith("-")) {
+    throw commandError(en ? "Usage: agentlas mcp probe <server-id|catalog-id>" : "사용법: agentlas mcp probe <server-id|catalog-id>");
   }
   const db = ctx.db();
   if (!ctx.tableExists(db, "mcp_servers")) {
-    ctx.err(en ? "No MCP servers registered." : "등록된 MCP 서버가 없습니다.");
-    return 1;
+    throw commandError(en ? "No MCP servers registered." : "등록된 MCP 서버가 없습니다.", "MCP_SERVER_NOT_FOUND");
   }
   // catalog_id는 데스크탑 스키마 열 — 오래된 DB에는 없을 수 있어 방어적으로 조회.
   const byCatalog = ctx.columnExists(db, "mcp_servers", "catalog_id");
@@ -49,47 +138,71 @@ async function probe(ctx, args) {
     ? db.prepare("SELECT id, catalog_id, name, name_en, transport, command, args_json, env_keys_json, enabled FROM mcp_servers WHERE id=? OR catalog_id=? LIMIT 1").get(ref, ref)
     : db.prepare("SELECT id, NULL AS catalog_id, name, name_en, transport, command, args_json, env_keys_json, enabled FROM mcp_servers WHERE id=? LIMIT 1").get(ref);
   if (!row) {
-    ctx.err(en ? `MCP server not found: ${ref}` : `MCP 서버를 찾을 수 없습니다: ${ref}`);
-    return 1;
+    throw commandError(
+      en ? `MCP server not found: ${ref}` : `MCP 서버를 찾을 수 없습니다: ${ref}`,
+      "MCP_SERVER_NOT_FOUND",
+      { serverId: ref },
+    );
   }
   const server = materializeTrustedSystemMcpServer(row, { userDataDir: userDataDir() });
   if (!server) {
     // 이유를 지어내지 않는다 — materialize는 비활성/비-stdio/안전하지 않은
     // 정의를 하나의 fail-closed로 접기 때문에 관찰 가능한 사실만 알린다.
-    ctx.err(en
-      ? `'${ref}' is not probe-eligible (disabled, non-stdio transport, or an unsafe runtime definition).`
-      : `'${ref}' 은(는) probe 대상이 아닙니다 (비활성, stdio가 아닌 transport, 또는 안전하지 않은 실행 정의).`);
-    return 1;
+    throw commandError(
+      en
+        ? `'${ref}' is not probe-eligible (disabled, non-stdio transport, or an unsafe runtime definition).`
+        : `'${ref}' 은(는) probe 대상이 아닙니다 (비활성, stdio가 아닌 transport, 또는 안전하지 않은 실행 정의).`,
+      "MCP_PROBE_INELIGIBLE",
+      { serverId: ref },
+    );
+  }
+  if (!isMachineOutput(ctx)) {
+    const options = ctx.output || DEFAULT_OPTIONS;
+    ctx.out(ansi(options, 2, en
+      ? `Probing ${server.catalog_id} (isolated child env, handshake only)…`
+      : `${server.catalog_id} 연결 확인 중 (격리 자식 env, 핸드셰이크만)…`));
   }
-  ctx.out(ctx.ui.dim(en
-    ? `Probing ${server.catalog_id} (isolated child env, handshake only)…`
-    : `${server.catalog_id} 연결 확인 중 (격리 자식 env, 핸드셰이크만)…`));
   const result = await probeSystemMcpServerConnection(server, { userDataDir: userDataDir(), cwd: process.cwd() });
-  if (result.connected) {
-    const toolCount = Array.isArray(result.tools) ? result.tools.length : 0;
-    ctx.out(`${ctx.ui.green("connected")} ${ctx.ui.bold(server.catalog_id)} · ${en ? `${toolCount} tool(s) listed` : `툴 ${toolCount}개 확인`}`);
-    ctx.out(ctx.ui.dim(en
-      ? "Preflight only: connection readiness does not imply tool-call success."
-      : "프리플라이트일 뿐입니다: 연결 준비됨 ≠ 툴 호출 성공."));
-    return 0;
+  if (!result.connected) {
+    throw commandError(
+      en
+        ? `MCP probe failed: ${server.catalog_id} · ${result.reason || "connection_failed"}`
+        : `MCP 연결 확인 실패: ${server.catalog_id} · ${result.reason || "connection_failed"}`,
+      "MCP_PROBE_FAILED",
+      { serverId: server.catalog_id, reason: result.reason || "connection_failed" },
+    );
   }
-  ctx.err(`${ctx.ui.red("failed")} ${ctx.ui.bold(server.catalog_id)} · ${result.reason}`);
-  return 1;
+  const toolCount = Array.isArray(result.tools) ? result.tools.length : 0;
+  emit(ctx, single({
+    serverId: server.catalog_id,
+    status: "connected",
+    connected: true,
+    reason: result.reason || "connected",
+    toolCount,
+  }, mcpProbeSchema(en)));
+  return 0;
 }
 
 function run(ctx, args = []) {
+  const normalized = withOutputFlags(ctx, args);
+  ctx = normalized.ctx;
+  args = normalized.args;
   const [sub, ...rest] = args;
   if (!sub) return list(ctx);
   // 무인자 기본 동작이 목록인데 이름으로 부르면 거부되는 비대칭이 있었다
   // (2026-08-05 감사 결함 G): 다른 명령들(cloud list, plugin list)이 만든
   // "list를 붙이는" 습관이 여기서만 usage 오류가 됐다.
-  if (sub === "list" || sub === "ls") return list(ctx);
+  if (sub === "list" || sub === "ls") {
+    if (rest.length) {
+      throw commandError(ctx.lang === "en" ? "Usage: agentlas mcp list" : "사용법: agentlas mcp list");
+    }
+    return list(ctx);
+  }
   if (sub === "probe") return probe(ctx, rest);
   const en = ctx.lang === "en";
-  ctx.err(en
+  throw commandError(en
     ? `unknown mcp subcommand: ${sub} (available: list · probe)`
     : `알 수 없는 mcp 하위 명령: ${sub} (사용 가능: list · probe)`);
-  return 1;
 }
 
 module.exports = { run };

package/engine/commands/memory.cjs

@@ -6,11 +6,12 @@
  * engine/agentlas-memory-import.cjs 가 소유한다(여기서는 주입만).
  * v1의 fail(process.exit)은 v2에서 throw 로 바꿔 엔진이 stderr+exit 1 처리한다.
  */
-const { cmdMemory } = require("../agentlas-memory-import.cjs");
+const { cmdMemory, parseMemoryArgs } = require("../agentlas-memory-import.cjs");
 
 function run(ctx, args) {
+  const parsed = parseMemoryArgs(args);
   cmdMemory({
-    db: ctx.db(),
+    db: parsed.help ? null : ctx.db(),
     args,
     out: ctx.out,
     fail: (msg) => { throw new Error(String(msg ?? "")); },

package/engine/commands/multimodal.cjs

@@ -51,6 +51,18 @@ function saveSettings(db, patch) {
 
 function run(ctx, args) {
   const ko = ctx.lang === "ko";
+  const usage = ko
+    ? "사용법: agentlas multimodal [set <image|video|audio> <provider-id>]"
+    : "Usage: agentlas multimodal [set <image|video|audio> <provider-id>]";
+  if (args.length === 1 && ["help", "--help", "-h"].includes(args[0])) {
+    ctx.out(usage);
+    return 0;
+  }
+  if (args.length !== 0 && !(args.length === 3 && args[0] === "set")) {
+    const error = new Error(usage);
+    error.code = "INVALID_ARGUMENT";
+    throw error;
+  }
   const db = ctx.db();
 
   if (args[0] === "set") {

package/engine/commands/native.cjs

@@ -8,6 +8,10 @@ function run(ctx, args) {
   const sub = String(args[0] || "help");
   const query = args[1];
   if (sub === "help" || sub === "--help" || sub === "-h") {
+    if (args.length > 1) {
+      ctx.err(ko ? "사용법: agentlas native help" : "usage: agentlas native help");
+      return 1;
+    }
     // SELF_HELP_COMMANDS 계약: --help 는 스텁이 아니라 실제 안내여야 한다 —
     // 무엇이 만들어지고 언제 필요한지까지 말한다.
     ctx.out(ko
@@ -29,7 +33,7 @@ function run(ctx, args) {
       ].join("\n"));
     return 0;
   }
-  if (sub !== "prepare" || !query) {
+  if (sub !== "prepare" || !query || args.length !== 2) {
     ctx.err(ko ? "사용법: agentlas native prepare <에이전트>" : "usage: agentlas native prepare <agent>");
     return 1;
   }

package/engine/commands/one.cjs

@@ -20,6 +20,7 @@
  *   agentlas one --list                One 대화 목록
  *   agentlas one --new "<프롬프트>"      새 One 대화로 시작
  *   agentlas one --chat <id> "<p>"     특정 One 대화에 이어 붙임
+ *   agentlas one -- "list 같은 옵션 모양의 프롬프트"
  *   공통: -p/--print · --runtime · --model · --effort · --permission
  */
 const readline = require("node:readline");
@@ -30,7 +31,7 @@ const { Renderer } = require("../ui/renderer.cjs");
 const permissions = require("../agentlas-permissions.cjs");
 const { EFFORTS } = require("../agentlas-workload-routing.cjs");
 const { projectCwd } = require("../project/paths.cjs");
-const { columnExists, runWriteTransaction } = require("../core/db.cjs");
+const { runWriteTransaction } = require("../core/db.cjs");
 const store = require("../sessions/store.cjs");
 
 /** 데스크탑 정본 신원(electron/architecture/manifest.ts + builtinAgentId). */
@@ -45,13 +46,8 @@ const ONE_ORIGIN_SURFACE = "one";
  * 걸러 낸다(설계). One 은 라우팅 후보가 아니라 **신원 행**이므로 직접 읽는다.
  */
 function resolveOneAgent(db) {
-  let row = null;
-  try {
-    row = db.prepare("SELECT * FROM installed_agents WHERE id=?").get(ONE_AGENT_ID)
-      || db.prepare("SELECT * FROM installed_agents WHERE slug=?").get(ONE_AGENT_SLUG);
-  } catch {
-    row = null;
-  }
+  const row = db.prepare("SELECT * FROM installed_agents WHERE id=?").get(ONE_AGENT_ID)
+    || db.prepare("SELECT * FROM installed_agents WHERE slug=?").get(ONE_AGENT_SLUG);
   return rowToAgent(row);
 }
 
@@ -78,26 +74,22 @@ function desktopOnePersona() {
 }
 
 function chatsHaveOriginSurface(db) {
-  return columnExists(db, "chats", "origin_surface");
+  return db.prepare("PRAGMA table_info(chats)").all().some((column) => column.name === "origin_surface");
 }
 
 /** One 소유 대화 목록(최근 순). origin_surface 열이 없는 구형 DB 는 에이전트 소유로 폴백. */
 function listOneChats(db, limit = 20) {
   const bounded = Math.max(1, Math.min(Number(limit) || 20, 200));
-  try {
-    if (chatsHaveOriginSurface(db)) {
-      return db.prepare(
-        "SELECT id, title, updated_at, origin_surface FROM chats " +
-        "WHERE origin_surface = ? ORDER BY updated_at DESC, rowid DESC LIMIT ?",
-      ).all(ONE_ORIGIN_SURFACE, bounded);
-    }
+  if (chatsHaveOriginSurface(db)) {
     return db.prepare(
-      "SELECT id, title, updated_at FROM chats WHERE agent_id IN (?, ?) AND (kind IS NULL OR kind <> 'division') " +
-      "ORDER BY updated_at DESC, rowid DESC LIMIT ?",
-    ).all(ONE_AGENT_ID, ONE_AGENT_SLUG, bounded);
-  } catch {
-    return [];
+      "SELECT id, title, updated_at, origin_surface FROM chats " +
+      "WHERE origin_surface = ? ORDER BY updated_at DESC, rowid DESC LIMIT ?",
+    ).all(ONE_ORIGIN_SURFACE, bounded);
   }
+  return db.prepare(
+    "SELECT id, title, updated_at FROM chats WHERE agent_id IN (?, ?) AND (kind IS NULL OR kind <> 'division') " +
+    "ORDER BY updated_at DESC, rowid DESC LIMIT ?",
+  ).all(ONE_AGENT_ID, ONE_AGENT_SLUG, bounded);
 }
 
 /**
@@ -121,19 +113,48 @@ function createOneChat(db, { agentId, title, workingFolder }) {
 }
 
 function parseArgs(args) {
-  const out = { print: false, list: false, fresh: false, chatId: null, runtime: null, model: null, effort: null, permission: null, rest: [] };
+  const out = { print: false, list: false, fresh: false, chatId: null, runtime: null, model: null, effort: null, permission: null, rest: [], error: null };
+  const readValue = (index, flag) => {
+    const value = args[index + 1];
+    if (typeof value !== "string" || !value || value === "--" || value.startsWith("--")) {
+      out.error = `${flag} requires a value`;
+      return null;
+    }
+    return value;
+  };
   for (let i = 0; i < args.length; i++) {
     const a = args[i];
+    if (a === "--") {
+      out.rest.push(...args.slice(i + 1));
+      break;
+    }
     if (a === "-p" || a === "--print") out.print = true;
-    else if (a === "--list" || a === "list") out.list = true;
-    else if (a === "--new" || a === "new") out.fresh = true;
-    else if (a === "--chat") out.chatId = args[++i];
-    else if (a === "--runtime") out.runtime = args[++i];
-    else if (a === "--model") out.model = args[++i];
-    else if (a === "--effort") out.effort = args[++i];
-    else if (a === "--permission") out.permission = args[++i];
+    else if (a === "--list") out.list = true;
+    else if (a === "--new") out.fresh = true;
+    else if (["--chat", "--runtime", "--model", "--effort", "--permission"].includes(a)) {
+      const value = readValue(i, a);
+      if (value === null) break;
+      if (a === "--chat") out.chatId = value;
+      else if (a === "--runtime") out.runtime = value;
+      else if (a === "--model") out.model = value;
+      else if (a === "--effort") out.effort = value;
+      else out.permission = value;
+      i += 1;
+    }
+    else if (a.startsWith("-")) {
+      out.error = `unknown option ${a}`;
+      break;
+    }
     else out.rest.push(a);
   }
+  if (!out.error && out.list && (
+    out.fresh || out.chatId || out.runtime || out.model || out.effort || out.permission || out.rest.length > 0
+  )) {
+    out.error = "--list cannot be combined with a prompt or execution options";
+  }
+  if (!out.error && out.fresh && out.chatId) {
+    out.error = "--new cannot be combined with --chat";
+  }
   return out;
 }
 
@@ -153,6 +174,10 @@ function renderList(ctx, rows) {
 
 async function runOne(ctx, args) {
   const parsed = parseArgs(args);
+  if (parsed.error) {
+    ctx.err(`invalid one arguments: ${parsed.error}`);
+    return 1;
+  }
   if (parsed.permission && !permissions.LEVELS.includes(String(parsed.permission))) {
     ctx.err(`unknown --permission ${parsed.permission} (use: ${permissions.LEVELS.join(" | ")})`);
     return 1;
@@ -163,12 +188,29 @@ async function runOne(ctx, args) {
   }
 
   const db = ctx.db();
+  const readChats = (limit) => {
+    try {
+      return listOneChats(db, limit);
+    } catch (error) {
+      ctx.err(`Could not read One conversations: ${String((error && error.message) || error)}`);
+      return null;
+    }
+  };
 
   // 목록은 신원 행이 없어도 답할 수 있어야 한다 — 대화는 chats 에 있고, One 행은
   // 실행에만 필요하다. 조회를 실행 전제조건 뒤에 두면 "볼 수도 없는" 화면이 된다.
-  if (parsed.list) return renderList(ctx, listOneChats(db, 20));
+  if (parsed.list) {
+    const rows = readChats(20);
+    return rows ? renderList(ctx, rows) : 1;
+  }
 
-  const agent = resolveOneAgent(db);
+  let agent;
+  try {
+    agent = resolveOneAgent(db);
+  } catch (error) {
+    ctx.err(`Could not read the Agentlas One identity: ${String((error && error.message) || error)}`);
+    return 1;
+  }
   if (!agent) {
     ctx.err(
       "Agentlas One is not present in the shared database yet.\n" +
@@ -212,14 +254,17 @@ async function runOne(ctx, args) {
   let chatId = null;
   let created = false;
   if (parsed.chatId) {
-    const row = listOneChats(db, 200).find((item) => item.id === parsed.chatId);
+    const rows = readChats(200);
+    if (!rows) return 1;
+    const row = rows.find((item) => item.id === parsed.chatId);
     if (!row) {
       ctx.err(`No One conversation with id ${parsed.chatId} (see: agentlas one --list)`);
       return 1;
     }
     chatId = row.id;
   } else if (!parsed.fresh) {
-    const recent = listOneChats(db, 1);
+    const recent = readChats(1);
+    if (!recent) return 1;
     if (recent.length) chatId = recent[0].id;
   }
   if (!chatId) {