hob-bot 1.3.0 → 1.5.0

package/server/src/desktop-tools.ts

@@ -4,10 +4,10 @@ import { join, resolve } from "node:path";
 import { Type } from "@earendil-works/pi-ai";
 import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
 import { chromium, type Browser, type Page } from "playwright-core";
+import { assistantFilesDir } from "./config.ts";
 import type { HobRuntime } from "./runtime.ts";
 
-const LOGIN = "需要登录的页面不要自己登录，用 ask_user 请用户打开云桌面登录后回复。";
-const TAKEN = "用户正在操作云桌面，请稍后再试或用 ask_user 询问";
+const TAKEN = "用户正在操作云桌面，等用户操作完再试；着急的话，用 ask_user 问一声。";
 const point = Type.Object({ x: Type.Integer(), y: Type.Integer() });
 const action = Type.Object({
   type: Type.Union([Type.Literal("click"), Type.Literal("move"), Type.Literal("drag"), Type.Literal("type"), Type.Literal("key"), Type.Literal("scroll"), Type.Literal("wait")]),
@@ -27,7 +27,7 @@ export class DesktopToolSession {
   private active = new Set<Promise<unknown>>();
   private disposed = false;
   private profile: string;
-  constructor(private runtime: HobRuntime, private assistantId: string, private canSeeImages: boolean | (() => boolean), private jobTitle?: string, private router = false, private screenshotDir = join(runtime.home, "assistants", assistantId, "screenshots")) {
+  constructor(private runtime: HobRuntime, private assistantId: string, private canSeeImages: boolean | (() => boolean), private jobTitle?: string, private router = false, private screenshotDir = assistantFilesDir(runtime.home, assistantId, "screenshots")) {
     this.profile = desktopProfile(assistantId);
   }
 
@@ -110,7 +110,7 @@ export class DesktopToolSession {
   tools(): ToolDefinition<any, any>[] {
     const allowPublic = this.runtime.settings.settings.desktop?.publicAssistants?.includes(this.assistantId) ?? false;
     const make = (name: string, label: string, description: string, parameters: any, run: (params: any, screen: string) => Promise<string | Buffer>): ToolDefinition<any, any> => ({
-      name, label, description: `${description} ${LOGIN}`,
+      name, label, description,
       parameters: Type.Object({ ...parameters.properties, ...(allowPublic ? { screen: Type.Optional(Type.Union([Type.Literal("own"), Type.Literal("public")])) } : {}) }),
       execute: async (_id, params) => {
         const operation = (async () => {
@@ -147,12 +147,12 @@ export class DesktopToolSession {
       },
     });
     return [
-      make("browser_open", "打开网页", this.router ? "在你的云桌面浏览器里打开 HTTP(S) 网页。要边看边和用户确认的操作自己做；步骤多、不需要用户盯着的交给任务。" : "在助手的浏览器中打开 HTTP(S) 网页。" , Type.Object({ url: Type.String() }), async ({ url }, screen) => {
+      make("browser_open", "打开网页", this.router ? "在你的云桌面浏览器里打开网页（HTTP 或 HTTPS）。" : "在助手的云桌面浏览器里打开网页（HTTP 或 HTTPS）。" , Type.Object({ url: Type.String() }), async ({ url }, screen) => {
         const target = new URL(url);
         if (target.protocol !== "http:" && target.protocol !== "https:") throw new Error("只支持 HTTP(S) 网页。");
         const page = await this.getPage(screen); this.check(screen); await page.goto(target.toString(), { waitUntil: "domcontentloaded", timeout: 30_000 }); return `已打开 ${page.url()}`;
       }),
-      make("browser_snapshot", "读取页面", "读取当前页面的无障碍快照；引用用于点击或输入。", Type.Object({}), async (_, screen) => { const page = await this.getPage(screen); this.check(screen); return page.ariaSnapshot({ mode: "ai" }); }),
+      make("browser_snapshot", "读取页面", "读取当前页面的无障碍快照；里面的引用用于点击或输入。", Type.Object({}), async (_, screen) => { const page = await this.getPage(screen); this.check(screen); return page.ariaSnapshot({ mode: "ai" }); }),
       make("browser_click", "点击网页", "点击最新页面快照中的引用。", Type.Object({ ref: Type.String() }), async ({ ref }, screen) => { const page = await this.getPage(screen); this.check(screen); await page.getByRef(ref).click(); return "已点击。"; }),
       make("browser_type", "输入文字", "向最新页面快照中的引用输入文字。", Type.Object({ ref: Type.String(), text: Type.String(), submit: Type.Optional(Type.Boolean()) }), async ({ ref, text, submit }, screen) => { const page = await this.getPage(screen); this.check(screen); const target = page.getByRef(ref); await target.fill(text); if (submit) { this.check(screen); await target.press("Enter"); } return "已输入。"; }),
       make("browser_press", "按键", "向当前网页发送按键，如 Enter、Control+L。", Type.Object({ key: Type.String() }), async ({ key }, screen) => { const page = await this.getPage(screen); this.check(screen); await page.keyboard.press(key); return "已按键。"; }),

package/server/src/files.ts

@@ -3,11 +3,14 @@ import { closeSync, existsSync, lstatSync, openSync, readSync, readdirSync, real
 import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { fileKind, isTextKind, mimeOf } from "../../shared/files.ts";
 import type { FileKind, JobFileEntry, JobFilesView } from "../../shared/types.ts";
+import { resolveMovedPath } from "./layout.ts";
 
-/** 数据目录根上不对页面开放的文件：Hob 自己的凭据和内部状态（连同它们的临时文件、备份）。 */
+/** 数据目录根上不对页面开放的文件：半搬的老目录里也可能有这些。 */
 const DENY_ROOT_FILE = /^(secrets|config|settings|push)\.json/i;
-/** 数据目录根上不对页面开放的目录：引擎目录（凭据、bin）和 Lore 连接。 */
-const DENY_ROOT_DIRS = new Set(["engine", "lore"]);
+/** 数据目录根上整个不对页面开放的目录：配置、凭据、引擎、Lore、记忆都在 system/ 里。 */
+const DENY_ROOT_DIRS = new Set(["system"]);
+/** 迁移前的备份里面有整份凭据：不自动删，但也不给页面看。 */
+const DENY_ROOT_PREFIX = /^backup/i;
 /** 备份文件一律不给（凭据的备份也在里面）。 */
 const DENY_ANY_FILE = /\.bak/i;
 
@@ -38,9 +41,10 @@ export type Lookup = { ok: true; info: FileInfo } | { ok: false; status: 403 | 4
 function denied(root: string, path: string): boolean {
   const rel = relative(root, path);
   const parts = rel.split(sep);
-  if (DENY_ROOT_DIRS.has(parts[0] ?? "")) return true;
+  const top = parts[0] ?? "";
+  if (DENY_ROOT_DIRS.has(top) || DENY_ROOT_PREFIX.test(top)) return true;
   // 根上的凭据文件（含 settings.json.1234.tmp 这种原子写临时文件）
-  if (parts.length === 1 && DENY_ROOT_FILE.test(parts[0] ?? "")) return true;
+  if (parts.length === 1 && DENY_ROOT_FILE.test(top)) return true;
   return DENY_ANY_FILE.test(basename(path));
 }
 
@@ -79,8 +83,11 @@ export function lookupFile(home: string, requested: string, workDirs: string[] =
   let path: string;
   let size: number;
   let modifiedAt: string;
+  // 迁移把文件搬走了，会话和卡片里还是老路径：不存在时按 moves.json 找新位置
+  const wanted = resolve(requested);
+  const candidate = existsSync(wanted) ? wanted : resolveMovedPath(home, wanted);
   try {
-    path = realpathSync(resolve(requested));
+    path = realpathSync(candidate);
     const stats = statSync(path);
     if (!stats.isFile()) return { ok: false, status: 404, error: "文件不存在" };
     size = stats.size;
@@ -100,10 +107,23 @@ export function lookupFile(home: string, requested: string, workDirs: string[] =
   const text = isTextKind(kind);
   return {
     ok: true,
-    info: { path, name, size, modifiedAt, kind, text, mime: mimeOf(name), ...(/^(?:pages[/\\][0-9a-f-]{36}|knowledge[/\\]pages[/\\][0-9a-f]{64})\.html$/i.test(relative(root, path)) ? { page: true } : {}) },
+    info: { path, name, size, modifiedAt, kind, text, mime: mimeOf(name), ...(isPagePath(relative(root, path)) ? { page: true } : {}) },
   };
 }
 
+/**
+ * 展示页面：现在的布局是 assistants/<id>/files/pages/<uuid>.html，老数据还在根上的 pages/。
+ * knowledge/pages/<hash>.html 是进知识库的副本，也算页面。
+ */
+export function isPagePath(relativePath: string): boolean {
+  return /^(?:(?:assistants[/\\][^/\\]+[/\\]files[/\\])?pages[/\\][0-9a-f-]{36}|knowledge[/\\]pages[/\\][0-9a-f]{64})\.html$/i.test(relativePath);
+}
+
+/** 文件是不是在某个助手的展示页面目录里（或老布局根上的 pages/）：不看文件名。 */
+export function isInPagesDir(relativePath: string): boolean {
+  return /^(?:assistants[/\\][^/\\]+[/\\]files[/\\])?pages[/\\][^/\\]+$/.test(relativePath);
+}
+
 function workRoots(root: string, dirs: string[]): string[] {
   const out: string[] = [];
   for (const dir of new Set(dirs)) {

package/server/src/http.ts

@@ -20,11 +20,14 @@ import type {
   ModelThinkingSaved,
   ModelsView,
   PushSubscriptionJson,
+  RoutineCheck,
   SettingsPatch,
+  UsagePricePatch,
+  UsagePriceSaved,
 } from "../../shared/types.ts";
 import { parseSprite } from "../../shared/sprites.ts";
 import { answerApproval, archiveAssistant, createFromDraft, dismissDraft } from "./actions.ts";
-import { setPassword } from "./config.ts";
+import { setPassword, assistantFilesDir, cacheDir } from "./config.ts";
 import { newId } from "./ids.ts";
 import { claudeStatus } from "./claude-status.ts";
 import { checkDesktopUrl } from "./desktop.ts";
@@ -45,7 +48,8 @@ import { SEARCH_PROVIDERS } from "../../shared/search.ts";
 import { WebSearch } from "./search.ts";
 import { clampDuty } from "./text.ts";
 import { deleteOwnSkill, importSkills, listImportSkills, skillViews } from "./skills.ts";
-import { archiveAssistantSkill, listAssistantSkills, rollbackAssistantSkill, setAssistantSkillEnabled } from "./assistant-skills.ts";
+import { listAssistantSkills, rollbackAssistantSkill, setAssistantSkillEnabled } from "./assistant-skills.ts";
+import { deleteSkill } from "./delete-skill.ts";
 import type { SkillImportSource } from "../../shared/skills.ts";
 
 const COOKIE = "hob";
@@ -347,6 +351,24 @@ export function createApp(runtime: HobRuntime, options: { webDir?: string; home:
     return c.json({ settings: next, thinking } satisfies ModelThinkingSaved);
   });
 
+  // 设置 → 消耗：会话文件里的用量和价格表；改单价走 settings.json，price 为 null 恢复默认
+  app.get("/api/usage", async (c) => c.json(await runtime.usage.view()));
+
+  app.put("/api/usage/price", async (c) => {
+    const body = (await c.req.json().catch(() => ({}))) as Partial<UsagePricePatch>;
+    if (typeof body.revision !== "number") return c.json({ error: "缺 revision" }, 400);
+    const model = typeof body.model === "string" ? body.model.trim() : "";
+    if (!model) return c.json({ error: "未指定模型。" }, 400);
+    let next;
+    try {
+      next = runtime.settings.setUsagePrice(body.revision, model, body.price ?? null);
+    } catch (error) {
+      return c.json({ error: error instanceof Error ? error.message : String(error) }, 400);
+    }
+    if (!next) return c.json({ error: "设置已在别处修改，已刷新" }, 409);
+    return c.json({ settings: next, price: await runtime.usage.priceOf(model) } satisfies UsagePriceSaved);
+  });
+
   // 设置 → 服务商：列表（Key 只报配没配）、引擎自带的服务商目录、整份设置
   app.get("/api/providers/claude-status", async (c) => c.json(await claudeStatus(runtime.home, runtime.settings.settings.claude?.executable || undefined)));
   app.get("/api/claude", async (c) => {
@@ -549,7 +571,7 @@ export function createApp(runtime: HobRuntime, options: { webDir?: string; home:
       const path = await generateImage(
         {
           home: options.home,
-          dir: join(options.home, "previews"),
+          dir: join(cacheDir(options.home), "previews"),
           config,
           ...(typeof body.apiKey === "string" && body.apiKey.trim() ? { apiKey: body.apiKey.trim() } : {}),
         },
@@ -711,8 +733,7 @@ export function createApp(runtime: HobRuntime, options: { webDir?: string; home:
     const id = c.req.param("id");
     if (!store.assistant(id)) return c.json({ error: "助手不存在" }, 404);
     try {
-      archiveAssistantSkill(options.home, id, c.req.param("name"));
-      bus.emit({ type: "skills", assistantId: id });
+      deleteSkill(runtime, id, c.req.param("name"));
       return c.json({ ok: true });
     } catch (error) { return c.json({ error: error instanceof Error ? error.message : String(error) }, 400); }
   });
@@ -812,6 +833,8 @@ export function createApp(runtime: HobRuntime, options: { webDir?: string; home:
       ...(typeof body.dutyLong === "string" ? { dutyLong: body.dutyLong } : {}),
       ...(typeof body.sprite === "string" ? { sprite: body.sprite } : {}),
       ...(typeof body.pinned === "boolean" ? { pinned: body.pinned } : {}),
+      // 置顶区里的位置：拖动头像换位置后按 0、1、2… 存，取整且不为负
+      ...(typeof body.pinOrder === "number" && Number.isFinite(body.pinOrder) ? { pinOrder: Math.max(0, Math.round(body.pinOrder)) } : {}),
       ...(typeof body.hidden === "boolean" ? { hidden: body.hidden } : {}),
       ...(typeof body.notify === "boolean" ? { notify: body.notify } : {}),
       ...(models ? { models } : {}),
@@ -878,6 +901,8 @@ export function createApp(runtime: HobRuntime, options: { webDir?: string; home:
       name?: string;
       instruction?: string;
       schedules?: string[];
+      check?: RoutineCheck;
+      once?: boolean;
     };
     if (!body.assistantId || !body.name || !body.instruction || !body.schedules?.length) {
       return c.json({ error: "缺字段：assistantId、name、instruction、schedules" }, 400);
@@ -888,6 +913,8 @@ export function createApp(runtime: HobRuntime, options: { webDir?: string; home:
         name: body.name,
         instruction: body.instruction,
         schedules: body.schedules,
+        ...(body.check ? { check: body.check } : {}),
+        ...(body.once ? { once: true } : {}),
       });
       return c.json({ routine });
     } catch (error) {
@@ -902,6 +929,8 @@ export function createApp(runtime: HobRuntime, options: { webDir?: string; home:
       schedules?: string[];
       active?: boolean;
       skill?: string | null;
+      check?: RoutineCheck | null;
+      once?: boolean;
     };
     try {
       const routine = routines.update(c.req.param("id"), body);
@@ -923,8 +952,8 @@ export function createApp(runtime: HobRuntime, options: { webDir?: string; home:
 
   app.post("/api/routines/:id/run", async (c) => {
     try {
-      const job = await routines.runNow(c.req.param("id"));
-      return c.json({ job });
+      const result = await routines.runNow(c.req.param("id"));
+      return c.json(result);
     } catch (error) {
       return c.json({ error: error instanceof Error ? error.message : String(error) }, 404);
     }
@@ -933,7 +962,7 @@ export function createApp(runtime: HobRuntime, options: { webDir?: string; home:
   app.post("/api/jobs/:id/sediment", (c) => {
     const id = c.req.param("id");
     if (!store.job(id)) return c.json({ error: "任务不存在" }, 404);
-    try { jobs.startSediment(id, "manual"); return c.json({ ok: true }); }
+    try { jobs.startSediment(id); return c.json({ ok: true }); }
     catch (error) { return c.json({ error: error instanceof Error ? error.message : String(error) }, 409); }
   });
 
@@ -1033,8 +1062,11 @@ export function createApp(runtime: HobRuntime, options: { webDir?: string; home:
   });
 
   app.post("/api/uploads", async (c) => {
+    const assistantId = (c.req.query("assistantId") ?? "").trim();
+    if (!assistantId) return c.json({ error: "缺少 assistantId：上传的文件要放在某个助手的目录下" }, 400);
+    if (!store.assistant(assistantId)) return c.json({ error: `助手不存在：${assistantId}` }, 404);
     const body = await c.req.parseBody({ all: true });
-    const uploads = join(options.home, "uploads");
+    const uploads = assistantFilesDir(options.home, assistantId, "uploads");
     mkdirSync(uploads, { recursive: true });
     const saved: { path: string; name: string }[] = [];
     const values = Object.values(body).flatMap((value) => (Array.isArray(value) ? value : [value]));

package/server/src/job-view.ts

@@ -1,7 +1,7 @@
 import type { Approval, Job, JobStatus, JobStep } from "../../shared/types.ts";
 import type { AssistantSkill } from "../../shared/skills.ts";
 
-const statusText: Record<JobStatus, string> = { queued: "排队中", running: "进行中", waiting: "等用户确认", done: "已完成", stuck: "受阻", failed: "失败", stopped: "已停止" };
+const statusText: Record<JobStatus, string> = { queued: "排队中", running: "进行中", waiting: "等你回复", done: "已完成", stuck: "受阻", failed: "失败", stopped: "已停止" };
 
 export function duration(ms: number): string {
   const seconds = Math.max(0, Math.floor(ms / 1000));
@@ -35,7 +35,7 @@ export function jobView(job: Job, steps: JobStep[], approvals: Approval[], skill
     : `${statusText[job.status]}，已运行 ${elapsed < 60000 ? "不到 1 分钟" : `${Math.floor(elapsed / 60000)} 分钟`}`;
   const lines = [`任务「${job.title}」（${job.id}）：${state}${job.rounds?.length ? `（第 ${job.rounds.length + 1} 轮）` : ""}`];
   if (job.statusReason) lines.push(`原因：${job.statusReason}`);
-  for (const approval of approvals.filter((item) => item.jobId === job.id && item.status === "pending")) lines.push(`在等用户回答：${approval.title}`);
+  for (const approval of approvals.filter((item) => item.jobId === job.id && item.status === "pending")) lines.push(`在等你回复：${approval.title}`);
   if (job.skillsUsed?.length) lines.push(`用到的技能：${job.skillsUsed.map((name) => { const skill = skills.find((item) => item.name === name); return skill ? `${skill.title}（第 ${skill.version} 版）` : name; }).join("、")}`);
   if (ended) {
     if (job.summary) {