dsh-office-kit 0.4.0 → 0.4.1

package/assets/skills/office-documents/tasks/verify_render.md

@@ -32,7 +32,7 @@ The runtime reports `renderers.can_render.docx: false` because the DSH LibreOffi
 In that state:
 
 - Verify structure with `docx read`, `docx_kit.py parts|text|xml` and the audit scripts.
-- Tell the user plainly that layout was not visually verified, and that the fix is installing the plugin inside the harness tree (or setting `DSH_LIBREOFFICE_KIT_CLI`), not installing Word/LibreOffice.
+- Tell the user plainly that layout was not visually verified, and that the fix is a harness install that ships the kit (the plugin injects `DSH_LIBREOFFICE_KIT_CLI` when it loads), not installing Word/LibreOffice.
 - Do not claim a file "looks good" from XML evidence alone.
 
 ## After any script edit

package/assets/skills/office-documents/troubleshooting/libreoffice_headless.md

@@ -12,17 +12,19 @@ Look at `renderers.kit` and `renderers.can_render`. `can_render.docx: false` mea
 
 Rendering goes through the LibreOffice kit that DeepSeek Harness ships (`@deepseek-ai/libreoffice-kit`). On macOS and Windows it uses the kit's native engine; on Linux it uses the WASM engine. A separately installed Microsoft Office, WPS Office, or system LibreOffice is **not** used and does not make rendering work on its own.
 
-The plugin finds the kit by walking up from its own directory through `node_modules/@deepseek-ai/libreoffice-kit/lib/cli.js`. So:
+The plugin resolves the kit in this order:
 
-- Installed inside the harness tree → the kit is found automatically.
-- Installed anywhere else → install the plugin where the harness can see its dependencies, or set `DSH_LIBREOFFICE_KIT_CLI` to the kit's `lib/cli.js`.
-- `DSH_NODE` overrides the node binary if `node` is not on `PATH`.
+1. `DSH_LIBREOFFICE_KIT_CLI` — the host half sets it (and `DSH_NODE`) when it loads, so every shell the agent spawns inherits it. That is what makes a profile install work, where the kit lives in the harness tree and not next to the plugin.
+2. The harness entry point (`process.argv[1]`, e.g. `<dsh>/node_modules/@deepseek-ai/dsh/lib/bin.js`) → resolves the kit from the tree the harness itself loaded.
+3. Walking up from the plugin directory through `node_modules/@deepseek-ai/libreoffice-kit/lib/cli.js` — covers a checkout or a plugin-local dependency.
+
+Running the helper by hand outside the harness means setting `DSH_LIBREOFFICE_KIT_CLI` yourself; `DSH_NODE` overrides the node binary if `node` is not on `PATH`.
 
 ## Common failures
 
 | Message | Cause | Fix |
 |---|---|---|
-| `the LibreOffice renderer is not available` | Kit not found from the plugin directory | Put the plugin inside the harness tree, or set `DSH_LIBREOFFICE_KIT_CLI` |
+| `the LibreOffice renderer is not available` | Kit not found | Run through the plugin (the host injects the path), or set `DSH_LIBREOFFICE_KIT_CLI` to the kit's `lib/cli.js` |
 | `cannot start the LibreOffice kit` / `EEXIST` | Interrupted install, or a stale staging directory | Re-run the plugin postinstall; delete leftover `.kit-render-*` directories |
 | `Unsupported LibreOfficeKit host` | Unsupported platform/arch (the kit ships Windows x64/arm64, macOS x64/arm64, Linux via WASM) | Render on a supported host |
 | `warning: N font(s) used by this file are not installed` | Font substitution — the render succeeded but that text may reflow or show boxes | Install the font or substitute it deliberately, then re-render |

package/assets/skills/office-presentations/SKILL.md

@@ -150,9 +150,9 @@ Guidance: [authoring workflow](references/authoring-workflow.md) ·
 ## Genuine gaps
 
 - The DSH LibreOffice kit missing (`renderers.can_render.pptx: false`) → no true
-  render; use `--engine draft` and say the check was geometric. Installing the
-  plugin inside the harness tree (or setting `DSH_LIBREOFFICE_KIT_CLI`) fixes it;
-  a standalone Office/LibreOffice install does not.
+  render; use `--engine draft` and say the check was geometric. A harness install
+  that ships the kit fixes it (the plugin injects `DSH_LIBREOFFICE_KIT_CLI` when it
+  loads); a standalone Office/LibreOffice install does not.
 - Fonts the user's machine lacks are substituted by any renderer; the pack
   cannot install fonts.
 - Google Slides import fidelity is out of our control; see

package/assets/skills/shared/common-workflow.md

@@ -125,10 +125,10 @@ a blank, clipped or miscoloured raster is invisible inside the host file.
 | --- | --- | --- |
 | No `## Office runtime` JSON; skill says *No working Python runtime is available* | The plugin cannot install or find a compatible interpreter | Do not run helper commands, do not write a document by hand. Give the user the remedy command from the skill body, ask them to run it, then call `office_status` again. |
 | `office_status` shows `cli.exists: false`, or `python`/`cli` file not found | The bundled helper or its install is incomplete | Report the missing path. Do not substitute another tool that produces a different file. |
-| `render` fails: `the LibreOffice renderer is not available` | The kit that DSH ships with was not found; create/read/edit still work but docx/pptx/xlsx cannot be rasterised | Do not claim you inspected it. Say the file was built and validated structurally (read verb), but the renderer is unavailable on this host so you could not check its appearance. The kit ships with DeepSeek Harness — installing this plugin inside the harness tree (or setting `DSH_LIBREOFFICE_KIT_CLI`) fixes it; a standalone LibreOffice/Office/WPS install does not. `pdf render` still works. If the user needs visual confidence now, offer to rebuild from a spec or to present the unverified file explicitly labelled as such. |
+| `render` fails: `the LibreOffice renderer is not available` | The kit that DSH ships with was not found; create/read/edit still work but docx/pptx/xlsx cannot be rasterised | Do not claim you inspected it. Say the file was built and validated structurally (read verb), but the renderer is unavailable on this host so you could not check its appearance. The kit ships with DeepSeek Harness and the plugin injects its path (`DSH_LIBREOFFICE_KIT_CLI`) at load time, so this means the harness install lacks the kit or the variable points nowhere; a standalone LibreOffice/Office/WPS install does not help. `pdf render` still works. If the user needs visual confidence now, offer to rebuild from a spec or to present the unverified file explicitly labelled as such. |
 | Annotation region does not land on anything, or the payload says `unmapped: true` | The drawn region cannot be tied to an object in the file | Do not silently shift the region or guess a cell/shape. Say what you could identify (preview page, text, resolved cells) and which item you could not locate, then ask the user for the text or cell. |
 | `{"ok": false, "error": "..."}` and non-zero exit | The spec was rejected (unknown key, bad type, missing file) | Read the error text, fix the spec key it names, re-run the same command. Never strip a failing block to make the command pass — that silently deletes user content. |
-| `xlsx recalc` fails because the LibreOffice kit is missing | openpyxl cannot evaluate formulas, and the kit is the only calculation engine this plugin uses | Report formula cells as uncalculated; do not invent computed values. Fix the renderer first (install the plugin inside the harness tree) and re-run. |
+| `xlsx recalc` fails because the LibreOffice kit is missing | openpyxl cannot evaluate formulas, and the kit is the only calculation engine this plugin uses | Report formula cells as uncalculated; do not invent computed values. Fix the renderer first (see the row above) and re-run. |
 | The helper has no verb for what the requirement needs | The common path is short; the capability is not limited to it | Take the pack script route, or write a short snippet against `python-docx` / `openpyxl` / `python-pptx` / `pypdf` / `PyMuPDF` / `reportlab`, run it with `<python>`, then `read` the file back and render. Never refuse a job because a verb is missing. |
 | `read` returns an empty structure for a file the user supplied | Unsupported or corrupt input | Say what failed and stop; do not overwrite the user's file with an empty one. |
 

package/dist/index.js

@@ -1,12 +1,13 @@
+import { createRequire } from "node:module";
 import { execFile } from "node:child_process";
 import { existsSync, readFileSync, statSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import process from "node:process";
-import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
 import { BUNDLED_SKILL_RANK } from "@deepseek-ai/dsh-skill";
 import { defineTool } from "@deepseek-ai/dsh-tools";
+import { fileURLToPath } from "node:url";
 import { homedir } from "node:os";
 //#region src/features.ts
 /** The four entries, in menu order. */
@@ -48,6 +49,33 @@ const OFFICE_FEATURES = [
 		extensions: [".xlsx"]
 	}
 ];
+//#endregion
+//#region src/kit.ts
+/** Package root of the installed plugin (dist/ during a build, src/ in a checkout). */
+const PACKAGE_ROOT$1 = fileURLToPath(new URL("..", import.meta.url));
+const KIT_CLI = "@deepseek-ai/libreoffice-kit/cli";
+/**
+* Locate the LibreOffice kit CLI that DeepSeek Harness ships.
+*
+* DSH installs third-party plugins into a profile (`~/.dsh/profiles/<name>/node_modules`)
+* while the kit lives in the harness dependency tree, so resolving relative to this
+* package cannot find it. Resolving from the harness entry point (`process.argv[1]`,
+* e.g. `<dsh>/node_modules/@deepseek-ai/dsh/lib/bin.js`) walks the tree the harness
+* itself loaded from, and resolving from this package covers a checkout or a
+* plugin-local install. `DSH_LIBREOFFICE_KIT_CLI` overrides both.
+*/
+function resolveKitCli(entry = process.argv[1]) {
+	const override = process.env.DSH_LIBREOFFICE_KIT_CLI;
+	if (override != null && existsSync(override)) return override;
+	for (const anchor of [entry, join(PACKAGE_ROOT$1, "package.json")]) {
+		if (anchor == null) continue;
+		try {
+			const cli = createRequire(anchor).resolve(KIT_CLI);
+			if (existsSync(cli)) return cli;
+		} catch {}
+	}
+	return null;
+}
 /** Python packages the helper CLI needs. */
 const PYTHON_PACKAGES = [
 	{
@@ -91,8 +119,8 @@ const PYTHON_PACKAGES = [
 		package: "mathml2omml"
 	}
 ];
-const PACKAGE_ROOT$1 = fileURLToPath(new URL("..", import.meta.url));
-const POSTINSTALL_SCRIPT = join(PACKAGE_ROOT$1, "postinstall.mjs");
+const PACKAGE_ROOT = fileURLToPath(new URL("..", import.meta.url));
+const POSTINSTALL_SCRIPT = join(PACKAGE_ROOT, "postinstall.mjs");
 /** Upper bound for one self-heal run; the remedy command remains available afterwards. */
 const POSTINSTALL_TIMEOUT = 540 * 1e3;
 /** Failed probes are retried after this delay instead of re-running pip on every status call. */
@@ -117,8 +145,8 @@ function officePaths() {
 		legacyConfigFile: legacyConfigFile(),
 		venv: join(runtimeDir, "venv"),
 		legacyVenv: join(legacyDataDir(), "venv"),
-		cli: join(PACKAGE_ROOT$1, "python", "office_cli.py"),
-		skillsDir: join(PACKAGE_ROOT$1, "assets", "skills")
+		cli: join(PACKAGE_ROOT, "python", "office_cli.py"),
+		skillsDir: join(PACKAGE_ROOT, "assets", "skills")
 	};
 }
 /** One-liner the user can run to repair the runtime without pnpm. */
@@ -241,7 +269,7 @@ function candidates(configFile) {
 	const saved = savedPython(configFile, paths.legacyConfigFile);
 	if (saved != null) found.push(saved);
 	found.push(venvPython(paths.venv), venvPython(paths.legacyVenv));
-	const marker = join(PACKAGE_ROOT$1, ".python-path");
+	const marker = join(PACKAGE_ROOT, ".python-path");
 	if (isFile(marker)) {
 		const text = readFileSync(marker, "utf8").trim();
 		if (text.length > 0) found.push(text);
@@ -405,24 +433,10 @@ function parseSkill(raw, path) {
 		content: raw.slice(match[0].length).trim()
 	};
 }
-const KIT_MISSING = "the DSH LibreOffice kit (@deepseek-ai/libreoffice-kit) was not found: install this plugin inside the harness tree, or point DSH_LIBREOFFICE_KIT_CLI at <kit>/lib/cli.js";
-const PACKAGE_ROOT = fileURLToPath(new URL("..", import.meta.url));
+const KIT_MISSING = "the DSH LibreOffice kit (@deepseek-ai/libreoffice-kit) was not found: DeepSeek Harness normally injects DSH_LIBREOFFICE_KIT_CLI, so point that variable at <kit>/lib/cli.js if this plugin runs outside the harness";
 const runKit = promisify(execFile);
-/** Locate the kit the same way python/office_cli.py does, so both halves agree. */
-function findKitCli() {
-	const override = process.env.DSH_LIBREOFFICE_KIT_CLI;
-	if (override != null && existsSync(override)) return override;
-	let directory = PACKAGE_ROOT;
-	for (;;) {
-		const candidate = join(directory, "node_modules", "@deepseek-ai", "libreoffice-kit", "lib", "cli.js");
-		if (existsSync(candidate)) return candidate;
-		const parent = dirname(directory);
-		if (parent === directory) return null;
-		directory = parent;
-	}
-}
 async function kitFacts() {
-	const cli = findKitCli();
+	const cli = resolveKitCli();
 	if (cli == null) return {
 		available: false,
 		node: null,
@@ -462,7 +476,7 @@ async function kitFacts() {
 }
 function pluginVersion() {
 	try {
-		const parsed = JSON.parse(readFileSync(join(PACKAGE_ROOT, "package.json"), "utf8"));
+		const parsed = JSON.parse(readFileSync(join(PACKAGE_ROOT$1, "package.json"), "utf8"));
 		return typeof parsed.version === "string" ? parsed.version : "unknown";
 	} catch {
 		return "unknown";
@@ -480,6 +494,11 @@ function runtimeReason(runtime) {
 function apply(ctx) {
 	const paths = officePaths();
 	const candidates = [];
+	const kitCli = resolveKitCli();
+	if (kitCli != null) {
+		process.env.DSH_LIBREOFFICE_KIT_CLI ??= kitCli;
+		process.env.DSH_NODE ??= process.execPath;
+	}
 	for (const feature of OFFICE_FEATURES) {
 		const directory = join(paths.skillsDir, feature.skill);
 		const path = join(directory, "SKILL.md");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-office-kit",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Office documents, PDF, presentations, and spreadsheets for DeepSeek Harness",
   "author": "Hairy",
   "license": "MIT",

package/python/office_cli.py

@@ -93,17 +93,18 @@ KIT_RELATIVE = Path("node_modules") / "@deepseek-ai" / "libreoffice-kit" / "lib"
 #: Actionable explanation used whenever the kit cannot be located.
 KIT_MISSING = (
     "the LibreOffice renderer is not available: the DSH LibreOffice kit was not found. "
-    "It ships with DeepSeek Harness as @deepseek-ai/libreoffice-kit; install the plugin "
-    "inside the harness tree, or point DSH_LIBREOFFICE_KIT_CLI at <kit>/lib/cli.js"
+    "DeepSeek Harness normally injects DSH_LIBREOFFICE_KIT_CLI when it loads this plugin; "
+    "if you run the helper by hand, point that variable at <kit>/lib/cli.js of "
+    "@deepseek-ai/libreoffice-kit"
 )
 
 
 def find_kit() -> tuple[str, str] | None:
     """Return (node, kit CLI) for the bundled renderer, or None when it is absent.
 
-    Resolution walks up from this file, which covers both layouts that matter:
-    a plugin-local dependency (`<plugin>/node_modules/...`) and the harness
-    install (`<dsh>/node_modules/dsh-office-kit/../../@deepseek-ai/...`).
+    DeepSeek Harness exports `DSH_LIBREOFFICE_KIT_CLI` (and `DSH_NODE`) before any
+    agent shell runs, which covers a profile install where the kit lives in the
+    harness tree. The walk-up covers a checkout or a plugin-local dependency.
     """
     candidates: list[Path] = []
     override = os.environ.get("DSH_LIBREOFFICE_KIT_CLI")