agent-loft 0.2.49 → 0.2.50

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.
@@ -44,12 +44,13 @@ export function setDraftExpert(id) {
44
44
  localStorage.setItem("aim.expert", id);
45
45
  const e = syncDraftExpert();
46
46
  if (e) localStorage.setItem("aim.agent", e.engine);
47
- // 换了专家:默认工作目录跟着专家走(没设就是工作区根目录)
48
- S.draftCwd = e?.cwd || null;
47
+ // 换了专家:默认工作目录跟着专家走(没设就是工作区根目录);自己选过目录的就不动
48
+ if (!S.draftCwdPicked) S.draftCwd = e?.cwd || null;
49
49
  }
50
50
 
51
- /** 专家的图标:自定义专家有 emoji 就用 emoji,否则用引擎的图标 */
51
+ /** 专家的图标:自定义专家上传了头像用头像,以前设过 emoji 的用 emoji,否则用引擎的图标 */
52
52
  export function expertIcon(e, cls = "agent-icon") {
53
+ if (e?.avatar) return h("span", { class: `${cls} expert-avatar` }, h("img", { src: e.avatar, alt: "", draggable: "false" }));
53
54
  if (e?.icon) return h("span", { class: `${cls} expert-emoji` }, e.icon);
54
55
  return agentIcon(e?.engine ?? e?.id, cls);
55
56
  }
@@ -24,7 +24,8 @@ import { syncDraftExpert } from "./experts.js";
24
24
  import { confirmDialog, showMenu } from "../lib/overlay.js";
25
25
  import { applyShellInfo, handleAllowEmbed, HOME, mountSwitcher, refreshShellPush, routeToServer, shellBooted, switchServer } from "../lib/shell.js";
26
26
  import { bindScrollWatch, newDraft, openConversation, scrollToBottom } from "./messages.js";
27
- import { renderComposer } from "./composer.js";
27
+ import { bindFileDrop, renderComposer } from "./composer.js";
28
+ import { openSearch } from "./conv-search.js";
28
29
  import { createNav } from "./msg-nav.js";
29
30
  import { renameConv } from "./conv-actions.js";
30
31
  import { releaseForeignPushSub } from "../lib/push.js";
@@ -263,6 +264,8 @@ function renderLayout() {
263
264
  { class: "side-top" },
264
265
  h("button", { class: "btn new-chat", onclick: () => (newDraft(), closeSide()) }, icon("compose"), "新聊天"),
265
266
  ),
267
+ // 搜索:弹窗里搜标题和聊天内容,可以按专家筛
268
+ h("button", { class: "btn new-chat side-nav search-nav", onclick: () => openSearch() }, icon("search"), "搜索"),
266
269
  // 「最近」上面的入口,像 ChatGPT 的 Tasks。当前在任务页时高亮(renderSidebar 里切换)
267
270
  (ui.tasksNav = h("button", { class: "btn new-chat side-nav", onclick: () => openTasksView() }, icon("clock"), "定时任务")),
268
271
  // 远程控制:这台机器的桌面和终端。后台连着时右边亮个小绿点(renderSidebar 里切换)
@@ -291,6 +294,7 @@ function renderLayout() {
291
294
  bindScrollWatch();
292
295
  ui.composerWrap = h("div", { class: "composer-wrap" });
293
296
  ui.main = h("main", { class: "main" }, ui.topbar, ui.messages, createNav(), ui.composerWrap);
297
+ bindFileDrop(ui.main);
294
298
  ui.layout = h("div", { class: "layout" }, ui.sidebar, h("div", { class: "scrim", onclick: closeSide }), ui.main);
295
299
  fill($app, ui.layout, h("div", { class: "edge-strip", "aria-hidden": "true" }));
296
300
  renderComposer();
@@ -83,15 +83,18 @@ document.addEventListener("visibilitychange", () => {
83
83
  if (Date.now() - quotaState.at >= quotaInterval()) void loadQuota();
84
84
  });
85
85
 
86
- function untilText(ms) {
87
- const sec = Math.floor((ms - Date.now()) / 1000);
88
- if (sec <= 0) return "即将重置";
89
- const d = Math.floor(sec / 86400);
90
- const hh = Math.floor((sec % 86400) / 3600);
91
- const mm = Math.floor((sec % 3600) / 60);
92
- if (d > 0) return `${d} 天 ${hh} 小时后重置`;
93
- if (hh > 0) return `${hh} 小时 ${mm} 分后重置`;
94
- return `${Math.max(1, mm)} 分钟后重置`;
86
+ /** 什么时候重置(和桌面端一样):今天的只写时间(13:02 重置),明天的带「明天」,再往后带日期(11月3日 13:02 重置) */
87
+ function resetText(at) {
88
+ if (at <= Date.now()) return "即将重置";
89
+ const d = new Date(at);
90
+ const time = `${String(d.getHours()).padStart(2, "0")}:${String(d.getMinutes()).padStart(2, "0")}`;
91
+ const today = new Date();
92
+ today.setHours(0, 0, 0, 0);
93
+ const days = Math.round((new Date(d).setHours(0, 0, 0, 0) - today.getTime()) / 86400_000);
94
+ if (days <= 0) return `${time} 重置`;
95
+ if (days === 1) return `明天 ${time} 重置`;
96
+ const year = d.getFullYear() === today.getFullYear() ? "" : `${d.getFullYear()}年`;
97
+ return `${year}${d.getMonth() + 1}月${d.getDate()}日 ${time} 重置`;
95
98
  }
96
99
 
97
100
  function quotaLevel(p) {
@@ -133,7 +136,7 @@ export function renderQuota() {
133
136
  { class: "qt-row" },
134
137
  h("span", { class: "qt-name" }, w.label),
135
138
  h("span", { class: `qt-pct ${quotaLevel(w.percent)}` }, `已用 ${Math.round(w.percent)}%`),
136
- w.resetsAt ? h("span", { class: "qt-reset" }, untilText(w.resetsAt)) : null,
139
+ w.resetsAt ? h("span", { class: "qt-reset" }, resetText(w.resetsAt)) : null,
137
140
  ),
138
141
  ),
139
142
  q.extra ? h("div", { class: "qt-extra" }, q.extra) : null,
@@ -155,22 +155,60 @@ function forkForest(convs) {
155
155
  return roots.sort((a, b) => b.at - a.at);
156
156
  }
157
157
 
158
- /** 画一棵分叉树:主对话一行,分叉缩进挂在下面,用虚线连起来(样式见 .fork-node) */
159
- function renderForkNode(node, row, cls = "") {
160
- const self = row(node.c, !!node.c.forkOf && !node.parentShown);
161
- if (node.kids.length === 0) return self;
158
+ /** 整棵子树里所有分叉的 key(不含自己) */
159
+ function descendantKeys(node) {
160
+ return node.kids.flatMap((k) => [k.c.key, ...descendantKeys(k)]);
161
+ }
162
+
163
+ /** 标题后面的小三角:朝下是展开,朝右是折叠。onToggle 给了就自己响应点击(不触发整行的点击) */
164
+ function caret(folded, onToggle) {
165
+ return h("span", {
166
+ class: `caret${folded ? " folded" : ""}`,
167
+ html: ICON.caret,
168
+ role: onToggle ? "button" : null,
169
+ title: onToggle ? (folded ? "展开分叉" : "折叠分叉") : null,
170
+ onclick: onToggle
171
+ ? (e) => {
172
+ e.stopPropagation();
173
+ onToggle();
174
+ }
175
+ : null,
176
+ });
177
+ }
178
+
179
+ /**
180
+ * 画一棵分叉树:主对话一行(标题后面带三角),分叉缩进挂在下面,左边一条竖线,最后一条拐个圆角(样式见 .fork-node)。
181
+ * 折叠了就只留一行「N 个嵌套会话」。row(c, orphan, fold)
182
+ */
183
+ function renderForkNode(node, row) {
184
+ const orphan = !!node.c.forkOf && !node.parentShown;
185
+ if (node.kids.length === 0) return row(node.c, orphan);
186
+ const key = node.c.key;
187
+ const folded = sideState.forkFolded.includes(key);
188
+ const nested = descendantKeys(node);
189
+ const toggle = () => toggleSide("forkFolded", key);
162
190
  return h(
163
191
  "div",
164
192
  { class: "fork-group" },
165
- self,
193
+ row(node.c, orphan, { folded, keys: [key, ...nested], toggle }),
166
194
  h(
167
195
  "div",
168
- { class: `fork-children${cls}` },
169
- node.kids.map((k) => h("div", { class: "fork-node" }, renderForkNode({ ...k, parentShown: true }, row))),
196
+ { class: "fork-children" },
197
+ folded
198
+ ? h("div", { class: "fork-node" }, h("button", { class: "conv-item fork-more", onclick: toggle }, h("span", { class: "title" }, `${nested.length} 个嵌套会话`)))
199
+ : node.kids.map((k) => h("div", { class: "fork-node" }, renderForkNode({ ...k, parentShown: true }, row))),
170
200
  ),
171
201
  );
172
202
  }
173
203
 
204
+ /** 标题放不下的行加 .clip:尾巴淡出(代替省略号)。重绘、侧栏变宽窄时重新量 */
205
+ function markClipped() {
206
+ for (const el of ui.convList.querySelectorAll(".conv-item .title")) {
207
+ el.classList.toggle("clip", el.scrollWidth > el.clientWidth + 1);
208
+ }
209
+ }
210
+ let clipObserver = null;
211
+
174
212
  /** 分叉出来的对话:提示里写上从哪条来的 */
175
213
  function forkNote(c) {
176
214
  if (!c.forkOf) return "";
@@ -193,8 +231,8 @@ function agentShort(id) {
193
231
  return id === "claude" ? "Claude" : id === "codex" ? "Codex" : id;
194
232
  }
195
233
 
196
- /** 侧栏里展开 / 收起的状态:哪些项目目录展开了、哪些分组折叠了、目录的顺序(more 是老版本的,不再用) */
197
- export const sideState = { open: [], more: [], folded: [], order: [], ...JSON.parse(localStorage.getItem("aim.side") || "{}") };
234
+ /** 侧栏里展开 / 收起的状态:哪些项目目录展开了、哪些分组折叠了、哪些主对话的分叉折叠了、目录的顺序(more 是老版本的,不再用) */
235
+ export const sideState = { open: [], more: [], folded: [], forkFolded: [], order: [], ...JSON.parse(localStorage.getItem("aim.side") || "{}") };
198
236
 
199
237
  /**
200
238
  * 「项目」目录的顺序固定按 sideState.order,新消息不会把目录顶到前面。
@@ -426,8 +464,9 @@ export function renderSidebar() {
426
464
  // 在远程控制页上点进来之前那条对话:对话没动过,退出远程控制就露出来了
427
465
  else if (S.view === "remote") leaveRemote();
428
466
  };
429
- // 一行会话。orphan:是分叉出来的、但父对话不在这一组里(删了 / 在别的目录),没有连线可画,用图标标一下
430
- const convRow = (c, cls, detail, orphan) =>
467
+ // 一行会话。orphan:是分叉出来的、但父对话不在这一组里(删了 / 在别的目录),没有连线可画,用图标标一下。
468
+ // fold:有分叉的主对话,标题后面挂三角;折叠着时分叉的状态也显示在这一行
469
+ const convRow = (c, cls, detail, orphan, fold) =>
431
470
  h(
432
471
  "button",
433
472
  {
@@ -439,17 +478,20 @@ export function renderSidebar() {
439
478
  orphan ? h("span", { class: "brand-icon lead fork-mark", html: ICON.fork }) : null,
440
479
  // 定时任务的专用对话
441
480
  c.taskId ? h("span", { class: "brand-icon lead task-mark", title: "定时任务的对话", html: ICON.clock }) : null,
442
- // 自定义专家的对话:前面挂专家的 emoji
443
- c.expert?.icon && !c.expert.builtin ? h("span", { class: "brand-icon lead expert-mark", title: `专家:${c.expert.name}` }, c.expert.icon) : null,
481
+ // 自定义专家的对话:前面挂专家的头像(以前的是 emoji)
482
+ (c.expert?.avatar || c.expert?.icon) && !c.expert.builtin
483
+ ? h("span", { class: "brand-icon lead expert-mark", title: `专家:${c.expert.name}` }, c.expert.avatar ? h("img", { src: c.expert.avatar, alt: "" }) : c.expert.icon)
484
+ : null,
444
485
  h("span", { class: "title" }, convTitle(c)),
445
- status([c.key]),
486
+ fold ? caret(fold.folded, fold.toggle) : null,
487
+ status(fold?.folded ? fold.keys : [c.key]),
446
488
  );
447
489
 
448
490
  // ---- 最近:Web 会话 + 每个飞书机器人一行(点开它最近活跃的聊天),按活跃时间混排 ----
449
491
  // 分叉出来的对话挂在主对话下面,整棵树按里面最近活跃的那条排
450
492
  const recent = [];
451
493
  for (const node of forkForest(visible.filter((c) => c.channel !== "feishu"))) {
452
- recent.push({ at: node.at, el: renderForkNode(node, (c, orphan) => convRow(c, "", `${agentLabel(c.agent)} · ${c.cwd}`, orphan)) });
494
+ recent.push({ at: node.at, el: renderForkNode(node, (c, orphan, fold) => convRow(c, "", `${agentLabel(c.agent)} · ${c.cwd}`, orphan, fold)) });
453
495
  }
454
496
  for (const bot of S.bots) {
455
497
  const convs = visible.filter((c) => c.channel === "feishu" && c.channelId === bot.id);
@@ -564,8 +606,8 @@ export function renderSidebar() {
564
606
  h(
565
607
  "button",
566
608
  { class: "conv-item proj", title: `${dir}\n拖动可调整顺序,右键可置顶`, onclick: () => toggleSide("open", dir) },
567
- h("span", { class: "proj-icon", html: expanded ? ICON.folderOpen : ICON.folder }),
568
609
  h("span", { class: "title" }, baseName(dir)),
610
+ caret(!expanded),
569
611
  expanded ? null : status(convs.map((c) => c.key)),
570
612
  ),
571
613
  h(
@@ -575,11 +617,12 @@ export function renderSidebar() {
575
617
  title: `在 ${baseName(dir)} 中开新对话`,
576
618
  onclick: () => {
577
619
  S.draftCwd = dir === S.workspaceRoot ? null : dir;
620
+ S.draftCwdPicked = true;
578
621
  newDraft();
579
622
  closeSide();
580
623
  },
581
624
  },
582
- icon("edit"),
625
+ icon("plus"),
583
626
  ),
584
627
  ),
585
628
  );
@@ -591,22 +634,31 @@ export function renderSidebar() {
591
634
  // 「展开显示」按主对话算条数,分叉跟着主对话一起出现
592
635
  const forest = loadedPrefix(st, forkForest(convs));
593
636
  for (const node of forest.slice(0, st.show)) {
594
- nodes.push(renderForkNode(node, (c, orphan) => convRow(c, " sub", agentLabel(c.agent), orphan), " in-proj"));
637
+ nodes.push(renderForkNode(node, (c, orphan, fold) => convRow(c, " sub", agentLabel(c.agent), orphan, fold)));
595
638
  }
596
639
  const btn = moreButton(st, forest.length, PROJECT_LIMIT, load);
597
640
  if (btn) nodes.push(h("div", { class: "sub-more" }, btn));
598
641
  }
599
642
  }
643
+ paintList(nodes, askKeys.size);
644
+ }
645
+
646
+ /** 把一组节点画进会话列表 */
647
+ function paintList(nodes, asks) {
600
648
  // 重绘会换掉 DOM:如果鼠标正停在某个标题上,重绘后接着滚
601
649
  const hovered = marquee.el ? marquee.el.textContent : null;
602
650
  stopMarquee();
603
651
  fill(ui.convList, ...nodes);
652
+ markClipped();
653
+ if (!clipObserver) {
654
+ clipObserver = new ResizeObserver(() => markClipped());
655
+ clipObserver.observe(ui.convList);
656
+ }
604
657
  if (hovered) {
605
658
  requestAnimationFrame(() => {
606
659
  const el = ui.convList.querySelector(".conv-item:hover .title");
607
660
  if (el?.textContent === hovered) startMarquee(el);
608
661
  });
609
662
  }
610
- const asks = askKeys.size;
611
663
  document.title = asks ? `(${asks}) 待处理 · Agent Loft` : "Agent Loft";
612
664
  }
@@ -25,8 +25,8 @@ export function renderTopbar() {
25
25
  ? h("span", { class: "conv-name" }, tasks ? "定时任务" : "远程控制")
26
26
  : c
27
27
  ? [
28
- // 自定义专家的对话:标题前面挂上专家的图标
29
- c.expert && !c.expert.builtin ? h("span", { class: "conv-expert-icon", title: `专家:${c.expert.name}` }, expertIcon(convExpert(c))) : null,
28
+ // 标题前面是专家的头像:点一下或鼠标停上去,看专家的信息和工作目录
29
+ expertAvatarButton(c),
30
30
  h("span", { class: "conv-name", title: convTitle(c) }, convTitle(c)),
31
31
  ]
32
32
  : null,
@@ -38,6 +38,113 @@ export function renderTopbar() {
38
38
  syncDesktopMenu();
39
39
  }
40
40
 
41
+ // ---------- 顶栏的专家头像和信息卡 ----------
42
+
43
+ const ACCESS_LABEL = { web: "只能联网", read: "能读文件", edit: "能改文件", exec: "能跑命令" };
44
+ const ENGINE_LABEL = { claude: "Claude", codex: "Codex" };
45
+ /** 鼠标停多久才弹、离开多久才收(从头像挪到卡片上的那一下不能收) */
46
+ const HOVER_OPEN_MS = 250;
47
+ const HOVER_CLOSE_MS = 200;
48
+ const hoverCard = { timer: 0, pinned: false };
49
+
50
+ function expertAvatarButton(c) {
51
+ const btn = h(
52
+ "button",
53
+ {
54
+ class: "conv-expert-icon",
55
+ "aria-label": `专家:${c.expert?.name ?? agentLabel(c.agent)}`,
56
+ onclick: () => {
57
+ clearTimeout(hoverCard.timer);
58
+ // 已经是悬停弹出来的:点一下就钉住,不随鼠标离开收起
59
+ if (ui.menu?.dataset.for === "expert-info" && !hoverCard.pinned) {
60
+ hoverCard.pinned = true;
61
+ return;
62
+ }
63
+ if (ui.menu?.dataset.for === "expert-info") return closeMenu();
64
+ openExpertCard(btn, c.key, true);
65
+ },
66
+ onpointerenter: (e) => {
67
+ if (e.pointerType !== "mouse") return;
68
+ clearTimeout(hoverCard.timer);
69
+ if (ui.menu?.dataset.for === "expert-info") return;
70
+ hoverCard.timer = setTimeout(() => openExpertCard(btn, c.key, false), HOVER_OPEN_MS);
71
+ },
72
+ onpointerleave: (e) => {
73
+ if (e.pointerType === "mouse") scheduleCardClose();
74
+ },
75
+ },
76
+ expertIcon(convExpert(c)),
77
+ );
78
+ return btn;
79
+ }
80
+
81
+ function scheduleCardClose() {
82
+ clearTimeout(hoverCard.timer);
83
+ hoverCard.timer = setTimeout(() => {
84
+ if (!hoverCard.pinned && ui.menu?.dataset.for === "expert-info") closeMenu();
85
+ }, HOVER_CLOSE_MS);
86
+ }
87
+
88
+ /** 专家信息卡:头像、名字、说明,引擎、模型、权限,当前工作目录(能读文件的才有) */
89
+ function openExpertCard(anchor, key, pinned) {
90
+ const c = S.convs.get(key);
91
+ if (!c || !anchor.isConnected) return;
92
+ const pop = showPopover(anchor, { place: "below", align: "left" });
93
+ pop.dataset.for = "expert-info";
94
+ pop.classList.add("expert-card");
95
+ hoverCard.pinned = pinned;
96
+ pop.onpointerenter = () => clearTimeout(hoverCard.timer);
97
+ pop.onpointerleave = (e) => {
98
+ if (e.pointerType === "mouse") scheduleCardClose();
99
+ };
100
+ const badge = convExpert(c);
101
+ // 自己的专家:说明、联网这些在 S.experts 里(别人的专家只有徽章上那点)
102
+ const mine = badge.builtin ? null : S.experts.find((e) => e.id === badge.id);
103
+ const access = badge.builtin ? null : (mine?.access ?? badge.access);
104
+ const abilities = badge.builtin
105
+ ? "原装的样子:所有工具"
106
+ : [
107
+ mine?.webSearch !== false ? "联网搜索" : null,
108
+ mine?.webFetch !== false && c.agent === "claude" ? "读网页" : null,
109
+ access && access !== "web" ? ACCESS_LABEL[access]?.replace(/^能/, "") : null,
110
+ ]
111
+ .filter(Boolean)
112
+ .join("、") || "只能聊天";
113
+ const model = modelName(c.agent, c.runtimeModel || c.model);
114
+ const effort = c.runtimeEffort || c.effort;
115
+ const row = (label, ...value) => h("div", { class: "ec-row" }, h("span", { class: "ec-label" }, label), h("span", { class: "ec-value" }, ...value));
116
+ fill(
117
+ pop,
118
+ h(
119
+ "div",
120
+ { class: "ec-head" },
121
+ expertIcon(badge, "ec-avatar"),
122
+ h(
123
+ "div",
124
+ { class: "ec-name" },
125
+ h("b", {}, badge.name),
126
+ h("span", { class: "ec-sub" }, badge.builtin ? "内置专家" : badge.missing ? "这个专家已经删除了" : `自定义专家 · ${ENGINE_LABEL[c.agent] ?? c.agent}`),
127
+ ),
128
+ ),
129
+ mine?.description ? h("div", { class: "ec-desc" }, mine.description) : null,
130
+ h(
131
+ "div",
132
+ { class: "ec-rows" },
133
+ row("引擎", agentLabel(c.agent)),
134
+ row("模型", [model ?? "默认", effort ? ` · ${effort}` : ""].join("")),
135
+ row("能力", abilities),
136
+ access === "web"
137
+ ? null
138
+ : row(
139
+ "工作目录",
140
+ h("span", { class: "ec-cwd", title: c.cwd }, c.cwd),
141
+ h("button", { class: "ec-link", onclick: () => (closeMenu(), changeCwd()) }, "切换"),
142
+ ),
143
+ ),
144
+ );
145
+ placePopover(pop, anchor);
146
+ }
147
+
41
148
  /**
42
149
  * 右上角「更多」里的项。对话页(含新对话)有定时发送;设置哪个页面都有,
43
150
  * 桌面端自己的「更多」里已经有每台服务器的设置时不放
@@ -195,7 +302,7 @@ export function usableAgents() {
195
302
  return usable.length ? usable : enabled;
196
303
  }
197
304
 
198
- /** 新对话里选专家:内置的在前,再是自己的;最下面去设置里管理 */
305
+ /** 新对话里选专家:内置的在前,再是自己的(新建、管理在「设置 → 专家」里) */
199
306
  function pickExpertMenu(anchor) {
200
307
  if (ui.menu?.dataset.for === "expert") return closeMenu();
201
308
  const pop = showPopover(anchor, { align: "left" });
@@ -216,8 +323,6 @@ function pickExpertMenu(anchor) {
216
323
  pop,
217
324
  builtin.map(item),
218
325
  own.length ? [h("div", { class: "sep" }), h("div", { class: "pop-head" }, "我的专家"), own.map(item)] : null,
219
- h("div", { class: "sep" }),
220
- h("button", { class: "pop-item", onclick: () => (closeMenu(), openSettings("专家")) }, icon("gear"), h("span", { class: "grow" }, own.length ? "管理专家…" : "新建专家…")),
221
326
  );
222
327
  placePopover(pop, anchor);
223
328
  }