dsh-plugin-library 0.1.1 → 0.1.3

package/dist/client.js

@@ -1092,7 +1092,9 @@ window.__ModuleLoader__.load({
       /** The applications registered for this file, OS preference order first. */
       fileApplications: (assetId) => hostCall(FEATURE, "file-applications", { assetId }),
       /** Re-read the (possibly externally edited) original into a new revision. */
-      importExternal: (assetId) => hostCall(FEATURE, "import-external", { assetId })
+      importExternal: (assetId) => hostCall(FEATURE, "import-external", { assetId }),
+      /** The original converted to PDF by the installation's LibreOffice engine (pptx / docx / xlsx …). */
+      previewPdf: (assetId) => hostCall(FEATURE, "preview-pdf", { assetId })
     };
     var KIND_LABELS = {
       markdown: "Markdown",
@@ -1502,6 +1504,7 @@ window.__ModuleLoader__.load({
       avif: "image/avif",
       ico: "image/x-icon"
     };
+    var OFFICE_EXTENSIONS = /* @__PURE__ */ new Set(["pptx", "ppt", "docx", "doc", "xlsx", "xls"]);
     function previewKindOf(name2, kind, mediaType) {
       const extension = extensionOf(name2);
       const type = mediaType.toLowerCase();
@@ -1509,6 +1512,7 @@ window.__ModuleLoader__.load({
       if (kind === "html" || extension === "html" || extension === "htm" || type === "text/html") return "html";
       if (kind === "csv" || extension === "csv" || type === "text/csv") return "csv";
       if (type.startsWith("image/") || IMAGE_TYPES[extension] !== void 0) return "image";
+      if (OFFICE_EXTENSIONS.has(extension)) return "office-pdf";
       return void 0;
     }
     function isolatedHtml(source) {
@@ -1713,6 +1717,17 @@ window.__ModuleLoader__.load({
             setPreview({ kind: "csv", bytes: decodeBase64(original.base64) });
             return;
           }
+          if (kind === "office-pdf") {
+            const converted = await management.previewPdf(asset.id);
+            if (!live()) return;
+            const url2 = URL.createObjectURL(originalBlob(
+              { name: `${asset.id}-preview.pdf`, mediaType: "application/pdf", byteLength: 0, base64: converted.base64 },
+              "application/pdf"
+            ));
+            previewUrlRef.current = url2;
+            setPreview({ kind: "office-pdf", url: url2 });
+            return;
+          }
           const name2 = original.name.length > 0 ? original.name : node.name;
           const extension = extensionOf(name2);
           const type = kind === "pdf" ? "application/pdf" : original.mediaType.startsWith("image/") ? original.mediaType : IMAGE_TYPES[extension] ?? original.mediaType;
@@ -2102,6 +2117,7 @@ window.__ModuleLoader__.load({
           }
           if (preview !== void 0) {
             if (preview.kind === "csv") return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(CsvGrid, { bytes: preview.bytes });
+            if (preview.kind === "office-pdf") return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("iframe", { className: "wd-library-pdf", title: node.name, src: preview.url });
             return preview.kind === "pdf" ? /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("iframe", { className: "wd-library-pdf", title: node.name, src: preview.url }) : /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("img", { src: preview.url, alt: node.name, style: { maxWidth: "100%", borderRadius: 10, border: "1px solid var(--dsw-alias-border-l2)" } });
           }
           return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("div", { className: "wd-library-state", children: "\u539F\u4EF6\u8BFB\u53D6\u5931\u8D25\uFF0C\u4E0A\u65B9\u63D0\u793A\u8BF4\u660E\u4E86\u539F\u56E0\uFF1B\u53EF\u4EE5\u7528\u4E0A\u65B9\u7684\u300C\u4E0B\u8F7D\u300D\u628A\u5B83\u53D6\u56DE\u3002" });

package/dist/dsh-package.mjs

@@ -0,0 +1,116 @@
+/**
+ * Reaching an official Harness package from a third-party Host half.
+ *
+ * Why this exists: `install_bundle` links a workspace directory into the
+ * profile, and Node resolves a plugin's bare-specifier imports from that
+ * directory's **realpath** — the user's source tree, far outside the dsh
+ * installation. So `import '@deepseek-ai/dsh-mcp-client'` fails with
+ * ERR_MODULE_NOT_FOUND even though the package is right there in the running
+ * app. Verified on 0.2.0-rc.2; see docs/PORTING-NOTES.md §9.
+ *
+ * The anchor order mirrors app-boot's own `resolveBundleDir`: the installation
+ * first, the profile second, so an in-box package is never shadowed by a
+ * profile-local copy. Resolution through the same anchor also means the import
+ * lands on the same absolute file the official rows use, so Node's module cache
+ * hands back the same instance rather than a second one.
+ *
+ * @module shared/dsh-package
+ */
+
+import { createRequire } from 'node:module'
+import { isAbsolute, join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+
+/**
+ * Candidate resolution anchors, most authoritative first.
+ * @param {{ argv?: readonly string[], cwd?: string }} [options] - overrides for tests.
+ * @returns {string[]} absolute anchors suitable for `createRequire`.
+ */
+export function dshResolutionAnchors({ argv = process.argv, cwd = process.cwd() } = {}) {
+  const anchors = []
+  // The script the host process was started with lives inside the installation:
+  //   <dsh home>/node_modules/@deepseek-ai/dsh-desktop-host/lib/index.js
+  if (typeof argv[1] === 'string' && isAbsolute(argv[1])) anchors.push(argv[1])
+  // The desktop host is additionally handed the dsh home as its first argument.
+  if (typeof argv[2] === 'string' && isAbsolute(argv[2])) anchors.push(join(argv[2], 'package.json'))
+  // Profile-local packages last, so they can never shadow the installation.
+  anchors.push(join(cwd, 'package.json'))
+  return [...new Set(anchors)]
+}
+
+/**
+ * Test seam: specifiers answered from memory instead of the installation.
+ *
+ * Offline verification runs a Host half's `apply()` outside DSH, where the
+ * installation does not exist. A feature that needs `storageDomain` or the MCP
+ * client would otherwise be unverifiable until it is installed — exactly the
+ * situation shared/host/route.mjs and the rest of the harness exist to avoid.
+ *
+ * This only substitutes *resolution*; the real anchor walk stays the default and
+ * is covered directly by tests/dsh-package.test.mjs.
+ *
+ * The map lives on `globalThis` under a symbol: the published bundle ships this
+ * file as its own module (`dist/dsh-package.mjs`), so a test process holds two
+ * instances of it — the repo copy and the bundle copy. Module-level state would
+ * split them, and stubs registered through the repo copy would silently stop
+ * resolving inside the bundle. One shared registry keeps every instance honest.
+ * @type {Map<string, Record<string, unknown>>}
+ */
+const STUBS_KEY = Symbol.for('dsh-skills:dsh-package-stubs')
+const stubs = (globalThis[STUBS_KEY] ??= new Map())
+
+/**
+ * Answer one specifier from memory for the rest of this process.
+ * @param {string} specifier - package name to stub.
+ * @param {Record<string, unknown>} module - the module namespace to return.
+ * @returns {void}
+ */
+export function setDshPackageStub(specifier, module) {
+  stubs.set(specifier, module)
+}
+
+/** Remove every stub. */
+export function clearDshPackageStubs() {
+  stubs.clear()
+}
+
+/**
+ * Resolve an official package to its entry file.
+ * @param {string} specifier - the package name to resolve.
+ * @param {{ argv?: readonly string[], cwd?: string }} [options] - overrides for tests.
+ * @returns {string} absolute path of the resolved entry file.
+ * @throws {Error} with the anchors and codes tried when nothing resolves.
+ */
+export function resolveDshPackage(specifier, options = {}) {
+  if (stubs.has(specifier)) return `stub:${specifier}`
+  const tried = []
+  for (const anchor of dshResolutionAnchors(options)) {
+    try {
+      return createRequire(anchor).resolve(specifier)
+    } catch (error) {
+      tried.push(`${anchor} (${error?.code ?? error?.name ?? 'error'})`)
+    }
+  }
+  throw new Error(
+    `dsh-skills: cannot resolve ${JSON.stringify(specifier)} from the dsh installation or the profile.\n`
+    + `Tried: ${tried.join(', ')}\n`
+    + 'A Host half must not import an official package by bare specifier: Node resolves that from\n'
+    + "this plugin's realpath, which is outside the installation. Use importDshPackage() instead.",
+  )
+}
+
+/**
+ * Import an official package from the installation.
+ *
+ * Resolving to the same absolute file the official rows use means a second
+ * module instance is never created, which matters for plugins that coordinate
+ * through module-level state (for example mcp-client's `serverName` reservations).
+ * @param {string} specifier - the package name to import.
+ * @param {{ argv?: readonly string[], cwd?: string }} [options] - overrides for tests.
+ * @returns {Promise<Record<string, unknown>>} the imported module namespace.
+ */
+export async function importDshPackage(specifier, options) {
+  const stub = stubs.get(specifier)
+  if (stub !== undefined) return stub
+  return import(pathToFileURL(resolveDshPackage(specifier, options)).href)
+}

package/dist/host.js

@@ -60,7 +60,8 @@ function dshResolutionAnchors({ argv = process.argv, cwd = process.cwd() } = {})
   anchors.push(join(cwd, "package.json"));
   return [...new Set(anchors)];
 }
-var stubs = /* @__PURE__ */ new Map();
+var STUBS_KEY = /* @__PURE__ */ Symbol.for("dsh-skills:dsh-package-stubs");
+var stubs = globalThis[STUBS_KEY] ??= /* @__PURE__ */ new Map();
 function resolveDshPackage(specifier, options = {}) {
   if (stubs.has(specifier)) return `stub:${specifier}`;
   const tried = [];
@@ -264,11 +265,12 @@ function deriveText(kind, bytes) {
 }
 
 // src/native-open.js
+import { importDshPackage as importDshPackage2 } from "./dsh-package.mjs";
 var cached2;
 async function loadNativeCommand() {
   if (cached2 !== void 0) return cached2;
   try {
-    const mod = await importDshPackage("@deepseek-ai/dsh-native-command");
+    const mod = await importDshPackage2("@deepseek-ai/dsh-native-command");
     if (typeof mod?.openNativeAssociatedPath === "function") {
       cached2 = mod;
       return cached2;
@@ -317,6 +319,43 @@ async function fileApplications(absolutePath2) {
   return Array.isArray(rows) ? rows : [];
 }
 
+// src/office-preview.js
+import { importDshPackage as importDshPackage3 } from "./dsh-package.mjs";
+var cached3;
+async function loadKit() {
+  if (cached3 !== void 0) return cached3;
+  try {
+    const mod = await importDshPackage3("@deepseek-ai/libreoffice-kit");
+    if (typeof mod?.createConverter === "function") {
+      cached3 = mod;
+      return cached3;
+    }
+  } catch {
+  }
+  return void 0;
+}
+var CONVERTIBLE = /* @__PURE__ */ new Set([".pptx", ".ppt", ".docx", ".doc", ".xlsx", ".xls"]);
+function isConvertible(name2) {
+  const dot = name2.lastIndexOf(".");
+  if (dot < 0) return false;
+  return CONVERTIBLE.has(name2.slice(dot).toLowerCase());
+}
+async function convertToPdf(inputPath, outputPath) {
+  const kit = await loadKit();
+  if (kit === void 0) {
+    const error = new Error("\u5F53\u524D DSH \u5B89\u88C5\u6CA1\u6709\u5185\u7F6E LibreOffice\uFF0C\u65E0\u6CD5\u8F6C\u6362\u9884\u89C8\u3002");
+    error.code = "library/preview-unavailable";
+    throw error;
+  }
+  const converter = await kit.createConverter();
+  try {
+    const result = await converter.render({ inputPath, outputPath });
+    return { engine: result?.engine ?? "native" };
+  } finally {
+    await converter[Symbol.asyncDispose]?.();
+  }
+}
+
 // src/manager.js
 var MAX_BYTES = 50 * 1024 * 1024;
 var MAX_TOTAL_BYTES = 5 * 1024 * 1024 * 1024;
@@ -581,6 +620,38 @@ var LibraryManager = class {
       return this.storeBytes({ name: name2, parentId: node.parentId, bytes, source: asset.source ?? "import" });
     });
   }
+  /**
+   * The PDF preview of one revision's original, converted on demand and cached
+   * beside the revision's own files.
+   *
+   * Office originals (pptx / docx / xlsx …) cannot be shown by a browser, but
+   * the DSH installation ships a full LibreOffice engine — the same one its own
+   * document preview drives. This converts the original to PDF once, stores the
+   * result as `<revision-dir>/preview.pdf`, and every later read of the same
+   * revision reuses it. 「导入新版本」 mints a new revision id, so the cache
+   * invalidates itself.
+   * @param {string} assetId - the asset.
+   * @param {string} [revisionId] - a pinned revision; defaults to the current one.
+   * @returns {Promise<{ base64: string, cached: boolean, mediaType: string }>} the converted PDF.
+   */
+  async previewPdf(assetId, revisionId, convert) {
+    const { revision } = this.resolveStored(assetId, revisionId);
+    if (revision.conversionStatus !== void 0 && revision.conversionStatus === "unavailable" && false) {
+    }
+    const absolutePath2 = this.safePath(revision.originalRelativePath);
+    const pdfPath = this.safePath(join2(dirname(revision.originalRelativePath), "preview.pdf"));
+    try {
+      const pdf2 = await readFile(pdfPath);
+      return { base64: Buffer.from(pdf2).toString("base64"), cached: true, mediaType: "application/pdf" };
+    } catch {
+    }
+    if (!isConvertible(revision.originalRelativePath)) {
+      throw new FeatureError2("library/not-convertible", "\u8BE5\u683C\u5F0F\u4E0D\u652F\u6301\u8F6C\u6362\u4E3A PDF \u9884\u89C8\u3002");
+    }
+    await convert(absolutePath2, pdfPath);
+    const pdf = await readFile(pdfPath);
+    return { base64: Buffer.from(pdf).toString("base64"), cached: false, mediaType: "application/pdf" };
+  }
   // ---- write surface -------------------------------------------------------
   /** Create one folder. */
   createFolder(input) {
@@ -1155,7 +1226,12 @@ var LibraryManager = class {
           byteLength: bytes.byteLength,
           base64: Buffer.from(bytes).toString("base64")
         };
-      }
+      },
+      "preview-pdf": async (payload) => this.previewPdf(
+        requireString(payload.assetId, "assetId"),
+        optionalId(payload.revisionId),
+        (inputPath, outputPath) => convertToPdf(inputPath, outputPath)
+      )
     };
   }
   // ---- internals -----------------------------------------------------------
@@ -1339,6 +1415,50 @@ var LibraryManager = class {
     if (asset.status === "removed") throw new FeatureError2("library/not-found", "\u8D44\u6599\u5DF2\u79FB\u9664\u3002");
     return asset;
   }
+  /**
+   * Resolve whatever identifier a caller supplied into a live asset id.
+   *
+   * The model-facing tools address a document by `asset_id`, but the text a
+   * model actually reads (the search results) leads with the *name*. A model
+   * that passes the name used to get `library/not-found` — "资料不存在或已移除"
+   * — for a document that was perfectly readable, which reads as data loss.
+   * So a name is accepted too, with two deliberate refusals:
+   *
+   * - **Ambiguous** (two live documents share a name): refused with every
+   *   candidate's id listed. Silently picking one would read the wrong document.
+   * - **Unknown**: refused with a message that names both possibilities and
+   *   points at `library_search`, instead of the bare "not found" that hints
+   *   nothing about what was wrong with the identifier.
+   * @param {string} identifier - an asset id, or a document name.
+   * @returns {string} the live asset id.
+   * @throws {FeatureError} `library/invalid-request`, `library/ambiguous` or `library/not-found`.
+   */
+  resolveAssetId(identifier) {
+    const text = typeof identifier === "string" ? identifier.trim() : "";
+    if (text.length === 0) {
+      throw new FeatureError2("library/invalid-request", "\u9700\u8981 asset_id\uFF1A\u7528 library_search \u641C\u5230\u8D44\u6599\u540E\uFF0C\u628A\u5B83\u8FD4\u56DE\u7684 asset_id \u539F\u6837\u4F20\u8FDB\u6765\u3002");
+    }
+    const state = this.load();
+    const direct = state.assets[text];
+    const directNode = direct === void 0 ? void 0 : state.nodes[text];
+    if (direct !== void 0 && direct.status !== "removed" && directNode !== void 0 && directNode.removedAt === void 0) {
+      return text;
+    }
+    const live = Object.values(state.assets).filter((asset) => asset.status !== "removed").map((asset) => ({ asset, node: state.nodes[asset.id] })).filter((row) => row.node !== void 0 && row.node.removedAt === void 0 && row.node.kind === "asset");
+    const exact = live.filter((row) => row.node.name === text);
+    const matches = exact.length > 0 ? exact : live.filter((row) => row.node.name.toLocaleLowerCase() === text.toLocaleLowerCase());
+    if (matches.length === 1) return matches[0].asset.id;
+    if (matches.length > 1) {
+      throw new FeatureError2(
+        "library/ambiguous",
+        `\u6709 ${matches.length} \u4EFD\u8D44\u6599\u53EB\u300C${text}\u300D\uFF0C\u65E0\u6CD5\u786E\u5B9A\u8BFB\u54EA\u4E00\u4EFD\uFF1B\u8BF7\u628A asset_id \u6362\u6210\u5176\u4E2D\u4E00\u4E2A\uFF1A` + matches.map((row) => `${row.node.name}\uFF08${row.asset.id}\uFF09`).join("\u3001")
+      );
+    }
+    throw new FeatureError2(
+      "library/not-found",
+      `\u6CA1\u627E\u5230\u8D44\u6599\u300C${text}\u300D\uFF1A\u5B83\u65E2\u4E0D\u662F asset_id\uFF0C\u4E5F\u4E0D\u662F\u73B0\u6709\u8D44\u6599\u7684\u540D\u79F0\u3002\u8D44\u6599\u5728\u8D44\u6599\u5E93\u91CC\u3001\u4E0D\u5728\u5DE5\u4F5C\u533A\u6587\u4EF6\u7CFB\u7EDF\u91CC\uFF0C\u5148\u7528 library_search \u641C\u7D22\uFF0C\u518D\u628A\u8FD4\u56DE\u7684 asset_id \u539F\u6837\u4F20\u7ED9\u672C\u5DE5\u5177\u3002`
+    );
+  }
   /** An asset record a read is allowed to resolve: present and enabled. */
   requireReadableAsset(state, assetId) {
     const asset = this.requireAsset(state, assetId);
@@ -1391,6 +1511,7 @@ var LibraryManager = class {
 };
 
 // src/tools.js
+import { importDshPackage as importDshPackage4 } from "./dsh-package.mjs";
 function compileValue(node) {
   if (node === null || typeof node !== "object") throw new Error("dsh-plugin-library: schema node must be an object");
   if (node.type === "object") {
@@ -1439,19 +1560,19 @@ function fallbackDefineTool(options) {
     execute: options.execute
   };
 }
-var cached3;
+var cached4;
 async function loadDefineTool() {
-  if (cached3 !== void 0) return cached3;
+  if (cached4 !== void 0) return cached4;
   try {
-    const mod = await importDshPackage("@deepseek-ai/dsh-tools");
+    const mod = await importDshPackage4("@deepseek-ai/dsh-tools");
     if (typeof mod?.defineTool === "function") {
-      cached3 = mod.defineTool;
-      return cached3;
+      cached4 = mod.defineTool;
+      return cached4;
     }
   } catch {
   }
-  cached3 = fallbackDefineTool;
-  return cached3;
+  cached4 = fallbackDefineTool;
+  return cached4;
 }
 function hitForModel(hit) {
   return {
@@ -1509,7 +1630,13 @@ async function registerLibraryTools(ctx, manager) {
       },
       render: (_args, value) => [{
         type: "text",
+        // The id is printed here, not just carried in the structured payload:
+        // this rendered text is what the model actually reads, and the read /
+        // edit tools address a document by `asset_id`. Leaving it out (v0.1.x)
+        // made models pass the *name* instead and get "资料不存在或已移除" for a
+        // document that was perfectly readable.
         text: value.hits.length > 0 ? value.hits.map((hit) => `${hit.name} (${hit.folder_path} \xB7 ${hit.kind} \xB7 \u4FEE\u8BA2 ${hit.revision_number} \xB7 ${hit.conversion_status})
+asset_id: ${hit.asset_id}
 ${hit.excerpt}`).join("\n\n") : "\u8D44\u6599\u5E93\u91CC\u6CA1\u6709\u5339\u914D\u7684\u8D44\u6599\u3002"
       }]
     },
@@ -1549,15 +1676,16 @@ ${hit.excerpt}`).join("\n\n") : "\u8D44\u6599\u5E93\u91CC\u6CA1\u6709\u5339\u914
       if (!Number.isInteger(offset) || offset < 0 || !Number.isInteger(limit) || limit < 1 || limit > 2e4) {
         throw new Error("library/invalid-page");
       }
-      const detail = manager.assetDetail(args.asset_id);
+      const assetId = manager.resolveAssetId(args.asset_id);
+      const detail = manager.assetDetail(assetId);
       const revisionId = args.revision_id ?? detail.asset.currentRevisionId;
       const revision = detail.revisions.find((row) => row.id === revisionId);
-      const complete = await manager.readText(args.asset_id, revisionId);
+      const complete = await manager.readText(assetId, revisionId);
       const content = complete.slice(offset, offset + limit);
       const next = offset + content.length;
       const truncated = next < complete.length;
       return {
-        asset_id: args.asset_id,
+        asset_id: assetId,
         revision_id: revisionId,
         conversion_status: revision?.conversionStatus ?? "ready",
         content,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-library",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "本地文件资料库：内容寻址的不可变修订、派生的可检索正文、文件夹与模型工具。",
   "type": "module",
   "main": "dist/host.js",
@@ -30,6 +30,7 @@
   "files": [
     "dist/host.js",
     "dist/client.js",
+    "dist/dsh-package.mjs",
     "cordis.patch.yml",
     "locale/*.json",
     "README.md"