@norman-else/dsh-claude 0.1.5 → 0.1.7

package/lib/index.mjs

@@ -1,6 +1,6 @@
-import { a as latestClaudeTasks, b as isClaudePresetId, 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, y as TASK_TOOL_NAMES } from "./events-qlmU1KrH.mjs";
-import { a as ClaudeCommandBridge, i as CLAUDE_COMMANDS_SERVICE, r as dynamicPresenterDefinition, t as CLAUDE_PRESENTER_NAMES } from "./presenters-DbfG-9KQ.mjs";
-import { a as resolveClaudeExecutable, o as runClaudeDoctor, r as removeManagedPreset, t as ManagedPresetConflictError } from "./preset-installer-D8q3_-wJ.mjs";
+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 z from "@deepseek-ai/schemastery";
 import { CallId, LlmAdapter, ReasoningEffortId, createToolResultMessage, createUserMessage } from "@deepseek-ai/dsh-llm";
 import { randomUUID } from "node:crypto";
@@ -45,6 +45,7 @@ const ACTIVITY_KINDS = /* @__PURE__ */ new Set([
 	"tool-call",
 	"tool-result",
 	"permission",
+	"question",
 	"subagent",
 	"usage",
 	"warning",
@@ -336,8 +337,14 @@ function mapApprovalOutcome(outcome, input, toolUseID) {
 		decisionClassification: "user_reject"
 	};
 }
-function createPermissionBridge(approval, activeContext) {
+function createPermissionBridge(approval, activeContext, userQuestion) {
 	return async (toolName, input, options) => {
+		if (toolName === "AskUserQuestion") return userQuestion === void 0 ? {
+			behavior: "deny",
+			message: "DeepSeek Harness user questions are unavailable; the question was cancelled.",
+			toolUseID: options.toolUseID,
+			decisionClassification: "user_reject"
+		} : userQuestion(input, options);
 		const active = activeContext();
 		if (active === void 0) return {
 			behavior: "deny",
@@ -357,21 +364,24 @@ function createPermissionBridge(approval, activeContext) {
 				summary: options.title ?? options.description ?? reason,
 				detail: input
 			});
-			const outcome = await approval.request({
+			const alreadyFullAccess = await active.hasFullAccess?.() === true;
+			const outcome = alreadyFullAccess ? "allowed-once" : await approval.request({
 				agent: active.agent,
 				toolName,
 				reason,
 				signal: options.signal
 			});
-			const result = mapApprovalOutcome(outcome, input, options.toolUseID);
+			const fullAccess = alreadyFullAccess || await active.hasFullAccess?.() === true;
+			const effectiveOutcome = fullAccess ? "allowed-once" : outcome;
+			const result = mapApprovalOutcome(effectiveOutcome, input, options.toolUseID);
 			if (result.behavior === "deny") active.recordDenial?.(options.toolUseID);
 			await active.appendActivity({
 				kind: "permission",
-				phase: outcome === "allowed-once" ? "completed" : "denied",
+				phase: effectiveOutcome === "allowed-once" ? "completed" : "denied",
 				toolUseId: options.toolUseID,
 				toolName,
 				title: options.displayName ?? toolName,
-				summary: outcome === "allowed-once" ? "Allowed once in DeepSeek Harness" : denialMessage(outcome)
+				summary: fullAccess ? "Allowed by Full access in DeepSeek Harness" : effectiveOutcome === "allowed-once" ? "Allowed once in DeepSeek Harness" : denialMessage(effectiveOutcome)
 			});
 			return result;
 		} catch (error) {
@@ -398,6 +408,120 @@ function createPermissionBridge(approval, activeContext) {
 	};
 }
 //#endregion
+//#region src/user-question.ts
+const FAILURE_MESSAGE = "DeepSeek Harness could not collect an answer; the question was cancelled.";
+const INVALID_MESSAGE = "Claude Code sent an invalid user-question request; the question was cancelled.";
+function failureMessage(error) {
+	const code = error !== null && typeof error === "object" && "code" in error ? error.code : void 0;
+	return typeof code === "string" && /^[A-Z][A-Z0-9_]*$/.test(code) ? `${FAILURE_MESSAGE} (${code})` : FAILURE_MESSAGE;
+}
+function deny(message, toolUseID) {
+	return {
+		behavior: "deny",
+		message,
+		toolUseID,
+		decisionClassification: "user_reject"
+	};
+}
+function optionalText(value) {
+	return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function parseQuestions(input, toolUseID) {
+	if (!Array.isArray(input.questions) || input.questions.length === 0 || input.questions.length > 20) return void 0;
+	const seen = /* @__PURE__ */ new Set();
+	const questions = [];
+	for (const [index, value] of input.questions.entries()) {
+		if (value === null || typeof value !== "object" || Array.isArray(value)) return void 0;
+		const item = value;
+		if (typeof item.question !== "string" || item.question.length === 0 || seen.has(item.question)) return void 0;
+		seen.add(item.question);
+		if (item.options !== void 0 && !Array.isArray(item.options)) return void 0;
+		const options = (item.options ?? []).map((option) => {
+			if (option === null || typeof option !== "object" || Array.isArray(option)) return void 0;
+			const record = option;
+			if (typeof record.label !== "string" || record.label.length === 0) return void 0;
+			const description = optionalText(record.description);
+			return {
+				label: record.label,
+				...description === void 0 ? {} : { description }
+			};
+		});
+		if (options.some((option) => option === void 0)) return void 0;
+		const header = optionalText(item.header);
+		questions.push({
+			id: `${toolUseID}:${index}`,
+			question: item.question,
+			...header === void 0 ? {} : { header },
+			options,
+			multiSelect: item.multiSelect === true
+		});
+	}
+	return questions;
+}
+function answerText(answer, multiSelect) {
+	if (answer === void 0) return "";
+	const custom = optionalText(answer.custom);
+	if (!multiSelect && custom !== void 0) return custom;
+	return [...answer.selected, ...custom === void 0 ? [] : [custom]].join(", ");
+}
+function createUserQuestionBridge(userQuestions, activeContext) {
+	return async (input, options) => {
+		const active = activeContext();
+		if (active === void 0) return deny("No active DeepSeek Harness turn owns this Claude Code question.", options.toolUseID);
+		const questions = parseQuestions(input, options.toolUseID);
+		if (questions === void 0) return deny(INVALID_MESSAGE, options.toolUseID);
+		active.markActivity?.();
+		try {
+			await active.appendActivity({
+				kind: "question",
+				phase: "started",
+				toolUseId: options.toolUseID,
+				toolName: "AskUserQuestion",
+				title: "Claude asked a question",
+				summary: questions.length === 1 ? questions[0].question : `Claude asked ${questions.length} questions`
+			});
+			const response = await userQuestions.ask({
+				questions,
+				agent: active.agent,
+				signal: options.signal
+			});
+			const answersById = new Map(response.answers.map((answer) => [answer.id, answer]));
+			const answers = Object.fromEntries(questions.map((question) => [question.question, answerText(answersById.get(question.id), question.multiSelect === true)]));
+			await active.appendActivity({
+				kind: "question",
+				phase: "completed",
+				toolUseId: options.toolUseID,
+				toolName: "AskUserQuestion",
+				title: "Claude asked a question",
+				summary: "Answered in DeepSeek Harness"
+			});
+			return {
+				behavior: "allow",
+				updatedInput: {
+					...input,
+					answers
+				},
+				toolUseID: options.toolUseID,
+				decisionClassification: "user_temporary"
+			};
+		} catch (error) {
+			const message = failureMessage(error);
+			try {
+				await active.appendActivity({
+					kind: "question",
+					phase: "failed",
+					toolUseId: options.toolUseID,
+					toolName: "AskUserQuestion",
+					title: "Claude asked a question",
+					summary: message,
+					isError: true
+				});
+			} catch {}
+			return deny(message, options.toolUseID);
+		}
+	};
+}
+//#endregion
 //#region src/sdk-messages.ts
 function record(value) {
 	return value !== null && typeof value === "object" ? value : void 0;
@@ -905,6 +1029,7 @@ var ClaudeSupervisor = class {
 	#entries = /* @__PURE__ */ new Map();
 	#runtime;
 	#approval;
+	#userQuestions;
 	#config;
 	#queryFactory;
 	#runDetached;
@@ -916,6 +1041,7 @@ var ClaudeSupervisor = class {
 	constructor(dependencies) {
 		this.#runtime = dependencies.runtime;
 		this.#approval = dependencies.approval;
+		this.#userQuestions = dependencies.userQuestions;
 		this.#config = dependencies.config;
 		this.#queryFactory = dependencies.queryFactory ?? ((params) => query(params));
 		this.#runDetached = dependencies.runDetached ?? ((operation) => operation());
@@ -1151,7 +1277,7 @@ var ClaudeSupervisor = class {
 			taskSnapshotAt: 0,
 			taskSnapshotTimer: void 0
 		};
-		const canUseTool = createPermissionBridge(this.#approval, () => {
+		const activeInteraction = () => {
 			const active = entry.active;
 			return active === void 0 ? void 0 : {
 				agent: active.agent,
@@ -1162,9 +1288,15 @@ var ClaudeSupervisor = class {
 				recordDenial: (toolUseId) => {
 					active.deniedToolUseIds.add(toolUseId);
 				},
+				hasFullAccess: async () => {
+					await this.#syncPermissionMode(entry);
+					return entry.permissionMode === "bypassPermissions";
+				},
 				appendActivity: (activity) => this.#appendActivity(active, activity)
 			};
-		});
+		};
+		const userQuestion = createUserQuestionBridge(this.#userQuestions, activeInteraction);
+		const canUseTool = createPermissionBridge(this.#approval, activeInteraction, userQuestion);
 		const options = {
 			pathToClaudeCodeExecutable: this.#config.executablePath,
 			cwd,
@@ -1347,6 +1479,12 @@ var ClaudeSupervisor = class {
 					title: message.toolName,
 					summary: message.summary
 				});
+				if (!TASK_TOOL_NAMES.has(active.callNames.get(message.toolUseId) ?? message.toolName)) await this.#appendNativeToolResult(active, {
+					kind: "tool-result",
+					toolUseId: message.toolUseId,
+					output: message.summary,
+					isError: true
+				});
 				return;
 		}
 	}
@@ -1803,7 +1941,7 @@ var ClaudeCodeAdapter = class extends LlmAdapter {
 	async *stream(options) {
 		if (options.purpose !== void 0) throw new Error(`dsh-claude: auxiliary ${options.purpose} calls are not routed into the Claude session`);
 		const agent = resolveAgent(this.#agents, options);
-		if (!isClaudePresetId(this.#presetIdFor(agent))) throw new Error(`dsh-claude: provider ${CLAUDE_CODE_PROVIDER} is available only to the ${CLAUDE_CODE_PRESET_ID} preset`);
+		if (this.#presetIdFor(agent) !== "claude") throw new Error(`dsh-claude: provider ${CLAUDE_CODE_PROVIDER} is available only to the ${CLAUDE_CODE_PRESET_ID} preset`);
 		const thinkingMode = thinkingModeFor(options.reasoningEffort);
 		const prompt = extractDirectUserText(options.messages);
 		const events = await this.#supervisor.runTurn({
@@ -2068,7 +2206,8 @@ const inject = [
 	"agentPresets",
 	"commands",
 	"subprocess",
-	"approval"
+	"approval",
+	"userQuestions"
 ];
 const Config = z.object({
 	executablePath: z.string().default(""),
@@ -2082,7 +2221,7 @@ 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)) {
-	if (!isClaudePresetId(ctx.agentPresets.composedPreset(agent.ctx))) return void 0;
+	if (ctx.agentPresets.composedPreset(agent.ctx) !== "claude") return void 0;
 	let stopped = false;
 	let pending = Promise.resolve();
 	let commandScope;
@@ -2179,13 +2318,17 @@ function mountClaudeMetadata(ctx, supervisor, agent, model, sidecar, resolveComm
 		};
 	}, "dsh-claude: agent metadata bridge");
 }
-async function apply(ctx, config) {
+async function installManagedPresetCompatibility(logger, install = ensureManagedPreset) {
 	try {
-		await removeManagedPreset();
+		return await install();
 	} catch (error) {
 		if (!(error instanceof ManagedPresetConflictError)) throw error;
-		ctx.logger.warn(`dsh-claude: preserving user-modified legacy preset at ${error.path}`);
+		logger.warn(`dsh-claude: preserving user-modified preset at ${error.path}`);
+		return "conflict";
 	}
+}
+async function apply(ctx, config) {
+	await installManagedPresetCompatibility(ctx.logger);
 	const supervisorConfig = {
 		executablePath: "",
 		defaultModel: config.model ?? "default",
@@ -2196,6 +2339,7 @@ async function apply(ctx, config) {
 	const supervisor = new ClaudeSupervisor({
 		runtime: ctx.subprocess,
 		approval: ctx.approval,
+		userQuestions: ctx.userQuestions,
 		config: supervisorConfig,
 		runDetached: (operation) => ctx.agents.withoutInitiator(operation),
 		sidecar
@@ -2243,7 +2387,7 @@ async function apply(ctx, config) {
 			});
 			const onPresetSelected = ctx.on;
 			const stopSelected = onPresetSelected("agent-preset/selected", (sessionId, preset) => {
-				if (!isClaudePresetId(preset)) return;
+				if (preset !== "claude") return;
 				const agent = ctx.agents.get(sessionId);
 				if (agent !== void 0) mountWhenPresetSettles(agent);
 			});
@@ -2267,11 +2411,11 @@ async function apply(ctx, config) {
 		registerClaudeDoctorRoutes(webCtx, webCtx.subprocess, supervisor, supervisorConfig, resolutionError);
 		registerClaudeProjectionRoute(webCtx, sidecar, (sessionId) => {
 			const agent = webCtx.agents.get(sessionId);
-			return agent !== void 0 && isClaudePresetId(webCtx.agentPresets.composedPreset(agent.ctx));
+			return agent !== void 0 && webCtx.agentPresets.composedPreset(agent.ctx) === "claude";
 		});
 	});
 }
 //#endregion
-export { Config, apply, inject, mountClaudeMetadata, name };
+export { Config, apply, inject, installManagedPresetCompatibility, mountClaudeMetadata, name };
 
 //# sourceMappingURL=index.mjs.map