@drscrewdriver/dsh-better-display 0.3.3-fork.1 → 0.3.3-fork.3

package/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Windows build fix (fork.3): the vendored `tools/client-build.js` server bundling predicate accepted only POSIX-style paths, so on Windows the server entry shipped with dangling `./skill-roots.ts` / `./skill-status.ts` imports and never activated. Relative modules are now inlined on every platform.
 - Message bubbles: each final answer renders in a rounded bubble separating it from the page background, so text no longer sits directly on skinned hosts' wallpapers. Glass mode mixes the same tokens translucently, mirroring the user bubble's frosted treatment. A new 消息气泡 / Message bubbles switch in settings restores the flat layout when off (persisted as `bubbles` on `dsh.reader.v1`, default on).
 
 ## 0.3.3 — 2026-09-24

package/cordis.patch.yml

@@ -1,5 +1,5 @@
 # Official bundle layer. `dsh plugin add` applies this into the profile.
 # Rows resolve by package name so the installed copy is what boots.
 - insert:
-    - id: dsh-better-display
+    - id: '@drscrewdriver/dsh-better-display'
       name: '@drscrewdriver/dsh-better-display'

package/lib/dsh-better-display.js

@@ -1,6 +1,161 @@
 import { spawn } from "node:child_process";
-import { scanGenerativeMcpappsStatus } from "./skill-roots.ts";
-import { skillsFromListResult, toPublicSkillStatus } from "./skill-status.ts";
+import { access, readdir } from "node:fs/promises";
+import { existsSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, isAbsolute, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+//#region src/skill-status.ts
+/** Shared generative-mcpapps identity. Plugin-tree presence is not installation. */
+const GENERATIVE_MCPAPPS_SKILL = "generative-mcpapps";
+/** Conventional relative roots only. Never expand $HOME or dump host `root.path`. */
+const CONVENTIONAL_SKILL_ROOTS = [".dsh/skills", ".agents/skills"];
+function skillNameMatches(name) {
+	return typeof name === "string" && name === "generative-mcpapps";
+}
+function skillListIncludes(entries) {
+	return Array.isArray(entries) && entries.some((entry) => skillNameMatches(entry?.name));
+}
+/** Directory bundle `name/SKILL.md` or flat `name.md` at a scanned root. */
+function skillRootEntryMatches(entryName) {
+	return entryName === "generative-mcpapps" || entryName === `generative-mcpapps.md`;
+}
+function skillsFromListResult(result) {
+	if (Array.isArray(result)) return result;
+	if (result === null || typeof result !== "object") return [];
+	const record = result;
+	if (record.ok === false) return [];
+	if (Array.isArray(record.skills)) return record.skills;
+	if (record.value && typeof record.value === "object") {
+		const value = record.value;
+		if (Array.isArray(value.skills)) return value.skills;
+		if (Array.isArray(record.value)) return record.value;
+	}
+	return [];
+}
+function publicSkillRoots() {
+	return CONVENTIONAL_SKILL_ROOTS.map((path) => ({
+		source: "conventional",
+		path
+	}));
+}
+/**
+* Strip host home / pack absolutes before anything user-facing (HTTP or Settings).
+* Detection still uses the raw scan; this is the public face.
+*/
+function toPublicSkillStatus(status) {
+	return {
+		name: status.name,
+		installed: status.installed,
+		via: status.via,
+		roots: publicSkillRoots()
+	};
+}
+//#endregion
+//#region src/skill-roots.ts
+function expandHomePath(path, home = homedir()) {
+	if (path === "~") return home;
+	if (path.startsWith("~/") || path.startsWith("~\\")) return join(home, path.slice(2));
+	return path;
+}
+/** `$DSH_HOME` or `~/.dsh`, matching official `resolveDshHome`. */
+function resolveDshHome(env = process.env, home = homedir()) {
+	const fromEnv = env.DSH_HOME;
+	const selected = fromEnv !== void 0 && fromEnv.trim().length > 0 ? fromEnv : join(home, ".dsh");
+	return resolve(expandHomePath(selected, home));
+}
+/** `$DSH_AGENTS_HOME` or `~/.agents`. */
+function resolveAgentsHome(env = process.env, home = homedir()) {
+	const fromEnv = env.DSH_AGENTS_HOME;
+	const selected = fromEnv !== void 0 && fromEnv.trim().length > 0 ? fromEnv : join(home, ".agents");
+	return resolve(expandHomePath(selected, home));
+}
+function userSkillRoots(env = process.env, home = homedir()) {
+	return [{
+		source: "user-dsh",
+		path: join(resolveDshHome(env, home), "skills")
+	}, {
+		source: "user-agents",
+		path: join(resolveAgentsHome(env, home), "skills")
+	}];
+}
+function projectSkillRoots(projectRoot) {
+	return [{
+		source: "project-dsh",
+		path: join(projectRoot, ".dsh", "skills")
+	}, {
+		source: "project-agents",
+		path: join(projectRoot, ".agents", "skills")
+	}];
+}
+async function findProjectRoot(cwd) {
+	let current = resolve(cwd);
+	while (true) {
+		if (existsSync(join(current, ".git"))) return current;
+		const parent = dirname(current);
+		if (parent === current) return resolve(cwd);
+		current = parent;
+	}
+}
+async function rootHasGenerativeMcpapps(rootPath) {
+	let entries;
+	try {
+		entries = await readdir(rootPath, { withFileTypes: true });
+	} catch {
+		return false;
+	}
+	for (const entry of entries) {
+		if (entry.name === ".system") continue;
+		if (!skillRootEntryMatches(entry.name)) continue;
+		if (entry.isDirectory()) try {
+			await access(join(rootPath, entry.name, "SKILL.md"));
+			return true;
+		} catch {
+			continue;
+		}
+		if (entry.isFile()) return true;
+	}
+	return false;
+}
+/** Resolve the plugin-shipped pack. This path is never treated as a skill root. */
+function pluginSkillPackPath(moduleUrl = import.meta.url) {
+	const here = dirname(fileURLToPath(moduleUrl));
+	return [
+		join(here, "../skills", GENERATIVE_MCPAPPS_SKILL),
+		join(here, "../../skills", GENERATIVE_MCPAPPS_SKILL),
+		join(here, "skills", GENERATIVE_MCPAPPS_SKILL)
+	].find((path) => existsSync(join(path, "SKILL.md")));
+}
+async function scanGenerativeMcpappsStatus(options = {}) {
+	const roots = [...userSkillRoots(options.env ?? process.env, options.home ?? homedir())];
+	const cwd = typeof options.cwd === "string" && options.cwd.trim().length > 0 ? isAbsolute(options.cwd) ? options.cwd : resolve(options.cwd) : void 0;
+	if (cwd !== void 0) roots.unshift(...projectSkillRoots(await findProjectRoot(cwd)));
+	const inspected = [];
+	let rootHit = false;
+	for (const root of roots) {
+		const present = await rootHasGenerativeMcpapps(root.path);
+		inspected.push({
+			...root,
+			present
+		});
+		if (present) rootHit = true;
+	}
+	let via = null;
+	let listHit = false;
+	if (options.listSkills) try {
+		listHit = skillListIncludes(await options.listSkills());
+		if (listHit) via = "skills.list";
+	} catch {}
+	if (!listHit && rootHit) via = "skill-root";
+	const packPath = options.packPath ?? pluginSkillPackPath();
+	return {
+		name: GENERATIVE_MCPAPPS_SKILL,
+		installed: listHit || rootHit,
+		via,
+		roots: inspected,
+		...packPath !== void 0 ? { packPath } : {}
+	};
+}
+//#endregion
 //#region src/dsh-better-display.ts
 const name = "@drscrewdriver/dsh-better-display";
 const inject = ["webServer"];
@@ -77,12 +232,10 @@ function apply(ctx) {
 					return;
 				}
 				try {
-					const cwd = new URL(req.url ?? "", "http://127.0.0.1").searchParams.get("cwd") ?? void 0;
-					const status = await scanGenerativeMcpappsStatus({
-						cwd,
+					writeJson(res, 200, toPublicSkillStatus(await scanGenerativeMcpappsStatus({
+						cwd: new URL(req.url ?? "", "http://127.0.0.1").searchParams.get("cwd") ?? void 0,
 						listSkills: skillLister(ctx)
-					});
-					writeJson(res, 200, toPublicSkillStatus(status));
+					})));
 				} catch (err) {
 					writeJson(res, 500, {
 						ok: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drscrewdriver/dsh-better-display",
-  "version": "0.3.3-fork.1",
+  "version": "0.3.3-fork.3",
   "description": "A calmer reading view for DeepSeek Harness: native process details, live reasoning, and clean final answers. Fork adds answer message bubbles with a settings switch.",
   "type": "module",
   "license": "MIT",