@vicvic-im/agent-bot 0.1.3 → 0.1.5

package/dist/core/state.d.ts

@@ -10,6 +10,13 @@ export interface VbotState {
     createdAt: string;
     lastUsedAt: string;
     usage: Usage;
+    /** 上次从 ACP 读到的模型；仅作重启后的展示缓存，权威值始终来自 agent。 */
+    model: CachedModel | null;
+}
+/** 模型缓存：只存展示需要的最小字段，不存 options 列表。 */
+export interface CachedModel {
+    value: string;
+    label: string;
 }
 /** token 的 SHA-256 前 16 位：不落明文 token，且一个 token 稳定对应一个状态文件。 */
 export declare function tokenHash(token: string): string;

package/dist/core/state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/core/state.ts"],"names":[],"mappings":"AAWA,OAAO,EAAe,KAAK,SAAS,EAAE,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE7E,0CAA0C;AAC1C,wBAAgB,QAAQ,IAAI,MAAM,CAEjC;AAED,wBAAgB,QAAQ,IAAI,MAAM,CAEjC;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,SAAS,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;CACd;AAED,8DAA8D;AAC9D,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAWlF;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAwBzD;AAED,gCAAgC;AAChC,wBAAgB,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAOhD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAS9C"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/core/state.ts"],"names":[],"mappings":"AAWA,OAAO,EAAe,KAAK,SAAS,EAAE,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE7E,0CAA0C;AAC1C,wBAAgB,QAAQ,IAAI,MAAM,CAEjC;AAED,wBAAgB,QAAQ,IAAI,MAAM,CAEjC;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,SAAS,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,8CAA8C;IAC9C,KAAK,EAAE,WAAW,GAAG,IAAI,CAAC;CAC3B;AAED,sCAAsC;AACtC,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,8DAA8D;AAC9D,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAYlF;AAUD,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAyBzD;AAED,gCAAgC;AAChC,wBAAgB,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAOhD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAS9C"}

package/dist/core/switch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"switch.d.ts","sourceRoot":"","sources":["../../src/core/switch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,KAAK,YAAY,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,IAAI,YAAY,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IACpC,UAAU,IAAI,IAAI,CAAC;IACnB,SAAS,IAAI,IAAI,CAAC;IAClB,0BAA0B;IAC1B,WAAW,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC;CAClE;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAsBtF"}
+{"version":3,"file":"switch.d.ts","sourceRoot":"","sources":["../../src/core/switch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,KAAK,YAAY,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,IAAI,YAAY,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IACpC,UAAU,IAAI,IAAI,CAAC;IACnB,SAAS,IAAI,IAAI,CAAC;IAClB,0BAA0B;IAC1B,WAAW,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC;CAClE;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAwBtF"}

package/dist/index.cjs

@@ -361,7 +361,7 @@ var acp = __toESM(require("@agentclientprotocol/sdk"), 1);
 var EMPTY_USAGE = { used: 0, size: 0, cost: null };
 
 // src/version.ts
-var VBOT_VERSION = "0.1.3";
+var VBOT_VERSION = "0.1.5";
 
 // src/agents/acp.ts
 var AgentAbortError = class extends Error {
@@ -424,6 +424,11 @@ var AcpAgent = class {
     const label = options.find((entry) => entry.value === value)?.label ?? value;
     return { value, label, options };
   }
+  // 不跑 prompt 也能读模型：session/new|resume|load 的 configOptions 里带 model 项。
+  async warmup(savedSessionId) {
+    await this.start();
+    await this.ensureSession(savedSessionId);
+  }
   resetSession() {
     this.session = null;
   }
@@ -760,7 +765,7 @@ var HELP_ROWS = [
   ["/stop", "Abort the current request"],
   ["/status", "Show agent, session and queue status"],
   ["/agent [name]", "Show or switch agent backend"],
-  ["/model [name]", "Show or switch model"],
+  ["/model [name]", "Show or switch model (/model list for all)"],
   ["/cost", "Show context usage and cost"],
   ["/version", "Show vbot version"],
   ["/help", "Show this help"]
@@ -768,6 +773,7 @@ var HELP_ROWS = [
 var HELP_FOOTER = "Other /commands are sent to the agent as prompts.";
 var NEW_BUSY_TEXT = "Cannot reset the session while a request is running. Use /stop first.";
 var MODEL_BUSY_TEXT = "Cannot switch model while a request is running. Use /stop first.";
+var INLINE_OPTION_LIMIT = 8;
 var HELP_TEXT = [
   table(
     ["Command", "Description"],
@@ -831,9 +837,11 @@ function compactPath(path) {
 function modelText(runtime) {
   const current = runtime.agent().currentModel();
   if (current) return current.label;
+  const cached = runtime.state().model;
+  if (cached) return `${cached.label} (last known)`;
   const configured = runtime.config().agent.model;
   if (configured) return `${configured} (configured, not applied yet)`;
-  return "unknown (session not started)";
+  return "unknown (send /model list)";
 }
 function handleSlashCommand(runtime, text, send) {
   const [rawCommand, ...args] = text.split(/\s+/);
@@ -923,7 +931,11 @@ function handleAgent(runtime, args, send) {
 async function handleModel(runtime, args, send) {
   const model = args.join(" ").trim();
   if (!model) {
-    send(modelReport(runtime));
+    await reportModel(runtime, send, false);
+    return;
+  }
+  if (model.toLowerCase() === "list") {
+    await reportModel(runtime, send, true);
     return;
   }
   if (runtime.queue().status().busy) {
@@ -938,7 +950,12 @@ async function handleModel(runtime, args, send) {
     runtime.saveConfig();
     return accepted;
   });
-  const applied = runtime.agent().currentModel()?.label ?? model;
+  const applied = runtime.agent().currentModel();
+  if (applied) {
+    runtime.state().model = { value: applied.value, label: applied.label };
+    runtime.saveState();
+  }
+  const label = applied?.label ?? model;
   if (!supported) {
     send(
       `Model saved: ${model}. This agent does not expose a runtime model option; it will be used on the next session if supported.`
@@ -946,34 +963,83 @@ async function handleModel(runtime, args, send) {
     return;
   }
   send(
-    hadSession ? `Model switched to: ${applied}` : `Model set to: ${applied}. It will apply when the session starts.`
+    hadSession ? `Model switched to: ${label}` : `Model set to: ${label}. It will apply when the session starts.`
   );
 }
-function modelReport(runtime) {
-  const current = runtime.agent().currentModel();
-  if (!current) {
-    const configured = runtime.config().agent.model;
-    const hint = configured ? `Configured: ${configured}
-
-The agent has not reported a model yet; it becomes visible after the first message.` : "This agent does not expose a runtime model option, or the session has not started.";
-    return `Current: unknown
-
-${hint}`;
+async function reportModel(runtime, send, wantList) {
+  const live = runtime.agent().currentModel();
+  if (live) {
+    send(renderModel(live, wantList));
+    return;
+  }
+  const cached = runtime.state().model;
+  if (cached && !wantList) {
+    send(renderCachedModel(cached));
+    return;
+  }
+  const name = runtime.config().agent.name;
+  send(`Reading ${wantList ? "model list" : "model"} from ${name}... (starting the agent)`);
+  try {
+    await runtime.serialize(
+      () => runtime.agent().warmup(runtime.state().acpSessionId ?? void 0)
+    );
+  } catch (error) {
+    const reason = error instanceof Error ? error.message : String(error);
+    send(`Could not read the model from ${name}: ${reason}`);
+    if (cached) send(renderCachedModel(cached));
+    return;
+  }
+  const refreshed = runtime.agent().currentModel();
+  if (refreshed) {
+    runtime.state().model = { value: refreshed.value, label: refreshed.label };
+    runtime.saveState();
+    send(renderModel(refreshed, wantList));
+    return;
+  }
+  send(cached ? renderCachedModel(cached) : unknownModelText(runtime));
+}
+function renderModel(model, wantList) {
+  const lines = [`Current: ${model.label}`];
+  const total = model.options.length;
+  if (total === 0) {
+    lines.push("", "This agent does not expose a model list.");
+    return lines.join("\n");
   }
-  const lines = [`Current: ${current.label}`];
-  if (current.options.length > 0) {
+  if (wantList || total <= INLINE_OPTION_LIMIT) {
     lines.push(
       "",
       table(
         ["Model", ""],
-        current.options.map((option) => [
+        model.options.map((option) => [
           option.label,
-          option.value === current.value ? "\u2190 current" : ""
+          option.value === model.value ? "\u2190 current" : ""
         ])
       )
     );
-  }
-  lines.push("", "Switch: /model <name>");
+    lines.push("", "Switch: /model <name>");
+    return lines.join("\n");
+  }
+  lines.push(
+    "",
+    table(["Model", ""], [[model.label, "\u2190 current"]]),
+    "",
+    `${total} models available \xB7 Switch: /model <name> \xB7 List: /model list`
+  );
+  return lines.join("\n");
+}
+function renderCachedModel(cached) {
+  return [
+    `Current: ${cached.label} (last known)`,
+    "",
+    "Cached from the last session; the agent has not started in this process yet.",
+    "Send /model list to read the live value from the agent."
+  ].join("\n");
+}
+function unknownModelText(runtime) {
+  const configured = runtime.config().agent.model;
+  const lines = ["Current: unknown"];
+  if (configured) lines.push("", `Configured: ${configured}`);
+  lines.push("", "This agent does not expose a runtime model option.");
   return lines.join("\n");
 }
 function statusText(runtime) {
@@ -1050,9 +1116,16 @@ function emptyState(token, agent, cwd) {
     cwd,
     createdAt: now,
     lastUsedAt: now,
-    usage: { ...EMPTY_USAGE }
+    usage: { ...EMPTY_USAGE },
+    model: null
   };
 }
+function parseCachedModel(value) {
+  if (!value || typeof value !== "object") return null;
+  const record = value;
+  if (typeof record.value !== "string" || typeof record.label !== "string") return null;
+  return { value: record.value, label: record.label };
+}
 function loadState(token) {
   const path = statePath(token);
   if (!(0, import_node_fs3.existsSync)(path)) return null;
@@ -1067,7 +1140,8 @@ function loadState(token) {
       cwd: typeof parsed.cwd === "string" ? parsed.cwd : process.cwd(),
       createdAt: typeof parsed.createdAt === "string" ? parsed.createdAt : (/* @__PURE__ */ new Date()).toISOString(),
       lastUsedAt: typeof parsed.lastUsedAt === "string" ? parsed.lastUsedAt : (/* @__PURE__ */ new Date()).toISOString(),
-      usage: parsed.usage && typeof parsed.usage === "object" ? { ...EMPTY_USAGE, ...parsed.usage } : { ...EMPTY_USAGE }
+      usage: parsed.usage && typeof parsed.usage === "object" ? { ...EMPTY_USAGE, ...parsed.usage } : { ...EMPTY_USAGE },
+      model: parseCachedModel(parsed.model)
     };
   } catch {
     return null;
@@ -1354,6 +1428,7 @@ async function switchAgent(ctx, name) {
   ctx.state.agent = name;
   ctx.state.acpSessionId = null;
   ctx.state.usage = { ...EMPTY_USAGE };
+  ctx.state.model = null;
   ctx.saveConfig();
   ctx.saveState();
   await previous.close().catch(() => void 0);
@@ -1508,6 +1583,8 @@ async function processPrompt(ctx, item, signal) {
     });
     ctx.state.acpSessionId = result.sessionId;
     ctx.state.usage = result.usage;
+    const model = ctx.getAgent().currentModel();
+    if (model) ctx.state.model = { value: model.value, label: model.label };
     ctx.saveState();
     for (const chunk of splitMessage(result.text || "(no output)")) {
       await item.reply(chunk);