dsh-modellix 0.2.1 → 0.3.0

package/CHANGELOG.md

@@ -6,6 +6,21 @@ The format follows Keep a Changelog.
 
 ## [Unreleased]
 
+## [0.3.0] - 2026-10-15
+
+### Changed
+
+- Replaced repeated immediate task reads with bounded server waits and an overall cancellation deadline.
+- Moved remote waits outside the shared Design write queue; observations remain serialized and credential-epoch guarded.
+- Added deterministic image, video, and audio upload validation up to 16 MiB and explicit file-quota recovery guidance.
+- Updated real API acceptance to exercise server waits without replaying media submissions.
+
+### Fixed
+
+- Keep API Key validation errors visible while a credential editor is open; background configuration refresh resumes after it closes.
+- Restore keyboard focus to the credential editor's opener when a host Modal applies its own autofocus.
+- Keep settings controls enabled during background refresh and discard stale replies after a newer settings change.
+
 ## [0.2.1] - 2026-09-02
 
 ### Changed

package/README.md

@@ -8,6 +8,13 @@
 
 ![A real English Harness conversation showing a completed Modellix image result](docs/assets/chat-media-generation-en.webp)
 
+## What changed in 0.3.0
+
+- Task monitoring uses bounded server waits. Only a known task ID is observed, and stopping a wait never resubmits the paid generation.
+- Chat and result history stay responsive during a wait. Disabling Design, changing credentials, or closing the plugin cancels outstanding reads and prevents stale results from being saved.
+- Workspace uploads support the File API's image, video, and audio formats up to 16 MiB, with local file/container checks. Harness attachment uploads still use its image attachment reader. On quota errors, list files and explicitly delete only selected IDs through the File API or CLI; the plugin never deletes files automatically.
+- The server must support `wait=true`; an unsupported server produces a compatibility error instead of repeated short polling.
+
 ## What changed in 0.2.1
 
 - The Web switch now unregisters only `modellix_web_search` and `modellix_web_fetch`. Harness-native Web tools and providers remain available, so turning Modellix Web off falls back to the active profile's defaults.
@@ -60,7 +67,7 @@ To install a trusted local build:
 pnpm install --frozen-lockfile
 pnpm run verify:release:static
 pnpm pack
-dsh plugin --profile web add ./dsh-modellix-0.2.1.tgz
+dsh plugin --profile web add ./dsh-modellix-0.3.0.tgz
 ```
 
 See [local usage](docs/en-US/LOCAL_USAGE.md) for the complete Windows-first workflow.
@@ -110,7 +117,7 @@ The **Modellix Design** button sits at the far right of the conversation header,
 - The entire Results list is expanded by default and can be collapsed.
 - Every result card is expanded by default and can be collapsed by selecting its header.
 - The close button returns focus to the launcher.
-- The advanced exact-parameter editor remains implemented but its entry is hidden in `0.2.1`; ordinary users work through chat.
+- The advanced exact-parameter editor remains implemented but its entry is hidden in `0.3.0`; ordinary users work through chat.
 - At 560 px and below, the panel uses the available viewport width. At 360 px and below, the launcher becomes a reachable compact control.
 
 ## LLM models

package/README.zh-CN.md

@@ -8,6 +8,13 @@
 
 ![真实中文 Harness 会话中已完成的 Modellix 图片结果](docs/assets/chat-media-generation-zh.webp)
 
+## 0.3.0 的主要变化
+
+- 任务监控改为有界服务端等待，只观察已知任务 ID；停止等待不会重新提交计费生成。
+- 等待期间 Chat 与结果历史保持响应。关闭 Design、更换凭据或关闭插件时会取消未完成的读取，并阻止旧结果写入。
+- 工作区上传支持 File API 的图片、视频和音频格式，单文件上限 16 MiB，并校验本地文件与容器。Harness 附件仍使用其图片读取接口。配额不足时，通过 File API 或 CLI 列出文件并明确删除选中的 ID；插件不会自动清理文件。
+- 服务端需要支持 `wait=true`；不支持时会明确提示兼容性错误，不会回退为反复短轮询。
+
 ## 0.2.1 的主要变化
 
 - Web 开关现在只注销 `modellix_web_search` 与 `modellix_web_fetch`。Harness 原生 Web 工具和 Provider 保持可用，关闭 Modellix Web 后会回退到当前 Profile 的默认能力。
@@ -60,7 +67,7 @@ dsh --profile web
 pnpm install --frozen-lockfile
 pnpm run verify:release:static
 pnpm pack
-dsh plugin --profile web add ./dsh-modellix-0.2.1.tgz
+dsh plugin --profile web add ./dsh-modellix-0.3.0.tgz
 ```
 
 完整 Windows 本地流程见[本地使用指南](docs/zh-CN/LOCAL_USAGE.md)。
@@ -110,7 +117,7 @@ Agent 会按实际情况：
 - 整个结果列表默认展开，可点击收起。
 - 每张结果卡默认展开，可点击卡片头部收起。
 - 点击 X 关闭后，焦点会回到入口按钮。
-- 高级精准参数编辑器已保留，但 `0.2.1` 暂不显示入口；普通用户通过 Chat 使用。
+- 高级精准参数编辑器已保留，但 `0.3.0` 暂不显示入口；普通用户通过 Chat 使用。
 - 560px 及以下使用可用视口全宽；360px 及以下入口变为可触达的紧凑按钮。
 
 ## LLM 模型

package/docs/en-US/LOCAL_USAGE.md

@@ -42,7 +42,7 @@ pnpm run verify:pack
 pnpm pack
 ```
 
-The repository root will contain a file such as `dsh-modellix-0.2.1.tgz`. Do not ask DSH to install the unbuilt TypeScript checkout directly.
+The repository root will contain a file such as `dsh-modellix-0.3.0.tgz`. Do not ask DSH to install the unbuilt TypeScript checkout directly.
 
 ## 3. Create an isolated local Harness environment
 
@@ -60,7 +60,7 @@ This affects only the current PowerShell process and its children. Omit this ste
 Install the tarball into the `web` profile and inspect the merged configuration:
 
 ```powershell
-dsh plugin --profile web add .\dsh-modellix-0.2.1.tgz
+dsh plugin --profile web add .\dsh-modellix-0.3.0.tgz
 dsh --profile web --dump-config
 ```
 
@@ -88,10 +88,12 @@ An environment-sourced Modellix Key is read-only in the UI. Stop and restart Har
 ## 6. Start the local Web UI
 
 ```powershell
-dsh --profile web --no-open
+dsh --profile web --no-open --port 3080 --trusted-host localhost:3080
 ```
 
-The terminal prints the actual address, such as `http://127.0.0.1:3080`. Open the printed address; do not assume the port is fixed.
+The supported Harness currently accepts only its loopback IP or all interfaces as a bind value. Keep the default loopback binding, allow `localhost:3080` through its trust fence, and open `http://localhost:3080/`. Do not use an all-interface bind for local acceptance.
+
+The terminal prints the actual address, such as `http://localhost:3080`. Open the printed address; do not assume the port is fixed.
 
 A fresh profile may first show Harness's own DeepSeek initialization dialog. Complete or otherwise handle that step before the plugin presents “Connect Modellix”:
 
@@ -109,7 +111,7 @@ A fresh profile may first show Harness's own DeepSeek initialization dialog. Com
 6. Select **Modellix Design** at the far right of the session header to see all current-session results.
 7. Use Preview/JSON on successful cards, image enlargement, native video/audio players, **Add URL to chat**, and **Download**.
 
-The advanced exact-parameter editor remains internal but its entry is hidden in `0.2.1`. Routine UI flows do not display payment prompts; usage and details remain available in Modellix.
+The advanced exact-parameter editor remains internal but its entry is hidden in `0.3.0`. Routine UI flows do not display payment prompts; usage and details remain available in Modellix.
 
 ## 8. Use Modellix LLM models
 
@@ -137,9 +139,9 @@ After source changes:
 Set-Location 'D:\work\maas\githup\dsh-modellix'
 pnpm run verify:pack
 pnpm pack
-dsh plugin --profile web add .\dsh-modellix-0.2.1.tgz
+dsh plugin --profile web add .\dsh-modellix-0.3.0.tgz
 dsh --profile web --dump-config
-dsh --profile web --no-open
+dsh --profile web --no-open --port 3080 --trusted-host localhost:3080
 ```
 
 ## 11. Troubleshooting
@@ -149,8 +151,8 @@ dsh --profile web --no-open
 | A DeepSeek API Key dialog appears first | This is the fresh Harness profile's base initialization, not the Modellix dialog; complete it before configuring Modellix |
 | The CLI is logged in but the plugin still requests a Key | The CLI Keychain and Harness Credential service are separate; save it in the plugin UI or inject `MODELLIX_API_KEY` into the Harness process |
 | Modellix Design is missing | Inspect `--dump-config`, confirm Design is enabled, and fully restart the running profile after an update |
-| A task remains stale in assistant prose | Current status belongs to the live card and right panel; `0.2.1` updates the card in the background and avoids nonterminal status wording in ordinary prose |
-| One task shows two cards | This is not expected in `0.2.1`; record the job/tool call ids without Secrets and report a duplicate-card defect |
+| A task remains stale in assistant prose | Current status belongs to the live card and right panel; `0.3.0` updates the card in the background and avoids nonterminal status wording in ordinary prose |
+| One task shows two cards | This is not expected in `0.3.0`; record the job/tool call ids without Secrets and report a duplicate-card defect |
 | The UI reports an invalid Key | Only an explicit Modellix 401 enters this state; replace a local Credential in settings, or update an environment source and restart |
 | Balance is insufficient | A 402 is not treated as an invalid Key; fund the account or change the task before retrying manually |
 | Requests are rate-limited | Wait for the 429 window to end before retrying manually |

package/docs/en-US/RELEASE_CHECKLIST.md

@@ -1,6 +1,6 @@
 [English](RELEASE_CHECKLIST.md) | [简体中文](../zh-CN/RELEASE_CHECKLIST.md)
 
-# dsh-modellix 0.2.1 Release and Acceptance Checklist
+# dsh-modellix 0.3.0 Release and Acceptance Checklist
 
 Use this document for manual product acceptance and for the final release gate. Check each item against the exact package/commit being released.
 
@@ -23,7 +23,7 @@ Record before testing:
 
 | Item | Expected |
 | --- | --- |
-| Package | `dsh-modellix@0.2.1` |
+| Package | `dsh-modellix@0.3.0` |
 | Harness | `0.1.2-alpha.4` latest matrix plus `0.1.1-rc.2` compatibility matrix |
 | Development Node | `24.18.1` |
 | pnpm | `11.24.0` |
@@ -219,7 +219,7 @@ Create Secret-free files outside the repository:
 
 Both files must:
 
-- target `dsh-modellix@0.2.1`;
+- target `dsh-modellix@0.3.0`;
 - contain the exact lowercase 40-character Git HEAD;
 - use a canonical UTC ISO-8601 completion time no older than 72 hours;
 - have status `passed` for every required check;
@@ -244,10 +244,10 @@ After all checks pass:
 5. Read back:
 
 ```sh
-npm view dsh-modellix@0.2.1 version dist.integrity dist.shasum --json --registry=https://registry.npmjs.org/ --prefer-online
+npm view dsh-modellix@0.3.0 version dist.integrity dist.shasum --json --registry=https://registry.npmjs.org/ --prefer-online
 ```
 
-6. From an empty external directory and fresh npm cache, install `dsh-modellix@0.2.1`.
+6. From an empty external directory and fresh npm cache, install `dsh-modellix@0.3.0`.
 7. Verify the installed version and `dsh --profile <isolated> --dump-config`.
 8. Remove temporary npm config, cache, tarball, profile, evidence intermediates, and process variables.
 

package/docs/en-US/USER_GUIDE.md

@@ -2,7 +2,16 @@
 
 # dsh-modellix User Guide
 
-This guide describes the current `0.2.1` experience. Media creation is chat-first; there is no standalone Design tab. The right-side **Modellix Design** panel is a session-scoped result workspace.
+This guide describes the current `0.3.0` experience. Media creation is chat-first; there is no standalone Design tab. The right-side **Modellix Design** panel is a session-scoped result workspace.
+
+
+## What changed in 0.3.0
+
+- Task monitoring uses bounded server waits. Only a known task ID is observed, and stopping a wait never resubmits the paid generation.
+- Chat and result history stay responsive during a wait. Disabling Design, changing credentials, or closing the plugin cancels outstanding reads and prevents stale results from being saved.
+- Workspace uploads support the File API's image, video, and audio formats up to 16 MiB, with local file/container checks. Harness attachment uploads still use its image attachment reader. On quota errors, list files and explicitly delete only selected IDs through the File API or CLI; the plugin never deletes files automatically.
+- The server must support `wait=true`; an unsupported server produces a compatibility error instead of repeated short polling.
+
 
 ## 1. Install and verify
 
@@ -28,7 +37,7 @@ To use a local package artifact:
 pnpm install --frozen-lockfile
 pnpm run verify:release:static
 pnpm pack
-dsh plugin --profile web add ./dsh-modellix-0.2.1.tgz
+dsh plugin --profile web add ./dsh-modellix-0.3.0.tgz
 ```
 
 See [LOCAL_USAGE.md](LOCAL_USAGE.md) for isolated-profile setup and update commands.
@@ -80,7 +89,7 @@ It does not add a standalone Design tab.
 - Results and every card are expanded by default.
 - Select **Results** to collapse the whole list; select a card header to collapse only that card.
 - Select X to close. Keyboard focus returns to the launcher.
-- The advanced exact-parameter editor remains in the implementation but its entry is hidden for `0.2.1`.
+- The advanced exact-parameter editor remains in the implementation but its entry is hidden for `0.3.0`.
 
 ## 4. Create media by chatting
 
@@ -283,11 +292,11 @@ Keep the conversation open long enough for the Client watcher, verify the Creden
 
 ### Two cards represent one task
 
-This is not expected in `0.2.1`. Capture the two job ids and tool call ids without Secrets. The generation card should win the per-session task claim, and the matching result-query card should be suppressed.
+This is not expected in `0.3.0`. Capture the two job ids and tool call ids without Secrets. The generation card should win the per-session task claim, and the matching result-query card should be suppressed.
 
 ### Results from another conversation appear
 
-This is not expected for new `0.2.1` tasks. Record the affected session/task ids and report it as a session-isolation defect.
+This is not expected for new `0.3.0` tasks. Record the affected session/task ids and report it as a session-isolation defect.
 
 ### Media cannot play
 

package/docs/zh-CN/LOCAL_USAGE.md

@@ -42,7 +42,7 @@ pnpm run verify:pack
 pnpm pack
 ```
 
-完成后，仓库根目录会生成类似 `dsh-modellix-0.2.1.tgz` 的文件。不要直接把未构建的 TypeScript 源码交给 DSH 安装。
+完成后，仓库根目录会生成类似 `dsh-modellix-0.3.0.tgz` 的文件。不要直接把未构建的 TypeScript 源码交给 DSH 安装。
 
 ## 3. 创建独立的本地 Harness 环境
 
@@ -60,7 +60,7 @@ New-Item -ItemType Directory -Force -Path $env:DSH_HOME | Out-Null
 把刚生成的 tarball 安装到 `web` Profile：
 
 ```powershell
-dsh plugin --profile web add .\dsh-modellix-0.2.1.tgz
+dsh plugin --profile web add .\dsh-modellix-0.3.0.tgz
 dsh --profile web --dump-config
 ```
 
@@ -88,10 +88,12 @@ $env:MODELLIX_API_KEY = (Get-Content -LiteralPath 'D:\secrets\modellix-key.txt'
 ## 6. 启动本地 Web UI
 
 ```powershell
-dsh --profile web --no-open
+dsh --profile web --no-open --port 3080 --trusted-host localhost:3080
 ```
 
-终端会打印实际地址，例如 `http://127.0.0.1:3080`。用浏览器打开终端显示的地址，不要假定端口固定。
+当前受支持的 Harness 绑定值仅接受回环 IP 或全部网卡。保留默认的回环绑定，通过信任边界显式允许 `localhost:3080`，并打开 `http://localhost:3080/`；本地验收不要绑定全部网卡。
+
+终端会打印实际地址，例如 `http://localhost:3080`。用浏览器打开终端显示的地址，不要假定端口固定。
 
 全新 Profile 可能先显示 Harness 自带的 DeepSeek 初始化弹窗。完成或按需处理该步骤后，插件会显示“连接 Modellix”弹窗：
 
@@ -109,7 +111,7 @@ dsh --profile web --no-open
 6. 点击会话头部最右侧 **Modellix Design**，查看当前会话全部结果。
 7. 成功卡可用预览/JSON、图片放大、原生视频/音频播放器、**添加 URL 到对话框** 和 **下载**。
 
-高级精准参数编辑器继续保留，但 `0.2.1` 暂不显示入口。常规 UI 不显示付费提示；消耗与明细在 Modellix 查看。
+高级精准参数编辑器继续保留，但 `0.3.0` 暂不显示入口。常规 UI 不显示付费提示；消耗与明细在 Modellix 查看。
 
 ## 8. 使用 Modellix LLM
 
@@ -137,9 +139,9 @@ dsh --profile web --no-open
 Set-Location 'D:\work\maas\githup\dsh-modellix'
 pnpm run verify:pack
 pnpm pack
-dsh plugin --profile web add .\dsh-modellix-0.2.1.tgz
+dsh plugin --profile web add .\dsh-modellix-0.3.0.tgz
 dsh --profile web --dump-config
-dsh --profile web --no-open
+dsh --profile web --no-open --port 3080 --trusted-host localhost:3080
 ```
 
 ## 11. 常见问题
@@ -149,8 +151,8 @@ dsh --profile web --no-open
 | 先出现 DeepSeek API Key 弹窗 | 这是全新 Harness Profile 的基础初始化，不是 Modellix 弹窗；完成后继续配置 Modellix |
 | `modellix-cli` 已登录但插件仍要求 Key | CLI Keychain 与 Harness Credential 相互独立；在插件 UI 保存，或给 Harness 启动进程设置 `MODELLIX_API_KEY` |
 | 看不到 Modellix Design | 检查 `--dump-config`、确认 Design 已开启，并在更新后完整重启运行中的 Profile |
-| 助手正文里的状态看起来旧 | 当前状态属于实时卡片与右侧面板；`0.2.1` 后台更新卡片，并避免在普通正文写非终态 |
-| 一个任务显示两张卡 | `0.2.1` 不应出现；在不包含 Secret 的情况下记录 job/tool call id 并报告重复卡缺陷 |
+| 助手正文里的状态看起来旧 | 当前状态属于实时卡片与右侧面板；`0.3.0` 后台更新卡片，并避免在普通正文写非终态 |
+| 一个任务显示两张卡 | `0.3.0` 不应出现；在不包含 Secret 的情况下记录 job/tool call id 并报告重复卡缺陷 |
 | 页面提示 Key 无效 | 只有 Modellix 明确返回 401 才会进入该状态；本地 Credential 可在设置中更换，环境来源需在外部更新并重启 |
 | 余额不足 | 402 不会被误报为 Key 无效；充值或调整任务后手动重试 |
 | 请求过多 | 等待 429 限流窗口结束后再手动重试 |

package/docs/zh-CN/RELEASE_CHECKLIST.md

@@ -1,6 +1,6 @@
 [English](../en-US/RELEASE_CHECKLIST.md) | [简体中文](RELEASE_CHECKLIST.md)
 
-# dsh-modellix 0.2.1 发布与验收清单
+# dsh-modellix 0.3.0 发布与验收清单
 
 本文用于人工产品验收和最终发布门禁。每一项都必须针对即将发布的准确包版本与 commit 检查。
 
@@ -23,7 +23,7 @@
 
 | 项目 | 预期 |
 | --- | --- |
-| 包 | `dsh-modellix@0.2.1` |
+| 包 | `dsh-modellix@0.3.0` |
 | Harness | `0.1.2-alpha.4` 最新矩阵，并兼容验证 `0.1.1-rc.2` |
 | 开发 Node | `24.18.1` |
 | pnpm | `11.24.0` |
@@ -219,7 +219,7 @@ pnpm run test:real:modellix
 
 两个文件必须：
 
-- 指向 `dsh-modellix@0.2.1`；
+- 指向 `dsh-modellix@0.3.0`；
 - 包含准确的 40 位小写 Git HEAD；
 - 使用不早于 72 小时的规范 UTC ISO-8601 时间；
 - 所有必填 check 均为 `passed`；
@@ -244,10 +244,10 @@ pnpm run verify:release
 5. 回读：
 
 ```sh
-npm view dsh-modellix@0.2.1 version dist.integrity dist.shasum --json --registry=https://registry.npmjs.org/ --prefer-online
+npm view dsh-modellix@0.3.0 version dist.integrity dist.shasum --json --registry=https://registry.npmjs.org/ --prefer-online
 ```
 
-6. 在仓库外空目录和全新 npm cache 中安装 `dsh-modellix@0.2.1`。
+6. 在仓库外空目录和全新 npm cache 中安装 `dsh-modellix@0.3.0`。
 7. 检查实际落盘版本和 `dsh --profile <isolated> --dump-config`。
 8. 删除临时 npm 配置、cache、tarball、profile、Evidence 中间文件和进程变量。
 

package/docs/zh-CN/USER_GUIDE.md

@@ -2,7 +2,16 @@
 
 # dsh-modellix 用户指南
 
-本文说明 `0.2.1` 的当前体验。媒体创作以对话为主，不再存在独立 Design Tab；右侧 **Modellix Design** 是按会话隔离的结果工作区。
+本文说明 `0.3.0` 的当前体验。媒体创作以对话为主，不再存在独立 Design Tab；右侧 **Modellix Design** 是按会话隔离的结果工作区。
+
+
+## 0.3.0 的主要变化
+
+- 任务监控改为有界服务端等待，只观察已知任务 ID；停止等待不会重新提交计费生成。
+- 等待期间 Chat 与结果历史保持响应。关闭 Design、更换凭据或关闭插件时会取消未完成的读取，并阻止旧结果写入。
+- 工作区上传支持 File API 的图片、视频和音频格式，单文件上限 16 MiB，并校验本地文件与容器。Harness 附件仍使用其图片读取接口。配额不足时，通过 File API 或 CLI 列出文件并明确删除选中的 ID；插件不会自动清理文件。
+- 服务端需要支持 `wait=true`；不支持时会明确提示兼容性错误，不会回退为反复短轮询。
+
 
 ## 1. 安装与检查
 
@@ -28,7 +37,7 @@ dsh --profile web
 pnpm install --frozen-lockfile
 pnpm run verify:release:static
 pnpm pack
-dsh plugin --profile web add ./dsh-modellix-0.2.1.tgz
+dsh plugin --profile web add ./dsh-modellix-0.3.0.tgz
 ```
 
 独立 Profile 与更新命令见 [LOCAL_USAGE.md](LOCAL_USAGE.md)。
@@ -80,7 +89,7 @@ dsh plugin --profile web add ./dsh-modellix-0.2.1.tgz
 - 结果列表和每张卡片默认展开。
 - 点击 **结果** 收起整个列表；点击卡片头部只收起该卡片。
 - 点击 X 关闭，键盘焦点回到入口。
-- 高级精准参数编辑器保留在实现中，但 `0.2.1` 隐藏入口。
+- 高级精准参数编辑器保留在实现中，但 `0.3.0` 隐藏入口。
 
 ## 4. 通过对话创建媒体
 
@@ -283,11 +292,11 @@ Provider 使用 OpenAI 兼容接口，重试次数为 `0`；目录不可用时
 
 ### 同一任务出现两张卡
 
-`0.2.1` 不应出现。请在不包含 Secret 的情况下记录两张卡的 job id 和 tool call id。生成卡应赢得当前会话的任务展示权，匹配的结果查询卡应被抑制。
+`0.3.0` 不应出现。请在不包含 Secret 的情况下记录两张卡的 job id 和 tool call id。生成卡应赢得当前会话的任务展示权，匹配的结果查询卡应被抑制。
 
 ### 显示其他会话结果
 
-新建 `0.2.1` 任务不应出现。请记录受影响的 session/task id，并按会话隔离缺陷报告。
+新建 `0.3.0` 任务不应出现。请记录受影响的 session/task id，并按会话隔离缺陷报告。
 
 ### 媒体不能播放
 

package/lib/client.js

@@ -800,6 +800,19 @@ var SettingsController = class extends ResourceController {
 	load(signal) {
 		return this.perform("load", () => this.#rpc.settings(signal));
 	}
+	async refresh(signal) {
+		const previous = this.store.getSnapshot();
+		if (previous.data === null) return this.load(signal);
+		if (previous.pending !== null) return false;
+		try {
+			const data = await this.#rpc.settings(signal);
+			if (this.store.getSnapshot() !== previous) return false;
+			this.publishData(data);
+			return true;
+		} catch {
+			return false;
+		}
+	}
 	saveOnboarding(apiKey, services, expectedCredentialEpoch, signal) {
 		return this.perform("save-onboarding", () => this.#rpc.saveOnboarding(apiKey, services, expectedCredentialEpoch, signal));
 	}
@@ -969,10 +982,14 @@ function useExternalDialogGate(requestedOpen, externalDialogOwner) {
 }
 /** Adds the focus behavior intentionally absent from the public Modal primitive. */
 function useDialogA11y(options) {
-	const { open, container, externalDialogOwner, initialFocusSelector, mandatory, onEscape } = options;
+	const { open, requestedOpen = open, container, externalDialogOwner, initialFocusSelector, mandatory, onEscape } = options;
 	const onEscapeRef = (0, react.useRef)(onEscape);
 	const restoreTargetRef = (0, react.useRef)(null);
 	onEscapeRef.current = onEscape;
+	(0, react.useEffect)(() => {
+		if (!requestedOpen || typeof document === "undefined") return;
+		restoreTargetRef.current ??= document.activeElement instanceof HTMLElement ? document.activeElement : null;
+	}, [requestedOpen]);
 	(0, react.useEffect)(() => {
 		if (!open || typeof document === "undefined") return;
 		const activeBeforeOpen = document.activeElement instanceof HTMLElement ? document.activeElement : null;
@@ -1306,6 +1323,7 @@ function CredentialModal(props) {
 	}, [clear, onCancel]);
 	useDialogA11y({
 		open: surfaceOpen,
+		requestedOpen: open,
 		container: contentRef,
 		externalDialogOwner,
 		initialFocusSelector: "[data-mdlx-initial-focus]",
@@ -1786,16 +1804,20 @@ function CredentialRecoveryOverlay({ controller, t }) {
 		recoveryToken
 	]);
 	(0, react.useEffect)(() => {
-		if (recoveryPresented) return;
+		if (recoveryPresented || dialog.activeOwner !== null) return;
 		const refresh = () => {
 			const current = controller.store.getSnapshot();
 			if (current.pending !== null || current.status === "loading") return;
-			controller.load();
+			controller.refresh();
 		};
 		refresh();
 		const timer = window.setInterval(refresh, RECOVERY_REFRESH_MS);
 		return () => window.clearInterval(timer);
-	}, [controller, recoveryPresented]);
+	}, [
+		controller,
+		dialog.activeOwner,
+		recoveryPresented
+	]);
 	(0, react.useEffect)(() => () => dialogCoordinator.release(RECOVERY_CREDENTIAL_DIALOG_OWNER), [dialogCoordinator]);
 	const dismiss = (0, react.useCallback)(() => {
 		dialogCoordinator.dismissCredential(RECOVERY_CREDENTIAL_DIALOG_OWNER);