dsh-files-native 0.2.0 → 0.2.1

package/README.md

@@ -11,6 +11,24 @@
 
 </div>
 
+## ⭐ 欢迎点星收藏
+
+如果附件轨帮到了你，欢迎到 [GitHub 仓库](https://github.com/meyaomiao/dsh-files-native) 点个 Star ⭐，让更多 DSH 用户看到它。问题与建议请提 Issue。
+
+## 📋 兼容性
+
+| 插件版本 | 状态 | 对应 DSH |
+|---|---|---|
+| **0.2.x**（当前主线，含 0.2.1） | ✅ | **0.1.5-rc.1 / 0.1.5-rc.2**（及之后的 0.1.5 线） |
+| 0.1.x | 🔧 维护态（仅修 bug） | DSH ≤ 0.1.2-rc.1（仍兼容 0.1.1-rc.2 / 0.1.2-alpha.4） |
+
+### 本次升级功能变化
+
+- **官方已有的交给官方**：回复尾的「产物」卡不再由本插件绘制，改用 DSH 官方交付文件卡（0.1.5-rc.2 起排版/图标更紧）。用户气泡旁的附件卡仍由本插件画。
+- **粘贴让路**：纯官方四类图（PNG / JPEG / WebP / GIF）交给官方草稿图；其它文件仍走本插件轨。
+- **不依赖 better-sidebar**：模块 `inject` 只有 `slots`。有侧栏则气泡卡走预览，没有则新页签打开。
+- 不要和 `dsh-file-fix` / `dsh-file-upload` / `dsh-paste-to-path` 叠装。
+
 运行时插件 id 仍是 `file-native`（上传路由 `/plugins/file-native/*`）。npm / GitHub 仓库名是 `dsh-files-native`。
 
 - **图片**（PNG / JPEG / WebP / GIF）走官方草稿图栏（64px 缩略图，点击灯箱），发送后进模型视觉上下文。
@@ -19,7 +37,7 @@
 - **气泡附件卡**：消息发出后，文件卡渲染在用户气泡上方（与图片同列右对齐），注入提示行自动隐藏。
 - **点击打开**：点气泡附件卡——装了 [better-sidebar](https://github.com/用户/dsh-better-sidebar) 走侧栏预览；未装则新页签打开（文本/图片/PDF 页签内展示，二进制自动下载）。
 - 发送后文件卡贴在用户气泡栈（与官方图同一列），作业回复不会插在提问和文件中间。
-- 发送成功即清输入框待发轨。回复结尾只画「产物」chip。
+- 发送成功即清输入框待发轨。**回复尾产物卡让给官方。**
 
 不要和 `dsh-file-fix` / `dsh-file-upload` / `dsh-paste-to-path` 叠装。
 
@@ -29,7 +47,7 @@
 |---|---|
 | ![空输入框](screenshots/01-empty.png) | ![待发混排](screenshots/02-rail.png) |
 
-| 拖入窗口任意位置 | 发送后：图与文件卡跟用户气泡，产物在回复尾 |
+| 拖入窗口任意位置 | 发送后：图与文件卡跟用户气泡（产物走官方卡） |
 |---|---|
 | ![拖入遮罩](screenshots/03-overlay.png) | ![发送后](screenshots/04-sent.png) |
 
@@ -82,9 +100,4 @@ dsh plugin --profile web add .
 - 上传路由仅 loopback。
 - 刷新会丢掉「已上传未发送」的文件卡（磁盘文件仍在 `.dsh-uploads/`）。
 
-## 兼容性
-
-- DeepSeek Harness `0.1.2-rc.1`（仍兼容 `0.1.1-rc.2` 与 `0.1.2-alpha.4`，web profile）
-- 不要和 `dsh-file-fix` / `dsh-file-upload` / `dsh-paste-to-path` 叠装
-
 改仓库前先读 [CONTRIBUTING.md](./CONTRIBUTING.md)（Issue → 分支 → Draft PR）。思考原则见 [AI-ISSUE-WORKFLOW.md](./AI-ISSUE-WORKFLOW.md)。插件硬约束见 [AGENTS.md](./AGENTS.md)。

package/lib/client.js

@@ -28,7 +28,7 @@ __export(client_exports, {
   name: () => name
 });
 module.exports = __toCommonJS(client_exports);
-var import_react8 = require("react");
+var import_react7 = require("react");
 
 // src/rail.tsx
 var import_react2 = require("react");
@@ -70,11 +70,30 @@ function splitIntake(files) {
   }
   return { images, others };
 }
+function planPaste(files) {
+  const nativeImages = [];
+  const cards = [];
+  for (const file of files) {
+    if (isNativeImage(file)) nativeImages.push(file);
+    else cards.push(file);
+  }
+  if (cards.length === 0 && nativeImages.length > 0) return { action: "yield" };
+  return { action: "take", cards, nativeImages };
+}
+function extractPasteText(raw, files) {
+  const text = raw.replace(/\uFFFC/g, "").trim();
+  if (text === "") return "";
+  const names = files.map((file) => file.name.replace(/^.*[/\\]/, "")).filter((name2) => name2.length >= 4);
+  if (names.length === 0) return text;
+  const tokens = text.split(/\s+/).filter(Boolean);
+  const referenced = (token) => names.some((name2) => token.toLowerCase().includes(name2.toLowerCase()));
+  const meaningful = tokens.filter((token) => !referenced(token));
+  return meaningful.length === 0 ? "" : text;
+}
 
 // src/store.ts
 var items = [];
 var sentBySession = /* @__PURE__ */ new Map();
-var sentByTurn = /* @__PURE__ */ new Map();
 var listeners = /* @__PURE__ */ new Set();
 var generation = 0;
 function emit() {
@@ -127,12 +146,6 @@ function archiveSent(sessionId) {
   if (files.length > 0) emit();
   return files;
 }
-function lastSent(sessionId) {
-  return sentBySession.get(sessionId) ?? [];
-}
-function filesForTurn(sessionId, turn) {
-  return sentByTurn.get(`${sessionId}:${turn}`) ?? lastSent(sessionId);
-}
 
 // src/styles.ts
 var FR_CSS = `
@@ -676,6 +689,86 @@ function ComposerRail(props) {
   }, host !== null && host.isConnected ? (0, import_react_dom2.createPortal)(rail, host) : null);
 }
 
+// src/vision.ts
+function currentModelLabel() {
+  const buttons = document.querySelectorAll("button[aria-label]");
+  for (const button of buttons) {
+    const label = button.getAttribute("aria-label") ?? "";
+    if (/选择模型|select model|current model/i.test(label)) return label;
+  }
+  return "";
+}
+function insertComposerText(text) {
+  const active = document.activeElement;
+  const el = active instanceof HTMLTextAreaElement || active instanceof HTMLInputElement ? active : document.querySelector("[data-composer-card] textarea");
+  if (!(el instanceof HTMLTextAreaElement) && !(el instanceof HTMLInputElement)) return;
+  el.focus();
+  let inserted = false;
+  try {
+    inserted = document.execCommand("insertText", false, text);
+  } catch {
+    inserted = false;
+  }
+  if (inserted) return;
+  const proto = el instanceof HTMLTextAreaElement ? window.HTMLTextAreaElement.prototype : window.HTMLInputElement.prototype;
+  const setter = Object.getOwnPropertyDescriptor(proto, "value")?.set;
+  setter?.call(el, `${el.value}${text}`);
+  el.dispatchEvent(new Event("input", { bubbles: true }));
+}
+function pasteAccompanyingText(text) {
+  insertComposerText(text);
+}
+var modlensRouteAvailable = true;
+async function probeModlensTakeover() {
+  if (!modlensRouteAvailable) return false;
+  const label = currentModelLabel();
+  try {
+    const res = await fetch(`/modlens/paste?model=${encodeURIComponent(label)}`, {
+      signal: AbortSignal.timeout(2e3)
+    });
+    if (res.status === 404) {
+      modlensRouteAvailable = false;
+      return false;
+    }
+    if (!res.ok) return false;
+    const body = await res.json();
+    return body.takeover === true;
+  } catch {
+    return false;
+  }
+}
+async function uploadModlensPaste(file) {
+  const res = await fetch("/modlens/paste", { method: "POST", body: await file.arrayBuffer() });
+  if (!res.ok) return void 0;
+  const body = await res.json();
+  return typeof body.path === "string" && body.path !== "" ? body.path : void 0;
+}
+async function deliverImages(sessionId, files) {
+  if (files.length === 0) return;
+  const takeover = await probeModlensTakeover();
+  if (!takeover) {
+    addImages(sessionId, files);
+    return;
+  }
+  const paths = [];
+  const failed = [];
+  for (const file of files) {
+    try {
+      const path = await uploadModlensPaste(file);
+      if (path !== void 0) paths.push(path);
+      else failed.push(file);
+    } catch {
+      failed.push(file);
+    }
+  }
+  if (paths.length === 0) {
+    addImages(sessionId, files);
+    return;
+  }
+  if (failed.length > 0) addImages(sessionId, failed);
+  insertComposerText(`${paths.join(" ")} `);
+}
+
 // src/picker.tsx
 function PaperclipButton(props) {
   ensureStyles();
@@ -689,7 +782,9 @@ function PaperclipButton(props) {
     event.currentTarget.value = "";
     const sid = String(props.sessionId || currentSessionId());
     if (files.length === 0) return;
-    intakeFiles(sid, files, (images) => addImages(sid, images));
+    intakeFiles(sid, files, (images) => {
+      void deliverImages(sid, images);
+    });
   };
   return (0, import_react5.createElement)(
     "span",
@@ -713,97 +808,15 @@ function PaperclipButton(props) {
   );
 }
 
-// src/tail.tsx
-var import_react6 = require("react");
-function basename(path) {
-  const at = Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\"));
-  return at === -1 ? path : path.slice(at + 1);
-}
-function ChipRow({ label, items: items2, open }) {
-  if (items2.length === 0) return null;
-  const shown = items2.slice(0, 6);
-  const hidden = items2.length - shown.length;
-  return (0, import_react6.createElement)(
-    "div",
-    { className: "fr-tail" },
-    (0, import_react6.createElement)("span", { className: "fr-tail-label" }, label),
-    (0, import_react6.createElement)(
-      "div",
-      { className: "fr-tail-row" },
-      ...shown.map((item) => (0, import_react6.createElement)("button", {
-        key: item.path,
-        type: "button",
-        className: "fr-chip",
-        title: item.path,
-        onClick: () => open(item.path)
-      }, item.name)),
-      hidden > 0 ? (0, import_react6.createElement)("span", { className: "fr-more" }, `+ ${hidden} \u4E2A\u6587\u4EF6`) : null
-    )
-  );
-}
-function UploadedTail(props) {
-  ensureStyles();
-  const sessionId = String(props.sessionId ?? "");
-  const [uploaded, setUploaded] = (0, import_react6.useState)(
-    props.matched?.uploaded ?? (props.turn !== void 0 ? filesForTurn(sessionId, props.turn) : lastSent(sessionId))
-  );
-  (0, import_react6.useEffect)(() => {
-    if (props.matched?.uploaded) {
-      setUploaded(props.matched.uploaded);
-      return;
-    }
-    let cancelled = false;
-    void fetch(`/plugins/file-native/last?sessionId=${encodeURIComponent(sessionId)}`).then((res) => res.json()).then((body) => {
-      if (!cancelled && Array.isArray(body.files) && body.files.length > 0) setUploaded(body.files);
-    }).catch(() => {
-    });
-    return () => {
-      cancelled = true;
-    };
-  }, [sessionId, props.matched, props.turn]);
-  const produced = props.matched?.produced ?? [];
-  if (uploaded.length === 0 && produced.length === 0) return null;
-  const open = props.openFile ?? ((path) => {
-    window.open(path, "_blank");
-  });
-  return (0, import_react6.createElement)(
-    "div",
-    { "data-file-native-tail": true },
-    (0, import_react6.createElement)(ChipRow, {
-      label: "\u9644\u4EF6",
-      items: uploaded.map((file) => ({ name: file.name, path: file.relPath })),
-      open
-    }),
-    (0, import_react6.createElement)(ChipRow, {
-      label: "\u4EA7\u7269",
-      items: produced.map((path) => ({ name: basename(path), path })),
-      open
-    })
-  );
-}
-function producedPathsOf(owner2) {
-  const data = owner2.turn?.data?.get?.("deliverables");
-  const seq = owner2.seq ?? Number.POSITIVE_INFINITY;
-  if (!data?.produced) return [];
-  const paths = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const item of data.produced) {
-    if (item.seq > seq || seen.has(item.path)) continue;
-    seen.add(item.path);
-    paths.push(item.path);
-  }
-  return paths;
-}
-
 // src/context.tsx
-var import_react7 = require("react");
+var import_react6 = require("react");
 var import_react_dom3 = require("react-dom");
 function isFileNoticeRow(el) {
   const text = el.textContent ?? "";
   return text.includes("\u{1F4CE} \u9644\u4EF6") && text.includes("\u4E2A\u6587\u4EF6");
 }
 function FileCard({ file, onOpen }) {
-  return (0, import_react7.createElement)(
+  return (0, import_react6.createElement)(
     "button",
     {
       type: "button",
@@ -811,12 +824,12 @@ function FileCard({ file, onOpen }) {
       title: file.relPath,
       onClick: () => onOpen?.(file)
     },
-    (0, import_react7.createElement)("span", { className: "fr-ext" }, extOf(file.name)),
-    (0, import_react7.createElement)(
+    (0, import_react6.createElement)("span", { className: "fr-ext" }, extOf(file.name)),
+    (0, import_react6.createElement)(
       "span",
       { className: "fr-copy" },
-      (0, import_react7.createElement)("span", { className: "fr-name" }, file.name),
-      file.size > 0 ? (0, import_react7.createElement)("span", { className: "fr-meta" }, formatSize(file.size)) : null
+      (0, import_react6.createElement)("span", { className: "fr-name" }, file.name),
+      file.size > 0 ? (0, import_react6.createElement)("span", { className: "fr-meta" }, formatSize(file.size)) : null
     )
   );
 }
@@ -859,11 +872,11 @@ function placeHostInRow(notice) {
 }
 function MessageCards(props) {
   ensureStyles();
-  const [hosted, setHosted] = (0, import_react7.useState)([]);
-  const sessionKey = (0, import_react7.useRef)("");
-  const lastCount = (0, import_react7.useRef)(-1);
-  const cachedFiles = (0, import_react7.useRef)(null);
-  (0, import_react7.useEffect)(() => {
+  const [hosted, setHosted] = (0, import_react6.useState)([]);
+  const sessionKey = (0, import_react6.useRef)("");
+  const lastCount = (0, import_react6.useRef)(-1);
+  const cachedFiles = (0, import_react6.useRef)(null);
+  (0, import_react6.useEffect)(() => {
     if (sessionKey.current !== (props.sessionId ?? "")) {
       sessionKey.current = props.sessionId ?? "";
       lastCount.current = -1;
@@ -923,14 +936,14 @@ function MessageCards(props) {
     };
   }, [props.sessionId]);
   if (hosted.length === 0) return null;
-  return (0, import_react7.createElement)(
+  return (0, import_react6.createElement)(
     "span",
     { "aria-hidden": true },
     ...hosted.map((item, i) => (0, import_react_dom3.createPortal)(
-      (0, import_react7.createElement)(
+      (0, import_react6.createElement)(
         "div",
         { className: "fr-msg-row-inner" },
-        ...item.files.map((file) => (0, import_react7.createElement)(FileCard, { key: file.relPath, file, onOpen: props.onOpen }))
+        ...item.files.map((file) => (0, import_react6.createElement)(FileCard, { key: file.relPath, file, onOpen: props.onOpen }))
       ),
       item.host,
       `file-native-cards-${i}`
@@ -1006,9 +1019,16 @@ function installFileIntercept(handlers) {
     const fromItems = Array.from(event.clipboardData?.items ?? []).filter((item) => item.kind === "file").map((item) => item.getAsFile()).filter((file) => file !== null);
     const files = fromList.length > 0 ? fromList : fromItems;
     if (files.length === 0) return;
+    const plan = planPaste(files);
+    if (plan.action === "yield") return;
     event.preventDefault();
-    event.stopPropagation();
-    handlers.onFiles(files);
+    event.stopImmediatePropagation();
+    if (plan.cards.length > 0) handlers.onFiles(plan.cards);
+    if (plan.nativeImages.length > 0) handlers.onImages?.(plan.nativeImages);
+    if (handlers.onText !== void 0) {
+      const kept = extractPasteText(event.clipboardData?.getData("text/plain") ?? "", files);
+      if (kept !== "") handlers.onText(kept);
+    }
   };
   document.addEventListener("dragenter", onDragEnter, true);
   document.addEventListener("dragover", onDragOver, true);
@@ -1028,13 +1048,13 @@ function installFileIntercept(handlers) {
 
 // src/client.ts
 var name = "file-native";
-var inject = ["slots", "betterSidebar"];
+var inject = ["slots"];
 function RailSlot(props) {
   ensureStyles();
   const sessionId = resolveSessionId(props);
   rememberSessionId(sessionId);
-  const tokenRef = (0, import_react8.useRef)(0);
-  (0, import_react8.useLayoutEffect)(() => {
+  const tokenRef = (0, import_react7.useRef)(0);
+  (0, import_react7.useLayoutEffect)(() => {
     tokenRef.current = setLiveOwner({
       attachments: props.attachments,
       canAcceptDrop: props.canAcceptDrop,
@@ -1044,7 +1064,7 @@ function RailSlot(props) {
       dropLimits: props.dropLimits
     });
   });
-  (0, import_react8.useLayoutEffect)(() => () => clearLiveOwner(tokenRef.current), []);
+  (0, import_react7.useLayoutEffect)(() => () => clearLiveOwner(tokenRef.current), []);
   return null;
 }
 var chatCardOpener;
@@ -1055,7 +1075,7 @@ function PickerSlot(props) {
   const inputActions = props.inputActions;
   const submitAction = inputActions?.submit;
   const kitSig = `inputActions=${props.inputActions ? "y" : "n"} useSession=${props.useSession ? "y" : "n"}`;
-  (0, import_react8.useEffect)(() => {
+  (0, import_react7.useEffect)(() => {
     console.info(`[file-native] kit: ${kitSig}`);
   }, [kitSig]);
   const submitWithFiles = (ev, sid) => {
@@ -1071,7 +1091,7 @@ function PickerSlot(props) {
     void fetch(`/plugins/file-native/arm?sessionId=${encodeURIComponent(sid)}`, { method: "POST" }).catch(() => {
     }).then(() => submitFn());
   };
-  (0, import_react8.useEffect)(() => {
+  (0, import_react7.useEffect)(() => {
     const onKeyDown = (ev) => {
       if (ev.key !== "Enter" || ev.shiftKey || ev.isComposing || ev.altKey || ev.ctrlKey || ev.metaKey) return;
       if (running) return;
@@ -1082,7 +1102,7 @@ function PickerSlot(props) {
     document.addEventListener("keydown", onKeyDown, true);
     return () => document.removeEventListener("keydown", onKeyDown, true);
   }, [running, inputActions, sessionId]);
-  (0, import_react8.useEffect)(() => {
+  (0, import_react7.useEffect)(() => {
     const onClick = (ev) => {
       if (running) return;
       const button = ev.target instanceof Element ? ev.target.closest("button") : null;
@@ -1095,34 +1115,28 @@ function PickerSlot(props) {
     document.addEventListener("click", onClick, true);
     return () => document.removeEventListener("click", onClick, true);
   }, [running, inputActions, sessionId]);
-  return (0, import_react8.createElement)(
+  return (0, import_react7.createElement)(
     "span",
     null,
-    (0, import_react8.createElement)(PaperclipButton, { sessionId }),
-    (0, import_react8.createElement)(MessageCards, { sessionId, onOpen: (file) => chatCardOpener?.(sessionId || currentSessionId(), file.relPath, file.name) })
+    (0, import_react7.createElement)(PaperclipButton, { sessionId }),
+    (0, import_react7.createElement)(MessageCards, { sessionId, onOpen: (file) => chatCardOpener?.(sessionId || currentSessionId(), file.relPath, file.name) })
   );
 }
-function TailSlot(props) {
-  return (0, import_react8.createElement)(UploadedTail, {
-    sessionId: props.sessionId,
-    openFile: props.openFile,
-    matched: props.matched ?? null,
-    turn: props.turn?.turn
-  });
-}
-function selectTail(owner2) {
-  const produced = producedPathsOf(owner2);
-  if (produced.length === 0) return null;
-  return { uploaded: [], produced };
-}
 function installLiveIntercept() {
   return installFileIntercept({
     canAccept: () => true,
     onDepth: (depth) => setDragDepth(depth),
     onFiles: (files) => {
       const sessionId = currentSessionId();
-      intakeFiles(sessionId, files, (images) => addImages(sessionId, images));
-    }
+      intakeFiles(sessionId, files, (images) => {
+        void deliverImages(sessionId, images);
+      });
+    },
+    onImages: (files) => {
+      const sessionId = currentSessionId();
+      void deliverImages(sessionId, files);
+    },
+    onText: (text) => pasteAccompanyingText(text)
   });
 }
 var INSTANCE = (() => {
@@ -1134,7 +1148,12 @@ var INSTANCE = (() => {
 })();
 function apply(ctx) {
   ctx.effect(() => installLiveIntercept(), "file-native: document intercept");
-  const sidebar = ctx.betterSidebar;
+  let sidebar;
+  try {
+    sidebar = ctx.betterSidebar;
+  } catch {
+    sidebar = void 0;
+  }
   if (sidebar !== void 0 && sidebar.features.includes("openFile")) {
     chatCardOpener = (sid, relPath, name2) => sidebar.openFile({ sessionId: sid }, relPath, name2);
   } else {
@@ -1164,11 +1183,6 @@ function apply(ctx) {
     order: 0,
     priority: base
   }, PickerSlot));
-  safeInject("conversation.chat.turnTail", () => ctx.slots.register({
-    name: "conversation.chat.turnTail",
-    select: selectTail,
-    priority: base
-  }, TailSlot));
   console.info(`[file-native] client loaded (instance #${INSTANCE})`);
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-files-native",
   "description": "DSH 插件:接近原生质感的附件上传——拖入/粘贴/回形针,图片缩略图与文件卡片混排在官方附件栏",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "main": "lib/index.js",
   "exports": {