hob-bot 1.4.0 → 1.5.0

package/server/src/http.ts

@@ -20,13 +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";
@@ -570,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() } : {}),
         },
@@ -832,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 } : {}),
@@ -898,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);
@@ -908,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) {
@@ -922,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);
@@ -943,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);
     }
@@ -1053,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/jobs.ts

@@ -18,6 +18,7 @@ import type {
 } from "../../shared/types.ts";
 import { IMAGE_TYPES, isImagePath } from "../../shared/media.ts";
 import { newId } from "./ids.ts";
+import { resolveMovedPath } from "./layout.ts";
 import { availableDesktopTools, type DesktopToolSession } from "./desktop-tools.ts";
 import { imageConfigured } from "./image.ts";
 import { boundKnowledge, findKnowledgeTool, searchKnowledgeTool } from "./knowledge-tools.ts";
@@ -220,6 +221,8 @@ export class JobManager {
       cwd: job.cwd ?? "",
       save: (stepId, text) => this.store.writeStepOutput(jobId, stepId, text),
       mcpServers: mcpServerDisplay(this.runtime.home),
+      // 迁移前写进会话的绝对路径：换成新位置后，详情页里还是短文件名
+      resolvePath: (path) => resolveMovedPath(this.runtime.home, path),
     });
     return [...steps, ...(this.workers.get(jobId)?.queued ?? [])];
   }

package/server/src/knowledge.ts

@@ -7,10 +7,15 @@ import type { EmbeddingSettings } from "../../shared/types.ts";
 import { embed, embeddingKey, embeddingModel } from "./embedding.ts";
 import { extractChunks, UnsupportedIndex, type IndexedChunk } from "./knowledge-index.ts";
 import type { Bus } from "./bus.ts";
-import { looksText } from "./files.ts";
+import { looksText, isInPagesDir } from "./files.ts";
 import { newId } from "./ids.ts";
 import type { Store } from "./store.ts";
 
+/** 从数据目录内的相对路径推任务 id：老布局 jobs/<jid>/…，新布局 assistants/<aid>/jobs/<jid>/… */
+function jobIdFromPath(rel: string): string | undefined {
+  return /^(?:assistants[/\\][^/\\]+[/\\])?jobs[/\\]([^/\\]+)[/\\]/.exec(rel)?.[1];
+}
+
 type Entry = KnowledgeEntry & { sourceKey?: string };
 type CollectInput = { origin: "output" | "chat"; path: string; name?: string; description?: string; assistantId: string; itemId?: string; jobId?: string };
 type Query = { origin?: string; collection?: string; kind?: string; assistantId?: string; q?: string; before?: string; limit?: number };
@@ -188,7 +193,7 @@ export class KnowledgeStore {
     const originalName = basename(input.path);
     const name = input.name || (input.origin === "chat" ? originalName.replace(/^u-[^-]+-/, "") : originalName);
     const kind = fileKind(originalName) ?? (looksText(data) ? "text" : "other");
-    const inPages = !relative(join(this.home, "pages"), resolve(input.path)).startsWith(`..${sep}`) && relative(join(this.home, "pages"), resolve(input.path)) !== "..";
+    const inPages = isInPagesDir(relative(this.home, resolve(input.path)));
     const ext = extname(originalName).toLowerCase().replace(/[^.a-z0-9]/g, "");
     const path = join(this.root, inPages ? "pages" : "blobs", `${hash}${inPages ? ".html" : ext}`);
     mkdirSync(dirname(path), { recursive: true });
@@ -201,8 +206,8 @@ export class KnowledgeStore {
         : content;
       writeFileSync(join(this.root, "text", `${hash}.txt`), Buffer.from(text).subarray(0, 64 * 1024), { mode: 0o600 });
     }
-    const rel = relative(join(this.home, "jobs"), resolve(input.path));
-    const jobId = input.jobId || (!rel.startsWith(`..${sep}`) && rel !== ".." && rel.includes(sep) ? rel.split(sep)[0] : undefined);
+    const rel = relative(this.home, resolve(input.path));
+    const jobId = input.jobId || jobIdFromPath(rel);
     const description = input.description || (jobId ? this.store.job(jobId)?.title : undefined);
     const now = this.timestamp(entries);
     if (previous) {

package/server/src/layout-cli.ts

@@ -0,0 +1,25 @@
+// HOB_HOME 布局迁移的命令行入口：npm run layout -- --dry-run | --restore
+//
+// 正常情况下启动时自动迁移；这两个开关给试跑和出事后的恢复用。
+// --dry-run 只打印计划，什么都不动；--restore 从 backup-v1-* 恢复成老布局。
+import { resolveHome } from "./config.ts";
+import { migrateHome, restoreHome } from "./layout.ts";
+
+const args = new Set(process.argv.slice(2));
+const home = resolveHome();
+const usage = "用法：npm run layout -- [--dry-run | --restore]（npm 安装的用 hob layout [--dry-run | --restore]）";
+
+if (args.has("--help") || args.has("-h")) {
+  console.log(usage);
+} else if (args.has("--dry-run")) {
+  console.log(`数据目录：${home}`);
+  const summary = migrateHome(home, { dryRun: true });
+  console.log(summary.status === "dry-run" ? "（dry-run 没有改动任何文件）" : `当前状态：${summary.status}`);
+} else if (args.has("--restore")) {
+  console.log(`数据目录：${home}`);
+  const result = restoreHome(home);
+  console.log(`已恢复到老布局：${result.files} 个文件，备份在 ${result.backupDir}。下次启动会重新迁移。`);
+} else {
+  console.error(usage);
+  process.exit(1);
+}