dsh-deepseek-import 0.1.1 → 0.2.0

package/dsh-import.cmd

@@ -1,65 +1,65 @@
-@echo off
-setlocal
-cd /d "%~dp0"
-
-set "LOG=%~dp0import.log"
-chcp 65001 >nul 2>&1
-
-rem ---------- find Node.js: always absolute paths, never relative ----------
-set "NODE="
-
-rem 0) manual override: put the full node.exe path in node-path.txt (highest priority)
-if exist "%~dp0node-path.txt" set /p NODE=<"%~dp0node-path.txt"
-
-rem 1) resolve node.exe from PATH (a bare "node" would fail an exist check)
-if not defined NODE for %%I in (node.exe) do set "NODE=%%~$PATH:I"
-
-rem 2) common install locations
-if not defined NODE if exist "%ProgramFiles%\nodejs\node.exe" set "NODE=%ProgramFiles%\nodejs\node.exe"
-if not defined NODE if exist "%ProgramFiles(x86)%\nodejs\node.exe" set "NODE=%ProgramFiles(x86)%\nodejs\node.exe"
-if not defined NODE if exist "%LOCALAPPDATA%\Programs\nodejs\node.exe" set "NODE=%LOCALAPPDATA%\Programs\nodejs\node.exe"
-if not defined NODE if exist "%APPDATA%\npm\node.exe" set "NODE=%APPDATA%\npm\node.exe"
-
-rem 3) portable: put node.exe next to this file
-if not defined NODE if exist "%~dp0node.exe" set "NODE=%~dp0node.exe"
-
-if not defined NODE (
-  echo.
-  echo   Node.js not found.
-  echo.
-  echo   Install Node 22 or newer: https://nodejs.org/
-  echo   Or drop node.exe next to this file.
-  echo   Or create node-path.txt with the full path to node.exe.
-  echo.
-  pause
-  exit /b 1
-)
-
-rem version check: built-in zstd requires Node 22+
-"%NODE%" -e "process.exit(Number(process.versions.node.split('.')[0]) >= 22 ? 0 : 1)" >nul 2>&1
-if errorlevel 1 (
-  echo.
-  echo   Node.js is too old:
-  "%NODE%" -v
-  echo   Node 22 or newer is required - session compression uses built-in zstd.
-  echo.
-  pause
-  exit /b 1
-)
-
-echo ============================================
-echo   DeepSeek chat import into DeepSeek Harness
-echo   Node: %NODE%
-echo ============================================
-echo.
-
-"%NODE%" "%~dp0dsh-import.mjs" %*
-set "CODE=%ERRORLEVEL%"
-
-echo.
-if not "%CODE%"=="0" (
-  echo [FAILED] exit code %CODE%, see import.log
-) else (
-  echo [DONE] see import.log
-)
-pause
+@echo off
+setlocal
+cd /d "%~dp0"
+
+set "LOG=%~dp0import.log"
+chcp 65001 >nul 2>&1
+
+rem ---------- find Node.js: always absolute paths, never relative ----------
+set "NODE="
+
+rem 0) manual override: put the full node.exe path in node-path.txt (highest priority)
+if exist "%~dp0node-path.txt" set /p NODE=<"%~dp0node-path.txt"
+
+rem 1) resolve node.exe from PATH (a bare "node" would fail an exist check)
+if not defined NODE for %%I in (node.exe) do set "NODE=%%~$PATH:I"
+
+rem 2) common install locations
+if not defined NODE if exist "%ProgramFiles%\nodejs\node.exe" set "NODE=%ProgramFiles%\nodejs\node.exe"
+if not defined NODE if exist "%ProgramFiles(x86)%\nodejs\node.exe" set "NODE=%ProgramFiles(x86)%\nodejs\node.exe"
+if not defined NODE if exist "%LOCALAPPDATA%\Programs\nodejs\node.exe" set "NODE=%LOCALAPPDATA%\Programs\nodejs\node.exe"
+if not defined NODE if exist "%APPDATA%\npm\node.exe" set "NODE=%APPDATA%\npm\node.exe"
+
+rem 3) portable: put node.exe next to this file
+if not defined NODE if exist "%~dp0node.exe" set "NODE=%~dp0node.exe"
+
+if not defined NODE (
+  echo.
+  echo   Node.js not found.
+  echo.
+  echo   Install Node 22 or newer: https://nodejs.org/
+  echo   Or drop node.exe next to this file.
+  echo   Or create node-path.txt with the full path to node.exe.
+  echo.
+  pause
+  exit /b 1
+)
+
+rem version check: built-in zstd requires Node 22+
+"%NODE%" -e "process.exit(Number(process.versions.node.split('.')[0]) >= 22 ? 0 : 1)" >nul 2>&1
+if errorlevel 1 (
+  echo.
+  echo   Node.js is too old:
+  "%NODE%" -v
+  echo   Node 22 or newer is required - session compression uses built-in zstd.
+  echo.
+  pause
+  exit /b 1
+)
+
+echo ============================================
+echo   DeepSeek chat import into DeepSeek Harness
+echo   Node: %NODE%
+echo ============================================
+echo.
+
+"%NODE%" "%~dp0dsh-import.mjs" %*
+set "CODE=%ERRORLEVEL%"
+
+echo.
+if not "%CODE%"=="0" (
+  echo [FAILED] exit code %CODE%, see import.log
+) else (
+  echo [DONE] see import.log
+)
+pause

package/dsh-import.mjs

@@ -424,7 +424,7 @@ function sidecarDir(workspacePath, sessionId) {
     const ignore = path.join(root, '.gitignore');
     if (!fs.existsSync(ignore)) {
       try {
-        fs.writeFileSync(ignore, '# DSH 导入存档（思考 / 引用 / 全文 / 附件）\n*\n');
+        fs.writeFileSync(ignore, '# DSH 导入存档（思考 / 全文 / 多版本；数据源带引用或附件时另存）\n*\n');
       } catch {
         /* 没有写权限就算了 */
       }
@@ -1162,7 +1162,7 @@ async function main() {
  * 供 TUI / 其它程序调用：不解析命令行，直接指定文件与工作区。
  * 返回 { workspace, created }。
  */
-export async function runImport({ files, workspacePath = null, dryRun = false, register = true, thinking = false, only = null, keepAll = false, keepInterrupted = false, fromIndex = null, fromMatch = null }) {
+export async function runImport({ files, workspacePath = null, dryRun = false, register = true, thinking = false, only = null, keepAll = false, keepInterrupted = false, fromIndex = null, fromMatch = null, tail = null }) {
   opts.files = [...files];
   opts.workspace = workspacePath;
   opts.dryRun = dryRun;
@@ -1173,6 +1173,7 @@ export async function runImport({ files, workspacePath = null, dryRun = false, r
   opts.keepInterrupted = keepInterrupted;
   opts.fromIndex = fromIndex;
   opts.fromMatch = fromMatch;
+  opts.tail = Number.isInteger(tail) && tail > 0 ? tail : undefined;
   opts.list = false;
   opts.json = false;
   return main();

package/edge-extension/content.js

@@ -437,11 +437,31 @@
     try {
       const cached = await readCachedHistory();
       if (cached.ok && cached.messages?.length) {
-        pushCapture(cached.messages);
+        // 缓存里没有附件（DeepSeek 不把 files 写进 IndexedDB）。
+        // 当前屏幕上已渲染的消息能拿到 <img>，按「角色+正文完全相同」贴回去，
+        // 只做并集、不新增消息，避免重复。
+        let withFiles = cached.messages;
+        try {
+          const domMessages = domExtract().messages || [];
+          const byKey = new Map(withFiles.map((m) => [`${m.role}|${String(m.content || '').trim()}`, m]));
+          let attached = 0;
+          for (const domMessage of domMessages) {
+            if (!(domMessage.files || []).length) continue;
+            const target = byKey.get(`${domMessage.role}|${String(domMessage.content || '').trim()}`);
+            if (!target) continue;
+            target.files = [...(target.files || []), ...domMessage.files];
+            attached += domMessage.files.length;
+          }
+          if (attached) withFiles = [...withFiles];
+        } catch {
+          /* DOM 读不到就维持原样 */
+        }
+
+        pushCapture(withFiles);
         return {
           ok: true,
           source: 'cache',
-          messages: cached.messages,
+          messages: withFiles,
           rounds: 0,
           captures: 1,
           delta: 0,

package/edge-extension/merge.js

@@ -16,8 +16,25 @@
     return (message?.content || '').length + (message?.thinking || '').length;
   }
 
+  /** 同一消息的两份副本：正文取更全的，附件取并集 */
+  function unionFiles(a, b) {
+    const merged = [];
+    const seen = new Set();
+    for (const file of [...(a || []), ...(b || [])]) {
+      const key = file?.dataUrl ? String(file.dataUrl).slice(0, 64) : file?.url || file?.name;
+      if (!key || seen.has(key)) continue;
+      seen.add(key);
+      merged.push(file);
+    }
+    return merged;
+  }
+
   function richer(a, b) {
-    return score(b) > score(a) ? b : a;
+    if (!a) return b;
+    if (!b) return a;
+    const winner = score(b) > score(a) ? b : a;
+    const files = unionFiles(a.files, b.files);
+    return files.length ? { ...winner, files } : winner;
   }
 
   function keyOf(message) {

package/icon.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" width="64" height="64" role="img" aria-label="DeepSeek Chat Import">
+  <rect x="4" y="10" width="40" height="30" rx="8" fill="#4d6bfe" opacity="0.15"/>
+  <path d="M12 20h24M12 28h16" stroke="#4d6bfe" stroke-width="3.5" stroke-linecap="round"/>
+  <path d="M24 52l14-12h10a6 6 0 0 0 6-6V22" fill="none" stroke="#4d6bfe" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M48 22l6-6M48 22l6 6" stroke="#4d6bfe" stroke-width="4" stroke-linecap="round"/>
+</svg>

package/index.js

@@ -0,0 +1,105 @@
+/**
+ * dsh-deepseek-import 的 Host 插件入口。
+ *
+ * 提供一个模型可调用的工具：把 Edge 扩展导出的 DeepSeek 对话 JSON
+ * 重建为当前工作区里的 DSH 会话。
+ */
+
+import { defineTool } from '@deepseek-ai/dsh-tools';
+
+/** Cordis 插件名 */
+export const name = 'dsh-deepseek-import';
+
+/** 需要工具注册表 */
+export const inject = ['tools'];
+
+/**
+ * 注册 import_deepseek_chat。
+ * @param ctx - 工具注册表（以及可选的 session/agent 服务）
+ * @param config - 插件配置（当前未使用）
+ */
+export function apply(ctx, config = {}) {
+  void config;
+
+  ctx.tools.register(
+    defineTool({
+      name: 'import_deepseek_chat',
+      description:
+        'Import a DeepSeek web chat export (the JSON produced by the dsh-deepseek-import Edge extension) into DeepSeek Harness as new session(s) in the current workspace. Returns the created session ids and the sidecar paths (thinking/transcript/references). New sessions become visible in the sidebar on the next session-list refresh; if they do not appear, restart DSH.',
+      parameters: {
+        file: {
+          type: 'string',
+          description: 'Absolute path to a dsh-deepseek-*.json export. Renamed exports are recognised by their content.',
+        },
+        workspace: {
+          type: 'string',
+          description: 'Target workspace directory. Omit to use the calling session working directory.',
+        },
+        tail: {
+          type: 'number',
+          description: 'Import only the last N turns of each conversation (recommended for very long chats).',
+        },
+        fromMatch: {
+          type: 'string',
+          description: 'Start the branch at the first user message containing this text.',
+        },
+        keepInterrupted: {
+          type: 'boolean',
+          description: 'Keep partial interrupted assistant output instead of a placeholder.',
+        },
+        dryRun: {
+          type: 'boolean',
+          description: 'Parse and report only; write nothing.',
+        },
+      },
+      output: {
+        schema: {
+          type: 'object',
+          additionalProperties: false,
+          properties: {
+            ok: { type: 'boolean', required: true },
+            created: { type: 'array', items: { type: 'string' }, required: true },
+            workspace: { type: 'string', required: true },
+            message: { type: 'string', required: true },
+          },
+        },
+        render: (_args, value) => [{ type: 'text', text: JSON.stringify(value) }],
+      },
+      async execute(args, exec) {
+        const workspace =
+          args.workspace ||
+          exec?.agent?.cwd ||
+          exec?.agent?.workingDirectory ||
+          exec?.cwd ||
+          process.cwd();
+
+        const { runImport } = await import(new URL('./dsh-import.mjs', import.meta.url).href);
+        const result = await runImport({
+          files: [args.file],
+          workspacePath: workspace,
+          dryRun: args.dryRun === true,
+          tail: args.tail,
+          fromMatch: args.fromMatch,
+          keepInterrupted: args.keepInterrupted === true,
+        });
+
+        const created = (result?.created ?? []).map((item) =>
+          typeof item === 'string' ? item : item.sessionId
+        );
+        return {
+          ok: created.length > 0,
+          created,
+          workspace,
+          message: created.length
+            ? `已导入 ${created.length} 个会话。侧栏下次刷新可见；若没有出现，重启 DSH。`
+            : '没有创建任何会话，请检查导出文件是否包含消息。',
+        };
+      },
+      presentCall: (args) => ({
+        card: 'generic',
+        title: 'import_deepseek_chat',
+        rawInput: args,
+      }),
+    })
+  );
+}

package/locale/en.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "DeepSeek Chat Import",
+    "description": "Rebuild DeepSeek web conversations exported by the Edge extension as DeepSeek Harness sessions."
+  }
+}

package/locale/zh.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "DeepSeek 对话导入",
+    "description": "把 Edge 扩展导出的 DeepSeek 网页对话重建为 DeepSeek Harness 会话。"
+  }
+}

package/package.json

@@ -1,14 +1,37 @@
 {
   "name": "dsh-deepseek-import",
-  "version": "0.1.1",
-  "description": "DeepSeek web chat → DeepSeek Harness sessions (Edge extension + importer CLI)",
+  "version": "0.2.0",
+  "description": "DeepSeek web chat → DeepSeek Harness sessions (Edge extension + importer CLI + DSH plugin)",
   "type": "module",
   "license": "MIT",
   "author": "Hungry-M",
   "bin": {
     "dsh-import": "./dsh-import.mjs"
   },
+  "exports": {
+    ".": "./index.js",
+    "./locale/*.json": "./locale/*.json",
+    "./icon": "./icon.svg",
+    "./package.json": "./package.json"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    }
+  },
+  "peerDependencies": {
+    "@deepseek-ai/dsh-tools": "*"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-tools": {
+      "optional": true
+    }
+  },
   "files": [
+    "index.js",
+    "cordis.patch.yml",
+    "locale/*.json",
+    "icon.svg",
     "dsh-import.mjs",
     "dsh-import-tui.mjs",
     "dsh-import.cmd",