dsh-files-native 0.1.3 → 0.2.1

package/README.md

@@ -11,12 +11,33 @@
 
 </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 缩略图，点击灯箱），发送后进模型视觉上下文。
 - **其它文件**落到会话工作区 `.dsh-uploads/`，同一条轨上用 64px 高可读横条卡（扩展名角标 + 文件名 + 大小）。
+- **附件只跟随「立即发送」的消息**：忙碌时回车 = 纯文字排队，文件留在附件轨等下次空闲发送。
+- **气泡附件卡**：消息发出后，文件卡渲染在用户气泡上方（与图片同列右对齐），注入提示行自动隐藏。
+- **点击打开**：点气泡附件卡——装了 [better-sidebar](https://github.com/用户/dsh-better-sidebar) 走侧栏预览；未装则新页签打开（文本/图片/PDF 页签内展示，二进制自动下载）。
 - 发送后文件卡贴在用户气泡栈（与官方图同一列），作业回复不会插在提问和文件中间。
-- 发送成功即清输入框待发轨。回复结尾只画「产物」chip。
+- 发送成功即清输入框待发轨。**回复尾产物卡让给官方。**
 
 不要和 `dsh-file-fix` / `dsh-file-upload` / `dsh-paste-to-path` 叠装。
 
@@ -26,7 +47,7 @@
 |---|---|
 | ![空输入框](screenshots/01-empty.png) | ![待发混排](screenshots/02-rail.png) |
 
-| 拖入窗口任意位置 | 发送后：图与文件卡跟用户气泡，产物在回复尾 |
+| 拖入窗口任意位置 | 发送后：图与文件卡跟用户气泡（产物走官方卡） |
 |---|---|
 | ![拖入遮罩](screenshots/03-overlay.png) | ![发送后](screenshots/04-sent.png) |
 
@@ -79,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");
@@ -43,7 +43,6 @@ var NATIVE_IMAGE_TYPES = /* @__PURE__ */ new Set([
 var NATIVE_IMAGE_EXT = /* @__PURE__ */ new Set(["png", "jpg", "jpeg", "webp", "gif"]);
 var MAX_FILE_BYTES = 50 * 1024 * 1024;
 var MAX_FILES_PER_BATCH = 20;
-var UPLOAD_DIR = ".dsh-uploads";
 function isNativeImage(file) {
   const type = (file.type ?? "").toLowerCase();
   if (NATIVE_IMAGE_TYPES.has(type)) return true;
@@ -62,12 +61,6 @@ function formatSize(bytes) {
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
   return `${(bytes / 1024 / 1024).toFixed(1)} MB`;
 }
-function isSafeRelPath(relPath) {
-  if (relPath === "" || relPath.startsWith("/") || relPath.startsWith("\\")) return false;
-  const parts = relPath.split(/[/\\]/);
-  if (parts[0] !== UPLOAD_DIR) return false;
-  return parts.every((part) => part !== "" && part !== "." && part !== "..");
-}
 function splitIntake(files) {
   const images = [];
   const others = [];
@@ -77,39 +70,30 @@ function splitIntake(files) {
   }
   return { images, others };
 }
-var NOTICE_LINE = /^- (.+?) — path="([^"]+)" size=(\d+)(?: type="([^"]*)")?/;
-function parseNoticeFiles(text) {
-  const files = [];
-  for (const line of text.split("\n")) {
-    const match = NOTICE_LINE.exec(line.trim());
-    if (match === null) continue;
-    const relPath = match[2] ?? "";
-    if (!isSafeRelPath(relPath)) continue;
-    files.push({
-      name: match[1] ?? "file",
-      relPath,
-      size: Number(match[3] ?? 0),
-      mediaType: match[4] || "application/octet-stream"
-    });
-  }
-  return files;
-}
-function contentText(content) {
-  if (typeof content === "string") return content;
-  if (!Array.isArray(content)) return "";
-  const parts = [];
-  for (const block of content) {
-    if (block && typeof block === "object" && "text" in block && typeof block.text === "string") {
-      parts.push(block.text);
-    }
+function planPaste(files) {
+  const nativeImages = [];
+  const cards = [];
+  for (const file of files) {
+    if (isNativeImage(file)) nativeImages.push(file);
+    else cards.push(file);
   }
-  return parts.join("\n");
+  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() {
@@ -162,20 +146,6 @@ function archiveSent(sessionId) {
   if (files.length > 0) emit();
   return files;
 }
-function archiveIfNoticeMatches(sessionId, notice) {
-  if (notice.length === 0) return [];
-  const pendingDone = doneFiles(sessionId);
-  if (pendingDone.length === 0) return [];
-  const paths = new Set(notice.map((file) => file.relPath));
-  if (!pendingDone.some((file) => paths.has(file.relPath))) return [];
-  return archiveSent(sessionId);
-}
-function lastSent(sessionId) {
-  return sentBySession.get(sessionId) ?? [];
-}
-function filesForTurn(sessionId, turn) {
-  return sentByTurn.get(`${sessionId}:${turn}`) ?? lastSent(sessionId);
-}
 
 // src/styles.ts
 var FR_CSS = `
@@ -261,6 +231,9 @@ var FR_CSS = `
 .fr-ctx-body{box-sizing:border-box;background:var(--dsw-alias-markdown-code-block);width:calc(100% - 22px);max-height:141px;
   color:var(--dsw-alias-label-tertiary);font:400 11px/16px var(--ds-font-family-code, ui-monospace,monospace);
   border:none;border-radius:8px;margin:4px 0 0 22px;padding:10px 16px 12px 12px;overflow:auto;white-space:pre-wrap}
+[data-file-native-queue]{flex:none;display:inline-flex;align-items:center;gap:2px;height:20px;padding:0 7px;
+  border-radius:999px;color:var(--dsw-alias-label-tertiary);background:var(--dsw-alias-interactive-bg-hover);
+  font:500 11px/20px Inter, var(--dsw-font-family, system-ui);white-space:nowrap;pointer-events:none}
 `;
 var injected = false;
 function ensureStyles() {
@@ -484,8 +457,7 @@ function FileRail(props) {
     const right = el.scrollLeft < el.scrollWidth - el.clientWidth - 1;
     setEdges((prev) => prev.left === left && prev.right === right ? prev : { left, right });
   };
-  const visibleFiles = files.filter((item) => item.sessionId === sessionId);
-  const itemCount = props.attachments.length + visibleFiles.length;
+  const itemCount = props.attachments.length + files.length;
   (0, import_react2.useLayoutEffect)(() => {
     const grew = countRef.current !== 0 && itemCount > countRef.current;
     countRef.current = itemCount;
@@ -521,7 +493,7 @@ function FileRail(props) {
     el.scrollBy({ left: direction * Math.max(el.clientWidth - 64, 200), behavior: "smooth" });
   };
   const hasImages = props.attachments.length > 0;
-  const hasFiles = visibleFiles.length > 0;
+  const hasFiles = files.length > 0;
   if (!hasImages && !hasFiles) return null;
   return (0, import_react2.createElement)(
     "div",
@@ -539,7 +511,7 @@ function FileRail(props) {
           onRemove: () => props.onRemoveImage(item.id),
           onOpen: () => setPreview(item)
         })),
-        ...visibleFiles.map((item) => (0, import_react2.createElement)(FileTile, { key: item.id, item, sessionId }))
+        ...files.map((item) => (0, import_react2.createElement)(FileTile, { key: item.id, item, sessionId }))
       ),
       edges.right ? (0, import_react2.createElement)("button", { type: "button", className: "fr-arrow fr-arrow-right", "aria-label": "\u5411\u53F3", onClick: () => page(1) }, (0, import_react2.createElement)(IconChevronRight)) : null
     ),
@@ -629,7 +601,7 @@ function addImages(sessionId, files) {
   }
   const key = sid || owner?.sessionId || lastSessionId;
   const prev = queuedImages.get(key) ?? [];
-  queuedImages.set(key, prev.concat([...files]));
+  queuedImages.set(key, prev.concat(files));
 }
 function setDragDepth(depth) {
   const next = Math.max(0, depth);
@@ -717,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();
@@ -730,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",
@@ -754,106 +808,28 @@ 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",
       className: "fr-msg-card",
       title: file.relPath,
-      onClick: () => onOpen?.(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),
-      (0, import_react7.createElement)("span", { className: "fr-meta" }, formatSize(file.size))
+      (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
     )
   );
 }
@@ -861,15 +837,11 @@ function userStackOf(el) {
   if (!(el instanceof HTMLElement)) return null;
   const kind = el.getAttribute("data-chat-flow-kind");
   if (kind !== "user" && kind !== "steering") return null;
-  const row = el.querySelector("[data-time-hover-root]");
-  const stack = row?.firstElementChild;
-  return stack instanceof HTMLElement ? stack : null;
-}
-function findUserStack(anchor) {
-  const flow = anchor?.closest('[data-chat-flow-kind="context"]');
-  if (flow === null) return null;
-  let next = flow.nextElementSibling;
-  let prev = flow.previousElementSibling;
+  return el.querySelector('[class*="userStack"]');
+}
+function findUserStack(notice) {
+  let next = notice.nextElementSibling;
+  let prev = notice.previousElementSibling;
   for (let hop = 0; hop < 16; hop += 1) {
     const stack = userStackOf(next) ?? userStackOf(prev);
     if (stack !== null) return stack;
@@ -878,98 +850,106 @@ function findUserStack(anchor) {
   }
   return null;
 }
-function alreadyPlaced(el, stack, before) {
-  if (el.parentElement !== stack) return false;
-  if (before === el) return true;
-  return el.nextSibling === before;
-}
-function placeHost2(stack) {
-  let el = stack.querySelector("[data-file-native-msg]");
+function placeHostInStack(stack) {
+  let el = stack.querySelector(":scope > [data-file-native-msg]");
   if (el === null) {
     el = document.createElement("div");
     el.dataset.fileNativeMsg = "";
     el.className = "fr-msg-row";
+    stack.insertBefore(el, stack.firstChild);
   }
-  const gallery = stack.querySelector("[data-align]");
-  const after = gallery instanceof HTMLElement ? gallery.closest('[data-slot="conversation.message.images"]') ?? gallery : null;
-  const before = after?.nextSibling ?? stack.firstChild;
-  if (!alreadyPlaced(el, stack, before)) {
-    stack.insertBefore(el, before);
+  return el;
+}
+function placeHostInRow(notice) {
+  let el = notice.querySelector(":scope > [data-file-native-msg]");
+  if (el === null) {
+    el = document.createElement("div");
+    el.dataset.fileNativeMsg = "";
+    el.style.cssText = "flex:0 0 100%;display:flex;flex-wrap:wrap;gap:10px;justify-content:flex-end;padding:2px 44px 8px 22px;width:100%;box-sizing:border-box";
+    notice.appendChild(el);
   }
   return el;
 }
-function AttachToUserBubble(props) {
-  const anchorRef = (0, import_react7.useRef)(null);
-  const [host, setHost] = (0, import_react7.useState)(null);
-  const noticeKey = props.files.map((file) => file.relPath).join("\n");
-  (0, import_react7.useEffect)(() => {
-    const sid = currentSessionId();
-    if (sid) archiveIfNoticeMatches(sid, props.files);
-  }, [noticeKey]);
-  (0, import_react7.useEffect)(() => {
+function MessageCards(props) {
+  ensureStyles();
+  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;
+      cachedFiles.current = null;
+    }
     let cancelled = false;
-    let tries = 0;
     const tick = () => {
       if (cancelled) return;
-      const stack = findUserStack(anchorRef.current);
-      if (stack !== null) {
-        const el = placeHost2(stack);
-        setHost((prev) => prev === el ? prev : el);
-        return;
-      }
-      tries += 1;
-      if (tries < 30) window.setTimeout(tick, 50);
+      const run = async () => {
+        const rows = [...document.querySelectorAll('[data-chat-flow-kind="context"]')].filter((el) => isFileNoticeRow(el));
+        if (rows.length === 0) {
+          if (lastCount.current !== 0) {
+            lastCount.current = 0;
+            setHosted([]);
+          }
+          return;
+        }
+        if (rows.length !== lastCount.current) {
+          const sid = props.sessionId ?? "";
+          if (sid !== "") {
+            try {
+              const res = await fetch(`/plugins/file-native/last?sessionId=${encodeURIComponent(sid)}`);
+              const body = await res.json();
+              cachedFiles.current = Array.isArray(body.files) ? body.files : [];
+            } catch {
+              cachedFiles.current = cachedFiles.current ?? [];
+            }
+          }
+          lastCount.current = rows.length;
+        }
+        const files = cachedFiles.current ?? [];
+        if (files.length === 0) return;
+        const latest = rows[rows.length - 1];
+        const stack = findUserStack(latest);
+        const host = stack !== null ? placeHostInStack(stack) : placeHostInRow(latest);
+        if (stack !== null) {
+          if (latest.querySelector("[data-file-native-anchor]") === null) {
+            const anchor = document.createElement("span");
+            anchor.dataset.fileNativeAnchor = "";
+            anchor.setAttribute("aria-hidden", "true");
+            latest.appendChild(anchor);
+          }
+        }
+        setHosted((prev) => {
+          if (prev.length === 1 && prev[0].host === host) return prev;
+          return [{ host, files }];
+        });
+      };
+      void run().catch(() => {
+      }).then(() => {
+        if (!cancelled) window.setTimeout(tick, 300);
+      });
     };
     tick();
     return () => {
       cancelled = true;
     };
-  }, []);
-  const gallery = (0, import_react7.createElement)(
-    "div",
-    { className: "fr-msg-row-inner" },
-    ...props.files.map((file) => (0, import_react7.createElement)(FileCard, { key: file.relPath, file, onOpen: props.openFile }))
-  );
-  return (0, import_react7.createElement)("span", {
-    ref: anchorRef,
-    "data-file-native-anchor": true,
-    "aria-hidden": true
-  }, host !== null && host.isConnected ? (0, import_react_dom3.createPortal)(gallery, host) : null);
-}
-function OtherContext({ node }) {
-  const [open, setOpen] = (0, import_react7.useState)(false);
-  const data = node.data ?? {};
-  const text = contentText(data.content);
-  const summary = data.source?.summary || data.provenance?.label || "\u4E0A\u4E0B\u6587\u6CE8\u5165";
-  const source = data.source?.plugin || data.provenance?.label || "";
-  return (0, import_react7.createElement)(
-    "div",
-    { className: "fr-ctx", "data-open": open || void 0 },
-    (0, import_react7.createElement)(
-      "button",
-      {
-        type: "button",
-        className: "fr-ctx-head",
-        onClick: () => setOpen((value) => !value)
-      },
-      (0, import_react7.createElement)("span", { className: "fr-ctx-title" }, "\u4E0A\u4E0B\u6587\u6CE8\u5165"),
-      source ? (0, import_react7.createElement)("span", { className: "fr-ctx-src" }, source) : null,
-      (0, import_react7.createElement)("span", { className: "fr-ctx-sum" }, summary)
-    ),
-    open ? (0, import_react7.createElement)("pre", { className: "fr-ctx-body" }, text) : null
+  }, [props.sessionId]);
+  if (hosted.length === 0) return null;
+  return (0, import_react6.createElement)(
+    "span",
+    { "aria-hidden": true },
+    ...hosted.map((item, i) => (0, import_react_dom3.createPortal)(
+      (0, import_react6.createElement)(
+        "div",
+        { className: "fr-msg-row-inner" },
+        ...item.files.map((file) => (0, import_react6.createElement)(FileCard, { key: file.relPath, file, onOpen: props.onOpen }))
+      ),
+      item.host,
+      `file-native-cards-${i}`
+    ))
   );
 }
-function ContextNodeView(props) {
-  ensureStyles();
-  const node = props.node ?? {};
-  const source = node.data?.source;
-  if (source?.kind === "plugin" && source.plugin === "file-native") {
-    const files = parseNoticeFiles(contentText(node.data?.content));
-    if (files.length === 0) return null;
-    return (0, import_react7.createElement)(AttachToUserBubble, { files, openFile: props.openFile });
-  }
-  return (0, import_react7.createElement)(OtherContext, { node });
-}
 
 // src/intercept.ts
 function looksLikeFileDrag(transfer) {
@@ -1039,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);
@@ -1066,8 +1053,8 @@ 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,
@@ -1076,40 +1063,64 @@ function RailSlot(props) {
       sessionId,
       dropLimits: props.dropLimits
     });
-  }, [sessionId, props.attachments, props.canAcceptDrop, props.onAddImages, props.onRemoveImage, props.dropLimits]);
-  (0, import_react8.useLayoutEffect)(() => () => clearLiveOwner(tokenRef.current), []);
+  });
+  (0, import_react7.useLayoutEffect)(() => () => clearLiveOwner(tokenRef.current), []);
   return null;
 }
+var chatCardOpener;
 function PickerSlot(props) {
   const sessionId = resolveSessionId(props);
   rememberSessionId(sessionId);
-  const phase = String(props.input?.phase ?? "");
-  const draft = String(props.input?.draft ?? "");
-  const imageCount = props.input?.imageIds?.length ?? 0;
-  const prev = (0, import_react8.useRef)({ phase, draft, imageCount });
-  (0, import_react8.useEffect)(() => {
-    const sid = sessionId || currentSessionId();
-    const was = prev.current;
-    const entering = phase === "submitting" || phase === "claimed";
-    const leaving = (was.phase === "submitting" || was.phase === "claimed") && phase === "plain";
-    const sentPlain = was.phase !== "plain" && phase === "plain" && draft.trim() === "" && imageCount === 0;
-    if (sid && (entering || leaving || sentPlain)) archiveSent(sid);
-    prev.current = { phase, draft, imageCount };
-  }, [phase, draft, imageCount, sessionId]);
-  return (0, import_react8.createElement)(PaperclipButton, { sessionId });
-}
-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 };
+  const running = Boolean(props.useSession?.((state) => state.running));
+  const inputActions = props.inputActions;
+  const submitAction = inputActions?.submit;
+  const kitSig = `inputActions=${props.inputActions ? "y" : "n"} useSession=${props.useSession ? "y" : "n"}`;
+  (0, import_react7.useEffect)(() => {
+    console.info(`[file-native] kit: ${kitSig}`);
+  }, [kitSig]);
+  const submitWithFiles = (ev, sid) => {
+    const submitFn = inputActions?.submit;
+    archiveSent(sid);
+    if (submitFn === void 0) {
+      void fetch(`/plugins/file-native/arm?sessionId=${encodeURIComponent(sid)}`, { method: "POST" }).catch(() => {
+      });
+      return;
+    }
+    ev.preventDefault();
+    ev.stopPropagation();
+    void fetch(`/plugins/file-native/arm?sessionId=${encodeURIComponent(sid)}`, { method: "POST" }).catch(() => {
+    }).then(() => submitFn());
+  };
+  (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;
+      const sid = sessionId || currentSessionId();
+      if (sid === "" || doneFiles(sid).length === 0) return;
+      submitWithFiles(ev, sid);
+    };
+    document.addEventListener("keydown", onKeyDown, true);
+    return () => document.removeEventListener("keydown", onKeyDown, true);
+  }, [running, inputActions, sessionId]);
+  (0, import_react7.useEffect)(() => {
+    const onClick = (ev) => {
+      if (running) return;
+      const button = ev.target instanceof Element ? ev.target.closest("button") : null;
+      if (button === null) return;
+      if (!/[a-zA-Z0-9_-]*primary/.test(button.className)) return;
+      const sid = sessionId || currentSessionId();
+      if (sid === "" || doneFiles(sid).length === 0) return;
+      submitWithFiles(ev, sid);
+    };
+    document.addEventListener("click", onClick, true);
+    return () => document.removeEventListener("click", onClick, true);
+  }, [running, inputActions, sessionId]);
+  return (0, import_react7.createElement)(
+    "span",
+    null,
+    (0, import_react7.createElement)(PaperclipButton, { sessionId }),
+    (0, import_react7.createElement)(MessageCards, { sessionId, onOpen: (file) => chatCardOpener?.(sessionId || currentSessionId(), file.relPath, file.name) })
+  );
 }
 function installLiveIntercept() {
   return installFileIntercept({
@@ -1117,32 +1128,62 @@ function installLiveIntercept() {
     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 = (() => {
+  const w = globalThis;
+  w.__fileNativeInstances = (w.__fileNativeInstances ?? 0) + 1;
+  const n = w.__fileNativeInstances;
+  console.warn(`[file-native] apply #${n}`);
+  return n;
+})();
 function apply(ctx) {
   ctx.effect(() => installLiveIntercept(), "file-native: document intercept");
-  ctx.slots.inject("conversation.input.attachments", () => ctx.slots.register({
+  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 {
+    chatCardOpener = (sid, relPath) => {
+      window.open(`/plugins/file-native/file?sessionId=${encodeURIComponent(sid)}&path=${encodeURIComponent(relPath)}`, "_blank");
+    };
+  }
+  const base = -(1e3 + INSTANCE * 10);
+  const safeInject = (slot, registerFn) => {
+    ctx.slots.inject(slot, () => {
+      try {
+        return registerFn();
+      } catch (error) {
+        console.warn(`[file-native] skip ${slot} registration:`, error);
+        return () => {
+        };
+      }
+    });
+  };
+  safeInject("conversation.input.attachments", () => ctx.slots.register({
     name: "conversation.input.attachments",
-    priority: -1
+    priority: base
   }, RailSlot));
-  ctx.slots.inject("conversation.input.left", () => ctx.slots.register({
+  safeInject("conversation.input.left", () => ctx.slots.register({
     name: "conversation.input.left",
     id: "file-native-picker",
-    order: 0
+    order: 0,
+    priority: base
   }, PickerSlot));
-  ctx.slots.inject("conversation.chat.node", () => ctx.slots.register({
-    name: "conversation.chat.node",
-    key: "context",
-    priority: -1
-  }, ContextNodeView));
-  ctx.slots.inject("conversation.chat.turnTail", () => ctx.slots.register({
-    name: "conversation.chat.turnTail",
-    priority: -1,
-    select: selectTail
-  }, TailSlot));
-  ctx.logger?.info?.("[file-native] client loaded");
+  console.info(`[file-native] client loaded (instance #${INSTANCE})`);
 }
 
 return module.exports;

package/lib/index.js

@@ -1,7 +1,7 @@
 // src/index.ts
 import { randomUUID } from "node:crypto";
 import { createWriteStream } from "node:fs";
-import { mkdir, rename, rm, stat } from "node:fs/promises";
+import { mkdir, readFile, rename, rm, stat } from "node:fs/promises";
 import { dirname, join, resolve, sep } from "node:path";
 
 // src/lib.ts
@@ -41,6 +41,7 @@ var name = "file-native";
 var inject = ["webServer", "sessions"];
 var pending = /* @__PURE__ */ new Map();
 var lastSent = /* @__PURE__ */ new Map();
+var armed = /* @__PURE__ */ new Set();
 function sessionCwd(ctx, sessionId, clientCwd) {
   const headerCwd = ctx.sessions.get(sessionId)?.header?.cwd;
   if (headerCwd) return headerCwd;
@@ -127,12 +128,12 @@ function registerRoutes(ctx, webServer) {
         const bytes = await readBody(req, MAX_FILE_BYTES);
         if (bytes.length === 0) return json(res, 400, { ok: false, error: "empty" });
         const cwd = sessionCwd(ctx, sessionId, q.get("cwd") ?? void 0);
-        const file = await writeUpload(cwd, fileName, bytes);
-        file.mediaType = q.get("type") || file.mediaType;
+        const file2 = await writeUpload(cwd, fileName, bytes);
+        file2.mediaType = q.get("type") || file2.mediaType;
         const list = pending.get(sessionId) ?? [];
-        list.push(file);
+        list.push(file2);
         pending.set(sessionId, list);
-        json(res, 200, { ok: true, file });
+        json(res, 200, { ok: true, file: file2 });
       } catch (error) {
         const code = error.code === "too-large" ? 413 : 400;
         ctx.logger.warn("[file-native] upload failed: %o", error);
@@ -168,10 +169,68 @@ function registerRoutes(ctx, webServer) {
       json(res, 200, { ok: true, files: lastSent.get(sessionId) ?? [] });
     }
   });
+  const arm = webServer.register({
+    kind: "exact",
+    path: "/plugins/file-native/arm",
+    handler: (req, res) => {
+      if (!isLoopback(req)) return json(res, 403, { ok: false, error: "forbidden" });
+      if (req.method !== "POST") return json(res, 405, { ok: false, error: "method" });
+      const sessionId = query(req).get("sessionId") ?? "";
+      if (sessionId === "") return json(res, 400, { ok: false, error: "sessionId" });
+      armed.add(sessionId);
+      json(res, 200, { ok: true });
+    }
+  });
+  const file = webServer.register({
+    kind: "exact",
+    path: "/plugins/file-native/file",
+    handler: async (req, res) => {
+      if (!isLoopback(req)) return json(res, 403, { ok: false, error: "forbidden" });
+      if (req.method !== "GET") return json(res, 405, { ok: false, error: "method" });
+      const q = query(req);
+      const sessionId = q.get("sessionId") ?? "";
+      const relPath = q.get("path") ?? "";
+      if (sessionId === "" || !isSafeRelPath(relPath)) return json(res, 400, { ok: false, error: "bad-path" });
+      try {
+        const cwd = sessionCwd(ctx, sessionId);
+        const abs = resolve(cwd, relPath);
+        const info = await stat(abs);
+        if (!info.isFile()) throw new Error("not-file");
+        const bytes = await readFile(abs);
+        const ext = relPath.split(".").pop()?.toLowerCase() ?? "";
+        const types = {
+          md: "text/markdown; charset=utf-8",
+          txt: "text/plain; charset=utf-8",
+          json: "application/json; charset=utf-8",
+          csv: "text/csv; charset=utf-8",
+          pdf: "application/pdf",
+          png: "image/png",
+          jpg: "image/jpeg",
+          jpeg: "image/jpeg",
+          gif: "image/gif",
+          webp: "image/webp",
+          svg: "image/svg+xml",
+          html: "text/html; charset=utf-8",
+          xml: "application/xml"
+        };
+        const name2 = relPath.replace(/^.*[/\\]/, "");
+        res.writeHead(200, {
+          "content-type": types[ext] ?? "application/octet-stream",
+          "content-length": String(bytes.length),
+          "content-disposition": `inline; filename*=UTF-8''${encodeURIComponent(name2)}`
+        });
+        res.end(bytes);
+      } catch {
+        json(res, 404, { ok: false, error: "not-found" });
+      }
+    }
+  });
   return () => {
     upload();
     remove();
     last();
+    arm();
+    file();
   };
 }
 function apply(ctx) {
@@ -205,20 +264,25 @@ function apply(ctx) {
     if (decision?.kind === "reject") return decision;
     const agent = payload.agent;
     const sessionId = String(agent?.id ?? "");
+    if (!Array.isArray(decision.messages) || decision.messages.length === 0) return decision;
+    const lastMessage = decision.messages[decision.messages.length - 1];
+    if (String(lastMessage?.role) !== "user") return decision;
     const files = takePending(sessionId);
-    if (files.length === 0 || !Array.isArray(decision.messages) || decision.messages.length === 0) {
-      return decision;
-    }
+    if (!armed.has(sessionId)) return decision;
+    armed.delete(sessionId);
+    const deliver = files;
+    if (deliver.length === 0) return decision;
+    lastSent.set(sessionId, deliver);
     const lastIndex = decision.messages.length - 1;
     const notice = {
       id: `file-native-${String(decision.messages[lastIndex]?.id ?? randomUUID())}`,
       role: "user",
-      content: [{ type: "text", text: fileListText(files) }],
+      content: [{ type: "text", text: fileListText(deliver) }],
       source: {
         kind: "plugin",
         plugin: "file-native",
         form: "notice",
-        summary: `\u{1F4CE} \u9644\u4EF6 ${files.length} \u4E2A\u6587\u4EF6`
+        summary: `\u{1F4CE} \u9644\u4EF6 ${deliver.length} \u4E2A\u6587\u4EF6`
       }
     };
     return {

package/package.json

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