@norman-else/dsh-claude 0.1.10 → 0.1.12

package/lib/index.d.mts

@@ -3,28 +3,33 @@ import { EffortLevel, Options, Query, SDKControlGetContextUsageResponse, SDKUser
 import { SubprocessRuntime } from "@deepseek-ai/dsh-subprocess";
 import { Context } from "@deepseek-ai/cordis";
 import { Agent } from "@deepseek-ai/dsh-agent";
-import { CommandDefinition, CommandDescriptor } from "@deepseek-ai/dsh-commands";
+import { CommandDescriptor } from "@deepseek-ai/dsh-commands";
 import { SessionEvent } from "@deepseek-ai/dsh-session";
 import { ApprovalService } from "@deepseek-ai/dsh-user-approval";
 import { UserQuestionService } from "@deepseek-ai/dsh-user-questions";
 //#region src/command-bridge.d.ts
 /**
- * Agent-scope command service contract. The commands service is unreachable
+ * Agent-scope command-directory contract. The commands service is unreachable
  * from the host plugin's view of `agent.ctx` ("without inject"), but the
- * preset route plugin runs INSIDE the agent's preset composition with
- * `commands` injected. Registrations made through the provided service land
- * in the agent's scope layer, which the command registry inherits into
- * `list(agent)` for exactly that agent — invisible to every other session.
+ * preset route plugin runs inside the agent's preset composition with
+ * `commands` injected. The Host reads only the exact agent's effective names
+ * for collision checks; Claude catalog entries are never registered there.
  */
 interface ClaudeAgentCommandService {
   list(agent: unknown): readonly Pick<CommandDescriptor, 'name'>[];
-  register(definition: CommandDefinition): () => void;
 }
 declare module '@deepseek-ai/cordis' {
   interface Context {
     claudeCommands?: ClaudeAgentCommandService;
   }
 }
+interface ClaudeCommandView {
+  publicName: string;
+  claudeName: string;
+  description: string;
+  hint?: string;
+  prefixed: boolean;
+}
 //#endregion
 //#region src/events.d.ts
 type ClaudeActivityKind = 'status' | 'thinking' | 'tool-call' | 'tool-result' | 'permission' | 'question' | 'subagent' | 'usage' | 'warning' | 'error';
@@ -232,7 +237,7 @@ interface Config {
   maxProcesses?: number;
 }
 declare const Config: z<Config>;
-declare function mountClaudeMetadata(ctx: Context, supervisor: ClaudeSupervisor, agent: Agent, model: string, sidecar: ClaudeSidecarRepository, resolveCommands?: () => ClaudeAgentCommandService | undefined): (() => Promise<void>) | undefined;
+declare function mountClaudeMetadata(ctx: Context, supervisor: ClaudeSupervisor, agent: Agent, model: string, sidecar: ClaudeSidecarRepository, publishCommands?: (commands: readonly ClaudeCommandView[]) => void, resolveCommands?: () => ClaudeAgentCommandService | undefined): (() => Promise<void>) | undefined;
 declare function installManagedPresetCompatibility(logger: Pick<Context['logger'], 'warn'>, install?: typeof ensureManagedPreset): Promise<'installed' | 'unchanged' | 'conflict'>;
 declare function apply(ctx: Context, config: Config): Promise<void>;
 //#endregion

package/lib/index.mjs

@@ -1,14 +1,14 @@
 import { _ as CLAUDE_PROJECTION_PATH, a as latestClaudeTasks, c as normalizeTasksEvent, d as CLAUDE_ACTIVITY_EVENT, f as CLAUDE_CODE_PRESET_ID, g as CLAUDE_GLOBAL_SETTINGS_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_CHECK_PATH, x as TASK_TOOL_NAMES, y as CLAUDE_UPDATE_PATH } from "./events-6xTApIQw.mjs";
-import { a as ClaudeCommandBridge, i as CLAUDE_COMMANDS_SERVICE, r as dynamicPresenterDefinition, t as CLAUDE_PRESENTER_NAMES } from "./presenters-C8Yx_rNY.mjs";
+import { a as projectClaudeCommands, i as CLAUDE_COMMANDS_SERVICE, r as dynamicPresenterDefinition, t as CLAUDE_PRESENTER_NAMES } from "./presenters-CtgkpzZo.mjs";
 import { a as resolveClaudeExecutable, n as ensureManagedPreset, o as runClaudeDoctor, t as ManagedPresetConflictError } from "./preset-installer-B0NrA4Hi.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, opendir, readFile, realpath, rename, rm, writeFile } from "node:fs/promises";
 import { dirname, extname, join, resolve } from "node:path";
 import { dshHomePath, resolveDshHome } from "@deepseek-ai/dsh-home-paths";
 import { homedir } from "node:os";
 import { query } from "@anthropic-ai/claude-agent-sdk";
+import { CallId, LlmAdapter, ReasoningEffortId, createToolResultMessage } from "@deepseek-ai/dsh-llm";
 import { EventEmitter } from "node:events";
 import { DSH_ENV_PREFIX, SENSITIVE_ENV_PATTERN } from "@deepseek-ai/dsh-subprocess";
 import { fileURLToPath } from "node:url";
@@ -1345,6 +1345,7 @@ var ClaudeSupervisor = class {
 	}
 	async #handleMessage(entry, message) {
 		if (message.kind === "init") {
+			const firstInitialization = !entry.initialized;
 			if (entry.expectedResume !== void 0 && message.sessionId !== entry.expectedResume) throw new ClaudeProtocolError(`Claude Code resumed unexpected session ${message.sessionId}; expected ${entry.expectedResume}`);
 			if (message.cwd !== entry.cwd) throw new ClaudeProtocolError(`Claude Code initialized in unexpected cwd ${message.cwd}; expected ${entry.cwd}`);
 			if (entry.initTimer !== void 0) {
@@ -1355,7 +1356,7 @@ var ClaudeSupervisor = class {
 			entry.claudeSessionId = message.sessionId;
 			entry.state = entry.active === void 0 ? "idle" : "running";
 			for (const waiter of entry.initWaiters.splice(0)) waiter(void 0);
-			if (entry.tasks.size > 0) {
+			if (firstInitialization && entry.tasks.size > 0) {
 				entry.tasks.clear();
 				await this.#flushTasksSnapshot(entry);
 			}
@@ -2258,7 +2259,7 @@ function sessionIdFromUrl(rawUrl) {
 	}
 }
 /** Register the browser-readable, credential-free sidecar projection endpoint. */
-function registerClaudeProjectionRoute(ctx, sidecar, ownsSession) {
+function registerClaudeProjectionRoute(ctx, sidecar, ownsSession, commandsForSession = () => []) {
 	ctx.effect(() => ctx.webServer.register({
 		kind: "prefix",
 		path: CLAUDE_PROJECTION_PATH,
@@ -2273,6 +2274,7 @@ function registerClaudeProjectionRoute(ctx, sidecar, ownsSession) {
 					schemaVersion: projection.schemaVersion,
 					revision: projection.revision,
 					owned: ownsSession(sessionId),
+					commands: commandsForSession(sessionId),
 					activities: projection.activities,
 					...projection.contextUsage === void 0 ? {} : { contextUsage: projection.contextUsage },
 					...projection.tasks === void 0 ? {} : { tasks: projection.tasks }
@@ -2504,14 +2506,15 @@ async function updatePlugin(deps = {}) {
 		throw new Error(`DSH plugin update failed (${outcome.exitCode ?? outcome.signal ?? "unknown exit"}): ${safeMessage(detail)}`);
 	}
 	await verifyInstalledVersion(installation, latest);
+	if (deps.requestRestart !== void 0) setTimeout(() => deps.requestRestart?.(), 100).unref?.();
 	return {
 		currentVersion: latest,
 		latestVersion: latest,
 		source: "registry",
 		state: "current",
 		canUpdate: false,
-		restartRequired: true,
-		message: "Update installed; restart DSH Desktop to load it"
+		restartRequired: deps.requestRestart === void 0,
+		message: deps.requestRestart === void 0 ? "Update installed; restart DSH Desktop to load it" : "Update installed; DSH Desktop is restarting to load it"
 	};
 }
 function registerClaudeUpdateRoutes(ctx, runtime, deps = {}) {
@@ -2754,7 +2757,7 @@ const CATALOG_RETRY_MS = 5e3;
 const SCOPE_RETRY_MS = 500;
 const MAX_CATALOG_RETRIES = 3;
 const MAX_SCOPE_RETRIES = 24;
-function mountClaudeMetadata(ctx, supervisor, agent, model, sidecar, resolveCommands = () => ctx.agentPresets.serviceFor(agent, CLAUDE_COMMANDS_SERVICE)) {
+function mountClaudeMetadata(ctx, supervisor, agent, model, sidecar, publishCommands = () => {}, resolveCommands = () => ctx.agentPresets.serviceFor(agent, CLAUDE_COMMANDS_SERVICE)) {
 	if (ctx.agentPresets.composedPreset(agent.ctx) !== "claude") return void 0;
 	let stopped = false;
 	let pending = Promise.resolve();
@@ -2765,19 +2768,7 @@ function mountClaudeMetadata(ctx, supervisor, agent, model, sidecar, resolveComm
 		commandScope = scoped;
 		return scoped;
 	};
-	const bridge = new ClaudeCommandBridge({
-		list: () => scopedCommands().list(agent),
-		register: (definition) => scopedCommands().register(definition),
-		forward: (line) => {
-			agent.followup(createUserMessage({
-				content: [{
-					type: "text",
-					text: line
-				}],
-				source: { kind: "user" }
-			}));
-		}
-	});
+	const commandTarget = { list: () => scopedCommands().list(agent) };
 	const warn = (area, error) => {
 		ctx.logger.warn(`dsh-claude: ${area} refresh failed for ${String(agent.id)}: ${error instanceof Error ? error.message : String(error)}`);
 	};
@@ -2819,7 +2810,9 @@ function mountClaudeMetadata(ctx, supervisor, agent, model, sidecar, resolveComm
 			}
 			if (stopped || catalog === void 0) return;
 			try {
-				diagnostic.registered = bridge.refresh(catalog).map((view) => view.publicName);
+				const commands = projectClaudeCommands(catalog, commandTarget);
+				publishCommands(commands);
+				diagnostic.registered = commands.map((view) => view.publicName);
 				if (!stopped) scopeRetries = 0;
 			} catch (error) {
 				diagnostic.lastError = error instanceof Error ? error.message : String(error);
@@ -2845,10 +2838,10 @@ function mountClaudeMetadata(ctx, supervisor, agent, model, sidecar, resolveComm
 		refresh();
 		return async () => {
 			stopped = true;
+			publishCommands([]);
 			if (retryTimer !== void 0) clearTimeout(retryTimer);
 			stopStatus();
 			await pending;
-			bridge.dispose();
 		};
 	}, "dsh-claude: agent metadata bridge");
 }
@@ -2870,6 +2863,7 @@ async function apply(ctx, config) {
 		maxProcesses: config.maxProcesses ?? 4
 	};
 	const sidecar = new ClaudeSidecarRepository();
+	const commandCatalogs = /* @__PURE__ */ new Map();
 	const supervisor = new ClaudeSupervisor({
 		runtime: ctx.subprocess,
 		approval: ctx.approval,
@@ -2889,7 +2883,11 @@ async function apply(ctx, config) {
 			const MOUNT_RETRY_LIMIT = 50;
 			const mount = (agent) => {
 				if (mounted.has(agent)) return;
-				const dispose = mountClaudeMetadata(ctx, supervisor, agent, supervisorConfig.defaultModel, sidecar);
+				const sessionId = agent.id;
+				const dispose = mountClaudeMetadata(ctx, supervisor, agent, supervisorConfig.defaultModel, sidecar, (commands) => {
+					if (commands.length === 0) commandCatalogs.delete(sessionId);
+					else commandCatalogs.set(sessionId, commands);
+				});
 				if (dispose !== void 0) mounted.set(agent, dispose);
 				pending.delete(agent);
 			};
@@ -2943,12 +2941,13 @@ 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);
+		const desktopActions = webCtx.get("desktopActions");
+		registerClaudeUpdateRoutes(webCtx, webCtx.subprocess, { ...typeof desktopActions?.requestRestart === "function" ? { requestRestart: desktopActions.requestRestart.bind(desktopActions) } : {} });
 		registerClaudeGlobalSettingsRoute(webCtx);
 		registerClaudeProjectionRoute(webCtx, sidecar, (sessionId) => {
 			const agent = webCtx.agents.get(sessionId);
 			return agent !== void 0 && webCtx.agentPresets.composedPreset(agent.ctx) === "claude";
-		});
+		}, (sessionId) => commandCatalogs.get(sessionId) ?? []);
 	});
 }
 //#endregion