dsh-sidenote 0.3.4 → 0.3.5

package/lib/client.js

@@ -2181,92 +2181,92 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var sidechat_module_css_default = {
-			"pendingBar": "_5KEEsG_pendingBar",
-			"composerCard": "_5KEEsG_composerCard",
-			"attachRail": "_5KEEsG_attachRail",
-			"reasoningBody": "_5KEEsG_reasoningBody",
-			"empty": "_5KEEsG_empty",
-			"dotRunning": "_5KEEsG_dotRunning",
-			"toolBody": "_5KEEsG_toolBody",
+			"todoBody": "_5KEEsG_todoBody",
+			"attachButton": "_5KEEsG_attachButton",
+			"writeNoticeClose": "_5KEEsG_writeNoticeClose",
+			"pendingBtnGhost": "_5KEEsG_pendingBtnGhost",
 			"attachImg": "_5KEEsG_attachImg",
-			"slashItem": "_5KEEsG_slashItem",
-			"stateDetail": "_5KEEsG_stateDetail",
-			"sentChipRow": "_5KEEsG_sentChipRow",
+			"composer": "_5KEEsG_composer",
+			"headerSide": "_5KEEsG_headerSide",
+			"toolGenericBody": "_5KEEsG_toolGenericBody",
+			"toolHead": "_5KEEsG_toolHead",
+			"assistantBody": "_5KEEsG_assistantBody",
+			"sendButton": "_5KEEsG_sendButton",
 			"userBubble": "_5KEEsG_userBubble",
 			"rowPreview": "_5KEEsG_rowPreview",
-			"reflowButton": "_5KEEsG_reflowButton",
-			"toolLocations": "_5KEEsG_toolLocations",
-			"toolGenericBody": "_5KEEsG_toolGenericBody",
-			"jumpBottom": "_5KEEsG_jumpBottom",
-			"streamingHint": "_5KEEsG_streamingHint",
-			"pendingTitle": "_5KEEsG_pendingTitle",
-			"inheritedBody": "_5KEEsG_inheritedBody",
-			"pendingQHeader": "_5KEEsG_pendingQHeader",
+			"empty": "_5KEEsG_empty",
+			"densityToggle": "_5KEEsG_densityToggle",
 			"pendingOption": "_5KEEsG_pendingOption",
-			"pendingOptionActive": "_5KEEsG_pendingOptionActive",
-			"rowActions": "_5KEEsG_rowActions",
-			"stateScreen": "_5KEEsG_stateScreen",
-			"pendingActions": "_5KEEsG_pendingActions",
-			"pendingBtnGhost": "_5KEEsG_pendingBtnGhost",
+			"emptyIcon": "_5KEEsG_emptyIcon",
+			"errorRow": "_5KEEsG_errorRow",
+			"todoDot": "_5KEEsG_todoDot",
+			"pendingHead": "_5KEEsG_pendingHead",
+			"flowRowError": "_5KEEsG_flowRowError",
+			"pendingReason": "_5KEEsG_pendingReason",
+			"pendingQuestion": "_5KEEsG_pendingQuestion",
 			"actionGroup": "_5KEEsG_actionGroup",
-			"toolHead": "_5KEEsG_toolHead",
-			"toolBodyText": "_5KEEsG_toolBodyText",
+			"jumpBottom": "_5KEEsG_jumpBottom",
 			"sidechat-pulse": "_5KEEsG_sidechat-pulse",
-			"assistantBody": "_5KEEsG_assistantBody",
-			"todoDot": "_5KEEsG_todoDot",
-			"todoBody": "_5KEEsG_todoBody",
-			"toolError": "_5KEEsG_toolError",
-			"reasoning": "_5KEEsG_reasoning",
-			"attachThumb": "_5KEEsG_attachThumb",
-			"attachButton": "_5KEEsG_attachButton",
-			"densityToggle": "_5KEEsG_densityToggle",
-			"composerFoot": "_5KEEsG_composerFoot",
+			"pendingBar": "_5KEEsG_pendingBar",
+			"userRow": "_5KEEsG_userRow",
+			"transcript": "_5KEEsG_transcript",
+			"assistantRow": "_5KEEsG_assistantRow",
+			"flowRow": "_5KEEsG_flowRow",
+			"pendingCustom": "_5KEEsG_pendingCustom",
+			"pendingCard": "_5KEEsG_pendingCard",
+			"dotPending": "_5KEEsG_dotPending",
+			"reasoningBody": "_5KEEsG_reasoningBody",
+			"todoText": "_5KEEsG_todoText",
+			"slashItemName": "_5KEEsG_slashItemName",
 			"stopButton": "_5KEEsG_stopButton",
-			"slashItemActive": "_5KEEsG_slashItemActive",
-			"slashMenu": "_5KEEsG_slashMenu",
-			"writeNotice": "_5KEEsG_writeNotice",
-			"input": "_5KEEsG_input",
+			"slashItem": "_5KEEsG_slashItem",
 			"densityRow": "_5KEEsG_densityRow",
-			"composerChips": "_5KEEsG_composerChips",
+			"root": "_5KEEsG_root",
+			"slashMenu": "_5KEEsG_slashMenu",
+			"stateScreen": "_5KEEsG_stateScreen",
+			"pendingActions": "_5KEEsG_pendingActions",
+			"rowActions": "_5KEEsG_rowActions",
+			"pendingOptionDesc": "_5KEEsG_pendingOptionDesc",
+			"streamingHint": "_5KEEsG_streamingHint",
+			"attachRail": "_5KEEsG_attachRail",
+			"pendingQText": "_5KEEsG_pendingQText",
+			"dotIdle": "_5KEEsG_dotIdle",
+			"slashItemActive": "_5KEEsG_slashItemActive",
+			"toolBody": "_5KEEsG_toolBody",
+			"toolError": "_5KEEsG_toolError",
+			"toolRunning": "_5KEEsG_toolRunning",
 			"sentChip": "_5KEEsG_sentChip",
-			"pendingQuestion": "_5KEEsG_pendingQuestion",
-			"todoText": "_5KEEsG_todoText",
-			"pendingReason": "_5KEEsG_pendingReason",
+			"pendingQHeader": "_5KEEsG_pendingQHeader",
+			"body": "_5KEEsG_body",
+			"emptyTitle": "_5KEEsG_emptyTitle",
+			"toolBodyText": "_5KEEsG_toolBodyText",
+			"pendingOptionActive": "_5KEEsG_pendingOptionActive",
+			"inheritedBody": "_5KEEsG_inheritedBody",
+			"dotRunning": "_5KEEsG_dotRunning",
+			"reflowButton": "_5KEEsG_reflowButton",
+			"composerChips": "_5KEEsG_composerChips",
+			"pendingTitle": "_5KEEsG_pendingTitle",
 			"pendingBtnPrimary": "_5KEEsG_pendingBtnPrimary",
-			"dotIdle": "_5KEEsG_dotIdle",
-			"assistantRow": "_5KEEsG_assistantRow",
-			"flowRow": "_5KEEsG_flowRow",
-			"userRow": "_5KEEsG_userRow",
+			"composerCard": "_5KEEsG_composerCard",
 			"toolCard": "_5KEEsG_toolCard",
-			"errorRow": "_5KEEsG_errorRow",
+			"reasoning": "_5KEEsG_reasoning",
 			"noticeRow": "_5KEEsG_noticeRow",
+			"stateDetail": "_5KEEsG_stateDetail",
 			"slashItemDetail": "_5KEEsG_slashItemDetail",
-			"transcript": "_5KEEsG_transcript",
-			"toolRunning": "_5KEEsG_toolRunning",
-			"emptyIcon": "_5KEEsG_emptyIcon",
-			"pendingCustom": "_5KEEsG_pendingCustom",
-			"headerSide": "_5KEEsG_headerSide",
-			"parentStrip": "_5KEEsG_parentStrip",
-			"modelSelect": "_5KEEsG_modelSelect",
-			"pendingHead": "_5KEEsG_pendingHead",
-			"root": "_5KEEsG_root",
-			"flowRowError": "_5KEEsG_flowRowError",
-			"writeNoticeClose": "_5KEEsG_writeNoticeClose",
-			"slashGroupTitle": "_5KEEsG_slashGroupTitle",
-			"sendButton": "_5KEEsG_sendButton",
-			"slashItemName": "_5KEEsG_slashItemName",
-			"body": "_5KEEsG_body",
-			"emptyText": "_5KEEsG_emptyText",
-			"composer": "_5KEEsG_composer",
-			"emptyTitle": "_5KEEsG_emptyTitle",
 			"attachRemove": "_5KEEsG_attachRemove",
-			"dotPending": "_5KEEsG_dotPending",
-			"todoItem": "_5KEEsG_todoItem",
-			"pendingQText": "_5KEEsG_pendingQText",
-			"pendingOptionDesc": "_5KEEsG_pendingOptionDesc",
 			"pendingDesc": "_5KEEsG_pendingDesc",
+			"sentChipRow": "_5KEEsG_sentChipRow",
+			"writeNotice": "_5KEEsG_writeNotice",
+			"attachThumb": "_5KEEsG_attachThumb",
+			"modelSelect": "_5KEEsG_modelSelect",
+			"slashGroupTitle": "_5KEEsG_slashGroupTitle",
 			"modelLabel": "_5KEEsG_modelLabel",
-			"pendingCard": "_5KEEsG_pendingCard"
+			"emptyText": "_5KEEsG_emptyText",
+			"parentStrip": "_5KEEsG_parentStrip",
+			"input": "_5KEEsG_input",
+			"composerFoot": "_5KEEsG_composerFoot",
+			"toolLocations": "_5KEEsG_toolLocations",
+			"todoItem": "_5KEEsG_todoItem"
 		};
 		//#endregion
 		//#region src/client/chat/ToolCard.tsx
@@ -4709,43 +4709,43 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var annotate_module_css_default = {
-			"badgeSent": "_SVViG_badgeSent",
-			"chipClearAll": "_SVViG_chipClearAll",
-			"highlight": "_SVViG_highlight",
-			"chipRemove": "_SVViG_chipRemove",
-			"dshSidenoteHintIn": "_SVViG_dshSidenoteHintIn",
-			"editorNew": "_SVViG_editorNew",
-			"chipRow": "_SVViG_chipRow",
-			"editorTextarea": "_SVViG_editorTextarea",
+			"editorTarget": "_SVViG_editorTarget",
+			"cancelButton": "_SVViG_cancelButton",
+			"hintClose": "_SVViG_hintClose",
+			"chipWrap": "_SVViG_chipWrap",
 			"editorAsk": "_SVViG_editorAsk",
-			"chipNote": "_SVViG_chipNote",
-			"chip": "_SVViG_chip",
-			"chipText": "_SVViG_chipText",
-			"chipPanel": "_SVViG_chipPanel",
+			"editorAskRow": "_SVViG_editorAskRow",
 			"editorError": "_SVViG_editorError",
-			"toolbarBelow": "_SVViG_toolbarBelow",
-			"sentCardQuote": "_SVViG_sentCardQuote",
-			"hint": "_SVViG_hint",
-			"sentChipRow": "_SVViG_sentChipRow",
-			"deleteButton": "_SVViG_deleteButton",
-			"sentCardNote": "_SVViG_sentCardNote",
 			"confirmButton": "_SVViG_confirmButton",
-			"cancelButton": "_SVViG_cancelButton",
+			"toolbar": "_SVViG_toolbar",
+			"editorInput": "_SVViG_editorInput",
+			"toolbarButton": "_SVViG_toolbarButton",
+			"chip": "_SVViG_chip",
+			"chipNumber": "_SVViG_chipNumber",
+			"sentCardQuote": "_SVViG_sentCardQuote",
 			"editorFooter": "_SVViG_editorFooter",
+			"sentCardNote": "_SVViG_sentCardNote",
+			"hint": "_SVViG_hint",
 			"sentCardTitle": "_SVViG_sentCardTitle",
-			"badge": "_SVViG_badge",
-			"editorTarget": "_SVViG_editorTarget",
-			"chipNumber": "_SVViG_chipNumber",
-			"editorAskRow": "_SVViG_editorAskRow",
+			"chipPanel": "_SVViG_chipPanel",
+			"sentChip": "_SVViG_sentChip",
+			"dshSidenoteHintIn": "_SVViG_dshSidenoteHintIn",
+			"editorTextarea": "_SVViG_editorTextarea",
+			"editorEdit": "_SVViG_editorEdit",
 			"editorSpacer": "_SVViG_editorSpacer",
-			"hintClose": "_SVViG_hintClose",
-			"editorInput": "_SVViG_editorInput",
+			"badgeSent": "_SVViG_badgeSent",
+			"chipNote": "_SVViG_chipNote",
+			"chipRow": "_SVViG_chipRow",
+			"highlight": "_SVViG_highlight",
 			"saveButton": "_SVViG_saveButton",
-			"toolbarButton": "_SVViG_toolbarButton",
-			"editorEdit": "_SVViG_editorEdit",
-			"chipWrap": "_SVViG_chipWrap",
-			"sentChip": "_SVViG_sentChip",
-			"toolbar": "_SVViG_toolbar"
+			"chipText": "_SVViG_chipText",
+			"sentChipRow": "_SVViG_sentChipRow",
+			"toolbarBelow": "_SVViG_toolbarBelow",
+			"deleteButton": "_SVViG_deleteButton",
+			"chipRemove": "_SVViG_chipRemove",
+			"editorNew": "_SVViG_editorNew",
+			"chipClearAll": "_SVViG_chipClearAll",
+			"badge": "_SVViG_badge"
 		};
 		//#endregion
 		//#region src/client/annotate/hint.tsx
@@ -5584,6 +5584,23 @@ window.__ModuleLoader__.load({
 		function installSendInterceptor(ctx, store, reflow) {
 			/** 重入/连按护栏：事务进行中吞掉命中识别面的 Enter/点击（不重复驱动）。 */
 			let committing = false;
+			/**
+			* 手势尾随 click 的一次性吞并。pointerdown 提交后，同一次点击的 click 仍会
+			* 到达，而此时宿主主按钮已按 `primaryStops = running && empty` 变身「停止」
+			* ——放行它会立刻 `stop()` 掉刚发起的这一轮（表现：assistant/attempt 空流、
+			* 缺 turn/end、且没有任何错误提示）。只吞这一发，并带兜底超时。
+			*/
+			let swallowNextClick = false;
+			let swallowTimer = 0;
+			const clearSwallow = () => {
+				swallowNextClick = false;
+				window.clearTimeout(swallowTimer);
+			};
+			const armSwallow = () => {
+				swallowNextClick = true;
+				window.clearTimeout(swallowTimer);
+				swallowTimer = window.setTimeout(clearSwallow, 2e3);
+			};
 			const currentSessionId = () => {
 				try {
 					return ctx.sessions.list.getSnapshot().current ?? "";
@@ -5663,6 +5680,12 @@ window.__ModuleLoader__.load({
 				const target = event.target;
 				if (!(target instanceof Element)) return;
 				if (target.closest("[data-composer-seat]") === null) return;
+				if (swallowNextClick) {
+					clearSwallow();
+					event.preventDefault();
+					event.stopImmediatePropagation();
+					return;
+				}
 				const button = target.closest("button");
 				if (button === null) return;
 				if (committing) {
@@ -5675,11 +5698,35 @@ window.__ModuleLoader__.load({
 				event.preventDefault();
 				event.stopImmediatePropagation();
 			};
+			/**
+			* 空草稿补位：只接管「因空草稿而 disabled」的主按钮。enabled 时立即放行，
+			* 正常路径仍由上面的 click 拦截负责 —— 二者以 button.disabled 互斥。
+			*/
+			const onPointerDown = (event) => {
+				if (event.button !== 0) return;
+				const target = event.target;
+				if (!(target instanceof Element)) return;
+				const button = target.closest("button");
+				if (!(button instanceof HTMLButtonElement)) return;
+				if (!button.disabled) return;
+				if (button !== findSendButtonInCard()) return;
+				if (committing) return;
+				const sessionId = currentSessionId();
+				if (sessionId === "") return;
+				const input = resolveInput(ctx, sessionId);
+				if (input === void 0 || input.state.getSnapshot().draft.trim() !== "") return;
+				if (!hijack()) return;
+				armSwallow();
+				event.preventDefault();
+				event.stopImmediatePropagation();
+			};
 			document.addEventListener("keydown", onKeyDown, true);
 			document.addEventListener("click", onClick, true);
+			document.addEventListener("pointerdown", onPointerDown, true);
 			return () => {
 				document.removeEventListener("keydown", onKeyDown, true);
 				document.removeEventListener("click", onClick, true);
+				document.removeEventListener("pointerdown", onPointerDown, true);
 			};
 		}
 		//#endregion

package/lib/types/client/annotate/send.d.ts

@@ -19,6 +19,17 @@
  * plain 且草稿清空 = 发出（markSent 只翻当时拼进去的那批 id，C2 P1-3）；
  * 回到 plain 而草稿未清 = 发送失败（宿主 notice + 留稿）→ 仅在草稿仍以
  * 我们拼的前缀开头时剥离回滚（C2 P2-3）；相位未到终态前绝不回滚。
+ *
+ * 空草稿补位：宿主主按钮在 `draft.trim()==="" && attachments.length===0` 时
+ * 被置为原生 `disabled`（dsh-client-ui-conversation 的 `empty`），而注释/回流
+ * 按设计不进草稿 —— 于是此时**没有任何可达的发送手势**：浏览器不为 disabled
+ * 的按钮派发 `click`（`mousedown` 同样不发），只有 `pointerdown` 仍会到达它
+ * （Chromium / Firefox / WebKit 实测一致）。因此对「空草稿导致 disabled 的
+ * 主按钮」补一条 pointerdown 拦截；enabled 时一切照旧走 click，两条路径以
+ * `button.disabled` 互斥，不会双驱动。**该手势尾随的 click 必须一并吞掉**：
+ * 提交瞬间草稿变空，宿主主按钮随即按 `primaryStops = running && empty` 变身
+ * 「停止」，放行那一发 click 会立刻 `stop()` 掉刚发起的这一轮 —— 症状是
+ * `assistant/attempt` 空流、缺 `turn/end`、界面上却没有任何错误提示。
  */
 import type { Context, SessionId, SessionInput } from '../host/contracts.ts';
 import type { AnnotationStore } from './model.ts';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-sidenote",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "DSH web plugin: Codex-style side chat (fork the current session into a persistent side panel) + selection annotations with numbered badges and a composer chip. A thin consumer of dsh-better-sidebar. / Codex 风格侧边聊天 + 划选注释的 DSH 插件。",
   "type": "module",
   "license": "MIT",

package/src/client/annotate/send.ts

@@ -19,6 +19,17 @@
  * plain 且草稿清空 = 发出（markSent 只翻当时拼进去的那批 id，C2 P1-3）；
  * 回到 plain 而草稿未清 = 发送失败（宿主 notice + 留稿）→ 仅在草稿仍以
  * 我们拼的前缀开头时剥离回滚（C2 P2-3）；相位未到终态前绝不回滚。
+ *
+ * 空草稿补位：宿主主按钮在 `draft.trim()==="" && attachments.length===0` 时
+ * 被置为原生 `disabled`（dsh-client-ui-conversation 的 `empty`），而注释/回流
+ * 按设计不进草稿 —— 于是此时**没有任何可达的发送手势**：浏览器不为 disabled
+ * 的按钮派发 `click`（`mousedown` 同样不发），只有 `pointerdown` 仍会到达它
+ * （Chromium / Firefox / WebKit 实测一致）。因此对「空草稿导致 disabled 的
+ * 主按钮」补一条 pointerdown 拦截；enabled 时一切照旧走 click，两条路径以
+ * `button.disabled` 互斥，不会双驱动。**该手势尾随的 click 必须一并吞掉**：
+ * 提交瞬间草稿变空，宿主主按钮随即按 `primaryStops = running && empty` 变身
+ * 「停止」，放行那一发 click 会立刻 `stop()` 掉刚发起的这一轮 —— 症状是
+ * `assistant/attempt` 空流、缺 `turn/end`、界面上却没有任何错误提示。
  */
 import type { Context, ConversationService, SessionId, SessionInput } from '../host/contracts.ts'
 import { buildProtocolBlock } from './format.ts'
@@ -56,6 +67,25 @@ export function installSendInterceptor(ctx: Context, store: AnnotationStore, ref
   /** 重入/连按护栏：事务进行中吞掉命中识别面的 Enter/点击（不重复驱动）。 */
   let committing = false
 
+  /**
+   * 手势尾随 click 的一次性吞并。pointerdown 提交后，同一次点击的 click 仍会
+   * 到达，而此时宿主主按钮已按 `primaryStops = running && empty` 变身「停止」
+   * ——放行它会立刻 `stop()` 掉刚发起的这一轮（表现：assistant/attempt 空流、
+   * 缺 turn/end、且没有任何错误提示）。只吞这一发，并带兜底超时。
+   */
+  let swallowNextClick = false
+  let swallowTimer = 0
+  const clearSwallow = (): void => {
+    swallowNextClick = false
+    window.clearTimeout(swallowTimer)
+  }
+  const armSwallow = (): void => {
+    swallowNextClick = true
+    window.clearTimeout(swallowTimer)
+    // 兜底：手势没有产生 click（指针移出按钮等）时不至于吞掉后续无关点击。
+    swallowTimer = window.setTimeout(clearSwallow, 2_000)
+  }
+
   const currentSessionId = (): string => {
     try {
       return ctx.sessions.list.getSnapshot().current ?? ''
@@ -159,6 +189,13 @@ export function installSendInterceptor(ctx: Context, store: AnnotationStore, ref
     if (!(target instanceof Element)) return
     const seat = target.closest('[data-composer-seat]')
     if (seat === null) return
+    // 尾随 click：必须先于按钮识别吞掉（见 armSwallow），否则宿主按「停止」处理。
+    if (swallowNextClick) {
+      clearSwallow()
+      event.preventDefault()
+      event.stopImmediatePropagation()
+      return
+    }
     const button = target.closest('button')
     if (button === null) return
     if (committing) {
@@ -175,10 +212,39 @@ export function installSendInterceptor(ctx: Context, store: AnnotationStore, ref
     event.stopImmediatePropagation()
   }
 
+  /**
+   * 空草稿补位：只接管「因空草稿而 disabled」的主按钮。enabled 时立即放行，
+   * 正常路径仍由上面的 click 拦截负责 —— 二者以 button.disabled 互斥。
+   */
+  const onPointerDown = (event: PointerEvent): void => {
+    // 只认主键：右键/中键的 pointerdown 同样到达 disabled 按钮（已实证），
+    // 不检查会把「打开上下文菜单」误当发送手势。
+    if (event.button !== 0) return
+    const target = event.target
+    if (!(target instanceof Element)) return
+    const button = target.closest('button')
+    if (!(button instanceof HTMLButtonElement)) return
+    if (!button.disabled) return
+    if (button !== findSendButtonInCard()) return
+    if (committing) return
+    // disabled 的成因必须是空草稿：离线/无模型等其它成因不属本拦截器授权范围。
+    const sessionId = currentSessionId()
+    if (sessionId === '') return
+    const input = resolveInput(ctx, sessionId)
+    if (input === undefined || input.state.getSnapshot().draft.trim() !== '') return
+    if (!hijack()) return
+    // 同一次手势的 click 紧随其后，而主按钮此刻已变身「停止」——吞掉这一发。
+    armSwallow()
+    event.preventDefault()
+    event.stopImmediatePropagation()
+  }
+
   document.addEventListener('keydown', onKeyDown, true)
   document.addEventListener('click', onClick, true)
+  document.addEventListener('pointerdown', onPointerDown, true)
   return () => {
     document.removeEventListener('keydown', onKeyDown, true)
     document.removeEventListener('click', onClick, true)
+    document.removeEventListener('pointerdown', onPointerDown, true)
   }
 }