dsh-prompt-rewriter 1.6.0 → 1.6.2

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 记录每个**已发布**版本对使用者可见的变化。中英双语并列，中文在前。
 
+## 1.6.2
+
+**中文**
+
+- 增强进行中的鱼尾动效改用品牌蓝。此前它跟随按钮的文字色，深色主题下接近白色，与旁边的鱼形图标不同色。
+- 输入框里的图片读取更可靠：宿主服务取不到时改从输入框自身的通道取图；两处都无法回答时不再静默跳过，文字改写照常完成，状态区会告诉你少读了几张。
+
+**English**
+
+- The tail animation shown while an enhancement runs now uses the brand blue. It previously followed the button's text colour, which is near white in the dark theme and did not match the fish icon beside it.
+- Composer images are read more reliably: when the host service cannot answer, the composer's own channel is used instead; when neither can, the images are no longer skipped silently — the text-only rewrite still completes and the status area reports how many were missed.
 ## 1.6.0
 
 **中文**
@@ -86,4 +97,4 @@
 
 **English**
 
-- Added the bilingual README and screenshots; fixed images and the Chinese guide missing from the npm package.
+- Added the bilingual README and screenshots; fixed images and the Chinese guide missing from the npm package.

package/README.md

@@ -43,7 +43,7 @@ An enhancement is a real model call, and **how fast the result comes back depend
 
 If it feels slow, switch the session to a model that is more stable and responds faster — the same draft can take a few seconds on one model and well over ten on another. The button does not favour any particular model; it uses whichever one you picked.
 
-> Want a fixed model just for enhancement, without affecting normal chat? Open `Settings → Prompt rewriter` and turn on **Use a fixed model**.
+> Want a fixed model just for enhancement, without affecting normal chat? Open `Settings → Prompt Enhance` and turn on **Use a fixed model**.
 
 ### You can navigate away mid-rewrite
 
@@ -55,7 +55,7 @@ That wasn't true in 1.0.x: switching sessions aborted the task, and coming back
 
 ### Keyboard shortcut (off by default)
 
-Turn it on at **Settings → Prompt rewriter → Shortcut**. Desktop uses `Ctrl+E` (`Cmd+E` on macOS); the browser uses `Ctrl+Alt+E` (`Cmd+Alt+E`).
+Turn it on at **Settings → Prompt Enhance → Shortcut**. Desktop uses `Ctrl+E` (`Cmd+E` on macOS); the browser uses `Ctrl+Alt+E` (`Cmd+Alt+E`).
 
 - Press once to enhance; press again while it runs to pause. It acts on the composer of the current conversation.
 - **Same as clicking the icon** — the shortcut runs the icon's own click handler, including its undo state, so the two paths cannot drift. Restoring a draft stays on the button or `Ctrl+Z`.
@@ -95,7 +95,7 @@ Only images **currently sitting in the composer** — **never images from earlie
 
 ## Settings
 
-`Settings → Prompt rewriter`. Three switches and one dropdown, affecting **only this button, never normal sending**.
+`Settings → Prompt Enhance`. Four switches and one dropdown, affecting **only this button, never normal sending**.
 
 ![Settings page](https://raw.githubusercontent.com/huaguoxingkong/dsh-prompt-rewriter/main/docs/images/03-settings-en.png)
 
@@ -104,6 +104,7 @@ Only images **currently sitting in the composer** — **never images from earlie
 | Use a fixed model | Off | Off: follow the model of the current conversation. On: always use the model picked below. |
 | Reference the conversation | **On** | Read earlier turns. More accurate, but extra tokens and slower on long chats. |
 | Reference composer images | Off | Images in the composer take part. Earlier messages' images are never read. |
+| Shortcut | Off | Lets the keyboard trigger a rewrite. Off by default, so no global key fires unasked. |
 
 - The model dropdown lists **the providers and models you actually have** — you can't type in one that doesn't exist.
 - Turning the model switch off does not clear your selection; flipping it back on shows the same choice.
@@ -137,7 +138,7 @@ Download the zip from [Releases](https://github.com/huaguoxingkong/dsh-prompt-re
 
 ## FAQ
 
-**Clicked it and nothing happened.** The composer is empty, or *Use a fixed model* is on with no model picked.
+**Clicked it and nothing happened.** The composer is empty, or *Use a fixed model* is on with no model picked. If you used the shortcut instead, check that the Shortcut switch is on and that no conflict is reported.
 
 **"No credentials configured for the current model."** That model has no key set. Switch models, or pin one that works in settings.
 
@@ -147,7 +148,7 @@ Download the zip from [Releases](https://github.com/huaguoxingkong/dsh-prompt-re
 
 ## Configuration
 
-Every `config` key on the profile plugin line is optional. The first five are managed by the settings page; the last seven are operational ceilings and are not exposed in the UI.
+Every `config` key on the profile plugin line is optional. The first six are managed by the settings page; the last seven are operational ceilings and are not exposed in the UI.
 
 ```yaml
 - id: dsh-prompt-rewriter
@@ -159,6 +160,7 @@ Every `config` key on the profile plugin line is optional. The first five are ma
     enhanceModel: ""
     referenceImages: false     # read composer images
     referenceContext: true     # read earlier turns
+    shortcutEnabled: false     # keyboard shortcut (off by default)
 
     # operational ceilings (not exposed in the UI)
     maxDraftChars: 8000        # draft length cap

package/README.zh.md

@@ -44,7 +44,7 @@
 
 如果觉得等得久，把会话用的模型换成一个更稳定、响应更快的——同一个草稿，换个模型往往就是几秒和十几秒的差别。这个按钮不挑模型，你选哪个它就用哪个。
 
-> 想固定用某个模型专门做增强（不影响正常对话）？去 `设置 → 提示词改写` 打开「用哪个模型改写」。
+> 想固定用某个模型专门做增强（不影响正常对话）？去 `设置 → 提示词增强` 打开「用哪个模型改写」。
 
 ### 增强过程中可以切走
 
@@ -56,7 +56,7 @@
 
 ### 键盘快捷键（默认关闭）
 
-到 **设置 → 提示词改写 → 快捷键** 打开开关。桌面端为 `Ctrl+E`（macOS `Cmd+E`），浏览器端为 `Ctrl+Alt+E`（macOS `Cmd+Alt+E`）。
+到 **设置 → 提示词增强 → 快捷键** 打开开关。桌面端为 `Ctrl+E`（macOS `Cmd+E`），浏览器端为 `Ctrl+Alt+E`（macOS `Cmd+Alt+E`）。
 
 - 按一次增强，运行中再按一次暂停。作用对象是当前会话的输入框。
 - **与点击图标完全等价**：走的是图标自身的点击入口，含「撤销」态，不存在第二套逻辑。回退仍由按钮或 `Ctrl+Z` 负责。
@@ -96,7 +96,7 @@
 
 ## 设置
 
-`设置 → 提示词改写`。三个开关一个下拉，**只影响这个按钮，不影响正常发送**。
+`设置 → 提示词增强`。四个开关一个下拉，**只影响这个按钮，不影响正常发送**。
 
 ![设置页](https://raw.githubusercontent.com/huaguoxingkong/dsh-prompt-rewriter/main/docs/images/03-settings.png)
 
@@ -105,6 +105,7 @@
 | 用哪个模型改写 | 关 | 关：跟随当前对话的模型。开：固定用下拉选定的模型。 |
 | 参考之前的对话 | **开** | 读前面的内容。更准，但多耗 token、长对话更慢。 |
 | 参考输入框里的图片 | 关 | 输入框里的图一起参与。历史消息里的图片始终不读。 |
+| 快捷键 | 关 | 打开后可用键盘触发改写。默认关闭，不会在你没要求时抢占按键。 |
 
 - 模型下拉列出你**实际拥有**的渠道与模型，填不进不存在的模型。
 - 关掉模型开关不会清空你的选择，重新打开还是同一个。
@@ -138,7 +139,7 @@ dsh plugin --profile web add github:huaguoxingkong/dsh-prompt-rewriter
 
 ## 常见问题
 
-**点了没反应？** 输入框是空的，或者「用哪个模型改写」打开了但没选模型。
+**点了没反应？** 输入框是空的，或者「用哪个模型改写」打开了但没选模型。如果用的是快捷键，先确认「快捷键」开关已打开、且没有提示冲突。
 
 **报「当前模型尚未配置可用的凭据」？** 这个模型没配 key。换个模型，或在设置里固定一个能用的。
 
@@ -148,7 +149,7 @@ dsh plugin --profile web add github:huaguoxingkong/dsh-prompt-rewriter
 
 ## 配置
 
-profile 插件行的 `config` 全部可选。前五项由设置页托管，后七项是运维上限，不暴露在界面上：
+profile 插件行的 `config` 全部可选。前六项由设置页托管，后七项是运维上限，不暴露在界面上：
 
 ```yaml
 - id: dsh-prompt-rewriter
@@ -160,6 +161,7 @@ profile 插件行的 `config` 全部可选。前五项由设置页托管，后
     enhanceModel: ""
     referenceImages: false     # 是否参考输入框图片
     referenceContext: true     # 是否参考前文
+    shortcutEnabled: false     # 键盘快捷键（默认关闭）
 
     # 运维上限（不暴露在设置页）
     maxDraftChars: 8000        # 草稿字符上限

package/client.js

@@ -75,7 +75,7 @@ window.__ModuleLoader__.load({
 			// Colour: the official brand blue, not `currentColor`. The tail is a graphic,
 			// not text, so inheriting the button's label colour made it render white on
 			// the dark composer — visually detached from the fish mark it replaces.
-			'.dsh-pe_twist{display:block;width:20px;height:16px;overflow:visible;color:inherit}',
+			'.dsh-pe_twist{display:block;width:20px;height:16px;overflow:visible;color:var(--dsw-alias-brand-primary-new-colorprimary-new-color,#4176e6)}',
 			'.dsh-pe_twist path{fill:currentColor;fill-rule:evenodd}',
 			'.dsh-pe_icon{display:block;width:15px;height:15px}',
 			// Context-mode mark: a dot on the seat that reports an EXPECTATION — "if you
@@ -708,10 +708,6 @@ window.__ModuleLoader__.load({
 			// feature is opt-in, so a global key never fires on a user who did not ask for
 			// it. Read from the same settings response as the other switches.
 			const [shortcutOn, setShortcutOn] = useState(false);
-			// Exposed on the seat as data-ctx-debug so a missing dot can be diagnosed
-			// without guessing: it records which of the two facts was false, and whether
-			// either request failed. Not shown to users; harmless in the DOM.
-			const [ctxProbe, setCtxProbe] = useState('pending');
 			useEffect(() => {
 				let cancelled = false;
 				const read = async () => {
@@ -730,16 +726,11 @@ window.__ModuleLoader__.load({
 						const allowed = settings?.ok === true && settings.values?.shortcutEnabled === true;
 						setShortcutOn(allowed);
 						taskStore.setShortcutEnabled(allowed);
-							setCtxProbe(
-							`sw=${switchOn ? 1 : 0},hc=${hasContext ? 1 : 0},`
-							+ `sHttp=${settingsResponse.status},cHttp=${statusResponse.status}`,
-						);
 					} catch (error) {
 						// An unreachable route means "we cannot promise context"; showing no dot
 						// is the honest default rather than promising a context-aware run.
 						if (!cancelled) {
 							setWillUseContext(false);
-							setCtxProbe(`error:${error?.message ?? 'unknown'}`);
 						}
 					}
 				};
@@ -819,19 +810,52 @@ window.__ModuleLoader__.load({
 		 * @param signal - cancellation.
 		 * @returns `{ images, skipped }`.
 		 */
-		async function readComposerImages(conversation, ids, signal) {
-			const images = [];
-			let skipped = 0;
-			if (!Array.isArray(ids) || ids.length === 0) return { images, skipped };
-			if (conversation === undefined || typeof conversation.resolveDraftAttachments !== 'function') {
-				return { images, skipped: ids.length };
+		/**
+		 * Resolve the composer draft descriptors for these ids.
+		 *
+		 * Two owners can answer, and which one is reachable depends on the shell:
+		 *
+		 * 1. the `conversation` client service, which owns the draft map;
+		 * 2. the composer action face handed to the slot, which exposes the same
+		 *    lookup when the host chooses to publish it there.
+		 *
+		 * Trying both removes the single point of failure that made every image come
+		 * back unreadable when the first owner was absent.
+		 *
+		 * @param inputActions - the composer action face from slot props.
+		 * @param ids - draft attachment ids.
+		 * @returns `{ descriptors, source }` where source is the owner that answered.
+		 */
+		function resolveDraftDescriptors(inputActions, ids) {
+			const conversation = conversationResolver();
+			if (conversation !== undefined && typeof conversation.resolveDraftAttachments === 'function') {
+				try {
+					return { descriptors: conversation.resolveDraftAttachments(ids) ?? [], source: 'service' };
+				} catch {
+					// Fall through to the action face.
+				}
 			}
-			let descriptors;
-			try {
-				descriptors = conversation.resolveDraftAttachments(ids) ?? [];
-			} catch {
-				return { images, skipped: ids.length };
+			if (inputActions !== undefined && typeof inputActions.resolveDraftAttachments === 'function') {
+				try {
+					return { descriptors: inputActions.resolveDraftAttachments(ids) ?? [], source: 'actions' };
+				} catch {
+					// Neither owner could answer.
+				}
 			}
+			return { descriptors: [], source: 'none' };
+		}
+
+		/**
+		 * Turn resolved draft descriptors into request images.
+		 *
+		 * @param descriptors - draft descriptors carrying the original browser `File`.
+		 * @param signal - cancellation.
+		 * @returns `{ images, skipped }`.
+		 */
+		async function readComposerImages(descriptors, signal) {
+			const images = [];
+			let skipped = 0;
+			if (!Array.isArray(descriptors) || descriptors.length === 0) return { images, skipped };
 			for (const descriptor of descriptors.slice(0, 4)) {
 				if (signal.aborted) return { images, skipped };
 				if (descriptor?.kind !== 'image') continue;
@@ -900,10 +924,17 @@ window.__ModuleLoader__.load({
 						// race entirely and keeps one authority for the switch.
 						// Resolved here, not at activation: the service mounts with the
 						// conversation plugin, which can come up after this plugin.
-						const conversation = attachmentIds.length > 0 ? conversationResolver() : undefined;
+						const drafts = attachmentIds.length > 0
+							? resolveDraftDescriptors(inputActions, attachmentIds)
+							: { descriptors: [], source: 'none' };
 						const collected = attachmentIds.length > 0
-							? await readComposerImages(conversation, attachmentIds, controller.signal)
+							? await readComposerImages(drafts.descriptors, controller.signal)
 							: { images: [], skipped: 0 };
+						if (attachmentIds.length > 0 && drafts.source === 'none') {
+							// Nothing could read the attachments. Report it through the same notice
+							// the Host uses for a skipped image, instead of dropping them silently.
+							collected.skipped = attachmentIds.length;
+						}
 							if (controller.signal.aborted) return;
 						const response = await fetch('/api/prompt-enhance', {
 							method: 'POST',
@@ -1112,7 +1143,6 @@ window.__ModuleLoader__.load({
 					className: 'dsh-pe_root',
 					'data-prompt-enhance': '1',
 					'data-context': showContextMark ? 'true' : 'false',
-					'data-ctx-debug': ctxProbe,
 					'data-notice': failure !== null ? 'true' : 'false',
 				},
 				h(
@@ -1371,7 +1401,6 @@ window.__ModuleLoader__.load({
 						// Keep the reason: an empty picker with no explanation is
 						// indistinguishable from a slow load, and the message is shown to the
 						// user instead of being swallowed.
-						if (typeof console !== 'undefined') console.warn('[dsh-prompt-rewriter] model catalog failed:', failure?.message ?? failure);
 						setCatalog({ status: 'error', groups: [] });
 					}
 				})();
@@ -1925,9 +1954,9 @@ window.__ModuleLoader__.load({
 							modals: [],
 						});
 						return dispose;
-					} catch (error) {
-						// Record the failure instead of letting `ctx.effect` swallow it; the
-						// console then explains why the key does nothing.
+					} catch {
+						// A throw here is swallowed by the effect wrapper; the keydown fallback
+						// below still serves the shortcut, so it must not fail activation.
 						return undefined;
 					}
 				}, 'dsh-prompt-rewriter: shortcut');
@@ -1994,10 +2023,9 @@ window.__ModuleLoader__.load({
 					};
 
 					/**
-					 * Walk the whole guard chain and report which link decided.
+					 * Does this keyboard event match a binding this plugin owns?
 					 *
-					 * Kept separate from `onKey` so the periodic probe can evaluate the same
-					 * chain without ever triggering an enhancement.
+					 * Kept separate from `onKey` so the pure judgement is testable on its own.
 					 */
 					const evaluate = (event) => {
 						const base = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-prompt-rewriter",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "One-click prompt enhancement beside the DeepSeek Harness composer: rewrites a draft in place without sending it.",
   "type": "module",
   "icon": "icon.svg",