dsh-office-kit 0.3.3 → 0.4.0

package/dist/index.js

@@ -1,11 +1,12 @@
-import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
+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 { execFile } from "node:child_process";
 import { homedir } from "node:os";
 //#region src/features.ts
 /** The four entries, in menu order. */
@@ -104,11 +105,16 @@ function legacyDataDir() {
 	const home = homedir();
 	return process.platform === "win32" ? join(process.env.LOCALAPPDATA ?? join(home, "AppData", "Local"), "dsh-office-kit") : process.platform === "darwin" ? join(home, "Library", "Application Support", "dsh-office-kit") : join(process.env.XDG_DATA_HOME ?? join(home, ".local", "share"), "dsh-office-kit");
 }
+/** Config location written by versions that ignored the platform branch. */
+function legacyConfigFile() {
+	return process.platform === "win32" ? join(configDir(), "config.json") : join(process.env.APPDATA ?? join(homedir(), "AppData", "Roaming"), "dsh-office-kit", "config.json");
+}
 /** Resolve per-OS config/data directories and bundled resources. */
 function officePaths() {
 	const runtimeDir = join(homedir(), ".dsh", "office", "runtime");
 	return {
 		configFile: join(configDir(), "config.json"),
+		legacyConfigFile: legacyConfigFile(),
 		venv: join(runtimeDir, "venv"),
 		legacyVenv: join(legacyDataDir(), "venv"),
 		cli: join(PACKAGE_ROOT$1, "python", "office_cli.py"),
@@ -208,25 +214,33 @@ function failedInspection(path, error) {
 		error: error instanceof Error ? error.message : String(error)
 	};
 }
-/** Read the interpreter path postinstall recorded; malformed files are ignored. */
-function savedPython(configFile) {
-	if (!isFile(configFile)) return void 0;
-	try {
-		const parsed = JSON.parse(readFileSync(configFile, "utf8"));
-		return typeof parsed.python === "string" && parsed.python.length > 0 ? parsed.python : void 0;
-	} catch {
-		return;
+/**
+* Read the interpreter path postinstall recorded; malformed files are ignored.
+* The legacy location is read second so an upgrade does not orphan a ready venv.
+*/
+function savedPython(configFile, legacyConfigFile) {
+	const files = legacyConfigFile == null ? [configFile] : [configFile, legacyConfigFile];
+	for (const file of files) {
+		if (!isFile(file)) continue;
+		try {
+			const parsed = JSON.parse(readFileSync(file, "utf8"));
+			if (typeof parsed.python === "string" && parsed.python.length > 0) return parsed.python;
+		} catch {}
 	}
 }
+/** The interpreter inside a virtual environment, which differs per platform. */
+function venvPython(venv) {
+	return join(venv, process.platform === "win32" ? "Scripts/python.exe" : "bin/python");
+}
 /** PATH-independent candidate list, plugin-owned interpreters first. */
 function candidates(configFile) {
 	const paths = officePaths();
 	const found = [];
 	const env = process.env.DSH_OFFICE_PYTHON;
 	if (env != null && env.length > 0) found.push(env);
-	const saved = savedPython(configFile);
+	const saved = savedPython(configFile, paths.legacyConfigFile);
 	if (saved != null) found.push(saved);
-	found.push(paths.venv, paths.legacyVenv);
+	found.push(venvPython(paths.venv), venvPython(paths.legacyVenv));
 	const marker = join(PACKAGE_ROOT$1, ".python-path");
 	if (isFile(marker)) {
 		const text = readFileSync(marker, "utf8").trim();
@@ -391,55 +405,61 @@ function parseSkill(raw, path) {
 		content: raw.slice(match[0].length).trim()
 	};
 }
-function findFile(candidates) {
-	for (const path of candidates) if (existsSync(path)) return path;
-	return null;
-}
-const WPS_BINARIES = {
-	writer: "wps.exe",
-	presentation: "wpp.exe",
-	spreadsheet: "et.exe"
-};
-const WPS_ROOTS = [
-	process.env.WPS_OFFICE_HOME ?? "",
-	"C:\\Program Files\\Kingsoft\\WPS Office",
-	"C:\\Program Files (x86)\\Kingsoft\\WPS Office",
-	join(process.env.LOCALAPPDATA ?? "", "Kingsoft", "WPS Office")
-].filter(Boolean);
-function wpsInstalled(binary) {
-	for (const root of WPS_ROOTS) {
-		if (existsSync(join(root, "office6", binary))) return true;
-		try {
-			for (const version of readdirSync(root)) if (existsSync(join(root, version, "office6", binary))) return true;
-		} catch {}
+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 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;
 	}
-	return false;
 }
-function rendererFacts() {
-	const libreoffice = findFile([
-		process.env.SOFFICE ?? "",
-		"C:\\Program Files\\LibreOffice\\program\\soffice.exe",
-		"C:\\Program Files (x86)\\LibreOffice\\program\\soffice.exe",
-		"/Applications/LibreOffice.app/Contents/MacOS/soffice",
-		"/usr/bin/soffice",
-		"/usr/local/bin/soffice"
-	].filter(Boolean));
-	const officeRoots = ["C:\\Program Files\\Microsoft Office\\root\\Office16", "C:\\Program Files (x86)\\Microsoft Office\\root\\Office16"];
-	return {
-		libreoffice,
-		microsoftOffice: {
-			word: officeRoots.some((root) => existsSync(join(root, "WINWORD.EXE"))),
-			powerpoint: officeRoots.some((root) => existsSync(join(root, "POWERPNT.EXE"))),
-			excel: officeRoots.some((root) => existsSync(join(root, "EXCEL.EXE")))
-		},
-		kingsoftWps: {
-			writer: wpsInstalled(WPS_BINARIES.writer),
-			presentation: wpsInstalled(WPS_BINARIES.presentation),
-			spreadsheet: wpsInstalled(WPS_BINARIES.spreadsheet)
-		}
+async function kitFacts() {
+	const cli = findKitCli();
+	if (cli == null) return {
+		available: false,
+		node: null,
+		cli: null,
+		version: null,
+		backend: null,
+		remedy: KIT_MISSING
 	};
+	const node = process.env.DSH_NODE ?? process.execPath;
+	try {
+		const { stdout } = await runKit(node, [
+			cli,
+			"capabilities",
+			"--json"
+		], {
+			timeout: 12e4,
+			maxBuffer: 8 * 1024 * 1024
+		});
+		const parsed = JSON.parse(stdout);
+		return {
+			available: true,
+			node,
+			cli,
+			version: typeof parsed.runtime?.version === "string" ? parsed.runtime.version : null,
+			backend: typeof parsed.runtime?.backend === "string" ? parsed.runtime.backend : null
+		};
+	} catch (error) {
+		return {
+			available: true,
+			node,
+			cli,
+			version: null,
+			backend: null,
+			error: error instanceof Error ? error.message.split("\n")[0] ?? error.message : String(error)
+		};
+	}
 }
-const PACKAGE_ROOT = fileURLToPath(new URL("..", import.meta.url));
 function pluginVersion() {
 	try {
 		const parsed = JSON.parse(readFileSync(join(PACKAGE_ROOT, "package.json"), "utf8"));
@@ -521,7 +541,7 @@ function apply(ctx) {
 	ctx.effect(() => ctx.skills.registerProvider(() => provider), "office-suite: skills");
 	ctx.effect(() => ctx.tools.register(defineTool({
 		name: "office_status",
-		description: "Report the Office runtime state: compatible Python, installed Python packages, helper CLI path, and document renderers (LibreOffice, Microsoft Office, or WPS Office). Call this before Office file work.",
+		description: "Report the Office runtime state: compatible Python, installed Python packages, helper CLI path, and document renderers (the DSH LibreOffice kit). Call this before Office file work.",
 		parameters: {},
 		output: {
 			schema: { type: "string" },
@@ -560,7 +580,7 @@ function apply(ctx) {
 					exists: cliExists()
 				},
 				packages: runtime.packages,
-				renderers: rendererFacts(),
+				renderers: await kitFacts(),
 				skills: candidates.map((candidate) => candidate.name)
 			};
 			return JSON.stringify(report, null, 2);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-office-kit",
   "type": "module",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "description": "Office documents, PDF, presentations, and spreadsheets for DeepSeek Harness",
   "author": "Hairy",
   "license": "MIT",
@@ -110,6 +110,7 @@
     "@deepseek-ai/dsh-util-code-language": "0.2.1-rc.2",
     "@deepseek-ai/dsh-util-values": "0.2.1-rc.2",
     "@deepseek-ai/dsh-workspace": "0.2.1-rc.2",
+    "@deepseek-ai/libreoffice-kit": "^0.1.5",
     "@types/node": "^26.1.1",
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.2.0",

package/postinstall.mjs

@@ -35,8 +35,21 @@ const LEGACY_DATA_DIR = IS_WINDOWS
     : join(process.env.XDG_DATA_HOME || join(homedir(), '.local', 'share'), 'dsh-office-kit')
 export const LEGACY_VENV_DIR = join(LEGACY_DATA_DIR, 'venv')
 const LEGACY_VENV_PYTHON = join(LEGACY_VENV_DIR, IS_WINDOWS ? 'Scripts/python.exe' : 'bin/python')
-const CONFIG_DIR = join(process.env.APPDATA || join(homedir(), 'AppData', 'Roaming'), 'dsh-office-kit')
-const CONFIG_FILE = join(CONFIG_DIR, 'config.json')
+// Must mirror `configDir()` in src/python.ts: the host half reads this file on
+// every runtime probe, so a platform mismatch here makes a ready venv look missing.
+export const CONFIG_DIR = IS_WINDOWS
+  ? join(process.env.APPDATA || join(homedir(), 'AppData', 'Roaming'), 'dsh-office-kit')
+  : process.platform === 'darwin'
+    ? join(homedir(), 'Library', 'Application Support', 'dsh-office-kit')
+    : join(process.env.XDG_CONFIG_HOME || join(homedir(), '.config'), 'dsh-office-kit')
+export const CONFIG_FILE = join(CONFIG_DIR, 'config.json')
+/**
+ * Legacy config location written by versions without the platform branch.
+ * Read as a fallback so an existing runtime is not rebuilt on upgrade.
+ */
+const LEGACY_CONFIG_FILE = IS_WINDOWS
+  ? CONFIG_FILE
+  : join(process.env.APPDATA || join(homedir(), 'AppData', 'Roaming'), 'dsh-office-kit', 'config.json')
 const REQUIREMENTS = join(PACKAGE_ROOT, 'python', 'requirements.txt')
 const LOG_PREFIX = '[dsh-office-kit]'
 
@@ -271,15 +284,18 @@ function verifyImports(python) {
 }
 
 function readConfig() {
-  if (!existsSync(CONFIG_FILE)) {
-    return {}
-  }
-  try {
-    return JSON.parse(readFileSync(CONFIG_FILE, 'utf8'))
-  }
-  catch {
-    return {}
+  for (const file of [CONFIG_FILE, LEGACY_CONFIG_FILE]) {
+    if (!existsSync(file)) {
+      continue
+    }
+    try {
+      return JSON.parse(readFileSync(file, 'utf8'))
+    }
+    catch {
+      // A malformed file must not hide a usable legacy one.
+    }
   }
+  return {}
 }
 
 function writeConfig(config) {