dsh-sidenote 0.6.3 → 0.6.5

package/README.md

@@ -82,7 +82,9 @@ dsh plugin --profile web add dsh-sidenote
 
 ## 兼容与帮助
 
-已验证的原生侧栏组合为 **DSH 0.1.5-rc.2、0.1.7-rc.2、0.2.0-rc.2、0.2.1-rc.2**；旧版的三组 BS 组合继续保留验收。支持范围以[兼容与维护政策](docs/compatibility.md)中的精确版本为准；已发布版本请查看对应 Release。
+已验证的原生侧栏组合为 **DSH 0.1.5-rc.2、0.1.7-rc.2、0.2.0-rc.2、0.2.1-rc.2、0.2.1-rc.3**；旧版的三组 BS 组合继续保留验收。支持范围以[兼容与维护政策](docs/compatibility.md)中的精确版本为准；已发布版本请查看对应 Release。
+
+0.6.5 包含 DSH 0.2.1-rc.3 适配、V4 回流来源修复和逐项投递确认。0.6.4 及更早版本不声明支持 rc.3。0.6.5 是原生 Conversation 重构前的兼容修复快照；后续新版的原生宿主范围以对应 Release 为准，窗口外可固定 `dsh-sidenote@0.6.5`。
 
 遇到问题时，可在 **设置 → 通用设置 → dsh-sidenote 诊断模式** 开启诊断，查看并手动导出接入状态。[报告问题或提出建议](https://github.com/g-yixuan/dsh-sidenote/issues/new/choose)。
 

package/lib/client.js

@@ -619,7 +619,7 @@ window.__ModuleLoader__.load({
 			let dockRegistered = false;
 			let report = {
 				versions: {
-					sidenote: "0.6.3",
+					sidenote: "0.6.5",
 					dsh: "unknown",
 					betterSidebar: null
 				},
@@ -919,6 +919,7 @@ window.__ModuleLoader__.load({
 			reflowReason: "brought back from a side chat by the user",
 			reflowBubbleLabel: "Side-chat context",
 			reflowRemoveTitle: "Remove reflow",
+			termCommandLine: "Command line {n}",
 			termSignal: "Terminated ({signal})",
 			termExitCode: "Exit code {code}",
 			termDone: "done",
@@ -1115,6 +1116,7 @@ window.__ModuleLoader__.load({
 			reflowReason: "用户选择从侧边聊天带回主线",
 			reflowBubbleLabel: "含侧边回流上下文",
 			reflowRemoveTitle: "移除回流",
+			termCommandLine: "命令第 {n} 行",
 			termSignal: "已终止（{signal}）",
 			termExitCode: "退出码 {code}",
 			termDone: "完成",
@@ -1234,15 +1236,15 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var diagnostics_module_css_default = {
-			"settingTitle": "tGe0LW_settingTitle",
-			"setting": "tGe0LW_setting",
 			"description": "tGe0LW_description",
+			"trigger": "tGe0LW_trigger",
+			"settingTitle": "tGe0LW_settingTitle",
 			"panel": "tGe0LW_panel",
 			"versions": "tGe0LW_versions",
-			"actions": "tGe0LW_actions",
 			"list": "tGe0LW_list",
+			"setting": "tGe0LW_setting",
 			"header": "tGe0LW_header",
-			"trigger": "tGe0LW_trigger"
+			"actions": "tGe0LW_actions"
 		};
 		//#endregion
 		//#region src/client/diagnostics/index.tsx
@@ -1472,7 +1474,7 @@ window.__ModuleLoader__.load({
 		*/
 		/**
 		* reflow 注入通道（Workitem_06）：优先经宿主路由 /sidenote/reflow 以
-		* agent.inject 落父会话日志（plugin-source 独立事件，context row 折叠）；
+		* agent.inject 落父会话日志（插件自有 source 独立事件，context row 折叠）；
 		* 路由缺席/父会话无 live agent/超时 → 调用方回落搭车形态（发送拦截器
 		* 序列化前缀）。逐个 item 投递；成功项由调用方从 store 移除（不等发送
 		* 确认——注入已入 inbox，chip 消失表达「已注入」）。
@@ -1480,7 +1482,7 @@ window.__ModuleLoader__.load({
 		* 有界等待：注入尝试绝不能拖住发送手势——300ms 超时即回落搭车。
 		*/
 		const REFLOW_ROUTE_TIMEOUT_MS = 300;
-		/** 尝试经宿主路由注入一批回流项；任何失败都降级为「全未注入」。 */
+		/** 只消费宿主明确确认的项；未注入项由调用方搭车，发送拒绝时继续保留。 */
 		async function tryInjectReflows(parentSessionId, items) {
 			if (items.length === 0) return { injectedIds: /* @__PURE__ */ new Set() };
 			const empty = { injectedIds: /* @__PURE__ */ new Set() };
@@ -1507,7 +1509,12 @@ window.__ModuleLoader__.load({
 					clearTimeout(timer);
 				}
 				if (!res.ok) return empty;
-				if ((await res.json()).ok !== true) return empty;
+				const data = await res.json();
+				if (Array.isArray(data.injectedIndexes)) {
+					const indexes = data.injectedIndexes.filter((index) => typeof index === "number" && Number.isInteger(index) && index >= 0 && index < items.length);
+					return { injectedIds: new Set(indexes.map((index) => items[index].id)) };
+				}
+				if (data.ok !== true) return empty;
 				return { injectedIds: new Set(items.map((item) => item.id)) };
 			} catch {
 				return empty;
@@ -3123,9 +3130,10 @@ window.__ModuleLoader__.load({
 		* 要求必填——所以各 builder 返回类型按 0.1.2 形状写、调用点 cast（与
 		* markdown.ts 双形状同款姿势）。
 		*/
-		/** TerminalBlockLabels（0.1.1 与 0.1.2 同形状）。 */
+		/** TerminalBlockLabels；新版宿主还要求每行命令的无障碍标签。 */
 		function terminalLabels() {
 			return {
+				commandLine: (n) => t("termCommandLine", { n }),
 				signal: (signal) => t("termSignal", { signal }),
 				exitCode: (code) => t("termExitCode", { code }),
 				running: t("running"),
@@ -3225,97 +3233,97 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var sidechat_module_css_default = {
+			"userRow": "_5KEEsG_userRow",
+			"attachImg": "_5KEEsG_attachImg",
+			"rowPreview": "_5KEEsG_rowPreview",
+			"streamingHint": "_5KEEsG_streamingHint",
+			"errorRow": "_5KEEsG_errorRow",
+			"headerSide": "_5KEEsG_headerSide",
+			"snapshotBody": "_5KEEsG_snapshotBody",
 			"quoteBody": "_5KEEsG_quoteBody",
-			"todoItem": "_5KEEsG_todoItem",
+			"toolLocations": "_5KEEsG_toolLocations",
+			"composerChips": "_5KEEsG_composerChips",
 			"slashItemDetail": "_5KEEsG_slashItemDetail",
-			"pendingCustom": "_5KEEsG_pendingCustom",
-			"todoBody": "_5KEEsG_todoBody",
-			"sentChipRow": "_5KEEsG_sentChipRow",
-			"attachButton": "_5KEEsG_attachButton",
-			"dotPending": "_5KEEsG_dotPending",
-			"assistantRow": "_5KEEsG_assistantRow",
-			"pendingHead": "_5KEEsG_pendingHead",
-			"parentStrip": "_5KEEsG_parentStrip",
+			"attachThumb": "_5KEEsG_attachThumb",
+			"pendingOptionActive": "_5KEEsG_pendingOptionActive",
 			"toolHead": "_5KEEsG_toolHead",
-			"toolBody": "_5KEEsG_toolBody",
-			"snapshotText": "_5KEEsG_snapshotText",
-			"streamingHint": "_5KEEsG_streamingHint",
-			"modelSelect": "_5KEEsG_modelSelect",
-			"inheritedBody": "_5KEEsG_inheritedBody",
-			"actionGroup": "_5KEEsG_actionGroup",
+			"pendingCustom": "_5KEEsG_pendingCustom",
+			"pendingBtnGhost": "_5KEEsG_pendingBtnGhost",
+			"writeNoticeClose": "_5KEEsG_writeNoticeClose",
+			"pendingTitle": "_5KEEsG_pendingTitle",
+			"dotIdle": "_5KEEsG_dotIdle",
 			"composer": "_5KEEsG_composer",
 			"stopButton": "_5KEEsG_stopButton",
-			"densityRow": "_5KEEsG_densityRow",
-			"slashMenu": "_5KEEsG_slashMenu",
-			"pendingQHeader": "_5KEEsG_pendingQHeader",
-			"attachRemove": "_5KEEsG_attachRemove",
-			"reasoning": "_5KEEsG_reasoning",
-			"pendingActions": "_5KEEsG_pendingActions",
-			"toolRunning": "_5KEEsG_toolRunning",
-			"pendingBtnPrimary": "_5KEEsG_pendingBtnPrimary",
-			"writeNotice": "_5KEEsG_writeNotice",
 			"visibilitySetting": "_5KEEsG_visibilitySetting",
-			"emptyTitle": "_5KEEsG_emptyTitle",
-			"empty": "_5KEEsG_empty",
-			"dotIdle": "_5KEEsG_dotIdle",
-			"todoDot": "_5KEEsG_todoDot",
-			"headerSide": "_5KEEsG_headerSide",
-			"pendingOption": "_5KEEsG_pendingOption",
-			"userBubble": "_5KEEsG_userBubble",
-			"sendButton": "_5KEEsG_sendButton",
+			"dotPending": "_5KEEsG_dotPending",
+			"assistantRow": "_5KEEsG_assistantRow",
+			"composerFoot": "_5KEEsG_composerFoot",
+			"toolBodyText": "_5KEEsG_toolBodyText",
 			"densityToggle": "_5KEEsG_densityToggle",
+			"pendingQHeader": "_5KEEsG_pendingQHeader",
+			"todoDot": "_5KEEsG_todoDot",
+			"pendingQText": "_5KEEsG_pendingQText",
+			"dotRunning": "_5KEEsG_dotRunning",
+			"rowActions": "_5KEEsG_rowActions",
+			"stateDetail": "_5KEEsG_stateDetail",
+			"reasoning": "_5KEEsG_reasoning",
+			"snapshotText": "_5KEEsG_snapshotText",
+			"reflowButton": "_5KEEsG_reflowButton",
 			"stateScreen": "_5KEEsG_stateScreen",
-			"toolError": "_5KEEsG_toolError",
+			"sentChip": "_5KEEsG_sentChip",
 			"nativeHost": "_5KEEsG_nativeHost",
-			"slashItem": "_5KEEsG_slashItem",
-			"slashItemActive": "_5KEEsG_slashItemActive",
-			"dotRunning": "_5KEEsG_dotRunning",
-			"slashGroupTitle": "_5KEEsG_slashGroupTitle",
-			"composerCard": "_5KEEsG_composerCard",
-			"toolBodyText": "_5KEEsG_toolBodyText",
+			"toolBody": "_5KEEsG_toolBody",
 			"modelLabel": "_5KEEsG_modelLabel",
+			"sentChipRow": "_5KEEsG_sentChipRow",
+			"slashItem": "_5KEEsG_slashItem",
+			"slashItemName": "_5KEEsG_slashItemName",
+			"pendingDesc": "_5KEEsG_pendingDesc",
 			"pendingOptionDesc": "_5KEEsG_pendingOptionDesc",
+			"pendingActions": "_5KEEsG_pendingActions",
+			"flowRow": "_5KEEsG_flowRow",
+			"slashGroupTitle": "_5KEEsG_slashGroupTitle",
+			"sidechat-pulse": "_5KEEsG_sidechat-pulse",
+			"todoText": "_5KEEsG_todoText",
+			"actionGroup": "_5KEEsG_actionGroup",
+			"flowRowError": "_5KEEsG_flowRowError",
+			"attachRemove": "_5KEEsG_attachRemove",
+			"slashItemActive": "_5KEEsG_slashItemActive",
+			"toolError": "_5KEEsG_toolError",
+			"toolCard": "_5KEEsG_toolCard",
+			"pendingCard": "_5KEEsG_pendingCard",
+			"pendingQuestion": "_5KEEsG_pendingQuestion",
 			"body": "_5KEEsG_body",
-			"composerFoot": "_5KEEsG_composerFoot",
-			"writeNoticeClose": "_5KEEsG_writeNoticeClose",
+			"empty": "_5KEEsG_empty",
 			"emptyIcon": "_5KEEsG_emptyIcon",
-			"sentChip": "_5KEEsG_sentChip",
-			"rowPreview": "_5KEEsG_rowPreview",
-			"toolLocations": "_5KEEsG_toolLocations",
-			"root": "_5KEEsG_root",
-			"emptyText": "_5KEEsG_emptyText",
-			"assistantBody": "_5KEEsG_assistantBody",
-			"attachRail": "_5KEEsG_attachRail",
-			"pendingBtnGhost": "_5KEEsG_pendingBtnGhost",
-			"errorRow": "_5KEEsG_errorRow",
-			"toolCard": "_5KEEsG_toolCard",
-			"rowActions": "_5KEEsG_rowActions",
-			"pendingBar": "_5KEEsG_pendingBar",
-			"reasoningBody": "_5KEEsG_reasoningBody",
-			"userRow": "_5KEEsG_userRow",
-			"todoText": "_5KEEsG_todoText",
+			"slashMenu": "_5KEEsG_slashMenu",
 			"transcript": "_5KEEsG_transcript",
+			"sendButton": "_5KEEsG_sendButton",
+			"input": "_5KEEsG_input",
+			"toolRunning": "_5KEEsG_toolRunning",
+			"userBubble": "_5KEEsG_userBubble",
+			"jumpBottom": "_5KEEsG_jumpBottom",
+			"pendingOption": "_5KEEsG_pendingOption",
+			"todoItem": "_5KEEsG_todoItem",
 			"toolGenericBody": "_5KEEsG_toolGenericBody",
-			"pendingCard": "_5KEEsG_pendingCard",
-			"pendingTitle": "_5KEEsG_pendingTitle",
+			"attachRail": "_5KEEsG_attachRail",
 			"pendingReason": "_5KEEsG_pendingReason",
-			"stateDetail": "_5KEEsG_stateDetail",
-			"slashItemName": "_5KEEsG_slashItemName",
-			"jumpBottom": "_5KEEsG_jumpBottom",
-			"attachImg": "_5KEEsG_attachImg",
-			"flowRow": "_5KEEsG_flowRow",
-			"sidechat-pulse": "_5KEEsG_sidechat-pulse",
-			"composerChips": "_5KEEsG_composerChips",
-			"input": "_5KEEsG_input",
-			"attachThumb": "_5KEEsG_attachThumb",
-			"flowRowError": "_5KEEsG_flowRowError",
+			"root": "_5KEEsG_root",
+			"composerCard": "_5KEEsG_composerCard",
+			"emptyTitle": "_5KEEsG_emptyTitle",
+			"inheritedBody": "_5KEEsG_inheritedBody",
+			"pendingBtnPrimary": "_5KEEsG_pendingBtnPrimary",
+			"writeNotice": "_5KEEsG_writeNotice",
+			"modelSelect": "_5KEEsG_modelSelect",
+			"pendingHead": "_5KEEsG_pendingHead",
+			"parentStrip": "_5KEEsG_parentStrip",
+			"assistantBody": "_5KEEsG_assistantBody",
+			"emptyText": "_5KEEsG_emptyText",
 			"noticeRow": "_5KEEsG_noticeRow",
-			"pendingDesc": "_5KEEsG_pendingDesc",
-			"pendingQuestion": "_5KEEsG_pendingQuestion",
-			"pendingQText": "_5KEEsG_pendingQText",
-			"pendingOptionActive": "_5KEEsG_pendingOptionActive",
-			"reflowButton": "_5KEEsG_reflowButton",
-			"snapshotBody": "_5KEEsG_snapshotBody"
+			"pendingBar": "_5KEEsG_pendingBar",
+			"attachButton": "_5KEEsG_attachButton",
+			"reasoningBody": "_5KEEsG_reasoningBody",
+			"todoBody": "_5KEEsG_todoBody",
+			"densityRow": "_5KEEsG_densityRow"
 		};
 		//#endregion
 		//#region src/client/chat/ToolCard.tsx
@@ -5298,16 +5306,16 @@ ${entries.map((entry) => {
 			document.head.appendChild(tag);
 		}
 		var annotations_module_css_default = {
-			"chipPanel": "SVnebq_chipPanel",
-			"chipClearAll": "SVnebq_chipClearAll",
-			"chip": "SVnebq_chip",
-			"side": "SVnebq_side",
-			"chipNote": "SVnebq_chipNote",
-			"chipWrap": "SVnebq_chipWrap",
 			"storageNotice": "SVnebq_storageNotice",
+			"chipRemove": "SVnebq_chipRemove",
 			"chipRow": "SVnebq_chipRow",
+			"chipWrap": "SVnebq_chipWrap",
 			"chipText": "SVnebq_chipText",
-			"chipRemove": "SVnebq_chipRemove",
+			"chip": "SVnebq_chip",
+			"chipPanel": "SVnebq_chipPanel",
+			"side": "SVnebq_side",
+			"chipClearAll": "SVnebq_chipClearAll",
+			"chipNote": "SVnebq_chipNote",
 			"chipNumber": "SVnebq_chipNumber"
 		};
 		//#endregion
@@ -7816,34 +7824,34 @@ ${entries.map((entry) => {
 			document.head.appendChild(tag);
 		}
 		var annotate_module_css_default = {
-			"sentCardQuote": "_SVViG_sentCardQuote",
-			"toolbarBelow": "_SVViG_toolbarBelow",
-			"badge": "_SVViG_badge",
-			"deleteButton": "_SVViG_deleteButton",
-			"sentCardTitle": "_SVViG_sentCardTitle",
+			"hint": "_SVViG_hint",
+			"toolbar": "_SVViG_toolbar",
+			"editorTextarea": "_SVViG_editorTextarea",
 			"editorAskRow": "_SVViG_editorAskRow",
-			"editorFooter": "_SVViG_editorFooter",
-			"editorEdit": "_SVViG_editorEdit",
-			"toolbarButton": "_SVViG_toolbarButton",
 			"saveButton": "_SVViG_saveButton",
-			"editorError": "_SVViG_editorError",
+			"editorNew": "_SVViG_editorNew",
+			"badge": "_SVViG_badge",
 			"sentChip": "_SVViG_sentChip",
+			"sentCardQuote": "_SVViG_sentCardQuote",
+			"editorInput": "_SVViG_editorInput",
+			"dshSidenoteHintIn": "_SVViG_dshSidenoteHintIn",
 			"hintClose": "_SVViG_hintClose",
+			"editorSpacer": "_SVViG_editorSpacer",
 			"sentChipRow": "_SVViG_sentChipRow",
-			"toolbar": "_SVViG_toolbar",
-			"editorNew": "_SVViG_editorNew",
-			"sentCardNote": "_SVViG_sentCardNote",
-			"dshSidenoteHintIn": "_SVViG_dshSidenoteHintIn",
-			"editorTextarea": "_SVViG_editorTextarea",
-			"editorInput": "_SVViG_editorInput",
-			"badgeSent": "_SVViG_badgeSent",
 			"editorAsk": "_SVViG_editorAsk",
 			"highlight": "_SVViG_highlight",
-			"confirmButton": "_SVViG_confirmButton",
-			"cancelButton": "_SVViG_cancelButton",
-			"hint": "_SVViG_hint",
 			"editorTarget": "_SVViG_editorTarget",
-			"editorSpacer": "_SVViG_editorSpacer"
+			"editorFooter": "_SVViG_editorFooter",
+			"editorEdit": "_SVViG_editorEdit",
+			"toolbarBelow": "_SVViG_toolbarBelow",
+			"editorError": "_SVViG_editorError",
+			"deleteButton": "_SVViG_deleteButton",
+			"toolbarButton": "_SVViG_toolbarButton",
+			"cancelButton": "_SVViG_cancelButton",
+			"confirmButton": "_SVViG_confirmButton",
+			"badgeSent": "_SVViG_badgeSent",
+			"sentCardTitle": "_SVViG_sentCardTitle",
+			"sentCardNote": "_SVViG_sentCardNote"
 		};
 		//#endregion
 		//#region src/client/annotate/hint.tsx