agent-loft 0.2.85 → 0.2.86
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.
- package/README.md +3 -2
- package/package.json +1 -1
- package/src/channels/web/api.ts +55 -10
- package/src/channels/web/server.ts +6 -0
- package/src/core/hub.ts +1 -1
- package/web/lib/ws.js +4 -1
- package/web/views/conv-actions.js +51 -8
- package/web/views/layout.js +4 -4
- package/web/views/sidebar.js +30 -2
- package/web/views/terminal.js +30 -7
- package/web/views/topbar.js +0 -39
package/README.md
CHANGED
|
@@ -55,7 +55,7 @@ Logo 就是这个意思:一大两小几颗星(多个 agent)站在同一张
|
|
|
55
55
|
- 输入框里的小圆环显示上下文窗口占用;模型按钮显示实际的模型和思考程度(如「Opus 5.5 high」)。
|
|
56
56
|
- 滚动和 ChatGPT 一样:发出的问题顶到最上面、下面留白,回复长到屏幕底部才跟着往下滚;回复过程中自己滚动了就不再自动滚,下次发消息再恢复。
|
|
57
57
|
- 定时发送:右上角「更多」→「定时发送」,默认排在 5 小时额度重置后 5 分钟(弹窗里提示 5 小时 / 7 天额度的重置时间),由服务端到点发出,关掉页面也会发。适合额度用完、要等刷新才能接着干活的时候。
|
|
58
|
-
- 侧栏直接显示各个文件夹,Web 会话按工作目录归类(目录可以拖动排序,右键可置顶;排好的顺序跟着账号走、各设备一致,新消息不会打乱),飞书会话按机器人分组,微信的当前与历史会话按账号分组,两者都能展开 /
|
|
58
|
+
- 侧栏直接显示各个文件夹,Web 会话按工作目录归类(目录可以拖动排序,右键可置顶;排好的顺序跟着账号走、各设备一致,新消息不会打乱),飞书会话按机器人分组,微信的当前与历史会话按账号分组,两者都能展开 / 折叠并记住状态,收起时仍显示运行中和待处理提示,展开即可查看历史会话。渠道分组行右侧始终显示飞书或微信的静态图标,Web 页面不提供这些分组的新建会话入口。项目名、渠道分组名和有分叉的会话后面有个小三角,点一下折叠 / 展开(分叉折叠后显示「N 个嵌套会话」);分叉出来的会话缩进挂在原会话下面,用一条细线连着;标题放不下时尾巴淡出;Web 和飞书会话都先用首条消息命名,再同步 agent 自动生成的标题,旧飞书会话会从历史记录补名,双击可手动重命名;鼠标移到会话上,行尾显示对应的专家图标;定时任务的时钟图标始终放在最右侧。
|
|
59
59
|
- **搜索**:侧栏「搜索」弹窗,搜全部会话的标题、目录名和聊天内容(不开记忆也能搜),可以按专家筛;电脑和手机上弹窗都固定高度,结果在内部滚动,手机上从底部展开;↑↓ 选、回车打开。
|
|
60
60
|
- **侧栏菜单**:项目上方的「更多」支持点击或鼠标悬停展开,设置入口也在这里。「编辑侧边栏」可勾选直接显示的菜单、拖动调整顺序,未勾选的收进「更多」;配置跟着账号走,电脑和手机共用。
|
|
61
61
|
- 会话页顶部标题前是专家的头像,PC 端头像与会话名称字号一致(15px);鼠标停上去或点一下,看专家的说明、模型、能力、当前工作目录和本会话 Token 用量。
|
|
@@ -64,6 +64,7 @@ Logo 就是这个意思:一大两小几颗星(多个 agent)站在同一张
|
|
|
64
64
|
- 用户消息的复制按钮后有「回退到此处」图标:把这条消息及附件放回输入框,并删除它及之后的聊天内容,重新发送时从之前的上下文继续。
|
|
65
65
|
- 太长的消息先收起,点「展开显示」看全文;对话里有至少 3 条用户消息时,右侧显示快速定位尺,电脑上鼠标移入查看消息开头、点击跳转;手机上手动滚动时显示短轨道,按住拖动可预览问题和位置,松手跳转,停止操作约 1.6 秒后隐藏。
|
|
66
66
|
- 回复底部的 token 数自动按大小显示为 K、M 等单位。
|
|
67
|
+
- 项目右键(触屏长按)可「删除项目…」:二次确认后删除文件夹及全部文件、子目录和关联会话,同时清理附件、资料库文件和定时发送;目录选择器里也可删除空文件夹。工作区根目录、包含其他用户会话的目录不能删除,Agent 自己保存的原始会话记录仍保留。
|
|
67
68
|
- 侧栏按页加载:每个项目目录和飞书机器人分组先显示 5 条,点「展开显示」每次再拉 10 条。
|
|
68
69
|
- 项目、飞书和微信分组可混合拖拽排序,渠道分组可以放在项目前面或项目之间;右键(触屏长按)可置顶、上移、下移或按最近活跃重排。顺序按账号保存,刷新、换设备后保留,新消息不会改变已排好的位置。
|
|
69
70
|
- 侧栏底部显示 Claude / Codex 的订阅额度(5 小时 / 7 天窗口,以及多久后重置);关了额度查询就整块不显示。
|
|
@@ -95,7 +96,7 @@ Logo 就是这个意思:一大两小几颗星(多个 agent)站在同一张
|
|
|
95
96
|
- **资料库**:像 ChatGPT 的资料库,侧栏的「资料库」。对话里发过的附件、agent 回复里给出的、这一轮新写出来的图片 / 文档 / 音视频(复制一份收进来,之后原文件改了删了不影响)都汇总在这里:按图片 / 文档 / 音视频筛、按文件名搜,点开看大图或下载,「在新对话里用」,单个或批量删除(文件从磁盘上删掉)。从资料库拿到对话里的文件硬链接进那条对话的上传目录,不占双份空间,agent 照常能读。按人隔离,规则同对话:自己的;没主人的对话(飞书群聊等)的归管理员。上传了一直没发出去的一天后清掉;删除会话时立即清理该会话的上传文件和资料库记录,删除原件也会清理复用到其他会话的副本。agent 侧的会话记录仍保留,恢复会话不会恢复已删除的文件。
|
|
96
97
|
- **远程控制**:侧栏「定时任务」下面的「远程控制」,直接操作这台机器的**桌面**和**终端**,上面一键切换;切回对话时连接留在后台(侧栏入口上亮个小绿点),再进来接着用。这台机器没有图形桌面(服务器、NAS)时只有终端。
|
|
97
98
|
- 桌面:走 VNC 协议,网页里用 noVNC 显示,鼠标、键盘、剪贴板都能用,进来时不自动连、点「连接桌面」才连,工具栏上选画质:流畅 / 标准(默认)/ 高清由服务端把画面缩小到长边 1280 / 1920 / 2560、只把变了的地方压成 JPEG 发过来(macOS 屏幕共享只给无损的 ZRLE,5K 屏一整屏 30MB,原样转发隔着公网几秒一帧),原画是原样转发、只适合局域网;远程那边接了几块屏时可以只看其中一块(按系统里的显示器名称选,服务端只截那块再缩,比几块屏拼在一起缩小清楚得多;macOS 的各块屏位置要从屏幕共享发来的画面里学,第一次连上要几秒,原画下不能选);可以缩放到窗口或按原始大小看、全屏(手机上也能,iPhone 上是铺满页面)、「只看不控制」、发送 Ctrl+Alt+Del 之类的组合键。手机上有两种手势(右上角切换,「?」看说明):**触控板模式**(默认)屏幕上有个指针,单指滑动移动、轻点单击、双指轻点右键、长按后拖动是按住左键拖、双指滑动滚动;**触摸模式**点哪就点哪。两种模式都能双指捏合在本地放大画面(放大后小按钮也点得准,右下角「还原」),画面下面一排 Esc / Tab / Ctrl / Alt / Win / 方向键,Ctrl、Alt、Win 点一下会粘住,带给下一个按键或点击;键盘按钮弹出软键盘打字,中文输入法也能用。Linux 上 agent-loft 在有人连时用 x11vnc 共享当前的桌面(Xorg 会话;只听 127.0.0.1、随机端口、每次随机密码,需要 `sudo apt install x11vnc`),没人连着 30 分钟后停掉;macOS 上在 设置 → 远程控制 里改用「已有的 VNC 服务」,接系统自带的屏幕共享:填 VNC 密码,或者屏幕共享没开 VNC 密码时填 Mac 的用户名和登录密码(苹果认证,由服务端登录)。
|
|
98
|
-
-
|
|
99
|
+
- 终端:进入或刷新页面时不自动连接,点击「连接终端」后接上后台终端,没有现成的才新建;也可直接点击「新建终端」。新终端开在当前对话的工作目录里,可以开多个标签;`Ctrl+Shift+C` / `Ctrl+Shift+V` 复制粘贴。`` Ctrl+` `` 在对话下面拉出终端面板(高度可拖动),面板和远程控制里的是同一批终端。关掉页面、手机切到后台、断线都不结束 shell,重新打开后手动连接即可接着用、补上错过的输出,别的设备上也能接上;没有页面连着超过 30 分钟(设置里可改)才结束,点标签上的 × 立即结束。依赖可选的原生模块 `node-pty`:Linux 上安装时要现场编译(需要 `make`、`g++`、`python3`),没装好时终端用不了,其他功能照常。手机上单指上下滑翻看历史(在 less、vim 里是翻页),长按选中文字、接着拖动扩大选区,再点「复制」;终端下面多一排 Esc / Tab / Ctrl / Alt / 方向键 / Home / End / PgUp / PgDn / 粘贴。iOS 上软键盘弹出来时这排键会垫到键盘上面。
|
|
99
100
|
- 管理员能用;成员要管理员在 设置 → 用户 里单独「开通远程控制」。终端、桌面在 设置 → 远程控制 里各有总开关。
|
|
100
101
|
- **微信 ClawBot**:设置 → 账号 → 微信 →「扫码连接微信」,用手机微信扫码并确认(要求微信 8.0.70 以上,「设置 → 插件」里有 ClawBot;这个功能腾讯还在逐步放量)。每个人连自己的微信,会话归扫码的人,用他的记忆和工具,只认扫码的这个微信号;发送 `/new` 创建独立会话并保留旧记录,Web 微信分组里可以查看和续聊历史;服务端主动连向腾讯,不需要公网地址。微信里发文字或语音(要微信能转成文字),不发过程,只显示「正在输入」,结束后发结果;授权和提问是一条文字,回复数字处理(`1` 允许一次、`0` 拒绝,含义固定),网页上也能处理。`/new`、`/stop`、`/model`、`/expert` 等命令都能用。连接后可在同一设置页的「微信使用的专家」中选择专家并点击「切换专家」,也能在首次发微信消息前选好;已有聊天内容时,切换会创建独立会话并保留旧记录,和微信里的 `/expert` 共用同一份选择。
|
|
101
102
|
|
package/package.json
CHANGED
package/src/channels/web/api.ts
CHANGED
|
@@ -104,6 +104,15 @@ const startedAt = Date.now();
|
|
|
104
104
|
/** 上传后先存着,发消息时用 id 认领。一小时没人认领就作废 */
|
|
105
105
|
const uploads = new Map<string, { key: string; attachment: SavedAttachment; at: number }>();
|
|
106
106
|
|
|
107
|
+
/** 单条删除和项目批量删除共用清理规则,保留 agent 自己的文字记录。 */
|
|
108
|
+
function hideConversation(key: string): void {
|
|
109
|
+
updateConversation(key, { hidden: true });
|
|
110
|
+
deleteConversationFiles(key);
|
|
111
|
+
for (const [id, entry] of uploads) if (entry.key === key) uploads.delete(id);
|
|
112
|
+
clearScheduled(key);
|
|
113
|
+
hub.emitEvent(key, { type: "meta" });
|
|
114
|
+
}
|
|
115
|
+
|
|
107
116
|
/**
|
|
108
117
|
* 认领上传的附件。有任何一个已失效(id 不认识、不属于这条会话、文件已被删 —— 比如
|
|
109
118
|
* 另一个浏览器在这期间开了新会话、清掉了上传目录)就整条拒绝,让前端提示重新上传,
|
|
@@ -817,7 +826,7 @@ export async function handleApi(req: IncomingMessage, res: ServerResponse, url:
|
|
|
817
826
|
if (p.startsWith("/api/terminals") && (await handleTerminalApi(req, res, p, user))) return;
|
|
818
827
|
if ((p === "/api/remote" || p.startsWith("/api/desktop/")) && (await handleDesktopApi(req, res, p, user))) return;
|
|
819
828
|
|
|
820
|
-
// -----
|
|
829
|
+
// ----- 工作区目录 -----
|
|
821
830
|
if (p === "/api/dirs" && method === "GET") {
|
|
822
831
|
const listing = listWorkspaceDirs(url.searchParams.get("path") ?? "");
|
|
823
832
|
if (!listing) throw new HttpError(404, `目录不存在,或不在 ${config().workspaceRoot} 之内`);
|
|
@@ -845,9 +854,51 @@ export async function handleApi(req: IncomingMessage, res: ServerResponse, url:
|
|
|
845
854
|
sendJson(res, 201, { path: target });
|
|
846
855
|
return;
|
|
847
856
|
}
|
|
857
|
+
if (p === "/api/dirs" && method === "DELETE") {
|
|
858
|
+
const body = await readJsonBody<{ path?: unknown }>(req);
|
|
859
|
+
if (typeof body.path !== "string" || !body.path.trim()) throw new HttpError(400, "请指定要删除的项目目录");
|
|
860
|
+
const target = resolveWorkspacePath(body.path);
|
|
861
|
+
if (!target) throw new HttpError(404, "目录不存在,或不在工作区之内");
|
|
862
|
+
if (target === path.resolve(config().workspaceRoot)) throw new HttpError(403, "不能删除工作区根目录");
|
|
863
|
+
// 不把「删除链接」变成删除它指向的整个项目;工作区根目录本身可以是链接。
|
|
864
|
+
if (target !== path.resolve(config().workspaceRoot, body.path)) throw new HttpError(400, "请从实际项目目录删除,不能通过符号链接删除项目");
|
|
865
|
+
const within = (dir: string) => dir === target || dir.startsWith(target + path.sep);
|
|
866
|
+
const affected = () => listConversations().filter((c) => within(resolveWorkspacePath(c.cwd) ?? c.cwd));
|
|
867
|
+
const convs = affected();
|
|
868
|
+
if (convs.some((c) => !visible(c))) throw new HttpError(403, "此目录下有其他用户的会话,不能删除项目");
|
|
869
|
+
const realTarget = fs.realpathSync(target);
|
|
870
|
+
const identity = fs.statSync(target);
|
|
871
|
+
const keys = convs.map((c) => c.key);
|
|
872
|
+
const keySet = new Set(keys);
|
|
873
|
+
const activity = new Map(convs.map((c) => [c.key, c.activeAt]));
|
|
874
|
+
await Promise.all(convs.map((c) => hub.drop(c.key, "项目已删除")));
|
|
875
|
+
// 等待运行中的会话退出后,再核对目录和会话,避免删除等待期间新建的会话。
|
|
876
|
+
const current = affected();
|
|
877
|
+
const changed = current.length !== convs.length || current.some((c) =>
|
|
878
|
+
!keySet.has(c.key) || !visible(c) || c.activeAt !== activity.get(c.key) || hub.liveSessionId(c.key) !== undefined,
|
|
879
|
+
);
|
|
880
|
+
if (resolveWorkspacePath(body.path) !== target || fs.realpathSync(target) !== realTarget || changed) {
|
|
881
|
+
throw new HttpError(409, "项目内容已变化,请重新确认后删除");
|
|
882
|
+
}
|
|
883
|
+
const now = fs.statSync(target);
|
|
884
|
+
if (identity.dev !== now.dev || identity.ino !== now.ino) {
|
|
885
|
+
throw new HttpError(409, "项目内容已变化,请重新确认后删除");
|
|
886
|
+
}
|
|
887
|
+
try {
|
|
888
|
+
fs.rmSync(target, { recursive: true });
|
|
889
|
+
} catch (err) {
|
|
890
|
+
const code = (err as NodeJS.ErrnoException).code;
|
|
891
|
+
throw new HttpError(code === "EACCES" || code === "EPERM" ? 403 : 400, "无法删除项目文件夹,请检查目录权限后重试");
|
|
892
|
+
}
|
|
893
|
+
for (const c of convs) hideConversation(c.key);
|
|
894
|
+
const dirOrder = setDirOrder(user.id, (getDirOrder(user.id) ?? []).filter((dir) => !within(dir)));
|
|
895
|
+
hub.emit("project-deleted", { owner: user.id, path: target, keys });
|
|
896
|
+
sendJson(res, 200, { path: target, keys, dirOrder });
|
|
897
|
+
return;
|
|
898
|
+
}
|
|
848
899
|
|
|
849
900
|
// ----- 会话 -----
|
|
850
|
-
// 侧栏按页拉:recent / dir / bot / weixin
|
|
901
|
+
// 侧栏按页拉:recent / dir / bot / weixin 按树分页。
|
|
851
902
|
if (p === "/api/conversations/page" && method === "GET") {
|
|
852
903
|
const all = hub.list(visible).filter((c) => !c.hidden);
|
|
853
904
|
const scope = url.searchParams.get("scope");
|
|
@@ -862,9 +913,7 @@ export async function handleApi(req: IncomingMessage, res: ServerResponse, url:
|
|
|
862
913
|
const bot = url.searchParams.get("bot") ?? "";
|
|
863
914
|
const list = all.filter((c) => c.channel === "feishu" && c.channelId === bot);
|
|
864
915
|
const before = parseCursor(url.searchParams.get("at"), url.searchParams.get("key"));
|
|
865
|
-
const page = url.searchParams.
|
|
866
|
-
? pageOf(list, before, clampLimit(url.searchParams.get("limit"), 5))
|
|
867
|
-
: { conversations: list.slice(0, 200), next: null };
|
|
916
|
+
const page = pageOf(list, before, clampLimit(url.searchParams.get("limit"), 5));
|
|
868
917
|
page.conversations = await hub.backfillFeishuTitles(page.conversations);
|
|
869
918
|
sendJson(res, 200, page);
|
|
870
919
|
return;
|
|
@@ -977,11 +1026,7 @@ export async function handleApi(req: IncomingMessage, res: ServerResponse, url:
|
|
|
977
1026
|
if (!sub && method === "DELETE") {
|
|
978
1027
|
// agent 侧的文字记录保留;托管附件和资料库文件立即清理,恢复会话也不会恢复文件。
|
|
979
1028
|
await hub.drop(key, "会话已删除");
|
|
980
|
-
|
|
981
|
-
deleteConversationFiles(key);
|
|
982
|
-
for (const [id, entry] of uploads) if (entry.key === key) uploads.delete(id);
|
|
983
|
-
clearScheduled(key);
|
|
984
|
-
hub.emitEvent(key, { type: "meta" });
|
|
1029
|
+
hideConversation(key);
|
|
985
1030
|
sendJson(res, 200, { ok: true });
|
|
986
1031
|
return;
|
|
987
1032
|
}
|
|
@@ -312,6 +312,10 @@ function broadcastTasks(owner: string): void {
|
|
|
312
312
|
for (const client of clients) if (client.user.id === owner) send(client, { t: "tasks" });
|
|
313
313
|
}
|
|
314
314
|
|
|
315
|
+
function broadcastProjectDeleted(project: { owner: string; path: string; keys: string[] }): void {
|
|
316
|
+
for (const client of clients) if (client.user.id === project.owner) send(client, { t: "project-deleted", path: project.path, keys: project.keys });
|
|
317
|
+
}
|
|
318
|
+
|
|
315
319
|
/** 某人的终端开了 / 结束了:他开着的页面重新拉终端列表(别的设备上开的也能接上) */
|
|
316
320
|
function broadcastTerminals(owner: string): void {
|
|
317
321
|
for (const client of clients) if (client.user.id === owner) send(client, { t: "remote" });
|
|
@@ -659,6 +663,7 @@ export async function startWeb(): Promise<void> {
|
|
|
659
663
|
heartbeat.unref();
|
|
660
664
|
|
|
661
665
|
hub.on("event", broadcastEvent);
|
|
666
|
+
hub.on("project-deleted", broadcastProjectDeleted);
|
|
662
667
|
hub.on("event", pushEvent);
|
|
663
668
|
interactions.on("created", broadcastInteraction);
|
|
664
669
|
interactions.on("created", pushInteraction);
|
|
@@ -710,6 +715,7 @@ function onRevoked(): void {
|
|
|
710
715
|
export async function stopWeb(): Promise<void> {
|
|
711
716
|
authEvents.off("revoked", onRevoked);
|
|
712
717
|
hub.off("event", broadcastEvent);
|
|
718
|
+
hub.off("project-deleted", broadcastProjectDeleted);
|
|
713
719
|
hub.off("event", pushEvent);
|
|
714
720
|
interactions.off("created", broadcastInteraction);
|
|
715
721
|
interactions.off("created", pushInteraction);
|
package/src/core/hub.ts
CHANGED
|
@@ -226,7 +226,7 @@ function withTimeout<T>(p: Promise<T>, what: string, ms = QUERY_TIMEOUT_MS): Pro
|
|
|
226
226
|
|
|
227
227
|
type Live = { id: number; agent: string; cwd: string; session: AgentSession };
|
|
228
228
|
|
|
229
|
-
class Hub extends EventEmitter<{ event: [EventEnvelope]; task: [TaskTurnEnd] }> {
|
|
229
|
+
class Hub extends EventEmitter<{ event: [EventEnvelope]; task: [TaskTurnEnd]; "project-deleted": [{ owner: string; path: string; keys: string[] }] }> {
|
|
230
230
|
private drivers = new Map<string, AgentDriver>();
|
|
231
231
|
private live = new Map<string, Live>();
|
|
232
232
|
/**
|
package/web/lib/ws.js
CHANGED
|
@@ -2,7 +2,7 @@ import { h } from "./dom.js";
|
|
|
2
2
|
import { api } from "./api.js";
|
|
3
3
|
import { desktop, framed, S, ui } from "../state.js";
|
|
4
4
|
import { showAuth } from "../views/auth.js";
|
|
5
|
-
import { applyBootstrap, bootstrapQuery, renderSidebar, scheduleSidebar } from "../views/sidebar.js";
|
|
5
|
+
import { applyBootstrap, bootstrapQuery, forgetProject, renderSidebar, scheduleSidebar } from "../views/sidebar.js";
|
|
6
6
|
import { scheduleQuota } from "../views/quota.js";
|
|
7
7
|
import { renderTopbar } from "../views/topbar.js";
|
|
8
8
|
import { applyEvent, openConversation, renderIdleNotice } from "../views/messages.js";
|
|
@@ -261,6 +261,9 @@ function onWsMessage(msg) {
|
|
|
261
261
|
for (const ix of msg.pending) upsertInteraction(ix);
|
|
262
262
|
setBusy(msg.busy);
|
|
263
263
|
return;
|
|
264
|
+
case "project-deleted":
|
|
265
|
+
forgetProject(msg.path, msg.keys);
|
|
266
|
+
return;
|
|
264
267
|
case "conv":
|
|
265
268
|
if (S.convs.get(msg.info.key)?.busy && !msg.info.busy) scheduleQuota();
|
|
266
269
|
S.convs.set(msg.info.key, msg.info);
|
|
@@ -2,7 +2,7 @@ import { agentIcon, fill, h, icon, toast } from "../lib/dom.js";
|
|
|
2
2
|
import { api } from "../lib/api.js";
|
|
3
3
|
import { relTime } from "../lib/time.js";
|
|
4
4
|
import { S, ui } from "../state.js";
|
|
5
|
-
import { agentLabel, convTitle, renderSidebar } from "./sidebar.js";
|
|
5
|
+
import { agentLabel, convTitle, forgetProject, renderSidebar } from "./sidebar.js";
|
|
6
6
|
import { agentCatalog, baseName, catalogDefaults, draftPick, modelName, renderContext, renderTopbar, saveDraftPick, visibleModels } from "./topbar.js";
|
|
7
7
|
import { closeMenu, confirmDialog, modal, placePopover, showPopover } from "../lib/overlay.js";
|
|
8
8
|
import { newDraft, openConversation, renderEmpty } from "./messages.js";
|
|
@@ -246,6 +246,7 @@ export async function changeCwd(pick) {
|
|
|
246
246
|
let seq = 0;
|
|
247
247
|
let loading = false;
|
|
248
248
|
let creating = false;
|
|
249
|
+
let deleting = false;
|
|
249
250
|
|
|
250
251
|
const crumbs = h("div", { class: "dir-crumbs" });
|
|
251
252
|
const list = h("div", { class: "dir-list" });
|
|
@@ -280,12 +281,27 @@ export async function changeCwd(pick) {
|
|
|
280
281
|
folderName.focus();
|
|
281
282
|
},
|
|
282
283
|
}, icon("plus"), "新建文件夹");
|
|
284
|
+
const removeFolder = h("button", {
|
|
285
|
+
type: "button", class: "btn danger small", hidden: true,
|
|
286
|
+
onclick: async () => {
|
|
287
|
+
if (!listing || loading || creating || deleting) return;
|
|
288
|
+
const parent = listing.rel.split(/[\\/]/).slice(0, -1).join("/");
|
|
289
|
+
deleting = true;
|
|
290
|
+
syncActions();
|
|
291
|
+
try {
|
|
292
|
+
if (await deleteProject(listing.path)) await load(parent);
|
|
293
|
+
} finally {
|
|
294
|
+
deleting = false;
|
|
295
|
+
syncActions();
|
|
296
|
+
}
|
|
297
|
+
},
|
|
298
|
+
}, "删除文件夹…");
|
|
283
299
|
const body = h(
|
|
284
300
|
"div",
|
|
285
301
|
{ class: "modal-body" },
|
|
286
302
|
crumbs,
|
|
287
303
|
manual,
|
|
288
|
-
h("div", { class: "dir-actions" }, h("label", { class: "check" }, hiddenBox, "显示隐藏"), newFolder),
|
|
304
|
+
h("div", { class: "dir-actions" }, h("label", { class: "check" }, hiddenBox, "显示隐藏"), newFolder, removeFolder),
|
|
289
305
|
createForm,
|
|
290
306
|
list,
|
|
291
307
|
);
|
|
@@ -299,13 +315,13 @@ export async function changeCwd(pick) {
|
|
|
299
315
|
});
|
|
300
316
|
|
|
301
317
|
go.onclick = async () => {
|
|
302
|
-
if (!listing || loading || creating) return;
|
|
318
|
+
if (!listing || loading || creating || deleting) return;
|
|
303
319
|
close();
|
|
304
320
|
if (pick) {
|
|
305
321
|
pick.onPick(listing.path);
|
|
306
322
|
return;
|
|
307
323
|
}
|
|
308
|
-
if (draft) {
|
|
324
|
+
if (draft || !S.current) {
|
|
309
325
|
S.draftCwd = listing.path === listing.root ? null : listing.path;
|
|
310
326
|
S.draftCwdPicked = true;
|
|
311
327
|
preloadCommands();
|
|
@@ -316,9 +332,11 @@ export async function changeCwd(pick) {
|
|
|
316
332
|
};
|
|
317
333
|
|
|
318
334
|
function syncActions() {
|
|
319
|
-
go.disabled = loading || creating || !listing || listing.path === current;
|
|
320
|
-
newFolder.disabled = loading || creating || !listing;
|
|
321
|
-
|
|
335
|
+
go.disabled = loading || creating || deleting || !listing || listing.path === current;
|
|
336
|
+
newFolder.disabled = loading || creating || deleting || !listing;
|
|
337
|
+
removeFolder.hidden = !listing?.rel;
|
|
338
|
+
removeFolder.disabled = loading || creating || deleting || !listing;
|
|
339
|
+
create.disabled = loading || creating || deleting;
|
|
322
340
|
cancelCreate.disabled = creating;
|
|
323
341
|
folderName.disabled = creating;
|
|
324
342
|
create.textContent = creating ? "创建中…" : "创建";
|
|
@@ -326,7 +344,7 @@ export async function changeCwd(pick) {
|
|
|
326
344
|
|
|
327
345
|
async function createFolder() {
|
|
328
346
|
const name = folderName.value.trim();
|
|
329
|
-
if (!listing || loading || creating || !name) return;
|
|
347
|
+
if (!listing || loading || creating || deleting || !name) return;
|
|
330
348
|
const my = seq;
|
|
331
349
|
const parent = listing.path;
|
|
332
350
|
creating = true;
|
|
@@ -502,3 +520,28 @@ export async function deleteConv(key = S.current) {
|
|
|
502
520
|
toast(err.message);
|
|
503
521
|
}
|
|
504
522
|
}
|
|
523
|
+
|
|
524
|
+
const deletingProjects = new Set();
|
|
525
|
+
|
|
526
|
+
export async function deleteProject(dir) {
|
|
527
|
+
if (!dir || dir === S.workspaceRoot || deletingProjects.has(dir)) return false;
|
|
528
|
+
deletingProjects.add(dir);
|
|
529
|
+
try {
|
|
530
|
+
const sure = await confirmDialog({
|
|
531
|
+
title: "删除项目?",
|
|
532
|
+
sub: dir,
|
|
533
|
+
message: "将删除此文件夹及全部文件、子目录,同时删除其中的所有会话、附件、资料库文件和定时发送,包括尚未展开的会话及复用到其他会话的文件副本,无法恢复。agent 自己保存的会话记录仍会保留。",
|
|
534
|
+
confirmText: "删除项目",
|
|
535
|
+
danger: true,
|
|
536
|
+
});
|
|
537
|
+
if (!sure) return false;
|
|
538
|
+
const data = await api("/api/dirs", { method: "DELETE", body: { path: dir } });
|
|
539
|
+
forgetProject(data.path, data.keys);
|
|
540
|
+
return true;
|
|
541
|
+
} catch (err) {
|
|
542
|
+
toast(`删除项目失败:${err.message}`);
|
|
543
|
+
return false;
|
|
544
|
+
} finally {
|
|
545
|
+
deletingProjects.delete(dir);
|
|
546
|
+
}
|
|
547
|
+
}
|
package/web/views/layout.js
CHANGED
|
@@ -19,7 +19,7 @@ import {
|
|
|
19
19
|
stopMarquee,
|
|
20
20
|
} from "./sidebar.js";
|
|
21
21
|
import { applyDesktopQuota, loadQuota, renderQuota } from "./quota.js";
|
|
22
|
-
import {
|
|
22
|
+
import { openConvContextMenu, runDesktopMenu } from "./topbar.js";
|
|
23
23
|
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";
|
|
@@ -27,7 +27,7 @@ import { bindScrollWatch, latestConversation, newDraft, openConversation, scroll
|
|
|
27
27
|
import { bindFileDrop, renderComposer } from "./composer.js";
|
|
28
28
|
import { openSearch } from "./conv-search.js";
|
|
29
29
|
import { createNav } from "./msg-nav.js";
|
|
30
|
-
import { renameConv } from "./conv-actions.js";
|
|
30
|
+
import { deleteProject, renameConv } from "./conv-actions.js";
|
|
31
31
|
import { clearCommandCache, preloadCommands } from "./slash.js";
|
|
32
32
|
import { releaseForeignPushSub } from "../lib/push.js";
|
|
33
33
|
import { createSidebarNav } from "./sidebar-nav.js";
|
|
@@ -236,7 +236,7 @@ function renderLayout() {
|
|
|
236
236
|
});
|
|
237
237
|
ui.convList.addEventListener("contextmenu", (e) => {
|
|
238
238
|
// 项目和 IM 分组共用移动菜单;触屏也可以通过长按调整混合顺序。
|
|
239
|
-
const
|
|
239
|
+
const dir = e.target.closest?.("[data-dir]")?.dataset.dir;
|
|
240
240
|
const group = e.target.closest?.("[data-group]")?.dataset.group;
|
|
241
241
|
if (group) {
|
|
242
242
|
const i = sidebarGroups.indexOf(group);
|
|
@@ -246,7 +246,7 @@ function renderLayout() {
|
|
|
246
246
|
];
|
|
247
247
|
const reset = sidebarGroups.length > 1 ? [{ label: "按最近活跃重排", onclick: resetSidebarGroupOrder }] : [];
|
|
248
248
|
const items = moves.length && reset.length ? [...moves, "sep", ...reset] : [...moves, ...reset];
|
|
249
|
-
if (
|
|
249
|
+
if (dir && dir !== S.workspaceRoot) items.push(...(items.length ? ["sep"] : []), { label: "删除项目…", danger: true, onclick: () => deleteProject(dir) });
|
|
250
250
|
if (!items.length) return;
|
|
251
251
|
e.preventDefault();
|
|
252
252
|
showMenu({ x: e.clientX, y: e.clientY }, items);
|
package/web/views/sidebar.js
CHANGED
|
@@ -389,7 +389,33 @@ const MORE_STEP = 10;
|
|
|
389
389
|
// next:下一页的游标;null = 没有更多了;undefined = 这个目录还没拉过。
|
|
390
390
|
|
|
391
391
|
/** full:老版本服务端一次给了全部,不用再拉 */
|
|
392
|
-
const pages = { recent: { show: RECENT_LIMIT, next: null, loading: false }, dirs: new Map(), bots: new Map(), weixin: new Map(), dirAt: new Map(), full: false };
|
|
392
|
+
const pages = { recent: { show: RECENT_LIMIT, next: null, loading: false }, dirs: new Map(), bots: new Map(), weixin: new Map(), dirAt: new Map(), full: false, revision: 0 };
|
|
393
|
+
|
|
394
|
+
/** 项目删除后清掉分页目录、折叠和排序缓存,其他设备也通过 WebSocket 调用。 */
|
|
395
|
+
export function forgetProject(dir, keys) {
|
|
396
|
+
const within = (value) => value === dir || value?.startsWith(`${dir}/`) || value?.startsWith(`${dir}\\`);
|
|
397
|
+
const removed = new Set(keys);
|
|
398
|
+
pages.revision++;
|
|
399
|
+
for (const key of pages.dirAt.keys()) if (within(key)) pages.dirAt.delete(key);
|
|
400
|
+
for (const key of pages.dirs.keys()) if (within(key)) pages.dirs.delete(key);
|
|
401
|
+
for (const list of ["open", "more", "folded", "order"]) sideState[list] = sideState[list].filter((value) => !within(value));
|
|
402
|
+
sideState.forkFolded = sideState.forkFolded.filter((key) => !removed.has(key));
|
|
403
|
+
saveSideState();
|
|
404
|
+
for (const key of removed) {
|
|
405
|
+
const c = S.convs.get(key);
|
|
406
|
+
if (c) c.hidden = true;
|
|
407
|
+
}
|
|
408
|
+
const resetDraft = within(S.draftCwd);
|
|
409
|
+
if (resetDraft) {
|
|
410
|
+
S.draftCwd = null;
|
|
411
|
+
S.draftCwdPicked = false;
|
|
412
|
+
}
|
|
413
|
+
if (removed.has(S.current) || (!S.current && resetDraft)) {
|
|
414
|
+
S.loadToken++;
|
|
415
|
+
newDraft();
|
|
416
|
+
} else renderSidebar();
|
|
417
|
+
reportDesktop();
|
|
418
|
+
}
|
|
393
419
|
|
|
394
420
|
function dirState(dir) {
|
|
395
421
|
let st = pages.dirs.get(dir);
|
|
@@ -453,6 +479,7 @@ async function fetchPage(st, params) {
|
|
|
453
479
|
if (st.loading) return;
|
|
454
480
|
st.loading = true;
|
|
455
481
|
st.failed = false;
|
|
482
|
+
const revision = pages.revision;
|
|
456
483
|
try {
|
|
457
484
|
const q = new URLSearchParams(params);
|
|
458
485
|
if (st.next) {
|
|
@@ -460,6 +487,7 @@ async function fetchPage(st, params) {
|
|
|
460
487
|
q.set("key", st.next.key);
|
|
461
488
|
}
|
|
462
489
|
const data = await api(`/api/conversations/page?${q}`);
|
|
490
|
+
if (revision !== pages.revision) return;
|
|
463
491
|
for (const c of data.conversations) S.convs.set(c.key, c);
|
|
464
492
|
st.next = data.next;
|
|
465
493
|
} catch (err) {
|
|
@@ -681,7 +709,7 @@ export function renderSidebar() {
|
|
|
681
709
|
{ class: "proj-row", "data-dir": dir, ...groupDragAttrs(dir) },
|
|
682
710
|
h(
|
|
683
711
|
"button",
|
|
684
|
-
{ class: "conv-item proj", title: `${dir}\n
|
|
712
|
+
{ class: "conv-item proj", title: `${dir}\n拖动可调整顺序,右键更多操作`, onclick: () => toggleSide("open", dir) },
|
|
685
713
|
h("span", { class: "title" }, baseName(dir)),
|
|
686
714
|
caret(!expanded),
|
|
687
715
|
expanded ? null : status(convs.map((c) => c.key)),
|
package/web/views/terminal.js
CHANGED
|
@@ -12,7 +12,8 @@ import { attachTermTouch } from "./terminal-touch.js";
|
|
|
12
12
|
// ---------- 网页终端 ----------
|
|
13
13
|
// shell 跑在服务端(core/terminals.ts),这里每个标签一条 /ws/term 连接。
|
|
14
14
|
// 两种摆法:放在远程控制页里(embed),或者对话下面的底部面板(dock,Ctrl+`)。是同一块面板,挪个地方而已。
|
|
15
|
-
//
|
|
15
|
+
// 进来时不自动连接,点「连接终端」后按服务端列表接上,没有现成的才新建。
|
|
16
|
+
// 离开远程控制页、关掉面板、刷新页面都不结束 shell;刷新后仍需手动连接,点标签上的 × 才结束。
|
|
16
17
|
|
|
17
18
|
const T = {
|
|
18
19
|
/** closed:藏起来(shell 照常跑)/ dock:底部面板 / embed:在远程控制页里 */
|
|
@@ -23,6 +24,8 @@ const T = {
|
|
|
23
24
|
ctrl: false,
|
|
24
25
|
alt: false,
|
|
25
26
|
loaded: false,
|
|
27
|
+
want: false,
|
|
28
|
+
connecting: false,
|
|
26
29
|
};
|
|
27
30
|
|
|
28
31
|
const narrow = () => matchMedia("(max-width: 768px)").matches;
|
|
@@ -179,7 +182,12 @@ function renderEmptyPane() {
|
|
|
179
182
|
{ class: "term-empty" },
|
|
180
183
|
status.available === false
|
|
181
184
|
? h("div", { class: "error-text" }, status.reason ?? "这台服务器上终端用不了")
|
|
182
|
-
: [
|
|
185
|
+
: [
|
|
186
|
+
h("div", { class: "muted" }, T.want ? "没有开着的终端" : "终端未连接"),
|
|
187
|
+
T.want && !T.connecting
|
|
188
|
+
? h("button", { class: "btn", onclick: () => void newTab() }, icon("plus"), "新建终端")
|
|
189
|
+
: h("button", { class: "btn primary", disabled: T.connecting, onclick: () => void connectTerminals() }, icon("plug"), T.connecting ? "连接中…" : "连接终端"),
|
|
190
|
+
],
|
|
183
191
|
),
|
|
184
192
|
);
|
|
185
193
|
}
|
|
@@ -228,8 +236,21 @@ export function hide() {
|
|
|
228
236
|
|
|
229
237
|
// ---------- 标签 ----------
|
|
230
238
|
|
|
239
|
+
async function connectTerminals() {
|
|
240
|
+
if (T.connecting) return;
|
|
241
|
+
T.want = true;
|
|
242
|
+
T.connecting = true;
|
|
243
|
+
renderEmptyPane();
|
|
244
|
+
try {
|
|
245
|
+
await loadTabs({ create: true });
|
|
246
|
+
} finally {
|
|
247
|
+
T.connecting = false;
|
|
248
|
+
renderEmptyPane();
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
|
|
231
252
|
/** 按服务端的列表对一下:别的设备开的接上,已经结束的标出来 */
|
|
232
|
-
async function loadTabs() {
|
|
253
|
+
async function loadTabs({ create = false } = {}) {
|
|
233
254
|
let data;
|
|
234
255
|
try {
|
|
235
256
|
data = await api("/api/terminals");
|
|
@@ -239,16 +260,16 @@ async function loadTabs() {
|
|
|
239
260
|
}
|
|
240
261
|
if (S.remote) S.remote.terminal = { enabled: data.enabled, allowed: data.allowed, available: data.available, reason: data.reason, keepAliveMin: data.keepAliveMin };
|
|
241
262
|
if (!data.allowed) return revoked();
|
|
263
|
+
T.loaded = true;
|
|
264
|
+
if (!T.want) return renderEmptyPane();
|
|
242
265
|
const ids = new Set(data.terminals.map((t) => t.id));
|
|
243
266
|
for (const tab of T.tabs) if (!ids.has(tab.id) && !tab.ended) ended(tab, "已经结束了");
|
|
244
267
|
for (const t of data.terminals) if (!T.tabs.some((tab) => tab.id === t.id)) addTab(t, false);
|
|
245
|
-
//
|
|
246
|
-
if (
|
|
247
|
-
T.loaded = true;
|
|
268
|
+
// 用户手动连接、一个都没有:开一个;打开页面和同步列表不新建。
|
|
269
|
+
if (create && T.tabs.length === 0 && data.available) {
|
|
248
270
|
await newTab();
|
|
249
271
|
return;
|
|
250
272
|
}
|
|
251
|
-
T.loaded = true;
|
|
252
273
|
if (!T.active && T.tabs.length) select(T.tabs[T.tabs.length - 1]);
|
|
253
274
|
renderHead();
|
|
254
275
|
renderEmptyPane();
|
|
@@ -256,6 +277,7 @@ async function loadTabs() {
|
|
|
256
277
|
|
|
257
278
|
async function newTab() {
|
|
258
279
|
ensureDock();
|
|
280
|
+
T.want = true;
|
|
259
281
|
// 先按面板现在的大小算好行列,shell 一开始就是对的宽度
|
|
260
282
|
const probe = T.active?.fit.proposeDimensions();
|
|
261
283
|
let info;
|
|
@@ -265,6 +287,7 @@ async function newTab() {
|
|
|
265
287
|
toast(err.message);
|
|
266
288
|
return;
|
|
267
289
|
}
|
|
290
|
+
T.loaded = true;
|
|
268
291
|
if (T.mode === "closed") {
|
|
269
292
|
if (narrow()) return void openRemote("terminal");
|
|
270
293
|
setMode("dock");
|
package/web/views/topbar.js
CHANGED
|
@@ -568,42 +568,3 @@ async function continueInFeishu(key) {
|
|
|
568
568
|
}),
|
|
569
569
|
);
|
|
570
570
|
}
|
|
571
|
-
|
|
572
|
-
/** 飞书机器人的历史会话:独立于侧栏分页拉取,按活跃时间排,点一下打开 */
|
|
573
|
-
export async function openBotConversations(botId) {
|
|
574
|
-
const bot = S.bots.find((b) => b.id === botId);
|
|
575
|
-
const body = h("div", { class: "modal-body" }, h("span", { class: "spinner" }));
|
|
576
|
-
const close = modal({ title: `历史会话${bot ? ` · ${bot.name}` : ""}`, body });
|
|
577
|
-
let convs;
|
|
578
|
-
try {
|
|
579
|
-
convs = (await api(`/api/conversations/page?${new URLSearchParams({ scope: "bot", bot: botId })}`)).conversations;
|
|
580
|
-
} catch (err) {
|
|
581
|
-
fill(body, h("div", { class: "error-text" }, err.message));
|
|
582
|
-
return;
|
|
583
|
-
}
|
|
584
|
-
for (const c of convs) S.convs.set(c.key, c);
|
|
585
|
-
fill(
|
|
586
|
-
body,
|
|
587
|
-
...(convs.length === 0
|
|
588
|
-
? [h("div", { class: "muted" }, "还没有会话")]
|
|
589
|
-
: convs.map((c) =>
|
|
590
|
-
h(
|
|
591
|
-
"button",
|
|
592
|
-
{
|
|
593
|
-
class: `list-item${c.key === S.current ? " on" : ""}`,
|
|
594
|
-
onclick: () => {
|
|
595
|
-
close();
|
|
596
|
-
if (c.key !== S.current) void openConversation(c.key);
|
|
597
|
-
},
|
|
598
|
-
},
|
|
599
|
-
h(
|
|
600
|
-
"div",
|
|
601
|
-
{ class: "grow" },
|
|
602
|
-
h("div", { class: "t" }, convTitle(c)),
|
|
603
|
-
h("div", { class: "s" }, `${relTime(c.activeAt)} · ${agentLabel(c.agent)} · ${c.cwd}`),
|
|
604
|
-
),
|
|
605
|
-
c.key === S.current ? "当前" : c.busy ? h("span", { class: "conv-spin", title: "进行中" }) : null,
|
|
606
|
-
),
|
|
607
|
-
)),
|
|
608
|
-
);
|
|
609
|
-
}
|