agim-cli 1.2.49 → 1.2.52

package/CHANGELOG.md

@@ -4,6 +4,63 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.2.52] - 2026-05-25
+
+### Fixed
+
+- `/models` under cursor returned "未能获取 cursor 的模型列表" on
+  systemd-launched agim because the spawned `cursor-agent` couldn't be
+  found on the stripped PATH. ModelDriver's listModels now uses the
+  same bin-resolution as the cursor adapter (env `IMHUB_CURSOR_BIN`
+  → PATH → `~/.local/bin/cursor-agent` → `/usr/local/bin/...` →
+  `/opt/cursor/bin/...`), cached for the process lifetime.
+- Tightened ANSI strip regex from `\[[0-9;]*m` (where the leading `\[`
+  was silently dropped to `[`, accidentally treating `[` as a class
+  member) to `\\[[0-9;]*m` so it matches a literal `[` followed by the
+  digit/`;` class.
+
+## [1.2.51] - 2026-05-25
+
+### Fixed
+
+- v1.2.50's npm publish workflow gated on `Run tests` failing in CI
+  because (a) the legacy `test/unit/model-command.test.ts` asserted
+  the old single-agent gating wording and (b) the
+  `src/web/agim-skills-api.test.ts` "fresh install count=0" fixture
+  was tripping on v1.2.48's multi-root skills scan inheriting
+  `~/.claude/skills` etc. on the CI box. Both tests updated to match
+  current behaviour.
+- Lint errors that had accumulated across v1.2.48-50 are now zero:
+  three `useTemplate` rewrites in `memo-rpc.ts` + `web/server.ts`,
+  one ANSI regex now built via `new RegExp` to dodge biome's
+  `noControlCharactersInRegex`, one assign-in-while-expression in
+  `parsePromptMedia` rewritten to a `for (;;)` loop, one void-return
+  in the cursor adapter test stub.
+- All `/model` + cursor adapter functionality from v1.2.50 is in this
+  release — v1.2.50 itself never landed on npm.
+
+## [1.2.50] - 2026-05-25
+
+### Added
+
+- **`/model` + `/models` now work for cursor too** — the command was
+  opencode-only; v1.2.50 refactors it into a per-agent `ModelDriver`
+  dispatch. When the active session is on cursor, `/models` runs
+  `cursor-agent models` and renders the flat list (auto / composer-2 /
+  gpt-5.x / sonnet-4 / claude-opus-4-6 / …). `/model <id>` or
+  `/model #N` switches the per-session model and the next cursor turn
+  spawns with `--model <id>`. Default model is read from
+  `~/.cursor/cli-config.json` `model.modelId`. opencode driver is
+  unchanged.
+
+### Notes
+
+- Adding a third agent now means filling in a `ModelDriver` (`listModels`
+  + `resolveDefault`) and registering it in `MODEL_DRIVERS`. No new flag
+  on AgentAdapter / Session.
+- /models output is cached per-driver for 5 min; `/models refresh`
+  clears all driver caches.
+
 ## [1.2.49] - 2026-05-24
 
 ### Added — Cursor CLI agent

package/README.md

@@ -17,7 +17,7 @@
 
 ## Highlights
 
-- **3 messengers + email, 5 CLI agents + native** — WeChat (image / file / voice), Feishu, DingTalk (image / voice with server-side ASR), Email (SMTP); Claude Code, Codex, OpenCode, Antigravity, **Cursor (v1.2.49+ · `/cs`)**, plus the in-process `native` LLM agent and any ACP endpoint
+- **3 messengers + email, 6 agents** — WeChat (image / file / voice), Feishu, DingTalk (image / voice with server-side ASR), Email (SMTP); Claude Code, Codex, OpenCode, Antigravity, **Cursor (v1.2.49+ · `/cs`)**, and the in-process `native` LLM agent (DeepSeek / Kimi / Qwen / OpenAI / Anthropic compat — `/na`). Plus any ACP endpoint.
 - **Native LLM stack (v1.3.0+, hardened in v1.2.48)** — built-in in-process agent loop (`native` adapter) that talks directly to any OpenAI- / Anthropic-compatible API (DeepSeek, Kimi, GLM, Qwen, Ollama, vLLM, OpenAI, Anthropic). v1.2.48 makes native production-ready: **operator role definition** via `~/.agim-workspaces/native/AGENTS.md` (hot-reloaded, no restart), **multimodal vision** (image attachments → openai-compat `image_url` blocks), **auto-compact** long histories (>60k chars summarised by cheap role), **provider fallback chain** on transient 5xx/timeout, **turn-level heartbeat** every 3 min so multi-hop research turns never look dead, **28-min agent-loop timeout** (was 5-min default, killed long `call_agent` chains). Use it as a cheap router for `memory-distill` / `memory-consolidate` / `intent-llm`, as a local-first chat agent (`/na`), or as a peer in A2A. See [`docs/llm-backends.md`](docs/llm-backends.md) + [`docs/architecture-bridge-and-native.md`](docs/architecture-bridge-and-native.md).
 - **Skills multi-root scan (v1.2.48+)** — `IMHUB_SKILLS_MODE=auto` (default) merges `~/.agim/skills/` (write target) with `~/.claude/skills/`, `~/.config/opencode/skills/`, `~/.codex/skills/` so a fresh install sees every skill you already have from CLI agents. Workspace skills shadow same-named inherited entries. Settings → 技能 has 2 subtabs (Installed editor + skillhub 热门); top-level `/skills` nav merged into Settings.
 - **Cross-channel outbox alert (v1.2.48+)** — when a thread's outbox is dead (e.g. wechat session expired), agim auto-invalidates the stale context-token + pushes a "⚠️ outbox 告警" to your configured backup channel (`IMHUB_OPERATOR_ALERT_PLATFORM` / `IMHUB_OPERATOR_ALERT_THREAD_ID`) so you find out before the user does.
@@ -98,7 +98,7 @@ units that call `agim` continue to work without any extra setup.
 | Category | Details |
 |----------|---------|
 | **Messengers** | WeChat (iLink — image / file / voice / video), Feishu (WebSocket), DingTalk (Stream mode — image / voice with built-in ASR), Email (SMTP, push-only) |
-| **Agents** | Claude Code, Codex, OpenCode, Antigravity (all CLI via shared `AgentBase`); **`native`** in-process LLM loop; any HTTP agent via ACP — all share one `AgentAdapter` interface |
+| **Agents** | 6 built-in: Claude Code, Codex, OpenCode, Antigravity, Cursor (CLI via shared `AgentBase`), and **`native`** (in-process LLM loop, OpenAI/Anthropic compat). Any HTTP agent via ACP — all 7 share one `AgentAdapter` interface |
 | **Native LLM** | OpenAI- + Anthropic-compatible providers, external MCP server attach, multi-iteration agent loop with policy approval gate, role bindings (`cheap` / `evaluator` / `native-chat`) |
 | **Reminders** | `/remind` slash, LLM intent detection, LLM-polished delivery, MCP tools for agents (claude-code + opencode), web `/reminders` UI |
 | **Goals + Heartbeat + Ask** | `/goal` per-thread objective, `/heartbeat` periodic DECIDE/EXECUTE/EVALUATE tick, `mcp__imhub__ask_user` structured multi-choice with `/tasks/{goals,heartbeat,asks}` cross-thread admin |
@@ -153,7 +153,7 @@ agim token bootstrap       # Print one-shot web-bootstrap token (`~/.agim/admin-
 | any text | Route to agent (sticky session, intent-classified) |
 | `/<agent> <prompt>` | Switch agent — `/cc`, `/oc`, `/cx`, `/co` |
 | `/new` | New conversation (clear context) |
-| `/model [provider/model]` | View or switch model |
+| `/model [id]` / `/models [filter]` | View / list / switch the active agent's model. Works for opencode (`provider/model`) and cursor (flat names like `gpt-5.2`, `sonnet-4-thinking`). v1.2.50+ |
 | `/think on\|off` | Toggle extended thinking |
 | `/remind …` | Reminders — see [Reminders](#reminders) below |
 | `/memo …` | 5W1H persistent memory — see [Memos](#memos) below (aliases `/记`, `/note`) |
@@ -166,6 +166,8 @@ agim token bootstrap       # Print one-shot web-bootstrap token (`~/.agim/admin-
 | `/heartbeat …` | Periodic DECIDE→EXECUTE→EVALUATE tick — `bind / unbind / show / pause / resume / status` (v1.3.0+) |
 | `/skill list\|show <name>\|refresh` | Inspect agim Skills loaded from `~/.agim/skills/` (v1.3.0+) |
 | `/cc native …` / `/na …` / `/llm …` | Route to the in-process native LLM agent (v1.3.0+) |
+| `/cs …` / `/cur …` / `/cc cursor …` | Route to Cursor CLI agent (v1.2.49+); `/cs plan` enters plan mode for one turn |
+| `/agy …` / `/cc antigravity …` | Route to Google Antigravity (agy) CLI agent |
 | `y` / `n` / `批准` / `拒绝` | Approve / deny Claude tool call (or reminder confirmation card) |
 | `1` / `2` | After a service restart, reply `1` to redo the interrupted message or `2` to cancel (10 min window) |
 

package/README.zh-CN.md

@@ -13,7 +13,7 @@
 
 ## 亮点
 
-- **3 种 IM + 邮件，5 种 CLI Agent + native** — 微信（图片 / 文件 / 语音）、飞书、钉钉（图片 / 语音，自带服务端 ASR）、Email（SMTP）；Claude Code、Codex、OpenCode、Antigravity、**Cursor（v1.2.49+ · `/cs`）**，以及内置 native 与任意 ACP 端点
+- **3 种 IM + 邮件，6 个 Agent** — 微信（图片 / 文件 / 语音）、飞书、钉钉（图片 / 语音，自带服务端 ASR）、Email（SMTP）；Claude Code、Codex、OpenCode、Antigravity、**Cursor（v1.2.49+ · `/cs`）**，以及内置 `native` LLM agent（DeepSeek / Kimi / Qwen / OpenAI / Anthropic 兼容 · `/na`）。另支持任意 ACP 端点。
 - **原生 LLM 栈（v1.3.0+，v1.2.48 强化）** — 内置 in-process agent loop（`native` adapter），直连任何 OpenAI / Anthropic 兼容 API（DeepSeek / Kimi / GLM / Qwen / Ollama / vLLM / OpenAI / Anthropic）。v1.2.48 让 native 真正进入生产可用：**角色定义** 通过 `~/.agim-workspaces/native/AGENTS.md`（热加载，无需重启）；**多模态**（图片附件 → openai-compat `image_url`）；**自动压缩**长对话（>60k 字符 → 由 cheap role 摘要）；**Provider 失败链路降级**（5xx/超时自动切下一个 role）；**轮级心跳**每 3 分钟一次"⏳ 还在处理"避免多步研究看似卡死；**agent-loop 超时拉到 28 分钟**（旧 5 分钟会切断 multi-hop `call_agent`）。可用作 `memory-distill` / `memory-consolidate` / `intent-llm` 的便宜路由，可作为本地优先的聊天 agent（`/na`），也可作 A2A 的 peer。详见 [`docs/llm-backends.md`](docs/llm-backends.md) 与 [`docs/architecture-bridge-and-native.md`](docs/architecture-bridge-and-native.md)
 - **Skills 多目录扫描（v1.2.48+）** — `IMHUB_SKILLS_MODE=auto`（默认）把 `~/.agim/skills/`（写入目标）与 `~/.claude/skills/`、`~/.config/opencode/skills/`、`~/.codex/skills/` 合并；新装即可看到所有已有 CLI agent 的技能。同名时 workspace 覆盖。Settings → 技能 改成两个子 tab（已安装编辑器 + skillhub 热门）；顶部导航条的 `/skills` 已合并进 Settings
 - **跨通道出口告警（v1.2.48+）** — 某条会话 outbox 失败 ≥3 次时（如 wechat session 过期），agim 自动失效 stale 的 context-token，并向你预设的备用通道（`IMHUB_OPERATOR_ALERT_PLATFORM` / `IMHUB_OPERATOR_ALERT_THREAD_ID`）推一条"⚠️ outbox 告警"，让你比用户更早发现
@@ -90,7 +90,7 @@ npm 包名是 `agim-cli`（短名 `agim` 被 npm 反 typo-squat 保留了）；
 | 分类 | 内容 |
 |------|------|
 | **IM 通道** | 微信（iLink — 图片 / 文件 / 语音 / 视频）、飞书（WebSocket）、钉钉（Stream 模式 — 图片 / 语音，自带服务端 ASR）、Email（SMTP，仅推送） |
-| **Agent** | Claude Code、Codex、OpenCode、Antigravity（统一 `AgentBase`）；**`native`** in-process LLM loop；任何 HTTP Agent 通过 ACP 接入——所有后端走同一份 `AgentAdapter` 接口 |
+| **Agent** | 6 个内置：Claude Code、Codex、OpenCode、Antigravity、Cursor（CLI，统一 `AgentBase`），以及 **`native`**（in-process LLM loop，OpenAI/Anthropic 兼容）。任何 HTTP Agent 通过 ACP 接入——所有 7 类后端走同一份 `AgentAdapter` 接口 |
 | **原生 LLM** | OpenAI / Anthropic 兼容 provider，外挂 MCP 服务器，多轮 agent loop + 策略式审批门，角色绑定（`cheap` / `evaluator` / `native-chat`） |
 | **提醒** | `/remind` slash、LLM 意图识别、LLM 润色投递、Agent MCP 工具（claude-code + opencode）、Web `/reminders` 页面 |
 | **长目标 + 心跳 + 提问** | `/goal` 会话级目标、`/heartbeat` 周期 DECIDE/EXECUTE/EVALUATE 节拍、`mcp__imhub__ask_user` 结构化选择题，跨会话视图在 `/tasks/{goals,heartbeat,asks}` |
@@ -145,7 +145,7 @@ agim token bootstrap       # 输出一次性 web-bootstrap token（`~/.agim/admi
 | 任意文本 | 路由到 Agent（Sticky 会话 + 意图分类） |
 | `/<agent> <内容>` | 切换 Agent — `/cc`、`/oc`、`/cx`、`/co` |
 | `/new` | 开新会话（清空历史） |
-| `/model [provider/model]` | 查看或切换模型 |
+| `/model [id]` / `/models [filter]` | 查看 / 列出 / 切换当前 agent 的模型。支持 opencode（`provider/model` 格式）与 cursor（扁平名，如 `gpt-5.2`、`sonnet-4-thinking`）。v1.2.50+ |
 | `/think on\|off` | 切换深度思考模式 |
 | `/remind …` | 提醒子系统 — 详见 [提醒](#提醒) |
 | `/memo …` | 5W1H 持久记忆库 — 详见 [备忘](#备忘)（别名 `/记`、`/note`）|
@@ -158,6 +158,8 @@ agim token bootstrap       # 输出一次性 web-bootstrap token（`~/.agim/admi
 | `/heartbeat …` | 周期 DECIDE→EXECUTE→EVALUATE 节拍——`bind / unbind / show / pause / resume / status`（v1.3.0+） |
 | `/skill list\|show <name>\|refresh` | 查看从 `~/.agim/skills/` 加载的 agim Skills（v1.3.0+） |
 | `/cc native …` / `/na …` / `/llm …` | 切换到 in-process 原生 LLM agent（v1.3.0+） |
+| `/cs …` / `/cur …` / `/cc cursor …` | 切换到 Cursor CLI agent（v1.2.49+）；`/cs plan` 单条进入 plan 模式 |
+| `/agy …` / `/cc antigravity …` | 切换到 Google Antigravity (agy) CLI agent |
 | `y` / `n` / `批准` / `拒绝` | 同意 / 拒绝（工具调用 或 提醒确认卡片） |
 | `1` / `2` | 服务重启后看到「上次消息中断」提示时，回 `1` 重发 / `2` 取消（10 分钟内有效） |
 

package/dist/core/commands/model.d.ts

@@ -1,6 +1,6 @@
 import type { RouteContext } from '../router.js';
-export declare function handleModelCommand(args: string, ctx: RouteContext): Promise<string>;
 declare function invalidateModelCache(): void;
+export declare function handleModelCommand(args: string, ctx: RouteContext): Promise<string>;
 /** Test-only diagnostic: clear caches between cases. */
 export declare const _internal: {
     invalidateModelCache: typeof invalidateModelCache;

package/dist/core/commands/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/core/commands/model.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAoBhD,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BzF;AA+FD,iBAAS,oBAAoB,IAAI,IAAI,CAGpC;AAuDD,wDAAwD;AACxD,eAAO,MAAM,SAAS;;CAA2B,CAAA"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/core/commands/model.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AA6KhD,iBAAS,oBAAoB,IAAI,IAAI,CAGpC;AAkBD,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBzF;AA4FD,wDAAwD;AACxD,eAAO,MAAM,SAAS;;CAA2B,CAAA"}

package/dist/core/commands/model.js

@@ -1,78 +1,242 @@
 // /model [name|#N] + /models [filter|refresh] — model switching & listing
 //
-// Currently only the opencode adapter ships variants/models that the
-// router can switch between, so this command is opencode-scoped. When
-// the active agent isn't opencode we surface a friendly "not supported"
-// message instead of querying the wrong CLI.
+// Originally opencode-only. v1.2.50 generalised the dispatch into a
+// per-agent `ModelDriver`, so the command works for any CLI that
+// (a) lists models via its own CLI subcommand, (b) honours a per-call
+// `--model <id>` flag, and (c) lets agim persist the picked model on
+// the session row for the next turn.
+//
+// Drivers shipped today: opencode, cursor. To add a third, fill in
+// `listModels()` + `resolveDefault()` and register in MODEL_DRIVERS.
 import { spawn } from 'node:child_process';
+import { existsSync, statSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
 import { sessionManager } from '../session.js';
-const SUPPORTED_AGENT = 'opencode';
+/** Resolve cursor-agent the same way the adapter does so systemd's
+ *  stripped PATH doesn't break `/models` while the adapter still works. */
+let cachedCursorBin = null;
+function resolveCursorBin() {
+    const override = process.env.IMHUB_CURSOR_BIN;
+    if (override)
+        return override;
+    if (cachedCursorBin !== null)
+        return cachedCursorBin ?? 'cursor-agent';
+    const candidates = [
+        join(homedir(), '.local', 'bin', 'cursor-agent'),
+        '/usr/local/bin/cursor-agent',
+        '/opt/cursor/bin/cursor-agent',
+    ];
+    for (const p of candidates) {
+        try {
+            const s = statSync(p);
+            if (s.isFile() && (s.mode & 0o111) !== 0) {
+                cachedCursorBin = p;
+                return p;
+            }
+        }
+        catch { /* not here */ }
+        if (!existsSync(p))
+            continue;
+    }
+    cachedCursorBin = undefined;
+    return 'cursor-agent';
+}
 const MODEL_LIST_TTL_MS = 5 * 60 * 1000; // 5 minutes — picks up newly-added models
 function sessionKey(ctx) {
-    // Mirrors SessionManager's key shape so the cached numbered list lives
-    // alongside the actual session state (no userId mismatch in groups).
     return `${ctx.platform}:${ctx.channelId}:${ctx.threadId}`;
 }
 function parseModelArgs(args) {
     const p = args.trim().split(/\s+/);
     return { sub: p[0] || '', rest: p.slice(1).join(' ') };
 }
+// ─── opencode driver (legacy default) ────────────────────────────────
+const opencodeDriver = {
+    label: 'opencode',
+    namespaced: true,
+    switchHint: '例: /model deepseek/deepseek-v4-pro',
+    listModels: () => new Promise((resolve) => {
+        const proc = spawn('opencode', ['models'], { stdio: ['ignore', 'pipe', 'pipe'] });
+        let out = '';
+        proc.stdout?.on('data', d => out += d.toString());
+        proc.on('close', () => {
+            const lines = out.trim().split('\n').filter(Boolean);
+            resolve(lines);
+        });
+        proc.on('error', () => resolve([]));
+    }),
+    async resolveDefault() {
+        try {
+            const { readFile } = await import('node:fs/promises');
+            const { homedir } = await import('node:os');
+            const { join } = await import('node:path');
+            const configPath = join(homedir(), '.config', 'opencode', 'opencode.json');
+            const raw = await readFile(configPath, 'utf-8');
+            const config = JSON.parse(raw);
+            const provider = config.provider;
+            if (provider) {
+                for (const [, p] of Object.entries(provider)) {
+                    if (p.models && typeof p.models === 'object') {
+                        const keys = Object.keys(p.models);
+                        if (keys.length > 0)
+                            return keys[0];
+                    }
+                }
+            }
+        }
+        catch { /* fall through */ }
+        const models = await opencodeDriver.listModels();
+        return models[0] || 'unknown';
+    },
+};
+// ─── cursor driver ───────────────────────────────────────────────────
+const cursorDriver = {
+    label: 'cursor',
+    namespaced: false,
+    switchHint: '例: /model gpt-5.2 / sonnet-4-thinking / claude-opus-4-6',
+    listModels: () => new Promise((resolve) => {
+        // cursor-agent emits:
+        //   Available models
+        //
+        //   <id> - <display name>
+        //   <id> - <display name>
+        //   ...
+        // (sometimes piped through ANSI colors — strip on parse).
+        //
+        // Bin resolution mirrors cursor adapter's: env override → PATH →
+        // ~/.local/bin → /usr/local/bin → /opt. systemd-launched agim has
+        // a stripped PATH that often misses ~/.local/bin, so the bare name
+        // fails ENOENT even when the binary is sitting there.
+        const bin = resolveCursorBin();
+        const proc = spawn(bin, ['models'], { stdio: ['ignore', 'pipe', 'pipe'] });
+        let out = '';
+        proc.stdout?.on('data', d => out += d.toString());
+        proc.on('close', () => {
+            const ids = [];
+            // ANSI CSI strip. Build via RegExp constructor so the literal
+            // ESC byte (0x1b) never lands in source (biome
+            // noControlCharactersInRegex).
+            const ansi = new RegExp(`${String.fromCharCode(0x1b)}\\[[0-9;]*m`, 'g');
+            for (const lineRaw of out.split('\n')) {
+                const line = lineRaw.replace(ansi, '').trim();
+                if (!line)
+                    continue;
+                if (line.toLowerCase().startsWith('available models'))
+                    continue;
+                const m = line.match(/^([A-Za-z0-9._-]+)\s+-\s+/);
+                if (m)
+                    ids.push(m[1]);
+            }
+            resolve(ids);
+        });
+        proc.on('error', () => resolve([]));
+    }),
+    async resolveDefault() {
+        // ~/.cursor/cli-config.json carries model.modelId.
+        try {
+            const { readFile } = await import('node:fs/promises');
+            const { homedir } = await import('node:os');
+            const { join } = await import('node:path');
+            const configPath = join(homedir(), '.cursor', 'cli-config.json');
+            const raw = await readFile(configPath, 'utf-8');
+            const config = JSON.parse(raw);
+            const model = config.model;
+            if (model?.modelId)
+                return model.modelId;
+        }
+        catch { /* fall through */ }
+        const models = await cursorDriver.listModels();
+        return models[0] || 'auto';
+    },
+};
+const MODEL_DRIVERS = {
+    opencode: opencodeDriver,
+    cursor: cursorDriver,
+};
+const SUPPORTED_AGENTS = Object.keys(MODEL_DRIVERS);
 /** Per-session cache: last /models ordered result, indexed from 1 */
 const sessionModelIndex = new Map();
+/** Per-agent list cache. Keyed by driver label. */
+const modelListCache = new Map();
+/** Per-agent default-model cache. Keyed by driver label. */
+const defaultModelCache = new Map();
+function invalidateModelCache() {
+    modelListCache.clear();
+    defaultModelCache.clear();
+}
+async function getModelList(driver) {
+    const cached = modelListCache.get(driver.label);
+    if (cached && Date.now() - cached.ts < MODEL_LIST_TTL_MS)
+        return cached.value;
+    const value = await driver.listModels();
+    modelListCache.set(driver.label, { value, ts: Date.now() });
+    return value;
+}
+async function resolveDefaultModel(driver) {
+    const cached = defaultModelCache.get(driver.label);
+    if (cached && Date.now() - cached.ts < MODEL_LIST_TTL_MS)
+        return cached.value;
+    const value = await driver.resolveDefault();
+    defaultModelCache.set(driver.label, { value, ts: Date.now() });
+    return value;
+}
 export async function handleModelCommand(args, ctx) {
     const { sub, rest } = parseModelArgs(args);
-    // /model refresh — force re-query the underlying CLI (M-5)
     if (sub === 'refresh') {
         invalidateModelCache();
         return '✅ 模型缓存已清空。下次 /models 将重新查询。';
     }
-    // Determine which agent the active session is using; fall back to default
     const session = await sessionManager.getExistingSession(ctx.platform, ctx.channelId, ctx.threadId);
     const activeAgent = session?.agent || ctx.defaultAgent;
-    if (activeAgent !== SUPPORTED_AGENT) {
-        return `ℹ️ \`/model\` 仅在 \`${SUPPORTED_AGENT}\` 下可用，当前 agent: \`${activeAgent}\`。\n\n切换到 opencode：/oc 或 /opencode`;
+    const driver = MODEL_DRIVERS[activeAgent];
+    if (!driver) {
+        const switchHint = SUPPORTED_AGENTS.map((a) => `/${a === 'opencode' ? 'oc' : a === 'cursor' ? 'cs' : a}`).join(' / ');
+        return `ℹ️ \`/model\` 在 \`${activeAgent}\` 下不可用。当前支持：${SUPPORTED_AGENTS.join(' / ')}\n\n切换：${switchHint}`;
     }
-    // /models or /models <filter> — list all models
     if (sub === 'list') {
-        return handleModelList(rest, ctx);
+        return handleModelList(driver, rest, ctx);
     }
-    // /model (no args) — show current model
     if (args.trim() === '') {
-        return handleModelCurrent(ctx);
+        return handleModelCurrent(driver, ctx);
     }
-    // /model <name|#N> — switch model (by full name, short name, or index)
-    return handleModelSwitch(args.trim(), ctx);
+    return handleModelSwitch(driver, args.trim(), ctx);
 }
-/** /models — list available models with optional filter, numbered */
-async function handleModelList(filter, ctx) {
-    const models = await getModelList();
-    const defaultModel = await resolveDefaultModel();
+async function handleModelList(driver, filter, ctx) {
+    const models = await getModelList(driver);
+    const defaultModel = await resolveDefaultModel(driver);
     const lowered = filter.toLowerCase();
     const filtered = lowered ? models.filter(m => m.toLowerCase().includes(lowered)) : models;
     if (filtered.length === 0) {
         if (filter)
             return `🔍 没有匹配 "${filter}" 的模型。`;
-        return `⚠️ 未能获取模型列表。请确认 opencode 已安装且配置了模型。`;
+        return `⚠️ 未能获取 ${driver.label} 的模型列表。请确认 CLI 已安装并已登录。`;
     }
     const session = await sessionManager.getOrCreateSession(ctx.platform, ctx.channelId, ctx.threadId, ctx.defaultAgent);
     const current = session?.model || defaultModel;
-    // Build a flat indexed list for /model #N lookup
     let idx = 1;
     const flat = [];
     const groups = new Map();
     for (const m of filtered) {
-        const parts = m.split('/');
-        const prov = parts.length >= 2 ? parts.slice(0, -1).join('/') : m;
-        const short = m.split('/').pop();
-        if (!groups.has(prov))
-            groups.set(prov, []);
-        groups.get(prov)?.push({ num: idx, short, full: m });
+        if (driver.namespaced) {
+            const parts = m.split('/');
+            const prov = parts.length >= 2 ? parts.slice(0, -1).join('/') : m;
+            const short = parts.pop();
+            if (!groups.has(prov))
+                groups.set(prov, []);
+            groups.get(prov)?.push({ num: idx, short, full: m });
+        }
+        else {
+            // Flat list — bucket under the driver label so the rendered card
+            // still has a header line.
+            if (!groups.has(driver.label))
+                groups.set(driver.label, []);
+            groups.get(driver.label)?.push({ num: idx, short: m, full: m });
+        }
         flat.push({ num: idx, full: m });
         idx++;
     }
-    // Cache indexed list keyed identically to SessionManager.
     sessionModelIndex.set(sessionKey(ctx), flat.map(f => f.full));
-    let msg = `📋 模型列表 (${filtered.length})\n\n`;
+    let msg = `📋 ${driver.label} 模型列表 (${filtered.length})\n\n`;
     for (const [prov, list] of groups) {
         msg += `**${prov}**\n`;
         for (const { num, short, full } of list) {
@@ -80,19 +244,17 @@ async function handleModelList(filter, ctx) {
             msg += `  ${String(num).padStart(3, ' ')}. \`${short}\`${tag}\n`;
         }
     }
-    msg += `\n当前: \`${current}\` ⭐\n/model <全名> 或 /model #序号 切换\n/models refresh 强制刷新缓存`;
+    msg += `\n当前: \`${current}\` ⭐\n/model <名称> 或 /model #序号 切换\n/models refresh 强制刷新缓存`;
     return msg;
 }
-/** /model — show currently selected model */
-async function handleModelCurrent(ctx) {
+async function handleModelCurrent(driver, ctx) {
     const session = await sessionManager.getOrCreateSession(ctx.platform, ctx.channelId, ctx.threadId, ctx.defaultAgent);
-    const defaultModel = await resolveDefaultModel();
+    const defaultModel = await resolveDefaultModel(driver);
     const current = session?.model || defaultModel;
-    return `🧠 当前模型: \`${current}\`\n\n使用 /model <全名> 或 /model #序号 切换\n使用 /models 查看所有模型`;
+    return `🧠 当前 ${driver.label} 模型: \`${current}\`\n\n使用 /model <名称> 或 /model #序号 切换\n使用 /models 查看所有模型`;
 }
-/** /model <name|#N> — switch to a different model */
-async function handleModelSwitch(input, ctx) {
-    // Check if input is an index reference #N or just N
+async function handleModelSwitch(driver, input, ctx) {
+    // /model #N (or /model N) — index lookup
     const indexMatch = input.match(/^#?(\d+)$/);
     if (indexMatch) {
         const num = parseInt(indexMatch[1], 10);
@@ -106,77 +268,21 @@ async function handleModelSwitch(input, ctx) {
         const model = cached[num - 1];
         await sessionManager.getOrCreateSession(ctx.platform, ctx.channelId, ctx.threadId, ctx.defaultAgent);
         await sessionManager.patchSession(ctx.platform, ctx.channelId, ctx.threadId, { model });
-        return `✅ 模型已切换: \`${model}\``;
+        return `✅ ${driver.label} 模型已切换: \`${model}\``;
     }
-    // Check if input is a short name (no /) but looks like a model name
-    if (!input.includes('/')) {
-        return `⚠️ 模型格式: provider/model\n例: /model deepseek/deepseek-v4-pro\n或: /model #5 (序号切换)\n\n先 /models 查看`;
+    // Namespaced drivers require `provider/model`; flat drivers accept bare names.
+    if (driver.namespaced && !input.includes('/')) {
+        return `⚠️ 模型格式: provider/model\n${driver.switchHint}\n或: /model #N (序号切换)\n\n先 /models 查看`;
     }
-    const models = await getModelList();
-    const exactMatch = models.find(m => m === input || m.endsWith(`/${input}`));
+    const models = await getModelList(driver);
+    const exactMatch = models.find(m => m === input || (driver.namespaced && m.endsWith(`/${input}`)));
     if (!exactMatch && models.length > 0) {
-        return `⚠️ 模型 "${input}" 不在列表中。\n\n先 /models 查看可用模型。`;
+        return `⚠️ 模型 "${input}" 不在 ${driver.label} 列表中。\n\n先 /models 查看可用模型。`;
     }
     const resolved = exactMatch || input;
     await sessionManager.getOrCreateSession(ctx.platform, ctx.channelId, ctx.threadId, ctx.defaultAgent);
     await sessionManager.patchSession(ctx.platform, ctx.channelId, ctx.threadId, { model: resolved });
-    return `✅ 模型已切换: \`${resolved}\``;
-}
-let modelListCache = null;
-let defaultModelCache = null;
-function invalidateModelCache() {
-    modelListCache = null;
-    defaultModelCache = null;
-}
-function getModelList() {
-    return new Promise((resolve) => {
-        if (modelListCache && Date.now() - modelListCache.ts < MODEL_LIST_TTL_MS) {
-            return resolve(modelListCache.value);
-        }
-        const proc = spawn('opencode', ['models'], { stdio: ['ignore', 'pipe', 'pipe'] });
-        let out = '';
-        proc.stdout?.on('data', d => out += d.toString());
-        proc.on('close', () => {
-            const lines = out.trim().split('\n').filter(Boolean);
-            modelListCache = { value: lines, ts: Date.now() };
-            resolve(lines);
-        });
-        proc.on('error', () => resolve([]));
-    });
-}
-/** Resolve opencode's actual default model name */
-async function resolveDefaultModel() {
-    if (defaultModelCache && Date.now() - defaultModelCache.ts < MODEL_LIST_TTL_MS) {
-        return defaultModelCache.value;
-    }
-    // Read opencode.json to find the first configured model as the default
-    try {
-        const { readFile } = await import('node:fs/promises');
-        const { homedir } = await import('node:os');
-        const { join } = await import('node:path');
-        const configPath = join(homedir(), '.config', 'opencode', 'opencode.json');
-        const raw = await readFile(configPath, 'utf-8');
-        const config = JSON.parse(raw);
-        const provider = config.provider;
-        if (provider) {
-            for (const [, p] of Object.entries(provider)) {
-                if (p.models && typeof p.models === 'object') {
-                    const keys = Object.keys(p.models);
-                    if (keys.length > 0) {
-                        defaultModelCache = { value: keys[0], ts: Date.now() };
-                        return keys[0];
-                    }
-                }
-            }
-        }
-    }
-    catch { /* fall through */ }
-    const models = await getModelList();
-    if (models.length > 0) {
-        defaultModelCache = { value: models[0], ts: Date.now() };
-        return models[0];
-    }
-    return 'unknown';
+    return `✅ ${driver.label} 模型已切换: \`${resolved}\``;
 }
 /** Test-only diagnostic: clear caches between cases. */
 export const _internal = { invalidateModelCache };

package/dist/core/commands/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/core/commands/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/core/commands/model.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,EAAE;AACF,oEAAoE;AACpE,iEAAiE;AACjE,sEAAsE;AACtE,qEAAqE;AACrE,qCAAqC;AACrC,EAAE;AACF,mEAAmE;AACnE,qEAAqE;AAErE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C;2EAC2E;AAC3E,IAAI,eAAe,GAA8B,IAAI,CAAA;AACrD,SAAS,gBAAgB;IACvB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAA;IAC7C,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAA;IAC7B,IAAI,eAAe,KAAK,IAAI;QAAE,OAAO,eAAe,IAAI,cAAc,CAAA;IACtE,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,CAAC;QAChD,6BAA6B;QAC7B,8BAA8B;KAC/B,CAAA;IACD,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YACrB,IAAI,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzC,eAAe,GAAG,CAAC,CAAA;gBACnB,OAAO,CAAC,CAAA;YACV,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC;QAC1B,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;YAAE,SAAQ;IAC9B,CAAC;IACD,eAAe,GAAG,SAAS,CAAA;IAC3B,OAAO,cAAc,CAAA;AACvB,CAAC;AAED,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA,CAAE,0CAA0C;AAEnF,SAAS,UAAU,CAAC,GAAiB;IACnC,OAAO,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAA;AAC3D,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAClC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;AACxD,CAAC;AAoBD,wEAAwE;AAExE,MAAM,cAAc,GAAgB;IAClC,KAAK,EAAE,UAAU;IACjB,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,oCAAoC;IAEhD,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACxC,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAA;QACjF,IAAI,GAAG,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QACjD,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACpB,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACpD,OAAO,CAAC,KAAK,CAAC,CAAA;QAChB,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;IACrC,CAAC,CAAC;IAEF,KAAK,CAAC,cAAc;QAClB,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAA;YACrD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAA;YAC3C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAA;YAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,CAAC,CAAA;YAC1E,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;YAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA4B,CAAA;YACzD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAA4E,CAAA;YACpG,IAAI,QAAQ,EAAE,CAAC;gBACb,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC7C,IAAI,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;wBAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;wBAClC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;4BAAE,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;oBACrC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;QAC9B,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,CAAA;QAChD,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IAC/B,CAAC;CACF,CAAA;AAED,wEAAwE;AAExE,MAAM,YAAY,GAAgB;IAChC,KAAK,EAAE,QAAQ;IACf,UAAU,EAAE,KAAK;IACjB,UAAU,EAAE,yDAAyD;IAErE,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACxC,sBAAsB;QACtB,qBAAqB;QACrB,EAAE;QACF,0BAA0B;QAC1B,0BAA0B;QAC1B,QAAQ;QACR,0DAA0D;QAC1D,EAAE;QACF,iEAAiE;QACjE,kEAAkE;QAClE,mEAAmE;QACnE,sDAAsD;QACtD,MAAM,GAAG,GAAG,gBAAgB,EAAE,CAAA;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAA;QAC1E,IAAI,GAAG,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QACjD,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACpB,MAAM,GAAG,GAAa,EAAE,CAAA;YACxB,8DAA8D;YAC9D,+CAA+C;YAC/C,+BAA+B;YAC/B,MAAM,IAAI,GAAG,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,CAAA;YACvE,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC7C,IAAI,CAAC,IAAI;oBAAE,SAAQ;gBACnB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC;oBAAE,SAAQ;gBAC/D,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAA;gBACjD,IAAI,CAAC;oBAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACvB,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,CAAA;QACd,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;IACrC,CAAC,CAAC;IAEF,KAAK,CAAC,cAAc;QAClB,mDAAmD;QACnD,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAA;YACrD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAA;YAC3C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAA;YAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAA;YAChE,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;YAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA4B,CAAA;YACzD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAyC,CAAA;YAC9D,IAAI,KAAK,EAAE,OAAO;gBAAE,OAAO,KAAK,CAAC,OAAO,CAAA;QAC1C,CAAC;QAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;QAC9B,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAA;QAC9C,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAA;IAC5B,CAAC;CACF,CAAA;AAED,MAAM,aAAa,GAAgC;IACjD,QAAQ,EAAE,cAAc;IACxB,MAAM,EAAE,YAAY;CACrB,CAAA;AAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;AAEnD,qEAAqE;AACrE,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAoB,CAAA;AAErD,mDAAmD;AACnD,MAAM,cAAc,GAAG,IAAI,GAAG,EAA+B,CAAA;AAC7D,4DAA4D;AAC5D,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAA6B,CAAA;AAE9D,SAAS,oBAAoB;IAC3B,cAAc,CAAC,KAAK,EAAE,CAAA;IACtB,iBAAiB,CAAC,KAAK,EAAE,CAAA;AAC3B,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,MAAmB;IAC7C,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC/C,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,EAAE,GAAG,iBAAiB;QAAE,OAAO,MAAM,CAAC,KAAK,CAAA;IAC7E,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,CAAA;IACvC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAC3D,OAAO,KAAK,CAAA;AACd,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,MAAmB;IACpD,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAClD,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,EAAE,GAAG,iBAAiB;QAAE,OAAO,MAAM,CAAC,KAAK,CAAA;IAC7E,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,cAAc,EAAE,CAAA;IAC3C,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAC9D,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,IAAY,EAAE,GAAiB;IACtE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,CAAA;IAE1C,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,oBAAoB,EAAE,CAAA;QACtB,OAAO,6BAA6B,CAAA;IACtC,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;IAClG,MAAM,WAAW,GAAG,OAAO,EAAE,KAAK,IAAI,GAAG,CAAC,YAAY,CAAA;IACtD,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAAA;IACzC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,UAAU,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACrH,OAAO,qBAAqB,WAAW,gBAAgB,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,UAAU,EAAE,CAAA;IAC3G,CAAC;IAED,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;QACnB,OAAO,eAAe,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;IAC3C,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACvB,OAAO,kBAAkB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACxC,CAAC;IAED,OAAO,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAA;AACpD,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,MAAmB,EAAE,MAAc,EAAE,GAAiB;IACnF,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,CAAA;IACzC,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAA;IACtD,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,EAAE,CAAA;IACpC,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;IAEzF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,IAAI,MAAM;YAAE,OAAO,YAAY,MAAM,QAAQ,CAAA;QAC7C,OAAO,WAAW,MAAM,CAAC,KAAK,yBAAyB,CAAA;IACzD,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,YAAY,CAAC,CAAA;IACpH,MAAM,OAAO,GAAG,OAAO,EAAE,KAAK,IAAI,YAAY,CAAA;IAE9C,IAAI,GAAG,GAAG,CAAC,CAAA;IACX,MAAM,IAAI,GAAoC,EAAE,CAAA;IAChD,MAAM,MAAM,GAAG,IAAI,GAAG,EAA0D,CAAA;IAChF,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACjE,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAY,CAAA;YACnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YAC3C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;QACtD,CAAC;aAAM,CAAC;YACN,iEAAiE;YACjE,2BAA2B;YAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;gBAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YAC3D,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;QACjE,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;QAChC,GAAG,EAAE,CAAA;IACP,CAAC;IAED,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IAE7D,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,MAAM,OAAO,CAAA;IAC5D,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC;QAClC,GAAG,IAAI,KAAK,IAAI,MAAM,CAAA;QACtB,KAAK,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YACxC,MAAM,GAAG,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAA;YACxC,GAAG,IAAI,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,KAAK,KAAK,GAAG,IAAI,CAAA;QAClE,CAAC;IACH,CAAC;IACD,GAAG,IAAI,WAAW,OAAO,2DAA2D,CAAA;IACpF,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,MAAmB,EAAE,GAAiB;IACtE,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,YAAY,CAAC,CAAA;IACpH,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAA;IACtD,MAAM,OAAO,GAAG,OAAO,EAAE,KAAK,IAAI,YAAY,CAAA;IAC9C,OAAO,SAAS,MAAM,CAAC,KAAK,UAAU,OAAO,yDAAyD,CAAA;AACxG,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,MAAmB,EAAE,KAAa,EAAE,GAAiB;IACpF,yCAAyC;IACzC,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IAC3C,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QACvC,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;QACrD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,8CAA8C,CAAA;QACvD,CAAC;QACD,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;YACnC,OAAO,SAAS,GAAG,iBAAiB,MAAM,CAAC,MAAM,uBAAuB,CAAA;QAC1E,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAA;QAC7B,MAAM,cAAc,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,YAAY,CAAC,CAAA;QACpG,MAAM,cAAc,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QACvF,OAAO,KAAK,MAAM,CAAC,KAAK,aAAa,KAAK,IAAI,CAAA;IAChD,CAAC;IAED,+EAA+E;IAC/E,IAAI,MAAM,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9C,OAAO,4BAA4B,MAAM,CAAC,UAAU,uCAAuC,CAAA;IAC7F,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,CAAA;IACzC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IAClG,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrC,OAAO,UAAU,KAAK,QAAQ,MAAM,CAAC,KAAK,4BAA4B,CAAA;IACxE,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,IAAI,KAAK,CAAA;IACpC,MAAM,cAAc,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,YAAY,CAAC,CAAA;IACpG,MAAM,cAAc,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;IACjG,OAAO,KAAK,MAAM,CAAC,KAAK,aAAa,QAAQ,IAAI,CAAA;AACnD,CAAC;AAED,wDAAwD;AACxD,MAAM,CAAC,MAAM,SAAS,GAAG,EAAE,oBAAoB,EAAE,CAAA"}

package/dist/core/memo-rpc.js

@@ -110,7 +110,7 @@ async function handleSave(payload, ctx) {
         }
         const geo = await geocodeAddress(address);
         if (!geo.ok) {
-            return { ok: false, error: `geocode failed: ${geo.reason}${geo.message ? ' (' + geo.message + ')' : ''}` };
+            return { ok: false, error: `geocode failed: ${geo.reason}${geo.message ? ` (${geo.message})` : ''}` };
         }
         whereLat = geo.lat;
         whereLng = geo.lng;
@@ -247,7 +247,7 @@ async function handleUpdate(payload, ctx) {
             }
             const geo = await geocodeAddress(payload.address.trim());
             if (!geo.ok) {
-                return { ok: false, error: `geocode failed: ${geo.reason}${geo.message ? ' (' + geo.message + ')' : ''}` };
+                return { ok: false, error: `geocode failed: ${geo.reason}${geo.message ? ` (${geo.message})` : ''}` };
             }
             u.whereLat = geo.lat;
             u.whereLng = geo.lng;