dsh-sidenote 0.4.5 → 0.4.6

package/lib/client.js

@@ -3269,95 +3269,95 @@ ${entries.map((entry) => {
 			document.head.appendChild(tag);
 		}
 		var sidechat_module_css_default = {
+			"sentChip": "_5KEEsG_sentChip",
+			"pendingQuestion": "_5KEEsG_pendingQuestion",
+			"assistantBody": "_5KEEsG_assistantBody",
+			"pendingTitle": "_5KEEsG_pendingTitle",
+			"pendingQHeader": "_5KEEsG_pendingQHeader",
+			"pendingBtnPrimary": "_5KEEsG_pendingBtnPrimary",
+			"assistantRow": "_5KEEsG_assistantRow",
+			"reflowButton": "_5KEEsG_reflowButton",
+			"composerFoot": "_5KEEsG_composerFoot",
+			"slashItemDetail": "_5KEEsG_slashItemDetail",
+			"inheritedBody": "_5KEEsG_inheritedBody",
+			"reasoningBody": "_5KEEsG_reasoningBody",
+			"pendingQText": "_5KEEsG_pendingQText",
+			"flowRowError": "_5KEEsG_flowRowError",
+			"toolRunning": "_5KEEsG_toolRunning",
+			"attachButton": "_5KEEsG_attachButton",
+			"slashGroupTitle": "_5KEEsG_slashGroupTitle",
 			"pendingOptionActive": "_5KEEsG_pendingOptionActive",
-			"sendButton": "_5KEEsG_sendButton",
-			"composerCard": "_5KEEsG_composerCard",
-			"modelLabel": "_5KEEsG_modelLabel",
+			"toolBody": "_5KEEsG_toolBody",
+			"pendingDesc": "_5KEEsG_pendingDesc",
 			"transcript": "_5KEEsG_transcript",
-			"toolLocations": "_5KEEsG_toolLocations",
-			"densityToggle": "_5KEEsG_densityToggle",
-			"dotRunning": "_5KEEsG_dotRunning",
-			"dotPending": "_5KEEsG_dotPending",
-			"pendingCard": "_5KEEsG_pendingCard",
 			"headerSide": "_5KEEsG_headerSide",
-			"pendingActions": "_5KEEsG_pendingActions",
-			"userRow": "_5KEEsG_userRow",
-			"input": "_5KEEsG_input",
+			"reasoning": "_5KEEsG_reasoning",
+			"composerChips": "_5KEEsG_composerChips",
+			"pendingOption": "_5KEEsG_pendingOption",
+			"rowActions": "_5KEEsG_rowActions",
 			"snapshotText": "_5KEEsG_snapshotText",
-			"writeNotice": "_5KEEsG_writeNotice",
-			"empty": "_5KEEsG_empty",
-			"composer": "_5KEEsG_composer",
-			"slashItemActive": "_5KEEsG_slashItemActive",
+			"pendingActions": "_5KEEsG_pendingActions",
+			"parentStrip": "_5KEEsG_parentStrip",
 			"root": "_5KEEsG_root",
-			"toolBody": "_5KEEsG_toolBody",
-			"sentChipRow": "_5KEEsG_sentChipRow",
+			"actionGroup": "_5KEEsG_actionGroup",
+			"emptyTitle": "_5KEEsG_emptyTitle",
+			"flowRow": "_5KEEsG_flowRow",
+			"jumpBottom": "_5KEEsG_jumpBottom",
+			"emptyText": "_5KEEsG_emptyText",
+			"slashItemName": "_5KEEsG_slashItemName",
+			"attachImg": "_5KEEsG_attachImg",
+			"attachRemove": "_5KEEsG_attachRemove",
+			"pendingReason": "_5KEEsG_pendingReason",
 			"modelSelect": "_5KEEsG_modelSelect",
-			"pendingTitle": "_5KEEsG_pendingTitle",
-			"toolGenericBody": "_5KEEsG_toolGenericBody",
-			"stopButton": "_5KEEsG_stopButton",
-			"toolBodyText": "_5KEEsG_toolBodyText",
-			"pendingBtnGhost": "_5KEEsG_pendingBtnGhost",
-			"pendingBtnPrimary": "_5KEEsG_pendingBtnPrimary",
-			"streamingHint": "_5KEEsG_streamingHint",
-			"writeNoticeClose": "_5KEEsG_writeNoticeClose",
-			"toolError": "_5KEEsG_toolError",
 			"pendingBar": "_5KEEsG_pendingBar",
-			"densityRow": "_5KEEsG_densityRow",
-			"slashItemDetail": "_5KEEsG_slashItemDetail",
-			"pendingQuestion": "_5KEEsG_pendingQuestion",
-			"attachButton": "_5KEEsG_attachButton",
-			"assistantBody": "_5KEEsG_assistantBody",
-			"body": "_5KEEsG_body",
-			"slashGroupTitle": "_5KEEsG_slashGroupTitle",
-			"errorRow": "_5KEEsG_errorRow",
-			"slashItemName": "_5KEEsG_slashItemName",
+			"todoBody": "_5KEEsG_todoBody",
+			"input": "_5KEEsG_input",
+			"toolHead": "_5KEEsG_toolHead",
 			"userBubble": "_5KEEsG_userBubble",
-			"attachImg": "_5KEEsG_attachImg",
+			"toolGenericBody": "_5KEEsG_toolGenericBody",
+			"toolLocations": "_5KEEsG_toolLocations",
 			"snapshotBody": "_5KEEsG_snapshotBody",
-			"pendingOption": "_5KEEsG_pendingOption",
+			"slashItemActive": "_5KEEsG_slashItemActive",
+			"pendingOptionDesc": "_5KEEsG_pendingOptionDesc",
+			"stopButton": "_5KEEsG_stopButton",
+			"pendingBtnGhost": "_5KEEsG_pendingBtnGhost",
 			"toolCard": "_5KEEsG_toolCard",
-			"parentStrip": "_5KEEsG_parentStrip",
-			"pendingCustom": "_5KEEsG_pendingCustom",
-			"attachRail": "_5KEEsG_attachRail",
-			"stateScreen": "_5KEEsG_stateScreen",
-			"nativeHost": "_5KEEsG_nativeHost",
-			"emptyTitle": "_5KEEsG_emptyTitle",
-			"attachThumb": "_5KEEsG_attachThumb",
-			"sentChip": "_5KEEsG_sentChip",
-			"dotIdle": "_5KEEsG_dotIdle",
-			"rowActions": "_5KEEsG_rowActions",
-			"todoDot": "_5KEEsG_todoDot",
-			"composerFoot": "_5KEEsG_composerFoot",
 			"rowPreview": "_5KEEsG_rowPreview",
-			"inheritedBody": "_5KEEsG_inheritedBody",
-			"todoBody": "_5KEEsG_todoBody",
-			"actionGroup": "_5KEEsG_actionGroup",
+			"densityToggle": "_5KEEsG_densityToggle",
+			"pendingHead": "_5KEEsG_pendingHead",
+			"dotRunning": "_5KEEsG_dotRunning",
 			"stateDetail": "_5KEEsG_stateDetail",
-			"pendingQText": "_5KEEsG_pendingQText",
-			"reasoning": "_5KEEsG_reasoning",
-			"flowRowError": "_5KEEsG_flowRowError",
-			"toolHead": "_5KEEsG_toolHead",
-			"slashItem": "_5KEEsG_slashItem",
-			"toolRunning": "_5KEEsG_toolRunning",
-			"reasoningBody": "_5KEEsG_reasoningBody",
-			"reflowButton": "_5KEEsG_reflowButton",
-			"todoItem": "_5KEEsG_todoItem",
-			"jumpBottom": "_5KEEsG_jumpBottom",
-			"attachRemove": "_5KEEsG_attachRemove",
-			"pendingQHeader": "_5KEEsG_pendingQHeader",
-			"pendingOptionDesc": "_5KEEsG_pendingOptionDesc",
-			"todoText": "_5KEEsG_todoText",
-			"emptyText": "_5KEEsG_emptyText",
+			"dotPending": "_5KEEsG_dotPending",
+			"toolBodyText": "_5KEEsG_toolBodyText",
+			"dotIdle": "_5KEEsG_dotIdle",
+			"userRow": "_5KEEsG_userRow",
 			"sidechat-pulse": "_5KEEsG_sidechat-pulse",
-			"pendingDesc": "_5KEEsG_pendingDesc",
+			"modelLabel": "_5KEEsG_modelLabel",
+			"todoDot": "_5KEEsG_todoDot",
+			"empty": "_5KEEsG_empty",
+			"pendingCard": "_5KEEsG_pendingCard",
+			"writeNotice": "_5KEEsG_writeNotice",
+			"todoItem": "_5KEEsG_todoItem",
+			"pendingCustom": "_5KEEsG_pendingCustom",
+			"body": "_5KEEsG_body",
+			"writeNoticeClose": "_5KEEsG_writeNoticeClose",
+			"attachRail": "_5KEEsG_attachRail",
+			"slashMenu": "_5KEEsG_slashMenu",
+			"slashItem": "_5KEEsG_slashItem",
+			"sendButton": "_5KEEsG_sendButton",
 			"noticeRow": "_5KEEsG_noticeRow",
-			"pendingReason": "_5KEEsG_pendingReason",
-			"pendingHead": "_5KEEsG_pendingHead",
-			"composerChips": "_5KEEsG_composerChips",
+			"toolError": "_5KEEsG_toolError",
+			"composer": "_5KEEsG_composer",
+			"streamingHint": "_5KEEsG_streamingHint",
+			"todoText": "_5KEEsG_todoText",
+			"densityRow": "_5KEEsG_densityRow",
+			"nativeHost": "_5KEEsG_nativeHost",
+			"sentChipRow": "_5KEEsG_sentChipRow",
 			"emptyIcon": "_5KEEsG_emptyIcon",
-			"flowRow": "_5KEEsG_flowRow",
-			"assistantRow": "_5KEEsG_assistantRow",
-			"slashMenu": "_5KEEsG_slashMenu"
+			"errorRow": "_5KEEsG_errorRow",
+			"attachThumb": "_5KEEsG_attachThumb",
+			"stateScreen": "_5KEEsG_stateScreen",
+			"composerCard": "_5KEEsG_composerCard"
 		};
 		//#endregion
 		//#region src/client/chat/ToolCard.tsx
@@ -6237,43 +6237,43 @@ ${entries.map((entry) => {
 			document.head.appendChild(tag);
 		}
 		var annotate_module_css_default = {
-			"chipClearAll": "_SVViG_chipClearAll",
-			"badge": "_SVViG_badge",
+			"confirmButton": "_SVViG_confirmButton",
+			"editorTarget": "_SVViG_editorTarget",
+			"highlight": "_SVViG_highlight",
+			"toolbarBelow": "_SVViG_toolbarBelow",
 			"editorFooter": "_SVViG_editorFooter",
-			"hintClose": "_SVViG_hintClose",
-			"sentCardQuote": "_SVViG_sentCardQuote",
-			"chipRow": "_SVViG_chipRow",
-			"chipRemove": "_SVViG_chipRemove",
-			"chipNumber": "_SVViG_chipNumber",
-			"editorError": "_SVViG_editorError",
-			"editorAskRow": "_SVViG_editorAskRow",
 			"badgeSent": "_SVViG_badgeSent",
-			"hint": "_SVViG_hint",
-			"toolbarBelow": "_SVViG_toolbarBelow",
+			"badge": "_SVViG_badge",
 			"chipNote": "_SVViG_chipNote",
-			"saveButton": "_SVViG_saveButton",
-			"chip": "_SVViG_chip",
-			"chipWrap": "_SVViG_chipWrap",
+			"editorAskRow": "_SVViG_editorAskRow",
+			"editorError": "_SVViG_editorError",
+			"toolbar": "_SVViG_toolbar",
+			"editorNew": "_SVViG_editorNew",
+			"editorEdit": "_SVViG_editorEdit",
+			"sentCardTitle": "_SVViG_sentCardTitle",
+			"sentChip": "_SVViG_sentChip",
+			"chipClearAll": "_SVViG_chipClearAll",
+			"chipText": "_SVViG_chipText",
+			"editorInput": "_SVViG_editorInput",
+			"dshSidenoteHintIn": "_SVViG_dshSidenoteHintIn",
 			"sentChipRow": "_SVViG_sentChipRow",
+			"editorSpacer": "_SVViG_editorSpacer",
 			"deleteButton": "_SVViG_deleteButton",
 			"cancelButton": "_SVViG_cancelButton",
+			"chipWrap": "_SVViG_chipWrap",
 			"toolbarButton": "_SVViG_toolbarButton",
-			"sentChip": "_SVViG_sentChip",
-			"editorTarget": "_SVViG_editorTarget",
-			"confirmButton": "_SVViG_confirmButton",
+			"editorTextarea": "_SVViG_editorTextarea",
+			"saveButton": "_SVViG_saveButton",
 			"editorAsk": "_SVViG_editorAsk",
-			"sentCardTitle": "_SVViG_sentCardTitle",
-			"editorNew": "_SVViG_editorNew",
+			"chip": "_SVViG_chip",
 			"chipPanel": "_SVViG_chipPanel",
-			"editorEdit": "_SVViG_editorEdit",
-			"editorTextarea": "_SVViG_editorTextarea",
-			"highlight": "_SVViG_highlight",
-			"editorSpacer": "_SVViG_editorSpacer",
-			"editorInput": "_SVViG_editorInput",
-			"chipText": "_SVViG_chipText",
-			"toolbar": "_SVViG_toolbar",
-			"dshSidenoteHintIn": "_SVViG_dshSidenoteHintIn",
-			"sentCardNote": "_SVViG_sentCardNote"
+			"chipRemove": "_SVViG_chipRemove",
+			"sentCardNote": "_SVViG_sentCardNote",
+			"hint": "_SVViG_hint",
+			"chipRow": "_SVViG_chipRow",
+			"chipNumber": "_SVViG_chipNumber",
+			"sentCardQuote": "_SVViG_sentCardQuote",
+			"hintClose": "_SVViG_hintClose"
 		};
 		//#endregion
 		//#region src/client/annotate/hint.tsx
@@ -6530,7 +6530,7 @@ ${entries.map((entry) => {
 						}
 						closeEditor();
 					}
-				}),
+				}, `${editor.annotationId}:${editor.mode}`),
 				sideDraft !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SideChatNoteEditor, {
 					x: sideDraft.x,
 					y: sideDraft.y,
@@ -6795,12 +6795,17 @@ ${entries.map((entry) => {
 		}
 		/**
 		* The annotation editor popover. 新建态: input + ✓ 确认 (允许空注解直接保存;
-		* 点击外部/Esc 取消且无显式取消按钮). 重开态: 已有注解 + 🗑 删除 + 取消/保存.
+		* 点击外部 = 确认、Esc = 取消，无显式取消按钮). 重开态: 已有注解 + 🗑 删除 +
+		* 取消/保存.
+		*
+		* 导出供单测直接挂载（tests/annotate-editor.spec.tsx）。
 		*/
 		function AnnotationEditor(props) {
 			useLocaleTick();
 			const [note, setNote] = (0, react.useState)(props.annotation.note);
 			const rootRef = (0, react.useRef)(null);
+			const noteRef = (0, react.useRef)(note);
+			noteRef.current = note;
 			(0, react.useEffect)(() => {
 				const onKeyDown = (event) => {
 					if (event.key === "Escape") {
@@ -6813,7 +6818,8 @@ ${entries.map((entry) => {
 					if (root === null || !(event.target instanceof Node)) return;
 					if (root.contains(event.target)) return;
 					if (event.target instanceof Element && event.target.closest("[data-dsh-sidenote]") !== null) return;
-					props.onCancel();
+					if (props.mode === "new") props.onSave(noteRef.current);
+					else props.onCancel();
 				};
 				document.addEventListener("keydown", onKeyDown, true);
 				document.addEventListener("mousedown", onMouseDown, true);

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

@@ -1,7 +1,7 @@
 import { Component } from 'react';
 import type { ReactNode } from 'react';
 import type { Context } from '../host/contracts.ts';
-import type { AnnotationStore } from './model.ts';
+import type { Annotation, AnnotationStore } from './model.ts';
 import type { SelectionController } from './selection.ts';
 interface OverlayProps {
     readonly ctx: Context;
@@ -24,4 +24,20 @@ export declare class AnnotateErrorBoundary extends Component<{
     render(): ReactNode;
 }
 export declare function AnnotateOverlay(props: OverlayProps): ReactNode;
+/**
+ * The annotation editor popover. 新建态: input + ✓ 确认 (允许空注解直接保存;
+ * 点击外部 = 确认、Esc = 取消，无显式取消按钮). 重开态: 已有注解 + 🗑 删除 +
+ * 取消/保存.
+ *
+ * 导出供单测直接挂载（tests/annotate-editor.spec.tsx）。
+ */
+export declare function AnnotationEditor(props: {
+    annotation: Annotation;
+    mode: 'new' | 'edit';
+    x: number;
+    y: number;
+    onSave: (note: string) => void;
+    onDelete: () => void;
+    onCancel: () => void;
+}): ReactNode;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-sidenote",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "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. Runs directly on the DSH native right sidebar (DSH ≥ 0.1.5); dsh-better-sidebar is an optional peer for older hosts. / Codex 风格侧边聊天 + 划选注释的 DSH 插件。",
   "type": "module",
   "license": "MIT",

package/src/client/annotate/overlay.tsx

@@ -222,6 +222,7 @@ function AnnotateOverlayInner({ ctx, store, controller }: OverlayProps): ReactNo
       />
       {editingAnnotation !== undefined && editor !== null && (
         <AnnotationEditor
+          key={`${editor.annotationId}:${editor.mode}`}
           annotation={editingAnnotation}
           mode={editor.mode}
           x={editor.x}
@@ -542,9 +543,12 @@ function BadgeLayer(props: {
 
 /**
  * The annotation editor popover. 新建态: input + ✓ 确认 (允许空注解直接保存;
- * 点击外部/Esc 取消且无显式取消按钮). 重开态: 已有注解 + 🗑 删除 + 取消/保存.
+ * 点击外部 = 确认、Esc = 取消，无显式取消按钮). 重开态: 已有注解 + 🗑 删除 +
+ * 取消/保存.
+ *
+ * 导出供单测直接挂载（tests/annotate-editor.spec.tsx）。
  */
-function AnnotationEditor(props: {
+export function AnnotationEditor(props: {
   annotation: Annotation
   mode: 'new' | 'edit'
   x: number
@@ -556,6 +560,10 @@ function AnnotationEditor(props: {
   useLocaleTick()
   const [note, setNote] = useState(props.annotation.note)
   const rootRef = useRef<HTMLDivElement | null>(null)
+  // 外点确认读「当前」注解：下面的 effect 是空依赖闭包，直接捕获 note 会永远停在
+  // 首次渲染的值——用户敲完注解再点别处，那段注解会静默丢掉。
+  const noteRef = useRef(note)
+  noteRef.current = note
 
   useEffect(() => {
     const onKeyDown = (event: KeyboardEvent): void => {
@@ -571,7 +579,11 @@ function AnnotationEditor(props: {
       // 本插件自身的 DOM（角标/工具条）不算「外部」：点击角标由它自己的
       // click 处理器接管编辑器，不能先被外部点击取消掉。
       if (event.target instanceof Element && event.target.closest('[data-dsh-sidenote]') !== null) return
-      props.onCancel()
+      // 新建态点外部 = 确认这一条：点输入框准备写问题是最常见的下一步动作，以前这里
+      // 走 onCancel → 刚创建的注释被整条删除，用户划选的引用凭空消失（Esc 才是显式放弃）。
+      // 重开态点外部仍是取消——只关编辑器，已有注解不受影响。
+      if (props.mode === 'new') props.onSave(noteRef.current)
+      else props.onCancel()
     }
     document.addEventListener('keydown', onKeyDown, true)
     document.addEventListener('mousedown', onMouseDown, true)