@sqdr2/dsh-fusion 0.3.2 → 0.3.3

package/CHANGELOG.md

@@ -0,0 +1,148 @@
+# Changelog
+
+Release notes for `@sqdr2/dsh-fusion`. Newest first.
+
+## Origin
+
+This package is a fork of [`aa2246740/dsh-model-fusion`](https://github.com/aa2246740/dsh-model-fusion). 0.3.0 is the
+first release published under this name, and it branches from upstream 0.2.9. Upstream 0.2.10 and 0.2.11 landed after
+that point and are **not** included here.
+
+Earlier versions — `dsh-model-fusion` 0.2.0 through 0.2.11, and the pre-0.3.0 tags in this repository's history — were
+not published as `@sqdr2/dsh-fusion`, so they are not listed here. Their notes live in the upstream repository, under its
+own tags and releases.
+
+Entry format: what changed, then what was actually validated. "Not claimed" lines mark what a release did *not* test —
+read them before assuming a platform is covered.
+
+## 0.3.3 — 2026-11-07
+
+### Changes
+
+- The combo list selects from the whole row, and no longer paints a black pill inside it. Only the name and route text
+  was a button, so the row's padding and the empty space beside the text ignored clicks; and the generic
+  `.fusion-settings button` fill (`--dsw-alias-button-primary-fill`, which is `#0f1115` in the light theme) outranked the
+  row's `background:none`, so the one clickable strip rendered as a black capsule. The row is now `padding:0` with the
+  button spanning its full width up to the Delete button (89% of the row in a headless-Chrome measurement), the button
+  keeps `background:none`, and Delete keeps its own hit area and stops its click from selecting. A radio-style marker,
+  a hover surface and a brand-tinted selected state carry the selection instead of the fill.
+- The composer names the permission of the model working now. Fusion pins the conversation (Lead) session to
+  `read-only`, and that pair matches no configured preset, so the native permission control read `Custom` for the whole
+  task. A Fusion chip in the composer tool row shows `Lead · Read Only` / `Sidekick · Full access` and follows the role
+  that is running; `FusionStatus.task.permissions` carries the per-role modes (`lead`, `worker`) and `active` role, read
+  from the recorded role intent, the in-flight request and the phase. The native control keeps its slot, its selection
+  state and its meaning: it still sets the Sidekick's mode.
+- Fusion is no longer limited to one saved pair. The sidebar panel now manages a list of combos (add, rename, delete),
+  and **each combo is its own entry in the native model menu** (`Fusion · <name>`), so several conversations can run
+  different Lead/Sidekick pairs at the same time.
+- Each combo advertises its own Lead's input modalities and freezes its own profile, so a conversation keeps the pair it
+  selected even after the list is edited, reordered or a combo is deleted. Picking another combo inside a conversation
+  drains the current task and starts a new one, exactly like leaving Fusion.
+- Up to 6 combos. The first combo keeps the historical model id `auto`, and a pre-combo `settings:profile` is migrated
+  into it (named "自动") on read, so durable selections, frozen bindings and deploy-time profile files keep working. The
+  first combo is still mirrored into `settings:profile` for an older tab or a downgrade.
+- An existing tab running the previous bundle can still save: it sends one pair and edits the first combo, leaving the
+  others alone.
+- The switch-notice filter now recognizes every combo id, including the bare `auto → pair-xxxxxxxx` form the native menu
+  emits when two combos of this provider replace each other.
+
+### Build
+
+- `pnpm build` no longer requires a harness checkout with `tools/dshx`. It still uses that harness-owned builder when
+  `DSHX_HARNESS` provides it, and otherwise emits the same two artifacts with a local `esbuild` pass (now a
+  devDependency): `lib/dsh-fusion.js` as plain ESM with every package external, `lib/client.js` as the CommonJS body the
+  Harness module loader expects.
+
+### Validation
+
+- `pnpm test` (53 files, 397 tests: 395 passed, 1 skipped, 1 failed), `tsc -p tsconfig.json --noEmit`. The native Host
+  suite was last run at 263 passed / 1 skipped and was not re-run for this change: nothing outside the client bundle
+  moved. The one failing case is `tests/check-programs.spec.ts`, whose probe returns `undefined` on this Windows host
+  both before and after the change, so it is not counted as a regression.
+- Rebuilt `lib/` and loaded both artifacts in Node: the Host module exports `apply`/`Config`/`name`, and the client
+  bundle registers under `@sqdr2/dsh-fusion` and still exports `apply`/`inject`/`name`/`FUSION_PANEL_ID`/`FusionPanelIcon`.
+- New `tests/pairs.spec.ts` (migration, id assignment, name/limit validation, compare-and-swap, per-combo profile
+  identity) and `tests/fusion-combos.spec.ts` (list/rename/add/delete and whole-list save payload).
+- The combo row hit area: a new `tests/fusion-combos.spec.ts` case asserts the row carries no padding, the selection
+  button owns it (`flex:1 1 auto`, `padding:11px 12px`, `background:none`), the row switches selection from the row body,
+  and Delete removes its own row without changing which combo is selected. The same markup and CSS were rendered in
+  headless Chrome and hit-tested with `elementFromPoint`: the left edge, the marker, the text and the empty space right
+  of it all resolve to the selection button, the right edge resolves to Delete, and the selection button covers 89% of
+  the row width.
+- The permission chip: new `tests/status.spec.ts` cases (role modes, the takeover exception and the released
+  conversation) and `tests/fusion-permission.spec.ts` (both roles, the Custom explanation, silence outside a
+  role-separated task, the fast poll, and the additive registration that never takes the native permission slot).
+
+## 0.3.2 — 2026-11-05
+
+Verification release. No runtime behaviour changed from 0.3.0, and the package is identical to it apart from the version
+field.
+
+0.3.1 was meant to be this release, but its CI run failed before publishing: `tests/status-index.spec.ts` timed out at
+5000ms while finishing in a fraction of a second locally. The fixture built 600 rows with one autocommit each, which a
+CI runner's disk cannot absorb inside a limit meant for unit tests. Those fixtures now use a single transaction, and the
+two tests that migrate and backfill a real database declare a 60s budget.
+
+## 0.3.1 — 2026-11-05
+
+Verification release. No runtime behaviour changed from 0.3.0, and the package is byte-identical to it apart from the
+version field.
+
+0.3.0 was published by hand with a granular token, before this repository could publish from CI: Actions are disabled by
+default on forks, and a trusted publisher can only be added to a package that already exists. Both are now in place, so
+0.3.1 exists to prove the OIDC path end to end — the tag-push workflow builds, tests and publishes without any stored
+token, and the result carries a provenance attestation naming the commit it was built from.
+
+## 0.3.0 — 2026-11-05
+
+First release under the name `@sqdr2/dsh-fusion`, branching from upstream `dsh-model-fusion` 0.2.9. Everything 0.2.9
+does is still here; the changes below are the fork's.
+
+The package was renamed, so install `@sqdr2/dsh-fusion` once — an installed `dsh-model-fusion` is not upgraded in place.
+The plugin id stays `dsh-fusion`, so the rename moves code only, not data.
+
+### Changes
+
+- The Fusion entry moved from **Settings → Fusion** to its own left-sidebar panel, and the panel body scrolls inside the
+  main slot instead of clipping the form and history table on a short window.
+- A role on a bridge route (`antigravity`, i.e. `dsh-agy-worker` / `dsh-agy-link`) can now reach the Host tools. That
+  route may only report a step as `agy_tool`, which the role ceiling never carried, so a delegation degraded to prose and
+  the Host reported `WORKER_TOOLS_UNREACHABLE`. The transport is unioned into the ceiling when this Host registers it,
+  for the Lead as well as the Sidekick. Full diagnosis: [docs/WORKER-TOOLS-UNREACHABLE.md](docs/WORKER-TOOLS-UNREACHABLE.md).
+- A bridged Sidekick can now bind its brief and report back. Such a route runs the call in its own loop under a
+  bridge-local id, so `fusion_submit_result` was refused as "Worker tool requires a complete native model request" and
+  the task stalled. A bridged call is accepted for the message that emitted the transport; the native path is unchanged
+  and still preferred.
+- A task whose Sidekick route cannot reach the tools at all has an exit: the verdict is recorded on the runtime record,
+  `fusion_wait` re-reports it, and `fusion_delegate` may replace the dead order instead of leaving the task in
+  `WORKER_RUNNING` with no way out.
+- A frozen scope no longer deadlocks a task. A glob such as `allowedPaths: ['lib/types/**']` matched nothing, widening
+  was refused because the files it wanted to record already differed, and the scope could not be cleared. Globs match,
+  widening is compared against the delegation base, and the scope can be cleared explicitly.
+- History records can be deleted again. Deletion now asks the coordinator, which is the only authority that sees live
+  Agents, tool calls, jobs and write leases, so a replaced process no longer leaves an undeletable `running` task and a
+  live task is no longer deleted out from under itself. A 409 names the resource that held it.
+- Usage, the task list, cache keepalive and history are each a collapsible box, collapsed by default, so the model pair
+  stays above the fold.
+
+### Compatibility after the rename
+
+- Message source kinds are read under both spellings (`plugin:dsh-fusion`, `plugin:dsh-model-fusion`) and written only
+  under the new one. Recorded history is never rewritten.
+- A session that selected Fusion before the rename stored `dsh-model-fusion/auto`; it is rewritten to `dsh-fusion/auto`
+  when the plugin installs its selection, so the next turn dispatches under a registered provider.
+- `$DSH_HOME/plugins/dsh-model-fusion/` is migrated to `$DSH_HOME/plugins/dsh-fusion/` on first start, with a copy
+  fallback across filesystems that removes only the files it copied.
+- Durable write leases are adopted the same way, and a lock written under the old name still blocks a new writer rather
+  than being taken over.
+- The panel's HTTP routes are now `/api/fusion`; `/api/model-fusion` stays registered for a browser tab still holding the
+  previous client bundle.
+
+### Validation
+
+Type checking passes, all 379 unit tests pass, and `lib/` was rebuilt from the tagged source. The native Host suite passes
+263 tests with one Windows-only test skipped, on the pinned Host checkout. No model calls were made for this release, and
+the plugin is not installed or activated in a running Host by this preparation.
+
+Install with `dsh plugin --profile web add @sqdr2/dsh-fusion`, or `github:SQDR2/dsh-fusion` from the repository, which
+ships the built `lib/`. See [INSTALL.md](INSTALL.md) / [INSTALL.zh.md](INSTALL.zh.md).

package/README.en.md

@@ -1,6 +1,6 @@
 # Fusion · a DSH plugin
 
-[中文](README.md) · [Install](INSTALL.md) · [安装](INSTALL.zh.md)
+[中文](README.md) · [Install](INSTALL.md) · [安装](INSTALL.zh.md) · [Changelog](CHANGELOG.md)
 
 > **This repository is a fork of [`aa2246740/dsh-model-fusion`](https://github.com/aa2246740/dsh-model-fusion), published as `@sqdr2/dsh-fusion`.**
 > Every upstream capability, algorithm and measurement is kept. This fork does three things: it moves the entry from
@@ -8,7 +8,7 @@
 > ([`dsh-agy-worker`](https://github.com/SQDR2/dsh-agy-worker)) work as a Sidekick, and it removes a few ways a frozen
 > scope or a stale task record could dead-end a run. See [What this fork changes](#what-this-fork-changes).
 
-In DeepSeek Harness (DSH), Fusion is one entry in the model menu: **Fusion · auto**. Behind it are two models you choose:
+In DeepSeek Harness (DSH), Fusion is an ordinary model in the menu: **save N combos and the menu shows N entries** (**Fusion · combo name**). Behind each one are two models you choose:
 
 - **Lead**: a strong frontier model. It reads the request and the code, briefs the work and reviews the result.
 - **Sidekick**: a much cheaper model. It edits code, runs commands and runs tests.
@@ -51,8 +51,10 @@ After contaminated attempts were excluded, four tasks were clean in every condit
 ## Use
 
 1. Install the plugin ([INSTALL.md](INSTALL.md)).
-2. Open the **Fusion** entry in the left sidebar (default below Memory System) and choose a Lead and a Sidekick. Any model you are signed in to in DSH works.
-3. Select **Fusion · auto** in the model menu and work as usual.
+2. Open the **Fusion** entry in the left sidebar (default below Memory System), name the combo, and choose a Lead and a Sidekick. Any model you are signed in to in DSH works.
+3. Select that combo (**Fusion · name**) in the model menu and work as usual.
+
+**Several combos can coexist** (up to 6): for example a cheap "fast" one and a strong "thorough" one, each its own model-menu entry. With several conversations open, each one can pick a different combo — a conversation freezes the combo it selected, so later edits or other conversations never change it. A pre-combo installation is migrated into one combo named "自动" whose model id stays `auto`, so existing conversations keep working.
 
 **Pairing:** Fusion saves money because the Sidekick costs far less than the Lead. Pick a strong frontier Lead and a Sidekick that is much cheaper (ideally 5× or more). The closer their prices, the smaller the saving.
 
@@ -70,6 +72,7 @@ After contaminated attempts were excluded, four tasks were clean in every condit
 - **The Lead does not write code.** The program enforces this, not the prompt:
   - the Lead has no file-writing tools;
   - its shell commands run in DSH's read-only sandbox.
+- **The permission shown in the composer.** Fusion separates permissions by role and pins the Lead's session to read-only, and "read-only plus your approval policy" usually matches no configured preset, so the native permission control reads `Custom` once a task is dispatched. Fusion's own chip in the composer tool row names the role working right now and its permission: `Lead · Read Only` / `Sidekick · Full access`. That control still sets the Sidekick's permission: change it and the Sidekick's next step uses that mode while the Lead stays read-only. If you would rather the native control read a name instead of `Custom`, add a preset to your profile's `presets` with `sandbox: read-only` and `approval: never` — pure configuration, this plugin does not depend on it.
 - **The only exception is a takeover the Host unlocks when the Sidekick demonstrably cannot finish.** For example: checks still failing after 2 rework rounds, or the Sidekick hit its step limit or kept stalling. During a takeover:
   - the Lead may only change the files the task allows;
   - its work must pass the same acceptance;

package/README.md

@@ -1,13 +1,13 @@
 # Fusion · DSH 插件
 
-[English](README.en.md) · [安装](INSTALL.zh.md) · [Install (English)](INSTALL.md)
+[English](README.en.md) · [安装](INSTALL.zh.md) · [Install (English)](INSTALL.md) · [更新日志](CHANGELOG.md)
 
 > **本仓库是 [`aa2246740/dsh-model-fusion`](https://github.com/aa2246740/dsh-model-fusion) 的 fork，包名 `@sqdr2/dsh-fusion`。**
 > 上游的能力、算法和实测数据全部保留；本 fork 专注于三件事：把入口从「设置」搬到左侧边栏、
 > 让 agy 线路（[`dsh-agy-worker`](https://github.com/SQDR2/dsh-agy-worker)）真的能当 Sidekick、
 > 以及修掉冻结范围与任务记录上几个会卡住流程的问题。改动清单见 [本 fork 做了什么](#本-fork-做了什么)。
 
-Fusion 在 DeepSeek Harness（DSH）的模型菜单里是一个普通模型：**Fusion · 自动**。背后是两个你自己选的模型：
+Fusion 在 DeepSeek Harness（DSH）的模型菜单里就是一个普通模型：**你保存几个组合，菜单里就有几项**（**Fusion · 组合名称**）。每个组合背后是两个你自己选的模型：
 
 - **Lead**：一个强的前沿模型。负责理解需求、看代码、写任务说明、审查结果。
 - **Sidekick**：一个便宜得多的模型。负责实际改代码、跑命令、跑测试。
@@ -48,8 +48,10 @@ Fusion 在 DeepSeek Harness（DSH）的模型菜单里是一个普通模型：**
 ## 怎么用
 
 1. 按 [安装说明](INSTALL.zh.md) 装好插件。
-2. 打开左侧边栏的 **Fusion** 入口（默认位于记忆系统下方），选择 Lead 和 Sidekick。可以选 DSH 里任何已登录的模型。
-3. 在模型菜单里选择 **Fusion · 自动**，像平时一样对话。
+2. 打开左侧边栏的 **Fusion** 入口（默认位于记忆系统下方），给组合起个名字，选择 Lead 和 Sidekick。可以选 DSH 里任何已登录的模型。
+3. 在模型菜单里选择这个组合（显示为 **Fusion · 组合名称**），像平时一样对话。
+
+**多个组合可以同时存在**（最多 6 个）：例如「快」用便宜模型、「稳」用强模型，分别作为模型菜单里的两项。同时开多个会话时，每个会话可以选不同的组合——选中的会话会冻结当时的组合，之后改设置或换别的会话都不影响它。旧版只有一个组合时保存的配置会自动迁移成名为「自动」的组合，模型 ID 仍是 `auto`，已有会话照常继续。
 
 **搭配建议：** 省钱靠的是 Sidekick 比 Lead 便宜得多。选一个强的前沿模型当 Lead，再选一个价格低很多（最好 5 倍以上）的模型当 Sidekick。两者价格越接近，越省不了钱。
 
@@ -67,6 +69,7 @@ Fusion 在 DeepSeek Harness（DSH）的模型菜单里是一个普通模型：**
 - **Lead 不写代码**：这不是靠提示词约束，而是由程序保证的：
   - Lead 没有写文件的工具；
   - 它执行的 shell 命令跑在 DSH 的只读沙盒里。
+- **输入框里的权限**：Fusion 按角色分离权限，Lead 的会话被固定在只读，而"只读 + 你的确认策略"这个组合通常匹配不上任何已配置预设，所以下发任务后「权限」控件会显示 `Custom`。工具行里 Fusion 自己的标签随时显示**当前在干活的角色**及其权限：`Lead · 仅可查看` / `Sidekick · 完全权限`。那个控件本身仍然决定 Sidekick 的权限：在那里换一项，Sidekick 下一轮就用那一项，Lead 仍然只读。如果你更希望原生控件也不显示 `Custom`，在你 profile 的 `presets` 里加一条 `sandbox: read-only` + `approval: never` 的预设即可（纯配置，本插件不依赖它）。
 - **唯一的例外：程序判定 Sidekick 确实做不完时，才解锁 Lead 接手。** 例如 2 轮返工后检查仍然失败，或者 Sidekick 用完了步数、反复卡住。接手时：
   - Lead 只能改任务允许的文件；
   - 必须通过同样的验收；

package/RELEASING.md

@@ -72,12 +72,13 @@ action`. This step is browser-only by design.
 first step.
 
 ```sh
-# 1. Bump the version in package.json (and nowhere else).
+# 1. Bump the version in package.json (and nowhere else), and add the entry at
+#    the top of CHANGELOG.md. That section becomes the GitHub release body.
 # 2. Rebuild lib/ — it is tracked in git and shipped in the tarball, so a stale
 #    lib/ publishes code that does not match the tagged source.
 DSHX_HARNESS=/path/to/deepseek-harness-0.2.0-rc.2 pnpm build
 pnpm typecheck && pnpm test
-# 3. Commit the source and the rebuilt lib/ together.
+# 3. Commit the source, the rebuilt lib/ and CHANGELOG.md together.
 git add -A && git commit -m "chore(release): 0.3.1"
 # 4. Tag and push both.
 git tag v0.3.1 && git push origin main v0.3.1
@@ -86,6 +87,11 @@ git tag v0.3.1 && git push origin main v0.3.1
 The workflow then runs `pnpm install`, `pnpm build`, `pnpm test` and, on a tag, `npm publish --access public`.
 A published version also gets a provenance attestation, so `npm view` can point at the commit it was built from.
 
+[`CHANGELOG.md`](CHANGELOG.md) is the only place release notes live. Do not add a `RELEASE-*.md` per version: a
+directory of near-identical files that nothing links to stops being readable within a few releases, and the notes belong
+under one version heading each. It lists only versions published as `@sqdr2/dsh-fusion`; upstream `dsh-model-fusion`
+history stays in the upstream repository.
+
 ### Two things the build is pinned to
 
 `scripts/build.mjs` accepts only the Host versions in `engines.dsh` (`0.2.0-rc.2` and `0.2.1-rc.2`) and fails

package/RELEASING.zh.md

@@ -64,12 +64,13 @@ npm CLI 建不了信任配置：`npm trust github` 需要交互式 2FA 凭据，
 版本号的唯一真源是 `package.json`。tag 必须与它完全一致，否则 workflow 会在第一步退出。
 
 ```sh
-# 1. 改 package.json 里的版本号（别处不要改）。
+# 1. 改 package.json 里的版本号（别处不要改），并在 CHANGELOG.md 顶部加一条。
+#    这一节就是 GitHub Release 的正文。
 # 2. 重建 lib/ —— 它纳入版本库并随包发布，lib/ 陈旧等于发布了
 #    与 tag 源码不一致的代码。
 DSHX_HARNESS=/path/to/deepseek-harness-0.2.0-rc.2 pnpm build
 pnpm typecheck && pnpm test
-# 3. 源码和重建后的 lib/ 一起提交。
+# 3. 源码、重建后的 lib/ 和 CHANGELOG.md 一起提交。
 git add -A && git commit -m "chore(release): 0.3.1"
 # 4. 打 tag 并一起推。
 git tag v0.3.1 && git push origin main v0.3.1
@@ -78,6 +79,10 @@ git tag v0.3.1 && git push origin main v0.3.1
 workflow 随后依次执行 `pnpm install`、`pnpm build`、`pnpm test`，在 tag 上再执行 `npm publish --access public`。
 发布出来的版本还带 provenance 证明，可以用 `npm view` 追溯它是从哪个 commit 构建的。
 
+发布说明只有 [`CHANGELOG.md`](CHANGELOG.md) 一处。不要再每个版本加一个 `RELEASE-*.md`：
+一堆无人引用、名字几乎相同的文件，几个版本之后就没法读了；同一个版本的内容应该按版本标题归在这一个文件里。
+它只列以 `@sqdr2/dsh-fusion` 名义发过的版本；上游 `dsh-model-fusion` 的历史留在上游仓库。
+
 ### 构建被钉死的两处
 
 `scripts/build.mjs` 只接受 `engines.dsh` 里列出的 Host 版本（`0.2.0-rc.2` 和 `0.2.1-rc.2`），其余直接报错。

package/dshx.yml

@@ -8,6 +8,9 @@ hotReload:
     - src/dsh-fusion.ts
     - src/host/coordinator.ts
     - src/host/settings.ts
+    - src/host/pairs.ts
+    - src/host/native-selection.ts
+    - src/identity.ts
     - src/host/status.ts
     - src/host/native-scopes.ts
     - src/host/native-worker.ts