Merge remote-tracking branch 'origin/master' into build/windows-cache-concurrency
This commit is contained in:
winewill committed
commit
466aa2232b
43 files changed
+377
-124
No files matched your search
@@ -2,5 +2,5 @@
|
||||
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
||||
# after editing either side, bring the other along and re-record with:
|
||||
# pnpm run verify-translation-pairing --write .agents/notes/implemented/bug-fix/2026-09-16-desktop-window-menus.md
|
||||
2026-09-16-desktop-window-menus.md: 85ac42aa287b1cd9e595ade7cb44b965dea787dd
|
||||
2026-09-16-desktop-window-menus.zh.md: 1376b90058ceafa7e378b4fd543d261064f5d8aa
|
||||
2026-09-16-desktop-window-menus.md: 8a5343404e0cb3d2e7c4e20248a8b29f3bfbec47
|
||||
2026-09-16-desktop-window-menus.zh.md: d6ee6412462aecf49557a7994a683d37bf8e7253
|
||||
@@ -12,7 +12,7 @@ The Desktop shell replaces Electron's default application menu with a custom tem
|
||||
|
||||
On macOS the template declares `{ role: 'fileMenu' }` before the Edit menu and `{ role: 'windowMenu' }` after it, and a separator-delimited run of `hide`, `hideOthers`, and `unhide` before Quit in the application submenu. Those roles contribute only the standard items; no Services submenu, window list, or other macOS default is declared. Windows and Linux keep the application and Edit menus.
|
||||
|
||||
Electron's role labels are English string literals inside Electron (`lib/browser/api/menu-item-roles.ts`, `filemenu`, `windowmenu`, `close`, `minimize`, `hide`) with no locale lookup, and Electron re-applies them to the native menu items before the menu is shown, so a non-English Desktop shows them in English; the existing Edit menu behaves the same way. No custom close, minimize, or hide code is added: ⌘W destroys the window through Electron's own role.
|
||||
Electron supplies English defaults for the File, Window, and Edit roles. Explicit labels override role defaults while retaining native actions and shortcuts; the localized application commands are documented in the [Desktop README](../../../../apps/desktop/README.md). No custom close, minimize, or hide code is added: ⌘W destroys the window through Electron's own role.
|
||||
|
||||
## Alternatives considered
|
||||
|
||||
@@ -28,8 +28,8 @@ Electron's role labels are English string literals inside Electron (`lib/browser
|
||||
|
||||
## Consequences
|
||||
|
||||
macOS regains the window and application commands the custom menu suppressed, at the cost of four menu roles. The labels stay English on a non-English Desktop.
|
||||
macOS regains the window and application commands the custom menu suppressed. File, Window, and Edit retain Electron’s default English labels; application commands use the Desktop locale.
|
||||
|
||||
## Testing
|
||||
|
||||
A `apps/desktop/tests/main-startup.spec.ts` case pins the declared menu roles per platform, including the macOS hide commands. Role-based menu items execute natively, so a programmatic `click()` and the vitest Electron mock cannot exercise the shortcuts; a real Electron 44 run of the same template showed the standard File, Window, and application items present only after this change, with the same English labels while `app.getLocale()`, `getSystemLocale()`, and `getPreferredSystemLanguages()` all reported `zh-CN`.
|
||||
`apps/desktop/tests/main-startup.spec.ts` verifies the declared menu roles per platform and records English and Chinese application-label snapshots. Role-based menu items execute natively, so a programmatic `click()` and the Vitest Electron mock cannot exercise the shortcuts. The isolated Electron 44 demo confirms that explicit application labels appear in native menus; the template snapshots do not qualify native shortcut execution.
|
||||
@@ -12,7 +12,7 @@ Desktop shell 用自定义模板替换了 Electron 的默认应用菜单，该
|
||||
|
||||
macOS 上的模板在 Edit 菜单之前声明 `{ role: 'fileMenu' }`，在其之后声明 `{ role: 'windowMenu' }`，并在应用子菜单的 Quit 之前声明由分隔符隔开的 `hide`、`hideOthers` 和 `unhide`。这些 role 只提供标准菜单项；不声明 Services 子菜单、窗口列表或其他 macOS 默认项。Windows 和 Linux 保留应用菜单和 Edit 菜单。
|
||||
|
||||
这些 role 的标签是 Electron 内部的英文常量（`lib/browser/api/menu-item-roles.ts` 的 `filemenu`、`windowmenu`、`close`、`minimize`、`hide`），没有语言查询，而且 Electron 在菜单显示前会把这些标签重新写到本机菜单项上，因此在非英文的 Desktop 上它们仍是英文；现有的 Edit 菜单同样如此。这里不新增任何自定义的关闭、最小化或隐藏代码：⌘W 通过 Electron 自身的 role 销毁窗口。
|
||||
Electron 为 File、Window 和 Edit role 提供英文默认标签。显式标签会覆盖 role 的默认标签，同时保留原生命令和快捷键；本地化的应用命令见 [Desktop README](../../../../apps/desktop/README.zh.md)。这里不新增任何自定义的关闭、最小化或隐藏代码：⌘W 通过 Electron 自身的 role 销毁窗口。
|
||||
|
||||
## 考虑过的替代方案
|
||||
|
||||
@@ -28,8 +28,8 @@ macOS 上的模板在 Edit 菜单之前声明 `{ role: 'fileMenu' }`，在其之
|
||||
|
||||
## 影响
|
||||
|
||||
macOS 恢复了自定义菜单压掉的窗口和应用命令，代价是四个菜单 role。在非英文的 Desktop 上这些标签仍是英文。
|
||||
macOS 恢复了自定义菜单压掉的窗口和应用命令。File、Window 和 Edit 保留 Electron 的默认英文标签；应用命令使用 Desktop 的语言。
|
||||
|
||||
## 测试
|
||||
|
||||
`apps/desktop/tests/main-startup.spec.ts` 中的一个用例固定了各平台声明的菜单 role，包括 macOS 的隐藏命令。基于 role 的菜单项由本机执行，因此程序化的 `click()` 和 vitest 的 Electron mock 都无法触达这些快捷键；用真实 Electron 44 运行同一模板显示，只有在本改动之后才出现标准的 File、Window 和应用菜单项，并且在 `app.getLocale()`、`getSystemLocale()` 和 `getPreferredSystemLanguages()` 都报告 `zh-CN` 时标签保持不变。
|
||||
`apps/desktop/tests/main-startup.spec.ts` 验证各平台声明的菜单 role，并记录中英文应用标签快照。基于 role 的菜单项由本机执行，因此程序化的 `click()` 和 Vitest 的 Electron mock 都无法触达这些快捷键。独立 Electron 44 demo 确认显式应用标签会显示在原生菜单中；模板快照不能验证原生快捷键的执行。
|
||||
@@ -2,5 +2,5 @@
|
||||
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
||||
# after editing either side, bring the other along and re-record with:
|
||||
# pnpm run verify-translation-pairing --write .agents/notes/implemented/feature/2026-09-17-developer-tools-settings.md
|
||||
2026-09-17-developer-tools-settings.md: e76cb7f367faff71ef916d8a263dc523583f1cd2
|
||||
2026-09-17-developer-tools-settings.zh.md: 5a7d6d59db686f57ef4945b572ea65ffe54b7f9c
|
||||
2026-09-17-developer-tools-settings.md: 7819b2a2df3c9eaf2db1e1271d7b419768affaff
|
||||
2026-09-17-developer-tools-settings.zh.md: 5ff9f2c1e2380f086969cc392bf649edd13e2893
|
||||
@@ -10,9 +10,9 @@ Diagnostic views, preset selection and changed-file summaries add complexity to
|
||||
|
||||
## Decision
|
||||
|
||||
The settings-owned `ctx.settingsScope.developerTools` preference binds a namespace scope and exposes one accepted `ui-developer-tools.enabled` preference, defaulting off. General Settings offers the same switch on Web and desktop. The existing settings transport owns validation, ordered writes, persistence and recovery; loopback Web and desktop follow Host acceptance. Remote Web owns one browser-local observable shared by all consumers until reload, with no Host writes.
|
||||
The settings-owned `ctx.settingsScope.developerTools` preference binds a namespace scope and exposes one accepted `ui-developer-tools.enabled` preference. The initial default-off choice reduces routine-task complexity; [Developer tools default on after preference resolution](2026-09-20-developer-tools-default-on.md) supersedes that default and owns startup enablement. General Settings offers the same switch on Web and desktop. The existing settings transport owns validation, ordered writes, persistence and recovery; loopback Web and desktop follow Host acceptance. Remote Web owns one browser-local observable shared by all consumers until reload, with no Host writes.
|
||||
|
||||
Off exposes only Chat, hides tool Inspect actions when no visible View declares tool-call inspection, removes the conversation View tab bar, hides the new-session preset chip, and omits the changed-files card and its summary read. Turning it off from another View activates Chat. The preset composition, saved default, Session events and explicit delivery cards remain unchanged. This preference is presentation policy, not Host authorization.
|
||||
Off hides the Trajectory View, hides tool Inspect actions when no visible View declares tool-call inspection, hides the conversation View tab bar while fewer than two Views are available, hides the new-session preset chip and the settings row that allows switching Agent modes, and omits the changed-files card and its summary read. Views registered by other plugins stay available. Turning it off while Trajectory is active activates Chat. The preset composition, saved default, Session events and explicit delivery cards remain unchanged. This preference is presentation policy, not Host authorization.
|
||||
|
||||
Plugin assembly translates the shared preference into component-specific capabilities (`showCodeDiff`, `showPresetPicker`, and `interactivePreview`). Conversation supplies the inspection callback using the visible target's `toolCallFocus`; Chat does not name the target. The builtin HTML renderer uses DOMPurify for complete-document sanitization and parser-mutation defenses. Off preserves root styling, removes active documents, resource hints, SVG animation and all `href` attributes, and mounts an iframe with no sandbox permissions and a CSP denying scripts and external resources. It reads no related files. On retains the opaque scripted Blob renderer and its bounded related-file reads. Switching modes replaces the browsing context and disposes pending reads. The [document-preview decision](../architecture/2026-09-08-document-preview-operations.md) and [filesystem-read authority](../architecture/2026-09-09-workspace-file-read-authority.md) remain authoritative for advanced rendering and Host read access.
|
||||
|
||||
@@ -26,4 +26,4 @@ Plugin assembly translates the shared preference into component-specific capabil
|
||||
|
||||
Basic HTML sacrifices JavaScript, external and related resources, and link navigation; inline styles and data images remain available. Advanced mode retains normal browser networking and does not gain parent-origin, popup, form or top-navigation privileges. The setting does not constrain third-party preview implementations or revoke Host filesystem authority.
|
||||
|
||||
Component and settings tests cover defaulting, schema rejection, accepted-state updates, chip disclosure, changed-file visibility and iframe disposal. The recorded-session [document preview](../../../../apps/web/tests/document-preview.e2e.ts) and [changed-files](../../../../apps/web/tests/changed-files-turn.e2e.ts) scenarios exercise the real settings control and the shared renderer. The browser scaffold enables developer tools by default. Only settings chrome, document preview, changed-files and developer-tools scenarios explicitly retain the shipped default; together they cover hidden diagnostic controls, static previews, and switching back to Chat. Refused Host writes recover accepted state and show the localized retry message. Native Electron execution remains unverified.
|
||||
Component and settings tests cover defaulting, schema rejection, accepted-state updates, chip disclosure, changed-file visibility and iframe disposal. The recorded-session [document preview](../../../../apps/web/tests/document-preview.e2e.ts) and [changed-files](../../../../apps/web/tests/changed-files-turn.e2e.ts) scenarios exercise the real settings control and the shared renderer. The browser scaffold uses the shipped default unless a scenario specifies a preference. Settings chrome, document preview and changed-files scenarios explicitly disable developer tools; together they cover hidden diagnostic controls, static previews, and switching back to Chat. Refused Host writes recover accepted state and show the localized retry message. Native Electron execution remains unverified.
|
||||
@@ -10,9 +10,9 @@ Status: implemented
|
||||
|
||||
## Decision
|
||||
|
||||
设置域内的 `ctx.settingsScope.developerTools` 偏好对象绑定命名空间 scope，提供一个已接受的 `ui-developer-tools.enabled` 偏好，默认关闭。Web 和桌面端的通用设置提供同一个开关。现有设置传输负责验证、有序写入、持久化和恢复；回环 Web 和桌面端跟随 Host 接受的状态。远程 Web 持有一个所有消费者共享的浏览器本地可观察值，刷新后重置，不发送 Host 写入。
|
||||
设置域内的 `ctx.settingsScope.developerTools` 偏好对象绑定命名空间 scope，提供一个已接受的 `ui-developer-tools.enabled` 偏好。最初默认关闭的选择用于降低日常任务的复杂度；[偏好解析后默认开启开发者工具](2026-09-20-developer-tools-default-on.zh.md)取代该默认值并负责启动时的启用策略。Web 和桌面端的通用设置提供同一个开关。现有设置传输负责验证、有序写入、持久化和恢复；回环 Web 和桌面端跟随 Host 接受的状态。远程 Web 持有一个所有消费者共享的浏览器本地可观察值，刷新后重置，不发送 Host 写入。
|
||||
|
||||
关闭时仅展示 Chat，在没有可见 View 声明工具调用检查能力时隐藏 Inspect 操作，移除会话 View 标签栏，隐藏新会话预设入口，并省略改动文件卡片及其摘要读取。在其他 View 中关闭开关会激活 Chat。预设组合、保存的默认值、Session 事件和显式交付卡片保持不变。此偏好是展示策略，不是 Host 授权。
|
||||
关闭时隐藏 Trajectory View，在没有可见 View 声明工具调用检查能力时隐藏 Inspect 操作，可见 View 少于两个时隐藏会话 View 标签栏，隐藏新会话预设入口和「允许切换agent模式」设置行，并省略改动文件卡片及其摘要读取。其他插件注册的 View 保持可用。在 Trajectory 中关闭开关会激活 Chat。预设组合、保存的默认值、Session 事件和显式交付卡片保持不变。此偏好是展示策略，不是 Host 授权。
|
||||
|
||||
插件组装层将共享偏好转换为组件自身的能力（`showCodeDiff`、`showPresetPicker` 和 `interactivePreview`）。Conversation 根据可见目标的 `toolCallFocus` 提供检查回调；Chat 不再指定目标名称。内置 HTML 渲染器使用 DOMPurify 清理完整文档并防护解析变异。关闭时保留根节点样式，移除主动文档、资源提示、SVG 动画及所有 `href` 属性，再放入不授予沙箱权限的 iframe，并通过 CSP 禁止脚本和外部资源。不读取关联文件。开启时保留不透明源的脚本 Blob 渲染器及其有界关联文件读取。切换模式会替换浏览上下文并清理待处理读取。[文档预览决策](../architecture/2026-09-08-document-preview-operations.zh.md)和[文件系统读取权限](../architecture/2026-09-09-workspace-file-read-authority.zh.md)继续定义高级渲染与 Host 读取访问。
|
||||
|
||||
@@ -26,4 +26,4 @@ Status: implemented
|
||||
|
||||
基础 HTML 放弃 JavaScript、外部与关联资源和链接导航；行内样式与 data 图片仍可用。高级模式保留正常浏览器网络能力，不增加父源、弹窗、表单或顶层导航权限。此设置不约束第三方预览实现，也不撤销 Host 文件系统读取权限。
|
||||
|
||||
组件和设置测试覆盖默认值、schema 拒绝、已接受状态更新、入口折叠、改动文件展示和 iframe 清理。基于已记录 Session 的[文档预览](../../../../apps/web/tests/document-preview.e2e.ts)与[改动文件](../../../../apps/web/tests/changed-files-turn.e2e.ts)场景验证真实设置控件及共用渲染器。浏览器脚手架默认开启开发者工具，仅设置外壳、文档预览、改动文件和开发者工具场景显式保留产品默认值；这些场景共同覆盖诊断控件隐藏、静态预览和切回 Chat。Host 拒绝写入后会恢复已接受状态，并显示本地化重试提示。原生 Electron 执行尚未验证。
|
||||
组件和设置测试覆盖默认值、schema 拒绝、已接受状态更新、入口折叠、改动文件展示和 iframe 清理。基于已记录 Session 的[文档预览](../../../../apps/web/tests/document-preview.e2e.ts)与[改动文件](../../../../apps/web/tests/changed-files-turn.e2e.ts)场景验证真实设置控件及共用渲染器。浏览器脚手架使用产品默认值，除非场景指定偏好。设置外壳、文档预览和改动文件场景显式关闭开发者工具；这些场景共同覆盖诊断控件隐藏、静态预览和切回 Chat。Host 拒绝写入后会恢复已接受状态，并显示本地化重试提示。原生 Electron 执行尚未验证。
|
||||
@@ -0,0 +1,6 @@
|
||||
# Bilingual-pair consistency record (docs/i18n/README.md): the git blob hash of each
|
||||
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
||||
# after editing either side, bring the other along and re-record with:
|
||||
# pnpm run verify-translation-pairing --write .agents/notes/implemented/feature/2026-09-20-developer-tools-default-on.md
|
||||
2026-09-20-developer-tools-default-on.md: 42c89faed11b966ac8ea0882236af9bf13557702
|
||||
2026-09-20-developer-tools-default-on.zh.md: a684844f5ba53a0bebdd1c3a3a3ade1ed150cc31
|
||||
@@ -0,0 +1,31 @@
|
||||
# Agent Note: Developer tools default on after preference resolution
|
||||
|
||||
Status: implemented
|
||||
|
||||
English | [中文](2026-09-20-developer-tools-default-on.zh.md)
|
||||
|
||||
## Problem
|
||||
|
||||
New installations need access to developer views, preset selection, change summaries and interactive HTML previews without first finding a Settings switch. A saved disabled preference must still prevent those features from activating during startup, including script execution that cannot be undone after it occurs.
|
||||
|
||||
## Decision
|
||||
|
||||
The Host schema defaults `ui-developer-tools.enabled` to `true`. Remote browsers with process-local preferences also start enabled. Saved Host values take precedence, including `false`. This supersedes only the initial default-off choice in [Shared developer-tool settings](2026-09-17-developer-tools-settings.md); that note retains ownership of shared persistence and rendering policy.
|
||||
|
||||
Host-backed clients publish disabled until an accepted schema-resolved value arrives. Loading, failed initial reads and an unavailable namespace do not grant interactive-preview capabilities. The Host supplies the default for an absent stored field; the client does not interpret an absent response as consent to enable scripts. An accepted value remains authoritative during later refreshes.
|
||||
|
||||
Only the Trajectory tab follows the developer-tools preference; third-party Views remain available. The conversation shell retains the explicit Trajectory id because the requested rule names that View. No current requirement makes arbitrary diagnostic Views share the switch.
|
||||
|
||||
## Alternatives considered
|
||||
|
||||
**Keep the default off.** This minimizes the initial interface but requires a separate opt-in for the features new installations now expose. Users can still save the disabled preference.
|
||||
|
||||
**Default the Host client to enabled before settings arrive.** This makes rendering immediate, but briefly activates features for users who disabled them. Unmounting a scripted HTML iframe cannot undo scripts or requests already executed.
|
||||
|
||||
**Add a generic developer-tool flag to View registration.** This expands the plugin API and allows other Views to join a switch whose current requirement is specific to Trajectory. A future requirement can justify that API separately.
|
||||
|
||||
## Consequences
|
||||
|
||||
Fresh profiles expose developer features after settings resolve; users with a saved disabled choice retain the simpler presentation. New users also receive interactive HTML previews with the capabilities documented by the [filesystem-read authority](../architecture/2026-09-09-workspace-file-read-authority.md). Host initialization can briefly withhold developer controls even when the eventual preference is enabled.
|
||||
|
||||
Settings tests cover initial withholding, unavailable namespaces, explicit disabled values and process-local defaults. HTML renderer coverage checks that pending and disabled preferences neither read related files nor create script-enabled frames. Browser settings coverage verifies the default and a disabled choice across reload; document-preview replay pins the explicitly disabled scenario.
|
||||
@@ -0,0 +1,31 @@
|
||||
# Agent Note: 偏好解析后默认开启开发者工具
|
||||
|
||||
Status: implemented
|
||||
|
||||
[English](2026-09-20-developer-tools-default-on.md) | 中文
|
||||
|
||||
## Problem
|
||||
|
||||
新安装需要直接使用开发者视图、预设选择、改动摘要和交互式 HTML 预览，无需先寻找设置开关。已保存的关闭偏好仍必须阻止这些功能在启动期间激活，包括发生后无法撤销的脚本执行。
|
||||
|
||||
## Decision
|
||||
|
||||
Host schema 将 `ui-developer-tools.enabled` 默认为 `true`。使用进程内偏好的远程浏览器也从开启状态启动。已保存的 Host 值优先，包括 `false`。这仅取代[共享开发者工具设置](2026-09-17-developer-tools-settings.zh.md)中最初默认关闭的选择；该记录继续负责共享持久化和渲染策略。
|
||||
|
||||
使用 Host 偏好的客户端在收到经过 schema 解析并接受的值之前发布关闭状态。加载中、首次读取失败和命名空间不可用均不授予交互式预览能力。缺少存储字段时由 Host 提供默认值；客户端不会把缺少响应解释为允许开启脚本。后续刷新期间，已接受的值继续有效。
|
||||
|
||||
只有 Trajectory 标签页受开发者工具偏好控制；第三方 View 保持可用。对话外壳保留显式 Trajectory id，因为当前需求明确指定此 View。没有现行需求要求任意诊断 View 共用该开关。
|
||||
|
||||
## Alternatives considered
|
||||
|
||||
**保持默认关闭。** 这可简化初始界面，但新安装现在直接提供的功能将需要额外启用。用户仍可保存关闭偏好。
|
||||
|
||||
**在设置到达前让 Host 客户端默认开启。** 这可以立即渲染，却会短暂激活用户已关闭的功能。卸载可执行脚本的 HTML iframe 无法撤销已经执行的脚本或请求。
|
||||
|
||||
**在 View 注册中增加通用开发者工具标记。** 这会扩展插件 API，并允许其他 View 加入当前仅针对 Trajectory 的开关。未来需求可以单独论证该 API。
|
||||
|
||||
## Consequences
|
||||
|
||||
新 profile 在设置解析后展示开发者功能；已保存关闭选择的用户保留简化展示。新用户也会获得带有[文件系统读取权限](../architecture/2026-09-09-workspace-file-read-authority.zh.md)所述能力的交互式 HTML 预览。即使最终偏好为开启，Host 初始化期间也可能短暂不展示开发者控件。
|
||||
|
||||
设置测试覆盖首次等待、命名空间不可用、显式关闭值和进程内默认值。HTML 渲染器覆盖验证等待中及关闭偏好均不读取关联文件，也不创建允许脚本的 frame。浏览器设置覆盖验证默认值和关闭选择在刷新后保持；文档预览回放固定显式关闭的场景。
|
||||
@@ -2,5 +2,5 @@
|
||||
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
||||
# after editing either side, bring the other along and re-record with:
|
||||
# pnpm run verify-translation-pairing --write apps/desktop/README.md
|
||||
README.md: 8885703f33223d381633c29a11516619d52fd711
|
||||
README.zh.md: b5a3f0433d874b3fc51ef16805d7ab6df20d9059
|
||||
README.md: 2b41f6deeda70db186fb38ee6b5590bf8c459835
|
||||
README.zh.md: 24128293d5a246e33d36ba1ecbc10ae3cf594ea5
|
||||
@@ -4,7 +4,7 @@ English | [中文](README.zh.md)
|
||||
|
||||
The desktop application is an Electron shell around the complete dsh Web application. An Electron RunAsNode child starts the shared profile runner, and Electron immediately loads the packaged Web entry at `dsh-app://app/`. Its shared loading page waits for Host boot injections, then starts the client without navigating to another document. Electron forwards application HTTP requests to the authenticated Web Host; WebSocket streams connect to that Host with credentials attached only for the owned application window. Node IPC carries boot injections, readiness, and shutdown. Desktop defaults to port `19387`, separate from Web’s `3080`; a `webserver.config.port` patch can override it.
|
||||
|
||||
The first application-menu command, **About DeepSeek Harness**, opens Electron's native About panel with the application icon, product name, and installed release version. The menu follows the Desktop shell locale. macOS reads the icon from its application bundle, so an unpackaged development launch displays Electron's icon; Windows receives the packaged PNG.
|
||||
The first application-menu command, **About DeepSeek Harness**, opens Electron's native About panel with the application icon, product name, and installed release version. The menu follows the Desktop shell locale. On macOS, Hide, Hide Others, Show All, and Quit use localized labels; Hide and Quit include the DeepSeek Harness product name. These commands retain their native actions and shortcuts. macOS reads the icon from its application bundle, so an unpackaged development launch displays Electron's icon; Windows receives the packaged PNG.
|
||||
|
||||
Desktop’s local native directory flow opens an Electron folder dialog attached to the application window, restoring, showing, and focusing that window first. Concurrent requests share one dialog; cancellation returns no path and failures remain retryable. Ordinary Web uses the Host chooser. Browse mode lists Host directories. On Linux without zenity or kdialog, automatic selection uses browse instead of the Electron dialog.
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
桌面应用是完整 dsh Web 应用外的一层 Electron 壳。Electron RunAsNode 子进程启动共享 profile runner，Electron 立即从 `dsh-app://app/` 加载打包内的 Web 入口。共享加载页等待 Host 启动注入，然后在同一文档中启动客户端。Electron 将应用 HTTP 请求转发给已认证的 Web Host；WebSocket 流连接到该 Host，仅为归属的应用窗口附加凭据。Node IPC 承载启动注入、就绪与关闭。Desktop 默认使用端口 `19387`，与 Web 的 `3080` 分开；可通过 `webserver.config.port` patch 覆盖。
|
||||
|
||||
应用菜单第一项“**关于 DeepSeek Harness**”打开 Electron 原生关于面板，展示应用图标、产品名称和当前安装的发布版本。菜单文案跟随桌面壳的语言。macOS 从应用包读取图标，因此未打包的开发启动会显示 Electron 图标；Windows 使用随包分发的 PNG。
|
||||
应用菜单第一项“**关于 DeepSeek Harness**”打开 Electron 原生关于面板，展示应用图标、产品名称和当前安装的发布版本。菜单文案跟随桌面壳的语言。macOS 的隐藏、隐藏其他、显示全部和退出条目使用本地化文案，隐藏和退出条目包含 DeepSeek Harness 产品名称。这些条目保留原生动作和快捷键。macOS 从应用包读取图标，因此未打包的开发启动会显示 Electron 图标；Windows 使用随包分发的 PNG。
|
||||
|
||||
Desktop 的本地原生目录流程打开绑定应用窗口的 Electron 文件夹对话框，并先恢复、显示和聚焦该窗口。并发请求共用一个对话框；取消不返回路径，失败后可以重试。普通 Web 使用 Host 选择器。浏览模式列出 Host 目录。Linux 缺少 zenity 或 kdialog 时，自动选择使用浏览模式，不使用 Electron 对话框。
|
||||
|
||||
|
||||
@@ -3,6 +3,10 @@
|
||||
export const en = {
|
||||
application: 'Application',
|
||||
aboutMenu: 'About DeepSeek Harness',
|
||||
hideApplication: 'Hide DeepSeek Harness',
|
||||
hideOtherApplications: 'Hide Others',
|
||||
showAllApplications: 'Show All',
|
||||
quitApplication: 'Quit DeepSeek Harness',
|
||||
edit: 'Edit',
|
||||
menuBar: 'Application menu',
|
||||
delete: 'Delete',
|
||||
@@ -94,6 +98,10 @@ export type DesktopMessages = { readonly [Key in keyof typeof en]: string }
|
||||
export const zh = {
|
||||
application: '应用',
|
||||
aboutMenu: '关于 DeepSeek Harness',
|
||||
hideApplication: '隐藏 DeepSeek Harness',
|
||||
hideOtherApplications: '隐藏其他',
|
||||
showAllApplications: '显示全部',
|
||||
quitApplication: '退出 DeepSeek Harness',
|
||||
edit: '编辑',
|
||||
menuBar: '应用菜单',
|
||||
delete: '删除',
|
||||
|
||||
@@ -608,12 +608,15 @@ async function main(): Promise<void> {
|
||||
})
|
||||
// A custom application menu replaces Electron's default menu, so macOS needs
|
||||
// its standard menus and application hide commands declared explicitly.
|
||||
// Keep app.name stable: Electron derives its default userData directory from it.
|
||||
const darwin = process.platform === 'darwin'
|
||||
const platformMenus: MenuItemConstructorOptions[] = darwin
|
||||
? [{ role: 'fileMenu' }, { role: 'editMenu' }, { role: 'windowMenu' }]
|
||||
: [{ role: 'editMenu' }]
|
||||
const hideCommands: MenuItemConstructorOptions[] = darwin
|
||||
? [{ role: 'hide' }, { role: 'hideOthers' }, { role: 'unhide' }, { type: 'separator' }]
|
||||
? [{ role: 'hide', label: currentDesktopLocale().messages.hideApplication },
|
||||
{ role: 'hideOthers', label: currentDesktopLocale().messages.hideOtherApplications },
|
||||
{ role: 'unhide', label: currentDesktopLocale().messages.showAllApplications }, { type: 'separator' }]
|
||||
: []
|
||||
const applicationItems = (): MenuItemConstructorOptions[] => [
|
||||
{ label: currentDesktopLocale().messages.aboutMenu, role: 'about' },
|
||||
@@ -621,7 +624,8 @@ async function main(): Promise<void> {
|
||||
{ label: currentDesktopLocale().messages.checkUpdatesMenu, click: () => { void openUpdatePrompt(true) } },
|
||||
{ type: 'separator' },
|
||||
...hideCommands,
|
||||
{ role: 'quit', ...(process.platform === 'win32' ? { label: currentDesktopLocale().messages.exitApplication } : {}) },
|
||||
{ role: 'quit', ...(darwin ? { label: currentDesktopLocale().messages.quitApplication }
|
||||
: process.platform === 'win32' ? { label: currentDesktopLocale().messages.exitApplication } : {}) },
|
||||
]
|
||||
Menu.setApplicationMenu(process.platform === 'win32' ? null : Menu.buildFromTemplate([{
|
||||
label: darwin ? app.name : currentDesktopLocale().messages.application,
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
[
|
||||
{
|
||||
"role": "hide",
|
||||
"label": "Hide DeepSeek Harness"
|
||||
},
|
||||
{
|
||||
"role": "hideOthers",
|
||||
"label": "Hide Others"
|
||||
},
|
||||
{
|
||||
"role": "unhide",
|
||||
"label": "Show All"
|
||||
},
|
||||
{
|
||||
"role": "quit",
|
||||
"label": "Quit DeepSeek Harness"
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,18 @@
|
||||
[
|
||||
{
|
||||
"role": "hide",
|
||||
"label": "隐藏 DeepSeek Harness"
|
||||
},
|
||||
{
|
||||
"role": "hideOthers",
|
||||
"label": "隐藏其他"
|
||||
},
|
||||
{
|
||||
"role": "unhide",
|
||||
"label": "显示全部"
|
||||
},
|
||||
{
|
||||
"role": "quit",
|
||||
"label": "退出 DeepSeek Harness"
|
||||
}
|
||||
]
|
||||
@@ -672,6 +672,22 @@ describe('desktop main startup', () => {
|
||||
expect(harness.menu.setApplicationMenu).toHaveBeenCalledOnce()
|
||||
})
|
||||
|
||||
it.each(['en-US', 'zh-CN'])('localizes macOS visibility and quit commands without changing the application name (%s)', async (locale) => {
|
||||
vi.spyOn(process, 'platform', 'get').mockReturnValue('darwin')
|
||||
vi.spyOn(harness.app, 'getLocale').mockReturnValue(locale)
|
||||
const originalName = harness.app.name
|
||||
harness.app.name = '@deepseek-ai/dsh-desktop'
|
||||
try {
|
||||
await import('../src/main.ts')
|
||||
await harness.preparing.promise
|
||||
const commands = applicationMenuItems().filter(item =>
|
||||
item.role === 'hide' || item.role === 'hideOthers' || item.role === 'unhide' || item.role === 'quit')
|
||||
await expect(JSON.stringify(commands, null, 2) + '\n')
|
||||
.toMatchFileSnapshot(`./expected/application-menu-${locale}.json`)
|
||||
expect(harness.app.name).toBe('@deepseek-ai/dsh-desktop')
|
||||
} finally { harness.app.name = originalName }
|
||||
})
|
||||
|
||||
it('attaches Host socket credentials only to the owned application origin and window', async () => {
|
||||
await import('../src/main.ts')
|
||||
await harness.preparing.promise
|
||||
|
||||
@@ -99,7 +99,7 @@ interface CapturedFixture {
|
||||
}
|
||||
|
||||
export interface AssembledRemoteOptions {
|
||||
/** Supply an enabled Host preference for diagnostic View scenarios. */
|
||||
/** Override the schema-resolved Host preference for developer-tool scenarios. */
|
||||
readonly developerTools?: boolean
|
||||
/** Return the fixture's image-dimension admission error from Session prompt. */
|
||||
readonly rejectPrompt?: boolean
|
||||
@@ -142,16 +142,14 @@ export function createAssembledRemote(options: AssembledRemoteOptions = {}): Ass
|
||||
const mock = RemoteMock.create().load(remoteDefaultResponses)
|
||||
mock.load({
|
||||
unary: {
|
||||
'settings/describe': options.developerTools === true
|
||||
? ok({
|
||||
...fixture.settingsDescribe.value,
|
||||
namespaces: [...fixture.settingsDescribe.value.namespaces, {
|
||||
ns: 'ui-developer-tools',
|
||||
schema: { type: 'object', dict: { enabled: { type: 'boolean' } } },
|
||||
value: { enabled: true }, applies: 'live', secrets: [], revision: 0,
|
||||
}],
|
||||
})
|
||||
: structuredClone(fixture.settingsDescribe),
|
||||
'settings/describe': ok({
|
||||
...fixture.settingsDescribe.value,
|
||||
namespaces: [...fixture.settingsDescribe.value.namespaces, {
|
||||
ns: 'ui-developer-tools',
|
||||
schema: { type: 'object', dict: { enabled: { type: 'boolean' } } },
|
||||
value: { enabled: options.developerTools ?? true }, applies: 'live', secrets: [], revision: 0,
|
||||
}],
|
||||
}),
|
||||
'credentials/describe': structuredClone(fixture.credentialsDescribe),
|
||||
'session/modelCatalog': structuredClone(fixture.modelCatalog),
|
||||
'agentPresets/list': structuredClone(fixture.agentPresets),
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/** Shared settings are off on a fresh Host and survive browser reload through the ordinary settings UI. */
|
||||
/** Developer tools default on for a fresh Host and survive browser reload through the ordinary settings UI. */
|
||||
import { readFile } from 'node:fs/promises'
|
||||
import { join } from 'node:path'
|
||||
import { chromium } from 'playwright'
|
||||
@@ -7,7 +7,7 @@ import { launchWebScaffold } from './scaffold.ts'
|
||||
import { newEnglishPage } from './support.ts'
|
||||
|
||||
it('persists developer tools in the Host settings document and restores the accepted choice', async () => {
|
||||
const scaffold = await launchWebScaffold({ developerTools: false })
|
||||
const scaffold = await launchWebScaffold()
|
||||
onTestFinished(() => scaffold.close())
|
||||
const browser = await chromium.launch()
|
||||
onTestFinished(() => browser.close())
|
||||
@@ -15,15 +15,26 @@ it('persists developer tools in the Host settings document and restores the acce
|
||||
await page.goto(scaffold.authenticatedUrl)
|
||||
await page.getByRole('button', { name: 'Settings', exact: true }).click()
|
||||
const toggle = page.getByRole('switch', { name: 'Developer tools' })
|
||||
expect(await toggle.getAttribute('aria-checked')).toBe('false')
|
||||
expect(await toggle.getAttribute('aria-checked')).toBe('true')
|
||||
expect(await readFile(join(scaffold.harnessHome, 'settings.yaml'), 'utf8')).not.toContain('ui-developer-tools:')
|
||||
await toggle.click()
|
||||
await expect.poll(() => toggle.getAttribute('aria-checked')).toBe('true')
|
||||
expect(await readFile(join(scaffold.harnessHome, 'settings.yaml'), 'utf8')).toContain('ui-developer-tools:\n enabled: true')
|
||||
await page.reload()
|
||||
await page.getByRole('button', { name: 'Settings', exact: true }).click()
|
||||
await expect.poll(() => toggle.getAttribute('aria-checked')).toBe('true')
|
||||
await toggle.click()
|
||||
await expect.poll(() => toggle.getAttribute('aria-checked')).toBe('false')
|
||||
expect(await readFile(join(scaffold.harnessHome, 'settings.yaml'), 'utf8')).toContain('ui-developer-tools:\n enabled: false')
|
||||
await page.reload()
|
||||
await page.getByRole('button', { name: 'Settings', exact: true }).click()
|
||||
await expect.poll(() => toggle.getAttribute('aria-checked')).toBe('false')
|
||||
|
||||
await page.getByRole('button', { name: 'Agent presets', exact: true }).click()
|
||||
const pickerToggle = page.getByRole('switch', { name: 'Allow switching Agent modes' })
|
||||
await expect.poll(() => page.getByRole('heading', { name: 'Agent presets', exact: true }).count()).toBe(1)
|
||||
expect(await pickerToggle.count()).toBe(0)
|
||||
await scaffold.ctx.settings.update('ui-developer-tools', { enabled: true })
|
||||
await expect.poll(() => pickerToggle.count()).toBe(1)
|
||||
await expect.poll(() => pickerToggle.isEnabled()).toBe(true)
|
||||
const pickerEnabled = await pickerToggle.getAttribute('aria-checked')
|
||||
await scaffold.ctx.settings.update('ui-developer-tools', { enabled: false })
|
||||
await expect.poll(() => pickerToggle.count()).toBe(0)
|
||||
await scaffold.ctx.settings.update('ui-developer-tools', { enabled: true })
|
||||
await expect.poll(() => pickerToggle.isEnabled()).toBe(true)
|
||||
await expect.poll(() => pickerToggle.getAttribute('aria-checked')).toBe(pickerEnabled)
|
||||
})
|
||||
@@ -365,7 +365,7 @@ fs.appendFileSync(${JSON.stringify(openLog)}, JSON.stringify({ path, action }) +
|
||||
await successShot(page, 'html-basic')
|
||||
sections.push([
|
||||
'## Basic HTML', '',
|
||||
'- Developer tools: off by default on Web and desktop',
|
||||
'- Developer tools: disabled for this scenario',
|
||||
'- Sandbox: no permissions',
|
||||
`- Inline script: ${await basicHtml.locator('#result').innerText()}`,
|
||||
`- Local script: ${await basicHtml.locator('#local-result').innerText()}`,
|
||||
|
||||
@@ -302,7 +302,7 @@ export interface WebScaffold {
|
||||
|
||||
/** Options for {@link launchWebScaffold}. */
|
||||
export interface LaunchOptions {
|
||||
/** The scaffold enables developer tools unless false preserves the shipped default. */
|
||||
/** Override the developer-tools preference; omitted uses the shipped default. */
|
||||
developerTools?: boolean
|
||||
/** Enable the real Open In rows with deterministic launch-environment facts. */
|
||||
openInAppEnvironment?: LaunchEnvironmentSnapshot
|
||||
@@ -818,8 +818,8 @@ export async function launchWebScaffold(options: LaunchOptions = {}): Promise<We
|
||||
}
|
||||
await ctx.loader.await()
|
||||
await auditStartupEntries(ctx, 'web e2e scaffold')
|
||||
if (options.developerTools !== false) {
|
||||
await ctx.settings.update('ui-developer-tools', { enabled: true })
|
||||
if (options.developerTools !== undefined) {
|
||||
await ctx.settings.update('ui-developer-tools', { enabled: options.developerTools })
|
||||
}
|
||||
if (options.welcomeNoticePending !== true) {
|
||||
await ctx.settings.mutate(WELCOME_NOTICE_SETTINGS_NAMESPACE, [{
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
||||
# after editing either side, bring the other along and re-record with:
|
||||
# pnpm run verify-translation-pairing --write packages/client/ui-agent-preset/README.md
|
||||
README.md: c7a87da591c1cafc433fbb3bb5fa216d94ab85ef
|
||||
README.zh.md: a54b47baed132e790fc4f44ad1155f48a19c430b
|
||||
README.md: 5f2c9acaa5840e71d6ca237c5fc5eccb52724cda
|
||||
README.zh.md: 5c61823c25f145c0e516f3f2a16c2de05c250ef1
|
||||
@@ -9,7 +9,7 @@ English | [中文](README.zh.md)
|
||||
|
||||
## Summary
|
||||
|
||||
Use this package to choose the agent preset for a new Web GUI session, see the active preset in the session header, and manage available presets in Settings. The Agent mode picker is shown by default; Settings can hide it without changing running or historical sessions. A preset is fixed when a session is created, so changing the selection or default affects only later sessions. If the deployment provides no presets, these controls stay hidden and every session uses the host composition.
|
||||
Use this package to choose the agent preset for a new Web GUI session, see the active preset in the session header, and manage available presets in Settings. The Agent mode picker is shown by default while Developer tools is enabled; Settings can hide it without changing running or historical sessions. A preset is fixed when a session is created, so changing the selection or default affects only later sessions. If the deployment provides no presets, these controls stay hidden and every session uses the host composition.
|
||||
|
||||
## Table of Contents
|
||||
|
||||
@@ -25,9 +25,9 @@ Use this package to choose the agent preset for a new Web GUI session, see the a
|
||||
<a id="use-this-package"></a>
|
||||
## Use this package
|
||||
|
||||
The new-session picker additionally requires Developer tools to be enabled in General Settings. This presentation preference does not alter the selected preset, saved default, Host composition, or the management section’s independent picker policy.
|
||||
The new-session picker and the management section’s “Allow switching Agent modes” row are visible only while Developer tools is enabled in General Settings. This presentation preference does not alter the selected preset, saved default, Host composition, or the management section’s independent picker policy.
|
||||
|
||||
Mount this plugin alongside the settings and conversation packages; the management section then shows a visibility switch that is on by default. While it is off, the new-session chip is absent and the Host composes an unnamed session from the deployment default (`standard` in the shipped Web bundle). Turning it on restores the saved user default, or uses the deployment default when none has been saved, and carries that default to the current blank task; a chip pick itself is staged only once for the next blank session. Turning the picker off again returns the current blank task to the deployment default the same way and discards an unconsumed stage; started and historical sessions keep their labels, compositions, and recorded history.
|
||||
Mount this plugin alongside the settings and conversation packages; once Developer tools is enabled, the management section shows a visibility switch that is on by default. While it is off, the new-session chip is absent and the Host composes an unnamed session from the deployment default (`standard` in the shipped Web bundle). Turning it on restores the saved user default, or uses the deployment default when none has been saved, and carries that default to the current blank task; a chip pick itself is staged only once for the next blank session. Turning the picker off again returns the current blank task to the deployment default the same way and discards an unconsumed stage; started and historical sessions keep their labels, compositions, and recorded history.
|
||||
|
||||
### Managing the roster
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ kind: "package-reference"
|
||||
|
||||
## 概述
|
||||
|
||||
使用本包可以为新的 Web GUI 会话选择 agent preset、在会话标题中查看当前 preset，并在设置中管理可用 preset。Agent 模式选择器默认显示；设置可以隐藏它，而不会改变运行中或历史会话。preset 在会话创建时即固定，因此更改选择或默认值只影响此后创建的会话。如果部署未提供任何 preset，这些控件保持隐藏，每个会话都使用宿主组装。
|
||||
使用本包可以为新的 Web GUI 会话选择 agent preset、在会话标题中查看当前 preset，并在设置中管理可用 preset。Agent 模式选择器在通用设置开启开发者工具时默认显示；设置可以隐藏它，而不会改变运行中或历史会话。preset 在会话创建时即固定，因此更改选择或默认值只影响此后创建的会话。如果部署未提供任何 preset，这些控件保持隐藏，每个会话都使用宿主组装。
|
||||
|
||||
## 目录
|
||||
|
||||
@@ -25,9 +25,9 @@ kind: "package-reference"
|
||||
<a id="use-this-package"></a>
|
||||
## 使用本包
|
||||
|
||||
新会话选择器还要求在通用设置中开启开发者工具。此展示偏好不会改变已选预设、保存的默认值、Host 组合或管理区域独立的选择器策略。
|
||||
新会话选择器和管理区域中的「允许切换agent模式」整行设置仅在通用设置中开启开发者工具时显示。此展示偏好不会改变已选预设、保存的默认值、Host 组合或管理区域独立的选择器策略。
|
||||
|
||||
与设置和对话包一起挂载本插件；管理分区随后显示一个默认开启的可见性开关。关闭期间，新建会话 chip 不出现，宿主会依据部署默认值（随附 Web bundle 中为 `standard`）组装未指名会话。开启时会恢复已保存的用户默认值；尚未保存时则使用部署默认值；该默认值会同时带到当前空白任务上。chip 中的选择本身只为下一个空白会话暂存一次。再次关闭选择器会以同样方式把当前空白任务带回部署默认值，并丢弃尚未使用的暂存选择；已开始及历史会话的标签、组装与已记录历史均保持不变。
|
||||
与设置和对话包一起挂载本插件；通用设置开启开发者工具后，管理分区会显示一个默认开启的可见性开关。关闭期间，新建会话 chip 不出现，宿主会依据部署默认值（随附 Web bundle 中为 `standard`）组装未指名会话。开启时会恢复已保存的用户默认值；尚未保存时则使用部署默认值；该默认值会同时带到当前空白任务上。chip 中的选择本身只为下一个空白会话暂存一次。再次关闭选择器会以同样方式把当前空白任务带回部署默认值，并丢弃尚未使用的暂存选择；已开始及历史会话的标签、组装与已记录历史均保持不变。
|
||||
|
||||
### 管理名单
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ import {
|
||||
Button, IconBrowseOutlineRegular, IconCopyOutlineRegular, IconFolderOpenOutlineRegular,
|
||||
IconPlusOutlineRegular, IconTrashOutlineRegular, Modal, Switch, Tag, Tooltip,
|
||||
} from '@deepseek-ai/dsh-client-ui-primitives'
|
||||
import type { SnapshotStore } from '@deepseek-ai/dsh-client-store'
|
||||
import type { ObservableSnapshot, SnapshotStore } from '@deepseek-ai/dsh-client-store'
|
||||
import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
|
||||
import { draftBlocker, type AgentPresetSectionState } from './section-store.ts'
|
||||
import { presetDisplayText, type AgentPresetSettingsKey } from './locales.ts'
|
||||
@@ -27,6 +27,8 @@ export interface AgentPresetSectionInjected {
|
||||
hooks: {
|
||||
/** Page snapshot bound by the renderer as useAgentPresetSection. */
|
||||
agentPresetSection: SnapshotStore<AgentPresetSectionState>
|
||||
/** Shared preference controlling the picker-policy row. */
|
||||
developerTools: ObservableSnapshot<boolean>
|
||||
}
|
||||
/** Read the roster; called once when the section first renders. */
|
||||
load: () => Promise<void>
|
||||
@@ -181,6 +183,7 @@ function CardDescription({ text }: { text: string }): ReactNode {
|
||||
export function AgentPresetSection(props: AgentPresetSectionProps): ReactNode {
|
||||
const { useAgentPresetSection, t, load } = props
|
||||
const state = useAgentPresetSection(snapshot => snapshot)
|
||||
const developerTools = props.useDeveloperTools(enabled => enabled)
|
||||
const viewedId = state.view?.id
|
||||
const viewedRow = viewedId === undefined ? undefined : state.rows.find(row => row.id === viewedId)
|
||||
const viewedTitle = state.view === null
|
||||
@@ -236,21 +239,23 @@ export function AgentPresetSection(props: AgentPresetSectionProps): ReactNode {
|
||||
<div className={css.section}>
|
||||
<h2 className={css.title}>{t('nav')}</h2>
|
||||
<p className={css.intro}>{t('sectionIntro')}</p>
|
||||
<div className={css.pickerPreference}>
|
||||
<div className={css.pickerPreferenceCopy}>
|
||||
<span className={css.pickerPreferenceTitleRow}>
|
||||
<span className={css.pickerPreferenceTitle}>{t('showPicker')}</span>
|
||||
<Tag>{t('showPickerBeta')}</Tag>
|
||||
</span>
|
||||
<p className={css.pickerPreferenceDescription}>{t('showPickerDescription')}</p>
|
||||
{developerTools && (
|
||||
<div className={css.pickerPreference}>
|
||||
<div className={css.pickerPreferenceCopy}>
|
||||
<span className={css.pickerPreferenceTitleRow}>
|
||||
<span className={css.pickerPreferenceTitle}>{t('showPicker')}</span>
|
||||
<Tag>{t('showPickerBeta')}</Tag>
|
||||
</span>
|
||||
<p className={css.pickerPreferenceDescription}>{t('showPickerDescription')}</p>
|
||||
</div>
|
||||
<Switch
|
||||
checked={state.showPicker}
|
||||
label={t('showPicker')}
|
||||
disabled={state.status !== 'ready' || state.policySaving}
|
||||
onChange={(next) => { void props.setPickerVisible(next) }}
|
||||
/>
|
||||
</div>
|
||||
<Switch
|
||||
checked={state.showPicker}
|
||||
label={t('showPicker')}
|
||||
disabled={state.status !== 'ready' || state.policySaving}
|
||||
onChange={(next) => { void props.setPickerVisible(next) }}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
{state.error === null ? null : <p className={css.error} role="alert">{state.error}</p>}
|
||||
{([['system', t('builtInGroup')], ['user', t('customGroup')]] as const).map(([trust, heading]) => {
|
||||
const group = state.rows
|
||||
|
||||
@@ -203,7 +203,7 @@ export function apply(ctx: ClientContext): void {
|
||||
}
|
||||
|
||||
const sectionInjected = (): AgentPresetSectionInjected => ({
|
||||
hooks: { agentPresetSection: section.store },
|
||||
hooks: { agentPresetSection: section.store, developerTools: ctx.settingsScope.developerTools.enabled },
|
||||
load: () => section.load(),
|
||||
view: (id: string) => section.view(id),
|
||||
closeView: () => { section.closeView() },
|
||||
|
||||
@@ -17,6 +17,8 @@ import { en } from '../src/client/locales.ts'
|
||||
|
||||
afterEach(cleanup)
|
||||
|
||||
const translations: ReadonlyMap<string, string> = new Map(Object.entries(en))
|
||||
|
||||
const READY: AgentPresetSectionState = {
|
||||
status: 'ready',
|
||||
error: null,
|
||||
@@ -35,6 +37,10 @@ const READY: AgentPresetSectionState = {
|
||||
revealedPaths: {},
|
||||
}
|
||||
|
||||
function unusedHook(): never {
|
||||
throw new Error('This section does not read global slot sources')
|
||||
}
|
||||
|
||||
/**
|
||||
* Render the section over a fixed snapshot, with every action a spy.
|
||||
* @param state - the snapshot to render.
|
||||
@@ -42,7 +48,7 @@ const READY: AgentPresetSectionState = {
|
||||
*/
|
||||
function renderSection(
|
||||
state: Partial<AgentPresetSectionState> = {},
|
||||
options: { creator?: boolean } = {},
|
||||
options: { creator?: boolean; developerTools?: boolean } = {},
|
||||
) {
|
||||
const store = createSnapshotStore<AgentPresetSectionState>({ ...READY, ...state })
|
||||
const actions = {
|
||||
@@ -63,11 +69,18 @@ function renderSection(
|
||||
makeDefault: vi.fn(() => Promise.resolve()),
|
||||
setPickerVisible: vi.fn(() => Promise.resolve()),
|
||||
}
|
||||
const props = {
|
||||
const props: AgentPresetSectionProps = {
|
||||
...actions,
|
||||
usePanelInfo: unusedHook,
|
||||
useSessions: unusedHook,
|
||||
useSessionStatus: unusedHook,
|
||||
useSessionRetainInfo: unusedHook,
|
||||
useWorkspaces: unusedHook,
|
||||
useResource: unusedHook,
|
||||
useAgentPresetSection: bindSnapshotSelector(store),
|
||||
t: (key: keyof typeof en) => en[key],
|
||||
} as unknown as AgentPresetSectionProps
|
||||
useDeveloperTools: bindSnapshotSelector(createSnapshotStore(options.developerTools ?? true)),
|
||||
t: key => translations.get(key) ?? key,
|
||||
}
|
||||
render(<AgentPresetSection {...props} />)
|
||||
return actions
|
||||
}
|
||||
@@ -82,6 +95,13 @@ function rowFor(id: string): HTMLElement {
|
||||
}
|
||||
|
||||
describe('the preset list', () => {
|
||||
it('hides the complete picker-policy row while developer tools are off', () => {
|
||||
renderSection({}, { developerTools: false })
|
||||
expect(screen.queryByRole('switch', { name: en.showPicker })).toBeNull()
|
||||
expect(screen.queryByText(en.showPickerDescription)).toBeNull()
|
||||
expect(screen.queryByText(en.showPickerBeta)).toBeNull()
|
||||
})
|
||||
|
||||
it('reads the roster once when it first renders', async () => {
|
||||
const actions = renderSection()
|
||||
|
||||
@@ -348,14 +368,8 @@ describe('the preset list', () => {
|
||||
})
|
||||
|
||||
it('renders nothing when the deployment composes no presets', () => {
|
||||
const { container } = render(<AgentPresetSection {...({
|
||||
useAgentPresetSection: bindSnapshotSelector(
|
||||
createSnapshotStore<AgentPresetSectionState>({ ...READY, status: 'unavailable', rows: [] })),
|
||||
t: (key: keyof typeof en) => en[key],
|
||||
load: vi.fn(() => Promise.resolve()),
|
||||
} as unknown as AgentPresetSectionProps)} />)
|
||||
|
||||
expect(container.firstChild).toBeNull()
|
||||
renderSection({ status: 'unavailable', rows: [] })
|
||||
expect(screen.queryByRole('heading')).toBeNull()
|
||||
})
|
||||
|
||||
it('offers a retry when the roster could not be read', () => {
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
||||
# after editing either side, bring the other along and re-record with:
|
||||
# pnpm run verify-translation-pairing --write packages/client/ui-conversation/README.md
|
||||
README.md: fef3a6551b517af2ac636687883864525aac70ee
|
||||
README.zh.md: e9ab08c686420c38c11ca2bede2fd00099a247a5
|
||||
README.md: 16e821ed4caabae491d552a823bd69a2e976e2bd
|
||||
README.zh.md: 7316b00c69ca74284b81678082d93e870dee6bbe
|
||||
@@ -40,7 +40,7 @@ The shared image slot props keep display choices separate from durable reference
|
||||
|
||||
The context-occupancy button shows a ring and percentage below the input card, after the Session statistics. Clicking it opens the token breakdown in a panel kept inside the viewport, including when no statistics are shown; the button stays hidden until context usage and capacity are available.
|
||||
|
||||
With Developer tools off, the shell exposes only Chat and hides the View tab bar. Turning it off while another View is active returns to Chat; stored View preferences and recorded Session data remain intact. Turning it on makes registered Views available again. View owners receive the available roster so their navigation actions can follow the same visibility.
|
||||
With Developer tools off, the shell hides only Trajectory; other plugin-contributed Views remain available. The View tab bar is hidden when fewer than two Views are available. Turning Developer tools off while Trajectory is active returns to Chat; stored View preferences and recorded Session data remain intact. Turning it on makes Trajectory available again. View owners receive the available roster so their navigation actions can follow the same visibility.
|
||||
|
||||
The composer registers the File command action and owns its label, availability, and native file-dialog callback. Menu availability and invocation both consult the mounted composer's current attachment-intake policy. Unmounting or locking the composer disables that action; disposing the plugin removes its registration. The callback binding stays inside the input module.
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ target package 通过 declaration merge 扩展 snapshot 与 Location data map，
|
||||
|
||||
上下文占用按钮在输入卡片下方、会话统计右侧显示圆环和百分比。点击按钮可在视口内的面板查看 token 构成，没有统计项时面板也不会越界；上下文用量和容量尚不可用时，按钮保持隐藏。
|
||||
|
||||
关闭开发者工具时，外壳仅展示 Chat 并隐藏 View 标签栏。在其他 View 激活时关闭开关会返回 Chat；已保存的 View 偏好和 Session 记录保持不变。开启后，已注册的 View 恢复可用。View 所有者接收可用列表，使导航操作跟随相同的可见性。
|
||||
关闭开发者工具时，外壳仅隐藏 Trajectory；其他插件贡献的 View 仍然可用。可用 View 少于两个时隐藏 View 标签栏。在 Trajectory 激活时关闭开发者工具会返回 Chat；已保存的 View 偏好和 Session 记录保持不变。开启后，Trajectory 恢复可用。View 所有者接收可用列表，使导航操作跟随相同的可见性。
|
||||
|
||||
输入框注册「文件」命令动作，负责其标题、可用性和原生文件选择器回调。菜单可用性与实际调用都读取已挂载输入框当前的附件接收策略。输入框卸载或锁定后该动作不可用，插件 dispose（资源释放）时移除注册。回调绑定留在输入模块内部。
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ import { ConversationHeader } from './skeleton/ConversationHeader.tsx'
|
||||
import { ConversationSession, ConversationSessionHeader } from './skeleton/ConversationSession.tsx'
|
||||
import { InputBar } from './skeleton/InputBar.tsx'
|
||||
import { todoDockEntry } from './skeleton/TodoPanel.tsx'
|
||||
import { DEFAULT_VIEW_ID, resolveActiveView } from './view-selection.ts'
|
||||
import { DEVELOPER_TOOLS_VIEW_ID, resolveActiveView } from './view-selection.ts'
|
||||
import { en, NS, zh, type ConversationKey } from './locales.ts'
|
||||
import { CONVERSATION_SETTINGS_NAMESPACE, type ConversationSettings } from '../submission-settings.ts'
|
||||
|
||||
@@ -159,7 +159,7 @@ export function apply(ctx: Context, config: Config = Config({})): void {
|
||||
for (const entry of slots.entries('conversation.view')) {
|
||||
/* v8 ignore next -- list registration validates id at load. */
|
||||
if (entry.options.id === undefined) continue
|
||||
if (!ctx.settingsScope.developerTools.enabled.getSnapshot() && entry.options.id !== DEFAULT_VIEW_ID) continue
|
||||
if (!ctx.settingsScope.developerTools.enabled.getSnapshot() && entry.options.id === DEVELOPER_TOOLS_VIEW_ID) continue
|
||||
tabs.push({
|
||||
id: entry.options.id,
|
||||
label: resolveSlotLabel(entry.options.label) ?? entry.options.id,
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
import type { ViewTab } from './contract/views.ts'
|
||||
|
||||
/** Chat remains available when developer tools are disabled. */
|
||||
/** Fallback View selected when no stored preference resolves to a registered View. */
|
||||
export const DEFAULT_VIEW_ID = 'chat'
|
||||
|
||||
/** The one View the Developer tools preference gates; other Views stay registered by their owners. */
|
||||
export const DEVELOPER_TOOLS_VIEW_ID = 'trajectory'
|
||||
|
||||
/**
|
||||
* Resolve a preferred registered View, then Chat, without choosing another View.
|
||||
* @param tabs - currently registered Views.
|
||||
|
||||
@@ -201,24 +201,46 @@ describe('Conversation inject API', () => {
|
||||
const unsubscribe = source.subscribe(changed)
|
||||
expect(source.getSnapshot()).toBeUndefined()
|
||||
const removeDefinition = b.runtime.ctx.uiConversation.views.register({
|
||||
target: 'custom-inspector',
|
||||
target: 'trajectory',
|
||||
toolCallFocus: callId => `tool:${callId}`,
|
||||
create: () => ({ empty: null, replace: () => null, apply: () => null }),
|
||||
})
|
||||
expect(source.getSnapshot()).toBeUndefined()
|
||||
const removeView = b.slots.register(
|
||||
{ name: 'conversation.view', id: 'custom-inspector' }, (() => null) as never,
|
||||
{ name: 'conversation.view', id: 'trajectory' }, (() => null) as never,
|
||||
)
|
||||
await b.runtime.flush()
|
||||
const inspect = source.getSnapshot()!
|
||||
expect(inspect).toBeTypeOf('function')
|
||||
expect(source.getSnapshot()).toBe(inspect)
|
||||
inspect('call-1')
|
||||
expect(body.instance.store.getSnapshot().viewRequest).toEqual({ view: 'custom-inspector', focus: 'tool:call-1' })
|
||||
expect(body.instance.store.getSnapshot().viewRequest).toEqual({ view: 'trajectory', focus: 'tool:call-1' })
|
||||
await b.runtime.ctx.settingsScope.developerTools.setEnabled(false)
|
||||
expect(source.getSnapshot()).toBeUndefined()
|
||||
await b.runtime.ctx.settingsScope.developerTools.setEnabled(true)
|
||||
expect(source.getSnapshot()).toBe(inspect)
|
||||
// Trajectory still owns inspection while both Views are visible; hiding
|
||||
// it must leave a third-party View's inspection capability reachable.
|
||||
const removePipelineDefinition = b.runtime.ctx.uiConversation.views.register({
|
||||
target: 'pipeline',
|
||||
toolCallFocus: callId => `stage:${callId}`,
|
||||
create: () => ({ empty: null, replace: () => null, apply: () => null }),
|
||||
})
|
||||
const removePipelineView = b.slots.register(
|
||||
{ name: 'conversation.view', id: 'pipeline' }, (() => null) as never,
|
||||
)
|
||||
await b.runtime.flush()
|
||||
expect(source.getSnapshot()).toBe(inspect)
|
||||
await b.runtime.ctx.settingsScope.developerTools.setEnabled(false)
|
||||
const pipelineInspect = source.getSnapshot()!
|
||||
expect(pipelineInspect).toBeTypeOf('function')
|
||||
pipelineInspect('call-2')
|
||||
expect(body.instance.store.getSnapshot().viewRequest).toEqual({ view: 'pipeline', focus: 'stage:call-2' })
|
||||
await b.runtime.ctx.settingsScope.developerTools.setEnabled(true)
|
||||
removePipelineView()
|
||||
removePipelineDefinition()
|
||||
await b.runtime.flush()
|
||||
expect(source.getSnapshot()).toBe(inspect)
|
||||
removeView()
|
||||
await b.runtime.flush()
|
||||
expect(source.getSnapshot()).toBeUndefined()
|
||||
|
||||
@@ -44,18 +44,18 @@ function entry(
|
||||
}
|
||||
|
||||
describe('target-neutral Conversation apply wiring', () => {
|
||||
it('offers only Chat while developer tools are disabled and restores registered views when enabled', async () => {
|
||||
it('hides only the Trajectory View while developer tools are disabled and restores it when enabled', async () => {
|
||||
const b = await bench()
|
||||
const header = b.runtime.slots.entries('conversation.session.header')[0]!
|
||||
const source = (header.inject!() as { hooks: { conversationViews: ObservableSnapshot<readonly ViewTab[]> } }).hooks.conversationViews
|
||||
for (const id of ['chat', 'trajectory']) {
|
||||
for (const id of ['chat', 'trajectory', 'probe']) {
|
||||
b.runtime.slots.register({ name: 'conversation.view', id, label: id }, (() => null) as never)
|
||||
}
|
||||
await vi.waitFor(() => { expect(source.getSnapshot().map(tab => tab.id)).toEqual(['chat', 'trajectory']) })
|
||||
await vi.waitFor(() => { expect(source.getSnapshot().map(tab => tab.id)).toEqual(['chat', 'trajectory', 'probe']) })
|
||||
b.developerTools.set(false)
|
||||
expect(source.getSnapshot().map(tab => tab.id)).toEqual(['chat'])
|
||||
expect(source.getSnapshot().map(tab => tab.id)).toEqual(['chat', 'probe'])
|
||||
b.developerTools.set(true)
|
||||
expect(source.getSnapshot().map(tab => tab.id)).toEqual(['chat', 'trajectory'])
|
||||
expect(source.getSnapshot().map(tab => tab.id)).toEqual(['chat', 'trajectory', 'probe'])
|
||||
await b.runtime.dispose()
|
||||
})
|
||||
it('waits for the layout-owned conversation declaration before registering its subtree', async () => {
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
||||
# after editing either side, bring the other along and re-record with:
|
||||
# pnpm run verify-translation-pairing --write packages/client/ui-settings/README.md
|
||||
README.md: d70cb35878d77c1d3e928aa222a2c7e96874ea2c
|
||||
README.zh.md: 87687ac3ccc7f19d7b34f5724eba260a02e92044
|
||||
README.md: d688442cb003f980b037354f76997c18a2ca0be2
|
||||
README.zh.md: 92e2026d04f188854fd6205fe4d35e8c9c8e57b2
|
||||
@@ -29,7 +29,7 @@ Feature plugins use this package to store and edit their preferences without re-
|
||||
|
||||
### Binding a namespace
|
||||
|
||||
`ctx.settingsScope.developerTools` owns the shared Web and desktop preference `ui-developer-tools.enabled`, defaulting to `false`. Its `enabled` observable publishes accepted choices and `setEnabled` uses the same ordered settings writes. Desktop and loopback Web persist to the Host document; remote Web keeps this choice in one browser-local observable until reload without issuing Host writes. This controls presentation and HTML preview permissions, not Host authorization or Session recording.
|
||||
`ctx.settingsScope.developerTools` owns the shared Web and desktop preference `ui-developer-tools.enabled`, defaulting to `true`. Its `enabled` observable publishes accepted choices and `setEnabled` uses the same ordered settings writes. Desktop and loopback Web persist to the Host document; remote Web keeps this choice in one browser-local observable until reload without issuing Host writes. This controls presentation and HTML preview permissions, not Host authorization or Session recording. Host-backed clients keep developer features disabled until the first accepted schema-resolved value arrives; missing or failed initial responses do not enable them. Later refreshes retain the last accepted choice.
|
||||
|
||||
A feature calls `ctx.settingsScope.bind(spec)` with a per-namespace spec and gets a scope derived from the shared document mirror. The scope snapshot carries the resolved section, composition `base`, raw `user`, revision, writability, and host/memory mode; a field is overridden when it is present in `user`, even when its value equals `base`, and `unset` clears that override. Writes go through the scope: `set` and `unset` submit one operation, while `mutate` submits several ordered operations atomically. These methods return `true` for Host acceptance and `false` for refusal or skipped writes; transport failures reject. Each write is fenced by the namespace revision as `expectedRevision`, so a concurrent write from another surface is refused instead of silently overwritten. A staged editor can supply the revision where its draft began as a fixed fence; otherwise the scope uses the latest queued or mirrored revision.
|
||||
|
||||
@@ -53,7 +53,7 @@ The package realizes one ownership rule: the browser keeps one shared mirror of
|
||||
|
||||
### The describe mirror
|
||||
|
||||
The Host half registers the `ui-developer-tools` schema and its default-off value with settings. The Client plugin injects `remote` with its `settings` namespace, resolves Host persistence once from the fixed `remote.$host` facts, and owns the one `settings.describe` reader in the browser: a shared mirror refreshed on every forwarded `settings/document-updated` event and on `connection/reset` (the first connection included, closing the window where a commit lands between the eager read and the SSE subscription). Cross-namespace surfaces read it through `ctx.settingsScope.describe()`, a read/fold face (`getSnapshot`/`subscribe`/`ensure`, plus `acceptView` folding a write answer in).
|
||||
The Host half registers the `ui-developer-tools` schema and its default-on value with settings. The Client plugin injects `remote` with its `settings` namespace, resolves Host persistence once from the fixed `remote.$host` facts, and owns the one `settings.describe` reader in the browser: a shared mirror refreshed on every forwarded `settings/document-updated` event and on `connection/reset` (the first connection included, closing the window where a commit lands between the eager read and the SSE subscription). Cross-namespace surfaces read it through `ctx.settingsScope.describe()`, a read/fold face (`getSnapshot`/`subscribe`/`ensure`, plus `acceptView` folding a write answer in).
|
||||
|
||||
### Scope derivation
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ kind: "package-reference"
|
||||
|
||||
### 绑定命名空间
|
||||
|
||||
`ctx.settingsScope.developerTools` 管理 Web 和桌面端共享的偏好 `ui-developer-tools.enabled`，默认为 `false`。其 `enabled` 可观察值发布已接受的选择，`setEnabled` 使用相同的有序设置写入。桌面端和回环 Web 将设置持久化到 Host 文档；远程 Web 将此选择保存在单个浏览器本地可观察值中，刷新后重置，不发送 Host 写入。此设置控制界面展示和 HTML 预览权限，不控制 Host 授权或 Session 记录。
|
||||
`ctx.settingsScope.developerTools` 管理 Web 和桌面端共享的偏好 `ui-developer-tools.enabled`，默认为 `true`。其 `enabled` 可观察值发布已接受的选择，`setEnabled` 使用相同的有序设置写入。桌面端和回环 Web 将设置持久化到 Host 文档；远程 Web 将此选择保存在单个浏览器本地可观察值中，刷新后重置，不发送 Host 写入。此设置控制界面展示和 HTML 预览权限，不控制 Host 授权或 Session 记录。 使用 Host 偏好的客户端在首个经过 schema 解析并接受的值到达前保持开发者功能关闭；首次响应缺失或失败不会启用它们。后续刷新保留已接受的选择。
|
||||
|
||||
功能调用 `ctx.settingsScope.bind(spec)` 并传入按命名空间的 spec，得到一个由共享文档镜像派生的 scope。scope 快照携带解析后的分区、组合 `base`、原始 `user`、revision、可写性以及 host/内存模式；字段只要出现在 `user` 中即视为覆盖，即使其值与 `base` 相等，`unset` 会清除该覆盖。写入经 scope 进行：`set` 与 `unset` 提交一个操作，`mutate` 则原子提交多个有序操作。这些方法在 Host 接受时返回 `true`，拒绝或跳过写入时返回 `false`；传输失败会 reject。每次写入都以命名空间 revision 作为 `expectedRevision` 围栏，因此来自另一界面的并发写入会被拒绝，而不是被静默覆盖。暂存编辑器可以把开始草拟时读取的 revision 作为固定围栏传入；否则 scope 使用最新排队或镜像 revision。
|
||||
|
||||
@@ -53,7 +53,7 @@ kind: "package-reference"
|
||||
|
||||
### Describe 镜像
|
||||
|
||||
Host 部分向 settings 注册 `ui-developer-tools` schema 及其默认关闭值。Client 插件注入 `remote` 及其 `settings` 命名空间，从固定的 `remote.$host` 事实一次性解析 Host 持久化模式，并持有浏览器中唯一的 `settings.describe` 读取方：一面共享镜像，在每次转发的 `settings/document-updated` 事件与 `connection/reset` 时刷新（首次连接也包含在内，关闭「提交落在急切读取与 SSE 订阅之间」的窗口）。跨命名空间表面通过 `ctx.settingsScope.describe()` 读它，这是一个读取/折叠面（`getSnapshot`/`subscribe`/`ensure`，另有把写应答折入的 `acceptView`）。
|
||||
Host 部分向 settings 注册 `ui-developer-tools` schema 及其默认开启值。Client 插件注入 `remote` 及其 `settings` 命名空间，从固定的 `remote.$host` 事实一次性解析 Host 持久化模式，并持有浏览器中唯一的 `settings.describe` 读取方：一面共享镜像，在每次转发的 `settings/document-updated` 事件与 `connection/reset` 时刷新（首次连接也包含在内，关闭「提交落在急切读取与 SSE 订阅之间」的窗口）。跨命名空间表面通过 `ctx.settingsScope.describe()` 读它，这是一个读取/折叠面（`getSnapshot`/`subscribe`/`ensure`，另有把写应答折入的 `acceptView`）。
|
||||
|
||||
### Scope 派生
|
||||
|
||||
|
||||
@@ -3,11 +3,11 @@ import { createSnapshotStore, type ObservableSnapshot } from '@deepseek-ai/dsh-c
|
||||
import type { DeveloperToolsSettings } from '../developer-tools-settings.ts'
|
||||
import type { SettingsScope } from './settings-contract.ts'
|
||||
|
||||
/** Shared preference; no accepted value means developer tools are disabled. */
|
||||
/** Shared preference; Host-backed features stay disabled until an accepted value arrives. */
|
||||
export class DeveloperToolsPreference {
|
||||
/** Accepted enablement, observable through renderer-bound hooks. */
|
||||
readonly enabled: ObservableSnapshot<boolean>
|
||||
private readonly local = createSnapshotStore(false)
|
||||
private readonly local = createSnapshotStore(true)
|
||||
|
||||
/**
|
||||
* @param scope - settings-owned namespace controller.
|
||||
|
||||
@@ -10,7 +10,7 @@ export interface DeveloperToolsSettings {
|
||||
enabled: boolean
|
||||
}
|
||||
|
||||
/** New installations and missing values use the basic interface. */
|
||||
/** New installations and missing values enable the full interface. */
|
||||
export const DeveloperToolsSettingsSchema: z<DeveloperToolsSettings> = z.object({
|
||||
enabled: z.boolean().default(false),
|
||||
enabled: z.boolean().default(true),
|
||||
})
|
||||
@@ -39,6 +39,39 @@ describe('developer tools settings', () => {
|
||||
expect(ctx.settingsScope.developerTools.enabled.getSnapshot()).toBe(false)
|
||||
})
|
||||
|
||||
it.each([false, true])('withholds features during a delayed Host read before accepting %s', async (enabled) => {
|
||||
const ctx = new Context()
|
||||
const accepted = { ok: true, value: {
|
||||
writable: true, hasDocument: true, namespaces: [{
|
||||
ns: DEVELOPER_TOOLS_NAMESPACE,
|
||||
schema: DeveloperToolsSettingsSchema.toJSON(),
|
||||
value: { enabled }, revision: 1, applies: 'live', secrets: [],
|
||||
}],
|
||||
} }
|
||||
const pending = Promise.withResolvers<typeof accepted>()
|
||||
onTestFinished(async () => { pending.resolve(accepted); await ctx.fiber.dispose() })
|
||||
new TestRemote(ctx, { settings: { describe: () => pending.promise } })
|
||||
await ctx.plugin({ inject, apply: clientApply }).await()
|
||||
const preference = ctx.settingsScope.developerTools
|
||||
const changed = vi.fn()
|
||||
const dispose = preference.enabled.subscribe(changed)
|
||||
onTestFinished(dispose)
|
||||
expect(preference.enabled.getSnapshot()).toBe(false)
|
||||
pending.resolve(accepted)
|
||||
await ctx.settingsScope.describe().ensure()
|
||||
expect(preference.enabled.getSnapshot()).toBe(enabled)
|
||||
expect(changed).toHaveBeenCalledTimes(enabled ? 1 : 0)
|
||||
})
|
||||
|
||||
it('keeps features disabled when the initial Host read fails', async () => {
|
||||
const ctx = new Context()
|
||||
onTestFinished(() => ctx.fiber.dispose())
|
||||
new TestRemote(ctx, { settings: { describe: () => Promise.reject(new Error('disconnected')) } })
|
||||
await ctx.plugin({ inject, apply: clientApply }).await()
|
||||
await ctx.settingsScope.describe().ensure()
|
||||
expect(ctx.settingsScope.developerTools.enabled.getSnapshot()).toBe(false)
|
||||
})
|
||||
|
||||
it('shares one remote-browser preference across consumers and disposes it with the plugin', async () => {
|
||||
const ctx = new Context()
|
||||
onTestFinished(() => ctx.fiber.dispose())
|
||||
@@ -49,13 +82,14 @@ describe('developer tools settings', () => {
|
||||
await fiber.await()
|
||||
const preference = ctx.settingsScope.developerTools
|
||||
expect(fiber.ctx.settingsScope.developerTools.enabled).toBe(preference.enabled)
|
||||
expect(preference.enabled.getSnapshot()).toBe(true)
|
||||
await preference.setEnabled(true)
|
||||
expect(fiber.ctx.settingsScope.developerTools.enabled.getSnapshot()).toBe(true)
|
||||
expect(describeCall).not.toHaveBeenCalled()
|
||||
await fiber.dispose()
|
||||
expect(ctx.get('settingsScope')).toBeUndefined()
|
||||
})
|
||||
it('defaults off, persists valid choices and removes its schema on disposal', async () => {
|
||||
it('defaults on, keeps an explicit false, persists valid choices and removes its schema on disposal', async () => {
|
||||
const ctx = new Context()
|
||||
const provider = ctx.plugin(MemorySettings)
|
||||
onTestFinished(() => provider.dispose())
|
||||
@@ -63,6 +97,8 @@ describe('developer tools settings', () => {
|
||||
const fiber = ctx.plugin({ apply })
|
||||
onTestFinished(() => fiber.dispose())
|
||||
await fiber.await()
|
||||
expect(ctx.settings.get(DEVELOPER_TOOLS_NAMESPACE)).toEqual({ enabled: true })
|
||||
await ctx.settings.update(DEVELOPER_TOOLS_NAMESPACE, { enabled: false })
|
||||
expect(ctx.settings.get(DEVELOPER_TOOLS_NAMESPACE)).toEqual({ enabled: false })
|
||||
await ctx.settings.update(DEVELOPER_TOOLS_NAMESPACE, { enabled: true })
|
||||
expect(ctx.settings.get(DEVELOPER_TOOLS_NAMESPACE)).toEqual({ enabled: true })
|
||||
@@ -71,19 +107,19 @@ describe('developer tools settings', () => {
|
||||
expect(ctx.settings.describe().map(row => row.ns)).not.toContain(DEVELOPER_TOOLS_NAMESPACE)
|
||||
})
|
||||
|
||||
it('stays off until accepted settings arrive and follows external changes', async () => {
|
||||
it('stays off until accepted settings arrive, then follows a stored false and external changes', async () => {
|
||||
const host = stubSettingsScope<DeveloperToolsSettings>()
|
||||
const preference = new DeveloperToolsPreference(host.scope)
|
||||
expect(preference.enabled.getSnapshot()).toBe(false)
|
||||
const notify = vi.fn()
|
||||
const dispose = preference.enabled.subscribe(notify)
|
||||
host.publish({ status: 'ready', value: { enabled: false } })
|
||||
expect(preference.enabled.getSnapshot()).toBe(false)
|
||||
host.publish({ status: 'ready', value: { enabled: true } })
|
||||
expect(notify).not.toHaveBeenCalled()
|
||||
await preference.setEnabled(true)
|
||||
expect(host.set).toHaveBeenCalledWith('enabled', true)
|
||||
host.publish({ value: { enabled: true } })
|
||||
expect(preference.enabled.getSnapshot()).toBe(true)
|
||||
expect(notify).toHaveBeenCalledOnce()
|
||||
await preference.setEnabled(false)
|
||||
expect(host.set).toHaveBeenCalledWith('enabled', false)
|
||||
host.publish({ value: { enabled: false } })
|
||||
expect(preference.enabled.getSnapshot()).toBe(false)
|
||||
dispose()
|
||||
})
|
||||
})
|
||||
@@ -94,13 +130,14 @@ it('keeps remote browser choices local and publishes only changed values', async
|
||||
const preference = new DeveloperToolsPreference(host.scope)
|
||||
const notify = vi.fn()
|
||||
const dispose = preference.enabled.subscribe(notify)
|
||||
expect(preference.enabled.getSnapshot()).toBe(false)
|
||||
await preference.setEnabled(true)
|
||||
expect(preference.enabled.getSnapshot()).toBe(true)
|
||||
await preference.setEnabled(true)
|
||||
expect(notify).toHaveBeenCalledOnce()
|
||||
await preference.setEnabled(false)
|
||||
expect(preference.enabled.getSnapshot()).toBe(false)
|
||||
await preference.setEnabled(false)
|
||||
expect(notify).toHaveBeenCalledOnce()
|
||||
await preference.setEnabled(true)
|
||||
expect(preference.enabled.getSnapshot()).toBe(true)
|
||||
expect(notify).toHaveBeenCalledTimes(2)
|
||||
expect(host.set).not.toHaveBeenCalled()
|
||||
dispose()
|
||||
})
|
||||
@@ -117,3 +154,10 @@ it('ignores host revisions that do not change enablement', () => {
|
||||
expect(notify).toHaveBeenCalledOnce()
|
||||
dispose()
|
||||
})
|
||||
|
||||
it('keeps an unavailable Host namespace disabled', () => {
|
||||
const host = stubSettingsScope<DeveloperToolsSettings>()
|
||||
const preference = new DeveloperToolsPreference(host.scope)
|
||||
host.publish({ status: 'unavailable' })
|
||||
expect(preference.enabled.getSnapshot()).toBe(false)
|
||||
})
|
||||
@@ -3,6 +3,9 @@
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { act, cleanup, render, screen, waitFor } from '@testing-library/react'
|
||||
import { createSnapshotStore } from '@deepseek-ai/dsh-client-store'
|
||||
import { bindSnapshotSelector, stubSettingsScope } from '@deepseek-ai/dsh-client-test-runtime'
|
||||
import { DeveloperToolsPreference } from '@deepseek-ai/dsh-client-ui-settings/src/client/developer-tools.ts'
|
||||
import type { DeveloperToolsSettings } from '@deepseek-ai/dsh-client-ui-settings/src/developer-tools-settings.ts'
|
||||
import type { Resources, ResourceSnapshot } from '@deepseek-ai/dsh-client-resources/client'
|
||||
import type { WorkspaceFileStat } from '@deepseek-ai/dsh-api-workspace-files/types'
|
||||
import type { SessionId } from '@deepseek-ai/dsh-session/types'
|
||||
@@ -153,6 +156,31 @@ describe('HtmlBody', () => {
|
||||
expect(screen.getByRole('alert').textContent).toBe(en.failed)
|
||||
})
|
||||
|
||||
it('follows the shared developer-tools preference from loading through a stored false to enabled', async () => {
|
||||
const host = stubSettingsScope<DeveloperToolsSettings>()
|
||||
const preference = new DeveloperToolsPreference(host.scope)
|
||||
const readRelated = vi.fn<HtmlBodyProps['readRelated']>().mockResolvedValue({ ok: true, value: {
|
||||
absolutePath: '/workspace/asset.js', version: 'asset-v1', offset: 0, eof: true,
|
||||
data: btoa('window.loaded = true'),
|
||||
} })
|
||||
const scripted: HtmlBodyProps = {
|
||||
...props('<p>Preview</p><script src="./asset.js"></script>'),
|
||||
useInteractivePreview: bindSnapshotSelector(preference.enabled),
|
||||
readRelated,
|
||||
}
|
||||
const view = render(<HtmlBody {...scripted} />)
|
||||
expect(screen.getByTitle(en.frame).getAttribute('sandbox')).toBe('')
|
||||
expect(readRelated).not.toHaveBeenCalled()
|
||||
act(() => { host.publish({ status: 'ready', value: { enabled: false } }) })
|
||||
expect(screen.getByTitle(en.frame).getAttribute('sandbox')).toBe('')
|
||||
expect(readRelated).not.toHaveBeenCalled()
|
||||
act(() => { host.publish({ value: { enabled: true } }) })
|
||||
const advanced = await screen.findByTitle(en.frame)
|
||||
expect(advanced.getAttribute('sandbox')).toBe('allow-scripts')
|
||||
expect(readRelated).toHaveBeenCalledOnce()
|
||||
view.unmount()
|
||||
})
|
||||
|
||||
it('renders a Blob iframe with only scripts allowed, keeping it mounted for unrelated props', async () => {
|
||||
const initial = props()
|
||||
const view = render(<HtmlBody {...initial} />)
|
||||
|
||||
@@ -481,10 +481,6 @@
|
||||
"packages/client/ui-agent-preset/tests/section-store.client.spec.ts": {
|
||||
"23e04af2a900d7a905ff7657de842e9833384a2d4c4afba33964477e43d8ba52": 1
|
||||
},
|
||||
"packages/client/ui-agent-preset/tests/section.client.spec.tsx": {
|
||||
"4cc9284f9e4d9df997ed042df717f143f3763130fdfb9e142226da4b5b4c60e6": 1,
|
||||
"67694f8f44eb8347cb38c39d368f4f0ce1b78bd33a6a57a55cf4664f3eaa7f98": 1
|
||||
},
|
||||
"packages/client/ui-agent-preset/tests/settings-store.client.spec.ts": {
|
||||
"c0e852e6b0e2a8a040b65723f8ab1d650d9cb06c26be7f3a0709ddb9f7525595": 1,
|
||||
"d6a04d954aef7a8edd403910851015c0ce1597f6f300292b5158a8bf993fc1d8": 1
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
## Basic HTML
|
||||
|
||||
- Developer tools: off by default on Web and desktop
|
||||
- Developer tools: disabled for this scenario
|
||||
- Sandbox: no permissions
|
||||
- Inline script: pending
|
||||
- Local script: pending
|
||||
|
||||
Reference in new issue
Block a user