diff --git a/README.md b/README.md index bcf0f3ad6c..2a7a15f16e 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,13 @@ contract](docs/reference/protocols/lark-manager-context-authority-v0.md). loopx dashboard ``` +For the optional [Workbench](apps/workbench/README.md#统一启动命令), use +`loopx workbench start`, `loopx workbench status`, and `loopx workbench stop` +after installing its separate application. These commands preserve its data and +leave independently managed Core services running. Opt in to current-user login +startup and crash recovery with `loopx workbench start --autostart` (macOS launchd +or Linux systemd); `stop --disable-autostart` removes that registration and keeps data. + `loopx dashboard` is the supported browser/PWA launch path. You can also download native desktop previews from the [current release](https://github.com/loopx-project/loopx/releases/latest); they reuse the same loopback services and Goal state. Apple Silicon macOS supports diff --git a/apps/workbench/README.md b/apps/workbench/README.md index 117f9692bc..8b1f951280 100644 --- a/apps/workbench/README.md +++ b/apps/workbench/README.md @@ -21,6 +21,8 @@ LooChat 不动 agent 本身的目录、配置和会话,装好即用。LooChat ## 使用方式 +消息菜单中的复制为引用、整条回复引用、作为上下文和侧边追问,见[引用使用说明](docs/references.md)。 + 实时语音:开启后输入框换成一个会随声音起伏的球,你说的话以浅蓝气泡记进线程;后台任务和待批准事项一行可见;结束后逐句对话折成一行,下面留一份文字总结。 用量与诊断:多 agent 的 token 用量、TPM 走势和费用估算。 @@ -39,7 +41,47 @@ LooChat 不动 agent 本身的目录、配置和会话,装好即用。LooChat | zcode | `zcode app-server` 精简接入 | 有 | 按原生模型能力 | 暂无 | | DeepSeek Harness | `dsh --profile acp`(ACP) | 有(仅允许一次/拒绝) | 有(按当前模型路由) | 暂无 | -各家 agent CLI 需要先在主机上装好并完成登录或鉴权。没装的 agent 在界面里显示为不可用。 +各家 agent CLI 需要先在主机上装好。没装的 agent 在界面里显示为不可用;已安装的 Claude Code 和 Antigravity 可从 Agents 页发起登录。 + +### Agent 未登录时恢复 + +读取模型时,所有 Agent 明确返回的原生认证失败都会在工作区显示「账号名 尚未登录」。恢复方式按该实例支持的能力提供: + +| Agent | 恢复入口 | +| --- | --- | +| Claude Code、Antigravity | 「去登录」展开行内授权面板;验证后自动刷新模型 | +| Codex、TRAE CLI、ZCode | 「去登录」打开该账号的原生终端登录;模型读取确认可用后自动恢复 | +| pi、DeepSeek Harness | 显示原生客户端凭据配置指引和「重试」;pi 在原生客户端使用 `/login` | + +空目录单独提示「暂无可用模型,请检查登录或模型配置」;空列表本身不作为未登录证据。配置型 Agent 在原生客户端配置后点击「重试」,已有草稿保留。网络故障、额度耗尽、不受支持的订阅和 Workbench 自身的访问令牌错误保留各自含义。 + +以下为构建页面与隔离测试账号的实际界面;原生授权结果由测试 CLI 提供,不代表真实账号授权已验收。 + +![Claude Code 未登录时的恢复入口](docs/images/agent-login-claude.png) + +手机上的 Codex 登录与重试入口,原草稿保留 + +![pi 空模型目录的配置指引](docs/images/agent-login-empty-models.png) + +认证识别遵循原生协议:[ACP 的认证错误](https://agentclientprotocol.com/protocol/v1/authentication)、Codex 的 `account/read`(仅在 `requiresOpenaiAuth` 为真且账号为空时判断未登录),以及 CLI 明确的登录或缺失凭据诊断。Codex 自定义服务和旧版账号协议保留原有目录行为。 + +### Antigravity 登录 + +若读取模型时尚未登录,当前页面会显示「Antigravity 尚未登录」和「去登录」。点击后在原位置展开授权面板;登录验证成功后自动加载模型列表,无需刷新页面。若此时模型读取暂时失败,可以重试读取,不必重复授权。网络或 CLI 故障仍单独显示为错误。 + +![未登录时就地进入授权](docs/images/antigravity-login-required.png) + +授权后自动恢复的模型列表(测试账号) + +在 Agents 页点击 Antigravity 的「登录」,授权面板会在该账号行下方展开,不遮挡其他页面操作。打开 Google 授权链接,授权后把验证码或浏览器最后显示的完整回跳地址粘贴回来,点击「提交验证码」。出现登录成功后,账号邮箱会显示在列表中。收起面板、离开页面或刷新都不会取消登录,10 分钟内可从「继续登录」回到同一次授权;只有「取消登录」会主动结束它。链接过期或授权失败时点「重试」获取新链接。 + +另加账号时,选择「添加 agent → Antigravity → 添加账号」。创建后直接展开登录面板。新账号使用独立目录,只复制可移植设置、指令和技能,不复制原账号的凭据、历史或项目信任。原生 CLI 负责 OAuth 和保存凭据。安装器留下的 `.old` 等备份不会作为可用账号展示,原文件保留。 + +下面是同一登录入口在桌面与手机上的示意(使用测试账号): + +![桌面 Antigravity 登录](docs/images/antigravity-login-desktop.png) + +手机 Antigravity 登录:打开链接后粘贴授权码或回跳地址 ## 插件与参与 @@ -87,6 +129,69 @@ curl -fsSL "https://raw.githubusercontent.com/loopx-project/loopx/$ref/apps/work 各家 agent CLI 要自己装好并登录,LooChat 只调用这台机器上现有的。 +### 统一启动命令 + +安装支持此命令的 LoopX CLI,并安装、构建同版本 Workbench 后: + +```bash +loopx workbench start +loopx workbench status +loopx workbench stop +``` + +`start` 在后台启动 Workbench,输出访问地址和私密登录链接。重复执行复用已有实例; +`status` 只读检查实际服务及 Core 连通性,不创建配置、不签发登录链接。 +`stop` 保留配置和会话数据,存在运行中的 Agent 时拒绝停止;明确要中断时使用 +`loopx workbench stop --force`。Core 仍独立管理,以上命令不会启动、替换或停止 Core。 +Core 不可达会明确提示,普通 Agent 会话仍可使用;连通性不代表 Goal 功能已验收。 + +需要登录电脑后自动运行时,显式启用: + +```bash +loopx workbench start --autostart +loopx workbench status +# 本次停止;下次登录仍自动启动 +loopx workbench stop +# 停止并取消自启动,保留会话和配置 +loopx workbench stop --disable-autostart +``` + +macOS 使用当前用户的 LaunchAgent,登录后启动、异常退出后恢复;不承诺未登录时运行。 +Linux 使用 `systemd --user`,需要可用的用户服务管理器;不自动启用 linger 或申请 root 权限。 +`status` 从系统服务管理器读取自启动状态,无法核实会明确报错。普通 `start` 不主动开启自启动; +已有注册时沿用该服务。为已运行的 CLI 实例启用自启动需要一次空闲重启,运行中的任务会阻止迁移。 +系统服务只读取已有配置,不签发登录链接;交互执行 `start` 就会输出带 token 的私密登录链接。 +默认地址只适用于同机浏览器;异机访问仍需已有的可达域名或代理。 + +注册使用 Node 和当前 CLI 的绝对路径。应从稳定安装位置启用,保留 Node、CLI、应用及配置文件; +移动安装位置或更换 Node 后,先用原安装执行 `stop --disable-autostart`,再从新安装启用。 +若服务文件被外部修改,CLI 会拒绝覆盖或删除,需先核对并恢复原注册;服务管理器不可用时不假报成功。 +服务文件只保存启动路径和必要环境,不复制登录 token;密钥仍由已有 `.env` 管理。 + +默认数据目录与 `scripts/workbench.sh` 相同: +`${XDG_STATE_HOME:-~/.local/state}/loochat-workbench`。 +可以用 `WORKBENCH_STATE_DIR` 或每次传入 `--state-dir` 指定已有目录。 +`start --port 8796`、`--workbench-dir /path/to/apps/workbench`、 +`--env-file /path/to/workbench.env` 可选择端口、已构建应用和已有配置; +成功启动后保存这些选择,停止后再次启动沿用。应用依次从显式目录、 +`LOOPX_WORKBENCH_DIR`、已保存目录、`LOOCHAT_HOME`、CLI 源码目录和默认安装目录查找。 +依赖或构建缺失时给出准备命令,不自动下载安装。 + +原有脚本或 systemd 正在管理的实例不会被接管或停止。迁移时先用原启动方式正常停止, +再指定同一数据和配置,例如安装器的默认目录: + +```bash +loopx workbench start --state-dir ~/.local/state/loochat --env-file ~/.config/loochat/.env +loopx workbench status --state-dir ~/.local/state/loochat +loopx workbench stop --state-dir ~/.local/state/loochat +``` + +systemd 实例继续使用原服务管理也完全可行,不要让两种启动方式同时管理同一数据。 +CLI 管理使用独立的私有 Unix socket,不开放浏览器或远程 relay 的停服接口; +旧 PID 文件不授予停止权限。后台日志在状态目录的 `daemon.log`; +启动失败先看日志,修正配置后重试。异常中断留下 `lifecycle.lock` 时,先确认没有进行中的 +启动,再移除该锁目录重试。命令支持 `--format json`,但 `start` 输出包含登录链接,勿公开。 + ### 从源码开发 ```bash @@ -208,6 +313,8 @@ npm test -w @calli/e2e -- --test-concurrency=1 test/smoke.spec.mjs ### 安装为桌面应用 -在 Chrome 中打开 LooChat 后,可通过浏览器菜单将它安装为应用。安装名称为 LooChat,图标使用蓝白配色的大小钳小螃蟹。 +在 macOS 或 Windows 的 Chrome 中打开 LoopX,浏览器允许安装时,侧栏底部会出现「安装 LoopX」。点击「安装」后,在 Chrome 弹窗中确认;网页不能跳过这次确认。安装后可从 Spotlight 或开始菜单打开独立窗口。 + +选择「以后再说」或取消安装后,7 天内不再主动提示;「配置 → 安装 LoopX」仍可手动进入。没有快捷安装按钮时,该页面会显示浏览器菜单安装说明。请使用 HTTPS(本机 localhost 也可);受管理的浏览器可能禁用安装。独立窗口仍需连接原来的 Workbench 服务,不提供离线 Agent 执行。 如果此前安装的应用仍显示 Limi、AgentHub 或旧图标,先尝试关闭所有应用窗口后重新打开,并接受 Chrome 提供的名称或图标更新。如果仍未更新,可卸载旧应用后从当前网页重新安装;卸载时不要勾选清除网站数据,以保留本机登录和偏好。 diff --git a/apps/workbench/THIRD_PARTY_NOTICES.md b/apps/workbench/THIRD_PARTY_NOTICES.md index f773ba12c0..1ba885c297 100644 --- a/apps/workbench/THIRD_PARTY_NOTICES.md +++ b/apps/workbench/THIRD_PARTY_NOTICES.md @@ -25,3 +25,37 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +## Calli + +Antigravity account isolation and native OAuth login (`packages/daemon/src/adapters/agy-account.ts`, +`code-login.ts`, inline login UI and related account tests) are adapted from Calli +(`maxliux5/calli`, account flow at `d2a6d6f1dc524dd0ce36a73f6674bd74967c950c`, +inline/resumable login at `c9802662b5219395b14e65ba30dfff21230df91b`). + +Quote-paste handling is adapted from Calli `b456a10716221f06baee5d62a02f87dd626df460`; +quoted side-chat model selection from `80eb16edbd3e2cc3e2a3c887a2560fe39b6ab209`, +including the current local SideChat preference/catalog refinements. Existing Loochat +message-draft protections and machine-scoped provenance are retained. + +MIT License + +Copyright (c) 2026 Calli contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/apps/workbench/docs/images/agent-login-claude.png b/apps/workbench/docs/images/agent-login-claude.png new file mode 100644 index 0000000000..3ccfcf9748 Binary files /dev/null and b/apps/workbench/docs/images/agent-login-claude.png differ diff --git a/apps/workbench/docs/images/agent-login-codex-phone.png b/apps/workbench/docs/images/agent-login-codex-phone.png new file mode 100644 index 0000000000..e90344c0e3 Binary files /dev/null and b/apps/workbench/docs/images/agent-login-codex-phone.png differ diff --git a/apps/workbench/docs/images/agent-login-empty-models.png b/apps/workbench/docs/images/agent-login-empty-models.png new file mode 100644 index 0000000000..a06f74c8f2 Binary files /dev/null and b/apps/workbench/docs/images/agent-login-empty-models.png differ diff --git a/apps/workbench/docs/images/antigravity-login-desktop.png b/apps/workbench/docs/images/antigravity-login-desktop.png new file mode 100644 index 0000000000..b4bc91ab63 Binary files /dev/null and b/apps/workbench/docs/images/antigravity-login-desktop.png differ diff --git a/apps/workbench/docs/images/antigravity-login-phone.png b/apps/workbench/docs/images/antigravity-login-phone.png new file mode 100644 index 0000000000..0962425b36 Binary files /dev/null and b/apps/workbench/docs/images/antigravity-login-phone.png differ diff --git a/apps/workbench/docs/images/antigravity-login-required.png b/apps/workbench/docs/images/antigravity-login-required.png new file mode 100644 index 0000000000..8d9ec616b0 Binary files /dev/null and b/apps/workbench/docs/images/antigravity-login-required.png differ diff --git a/apps/workbench/docs/images/antigravity-models-restored.png b/apps/workbench/docs/images/antigravity-models-restored.png new file mode 100644 index 0000000000..540dd72192 Binary files /dev/null and b/apps/workbench/docs/images/antigravity-models-restored.png differ diff --git a/apps/workbench/docs/images/reference-pasted-note-phone.png b/apps/workbench/docs/images/reference-pasted-note-phone.png new file mode 100644 index 0000000000..7fc1f94f71 Binary files /dev/null and b/apps/workbench/docs/images/reference-pasted-note-phone.png differ diff --git a/apps/workbench/docs/images/reference-sidechat-model.png b/apps/workbench/docs/images/reference-sidechat-model.png new file mode 100644 index 0000000000..660c16078a Binary files /dev/null and b/apps/workbench/docs/images/reference-sidechat-model.png differ diff --git a/apps/workbench/docs/install-agent.md b/apps/workbench/docs/install-agent.md index 22b1203b33..6cc1982033 100644 --- a/apps/workbench/docs/install-agent.md +++ b/apps/workbench/docs/install-agent.md @@ -46,6 +46,15 @@ LOOCHAT_LOOPX_REGISTRY=/path/to/registry.global.json 3. 通过带 Workbench token 的 `/api/loopx/healthz` 检查 Core 代理;无法连接时应返回 `502`、`loopx_core_unavailable` 和目标地址。 4. 修正 `.env` 或启动 Core 后,按下节方式重启 Workbench 并重试。连通性通过不代表已验证 Goal 创建和会话恢复,需按用户授权另外验收。 +## 用 LoopX CLI 管理 Workbench + +新版 LoopX CLI 提供 `loopx workbench start|status|stop`,用法见 +[统一启动命令](../README.md#统一启动命令)。它需要已安装并构建的 Workbench, +默认不接管本安装器创建的 systemd 服务,也不改变 Core 的独立安装边界。 +使用 `--no-service` 安装后,可通过 `start --workbench-dir` 指定应用, +通过 `--env-file` 和 `--state-dir` 复用安装器的配置与数据。 +`status` 只读;`stop` 不删除数据,有正在运行的会话时需等结束或明确加 `--force`。 + ## 更新、重启与卸载 更新时重跑同一个安装入口;分支 ref 获取最新提交,完整 SHA 则保持固定版本。安装器打印实际检出的 SHA。存在源码改动或安装后新增的本地提交时,先保存到另一个工作目录,再更新。上游 Calli 的已有克隆不能就地当作本仓库更新:请选择新的 `LOOCHAT_HOME`;原有配置与数据仍保留。 diff --git a/apps/workbench/docs/references.md b/apps/workbench/docs/references.md new file mode 100644 index 0000000000..a34fd6a529 --- /dev/null +++ b/apps/workbench/docs/references.md @@ -0,0 +1,33 @@ +# 引用消息、会话与目录 + +消息下方的操作栏、更多菜单、桌面右键和手机长按提供复制、复制为引用、引用整条回复、交给助手、作为上下文和选择文字。选中的文字还可以加注释或在侧边栏追问。 + +## 复制与粘贴引用 + +「复制为引用」保留富文本和 Markdown 两种表示。在另一个会话的输入框中粘贴时,整段引用成为输入框上方的注释条,已有草稿保留;可继续添加评论或移除引用。外部应用复制来的整段 `>` 引用也可以识别,混合引用和正文仍按普通文本粘贴。 + +工作台复制的引用记录来源机器、会话和轮次。同一机器的另一会话附带 `loochat history THREAD --turn TURN` 来源说明;同一会话或其他机器只携带所选正文,不把另一台机器的标识当作本机历史读取权限。注释条沿用已有草稿、排队、撤回编辑和发送协议。刷新后重新打开该会话,引用和已输入的草稿一起恢复。 + +手机端粘贴后,引用留在输入框上方,正文继续编辑: + +![手机端的引用与草稿](images/reference-pasted-note-phone.png) + +## 侧边追问 + +选择文字并打开侧边追问后,可以在发送前选择模型与思考档位。追问建立后,切换模型仍使用同一追问会话;切回某个模型时恢复记住的思考档位,源会话不受影响。模型目录的加载、失败和重试可见,附件入口遵循所选模型的图片能力。 + +模型控制位于追问输入框右下角,来源会话仍保留在背景: + +![侧边追问的独立模型选择](images/reference-sidechat-model.png) + +## 作为上下文 + +输入框的 `@` 入口分成协作对象、会话和目录三个页签。消息上下文保存所选正文的快照;会话引用固定在选择时的历史范围,正文按需读取;目录引用不会切换会话工作目录。引用和编号注释分别保存,可以一起发送。 + +「交给助手」先把所选回复带入助手草稿,用户补充要求后再发送。取消或发送失败保留草稿,不修改来源会话。 + +## 验证范围 + +`pasted-quote.test.ts`、`copy-quote.test.ts` 和 `context-references.test.ts` 检查转换与协议。浏览器用例 `quote-paste.spec.mjs`、`quote.spec.mjs`、`context-references.spec.mjs`、`message-actions.spec.mjs` 覆盖粘贴、追问、上下文与菜单。以上截图来自构建后的界面、隔离服务和测试 agent,不代表已部署到日常使用环境。用例使用相同边界;粘贴事件为合成事件,不代表实体手机系统剪贴板已经验证。 + +迁入来源:Calli `b456a10`、`80eb16e`,以及本机 SideChat 的模型偏好和目录加载修正,授权声明见 [第三方声明](../THIRD_PARTY_NOTICES.md)。 diff --git a/apps/workbench/packages/daemon/src/adapters/acp.ts b/apps/workbench/packages/daemon/src/adapters/acp.ts index 64967f034a..eb072e85a7 100644 --- a/apps/workbench/packages/daemon/src/adapters/acp.ts +++ b/apps/workbench/packages/daemon/src/adapters/acp.ts @@ -3,7 +3,7 @@ import type { PlanQuota, QuotaWindow, WorkMode } from './types.js'; import { acpUsage } from './usage.js'; import { timedUsage, type LiveUsage } from './live-usage.js'; import type { UsageSample } from '../telemetry.js'; -import { cliDiagnostic, probeWithDeadline } from './diagnostics.js'; +import { agentLoginRequired, cliDiagnostic, probeWithDeadline } from './diagnostics.js'; import { isCompaction, trackCompaction } from './compaction.js'; import { sessionEnvironment } from './types.js'; import { spawn } from 'node:child_process'; @@ -11,7 +11,7 @@ import { existsSync } from 'node:fs'; import { tmpdir } from 'node:os'; import type { EmittedEvent } from '../events.js'; import { textOf, commandExists } from '../util.js'; -import { JsonRpcPeer } from './jsonrpc.js'; +import { JsonRpcPeer, RpcError } from './jsonrpc.js'; import type { AgentAdapter, AgentSession, @@ -596,6 +596,9 @@ export abstract class AcpAdapter implements AgentAdapter { if (refresh) this.modelProbe = null; this.modelProbe ??= this.readModels().catch((err) => { this.modelProbe = null; + // ACP's auth_required code is shared by Claude, TRAE and DeepSeek Harness. + // An explicitly unsupported subscription cannot be fixed by signing in again. + if (err instanceof RpcError && err.code === -32000 && err.data?.reason !== 'claude_subscription_not_supported') throw agentLoginRequired(this.label); throw err; }); return this.modelProbe; diff --git a/apps/workbench/packages/daemon/src/adapters/agy-account.ts b/apps/workbench/packages/daemon/src/adapters/agy-account.ts new file mode 100644 index 0000000000..232127ab36 --- /dev/null +++ b/apps/workbench/packages/daemon/src/adapters/agy-account.ts @@ -0,0 +1,64 @@ +import { cp, lstat, mkdir, readFile, writeFile } from 'node:fs/promises'; +import { dirname, join } from 'node:path'; +import { startCodeLogin } from './code-login.js'; +import { configDirectory } from './session-location.js'; +import type { LoginSession } from './types.js'; + +export const AGY_AUTH_ENV = ['GOOGLE_API_KEY', 'GEMINI_API_KEY', 'GOOGLE_APPLICATION_CREDENTIALS', + 'GOOGLE_CLOUD_ACCESS_TOKEN', 'AGY_ADC_AUTH', 'AGY_ACP_ENABLE_GATEWAY_AUTH', + 'AGY_LLM_GATEWAY_URL', 'AGY_LLM_GATEWAY_PROXY_URL', 'AGY_LLM_GATEWAY_CLIENT_CERT', 'AGY_LLM_GATEWAY_CLIENT_KEY']; + +export async function copyAgyAccount(source: string, home: string, target: string, env: Record): Promise> { + const config = join(target, '.gemini', 'antigravity-cli'); + await mkdir(config, { recursive: true, mode: 0o700 }); + const copy = async (from: string, to: string) => { + try { await lstat(from); } catch (error) { + if ((error as NodeJS.ErrnoException).code === 'ENOENT') return; + throw error; + } + await mkdir(dirname(to), { recursive: true, mode: 0o700 }); + await cp(from, to, { recursive: true, dereference: true, force: false, errorOnExist: true }); + }; + // Materialize portable customizations. OAuth, project trust, caches and sessions stay put. + for (const name of ['GEMINI.md', 'AGENTS.md', 'skills', 'agents', 'commands', 'hooks', 'hooks.json', 'rules.json']) { + await copy(join(source, name), join(config, name)); + } + await copy(join(home, '.gemini', 'GEMINI.md'), join(target, '.gemini', 'GEMINI.md')); + await copy(join(home, '.agents', 'skills'), join(target, '.agents', 'skills')); + const copyJson = async (from: string, to: string, keys: string[]) => { + let contents: Record; + try { + const text = await readFile(from, 'utf8'); + if (!text.trim()) return; // Native optional configuration may be an empty file. + contents = JSON.parse(text); + } catch (error) { + if ((error as NodeJS.ErrnoException).code === 'ENOENT') return; + throw error; + } + if (!contents || typeof contents !== 'object' || Array.isArray(contents)) throw new Error('invalid agy configuration'); + await mkdir(dirname(to), { recursive: true, mode: 0o700 }); + await writeFile(to, JSON.stringify(Object.fromEntries(keys.filter(key => key in contents).map(key => [key, contents[key]])), null, 2) + '\n', { mode: 0o600 }); + }; + await copyJson(join(source, 'settings.json'), join(config, 'settings.json'), + ['colorScheme', 'useTerminalCursor', 'seasonalThemesOff', 'toolFormatterType', 'model', 'effort', 'permissions']); + await copyJson(join(home, '.gemini', 'config', 'mcp_config.json'), join(target, '.gemini', 'config', 'mcp_config.json'), ['mcpServers']); + // Print mode ignores LOOCHAT_AGY_HOME: native CLI and its sidecars need their own actual home. + return { ...env, ...Object.fromEntries(AGY_AUTH_ENV.map(key => [key, ''])), HOME: target, + XDG_CONFIG_HOME: join(target, '.config'), XDG_DATA_HOME: join(target, '.local', 'share'), XDG_CACHE_HOME: join(target, '.cache'), + LOOCHAT_AGY_HOME: config }; +} + +export function startAgyLogin(command: string[], extraEnv: Record, onSuccess: (account?: string) => Promise, timeoutMs = 10 * 60_000): LoginSession { + const env = { ...process.env, ...extraEnv, ANTIGRAVITY_REMOTE_OOB_AUTH: '1', BROWSER: 'true' }; + return startCodeLogin([...command, 'acp', '--login'], env, + url => url.hostname === 'accounts.google.com' && url.pathname === '/o/oauth2/auth' && + url.searchParams.get('redirect_uri') === 'https://antigravity.google/oauth-callback', + async () => { + const path = join(configDirectory(extraEnv, 'LOOCHAT_AGY_HOME', ['.gemini', 'antigravity-cli'], process.cwd()), 'antigravity-oauth-token'); + const credentials = JSON.parse(await readFile(path, 'utf8')); + if (typeof credentials.token?.access_token !== 'string' || !credentials.token.access_token || + typeof credentials.token.refresh_token !== 'string' || !credentials.token.refresh_token || + typeof credentials.id_token_email !== 'string' || !credentials.id_token_email) throw new Error('login verification failed'); + return credentials.id_token_email; + }, onSuccess, timeoutMs, 'code-or-url'); +} diff --git a/apps/workbench/packages/daemon/src/adapters/agy.ts b/apps/workbench/packages/daemon/src/adapters/agy.ts index 53d598a198..199604394f 100644 --- a/apps/workbench/packages/daemon/src/adapters/agy.ts +++ b/apps/workbench/packages/daemon/src/adapters/agy.ts @@ -1,3 +1,5 @@ +import { HttpError } from '../errors.js'; +import { AGY_AUTH_ENV, copyAgyAccount, startAgyLogin } from './agy-account.js'; import type { WorkMode } from './types.js'; import { cliDiagnostic } from './diagnostics.js'; import { PlanReply } from './plan-reply.js'; @@ -10,7 +12,7 @@ import type { EmittedEvent } from '../events.js'; import { imagePathNote } from '../attachments.js'; import { commandExists } from '../util.js'; import { ANTIGRAVITY_ICON } from './icons.js'; -import { configDirectory, findSessionFile } from './session-location.js'; +import { configDirectory, findSessionFile, quoteArg } from './session-location.js'; import { agyLiveUsage } from './session-usage.js'; import { agyImageTool } from './agy-image.js'; import { agyBrowserTool, agySearchTool } from './agy-web.js'; @@ -501,6 +503,8 @@ export class AgyAdapter implements AgentAdapter { forkInto: false, quota: true, }; + onModelsChanged?: (models: ModelOption[]) => void; + private modelGeneration = 0; private modelCache: { at: number; models: ModelOption[] } | null = null; private readonly commandCache = new Map }>(); @@ -516,6 +520,21 @@ export class AgyAdapter implements AgentAdapter { return commandExists(this.command[0]); } + createAccount(directory: string): Promise> { + return copyAgyAccount(configDirectory(this.env, 'LOOCHAT_AGY_HOME', ['.gemini', 'antigravity-cli'], process.cwd()), + this.env.HOME ?? process.env.HOME ?? homedir(), directory, this.env); + } + + startLogin(onSuccess: (account?: string) => Promise) { + return startAgyLogin(this.command, this.env, async account => { + this.modelCache = null; + this.modelGeneration++; + this.commandCache.clear(); + await onSuccess(account); + void this.models(true).catch(() => {}); + }); + } + // Literal hard-quota message shipped in the CLI; do not classify HTTP 429 or disk quota errors. planExhausted(message: string): boolean { return /You have exhausted your quota on this model\./i.test(message); } @@ -534,14 +553,24 @@ export class AgyAdapter implements AgentAdapter { } async models(refresh = false): Promise { - if (refresh) this.modelCache = null; + if (refresh) { this.modelCache = null; this.modelGeneration++; } if (this.modelCache && Date.now() - this.modelCache.at < MODELS_TTL_MS) return this.modelCache.models; + const generation = this.modelGeneration; const [bin, ...base] = this.command; const stdout = await new Promise((resolve, reject) => { - execFile(bin, [...base, 'models'], { timeout: 30_000, env: { ...process.env, ...this.env } }, (err, out) => (err ? reject(err) : resolve(out))); + execFile(bin, [...base, 'models'], { timeout: 30_000, env: { ...process.env, ...this.env } }, (err, out, stderr) => { + if (!err) { resolve(out); return; } + // Native signed-out diagnostic only; network, quota and process errors retain their meaning. + if (/^\s*(?:Error:\s*)?Please sign in to view available models\.(?: Launch the CLI without arguments to sign in\.)?\s*$/m.test(stderr)) { + reject(new HttpError(409, 'Antigravity is not signed in', { code: 'agent_login_required' })); + } else reject(err); + }); }); const models = parseAgyModels(stdout); - if (models.length > 0) this.modelCache = { at: Date.now(), models }; + if (generation === this.modelGeneration) { + if (models.length > 0) this.modelCache = { at: Date.now(), models }; + if (refresh) this.onModelsChanged?.(models); + } return models; } @@ -602,7 +631,9 @@ export class AgyAdapter implements AgentAdapter { } resumeCommand(agentSessionId: string): string { - return `agy --conversation ${agentSessionId}`; + const prefix = Object.entries(this.env).filter(([key, value]) => ['HOME', 'XDG_CONFIG_HOME', 'XDG_DATA_HOME', 'XDG_CACHE_HOME'].includes(key) || (AGY_AUTH_ENV.includes(key) && value === '')) + .map(([key, value]) => `${key}=${quoteArg(value)}`).join(' '); + return `${prefix ? `env ${prefix} ` : ''}${this.command.map(quoteArg).join(' ')} --conversation ${quoteArg(agentSessionId)}`; } async sessionLocation(agentSessionId: string | null, cwd: string) { @@ -651,7 +682,7 @@ export class AgyAdapter implements AgentAdapter { /** agy saves what it generates (images, among other things) in a folder of its own per conversation. */ artifactDirs(agentSessionId: string): string[] { if (!/^[0-9a-f-]{8,64}$/i.test(agentSessionId)) return []; - const home = this.env.LOOCHAT_AGY_HOME || process.env.LOOCHAT_AGY_HOME || join(homedir(), '.gemini', 'antigravity-cli'); + const home = configDirectory(this.env, 'LOOCHAT_AGY_HOME', ['.gemini', 'antigravity-cli'], process.cwd()); return [join(home, 'brain', agentSessionId)]; } diff --git a/apps/workbench/packages/daemon/src/adapters/code-login.ts b/apps/workbench/packages/daemon/src/adapters/code-login.ts new file mode 100644 index 0000000000..fac71209f9 --- /dev/null +++ b/apps/workbench/packages/daemon/src/adapters/code-login.ts @@ -0,0 +1,75 @@ +import { spawn } from 'node:child_process'; +import { stripVTControlCharacters } from 'node:util'; +import { HttpError } from '../errors.js'; +import type { LoginSession, LoginState } from './types.js'; + +/** Native CLIs own OAuth and credential storage; the hub relays only a URL and one code. */ +export function startCodeLogin(command: string[], env: NodeJS.ProcessEnv, authorize: (url: URL) => boolean, + verify: () => Promise, onSuccess: (account?: string) => Promise, + timeoutMs = 10 * 60_000, input?: LoginState['input']): LoginSession { + let state: LoginState = { status: 'starting' }; + let output = ''; + const child = spawn(command[0], command.slice(1), { env, stdio: ['pipe', 'pipe', 'pipe'] }); + let stopped = false; + const stop = () => { + if (child.exitCode === null && !stopped) { + stopped = true; + child.kill('SIGTERM'); + const force = setTimeout(() => { if (child.exitCode === null) child.kill('SIGKILL'); }, 1000); + force.unref(); + child.once('close', () => clearTimeout(force)); + } + }; + const fail = (error: LoginState['error']) => { + if (['success', 'error', 'cancelled'].includes(state.status)) return; + state = { status: 'error', error }; + clearTimeout(timer); + stop(); + }; + const timer = setTimeout(() => fail('expired'), timeoutMs); + timer.unref(); + const receive = (chunk: Buffer) => { + if (state.status !== 'starting') return; + output = (output + stripVTControlCharacters(chunk.toString())).slice(-64 * 1024); + for (const match of output.matchAll(/https:\/\/[^\s<>"']+(?=\s)/g)) { + try { + const url = new URL(match[0]); + if (url.username || url.password || !authorize(url)) continue; + state = { status: 'waiting', url: url.href }; + output = ''; + break; + } catch { /* Wait for a complete URL. */ } + } + }; + child.stdout.on('data', receive); + child.stderr.on('data', receive); + child.stdin.on('error', () => fail('failed')); + child.on('error', () => fail('unavailable')); + child.on('close', async (code) => { + if (state.status === 'cancelled' || state.status === 'error') return; + if (code !== 0) { fail('failed'); return; } + state = { status: 'submitting' }; + try { + const account = await verify(); + if (state.status !== 'submitting') return; + await onSuccess(account); + if (state.status !== 'submitting') return; + clearTimeout(timer); + state = { status: 'success' }; + } catch { fail('verification'); } + }); + return { + state: () => ({ ...state, ...(input ? { input } : {}) }), + submit(code) { + if (state.status !== 'waiting') throw new HttpError(409, 'login is not waiting for a code'); + if (!code || code.length > 4096 || /\s|[\x00-\x1f\x7f]/.test(code)) throw new HttpError(400, 'invalid login code'); + state = { status: 'submitting' }; + child.stdin.write(code + '\n'); + }, + cancel() { + clearTimeout(timer); + if (state.status !== 'success') state = { status: 'cancelled' }; + stop(); + }, + }; +} diff --git a/apps/workbench/packages/daemon/src/adapters/codex.ts b/apps/workbench/packages/daemon/src/adapters/codex.ts index d9ef68a11d..685876a4f0 100644 --- a/apps/workbench/packages/daemon/src/adapters/codex.ts +++ b/apps/workbench/packages/daemon/src/adapters/codex.ts @@ -4,7 +4,7 @@ import type { SessionHooks } from './types.js'; import { nativeQuestions } from './questions.js'; import type { WorkMode } from './types.js'; import { CodexUsage } from './usage.js'; -import { cliDiagnostic } from './diagnostics.js'; +import { agentLoginRequired, cliDiagnostic } from './diagnostics.js'; import { trackCompaction } from './compaction.js'; import { goalSnapshot, goalSummary, parseGoalCommand, type GoalControl, type GoalCommand, type GoalSnapshot } from './native-goal.js'; import { sessionEnvironment } from './types.js'; @@ -1171,6 +1171,14 @@ export class CodexAppServerAdapter implements AgentAdapter { private async readModels(): Promise { return this.withServer(async (peer) => { + // model/list can return a public catalog even when the account cannot run a turn. + // Custom providers explicitly opt out; older servers may not expose account/read. + try { + const auth = await peer.request('account/read', { refreshToken: false }); + if (auth?.requiresOpenaiAuth === true && auth.account === null) throw agentLoginRequired(this.label); + } catch (error) { + if (!(error instanceof RpcError && error.code === -32601)) throw error; + } const models: any[] = []; let cursor: string | undefined; for (let page = 0; page < 20; page++) { diff --git a/apps/workbench/packages/daemon/src/adapters/diagnostics.ts b/apps/workbench/packages/daemon/src/adapters/diagnostics.ts index ddb746e361..19b0b10d5a 100644 --- a/apps/workbench/packages/daemon/src/adapters/diagnostics.ts +++ b/apps/workbench/packages/daemon/src/adapters/diagnostics.ts @@ -1,4 +1,18 @@ import { execFile } from 'node:child_process'; +import { HttpError } from '../errors.js'; + +export const agentLoginRequired = (label: string): HttpError => + new HttpError(409, `${label} is not signed in`, { code: 'agent_login_required' }); + +/** Native catalog diagnostics only. A timeout, quota denial or bare HTTP 401 is not proof of logout. */ +export function modelLoginFailure(error: unknown, label: string): unknown { + if ((error as { data?: { reason?: string } } | null)?.data?.reason === 'claude_subscription_not_supported') return error; + const message = error instanceof Error ? error.message : ''; + if (/^(?:Error:\s*|zcode:)?(?:not (?:logged|signed) in\b|(?:authentication|login|sign.in) required\b|please (?:sign|log) in\b|no API key (?:found )?for\b)/im.test(message)) { + return agentLoginRequired(label); + } + return error; +} export interface RuntimeDiagnostic { protocol: string; version: string | null } diff --git a/apps/workbench/packages/daemon/src/adapters/jsonrpc.ts b/apps/workbench/packages/daemon/src/adapters/jsonrpc.ts index 259d190e12..5090bbbff1 100644 --- a/apps/workbench/packages/daemon/src/adapters/jsonrpc.ts +++ b/apps/workbench/packages/daemon/src/adapters/jsonrpc.ts @@ -16,6 +16,7 @@ export class RpcError extends Error { constructor( message: string, readonly code: number, + readonly data?: { reason?: string }, ) { super(message); } @@ -107,7 +108,7 @@ export class JsonRpcPeer { const p = this.pending.get(msg.id); if (!p) return; this.pending.delete(msg.id); - if (msg.error) p.reject(new RpcError(msg.error.message ?? 'RPC error', msg.error.code ?? -32000)); + if (msg.error) p.reject(new RpcError(msg.error.message ?? 'RPC error', msg.error.code ?? -32603, msg.error.data)); else p.resolve(msg.result); return; } diff --git a/apps/workbench/packages/daemon/src/adapters/types.ts b/apps/workbench/packages/daemon/src/adapters/types.ts index 4256fe2d1c..b73ec0ee3a 100644 --- a/apps/workbench/packages/daemon/src/adapters/types.ts +++ b/apps/workbench/packages/daemon/src/adapters/types.ts @@ -509,6 +509,7 @@ export interface AgentAdapter { export interface LoginState { status: 'starting' | 'waiting' | 'submitting' | 'success' | 'error' | 'cancelled'; url?: string; + input?: 'code-or-url'; error?: 'failed' | 'expired' | 'unavailable' | 'verification'; } diff --git a/apps/workbench/packages/daemon/src/agents.ts b/apps/workbench/packages/daemon/src/agents.ts index 9d2bbf1283..64247bfc52 100644 --- a/apps/workbench/packages/daemon/src/agents.ts +++ b/apps/workbench/packages/daemon/src/agents.ts @@ -207,7 +207,7 @@ export class AgentRegistry { private creating: Promise = Promise.resolve(); private writing: Promise = Promise.resolve(); - /** Entries of agents.json whose adapter this version does not have: kept, never started. */ + /** Inactive agents.json entries (unsupported adapters or installer backups): kept, never started. */ private readonly retired: AgentInstance[] = []; constructor( @@ -223,7 +223,16 @@ export class AgentRegistry { // left out, so an old agents.json neither stops the hub nor loses the entry on the next save. const known = new Set(SUPPORTED_AGENTS.map(meta => meta.adapter)); instances = instances.filter(instance => { - if (known.has(instance?.adapter)) return true; + // Keep mistakenly auto-discovered backup executables on disk, outside the active registry. + if (known.has(instance?.adapter)) { + const name = basenameOf(instance.command); + if (!instance.account && !Object.keys(instance.env ?? {}).length && instance.id === name && + isCliBackup(name) && KNOWN_PREFIXES.some(([adapter, re]) => adapter === instance.adapter && re.test(name))) { + this.retired.push(instance); + return false; + } + return true; + } this.retired.push(instance); console.warn(`warning: agents.json entry ${JSON.stringify(instance?.id ?? null)} uses ${JSON.stringify(instance?.adapter ?? null)}, which this version no longer supports; it is kept in the file and not started`); return false; @@ -411,6 +420,15 @@ export class AgentRegistry { return login.session; } + /** Returns the in-progress login session for an agent, so any client can resume entering its code. */ + activeLogin(agent: string): ({ id: string } & ReturnType) | undefined { + const entry = this.logins.get(agent); + if (!entry) return undefined; + const state = entry.session.state(); + if (!['starting', 'waiting', 'submitting'].includes(state.status)) return undefined; + return { id: entry.id, ...state }; + } + dispose(): void { if (this.autoJoinTimer) clearInterval(this.autoJoinTimer); this.autoJoinTimer = null; @@ -588,7 +606,7 @@ export class AgentRegistry { continue; // unreadable or gone } for (const name of names) { - if (taken.has(name) || seen.has(name)) continue; + if (taken.has(name) || seen.has(name) || isCliBackup(name)) continue; const adapter = KNOWN_PREFIXES.find(([, re]) => re.test(name))?.[0]; if (!adapter) continue; const full = join(dir, name); @@ -769,3 +787,8 @@ function realPathOf(path: string): string { return resolve(path); } } + +/** Installer backups are files, not additional CLI accounts. */ +function isCliBackup(name: string): boolean { + return /(?:\.(?:old|bak|backup|orig|tmp)|~)$/i.test(name); +} diff --git a/apps/workbench/packages/daemon/src/http.ts b/apps/workbench/packages/daemon/src/http.ts index fbb869542a..6939947867 100644 --- a/apps/workbench/packages/daemon/src/http.ts +++ b/apps/workbench/packages/daemon/src/http.ts @@ -601,7 +601,10 @@ export function createHttpServer(deps: HttpDeps): Server { } // GET /api/agents - if (method === 'GET' && path === '/api/agents') return sendJson(res, 200, await manager.listAgents()); + if (method === 'GET' && path === '/api/agents') { + res.setHeader('Cache-Control', 'no-store'); + return sendJson(res, 200, await manager.listAgents()); + } // GET /api/agents/supported: all agent types supported by the hub if (method === 'GET' && path === '/api/agents/supported') { diff --git a/apps/workbench/packages/daemon/src/index.ts b/apps/workbench/packages/daemon/src/index.ts index bd5fa32d4a..7e385dad06 100644 --- a/apps/workbench/packages/daemon/src/index.ts +++ b/apps/workbench/packages/daemon/src/index.ts @@ -1,3 +1,9 @@ +import { serveLifecycle } from './workbench-lifecycle.js'; +import { once } from 'node:events'; +import { dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; +import type { Server } from 'node:http'; +import { coreUrl } from './adapters/loopx/proxy.js'; import { personalServer } from './personal.js'; import { PushService } from './push.js'; import { FeishuChat } from './feishu-chat.js'; @@ -40,6 +46,9 @@ async function main(): Promise { adoptLegacyEnv(); loadDotEnv(); adoptLegacyEnv(); + // Launch authority belongs to this daemon, never to agent/tool children. + const lifecycleSocket = process.env.LOOCHAT_LIFECYCLE_SOCKET; + delete process.env.LOOCHAT_LIFECYCLE_SOCKET; const config = loadConfig(); // Empty LOOCHAT_WORKDIRS means "only the directory the daemon was started in". @@ -115,7 +124,10 @@ async function main(): Promise { // Directories added from the page are kept next to the hub's data; threads in no project work in // a scratch area there too. const dirs = new Workdirs(workdirs, join(config.dataDir, 'workdirs.json'), join(config.dataDir, 'scratch')); - const manager = new ThreadManager(store, adapters, dirs, new AttachmentStore(config.dataDir), () => registry.list()); + const manager = new ThreadManager(store, adapters, dirs, new AttachmentStore(config.dataDir), () => registry.list().map((item) => { + const activeLogin = registry.activeLogin(item.id); + return activeLogin ? { ...item, activeLogin } : item; + })); // The session list scans once here and then only when a request finds it stale; the meter keeps // its own timer, files only. Stopped in shutdown with everything else. // LoopX Goal conversations: bindings, the core client and the Goal context; ordinary threads never touch it. @@ -248,6 +260,7 @@ async function main(): Promise { } }, 3000).unref(); + let lifecycle: Server | undefined; const shutdown = async (signal: string) => { console.log(`${signal} received, shutting down`); server.close(); @@ -280,10 +293,24 @@ async function main(): Promise { terminals.dispose(); desktop.dispose(); store.close(); + lifecycle?.close(); process.exit(0); }; process.on('SIGINT', () => void shutdown('SIGINT')); process.on('SIGTERM', () => void shutdown('SIGTERM')); + if (lifecycleSocket) { + if (!server.listening) await once(server, 'listening'); + const host = config.host === '0.0.0.0' || config.host === '::' ? '127.0.0.1' : config.host; + const url = `http://${host.includes(':') ? `[${host}]` : host}:${config.port}`; + lifecycle = await serveLifecycle(lifecycleSocket, { + url, appDir: dirname(dirname(dirname(dirname(fileURLToPath(import.meta.url))))), + dataDir: config.dataDir, coreUrl: coreUrl().toString(), + running: () => [...manager.listThreads(), ...manager.listThreads({ archived: true })] + .filter(thread => thread.status === 'running').length, + loginLink: async () => `${url}/#token=${(await linkTokens.issue()).token}`, + shutdown: () => shutdown('workbench stop'), + }); + } } main().catch((err) => { diff --git a/apps/workbench/packages/daemon/src/threads.ts b/apps/workbench/packages/daemon/src/threads.ts index 858b8246cb..5c8b2bc787 100644 --- a/apps/workbench/packages/daemon/src/threads.ts +++ b/apps/workbench/packages/daemon/src/threads.ts @@ -14,8 +14,8 @@ import type { VoiceTransport } from './voice-sessions.js'; import { VoiceConversation } from './voice-conversation.js'; import { turnOutcome } from './lifecycle.js'; import { UserInputs } from './user-input.js'; -import type { SystemPrompt, WorkMode } from './adapters/types.js'; -import { diagnosticFailure } from './adapters/diagnostics.js'; +import type { LoginState, SystemPrompt, WorkMode } from './adapters/types.js'; +import { diagnosticFailure, modelLoginFailure } from './adapters/diagnostics.js'; import { turnAnswer, type CoordinationManager, type CoordinationSetup } from './coordination.js'; import { Injections, type InjectionGate } from './injections.js'; import type { LoopxHooks } from './adapters/loopx/service.js'; @@ -275,6 +275,8 @@ export interface AgentInfo { streamBridgeEnabled?: boolean; /** How it can be signed in from the hub, when its adapter can start the CLI's login. */ login?: 'terminal' | 'wizard'; + /** In-progress login owned by the daemon, recoverable after page navigation. */ + activeLogin?: { id: string } & LoginState; capabilities: AgentAdapter['capabilities']; } @@ -394,7 +396,7 @@ export class ThreadManager { workdirs: string[] | Workdirs, private readonly attachments: AttachmentStore, /** What each instance is beyond its adapter: its adapter kind and linked account. */ - private readonly agentMeta: () => Array<{ id: string; adapter?: string; account?: string | null; hidden?: boolean }> = () => [], + private readonly agentMeta: () => Array<{ id: string; adapter?: string; account?: string | null; hidden?: boolean; activeLogin?: { id: string } & LoginState }> = () => [], ) { this.dirs = Array.isArray(workdirs) ? new Workdirs(workdirs) : workdirs; this.references = new ContextReferences(store, this); @@ -476,6 +478,7 @@ export class ThreadManager { ...(m?.hidden !== undefined ? { hidden: m.hidden } : {}), available: await a.available(), ...(a.startLogin ? { login: 'wizard' as const } : a.loginCommand ? { login: 'terminal' as const } : {}), + ...(m?.activeLogin ? { activeLogin: m.activeLogin } : {}), capabilities: a.capabilities, ...(a.capabilities.streamBridge ? { streamBridgeEnabled: a.streamBridgeEnabled ?? false } : {}), }); @@ -1092,7 +1095,7 @@ export class ThreadManager { ts: new Date().toISOString(), data: { agent, models } }; for (const listener of this.listeners) listener(event); }; - return adapter.models(refresh); + return adapter.models(refresh).catch(error => { throw modelLoginFailure(error, adapter.label); }); } async listModels(agent: string, refresh = false): Promise { diff --git a/apps/workbench/packages/daemon/src/workbench-lifecycle.ts b/apps/workbench/packages/daemon/src/workbench-lifecycle.ts new file mode 100644 index 0000000000..febf2d028a --- /dev/null +++ b/apps/workbench/packages/daemon/src/workbench-lifecycle.ts @@ -0,0 +1,47 @@ +/** Local CLI lifecycle, on its own private socket. Never exposed over HTTP or relay. */ +import { createServer, type Server } from 'node:http'; +import { randomUUID } from 'node:crypto'; +import { listenPrivate } from './http.js'; + +export async function serveLifecycle(socket: string, deps: { + url: string; appDir: string; dataDir: string; coreUrl: string; + running: () => number; + loginLink: () => Promise; + shutdown: () => Promise; +}): Promise { + const instance = randomUUID(); + let stopping = false; + const server = createServer((req, res) => { + const reply = (status: number, body: object) => { + res.writeHead(status, { 'Content-Type': 'application/json', 'Cache-Control': 'no-store' }); + res.end(JSON.stringify(body)); + }; + void (async () => { + if (req.headers.origin) return reply(403, { ok: false, error: 'Local CLI only.' }); + if (req.method === 'GET' && req.url === '/status') { + const reachable = await fetch(new URL('/healthz', deps.coreUrl), { signal: AbortSignal.timeout(1500) }) + .then(r => r.ok, () => false); + return reply(200, { ok: true, service: 'loopx-workbench', instance_id: instance, + state: stopping ? 'stopping' : 'running', pid: process.pid, parent_pid: process.ppid, url: deps.url, + app_dir: deps.appDir, data_dir: deps.dataDir, running_threads: deps.running(), + core: { url: new URL(deps.coreUrl).origin, reachable } }); + } + if (req.headers['x-loopx-instance'] !== instance) return reply(409, { ok: false, error: 'Workbench instance changed; retry status.' }); + if (stopping) return reply(409, { ok: false, error: 'Workbench is stopping.' }); + if (req.method === 'POST' && req.url === '/access') { + return reply(200, { ok: true, access_url: await deps.loginLink() }); + } + if (req.method === 'POST' && (req.url === '/stop' || req.url === '/stop?force=1')) { + const running = deps.running(); + if (running && req.url !== '/stop?force=1') return reply(409, { ok: false, + error: `${running} running turn(s); wait for them or use stop --force to interrupt them.` }); + stopping = true; + res.once('finish', () => { void deps.shutdown(); }); + return reply(200, { ok: true, state: 'stopping', instance_id: instance }); + } + reply(404, { ok: false, error: 'Unknown lifecycle operation.' }); + })().catch(() => reply(500, { ok: false, error: 'Lifecycle operation failed; see daemon.log.' })); + }); + if (!await listenPrivate(server, socket)) throw new Error('Another lifecycle owner already uses this socket.'); + return server; +} diff --git a/apps/workbench/packages/daemon/test/adapters.test.ts b/apps/workbench/packages/daemon/test/adapters.test.ts index b16f3e395a..1efc9f41e1 100644 --- a/apps/workbench/packages/daemon/test/adapters.test.ts +++ b/apps/workbench/packages/daemon/test/adapters.test.ts @@ -772,7 +772,8 @@ test('AgyAdapter: models, a turn with a tool, and several turns in one process', assert.equal(await new AgyAdapter(['definitely-not-installed-agy']).available(), false); assert.deepEqual((await adapter.models()).map((m) => m.id), ['fast-low', 'fast-high', 'big-thinking']); assert.ok((await adapter.commands()).some((c) => c.name === 'usage')); - assert.equal(adapter.resumeCommand('abc'), 'agy --conversation abc'); + assert.match(adapter.resumeCommand('abc'), /fake-agy\.mjs' --conversation 'abc'$/); + assert.equal(new AgyAdapter().resumeCommand('abc'), "'agy' --conversation 'abc'"); const session = await adapter.start({ cwd: here, model: 'fast-low' }); try { diff --git a/apps/workbench/packages/daemon/test/agent-accounts.test.ts b/apps/workbench/packages/daemon/test/agent-accounts.test.ts index f67c158bc5..029fdcf61a 100644 --- a/apps/workbench/packages/daemon/test/agent-accounts.test.ts +++ b/apps/workbench/packages/daemon/test/agent-accounts.test.ts @@ -1,3 +1,4 @@ +import { startAgyLogin } from '../src/adapters/agy-account.js'; import { test, before, after } from 'node:test'; import assert from 'node:assert/strict'; import { existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync, symlinkSync, writeFileSync } from 'node:fs'; @@ -35,7 +36,7 @@ before(async () => { mkdirSync(join(source, 'projects')); writeFileSync(join(source, 'projects', 'old.jsonl'), 'old conversation'); registry = new AgentRegistry([{ id: 'claude', adapter: 'claude', command: [process.execPath, acp], env: { CLAUDE_CONFIG_DIR: source, LOOCHAT_CLAUDE_BIN: fixture } }], join(root, 'agents.json')); store = new Store(root); - manager = new ThreadManager(store, registry.adapters, [root], new AttachmentStore(root), () => registry.list()); + manager = new ThreadManager(store, registry.adapters, [root], new AttachmentStore(root), () => registry.list().map(item => ({ ...item, activeLogin: registry.activeLogin(item.id) }))); server = createHttpServer({ manager, registry, token, webDir: null, version: 'test' }); await new Promise(resolve => server.listen(0, '127.0.0.1', resolve)); base = `http://127.0.0.1:${(server.address() as AddressInfo).port}`; @@ -116,6 +117,7 @@ test('bad codes can restart; stale sessions and cancelled sessions cannot accept assert.equal((await api(`${path}/${second.id}`, 'DELETE')).status, 204); assert.equal((await api(`${path}/${second.id}`, 'POST', { code: 'test-code#test-state' })).status, 409); assert.equal((await (await api(`${path}/${second.id}`)).json() as any).status, 'cancelled'); + assert.equal(registry.activeLogin('claude-3'), undefined); }); test('native login times out, refuses unsuccessful status, and handles missing CLI', async () => { @@ -147,3 +149,226 @@ test('persistence errors leave no new account directory or live registration', a assert.deepEqual(readdirSync(join(root, 'agent-accounts')), dirs); assert.equal(readdirSync(root).some(name => name.startsWith('unwritable-file.') && name.endsWith('.tmp')), false); }); + +test('agy account API isolates native home, copies portable settings, and keeps credentials and trust behind', async () => { + const home = join(root, "agy's original home"); + const config = join(home, '.gemini', 'antigravity-cli'); + mkdirSync(join(config, 'skills', 'sample'), { recursive: true }); + writeFileSync(join(config, 'skills', 'sample', 'SKILL.md'), 'Original agy skill'); + symlinkSync(join(config, 'skills', 'sample'), join(config, 'skills', 'linked')); + mkdirSync(join(home, '.agents', 'skills', 'shared'), { recursive: true }); + writeFileSync(join(home, '.agents', 'skills', 'shared', 'SKILL.md'), 'Shared skill'); + writeFileSync(join(config, 'settings.json'), JSON.stringify({ colorScheme: 'dark', trustedWorkspaces: ['/private'], apiKey: 'original-key', auth: { token: 'original-token' } })); + mkdirSync(join(home, '.gemini', 'config')); + writeFileSync(join(home, '.gemini', 'config', 'mcp_config.json'), JSON.stringify({ mcpServers: { docs: { command: 'docs' } }, oauthTokens: { docs: 'old-mcp-token' } })); + writeFileSync(join(config, 'antigravity-oauth-token'), 'original agy credentials'); + mkdirSync(join(config, 'conversations')); writeFileSync(join(config, 'conversations', 'original.db'), 'original session'); + const command = [process.execPath, fileURLToPath(new URL('./fixtures/fake-agy.mjs', import.meta.url))]; + await registry.add({ id: 'agy', adapter: 'agy', command, env: { HOME: home, LOOCHAT_AGY_HOME: config, + GOOGLE_API_KEY: 'old-api-key', GEMINI_API_KEY: 'old-gemini-key', GOOGLE_APPLICATION_CREDENTIALS: '/old/credentials', + FAKE_AGY_ACCOUNT_CHECK: '1', FAKE_LIVE_USAGE: '1' } }); + const supported = await (await api('/api/agents/supported')).json() as any[]; + assert.equal(supported.find(item => item.adapter === 'agy').capabilities.createAccount, true); + const response = await api('/api/agents/accounts', 'POST', { adapter: 'agy', sourceId: 'agy', label: 'Independent agy' }); + assert.equal(response.status, 201); + const instance = await response.json() as any; + assert.equal(instance.id, 'agy-2'); assert.equal(instance.account, null); + assert.deepEqual(instance.command, command); + const directory = instance.env.LOOCHAT_AGY_HOME; + assert.equal(directory, join(instance.env.HOME, '.gemini', 'antigravity-cli')); + assert.notEqual(instance.env.HOME, home); + assert.equal(statSync(instance.env.HOME).mode & 0o777, 0o700); + assert.equal(instance.env.XDG_CONFIG_HOME, join(instance.env.HOME, '.config')); + for (const key of ['GOOGLE_API_KEY', 'GEMINI_API_KEY', 'GOOGLE_APPLICATION_CREDENTIALS']) assert.equal(instance.env[key], ''); + assert.equal(existsSync(join(directory, 'antigravity-oauth-token')), false); + assert.equal(existsSync(join(directory, 'conversations')), false); + assert.deepEqual(JSON.parse(readFileSync(join(directory, 'settings.json'), 'utf8')), { colorScheme: 'dark' }); + assert.deepEqual(JSON.parse(readFileSync(join(instance.env.HOME, '.gemini', 'config', 'mcp_config.json'), 'utf8')), { mcpServers: { docs: { command: 'docs' } } }); + writeFileSync(join(directory, 'skills', 'linked', 'SKILL.md'), 'Changed new agy skill'); + assert.equal(readFileSync(join(config, 'skills', 'sample', 'SKILL.md'), 'utf8'), 'Original agy skill'); + assert.equal(readFileSync(join(instance.env.HOME, '.agents', 'skills', 'shared', 'SKILL.md'), 'utf8'), 'Shared skill'); + const agents = await (await api('/api/agents')).json() as any[]; + assert.equal(agents.find(a => a.id === 'agy-2').login, 'wizard'); + const before = readdirSync(join(root, 'agent-accounts')); + writeFileSync(join(config, 'settings.json'), '{broken'); + try { await assert.rejects(registry.createAccount({ adapter: 'agy', sourceId: 'agy' })); } + finally { writeFileSync(join(config, 'settings.json'), '{}'); } + assert.deepEqual(readdirSync(join(root, 'agent-accounts')), before); + assert.equal(readFileSync(join(config, 'antigravity-oauth-token'), 'utf8'), 'original agy credentials'); +}); + +test('agy native login accepts a callback URL, persists identity, and uses that account for quota, models and resumed turns', async () => { + const path = '/api/agents/agy-2/login'; + const login = await (await api(path, 'POST')).json() as any; + assert.equal((await (await api(path, 'POST')).json() as any).id, login.id); + const sessionPath = `${path}/${login.id}`; + const waiting = await waitFor(async () => (await api(sessionPath)).json() as any, item => item.status === 'waiting'); + assert.equal(new URL(waiting.url).hostname, 'accounts.google.com'); + assert.equal(new URL(waiting.url).searchParams.get('redirect_uri'), 'https://antigravity.google/oauth-callback'); + assert.equal(waiting.input, 'code-or-url'); + const listed = await api('/api/agents'); + assert.equal(listed.headers.get('Cache-Control'), 'no-store'); + const resumed = (await listed.json() as any[]).find(item => item.id === 'agy-2').activeLogin; + assert.deepEqual(resumed, waiting, 'another client can recover the same pending login'); + assert.equal(JSON.stringify(resumed).includes('fixture-agy-access'), false); + assert.equal((await api('/api/agents', 'GET', undefined, false)).status, 401); + assert.equal(JSON.stringify(JSON.parse(readFileSync(join(root, 'agents.json'), 'utf8'))).includes('activeLogin'), false); + + assert.equal((await api(sessionPath, 'POST', { code: 'code\ncommand' })).status, 400); + assert.equal((await api(sessionPath, 'POST', { code: 'https://antigravity.google/oauth-callback?code=test-agy-code&state=fixture' })).status, 200); + const done = await waitFor(async () => (await api(sessionPath)).json() as any, item => item.status === 'success'); + assert.equal(done.url, undefined); assert.doesNotMatch(JSON.stringify(done), /fixture-agy/); + assert.equal(registry.get('agy-2').account, 'agy-new@example.com'); + assert.equal(registry.activeLogin('agy-2'), undefined); + assert.equal((await (await api('/api/agents')).json() as any[]).find(item => item.id === 'agy-2').activeLogin, undefined); + const saved = JSON.parse(readFileSync(join(root, 'agents.json'), 'utf8')).agents.find((a: any) => a.id === 'agy-2'); + assert.equal(saved.account, 'agy-new@example.com'); + assert.deepEqual(saved.env, registry.get('agy-2').env); + const adapter = registry.adapters.get('agy-2')!; + assert.ok((await adapter.models()).length > 0); + assert.ok((await adapter.fetchQuota!()).windows.length > 0); + const hooks = { emit: () => {}, requestApproval: async () => ({ cancelled: true as const }) }; + let session = await adapter.start({ cwd: root }); + try { assert.equal((await session.prompt({ text: 'live usage', images: [] }, hooks)).stopReason, 'end_turn'); } + finally { await session.close(); } + const id = session.agentSessionId!; + session = await adapter.start({ cwd: root, resumeId: id }); + try { assert.equal((await session.prompt({ text: 'again', images: [] }, hooks)).stopReason, 'end_turn'); } + finally { await session.close(); } + const config = saved.env.LOOCHAT_AGY_HOME; + const location = await adapter.sessionLocation!(id, root); + assert.equal(location.configDir, config); assert.ok(location.sessionPath?.startsWith(config)); + assert.match(adapter.resumeCommand!(id), /env HOME=/); + assert.doesNotMatch(adapter.resumeCommand!(id), /old-api-key|old-gemini-key/); + assert.match(adapter.resumeCommand!(id), /GOOGLE_API_KEY=''/); + assert.equal(readFileSync(join(registry.get('agy').env!.LOOCHAT_AGY_HOME, 'antigravity-oauth-token'), 'utf8'), 'original agy credentials'); +}); + +test('agy login handles invalid codes, cancellation, timeout and native success without saved credentials', async () => { + const instance = await registry.createAccount({ adapter: 'agy', sourceId: 'agy' }); + const command = instance.command!; + const make = (env = instance.env!, timeout?: number) => startAgyLogin(command, env, async () => { assert.fail('invalid login succeeded'); }, timeout); + const invalid = make(); + await waitFor(() => invalid.state(), s => s.status === 'waiting'); invalid.submit('wrong'); + await waitFor(() => invalid.state(), s => s.status === 'error'); assert.equal(invalid.state().error, 'failed'); + const cancelled = make(); + await waitFor(() => cancelled.state(), s => s.status === 'waiting'); cancelled.cancel(); + assert.equal(cancelled.state().status, 'cancelled'); assert.throws(() => cancelled.submit('test-agy-code')); + const expired = make(instance.env!, 50); + await waitFor(() => expired.state(), s => s.status === 'error'); assert.equal(expired.state().error, 'expired'); + const missing = startAgyLogin([join(root, 'missing-agy')], instance.env!, async () => {}); + await waitFor(() => missing.state(), s => s.status === 'error'); assert.equal(missing.state().error, 'unavailable'); + const unverified = make({ ...instance.env!, FAKE_AGY_AUTH_BAD_STATUS: '1' }); + await waitFor(() => unverified.state(), s => s.status === 'waiting'); unverified.submit('test-agy-code'); + await waitFor(() => unverified.state(), s => s.status === 'error'); assert.equal(unverified.state().error, 'verification'); +}); + +test('agy account API treats empty optional configuration as absent without changing the source', async () => { + const source = registry.get('agy').env!; + const settings = join(source.LOOCHAT_AGY_HOME, 'settings.json'); + const mcp = join(source.HOME, '.gemini', 'config', 'mcp_config.json'); + const original = [readFileSync(settings, 'utf8'), readFileSync(mcp, 'utf8')]; + try { + for (const [settingsText, mcpText] of [ + ['{}', ''], ['', '{"mcpServers":{"docs":{"command":"docs"}}}'], [' \n\t', '\n '], + ]) { + writeFileSync(settings, settingsText); writeFileSync(mcp, mcpText); + const response = await api('/api/agents/accounts', 'POST', { adapter: 'agy', sourceId: 'agy' }); + assert.equal(response.status, 201); + const instance = await response.json() as any; + assert.equal(instance.account, null); + assert.equal(existsSync(join(instance.env.LOOCHAT_AGY_HOME, 'antigravity-oauth-token')), false); + assert.equal(existsSync(join(instance.env.LOOCHAT_AGY_HOME, 'settings.json')), !!settingsText.trim()); + const copiedMcp = join(instance.env.HOME, '.gemini', 'config', 'mcp_config.json'); + assert.equal(existsSync(copiedMcp), !!mcpText.trim()); + if (mcpText.trim()) assert.deepEqual(JSON.parse(readFileSync(copiedMcp, 'utf8')), JSON.parse(mcpText)); + assert.equal(readFileSync(settings, 'utf8'), settingsText); + assert.equal(readFileSync(mcp, 'utf8'), mcpText); + } + } finally { writeFileSync(settings, original[0]); writeFileSync(mcp, original[1]); } +}); + +test('signed-out model catalog offers typed login recovery and publishes models for the same account', async () => { + const home = join(root, 'recovery-home'); + const config = join(home, '.gemini', 'antigravity-cli'); + mkdirSync(config, { recursive: true }); + const id = 'agy-recovery'; + const command = [process.execPath, fileURLToPath(new URL('./fixtures/fake-agy.mjs', import.meta.url))]; + await registry.add({ id, adapter: 'agy', command, env: { HOME: home, LOOCHAT_AGY_HOME: config, FAKE_AGY_LOGIN_REQUIRED: '1' } }); + const denied = await api(`/api/agents/${id}/models`); + assert.equal(denied.status, 409, 'agent login must not invalidate the Workbench token'); + assert.deepEqual(await denied.json(), { error: 'Antigravity is not signed in', code: 'agent_login_required' }); + const events: any[] = []; + const off = manager.subscribe(event => { if (event.type === 'agent.modelsChanged') events.push(event); }); + try { + const login = await (await api(`/api/agents/${id}/login`, 'POST')).json() as any; + const sessionPath = `/api/agents/${id}/login/${login.id}`; + await waitFor(async () => (await api(sessionPath)).json() as any, state => state.status === 'waiting'); + await api(sessionPath, 'POST', { code: 'test-agy-code' }); + await waitFor(() => events, list => list.some(event => event.data.agent === id && event.data.models.length > 0)); + const response = await api(`/api/agents/${id}/models`); + assert.equal(response.status, 200); + assert.ok((await response.json() as any[]).some(model => model.id === 'fast-low')); + assert.equal(registry.get(id).account, 'agy-new@example.com'); + } finally { off(); } +}); + +test('non-authentication model failures retain their error meaning', async () => { + const command = [process.execPath, fileURLToPath(new URL('./fixtures/fake-agy.mjs', import.meta.url))]; + await registry.add({ id: 'agy-network-error', adapter: 'agy', command, env: { FAKE_AGY_MODELS_ERROR: 'upstream timed out; please check your connection' } }); + const response = await api('/api/agents/agy-network-error/models'); + assert.equal(response.status, 500); + const body = await response.json() as any; + assert.equal(body.code, undefined); + assert.match(body.error, /upstream timed out/); +}); + +// Each native protocol must reach the shared recovery UI, including non-default account ids. +for (const adapter of ['claude', 'codex', 'traex', 'zcode', 'pi', 'dsh'] as const) { + test(`${adapter}: missing authentication returns recovery and refresh uses that same account`, async () => { + const id = `${adapter}-signed-out`; + const marker = join(root, `${id}-authenticated`); + const script = adapter === 'codex' ? 'fake-codex.mjs' : adapter === 'zcode' ? 'fake-zcode.mjs' : adapter === 'pi' ? 'fake-pi.mjs' : 'fake-acp.mjs'; + await registry.add({ id, adapter, label: `${adapter} secondary`, command: [process.execPath, fileURLToPath(new URL(`./fixtures/${script}`, import.meta.url))], + env: { FAKE_LOGIN_FILE: marker, ...(adapter === 'traex' || adapter === 'dsh' ? { FAKE_ACP_FLAVOR: adapter } : {}) } }); + const response = await api(`/api/agents/${id}/models`); + assert.equal(response.status, 409, await response.clone().text()); + assert.equal((await response.json() as any).code, 'agent_login_required'); + assert.equal(existsSync(marker), false, 'a catalog read never signs in'); + writeFileSync(marker, 'fixture-authenticated'); + const restored = await api(`/api/agents/${id}/models?refresh=1`); + assert.equal(restored.status, 200, await restored.clone().text()); + assert.ok((await restored.json() as any[]).length > 0); + }); +} + +test('Codex custom providers and older account protocols keep their model catalog', async () => { + const command = [process.execPath, fileURLToPath(new URL('./fixtures/fake-codex.mjs', import.meta.url))]; + for (const [id, env] of [ + ['custom-provider', { FAKE_LOGIN_FILE: join(root, 'no-account'), FAKE_CUSTOM_PROVIDER: '1' }], + ['older-account-protocol', { FAKE_ACCOUNT_READ_UNSUPPORTED: '1' }], + ] as const) { + await registry.add({ id, adapter: 'codex', command, env }); + const response = await api(`/api/agents/${id}/models`); + assert.equal(response.status, 200, await response.clone().text()); + assert.ok((await response.json() as any[]).length > 0); + } +}); + + +test('non-login ACP failures and unsupported subscriptions retain their meaning', async () => { + const command = [process.execPath, acp]; + for (const [index, message, reason, code] of [ + [0, 'Upstream timed out', undefined, undefined], + [1, 'Usage limit reached', undefined, undefined], + [2, 'Authentication required: this integration does not support claude.ai subscriptions', 'claude_subscription_not_supported', undefined], + [3, 'Malformed RPC failure', undefined, 'invalid'], + ] as const) { + const id = `claude-non-login-${index}`; + await registry.add({ id, adapter: 'claude', command, env: { FAKE_ACP_START_ERROR: message, ...(code ? { FAKE_ACP_ERROR_CODE: code } : {}), ...(reason ? { FAKE_ACP_ERROR_CODE: '-32000', FAKE_ACP_ERROR_REASON: reason } : {}) } }); + const response = await api(`/api/agents/${id}/models`); + assert.equal(response.status, 500); + const body = await response.json() as any; + assert.equal(body.code, undefined); assert.equal(body.error, message); + } +}); diff --git a/apps/workbench/packages/daemon/test/agents.test.ts b/apps/workbench/packages/daemon/test/agents.test.ts index 85ff54690c..7a6b0652a2 100644 --- a/apps/workbench/packages/daemon/test/agents.test.ts +++ b/apps/workbench/packages/daemon/test/agents.test.ts @@ -180,7 +180,7 @@ test('discover finds extra CLIs on PATH and leaves lookalikes alone', async () = const bin = join(dir, 'bin'); mkdirSync(bin); const oldPath = process.env.PATH; - for (const name of ['agy2', 'claude2', 'ping', 'pix', 'pi', 'traecli']) { + for (const name of ['agy2', 'claude2', 'ping', 'pix', 'pi', 'traecli', 'agy.123.old', 'agy2.bak', 'agy3.backup', 'agy4.orig', 'agy5.tmp', 'agy6~']) { writeFileSync(join(bin, name), '#!/bin/sh\nexit 0\n'); chmodSync(join(bin, name), 0o755); } @@ -580,3 +580,17 @@ test('a removed account instance is remembered by its env, never by the binary i machine.restore(); } }); + +test('previously discovered backups stay on disk but leave the active registry; explicit accounts remain', async () => { + const backup = { id: 'agy.123.old', adapter: 'agy' as const, command: ['/opt/bin/agy.123.old'] }; + const account = { ...backup, id: 'agy2.bak', command: ['/opt/bin/agy2.bak'], env: { HOME: '/custom-account' } }; + const file = join(dir, 'backup-agents.json'); + const registry = new AgentRegistry([...defaults, backup, account], file); + assert.equal(registry.adapters.has(backup.id), false); + assert.equal(registry.adapters.has(account.id), true); + await registry.update('agy', { label: 'Antigravity' }); + const saved = JSON.parse(readFileSync(file, 'utf8')).agents; + assert.deepEqual(saved.find((entry: any) => entry.id === backup.id), backup); + assert.equal(new AgentRegistry(saved, file).adapters.has(backup.id), false); + registry.dispose(); +}); diff --git a/apps/workbench/packages/daemon/test/fixtures/fake-acp.mjs b/apps/workbench/packages/daemon/test/fixtures/fake-acp.mjs index d257ce5242..15b19a3107 100644 --- a/apps/workbench/packages/daemon/test/fixtures/fake-acp.mjs +++ b/apps/workbench/packages/daemon/test/fixtures/fake-acp.mjs @@ -200,7 +200,8 @@ rl.on('line', (line) => { case 'initialize': return out({ jsonrpc: '2.0', id: msg.id, result: { protocolVersion: 1, agentCapabilities: {} } }); case 'session/new': - if (process.env.FAKE_ACP_START_ERROR) return out({ jsonrpc: '2.0', id: msg.id, error: { code: -32603, message: process.env.FAKE_ACP_START_ERROR } }); + if (process.env.FAKE_LOGIN_FILE && !existsSync(process.env.FAKE_LOGIN_FILE)) return out({ jsonrpc: '2.0', id: msg.id, error: { code: -32000, message: 'Authentication required' } }); + if (process.env.FAKE_ACP_START_ERROR) return out({ jsonrpc: '2.0', id: msg.id, error: { code: Number(process.env.FAKE_ACP_ERROR_CODE ?? -32603), message: process.env.FAKE_ACP_START_ERROR, data: { reason: process.env.FAKE_ACP_ERROR_REASON } } }); if (!dsh) { const initial = msg.params?._meta?.claudeCode?.options; if (typeof initial?.model === 'string' && process.env.FAKE_ACP_MODEL_SELECTION_LOG) appendFileSync(process.env.FAKE_ACP_MODEL_SELECTION_LOG, initial.model + '\n'); diff --git a/apps/workbench/packages/daemon/test/fixtures/fake-agy.mjs b/apps/workbench/packages/daemon/test/fixtures/fake-agy.mjs index 4d5a2957fa..83c6dd998b 100644 --- a/apps/workbench/packages/daemon/test/fixtures/fake-agy.mjs +++ b/apps/workbench/packages/daemon/test/fixtures/fake-agy.mjs @@ -1,15 +1,47 @@ #!/usr/bin/env node +import { createInterface } from 'node:readline'; if (process.argv.includes('--version')) { process.stdout.write('fixture 1.2.3\n'); process.exit(0); } // A stand-in for the Antigravity CLI in headless stream-json mode, for tests. // Prompt text drives behaviour: "tool" runs a command, "command" needs a permission that headless // mode cannot ask for, "slow" waits until interrupted, "crash" exits. -import { existsSync, readFileSync, writeFileSync, symlinkSync } from 'node:fs'; +import { existsSync, mkdirSync, readFileSync, writeFileSync, symlinkSync } from 'node:fs'; import { agyUsage } from './live-usage.mjs'; import { coordinationFixture } from './coordination.mjs'; import { join } from 'node:path'; const args = process.argv.slice(2); +if (args[0] === 'acp' && args[1] === '--login') { + const directory = join(process.env.HOME, '.gemini', 'antigravity-cli'); + if (process.env.LOOCHAT_AGY_HOME !== directory || process.env.ANTIGRAVITY_REMOTE_OOB_AUTH !== '1') process.exit(2); + // Ignore unrelated links and wait for a complete authorization URL across output chunks. + process.stdout.write('https://accounts.google.com.evil.invalid/o/oauth2/auth\nhttps://accounts.google.com/o/oauth2/auth?redirect_uri=https%3A%2F%2Fevil.invalid\n'); + process.stdout.write('Open this link in a browser to log in with Google:\nhttps://accounts.google.com/o/oauth2/'); + setTimeout(() => process.stdout.write('auth?redirect_uri=https%3A%2F%2Fantigravity.google%2Foauth-callback&state=fixture\nThen paste the authorization code or full URL:\n'), 20); + createInterface({ input: process.stdin }).on('line', code => { + const valid = code === 'test-agy-code' || code === 'https://antigravity.google/oauth-callback?code=test-agy-code&state=fixture'; + if (!valid) process.exit(1); + mkdirSync(directory, { recursive: true }); + if (process.env.FAKE_AGY_AUTH_BAD_STATUS !== '1') writeFileSync(join(directory, 'antigravity-oauth-token'), JSON.stringify({ + token: { access_token: 'fixture-agy-access', refresh_token: 'fixture-agy-refresh' }, id_token_email: 'agy-new@example.com', auth_method: 'oauth-personal', + }), { mode: 0o600 }); + process.stdout.write('Logged in as agy-new@example.com.\n'); + process.exit(0); + }); + await new Promise(() => {}); +} + +if (process.env.FAKE_AGY_ACCOUNT_CHECK === '1') { + const directory = join(process.env.HOME, '.gemini', 'antigravity-cli'); + if (directory !== process.env.LOOCHAT_AGY_HOME || process.env.GOOGLE_API_KEY || process.env.GEMINI_API_KEY || + process.env.GOOGLE_APPLICATION_CREDENTIALS || !existsSync(join(directory, 'antigravity-oauth-token'))) process.exit(2); +} + if (args[0] === 'models') { + if (process.env.FAKE_AGY_MODELS_ERROR) { process.stderr.write(process.env.FAKE_AGY_MODELS_ERROR + '\n'); process.exit(1); } + if (process.env.FAKE_AGY_LOGIN_REQUIRED === '1' && !existsSync(join(process.env.HOME, '.gemini', 'antigravity-cli', 'antigravity-oauth-token'))) { + process.stderr.write('Fetching available models...\nError: Please sign in to view available models. Launch the CLI without arguments to sign in.\n'); process.exit(1); + } + if (process.env.FAKE_HANDOVER_QUOTA) { process.stdout.write('gemini-pro\tGemini Pro\nclaude-sonnet\tClaude Sonnet\n'); process.exit(0); } process.stderr.write('Fetching available models...\n'); process.stdout.write('fast-low\tFast (Low)\nfast-high\tFast (High)\nnot a model line\nbig-thinking\tBig (Thinking)\n'); diff --git a/apps/workbench/packages/daemon/test/fixtures/fake-codex.mjs b/apps/workbench/packages/daemon/test/fixtures/fake-codex.mjs index 1b86b793c6..d4440d7b70 100644 --- a/apps/workbench/packages/daemon/test/fixtures/fake-codex.mjs +++ b/apps/workbench/packages/daemon/test/fixtures/fake-codex.mjs @@ -459,6 +459,8 @@ rl.on('line', (line) => { switch (msg.method) { case 'account/read': + if (process.env.FAKE_ACCOUNT_READ_UNSUPPORTED) return out({ id: msg.id, error: { code: -32601, message: 'Method not found' } }); + if (process.env.FAKE_LOGIN_FILE && !existsSync(process.env.FAKE_LOGIN_FILE)) return out({ id: msg.id, result: { account: null, requiresOpenaiAuth: process.env.FAKE_CUSTOM_PROVIDER !== '1' } }); return out({ id: msg.id, result: { account: { type: process.env.FAKE_CODEX_VOICE_API_KEY ? 'apiKey' : 'chatgpt' } } }); case 'thread/realtime/listVoices': return out(process.env.FAKE_CODEX_NO_VOICE diff --git a/apps/workbench/packages/daemon/test/fixtures/fake-pi.mjs b/apps/workbench/packages/daemon/test/fixtures/fake-pi.mjs index de7ab09e14..5cdd93eb70 100644 --- a/apps/workbench/packages/daemon/test/fixtures/fake-pi.mjs +++ b/apps/workbench/packages/daemon/test/fixtures/fake-pi.mjs @@ -4,7 +4,7 @@ if (process.argv.includes('--version')) { process.stdout.write('fixture 1.2.3\n' // Prompt text drives behaviour: "slow" waits until abort, "fail" ends with an error. import { personalFixture } from './personal.mjs'; import { coordinationFixture } from './coordination.mjs'; -import { appendFileSync, readFileSync, watchFile, unwatchFile } from 'node:fs'; +import { existsSync, appendFileSync, readFileSync, watchFile, unwatchFile } from 'node:fs'; import { basename } from 'node:path'; import { createInterface } from 'node:readline'; @@ -163,6 +163,8 @@ rl.on('line', (line) => { switch (cmd.type) { case 'get_available_models': + if (process.env.FAKE_PI_EMPTY_MODELS === '1' && !existsSync(process.env.FAKE_LOGIN_FILE ?? '')) return reply({ models: [] }); + if (process.env.FAKE_LOGIN_FILE && !existsSync(process.env.FAKE_LOGIN_FILE)) return reply(null, false, 'No API key found for fixture-provider'); // Probes must not create sessions in pi's session list. if (!ephemeral) return reply(null, false, 'probe ran without --no-session'); if (process.env.FAKE_PI_REQUIRE_NO_MCP === '1' && !args.includes('--no-mcp')) return reply(null, false, 'catalog probe must disable MCP'); diff --git a/apps/workbench/packages/daemon/test/fixtures/fake-zcode.mjs b/apps/workbench/packages/daemon/test/fixtures/fake-zcode.mjs index 2b4d8bcadc..494fab5331 100644 --- a/apps/workbench/packages/daemon/test/fixtures/fake-zcode.mjs +++ b/apps/workbench/packages/daemon/test/fixtures/fake-zcode.mjs @@ -3,7 +3,7 @@ if (process.argv.includes('--version')) { process.stdout.write('fixture 1.2.3\n' // ZCode's strict NDJSON protocol: no jsonrpc field, reverse runtime preferences, native events. import { DatabaseSync } from 'node:sqlite'; import { createInterface } from 'node:readline'; -import { appendFileSync, readFileSync } from 'node:fs'; +import { existsSync, appendFileSync, readFileSync } from 'node:fs'; import { createHash } from 'node:crypto'; import { resolve } from 'node:path'; import { coordinationFixture } from './coordination.mjs'; @@ -48,6 +48,7 @@ async function handle(message) { if (!message.method) { pending.get(message.id)?.(message.result); pending.delete(message.id); return; } const { id, method, params: p = {} } = message; if (process.env.FAKE_ZCODE_LOG) appendFileSync(process.env.FAKE_ZCODE_LOG, JSON.stringify({ method, params: p }) + '\n'); + if (process.env.FAKE_LOGIN_FILE && !existsSync(process.env.FAKE_LOGIN_FILE)) return error(id, 'Not logged in'); switch (method) { case 'provider/updateAccountConfig': { const path = process.env.ZCODE_BUILTIN_PROVIDER_CONFIG_FILE; diff --git a/apps/workbench/packages/daemon/test/workbench-lifecycle.test.ts b/apps/workbench/packages/daemon/test/workbench-lifecycle.test.ts new file mode 100644 index 0000000000..cf1a779246 --- /dev/null +++ b/apps/workbench/packages/daemon/test/workbench-lifecycle.test.ts @@ -0,0 +1,63 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { mkdtempSync, statSync, rmSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { join } from 'node:path'; +import { request } from 'node:http'; +import { serveLifecycle } from '../src/workbench-lifecycle.js'; + +test('private lifecycle fences replacement, refuses busy stop and issues links only on demand', async () => { + const dir = mkdtempSync(join(tmpdir(), 'wb-life-')); + const socketPath = join(dir, 'control.sock'); + let links = 0, stops = 0, running = 1; + const server = await serveLifecycle(socketPath, { url: 'http://127.0.0.1:8796', + appDir: dir, dataDir: join(dir, 'data'), coreUrl: 'http://127.0.0.1:1', + running: () => running, loginLink: async () => { links++; return 'private-link'; }, + shutdown: async () => { stops++; }, + }); + const call = (path: string, method = 'GET', instance = '', origin = '') => new Promise((resolve, reject) => { + const req = request({ socketPath, path, method, headers: { 'x-loopx-instance': instance, ...(origin ? { Origin: origin } : {}) } }, res => { + let body = ''; res.on('data', c => { body += c; }); + res.on('end', () => resolve({ status: res.statusCode, ...JSON.parse(body) })); + }); req.on('error', reject); req.end(); + }); + try { + assert.equal(statSync(socketPath).mode & 0o077, 0); + const status = await call('/status'); + assert.equal(status.state, 'running'); + assert.equal(status.core.reachable, false); + assert.equal(status.running_threads, 1); + assert.equal(links, 0); + assert.equal((await call('/stop', 'POST', 'stale-instance')).status, 409); + assert.equal((await call('/stop', 'POST', status.instance_id)).status, 409); + assert.equal(stops, 0); + assert.equal((await call('/access', 'POST', status.instance_id, 'https://untrusted.example')).status, 403); + assert.equal((await call('/access', 'POST', status.instance_id)).access_url, 'private-link'); + assert.equal(links, 1); + running = 0; + assert.equal((await call('/stop', 'POST', status.instance_id)).state, 'stopping'); + assert.equal(stops, 1); + assert.equal((await call('/access', 'POST', status.instance_id)).status, 409); + } finally { + await new Promise(resolve => server.close(() => resolve())); + rmSync(dir, { recursive: true, force: true }); + } +}); + +test('force stop interrupts a busy daemon only with the observed instance', async () => { + const dir = mkdtempSync(join(tmpdir(), 'wb-force-')); + let stopped = false; + const socketPath = join(dir, 'control.sock'); + const server = await serveLifecycle(socketPath, { url: 'http://localhost:8796', appDir: dir, dataDir: dir, + coreUrl: 'http://127.0.0.1:1', running: () => 2, loginLink: async () => '', shutdown: async () => { stopped = true; } }); + const call = (path: string, method: string, instance = '') => new Promise((resolve, reject) => { + const req = request({ socketPath, path, method, headers: { 'x-loopx-instance': instance } }, res => { + let body = ''; res.on('data', c => { body += c; }); res.on('end', () => resolve(JSON.parse(body))); + }); req.on('error', reject); req.end(); + }); + try { + const status = await call('/status', 'GET'); + assert.equal((await call('/stop?force=1', 'POST', status.instance_id)).ok, true); + assert.equal(stopped, true); + } finally { await new Promise(resolve => server.close(() => resolve())); rmSync(dir, { recursive: true, force: true }); } +}); diff --git a/apps/workbench/packages/e2e/test/agent-accounts.spec.mjs b/apps/workbench/packages/e2e/test/agent-accounts.spec.mjs index 14251bb7a2..9b706469b0 100644 --- a/apps/workbench/packages/e2e/test/agent-accounts.spec.mjs +++ b/apps/workbench/packages/e2e/test/agent-accounts.spec.mjs @@ -6,13 +6,24 @@ import { join } from 'node:path'; import { fileURLToPath } from 'node:url'; import { startDaemon, openUi, api, launchBrowser } from '../harness.mjs'; -test('independent account creation and code login on desktop and phone, light and dark', { timeout: 120_000 }, async () => { +for (const adapter of ['claude', 'agy']) test(`${adapter}: independent account creation and code login on desktop and phone, light and dark`, { timeout: 120_000 }, async () => { const source = mkdtempSync(join(tmpdir(), 'loochat-e2e-account-source-')); - writeFileSync(join(source, 'CLAUDE.md'), 'Shared instructions'); - writeFileSync(join(source, '.credentials.json'), 'existing account'); + const config = adapter === 'claude' ? source : join(source, '.gemini', 'antigravity-cli'); + mkdirSync(config, { recursive: true }); + const credentials = join(config, adapter === 'claude' ? '.credentials.json' : 'antigravity-oauth-token'); + writeFileSync(join(config, adapter === 'claude' ? 'CLAUDE.md' : 'GEMINI.md'), 'Shared instructions'); + writeFileSync(credentials, 'existing account'); + if (adapter === 'agy') { + // Reproduce native optional configuration left as zero-byte or whitespace-only files. + mkdirSync(join(source, '.gemini', 'config'), { recursive: true }); + writeFileSync(join(source, '.gemini', 'config', 'mcp_config.json'), ''); + writeFileSync(join(config, 'settings.json'), ' \n\t'); + } + const label = adapter === 'claude' ? 'Claude Code' : 'Antigravity'; + const email = adapter === 'claude' ? 'new@example.com' : 'agy-new@example.com'; const fixture = fileURLToPath(new URL('../../daemon/test/fixtures/fake-claude-auth.mjs', import.meta.url)); const daemon = await startDaemon({ - LOOCHAT_AGENTS_JSON: JSON.stringify({ agents: [{ id: 'claude', adapter: 'claude', command: ['fake-claude'], env: { CLAUDE_CONFIG_DIR: source, LOOCHAT_CLAUDE_BIN: fixture } }] }), + LOOCHAT_AGENTS_JSON: JSON.stringify({ agents: [{ id: adapter, adapter, command: [adapter === 'claude' ? 'fake-claude' : 'fake-agy'], env: adapter === 'claude' ? { CLAUDE_CONFIG_DIR: source, LOOCHAT_CLAUDE_BIN: fixture } : { HOME: source, LOOCHAT_AGY_HOME: config } }] }), }); let browser; try { @@ -23,66 +34,109 @@ test('independent account creation and code login on desktop and phone, light an await context.addInitScript(() => localStorage.setItem('calli_onboard_dismissed', '1')); const page = await context.newPage(); const errors = []; + let creates = 0; + page.on('request', request => { if (request.method() === 'POST' && new URL(request.url()).pathname.endsWith('/api/agents/accounts')) creates++; }); page.on('pageerror', error => errors.push(String(error))); const mode = `${mobile ? 'phone' : 'desktop'}-${colorScheme}`; const shot = async name => { if (!process.env.LOOCHAT_E2E_SHOTS_DIR) return; mkdirSync(process.env.LOOCHAT_E2E_SHOTS_DIR, { recursive: true }); - await page.screenshot({ path: join(process.env.LOOCHAT_E2E_SHOTS_DIR, `accounts-${mode}-${name}.png`) }); + await page.screenshot({ path: join(process.env.LOOCHAT_E2E_SHOTS_DIR, `accounts-${adapter}-${mode}-${name}.png`), animations: 'disabled' }); }; await openUi(page, daemon); await page.evaluate(() => { location.hash = '#/agents'; }); await page.locator('.agents-page').waitFor(); await page.getByRole('button', { name: '添加 agent', exact: true }).click(); - await page.locator('.agent-account-dialog .choice-row').filter({ hasText: 'Claude Code' }).click(); - const name = `Claude ${mode}`; + await page.locator('.agent-account-dialog .choice-row').filter({ hasText: label }).waitFor(); + await shot('choices'); + await page.locator('.agent-account-dialog .choice-row').filter({ hasText: label }).click(); + const name = `${label} ${mode}`; await page.getByLabel('名称(选填)').fill(name); await shot('add'); + if (mobile && colorScheme === 'dark') { + await page.route('**/api/agents/*/login', route => route.fulfill({ status: 503, contentType: 'application/json', body: JSON.stringify({ error: 'Fixture login unavailable' }) }), { times: 1 }); + } await page.getByRole('button', { name: '添加账号', exact: true }).click(); await page.locator('.agent-account-dialog').waitFor({ state: 'detached' }); const row = page.locator('.agents-row').filter({ hasText: name }); await row.getByText('待登录', { exact: false }).waitFor(); - await shot('list'); - await row.getByRole('button', { name: '登录', exact: true }).click(); - const link = page.getByRole('link', { name: '打开登录链接' }); + if (mobile && colorScheme === 'dark') { + await page.getByText('Fixture login unavailable', { exact: true }).waitFor(); + await shot('start-failed'); + await row.getByRole('button', { name: '登录', exact: true }).click(); + } + const panel = page.locator('.agent-login-panel'); + const link = panel.getByRole('link', { name: '打开登录链接' }); await link.waitFor(); - assert.match(await link.getAttribute('href'), /^https:\/\/claude.com\/cai\/oauth\/authorize\?/); + assert.equal(await page.locator('.dialog-scrim').count(), 0, 'inline login must not block the workspace with a modal scrim'); + assert.equal(new URL(await link.getAttribute('href')).hostname, adapter === 'claude' ? 'claude.com' : 'accounts.google.com'); assert.equal(await link.getAttribute('rel'), 'noopener noreferrer'); + await panel.scrollIntoViewIfNeeded(); await shot('login'); - const box = await page.locator('.agent-login-dialog').boundingBox(); + assert.ok(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth), 'login does not overflow horizontally'); + const inputBox = await panel.locator('input').boundingBox(); + assert.ok(inputBox.height >= 40, 'mobile stacking preserves the normal input height'); + const box = await panel.boundingBox(); assert.ok(box.x >= 0 && box.x + box.width <= (mobile ? 390 : 1440)); - assert.ok(box.y >= 0 && box.y + box.height <= (mobile ? 844 : 1000)); - assert.ok(await page.getByRole('button', { name: '提交验证码' }).isDisabled()); + assert.ok(await panel.getByRole('button', { name: '提交验证码' }).isDisabled()); + { + // Collapsing or navigating away keeps the daemon login session alive so the user can return and paste the code. + const originalHref = await link.getAttribute('href'); + const originalLogin = (await (await api(daemon, '/api/agents')).json()).find(agent => agent.label === name).activeLogin; + assert.ok(originalLogin?.id); + await panel.getByRole('button', { name: '收起', exact: true }).click(); + await panel.waitFor({ state: 'detached' }); + await row.getByText('等待验证码', { exact: true }).waitFor(); + await page.evaluate(() => { location.hash = '#/settings'; }); + await page.locator('.agents-page').waitFor({ state: 'detached' }); + await page.evaluate(() => { location.hash = '#/agents'; }); + await row.getByRole('button', { name: '继续登录', exact: true }).waitFor(); + await page.reload(); + await page.locator('.agents-page').waitFor(); + await row.getByRole('button', { name: '继续登录', exact: true }).click(); + await link.waitFor(); + assert.equal(await link.getAttribute('href'), originalHref, 'resumed login keeps the same session URL'); + const resumedLogin = (await (await api(daemon, '/api/agents')).json()).find(agent => agent.label === name).activeLogin; + assert.equal(resumedLogin.id, originalLogin.id, 'collapse, navigation and reload must preserve the native login process'); + assert.equal(await page.locator('.dialog-scrim').count(), 0); + // Explicit cancel terminates the login session. + await panel.getByRole('button', { name: '取消登录', exact: true }).click(); + await panel.waitFor({ state: 'detached' }); + await row.getByText('待登录', { exact: false }).waitFor(); + await row.getByRole('button', { name: '登录', exact: true }).click(); + await link.waitFor(); + } if (!mobile && colorScheme === 'dark') { await page.route('**/api/agents/*/login/*', route => route.fulfill({ status: 404, contentType: 'application/json', body: JSON.stringify({ error: 'login not found' }) }), { times: 1 }); - await page.getByText('登录链接已过期,请重新登录。').waitFor(); - await page.getByRole('button', { name: '重试', exact: true }).click(); + await panel.getByText('登录链接已过期,请重新登录。').waitFor(); + await panel.getByRole('button', { name: '重试', exact: true }).click(); await link.waitFor(); } if (mobile && colorScheme === 'dark') { - await page.getByLabel('验证码', { exact: true }).fill('wrong'); - await page.getByRole('button', { name: '提交验证码' }).click(); - await page.getByText('登录未成功,请重试并使用新链接获取验证码。').waitFor(); + await panel.getByLabel(adapter === 'claude' ? '验证码' : '授权码或回跳地址', { exact: true }).fill('wrong'); + await panel.getByRole('button', { name: '提交验证码' }).click(); + await panel.getByText('登录未成功,请重试并使用新链接获取验证码。').waitFor(); await shot('failed'); - await page.getByRole('button', { name: '重试', exact: true }).click(); + await panel.getByRole('button', { name: '重试', exact: true }).click(); await link.waitFor(); } - await page.getByLabel('验证码', { exact: true }).fill('test-code#test-state'); - await page.getByRole('button', { name: '提交验证码' }).click(); - await page.getByText('登录成功,可以开始新会话了。').waitFor(); + await panel.getByLabel(adapter === 'claude' ? '验证码' : '授权码或回跳地址', { exact: true }).fill(adapter === 'claude' ? 'test-code#test-state' : 'https://antigravity.google/oauth-callback?code=test-agy-code&state=fixture'); + await panel.getByRole('button', { name: '提交验证码' }).click(); + await panel.getByText('登录成功,可以开始新会话了。').waitFor(); await shot('success'); - await page.getByRole('button', { name: '关闭', exact: true }).click(); - await row.getByText(/new@example.com/).waitFor(); + await panel.getByRole('button', { name: '关闭', exact: true }).click(); + await row.getByText(email, { exact: false }).waitFor(); await row.getByRole('button', { name: '登录', exact: true }).click(); await link.waitFor(); - await page.getByRole('button', { name: '取消', exact: true }).click(); - await page.locator('.agent-login-dialog').waitFor({ state: 'detached' }); + await panel.getByRole('button', { name: '取消登录', exact: true }).click(); + await panel.waitFor({ state: 'detached' }); + assert.equal(creates, 1, 'retrying or cancelling login must not create another account'); assert.deepEqual(errors, []); } finally { await context.close(); } } const agents = await (await api(daemon, '/api/agents')).json(); - assert.equal(agents.filter(a => a.account === 'new@example.com').length, 4); - assert.equal(readFileSync(join(source, '.credentials.json'), 'utf8'), 'existing account'); + assert.equal(agents.filter(a => a.account === email).length, 4); + assert.equal(readFileSync(credentials, 'utf8'), 'existing account'); } finally { await browser?.close(); await daemon.stop(); rmSync(source, { recursive: true, force: true }); } diff --git a/apps/workbench/packages/e2e/test/agent-login-recovery.spec.mjs b/apps/workbench/packages/e2e/test/agent-login-recovery.spec.mjs new file mode 100644 index 0000000000..6383f2e7a0 --- /dev/null +++ b/apps/workbench/packages/e2e/test/agent-login-recovery.spec.mjs @@ -0,0 +1,65 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { mkdtempSync, mkdirSync, rmSync, existsSync } from 'node:fs'; +import { join } from 'node:path'; +import { fileURLToPath } from 'node:url'; +import { tmpdir } from 'node:os'; +import { startDaemon, launchBrowser, openUi, api } from '../harness.mjs'; + +for (const adapter of ['agy', 'claude']) for (const mobile of [false, true]) for (const colorScheme of ['light', 'dark']) { + test(`${adapter} signed-out models recover in place: ${mobile ? 'phone' : 'desktop'} ${colorScheme}`, { timeout: 60000 }, async () => { + const home = mkdtempSync(join(tmpdir(), 'agy-recovery-')); + const config = join(home, '.gemini', 'antigravity-cli'); + mkdirSync(config, { recursive: true }); + const id = `${adapter}-secondary`; + const label = adapter === 'agy' ? 'Antigravity' : 'Claude Code'; + const credentials = adapter === 'agy' ? join(config, 'antigravity-oauth-token') : join(home, '.credentials.json'); + const fixture = name => fileURLToPath(new URL(`../../daemon/test/fixtures/${name}`, import.meta.url)); + const daemon = await startDaemon({ LOOCHAT_AGENTS_JSON: JSON.stringify({ agents: [{ id, adapter, label, + command: adapter === 'agy' ? ['fake-agy'] : [process.execPath, fixture('fake-acp.mjs')], + env: { HOME: home, LOOCHAT_AGY_HOME: config, FAKE_AGY_LOGIN_REQUIRED: '1', CLAUDE_CONFIG_DIR: home, FAKE_LOGIN_FILE: credentials, LOOCHAT_CLAUDE_BIN: fixture('fake-claude-auth.mjs') } }] }) }); + let browser; + try { + browser = await launchBrowser(); + const context = await browser.newContext({ viewport: mobile ? { width: 390, height: 844 } : { width: 1440, height: 1000 }, isMobile: mobile, hasTouch: mobile, colorScheme }); + const page = await context.newPage(); + const errors = [], starts = []; + page.on('pageerror', error => errors.push(error.message)); + page.on('request', request => { if (request.method() === 'POST' && new URL(request.url()).pathname.endsWith('/login')) starts.push(new URL(request.url()).pathname); }); + await openUi(page, daemon); + const recovery = page.locator('.agent-login-recovery'); + await recovery.getByText(`${label} 尚未登录`, { exact: true }).waitFor(); + assert.equal(await page.locator('.banner').count(), 0, 'signed out is not a raw command error'); + assert.equal(starts.length, 0, 'reading a catalog never starts OAuth'); + const shot = async name => { + if (!process.env.LOOCHAT_E2E_SHOTS_DIR) return; + mkdirSync(process.env.LOOCHAT_E2E_SHOTS_DIR, { recursive: true }); + await page.screenshot({ path: join(process.env.LOOCHAT_E2E_SHOTS_DIR, `recovery-${adapter}-${mobile ? 'phone' : 'desktop'}-${colorScheme}-${name}.png`), animations: 'disabled' }); + }; + await shot('signed-out'); + await recovery.getByRole('button', { name: '去登录', exact: true }).click(); + const panel = recovery.locator('.agent-login-panel'); + const link = panel.getByRole('link', { name: '打开登录链接' }); + await link.waitFor(); + assert.equal(new URL(await link.getAttribute('href')).hostname, adapter === 'agy' ? 'accounts.google.com' : 'claude.com'); + assert.deepEqual(starts, [`/api/agents/${id}/login`]); + assert.equal(await page.locator('.dialog-scrim').count(), 0); + await panel.scrollIntoViewIfNeeded(); + await shot('authorize'); + await panel.getByLabel(adapter === 'agy' ? '授权码或回跳地址' : '验证码').fill(adapter === 'agy' ? 'test-agy-code' : 'test-code#test-state'); + await panel.getByRole('button', { name: '提交验证码' }).click(); + await recovery.waitFor({ state: 'detached' }); + // No picker click or page refresh is allowed to trigger this recovery. + await page.waitForFunction(({ id, model }) => Object.values(JSON.parse(localStorage.getItem('calli.host.v1') ?? '{}')) + .some(state => state.models?.[id]?.some(item => item.id === model)), { id, model: adapter === 'agy' ? 'fast-low' : 'big' }); + await page.locator('.model-control-trigger').first().click(); + await page.getByText(adapter === 'agy' ? 'Fast (Low)' : 'Big 1.0', { exact: true }).first().waitFor(); + await shot('models-restored'); + assert.ok(existsSync(credentials)); + const agents = await (await api(daemon, '/api/agents')).json(); + assert.equal(agents.find(agent => agent.id === id).account, adapter === 'agy' ? 'agy-new@example.com' : 'new@example.com'); + assert.deepEqual(errors, []); + await context.close(); + } finally { await browser?.close(); await daemon.stop(); rmSync(home, { recursive: true, force: true }); } + }); +} diff --git a/apps/workbench/packages/e2e/test/agent-native-login-recovery.spec.mjs b/apps/workbench/packages/e2e/test/agent-native-login-recovery.spec.mjs new file mode 100644 index 0000000000..1d1b869141 --- /dev/null +++ b/apps/workbench/packages/e2e/test/agent-native-login-recovery.spec.mjs @@ -0,0 +1,79 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { mkdtempSync, mkdirSync, rmSync, writeFileSync, existsSync } from 'node:fs'; +import { join } from 'node:path'; +import { fileURLToPath } from 'node:url'; +import { tmpdir } from 'node:os'; +import { startDaemon, launchBrowser, openUi, api } from '../harness.mjs'; + +for (const adapter of ['codex', 'dsh', 'pi']) for (const mobile of [false, true]) for (const colorScheme of ['light', 'dark']) { + test(`${adapter} native recovery: ${mobile ? 'phone' : 'desktop'} ${colorScheme}`, { timeout: 60000 }, async () => { + const home = mkdtempSync(join(tmpdir(), 'native-login-recovery-')); + const marker = join(home, 'signed-in'); + const id = `${adapter}-secondary`, label = adapter === 'codex' ? 'Codex secondary' : adapter === 'pi' ? 'pi' : 'DeepSeek Harness'; + const fixture = new URL(`../../daemon/test/fixtures/${adapter === 'codex' ? 'fake-codex.mjs' : adapter === 'pi' ? 'fake-pi.mjs' : 'fake-acp.mjs'}`, import.meta.url); + const cli = join(home, 'native-cli.mjs'); + // The real login-terminal route launches this isolated native-CLI fixture. No browser route mock. + writeFileSync(cli, `#!${process.execPath} +import { createInterface } from 'node:readline'; +import { writeFileSync } from 'node:fs'; +process.env.FAKE_LOGIN_FILE = ${JSON.stringify(marker)}; +if (process.argv.includes('login')) { + console.log('Fixture sign-in: enter test-native-code'); + await new Promise(resolve => createInterface({ input: process.stdin }).on('line', code => { + if (code === 'test-native-code') { writeFileSync(${JSON.stringify(marker)}, 'fixture-authenticated'); resolve(); } + })); + process.exit(0); +} +await import(${JSON.stringify(fixture.href)}); +`, { mode: 0o755 }); + const daemon = await startDaemon({ LOOCHAT_TERM_SHELL: '/bin/sh', LOOCHAT_AGENTS_JSON: JSON.stringify({ agents: [{ id, adapter, label, + command: adapter === 'codex' ? [cli] : [process.execPath, fileURLToPath(fixture)], + env: { CODEX_HOME: home, FAKE_LOGIN_FILE: marker, FAKE_ACP_FLAVOR: 'dsh', ...(adapter === 'pi' ? { FAKE_PI_EMPTY_MODELS: '1' } : {}) } }] }) }); + let browser; + try { + browser = await launchBrowser(); + const context = await browser.newContext({ viewport: mobile ? { width: 390, height: 844 } : { width: 1440, height: 1000 }, isMobile: mobile, hasTouch: mobile, colorScheme }); + const page = await context.newPage(), errors = [], starts = []; + page.on('pageerror', error => errors.push(error.message)); + page.on('request', request => { if (request.method() === 'POST' && /\/login(?:-terminal)?$/.test(new URL(request.url()).pathname)) starts.push(new URL(request.url()).pathname); }); + await openUi(page, daemon); + const recovery = page.locator('.agent-login-recovery'); + await recovery.getByText(adapter === 'pi' ? `${label} 暂无可用模型,请检查登录或模型配置` : `${label} 尚未登录`, { exact: true }).waitFor(); + await page.locator('.composer textarea').last().fill('Keep this draft while signing in'); + assert.equal(await page.locator('.banner').count(), 0); + assert.deepEqual(starts, []); + if (process.env.LOOCHAT_E2E_SHOTS_DIR) { + mkdirSync(process.env.LOOCHAT_E2E_SHOTS_DIR, { recursive: true }); + await page.screenshot({ path: join(process.env.LOOCHAT_E2E_SHOTS_DIR, `recovery-${adapter}-${mobile ? 'phone' : 'desktop'}-${colorScheme}.png`), animations: 'disabled' }); + } + if (adapter === 'codex') { + const login = page.waitForResponse(response => response.request().method() === 'POST' && new URL(response.url()).pathname === `/api/agents/${id}/login-terminal`); + await recovery.getByRole('button', { name: '去登录', exact: true }).click(); + const { terminalId } = await (await login).json(); + await page.locator('.term-panel').waitFor(); + assert.deepEqual(starts, [`/api/agents/${id}/login-terminal`]); + assert.equal(existsSync(marker), false, 'opening a terminal is not successful login'); + // Deliver the fixture's approval through the real terminal input API. + const sent = await api(daemon, `/api/terminals/${terminalId}/input`, { method: 'POST', body: JSON.stringify({ data: 'test-native-code\r' }) }); + assert.ok(sent.ok); + await recovery.waitFor({ state: 'detached' }); + await page.locator('.term-panel').getByRole('button', { name: '关闭', exact: true }).click(); + } else { + assert.equal(await recovery.getByRole('button', { name: '去登录', exact: true }).count(), 0); + await recovery.getByText('请在原生客户端完成登录或配置凭据,然后重试。', { exact: true }).waitFor(); + if (adapter === 'pi') { + await recovery.getByRole('button', { name: '重试', exact: true }).click(); + await recovery.getByText('仍未获取到可用模型,请检查原生客户端后重试。', { exact: true }).waitFor(); + } + writeFileSync(marker, 'fixture-authenticated'); + await recovery.getByRole('button', { name: '重试', exact: true }).click(); + await recovery.waitFor({ state: 'detached' }); + } + assert.equal(await page.locator('.composer textarea').last().inputValue(), 'Keep this draft while signing in'); + await page.waitForFunction(id => Object.values(JSON.parse(localStorage.getItem('calli.host.v1') ?? '{}')).some(state => state.models?.[id]?.length > 0), id); + assert.deepEqual(errors, []); + await context.close(); + } finally { await browser?.close(); await daemon.stop(); rmSync(home, { recursive: true, force: true }); } + }); +} diff --git a/apps/workbench/packages/e2e/test/pwa-install.spec.mjs b/apps/workbench/packages/e2e/test/pwa-install.spec.mjs new file mode 100644 index 0000000000..b4bad5a1c2 --- /dev/null +++ b/apps/workbench/packages/e2e/test/pwa-install.spec.mjs @@ -0,0 +1,85 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { mkdirSync } from 'node:fs'; +import { join } from 'node:path'; +import { startDaemon, launchBrowser, openUi, api } from '../harness.mjs'; + +// Real packaged UI/backend; only browser-owned consent events are simulated. This does not +// certify OS installation on macOS or Windows. Screenshots contain synthetic conversations. +const shots = new URL('../../../../../output/playwright/pwa-install/', import.meta.url).pathname; +async function offer(page, outcome = 'dismissed', fail = false) { + await page.evaluate(({ outcome, fail }) => { + const event = new Event('beforeinstallprompt', { cancelable: true }); + event.prompt = () => { + window.installCalls = (window.installCalls ?? 0) + 1; + window.installClickedWithActivation = navigator.userActivation.isActive; + return fail ? Promise.reject(new Error('simulated browser refusal')) : Promise.resolve(); + }; + event.userChoice = Promise.resolve({ outcome }); + window.dispatchEvent(event); + }, { outcome, fail }); +} + +test('install entrypoints preserve consent, suppression, recovery and populated layouts', { timeout: 120000 }, async () => { + mkdirSync(shots, { recursive: true }); + const daemon = await startDaemon(); + const browser = await launchBrowser(); + try { + for (let i = 0; i < 18; i++) await api(daemon, '/api/threads', { + method: 'POST', body: JSON.stringify({ agent: 'pi', cwd: daemon.workdir, title: `Workspace review ${i + 1} — long conversation title for layout verification` }), + }); + for (const mobile of [false, true]) for (const theme of ['light', 'dark']) { + const context = await browser.newContext({ viewport: mobile ? { width: 390, height: 844 } : { width: 1440, height: 1000 }, isMobile: mobile, hasTouch: mobile, colorScheme: theme }); + const page = await context.newPage(); page.setDefaultTimeout(10000); + const errors = []; page.on('pageerror', error => errors.push(error.message)); + try { + // A synthetic expiring credential exercises the other standing footer notice. + await page.route('**/api/auth/kind', route => route.fulfill({ json: { kind: 'link', linkId: 'layout-fixture', expiresAt: new Date(Date.now() + 3600000).toISOString() } })); + await openUi(page, daemon); + await page.addStyleTag({ content: '*,*::before,*::after{animation:none!important;transition:none!important}' }); + if (!mobile && theme === 'light') { + const cdp = await context.newCDPSession(page); + const manifest = await cdp.send('Page.getAppManifest'); + assert.deepEqual(manifest.errors, [], 'the served manifest parses without errors'); + assert.equal(JSON.parse(manifest.data).name, 'LoopX'); + assert.deepEqual((await cdp.send('Page.getInstallabilityErrors')).installabilityErrors, []); + await cdp.detach(); + } + if (mobile) await page.getByRole('button', { name: '打开对话列表', exact: true }).click(); + await page.screenshot({ path: join(shots, `before-${mobile ? 'phone' : 'desktop'}-${theme}.png`) }); + await offer(page); + const promo = page.locator('.pwa-install-promo'); + await promo.waitFor(); + await page.locator('.sidebar-scroll').evaluate(el => { el.scrollTop = el.scrollHeight; }); + const [list, card] = await Promise.all([page.locator('.sidebar-scroll').boundingBox(), promo.boundingBox()]); + assert.ok(list.y + list.height <= card.y + 1, 'installation does not cover the populated list'); + assert.ok(card.x >= 0 && card.x + card.width <= (mobile ? 390 : 1440), 'card fits viewport'); + const notice = await page.locator('.link-login-notice').boundingBox(); + assert.ok(card.y + card.height <= notice.y + 1, 'installation does not cover the expiring-login notice'); + await page.screenshot({ path: join(shots, `after-${mobile ? 'phone' : 'desktop'}-${theme}.png`) }); + await promo.getByRole('button', { name: '以后再说' }).click(); + await promo.waitFor({ state: 'detached' }); + await page.locator('.sidebar').getByRole('button', { name: '配置', exact: true }).click(); + await page.locator('.settings-nav').getByRole('button', { name: '安装 LoopX', exact: true }).click(); + const settings = page.getByRole('region', { name: '安装 LoopX', exact: true }); + await settings.getByRole('button', { name: '安装', exact: true }).click(); + assert.equal(await page.evaluate(() => window.installCalls), 1); + assert.equal(await page.evaluate(() => window.installClickedWithActivation), true); + await settings.getByText('浏览器尚未提供快捷安装。', { exact: false }).waitFor(); + await page.reload(); await settings.waitFor(); await offer(page); + assert.equal(await promo.count(), 0, 'dismissal survives reload and renewed offers'); + await offer(page, 'dismissed', true); + await settings.getByRole('button', { name: '安装', exact: true }).click(); + await settings.getByRole('alert').waitFor(); + await page.screenshot({ path: join(shots, `recovery-${mobile ? 'phone' : 'desktop'}-${theme}.png`) }); + await offer(page, 'accepted'); + await settings.getByRole('button', { name: '安装', exact: true }).click(); + await settings.getByRole('status').filter({ hasText: '已接受安装' }).waitFor(); + await page.evaluate(() => window.dispatchEvent(new Event('appinstalled'))); + await settings.getByRole('status').filter({ hasText: '已安装' }).waitFor(); + assert.equal(await settings.getByRole('button', { name: '安装', exact: true }).count(), 0); + assert.deepEqual(errors, []); + } finally { await context.close(); } + } + } finally { await browser.close(); await daemon.stop(); } +}); diff --git a/apps/workbench/packages/e2e/test/quote-paste.spec.mjs b/apps/workbench/packages/e2e/test/quote-paste.spec.mjs new file mode 100644 index 0000000000..34accf2df5 --- /dev/null +++ b/apps/workbench/packages/e2e/test/quote-paste.spec.mjs @@ -0,0 +1,86 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { mkdirSync } from 'node:fs'; +import { join } from 'node:path'; +import { startDaemon, openUi, launchBrowser, api } from '../harness.mjs'; + +// Native copy action, synthetic paste delivery, real daemon and fake model. No OS clipboard claim. +test('copied references paste as durable notes with scoped provenance on four layouts', { timeout: 180000 }, async () => { + const daemon = await startDaemon(); + const browser = await launchBrowser(); + const post = async (path, body) => { + const response = await api(daemon, path, { method: 'POST', body: JSON.stringify(body) }); + assert.ok(response.ok, await response.clone().text()); return response.json(); + }; + const idle = async id => { + for (let n = 0; n < 120; n++) { + if ((await (await api(daemon, `/api/threads/${id}`)).json()).status === 'idle') return; + await new Promise(resolve => setTimeout(resolve, 100)); + } + throw new Error('turn did not finish'); + }; + const paste = async (input, text) => input.evaluate((element, text) => { + const data = new DataTransfer(); data.setData('text/plain', text); + element.dispatchEvent(new ClipboardEvent('paste', { clipboardData: data, bubbles: true, cancelable: true })); + }, text); + try { + for (const mobile of [false, true]) for (const theme of ['light', 'dark']) { + const source = await post('/api/threads', { agent: 'pi', cwd: daemon.workdir, title: 'Quote source' }); + const target = await post('/api/threads', { agent: 'pi', cwd: daemon.workdir, title: 'Quote target' }); + await post(`/api/threads/${source.id}/turns`, { text: 'A passage with **bold** and a second sentence.' }); await idle(source.id); + await post(`/api/threads/${target.id}/turns`, { text: 'target-ready' }); await idle(target.id); + const context = await browser.newContext({ viewport: mobile ? { width: 390, height: 844 } : { width: 1440, height: 1000 }, isMobile: mobile, hasTouch: mobile, colorScheme: theme }); + try { + const page = await context.newPage(), errors = []; + page.on('pageerror', error => errors.push(error.message)); + await openUi(page, daemon); + await page.evaluate(id => { location.hash = `#/thread/${id}`; }, source.id); + await page.locator('.main .thread .markdown').filter({ hasText: 'A passage with' }).waitFor(); + await page.getByRole('button', { name: '更多消息操作', exact: true }).last().click(); + await page.getByRole('menuitem', { name: '复制为引用', exact: true }).click(); + const copied = await page.evaluate(() => JSON.parse(localStorage.getItem('calli.copiedQuote'))); + assert.equal(copied.threadId, source.id); assert.equal(copied.host, null); + await page.getByRole('button', { name: '更多消息操作', exact: true }).last().click(); + await page.getByRole('menuitem', { name: '复制回答', exact: true }).click(); + await page.waitForFunction(() => localStorage.getItem('calli.copiedQuote') === null); + await page.getByRole('button', { name: '更多消息操作', exact: true }).last().click(); + await page.getByRole('menuitem', { name: '复制为引用', exact: true }).click(); + const text = copied.text.trim().split('\n').map(line => `> ${line}`.trimEnd()).join('\n'); + await page.evaluate(id => { location.hash = `#/thread/${id}`; }, target.id); + await page.getByText('hi there target-ready', { exact: true }).waitFor(); + const composer = page.locator('.composer'), input = composer.locator('textarea').last(); + await input.fill('My existing draft'); await paste(input, text); + await composer.locator('.note-strip').waitFor(); + assert.equal(await input.inputValue(), 'My existing draft'); + assert.equal(await composer.locator('.note-strip').count(), 1); + await page.waitForFunction(id => { const draft = JSON.parse(localStorage.getItem('calli.drafts') ?? '{}')[id]; return draft?.text === 'My existing draft' && draft.notes?.length === 1; }, target.id); + await page.reload(); + await page.locator('.sidebar-inner').waitFor({ state: 'attached' }); + await page.evaluate(id => { location.hash = `#/thread/${id}`; }, target.id); + await composer.locator('.note-strip').waitFor(); + assert.equal(await input.inputValue(), 'My existing draft'); + if (process.env.LOOCHAT_E2E_SHOTS_DIR) { + mkdirSync(process.env.LOOCHAT_E2E_SHOTS_DIR, { recursive: true }); + await page.screenshot({ path: join(process.env.LOOCHAT_E2E_SHOTS_DIR, `pasted-quote-${mobile ? 'phone' : 'desktop'}-${theme}.png`), animations: 'disabled' }); + } + const sentResponse = page.waitForResponse(response => response.request().method() === 'POST' && new URL(response.url()).pathname === `/api/threads/${target.id}/turns`); + await composer.locator('.send-btn:not(.stop)').click(); await sentResponse; await idle(target.id); + await composer.locator('.note-strip').waitFor({ state: 'detached' }); + const events = await (await api(daemon, `/api/threads/${target.id}/events`)).json(); + const sent = events.findLast(event => event.type === 'turn.started').data.text; + assert.ok(sent.includes(`来源:另一个会话,原文和上下文用 loochat history ${source.id} --turn ${copied.turnId} 读`)); + assert.match(sent, /My existing draft/); + assert.equal((await (await api(daemon, `/api/threads/${source.id}/events`)).json()).filter(e => e.type === 'turn.started').length, 1); + // The same ids on a different machine must not grant local provenance. + await page.evaluate(copied => localStorage.setItem('calli.copiedQuote', JSON.stringify({ ...copied, host: 'another-machine' })), copied); + await paste(input, text); await composer.locator('.note-strip').waitFor(); + await input.fill('Cross-machine quote'); + const crossResponse = page.waitForResponse(response => response.request().method() === 'POST' && new URL(response.url()).pathname === `/api/threads/${target.id}/turns`); + await composer.locator('.send-btn:not(.stop)').click(); await crossResponse; await idle(target.id); + const cross = (await (await api(daemon, `/api/threads/${target.id}/events`)).json()).findLast(e => e.type === 'turn.started').data.text; + assert.match(cross, /\[注释 1\]/); assert.ok(!cross.includes('loochat history')); + assert.deepEqual(errors, []); + } finally { await context.close(); } + } + } finally { await browser.close(); await daemon.stop(); } +}); diff --git a/apps/workbench/packages/e2e/test/quote.spec.mjs b/apps/workbench/packages/e2e/test/quote.spec.mjs index 3fd9665a97..9af84f01db 100644 --- a/apps/workbench/packages/e2e/test/quote.spec.mjs +++ b/apps/workbench/packages/e2e/test/quote.spec.mjs @@ -3,7 +3,7 @@ import { test, before, after } from 'node:test'; import assert from 'node:assert/strict'; import { writeFileSync } from 'node:fs'; import { join } from 'node:path'; -import { startDaemon, openUi, launchBrowser } from '../harness.mjs'; +import { startDaemon, openUi, launchBrowser, api } from '../harness.mjs'; let daemon; let browser; @@ -112,6 +112,18 @@ test('asking in the side chat opens a thread of its own', async () => { assert.equal(await page.locator('.side-chat-passage').innerText(), 'hi ther'); assert.equal(await page.locator('.sidebar .thread-row').count(), 1); + // The side chat starts on the source model but can choose its own before the first question. + await api(daemon, '/api/draft-model-preferences', { + method: 'PATCH', + body: JSON.stringify({ agent: 'pi', model: 'fake/think', effort: 'low' }), + }); + const sideModel = page.locator('.side-chat .model-control-trigger'); + await sideModel.filter({ hasText: 'Think' }).waitFor({ timeout: 10_000 }); + await sideModel.click(); + await page.locator('.model-control-panel .effort-model').click(); + await page.getByRole('menuitemradio', { name: /^Plain\b/ }).click(); + await page.keyboard.press('Escape'); + await page.locator('.side-chat textarea').click(); await page.keyboard.type('go on'); await page.keyboard.press('Enter'); @@ -133,6 +145,21 @@ test('asking in the side chat opens a thread of its own', async () => { assert.match(titles.join('\n'), /^追问:hi ther$/m); assert.equal(await page.locator('.sidebar .thread-fork').count(), 0); assert.match(await page.locator('.sidebar .thread-item').filter({ hasText: '追问:hi ther' }).getAttribute('title'), /分叉/); + const sideThread = (await (await api(daemon, '/api/threads')).json()).find(thread => thread.title === '追问:hi ther'); + assert.equal(sideThread.model, 'fake/plain'); + + // After the thread exists, changing the model applies to the same thread rather than a new one, + // and switching back to a model restores its remembered thinking effort. + const patched = page.waitForResponse(response => response.request().method() === 'PATCH' + && new URL(response.url()).pathname === `/api/threads/${sideThread.id}`); + await sideModel.click(); + await page.getByRole('menuitemradio', { name: /^Think\b/ }).click(); + const patchedThread = await (await patched).json(); + assert.equal(patchedThread.model, 'fake/think'); + assert.equal(patchedThread.effort, 'low'); + assert.equal((await (await api(daemon, '/api/threads')).json()).filter(thread => thread.title === '追问:hi ther').length, 1); + await page.locator('.side-chat-title').click(); + await page.locator('.model-control-panel').waitFor({ state: 'detached' }); // The conversation it came from is untouched underneath. assert.equal(await page.locator('.main .thread .markdown').first().innerText(), originalAnswer); @@ -164,3 +191,51 @@ test('a picture attached to the composer can be looked at full size before sendi await page.locator('.attachment-remove').click(); await page.locator('.attachment img').waitFor({ state: 'detached', timeout: 3_000 }); }); + +for (const mobile of [false, true]) for (const theme of ['light', 'dark']) test(`quoted follow-up preserves model choices: ${mobile ? 'phone' : 'desktop'} ${theme}`, { timeout: 45000 }, async () => { + const post = async (path, body, method = 'POST') => { + const response = await api(daemon, path, { method, body: JSON.stringify(body) }); + assert.ok(response.ok, await response.clone().text()); return response.json(); + }; + const source = await post('/api/threads', { agent: 'pi', cwd: daemon.workdir, model: 'fake/think', effort: 'high', title: `Source ${mobile} ${theme}` }); + await post(`/api/threads/${source.id}/turns`, { text: 'quote model choices' }); + for (let i = 0; i < 100; i++) { + if ((await (await api(daemon, `/api/threads/${source.id}`)).json()).status === 'idle') break; + await new Promise(resolve => setTimeout(resolve, 100)); + } + await post('/api/draft-model-preferences', { agent: 'pi', model: 'fake/think', effort: 'low' }, 'PATCH'); + const context = await browser.newContext({ viewport: mobile ? { width: 390, height: 844 } : { width: 1440, height: 1000 }, isMobile: mobile, hasTouch: mobile, colorScheme: theme }); + try { + const p = await context.newPage(); + const errors = []; p.on('pageerror', error => errors.push(error.message)); + await openUi(p, daemon); await p.evaluate(id => { location.hash = `#/thread/${id}`; }, source.id); + await p.locator('.main .thread .markdown').first().waitFor(); + await p.evaluate(() => { + const node = document.createTreeWalker(document.querySelector('.main .thread .markdown'), NodeFilter.SHOW_TEXT).nextNode(); + const range = document.createRange(); range.setStart(node, 0); range.setEnd(node, 7); + const selection = getSelection(); selection.removeAllRanges(); selection.addRange(range); + }); + await p.locator('.selection-menu button', { hasText: '在侧边栏提问' }).click(); + const side = p.locator('.side-chat'), picker = side.locator('.model-control-trigger'); + await picker.waitFor(); await picker.click(); + await p.locator('.model-control-panel .effort-model').click(); + await p.getByRole('menuitemradio', { name: /^Plain\b/ }).click(); await p.keyboard.press('Escape'); + const fork = p.waitForResponse(response => response.request().method() === 'POST' && new URL(response.url()).pathname === `/api/threads/${source.id}/fork`); + await side.locator('textarea').fill('Follow up with this model'); await side.locator('.send-btn:not(.stop)').click(); + const child = await (await fork).json(); + await side.locator('.row.user .bubble').last().waitFor(); + assert.equal((await (await api(daemon, `/api/threads/${child.id}`)).json()).model, 'fake/plain'); + const update = p.waitForResponse(response => response.request().method() === 'PATCH' && new URL(response.url()).pathname === `/api/threads/${child.id}`); + await picker.click(); await p.getByRole('menuitemradio', { name: /^Think\b/ }).click(); + const changed = await (await update).json(); + assert.equal(changed.id, child.id); assert.equal(changed.model, 'fake/think'); assert.equal(changed.effort, 'low'); + const original = await (await api(daemon, `/api/threads/${source.id}`)).json(); + assert.equal(original.model, 'fake/think'); assert.equal(original.effort, 'high'); + await side.locator('.side-chat-title').click(); + if (process.env.LOOCHAT_E2E_SHOTS_DIR) { + const { mkdirSync } = await import('node:fs'); mkdirSync(process.env.LOOCHAT_E2E_SHOTS_DIR, { recursive: true }); + await p.screenshot({ path: join(process.env.LOOCHAT_E2E_SHOTS_DIR, `side-quote-${mobile ? 'phone' : 'desktop'}-${theme}.png`), animations: 'disabled' }); + } + assert.deepEqual(errors, []); + } finally { await context.close(); } +}); diff --git a/apps/workbench/packages/web/public/manifest.webmanifest b/apps/workbench/packages/web/public/manifest.webmanifest index bebbeee3ae..c1c3c5c703 100644 --- a/apps/workbench/packages/web/public/manifest.webmanifest +++ b/apps/workbench/packages/web/public/manifest.webmanifest @@ -11,6 +11,18 @@ "background_color": "#f8f6f1", "theme_color": "#f8f6f1", "icons": [ + { + "src": "/pwa/icon-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "any" + }, + { + "src": "/pwa/icon-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "any" + }, { "src": "/loochat-icon.png?v=crab-1", "sizes": "1024x1024", diff --git a/apps/workbench/packages/web/public/pwa/icon-192.png b/apps/workbench/packages/web/public/pwa/icon-192.png new file mode 100644 index 0000000000..ed9957d940 Binary files /dev/null and b/apps/workbench/packages/web/public/pwa/icon-192.png differ diff --git a/apps/workbench/packages/web/public/pwa/icon-512.png b/apps/workbench/packages/web/public/pwa/icon-512.png new file mode 100644 index 0000000000..26cc2db73c Binary files /dev/null and b/apps/workbench/packages/web/public/pwa/icon-512.png differ diff --git a/apps/workbench/packages/web/src/App.tsx b/apps/workbench/packages/web/src/App.tsx index ef022d1912..f0fb45382d 100644 --- a/apps/workbench/packages/web/src/App.tsx +++ b/apps/workbench/packages/web/src/App.tsx @@ -1,3 +1,4 @@ +import { AgentLoginRecovery, needsAgentLogin } from './components/AgentLoginRecovery'; import { GitPanel } from './components/GitPanel'; import { SettingsPage, type SettingsGroup } from './components/SettingsPage'; import { AssistantSettingsPage, assistantTitle } from './components/AssistantSettingsPage'; @@ -94,6 +95,7 @@ import { SchedulesPage } from './components/SchedulesPage'; import { GoalWorkPage, GOAL_TABS, type GoalTab } from './components/GoalWorkPage'; import { GoalsPage, type GoalsFilter } from './components/GoalsPage'; import { AccessSettings } from './components/AccessSettings'; +import { PwaInstallPromotion, PwaInstallSettings } from './components/PwaInstall'; import { LinkLoginNotice, useAuthKind } from './components/LinkLoginNotice'; import { StewardActions, StewardPage } from './components/StewardPage'; import { SidebarGoals, useLoopxStatus } from './components/SidebarGoals'; @@ -133,7 +135,7 @@ import { ConnectDialog, DemoBar } from './components/ConnectDialog'; import { DemoApi, DemoError } from './demo/DemoApi'; import { EMPTY_MODEL_PREFERENCE, type DraftModelPreference } from '../../daemon/src/model-preferences'; import { QUICK_SWITCH_HIDDEN_KEY, clampQuickSwitchBottom, savedQuickSwitchBottom, saveQuickSwitchBottom } from './quick-switch'; -import { IconCheck, IconBell, AgentMark, IconActivity, IconAgents, IconArchive, IconArrowLeft, IconArrowDown, IconBack, IconClose, IconEdit, IconFolder, IconGauge, IconGlobe, IconList, IconMenu, IconSettings, IconMore, IconOverview, IconPalette, IconPlus, IconPuzzle, IconServer, IconShield, IconSidebar, IconSignIn, IconSignOut, IconSparkle, IconTerminal, IconTrace, IconLanguage, IconWaveform, IconSideChat } from './components/icons'; +import { IconDownload, IconCheck, IconBell, AgentMark, IconActivity, IconAgents, IconArchive, IconArrowLeft, IconArrowDown, IconBack, IconClose, IconEdit, IconFolder, IconGauge, IconGlobe, IconList, IconMenu, IconSettings, IconMore, IconOverview, IconPalette, IconPlus, IconPuzzle, IconServer, IconShield, IconSidebar, IconSignIn, IconSignOut, IconSparkle, IconTerminal, IconTrace, IconLanguage, IconWaveform, IconSideChat } from './components/icons'; import { StatReadings } from './components/SessionStats'; import { ThreadTracePanel } from './components/TracePanel'; import { chooseLocale, locale, LOCALES, localeChoice, t } from './i18n'; @@ -812,6 +814,7 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } const [writingBusy, setWritingBusy] = useState(false); const [draftPermission, setDraftPermission] = useState('auto_edit'); const modelPreferences = useModelPreferences(api, error => setError(message(error))); + const [modelLogin, setModelLogin] = useState<{ agent: string; label: string; login?: AgentInfo['login']; empty?: boolean; key: string; client: Api; scope: Api } | null>(null); const [modelsByAgent, setModelsByAgent] = useState>(() => (keepThreads ? cachedModels(hostId) ?? {} : {})); const draftCaps = agents.find(agent => agent.id === draftAgent)?.capabilities; const goalCap = goalCaps.find(cap => cap.agent === draftAgent); @@ -968,6 +971,7 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } }, [api, demo]); /** The terminal a login started; null attaches to the newest live one. */ const [terminalTarget, setTerminalTarget] = useState(null); + const [terminalClient, setTerminalClient] = useState(null); const [observabilityTab, setObservabilityTab] = useState<'usage' | 'diagnostics'>('usage'); const [observabilityFocus, setObservabilityFocus] = useState(undefined); // Bumped on every visit so the page opens on the requested tab, even when it is already showing. @@ -1492,6 +1496,7 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } const { agent, models } = ev.data as { agent: string; models: ModelOption[] }; modelVersions.current[agent] = (modelVersions.current[agent] ?? 0) + 1; setModelsByAgent(previous => ({ ...previous, [agent]: models })); + setModelLogin(current => models.length && current?.scope === api && current.client === api && current.key === agent ? null : current); } else refresh(); }, ctrl.signal, @@ -1758,6 +1763,25 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } const activeAgent = selected?.agent ?? draftTeamDefinition?.entryAgent ?? draftAgent; const activeCwd = selected?.cwd ?? draftCwd; const commandsKey = `${activeAgent}\n${activeCwd}`; + const activeCatalog = useRef({ api, agent: activeAgent }); + activeCatalog.current = { api, agent: activeAgent }; + useEffect(() => { setModelLogin(null); }, [api, activeAgent]); + const acceptModelCatalog = (agent: string, list: ModelOption[], client = api, id = agent) => { + setModelsByAgent(previous => ({ ...previous, [agent]: list })); + const info = agents.find(item => item.id === agent) ?? remoteAgents.find(item => item.id === agent); + if (!list.length && info?.available && info.capabilities.modelCatalog !== false) { + setModelLogin({ agent: id, key: agent, client, scope: api, label: info.label, login: info.login, empty: true }); + return; + } + setModelLogin(current => current?.scope === api && current.key === agent ? null : current); + }; + const handleModelError = (error: unknown, agent: string, client = api, key = agent, report = true) => { + if (!needsAgentLogin(error)) { if (report) handleError(error); return; } + modelVersions.current[key] = (modelVersions.current[key] ?? 0) + 1; + setModelsByAgent(previous => { const next = { ...previous }; delete next[key]; return next; }); + const info = agents.find(item => item.id === key) ?? remoteAgents.find(item => item.id === key); + setModelLogin({ agent, key, client, scope: api, label: info?.label ?? agent, login: info?.login }); + }; const lastFocusModelRefresh = useRef<{ agent: string; at: number } | null>(null); const refreshActiveModels = useCallback((force = false) => { if (!api || !activeAgent || document.hidden) return; @@ -1769,9 +1793,9 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } void api .models(activeAgent, force) .then((list) => { - if ((modelVersions.current[activeAgent] ?? 0) === version) setModelsByAgent(prev => ({ ...prev, [activeAgent]: list })); + if (activeCatalog.current.api === api && activeCatalog.current.agent === activeAgent && (modelVersions.current[activeAgent] ?? 0) === version) acceptModelCatalog(activeAgent, list); }) - .catch(error => { if (force) handleError(error); }); + .catch(error => { if (activeCatalog.current.api === api && activeCatalog.current.agent === activeAgent && (modelVersions.current[activeAgent] ?? 0) === version) handleModelError(error, activeAgent, api, activeAgent, force); }); }, [api, activeAgent]); // Models of an agent other than the thread's own, for choosing what its members start with. @@ -1782,21 +1806,25 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } const version = modelVersions.current[agent] ?? 0; // An instance of another machine is asked there, under the id it has on that machine. const remote = remoteAgents.find((a) => a.id === agent); - (remote && token ? new Api(token, '', remote.host).models(agent.slice(0, -(remote.host.length + 1)), refresh) : api.models(agent, refresh)).then((list) => { - if ((modelVersions.current[agent] ?? 0) === version) setModelsByAgent(prev => ({ ...prev, [agent]: list })); - }).catch(error => { if (refresh) handleError(error); }).finally(() => { modelsAsked.current.delete(agent); }); + const client = remote && token ? new Api(token, '', remote.host) : api; + const id = remote && token ? agent.slice(0, -(remote.host.length + 1)) : agent; + client.models(id, refresh).then((list) => { + if ((modelVersions.current[agent] ?? 0) === version) acceptModelCatalog(agent, list, client, id); + }).catch(error => { if ((modelVersions.current[agent] ?? 0) === version) handleModelError(error, id, client, agent, refresh); }).finally(() => { modelsAsked.current.delete(agent); }); }; // Models for that agent, loaded once per agent. useEffect(() => { - if (!api || !activeAgent || modelsByAgent[activeAgent]) return; + if (!api || !activeAgent || modelsByAgent[activeAgent]?.length) return; + let live = true; const version = modelVersions.current[activeAgent] ?? 0; api .models(activeAgent) .then((list) => { - if ((modelVersions.current[activeAgent] ?? 0) === version) setModelsByAgent(prev => ({ ...prev, [activeAgent]: list })); + if (live && (modelVersions.current[activeAgent] ?? 0) === version) acceptModelCatalog(activeAgent, list); }) - .catch(handleError); + .catch(error => { if (live && (modelVersions.current[activeAgent] ?? 0) === version) handleModelError(error, activeAgent); }); + return () => { live = false; }; // eslint-disable-next-line react-hooks/exhaustive-deps }, [api, activeAgent]); @@ -2323,12 +2351,13 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } const openAgents = () => { openSettings('agents'); void reloadAgents().catch(handleError); }; - const openTerminal = () => { setTerminalTarget(null); setTermOpen(true); }; + const openTerminal = () => { setTerminalTarget(null); setTerminalClient(null); setTermOpen(true); }; /** Starts an instance's CLI login in a fresh terminal and shows that terminal. */ - const openAgentLogin = async (agent: AgentInfo) => { - const { terminalId } = await api.loginAgentTerminal(agent.id); + const openAgentLogin = async (agent: Pick, client = api) => { + const { terminalId } = await client.loginAgentTerminal(agent.id); setTerminalTarget(terminalId); + setTerminalClient(client); setTermOpen(true); }; @@ -2429,6 +2458,8 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } const agentLabel = (id: string) => agents.find((a) => a.id === id)?.label ?? id; const capsOf = (id: string) => agents.find((a) => a.id === id)?.capabilities; const activeCaps = capsOf(activeAgent); + const sideAgent = sideAsk?.source?.agent ?? activeAgent; + const sideAgentInfo = agents.find(agent => agent.id === sideAgent); const models = modelsByAgent[activeAgent] ?? []; const permissionModes = activeCaps?.permissionModes ?? []; const effortLevels = activeCaps?.effortLevels ?? []; @@ -2829,6 +2860,7 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } { label: t('settings.preferences'), entries: [ ...(!demo ? [{ id: 'general', label: t('general.title'), icon: IconSettings, render: () => { setStartupSettings(value); setExternalNonce(n => n + 1); }} onClose={closeSettings} /> }] : []), { id: 'appearance', label: t('appearance.title'), icon: IconPalette, render: () => }, + ...(!showcase ? [{ id: 'install', label: t('pwa.title'), icon: IconDownload, render: () => }] : []), { id: 'language', label: t('locale.menu'), icon: IconLanguage, render: () =>
{[{ id: 'system' as const, name: t('locale.system') }, ...LOCALES].map(l => )}
}, @@ -3020,7 +3052,10 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } schedulesActive={onSchedules} extensionNav={extensionNav} notice={demo && compact ? showcase ? showcase.notice(selectedId, extWant) : : undefined} - footerNotice={authKind?.kind === 'link' && !showcase ? openSettings('access')} /> : undefined} + footerNotice={!showcase ? <> + openSettings('install')} /> + {authKind?.kind === 'link' && openSettings('access')} />} + : undefined} /> {!compact && !sidebarHidden && ( @@ -3178,6 +3213,15 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } {demo && (showcase ? showcase.notice(selectedId, extWant) : )} + {modelLogin?.scope === api && openAgentLogin({ id: modelLogin.agent }, modelLogin.client)} onRecovered={list => { + modelVersions.current[modelLogin.key] = (modelVersions.current[modelLogin.key] ?? 0) + 1; + setModelsByAgent(previous => ({ ...previous, [modelLogin.key]: list })); + setModelLogin(current => current === modelLogin ? null : current); + void reloadAgents().catch(handleError); + }} />} + {error && (
{error} @@ -3565,6 +3609,8 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } note={noteSignal?.draftKey === composerDraftKey ? noteSignal.note : null} onNoteConsumed={consumeNote} onNotesChange={onNotesChange} + quoteSource={(threadId, turnId, sourceHost) => sourceHost === (hostId ?? null) && threadId !== selectedId && threads.some(thread => thread.id === threadId) + ? { threadId, turnId, elsewhere: true } : undefined} lastSent={selected ? lastSent : null} />} } @@ -3632,10 +3678,10 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } )} {termOpen && ( { setTermOpen(false); setTerminalTarget(null); }} + onClose={() => { setTermOpen(false); setTerminalTarget(null); setTerminalClient(null); }} onError={handleError} /> )} @@ -3734,8 +3780,13 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } {sideAsk && ( acceptModelCatalog(sideAgent, list)} + onPreferenceChanged={() => void modelPreferences.refresh()} + agentLabel={agentLabel(sideAgent)} cwd={sideAsk.source?.cwd ?? activeCwd} permissionMode={sideAsk.source?.permissionMode ?? permission} model={sideAsk.source ? sideAsk.source.model : model} @@ -3743,9 +3794,9 @@ function Hub({ token, onToken, connect, hostId = null, onHost, start, showcase } quoteText={sideAsk.text} sourceTitle={(sideAsk.source ?? selected)?.title ?? null} forkSourceId={sideAsk.source ? (capsOf(sideAsk.source.agent)?.fork && !forkBlocked(sideAsk.source) ? sideAsk.source.id : null) : selected && activeCaps?.fork && !forkBlocked(selected) ? selected.id : null} - attachBlocked={sideAsk.source ? (capsOf(sideAsk.source.agent)?.images ? null : t('app.noImages', agentLabel(sideAsk.source.agent))) : attachBlocked} + attachBlocked={sideAgentInfo?.capabilities.images === false ? t('app.noImages', agentLabel(sideAgent)) : null} onClose={() => setSideAsk(null)} - onError={handleError} + onError={error => handleModelError(error, sideAgent)} onThreadCreated={(t) => setThreads((prev) => [t, ...prev.filter((x) => x.id !== t.id)])} threads={threads} onOpenThread={(id) => { setSideAsk(null); openThreadById(id); }} diff --git a/apps/workbench/packages/web/src/api.ts b/apps/workbench/packages/web/src/api.ts index 270acb01a1..747e427624 100644 --- a/apps/workbench/packages/web/src/api.ts +++ b/apps/workbench/packages/web/src/api.ts @@ -818,6 +818,8 @@ export interface AgentInfo { available: boolean; /** How it can be signed in from the hub, when its adapter can start the CLI's login. */ login?: 'terminal' | 'wizard'; + /** In-progress wizard login that can be resumed after navigation. */ + activeLogin?: AgentLogin; streamBridgeEnabled?: boolean; capabilities: { workModes?: WorkMode[]; @@ -860,6 +862,7 @@ export interface AgentLogin { id: string; status: 'starting' | 'waiting' | 'submitting' | 'success' | 'error' | 'cancelled'; url?: string; + input?: 'code-or-url'; error?: 'failed' | 'expired' | 'unavailable' | 'verification'; } diff --git a/apps/workbench/packages/web/src/clipboard.ts b/apps/workbench/packages/web/src/clipboard.ts index 8c5d6c4963..7d22cf59f8 100644 --- a/apps/workbench/packages/web/src/clipboard.ts +++ b/apps/workbench/packages/web/src/clipboard.ts @@ -7,6 +7,7 @@ export async function copyText(text: string): Promise { try { if (window.isSecureContext && navigator.clipboard?.writeText) { await navigator.clipboard.writeText(text); + forgetCopiedQuote(); return true; } } catch { @@ -27,6 +28,7 @@ export async function copyText(text: string): Promise { ok = false; } area.remove(); + if (ok) forgetCopiedQuote(); return ok; } @@ -39,6 +41,37 @@ export function quoteMarkdown(text: string): string { .join('\n'); } +const COPIED_QUOTE = 'calli.copiedQuote'; + +/** An ordinary copy must not inherit provenance from a previous copy-as-quote action. */ +function forgetCopiedQuote(): void { + try { localStorage.removeItem(COPIED_QUOTE); } catch { /* storage unavailable */ } +} + +/** A message copied as a quote, remembered so pasting it into a box brings back a quote, not plain lines. */ +export interface CopiedQuote { text: string; threadId?: string; turnId?: string; host?: string | null } + +export function rememberCopiedQuote(quote: CopiedQuote): void { + try { localStorage.setItem(COPIED_QUOTE, JSON.stringify(quote)); } catch { /* storage off: paste stays plain */ } +} + +/** + * What a paste quotes, when it is a quote: the message this page last copied as one (with where it + * came from), or any text made only of Markdown `> ` lines, such as a quote copied from another app. + */ +export function pastedQuote(pasted: string): CopiedQuote | null { + const plain = pasted.replace(/\r\n?/g, '\n').trim(); + if (!plain) return null; + try { + const copied = JSON.parse(localStorage.getItem(COPIED_QUOTE) ?? 'null') as CopiedQuote | null; + if (copied && typeof copied.text === 'string' && (plain === quoteMarkdown(copied.text) || plain === copied.text.trim())) return copied; + } catch { /* unreadable: fall through to the plain form */ } + const lines = plain.split('\n'); + if (!lines.every(line => line.startsWith('>'))) return null; + const text = lines.map(line => line.replace(/^>\s?/, '')).join('\n').trim(); + return text ? { text } : null; +} + /** * Copies text with an HTML twin, so a rich editor (Lark, Slack, Notion, mail) pastes the formatted * version and a plain one gets the text. The copy event works on plain http and keeps the click's diff --git a/apps/workbench/packages/web/src/components/AgentAccountDialog.tsx b/apps/workbench/packages/web/src/components/AgentAccountDialog.tsx index ae27dd9751..b9e17ae911 100644 --- a/apps/workbench/packages/web/src/components/AgentAccountDialog.tsx +++ b/apps/workbench/packages/web/src/components/AgentAccountDialog.tsx @@ -7,7 +7,7 @@ import { StreamBridgeOption } from './StreamBridgeOption'; import { AgentMark, IconChevron, IconPlus } from './icons'; export function AgentAccountDialog({ api, agents, onCreated, onDiscover, onClose }: { - api: Api; agents: AgentInfo[]; onCreated: () => Promise; onDiscover: () => void; onClose: () => void; + api: Api; agents: AgentInfo[]; onCreated: (accountId?: string) => Promise; onDiscover: () => void; onClose: () => void; }) { const [supported, setSupported] = useState(null); const [selected, setSelected] = useState(null); @@ -32,9 +32,11 @@ export function AgentAccountDialog({ api, agents, onCreated, onDiscover, onClose const create = async () => { if (!selected || busy) return; setBusy(true); setError(''); + let accountId: string | undefined; try { if (selected.capabilities?.createAccount) { - await api.createAgentAccount({ adapter: selected.adapter, sourceId: sourceId || undefined, label: label.trim() || undefined }); + const account = await api.createAgentAccount({ adapter: selected.adapter, sourceId: sourceId || undefined, label: label.trim() || undefined }); + accountId = account.id; } else if (sourceId) { await api.updateAgent(sourceId, { streamBridge, ...(label.trim() ? { label: label.trim() } : {}) }); } else { @@ -45,7 +47,7 @@ export function AgentAccountDialog({ api, agents, onCreated, onDiscover, onClose } catch (e) { setError(e instanceof Error ? e.message : String(e)); setBusy(false); return; } - await onCreated(); + await onCreated(accountId); }; return

{t('agents.add')}

diff --git a/apps/workbench/packages/web/src/components/AgentLoginDialog.tsx b/apps/workbench/packages/web/src/components/AgentLoginDialog.tsx deleted file mode 100644 index 24de937aaa..0000000000 --- a/apps/workbench/packages/web/src/components/AgentLoginDialog.tsx +++ /dev/null @@ -1,80 +0,0 @@ -import { useEffect, useRef, useState } from 'react'; -import { ApiError, type AgentInfo, type AgentLogin, type Api } from '../api'; -import { copyText } from '../clipboard'; -import { t } from '../i18n'; -import { DialogSurface } from './Dialog'; -import { AgentMark, IconCheck, IconCopy, IconExternal } from './icons'; - -export function AgentLoginDialog({ api, agent, initial, onReload, onClose }: { - api: Api; agent: AgentInfo; initial: AgentLogin; onReload: () => Promise | void; onClose: () => void; -}) { - const [login, setLogin] = useState(initial); - const [code, setCode] = useState(''); - const [error, setError] = useState(''); - const [busy, setBusy] = useState(false); - const [copied, setCopied] = useState(false); - const reload = useRef(onReload); reload.current = onReload; - const active = ['starting', 'waiting', 'submitting'].includes(login.status); - - useEffect(() => { - let alive = true; - let timer: ReturnType; - const poll = async () => { - try { - const next = await api.agentLogin(agent.id, login.id); - if (!alive) return; - setLogin(next); setError(''); - if (next.status === 'success') await reload.current(); - if (['starting', 'waiting', 'submitting'].includes(next.status)) timer = setTimeout(poll, 1000); - } catch (e) { - if (!alive) return; - if (e instanceof ApiError && e.status === 404) { - setLogin(current => ({ id: current.id, status: 'error', error: 'expired' })); - return; - } - setError(e instanceof Error ? e.message : String(e)); - timer = setTimeout(poll, 2500); - } - }; - if (active) void poll(); - return () => { alive = false; clearTimeout(timer); }; - }, [api, agent.id, login.id, active]); - - const restart = async () => { - setBusy(true); setError(''); setCode(''); setCopied(false); - try { setLogin(await api.startAgentLogin(agent.id)); } - catch (e) { setError(e instanceof Error ? e.message : String(e)); } - finally { setBusy(false); } - }; - const submit = async () => { - if (busy || !code.trim()) return; - setBusy(true); setError(''); - try { setLogin(await api.submitAgentLogin(agent.id, login.id, code.trim())); setCode(''); } - catch (e) { setError(e instanceof Error ? e.message : String(e)); } - finally { setBusy(false); } - }; - const close = async () => { - if (busy) return; - setBusy(true); - try { - if (active) await api.cancelAgentLogin(agent.id, login.id); - onClose(); - } catch (e) { - if (e instanceof ApiError && e.status === 404) onClose(); - else { setError(e instanceof Error ? e.message : String(e)); setBusy(false); } - } - }; - return void close()} busy={busy}> -
{agent.icon && }

{t('agentLogin.title', agent.label)}

{t('agentLogin.hint')}

- {login.status === 'waiting' && login.url && <> -
{t('agentLogin.open')}
- - } - {login.status !== 'waiting' &&

{login.status === 'success' && }{login.status === 'error' ? t(`agentLogin.${login.error ?? 'failed'}`) : t(`agentLogin.${login.status}`)}

} - {error &&

{error}

} -
- {login.status === 'waiting' && } - {(login.status === 'error' || login.status === 'cancelled') && } -
-
; -} diff --git a/apps/workbench/packages/web/src/components/AgentLoginPanel.tsx b/apps/workbench/packages/web/src/components/AgentLoginPanel.tsx new file mode 100644 index 0000000000..76309590da --- /dev/null +++ b/apps/workbench/packages/web/src/components/AgentLoginPanel.tsx @@ -0,0 +1,186 @@ +import { useEffect, useRef, useState } from 'react'; +import { ApiError, type AgentInfo, type AgentLogin, type Api } from '../api'; +import { copyText } from '../clipboard'; +import { t } from '../i18n'; +import { IconCheck, IconCopy, IconExternal } from './icons'; + +/** + * Inline sign-in panel rendered directly under an agent row so the rest of the workspace + * (including the remote desktop pane) stays interactive. Collapsing or leaving the page keeps + * the daemon login session alive; only the explicit cancel action terminates it. + */ +export function AgentLoginPanel({ api, agent, initial, onState, onReload, onCollapse, onDismiss, onSuccess }: { + api: Api; + agent: Pick; + initial: AgentLogin; + onState: (next: AgentLogin) => void; + onReload: () => Promise | void; + onCollapse: () => void; + onDismiss: () => void; + onSuccess?: () => void; +}) { + const [login, setLogin] = useState(initial); + const [code, setCode] = useState(''); + const [error, setError] = useState(''); + const [busy, setBusy] = useState(false); + const [copied, setCopied] = useState(false); + const reload = useRef(onReload); reload.current = onReload; + const notify = useRef(onState); notify.current = onState; + const success = useRef(onSuccess); success.current = onSuccess; + const active = ['starting', 'waiting', 'submitting'].includes(login.status); + const codeOrUrl = login.input === 'code-or-url'; + + const update = (next: AgentLogin) => { + setLogin(next); + notify.current(next); + }; + + useEffect(() => { + let alive = true; + let timer: ReturnType; + const poll = async () => { + try { + const next = await api.agentLogin(agent.id, login.id); + if (!alive) return; + update(next); + setError(''); + if (next.status === 'success') { await reload.current(); success.current?.(); } + if (['starting', 'waiting', 'submitting'].includes(next.status)) timer = setTimeout(poll, 1000); + } catch (e) { + if (!alive) return; + if (e instanceof ApiError && e.status === 404) { + update({ id: login.id, status: 'error', error: 'expired' }); + void reload.current(); + return; + } + setError(e instanceof Error ? e.message : String(e)); + timer = setTimeout(poll, 2500); + } + }; + if (active) void poll(); + return () => { alive = false; clearTimeout(timer); }; + }, [api, agent.id, login.id, active]); + + const restart = async () => { + setBusy(true); setError(''); setCode(''); setCopied(false); + try { + const started = await api.startAgentLogin(agent.id); + update(started); + void reload.current(); + } catch (e) { + setError(e instanceof Error ? e.message : String(e)); + } finally { + setBusy(false); + } + }; + + const submit = async () => { + if (busy || !code.trim()) return; + setBusy(true); setError(''); + try { + update(await api.submitAgentLogin(agent.id, login.id, code.trim())); + setCode(''); + } catch (e) { + setError(e instanceof Error ? e.message : String(e)); + } finally { + setBusy(false); + } + }; + + const cancel = async () => { + if (busy) return; + setBusy(true); setError(''); + try { + if (active) await api.cancelAgentLogin(agent.id, login.id); + onDismiss(); + void reload.current(); + } catch (e) { + if (e instanceof ApiError && e.status === 404) { + onDismiss(); + void reload.current(); + } else { + setError(e instanceof Error ? e.message : String(e)); + setBusy(false); + } + } + }; + + return ( +
+

{t(codeOrUrl ? 'agentLogin.hintCodeOrUrl' : 'agentLogin.hint')}

+ {login.status === 'waiting' && login.url && ( + <> +
+ + {t('agentLogin.open')} + + +
+
+ +
+ setCode(event.target.value)} + onKeyDown={(event) => { + if (event.key === 'Enter' && !event.nativeEvent.isComposing) void submit(); + }} + /> + +
+
+ + )} + {login.status !== 'waiting' && ( +

+ {login.status === 'success' && } + {login.status === 'error' ? t(`agentLogin.${login.error ?? 'failed'}`) : t(`agentLogin.${login.status}`)} +

+ )} + {error &&

{error}

} +
+ {active ? ( + <> + {t('agentLogin.keepHint')} +
+ + +
+ + ) : ( +
+ + {(login.status === 'error' || login.status === 'cancelled') && ( + + )} +
+ )} +
+
+ ); +} diff --git a/apps/workbench/packages/web/src/components/AgentLoginRecovery.tsx b/apps/workbench/packages/web/src/components/AgentLoginRecovery.tsx new file mode 100644 index 0000000000..025b9954c2 --- /dev/null +++ b/apps/workbench/packages/web/src/components/AgentLoginRecovery.tsx @@ -0,0 +1,87 @@ +import { useEffect, useRef, useState } from 'react'; +import { ApiError, type Api, type AgentInfo, type AgentLogin, type ModelOption } from '../api'; +import { t } from '../i18n'; +import { AgentLoginPanel } from './AgentLoginPanel'; + +export function needsAgentLogin(error: unknown): boolean { + return error instanceof ApiError && error.details.code === 'agent_login_required'; +} + +/** A signed-out catalog is recoverable in place, without replacing the workspace or its draft. */ +export function AgentLoginRecovery({ api, agent, empty = false, onRecovered, onTerminalLogin }: { + api: Api; agent: Pick; onRecovered: (models: ModelOption[]) => void; + empty?: boolean; + onTerminalLogin?: () => Promise; +}) { + const [login, setLogin] = useState(null); + const [expanded, setExpanded] = useState(false); + const [signedIn, setSignedIn] = useState(false); + const [busy, setBusy] = useState(false); + const [error, setError] = useState(''); + const [terminalStarted, setTerminalStarted] = useState(false); + const recoveredRef = useRef(onRecovered); recoveredRef.current = onRecovered; + // Terminal CLIs own their authentication. Read back that account; never assume opening it logged in. + useEffect(() => { + if (!terminalStarted) return; + let live = true; + let timer: ReturnType; + const deadline = Date.now() + 10 * 60_000; + const check = async () => { + if (Date.now() >= deadline) { setTerminalStarted(false); return; } + try { + const models = await api.models(agent.id, true); + if (live) { + if (!models.length) { setError(t('agentLogin.noModels')); setTerminalStarted(false); } + else recoveredRef.current(models); + } + } catch (e) { + if (!live) return; + if (!needsAgentLogin(e)) { + setError(e instanceof Error ? e.message : String(e)); + setTerminalStarted(false); + return; + } + timer = setTimeout(check, 2000); + } + }; + void check(); + return () => { live = false; clearTimeout(timer); }; + }, [api, agent.id, terminalStarted]); + const start = async () => { + setBusy(true); setError(''); + try { + if (agent.login === 'terminal') { + await onTerminalLogin?.(); + setTerminalStarted(true); + return; + } + setLogin(await api.startAgentLogin(agent.id)); + setExpanded(true); + } catch (e) { setError(e instanceof Error ? e.message : String(e)); } + finally { setBusy(false); } + }; + const reload = async (verified = signedIn) => { + setSignedIn(verified); setBusy(true); setError(''); + try { + const models = await api.models(agent.id, true); + if (models.length) onRecovered(models); + else setError(t('agentLogin.noModels')); + } + catch (e) { + if (needsAgentLogin(e)) { setSignedIn(false); setLogin(null); setExpanded(false); } + else setError(e instanceof Error ? e.message : String(e)); + } finally { setBusy(false); } + }; + return
+
+ {signedIn ? t('agentLogin.success') : t(empty ? 'agentLogin.empty' : 'agentLogin.required', agent.label)} + {!signedIn && !expanded && agent.login && } + {agent.login !== 'wizard' && } +
+ {agent.login !== 'wizard' &&

{t('agentLogin.nativeHint')}

} + {error &&

{error} {signedIn && }

} + {login && expanded && {}} onSuccess={() => void reload(true)} + onCollapse={() => setExpanded(false)} onDismiss={() => { setLogin(null); setExpanded(false); }} />} +
; +} diff --git a/apps/workbench/packages/web/src/components/AgentsPage.tsx b/apps/workbench/packages/web/src/components/AgentsPage.tsx index 47e366f688..80f9d67386 100644 --- a/apps/workbench/packages/web/src/components/AgentsPage.tsx +++ b/apps/workbench/packages/web/src/components/AgentsPage.tsx @@ -1,7 +1,7 @@ -import { useMemo, useState } from 'react'; +import { useEffect, useMemo, useRef, useState } from 'react'; import { ApiError, type AgentInfo, type AgentLogin, type AgentReferences, type Api } from '../api'; import { AgentAccountDialog } from './AgentAccountDialog'; -import { AgentLoginDialog } from './AgentLoginDialog'; +import { AgentLoginPanel } from './AgentLoginPanel'; import { AgentSettingsDialog } from './AgentSettingsDialog'; import { t } from '../i18n'; import { Dialog } from './Dialog'; @@ -39,13 +39,19 @@ const total = (references: AgentReferences): number => */ export function AgentsPage({ api, agents, onAdd, onReload, onLogin }: Props) { const [adding, setAdding] = useState(false); - const [signingIn, setSigningIn] = useState<{ agent: AgentInfo; login: AgentLogin } | null>(null); + const [logins, setLogins] = useState>({}); + const [expanded, setExpanded] = useState>({}); const [settings, setSettings] = useState(null); const [renaming, setRenaming] = useState(null); const [removing, setRemoving] = useState<{ agent: AgentInfo; references: AgentReferences } | null>(null); const [busy, setBusy] = useState(null); const [error, setError] = useState(null); const groups = useMemo(() => groupsOf(agents), [agents]); + const reloadRef = useRef(onReload); reloadRef.current = onReload; + + useEffect(() => { + void reloadRef.current(); + }, []); const fail = (e: unknown) => setError(e instanceof Error ? e.message : String(e)); @@ -116,10 +122,29 @@ export function AgentsPage({ api, agents, onAdd, onReload, onLogin }: Props) { const login = async (agent: AgentInfo) => { setError(null); + if (agent.login === 'wizard') { + const current = logins[agent.id] ?? agent.activeLogin; + if (current && ['starting', 'waiting', 'submitting'].includes(current.status)) { + setLogins((prev) => ({ ...prev, [agent.id]: current })); + setExpanded((prev) => ({ ...prev, [agent.id]: true })); + return; + } + setBusy(agent.id); + try { + const started = await api.startAgentLogin(agent.id); + setLogins((prev) => ({ ...prev, [agent.id]: started })); + setExpanded((prev) => ({ ...prev, [agent.id]: true })); + void onReload(); + } catch (e) { + fail(e); + } finally { + setBusy(null); + } + return; + } setBusy(agent.id); try { - if (agent.login === 'wizard') setSigningIn({ agent, login: await api.startAgentLogin(agent.id) }); - else await onLogin(agent); + await onLogin(agent); } catch (e) { fail(e); } finally { @@ -127,6 +152,32 @@ export function AgentsPage({ api, agents, onAdd, onReload, onLogin }: Props) { } }; + const dismissLogin = (agentId: string) => { + setExpanded((prev) => { + const next = { ...prev }; + delete next[agentId]; + return next; + }); + setLogins((prev) => { + const next = { ...prev }; + delete next[agentId]; + return next; + }); + }; + + const created = async (accountId?: string) => { + try { + if (accountId) { + const agent = (await api.agents()).find(agent => agent.id === accountId); + if (agent?.login) await login(agent); + } + } catch (e) { fail(e); } + finally { + setAdding(false); + try { await onReload(); } catch (e) { fail(e); } + } + }; + return (
@@ -152,8 +203,13 @@ export function AgentsPage({ api, agents, onAdd, onReload, onLogin }: Props) { {groups.map((group) => (
{group.agents.length > 1 &&

{group.label} · {group.agents.length}

} - {group.agents.map((agent) => ( -
+ {group.agents.map((agent) => { + const activeLogin = logins[agent.id] ?? agent.activeLogin; + const pendingLogin = !!activeLogin && ['starting', 'waiting', 'submitting'].includes(activeLogin.status); + const isExpanded = !!expanded[agent.id] && !!activeLogin; + return ( +
+
@@ -162,6 +218,12 @@ export function AgentsPage({ api, agents, onAdd, onReload, onLogin }: Props) { {agent.label} {agent.hidden && {t('agents.hidden')}} {!agent.available && {t('agents.unavailable')}} + {pendingLogin && ( + + + )}
{agent.account === null ? t('agentAccount.needsLogin') : agent.account ?? t('agents.localAccount')} @@ -170,15 +232,25 @@ export function AgentsPage({ api, agents, onAdd, onReload, onLogin }: Props) {
{agent.login && ( - + isExpanded ? ( + + ) : ( + + ) )}
- ))} + {isExpanded && activeLogin && ( + setLogins((prev) => ({ ...prev, [agent.id]: next }))} + onReload={onReload} + onCollapse={() => setExpanded((prev) => ({ ...prev, [agent.id]: false }))} + onDismiss={() => dismissLogin(agent.id)} + /> + )} +
+ ); + })} ))} )} - {adding && setAdding(false)} onDiscover={() => { setAdding(false); onAdd(); }} onCreated={async () => { setAdding(false); try { await onReload(); } catch (e) { fail(e); } }} />} + {adding && setAdding(false)} onDiscover={() => { setAdding(false); onAdd(); }} onCreated={created} />} {settings && setSettings(null)} />} - {signingIn && setSigningIn(null)} />} {renaming && ( void; /** Told which notes are in the box, so their passages can stay highlighted in the conversation. */ onNotesChange?: (notes: DraftNote[]) => void; + /** Resolve provenance only when the pasted quote belongs to this machine. */ + quoteSource?: (threadId: string, turnId: string, host?: string | null) => NoteSource | undefined; /** The thread's latest message from the user, as it was sent; null when there is none or it is not known yet. */ lastSent?: { turnId: string; text: string } | null; } @@ -265,6 +268,7 @@ export function Composer({ note, onNoteConsumed, onNotesChange, + quoteSource, lastSent = null, mentionOptions = [], collaboration, @@ -996,7 +1000,13 @@ export function Composer({ if (files.length) { e.preventDefault(); void addFiles(files); + return; } + const quote = pastedQuote(e.clipboardData.getData('text/plain')); + if (!quote) return; + e.preventDefault(); + const source = quote.threadId && quote.turnId ? quoteSource?.(quote.threadId, quote.turnId, quote.host) : undefined; + setNotes(previous => [...previous, { id: noteId(), quote: quote.text, comment: '', ...(source ? { source } : {}) }]); }; const hasFiles = (e: DragEvent) => [...e.dataTransfer.types].includes('Files'); diff --git a/apps/workbench/packages/web/src/components/Pickers.tsx b/apps/workbench/packages/web/src/components/Pickers.tsx index c0df651728..b8a868eaae 100644 --- a/apps/workbench/packages/web/src/components/Pickers.tsx +++ b/apps/workbench/packages/web/src/components/Pickers.tsx @@ -87,6 +87,8 @@ export function PermissionPicker({ modes, value, onChange, canAsk, openSignal, q } interface ModelProps { + catalogStatus?: 'loading' | 'ready' | 'error'; + onRetryCatalog?: () => void; preferenceStatus?: 'loading' | 'ready' | 'error'; onRetryPreference?: () => void; onDiagnose?: () => void; @@ -216,6 +218,22 @@ export function ModelPicker(props: ModelProps) { const { models, model, efforts, effort, openSignal, quietFor } = props; const narrow = useIsNarrow(); if (props.catalog === false) return null; + const levels = effortsForModel(models, model, efforts); + const shownEffort = effort && levels.includes(effort) ? effort : null; + if (props.catalogStatus && props.catalogStatus !== 'ready') { + const failed = props.catalogStatus === 'error'; + const label = failed ? t('pickers.modelsLoadFailed') : t('common.loading'); + return 0 ? ' dial-only' : ''}`} triggerLabel={label} triggerTitle={label} + trigger={<> + {!(narrow && levels.length > 0) && {model ? modelName(models, model) : t('statusPanel.model')}} + {levels.length > 0 && } + {!narrow && } + }> + {() => <>
{label}
{failed && }} +
; + } + if (props.preferenceStatus && props.preferenceStatus !== 'ready') { const failed = props.preferenceStatus === 'error'; const label = failed ? t('pickers.preferenceFailed') : t('common.loading'); @@ -242,8 +260,6 @@ export function ModelPicker(props: ModelProps) { ); } - const levels = effortsForModel(models, model, efforts); - const shownEffort = effort && levels.includes(effort) ? effort : null; if (quietFor !== undefined) { const chosen = [model ? modelName(models, model) : '', shownEffort ? (EFFORT_LABELS[shownEffort] ?? shownEffort) : ''].filter(Boolean).join(' · '); // Named even when nothing was chosen: the default model's name, quieter than a choice. diff --git a/apps/workbench/packages/web/src/components/PwaInstall.tsx b/apps/workbench/packages/web/src/components/PwaInstall.tsx new file mode 100644 index 0000000000..6e0bdaa1a4 --- /dev/null +++ b/apps/workbench/packages/web/src/components/PwaInstall.tsx @@ -0,0 +1,48 @@ +import { useSyncExternalStore } from 'react'; +import { createPwaInstall } from '../pwa-install'; +import { t } from '../i18n'; +import { SettingsSection } from './PageNavigation'; +import { IconDownload } from './icons'; + +// Capture eligibility before React mounts, and share one single-use offer across both entrypoints. +const install = typeof window !== 'undefined' && typeof window.matchMedia === 'function' ? createPwaInstall(window) : null; +if (import.meta.hot) import.meta.hot.dispose(() => install?.dispose()); +const empty = { available: false, installed: false, busy: false, accepted: false, failed: false, dismissedUntil: 0 }; +const snapshot = () => install?.getSnapshot() ?? empty; +const subscribe = (listener: () => void) => install?.subscribe(listener) ?? (() => {}); +const useInstall = () => useSyncExternalStore(subscribe, snapshot); + +export function PwaInstallPromotion({ onHelp }: { onHelp: () => void }) { + const state = useInstall(); + if (state.installed || state.dismissedUntil > Date.now() || (!state.available && !state.busy && !state.failed)) return null; + return
+ {t('pwa.title')} +

{t('pwa.hint')}

+ {state.failed &&

{t('pwa.failed')}

} +
+ {state.failed + ? + : } + +
+
; +} + +export function PwaInstallSettings() { + const state = useInstall(); + const secure = typeof window !== 'undefined' && window.isSecureContext; + return + {state.installed ?

{t('pwa.installed')}

: <> + {state.failed &&

{t('pwa.failed')}

} + {state.accepted &&

{t('pwa.accepted')}

} + {state.available || state.busy + ? + : !state.accepted &&

{t(secure ? 'pwa.unavailable' : 'pwa.insecure')}

} +
+ {t('pwa.help')} +

{t('pwa.chrome')}

+

{t('pwa.launch')}

+
+ } +
; +} diff --git a/apps/workbench/packages/web/src/components/SideChat.tsx b/apps/workbench/packages/web/src/components/SideChat.tsx index 2201306317..07bcc5506b 100644 --- a/apps/workbench/packages/web/src/components/SideChat.tsx +++ b/apps/workbench/packages/web/src/components/SideChat.tsx @@ -1,6 +1,6 @@ import { mergeHistory, watchHistory } from '../history'; -import { useEffect, useMemo, useRef, useState } from 'react'; -import { Api, type AgentMention, type Thread } from '../api'; +import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; +import { Api, type AgentInfo, type AgentMention, type ModelOption, type Thread } from '../api'; import type { PreparedImage } from '../images'; import { restoreVideos, type PreparedVideo } from '../videos'; import { folderName } from '../paths'; @@ -9,11 +9,21 @@ import { Composer } from './Composer'; import { ThreadView } from './ThreadView'; import { IconClose } from './icons'; import { t } from '../i18n'; +import { effortsForModel, imagesBlocked, ModelPicker } from './Pickers'; +import { applyModelPreference, type DraftModelPreference } from '../model-preferences'; interface Props { api: Api; /** Where the question goes: the same setup as the thread the quoted text came from. */ agent: string; + /** The source agent's model and effort capabilities. */ + agentInfo?: AgentInfo; + /** Models already known for that agent; the picker refreshes them when opened. */ + models: ModelOption[]; + /** Saved per-model preferences for this agent, so switching models restores each model's effort. */ + savedPreference?: DraftModelPreference; + onModelsLoaded?: (models: ModelOption[]) => void; + onPreferenceChanged?: () => void; agentLabel: string; cwd: string; permissionMode: string; @@ -53,6 +63,11 @@ export function SideChat({ agentLabel, cwd, permissionMode, + agentInfo, + models: cachedModels, + savedPreference, + onModelsLoaded, + onPreferenceChanged, model, effort, quoteText, @@ -66,6 +81,12 @@ export function SideChat({ onOpenThread, }: Props) { const [thread, setThread] = useState(null); + const [draftModel, setDraftModel] = useState(model); + const [draftEffort, setDraftEffort] = useState(effort); + const [draftEdited, setDraftEdited] = useState<{ model: boolean; effort: boolean }>({ model: false, effort: false }); + const draftPref = useRef(applyModelPreference(savedPreference, { model, effort })); + const [models, setModels] = useState(cachedModels); + const [modelsStatus, setModelsStatus] = useState<'loading' | 'ready' | 'error'>(cachedModels.length || agentInfo?.capabilities.modelCatalog === false ? 'ready' : 'loading'); const [events, setEvents] = useState([]); const scrollerRef = useRef(null); const stick = useRef(true); @@ -75,6 +96,58 @@ export function SideChat({ const threadId = thread?.id ?? null; const timeline = useMemo(() => buildTimeline(events), [events]); const running = timeline.running || thread?.status === 'running'; + const caps = agentInfo?.capabilities; + const shownModel = thread ? thread.model : draftModel; + const shownEffort = thread ? thread.effort : draftEffort; + const effectiveAttachBlocked = (caps?.images === false ? t('app.noImages', agentLabel) : attachBlocked) ?? imagesBlocked(models, shownModel); + + useEffect(() => { + if (!thread && !draftEdited.model && !draftEdited.effort) { + draftPref.current = applyModelPreference(savedPreference, { model: draftModel, effort: draftEffort }); + } + }, [savedPreference, thread, draftEdited.model, draftEdited.effort, draftModel, draftEffort]); + + const errorRef = useRef(onError); + errorRef.current = onError; + const modelsLoadedRef = useRef(onModelsLoaded); + modelsLoadedRef.current = onModelsLoaded; + const modelRequest = useRef(0); + const loadModels = useCallback((refresh = false) => { + if (agentInfo?.capabilities.modelCatalog === false) return; + const ticket = ++modelRequest.current; + setModelsStatus(current => current === 'ready' ? 'ready' : 'loading'); + void api.models(agent, refresh).then(list => { + if (modelRequest.current !== ticket) return; + setModels(list); + setModelsStatus('ready'); + modelsLoadedRef.current?.(list); + }).catch(error => { + if (modelRequest.current !== ticket) return; + setModelsStatus(current => current === 'ready' ? 'ready' : 'error'); + errorRef.current(error); + }); + }, [api, agent, agentInfo?.capabilities.modelCatalog]); + + useEffect(() => { + if (cachedModels.length > 0) { + setModels(cachedModels); + setModelsStatus('ready'); + } + }, [cachedModels]); + + useEffect(() => { + setModels(cachedModels); + if (agentInfo?.capabilities.modelCatalog === false) { + setModelsStatus('ready'); + return; + } + setModelsStatus(cachedModels.length ? 'ready' : 'loading'); + // A cached catalog is enough until the person opens the picker; without one, fetch it now. + if (cachedModels.length === 0) loadModels(); + return () => { modelRequest.current++; }; + // The catalog belongs to the source agent, not to whichever thread later opens here. + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [agent, loadModels]); useEffect(() => { const onKey = (e: KeyboardEvent) => { @@ -130,6 +203,11 @@ export function SideChat({ const title = t('sideChat.threadTitle', quoteText.replace(/\s+/g, ' ').slice(0, 24)); let created: Thread; let firstText = text; + const choicePatch = { + ...(draftEdited.model || draftModel !== model ? { model: draftModel } : {}), + ...(draftEdited.effort || (!draftEdited.model && draftEffort !== effort) ? { effort: draftEffort } : {}), + }; + const choiceChanged = choicePatch.model !== undefined || choicePatch.effort !== undefined; if (forkSourceId) { // The fork carries the conversation the passage was selected from, so the first question // already lands with all its context. The message itself stays just the quote and the @@ -137,15 +215,21 @@ export function SideChat({ // history and this panel's turns is read before the question is sent, or the question // could be counted as inherited. const forked = await api.forkThread(forkSourceId); - created = await api.updateThread(forked.id, { title }); + created = await api.updateThread(forked.id, { + title, + ...(choiceChanged ? { ...choicePatch, rememberModelChoice: true } : {}), + }); baseSeq.current = (await api.historyPosition(created.id)).snapshotSeq; } else { // A fresh agent seeing a bare snippet has nothing to go on but the words, so the message // says which thread the notes were lifted out of. - created = await api.createThread({ agent, cwd, permissionMode, model, effort, title }); + created = await api.createThread({ agent, cwd, permissionMode, model: draftModel, effort: draftEffort, title }); + if (choiceChanged) created = await api.updateThread(created.id, { ...choicePatch, rememberModelChoice: true }); const { notes, body } = splitNotes(text); if (sourceTitle && notes.length) firstText = withNotes(notes, `${t('sideChat.notesFrom', sourceTitle)}\n\n${body}`); } + if (choiceChanged) onPreferenceChanged?.(); + draftPref.current = applyModelPreference(draftPref.current, { model: created.model, effort: created.effort }); setThread(created); onThreadCreated(created); await api.startTurn(created.id, firstText, outgoing, { queue: true, videos: await Promise.all(videos.map(async video => (await api.uploadVideo(created.id, video.file)).id)) }); @@ -157,6 +241,54 @@ export function SideChat({ const roots = useMemo(() => (thread ? [thread.cwd, thread.cwdReal] : [cwd]), [thread, cwd]); + const updateChoice = (patch: { model?: string | null; effort?: string | null }) => { + const nextPref = applyModelPreference(draftPref.current, patch); + draftPref.current = nextPref; + const nextModel = patch.model !== undefined ? patch.model : shownModel; + const levels = effortsForModel(models, nextModel, caps?.effortLevels ?? []); + const nextEffort = patch.effort !== undefined ? patch.effort : nextPref.effort && levels.includes(nextPref.effort) ? nextPref.effort : null; + if (!thread) { + if (patch.model !== undefined) { + setDraftModel(patch.model); + setDraftEffort(nextEffort); + setDraftEdited({ model: true, effort: patch.effort !== undefined }); + } else if (patch.effort !== undefined) { + setDraftEffort(patch.effort); + setDraftEdited(prev => ({ ...prev, effort: true })); + } + return; + } + const before = thread; + const id = thread.id; + setThread({ ...thread, ...patch, effort: nextEffort }); + void api.updateThread(id, { ...patch, rememberModelChoice: true }).then(updated => { + draftPref.current = applyModelPreference(draftPref.current, { model: updated.model, effort: updated.effort }); + setThread(current => current?.id === id ? updated : current); + onThreadCreated(updated); + onPreferenceChanged?.(); + }).catch(error => { + setThread(current => current?.id === id ? before : current); + onError(error); + }); + }; + + const chooseModel = (next: string | null) => { + updateChoice({ model: next }); + }; + + const modelPicker = caps && loadModels(true)} + models={models} + model={shownModel} + efforts={caps.effortLevels ?? []} + effort={shownEffort} + onOpen={() => loadModels(true)} + onModel={chooseModel} + onEffort={effort => updateChoice({ effort })} + />; + return (