@norman-else/dsh-claude 0.1.7 → 0.1.8

package/lib/index.mjs

@@ -1,15 +1,16 @@
-import { a as latestClaudeTasks, c as normalizeTasksEvent, d as CLAUDE_ACTIVITY_EVENT, f as CLAUDE_CODE_PRESET_ID, g as CLAUDE_PROJECTION_PATH, h as CLAUDE_DOCTOR_PATH, i as latestClaudeSessionBinding, l as redactText, m as CLAUDE_CODE_PROVIDER_IDS, n as currentClaudeActivityCursor, o as normalizeActivity, p as CLAUDE_CODE_PROVIDER, r as latestClaudeContextUsage, s as normalizeContextUsage, t as boundText, u as safeDetail, v as TASK_TOOL_NAMES } from "./events-DP0Ov_Re.mjs";
-import { a as ClaudeCommandBridge, i as CLAUDE_COMMANDS_SERVICE, r as dynamicPresenterDefinition, t as CLAUDE_PRESENTER_NAMES } from "./presenters-YMR2WMjn.mjs";
-import { a as resolveClaudeExecutable, n as ensureManagedPreset, o as runClaudeDoctor, t as ManagedPresetConflictError } from "./preset-installer-BKw-SdOm.mjs";
+import { _ as CLAUDE_UPDATE_CHECK_PATH, a as latestClaudeTasks, b as TASK_TOOL_NAMES, c as normalizeTasksEvent, d as CLAUDE_ACTIVITY_EVENT, f as CLAUDE_CODE_PRESET_ID, g as CLAUDE_PROJECTION_PATH, h as CLAUDE_DOCTOR_PATH, i as latestClaudeSessionBinding, l as redactText, m as CLAUDE_CODE_PROVIDER_IDS, n as currentClaudeActivityCursor, o as normalizeActivity, p as CLAUDE_CODE_PROVIDER, r as latestClaudeContextUsage, s as normalizeContextUsage, t as boundText, u as safeDetail, v as CLAUDE_UPDATE_PATH } from "./events-BVQkPmjg.mjs";
+import { a as ClaudeCommandBridge, i as CLAUDE_COMMANDS_SERVICE, r as dynamicPresenterDefinition, t as CLAUDE_PRESENTER_NAMES } from "./presenters-CQ9dBVyY.mjs";
+import { a as resolveClaudeExecutable, n as ensureManagedPreset, o as runClaudeDoctor, t as ManagedPresetConflictError } from "./preset-installer-DUmmDvBm.mjs";
 import z from "@deepseek-ai/schemastery";
 import { CallId, LlmAdapter, ReasoningEffortId, createToolResultMessage, createUserMessage } from "@deepseek-ai/dsh-llm";
 import { randomUUID } from "node:crypto";
-import { chmod, mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
-import { join } from "node:path";
-import { dshHomePath } from "@deepseek-ai/dsh-home-paths";
+import { chmod, mkdir, opendir, readFile, realpath, rename, rm, writeFile } from "node:fs/promises";
+import { dirname, join, resolve } from "node:path";
+import { dshHomePath, resolveDshHome } from "@deepseek-ai/dsh-home-paths";
 import { query } from "@anthropic-ai/claude-agent-sdk";
 import { EventEmitter } from "node:events";
 import { DSH_ENV_PREFIX, SENSITIVE_ENV_PATTERN } from "@deepseek-ai/dsh-subprocess";
+import { fileURLToPath } from "node:url";
 //#region src/sidecar.ts
 const SIDECAR_SCHEMA_VERSION = 1;
 const MAX_ACTIVITIES = 1e4;
@@ -2064,7 +2065,7 @@ function json(res, status, value) {
 //#region src/doctor-routes.ts
 const CLAUDE_DOCTOR_PROBE_TIMEOUT_MS = 15e3;
 const claudeBridgeDiagnostics = /* @__PURE__ */ new WeakMap();
-function safeMessage(error) {
+function safeMessage$1(error) {
 	return redactText(error instanceof Error ? error.message : String(error), 1e3);
 }
 /** Live command-bridge diagnostics: which agents exist, their presets, and how
@@ -2080,14 +2081,14 @@ function commandDiagnostics(ctx) {
 					const preset = ctx.agentPresets.composedPreset(agent.ctx);
 					if (preset !== void 0) info.preset = preset;
 				} catch (error) {
-					info.error = safeMessage(error);
+					info.error = safeMessage$1(error);
 				}
 				try {
 					const list = ctx.commands.list(agent);
 					info.commandCount = list.length;
 					info.sample = list.slice(0, 10).map((command) => command.name);
 				} catch (error) {
-					info.error = info.error === void 0 ? safeMessage(error) : `${info.error}; ${safeMessage(error)}`;
+					info.error = info.error === void 0 ? safeMessage$1(error) : `${info.error}; ${safeMessage$1(error)}`;
 				}
 				const bridge = claudeBridgeDiagnostics.get(agent);
 				if (bridge !== void 0) info.bridge = bridge;
@@ -2095,7 +2096,7 @@ function commandDiagnostics(ctx) {
 			})
 		};
 	} catch (error) {
-		return { error: safeMessage(error) };
+		return { error: safeMessage$1(error) };
 	}
 }
 function registerClaudeDoctorRoutes(ctx, runtime, supervisor, config, resolutionError) {
@@ -2119,7 +2120,7 @@ function registerClaudeDoctorRoutes(ctx, runtime, supervisor, config, resolution
 					version: { status: "not-run" },
 					authentication: { status: "not-run" },
 					handshake: "not-run",
-					message: safeMessage(resolutionError),
+					message: safeMessage$1(resolutionError),
 					limits: {
 						idleTimeoutMs: config.idleTimeoutMs,
 						maxProcesses: config.maxProcesses
@@ -2149,7 +2150,7 @@ function registerClaudeDoctorRoutes(ctx, runtime, supervisor, config, resolution
 					commandBridge: commandDiagnostics(ctx)
 				});
 			} catch (error) {
-				json(res, 500, { error: safeMessage(error) });
+				json(res, 500, { error: safeMessage$1(error) });
 			}
 		}
 	}), "dsh-claude: Doctor route");
@@ -2198,6 +2199,259 @@ function registerClaudeProjectionRoute(ctx, sidecar, ownsSession) {
 	}), "dsh-claude: sidecar projection route");
 }
 //#endregion
+//#region src/update-routes.ts
+const PLUGIN_PACKAGE_NAME = "@norman-else/dsh-claude";
+const UPDATE_TIMEOUT_MS = 3e4;
+const CHECK_TIMEOUT_MS = 1e4;
+const MAX_MANIFEST_BYTES = 262144;
+const MAX_UPDATE_OUTPUT_BYTES = 32768;
+const SEMVER = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/;
+const PROFILE_NAME = /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/;
+function safeMessage(error) {
+	return redactText(error instanceof Error ? error.message : String(error), 500);
+}
+async function readManifest(path) {
+	const text = await readFile(path, "utf8");
+	if (Buffer.byteLength(text) > MAX_MANIFEST_BYTES) throw new Error("package manifest is too large");
+	const value = JSON.parse(text);
+	if (typeof value !== "object" || value === null || Array.isArray(value)) throw new Error("package manifest is invalid");
+	return value;
+}
+function dependencySpec(manifest) {
+	if (typeof manifest.dependencies !== "object" || manifest.dependencies === null || Array.isArray(manifest.dependencies)) return void 0;
+	const value = manifest.dependencies[PLUGIN_PACKAGE_NAME];
+	return typeof value === "string" && value.length <= 2e3 ? value : void 0;
+}
+function classifyInstallSpec(spec) {
+	if (/^(?:link|file|workspace):/i.test(spec)) return "link";
+	if (/^(?:git(?:\+[^:]+)?:|github:|https?:|npm:)/i.test(spec) || /\.git(?:#|$)/i.test(spec)) return "unsupported";
+	return /^(?:\^|~|>=?|<=?|=)?\s*v?\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\s*\|\|\s*(?:\^|~|>=?|<=?|=)?\s*v?\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?)*$/.test(spec.trim()) ? "registry" : "unsupported";
+}
+async function samePath(left, right) {
+	try {
+		const [a, b] = await Promise.all([realpath(left), realpath(right)]);
+		return process.platform === "win32" ? a.toLowerCase() === b.toLowerCase() : a === b;
+	} catch {
+		return false;
+	}
+}
+function linkedTarget(profileDir, spec) {
+	const match = /^(?:link|file):(.*)$/i.exec(spec);
+	return match?.[1] === void 0 ? void 0 : resolve(profileDir, match[1]);
+}
+async function discoverInstallation(dshHome, packageDir) {
+	const profilesDir = join(dshHome, "profiles");
+	const matches = [];
+	let profiles;
+	try {
+		profiles = await opendir(profilesDir);
+	} catch (error) {
+		if (error.code === "ENOENT") return void 0;
+		throw error;
+	}
+	for await (const entry of profiles) {
+		if (!entry.isDirectory() || !PROFILE_NAME.test(entry.name)) continue;
+		const profileDir = join(profilesDir, entry.name);
+		let manifest;
+		try {
+			manifest = await readManifest(join(profileDir, "package.json"));
+		} catch {
+			continue;
+		}
+		const spec = dependencySpec(manifest);
+		if (spec === void 0) continue;
+		const source = classifyInstallSpec(spec);
+		if (source === "link" ? linkedTarget(profileDir, spec) !== void 0 && await samePath(linkedTarget(profileDir, spec), packageDir) : await samePath(join(profileDir, "node_modules", ..."@norman-else/dsh-claude".split("/")), packageDir)) matches.push({
+			profile: entry.name,
+			profileDir,
+			source,
+			spec
+		});
+	}
+	return matches.length === 1 ? matches[0] : void 0;
+}
+function parseVersion(version) {
+	const match = SEMVER.exec(version);
+	if (match === null) throw new Error("package version is not valid semver");
+	return match;
+}
+function compareVersions(left, right) {
+	const a = parseVersion(left);
+	const b = parseVersion(right);
+	for (const index of [
+		1,
+		2,
+		3
+	]) {
+		const difference = Number(a[index]) - Number(b[index]);
+		if (difference !== 0) return Math.sign(difference);
+	}
+	const aPre = a[4];
+	const bPre = b[4];
+	if (aPre === void 0) return bPre === void 0 ? 0 : 1;
+	if (bPre === void 0) return -1;
+	return aPre.localeCompare(bPre, "en", { numeric: true });
+}
+async function registryLatest(signal) {
+	const response = await fetch("https://registry.npmjs.org/%40norman-else%2Fdsh-claude", {
+		headers: { accept: "application/vnd.npm.install-v1+json" },
+		signal
+	});
+	if (!response.ok) throw new Error(`npm registry returned HTTP ${response.status}`);
+	const latest = (await response.json())["dist-tags"]?.latest;
+	if (typeof latest !== "string") throw new Error("npm registry response has no latest version");
+	parseVersion(latest);
+	return latest;
+}
+async function resolvePackageContextDir(configured) {
+	const moduleDir = dirname(fileURLToPath(import.meta.url));
+	const candidates = configured === void 0 ? [moduleDir, dirname(moduleDir)] : [configured];
+	for (const packageDir of candidates) try {
+		const manifest = await readManifest(join(packageDir, "package.json"));
+		if (manifest.name === "@norman-else/dsh-claude") return {
+			packageDir,
+			manifest
+		};
+	} catch {}
+	throw new Error("plugin package manifest is invalid");
+}
+async function packageContext(deps) {
+	const { packageDir, manifest } = await resolvePackageContextDir(deps.packageDir);
+	if (typeof manifest.version !== "string") throw new Error("plugin package manifest is invalid");
+	parseVersion(manifest.version);
+	const installation = await discoverInstallation(deps.dshHome ?? resolveDshHome(), packageDir);
+	return {
+		version: manifest.version,
+		...installation === void 0 ? {} : { installation }
+	};
+}
+async function checkPluginUpdate(deps = {}) {
+	try {
+		const { version, installation } = await packageContext(deps);
+		if (installation === void 0) return {
+			currentVersion: version,
+			source: "unknown",
+			state: "unavailable",
+			canUpdate: false,
+			restartRequired: false,
+			message: "Active DSH profile could not be identified uniquely"
+		};
+		if (installation.source === "link") return {
+			currentVersion: version,
+			source: "link",
+			state: "linked",
+			canUpdate: false,
+			restartRequired: false,
+			message: "Local development link; updates come from the linked checkout"
+		};
+		if (installation.source !== "registry") return {
+			currentVersion: version,
+			source: installation.source,
+			state: "unsupported",
+			canUpdate: false,
+			restartRequired: false,
+			message: "This installation source cannot be updated from the npm registry"
+		};
+		const latest = await (deps.fetchLatest ?? registryLatest)(AbortSignal.timeout(CHECK_TIMEOUT_MS));
+		const comparison = compareVersions(version, latest);
+		return {
+			currentVersion: version,
+			latestVersion: latest,
+			source: "registry",
+			state: comparison < 0 ? "available" : "current",
+			canUpdate: comparison < 0,
+			restartRequired: comparison < 0
+		};
+	} catch (error) {
+		return {
+			currentVersion: "unknown",
+			source: "unknown",
+			state: "error",
+			canUpdate: false,
+			restartRequired: false,
+			message: safeMessage(error)
+		};
+	}
+}
+async function updatePlugin(deps = {}) {
+	const { version, installation } = await packageContext(deps);
+	if (installation === void 0 || installation.source !== "registry") throw new Error("Plugin update is unavailable for this installation");
+	const latest = await (deps.fetchLatest ?? registryLatest)(AbortSignal.timeout(CHECK_TIMEOUT_MS));
+	if (compareVersions(version, latest) >= 0) return {
+		currentVersion: version,
+		latestVersion: latest,
+		source: "registry",
+		state: "current",
+		canUpdate: false,
+		restartRequired: false
+	};
+	const resolveExecutable = deps.resolveExecutable;
+	const spawn = deps.spawn;
+	if (resolveExecutable === void 0 || spawn === void 0) throw new Error("DSH update runtime is unavailable");
+	const signal = AbortSignal.timeout(UPDATE_TIMEOUT_MS);
+	const handle = spawn({
+		argv: [
+			await resolveExecutable("dsh", {}, signal),
+			"plugin",
+			"--profile",
+			installation.profile,
+			"update",
+			PLUGIN_PACKAGE_NAME
+		],
+		cwd: installation.profileDir,
+		env: {},
+		stdio: {
+			stdin: "ignore",
+			stdout: { maxBytes: MAX_UPDATE_OUTPUT_BYTES },
+			stderr: { maxBytes: MAX_UPDATE_OUTPUT_BYTES }
+		},
+		graceMs: 2e3,
+		signal
+	});
+	const outcome = await handle.done;
+	if (outcome.exitCode !== 0) {
+		const detail = handle.collected.stderr?.readFrom(0).text ?? "";
+		throw new Error(`DSH plugin update failed (${outcome.exitCode ?? outcome.signal ?? "unknown exit"}): ${safeMessage(detail)}`);
+	}
+	return {
+		currentVersion: version,
+		latestVersion: latest,
+		source: "registry",
+		state: "current",
+		canUpdate: false,
+		restartRequired: true,
+		message: "Update installed; restart DSH Desktop to load it"
+	};
+}
+function registerClaudeUpdateRoutes(ctx, runtime, deps = {}) {
+	const shared = {
+		...deps,
+		resolveExecutable: runtime.resolveExecutable.bind(runtime),
+		spawn: runtime.spawn.bind(runtime)
+	};
+	for (const route of [{
+		path: CLAUDE_UPDATE_CHECK_PATH,
+		method: "GET",
+		run: () => checkPluginUpdate(shared)
+	}, {
+		path: CLAUDE_UPDATE_PATH,
+		method: "POST",
+		run: () => updatePlugin(shared)
+	}]) ctx.effect(() => ctx.webServer.register({
+		kind: "exact",
+		path: route.path,
+		handler: async (req, res) => {
+			if (req.method !== route.method) return json(res, 405, { error: "method not allowed" });
+			if (!trustedRequest(req)) return json(res, 403, { error: "forbidden" });
+			try {
+				json(res, 200, await route.run());
+			} catch (error) {
+				json(res, 500, { error: safeMessage(error) });
+			}
+		}
+	}), `dsh-claude: ${route.method} ${route.path}`);
+}
+//#endregion
 //#region src/index.ts
 const name = "llm-claude";
 const inject = [
@@ -2409,6 +2663,7 @@ async function apply(ctx, config) {
 	ctx.effect(() => () => supervisor.dispose(), "dsh-claude: process supervisor");
 	ctx.inject(["webServer"], (webCtx) => {
 		registerClaudeDoctorRoutes(webCtx, webCtx.subprocess, supervisor, supervisorConfig, resolutionError);
+		registerClaudeUpdateRoutes(webCtx, webCtx.subprocess);
 		registerClaudeProjectionRoute(webCtx, sidecar, (sessionId) => {
 			const agent = webCtx.agents.get(sessionId);
 			return agent !== void 0 && webCtx.agentPresets.composedPreset(agent.ctx) === "claude";