@norman-else/dsh-claude 0.1.4 → 0.1.6

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";
@@ -357,21 +357,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) {
@@ -1162,6 +1165,10 @@ 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)
 			};
 		});
@@ -1347,6 +1354,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;
 		}
 	}
@@ -1774,9 +1787,9 @@ var ClaudeCodeAdapter = class extends LlmAdapter {
 	providerRetryPolicy() {
 		return NO_RETRY_POLICY;
 	}
-	async listModels() {
+	async listModels(provider) {
 		return MODELS.map((model) => ({
-			provider: CLAUDE_CODE_PROVIDER,
+			provider,
 			id: model.id,
 			name: model.name,
 			description: model.description,
@@ -1803,7 +1816,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({
@@ -2082,7 +2095,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 +2192,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",
@@ -2243,7 +2260,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 +2284,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