dsh-quick-actions 0.2.0-rc.1 → 0.2.0-rc.2

package/README.en.md

@@ -9,7 +9,7 @@ Preset Quick Actions ship with the package and are read-only — you can hide or
 ## What it does
 
 - **Send Actions**: load a piece of static text into the draft and submit it through the official path. There is exactly one loading path, `setDraft(text)` → `submit()`.
-- **Three layouts**: a ribbon above the input, a bar inside it, or a single launcher opening a searchable panel. Switch at any time.
+- **Three layouts**: a ribbon above the input, a bar under it, or a single launcher opening a searchable panel. Switch at any time.
 - **Per-action send confirmation**, on by default and yours to change.
 - **Text starting with `/` is a valid Command Send Action**, adjudicated by DSH itself.
 - Presets and customs are capped at **50 combined**. At the cap, adding and cloning stop; if an upgrade or a config change pushes existing state past it, **no data is lost** — adding and cloning are simply refused until you are back under it.
@@ -54,7 +54,7 @@ Then restart the web profile. One package is the whole thing: it carries `dsh.bu
 ```sh
 mkdir -p /tmp/quick-actions
 pnpm --filter dsh-quick-actions pack --pack-destination /tmp/quick-actions
-dsh plugin --profile web add /tmp/quick-actions/dsh-quick-actions-0.2.0-rc.1.tgz
+dsh plugin --profile web add /tmp/quick-actions/dsh-quick-actions-0.2.0-rc.2.tgz
 ```
 
 The `--filter` form works from anywhere in the repository; from the package directory itself, `pnpm pack --pack-destination /tmp/quick-actions` is the same thing.
@@ -123,6 +123,7 @@ Field rules:
 - `label` and `text` are required; `icon` and `confirm` are optional, and `confirm` defaults to `true`.
 - An invalid preset (a missing field, a duplicate `id`, a catalog over 50 entries) makes **plugin loading fail loudly** and lists every problem at once, rather than truncating silently.
 - `presets` sits under the same row's `config` as your action data (see "Settings paths" below), and this plugin never writes it. It is a DSH volatile field: editing it while the profile runs reaches the Quick Actions immediately; an invalid catalog written that way shows a catalog error in the Quick Actions area, and the next profile restart fails plugin loading with the list of problems.
+- **Declare them in the active profile's own `cordis.patch.yml` only.** Do not put this plugin's `config` in the home patch (`<DSH_HOME>/cordis.patch.yml`) or a `dsh --patch` overlay: DSH replaces a patch row's `config` whole, so that layer hides the action data stored on this row (the UI falls back to defaults; the data on disk is still there), and DSH refuses every save from then on — the UI reports the save as refused, and retrying never succeeds. Remove this plugin's row from that layer and restart the profile to recover.
 
 Users can hide or clone a preset but never edit or delete it; a clone becomes an ordinary Custom Quick Action.
 
@@ -133,7 +134,7 @@ Layout is a global persisted setting, switched in the management panel:
 | Value | Name | Where |
 |---|---|---|
 | `ribbon` (default) | Action ribbon | One row above the input, matching its width |
-| `bar` | Action bar | One row inside the input; whatever does not fit folds into "more" |
+| `bar` | Action bar | One row under the input, beside DSH's own usage info, as wide as its content and at most as wide as the input card; whatever does not fit folds into "more" |
 | `launcher` | Single launcher | One entry button opening a searchable panel |
 
 `bar` and `launcher` share the same searchable panel, and the search matches labels and texts only. The management panel is where you reorder, hide, restore and clone presets, create, edit, enable and delete custom actions, and switch layout.
@@ -193,7 +194,7 @@ Cross-version data compatibility is the Host's job: new presets are appended to
 dsh plugin --profile web remove dsh-quick-actions
 ```
 
-Both the dependency and the layer in `dsh.profile.bundles` go away. After a profile restart the actions are gone. The `id: composer-quick-actions` row in `cordis.patch.yml` stays as it is — your actions live in its `config`, and a reinstall picks the row back up by id, so they come back. If you uninstall without reinstalling, the profile logs a `patch: entry "composer-quick-actions" not found` warning for that row on every start; it does not block startup, and step 1 below removes it.
+Both the dependency and the layer in `dsh.profile.bundles` go away. After a profile restart the actions are gone. The `id: composer-quick-actions` row in `cordis.patch.yml` stays as it is — your actions live in its `config`, and a reinstall picks the row back up by id, so they come back. If you uninstall without reinstalling, that row is left addressing nothing: it does not block startup, `dsh --profile web --dump-config` reports it as `patch: entry "composer-quick-actions" not found`, and step 1 below removes it.
 
 **Full manual cleanup** (uninstalling does none of this, because a reinstall should restore your actions):
 

package/README.md

@@ -9,7 +9,7 @@
 ## 能做什么
 
 - **发送动作**：把一段静态文本装载进草稿并按官方路径提交，装载路径只有一条 `setDraft(text)` → `submit()`。
-- **三种布局**：输入框上方的动作带、输入框内的操作栏、单入口的可搜索面板，随时切换。
+- **三种布局**：输入框上方的动作带、输入框下方的操作栏、单入口的可搜索面板，随时切换。
 - **每个动作可单独设置发送确认**，默认开启，之后由你决定。
 - **`/` 开头的文本是合法的命令发送动作**，交给 DSH 官方裁决。
 - 预置与自定义**合计上限 50 个**。达到上限后不能再新增或克隆；若升级或配置变化把既有状态推过上限，**已有数据一个都不会丢**，只是在回到上限以内之前禁止新增和克隆。
@@ -54,7 +54,7 @@ dsh plugin --profile web add dsh-quick-actions@next
 ```sh
 mkdir -p /tmp/quick-actions
 pnpm --filter dsh-quick-actions pack --pack-destination /tmp/quick-actions
-dsh plugin --profile web add /tmp/quick-actions/dsh-quick-actions-0.2.0-rc.1.tgz
+dsh plugin --profile web add /tmp/quick-actions/dsh-quick-actions-0.2.0-rc.2.tgz
 ```
 
 上面的 `--filter` 形式在仓库任意位置都能用；如果你已经在包目录里，`pnpm pack --pack-destination /tmp/quick-actions` 即可。
@@ -123,6 +123,7 @@ pnpm 有一条供应链策略：拒绝发布时间在冷却窗口内（默认 24
 - `label`、`text` 必填；`icon`、`confirm` 可选，`confirm` 默认 `true`。
 - 预置无效（缺字段、`id` 重复、目录超过 50 条）会让**插件加载响亮失败**并一次列出所有问题，而不是静默截断。
 - `presets` 与你的动作数据同在这一行 `config` 下（见下文「Settings 路径」），本插件从不写它。它是 DSH 的 volatile 字段：profile 运行期间改动会即时反映到快捷动作上；此时若改出无效目录，快捷动作区域显示目录错误，重启 profile 时插件加载失败并列出问题。
+- **只写在 active profile 自己的这份 `cordis.patch.yml` 里。** 不要把本插件的 `config` 写进 home patch（`<DSH_HOME>/cordis.patch.yml`）或 `dsh --patch` 的 overlay：DSH 的 patch 行 `config` 是整份替换，那一层会盖住这一行里存的你的动作数据（界面回到默认，磁盘上的数据还在），而且 DSH 会拒绝此后的每一次保存，界面报「保存被拒绝」，重试也不会成功。删掉那一层里本插件的行并重启 profile 即可恢复。
 
 用户对预置只能隐藏或克隆，不能编辑或删除；克隆出来的是一条普通的自定义动作。
 
@@ -133,7 +134,7 @@ pnpm 有一条供应链策略：拒绝发布时间在冷却窗口内（默认 24
 | 值 | 名称 | 位置 |
 |---|---|---|
 | `ribbon`（默认） | 上方动作带 | 输入框上方一行，与输入框等宽 |
-| `bar` | 下方操作栏 | 输入框内部下方一行，装不下的折进「更多」 |
+| `bar` | 下方操作栏 | 输入框下方一行，与 DSH 自己的用量信息并排，宽度随内容、最多与输入卡片同宽，装不下的折进「更多」 |
 | `launcher` | 单入口面板 | 一个入口按钮，点开可搜索的动作面板 |
 
 `bar` 与 `launcher` 共用同一个可搜索面板，搜索只匹配标签和文本。管理面板里可以给预置排序、隐藏、恢复、克隆，增删改自定义动作并启停它们，以及切换布局。
@@ -193,7 +194,7 @@ dsh plugin --profile web add dsh-quick-actions@<version>
 dsh plugin --profile web remove dsh-quick-actions
 ```
 
-依赖与 `dsh.profile.bundles` 里的那一层会同时去掉，重启 profile 后动作不再出现。`cordis.patch.yml` 里 `id: composer-quick-actions` 那一行原样保留——你的动作都在它的 `config` 里，重装后按 id 接回，所以动作会回来。只卸不装时，profile 每次启动会为这行打一条 `patch: entry "composer-quick-actions" not found` 警告，不影响启动；按下面第 1 步删掉即可。
+依赖与 `dsh.profile.bundles` 里的那一层会同时去掉，重启 profile 后动作不再出现。`cordis.patch.yml` 里 `id: composer-quick-actions` 那一行原样保留——你的动作都在它的 `config` 里，重装后按 id 接回，所以动作会回来。只卸不装时，这一行就成了找不到目标的孤儿行：不影响启动，`dsh --profile web --dump-config` 会为它报 `patch: entry "composer-quick-actions" not found`；按下面第 1 步删掉即可。
 
 **手工彻底清理**（卸载不做这些，因为重装应当恢复你的动作）：
 

package/lib/client.js

@@ -1685,6 +1685,11 @@ window.__ModuleLoader__.load({
 		* no layout — every width reads as zero. That answers "all of them": showing the
 		* full row and letting the browser's own overflow handle it for one frame is
 		* better than flashing a "more" button that the next frame withdraws.
+		*
+		* A control fits when it overruns the row by less than `FIT_TOLERANCE`. Whenever
+		* the bar is content-sized (spec 22.9) the row it measures is exactly as wide as
+		* the controls it shows, and fractional layout can report that a hair short;
+		* folding a face over the difference would narrow the row and start a cascade.
 		*/
 		function fitActionCount(input) {
 			const { available, widths, reserved, gap } = input;
@@ -1694,7 +1699,7 @@ window.__ModuleLoader__.load({
 			let shown = 0;
 			for (const width of widths) {
 				const next = used + width + (shown === 0 && reserved === 0 ? 0 : gap);
-				if (next > available) break;
+				if (next > available + .5) break;
 				used = next;
 				shown += 1;
 			}
@@ -2087,10 +2092,13 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/**
-		* Measure one element's inner width, republishing on every resize. Used twice:
-		* on the whole row for the density rule, and on the action region alone for the
-		* bar's overflow split — the region is `flex: 1 1 auto`, so its width is already
-		* what is left after the controls that must stay visible.
+		* Measure one element's width, republishing on every resize. Used twice: on the
+		* whole row for the density rule, and on the action region alone for the bar's
+		* overflow split — the region is `flex: 1 1 auto`, so its width is already what
+		* is left after the controls that must stay visible.
+		*
+		* Fractional, like the control widths it is compared with: `clientWidth` rounds,
+		* and a region reported a pixel short of the faces it holds folds one of them.
 		*/
 		function useElementWidth() {
 			const ref = (0, react.useRef)(null);
@@ -2099,10 +2107,10 @@ window.__ModuleLoader__.load({
 				const element = ref.current;
 				if (element === null || typeof ResizeObserver === "undefined") return;
 				const observer = new ResizeObserver(() => {
-					setWidth(element.clientWidth);
+					setWidth(element.getBoundingClientRect().width);
 				});
 				observer.observe(element);
-				setWidth(element.clientWidth);
+				setWidth(element.getBoundingClientRect().width);
 				return () => {
 					observer.disconnect();
 				};
@@ -2123,7 +2131,7 @@ window.__ModuleLoader__.load({
 				let changed = false;
 				for (const node of Array.from(fitRef.current?.querySelectorAll("[data-quick-action]") ?? [])) {
 					const key = node.dataset["quickAction"];
-					const value = node.offsetWidth;
+					const value = node.getBoundingClientRect().width;
 					if (key === void 0 || value <= 0 || widths.current.get(key) === value) continue;
 					widths.current.set(key, value);
 					changed = true;
@@ -2194,6 +2202,7 @@ window.__ModuleLoader__.load({
 				className: layout === "bar" ? "dsh-cqa-bar" : layout === "launcher" ? "dsh-cqa-launcher" : "dsh-cqa-ribbon",
 				"data-quick-actions-layout": layout,
 				"data-quick-actions-density": density,
+				"data-quick-actions-overflow": layout === "bar" && overflow.length > 0 ? "" : void 0,
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "dsh-cqa-row",
 					ref: rowRef,
@@ -3463,20 +3472,24 @@ window.__ModuleLoader__.load({
 		* Colours are DSH alias theme tokens only — nothing here defines a palette, and
 		* nothing overrides a global theme (spec 8.4).
 		*
-		* ## The width rule (spec 8.2)
-		*
-		* The two layouts sit in different boxes, so they reach the same outer edges by
-		* different arithmetic:
-		*
-		* - `.dsh-cqa-ribbon` renders in the composer stack, outside the InputBar, which
-		*   is the element that owns `--dsh-composer-side-clearance` as padding. It
-		*   therefore subtracts that clearance from both sides itself.
-		* - `.dsh-cqa-bar` renders as the InputBar's last child, inside that padding, so
-		*   it is simply `100%` wide.
-		*
-		* Both are then capped at `--dsh-composer-card-max-width` — the same cap the
-		* composer card uses — and centred, so their left and right edges coincide with
-		* the input box exactly rather than approximately.
+		* ## The width rule (spec 8.2, 22.9)
+		*
+		* `.dsh-cqa-ribbon` (and the launcher, in the same box) renders in the composer
+		* stack, outside the InputBar, which is the element that owns
+		* `--dsh-composer-side-clearance` as padding. It therefore subtracts that
+		* clearance from both sides itself, is capped at `--dsh-composer-card-max-width`
+		* — the same cap the composer card uses — and is centred, so its left and right
+		* edges coincide with the input box exactly rather than approximately.
+		*
+		* `.dsh-cqa-bar` makes no such claim. Since DSH 0.1.6-alpha.2 the composer dock is
+		* a row under the card that DSH centres and sizes to its content, shared with
+		* DSH's own stats pills and context meter, so the bar is a content-sized member of
+		* that row (spec 22.9). It only has to stay inside it: `min-width: 0` lets it
+		* shrink when the row reaches the composer's width, which is what hands the
+		* overflow split a smaller region to fold into "more". Once it folds it claims
+		* the card's width (`[data-quick-actions-overflow]`), capped by the row's own
+		* `max-width: 100%`: content-sized, the region the split measures would only be
+		* as wide as what it already shows, and a wider window could never unfold it.
 		*/
 		const TAG_ID = "dsh-quick-actions/surfaces.css";
 		const QUICK_ACTIONS_CSS = `
@@ -3489,9 +3502,12 @@ window.__ModuleLoader__.load({
 }
 .dsh-cqa-bar {
   box-sizing: border-box;
-  width: 100%;
+  min-width: 0;
   max-width: var(--dsh-composer-card-max-width);
-  margin: 0 auto;
+}
+/* Folding: claim the card's width, for the dock row's own max-width to cap. */
+.dsh-cqa-bar[data-quick-actions-overflow] {
+  width: var(--dsh-composer-card-max-width);
 }
 
 .dsh-cqa-row {