agent-loft 0.2.127 → 0.2.129

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/README.md +5 -2
  2. package/bin/cli.js +40 -19
  3. package/package.json +1 -1
  4. package/src/agents/claude/session.ts +8 -5
  5. package/src/agents/codex/session.ts +5 -4
  6. package/src/agents/dsh/session.ts +3 -1
  7. package/src/agents/pi/session.ts +4 -3
  8. package/src/agents/workbuddy/session.ts +6 -3
  9. package/src/channels/web/api.ts +10 -1
  10. package/src/channels/web/experts-api.ts +32 -8
  11. package/src/channels/web/memo-collab.ts +28 -0
  12. package/src/channels/web/memo-file.ts +30 -0
  13. package/src/channels/web/memo-storage.ts +15 -6
  14. package/src/channels/web/memos-api.ts +96 -37
  15. package/src/cli/service.ts +3 -1
  16. package/src/core/db.ts +12 -0
  17. package/src/core/expert-prompt.ts +2 -1
  18. package/src/core/experts.ts +2 -0
  19. package/src/core/hub.ts +13 -0
  20. package/src/core/mcp.ts +2 -2
  21. package/src/core/memo-index.ts +167 -0
  22. package/src/core/memo-sources.ts +113 -5
  23. package/src/core/memos-bridge.ts +69 -0
  24. package/src/core/tasks-bridge.ts +6 -0
  25. package/src/core/tasks-mcp.ts +7 -0
  26. package/src/core/types.ts +2 -0
  27. package/src/core/upgrade-health.ts +21 -0
  28. package/src/core/upgrade-launcher.ts +94 -0
  29. package/src/core/upgrade-releases.ts +103 -0
  30. package/src/core/upgrade.ts +54 -18
  31. package/src/main.ts +14 -0
  32. package/src/mcp/memo-tools.ts +26 -0
  33. package/src/mcp/tasks-server.ts +5 -4
  34. package/web/css/memos.css +3 -1
  35. package/web/lib/memo-access.js +28 -0
  36. package/web/settings/agent-defaults.js +4 -1
  37. package/web/settings/experts.js +7 -2
  38. package/web/settings/users.js +41 -15
  39. package/web/views/file-editor.js +2 -1
  40. package/web/views/memo-dialogs.js +88 -4
  41. package/web/views/memos.js +50 -15
@@ -0,0 +1,69 @@
1
+ import { HttpError } from "../channels/web/http.js";
2
+ import { editMemoRange, invalidateMemo, withMemoLock } from "../channels/web/memo-collab.js";
3
+ import { memoFile } from "../channels/web/memo-file.js";
4
+ import { MemoStorage } from "../channels/web/memo-storage.js";
5
+ import { MEMO_TOOLS } from "../mcp/memo-tools.js";
6
+ import { searchMemos } from "./memo-index.js";
7
+ import { canUseExpert } from "./experts.js";
8
+ import { memoAccessFor, memoSources, publicSource, validMemoPath } from "./memo-sources.js";
9
+ import { memoryOwnerOf } from "./personal.js";
10
+ import { expertIdOf, getConversation } from "./store.js";
11
+ import { getUser, isAdmin } from "./users.js";
12
+
13
+ export async function memoToolCall(owner: string, convKey: string, name: string, args: Record<string, unknown>) {
14
+ const tool = MEMO_TOOLS.find(t => t.name === name);
15
+ if (!tool) throw new HttpError(400, "未知备忘录操作");
16
+ const { properties, required } = tool.inputSchema;
17
+ if (Object.keys(args).some(k => !Object.hasOwn(properties, k) || typeof args[k] !== "string") ||
18
+ required.some(k => typeof args[k] !== "string")) throw new HttpError(400, "备忘录工具参数无效");
19
+ const { source: id, path, version, text, original, folder = "", query, cursor } = args as Record<string, string>;
20
+ if (folder && !validMemoPath(folder)) throw new HttpError(400, "笔记目录无效");
21
+ const authorize = () => {
22
+ const conv = getConversation(convKey), user = getUser(owner);
23
+ if (!conv || !user || user.disabled || memoryOwnerOf(conv) !== owner) throw new HttpError(403, "当前对话无权访问备忘录");
24
+ const expert = expertIdOf(conv);
25
+ if (!canUseExpert(owner, expert)) throw new HttpError(403, "当前对话无权使用此专家");
26
+ const sources = memoSources(owner).map(s => {
27
+ const access = memoAccessFor(s, expert);
28
+ return { ...s, access: conv.plan && access === "write" ? "read" as const : access };
29
+ }).filter(s => s.access !== "off");
30
+ const source = sources.find(s => s.id === id);
31
+ if (id !== undefined && !source) throw new HttpError(404, "未找到已授权的笔记库");
32
+ if (!tool.annotations.readOnlyHint && source?.access !== "write") throw new HttpError(403, "当前笔记库或对话仅允许读取");
33
+ return { user, sources, source };
34
+ };
35
+ const { user, sources, source } = authorize();
36
+ if (name === "list_memo_sources") return sources.map(publicSource);
37
+ if (name === "search_memos") return searchMemos(owner, source ? [source] : sources, query!, folder);
38
+ if (!source) throw new HttpError(400, "请选择笔记库");
39
+ const role = user.role;
40
+ const check = () => {
41
+ if (authorize().user.role !== role) throw new HttpError(403, "账号权限已变更");
42
+ };
43
+ if (name === "list_memo_files") {
44
+ const page = await new MemoStorage(source, isAdmin(user)).list(folder, cursor);
45
+ check();
46
+ return page;
47
+ }
48
+ const file = memoFile(user, source, path!, check);
49
+ return withMemoLock(file.lockKey, async () => {
50
+ check();
51
+ if (name === "create_memo") {
52
+ const saved = await file.persist(text!, null);
53
+ invalidateMemo(file.key);
54
+ return { version: saved };
55
+ }
56
+ const latest = await file.read();
57
+ check();
58
+ if (name === "read_memo") return latest;
59
+ if (version !== latest.version) throw new HttpError(409, "笔记版本已变更,请重新读取后修改");
60
+ let start = latest.text.length, end = start;
61
+ if (name === "edit_memo") {
62
+ if (!original) throw new HttpError(400, "请选择一段非空原文");
63
+ start = latest.text.indexOf(original);
64
+ if (start < 0 || latest.text.indexOf(original, start + 1) >= 0) throw new HttpError(409, "原文未找到或出现多次,请重新选择唯一片段");
65
+ end = start + original.length;
66
+ }
67
+ return { version: await editMemoRange(file.key, file.account, latest.text, version, start, end, text!, file.persist) };
68
+ });
69
+ }
@@ -1,3 +1,5 @@
1
+ import { memoToolCall } from "./memos-bridge.js";
2
+ import { MEMO_TOOLS } from "../mcp/memo-tools.js";
1
3
  // 主进程这头的定时任务工具:mcp/tasks-server.ts 经 unix socket 把 agent 的调用转过来,这里核对身份、
2
4
  // 弹授权卡、真正增删改。
3
5
  //
@@ -119,6 +121,10 @@ function card(fields: { schedule?: TaskSchedule; notify?: string; push?: PushCha
119
121
  }
120
122
 
121
123
  async function call(userId: string, convKey: string, tool: string, args: Record<string, unknown>): Promise<Reply> {
124
+ if (MEMO_TOOLS.some(t => t.name === tool)) {
125
+ try { return { text: JSON.stringify(await memoToolCall(userId, convKey, tool, args)) }; }
126
+ catch (err) { return fail(err instanceof Error ? err.message : "备忘录操作失败"); }
127
+ }
122
128
  const user = getUser(userId);
123
129
  if (!user || user.disabled) return fail("账号已停用。");
124
130
  const conv = getConversation(convKey);
@@ -42,6 +42,13 @@ export function verifyTaskCaller(userId: string, convKey: string, sig: string):
42
42
  */
43
43
  export const SKILLS_MCP_NAME = "agent_loft_skills";
44
44
 
45
+ export const MEMOS_MCP_NAME = "agent_loft_memos";
46
+
47
+ export function memosMcpSpawn(userId: string, convKey: string, via: string): StdioSpawn {
48
+ const base = tasksMcpSpawn(userId, convKey, via);
49
+ return { ...base, env: { ...base.env, AGENT_LOFT_TOOLSET: "memos" } };
50
+ }
51
+
45
52
  export function skillsMcpSpawn(userId: string, convKey: string, via: string): StdioSpawn {
46
53
  const base = tasksMcpSpawn(userId, convKey, via);
47
54
  return { ...base, env: { ...base.env, AGENT_LOFT_TOOLSET: "skills" } };
package/src/core/types.ts CHANGED
@@ -260,6 +260,8 @@ export type SessionOptions = {
260
260
  * 不给就是内置专家:原装提示词和工具,技能与 MCP 按账号的内置默认配置加载。
261
261
  */
262
262
  expert?: ExpertRuntime;
263
+ /** 当前主人有授权的可写笔记库时提供的整理说明。 */
264
+ memoPrompt?: string;
263
265
  /** 这条对话主人的记忆:prompt 拼进系统提示,userId 交给记忆工具(记给谁由这里定死) */
264
266
  memory?: {
265
267
  userId: string;
@@ -0,0 +1,21 @@
1
+ import { isIP } from "node:net";
2
+
3
+ export async function verifyUpgradeWeb(host: string, port: number): Promise<void> {
4
+ if (host === "0.0.0.0") host = "127.0.0.1";
5
+ if (host === "::") host = "::1";
6
+ const base = `http://${isIP(host) === 6 ? "[" + host + "]" : host}:${port}`;
7
+ async function get(url: string, type: RegExp): Promise<Response> {
8
+ const res = await fetch(base + url, { signal: AbortSignal.timeout(10_000), redirect: "error" });
9
+ if (res.status !== 200 || !type.test(res.headers.get("content-type") || "")) {
10
+ throw new Error(`${url} 响应异常(HTTP ${res.status})`);
11
+ }
12
+ return res;
13
+ }
14
+ const html = await (await get("/", /text\/html/)).text();
15
+ for (const [file, type] of [["app.js", /javascript/], ["css/base.css", /text\/css/]] as const) {
16
+ const asset = [...html.matchAll(/(?:src|href)="(\/[^"]+)"/g)].find(([, url]) => url?.endsWith("/" + file))?.[1];
17
+ if (!asset || !(await (await get(asset, type)).text()).trim()) throw new Error(`网页资源缺失:${file}`);
18
+ }
19
+ const me = await (await get("/api/me", /application\/json/)).json();
20
+ if (!me || typeof me !== "object" || !("authed" in me) || typeof me.authed !== "boolean") throw new Error("/api/me 响应异常");
21
+ }
@@ -0,0 +1,94 @@
1
+ // 由原 npm 命令入口加载。试运行期间由旧版监督启动,候选进程即使无法加载 tsx 也能回退。
2
+ import { fork } from "node:child_process";
3
+ import fs from "node:fs";
4
+ import path from "node:path";
5
+ import { pathToFileURL } from "node:url";
6
+ import { markInUse, pidAlive, readRelease, releaseRoot, type Release } from "./upgrade-releases.js";
7
+
8
+ async function tryRelease(store: string, pending: Release): Promise<boolean> {
9
+ const dir = path.join(store, pending.slot);
10
+ const marker = path.join(dir, "trial");
11
+ try {
12
+ fs.linkSync(markInUse(dir), marker);
13
+ } catch (err) {
14
+ if ((err as NodeJS.ErrnoException).code !== "EEXIST") throw err;
15
+ const pid = Number(fs.readFileSync(marker, "utf8"));
16
+ if (pid !== process.pid && pidAlive(pid)) return false;
17
+ recordFailure("上次验证被中断");
18
+ return false;
19
+ }
20
+ function recordFailure(reason: string) {
21
+ const message = `${pending.version} 启动验证失败,已回退:${reason}`;
22
+ console.error("[升级]", message);
23
+ if (readRelease(store, "pending")?.slot !== pending.slot) return;
24
+ fs.renameSync(path.join(store, "pending.json"), path.join(dir, "failed.json"));
25
+ try { fs.writeFileSync(path.join(store, "last-error"), message); }
26
+ catch (err) { console.error("[升级] 保存错误信息失败", err); }
27
+ }
28
+
29
+ const child = fork(path.join(releaseRoot(store, pending), "bin/cli.js"), process.argv.slice(2), {
30
+ execArgv: [], stdio: ["inherit", "inherit", "inherit", "ipc"],
31
+ env: { ...process.env, AGENT_LOFT_UPGRADE_TRIAL: pending.slot },
32
+ });
33
+ let ready = false;
34
+ let stopping = false;
35
+ let failure = "新版进程在验证前退出";
36
+ const stop = (signal: NodeJS.Signals) => { stopping = true; child.kill(signal); };
37
+ process.on("SIGINT", stop);
38
+ process.on("SIGTERM", stop);
39
+ const timer = setTimeout(() => { failure = "启动验证超时"; child.kill("SIGKILL"); }, 120_000);
40
+ try {
41
+ child.on("message", (msg) => {
42
+ const result = msg as { type?: string; version?: string; error?: string };
43
+ if (ready || stopping || result?.type !== "upgrade-health") return;
44
+ if (result.version !== pending.version || result.error) {
45
+ failure = result.error || "运行版本不匹配";
46
+ child.kill("SIGTERM");
47
+ return;
48
+ }
49
+ try {
50
+ fs.rmSync(path.join(store, "last-error"), { force: true });
51
+ fs.renameSync(path.join(store, "pending.json"), path.join(store, "active.json"));
52
+ ready = true;
53
+ clearTimeout(timer);
54
+ console.log(`[升级] 已验证并启用 ${pending.version}`);
55
+ } catch (err) {
56
+ failure = String(err);
57
+ child.kill("SIGTERM");
58
+ }
59
+ });
60
+ const code = await new Promise<number>((resolve) => {
61
+ child.once("error", (err) => { failure = err.message; });
62
+ child.once("close", (code) => resolve(code ?? 1));
63
+ });
64
+ if (ready || stopping) {
65
+ process.exitCode = code;
66
+ return true;
67
+ }
68
+ recordFailure(failure);
69
+ return false;
70
+ } finally {
71
+ clearTimeout(timer);
72
+ process.off("SIGINT", stop);
73
+ process.off("SIGTERM", stop);
74
+ }
75
+ }
76
+
77
+ export async function launchRelease(store: string): Promise<boolean> {
78
+ if ((process.argv[2] ?? "start") === "start") {
79
+ const pending = readRelease(store, "pending");
80
+ if (pending) {
81
+ try {
82
+ if (await tryRelease(store, pending)) return true;
83
+ } catch (err) {
84
+ console.error("[升级] 无法开始或完成验证,启动已验证版本", err);
85
+ }
86
+ }
87
+ }
88
+ const active = readRelease(store, "active");
89
+ if (!active) return false;
90
+ try { markInUse(path.join(store, active.slot)); }
91
+ catch (err) { console.warn("[升级] 无法记录版本占用", err); }
92
+ await import(pathToFileURL(path.join(releaseRoot(store, active), "bin/cli.js")).href);
93
+ return true;
94
+ }
@@ -0,0 +1,103 @@
1
+ // 全局安装保留最初的 CLI 入口。npm 只写独立 prefix,重启验证通过后原子切换版本记录。
2
+ import fs from "node:fs";
3
+ import path from "node:path";
4
+
5
+ const storeName = ".agent-loft-releases";
6
+ const modules = process.platform === "win32" ? "node_modules" : path.join("lib", "node_modules");
7
+ const slotPattern = /^release-[a-zA-Z0-9]{6}$/;
8
+
9
+ export function releaseStore(packageRoot: string): string {
10
+ const prefix = path.resolve(packageRoot, process.platform === "win32" ? "../.." : "../../..");
11
+ if (slotPattern.test(path.basename(prefix)) && path.basename(path.dirname(prefix)) === storeName) {
12
+ return path.dirname(prefix);
13
+ }
14
+ return path.join(packageRoot, storeName);
15
+ }
16
+
17
+ export type Release = { slot: string; version: string };
18
+ export type ReleaseRecord = "pending" | "active";
19
+
20
+ export function releaseRoot(store: string, release: Release): string {
21
+ if (!slotPattern.test(release.slot)) throw new Error("更新目录无效");
22
+ return path.join(store, release.slot, modules, "agent-loft");
23
+ }
24
+
25
+ export function readRelease(store: string, record: ReleaseRecord): Release | undefined {
26
+ try {
27
+ const release = JSON.parse(fs.readFileSync(path.join(store, record + ".json"), "utf8"));
28
+ releaseRoot(store, release);
29
+ return release;
30
+ } catch (err) {
31
+ if ((err as NodeJS.ErrnoException).code !== "ENOENT") throw err;
32
+ }
33
+ }
34
+
35
+ export function pidAlive(pid: number): boolean {
36
+ if (!Number.isSafeInteger(pid) || pid <= 0) return false;
37
+ try {
38
+ process.kill(pid, 0);
39
+ return true;
40
+ } catch (err) {
41
+ return (err as NodeJS.ErrnoException).code !== "ESRCH";
42
+ }
43
+ }
44
+
45
+ export function markInUse(dir: string): string {
46
+ const file = path.join(dir, "pid-" + process.pid);
47
+ fs.writeFileSync(file, String(process.pid));
48
+ return file;
49
+ }
50
+
51
+ // 清理中断的下载和已替换的版本。其他实例还在使用的目录要留到以后。
52
+ async function pruneReleases(store: string): Promise<void> {
53
+ for (const slot of fs.readdirSync(store).filter(name => slotPattern.test(name))) {
54
+ const dir = path.join(store, slot);
55
+ try {
56
+ const pids = fs.readdirSync(dir).filter(name => name.startsWith("pid-"));
57
+ if (!pids.length || pids.some(name => pidAlive(Number(name.slice(4))))) continue;
58
+ if (readRelease(store, "active")?.slot === slot || readRelease(store, "pending")?.slot === slot) continue;
59
+ await fs.promises.rm(dir, { recursive: true, force: true });
60
+ } catch (err) {
61
+ if ((err as NodeJS.ErrnoException).code !== "ENOENT") console.warn("[升级] 无法清理旧版本", err);
62
+ }
63
+ }
64
+ }
65
+
66
+ // link 在同一文件系统内一次性发布完整记录,另一个进程先提交时不会覆盖它。
67
+ function queueRelease(store: string, release: Release): void {
68
+ const manifest = path.join(store, release.slot, "release.json");
69
+ fs.writeFileSync(manifest, JSON.stringify(release));
70
+ fs.linkSync(manifest, path.join(store, "pending.json"));
71
+ }
72
+
73
+ export async function stageRelease(
74
+ root: string, version: string,
75
+ install: (prefix: string) => Promise<string>,
76
+ checkCli: (cli: string) => Promise<void>,
77
+ ): Promise<string> {
78
+ const store = releaseStore(root);
79
+ fs.mkdirSync(store, { recursive: true });
80
+ if (readRelease(store, "pending")) throw new Error("已有更新等待重启验证");
81
+ const active = readRelease(store, "active");
82
+ if ((active ? releaseRoot(store, active) : path.dirname(store)) !== root) throw new Error("运行版本已变更,请先重启服务");
83
+ await pruneReleases(store);
84
+ const prefix = fs.mkdtempSync(path.join(store, "release-"));
85
+ const release = { slot: path.basename(prefix), version };
86
+ try {
87
+ markInUse(prefix);
88
+ const output = await install(prefix);
89
+ const candidate = releaseRoot(store, release);
90
+ const pkg = JSON.parse(fs.readFileSync(path.join(candidate, "package.json"), "utf8"));
91
+ if (pkg.name !== "agent-loft" || pkg.version !== version) throw new Error("安装包名称或版本不匹配");
92
+ for (const file of ["src/main.ts", "web/index.html", "web/app.js", "web/css/base.css"]) {
93
+ if (!fs.statSync(path.join(candidate, file)).size) throw new Error(`更新包文件为空:${file}`);
94
+ }
95
+ await checkCli(path.join(candidate, "bin/cli.js"));
96
+ if (readRelease(store, "active")?.slot !== active?.slot) throw new Error("运行版本已变更,请先重启服务");
97
+ queueRelease(store, release);
98
+ return output;
99
+ } catch (err) {
100
+ await fs.promises.rm(prefix, { recursive: true, force: true }).catch(cleanup => console.warn("[升级] 清理安装目录失败", cleanup));
101
+ throw err;
102
+ }
103
+ }
@@ -6,6 +6,7 @@ import { spawn, spawnSync } from "node:child_process";
6
6
  import fs from "node:fs";
7
7
  import path from "node:path";
8
8
  import { fileURLToPath } from "node:url";
9
+ import { readRelease, releaseStore, stageRelease } from "./upgrade-releases.js";
9
10
  import { config, saveConfig } from "./config.js";
10
11
 
11
12
  const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../..");
@@ -32,17 +33,23 @@ function npmEnv(): NodeJS.ProcessEnv {
32
33
  function run(cmd: string, args: string[], timeoutMs: number): Promise<{ code: number; out: string }> {
33
34
  return new Promise((resolve) => {
34
35
  let out = "";
36
+ const npmCli = path.join(path.dirname(process.execPath), "node_modules/npm/bin/npm-cli.js");
37
+ if (process.platform === "win32" && cmd === npmBin() && fs.existsSync(npmCli)) {
38
+ args = [npmCli, ...args];
39
+ cmd = process.execPath;
40
+ }
35
41
  const child = spawn(cmd, args, { env: npmEnv(), stdio: ["ignore", "pipe", "pipe"] });
36
- const timer = setTimeout(() => child.kill("SIGKILL"), timeoutMs);
37
- child.stdout.on("data", (d) => (out += d));
38
- child.stderr.on("data", (d) => (out += d));
42
+ let timedOut = false;
43
+ const timer = setTimeout(() => { timedOut = true; child.kill("SIGKILL"); }, timeoutMs);
44
+ child.stdout.on("data", (d) => (out = (out + d).slice(-8000)));
45
+ child.stderr.on("data", (d) => (out = (out + d).slice(-8000)));
39
46
  child.on("error", (err) => {
40
47
  clearTimeout(timer);
41
48
  resolve({ code: -1, out: err.message });
42
49
  });
43
50
  child.on("close", (code) => {
44
51
  clearTimeout(timer);
45
- resolve({ code: code ?? -1, out: out.trim() });
52
+ resolve({ code: code ?? -1, out: timedOut ? `操作超时(${timeoutMs / 1000} 秒)。${out.trim()}` : out.trim() });
46
53
  });
47
54
  });
48
55
  }
@@ -68,7 +75,7 @@ function globalPrefix(): string | null {
68
75
  return null;
69
76
  }
70
77
  };
71
- const self = real(root);
78
+ const self = real(path.dirname(releaseStore(root)));
72
79
  if (!self || path.basename(path.dirname(self)) !== "node_modules") return null;
73
80
  if (process.platform === "win32") {
74
81
  const prefix = path.dirname(path.dirname(self));
@@ -118,9 +125,22 @@ export type VersionInfo = {
118
125
  /** 不能在线升级时说明原因和手动办法 */
119
126
  reason?: string;
120
127
  upgrading: boolean;
128
+ pendingVersion?: string;
129
+ upgradeError?: string;
121
130
  };
122
131
 
123
132
  let upgrading = false;
133
+ let installError: string | undefined;
134
+
135
+ // npm 安装可能比反向代理的请求时限更长,设置页用短请求读取进度。
136
+ export function upgradeStatus() {
137
+ return { version: RUNNING_VERSION, upgrading, pendingVersion: readRelease(releaseStore(root), "pending")?.version, error: installError };
138
+ }
139
+
140
+ export function beginUpgrade(): void {
141
+ if (upgrading) return;
142
+ void upgrade().catch(err => console.error("[升级]", err.message));
143
+ }
124
144
 
125
145
  export async function versionInfo(refresh = false): Promise<VersionInfo> {
126
146
  const [kind, latest] = await Promise.all([installKind(), latestVersion(refresh)]);
@@ -131,7 +151,16 @@ export async function versionInfo(refresh = false): Promise<VersionInfo> {
131
151
  : kind === "unknown"
132
152
  ? "不是用 npm install -g 装的,没法在线升级"
133
153
  : undefined;
154
+ const store = releaseStore(root);
155
+ const pending = readRelease(store, "pending");
156
+ let upgradeError: string | undefined;
157
+ try {
158
+ upgradeError = fs.readFileSync(path.join(store, "last-error"), "utf8");
159
+ } catch (err) {
160
+ if ((err as NodeJS.ErrnoException).code !== "ENOENT") throw err;
161
+ }
134
162
  return {
163
+ pendingVersion: pending?.version, upgradeError,
135
164
  version: RUNNING_VERSION,
136
165
  latest: latest.version,
137
166
  ...(latest.error ? { latestError: latest.error } : {}),
@@ -150,25 +179,32 @@ export async function versionInfo(refresh = false): Promise<VersionInfo> {
150
179
  */
151
180
  export async function upgrade(): Promise<{ from: string; to: string; restarting: boolean; output: string }> {
152
181
  if (upgrading) throw new Error("正在升级,稍等");
153
- const info = await versionInfo(true);
154
- if (!info.canUpgrade) throw new Error(info.reason ?? "没法在线升级");
155
- if (!info.latest) throw new Error(`查不到最新版本:${info.latestError ?? ""}`);
156
- if (!info.updateAvailable) throw new Error(`已经是最新版本 ${RUNNING_VERSION}`);
157
182
  upgrading = true;
183
+ installError = undefined;
158
184
  try {
159
- // 明确指定 prefix:装回原来那个位置,不受当前 npm 配置影响
160
- const prefix = globalPrefix()!;
161
- const r = await run(npmBin(), ["install", "-g", "--prefix", prefix, `${NAME}@${info.latest}`, "--no-audit", "--no-fund"], 10 * 60_000);
162
- const installed = readPackage().version;
163
- if (r.code !== 0 || installed !== info.latest) {
164
- throw new Error(`npm install 失败:${r.out.slice(-600) || `退出码 ${r.code}`}`);
165
- }
185
+ const info = await versionInfo(true);
186
+ if (!info.canUpgrade) throw new Error(info.reason ?? "没法在线升级");
187
+ if (info.pendingVersion) throw new Error("已有更新等待重启验证");
188
+ if (!info.latest) throw new Error(`查不到最新版本:${info.latestError ?? ""}`);
189
+ if (!info.updateAvailable) throw new Error(`已经是最新版本 ${RUNNING_VERSION}`);
190
+ const version = info.latest;
191
+ const output = await stageRelease(root, version, async (prefix) => {
192
+ const r = await run(npmBin(), ["install", "-g", "--prefix", prefix, `${NAME}@${version}`, "--no-audit", "--no-fund"], 10 * 60_000);
193
+ if (r.code !== 0) throw new Error(`npm install 失败:${r.out || `退出码 ${r.code}`}`);
194
+ return r.out;
195
+ }, async (cli) => {
196
+ const r = await run(process.execPath, [cli, "--help"], 15_000);
197
+ if (r.code !== 0) throw new Error(`新版 CLI 无法启动:${r.out || r.code}`);
198
+ });
166
199
  const restarting = !!info.service;
167
200
  if (restarting) {
168
- console.log(`[升级] 已装好 ${installed},退出进程,由 ${info.service} 拉起新版本`);
201
+ console.log(`[升级] 已准备 ${version},重启后验证`);
169
202
  setTimeout(() => process.exit(0), 1500).unref();
170
203
  }
171
- return { from: RUNNING_VERSION, to: installed, restarting, output: r.out.slice(-2000) };
204
+ return { from: RUNNING_VERSION, to: version, restarting, output: output.slice(-2000) };
205
+ } catch (err) {
206
+ installError = err instanceof Error ? err.message : String(err);
207
+ throw err;
172
208
  } finally {
173
209
  upgrading = false;
174
210
  }
package/src/main.ts CHANGED
@@ -1,3 +1,6 @@
1
+ import { RUNNING_VERSION } from "./core/upgrade.js";
2
+ import { verifyUpgradeWeb } from "./core/upgrade-health.js";
3
+ import { startMemoIndexer, stopMemoIndexer } from "./core/memo-index.js";
1
4
  // 入口:拉起 agent 驱动、飞书机器人和 Web 服务。
2
5
  import { config, loadConfig, onConfigChange } from "./core/config.js";
3
6
  import { hub } from "./core/hub.js";
@@ -102,6 +105,7 @@ async function main(): Promise<void> {
102
105
  });
103
106
  // 定时任务:agent 用的工具通道先开,再开始按点运行(停机期间错过的补跑)
104
107
  startTasksBridge();
108
+ startMemoIndexer();
105
109
  startTaskRunner();
106
110
  // 先查一遍 agent 装没装、登没登录,网页打开时新对话里就只列出能用的
107
111
  void agentHealth().catch(() => {});
@@ -123,6 +127,7 @@ async function main(): Promise<void> {
123
127
  console.log(`[退出] 收到 ${signal},正在收尾…`);
124
128
  const force = setTimeout(() => process.exit(0), 8000);
125
129
  force.unref();
130
+ stopMemoIndexer();
126
131
  stopScheduler();
127
132
  stopFeishu();
128
133
  stopWeixin();
@@ -138,6 +143,15 @@ async function main(): Promise<void> {
138
143
  process.on("SIGINT", () => void shutdown("SIGINT"));
139
144
  process.on("exit", (code) => console.log(`[退出] agent-loft 结束,退出码 ${code}`));
140
145
  process.on("unhandledRejection", (err) => console.error("[未处理的异常]", err));
146
+ if (process.env.AGENT_LOFT_UPGRADE_TRIAL && process.send) {
147
+ const { host, port } = config().web;
148
+ try {
149
+ await verifyUpgradeWeb(host, port);
150
+ process.send({ type: "upgrade-health", version: RUNNING_VERSION });
151
+ } catch (err) {
152
+ process.send({ type: "upgrade-health", error: String(err) });
153
+ }
154
+ }
141
155
  }
142
156
 
143
157
  void main();
@@ -0,0 +1,26 @@
1
+ const writeIntent = "只有用户表达了留存或更新笔记的意图时才写入备忘录。";
2
+ export const MEMO_WRITING_GUIDE = writeIntent +
3
+ "「这个留着下次用」「加到清单里」都算。普通聊天、问答或任务自然结束时,无需主动归档。" +
4
+ "用 agent_loft_memos 自行选择合适的已授权读写库,搜索相关笔记,先读取再更新。已有相同内容就跳过,没有合适的笔记就沿用目录和命名习惯新建 Markdown。" +
5
+ "根据对话拟标题、提炼正文,保存成功后告诉用户库名和文件路径。";
6
+
7
+ const fields = {
8
+ source: "笔记库 ID,从 list_memo_sources 获取", path: "库内相对文件路径", folder: "库内目录,默认根目录",
9
+ cursor: "上一页返回的分页标记", query: "文件名、路径或正文关键词", version: "read_memo 返回的最新版本",
10
+ text: "要新建、追加或替换成的文本", original: "要替换的唯一原文(精确匹配)",
11
+ };
12
+ type Field = keyof typeof fields;
13
+ function tool(name: string, description: string, required: Field[], optional: Field[] = [], write = false) {
14
+ const properties = Object.fromEntries([...required, ...optional].map(f => [f, { type: "string", description: fields[f] }]));
15
+ return { name, description: write ? writeIntent + description : description, inputSchema: { type: "object", properties, required, additionalProperties: false },
16
+ annotations: { readOnlyHint: !write, openWorldHint: true } };
17
+ }
18
+ export const MEMO_TOOLS = [
19
+ tool("list_memo_sources", "用户想留下笔记、清单或排障经验时,用此工具找到合适的读写库,再搜索、更新或新建笔记。库名、文件名和正文可以由你根据对话确定。", []),
20
+ tool("list_memo_files", "浏览笔记库中的一层目录。", ["source"], ["folder", "cursor"]),
21
+ tool("search_memos", "在授权笔记库的全文索引里搜索文件名和正文,返回路径和片段。success 为零表示首次索引未完成。", ["query"], ["source", "folder"]),
22
+ tool("read_memo", "从远端读取备忘录的最新正文和版本号。", ["source", "path"]),
23
+ tool("create_memo", "在已有目录中新建文本备忘录,同名文件会返回冲突。", ["source", "path", "text"], [], true),
24
+ tool("append_memo", "追加文本(自行包含所需换行)。先读取最新版本。", ["source", "path", "version", "text"], [], true),
25
+ tool("edit_memo", "精确替换一处唯一原文,先读取笔记。遇到版本冲突请重新读取并核对修改。", ["source", "path", "version", "original", "text"], [], true),
26
+ ];
@@ -1,3 +1,4 @@
1
+ import { MEMO_TOOLS } from "./memo-tools.js";
1
2
  // 定时任务工具的 MCP 服务(stdio):给 agent 用的 list / create / update / delete。
2
3
  // 环境变量 AGENT_LOFT_TOOLSET=skills 时换成技能工具(list / get / create / update_skill),走同一条通道。
3
4
  //
@@ -227,8 +228,8 @@ const SKILL_TOOLS = [
227
228
  },
228
229
  ];
229
230
 
230
- const skillsOnly = process.env.AGENT_LOFT_TOOLSET === "skills";
231
- const ACTIVE = skillsOnly ? SKILL_TOOLS : TOOLS;
231
+ const toolset = process.env.AGENT_LOFT_TOOLSET;
232
+ const ACTIVE = toolset === "memos" ? MEMO_TOOLS : toolset === "skills" ? SKILL_TOOLS : TOOLS;
232
233
 
233
234
  function text(t: string, isError = false) {
234
235
  return { content: [{ type: "text", text: t }], ...(isError ? { isError: true } : {}) };
@@ -238,7 +239,7 @@ function text(t: string, isError = false) {
238
239
  function forward(tool: string, args: Record<string, unknown>): Promise<{ text: string; isError?: boolean }> {
239
240
  return new Promise((resolve) => {
240
241
  if (!socketPath || !caller.user || !caller.conv) {
241
- resolve({ text: `${skillsOnly ? "技能" : "定时任务"}工具没有正确配置(缺少用户或对话)。`, isError: true });
242
+ resolve({ text: `内置工具没有正确配置(缺少用户或对话)。`, isError: true });
242
243
  return;
243
244
  }
244
245
  const sock = net.createConnection(socketPath);
@@ -274,7 +275,7 @@ async function handle(req: Request): Promise<unknown> {
274
275
  return {
275
276
  protocolVersion: typeof req.params?.protocolVersion === "string" ? req.params.protocolVersion : "2025-06-18",
276
277
  capabilities: { tools: {} },
277
- serverInfo: { name: skillsOnly ? "agent-loft-skills" : "agent-loft-tasks", version: "1.0.0" },
278
+ serverInfo: { name: `agent-loft-${toolset ?? "tasks"}`, version: "1.0.0" },
278
279
  };
279
280
  case "ping":
280
281
  return {};
package/web/css/memos.css CHANGED
@@ -4,7 +4,8 @@
4
4
  .memo-side, .memo-pane { display: flex; flex-direction: column; min-width: 0; min-height: 0; }
5
5
  .memo-side { background: var(--bg-side); border-right: 1px solid var(--border); }
6
6
  .memo-sources, .memo-tree-tools, .memo-bar, .memo-blankbar { display: flex; align-items: center; gap: 6px; padding: 8px; }
7
- .memo-sources .input { flex: 1; min-width: 0; }
7
+ .memo-sources { flex-wrap: wrap; }
8
+ .memo-sources .input { width: 100%; min-width: 0; }
8
9
  .memo-side .icon-btn { width: 30px; height: 30px; flex-shrink: 0; }
9
10
  .memo-tree { overflow: auto; flex: 1; padding: 0 6px 12px; }
10
11
  .memo-tree .memo-branch { margin-left: 10px; padding-left: 3px; border-left: 1px solid var(--border); }
@@ -35,6 +36,7 @@
35
36
  .memo-fields { gap: 12px; }
36
37
  .memo-fields label { font-size: 13px; }
37
38
  .memo-fields .input { width: 100%; }
39
+ .memo-fields .memo-expert-access { display: grid; grid-template-columns: minmax(0, 1fr) minmax(8em, 40%); align-items: center; overflow-wrap: anywhere; }
38
40
  .memo-fields .btn { align-self: flex-end; }
39
41
  .memo-error { color: var(--danger); }
40
42
  .memo-page [hidden], .memo-fields[hidden], .memo-blankbar, .memo-bar > button:first-child, .memo-return { display: none; }
@@ -0,0 +1,28 @@
1
+ import { h } from "./dom.js";
2
+
3
+ const labels = { off: "关闭", read: "只读", write: "读写" };
4
+
5
+ export function memoAccessSelect(label, value, libraryDefault) {
6
+ const select = h("select", { class: "input", "aria-label": label },
7
+ libraryDefault ? h("option", { value: "" }, `沿用笔记库默认(${labels[libraryDefault]})`) : null,
8
+ Object.entries(labels).map(([id, name]) => h("option", { value: id }, name)));
9
+ select.value = value;
10
+ return select;
11
+ }
12
+
13
+ export function expertMemoField(libraries = [], expert) {
14
+ const rows = libraries.map(source => {
15
+ const initial = source.expertAccess?.[expert] ?? "";
16
+ const input = memoAccessSelect(source.name, initial, source.access ?? "off");
17
+ return { id: source.id, input, initial, row: h("label", { class: "memo-expert-access" }, h("span", {}, source.name), input) };
18
+ });
19
+ return {
20
+ el: h("div", { class: "field" }, h("span", {}, "备忘录权限"),
21
+ rows.length ? h("div", { class: "memo-fields" }, rows.map(r => r.row))
22
+ : h("small", {}, "可先在「备忘录」连接自己的笔记库。")),
23
+ changes() {
24
+ const entries = rows.filter(r => r.input.value !== r.initial).map(r => [r.id, r.input.value || null]);
25
+ return entries.length ? Object.fromEntries(entries) : undefined;
26
+ },
27
+ };
28
+ }
@@ -1,5 +1,6 @@
1
1
  import { fill, h, toast } from "../lib/dom.js";
2
2
  import { api } from "../lib/api.js";
3
+ import { expertMemoField } from "../lib/memo-access.js";
3
4
  import { modal, confirmDialog } from "../lib/overlay.js";
4
5
  import { isAdmin, S } from "../state.js";
5
6
  import { renderContext } from "../views/topbar.js";
@@ -83,6 +84,7 @@ export function openAgentDefaults(engine, label) {
83
84
  const pick = server ? modelPicker(engine, server.defaultModel ?? "", server.defaultEffort ?? "", DEFAULT_MODEL_LABEL[engine] ?? "跟随默认") : null;
84
85
 
85
86
  const skills = loadPicker(`${label} 技能`, data.skills, prefs.skills, "全部已启用的个人技能(含以后新增)");
87
+ const memos = expertMemoField(data.memoLibraries, engine);
86
88
  const machine = (data.machineMcp?.[engine] ?? []).map((name) => ({ id: `${data.machinePrefix}${name}`, name: `${name}(本机)` }));
87
89
  const mcp = loadPicker(`${label} MCP`, [...data.mcp, ...machine], prefs.mcp, data.machineMcp ? "沿用机器上的 MCP 配置" : null);
88
90
  const machineSkills = h("input", { type: "checkbox", checked: prefs.machineSkills });
@@ -115,6 +117,7 @@ export function openAgentDefaults(engine, label) {
115
117
  skills.el,
116
118
  data.machineMcp ? h("label", { class: "check-item" }, machineSkills, "同时加载机器上的技能") : null,
117
119
  mcp.el,
120
+ memos.el,
118
121
  h("small", {}, "技能和 MCP 可分别全部取消。记忆、定时任务、技能管理等系统工具仍按功能设置提供。"),
119
122
  );
120
123
  fill(
@@ -122,7 +125,7 @@ export function openAgentDefaults(engine, label) {
122
125
  saveButton(async () => {
123
126
  const res = await api("/api/agents/defaults", {
124
127
  method: "PUT",
125
- body: { agents: { [engine]: { permission: permission.value || null, skills: skills.value(), machineSkills: machineSkills.checked, mcp: mcp.value() } } },
128
+ body: { agents: { [engine]: { permission: permission.value || null, skills: skills.value(), machineSkills: machineSkills.checked, mcp: mcp.value(), memoAccess: memos.changes() } } },
126
129
  });
127
130
  S.defaultPermission = { ...S.defaultPermission, [engine]: res.agents?.[engine]?.permission ?? null };
128
131
  const changed = pick && (pick.model() !== (server.defaultModel ?? "") || pick.effort() !== (server.defaultEffort ?? ""));