hob-bot 1.2.0 → 1.4.0

package/server/src/router.ts

@@ -1,6 +1,6 @@
 import { getSupportedThinkingLevels } from "@earendil-works/pi-ai";
 import { parseStreamingJson } from "@earendil-works/pi-ai/utils/json-parse";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { mkdirSync } from "node:fs";
 import { dirname, join, relative, resolve, sep } from "node:path";
 import type { AgentSession, AgentSessionEvent, SessionEntry, SessionManager } from "@earendil-works/pi-coding-agent";
@@ -30,6 +30,7 @@ import { activityLabel, thinkingLine } from "./router-activity.ts";
 import { imageContents } from "./jobs.ts";
 import { nowBlock } from "./now.ts";
 import { monthDayTimeText } from "./time.ts";
+import { DesktopToolSession } from "./desktop-tools.ts";
 
 export const ITEM_TYPE = "hob.item";
 export const ITEM_UPDATE_TYPE = "hob.item.update";
@@ -65,7 +66,7 @@ interface RouterState {
   /** 这一轮最后一次有动静的时间，看门狗用它判断“没响应” */
   lastEventAt: number;
   stallTimer?: NodeJS.Timeout;
-  /** 已经因为没响应被叫停：这一轮的错误不再写一条重复的 note */
+  /** 这一轮已经被叫停（没响应，或用户按了停止）：之后的报错不再写「回复失败」 */
   stalled: boolean;
   /** 记忆提供者换了：跑着的这一轮结束就释放会话，下一轮按新提供者重新打开 */
   releaseAfterTurn?: boolean;
@@ -78,6 +79,7 @@ interface RouterState {
   knowledgeNames?: string[];
   delegationReply?: string[];
   terminatingTools?: Set<string>;
+  desktop?: DesktopToolSession;
 }
 
 function readEntries(file: string): SessionEntry[] {
@@ -186,6 +188,7 @@ export function deriveItems(entries: SessionEntry[]): Item[] {
 
 export class RouterManager {
   private routers = new Map<string, RouterState>();
+  private itemCache = new Map<string, { manager?: SessionManager; version: string; result: ReturnType<typeof walk>; positions: Map<string, number>; assistantTimes: string[]; last?: { text: string; at: Iso } }>();
   private livePages = new Map<string, Map<string, { page: PageLive; timer?: NodeJS.Timeout; last: number }>>();
   private liveJson = new Map<string, string>();
 
@@ -250,6 +253,37 @@ export class RouterManager {
     return readEntries(this.store.routerFile(assistantId));
   }
 
+  private derived(assistantId: string) {
+    const manager = this.routers.get(assistantId)?.manager;
+    const file = this.store.routerFile(assistantId);
+    let version: string;
+    if (manager) version = String(manager.getEntryCount());
+    else {
+      try {
+        const stat = statSync(file);
+        version = `${stat.size}:${stat.mtimeMs}`;
+      } catch (error) {
+        if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
+        version = "missing";
+      }
+    }
+    const cached = this.itemCache.get(assistantId);
+    if (cached && cached.manager === manager && cached.version === version) return cached;
+    const result = walk(manager ? manager.getEntries() : readEntries(file));
+    const positions = new Map<string, number>();
+    const assistantTimes: string[] = [];
+    let last: { text: string; at: Iso } | undefined;
+    result.items.forEach((item, index) => {
+      positions.set(item.id, index);
+      if (item.kind === "assistant") assistantTimes.push(item.at);
+      if (item.kind === "assistant" || item.kind === "user" || item.kind === "note") last = { text: item.text, at: item.at };
+    });
+    assistantTimes.sort();
+    const next = { manager, version, result, positions, assistantTimes, last };
+    this.itemCache.set(assistantId, next);
+    return next;
+  }
+
   async ensure(assistantId: string): Promise<RouterState> {
     const assistant = this.assistant(assistantId);
     let state = this.routers.get(assistantId);
@@ -271,6 +305,10 @@ export class RouterManager {
     await this.runtime.models.get();
     const pick = conversationPick(this.runtime.settings.settings.models, assistant);
     state.knowledgeNames = (await boundKnowledge(this.runtime, assistant.id)).map((collection) => collection.name);
+    state.desktop = new DesktopToolSession(this.runtime, assistant.id, () => !!state.session?.model?.input.includes("image"), undefined, true);
+    const tools = [...buildRouterTools(this.runtime, assistant.id), ...state.desktop.tools().filter((tool) => tool.name.startsWith("browser_"))];
+    const desktop = this.runtime.desktop.view();
+    const enabled = desktop.enabled && !!desktop.url && desktop.tokenConfigured;
     const opened = await this.runtime.pi.open({
       file: this.store.routerFile(assistant.id),
       spillDir: join(dirname(this.store.routerFile(assistant.id)), "spill"),
@@ -280,10 +318,16 @@ export class RouterManager {
       memory: this.runtime.settings.memory().provider,
       systemPrompt: () => {
         const { timezone, aboutYou } = this.runtime.settings.settings.general;
+        const desktop = this.runtime.desktop.view();
         return buildSystemPrompt(this.store, assistant.id, {
           timezone,
           aboutYou,
           memory: this.runtime.settings.memory().provider,
+          searchEnabled: this.runtime.settings.settings.search.some((provider) => provider.enabled),
+          imageEnabled: tools.some((tool) => tool.name === "generate_image"),
+          showPageEnabled: tools.some((tool) => tool.name === "show_page"),
+          desktopEnabled: desktop.enabled && !!desktop.url && desktop.tokenConfigured,
+          publicDesktop: desktop.publicAssistants.includes(assistant.id),
           models: this.promptModels(assistant.id),
           skills: availableSkills(this.runtime.home, undefined, this.runtime.settings.settings.skills?.disabled, this.runtime.settings.memory().provider === "lore" ? this.runtime.pi.loreSkillPaths : []),
           assistantSkills: usableAssistantSkills(this.runtime.home, assistant.id),
@@ -292,8 +336,8 @@ export class RouterManager {
           knowledgeNames: state.knowledgeNames,
         });
       },
-      tools: buildRouterTools(this.runtime, assistant.id).map((tool) => tool.name),
-      customTools: buildRouterTools(this.runtime, assistant.id),
+      tools: tools.filter((tool) => enabled || !tool.name.startsWith("browser_")).map((tool) => tool.name),
+      customTools: tools,
     });
     state.session = opened.session;
     if (!state.knowledgeNames.length) refreshSystemPrompt(opened.session, opened.session.getActiveToolNames().filter((name) => name !== "search_knowledge"));
@@ -305,8 +349,10 @@ export class RouterManager {
 
   private async refreshTools(state: RouterState): Promise<void> {
     state.knowledgeNames = (await boundKnowledge(this.runtime, state.assistantId)).map((collection) => collection.name);
-    const names = state.session!.getActiveToolNames().filter((name) => name !== "search_knowledge");
+    const names = state.session!.getActiveToolNames().filter((name) => name !== "search_knowledge" && !name.startsWith("browser_"));
     if (state.knowledgeNames.length) names.push("search_knowledge");
+    const desktop = this.runtime.desktop.view();
+    if (desktop.enabled && desktop.url && desktop.tokenConfigured) names.push(...state.desktop!.tools().filter((tool) => tool.name.startsWith("browser_")).map((tool) => tool.name));
     refreshSystemPrompt(state.session!, names);
   }
 
@@ -392,7 +438,7 @@ export class RouterManager {
     }
     if (event.type === "message_start" && event.message.role === "custom" && event.message.customType === EVENT_TYPE) {
       const details = event.message.details as EventDetails | undefined;
-      const users = deriveItems(this.entries(assistantId)).filter((item) => item.kind === "user");
+      const users = this.derived(assistantId).result.items.filter((item) => item.kind === "user");
       const source = details?.sourceUserId ? users.find((item) => item.id === details.sourceUserId) : undefined;
       state.currentUserId = (source ?? users.at(-1))?.id;
       if (details?.delegationId && details.delegationId !== state.currentDelegationId) {
@@ -471,7 +517,7 @@ export class RouterManager {
             at: new Date().toISOString(),
             text: "",
             streaming: true,
-            ...(walk(this.entries(assistantId)).lead ? { lead: true } : {}),
+            ...(this.derived(assistantId).result.lead ? { lead: true } : {}),
           },
         });
       }
@@ -502,7 +548,7 @@ export class RouterManager {
   }
 
   private emitSettledAssistant(assistantId: string, text: string, expectedId?: string): void {
-    const list = deriveItems(this.entries(assistantId)).filter((item) => item.kind === "assistant");
+    const list = this.derived(assistantId).result.items.filter((item) => item.kind === "assistant");
     const item = list.find((entry) => entry.id === expectedId) ?? list.filter((entry) => entry.text === text).pop();
     if (item) this.bus.emit({ type: "item", assistantId, item });
     this.touch(assistantId);
@@ -580,8 +626,11 @@ export class RouterManager {
     if (state.idleTimer) clearTimeout(state.idleTimer);
     state.idleTimer = undefined;
     state.session?.dispose();
+    void state.desktop?.dispose();
+    state.desktop = undefined;
     state.session = undefined;
     state.manager = undefined;
+    this.itemCache.delete(state.assistantId);
   }
 
   /**
@@ -597,6 +646,7 @@ export class RouterManager {
 
   /** 助手没了（归档）：关掉它的会话，内存里也不留 —— 它的目录随后会被移进归档。 */
   forget(assistantId: string): void {
+    this.itemCache.delete(assistantId);
     const state = this.routers.get(assistantId);
     if (!state) return;
     this.close(state);
@@ -618,7 +668,7 @@ export class RouterManager {
   // ---------- 事件与条目 ----------
   async addItem(assistantId: string, item: NewItem): Promise<Item> {
     const state = await this.ensure(assistantId);
-    const lead = walk(this.entries(assistantId)).lead;
+    const lead = this.derived(assistantId).result.lead;
     const id = state.manager!.appendCustomEntry(ITEM_TYPE, item);
     const full = { ...item, ...(lead ? { lead: true } : {}), id, at: this.entryAt(state, id) } as Item;
     this.bus.emit({ type: "item", assistantId, item: full });
@@ -632,7 +682,7 @@ export class RouterManager {
 
   async updateImage(assistantId: string, id: string, update: { status: "done" | "failed"; path?: string; error?: string }): Promise<void> {
     const state = await this.ensure(assistantId);
-    const item = deriveItems(this.entries(assistantId)).find((entry) => entry.id === id && entry.kind === "image");
+    const item = this.derived(assistantId).result.items.find((entry) => entry.id === id && entry.kind === "image");
     if (!item) throw new Error(`图片条目不存在：${id}`);
     state.manager!.appendCustomEntry(ITEM_UPDATE_TYPE, { id, ...update });
     this.bus.emit({ type: "item", assistantId, item: { ...item, ...update } });
@@ -647,7 +697,7 @@ export class RouterManager {
 
   /** 取当前回合来源及其之前的可见对话；事件取最近用户消息。 */
   originalWords(assistantId: string, note?: string, recent = false, extraFiles: string[] = []): { text: string; files: string[] } {
-    const items = deriveItems(this.entries(assistantId));
+    const items = this.derived(assistantId).result.items;
     const state = this.routers.get(assistantId);
     const source = items.find((item) => item.kind === "user" && item.id === state?.currentUserId)
       ?? items.findLast((item) => item.kind === "user");
@@ -743,7 +793,8 @@ export class RouterManager {
    */
   private async reportTurnError(state: RouterState): Promise<void> {
     const last = state.session?.messages.findLast((message) => message.role === "assistant");
-    if (!last || last.role !== "assistant" || last.stopReason !== "error") return;
+    // 停下的那一轮：有的服务商（Claude 订阅桥）把停止报成 error，不是回复失败
+    if (state.stalled || !last || last.role !== "assistant" || last.stopReason !== "error") return;
     await this.addItem(state.assistantId, { kind: "note", icon: "info", text: `回复失败：${briefModelError(last.errorMessage)}。发送任意消息即可重试。` });
   }
 
@@ -876,7 +927,10 @@ export class RouterManager {
 
   async stop(assistantId: string): Promise<void> {
     const state = this.routers.get(assistantId);
-    if (state) this.setActivity(state, null);
+    if (state) {
+      state.stalled = true;
+      this.setActivity(state, null);
+    }
     if (state?.session) await state.session.abort();
   }
 
@@ -908,14 +962,12 @@ export class RouterManager {
   }
 
   items(assistantId: string, options: { before?: string; limit?: number } = {}): ItemsPage {
-    const all = deriveItems(this.entries(assistantId));
+    const derived = this.derived(assistantId);
+    const all = derived.result.items;
     const limit = Math.max(1, Math.min(options.limit ?? 50, 200));
-    let list = all;
-    if (options.before) {
-      const index = all.findIndex((item) => item.id === options.before);
-      if (index !== -1) list = all.slice(0, index);
-    }
-    const page = list.slice(-limit);
+    const end = options.before ? derived.positions.get(options.before) ?? all.length : all.length;
+    const start = Math.max(0, end - limit);
+    const page = all.slice(start, end);
     const jobIds = new Set(page.filter((item) => item.kind === "job").map((item) => (item as { jobId: string }).jobId));
     const draftIds = new Set(
       page.filter((item) => item.kind === "draft").map((item) => (item as { draftId: string }).draftId),
@@ -929,15 +981,14 @@ export class RouterManager {
       for (const id of delegation.jobIds) jobIds.add(id);
       for (const id of delegation.approvalIds ?? []) approvalIds.add(id);
     }
-    for (const approval of this.store.approvals()) if (approval.jobId && jobIds.has(approval.jobId)) approvalIds.add(approval.id);
     return {
       ...(!options.before ? { pageLive: [...(this.livePages.get(assistantId)?.values() ?? [])].map((live) => live.page) } : {}),
       items: page,
       approvals: this.store.approvals().filter((approval) => approvalIds.has(approval.id)),
-      jobs: this.store.jobs().filter((job) => jobIds.has(job.id)),
+      jobs: [...jobIds].flatMap((id) => { const job = this.store.job(id); return job ? [job] : []; }),
       drafts: this.store.drafts().filter((draft) => draftIds.has(draft.id)),
       delegations,
-      hasMore: list.length > page.length,
+      hasMore: start > 0,
     };
   }
 
@@ -947,21 +998,23 @@ export class RouterManager {
 
   unread(assistantId: string): number {
     const readAt = this.store.state(assistantId).readAt;
-    if (!readAt) return 0;
-    return deriveItems(this.entries(assistantId)).filter(
-      (item) => item.kind === "assistant" && item.at > readAt,
-    ).length;
+    // 从没记过已读：从现在开始算，以前的都当读过。不记的话未读永远是 0，前端也就永远不会来标已读
+    if (!readAt) {
+      this.read(assistantId);
+      return 0;
+    }
+    const times = this.derived(assistantId).assistantTimes;
+    let lo = 0, hi = times.length;
+    while (lo < hi) {
+      const mid = (lo + hi) >>> 1;
+      if (times[mid] <= readAt) lo = mid + 1;
+      else hi = mid;
+    }
+    return times.length - lo;
   }
 
   last(assistantId: string): { text: string; at: Iso } | undefined {
-    const items = deriveItems(this.entries(assistantId));
-    for (let i = items.length - 1; i >= 0; i -= 1) {
-      const item = items[i];
-      if (item.kind === "user" || item.kind === "assistant" || item.kind === "note") {
-        return { text: item.text, at: item.at };
-      }
-    }
-    return undefined;
+    return this.derived(assistantId).last;
   }
 
   summary(assistant: Assistant): AssistantSummary {
@@ -970,6 +1023,7 @@ export class RouterManager {
       ...assistant,
       ...(last ? { last } : {}),
       unread: this.unread(assistant.id),
+      ...(this.store.state(assistant.id).readAt ? { readAt: this.store.state(assistant.id).readAt } : {}),
       busy: this.isBusy(assistant.id),
       activity: this.routers.get(assistant.id)?.activity ?? null,
     };
@@ -993,7 +1047,7 @@ export class RouterManager {
         .jobs()
         .filter((job) => job.status === "running" || job.status === "queued" || job.status === "waiting" || (job.endedAt ?? job.createdAt) > jobCutoff),
       routines: this.store.routines(),
-      approvals: this.store.approvals().filter((approval) => approval.status === "pending"),
+      approvals: this.store.approvals().filter((approval) => approval.status === "pending" && approval.source !== "job"),
       delegations: this.store.delegations(),
       settings: this.runtime.settings.get(),
     };
@@ -1001,11 +1055,9 @@ export class RouterManager {
 
   /** 进程退出或测试收尾：释放所有 Router 会话。 */
   disposeAll(): void {
-    for (const state of this.routers.values()) {
-      if (state.idleTimer) clearTimeout(state.idleTimer);
-      state.session?.dispose();
-    }
+    for (const state of this.routers.values()) this.close(state);
     this.routers.clear();
+    this.itemCache.clear();
   }
 
   /** 直接走事件的 followUp 队列，实际收到这条消息时才开始关联任务。 */

package/server/src/routines.ts

@@ -9,6 +9,7 @@ export interface RoutineInput {
   name: string;
   instruction: string;
   schedules: string[];
+  skill?: string;
 }
 
 function validate(schedules: string[], timezone: string): void {
@@ -58,7 +59,7 @@ export class RoutineScheduler {
 
   private instruction(routine: Routine): string {
     const skill = routine.skill && usableAssistantSkills(this.runtime.home, routine.assistantId).find((item) => item.name === routine.skill);
-    return skill ? skillInstruction(skill.title, routine.instruction) : routine.instruction;
+    return skill ? skillInstruction([skill.title], routine.instruction) : routine.instruction;
   }
 
   private async fire(routineId: string): Promise<void> {
@@ -68,6 +69,7 @@ export class RoutineScheduler {
       await this.runtime.jobs.start(routine.assistantId, {
         title: routine.name,
         instruction: this.instruction(routine),
+        ...(routine.skill && usableAssistantSkills(this.runtime.home, routine.assistantId).some((skill) => skill.name === routine.skill) ? { skills: [routine.skill] } : {}),
         routineId: routine.id,
       });
     } catch (error) {
@@ -81,6 +83,7 @@ export class RoutineScheduler {
 
   create(input: RoutineInput): Routine {
     validate(input.schedules, this.runtime.settings.settings.general.timezone);
+    if (input.skill && !listAssistantSkills(this.runtime.home, input.assistantId).some((skill) => skill.name === input.skill)) throw new Error("绑定的技能无效");
     const routine: Routine = {
       id: newId("rt-"),
       assistantId: input.assistantId,
@@ -90,6 +93,7 @@ export class RoutineScheduler {
       active: true,
       createdAt: new Date().toISOString(),
       runs: [],
+      ...(input.skill ? { skill: input.skill } : {}),
     };
     this.runtime.store.saveRoutine(routine);
     this.apply(routine);
@@ -101,10 +105,10 @@ export class RoutineScheduler {
     const routine = this.runtime.store.routine(id);
     if (!routine) throw new Error(`定时任务不存在：${id}`);
     if (patch.schedules) validate(patch.schedules, this.runtime.settings.settings.general.timezone);
-    if (patch.skill !== undefined && patch.skill !== null && (typeof patch.skill !== "string" || !listAssistantSkills(this.runtime.home, routine.assistantId).some((skill) => skill.name === patch.skill))) throw new Error("绑定的技能无效");
+    if (patch.skill !== undefined && patch.skill !== null && patch.skill !== "" && (typeof patch.skill !== "string" || !listAssistantSkills(this.runtime.home, routine.assistantId).some((skill) => skill.name === patch.skill))) throw new Error("绑定的技能无效");
     const { skill, ...rest } = patch;
     const next: Routine = { ...routine, ...rest };
-    if (skill === null) delete next.skill;
+    if (skill === null || skill === "") delete next.skill;
     else if (skill !== undefined) next.skill = skill;
     this.runtime.store.saveRoutine(next);
     this.apply(next);
@@ -133,6 +137,7 @@ export class RoutineScheduler {
     return await this.runtime.jobs.start(routine.assistantId, {
       title: routine.name,
       instruction: this.instruction(routine),
+      ...(routine.skill && usableAssistantSkills(this.runtime.home, routine.assistantId).some((skill) => skill.name === routine.skill) ? { skills: [routine.skill] } : {}),
       routineId: routine.id,
     });
   }

package/server/src/runtime.ts

@@ -17,6 +17,7 @@ import type { LegacyModels } from "./settings.ts";
 import type { SettingsStore } from "./settings.ts";
 import type { Store } from "./store.ts";
 import type { PushSender, PushService } from "./push.ts";
+import type { UsageService } from "./usage.ts";
 import { Bus as BusImpl } from "./bus.ts";
 import { JobManager as JobManagerImpl } from "./jobs.ts";
 import { PushService as PushServiceImpl } from "./push.ts";
@@ -25,6 +26,8 @@ import { RouterManager as RouterManagerImpl } from "./router.ts";
 import { RoutineScheduler as RoutineSchedulerImpl } from "./routines.ts";
 import { SettingsStore as SettingsStoreImpl } from "./settings.ts";
 import { Store as StoreImpl } from "./store.ts";
+import { UsagePrices as UsagePricesImpl } from "./usage-prices.ts";
+import { UsageService as UsageServiceImpl } from "./usage.ts";
 
 /**
  * 进程内的全部服务。构造时先建 store/bus/pi，再把 router / jobs / routines 挂上去
@@ -53,6 +56,8 @@ export interface HobRuntime {
   routines: RoutineScheduler;
   /** Web Push：VAPID 密钥和订阅在 HOB_HOME/push.json，可见性只在内存里 */
   push: PushService;
+  /** 消耗：从会话文件统计用量，单价从 models.dev 拉 */
+  usage: UsageService;
 }
 
 export interface CreateRuntimeOptions {
@@ -63,7 +68,7 @@ export interface CreateRuntimeOptions {
   legacyModels?: LegacyModels;
   /** 测试注入的推送发送器（不碰网络） */
   pushSender?: PushSender;
-  /** 测试注入假的服务商接口（拉模型列表用） */
+  /** 测试注入假的服务商接口（拉模型列表用）和价格表接口（价格用） */
   fetchImpl?: typeof fetch;
 }
 
@@ -115,5 +120,11 @@ export function createRuntime(options: CreateRuntimeOptions): HobRuntime {
     email: () => runtime.settings.settings.push.email,
     ...(options.pushSender ? { sender: options.pushSender } : {}),
   });
+  runtime.usage = new UsageServiceImpl({
+    home: options.home,
+    store,
+    settings,
+    prices: new UsagePricesImpl({ home: options.home, ...(options.fetchImpl ? { fetchImpl: options.fetchImpl } : {}) }),
+  });
   return runtime;
 }

package/server/src/settings.ts

@@ -15,6 +15,7 @@ import type {
   Theme,
   ThinkingLevel,
   ThinkingLevelMapSetting,
+  TokenPrice,
 } from "../../shared/types.ts";
 import { defaultSearch, normalizeSearch } from "../../shared/search.ts";
 import { checkImageSettings, normalizeImageSettings } from "./image.ts";
@@ -25,6 +26,7 @@ import type { ModelScores } from "../../shared/types.ts";
 import { isMemoryProvider, LORE_PLUGIN_VERSION, loreConnection, resolveMemoryProvider } from "./memory.ts";
 import { checkProvider } from "./providers.ts";
 import { checkTimezone } from "./time.ts";
+import { checkPrice } from "./usage-prices.ts";
 
 const FILE = "settings.json";
 const THEMES: Theme[] = ["system", "light", "dark"];
@@ -192,6 +194,22 @@ function normalizeProviders(raw: unknown): ProviderSettings[] {
   return providers;
 }
 
+/** 每百万 token 的单价的四项，键名固定。 */
+function normalizePrices(raw: unknown): Record<string, TokenPrice> {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
+  const prices: Record<string, TokenPrice> = {};
+  for (const [model, price] of Object.entries(raw as Record<string, unknown>)) {
+    const id = model.trim();
+    if (!id) continue;
+    try {
+      prices[id] = checkPrice(price);
+    } catch {
+      // 这一项坏了：跳过，不影响其他模型
+    }
+  }
+  return prices;
+}
+
 /** 把读到的（或补丁里的）内容规整成合法设置：不合法的项退回默认值，时区不合法直接报错。 */
 function normalize(raw: unknown, base: Settings): Settings {
   const input = (raw ?? {}) as Partial<Settings>;
@@ -200,6 +218,7 @@ function normalize(raw: unknown, base: Settings): Settings {
   const work = (input.work ?? {}) as Partial<Settings["work"]>;
   const push = (input.push ?? {}) as Partial<Settings["push"]>;
   const theme = text(general.theme, base.general.theme) as Theme;
+  const prices = normalizePrices(input.usage?.prices);
   return {
     general: {
       theme: THEMES.includes(theme) ? theme : base.general.theme,
@@ -234,6 +253,7 @@ function normalize(raw: unknown, base: Settings): Settings {
       routerStallMinutes: int(work.routerStallMinutes, base.work.routerStallMinutes, 1, 24 * 60),
     },
     push: { email: text(push.email, base.push.email) },
+    ...(Object.keys(prices).length ? { usage: { prices } } : {}),
   };
 }
 
@@ -392,6 +412,7 @@ export class SettingsStore {
         providers: current.providers,
         work: { ...current.work, ...(patch.work ?? {}) },
         push: { ...current.push, ...(patch.push ?? {}) },
+        usage: current.usage,
       },
       current,
     );
@@ -466,6 +487,22 @@ export class SettingsStore {
     return this.get();
   }
 
+  /** 存一个模型的自定单价（price 为 null = 恢复默认）。不合法直接抛错，界面显示原因。 */
+  setUsagePrice(revision: number, model: string, price: TokenPrice | null): SettingsFile | undefined {
+    if (revision !== this.file.revision) return undefined;
+    const id = model.trim();
+    if (!id) throw new Error("未指定模型。");
+    const prices = { ...(this.settings.usage?.prices ?? {}) };
+    if (price === null) delete prices[id];
+    else prices[id] = checkPrice(price);
+    const settings = { ...this.settings };
+    if (Object.keys(prices).length) settings.usage = { prices };
+    else delete settings.usage;
+    this.file = { revision: this.file.revision + 1, settings };
+    this.write();
+    return this.get();
+  }
+
   /** 新建或改一个服务商（Key 不在这里，见 secrets.json）。 */
   setProvider(provider: ProviderSettings): SettingsFile {
     // 改已有的原地替换（列表顺序不跳），新的排到最后

package/server/src/store.ts

@@ -1,5 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync, appendFileSync } from "node:fs";
 import { dirname, join } from "node:path";
+import { newId } from "./ids.ts";
 import type {
   Approval,
   Assistant,
@@ -56,6 +57,25 @@ export class Store {
     for (const dir of ["assistants", "jobs", "uploads"]) {
       mkdirSync(join(this.home, dir), { recursive: true });
     }
+    if (!existsSync(join(this.home, "rules.json"))) {
+      const changedAt = new Date().toISOString();
+      this.saveGlobalRules([
+        ...["删除或覆盖文件、数据和备份", "对外发送（消息、邮件、发布）、付费、充值、改计费", "停止或重启别人正在使用的服务和设备", "修改可能让你失去远程访问的设置（网络、防火墙、登录方式）"].map((text) => ({ id: newId("r-"), text, mode: "ask" as const, changedAt })),
+        ...["过去的记录是线索不是现状：动手前先核实实际状态。", "改配置、改数据前先留好退路（备份或记下原值）；改完用实际效果验证，不只看命令返回。", "凭据（密码、密钥、令牌、Cookie）只在用的时候读取，不回显，不写进文件和报告，也不存起来。"].map((text) => ({ id: newId("r-"), text, mode: "allow" as const, changedAt })),
+      ]);
+    }
+  }
+
+  globalRules(): Rule[] {
+    const path = join(this.home, "rules.json");
+    if (!existsSync(path)) return [];
+    const rules = JSON.parse(readFileSync(path, "utf8")) as unknown;
+    if (!Array.isArray(rules)) throw new Error("全局规则文件格式无效");
+    return rules as Rule[];
+  }
+
+  saveGlobalRules(rules: Rule[]): void {
+    writeJsonAtomic(join(this.home, "rules.json"), rules);
   }
 
   // ---------- 助手 ----------

package/server/src/transcript.ts

@@ -5,7 +5,17 @@ import type { JobStep } from "../../shared/types.ts";
 import { showPath } from "./text.ts";
 
 /** 沉淀技能那一轮发给任务的话的开头：任务详情里这句显示成「沉淀技能」。 */
-export const SEDIMENT_PROMPT_HEAD = "这件事以后还会再做。回顾刚才的过程，把能复用的做法沉淀成技能";
+export const SEDIMENT_PROMPT_HEAD = "回顾刚才的过程，看看有没有能复用的做法。这类事以后还会再做的，把做法写成技能";
+
+/** 旧版用过的开头：已经存下来的任务记录里还是这些，任务详情照样显示成「沉淀技能」。 */
+const LEGACY_SEDIMENT_HEADS = [
+  "这件事以后还会再做。回顾刚才的过程，把能复用的做法写成技能",
+  "这件事以后还会再做。回顾刚才的过程，把能复用的做法沉淀成技能",
+];
+
+function isSedimentPrompt(text: string): boolean {
+  return text.startsWith(SEDIMENT_PROMPT_HEAD) || LEGACY_SEDIMENT_HEADS.some((head) => text.startsWith(head));
+}
 
 /** transcript 里单步输出最多这么多字，超出的整段落盘，页面按路径去拉。 */
 export const STEP_OUTPUT_LIMIT = 20 * 1024;
@@ -14,7 +24,7 @@ export const STEP_EVENT_LIMIT = 4 * 1024;
 /** diff 只给看得清的一段，超长的改动不整段塞进接口。 */
 const EDIT_TEXT_LIMIT = 4_000;
 
-const AUTO_FOLLOW_UP = "你还没有调用 report";
+const AUTO_FOLLOW_UP = "这一轮结束了，还没有交结果。";
 
 function oneLine(value: string, max = 120): string {
   const line = value.replace(/\s+/g, " ").trim();
@@ -313,12 +323,12 @@ export function deriveSteps(file: string, options: DeriveOptions = {}): JobStep[
 
     if (message.role === "user") {
       const text = textOfContent(message.content).trim();
-      if (!text || text.startsWith(AUTO_FOLLOW_UP)) continue;
+      if (!text || text.startsWith(AUTO_FOLLOW_UP) || text.startsWith("你还没有调用 report")) continue;
       if (!seenUser) {
         seenUser = true; // 第一句是任务说明，详情头部已经有
         continue;
       }
-      steps.push({ id: `u${message.timestamp ?? at}`, kind: "text", at, from: "user", text: text.startsWith(SEDIMENT_PROMPT_HEAD) ? "沉淀技能" : text });
+      steps.push({ id: `u${message.timestamp ?? at}`, kind: "text", at, from: "user", text: isSedimentPrompt(text) ? "沉淀技能" : text });
     }
   }
   return steps;