dsh-prompt-enhance 0.1.1 → 0.1.2

package/README.md

@@ -110,7 +110,8 @@ Everything lives in the `prompt-enhance` settings namespace, edited from the web
 | `maxInputChars` | `12000` | Input character cap; over-limit drafts are **rejected, never truncated** |
 | `timeoutMs` | `60000` | End-to-end deadline of one call |
 | `systemPrompt` | built-in strategy | Replace the whole enhancement strategy if you prefer your own |
-| `shortcut` | `ctrl+alt+e` | Global shortcut spec (modifiers + one alphanumeric/function key); empty disables it |
+| `shortcut` | `ctrl+alt+e` | Global shortcut spec (at least one modifier + one alphanumeric/function key — bare keys are ignored so normal typing can never be swallowed); empty disables it |
+| `provider` + `model` values | — | Match the harness settings: each key under `llm-pi-ai.providers` (e.g. `zhipu`, `muyuu`) is a provider and each `models[].id` under it (e.g. `glm-5.3-flash`) is a model. Example pair: `provider: zhipu` + `model: glm-5.3-flash` |
 
 **Model routing precedence:** explicit settings pair → the route recorded in the current session's request header → the harness-wide default model (`agent-default-model`). If none of them names a route (e.g. a fresh session with no default model), the plugin fails with an actionable message instead of guessing.
 
@@ -147,6 +148,15 @@ Set `systemPrompt` in the settings to replace all of this with your own strategy
 
 Every failure surfaces inside the plugin's own panel; the composer draft is never modified by a failed call, so manual input continues undisturbed.
 
+## Security model
+
+The enhance route is served by your own dsh host and reachable **only from this machine**:
+
+- **Socket fence** — requests from non-loopback addresses are refused (`127.0.0.1` / `::1` only). Note this means *any local process* can call the route; it carries no user authentication.
+- **Host allowlist** — the route also validates the `Host` header against `localhost` / `127.0.0.1` / `[::1]`, which defeats DNS-rebinding (a rebound attacker domain keeps the loopback socket address but carries the attacker's hostname and is refused). Responses are `cache-control: no-store`.
+- **Not for reverse-proxy exposure** — if you put dsh web behind a proxy that listens on the LAN, external callers appear as loopback to the route and the fence is moot. Do not expose a proxied host without adding your own authentication at the proxy.
+- **Prompt-injection boundary** — the draft is framed between `<raw_prompt>` tags, literal closing tags inside the draft are neutralized, and the strategy prompt treats the framed text as pure data. Enhancements run with your own credentials and the result is only ever shown back to you.
+
 ## Architecture
 
 ```
@@ -183,12 +193,12 @@ Build outputs: `lib/index.js` (host half, ESM, package imports kept external) an
 ```bash
 npm install
 npm run typecheck     # tsc --noEmit
-npm test              # 56 unit tests (see below)
+npm test              # unit + real-http + component suites
 npm run build         # typecheck + both halves
 npm run watch         # esbuild watch for both halves
 ```
 
-**Test coverage:** input validation (empty / invisible characters / over-length), output normalization (fence stripping, blank-line collapsing, empty refusal), the enhancer against stubbed `ctx.llm` streams (happy path, AUTH/NO_ADAPTER/max-tokens finishes, empty output, stalled-stream timeout, pre-aborted caller, route precedence), an end-to-end real-`node:http` suite for the route (loopback fence, method guard, malformed body, structured error envelopes, disabled switch), the undo stack, shortcut parsing/matching, config resolution, and the client settings decoder.
+**Test coverage:** input validation, output normalization, the enhancer against stubbed `ctx.llm` streams, a real-`node:http` route suite (loopback Host fence, disconnect abort, error envelopes), the loopback/Host fence units, prompt framing, config resolution, the undo stack, shortcut parsing, client settings, and React component tests locking the enhance → apply → undo flow (guards, stale marking, diverged-draft undo semantics).
 
 **Release process (maintainers):**
 

package/README.zh-CN.md

@@ -110,7 +110,8 @@ dsh plugin --profile web remove dsh-prompt-enhance
 | `maxInputChars` | `12000` | 输入字数上限;超限**拒绝而不截断** |
 | `timeoutMs` | `60000` | 单次调用的端到端超时 |
 | `systemPrompt` | 内置策略 | 想用自己的增强策略时整体替换 |
-| `shortcut` | `ctrl+alt+e` | 快捷键规格(修饰键 + 单个字母/数字/功能键);留空禁用 |
+| `shortcut` | `ctrl+alt+e` | 快捷键规格(至少一个修饰键 + 单个字母/数字/功能键——纯裸键会被忽略,绝不会吞掉正常打字);留空禁用 |
+| `provider` + `model` 取值 | — | 与 harness 设置一致:设置文件 `llm-pi-ai.providers` 下的键就是 provider(如 `zhipu`、`muyuu`),其 `models[].id` 就是 model(如 `glm-5.3-flash`)。示例:`provider: zhipu` + `model: glm-5.3-flash` |
 
 **模型路由优先级:** 设置成对覆盖 → 当前会话请求头中记录的路由 → 全局默认模型(`agent-default-model`)。三者都指不出路由时(例如全新会话且无默认模型),插件给出可操作的报错而不是乱猜。
 
@@ -125,7 +126,7 @@ dsh plugin --profile web remove dsh-prompt-enhance
 5. **验收标准** —— 写明怎样判断结果正确。
 6. **边界条件** —— 列出边界情况与信息缺失时的做法。
 
-硬性规则:精确保留原意(不删除、篡改、 contradict 用户信息);绝不编造——未知细节插入显式占位符如 `(待补充:…)` / `(TBD: …)`;保持任务范围不变;**只输出**改写后的正文(无解释、无围栏、无客套);镜像输入语言;长度约为原文 1–3 倍;已经成形的提示词只做轻度润色而不注水。
+硬性规则:精确保留原意(不删除、不篡改、不与用户信息冲突);绝不编造——未知细节插入显式占位符如 `(待补充:…)` / `(TBD: …)`;保持任务范围不变;**只输出**改写后的正文(无解释、无围栏、无客套);镜像输入语言;长度约为原文 1–3 倍;已经成形的提示词只做轻度润色而不注水。
 
 在设置中填写 `systemPrompt` 即可整体替换为你的策略。
 
@@ -147,6 +148,15 @@ dsh plugin --profile web remove dsh-prompt-enhance
 
 所有失败只出现在插件自己的面板里;失败的调用绝不修改输入框草稿,手动输入不受任何干扰。
 
+## 安全模型
+
+增强路由由你自己的 dsh 宿主提供服务,**仅限本机访问**:
+
+- **套接字栅栏** —— 非回环地址(`127.0.0.1` / `::1` 之外)的请求一律拒绝。注意这意味着*本机任意进程*都可以调用该路由;路由本身不带用户鉴权。
+- **Host 白名单** —— 路由同时校验 `Host` 头是否为 `localhost` / `127.0.0.1` / `[::1]`,可防御 DNS 重绑定(重绑定的攻击者域名虽然落在回环套接字上,但携带的是攻击者主机名,会被拒绝)。响应均为 `cache-control: no-store`。
+- **不要经反向代理暴露** —— 若把 dsh web 放在监听局域网的代理后面,外部调用者在路由看来就是回环地址,栅栏形同虚设。除非在代理层自行加鉴权,否则不要暴露。
+- **提示注入边界** —— 草稿被框在 `<raw_prompt>` 标签之间,草稿内的字面闭合标签会被中和,策略提示词把框内文本视为纯数据。增强只使用你自己的凭据,结果也只回显给你本人。
+
 ## 架构
 
 ```
@@ -182,7 +192,7 @@ src/
 ```bash
 npm install
 npm run typecheck     # tsc --noEmit
-npm test              # 56 个单元测试(见下)
+npm test              # 单元 + 真实 HTTP + 组件测试套件
 npm run build         # 类型检查 + 双半区构建
 npm run watch         # esbuild 监听构建双半区
 ```

package/lib/client.js

@@ -100,19 +100,56 @@ async function requestEnhance(body, signal) {
 var import_react = require("react");
 var import_jsx_runtime = require("react/jsx-runtime");
 var retryable = (code) => code === "upstream" || code === "timeout" || code === "internal";
+function localizedErrorMessage(t, code) {
+  switch (code) {
+    case "rejected":
+      return t("error.rejected");
+    case "timeout":
+      return t("error.timeout");
+    case "unconfigured":
+      return t("error.unconfigured");
+    case "upstream":
+      return t("error.upstream");
+    default:
+      return t("error.internal");
+  }
+}
 function ResultPanel(props) {
   const { state, t, onApply, onCancel, onRetry } = props;
   const [copied, setCopied] = (0, import_react.useState)("idle");
+  const panelRef = (0, import_react.useRef)(null);
   (0, import_react.useEffect)(() => {
     const onKeyDown = (event) => {
+      if (event.isComposing) return;
       if (event.key === "Escape" && !event.defaultPrevented) {
         event.preventDefault();
         onCancel();
+        return;
+      }
+      if (event.key === "Tab") {
+        const panel = panelRef.current;
+        if (panel === null) return;
+        const focusables = panel.querySelectorAll('button:not([disabled]), [href], input, [tabindex]:not([tabindex="-1"])');
+        const first = focusables[0];
+        const last = focusables[focusables.length - 1];
+        if (first === void 0 || last === void 0) return;
+        if (event.shiftKey && document.activeElement === first) {
+          event.preventDefault();
+          last.focus();
+        } else if (!event.shiftKey && document.activeElement === last) {
+          event.preventDefault();
+          first.focus();
+        }
       }
     };
     document.addEventListener("keydown", onKeyDown);
     return () => document.removeEventListener("keydown", onKeyDown);
   }, [onCancel]);
+  (0, import_react.useEffect)(() => {
+    const previous = document.activeElement instanceof HTMLElement ? document.activeElement : null;
+    panelRef.current?.focus();
+    return () => previous?.focus();
+  }, []);
   const copy = (0, import_react.useCallback)(() => {
     if (state.result === void 0) return;
     navigator.clipboard.writeText(state.result.text).then(() => setCopied("ok"), () => setCopied("failed"));
@@ -120,45 +157,63 @@ function ResultPanel(props) {
   const formatMs = (ms) => ms < 1e3 ? `${ms}ms` : `${(ms / 1e3).toFixed(1)}s`;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-pe-overlay", onMouseDown: (event) => {
     if (event.target === event.currentTarget) onCancel();
-  }, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("section", { className: "dsh-pe-panel", role: "dialog", "aria-label": t("panel.title"), children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("header", { className: "dsh-pe-head", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { children: [
-        "\u2728 ",
-        t("panel.title")
-      ] }),
-      state.phase === "result" && state.result !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dsh-pe-meta", children: [
-        t("panel.model", { provider: state.result.provider, model: state.result.model }),
-        " \xB7 ",
-        t("panel.elapsed", { ms: formatMs(state.result.elapsedMs) })
-      ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "dsh-pe-close", "aria-label": t("panel.close"), onClick: onCancel, children: "\u2715" })
-    ] }),
-    state.phase === "loading" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-pe-loading", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-pe-spin", "aria-hidden": true }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: t("panel.loading") }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-pe-hint", children: t("panel.loading.hint") })
-    ] }),
-    state.phase === "error" && state.error !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-pe-error", children: state.error.message }),
-    state.phase === "result" && state.result !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-pe-body", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-pe-col", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-pe-col-title", children: t("panel.original") }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("pre", { className: "dsh-pe-col-text", children: state.original })
-      ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-pe-col", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-pe-col-title", children: t("panel.enhanced") }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("pre", { className: "dsh-pe-col-text", children: state.result.text })
-      ] })
-    ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("footer", { className: "dsh-pe-foot", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsh-pe-grow" }),
-      state.phase === "error" && retryable(state.error?.code) && onRetry !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "dsh-pe-btn-action plain", onClick: onRetry, children: t("panel.retry") }),
-      state.phase === "result" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "dsh-pe-btn-action plain", onClick: copy, children: copied === "ok" ? t("panel.copied") : copied === "failed" ? t("panel.copyFailed") : t("panel.copy") }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "dsh-pe-btn-action primary", onClick: onApply, children: t("panel.apply") })
-      ] }),
-      state.phase !== "result" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "dsh-pe-btn-action plain", onClick: onCancel, children: state.phase === "loading" ? t("panel.cancel") : t("panel.close") })
-    ] })
-  ] }) });
+  }, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
+    "section",
+    {
+      ref: panelRef,
+      className: "dsh-pe-panel",
+      role: "dialog",
+      "aria-modal": "true",
+      "aria-label": t("panel.title"),
+      tabIndex: -1,
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("header", { className: "dsh-pe-head", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { children: [
+            "\u2728 ",
+            t("panel.title")
+          ] }),
+          state.phase === "result" && state.result !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dsh-pe-meta", children: [
+            t("panel.model", { provider: state.result.provider, model: state.result.model }),
+            " \xB7 ",
+            t("panel.elapsed", { ms: formatMs(state.result.elapsedMs) })
+          ] }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "dsh-pe-close", "aria-label": t("panel.close"), onClick: onCancel, children: "\u2715" })
+        ] }),
+        state.phase === "loading" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-pe-loading", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-pe-spin", "aria-hidden": true }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: t("panel.loading") }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-pe-hint", children: t("panel.loading.hint") })
+        ] }),
+        state.phase === "error" && state.error !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-pe-error", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: state.error.localized ?? localizedErrorMessage(t, state.error.code) }),
+          state.error.localized !== state.error.message && state.error.message !== "" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-pe-error-detail", children: state.error.message })
+        ] }),
+        state.phase === "result" && state.result !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-pe-body", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-pe-col", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-pe-col-title", children: t("panel.original") }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("pre", { className: "dsh-pe-col-text", children: state.original })
+          ] }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-pe-col", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dsh-pe-col-title", children: t("panel.enhanced") }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("pre", { className: "dsh-pe-col-text", children: state.result.text })
+          ] })
+        ] }),
+        state.phase === "result" && state.stale && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dsh-pe-stale", children: [
+          "\u26A0 ",
+          t("panel.stale.warn")
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("footer", { className: "dsh-pe-foot", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dsh-pe-grow" }),
+          state.phase === "error" && retryable(state.error?.code) && onRetry !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "dsh-pe-btn-action plain", onClick: onRetry, children: t("panel.retry") }),
+          state.phase === "result" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "dsh-pe-btn-action plain", onClick: copy, children: copied === "ok" ? t("panel.copied") : copied === "failed" ? t("panel.copyFailed") : t("panel.copy") }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "dsh-pe-btn-action primary", onClick: onApply, children: t("panel.apply") })
+          ] }),
+          state.phase !== "result" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "dsh-pe-btn-action plain", onClick: onCancel, children: state.phase === "loading" ? t("panel.cancel") : t("panel.close") })
+        ] })
+      ]
+    }
+  ) });
 }
 
 // src/client/undo-stack.ts
@@ -244,6 +299,11 @@ function openError(sessionId, original, error) {
   panelState = { sessionId, phase: "error", original, error };
   notify();
 }
+function setStale(sessionId, stale) {
+  if (panelState?.sessionId !== sessionId || panelState.phase !== "result" || panelState.stale === stale) return;
+  panelState = { ...panelState, stale };
+  notify();
+}
 function closePanel() {
   panelState?.abort?.();
   if (panelState === void 0) return;
@@ -256,7 +316,10 @@ function registerSession(sessionId, entry) {
   notify();
   return () => {
     if (sessions.get(sessionId) === entry) sessions.delete(sessionId);
-    if (lastMountedSession === sessionId) lastMountedSession = void 0;
+    if (lastMountedSession === sessionId) {
+      const keys = [...sessions.keys()];
+      lastMountedSession = keys[keys.length - 1];
+    }
     if (panelState?.sessionId === sessionId) closePanel();
     undoStore.clear(sessionId);
   };
@@ -324,30 +387,27 @@ function EnhanceButton(props) {
   const busy = panel !== void 0 && panel.sessionId === sessionId && panel.phase === "loading";
   const anyBusy = panel !== void 0 && panel.phase === "loading";
   const start = (0, import_react2.useCallback)(() => {
-    if (anyBusy) {
-      openError(sessionId, draft, { code: "rejected", message: t("error.busy") });
-      return;
-    }
+    if (anyBusy) return;
     if (!settings.enabled) {
-      openError(sessionId, draft, { code: "rejected", message: t("error.disabled") });
+      openError(sessionId, draft, { code: "rejected", message: t("error.disabled"), localized: t("error.disabled") });
       return;
     }
     if (imageCount > 0 && draft.trim() === "") {
-      openError(sessionId, draft, { code: "rejected", message: t("error.imagesOnly") });
+      openError(sessionId, draft, { code: "rejected", message: t("error.imagesOnly"), localized: t("error.imagesOnly") });
       return;
     }
     const check = checkInputText(draft, settings.maxInputChars);
     if (!check.ok) {
       const message = check.code === "empty" ? t("error.empty") : t("error.tooLong", { count: check.count, max: check.max });
-      openError(sessionId, draft, { code: "rejected", message });
+      openError(sessionId, draft, { code: "rejected", message, localized: message });
       return;
     }
     if (occurrenceCount > 0) {
-      openError(sessionId, draft, { code: "rejected", message: t("error.occurrences") });
+      openError(sessionId, draft, { code: "rejected", message: t("error.occurrences"), localized: t("error.occurrences") });
       return;
     }
     if (phase !== "plain") {
-      openError(sessionId, draft, { code: "rejected", message: t("error.phase") });
+      openError(sessionId, draft, { code: "rejected", message: t("error.phase"), localized: t("error.phase") });
       return;
     }
     const controller = new AbortController();
@@ -369,12 +429,17 @@ function EnhanceButton(props) {
     };
     return registerSession(sessionId, entry);
   }, [sessionId]);
+  (0, import_react2.useEffect)(() => {
+    if (panel !== void 0 && panel.sessionId === sessionId && panel.phase === "result") {
+      setStale(sessionId, draft !== panel.original);
+    }
+  }, [draft, panel, sessionId]);
   const apply2 = (0, import_react2.useCallback)(() => {
     if (panel === void 0 || panel.phase !== "result" || panel.result === void 0) return;
-    pushUndo(sessionId, { original: panel.original, applied: panel.result.text });
+    pushUndo(sessionId, { original: draft, applied: panel.result.text });
     inputActions.setDraft(panel.result.text);
     closePanel();
-  }, [inputActions, panel, sessionId]);
+  }, [draft, inputActions, panel, sessionId]);
   if (!settings.enabled) return null;
   const owned = panel !== void 0 && panel.sessionId === sessionId ? panel : void 0;
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_jsx_runtime2.Fragment, { children: [
@@ -451,6 +516,7 @@ var zh = {
   "panel.copyFailed": "\u590D\u5236\u5931\u8D25",
   "panel.close": "\u5173\u95ED",
   "panel.retry": "\u91CD\u8BD5",
+  "panel.stale.warn": "\u8349\u7A3F\u5728\u589E\u5F3A\u671F\u95F4\u6709\u6539\u52A8\u2014\u2014\u589E\u5F3A\u7ED3\u679C\u57FA\u4E8E\u589E\u5F3A\u524D\u7684\u6587\u672C\u3002\u56DE\u586B\u5C06\u8986\u76D6\u4F60\u7684\u6700\u65B0\u7F16\u8F91(\u64A4\u9500\u53EF\u6062\u590D\u56DE\u586B\u524D\u7684\u8349\u7A3F)\u3002",
   "panel.model": "\u6A21\u578B\uFF1A{provider} / {model}",
   "panel.elapsed": "\u8017\u65F6 {ms}",
   "undo.applied": "\u5DF2\u7528\u589E\u5F3A\u7ED3\u679C\u66FF\u6362\u539F\u63D0\u793A\u8BCD",
@@ -460,9 +526,13 @@ var zh = {
   "error.tooLong": "\u5185\u5BB9\u5171 {count} \u5B57\uFF0C\u8D85\u8FC7 {max} \u5B57\u4E0A\u9650\u3002\u4E3A\u907F\u514D\u6539\u53D8\u539F\u610F\u4E0D\u4F1A\u81EA\u52A8\u622A\u65AD\uFF0C\u8BF7\u7CBE\u7B80\u540E\u518D\u8BD5\u3002",
   "error.imagesOnly": "\u5F53\u524D\u53EA\u9644\u52A0\u4E86\u56FE\u7247\uFF0C\u4EC5\u652F\u6301\u589E\u5F3A\u6587\u672C\u5185\u5BB9\u3002",
   "error.occurrences": "\u8F93\u5165\u5185\u5BB9\u5305\u542B\u547D\u4EE4\u6216\u6587\u4EF6\u5F15\u7528\uFF0C\u6682\u4E0D\u652F\u6301\u589E\u5F3A\uFF1B\u8BF7\u5148\u79FB\u9664\u540E\u518D\u8BD5\u3002",
-  "error.busy": "\u6B63\u5728\u589E\u5F3A\u4E2D\uFF0C\u8BF7\u7A0D\u5019\u6216\u5148\u53D6\u6D88\u3002",
   "error.phase": "\u5F53\u524D\u8F93\u5165\u6B63\u88AB\u5360\u7528\uFF08\u63D0\u4EA4\u4E2D\uFF09\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002",
-  "error.disabled": "\u63D0\u793A\u8BCD\u589E\u5F3A\u5DF2\u5728\u63D2\u4EF6\u8BBE\u7F6E\u4E2D\u5173\u95ED\u3002"
+  "error.disabled": "\u63D0\u793A\u8BCD\u589E\u5F3A\u5DF2\u5728\u63D2\u4EF6\u8BBE\u7F6E\u4E2D\u5173\u95ED\u3002",
+  "error.rejected": "\u589E\u5F3A\u8BF7\u6C42\u88AB\u62D2\u7EDD\u3002",
+  "error.timeout": "\u589E\u5F3A\u8D85\u65F6\uFF0C\u8BF7\u91CD\u8BD5\uFF1B\u539F\u8F93\u5165\u672A\u6539\u52A8\u3002",
+  "error.unconfigured": "\u5C1A\u672A\u786E\u5B9A\u589E\u5F3A\u7528\u7684\u6A21\u578B\uFF1A\u8BF7\u5728\u63D2\u4EF6\u8BBE\u7F6E\u4E2D\u6210\u5BF9\u586B\u5199 provider/model\u3002",
+  "error.upstream": "\u6A21\u578B\u670D\u52A1\u8FD4\u56DE\u9519\u8BEF\uFF0C\u8BF7\u91CD\u8BD5\uFF1B\u539F\u8F93\u5165\u672A\u6539\u52A8\u3002",
+  "error.internal": "\u589E\u5F3A\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\uFF1B\u539F\u8F93\u5165\u672A\u6539\u52A8\u3002"
 };
 var en = {
   "button.title": "Enhance prompt (rewrite into a structured prompt)",
@@ -479,6 +549,7 @@ var en = {
   "panel.copyFailed": "Copy failed",
   "panel.close": "Close",
   "panel.retry": "Retry",
+  "panel.stale.warn": "The draft changed while enhancing \u2014 the result is based on the pre-enhance text. Applying will overwrite your latest edits (undo restores the draft as it was before applying).",
   "panel.model": "Model: {provider} / {model}",
   "panel.elapsed": "{ms} elapsed",
   "undo.applied": "Original prompt replaced by the enhanced version",
@@ -488,9 +559,13 @@ var en = {
   "error.tooLong": "The draft is {count} characters, above the {max} cap. It is never auto-truncated (that would change your meaning) \u2014 please shorten it.",
   "error.imagesOnly": "Only images are attached; prompt enhance supports text only.",
   "error.occurrences": "The draft contains commands or file references, which are not supported yet \u2014 remove them first.",
-  "error.busy": "An enhancement is already running \u2014 wait or cancel it first.",
   "error.phase": "The input box is busy (submitting) \u2014 try again in a moment.",
-  "error.disabled": "Prompt enhance is disabled in the plugin settings."
+  "error.disabled": "Prompt enhance is disabled in the plugin settings.",
+  "error.rejected": "The enhance request was rejected.",
+  "error.timeout": "The enhancement timed out. Retry; your draft is untouched.",
+  "error.unconfigured": "No model resolved for the enhancement: pair provider/model in the plugin settings.",
+  "error.upstream": "The model provider returned an error. Retry; your draft is untouched.",
+  "error.internal": "Enhancement failed. Retry; your draft is untouched."
 };
 var dictionaries = { zh, en };
 var NS = "prompt-enhance";
@@ -498,32 +573,10 @@ var NS = "prompt-enhance";
 // src/client/styles.ts
 var STYLE_ID = "dsh-prompt-enhance-styles";
 var CSS = `
-.dsh-pe-btn {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  height: 28px;
-  padding: 0 8px;
-  border: none;
-  border-radius: 6px;
-  background: transparent;
-  color: inherit;
-  opacity: 0.75;
-  font-size: 12px;
-  line-height: 1;
-  cursor: pointer;
-  white-space: nowrap;
-}
-.dsh-pe-btn:hover:not(:disabled) { opacity: 1; background: rgba(127, 127, 127, 0.18); }
-.dsh-pe-btn:disabled { opacity: 0.45; cursor: default; }
-.dsh-pe-btn .dsh-pe-btn-icon { font-size: 14px; }
-.dsh-pe-btn.is-busy .dsh-pe-btn-icon { animation: dsh-pe-spin 1s linear infinite; }
-@keyframes dsh-pe-spin { to { transform: rotate(360deg); } }
-
 .dsh-pe-overlay {
   position: fixed;
   inset: 0;
-  z-index: 1000;
+  z-index: var(--dsh-pe-z-index, 1000);
   display: flex;
   align-items: flex-end;
   justify-content: center;
@@ -531,23 +584,48 @@ var CSS = `
   padding: 24px 16px;
 }
 .dsh-pe-panel {
+  --pe-bg: #1f2127;
+  --pe-fg: #e6e8ee;
+  --pe-fg-dim: rgba(230, 232, 238, 0.55);
+  --pe-border: rgba(127, 127, 127, 0.35);
+  --pe-separator: rgba(127, 127, 127, 0.25);
+  --pe-hover: rgba(127, 127, 127, 0.18);
+  --pe-danger: #ffb4a8;
+  --pe-warn-fg: #e8c07d;
+  --pe-warn-border: rgba(230, 158, 60, 0.35);
+  --pe-warn-bg: rgba(230, 158, 60, 0.12);
   display: flex;
   flex-direction: column;
   width: min(880px, 100%);
   max-height: min(70vh, 640px);
   border-radius: 12px;
-  border: 1px solid rgba(127, 127, 127, 0.35);
-  background: #1f2127;
-  color: #e6e8ee;
+  border: 1px solid var(--pe-border);
+  background: var(--pe-bg);
+  color: var(--pe-fg);
   box-shadow: 0 12px 40px rgba(0, 0, 0, 0.45);
   overflow: hidden;
+  outline: none;
+}
+@media (prefers-color-scheme: light) {
+  .dsh-pe-panel {
+    --pe-bg: #ffffff;
+    --pe-fg: #1c1e24;
+    --pe-fg-dim: rgba(28, 30, 36, 0.55);
+    --pe-border: rgba(0, 0, 0, 0.18);
+    --pe-separator: rgba(0, 0, 0, 0.12);
+    --pe-hover: rgba(0, 0, 0, 0.08);
+    --pe-danger: #a63a2e;
+    --pe-warn-fg: #8a5a00;
+    --pe-warn-border: rgba(176, 122, 0, 0.4);
+    --pe-warn-bg: rgba(230, 158, 60, 0.15);
+  }
 }
 .dsh-pe-head {
   display: flex;
   align-items: center;
   gap: 8px;
   padding: 10px 14px;
-  border-bottom: 1px solid rgba(127, 127, 127, 0.25);
+  border-bottom: 1px solid var(--pe-separator);
   font-size: 13px;
   font-weight: 600;
 }
@@ -556,7 +634,7 @@ var CSS = `
   border: none; background: transparent; color: inherit; opacity: 0.6;
   font-size: 15px; cursor: pointer; padding: 2px 6px; border-radius: 4px;
 }
-.dsh-pe-close:hover { opacity: 1; background: rgba(127,127,127,0.2); }
+.dsh-pe-close:hover { opacity: 1; background: var(--pe-hover); }
 .dsh-pe-body { display: flex; flex: 1; min-height: 0; }
 .dsh-pe-col {
   flex: 1 1 0;
@@ -564,7 +642,7 @@ var CSS = `
   display: flex;
   flex-direction: column;
 }
-.dsh-pe-col + .dsh-pe-col { border-left: 1px solid rgba(127, 127, 127, 0.25); }
+.dsh-pe-col + .dsh-pe-col { border-left: 1px solid var(--pe-separator); }
 .dsh-pe-col-title {
   padding: 8px 14px 6px;
   font-size: 11px;
@@ -586,9 +664,15 @@ var CSS = `
   padding: 20px 16px;
   font-size: 13px;
   line-height: 1.6;
-  color: #ffb4a8;
+  color: var(--pe-danger);
   white-space: pre-wrap;
 }
+.dsh-pe-error .dsh-pe-error-detail {
+  margin-top: 8px;
+  font-size: 12px;
+  opacity: 0.75;
+  color: inherit;
+}
 .dsh-pe-loading {
   display: flex; flex-direction: column; gap: 8px;
   align-items: center; justify-content: center;
@@ -597,7 +681,7 @@ var CSS = `
 .dsh-pe-loading .dsh-pe-hint { font-size: 11px; opacity: 0.55; }
 .dsh-pe-spin {
   width: 22px; height: 22px; border-radius: 50%;
-  border: 2px solid rgba(127,127,127,0.3); border-top-color: #6ea8ff;
+  border: 2px solid var(--pe-separator); border-top-color: #6ea8ff;
   animation: dsh-pe-spin 0.9s linear infinite;
 }
 .dsh-pe-foot {
@@ -605,7 +689,7 @@ var CSS = `
   align-items: center;
   gap: 8px;
   padding: 10px 14px;
-  border-top: 1px solid rgba(127, 127, 127, 0.25);
+  border-top: 1px solid var(--pe-separator);
 }
 .dsh-pe-foot .dsh-pe-grow { flex: 1; }
 .dsh-pe-btn-action {
@@ -614,8 +698,39 @@ var CSS = `
 }
 .dsh-pe-btn-action.primary { background: #3f76e1; color: #fff; }
 .dsh-pe-btn-action.primary:hover { background: #4d82ec; }
-.dsh-pe-btn-action.plain { background: rgba(127,127,127,0.18); color: inherit; }
-.dsh-pe-btn-action.plain:hover { background: rgba(127,127,127,0.3); }
+.dsh-pe-btn-action.plain { background: var(--pe-hover); color: inherit; }
+.dsh-pe-btn-action.plain:hover { background: rgba(127, 127, 127, 0.3); }
+
+.dsh-pe-stale {
+  padding: 8px 14px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-top: 1px solid var(--pe-warn-border);
+  background: var(--pe-warn-bg);
+  color: var(--pe-warn-fg);
+}
+
+.dsh-pe-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  height: 28px;
+  padding: 0 8px;
+  border: none;
+  border-radius: 6px;
+  background: transparent;
+  color: inherit;
+  opacity: 0.75;
+  font-size: 12px;
+  line-height: 1;
+  cursor: pointer;
+  white-space: nowrap;
+}
+.dsh-pe-btn:hover:not(:disabled) { opacity: 1; background: var(--pe-hover); }
+.dsh-pe-btn:disabled { opacity: 0.45; cursor: default; }
+.dsh-pe-btn .dsh-pe-btn-icon { font-size: 14px; }
+.dsh-pe-btn.is-busy .dsh-pe-btn-icon { animation: dsh-pe-spin 1s linear infinite; }
+@keyframes dsh-pe-spin { to { transform: rotate(360deg); } }
 
 .dsh-pe-undo {
   display: flex;
@@ -628,7 +743,7 @@ var CSS = `
 }
 .dsh-pe-undo .dsh-pe-undo-check { color: #7ed491; }
 .dsh-pe-undo-link {
-  border: none; background: rgba(127,127,127,0.18); color: inherit;
+  border: none; background: var(--pe-hover); color: inherit;
   border-radius: 5px; padding: 3px 10px; font-size: 12px; cursor: pointer;
 }
 .dsh-pe-undo-link:hover { background: rgba(127,127,127,0.3); }
@@ -673,6 +788,7 @@ function parseShortcut(spec) {
     if (modifier === void 0) return null;
     modifiers[modifier] = true;
   }
+  if (!modifiers.ctrl && !modifiers.alt && !modifiers.shift && !modifiers.meta) return null;
   return { ...modifiers, key: last };
 }
 function matchesShortcut(event, combo) {