diff --git a/CLAUDE.md b/CLAUDE.md index 988e5c8f6..2c273d9af 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -98,6 +98,7 @@ The Superpowers plugin is disabled for this repository. Do not invoke or follow ## Desktop Shell - 每 workspace 一个 daemon:`workspace_registry`(`src/base/workspace/`)/ `daemon_pool` / `pick_active` / `web_host` / `tray_icon_win` / `notifications_win`;切 workspace 走整页 navigate(跨端口 CORS);webapp 兼容模式(WebView2 不可用或 `--webapp`)用托盘 + 消息循环托住进程,别用 `WaitForSingleObject(msedge)` 当生命周期;单实例互斥 `Local\ACECode-Desktop-Singleton-v1`;关窗默认隐藏到托盘(`desktop.close_to_tray`)。bridge 函数清单(`aceDesktop_*`)与通知抑制规则看 [docs/desktop-shell/multi-workspace.md](docs/desktop-shell/multi-workspace.md) 与归档:Desktop shell + multi-workspace。 +- **启动回到上次会话 / 升级后重启前置**:前端经 `aceDesktop_setLastSession` 把当前会话记进 `state.json::last_session`(首页等非会话页传 null 清掉,启动跳转落定前不上报),启动时拼 `?open=…&restore=1` 走已有的启动落地,失败静默回首页;升级重启时旧进程已不是前台程序,所以带 `--relaunched-after-update` 拉起新进程(macOS 已安装的 .app 改走 `open -n`),新进程带该参数或是新版本第一次启动时才用 `show_window_in_foreground` 强制前置,平时启动不抢焦点。main.cpp 离行数上限只差两行,新逻辑放 `last_session.cpp` / `window_foreground.cpp` / `desktop_restart.cpp`。见 [docs/desktop-shell/multi-workspace.md](docs/desktop-shell/multi-workspace.md)。 - 写 workspace.json 一律先读盘再改(`latest_workspace_meta`),Desktop 与 daemon 各持一份缓存。托盘 / 通知 / toast 的 controller 窗口**不能用 HWND_MESSAGE**。 - **打开文件夹**(`aceDesktop_openInExplorer` 异步 bridge):Windows 文件走 `SHOpenFolderAndSelectItems`,**不要改回 `explorer.exe /select`**(每次另起一个不退出的 Explorer 宿主进程,约 1 秒);独立 STA 线程执行,窗口被压在后面才拉起,不抢用户已切走的焦点,不撤用户的置顶。见 [docs/desktop-shell/multi-workspace.md](docs/desktop-shell/multi-workspace.md)。 - **窗口细节**:启动浮窗由独立绘制线程播动画(`splash_animation.cpp` 纯函数);窗口位置跨启动记忆(`window_placement_win.cpp` + `place_saved_desktop_window`,普通边框口径);Win10 顶边 1px 线由宿主窗口自画(别用 `DwmExtendFrameIntoClientArea`,别画在网页里);Ctrl+滚轮缩放只走 `aceDesktop_zoomFactor`,WebView2 `IsZoomControlEnabled` 保持 FALSE;主题异形窗口全部挂在 `g_window_shape.chamfer` 上。归档:启动浮窗动画、主窗口位置跨启动记忆、Win10 顶边、Ctrl+滚轮页面缩放、异形窗口。 diff --git a/docs/daemon-api.md b/docs/daemon-api.md index 36cfc9740..88a6923d0 100644 --- a/docs/daemon-api.md +++ b/docs/daemon-api.md @@ -367,6 +367,7 @@ download when nothing changed. | GET / PUT | `/api/files/editable` | read or safely save a Desktop workspace text file | | GET | `/api/fs/roots` | browsable roots for the Web path picker | | GET | `/api/fs/list` | list any absolute directory for the Web path picker | +| POST | `/api/fs/mkdir` | create one folder from the Web path picker | | GET | `/api/git/info` | git repo info for a workspace | | POST | `/api/git/checkout` | switch branch (stash-aware) | | GET | `/api/git/changes` | working tree changes vs base | @@ -2972,7 +2973,7 @@ Lists the direct children of any absolute directory readable by the daemon process. Unlike `/api/files`, there is no workspace whitelist: any authenticated client (loopback without a token, or a remote client with a valid token) may browse the whole filesystem. The route is read-only and logs every -listing with its path. +listing with its path. The only write in `/api/fs` is `POST /api/fs/mkdir`. ```json { @@ -3011,6 +3012,36 @@ Errors: `400 {"error":"path must be absolute"}` for an empty or relative `403 {"error":"permission denied"}` when the daemon cannot read the directory; `500 {"error":"io error"}` otherwise. Error bodies may add a `detail` string. +### `POST /api/fs/mkdir` + +Creates one folder for the picker's **New Folder** button (folder mode only). +Same access rule as `/api/fs/list`: any authenticated client, no workspace +whitelist. Every attempt is logged with its parent and name. + +```json +{"parent": "C:/Users/shao/projects", "name": "demo"} +``` + +Success is `201 {"path": "C:/Users/shao/projects/demo", "name": "demo"}`. +`path` uses the same lexical normalization as `/api/fs/list` and does not +resolve junctions, so a folder created under a junction keeps the junction +spelling. `name` is the name actually used after trimming surrounding ASCII +whitespace. + +- Only one level is created. A missing `parent` is an error, never created. +- Names are rejected, never rewritten: empty, `.`, `..`, containing `/`, `\`, + or control characters; on Windows also `< > : " | ? *`, a trailing period or + space, and reserved device names (`CON`, `NUL`, `COM1`, `LPT9`, also with an + extension). +- An existing entry of the same name, whether a folder, file, or dangling link, + is never overwritten. + +Errors: `400 {"error":"invalid name"}`; `400 {"error":"path must be absolute"}` +for an empty or relative `parent`; `404 {"error":"not found"}` and +`404 {"error":"not a directory"}` for the parent; `403 {"error":"permission denied"}`; +`409 {"error":"already exists"}`; `500 {"error":"io error"}` otherwise (for +example, a name that is too long). Error bodies may add a `detail` string. + ### `GET /api/git/info?cwd=` Returns git repository info for a workspace cwd (openspec `add-git-context`). @@ -6777,14 +6808,14 @@ Runtime-generated names use underscore separators. Existing hyphen-named data re | 方法与路径 | 请求 / 返回 | | --- | --- | -| `POST /api/sessions/:id/shares` | `{mode: "read_only" / "interactive", visibility: "conversation" / "tools", expires_in: 秒}`;201 返回记录及 `link`。默认可交互、只看对话、86400 秒;有效期 60–2592000 秒 | +| `POST /api/sessions/:id/shares` | `{mode?: "read_only" / "interactive", visibility?: "tools", expires_in?: 172800}`;201 返回记录及 `link`。默认只读,固定包含工具内容、172800 秒后失效;其它 visibility 或 expires_in 值返回 400 | | `GET /api/shares` | `{shares: [...]}`;有效记录可再次复制链接,带 `active`、`revoked`、`expires_at` | | `DELETE /api/shares/:share_id` | 撤销凭据,立即关闭该分享现有访客连接 | | `GET /api/shares/:share_id/asks` | `{asks: [...]}`,脱敏后的时间、访客名、问题、答案和取消状态,最多 200 条 | | `GET /api/config/desktop-clipboard` | `{ok, enabled}` | | `PUT /api/config/desktop-clipboard` | `{enabled: boolean}`,按现有配置事务即时保存 | -`mode` 决定能否聊天,`visibility` 决定工具内容是否可见,两者独立。dangerous 模式拒绝创建;无法由 daemon 加载的 TUI 主会话不可分享。分享数据不进入 `config.json`。 +`mode` 决定能否聊天。新链接内容固定为含工具输出,有效期固定两天;保留 `visibility`、`expires_in` 字段用于明确声明固定值,禁止其它值。已存在分享按原记录生效。dangerous 模式拒绝创建;无法由 daemon 加载的 TUI 主会话不可分享。分享数据不进入 `config.json`。 局域网转发在远程 Web 开启或存在有效分享时运行。仅开启分享时,经转发进入的完整 token 也被拒绝。`web.remote_port=0` 优先尝试 12400,再尝试 daemon 相邻端口,最后由系统分配;链接记录实际监听端口。显式固定端口的已有语义保持不变。 diff --git a/docs/design/interface-icons.md b/docs/design/interface-icons.md index c3a271a1f..84bc3f121 100644 --- a/docs/design/interface-icons.md +++ b/docs/design/interface-icons.md @@ -53,7 +53,7 @@ node scripts/preview_web_icons.mjs --output=icon-gallery.html ## 范围 -当前共有 123 个注册名称。MCP 服务器统一使用插头;专家入口使用人头轮廓加齿轮,均为空心描线;模型与推理仍使用 Brain。分享操作使用 Share(开口方框加穿出的上箭头,方框与 ChatBubble 同宽),已分享会话的状态标记使用 Antenna(发射信号的天线,侧栏按 18 px 显示,与同一行其它图标一致)。`interfaceIcons.test.js` 核对注册与公开文件一一对应、无固定色、线宽、真实组件渲染、ARIA、面板状态及文件类型独立渲染。 +当前共有 124 个注册名称。MCP 服务器统一使用插头;专家入口使用人头轮廓加齿轮,均为空心描线;模型与推理仍使用 Brain。分享操作使用 Share(开口方框加穿出的上箭头,方框与 ChatBubble 同宽),已分享会话的状态标记使用 Antenna(发射信号的天线,侧栏按 18 px 显示,与同一行其它图标一致)。`interfaceIcons.test.js` 核对注册与公开文件一一对应、无固定色、线宽、真实组件渲染、ARIA、面板状态及文件类型独立渲染。 保留原样的内容:ACECode/供应商品牌 Logo、原生应用/托盘资源、Seti 字体与文件类型映射、PPTX 文件类型图标、统计图和动态百分比仪表。操作用 Document/Folder/OpenFile 属于功能图标,仍使用本规范。 diff --git a/docs/desktop-shell/multi-workspace.md b/docs/desktop-shell/multi-workspace.md index 2495b901c..f5817e033 100644 --- a/docs/desktop-shell/multi-workspace.md +++ b/docs/desktop-shell/multi-workspace.md @@ -21,13 +21,31 @@ acecode-desktop.exe / ACECode.app (父) ## 启动顺序 1. desktop 扫 `.acecode/projects/*` → `WorkspaceRegistry` -2. 读 `state.json::last_active_workspace_hash` +2. 读 `state.json::last_active_workspace_hash`;没有显式打开请求且 `state.json::last_session` 可恢复时,它所在的工作区优先(见「回到上次会话」) 3. `pick_active(last_active, current_path, registry)` → active hash 4. registry 空 + 进程 cwd 非空 → 自动 `register_new(cwd)`(首次安装兜底) 5. 注册 4 个 webview bridge:`aceDesktop_listWorkspaces / activateWorkspace / renameWorkspace / addWorkspace` 6. `pool.activate(__shared_daemon__/default)` → 拿到 `{port, token}` → `host.navigate("http://127.0.0.1:port/?token=...")` 7. 主窗口 `host.run()` +## 回到上次会话 + +启动时直接打开上次停留的会话,实现在 [last_session.cpp](../../src/apps/desktop/last_session.cpp) 与 [lastSessionMemory.js](../../web/src/lib/lastSessionMemory.js): + +- **记**:前端在当前会话变化时调 `aceDesktop_setLastSession({session_id, workspace_hash?, no_workspace?, read_only?})`,停在首页 / 定时任务 / 专家组件页时传 `null`,桌面壳写进 `state.json::last_session`(内容没变不落盘)。启动跳转落定之前不上报 —— 那时 `activeRef` 还是空的,会把上次的记录清掉。 +- **用**:启动时 `restorable_last_session(registry)` 读回记录(带工作区的会话要求该工作区仍在 registry 且目录还在),该工作区优先成为 active,导航前给 URL 拼上 `?open=<会话>&workspace=`(或 `no_workspace=1`)`&restore=1`,走与跨 workspace 跳转相同的启动落地。`restore=1` 让前端静默处理失败:会话已被删除时回到首页,不弹「恢复失败」。 +- TUI 的 `--open-session` / 邀请链接等显式打开请求优先,此时不恢复。 +- 记录只由桌面壳读写:端口每次启动都变,浏览器本地存储留不住;浏览器直连 daemon 与 webapp 兼容模式没有 bridge,不记也不恢复。 + +## 升级后重启 + +`aceDesktop_restartApp` 只做预检并请求退出;真正拉起新进程在 `host.run()` 返回、托盘与 daemon 全部收尾之后([desktop_restart.cpp](../../src/apps/desktop/desktop_restart.cpp))。那一刻旧进程的窗口早已销毁,它不再是前台程序,新进程因此拿不到前台权 —— 窗口会出现在别的窗口后面。处理分两头: + +- **旧进程**:拉起时带 `--relaunched-after-update`。Windows 上顺手 `AllowSetForegroundWindow(新进程)`(只在自己仍有前台权时生效);macOS 上已安装的 `.app` 改经 LaunchServices 重启(`/usr/bin/open -n --args …`),由系统激活新实例,`open` 失败、裸二进制(开发构建)或进程带着 `ACECODE_*` 环境变量(LaunchServices 不继承)时仍直接 exec。 +- **新进程**:带该参数、或这是本版本装好后的第一次启动(`state.json::desktop_last_launch_version` 与当前版本不同;旧版本拉起新版本时不会带参数,靠这条兜住)时,首次显示主窗口走 [window_foreground.cpp](../../src/apps/desktop/window_foreground.cpp):临时并入当前前台线程的输入队列再激活(前台程序无响应时不并入),仍被拒绝就用一次置顶脉冲把窗口抬到最上层后立刻撤销。平时的启动不走这条路,用户启动后切去别的程序时不抢焦点。 + +macOS 的修复由旧进程执行,所以要到「装了这一版之后的下一次升级」才生效。 + ## 切换 workspace 前端 Sidebar 优先调用共享 daemon: diff --git a/docs/session-sharing.md b/docs/session-sharing.md index db8b54f75..c1b00c600 100644 --- a/docs/session-sharing.md +++ b/docs/session-sharing.md @@ -1,13 +1,13 @@ # 会话分享 -在会话标题栏「属性」左侧点击分享图标,选择链接权限、可见内容和有效期,再生成链接。 +在会话标题栏「属性」左侧点击分享图标,按需打开「可交互」开关,再生成链接。开关默认关闭,与「生成链接」按钮同排。 | 链接权限 | 访客能力 | | --- | --- | | 只读 | 查看历史、图片和实时进展,没有聊天入口 | | 可交互 | 在查看之外进行独立提问;使用分享者的模型和受限只读工具 | -「只看对话 / 含工具输出」独立于链接权限。默认可交互、只看对话、一天过期。复制邀请包含主人名、会话标题和链接;复制链接只复制 URL。存在有效分享的会话在侧栏显示发射天线图标。侧栏快捷菜单中的「分享与连接」管理有效分享、提问记录和已保存对端。 +新链接始终包含工具内容,创建后两天失效。默认只读;开启「可交互」后显示圈叹号和「打开可交互会话会消耗共享用户的token额度。」提示。内容和有效期不再提供界面选项。已存在链接仍保留创建时的权限、内容范围和失效时间。复制邀请包含主人名、会话标题和链接;复制链接只复制 URL。存在有效分享的会话在侧栏显示发射天线图标。侧栏快捷菜单中的「已存在的链接」管理有效分享、提问记录和已保存对端。 ## 连接与权限 @@ -27,7 +27,7 @@ Windows 安装器及绿色版启动时按当前用户注册协议,无需提权 问题不写入主会话历史、不占用主会话忙碌状态。每个分享码同时最多一个提问,默认每天 30 次,按 UTC 日期重置,响应带下一次恢复时间。检查在调用模型之前进行;只读链接的提问不会消耗额度。 -历史、实时输出和答案都经过脱敏。为避免密钥跨流式片段泄露,未完整的文本行及 PEM 块先缓冲,再脱敏发送。脱敏规则不能识别所有可能的秘密,分享者仍应选择适当的内容档位。 +历史、实时输出和答案都经过脱敏。为避免密钥跨流式片段泄露,未完整的文本行及 PEM 块先缓冲,再脱敏发送。脱敏规则不能识别所有可能的秘密,分享者仍应确认会话和工具输出适合共享。 ## 存储与撤销 diff --git a/openspec/changes/add-acecode-invite-links/design.md b/openspec/changes/add-acecode-invite-links/design.md index c5338b3ad..b244a6d5b 100644 --- a/openspec/changes/add-acecode-invite-links/design.md +++ b/openspec/changes/add-acecode-invite-links/design.md @@ -31,7 +31,7 @@ ### 用户确认的分享入口与权限 -分享入口放在会话标题栏「属性」左侧,使用开口方框加上箭头的线框图标。图形遵循 `docs/design/interface-icons.md`:`share` 别名指向统一图形库的 `Share`,通过 `VsIcon` 以 16 px 渲染,使用 20×20 坐标、currentColor 和按尺寸计算的线宽;业务组件不另画 SVG。有效分享的会话在侧栏显示统一图形库的 Antenna 发射天线标记(18 px,与侧栏其它图标一致),保留“已分享”无障碍名称。分享对话框显式提供「只读 / 可交互」两种权限,映射到服务端 `allow_questions=false/true`,保留原方案默认允许提问。内容档位「只看对话 / 含工具输出」与权限独立。只读远程视图不显示聊天入口,服务端拒绝提问;可交互只开放独立的受限访客对话,模型额度和工具执行归分享者,不改变主会话历史或忙碌状态。 +分享入口放在会话标题栏「属性」左侧,使用开口方框加上箭头的线框图标。图形遵循 `docs/design/interface-icons.md`:`share` 别名指向统一图形库的 `Share`,通过 `VsIcon` 以 16 px 渲染,使用 20×20 坐标、currentColor 和按尺寸计算的线宽;业务组件不另画 SVG。有效分享的会话在侧栏显示统一图形库的 Antenna 发射天线标记(18 px,与侧栏其它图标一致),保留“已分享”无障碍名称。分享对话框提供默认关闭的「可交互」开关,与「生成链接」同排,映射到服务端 `allow_questions=false/true`。开启后用统一 `StatusWarningCircle` 图标显示「打开可交互会话会消耗共享用户的token额度。」;关闭后移除提示。新分享固定包含工具输出、172800 秒后失效,前端明确提交固定值,后端默认只读并拒绝其它内容档位或有效期。已有记录不迁移,继续按原权限与时间生效。删除内容/有效期下拉和旧说明,「分享与连接」统一更名为「已存在的链接」。只读远程视图不显示聊天入口,服务端拒绝提问;可交互只开放独立的受限访客对话,模型额度和工具执行归分享者,不改变主会话历史或忙碌状态。 ### 1. 链接形状:固定 host,载荷放路径 @@ -141,9 +141,9 @@ base64url 只用 `A-Z a-z 0-9 - _`,Chrome 交给系统前做的转义(`EscapeE ## Risks / Trade-offs - [局域网明文传输,同网段的人能嗅探到对话和分享码] → 第一版明确告知(分享对话框里写「仅限可信局域网」);有效期默认 1 天;链接格式预留证书指纹字段,后续变更用 A 的自签证书、指纹放进链接里,由 B 校验,不需要 CA。这正是 Syncthing(设备 ID 就是证书哈希,线下交换)、KDE Connect(配对后把对方证书作为唯一信任根)、LocalSend(握手时校验证书 SHA-256 指纹)的做法。 -- [对方电脑没装 ACECode,或者在 Linux 上用 Chrome,把链接粘进地址栏回车,链接会作为搜索词发给搜索引擎] → 分享码只在局域网里有用,外人拿到也连不上;默认 1 天过期,主人可以随时撤销;复制邀请时附带的说明文字写「用 ACECode 打开」,引导对方把链接粘进 ACECode。 +- [对方电脑没装 ACECode,或者在 Linux 上用 Chrome,把链接粘进地址栏回车,链接会作为搜索词发给搜索引擎] → 分享码只在局域网里有用,外人拿到也连不上;固定 2 天过期,主人可以随时撤销;复制邀请时附带的说明文字写「用 ACECode 打开」,引导对方把链接粘进 ACECode。 - [链接被转发给不该看的人] → 链接就是凭据,这一点在分享对话框里写清楚;主人能随时撤销,撤销会断开所有已建立的连接;提问记录里能看到访客自报的名字。 -- [访客通过提问套出密钥] → 拒读清单、工具结果过滤、答案脱敏三层。脱敏靠正则,挡不住所有形式,所以默认档位是「只看对话」,并且主人能关掉提问。 +- [访客通过提问套出密钥] → 拒读清单、工具结果过滤、答案脱敏三层。脱敏靠正则,挡不住所有形式,所以新分享仍须由主人确认内容适合共享,并且提问默认关闭。 - [访客提问花主人的额度] → 每个分享码同时只能有一个提问,每天 30 次,提问使用主人当前会话的模型,主人在详情里能看到用量。 - [恶意网页触发 `acecode://` 链接,让 B 的 ACECode 去连攻击者的机器] → 确认之前不发任何网络请求;确认框显示地址;对端返回的一切都按不可信数据处理;AI 工具只能用已保存的对端。 - [后台剪贴板监听引起隐私顾虑] → 只做前缀匹配,不落盘、不写日志;尊重「不要监视」标记;设置里能关;macOS 只在激活时检查。 diff --git a/openspec/changes/add-acecode-invite-links/proposal.md b/openspec/changes/add-acecode-invite-links/proposal.md index 8ad1e6be0..57bf72145 100644 --- a/openspec/changes/add-acecode-invite-links/proposal.md +++ b/openspec/changes/add-acecode-invite-links/proposal.md @@ -14,8 +14,8 @@ - 剪贴板:Windows 上 Desktop 监听剪贴板变化(窗口在后台或托盘时也生效,用系统通知提示),macOS 只在窗口被激活时检查一次。只匹配 `acecode://connect/` 前缀,同一条链接只提示一次。密码管理器标记为「不要被监视」的剪贴板内容一律跳过,读到的内容不记日志、不外发。设置里可以关掉。 - 粘贴:在 ACECode 输入框里粘贴邀请链接时,提示「连接到 xxx」而不是当作普通文本发送。Web、安卓等没有系统协议的场景走这条。 - **A 侧分享**: - - 会话标题栏的「属性」按钮左侧新增开口方框加穿出的上箭头样式的分享图标。链接权限明确分为「只读」和「可交互」:只读仅查看内容,可交互额外允许独立访客提问;可见内容档位与链接权限分别选择。 - - 会话可以生成分享,选「只看对话 / 含工具输出」和有效期,得到邀请链接;可以随时撤销。 + - 会话标题栏的「属性」按钮左侧新增开口方框加穿出的上箭头样式的分享图标。使用默认关闭的「可交互」开关,与生成链接按钮同排。关闭时只读,开启后允许独立访客提问,并显示圈叹号和用户指定的额度提示。 + - 新分享固定包含工具内容,两天后失效;界面不显示内容与有效期设置及旧网络提示。「已存在的链接」入口支持复制、撤销和查看已有对端。 - 分享码使用独立的访客入口,永远不能通过现有 daemon 的 `require_auth`,只能访问这一个会话的只读数据和提问接口。 - 局域网监听复用远程 Web 的转发子进程。「有分享」和「开远程 Web」是两个开关:只开分享时,经转发进来的请求只认分享码,不认完整 token。 - **A 侧提问**:访客提问复用侧边对话的只读工具循环,但更严:额外的禁读清单(`.env`、密钥、证书等),不提供「转发给主会话」,答案发出前脱敏,每个分享码有频率和每日上限,流式返回,不占用 HTTP 服务线程。会话没打开时在后台自动打开。主人能看到谁问了什么、答了什么,这些都不写进主会话历史。 diff --git a/openspec/changes/add-acecode-invite-links/specs/lan-session-share/spec.md b/openspec/changes/add-acecode-invite-links/specs/lan-session-share/spec.md index 22d8604fd..c02c28f38 100644 --- a/openspec/changes/add-acecode-invite-links/specs/lan-session-share/spec.md +++ b/openspec/changes/add-acecode-invite-links/specs/lan-session-share/spec.md @@ -7,18 +7,23 @@ ## ADDED Requirements ### Requirement: 分享入口和链接权限 -会话标题栏 SHALL 在「属性」操作左侧显示开口方框加穿出的上箭头样式的分享图标。存在有效分享的会话 SHALL 在侧栏显示 18 px 发射天线状态图标;分享按钮与发射天线状态图标 SHALL 使用统一的 VsIcon 渲染和尺寸线宽规则。分享对话框 SHALL 提供「只读」与「可交互」两种链接权限,独立于内容可见档位。只读链接 SHALL 只能查看历史和实时内容,不显示聊天入口,服务端 SHALL 拒绝任何访客提问。可交互链接 SHALL 允许使用分享者的模型和受限只读工具进行独立提问。 +会话标题栏 SHALL 在「属性」操作左侧显示开口方框加穿出的上箭头样式的分享图标。存在有效分享的会话 SHALL 在侧栏显示 18 px 发射天线状态图标;分享按钮与发射天线状态图标 SHALL 使用统一的 VsIcon 渲染和尺寸线宽规则。分享对话框 SHALL 提供默认关闭的「可交互」开关,与「生成链接」按钮同排。开关关闭时 SHALL 不显示额度提示,开启时 SHALL 显示圆圈感叹号图标和「打开可交互会话会消耗共享用户的token额度。」。内容与有效期控件及旧网络/访问提示 SHALL 移除;管理入口和标题 SHALL 使用「已存在的链接」。只读链接 SHALL 只能查看历史和实时内容,不显示聊天入口,服务端 SHALL 拒绝任何访客提问。可交互链接 SHALL 允许使用分享者的模型和受限只读工具进行独立提问。 #### Scenario: 只读链接禁止聊天 - **WHEN** 访客通过只读链接连接,并绕过界面直接发送 `ask_start` - **THEN** 服务端 SHALL 拒绝请求,不调用模型、不执行工具、不消耗提问额度 +#### Scenario: 切换可交互选项 +- **WHEN** 主人打开「可交互」开关 +- **THEN** 弹框 SHALL 在同排的生成链接操作下方显示圆圈感叹号和指定额度提示,关闭开关后移除提示 +- **AND** 生成请求进行中 SHALL 禁用开关,避免显示的权限与生成结果不一致 + ### Requirement: 创建会话分享 -会话主人 SHALL 能为 daemon、Desktop 或 Web 中的单个会话创建分享,并选择可见内容(只看对话 / 含工具输出)、是否允许提问(默认允许)和有效期(默认 1 天)。创建成功后 SHALL 立即得到一条邀请链接。TUI 主会话不在会话登记表里,SHALL NOT 提供分享入口。 +会话主人 SHALL 能为 daemon、Desktop 或 Web 中的单个会话创建分享,并选择是否允许提问(默认不允许)。新分享 SHALL 固定包含工具输出,并在创建后 172800 秒失效;接口 SHALL 拒绝其它内容档位或有效期参数。已存在的分享 SHALL 按原记录继续生效,不改动其内容范围、提问权限和失效时间。创建成功后 SHALL 立即得到一条邀请链接。TUI 主会话不在会话登记表里,SHALL NOT 提供分享入口。 #### Scenario: 用默认选项分享 - **WHEN** 主人在某个会话上选择分享,并且不改任何选项 -- **THEN** 系统 SHALL 创建一条只看对话、允许提问、1 天后过期的分享,并给出可复制的邀请链接 +- **THEN** 系统 SHALL 创建一条包含工具输出、禁止提问、2 天后过期的分享,并给出可复制的邀请链接 #### Scenario: daemon 处于 dangerous 模式 - **WHEN** daemon 以 dangerous 模式运行时,主人尝试创建分享 @@ -80,9 +85,9 @@ - **THEN** 系统 SHALL 在后台打开这个会话再提供内容,不要求主人手动打开 ### Requirement: 按分享档位过滤内容 -「只看对话」档位 SHALL 只返回用户和助手的文字、工具名称以及简短摘要,不返回工具的输入、输出和非图片附件。「含工具输出」档位返回完整内容。两个档位的所有文字 SHALL 先经过敏感信息脱敏再发出。 +新分享 SHALL 使用「含工具输出」档位。已存在的「只看对话」档位 SHALL 只返回用户和助手的文字、工具名称以及简短摘要,不返回工具的输入、输出和非图片附件。「含工具输出」档位返回完整内容。两个档位的所有文字 SHALL 先经过敏感信息脱敏再发出。 -#### Scenario: 只看对话档位的工具行 +#### Scenario: 已存在的只看对话档位的工具行 - **WHEN** 被分享会话里有一次读文件的工具调用,分享档位是只看对话 - **THEN** 访客 SHALL 只看到工具名称和一行摘要,看不到文件内容 diff --git a/openspec/changes/add-acecode-invite-links/tasks.md b/openspec/changes/add-acecode-invite-links/tasks.md index c23f56b01..5c11991e2 100644 --- a/openspec/changes/add-acecode-invite-links/tasks.md +++ b/openspec/changes/add-acecode-invite-links/tasks.md @@ -42,8 +42,8 @@ ## 6. 前端:分享、确认与远程会话视图 -- [x] 6.1 会话标题栏「属性」左侧加用户指定的向上箭头分享图标,打开「分享」对话框(只读/可交互权限、可见内容、有效期、复制邀请、复制链接),有分享的会话在侧栏显示 18 px 发射天线标记,操作图标与状态标记都通过统一 VsIcon 渲染,按 `acecode-frontend-style` 和 UI 文案约束实现,验证组件测试通过 -- [x] 6.2 新增「分享与连接」列表:主人侧的有效分享(复制、撤销)和访客侧的已保存对端(打开、删除、失效标记),验证组件测试通过 +- [x] 6.1 会话标题栏「属性」左侧加用户指定的向上箭头分享图标,打开「分享」对话框(默认关闭的可交互开关、固定含工具内容和两天有效期、复制邀请、复制链接),有分享的会话在侧栏显示 18 px 发射天线标记,操作图标与状态标记都通过统一 VsIcon 渲染,按 `acecode-frontend-style` 和 UI 文案约束实现,验证组件测试通过 +- [x] 6.2 新增「已存在的链接」列表:主人侧的有效分享(复制、撤销)和访客侧的已保存对端(打开、删除、失效标记),验证组件测试通过 - [x] 6.3 实现连接确认框(基于 `components/Modal.jsx`),显示名和标题按纯文本显示,确认后才调用 `POST /api/peers/connect`,验证测试断言确认前没有发出请求 - [x] 6.4 实现只读远程会话视图:复用对话渲染组件,不挂输入框和审批区,不请求本机会话专用接口,`visual` 代码块按源码显示,验证架构测试断言这些限制 - [x] 6.5 输入框粘贴识别:调用 `extractInviteLink`,命中时弹确认,取消后按原文本插入光标处,验证 `composerFileIntake` 相关测试通过 @@ -93,6 +93,12 @@ - [ ] 12.2 两台真实电脑在同一局域网做验收(用户本人):分享、浏览器粘贴打开、剪贴板识别、提问、撤销、公司代理开启时仍能直连 - [x] 12.3 在 `CLAUDE.md` 加一行索引,链接到 `docs/session-sharing.md` +## 13. 精简分享弹框(2026-11-16) + +- [x] 13.1 用默认关闭的「可交互」开关替换权限单选,与生成链接同排;移除内容、有效期控件及旧提示;仅开启时显示圈叹号和指定额度提示,入口改为「已存在的链接」。 +- [x] 13.2 新链接固定含工具输出、172800 秒后失效,后端默认只读;拒绝不符合固定规则的创建参数,保留已存在分享的原有权限与时间。 +- [x] 13.3 同步图标、翻译、规格和文档,验证组件状态与实际创建参数、原生创建接口、前端测试/构建和真实弹框布局。 + ## Workflow follow-up - 两台电脑的验收通过后再归档本变更。 diff --git a/openspec/changes/add-acecode-invite-links/verification.md b/openspec/changes/add-acecode-invite-links/verification.md index 8749be8df..faa59cab0 100644 --- a/openspec/changes/add-acecode-invite-links/verification.md +++ b/openspec/changes/add-acecode-invite-links/verification.md @@ -1,5 +1,14 @@ # 本机验证记录(2026-11-14) +## 2026-11-16 分享弹框精简 + +- 移除内容范围、有效期下拉和旧说明,改用默认关闭的「可交互」Toggle,与「生成链接」同排;开启才显示统一 StatusWarningCircle 图标及用户指定的额度提示。「已存在的链接」用于管理入口与标题。 +- 新链接默认只读、固定包含工具输出、有效期 172800 秒。服务端拒绝其它内容范围或有效期参数,已保存记录不迁移。 +- 已通过图标生成检查(124 个)、完整 `pnpm test`、`pnpm build`、OpenSpec strict、分层/所有权/文件大小/文档路径检查及 `git diff --check`。 +- Windows MSVC Release 的 `acecode_unit_tests`、`acecode` 构建通过,输出为 `build/share-dialog-bin`;12 项定向原生回归全部通过,包含新的创建策略测试和既有只读拒绝、撤销、分页、附件与脱敏测试。 +- 当前前端构建在隔离测试 daemon 上完成真实弹框检查:默认关且无旧控件/说明,开关与按钮中心 Y 坐标一致;开启显示指定提示,关闭后消失;生成结果为只读、含工具、正好 172800 秒。创建接口的新默认与参数拒绝规则另由本次原生构建的 HTTP 测试验证。 +- 已保存默认关闭与开启提示两种状态的截图;本次测试不调用真实模型。 + 本次实现包含只读和可交互链接、主人分享管理、B daemon 代连、受限访客提问、协议入口、剪贴板入口及固定注册的对端工具。代码尚未提交或发布。本记录不把未完成的人工或跨平台检查视为通过。 最终原生定向回归共 94 项通过,包含 253 个管理路由的凭据隔离检查;两个隔离 daemon 重启后,已保存的交互对端继续返回 4 条可见消息。 diff --git a/src/apps/desktop/desktop_restart.cpp b/src/apps/desktop/desktop_restart.cpp index fef1d4adc..394eef59d 100644 --- a/src/apps/desktop/desktop_restart.cpp +++ b/src/apps/desktop/desktop_restart.cpp @@ -1,7 +1,11 @@ #include "desktop_restart.hpp" +#include "utils/state_file.hpp" #include "utils/utf8_path.hpp" +#include + +#include #include #include #include @@ -22,6 +26,7 @@ # include # include # ifdef __APPLE__ +# include # include # endif #endif @@ -29,6 +34,99 @@ namespace fs = std::filesystem; namespace acecode::desktop { +namespace { + +constexpr const char* kLaunchVersionStateKey = "desktop_last_launch_version"; + +#ifndef _WIN32 +// fork + exec. A close-on-exec pipe reports an exec failure back to the caller. +// With wait_for_exit the child is also reaped and must exit with status 0. +bool spawn_process(const std::vector& command, + bool wait_for_exit, + std::string* error) { + int error_pipe[2] = {-1, -1}; + if (::pipe(error_pipe) != 0) { + if (error) *error = std::string("pipe failed: ") + std::strerror(errno); + return false; + } + if (::fcntl(error_pipe[1], F_SETFD, FD_CLOEXEC) != 0) { + const int saved_errno = errno; + ::close(error_pipe[0]); + ::close(error_pipe[1]); + if (error) *error = std::string("fcntl failed: ") + std::strerror(saved_errno); + return false; + } + + // Built before fork: the child may only call async-signal-safe functions. + std::vector argv; + argv.reserve(command.size() + 1); + for (const auto& part : command) argv.push_back(const_cast(part.c_str())); + argv.push_back(nullptr); + + const pid_t pid = ::fork(); + if (pid < 0) { + const int saved_errno = errno; + ::close(error_pipe[0]); + ::close(error_pipe[1]); + if (error) *error = std::string("fork failed: ") + std::strerror(saved_errno); + return false; + } + if (pid == 0) { + ::close(error_pipe[0]); + ::setsid(); + ::execv(argv[0], argv.data()); + const int saved_errno = errno; + (void)::write(error_pipe[1], &saved_errno, sizeof(saved_errno)); + ::_exit(127); + } + + ::close(error_pipe[1]); + int child_errno = 0; + ssize_t bytes = -1; + do { + bytes = ::read(error_pipe[0], &child_errno, sizeof(child_errno)); + } while (bytes < 0 && errno == EINTR); + const int read_errno = errno; + ::close(error_pipe[0]); + if (bytes < 0) { + if (error) *error = std::string("restart handshake failed: ") + std::strerror(read_errno); + return false; + } + if (bytes > 0) { + (void)::waitpid(pid, nullptr, 0); + if (error) *error = std::string("exec failed: ") + std::strerror(child_errno); + return false; + } + if (!wait_for_exit) return true; + + int status = 0; + pid_t waited = -1; + do { + waited = ::waitpid(pid, &status, 0); + } while (waited < 0 && errno == EINTR); + if (waited != pid || !WIFEXITED(status) || WEXITSTATUS(status) != 0) { + if (error) *error = command.front() + " did not exit cleanly"; + return false; + } + return true; +} +#endif + +#ifdef __APPLE__ +// LaunchServices starts the application from the login session's environment. +// A process started with ACECODE_* overrides (a development instance, keys +// exported in a shell) must keep them, so it is executed directly instead. +bool has_acecode_environment_overrides() { + char*** environment = _NSGetEnviron(); + if (!environment || !*environment) return false; + for (char** entry = *environment; *entry; ++entry) { + if (std::strncmp(*entry, "ACECODE_", 8) == 0) return true; + } + return false; +} +#endif + +} // namespace fs::path current_desktop_executable_path() { #ifdef _WIN32 @@ -90,16 +188,74 @@ DesktopRestartPreflight validate_desktop_restart_target(const fs::path& executab return result; } -bool launch_desktop_replacement(const fs::path& executable, std::string* error) { +bool desktop_relaunched_after_update(const std::vector& argv) { + return argv.size() > 1 && + std::find(argv.begin() + 1, argv.end(), kRelaunchedAfterUpdateArgument) != argv.end(); +} + +bool note_desktop_version_launch(const std::string& version) { + if (version.empty()) return false; + bool changed = false; + (void)update_state_json([&version, &changed](nlohmann::json& state) { + const auto it = state.find(kLaunchVersionStateKey); + if (it != state.end() && it->is_string() && it->get() == version) { + return false; + } + changed = true; + state[kLaunchVersionStateKey] = version; + return true; + }); + return changed; +} + +std::optional macos_app_bundle_for_executable(const fs::path& executable) { + const std::string generic = executable.generic_string(); + if (generic.empty() || generic.front() != '/') return std::nullopt; + const fs::path normalized = executable.lexically_normal(); + const fs::path macos_dir = normalized.parent_path(); + const fs::path contents_dir = macos_dir.parent_path(); + const fs::path app_dir = contents_dir.parent_path(); + if (!normalized.has_filename() || macos_dir.filename() != "MacOS" || + contents_dir.filename() != "Contents" || app_dir.extension() != ".app" || + app_dir.stem().empty()) { + return std::nullopt; + } + return app_dir; +} + +bool valid_desktop_replacement_arguments(const std::vector& arguments, + std::string* error) { + for (const auto& argument : arguments) { + const bool plain = !argument.empty() && + std::all_of(argument.begin(), argument.end(), [](unsigned char ch) { + return ch > 0x20 && ch < 0x7F && ch != 0x22 && ch != 0x5C; + }); + if (!plain) { + if (error) *error = "desktop replacement argument is not a plain switch"; + return false; + } + } + return true; +} + +bool launch_desktop_replacement(const fs::path& executable, + const std::vector& arguments, + std::string* error) { const auto preflight = validate_desktop_restart_target(executable); if (!preflight.ok) { if (error) *error = preflight.error; return false; } + if (!valid_desktop_replacement_arguments(arguments, error)) return false; #ifdef _WIN32 std::wstring application = executable.native(); std::wstring command_line = L"\"" + application + L"\""; + for (const auto& argument : arguments) { + // Validated above: printable ASCII without spaces, quotes or backslashes. + command_line += L' '; + command_line.append(argument.begin(), argument.end()); + } std::vector mutable_command(command_line.begin(), command_line.end()); mutable_command.push_back(L'\0'); @@ -117,59 +273,31 @@ bool launch_desktop_replacement(const fs::path& executable, std::string* error) } return false; } + // Only effective while this process may still set the foreground itself; + // otherwise the replacement forces its own window forward. + (void)::AllowSetForegroundWindow(process.dwProcessId); ::CloseHandle(process.hThread); ::CloseHandle(process.hProcess); return true; #else - int error_pipe[2] = {-1, -1}; - if (::pipe(error_pipe) != 0) { - if (error) *error = std::string("pipe failed: ") + std::strerror(errno); - return false; - } - if (::fcntl(error_pipe[1], F_SETFD, FD_CLOEXEC) != 0) { - const int saved_errno = errno; - ::close(error_pipe[0]); - ::close(error_pipe[1]); - if (error) *error = std::string("fcntl failed: ") + std::strerror(saved_errno); - return false; - } - - const pid_t pid = ::fork(); - if (pid < 0) { - const int saved_errno = errno; - ::close(error_pipe[0]); - ::close(error_pipe[1]); - if (error) *error = std::string("fork failed: ") + std::strerror(saved_errno); - return false; - } - if (pid == 0) { - ::close(error_pipe[0]); - ::setsid(); - const std::string native = acecode::path_to_utf8(executable); - ::execl(native.c_str(), native.c_str(), static_cast(nullptr)); - const int saved_errno = errno; - (void)::write(error_pipe[1], &saved_errno, sizeof(saved_errno)); - ::_exit(127); - } - - ::close(error_pipe[1]); - int child_errno = 0; - ssize_t bytes = -1; - do { - bytes = ::read(error_pipe[0], &child_errno, sizeof(child_errno)); - } while (bytes < 0 && errno == EINTR); - const int read_errno = errno; - ::close(error_pipe[0]); - if (bytes < 0) { - if (error) *error = std::string("restart handshake failed: ") + std::strerror(read_errno); - return false; - } - if (bytes > 0) { - (void)::waitpid(pid, nullptr, 0); - if (error) *error = std::string("exec failed: ") + std::strerror(child_errno); - return false; +#ifdef __APPLE__ + if (const auto bundle = macos_app_bundle_for_executable(executable); + bundle && !has_acecode_environment_overrides()) { + // -n: this process is still registered with LaunchServices, which would + // otherwise activate it instead of starting the replacement. + std::vector command{ + "/usr/bin/open", "-n", acecode::path_to_utf8(*bundle)}; + if (!arguments.empty()) { + command.emplace_back("--args"); + command.insert(command.end(), arguments.begin(), arguments.end()); + } + if (spawn_process(command, /*wait_for_exit=*/true, nullptr)) return true; + // Relaunching matters more than activation: fall back to a direct exec. } - return true; +#endif + std::vector command{acecode::path_to_utf8(executable)}; + command.insert(command.end(), arguments.begin(), arguments.end()); + return spawn_process(command, /*wait_for_exit=*/false, error); #endif } diff --git a/src/apps/desktop/desktop_restart.hpp b/src/apps/desktop/desktop_restart.hpp index b21fd3aa9..fb9c3450b 100644 --- a/src/apps/desktop/desktop_restart.hpp +++ b/src/apps/desktop/desktop_restart.hpp @@ -1,10 +1,35 @@ #pragma once #include +#include #include +#include namespace acecode::desktop { +// Passed to the replacement process so it knows the user did not start it by +// hand and must bring its window to the front by itself. +inline constexpr const char* kRelaunchedAfterUpdateArgument = "--relaunched-after-update"; + +// True when argv (argv[0] is the program) carries kRelaunchedAfterUpdateArgument. +bool desktop_relaunched_after_update(const std::vector& argv); + +// Record the running version in state.json. Returns true when the previous +// launch recorded a different version or none at all: the first launch of a +// newly installed build, including one relaunched by an older build that does +// not pass kRelaunchedAfterUpdateArgument yet. +bool note_desktop_version_launch(const std::string& version); + +// The enclosing .app for .../.app/Contents/MacOS/. +// Portable so the layout rule is covered by the normal unit suite. +std::optional macos_app_bundle_for_executable( + const std::filesystem::path& executable); + +// Replacement arguments are internal switches. Anything that would need +// quoting on a command line is rejected instead of being escaped. +bool valid_desktop_replacement_arguments(const std::vector& arguments, + std::string* error = nullptr); + struct DesktopRestartPreflight { bool ok = false; std::string error; @@ -20,7 +45,19 @@ DesktopRestartPreflight validate_desktop_restart_target( // Launch the replacement desktop process. The caller must first tear down its // daemon/tray resources and release the desktop single-instance guard. +// +// By the time this runs the caller has destroyed its window and is no longer +// the foreground application, so the replacement cannot take the foreground +// the way a hand-started process can: +// - Windows: the replacement is granted the foreground right when this +// process still holds it; otherwise it forces its own window to the front +// (see window_foreground.hpp) because `arguments` tells it to. +// - macOS: an installed bundle is relaunched through LaunchServices +// (/usr/bin/open -n), which activates the new instance. A bare executable, +// or a process carrying ACECODE_* environment overrides that LaunchServices +// would drop, is executed directly as before. bool launch_desktop_replacement(const std::filesystem::path& executable, + const std::vector& arguments, std::string* error); } // namespace acecode::desktop diff --git a/src/apps/desktop/last_session.cpp b/src/apps/desktop/last_session.cpp new file mode 100644 index 000000000..6a63f5ba6 --- /dev/null +++ b/src/apps/desktop/last_session.cpp @@ -0,0 +1,129 @@ +#include "last_session.hpp" + +#include "url_builder.hpp" + +#include "utils/state_file.hpp" +#include "utils/utf8_path.hpp" + +#include + +#include +#include +#include +#include + +namespace acecode::desktop { +namespace { + +constexpr const char* kStateKey = "last_session"; +constexpr std::size_t kMaxIdentityBytes = 256; + +// 两个字段最终都进 URL 查询串(已 percent-encode)。这里只挡明显不是 id 的内容: +// 过长,或带控制字符。 +bool valid_identity(const std::string& value) { + if (value.size() > kMaxIdentityBytes) return false; + for (const unsigned char ch : value) { + if (ch < 0x20 || ch == 0x7F) return false; + } + return true; +} + +std::optional session_from_json(const nlohmann::json& value) { + if (!value.is_object()) return std::nullopt; + const auto text = [&value](const char* key) -> std::string { + const auto it = value.find(key); + return it != value.end() && it->is_string() ? it->get() : std::string{}; + }; + const auto flag = [&value](const char* key) { + const auto it = value.find(key); + return it != value.end() && it->is_boolean() && it->get(); + }; + + LastSession session; + session.session_id = text("session_id"); + session.no_workspace = flag("no_workspace"); + session.workspace_hash = session.no_workspace ? std::string{} : text("workspace_hash"); + session.read_only = flag("read_only"); + if (session.session_id.empty() || !valid_identity(session.session_id) || + !valid_identity(session.workspace_hash)) { + return std::nullopt; + } + return session; +} + +nlohmann::json session_to_json(const LastSession& session) { + nlohmann::json value{{"session_id", session.session_id}}; + if (session.no_workspace) value["no_workspace"] = true; + else if (!session.workspace_hash.empty()) value["workspace_hash"] = session.workspace_hash; + if (session.read_only) value["read_only"] = true; + return value; +} + +std::string error_json(const std::string& error) { + return nlohmann::json{{"ok", false}, {"error", error}}.dump(); +} + +} // namespace + +std::optional read_last_session() { + const nlohmann::json state = read_state_json(); + const auto it = state.find(kStateKey); + return it == state.end() ? std::nullopt : session_from_json(*it); +} + +void write_last_session(const std::optional& session) { + (void)update_state_json([&session](nlohmann::json& state) { + const auto it = state.find(kStateKey); + if (!session) { + if (it == state.end()) return false; + state.erase(it); + return true; + } + nlohmann::json next = session_to_json(*session); + if (it != state.end() && *it == next) return false; + state[kStateKey] = std::move(next); + return true; + }); +} + +std::optional restorable_last_session(const WorkspaceRegistry& registry) { + auto session = read_last_session(); + if (!session || session->workspace_hash.empty()) return session; + const auto workspace = registry.get(session->workspace_hash); + if (!workspace) return std::nullopt; + std::error_code ec; + if (!std::filesystem::is_directory(path_from_utf8(workspace->cwd), ec) || ec) { + return std::nullopt; + } + return session; +} + +std::string last_session_url(const std::string& url, const LastSession& session) { + std::string next = append_query_param(url, "open", session.session_id); + if (session.no_workspace) { + next = append_query_param(next, "no_workspace", "1"); + } else if (!session.workspace_hash.empty()) { + next = append_query_param(next, "workspace", session.workspace_hash); + } + if (session.read_only) next = append_query_param(next, "read_only", "1"); + return append_query_param(next, "restore", "1"); +} + +std::string handle_set_last_session(const std::string& request) { + try { + const auto args = nlohmann::json::parse(request); + if (!args.is_array() || args.empty()) return error_json("expect [session|null]"); + if (args[0].is_null()) { + write_last_session(std::nullopt); + return nlohmann::json{{"ok", true}}.dump(); + } + const auto session = session_from_json(args[0]); + if (!session) return error_json("invalid session"); + write_last_session(session); + return nlohmann::json{{"ok", true}}.dump(); + } catch (const std::exception& e) { + return error_json(std::string("parse: ") + e.what()); + } +} + +} // namespace acecode::desktop diff --git a/src/apps/desktop/last_session.hpp b/src/apps/desktop/last_session.hpp new file mode 100644 index 000000000..e03aa2f41 --- /dev/null +++ b/src/apps/desktop/last_session.hpp @@ -0,0 +1,54 @@ +#pragma once + +// 桌面版「启动时回到上次停留的会话」。 +// +// 前端每次切换当前会话时经 aceDesktop_setLastSession 上报,这里记进 +// state.json::last_session;停在首页 / 定时任务页等非会话页面时上报 null, +// 记录随之清掉(下次启动就落在首页)。启动时 main.cpp 读回记录,拼成与 +// 跨 workspace 跳转相同的 ?open=<会话>&workspace= 落地参数,交给前端 +// 已有的启动跳转去恢复。 +// +// 记录只由桌面壳读写:端口每次启动都变,浏览器本地存储留不住;daemon 可能同时 +// 服务多个页面,不适合记「这一个窗口」停在哪。 + +#include "workspace/workspace_registry.hpp" + +#include +#include + +namespace acecode::desktop { + +struct LastSession { + std::string session_id; + std::string workspace_hash; // no_workspace 时恒为空 + bool no_workspace = false; // 明确不属于任何工作区的会话 + bool read_only = false; // 只读打开的外部会话(TUI) + + bool operator==(const LastSession& other) const { + return session_id == other.session_id && + workspace_hash == other.workspace_hash && + no_workspace == other.no_workspace && + read_only == other.read_only; + } +}; + +// 读: 文件不存在 / 字段缺失 / 类型或内容不合法 → nullopt。永不抛异常。 +std::optional read_last_session(); + +// 写: nullopt 清掉记录;内容没变不落盘。失败只 LOG_WARN 不阻断。 +void write_last_session(const std::optional& session); + +// 本次启动要恢复的会话。带工作区的会话要求该工作区仍在 registry 里且目录还在 +// (否则 daemon 那边无从 resume);没有工作区信息的会话总是交给前端去试。 +std::optional restorable_last_session(const WorkspaceRegistry& registry); + +// 给 daemon 首页 URL 追加启动落地参数。restore=1 告诉前端这是自动恢复: +// 会话已被删除等失败情况静默回到首页,不弹错误。 +std::string last_session_url(const std::string& url, const LastSession& session); + +// bridge aceDesktop_setLastSession 的处理函数。请求是参数数组: +// [null] 或 [{session_id, workspace_hash?, no_workspace?, read_only?}]。 +// 返回 {"ok":true} 或 {"ok":false,"error":...}。 +std::string handle_set_last_session(const std::string& request); + +} // namespace acecode::desktop diff --git a/src/apps/desktop/main.cpp b/src/apps/desktop/main.cpp index 34162a769..67e5cb811 100644 --- a/src/apps/desktop/main.cpp +++ b/src/apps/desktop/main.cpp @@ -33,6 +33,7 @@ #include "ipc/open_request.hpp" #include "platform/invite_protocol.hpp" #include "invite_controller.hpp" +#include "last_session.hpp" #include "open_in_explorer_bridge.hpp" #include "pick_active.hpp" #include "single_instance.hpp" @@ -45,6 +46,7 @@ #include "tray_icon_win.hpp" #include "url_builder.hpp" #include "web_host.hpp" +#include "window_foreground.hpp" #include "web_host_close_policy.hpp" #include "window_bounds_state.hpp" #include "window_shape.hpp" @@ -281,16 +283,6 @@ void show_error(const std::string& msg) { using acecode::path_from_utf8; using acecode::path_to_utf8; -std::string append_query_param(const std::string& url, - const std::string& key, - const std::string& value) { - if (url.empty() || url == "about:blank") return url; - const char separator = url.find('?') == std::string::npos ? '?' : '&'; - return url + separator + - acecode::desktop::percent_encode(key) + "=" + - acecode::desktop::percent_encode(value); -} - std::string locate_daemon_exe() { auto dir = desktop_exe_dir(); if (dir.empty()) return ""; @@ -542,7 +534,7 @@ int run_browser_fallback(const std::string& url, return failures.empty() ? 1 : 100; } - const std::string browser_url = append_query_param(url, "ace_webapp", "1"); + const std::string browser_url = acecode::desktop::append_query_param(url, "ace_webapp", "1"); #ifdef _WIN32 // 1) 启动浏览器:Edge --app 优先(拿到进程句柄),失败退到默认浏览器。 @@ -677,6 +669,7 @@ int main(int argc, char** argv) { // MessageBox 给用户提示)。 auto run = [ force_webapp, + relaunched = acecode::desktop::desktop_relaunched_after_update(process_arguments), startup_open_request = startup_open_parse.request, startup_open_request_error = startup_open_parse.error ]() -> int { @@ -871,7 +864,9 @@ int main(int argc, char** argv) { mark_startup("workspace_scan_end"); // 2. 决定 active workspace + const auto restore_session = startup_open_request ? std::nullopt : restorable_last_session(registry); std::string last_active = acecode::read_last_active_workspace_hash(); + if (restore_session && !restore_session->workspace_hash.empty()) last_active = restore_session->workspace_hash; std::string proc_cwd = current_cwd(); std::optional startup_open_workspace; if (startup_open_request.has_value() && startup_open_request->invite.empty()) { @@ -1089,6 +1084,7 @@ int main(int argc, char** argv) { acecode::desktop::install_agent_browser_cookie_bridge(host, agent_browser); const auto ios_simulator_view = install_ios_simulator_view(host); std::atomic restart_requested{false}; + const bool reveal_in_foreground = note_desktop_version_launch(ACECODE_VERSION) || relaunched; host.set_title("ACECode"); host.set_size(kDefaultDesktopWindowWidth, kDefaultDesktopWindowHeight); host.restore_window_bounds(read_desktop_window_bounds()); @@ -1330,7 +1326,10 @@ int main(int argc, char** argv) { startup_splash_open = false; // 先在启动浮窗上播完 'A>' 收尾,再显示主窗口;回调可能在浮窗的绘制线程上触发, // 经 dispatch 回到主线程。 - splash.finish([&host] { host.dispatch([&host] { host.set_visible(true); }); }); + splash.finish([&host, reveal_in_foreground] { host.dispatch([&host, reveal_in_foreground] { + const auto show = [&host] { host.set_visible(true); }; + reveal_in_foreground ? (void)show_window_in_foreground(host.native_window(), show) : show(); + }); }); }; // 前端首屏完成后让启动浮窗收尾,再把屏幕外的主窗口移回前台。 @@ -2397,6 +2396,7 @@ int main(int argc, char** argv) { } }); + host.bind("aceDesktop_setLastSession", handle_set_last_session); // bridge: activateWorkspace auto activate_fn = [&](const std::string& hash) -> nlohmann::json { registry.scan(proj_dir); @@ -2767,6 +2767,7 @@ int main(int argc, char** argv) { "window.__ACECODE_DESKTOP_STARTUP__=" + startup_timeline.snapshot_json() + ";\n"); startup_navigation_started = true; + if (restore_session) url = last_session_url(url, *restore_session); host.navigate(url); if (url == onboarding_url()) close_splash_once(); @@ -2808,7 +2809,7 @@ int main(int argc, char** argv) { singleton.release(); LOG_INFO("[desktop] post-upgrade replacement launch started"); std::string restart_error; - if (!launch_desktop_replacement(desktop_restart_target, &restart_error)) { + if (!launch_desktop_replacement(desktop_restart_target, {kRelaunchedAfterUpdateArgument}, &restart_error)) { LOG_ERROR("[desktop] failed to launch replacement after upgrade: " + restart_error); return 101; } diff --git a/src/apps/desktop/url_builder.cpp b/src/apps/desktop/url_builder.cpp index 2de4fbbb1..93295ab16 100644 --- a/src/apps/desktop/url_builder.cpp +++ b/src/apps/desktop/url_builder.cpp @@ -19,4 +19,12 @@ std::string build_loopback_url(int port, const std::string& token) { return u.str(); } +std::string append_query_param(const std::string& url, + const std::string& key, + const std::string& value) { + if (url.empty() || url == "about:blank") return url; + const char separator = url.find('?') == std::string::npos ? '?' : '&'; + return url + separator + percent_encode(key) + "=" + percent_encode(value); +} + } // namespace acecode::desktop diff --git a/src/apps/desktop/url_builder.hpp b/src/apps/desktop/url_builder.hpp index 1bce0741a..4e53bb8af 100644 --- a/src/apps/desktop/url_builder.hpp +++ b/src/apps/desktop/url_builder.hpp @@ -21,4 +21,10 @@ std::string percent_encode(const std::string& raw); // 给定 port + token 拼出 WebView 用的初始 URL。port 不做范围校验(由调用方保证)。 std::string build_loopback_url(int port, const std::string& token); +// 给已有 URL 追加一个查询参数(key / value 都做 percent-encoding)。 +// 空 URL 与 about:blank(onboarding)原样返回。 +std::string append_query_param(const std::string& url, + const std::string& key, + const std::string& value); + } // namespace acecode::desktop diff --git a/src/apps/desktop/window_foreground.cpp b/src/apps/desktop/window_foreground.cpp new file mode 100644 index 000000000..c3424ebc4 --- /dev/null +++ b/src/apps/desktop/window_foreground.cpp @@ -0,0 +1,49 @@ +#include "window_foreground.hpp" + +#ifdef _WIN32 +# include "platform/native_ui/notifications.hpp" + +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif +# ifndef NOMINMAX +# define NOMINMAX +# endif +# include +#endif + +namespace acecode::desktop { + +bool show_window_in_foreground(void* native_window, const std::function& show) { +#ifdef _WIN32 + auto* hwnd = static_cast(native_window); + if (!hwnd || !::IsWindow(hwnd)) { + if (show) show(); + return false; + } + + const HWND foreground = ::GetForegroundWindow(); + const DWORD current_thread = ::GetCurrentThreadId(); + const DWORD foreground_thread = + foreground ? ::GetWindowThreadProcessId(foreground, nullptr) : 0; + // 并入输入队列后,激活切换会同步经过对方线程;对方无响应时不能并入, + // 否则本线程会跟着卡住。 + const bool attached = foreground_thread && foreground_thread != current_thread && + !::IsHungAppWindow(foreground) && + ::AttachThreadInput(current_thread, foreground_thread, TRUE) != FALSE; + if (show) show(); + ::BringWindowToTop(hwnd); + ::SetForegroundWindow(hwnd); + if (attached) ::AttachThreadInput(current_thread, foreground_thread, FALSE); + if (::GetForegroundWindow() == hwnd) return true; + + // 置顶脉冲:拿不到输入焦点也保证窗口在最上层可见。 + return activate_notification_window(hwnd); +#else + (void)native_window; + if (show) show(); + return true; +#endif +} + +} // namespace acecode::desktop diff --git a/src/apps/desktop/window_foreground.hpp b/src/apps/desktop/window_foreground.hpp new file mode 100644 index 000000000..f01cb293e --- /dev/null +++ b/src/apps/desktop/window_foreground.hpp @@ -0,0 +1,21 @@ +#pragma once + +#include + +namespace acecode::desktop { + +// 显示主窗口并把它放到最前。用于「不是用户亲手启动」的那次启动:升级后旧进程 +// 拉起的新进程、新版本装好后的第一次启动。 +// +// 背景(Windows 前台锁):进程只有在自己是前台进程、或由前台进程启动时, +// SetForegroundWindow 才会被系统接受。升级重启时,旧进程要先销毁窗口、停完 +// daemon 才拉起新进程 —— 那一刻它早已不是前台进程,新窗口于是出现在别的窗口 +// 后面,只在任务栏闪。这里先临时并入当前前台线程的输入队列再激活;仍被拒绝 +// (前台程序无响应或权限更高)就用一次置顶脉冲把窗口抬到最上层后立刻撤销。 +// +// show 负责让窗口可见(WebHost::set_visible(true)),在本次调用内同步执行一次。 +// 必须在窗口所属的 UI 线程调用。返回窗口最终是否在最前;非 Windows 平台只执行 +// show(macOS 的激活由 LaunchServices 负责,见 desktop_restart)。 +bool show_window_in_foreground(void* native_window, const std::function& show); + +} // namespace acecode::desktop diff --git a/src/apps/web/handlers/fs_browser_handler.cpp b/src/apps/web/handlers/fs_browser_handler.cpp index b05b7906f..983cbc61c 100644 --- a/src/apps/web/handlers/fs_browser_handler.cpp +++ b/src/apps/web/handlers/fs_browser_handler.cpp @@ -249,6 +249,107 @@ browse_directory(const std::string& path_utf8, bool show_hidden, std::size_t max return result; } +namespace { + +// Windows 保留设备名:扩展名不救命("CON.txt" 同样打不开),比较前去掉首个句点之后的部分 +// 与尾部空格,并按 ASCII 不分大小写。 +bool is_windows_reserved_folder_name(const std::string& name) { + std::string base = name.substr(0, name.find('.')); + while (!base.empty() && base.back() == ' ') base.pop_back(); + for (auto& c : base) c = static_cast(std::toupper(static_cast(c))); + if (base == "CON" || base == "PRN" || base == "AUX" || base == "NUL") return true; + if (base.size() == 4 && base[3] >= '1' && base[3] <= '9') { + return base.rfind("COM", 0) == 0 || base.rfind("LPT", 0) == 0; + } + return false; +} + +} // namespace + +bool folder_name_uses_windows_rules() { +#ifdef _WIN32 + return true; +#else + return false; +#endif +} + +std::string folder_name_problem(const std::string& name, bool windows_rules) { + if (name.empty()) return "name is empty"; + if (name == "." || name == "..") return "name cannot be . or .."; + for (const char ch : name) { + const auto c = static_cast(ch); + if (c < 32 || c == 127) return "name contains a control character"; + if (c == '/' || c == '\\') return "name contains a path separator"; + if (!windows_rules) continue; + switch (c) { + case '<': case '>': case ':': case '"': case '|': case '?': case '*': + return std::string("name contains a character Windows does not allow: ") + ch; + default: + break; + } + } + if (windows_rules) { + // Windows 会静默剥掉尾部的句点与空格,建出来的目录和用户看到的名字对不上。 + if (name.back() == '.' || name.back() == ' ') { + return "name cannot end with a period or space"; + } + if (is_windows_reserved_folder_name(name)) return "name is reserved by Windows"; + } + return {}; +} + +std::variant +create_browse_directory(const std::string& parent_utf8, const std::string& name_utf8) { + const auto parent = normalize_browse_path(parent_utf8); + if (!parent) { + return FsMkdirError{FsMkdirErrorKind::NotAbsolute, "parent must be an absolute path"}; + } + const std::string name = trim_ascii(name_utf8); + if (const std::string problem = folder_name_problem(name, folder_name_uses_windows_rules()); + !problem.empty()) { + return FsMkdirError{FsMkdirErrorKind::InvalidName, problem}; + } + + const fs::path parent_path = path_from_utf8(*parent); + std::error_code ec; + const auto st = fs::status(parent_path, ec); // 跟随 junction / symlink + if (ec) { + if (ec == std::errc::permission_denied) { + return FsMkdirError{FsMkdirErrorKind::AccessDenied, error_text(ec)}; + } + return FsMkdirError{FsMkdirErrorKind::ParentNotFound, error_text(ec)}; + } + if (!fs::exists(st)) { + return FsMkdirError{FsMkdirErrorKind::ParentNotFound, "parent directory not found"}; + } + if (!fs::is_directory(st)) { + return FsMkdirError{FsMkdirErrorKind::ParentNotDirectory, "parent is not a directory"}; + } + + const fs::path target = parent_path / path_from_utf8(name); + const std::string display = (parent->back() == '/' ? *parent : *parent + "/") + name; + + // symlink_status:悬空的链接也算「已存在」,不能顺着它在别处建目录。 + ec.clear(); + const auto existing = fs::symlink_status(target, ec); + if (!ec && fs::exists(existing)) { + return FsMkdirError{FsMkdirErrorKind::AlreadyExists, "already exists: " + display}; + } + + ec.clear(); + if (!fs::create_directory(target, ec)) { + if (!ec || ec == std::errc::file_exists) { + return FsMkdirError{FsMkdirErrorKind::AlreadyExists, "already exists: " + display}; + } + if (ec == std::errc::permission_denied) { + return FsMkdirError{FsMkdirErrorKind::AccessDenied, error_text(ec)}; + } + return FsMkdirError{FsMkdirErrorKind::IoError, error_text(ec)}; + } + return FsMkdirResult{display, name}; +} + std::vector enumerate_roots() { std::vector out; #ifdef _WIN32 diff --git a/src/apps/web/handlers/fs_browser_handler.hpp b/src/apps/web/handlers/fs_browser_handler.hpp index 0030850a8..4c8358206 100644 --- a/src/apps/web/handlers/fs_browser_handler.hpp +++ b/src/apps/web/handlers/fs_browser_handler.hpp @@ -18,6 +18,10 @@ // 隐藏 = 名称以 '.' 开头,或(Windows)文件属性带 HIDDEN / SYSTEM;show_hidden 一起 // 放行并在条目上标 hidden=true。单次列举上限 kFsBrowseMaxEntries,超出置 truncated。 // 模块无 Crow 依赖,routes_fs.cpp 只做 HTTP 解析 + 序列化。 +// +// 唯一的写操作是选择器底栏「New Folder」用的 create_browse_directory:在一个已存在的目录 +// 下建一层子目录。返回路径沿用同样的词法归一、不 canonical(理由同上);名字不合法直接 +// 拒绝,不替用户改名;不递归建父目录,不覆盖已有项目。 #include #include @@ -74,6 +78,35 @@ browse_directory(const std::string& path_utf8, bool show_hidden, std::size_t max_entries = kFsBrowseMaxEntries); +enum class FsMkdirErrorKind { + InvalidName, // 空名 / . / .. / 含分隔符或控制字符;Windows 另含 <>:"|?* 、句点结尾、保留设备名 → 400 + NotAbsolute, // parent 为空串 / 相对路径 → 400 + ParentNotFound, // parent 不存在 → 404 + ParentNotDirectory, // parent 存在但不是目录 → 404 + AccessDenied, // 权限拒绝 → 403 + AlreadyExists, // 同名项目(目录或文件)已存在 → 409 + IoError, // 其他失败(名字过长、磁盘只读等)→ 500 +}; + +struct FsMkdirError { + FsMkdirErrorKind kind; + std::string message; // 给日志 / body.detail +}; + +struct FsMkdirResult { + std::string path; // 新目录的显示形态路径:parent 的归一路径 + "/" + name + std::string name; // 实际使用的名字(去掉首尾空白之后) +}; + +// 名字的问题描述;合法返回空串。名字两端的 ASCII 空白由调用方先去掉。 +// windows_rules 只在单测里显式传入,线上按编译平台决定。 +std::string folder_name_problem(const std::string& name, bool windows_rules); +bool folder_name_uses_windows_rules(); + +// 在 parent_utf8 下建名为 name_utf8 的子目录(只建一层)。见文件头注释。 +std::variant +create_browse_directory(const std::string& parent_utf8, const std::string& name_utf8); + struct FsRootEntry { std::string path; // "C:/" | "/" | "/Volumes/Data" std::string label; // 卷标;取不到为空,前端自行组合「本地磁盘 (C:)」这类文案 diff --git a/src/apps/web/routes/routes_fs.cpp b/src/apps/web/routes/routes_fs.cpp index 235e7d956..0e8399120 100644 --- a/src/apps/web/routes/routes_fs.cpp +++ b/src/apps/web/routes/routes_fs.cpp @@ -1,7 +1,8 @@ // routes_fs.cpp — /api/fs:Web「选择文件 / 文件夹」弹窗的服务端目录浏览接口 // (openspec add-web-path-picker)。与 /api/files 的语义差别见 -// handlers/fs_browser_handler.hpp 头注释:已鉴权即可浏览任意绝对目录,只读,不做 -// workspace 白名单;每次列举记一条带路径的日志。 +// handlers/fs_browser_handler.hpp 头注释:已鉴权即可浏览任意绝对目录,不做 workspace +// 白名单;唯一的写操作是 mkdir(底栏「New Folder」,只建一层)。每次列举 / 建目录都记一条 +// 带路径的日志。 #include "web/server_impl.hpp" #include "web/handlers/fs_browser_handler.hpp" #include "web/project_creation.hpp" @@ -51,6 +52,32 @@ int browse_error_status(FsBrowseErrorKind kind) { return 500; } +int mkdir_error_status(FsMkdirErrorKind kind) { + switch (kind) { + case FsMkdirErrorKind::InvalidName: return 400; + case FsMkdirErrorKind::NotAbsolute: return 400; + case FsMkdirErrorKind::ParentNotFound: return 404; + case FsMkdirErrorKind::ParentNotDirectory: return 404; + case FsMkdirErrorKind::AccessDenied: return 403; + case FsMkdirErrorKind::AlreadyExists: return 409; + case FsMkdirErrorKind::IoError: return 500; + } + return 500; +} + +const char* mkdir_error_code(FsMkdirErrorKind kind) { + switch (kind) { + case FsMkdirErrorKind::InvalidName: return "invalid name"; + case FsMkdirErrorKind::NotAbsolute: return "path must be absolute"; + case FsMkdirErrorKind::ParentNotFound: return "not found"; + case FsMkdirErrorKind::ParentNotDirectory: return "not a directory"; + case FsMkdirErrorKind::AccessDenied: return "permission denied"; + case FsMkdirErrorKind::AlreadyExists: return "already exists"; + case FsMkdirErrorKind::IoError: return "io error"; + } + return "io error"; +} + const char* browse_error_code(FsBrowseErrorKind kind) { switch (kind) { case FsBrowseErrorKind::NotAbsolute: return "path must be absolute"; @@ -73,6 +100,10 @@ void WebServer::Impl::register_fs() { ([this](const crow::request& req) { return cors_preflight(req); }); + CROW_ROUTE(app, "/api/fs/mkdir").methods(crow::HTTPMethod::Options) + ([this](const crow::request& req) { + return cors_preflight(req); + }); // GET /api/fs/roots — 可浏览的根节点:盘符 / 文件系统根、主目录、桌面、默认项目 // 父目录(存在时)、已注册工作区,以及主机名与操作系统类型。盘符标签文案由前端组合。 @@ -169,6 +200,46 @@ void WebServer::Impl::register_fs() { r.add_header("Content-Type", "application/json"); return with_cors(req, std::move(r)); }); + + // POST /api/fs/mkdir {parent, name} — 选择器底栏「New Folder」:在 parent 下建一层子目录。 + // 与浏览一样已鉴权即可;每次尝试都记日志(成功与失败)。 + CROW_ROUTE(app, "/api/fs/mkdir").methods(crow::HTTPMethod::Post) + ([this](const crow::request& req) { + if (auto rej = require_auth(req)) return std::move(*rej); + + const auto parsed = json::parse(req.body, nullptr, false); + std::string parent; + std::string name; + if (parsed.is_object()) { + if (parsed.contains("parent") && parsed["parent"].is_string()) { + parent = parsed["parent"].get(); + } + if (parsed.contains("name") && parsed["name"].is_string()) { + name = parsed["name"].get(); + } + } + + auto created = create_browse_directory(parent, name); + if (std::holds_alternative(created)) { + const auto& err = std::get(created); + LOG_INFO("[web] fs mkdir rejected parent=" + parent + " name=" + name + + " reason=" + err.message); + crow::response r(mkdir_error_status(err.kind)); + json body{{"error", mkdir_error_code(err.kind)}}; + if (!err.message.empty()) body["detail"] = err.message; + r.body = body.dump(-1, ' ', false, json::error_handler_t::replace); + r.add_header("Content-Type", "application/json"); + return with_cors(req, std::move(r)); + } + + const auto& made = std::get(created); + LOG_INFO("[web] fs mkdir path=" + made.path); + crow::response r(201); + r.body = json{{"path", made.path}, {"name", made.name}} + .dump(-1, ' ', false, json::error_handler_t::replace); + r.add_header("Content-Type", "application/json"); + return with_cors(req, std::move(r)); + }); } } // namespace acecode::web diff --git a/src/apps/web/routes/routes_share.cpp b/src/apps/web/routes/routes_share.cpp index df43cd511..02c060293 100644 --- a/src/apps/web/routes/routes_share.cpp +++ b/src/apps/web/routes/routes_share.cpp @@ -8,6 +8,8 @@ namespace acecode::web { using nlohmann::json; namespace { +constexpr std::int64_t kShareLifetimeSeconds = 2 * 24 * 60 * 60; + crow::response response_json(const crow::request& req, int status, const json& body) { crow::response response(status, body.dump()); add_loopback_cors_headers(req, response); @@ -49,25 +51,26 @@ void WebServer::Impl::register_sharing() { if (!workspace) return response_json(req,404, {{"error", "session_not_found"}}); auto meta = find_session_meta_for_workspace(*workspace, id); if (!meta) return response_json(req,404, {{"error", "session_not_found"}}); - const auto mode = body.value("mode", std::string("interactive")); - const auto visibility = body.value("visibility", std::string("conversation")); + const auto mode = body.value("mode", std::string("read_only")); + const auto visibility = body.value("visibility", std::string("tools")); if ((mode != "read_only" && mode != "interactive") || - (visibility != "conversation" && visibility != "tools") || + visibility != "tools" || (body.contains("expires_in") && !body["expires_in"].is_number_integer())) return response_json(req,400, {{"error", "invalid_options"}}); - const auto duration = body.value("expires_in", std::int64_t{86400}); - if (duration < 60 || duration > 30 * 86400) return response_json(req,400, {{"error", "invalid_expiry"}}); + const auto duration = body.value("expires_in", kShareLifetimeSeconds); + if (duration != kShareLifetimeSeconds) return response_json(req,400, {{"error", "invalid_expiry"}}); share::ShareRecord record; record.session_id = id; record.cwd = meta->cwd.empty() ? workspace->cwd : meta->cwd; record.owner = (deps.remote_web_computer_name ? deps.remote_web_computer_name() : discover_remote_web_computer_name()).value_or("ACECode"); - record.title = meta->title; record.include_tools = visibility == "tools"; + record.title = meta->title; record.include_tools = true; record.allow_questions = mode == "interactive"; - record.expires_at = now_unix_ms() / 1000 + duration; if (!acquire_shared_session(record)) return response_json(req, 409, {{"error", "session_unavailable"}}); // Validate before persisting; long titles cannot create unusable shares. if (record.title.size() > 512) return response_json(req,400, {{"error", "title_too_long"}}); - record = shares->create(std::move(record), now_unix_ms() / 1000); + const auto created_at = now_unix_ms() / 1000; + record.expires_at = created_at + kShareLifetimeSeconds; + record = shares->create(std::move(record), created_at); try { reconcile_share_listener(); auto result = share::share_public_json(record); diff --git a/tests/desktop/desktop_restart_test.cpp b/tests/desktop/desktop_restart_test.cpp index aeaf28aea..e4417addc 100644 --- a/tests/desktop/desktop_restart_test.cpp +++ b/tests/desktop/desktop_restart_test.cpp @@ -1,13 +1,25 @@ #include #include "desktop/desktop_restart.hpp" +#include "desktop/window_foreground.hpp" +#include "test_support/utils/state_file_fixture.hpp" #include #include #include +#include +#include namespace fs = std::filesystem; +using acecode::desktop::desktop_relaunched_after_update; +using acecode::desktop::kRelaunchedAfterUpdateArgument; +using acecode::desktop::launch_desktop_replacement; +using acecode::desktop::macos_app_bundle_for_executable; +using acecode::desktop::note_desktop_version_launch; +using acecode::desktop::valid_desktop_replacement_arguments; using acecode::desktop::validate_desktop_restart_target; +using acecode::test_support::StateFileTest; +using acecode::test_support::write_raw; namespace { @@ -88,3 +100,96 @@ TEST(DesktopRestart, AcceptsExecutableFileTarget) { EXPECT_TRUE(result.ok) << result.error; EXPECT_TRUE(result.error.empty()); } + +// 触发场景:升级后旧进程拉起新进程时带上 --relaunched-after-update。 +// 期望行为:新进程从自己的 argv 认出这次启动不是用户亲手点的(要自己把窗口放到最前); +// argv[0] 是程序路径,不参与匹配;普通启动与别的开关不误判。 +// 回归:升级完成后程序自动启动,窗口出现在别的窗口后面。 +TEST(DesktopRestart, DetectsRelaunchArgument) { + EXPECT_TRUE(desktop_relaunched_after_update( + {"acecode-desktop.exe", kRelaunchedAfterUpdateArgument})); + EXPECT_TRUE(desktop_relaunched_after_update( + {"acecode-desktop.exe", "--webapp", kRelaunchedAfterUpdateArgument})); + EXPECT_FALSE(desktop_relaunched_after_update({"acecode-desktop.exe"})); + EXPECT_FALSE(desktop_relaunched_after_update({"acecode-desktop.exe", "--webapp"})); + EXPECT_FALSE(desktop_relaunched_after_update({kRelaunchedAfterUpdateArgument})); + EXPECT_FALSE(desktop_relaunched_after_update({})); +} + +// 触发场景:给替换进程传参数。参数直接拼进 Windows 命令行、不做转义。 +// 期望行为:只接受不需要引号的纯开关;带空格 / 引号 / 反斜杠 / 空串的一律拒绝, +// 且在创建进程之前就失败(不会带着拼坏的命令行启动)。 +TEST(DesktopRestart, ReplacementArgumentsMustBePlainSwitches) { + EXPECT_TRUE(valid_desktop_replacement_arguments({})); + EXPECT_TRUE(valid_desktop_replacement_arguments({kRelaunchedAfterUpdateArgument})); + + std::string error; + EXPECT_FALSE(valid_desktop_replacement_arguments({"--flag value"}, &error)); + EXPECT_NE(error.find("plain switch"), std::string::npos); + EXPECT_FALSE(valid_desktop_replacement_arguments({"--flag=\"x\""})); + EXPECT_FALSE(valid_desktop_replacement_arguments({"--path=C:\\x"})); + EXPECT_FALSE(valid_desktop_replacement_arguments({""})); + + TempDir temp; +#ifdef _WIN32 + fs::path executable = temp.path() / "acecode-desktop.exe"; +#else + fs::path executable = temp.path() / "acecode-desktop"; +#endif + std::ofstream(executable, std::ios::binary) << "stub"; + error.clear(); + EXPECT_FALSE(launch_desktop_replacement(executable, {"--bad arg"}, &error)); + EXPECT_NE(error.find("plain switch"), std::string::npos); +} + +// 触发场景:macOS 上要经 LaunchServices(open -n )重启,先从可执行文件路径 +// 推出外层 .app。 +// 期望行为:只认 <名字>.app/Contents/MacOS/<可执行文件> 这一种布局;开发时直接跑的 +// 裸二进制、相对路径、层级不对的路径都返回空(调用方退回直接 exec)。 +TEST(DesktopRestart, ResolvesMacosBundleFromExecutableLayout) { + const auto bundle = macos_app_bundle_for_executable( + "/Applications/ACECode.app/Contents/MacOS/acecode-desktop"); + ASSERT_TRUE(bundle.has_value()); + EXPECT_EQ(bundle->generic_string(), "/Applications/ACECode.app"); + + EXPECT_FALSE(macos_app_bundle_for_executable( + "/Users/me/build/acecode-desktop").has_value()); + EXPECT_FALSE(macos_app_bundle_for_executable( + "/Applications/ACECode.app/Contents/Resources/acecode-desktop").has_value()); + EXPECT_FALSE(macos_app_bundle_for_executable( + "/Applications/ACECode/Contents/MacOS/acecode-desktop").has_value()); + EXPECT_FALSE(macos_app_bundle_for_executable( + "ACECode.app/Contents/MacOS/acecode-desktop").has_value()); + EXPECT_FALSE(macos_app_bundle_for_executable({}).has_value()); +} + +// 触发场景:新版本装好后的第一次启动(包括被还不会传 --relaunched-after-update 的 +// 旧版本拉起的那一次)。 +// 期望行为:state.json 里记的版本与当前不同(或从没记过)时返回 true 并记下当前版本, +// 同一版本再启动返回 false —— 只有第一次启动强制把窗口放到最前。 +TEST_F(StateFileTest, FirstLaunchOfAVersionIsReportedOnce) { + EXPECT_TRUE(note_desktop_version_launch("1.0.30")); // 从没记过 + EXPECT_FALSE(note_desktop_version_launch("1.0.30")); // 同一版本再启动 + EXPECT_TRUE(note_desktop_version_launch("1.0.31")); // 升级后的第一次 + EXPECT_FALSE(note_desktop_version_launch("1.0.31")); + EXPECT_FALSE(note_desktop_version_launch("")); // 拿不到版本号时不触发 + + // 字段类型被写坏:按「没记过」处理并修正,不抛异常。 + write_raw(path_, R"({"desktop_last_launch_version": 7})"); + EXPECT_TRUE(note_desktop_version_launch("1.0.31")); + EXPECT_FALSE(note_desktop_version_launch("1.0.31")); +} + +// 触发场景:窗口句柄无效(窗口已销毁 / 启动失败)时仍被要求显示并前置。 +// 期望行为:show 回调恰好执行一次,不崩溃;Windows 上因没有可前置的窗口返回 false。 +TEST(DesktopWindowForeground, InvalidWindowStillRunsShowOnce) { + int shown = 0; + const bool front = acecode::desktop::show_window_in_foreground( + nullptr, [&shown] { ++shown; }); + EXPECT_EQ(shown, 1); +#ifdef _WIN32 + EXPECT_FALSE(front); +#else + EXPECT_TRUE(front); +#endif +} diff --git a/tests/desktop/last_session_test.cpp b/tests/desktop/last_session_test.cpp new file mode 100644 index 000000000..11f3e2180 --- /dev/null +++ b/tests/desktop/last_session_test.cpp @@ -0,0 +1,164 @@ +// 覆盖桌面版「启动时回到上次停留的会话」的持久化与落地 URL(src/apps/desktop/last_session.cpp)。 +#include + +#include "desktop/last_session.hpp" +#include "test_support/utils/state_file_fixture.hpp" +#include "utils/state_file.hpp" +#include "workspace/workspace_registry.hpp" + +#include +#include +#include +#include + +namespace fs = std::filesystem; +using acecode::desktop::LastSession; +using acecode::desktop::handle_set_last_session; +using acecode::desktop::last_session_url; +using acecode::desktop::read_last_session; +using acecode::desktop::restorable_last_session; +using acecode::desktop::write_last_session; +using acecode::test_support::StateFileTest; +using acecode::test_support::write_raw; + +namespace { + +bool bridge_ok(const std::string& response) { + const auto parsed = nlohmann::json::parse(response); + return parsed.value("ok", false); +} + +} // namespace + +// 触发场景:用户停在某个工作区会话上退出,下次启动读回记录。 +// 期望行为:会话 id、工作区 hash、只读标记原样往返;与 state.json 里别的 key 互不覆盖。 +TEST_F(StateFileTest, LastSessionRoundTripKeepsOtherState) { + EXPECT_FALSE(read_last_session().has_value()); // 初始没有记录 + + acecode::write_state_flag("some_flag", true); + write_last_session(LastSession{"20261116-abc", "ws-hash-1", false, true}); + const auto restored = read_last_session(); + ASSERT_TRUE(restored.has_value()); + EXPECT_EQ(*restored, (LastSession{"20261116-abc", "ws-hash-1", false, true})); + EXPECT_TRUE(acecode::read_state_flag("some_flag")); + + // 覆盖写:切到另一个会话。 + write_last_session(LastSession{"20261116-def", "ws-hash-2", false, false}); + EXPECT_EQ(read_last_session()->session_id, "20261116-def"); +} + +// 触发场景:用户从会话回到首页后退出(前端上报 null)。 +// 期望行为:记录被清掉,下次启动落在首页,而不是更早停留过的那个会话。 +TEST_F(StateFileTest, LastSessionClearedWhenUserLeavesTheSession) { + write_last_session(LastSession{"s1", "ws-1", false, false}); + ASSERT_TRUE(read_last_session().has_value()); + + write_last_session(std::nullopt); + EXPECT_FALSE(read_last_session().has_value()); + EXPECT_FALSE(acecode::read_state_json().contains("last_session")); +} + +// 触发场景:无工作区会话。 +// 期望行为:no_workspace 往返保留,且不带 workspace_hash —— 带了的话启动时会按 +// 工作区去 resume,daemon 回 404。 +TEST_F(StateFileTest, LastSessionNoWorkspaceDropsWorkspaceHash) { + ASSERT_TRUE(bridge_ok(handle_set_last_session( + R"([{"session_id":"s9","workspace_hash":"stale","no_workspace":true}])"))); + const auto restored = read_last_session(); + ASSERT_TRUE(restored.has_value()); + EXPECT_TRUE(restored->no_workspace); + EXPECT_TRUE(restored->workspace_hash.empty()); +} + +// 触发场景:state.json 被手改或被旧版本写坏(字段类型不对、会话 id 为空、带控制字符)。 +// 期望行为:读成「没有记录」而不是抛异常或拼出畸形 URL。 +TEST_F(StateFileTest, LastSessionMalformedRecordReadsEmpty) { + write_raw(path_, R"({"last_session": "s1"})"); + EXPECT_FALSE(read_last_session().has_value()); + + write_raw(path_, R"({"last_session": {"session_id": 42}})"); + EXPECT_FALSE(read_last_session().has_value()); + + write_raw(path_, R"({"last_session": {"session_id": ""}})"); + EXPECT_FALSE(read_last_session().has_value()); + + write_raw(path_, R"({"last_session": {"session_id": "a\nb"}})"); + EXPECT_FALSE(read_last_session().has_value()); + + // 257 字节:超过 id 长度上限(256),不是一个会话 id。 + write_raw(path_, nlohmann::json{ + {"last_session", {{"session_id", std::string(257, 'a')}}}}.dump()); + EXPECT_FALSE(read_last_session().has_value()); +} + +// 触发场景:前端经 aceDesktop_setLastSession 上报;参数是 webview 传来的 JSON 数组。 +// 期望行为:会话对象写入、null 清除;缺参数 / 非法内容 / 非 JSON 一律回 ok=false +// 且不动已有记录。 +TEST_F(StateFileTest, LastSessionBridgeAcceptsSessionAndNull) { + EXPECT_TRUE(bridge_ok(handle_set_last_session( + R"([{"session_id":"s1","workspace_hash":"ws-1"}])"))); + ASSERT_TRUE(read_last_session().has_value()); + EXPECT_EQ(read_last_session()->workspace_hash, "ws-1"); + + EXPECT_FALSE(bridge_ok(handle_set_last_session("[]"))); + EXPECT_FALSE(bridge_ok(handle_set_last_session(R"([{"workspace_hash":"ws-1"}])"))); + EXPECT_FALSE(bridge_ok(handle_set_last_session("not json"))); + ASSERT_TRUE(read_last_session().has_value()); + EXPECT_EQ(read_last_session()->session_id, "s1"); + + EXPECT_TRUE(bridge_ok(handle_set_last_session("[null]"))); + EXPECT_FALSE(read_last_session().has_value()); +} + +// 触发场景:启动时把上次会话拼进 daemon 首页 URL。 +// 期望行为:与跨 workspace 跳转同一套参数(open / workspace / no_workspace / read_only), +// 末尾带 restore=1 让前端静默处理失败;onboarding 的 about:blank 原样返回。 +TEST(DesktopLastSessionUrl, AppendsLandingParameters) { + const std::string base = "http://127.0.0.1:4100/?token=t"; + EXPECT_EQ(last_session_url(base, LastSession{"s1", "ws-1", false, false}), + base + "&open=s1&workspace=ws-1&restore=1"); + EXPECT_EQ(last_session_url(base, LastSession{"s2", "", true, false}), + base + "&open=s2&no_workspace=1&restore=1"); + EXPECT_EQ(last_session_url(base, LastSession{"s3", "ws-3", false, true}), + base + "&open=s3&workspace=ws-3&read_only=1&restore=1"); + // 既没有工作区 hash 也没标记 no_workspace:两个参数都不带,由前端按会话 id 直接 resume。 + EXPECT_EQ(last_session_url(base, LastSession{"s4", "", false, false}), + base + "&open=s4&restore=1"); + // 会话 id 里的保留字符必须 percent-encode,不能截断查询串。 + EXPECT_EQ(last_session_url("http://127.0.0.1:4100/", LastSession{"a&b=c", "", true, false}), + "http://127.0.0.1:4100/?open=a%26b%3Dc&no_workspace=1&restore=1"); + EXPECT_EQ(last_session_url("about:blank", LastSession{"s1", "ws-1", false, false}), + "about:blank"); +} + +// 触发场景:上次会话所在的工作区已被移除(registry 里没有),或它的目录被删。 +// 期望行为:不恢复 —— daemon 无从 resume,硬拼参数只会让启动卡在「打开会话」遮罩上; +// 没有工作区信息的会话不受影响,交给前端去试。 +TEST_F(StateFileTest, LastSessionRestoreRequiresAvailableWorkspace) { + const fs::path root = fs::temp_directory_path() / + ("acecode_last_session_" + std::to_string(::testing::UnitTest::GetInstance()->random_seed())); + const fs::path projects = root / "projects"; + const fs::path cwd = root / "repo"; + fs::create_directories(projects); + fs::create_directories(cwd); + + acecode::desktop::WorkspaceRegistry registry; + const auto workspace = registry.register_new(projects.string(), cwd.string()); + + write_last_session(LastSession{"s1", workspace.hash, false, false}); + ASSERT_TRUE(restorable_last_session(registry).has_value()); + EXPECT_EQ(restorable_last_session(registry)->session_id, "s1"); + + write_last_session(LastSession{"s1", "unknown-workspace-hash", false, false}); + EXPECT_FALSE(restorable_last_session(registry).has_value()); + + write_last_session(LastSession{"s2", "", true, false}); + EXPECT_TRUE(restorable_last_session(registry).has_value()); + + write_last_session(LastSession{"s1", workspace.hash, false, false}); + std::error_code ec; + fs::remove_all(cwd, ec); + EXPECT_FALSE(restorable_last_session(registry).has_value()); + + fs::remove_all(root, ec); +} diff --git a/tests/web/fs_browser_handler_test.cpp b/tests/web/fs_browser_handler_test.cpp index 642f7a449..9571413d8 100644 --- a/tests/web/fs_browser_handler_test.cpp +++ b/tests/web/fs_browser_handler_test.cpp @@ -3,6 +3,7 @@ // - browse_directory:目录优先排序、隐藏开关、噪音目录照常列出、错误分类、条目上限、 // Windows junction 保留原样前缀并附 link_target // - enumerate_roots / home_directory / desktop_directory / host_os_name +// - folder_name_problem / create_browse_directory:选择器底栏「New Folder」建一层子目录 // // 与 files_handler_test 的关系:这是「选择器」语义(全盘、完整路径、不过滤噪音与链接), // 不是「文件树」语义;两套函数刻意不共享过滤逻辑,所以测试也各自独立。 @@ -34,6 +35,11 @@ namespace fs = std::filesystem; using acecode::web::browse_directory; +using acecode::web::create_browse_directory; +using acecode::web::folder_name_problem; +using acecode::web::FsMkdirError; +using acecode::web::FsMkdirErrorKind; +using acecode::web::FsMkdirResult; using acecode::web::browse_parent_path; using acecode::web::desktop_directory; using acecode::web::enumerate_roots; @@ -377,3 +383,131 @@ TEST(FsBrowserHandler, DesktopDirectoryIsOmittedWhenMissing) { ASSERT_TRUE(desktop.has_value()); EXPECT_EQ(*desktop, home + "/Desktop"); } + +namespace { + +FsMkdirErrorKind mkdir_error_kind(const std::variant& r) { + return std::get(r).kind; +} + +} // namespace + +// 场景:用户在选择器里点「New Folder」,输入框里的名字带首尾空格、是中文。期望:去掉首尾空格 +// 后在 parent 下建出这一层目录;返回的 path 是 parent 的显示形态 + "/" + 名字(正斜杠、 +// 不 canonical),name 是去空格后的实际名字。中文名同时守住 UTF-8 → 宽字符路径的转换。 +TEST(FsBrowserHandler, MkdirCreatesOneLevelAndReturnsDisplayPath) { + TempDir d; + const auto made = create_browse_directory(acecode::path_to_utf8(d.path), " 新建文件夹 "); + ASSERT_TRUE(std::holds_alternative(made)); + const auto& r = std::get(made); + EXPECT_EQ(r.name, "新建文件夹"); + EXPECT_EQ(r.path, display_path(d.path) + "/新建文件夹"); + EXPECT_TRUE(fs::is_directory(acecode::path_from_utf8(r.path))); + + // 新目录随即出现在列表里,前端据此重读当前目录并选中它。 + const auto listed = browse_directory(display_path(d.path), false); + ASSERT_TRUE(std::holds_alternative(listed)); + ASSERT_NE(find_entry(std::get(listed), "新建文件夹"), nullptr); +} + +// 场景:同名的目录或文件已经存在(Windows 上只差大小写也算同名)。期望:AlreadyExists(→ 409), +// 不覆盖、不改动已有内容;已有文件仍是文件。 +TEST(FsBrowserHandler, MkdirRefusesExistingNames) { + TempDir d; + fs::create_directories(d.path / "taken"); + write_file(d.path / "note.txt", "keep"); + const std::string parent = acecode::path_to_utf8(d.path); + + EXPECT_EQ(mkdir_error_kind(create_browse_directory(parent, "taken")), + FsMkdirErrorKind::AlreadyExists); + EXPECT_EQ(mkdir_error_kind(create_browse_directory(parent, "note.txt")), + FsMkdirErrorKind::AlreadyExists); + EXPECT_TRUE(fs::is_regular_file(d.path / "note.txt")); +#ifdef _WIN32 + EXPECT_EQ(mkdir_error_kind(create_browse_directory(parent, "TAKEN")), + FsMkdirErrorKind::AlreadyExists); +#endif +} + +// 场景:parent 是相对路径、不存在、或其实是个文件。期望:分别是 NotAbsolute / ParentNotFound / +// ParentNotDirectory;不存在的 parent **不会**被顺手递归建出来(只建一层)。 +TEST(FsBrowserHandler, MkdirClassifiesParentErrors) { + TempDir d; + write_file(d.path / "file.txt", "x"); + + EXPECT_EQ(mkdir_error_kind(create_browse_directory("relative/dir", "a")), + FsMkdirErrorKind::NotAbsolute); + EXPECT_EQ(mkdir_error_kind(create_browse_directory("", "a")), + FsMkdirErrorKind::NotAbsolute); + + const fs::path missing = d.path / "missing"; + EXPECT_EQ(mkdir_error_kind(create_browse_directory(acecode::path_to_utf8(missing), "a")), + FsMkdirErrorKind::ParentNotFound); + EXPECT_FALSE(fs::exists(missing)); + + EXPECT_EQ(mkdir_error_kind(create_browse_directory( + acecode::path_to_utf8(d.path / "file.txt"), "a")), + FsMkdirErrorKind::ParentNotDirectory); +} + +// 场景:名字非法。期望:InvalidName(→ 400)且磁盘上什么都没建;名字非法优先于 parent +// 是否存在被判定。 +TEST(FsBrowserHandler, MkdirRejectsInvalidNamesWithoutTouchingDisk) { + TempDir d; + const std::string parent = acecode::path_to_utf8(d.path); + for (const std::string& bad : std::vector{"", " ", ".", "..", "a/b", "a\\b", "tab\there"}) { + EXPECT_EQ(mkdir_error_kind(create_browse_directory(parent, bad)), + FsMkdirErrorKind::InvalidName) << bad; + } + EXPECT_TRUE(fs::is_empty(d.path)); +} + +// 场景:名字规则按平台不同。期望: +// - 所有平台:空串、. / ..、分隔符、控制字符不合法;中文、空格夹在中间、点开头合法; +// - Windows 规则另外拒绝 <>:"|?* 、句点或空格结尾(Windows 会静默剥掉,建出来的名字对不上)、 +// 保留设备名(带扩展名、大小写不同也算:"con.txt"、"Lpt9"); +// - POSIX 规则下这些 Windows 专属限制都放行("a:b"、"CON" 在 Linux 上是普通名字)。 +// "COM0" / "COM10" 不是保留名,守住只认 1..9 的边界。 +TEST(FsBrowserHandler, FolderNameRulesFollowPlatform) { + for (const bool win : {true, false}) { + EXPECT_FALSE(folder_name_problem("", win).empty()); + EXPECT_FALSE(folder_name_problem(".", win).empty()); + EXPECT_FALSE(folder_name_problem("..", win).empty()); + EXPECT_FALSE(folder_name_problem("a/b", win).empty()); + EXPECT_FALSE(folder_name_problem("a\\b", win).empty()); + EXPECT_FALSE(folder_name_problem(std::string("a\x01" "b"), win).empty()); + EXPECT_TRUE(folder_name_problem("新建文件夹 (2)", win).empty()); + EXPECT_TRUE(folder_name_problem(".config", win).empty()); + EXPECT_TRUE(folder_name_problem("COM0", win).empty()); + EXPECT_TRUE(folder_name_problem("COM10", win).empty()); + } + for (const char* bad : {"ab", "a:b", "a\"b", "a|b", "a?b", "a*b", + "trailing.", "trailing ", "CON", "con.txt", "Lpt9", "nul", "AUX"}) { + EXPECT_FALSE(folder_name_problem(bad, true).empty()) << bad; + } + for (const char* ok : {"a:b", "trailing.", "CON", "a*b"}) { + EXPECT_TRUE(folder_name_problem(ok, false).empty()) << ok; + } +} + +#ifdef _WIN32 +// 场景:用户经 junction 进入目录后点「New Folder」(本机 C:\Users\shao → N:\Users\shao)。 +// 期望:返回的 path 保留链接写法(不被换成目标盘符),这样随后点「选择」注册的工作区与原生 +// 对话框一致;目录实际落在 junction 目标里。 +TEST(FsBrowserHandler, MkdirThroughJunctionKeepsLinkSpelling) { + TempDir d; + const fs::path target = d.path / "target"; + fs::create_directories(target); + const fs::path link = d.path / "link"; + const std::string cmd = "cmd /c mklink /J \"" + acecode::path_to_utf8(link) + "\" \"" + + acecode::path_to_utf8(target) + "\" >nul 2>&1"; + if (std::system(cmd.c_str()) != 0 || !fs::exists(link)) { + GTEST_SKIP() << "mklink /J unavailable in this environment"; + } + + const auto made = create_browse_directory(display_path(d.path) + "/link", "fresh"); + ASSERT_TRUE(std::holds_alternative(made)); + EXPECT_EQ(std::get(made).path, display_path(d.path) + "/link/fresh"); + EXPECT_TRUE(fs::is_directory(target / "fresh")); +} +#endif diff --git a/tests/web/web_server_smoke_test.cpp b/tests/web/web_server_smoke_test.cpp index c6f46f2c6..5ce67deb2 100644 --- a/tests/web/web_server_smoke_test.cpp +++ b/tests/web/web_server_smoke_test.cpp @@ -13645,6 +13645,45 @@ TEST(WebServerHttp, FsListRejectsRelativeMissingAndFilePaths) { EXPECT_EQ(json::parse(file.text)["error"], "not a directory"); } +// 场景:选择器底栏「New Folder」在 workspace 白名单之外的目录里建子目录。期望: +// - 首次 POST → 201,返回 parent 显示形态 + "/" + 名字,目录真实落盘; +// - 同名再建 → 409 "already exists";名字含分隔符 → 400 "invalid name"; +// - parent 不存在 → 404 "not found" 且不会被递归建出来;body 不是 JSON → 按空参数处理成 400。 +TEST(WebServerHttp, FsMkdirCreatesOneLevelAndReportsConflicts) { + WebServerFixture fx; + const auto parent = fx.tmp_dir / "fs-mkdir"; + std::filesystem::create_directories(parent); + const std::string parent_utf8 = acecode::path_to_utf8(parent); + const auto post = [&](const json& body) { + return cpr::Post(cpr::Url{fx.url("/api/fs/mkdir")}, + cpr::Header{{"Content-Type", "application/json"}}, + cpr::Body{body.dump()}); + }; + + auto created = post({{"parent", parent_utf8}, {"name", "fresh"}}); + ASSERT_EQ(created.status_code, 201) << created.text; + const auto expected_dir = acecode::web::normalize_browse_path(parent_utf8).value(); + EXPECT_EQ(json::parse(created.text)["path"], expected_dir + "/fresh"); + EXPECT_TRUE(std::filesystem::is_directory(parent / "fresh")); + + auto again = post({{"parent", parent_utf8}, {"name", "fresh"}}); + ASSERT_EQ(again.status_code, 409) << again.text; + EXPECT_EQ(json::parse(again.text)["error"], "already exists"); + + auto bad_name = post({{"parent", parent_utf8}, {"name", "a/b"}}); + ASSERT_EQ(bad_name.status_code, 400) << bad_name.text; + EXPECT_EQ(json::parse(bad_name.text)["error"], "invalid name"); + + const auto missing = parent / "missing"; + auto no_parent = post({{"parent", acecode::path_to_utf8(missing)}, {"name", "x"}}); + ASSERT_EQ(no_parent.status_code, 404) << no_parent.text; + EXPECT_EQ(json::parse(no_parent.text)["error"], "not found"); + EXPECT_FALSE(std::filesystem::exists(missing)); + + auto garbage = cpr::Post(cpr::Url{fx.url("/api/fs/mkdir")}, cpr::Body{"not json"}); + EXPECT_EQ(garbage.status_code, 400) << garbage.text; +} + // 场景:设置页「工具重写」的 REST 往返。GET 默认 → PUT 启用一条重写 → 文件落在 // config.json 同目录的 tool-rewrites.json、进程映射立即生效 → 撞真实工具名的 // PUT 被拒且不改动已生效映射 → PUT 关闭后映射清空。 @@ -15975,3 +16014,36 @@ TEST(WebServerHttp, ShareCreationRejectsDangerousAndTuiSurfaces) { EXPECT_FALSE(fx.remote_web_proxy->status().running); } } + +TEST(WebServerHttp, ShareCreationUsesReadOnlyToolsAndTwoDayPolicy) { + // 场景:省略选项时只读且含工具,显式开启才可交互;其它内容档位和有效期不能创建。 + WebServerFixture fx; + const auto session = cpr::Post(cpr::Url{fx.url("/api/sessions")}, + cpr::Header{{"Content-Type", "application/json"}}, cpr::Body{"{}"}); + ASSERT_EQ(session.status_code, 201) << session.text; + const auto sid = json::parse(session.text).at("session_id").get(); + const auto create = [&](const json& options) { + return cpr::Post(cpr::Url{fx.url("/api/sessions/" + sid + "/shares")}, + cpr::Header{{"Content-Type", "application/json"}}, cpr::Body{options.dump()}); + }; + const auto default_share = create(json::object()); + ASSERT_EQ(default_share.status_code, 201) << default_share.text; + const auto readonly = json::parse(default_share.text); + EXPECT_EQ(readonly.at("mode"), "read_only"); + EXPECT_FALSE(readonly.at("allow_questions").get()); + EXPECT_TRUE(readonly.at("include_tools").get()); + EXPECT_EQ(readonly.at("expires_at").get() - readonly.at("created_at").get(), 172800); + const auto interactive_share = create({{"mode", "interactive"}, {"visibility", "tools"}, {"expires_in", 172800}}); + ASSERT_EQ(interactive_share.status_code, 201) << interactive_share.text; + const auto interactive = json::parse(interactive_share.text); + EXPECT_TRUE(interactive.at("allow_questions").get()); + EXPECT_TRUE(interactive.at("include_tools").get()); + EXPECT_EQ(interactive.at("expires_at").get() - interactive.at("created_at").get(), 172800); + EXPECT_EQ(create({{"visibility", "conversation"}}).status_code, 400); + for (const auto value : {60, 86400, 2592000}) + EXPECT_EQ(create({{"expires_in", value}}).status_code, 400); + EXPECT_EQ(create({{"expires_in", "172800"}}).status_code, 400); + const auto listed = cpr::Get(cpr::Url{fx.url("/api/shares")}); + ASSERT_EQ(listed.status_code, 200); + EXPECT_EQ(json::parse(listed.text).at("shares").size(), 2u); +} diff --git a/web/public/vs-icons/StatusWarningCircle.svg b/web/public/vs-icons/StatusWarningCircle.svg new file mode 100644 index 000000000..7ab77a074 --- /dev/null +++ b/web/public/vs-icons/StatusWarningCircle.svg @@ -0,0 +1 @@ + diff --git a/web/scripts/i18n-en-overrides.mjs b/web/scripts/i18n-en-overrides.mjs index 31ac50279..3acb4da42 100644 --- a/web/scripts/i18n-en-overrides.mjs +++ b/web/scripts/i18n-en-overrides.mjs @@ -1,6 +1,8 @@ // Human-reviewed product terminology and phrases where generic machine // translation is ambiguous without ACECode context. export const ENGLISH_SOURCE_OVERRIDES = Object.freeze({ + '已存在的链接': 'Existing links', + '打开可交互会话会消耗共享用户的token额度。': "Enabling interactive sessions consumes the sharing user's token allowance.", '持有链接即可访问,仅限可信局域网。提问消耗你的模型额度。': 'Anyone with the link can access this session. Use trusted local networks only. Questions use your model allowance.', '提问额度已用完,将于 {{p0}} 恢复': 'Question limit reached. Resets at {{p0}}.', '{{p0}} 邀请你查看会话「{{p1}}」,请用 ACECode 打开:{{p2}}': '{{p0}} invited you to view "{{p1}}". Open with ACECode: {{p2}}', @@ -719,6 +721,19 @@ export const ENGLISH_SOURCE_OVERRIDES = Object.freeze({ '查看变更': 'View changes', '找不到路径:{{p0}}': 'Path not found: {{p0}}', '无权限读取这个目录:{{p0}}': 'No permission to read this folder: {{p0}}', + "新建文件夹": "New folder", + "文件夹名称": "Folder name", + "请输入文件夹名称": "Enter a folder name", + "名称不能是 . 或 ..": "Name can't be \".\" or \"..\"", + "名称不能包含斜杠或反斜杠": "Name can't contain slashes or backslashes", + "名称不能包含控制字符": "Name can't contain control characters", + "名称不能包含这些字符:< > : \" | ? *": "Name can't contain any of these characters: <>:\"|?*", + "名称不能以句点或空格结尾": "Name can't end with a period or space", + "「{{p0}}」是系统保留名称": "\"{{p0}}\" is a reserved system name", + "「{{p0}}」已存在": "\"{{p0}}\" already exists", + "无权限在这个目录里新建文件夹:{{p0}}": "No permission to create a folder here: {{p0}}", + "文件夹名称无效:{{p0}}": "Invalid folder name: {{p0}}", + "新建文件夹失败:{{p0}}": "Couldn't create folder: {{p0}}", '显示隐藏': 'Show hidden', '显示隐藏项目': 'Show hidden items', '服务端文件系统': 'server filesystem', diff --git a/web/src/App.jsx b/web/src/App.jsx index 61f9a17ee..8baf0dd03 100644 --- a/web/src/App.jsx +++ b/web/src/App.jsx @@ -174,6 +174,7 @@ import { resumeSessionFromTarget, stripOpenSessionParams, } from './lib/sessionJump.js'; +import { createLastSessionRecorder } from './lib/lastSessionMemory.js'; import { threadSessionTargetFromClickEvent } from './lib/fileLink.js'; import { desktopUiMode } from './lib/desktopShellMode.js'; import { @@ -547,6 +548,8 @@ export function App() { typeof window === 'undefined' ? null : openSessionTargetFromSearch(window.location.search), ); const startupNavigationStartedRef = useRef(false); + const lastSessionRecorderRef = useRef(null); + if (!lastSessionRecorderRef.current) lastSessionRecorderRef.current = createLastSessionRecorder(); const pendingSessionNavigationIdsRef = useRef(new Set()); const nextSessionNavigationIdRef = useRef(0); const sessionNavigationTimersRef = useRef(new Map()); @@ -801,6 +804,8 @@ export function App() { const navigationId = beginSessionNavigation(); const navigationIsPending = () => pendingSessionNavigationIdsRef.current.has(navigationId); + // 桌面版启动时自动回到上次会话(?restore=1):会话已被删除等失败静默回到首页。 + const silent = target?.restored === true; let handedOffToPageLoad = false; try { const noWorkspace = sessionJumpNoWorkspace(target); @@ -832,7 +837,7 @@ export function App() { try { resumed = await resumeWith(createApi({ port: r.port, token: r.token }), targetHash); } catch (e) { - if (navigationIsPending()) { + if (navigationIsPending() && !silent) { toast({ kind: 'err', text: '恢复失败:' + (e.message || '') }); } return false; @@ -881,7 +886,7 @@ export function App() { })); return true; } catch (e) { - if (navigationIsPending()) { + if (navigationIsPending() && !silent) { toast({ kind: 'err', text: '恢复失败:' + (e.message || '') }); } return false; @@ -1096,6 +1101,13 @@ export function App() { .finally(() => setStartupNavigationSettled(true)); }, [authState, resumeAndOpenSession]); + // 桌面版记住当前停留的会话,下次启动直接回到它(lib/lastSessionMemory.js)。 + // 启动跳转落定之前不上报:那时 activeRef 还是空的,会把上次的记录清掉。 + useEffect(() => { + if (authState !== 'ok' || !startupNavigationSettled) return; + lastSessionRecorderRef.current.remember(activeRef); + }, [authState, startupNavigationSettled, activeRef]); + // 桌面壳 native 通知 click_handler 走 webview eval 调这两个 window 全局函数。 // 同 workspace:focusSessionFromBridge → resume + setActiveRef // 跨 workspace:activateAndOpenSession → 激活 workspace 后 resume + 整页 navigate diff --git a/web/src/components/Icon.jsx b/web/src/components/Icon.jsx index 2862cfdad..f6837c9aa 100644 --- a/web/src/components/Icon.jsx +++ b/web/src/components/Icon.jsx @@ -92,6 +92,7 @@ const ICONS = { trajectory: 'Trajectory', tool: 'Tool', warning: 'StatusWarning', + warningCircle: 'StatusWarningCircle', wordWrap: 'WordWrap', world: 'World', workspaceMenu: 'WorkspaceMenu', diff --git a/web/src/components/PathPickerModal.jsx b/web/src/components/PathPickerModal.jsx index a75fbc4ee..148978fa9 100644 --- a/web/src/components/PathPickerModal.jsx +++ b/web/src/components/PathPickerModal.jsx @@ -15,8 +15,12 @@ import { browseErrorKey, initialPickerPath, isSelectableEntry, + mkdirErrorKey, + newFolderNameProblem, + nextNewFolderName, normalizePickerPath, pickerBreadcrumbs, + pickerNamesCaseInsensitive, pickerParentPath, pickerSelectionTarget, rootDisplayName, @@ -52,6 +56,27 @@ function browseErrorText(error, path) { return `读取目录失败:${detail || path}`; } +function newFolderProblemText(key, name) { + if (key === 'empty') return '请输入文件夹名称'; + if (key === 'dot') return '名称不能是 . 或 ..'; + if (key === 'separator') return '名称不能包含斜杠或反斜杠'; + if (key === 'control') return '名称不能包含控制字符'; + if (key === 'windows-char') return '名称不能包含这些字符:< > : " | ? *'; + if (key === 'trailing') return '名称不能以句点或空格结尾'; + if (key === 'reserved') return `「${name}」是系统保留名称`; + if (key === 'exists') return `「${name}」已存在`; + return ''; +} + +function mkdirErrorText(error, name, parent) { + const key = mkdirErrorKey(error?.status, error?.body); + if (key === 'exists') return `「${name}」已存在`; + if (key === 'permission-denied') return `无权限在这个目录里新建文件夹:${parent}`; + if (key === 'parent-missing') return `找不到路径:${parent}`; + if (key === 'invalid-name') return `文件夹名称无效:${name}`; + return `新建文件夹失败:${error?.body?.detail || error?.message || name}`; +} + function primaryLabelFor(mode, target) { if (mode === PICKER_MODE_FILE) return '打开文件'; if (target?.label === 'select-named') return `选择「${target.name}」`; @@ -92,8 +117,12 @@ export function PathPickerModal({ const [editing, setEditing] = useState(false); const [pathDraft, setPathDraft] = useState(''); const [historyLength, setHistoryLength] = useState(0); + const [newFolderDraft, setNewFolderDraft] = useState(null); // null = 没在新建;字符串 = 输入框内容 + const [newFolderBusy, setNewFolderBusy] = useState(false); const historyRef = useRef([]); + const newFolderInputRef = useRef(null); + const newFolderBusyRef = useRef(false); const currentPathRef = useRef(null); const showHiddenRef = useRef(false); const requestSeqRef = useRef(0); @@ -134,6 +163,7 @@ export function PathPickerModal({ setSelected(null); if (!keepError) setListError(''); setEditing(false); + setNewFolderDraft(null); return true; } setLoading(true); @@ -155,6 +185,7 @@ export function PathPickerModal({ setSelected(wanted ? entries.find((entry) => entry.name === wanted) || null : null); setListError(''); setEditing(false); + setNewFolderDraft(null); return true; } catch (error) { if (seq !== requestSeqRef.current) return false; @@ -283,6 +314,92 @@ export function PathPickerModal({ if (ok) focusList(); }, [focusList, navigate, pathDraft]); + // 底栏「New Folder」:列表顶上出现一行可编辑的名字(默认名已全选),Enter 建、Esc 或点到 + // 别处取消;建好后重读当前目录并选中新文件夹,主按钮随之变成「选择「…」」。 + const namesCaseInsensitive = pickerNamesCaseInsensitive(roots?.os); + const windowsNames = roots?.os === 'windows'; + const creatingFolder = newFolderDraft !== null; + + const startNewFolder = useCallback(() => { + if (!currentPathRef.current || newFolderBusyRef.current) return; + setSelected(null); + setListError(''); + setEditing(false); + setNewFolderDraft(nextNewFolderName(listing.entries, '新建文件夹', { caseInsensitive: namesCaseInsensitive })); + }, [listing.entries, namesCaseInsensitive]); + + useEffect(() => { + if (!creatingFolder) return; + const input = newFolderInputRef.current; + input?.focus(); + input?.select(); + }, [creatingFolder]); + + // 失焦取消时焦点已经去了别处(可能正是再点一次「New Folder」),不能再把它抢回列表。 + const cancelNewFolder = useCallback(({ refocusList = false } = {}) => { + if (newFolderBusyRef.current) return; + setNewFolderDraft(null); + setListError(''); + if (refocusList) focusList(); + }, [focusList]); + + const commitNewFolder = useCallback(async () => { + const parent = currentPathRef.current; + if (!parent || newFolderBusyRef.current || newFolderDraft === null) return; + const name = newFolderDraft.trim(); + const problem = newFolderNameProblem(name, { + windows: windowsNames, + entries: listing.entries, + caseInsensitive: namesCaseInsensitive, + }); + if (problem) { + setListError(newFolderProblemText(problem, name)); + return; + } + newFolderBusyRef.current = true; + setNewFolderBusy(true); + let result = null; + try { + result = await api.fsMkdir(parent, name); + } catch (error) { + newFolderBusyRef.current = false; + setNewFolderBusy(false); + setListError(mkdirErrorText(error, name, parent)); + requestAnimationFrame(() => newFolderInputRef.current?.focus()); + return; + } + newFolderBusyRef.current = false; + setNewFolderBusy(false); + if (currentPathRef.current !== parent) return; + pendingSelectNameRef.current = result?.name || name; + setNewFolderDraft(null); + const ok = await navigate(parent, { pushHistory: false }); + if (!ok) return; + focusList(); + requestAnimationFrame(() => { + listRef.current?.querySelector('[aria-selected="true"]')?.scrollIntoView?.({ block: 'nearest' }); + }); + }, [api, focusList, listing.entries, namesCaseInsensitive, navigate, newFolderDraft, windowsNames]); + + const onNewFolderKeyDown = useCallback((event) => { + // 不让对话框级快捷键(Alt+← 后退)抢走输入框里的按键。 + event.stopPropagation(); + if (event.key === 'Enter') { + event.preventDefault(); + if (event.nativeEvent?.isComposing || event.keyCode === 229) return; + void commitNewFolder(); + } else if (isDismissShortcut(event)) { + event.preventDefault(); + cancelNewFolder({ refocusList: true }); + } + }, [cancelNewFolder, commitNewFolder]); + + const onNewFolderBlur = useCallback(() => { + // 切到别的窗口不算「点到别处」,回来时输入框还在、焦点由浏览器还原。 + if (typeof document !== 'undefined' && !document.hasFocus()) return; + cancelNewFolder(); + }, [cancelNewFolder]); + const onListKeyDown = useCallback((event) => { const candidates = selectableEntries(rows, mode); const index = selected ? candidates.findIndex((entry) => entry.path === selected.path) : -1; @@ -511,6 +628,25 @@ export function PathPickerModal({ 修改时间 大小 + {creatingFolder && ( +
+ + + + setNewFolderDraft(event.target.value)} + onKeyDown={onNewFolderKeyDown} + onBlur={onNewFolderBlur} + readOnly={newFolderBusy} + spellCheck={false} + autoComplete="off" + className="ace-path-picker-new-input" + aria-label="文件夹名称" + /> +
+ )}
-
- {target ? ( - <> - {isFileMode ? '将打开' : '将选择'} - {target.path} - - ) : ( - {isFileMode ? '在列表中选择一个文件' : '进入一个磁盘或目录后再选择'} - )} -
- + )} + + )} -
-
- - +
+
+ 可交互 + { setInteractive(value); setGenerated(null); setCopied(false); }} /> +
+
-

{mode === 'interactive' ? '持有链接即可访问,仅限可信局域网。提问消耗你的模型额度。' : '仅限可信局域网。持有链接的人可以查看此会话。'}

- {generated ?
+ {interactive &&
+ + 打开可交互会话会消耗共享用户的token额度。 +
} + {generated &&
e.target.select()} />
-
: } +
}
- + } {manage &&

我的分享

diff --git a/web/src/components/SidebarQuickMenu.jsx b/web/src/components/SidebarQuickMenu.jsx index d994cef7d..b4374878b 100644 --- a/web/src/components/SidebarQuickMenu.jsx +++ b/web/src/components/SidebarQuickMenu.jsx @@ -104,7 +104,7 @@ export function SidebarQuickMenu({ })} )} diff --git a/web/src/i18n/sourceCatalog.generated.js b/web/src/i18n/sourceCatalog.generated.js index 374d411d1..c366c63ec 100644 --- a/web/src/i18n/sourceCatalog.generated.js +++ b/web/src/i18n/sourceCatalog.generated.js @@ -75,7 +75,6 @@ export const sourceCatalogs = { "s_0635261aef08149c": "请至少选择一个星期", "s_0635d2ebc22e01db": "开启后,Agent 可启动、查看并操作 Xcode 中的 iOS 模拟器;你也可以在预览面板中实时观看和操作", "s_06490c9aac171faf": "正在识别语音", - "s_06a32a9dfa382580": "进入一个磁盘或目录后再选择", "s_06ae0fdfac65c03d": "撤销归档失败:", "s_06aece1ed77e02f6": "命中禁止规则", "s_06d7b2e31d301e2e": "上下文用量", @@ -101,6 +100,7 @@ export const sourceCatalogs = { "s_0828cafb738794ba": "无法保存 Cookie 设置", "s_082a738ae620ae34": "模型设置", "s_0831592a902fb3a3": "将永久清空当前工作区的 {{p0}} 条记忆,以及索引、待整合观察和归档。全局记忆不受影响。", + "s_084762143a24f2d8": "名称不能以句点或空格结尾", "s_084ae4a64fb06560": "待办事项 ({{p0}}/{{p1}})", "s_084b42f6e95e4e65": "二", "s_084eda5e71440a15": "正在回答...", @@ -126,6 +126,7 @@ export const sourceCatalogs = { "s_09e3cdff62f6175b": "{{p0}} 号批注位置,共 {{p1}} 条批注", "s_09f06f0cee94a185": "保留会话数需在 1 到 100 之间", "s_09fcede14b2ae6d3": "内置主题不能导出或删除", + "s_09fe1643f711d3d7": "「{{p0}}」已存在", "s_0a04cc7eb4eda4df": "允许后,这条命令将在沙盒外执行。", "s_0a0af8a5218a1cdc": "这个目录没有可显示的项目", "s_0a6f82252d9788fb": "返回宫格", @@ -149,6 +150,7 @@ export const sourceCatalogs = { "s_0b6cd3ff0fadbd5f": "加载更多(每次 {{p0}} 条)", "s_0b6d58886ac1b7c2": "{{p0}} 上传中", "s_0b79f7b7c403acc3": "默认模型已设为 {{p0}}", + "s_0b8d0d57093a57d1": "名称不能包含控制字符", "s_0b9157354ab262ae": "错误信息", "s_0b94a58a388883d4": "有问题等你回答", "s_0b9c3963a5aa9089": "没有可复制的预览文本", @@ -229,7 +231,6 @@ export const sourceCatalogs = { "s_127b6378ecc0e545": "当前专家组件:{{p0}}", "s_128483ddb22a0169": "命令与工作区", "s_1288dd3054b9c81c": "请在 macOS 授权提示中选择是否允许", - "s_128c8ba5cdc3d0a3": "在列表中选择一个文件", "s_129dadf0a8648147": "正在启动升级任务", "s_12b4e2c5cfff6fd0": "请在 Xcode 中下载 iOS 模拟器运行时后重试", "s_12c8d9f7a9aef51f": "本次会话允许: {{p0}}", @@ -269,6 +270,7 @@ export const sourceCatalogs = { "s_14cbad1d857ee3e6": "连接已断开,停止状态尚未确认", "s_14d1e349b14010a9": "取消下载", "s_14dbe91e0547933c": "正在启动任务", + "s_14e0f623ec2ce26a": "无权限在这个目录里新建文件夹:{{p0}}", "s_14e7acfc08afa9e9": "浏览器组件已停止", "s_14ee02a96d9bca6d": "已连接 · {{p0}}", "s_150dd0cecdc803d0": "当前工作区", @@ -474,6 +476,7 @@ export const sourceCatalogs = { "s_2553a785fef2a405": "文件已保存", "s_255c8d56e8bb1295": "无匹配结果", "s_2560c96f89c6fea0": "在 LINE Official Account Manager 建立官方账号,并在「设定 > Messaging API」启用 Messaging API。", + "s_25696f769bbcb930": "文件夹名称无效:{{p0}}", "s_257bbcc44c839db4": "修改时间", "s_257c21aae4198b7e": "设置与再次查看", "s_25c67adc39bf6b7d": "剪贴板里没有文字", @@ -600,7 +603,6 @@ export const sourceCatalogs = { "s_307253e3d1f704a5": "已打开文件夹", "s_30ad3d68cbb14095": "浏览器更多操作", "s_30bed62ace8872f7": "新路径", - "s_30c21284df4feac6": "1 天", "s_30c731f953a5122d": "高级开发工程师", "s_30c83dc25b12c32c": "绿色", "s_30d9ddaea3081813": "上传未完成,请重新粘贴", @@ -609,7 +611,6 @@ export const sourceCatalogs = { "s_3113b21f24e47c25": "最近:{{p0}}", "s_311d6989dec3c386": "按间隔", "s_31666e5ea23d3e92": "本轮变更", - "s_316b6488730eb6f0": "将选择", "s_316c9cb7a03b7211": "memory summary consolidation extraction inbox idle 记忆整理 自动提炼", "s_31955ddb68261e31": "浏览器不可用", "s_319651c9d7db92dc": "远程 Web 模式设置失败:{{p0}}", @@ -639,7 +640,6 @@ export const sourceCatalogs = { "s_33e71e7397a405da": "当前环境不支持退出 ACECode", "s_33fdf547fb99a86d": "按工作区汇总 token 消耗", "s_342292808d6c0954": "切换文件及预览面板的显示", - "s_3424dd5017ffecbb": "正在生成", "s_34486c598efd2582": "Provider 探测失败", "s_34492b04ea0ccbcc": "请在系统设置中允许本次 ACECode 启动所对应的应用,完成后返回并刷新授权状态", "s_34615a3c7580c3e4": "搜索任务加载失败", @@ -659,11 +659,13 @@ export const sourceCatalogs = { "s_35cda8a7052dec20": "迁移失败", "s_35d9e1259e698690": "模拟器键盘输入", "s_35dccd6dcfaae1d4": "无法读取 Cookie 设置", + "s_3606e77c2b470a22": "请输入文件夹名称", "s_3615b021b8af5e82": "收尾", "s_3620d3d986f14584": "关闭模型弹窗", "s_3625f9fa2f9c629a": "拒绝执行命令", "s_364970d8168ca5fe": "发送中…", "s_3687f953cfe85fb8": "取消连接", + "s_368c5f43c2a18316": "「{{p0}}」是系统保留名称", "s_369078855fa122f7": "只读工具调用", "s_36f33adaf0942634": "确认", "s_3703e47860f64a12": "文件不存在", @@ -693,11 +695,11 @@ export const sourceCatalogs = { "s_38cd88ed8b3ddbf1": "复制完整输出", "s_38d456bbdb81317c": "按 Tag 筛选", "s_38e5a76bf4ad16e0": "当前后台服务不支持摘要生成,请更新 ACECode 并重启后重试", - "s_38eefacbb326e37f": "7 天", "s_390fd9bc7d9d7a2a": "审计中心", "s_392d0dceb45998d3": "极高", "s_39592d688f12a5a6": "已存在同名条目", "s_3969d8203ae05775": "扫码连接二维码", + "s_398c94353c3adad8": "名称不能是 . 或 ..", "s_39932f24fe11a6ba": "文件", "s_39a9046f9c8c993d": "最近使用", "s_39b068ea492a4f9a": "模型能力标签无效", @@ -877,7 +879,6 @@ export const sourceCatalogs = { "s_487422ef0c4e25b6": "首页标题", "s_48807d75530c1b03": "找不到这条排队消息", "s_4888c0a26e905c1f": "用户 {{p0}}", - "s_48d734d2f550c468": "只看对话", "s_48d75d4b7e92d9f2": "切换到项目", "s_48f78f1abeca0c47": "粘贴内容较大({{p0}}),将分 {{p1}} 段上传", "s_490a88b8ae9d4a2e": "该模型已不存在,请刷新", @@ -930,7 +931,6 @@ export const sourceCatalogs = { "s_4ce87e7fe2b6e95d": "文件或文件夹", "s_4ceae06adf5b9199": "撤销后立即停止处理其消息,并中止其会话正在进行的回合。", "s_4d0680f9efaef147": "未读", - "s_4d274b2b0a01212a": "可见内容", "s_4d2b19065afe4b07": "LSP 已开启:{{p0}}", "s_4d3273bc4de49e90": "查找线索,理解来龙去脉", "s_4d3f6a081ea86097": "彻底删除失败:", @@ -964,6 +964,7 @@ export const sourceCatalogs = { "s_4f5b0e563a452c80": "刷新技能列表", "s_4f61317e9307ad3e": "访问被拒", "s_4fca07787f3ef1ec": "移除这个待发送附件?", + "s_4fccf43f18f997d7": "已存在的链接", "s_4fd4f40094d40891": "正在删除…", "s_4fe5ca6370a901ef": "ACECode 本地工具分类", "s_4fed9b0a87376127": "主题工坊", @@ -1022,7 +1023,6 @@ export const sourceCatalogs = { "s_542535933d4b97b5": "折叠项目", "s_543b8d1935f06493": "已切换到 ", "s_5450a9bd0303d14c": "模型配置已重新加载", - "s_5482d1abc42f8a5b": "1 小时", "s_548f1cbcdbee6f4e": "项目与自定义规则", "s_549134d7633ae974": "恢复终端失败", "s_54ee672a9610bc5d": "操作失败:{{p0}}", @@ -1163,6 +1163,7 @@ export const sourceCatalogs = { "s_605a534da98e42ec": "Token 活动视图", "s_60b83f21d9d5d703": "群 {{p0}}", "s_60e2a659efb4f9d7": "subagent sub-agent agent avatar portrait icon style petal flower geometric pixel 子代理 智能体 头像 图标 花瓣 几何图形 像素小人", + "s_60f2969819220843": "名称不能包含这些字符:< > : \" | ? *", "s_610a30de692b91b0": "请把你的公网地址转发到本机 http://127.0.0.1:{{p0}},连通后会自动继续。", "s_610e4e820d6881ea": "彻底删除会话“{{p0}}”?此操作不可撤销。", "s_6135d4159e892541": "移除", @@ -1404,7 +1405,6 @@ export const sourceCatalogs = { "s_7535c326b525039f": "使用 xAI 设备登录与 Grok Build 受管端点。", "s_754a9d5828d502f1": "四", "s_756119c3f91c025b": "收起项目栏", - "s_7564bf915ddc893b": "链接权限", "s_7580b1501edb6fff": "此电脑", "s_758d1aea9c4b5b50": "侧边聊天存续时间", "s_75c306a7bcac0b15": "来自审计记录。加入白名单后记得保存;加入黑名单会让 AI 明确知道这条路径不可碰。", @@ -1444,6 +1444,7 @@ export const sourceCatalogs = { "s_788db1cfec2a3db5": "主题", "s_789eabc8eb6e9d9f": "编辑 {{p0}}", "s_789f61dbfcc7a2d2": "红色", + "s_78a72024f9c3ef10": "名称不能包含斜杠或反斜杠", "s_78b32b5a78c532ab": "导出 JSONL", "s_78e5c1be3c1a2347": "壶铃", "s_78e5d5fc974da8b5": "自动归档", @@ -1478,6 +1479,7 @@ export const sourceCatalogs = { "s_7b187349d641590c": "导出会话失败:", "s_7b1c1c5b441d279b": "请检查网站地址和网络连接,然后重试。", "s_7b1e53cd6386dad4": "协助生成会话或者标题,记忆的摘要,建议使用本地模型或者轻量级模型。", + "s_7b37eeee003658ef": "打开可交互会话会消耗共享用户的token额度。", "s_7b493bfc55770676": "待办事项 (", "s_7b4c4c37a5658899": "折叠目录", "s_7b89c50978dee6ed": "未注册", @@ -1537,7 +1539,6 @@ export const sourceCatalogs = { "s_7f3bc3b7d93ea4da": "显示任务时间", "s_7f68ebad19ba6bcd": "检查更新", "s_7f6c661eb101f549": "连接 GitHub", - "s_7f704bcbc3ee930a": "持有链接即可访问,仅限可信局域网。提问消耗你的模型额度。", "s_7f92b2869303b795": "在微信里私聊机器人下达指令,结果回到聊天窗口。", "s_7fd7c6c1c60155c2": "没有可批注的选中文本", "s_7fdbb049d2f6518e": "自动发现", @@ -1592,6 +1593,7 @@ export const sourceCatalogs = { "s_83ad87eee587826a": "展开显示", "s_83deaec053e921ce": "关闭标签页", "s_8407682b0b45bbb9": "· 连接不可用", + "s_84244abc71de03ac": "新建文件夹", "s_8429c4f81e54ed38": "界面导航", "s_843e5a96794f9e8c": "测试会使用标准画质生成一张图片并消耗额度。", "s_844b8cc8dff7c1d8": "默认", @@ -1891,7 +1893,6 @@ export const sourceCatalogs = { "s_9bcbd690c4a55f31": "导出主题失败,请重试", "s_9bd02db4e6d9ed96": "删除旧工作空间数据?", "s_9bd125161829b7d3": "采样参数无效,或当前 Provider / API 协议不支持该参数", - "s_9c2a28e8f98fb5df": "有效期", "s_9c49b6d64c60145c": "模型配置刷新失败:", "s_9c5d341609cd80b7": "新标签页", "s_9c773d880d0608d4": "默认终端", @@ -2212,7 +2213,6 @@ export const sourceCatalogs = { "s_b8954daeace3fcef": "指定 Git Bash 路径", "s_b8ab0fa06986bd29": "权限模式已变更", "s_b8e49270afa93c86": "可视化图表设置保存失败:", - "s_b8f1d5e4a38ed93d": "含工具输出", "s_b8f88aeead1520c8": "辅助功能", "s_b90af4ac2e8fc874": "无法更新推荐", "s_b913e107ad8b0d83": "结束时间必须晚于开始时间", @@ -2243,6 +2243,7 @@ export const sourceCatalogs = { "s_ba5002afadcb9f12": "无法打开开发者工具", "s_ba600e21a9765d06": "需要先开启「使用记忆」", "s_ba8b49f3fd10b338": "图片预览", + "s_bacf701908d8cf45": "文件夹名称", "s_bad0ab59c33beb1d": "每天 {{p0}}", "s_baeb44eebe946b43": "只能包含字母、数字、下划线和连字符,最多 64 个字符", "s_bb35ba51337fdea1": "逐档降低,到最低档停止", @@ -2397,7 +2398,6 @@ export const sourceCatalogs = { "s_c8fb9e13e776596a": "目标使用受限", "s_c9136488e2f44217": "图像生成测试结果", "s_c92179b74af61689": "取消置顶", - "s_c93bcf6d0ce49ad5": "分享与连接", "s_c9401893f45a2f77": "移除粘贴的文本", "s_c94a501ea3a492f1": "语音服务认证失败,请检查 API Key。", "s_c95309c734480385": "复制此文件 diff", @@ -2576,7 +2576,6 @@ export const sourceCatalogs = { "s_d6e882143a3c3b83": "扫码创建机器人", "s_d6f766f2adf53227": "排队中", "s_d6feded758aed3eb": "取消升级", - "s_d70cf6ebc7afced6": "查看输出", "s_d73e140df277dffe": "模型已更新", "s_d7402bc87dfcfbab": "尺规", "s_d74679ad02055214": "钩子操作失败:", @@ -2780,10 +2779,8 @@ export const sourceCatalogs = { "s_e7642d26cec8c7f1": "附件: {{p0}}", "s_e788045df7db1869": "{{p0}}头像相对路径", "s_e78db524e7c1e3dd": "... 还有 {{p0}} 项", - "s_e7a4ae94fa9dbad5": "将打开", "s_e7a71bb4b5b5dbf4": "语音识别失败,请重试。", "s_e7bf600d2da7ec18": "返回导航历史中的上一项", - "s_e7e6a53adba0eea1": "仅限可信局域网。持有链接的人可以查看此会话。", "s_e804670f73f0874a": "Shift+Enter 换行", "s_e806fbbe8ec6e82d": "插件", "s_e821845e5e671890": "已归档的聊天", @@ -2956,6 +2953,7 @@ export const sourceCatalogs = { "s_f5aa6c75d5cc3cf4": "由目录提供或手动覆盖", "s_f5c2506e70b16997": "保存模型", "s_f5fd1a20c267d65d": "搜索 {{p0}}", + "s_f60346e4ad20ffff": "新建文件夹失败:{{p0}}", "s_f60e8ff801708041": "复制全部 diff", "s_f60f6f444d92e1b1": "用法:/turn <插话内容>", "s_f627a3a526dc9da0": "在当前分支开始", @@ -3162,7 +3160,6 @@ export const sourceCatalogs = { "s_0635261aef08149c": "Please select at least one week", "s_0635d2ebc22e01db": "When enabled, the agent can boot, view and operate iOS Simulators from Xcode. You can also watch and control them live in the preview panel.", "s_06490c9aac171faf": "Recognizing speech", - "s_06a32a9dfa382580": "Open a drive or folder before selecting", "s_06ae0fdfac65c03d": "Failed to undo archive:", "s_06aece1ed77e02f6": "Matched a forbid rule", "s_06d7b2e31d301e2e": "Context usage", @@ -3188,6 +3185,7 @@ export const sourceCatalogs = { "s_0828cafb738794ba": "Could not save the cookie setting", "s_082a738ae620ae34": "Model settings", "s_0831592a902fb3a3": "This permanently clears {{p0}} memories in the current workspace, along with the index, pending observations and archive. Global memories are not affected.", + "s_084762143a24f2d8": "Name can't end with a period or space", "s_084ae4a64fb06560": "To-Do List ({{p0}}/{{p1}})", "s_084b42f6e95e4e65": "two", "s_084eda5e71440a15": "Answering...", @@ -3213,6 +3211,7 @@ export const sourceCatalogs = { "s_09e3cdff62f6175b": "Annotation marker {{p0}}, {{p1}} annotations", "s_09f06f0cee94a185": "Sessions to keep must be between 1 and 100", "s_09fcede14b2ae6d3": "Built-in themes cannot be exported or deleted", + "s_09fe1643f711d3d7": "\"{{p0}}\" already exists", "s_0a04cc7eb4eda4df": "If approved, this command will run outside the sandbox.", "s_0a0af8a5218a1cdc": "Nothing to show in this folder", "s_0a6f82252d9788fb": "Return to Gongge", @@ -3236,6 +3235,7 @@ export const sourceCatalogs = { "s_0b6cd3ff0fadbd5f": "Load more ({{p0}} per page)", "s_0b6d58886ac1b7c2": "{{p0}} Uploading", "s_0b79f7b7c403acc3": "Default model set to {{p0}}", + "s_0b8d0d57093a57d1": "Name can't contain control characters", "s_0b9157354ab262ae": "error message", "s_0b94a58a388883d4": "Has a question for you", "s_0b9c3963a5aa9089": "No preview text to copy", @@ -3316,7 +3316,6 @@ export const sourceCatalogs = { "s_127b6378ecc0e545": "Current expert component: {{p0}}", "s_128483ddb22a0169": "Commands and workspace", "s_1288dd3054b9c81c": "Please select whether to allow in the macOS authorization prompt", - "s_128c8ba5cdc3d0a3": "Select a file from the list", "s_129dadf0a8648147": "Starting upgrade task", "s_12b4e2c5cfff6fd0": "Download an iOS Simulator runtime in Xcode, then try again", "s_12c8d9f7a9aef51f": "Allow for this session: {{p0}}", @@ -3356,6 +3355,7 @@ export const sourceCatalogs = { "s_14cbad1d857ee3e6": "Disconnected. The stop has not been confirmed", "s_14d1e349b14010a9": "Cancel download", "s_14dbe91e0547933c": "Starting task", + "s_14e0f623ec2ce26a": "No permission to create a folder here: {{p0}}", "s_14e7acfc08afa9e9": "Browser component stopped", "s_14ee02a96d9bca6d": "Connected · {{p0}}", "s_150dd0cecdc803d0": "Current workspace", @@ -3561,6 +3561,7 @@ export const sourceCatalogs = { "s_2553a785fef2a405": "File saved", "s_255c8d56e8bb1295": "No matching results", "s_2560c96f89c6fea0": "Create an official account in LINE Official Account Manager and enable the Messaging API under Settings > Messaging API.", + "s_25696f769bbcb930": "Invalid folder name: {{p0}}", "s_257bbcc44c839db4": "Modified", "s_257c21aae4198b7e": "Setup and review", "s_25c67adc39bf6b7d": "The clipboard has no text", @@ -3687,7 +3688,6 @@ export const sourceCatalogs = { "s_307253e3d1f704a5": "Folder opened", "s_30ad3d68cbb14095": "More browser actions", "s_30bed62ace8872f7": "New path", - "s_30c21284df4feac6": "1 day", "s_30c731f953a5122d": "Senior Development Engineer", "s_30c83dc25b12c32c": "Green", "s_30d9ddaea3081813": "Upload did not finish, paste again", @@ -3696,7 +3696,6 @@ export const sourceCatalogs = { "s_3113b21f24e47c25": "Latest: {{p0}}", "s_311d6989dec3c386": "by interval", "s_31666e5ea23d3e92": "Changes in this round", - "s_316b6488730eb6f0": "Will select", "s_316c9cb7a03b7211": "memory summary consolidation extraction inbox idle", "s_31955ddb68261e31": "Browser unavailable", "s_319651c9d7db92dc": "Failed to update remote Web mode: {{p0}}", @@ -3726,7 +3725,6 @@ export const sourceCatalogs = { "s_33e71e7397a405da": "The current environment does not support exiting ACECode", "s_33fdf547fb99a86d": "Summarize token consumption by workspace", "s_342292808d6c0954": "Show or hide the file and preview panels", - "s_3424dd5017ffecbb": "Creating", "s_34486c598efd2582": "Provider detection failed", "s_34492b04ea0ccbcc": "Allow the application shown by macOS for this ACECode launch, then return and refresh permissions.", "s_34615a3c7580c3e4": "Search task loading failed", @@ -3746,11 +3744,13 @@ export const sourceCatalogs = { "s_35cda8a7052dec20": "Migration failed", "s_35d9e1259e698690": "Simulator keyboard input", "s_35dccd6dcfaae1d4": "Could not read the cookie setting", + "s_3606e77c2b470a22": "Enter a folder name", "s_3615b021b8af5e82": "Wrapping up", "s_3620d3d986f14584": "Close model dialog", "s_3625f9fa2f9c629a": "Command denied", "s_364970d8168ca5fe": "Sending…", "s_3687f953cfe85fb8": "Disconnect", + "s_368c5f43c2a18316": "\"{{p0}}\" is a reserved system name", "s_369078855fa122f7": "Read-only tool calls", "s_36f33adaf0942634": "Confirm", "s_3703e47860f64a12": "File does not exist", @@ -3780,11 +3780,11 @@ export const sourceCatalogs = { "s_38cd88ed8b3ddbf1": "Copy full output", "s_38d456bbdb81317c": "Filter by Tag", "s_38e5a76bf4ad16e0": "This background service does not support summary generation. Update and restart ACECode, then try again", - "s_38eefacbb326e37f": "7 days", "s_390fd9bc7d9d7a2a": "Audit Center", "s_392d0dceb45998d3": "Extra high", "s_39592d688f12a5a6": "An entry with the same name already exists", "s_3969d8203ae05775": "QR code for connecting", + "s_398c94353c3adad8": "Name can't be \".\" or \"..\"", "s_39932f24fe11a6ba": "document", "s_39a9046f9c8c993d": "Recently used", "s_39b068ea492a4f9a": "Model capability label is invalid", @@ -3964,7 +3964,6 @@ export const sourceCatalogs = { "s_487422ef0c4e25b6": "Home title", "s_48807d75530c1b03": "This queued message cannot be found", "s_4888c0a26e905c1f": "User {{p0}}", - "s_48d734d2f550c468": "Conversation only", "s_48d75d4b7e92d9f2": "Switch to project", "s_48f78f1abeca0c47": "The pasted content is large ({{p0}}) and will be uploaded in {{p1}} parts", "s_490a88b8ae9d4a2e": "This model no longer exists, please refresh", @@ -4017,7 +4016,6 @@ export const sourceCatalogs = { "s_4ce87e7fe2b6e95d": "File or folder", "s_4ceae06adf5b9199": "Their messages stop being processed immediately, and any running turn in their sessions is stopped.", "s_4d0680f9efaef147": "unread", - "s_4d274b2b0a01212a": "Visible content", "s_4d2b19065afe4b07": "LSP is on:{{p0}}", "s_4d3273bc4de49e90": "Find evidence and understand the context", "s_4d3f6a081ea86097": "Complete deletion failed:", @@ -4051,6 +4049,7 @@ export const sourceCatalogs = { "s_4f5b0e563a452c80": "Refresh skill list", "s_4f61317e9307ad3e": "Access denied", "s_4fca07787f3ef1ec": "Remove this pending attachment?", + "s_4fccf43f18f997d7": "Existing links", "s_4fd4f40094d40891": "Deleting…", "s_4fe5ca6370a901ef": "ACECode local tool categories", "s_4fed9b0a87376127": "Theme workshop", @@ -4109,7 +4108,6 @@ export const sourceCatalogs = { "s_542535933d4b97b5": "Collapse project", "s_543b8d1935f06493": "Switched to", "s_5450a9bd0303d14c": "Model configuration reloaded", - "s_5482d1abc42f8a5b": "1 hour", "s_548f1cbcdbee6f4e": "Project and custom rules", "s_549134d7633ae974": "Failed to restore terminals", "s_54ee672a9610bc5d": "Operation failed:{{p0}}", @@ -4250,6 +4248,7 @@ export const sourceCatalogs = { "s_605a534da98e42ec": "Token activity view", "s_60b83f21d9d5d703": "Group {{p0}}", "s_60e2a659efb4f9d7": "subagent sub-agent agent avatar portrait icon style petal flower geometric pixel", + "s_60f2969819220843": "Name can't contain any of these characters: <>:\"|?*", "s_610a30de692b91b0": "Forward your public address to http://127.0.0.1:{{p0}} on this computer. Setup continues automatically once it is reachable.", "s_610e4e820d6881ea": "Completely delete session \"{{p0}}\"? This action cannot be undone.", "s_6135d4159e892541": "Remove", @@ -4491,7 +4490,6 @@ export const sourceCatalogs = { "s_7535c326b525039f": "Use xAI device sign-in with the managed Grok Build endpoint.", "s_754a9d5828d502f1": "Four", "s_756119c3f91c025b": "Collapse sidebar", - "s_7564bf915ddc893b": "Link access", "s_7580b1501edb6fff": "This PC", "s_758d1aea9c4b5b50": "Side chat retention time", "s_75c306a7bcac0b15": "From the audit log. Remember to save after adding to an allow list; adding to the deny list tells the AI explicitly that the path is off limits.", @@ -4531,6 +4529,7 @@ export const sourceCatalogs = { "s_788db1cfec2a3db5": "Theme", "s_789eabc8eb6e9d9f": "Edit {{p0}}", "s_789f61dbfcc7a2d2": "Red", + "s_78a72024f9c3ef10": "Name can't contain slashes or backslashes", "s_78b32b5a78c532ab": "Export JSONL", "s_78e5c1be3c1a2347": "Kettlebell", "s_78e5d5fc974da8b5": "Auto-archive", @@ -4565,6 +4564,7 @@ export const sourceCatalogs = { "s_7b187349d641590c": "Export session failed:", "s_7b1c1c5b441d279b": "Check the site address and your network connection, then try again.", "s_7b1e53cd6386dad4": "Help generate conversation summaries, titles, and memory summaries. A local or lightweight model is recommended.", + "s_7b37eeee003658ef": "Enabling interactive sessions consumes the sharing user's token allowance.", "s_7b493bfc55770676": "To-do items (", "s_7b4c4c37a5658899": "Collapse table of contents", "s_7b89c50978dee6ed": "Not registered", @@ -4624,7 +4624,6 @@ export const sourceCatalogs = { "s_7f3bc3b7d93ea4da": "Show task time", "s_7f68ebad19ba6bcd": "Check for updates", "s_7f6c661eb101f549": "Connect GitHub", - "s_7f704bcbc3ee930a": "Anyone with the link can access this session. Use trusted local networks only. Questions use your model allowance.", "s_7f92b2869303b795": "Message the bot privately in WeChat to give instructions. Results come back to the chat.", "s_7fd7c6c1c60155c2": "No selected text to annotate", "s_7fdbb049d2f6518e": "Auto-detected", @@ -4679,6 +4678,7 @@ export const sourceCatalogs = { "s_83ad87eee587826a": "Expand display", "s_83deaec053e921ce": "Close tab", "s_8407682b0b45bbb9": "· Connection unavailable", + "s_84244abc71de03ac": "New folder", "s_8429c4f81e54ed38": "Navigation", "s_843e5a96794f9e8c": "Testing generates one standard-quality image and consumes credits.", "s_844b8cc8dff7c1d8": "default", @@ -4978,7 +4978,6 @@ export const sourceCatalogs = { "s_9bcbd690c4a55f31": "Could not export the theme. Try again.", "s_9bd02db4e6d9ed96": "Delete previous workspace data?", "s_9bd125161829b7d3": "Invalid sampling parameters, or the current provider or API protocol does not support one of them", - "s_9c2a28e8f98fb5df": "Expires in", "s_9c49b6d64c60145c": "Failed to refresh model configuration:", "s_9c5d341609cd80b7": "New tab", "s_9c773d880d0608d4": "Default terminal", @@ -5299,7 +5298,6 @@ export const sourceCatalogs = { "s_b8954daeace3fcef": "Specify Git Bash path", "s_b8ab0fa06986bd29": "Permissions mode changed", "s_b8e49270afa93c86": "Failed to save inline visuals setting:", - "s_b8f1d5e4a38ed93d": "Include tool output", "s_b8f88aeead1520c8": "Accessibility", "s_b90af4ac2e8fc874": "Couldn't update suggestion", "s_b913e107ad8b0d83": "End time must be later than start time", @@ -5330,6 +5328,7 @@ export const sourceCatalogs = { "s_ba5002afadcb9f12": "Could not open developer tools", "s_ba600e21a9765d06": "Turn on \"Use memory\" first", "s_ba8b49f3fd10b338": "Image preview", + "s_bacf701908d8cf45": "Folder name", "s_bad0ab59c33beb1d": "Every day {{p0}}", "s_baeb44eebe946b43": "Only letters, digits, underscores and hyphens, up to 64 characters", "s_bb35ba51337fdea1": "Decrease one level, down to the lowest supported depth", @@ -5484,7 +5483,6 @@ export const sourceCatalogs = { "s_c8fb9e13e776596a": "Goal usage limited", "s_c9136488e2f44217": "Image generation test result", "s_c92179b74af61689": "Unpin", - "s_c93bcf6d0ce49ad5": "Sharing and connections", "s_c9401893f45a2f77": "Remove pasted text", "s_c94a501ea3a492f1": "Speech service authentication failed. Check the API key.", "s_c95309c734480385": "Copy this file diff", @@ -5663,7 +5661,6 @@ export const sourceCatalogs = { "s_d6e882143a3c3b83": "Scan to create bot", "s_d6f766f2adf53227": "Queuing", "s_d6feded758aed3eb": "Cancel update", - "s_d70cf6ebc7afced6": "View output", "s_d73e140df277dffe": "Model updated", "s_d7402bc87dfcfbab": "Pencil and ruler", "s_d74679ad02055214": "Hook operation failed:", @@ -5867,10 +5864,8 @@ export const sourceCatalogs = { "s_e7642d26cec8c7f1": "Attachment:{{p0}}", "s_e788045df7db1869": "{{p0}} avatar relative path", "s_e78db524e7c1e3dd": "...and {{p0}} items", - "s_e7a4ae94fa9dbad5": "Will open", "s_e7a71bb4b5b5dbf4": "Speech recognition failed. Try again.", "s_e7bf600d2da7ec18": "Go back in navigation history", - "s_e7e6a53adba0eea1": "Trusted local networks only. Anyone with this link can view the session.", "s_e804670f73f0874a": "Shift+Enter for a new line", "s_e806fbbe8ec6e82d": "Plugins", "s_e821845e5e671890": "Chat archived", @@ -6043,6 +6038,7 @@ export const sourceCatalogs = { "s_f5aa6c75d5cc3cf4": "Provided by the catalog or overridden manually", "s_f5c2506e70b16997": "Save model", "s_f5fd1a20c267d65d": "Search {{p0}}", + "s_f60346e4ad20ffff": "Couldn't create folder: {{p0}}", "s_f60e8ff801708041": "copy all diff", "s_f60f6f444d92e1b1": "Usage: /turn ", "s_f627a3a526dc9da0": "Start on current branch", diff --git a/web/src/lib/api.js b/web/src/lib/api.js index cedcab919..a5e1d7590 100644 --- a/web/src/lib/api.js +++ b/web/src/lib/api.js @@ -961,6 +961,8 @@ export function createApi(base = null) { undefined, base, ), + // 选择器底栏「New Folder」:在 parent 下建一层子目录,成功返回 { path, name }。 + fsMkdir: (parent, name) => request('POST', '/api/fs/mkdir', { parent, name }, base), listFiles: (cwd, path, showHidden = false, showNoise = false) => { const qs = `?cwd=${encodeURIComponent(cwd)}&path=${encodeURIComponent(path || '')}` diff --git a/web/src/lib/icons/system.js b/web/src/lib/icons/system.js index 985e77bf9..0fddb3467 100644 --- a/web/src/lib/icons/system.js +++ b/web/src/lib/icons/system.js @@ -176,6 +176,11 @@ export const systemIcons = { ['path', { d: 'M8.7 3.5Q10 1.4 11.3 3.5L17.1 13.8Q18.3 16 15.8 16H4.2Q1.7 16 2.9 13.8L8.7 3.5ZM10 7.1V10.7' }], ['circle', { cx: 10, cy: 13.2, r: 0.7, fill: 'currentColor', stroke: 'none' }], ], + StatusWarningCircle: [ + ['circle', { cx: 10, cy: 10, r: 7.1 }], + ['path', { d: 'M10 5.7V10.5' }], + ['circle', { cx: 10, cy: 13.8, r: .7, fill: 'currentColor', stroke: 'none' }], + ], Tool: [ ['path', { d: 'M18.333333 6.666667C18.333333 9.428083 16.09475 11.666667 13.333333 11.666667C12.488875 11.666667 11.693292 11.457292 10.995667 11.087667L3.75 18.333333L1.666667 16.25L8.912333 9.004333C8.542708 8.306708 8.333333 7.511125 8.333333 6.666667C8.333333 3.905242 10.571917 1.666667 13.333333 1.666667C14.177792 1.666667 14.973375 1.876021 15.671 2.245663L12.5 5.416667L14.583333 7.5L17.754333 4.329C18.123958 5.026625 18.333333 5.822208 18.333333 6.666667Z' }], ], diff --git a/web/src/lib/lastSessionMemory.js b/web/src/lib/lastSessionMemory.js new file mode 100644 index 000000000..9896d35db --- /dev/null +++ b/web/src/lib/lastSessionMemory.js @@ -0,0 +1,56 @@ +// 桌面版「启动时回到上次停留的会话」的前端一半。 +// +// 当前会话每次变化都经 aceDesktop_setLastSession 报给桌面壳(记在 state.json), +// 下次启动由桌面壳拼成 ?open=<会话>&restore=1 落地参数,走已有的启动跳转恢复。 +// 停在首页 / 定时任务 / 专家组件等非会话页面时上报 null,记录随之清掉。 +// +// 只有桌面壳有这个 bridge;浏览器直连 daemon 时这里什么都不做。 +import { + sessionJumpId, + sessionJumpNoWorkspace, + sessionJumpReadOnly, + sessionJumpWorkspaceHash, +} from './sessionJump.js'; + +export function lastSessionRecordFromRef(ref) { + if (!ref || typeof ref !== 'object') return null; + if (ref.home || ref.loop || ref.expertComponents) return null; + const sessionId = sessionJumpId(ref); + if (!sessionId) return null; + const record = { session_id: sessionId }; + if (sessionJumpNoWorkspace(ref)) { + record.no_workspace = true; + } else { + const workspaceHash = sessionJumpWorkspaceHash(ref); + if (workspaceHash) record.workspace_hash = workspaceHash; + } + if (sessionJumpReadOnly(ref)) record.read_only = true; + return record; +} + +// 同一条记录只上报一次:activeRef 会因为标题、模型等字段更新而换对象, +// 这些变化不该各触发一次 state.json 写入。 +export function createLastSessionRecorder( + win = typeof window !== 'undefined' ? window : undefined, +) { + let lastKey; + return { + remember(ref) { + const bridge = win?.aceDesktop_setLastSession; + if (typeof bridge !== 'function') return false; + const record = lastSessionRecordFromRef(ref); + const key = JSON.stringify(record); + if (key === lastKey) return false; + lastKey = key; + try { + Promise.resolve(bridge(record)).catch(() => { + // 记不住只影响下次启动落在哪;允许下一次变化重试。 + if (lastKey === key) lastKey = undefined; + }); + } catch { + lastKey = undefined; + } + return true; + }, + }; +} diff --git a/web/src/lib/lastSessionMemory.test.js b/web/src/lib/lastSessionMemory.test.js new file mode 100644 index 000000000..af64dd904 --- /dev/null +++ b/web/src/lib/lastSessionMemory.test.js @@ -0,0 +1,129 @@ +import assert from 'node:assert/strict'; +import { readFileSync } from 'node:fs'; +import { createLastSessionRecorder, lastSessionRecordFromRef } from './lastSessionMemory.js'; +import { openSessionTargetFromSearch, stripOpenSessionParams } from './sessionJump.js'; + +function test(name, fn) { + try { + fn(); + console.log(`[pass] ${name}`); + } catch (error) { + console.error(`[fail] ${name}`); + throw error; + } +} + +async function testAsync(name, fn) { + try { + await fn(); + console.log(`[pass] ${name}`); + } catch (error) { + console.error(`[fail] ${name}`); + throw error; + } +} + +// 场景:用户停在某个工作区会话上。期望:记录带会话 id 与工作区 hash, +// 桌面壳据此拼出 ?open=<会话>&workspace=。 +test('workspace session ref becomes a record with its workspace hash', () => { + assert.deepEqual( + lastSessionRecordFromRef({ sessionId: 's1', workspaceHash: 'w1', contextId: 'default' }), + { session_id: 's1', workspace_hash: 'w1' }, + ); +}); + +// 场景:无工作区会话 / 只读打开的 TUI 会话。期望:分别带 no_workspace、read_only, +// 且无工作区会话不携带 workspace_hash(否则启动时会按工作区去 resume 而 404)。 +test('no-workspace and read-only sessions keep their flags', () => { + assert.deepEqual( + lastSessionRecordFromRef({ sessionId: 's2', noWorkspace: true, workspaceHash: 'stale' }), + { session_id: 's2', no_workspace: true }, + ); + assert.deepEqual( + lastSessionRecordFromRef({ sessionId: 's3', workspaceHash: 'w3', readOnly: true }), + { session_id: 's3', workspace_hash: 'w3', read_only: true }, + ); +}); + +// 场景:用户停在首页 / 定时任务页 / 专家组件页,或还没有任何页面。 +// 期望:没有记录(上报 null),下次启动落在首页而不是更早的某个会话。 +test('home, loop and expert pages are not sessions', () => { + assert.equal(lastSessionRecordFromRef(null), null); + assert.equal(lastSessionRecordFromRef({ home: true, workspaceHash: 'w1' }), null); + assert.equal(lastSessionRecordFromRef({ loop: true }), null); + assert.equal(lastSessionRecordFromRef({ expertComponents: true }), null); + assert.equal(lastSessionRecordFromRef({ workspaceHash: 'w1' }), null); +}); + +// 场景:activeRef 因标题 / 模型更新而换了对象,但仍是同一个会话。 +// 期望:只上报一次;切到别的会话、回到首页时各上报一次。 +// 回归:每次 activeRef 换对象都写一遍 state.json。 +test('recorder reports each distinct destination once', () => { + const calls = []; + const recorder = createLastSessionRecorder({ + aceDesktop_setLastSession: (record) => { calls.push(record); return '{"ok":true}'; }, + }); + assert.equal(recorder.remember({ sessionId: 's1', workspaceHash: 'w1' }), true); + assert.equal(recorder.remember({ sessionId: 's1', workspaceHash: 'w1', title: 'renamed' }), false); + assert.equal(recorder.remember({ sessionId: 's2', workspaceHash: 'w1' }), true); + assert.equal(recorder.remember({ home: true, workspaceHash: 'w1' }), true); + assert.equal(recorder.remember(null), false); + assert.deepEqual(calls, [ + { session_id: 's1', workspace_hash: 'w1' }, + { session_id: 's2', workspace_hash: 'w1' }, + null, + ]); +}); + +// 场景:浏览器直连 daemon(没有桌面壳的 bridge)。期望:什么都不做、不抛异常。 +test('recorder is inert without the desktop bridge', () => { + assert.equal(createLastSessionRecorder({}).remember({ sessionId: 's1' }), false); + assert.equal(createLastSessionRecorder(undefined).remember({ sessionId: 's1' }), false); +}); + +// 场景:bridge 调用失败(桌面壳正在退出)。期望:不抛到渲染流程里, +// 且同一个会话下次还能重新上报,而不是被去重吞掉。 +await testAsync('a failed report can be retried', async () => { + let attempts = 0; + const recorder = createLastSessionRecorder({ + aceDesktop_setLastSession: () => { + attempts += 1; + return attempts === 1 ? Promise.reject(new Error('shutting down')) : '{"ok":true}'; + }, + }); + assert.equal(recorder.remember({ sessionId: 's1' }), true); + await new Promise((resolve) => setTimeout(resolve, 0)); + assert.equal(recorder.remember({ sessionId: 's1' }), true); + assert.equal(attempts, 2); +}); + +// 场景:桌面壳自动恢复时在 URL 上带 restore=1。期望:落地目标标记 restored, +// 且该参数与 open 一起从地址栏抹掉(刷新不会二次触发)。 +test('restore marker is parsed and stripped with the open params', () => { + const target = openSessionTargetFromSearch('?token=t&open=s1&workspace=w1&restore=1'); + assert.equal(target.sessionId, 's1'); + assert.equal(target.workspaceHash, 'w1'); + assert.equal(target.restored, true); + assert.equal(openSessionTargetFromSearch('?open=s1&workspace=w1').restored, undefined); + assert.equal(stripOpenSessionParams('?token=t&open=s1&workspace=w1&restore=1'), 'token=t'); +}); + +// 架构守护:App 只在启动跳转落定后上报(否则空的 activeRef 会清掉上次的记录), +// 自动恢复失败不弹错误;桌面壳要绑定 bridge 并在导航前拼上落地参数。 +test('App and Desktop wire the last-session memory end to end', () => { + const app = readFileSync(new URL('../App.jsx', import.meta.url), 'utf8'); + assert.match( + app, + /if \(authState !== 'ok' \|\| !startupNavigationSettled\) return;\s+lastSessionRecorderRef\.current\.remember\(activeRef\);/, + ); + assert.match(app, /const silent = target\?\.restored === true;/); + assert.equal(app.match(/navigationIsPending\(\) && !silent/g)?.length, 2); + + const desktop = readFileSync( + new URL('../../../src/apps/desktop/main.cpp', import.meta.url), 'utf8'); + assert.match(desktop, /host\.bind\("aceDesktop_setLastSession", handle_set_last_session\);/); + assert.match( + desktop, + /if \(restore_session\) url = last_session_url\(url, \*restore_session\);\s+host\.navigate\(url\);/, + ); +}); diff --git a/web/src/lib/pathPicker.js b/web/src/lib/pathPicker.js index 6f7ce5281..db0759fab 100644 --- a/web/src/lib/pathPicker.js +++ b/web/src/lib/pathPicker.js @@ -203,3 +203,54 @@ export function browseErrorKey(status) { if (status === 400) return 'not-absolute'; return 'io-error'; } + +// 文件名按什么规则比较:Windows 与 macOS 默认卷不区分大小写,Linux 区分。 +export function pickerNamesCaseInsensitive(os) { + return os === 'windows' || os === 'macos'; +} + +// 「New Folder」的默认名:base 没被占用就用 base,否则 "base (2)"、"base (3)"…(资源管理器 +// 同款)。占用判断看当前列出的全部条目(目录与文件);隐藏项没列出来时撞名由服务端 409 兜底。 +export function nextNewFolderName(entries, baseName, { caseInsensitive = true } = {}) { + const fold = (text) => (caseInsensitive ? text.toLowerCase() : text); + const taken = new Set((entries || []).map((entry) => fold(String(entry?.name || '')))); + if (!taken.has(fold(baseName))) return baseName; + for (let n = 2; ; n += 1) { + const candidate = `${baseName} (${n})`; + if (!taken.has(fold(candidate))) return candidate; + } +} + +const WINDOWS_FORBIDDEN_NAME_CHARS = /[<>:"|?*]/u; +const WINDOWS_RESERVED_NAME_RE = /^(?:con|prn|aux|nul|com[1-9]|lpt[1-9])$/iu; + +// 新文件夹名在提交前的本地检查,与服务端 folder_name_problem 同一套规则(服务端仍是最终裁决)。 +// 返回问题键,合法返回 ''。name 由调用方先 trim。 +// empty | dot | separator | control | windows-char | trailing | reserved | exists +export function newFolderNameProblem(name, { windows = false, entries = [], caseInsensitive = windows } = {}) { + const text = String(name ?? ''); + if (!text) return 'empty'; + if (text === '.' || text === '..') return 'dot'; + if (/[/\\]/u.test(text)) return 'separator'; + // eslint-disable-next-line no-control-regex + if (/[\u0000-\u001f\u007f]/u.test(text)) return 'control'; + if (windows) { + if (WINDOWS_FORBIDDEN_NAME_CHARS.test(text)) return 'windows-char'; + if (/[. ]$/u.test(text)) return 'trailing'; + const base = text.split('.')[0].replace(/ +$/u, ''); + if (WINDOWS_RESERVED_NAME_RE.test(base)) return 'reserved'; + } + const fold = (value) => (caseInsensitive ? value.toLowerCase() : value); + const wanted = fold(text); + if ((entries || []).some((entry) => fold(String(entry?.name || '')) === wanted)) return 'exists'; + return ''; +} + +// POST /api/fs/mkdir 的失败 → 弹窗内联提示的文案键。 +export function mkdirErrorKey(status, body) { + if (status === 409) return 'exists'; + if (status === 403) return 'permission-denied'; + if (status === 404) return 'parent-missing'; + if (status === 400 && body?.error === 'invalid name') return 'invalid-name'; + return 'io-error'; +} diff --git a/web/src/lib/pathPicker.test.js b/web/src/lib/pathPicker.test.js index 8d91f1d48..99e167136 100644 --- a/web/src/lib/pathPicker.test.js +++ b/web/src/lib/pathPicker.test.js @@ -7,8 +7,12 @@ import { isPickerRoot, isSelectableEntry, joinPickerPath, + mkdirErrorKey, + newFolderNameProblem, + nextNewFolderName, normalizePickerPath, pickerBreadcrumbs, + pickerNamesCaseInsensitive, pickerParentPath, pickerSelectionTarget, rememberedFolderAfterPick, @@ -193,3 +197,63 @@ test('root rows render volume labels and usage percent defensively', () => { assert.equal(browseErrorKey(400), 'not-absolute'); assert.equal(browseErrorKey(500), 'io-error'); }); + +// 场景:点底栏「New Folder」时生成默认名。期望:没被占用就用原名;被占用依次试 "(2)"、"(3)"…, +// 文件同名也算占用;Windows / macOS 不分大小写("new folder" 占住 "New folder"),Linux 区分。 +test('new folder default name skips taken names like Explorer', () => { + const entries = [{ name: '新建文件夹', kind: 'dir' }, { name: '新建文件夹 (2)', kind: 'file' }]; + assert.equal(nextNewFolderName([], '新建文件夹'), '新建文件夹'); + assert.equal(nextNewFolderName(entries, '新建文件夹'), '新建文件夹 (3)'); + assert.equal(nextNewFolderName([{ name: 'new folder' }], 'New folder'), 'New folder (2)'); + assert.equal( + nextNewFolderName([{ name: 'new folder' }], 'New folder', { caseInsensitive: false }), + 'New folder', + ); + assert.equal(pickerNamesCaseInsensitive('windows'), true); + assert.equal(pickerNamesCaseInsensitive('macos'), true); + assert.equal(pickerNamesCaseInsensitive('linux'), false); +}); + +// 场景:用户在新文件夹输入框里按 Enter 之前的本地检查。期望:与服务端 folder_name_problem 同一套 +// 规则 —— 空名、. / ..、分隔符、控制字符所有平台都拒;<>:"|?*、句点或空格结尾、保留设备名 +// (带扩展名、大小写不同也算)只在 Windows 规则下拒;与当前列表撞名报 exists(大小写规则跟平台)。 +// 中文名、点开头、中间带空格都合法;COM0 / COM10 不是保留名。 +test('new folder name problems mirror the server rules', () => { + const backslash = String.fromCharCode(92); + for (const windows of [true, false]) { + assert.equal(newFolderNameProblem('', { windows }), 'empty'); + assert.equal(newFolderNameProblem('..', { windows }), 'dot'); + assert.equal(newFolderNameProblem('a/b', { windows }), 'separator'); + assert.equal(newFolderNameProblem(`a${backslash}b`, { windows }), 'separator'); + assert.equal(newFolderNameProblem(`a${String.fromCharCode(9)}b`, { windows }), 'control'); + assert.equal(newFolderNameProblem('新建文件夹 (2)', { windows }), ''); + assert.equal(newFolderNameProblem('.config', { windows }), ''); + assert.equal(newFolderNameProblem('COM10', { windows }), ''); + } + for (const bad of ['a:b', 'a*b', 'a?b', 'a"b', 'a { + assert.equal(mkdirErrorKey(409, { error: 'already exists' }), 'exists'); + assert.equal(mkdirErrorKey(403, {}), 'permission-denied'); + assert.equal(mkdirErrorKey(404, { error: 'not found' }), 'parent-missing'); + assert.equal(mkdirErrorKey(400, { error: 'invalid name' }), 'invalid-name'); + assert.equal(mkdirErrorKey(400, { error: 'path must be absolute' }), 'io-error'); + assert.equal(mkdirErrorKey(500, null), 'io-error'); +}); diff --git a/web/src/lib/runTests.js b/web/src/lib/runTests.js index e2eddf3fa..c28e578fd 100644 --- a/web/src/lib/runTests.js +++ b/web/src/lib/runTests.js @@ -346,6 +346,7 @@ import './remoteControlSessionHighlightArchitecture.test.js'; import './remoteControlSessionNavigation.test.js'; import './remoteControlSessionNavigationArchitecture.test.js'; import './sessionJump.test.js'; +import './lastSessionMemory.test.js'; import './sessionNavigationMaskArchitecture.test.js'; import './sessionListEvents.test.js'; import './errors.test.js'; diff --git a/web/src/lib/sessionJump.js b/web/src/lib/sessionJump.js index 9b7dfb0ca..1cf74f4f1 100644 --- a/web/src/lib/sessionJump.js +++ b/web/src/lib/sessionJump.js @@ -159,6 +159,8 @@ export function openSessionTargetFromSearch(search = '') { params.get('workspaceHash'), ); const target = { sessionId, workspaceHash, noWorkspace, readOnly }; + // 桌面壳自动恢复上次会话时带 restore=1:失败静默回到首页,不弹错误。 + if (boolParam(params.get('restore'))) target.restored = true; const ordinal = sessionJumpMessageOrdinal({ message_ordinal: params.get('message_ordinal'), messageOrdinal: params.get('messageOrdinal'), @@ -174,7 +176,7 @@ export function openSessionTargetFromSearch(search = '') { export function stripOpenSessionParams(search = '') { const raw = text(search); const params = new URLSearchParams(raw.startsWith('?') ? raw.slice(1) : raw); - for (const key of ['open', 'workspace', 'workspace_hash', 'workspaceHash', 'no_workspace', 'noWorkspace', 'read_only', 'readOnly', 'message_ordinal', 'messageOrdinal', 'message_position', 'messagePosition']) { + for (const key of ['open', 'workspace', 'workspace_hash', 'workspaceHash', 'no_workspace', 'noWorkspace', 'read_only', 'readOnly', 'message_ordinal', 'messageOrdinal', 'message_position', 'messagePosition', 'restore']) { params.delete(key); } return params.toString(); diff --git a/web/src/lib/sessionSharing.test.js b/web/src/lib/sessionSharing.test.js index 000f036bb..e987a679d 100644 --- a/web/src/lib/sessionSharing.test.js +++ b/web/src/lib/sessionSharing.test.js @@ -9,12 +9,12 @@ import { decodeInviteLink, inviteErrorMessage } from './inviteLink.js'; import { INVITE_LINK_EVENT, SHARE_SESSION_EVENT } from './sharingEvents.js'; const source = (name) => readFileSync(new URL(`../components/${name}.jsx`, import.meta.url), 'utf8'); -async function component(name, bindings = {}) { - const code = source(name).replace(/^import .*;\r?\n/gm, '').replace(/^export /gm, ''); +async function component(name, bindings = {}, exported = name) { + const code = source(name).replace(/^import\s[\s\S]*?;\r?\n/gm, '').replace(/^export /gm, ''); const compiled = await transformWithEsbuild(code, `${name}.jsx`, { loader: 'jsx', jsxFactory: 'React.createElement', jsxFragment: 'React.Fragment', }); - return vm.runInNewContext(`${compiled.code}; ${name};`, { React, ...React, ...bindings }); + return vm.runInNewContext(`${compiled.code}; ${exported};`, { React, ...React, ...bindings }); } const Modal = ({ children }) => React.createElement('section', {}, children); const ShareDialogHeader = ({ title }) => React.createElement('h2', {}, title); @@ -88,16 +88,18 @@ assert.equal(connect.props.disabled, false); await connect.props.onClick(); assert.equal(connections, 1); -// 场景:生成可交互链接的请求尚未返回,不能切成只读后复制旧权限的结果。 +// 场景:默认只读,开关决定新链接是否可交互;内容和两天有效期固定,生成期间不能切换权限。 const shareSlots = []; let shareIndex = 0; let finishCreate; +const createRequests = []; const shareApi = { - createShare: () => new Promise((resolve) => { finishCreate = resolve; }), + createShare: (sessionId, options) => { createRequests.push({ sessionId, options }); return new Promise((resolve) => { finishCreate = resolve; }); }, listShares: async () => ({ shares: [] }), listPeers: async () => ({ peers: [] }), }; +const Toggle = await component('Modal', { clsx: (...values) => values.filter(Boolean).join(' ') }, 'Toggle'); const ShareSessionDialog = await component('ShareSessionDialog', { - Modal, VsIcon: () => null, inviteErrorMessage, Event, + Modal, Toggle, VsIcon: ({ name }) => React.createElement('span', { 'data-icon-name': name }), inviteErrorMessage, Event, window: { dispatchEvent() {} }, useEffect() {}, useState(initial) { const slot = shareIndex++; @@ -107,14 +109,35 @@ const ShareSessionDialog = await component('ShareSessionDialog', { }); const renderShare = () => { shareIndex = 0; return ShareSessionDialog({ api: shareApi, sessionId: 's', title: 'Title' }); }; let shareTree = renderShare(); -const pendingCreate = find(shareTree, (node) => node.type === 'button' && node.props['data-ace-dialog-primary']).props.onClick(); -shareTree = renderShare(); -assert.equal(find(shareTree, (node) => node.props?.role === 'radio').props.disabled, true); -assert.equal(find(shareTree, (node) => node.type === 'select' && node.props.value === 'conversation').props.disabled, true); -assert.equal(find(shareTree, (node) => node.type === 'select' && node.props.value === 86400).props.disabled, true); -finishCreate({ link: 'generated-interactive-link' }); -await pendingCreate; +const initialShareHtml = renderToStaticMarkup(shareTree); +assert.match(initialShareHtml, /role="switch" aria-checked="false" aria-label="可交互"/); +assert.match(initialShareHtml, /已存在的链接/); +assert.doesNotMatch(initialShareHtml, / node.type === Toggle).props.onChange(true); + shareTree = renderShare(); + const html = renderToStaticMarkup(shareTree); + assert.match(html, /打开可交互会话会消耗共享用户的token额度。/); + assert.match(html, /data-icon-name="warningCircle"/); + assert.equal(find(shareTree, (node) => node.type === 'input'), undefined); + } + const pendingCreate = find(shareTree, (node) => node.type === 'button' && node.props['data-ace-dialog-primary']).props.onClick(); + assert.equal(JSON.stringify(createRequests.at(-1)), JSON.stringify({ sessionId: 's', options: { + mode: interactive ? 'interactive' : 'read_only', visibility: 'tools', expires_in: 172800, + } })); + shareTree = renderShare(); + assert.equal(find(shareTree, (node) => node.type === Toggle).props.disabled, true); + const link = `generated-${interactive ? 'interactive' : 'readonly'}-link`; + finishCreate({ link }); + await pendingCreate; + shareTree = renderShare(); + assert.equal(find(shareTree, (node) => node.type === Toggle).props.disabled, false); + assert.equal(find(shareTree, (node) => node.type === 'input').props.value, link); +} +find(shareTree, (node) => node.type === Toggle).props.onChange(false); shareTree = renderShare(); -assert.equal(find(shareTree, (node) => node.props?.role === 'radio').props.disabled, false); -assert.equal(find(shareTree, (node) => node.type === 'input').props.value, 'generated-interactive-link'); +assert.doesNotMatch(renderToStaticMarkup(shareTree), /token额度|warningCircle|generated-interactive-link/); +find(shareTree, (node) => node.type === 'button' && node.props.children === '已存在的链接').props.onClick(); +assert.match(renderToStaticMarkup(renderShare()), /]*>已存在的链接<\/h2>/); console.log('[pass] session sharing permissions, text escaping, confirmation and cancellation'); diff --git a/web/src/styles/globals.css b/web/src/styles/globals.css index e3f476c44..af205064b 100644 --- a/web/src/styles/globals.css +++ b/web/src/styles/globals.css @@ -7909,6 +7909,44 @@ div.ace-markdown-opaque > div.ace-markdown-opaque-rendered { opacity: 0.35; cursor: default; } +.ace-path-picker-soft-btn { + height: 32px; + padding: 0 12px; + border-radius: 8px; + background: var(--ace-surface-hi); + color: var(--ace-fg); + font-size: 12px; + white-space: nowrap; + transition: background-color 120ms ease; +} +.ace-path-picker-soft-btn:hover:not(:disabled) { + background: var(--ace-border); +} +.ace-path-picker-soft-btn:disabled { + opacity: 0.45; + cursor: default; +} +.ace-path-picker-new-row { + display: grid; + grid-template-columns: 18px minmax(0, 360px); + gap: 0 12px; + align-items: center; + margin: 4px 6px 0; + padding: 3px 8px; + border-radius: 6px; + background: var(--ace-accent-bg); +} +.ace-path-picker-new-input { + height: 24px; + min-width: 0; + padding: 0 6px; + border: 1px solid var(--ace-accent); + border-radius: 4px; + background: var(--ace-surface); + color: var(--ace-fg); + font-size: 12.5px; + outline: none; +} .ace-path-picker-crumbs { flex: 1; min-width: 0;