dsh-input-traffic 0.7.9 → 0.7.11

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### 修复：注入上下文不再占位等待区
+
+`next-step` 带里混着两类行：人真的插的话（`source.kind === 'user'`，web 控制器会给它盖上 `rpcId`），与服务/插件推给模型的上下文（宿主自己的 `user-approval` / `policy` / `time-context` 通知，以及第三方插件的意见）。旧实现把整个 `next-step` 都当“🟡 插话中”画出来，于是“The approval policy changed from "ask" to "never"”这类系统通知出现在用户的等待区里，还带着编辑 / 重排 / 重发按钮——那是对着不是人写的东西开的操作。现在新增纯函数 `isHumanSteer(row)`，黄色带只画真人插话；没带 `source` 的旧行（本地 fixture、老宿主）照旧可见，不会误伤真队列。上下文本身仍照常进模型。
+
 ## 0.7.7 (2026-10-27)
 
 两条外部 issue（feidky）的修复；无宿主兼容面变更，`engines.dsh` 枚举与 peers 保持 0.7.6。

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-input-traffic",
-  "version": "0.7.9",
+  "version": "0.7.11",
   "main": "./lib/index.js",
   "description": "Busy-time input queue: three-tier planning, drag-to-reorder, interject/interrupt, batch clear, session freeze.",
   "engines": {

package/lib/client.js

@@ -704,6 +704,31 @@ window.__ModuleLoader__.load({
 			return null;
 		}
 		/**
+		* Whether one `next-step` inbox row is a steer the person typed, rather than
+		* context some producer injected into the same band.
+		*
+		* The host merges two different things into `next-step`:
+		* - a human steer — `source.kind === 'user'` (the web controller stamps it with
+		*   an `rpcId`), the yellow tier this dock exists to plan;
+		* - model-facing context pushed by a service or plugin with its own
+		*   `source.kind` — the host's own `user-approval` / `policy` / `time-context`
+		*   notices, and third-party notes such as perm-gate's block opinion.
+		*
+		* Only the first is an input the person still owns. Drawing the second as a
+		* planned message put host notices (“The approval policy changed…”​) into the
+		* waiting area with edit / reorder / resend affordances that cannot work on
+		* them, and competed with the user's own queue for attention.
+		*
+		* Lenient on purpose: a row with no `source` at all (local fixtures, older
+		* hosts) stays visible, so nothing legitimately queued can disappear.
+		* @param row - one `next-step` inbox row.
+		* @returns true when the row is a human steer.
+		*/
+		function isHumanSteer(row) {
+			const kind = row.source?.kind;
+			return kind === void 0 || kind === "user";
+		}
+		/**
 		* Auto-grow one edit textarea to its content. The CSS max-height caps the
 		* growth; beyond it the textarea scrolls internally. Height is reset first so
 		* shrink (deleting lines) also tracks the content.
@@ -735,7 +760,7 @@ window.__ModuleLoader__.load({
 				...row,
 				text: textOf(row.content) ?? row.text ?? null
 			})), [inbox]);
-			const steering = (0, react.useMemo)(() => (inbox?.["next-step"] ?? []).map((row) => ({
+			const steering = (0, react.useMemo)(() => (inbox?.["next-step"] ?? []).filter(isHumanSteer).map((row) => ({
 				...row,
 				text: textOf(row.content) ?? row.text ?? null
 			})), [inbox]);
@@ -2000,10 +2025,16 @@ window.__ModuleLoader__.load({
 				return raw.subscribe(() => setPolled(raw.getSnapshot()));
 			});
 			const tabs = props.useTabs !== void 0 ? props.useTabs((value) => value) : polled;
+			const ownId = props.ownId ?? "__own__";
+			const rows = props.renderOwn ? [{
+				id: ownId,
+				order: Number.NEGATIVE_INFINITY,
+				label: ownId
+			}, ...tabs.filter((tab) => tab.id !== ownId)] : tabs;
 			return (0, react.createElement)("div", { style: {
 				display: "grid",
 				gap: "12px"
-			} }, tabs.map((row) => (0, react.createElement)("div", { key: row.id }, props.renderSlot ? props.renderSlot(FAMILY_CHILD_KEY, {}, {
+			} }, rows.map((row) => (0, react.createElement)("div", { key: row.id }, props.renderOwn && row.id === ownId ? props.renderOwn() : props.renderSlot ? props.renderSlot(FAMILY_CHILD_KEY, {}, {
 				only: row.id,
 				fallback: null
 			}) : props.renderContributor?.(row.id) ?? null)));
@@ -2046,7 +2077,7 @@ window.__ModuleLoader__.load({
 		* @param log - console 前缀（带插件名）。
 		* @returns 取消定时器与撤销接管注册的 disposer。
 		*/
-		function claimFamilyHostIfOrphaned(slots, isHeld, label, log) {
+		function claimFamilyHostIfOrphaned(slots, isHeld, label, log, ownTab) {
 			let disposeClaim;
 			let claimed = false;
 			const timer = setTimeout(() => {
@@ -2077,7 +2108,9 @@ window.__ModuleLoader__.load({
 						label,
 						inject: () => ({
 							hooks: { tabs: ledger },
-							renderContributor
+							renderContributor,
+							ownId: ownTab?.id,
+							renderOwn: ownTab === void 0 ? void 0 : () => (0, react.createElement)(ownTab.component, ownTab.inject ? ownTab.inject() : {})
 						}),
 						children: { [FAMILY_CHILD_KEY]: {
 							kind: "list",
@@ -2161,19 +2194,25 @@ window.__ModuleLoader__.load({
 					console.warn("[dsh-input-traffic] bridge busyEnter pin failed:", e);
 				});
 			});
-			let familyTabHeld = false;
-			ctx.slots.inject("dsh-family.tab", () => {
-				familyTabHeld = true;
-				return ctx.slots.register({
-					name: "dsh-family.tab",
-					id: "input-traffic",
-					order: 50,
-					label: () => tFamily("family.title"),
-					locale: NS,
-					inject: () => ({ scope: familyScopeRef.scope ?? bridgeScope })
-				}, InputTrafficFamilyCard);
-			});
-			ctx.effect(() => claimFamilyHostIfOrphaned(ctx.slots, () => familyTabHeld, () => "起子插件设置", "[dsh-input-traffic]"), "dsh-input-traffic: family host backstop");
+			ctx.slots.inject("dsh-family.tab", () => ctx.slots.register({
+				name: "dsh-family.tab",
+				id: "input-traffic",
+				order: 50,
+				label: () => tFamily("family.title"),
+				locale: NS,
+				inject: () => ({ scope: familyScopeRef.scope ?? bridgeScope })
+			}, InputTrafficFamilyCard));
+			ctx.effect(() => claimFamilyHostIfOrphaned(ctx.slots, () => {
+				try {
+					return ctx.slots.entries("settings.section").some((e) => String((e.options ?? {}).id ?? "") === "dsh-family");
+				} catch {
+					return false;
+				}
+			}, () => "起子插件设置", "[dsh-input-traffic]", {
+				id: "input-traffic",
+				component: InputTrafficFamilyCard,
+				inject: () => ({ scope: familyScopeRef.scope ?? bridgeScope })
+			}), "dsh-input-traffic: family host backstop");
 			registerSettingsFaces(ctx, {
 				namespace: CONVERSATION_SETTINGS_NAMESPACE,
 				field: BUSY_ENTER_FIELD,