@norman-else/dsh-claude 0.1.42 → 0.1.43

package/lib/index.mjs

@@ -2876,20 +2876,7 @@ var ClaudeSupervisor = class {
 			...result.usage.outputTokens === void 0 ? {} : { outputTokens: result.usage.outputTokens }
 		};
 	}
-	async #completeProgressSegment(active, result, recordUsage = true) {
-		if (recordUsage && (result.usage.inputTokens !== void 0 || result.usage.outputTokens !== void 0 || result.usage.cumulativeCostUsd !== void 0)) {
-			await this.#appendSafely(active, {
-				kind: "usage",
-				phase: "completed",
-				title: "Claude usage",
-				summary: usageSummary(result.usage),
-				usage: this.#timedUsage(active, result.usage)
-			});
-			active.output.push({
-				type: "usage",
-				usage: this.#reportedUsage(active, result)
-			});
-		}
+	async #completeProgressSegment(active, result) {
 		if (!active.sawTextDelta && active.text.length === 0 && result.text !== void 0) {
 			active.text = result.text;
 			active.transcriptText = result.text;
@@ -2909,6 +2896,25 @@ var ClaudeSupervisor = class {
 		this.#closeTranscriptTextSegment(active);
 		active.thinking = "";
 	}
+	/** The turn's accounting, recorded once the turn is actually over.
+	*
+	*  A turn that hands off to background tasks passes through the same result
+	*  handling on its way to `waiting-tasks`, and recording there drew a closing
+	*  total under a turn that was still running. */
+	async #recordTurnUsage(active, result) {
+		if (result.usage.inputTokens === void 0 && result.usage.outputTokens === void 0 && result.usage.cumulativeCostUsd === void 0) return;
+		await this.#appendSafely(active, {
+			kind: "usage",
+			phase: "completed",
+			title: "Claude usage",
+			summary: usageSummary(result.usage),
+			usage: this.#timedUsage(active, result.usage)
+		});
+		active.output.push({
+			type: "usage",
+			usage: this.#reportedUsage(active, result)
+		});
+	}
 	async #completeTurn(entry, active, result) {
 		if (entry.active !== active) return;
 		if (active.aborted) {
@@ -2930,19 +2936,6 @@ var ClaudeSupervisor = class {
 			this.#scheduleLimitReconciliation();
 			return;
 		}
-		if (result.usage.inputTokens !== void 0 || result.usage.outputTokens !== void 0 || result.usage.cumulativeCostUsd !== void 0) {
-			await this.#appendSafely(active, {
-				kind: "usage",
-				phase: "completed",
-				title: "Claude usage",
-				summary: usageSummary(result.usage),
-				usage: this.#timedUsage(active, result.usage)
-			});
-			active.output.push({
-				type: "usage",
-				usage: this.#reportedUsage(active, result)
-			});
-		}
 		const unmatchedDenials = (result.permissionDenials ?? []).filter((denial) => !active.deniedToolUseIds.has(denial.toolUseId));
 		if (unmatchedDenials.length > 0) await this.#appendSafely(active, {
 			kind: "permission",
@@ -2951,6 +2944,7 @@ var ClaudeSupervisor = class {
 			summary: unmatchedDenials.map((denial) => denial.toolName).join(", ")
 		});
 		if (!result.success) {
+			await this.#recordTurnUsage(active, result);
 			if (!active.sawTextDelta && active.text.length === 0 && result.text !== void 0) {
 				active.text = result.text;
 				active.transcriptText = result.text;
@@ -2989,9 +2983,10 @@ var ClaudeSupervisor = class {
 					phase: "updated",
 					title: "Claude Code is waiting for background tasks"
 				});
-				await this.#completeProgressSegment(active, result, false);
+				await this.#completeProgressSegment(active, result);
 				return;
 			}
+			await this.#recordTurnUsage(active, result);
 			await this.#appendSafely(active, {
 				kind: "status",
 				phase: "completed",
@@ -4328,6 +4323,7 @@ const GIT_TIMEOUT_MS$3 = 5e3;
 const GH_TIMEOUT_MS$1 = 8e3;
 const CACHE_TTL_MS = 5e3;
 const MAX_TEXT_CHARS = 1024;
+const MAX_CONFLICT_PATHS = 100;
 function bounded(value) {
 	return value.trim().slice(0, MAX_TEXT_CHARS);
 }
@@ -4365,6 +4361,7 @@ function parseGitStatus(output) {
 	let upstream = false;
 	let ahead;
 	let behind;
+	const conflicts = [];
 	for (const line of output.split(/\r?\n/u)) {
 		if (line.startsWith("# branch.head ")) {
 			const head = bounded(line.slice(14));
@@ -4384,6 +4381,10 @@ function parseGitStatus(output) {
 			}
 			continue;
 		}
+		if (line.startsWith("u ")) {
+			const path = line.split(" ").slice(10).join(" ");
+			if (path.length > 0 && conflicts.length < MAX_CONFLICT_PATHS) conflicts.push(bounded(path));
+		}
 		if (line.length > 0 && !line.startsWith("# ")) dirty = true;
 	}
 	return {
@@ -4392,9 +4393,36 @@ function parseGitStatus(output) {
 		dirty,
 		upstream,
 		...ahead === void 0 ? {} : { ahead },
-		...behind === void 0 ? {} : { behind }
+		...behind === void 0 ? {} : { behind },
+		...conflicts.length === 0 ? {} : { conflicts }
 	};
 }
+/** Ordered so the rebase directories win: a conflicted rebase also writes
+*  MERGE_HEAD-like state, and the two are resumed by different commands. */
+const OPERATION_MARKERS = [
+	["rebase-merge", "rebase"],
+	["rebase-apply", "rebase"],
+	["MERGE_HEAD", "merge"],
+	["CHERRY_PICK_HEAD", "cherry-pick"],
+	["REVERT_HEAD", "revert"]
+];
+/** Reads the in-progress operation out of the worktree's own git dir -- linked
+*  worktrees keep their own, so this must not be handed the common dir. */
+async function detectRepositoryOperation(gitDir) {
+	for (const [marker, operation] of OPERATION_MARKERS) {
+		const path = join(gitDir, marker);
+		try {
+			await stat(path);
+		} catch {
+			continue;
+		}
+		const branch = bounded(operation === "rebase" ? await readFile(join(path, "head-name"), "utf8").catch(() => "") : "").replace(/^refs\/heads\//u, "");
+		return {
+			operation,
+			...branch.length === 0 || branch.includes(" ") ? {} : { branch }
+		};
+	}
+}
 function parseDiffNumstat(value) {
 	let additions = 0;
 	let deletions = 0;
@@ -4601,13 +4629,15 @@ var RepositoryStatusService = class {
 				cwd: safeCwd
 			};
 			const status = parseGitStatus(statusResult.stdout);
+			const operation = await detectRepositoryOperation(gitDir);
+			const branch = operation?.branch ?? status.branch;
 			const remoteResult = await run(this.#runtime, git, [
 				"remote",
 				"get-url",
 				"origin"
 			], cwd, GIT_TIMEOUT_MS$3);
 			const remote = remoteResult.exitCode === 0 ? parseGitHubRemote(remoteResult.stdout) : void 0;
-			const pullRequest = status.branch === void 0 || remote === void 0 ? void 0 : await this.#pullRequest(cwd, remote, status.branch);
+			const pullRequest = branch === void 0 || remote === void 0 ? void 0 : await this.#pullRequest(cwd, remote, branch);
 			const diffBase = pullRequest?.baseBranch === void 0 ? "HEAD" : await this.#mergeBase(cwd, git, pullRequest.baseBranch) ?? "HEAD";
 			const diff = status.dirty || diffBase !== "HEAD" ? await this.#diff(cwd, git, diffBase, signal) : {
 				additions: 0,
@@ -4621,6 +4651,8 @@ var RepositoryStatusService = class {
 				cwd: safeCwd,
 				root,
 				...status,
+				...branch === void 0 ? {} : { branch },
+				...operation === void 0 ? {} : { operation: operation.operation },
 				worktree: normalizedPath(gitDir) !== normalizedPath(commonDir),
 				...remote === void 0 ? {} : { remote },
 				...pullRequest === void 0 ? {} : { pullRequest },
@@ -5496,6 +5528,10 @@ function parseRepositoryActionStatus(output) {
 	}
 	return [...files.values()].sort((left, right) => left.path.localeCompare(right.path));
 }
+function conflictPaths(result) {
+	if (result.exitCode !== 0 || result.lossy) return [];
+	return result.stdout.split(/\r?\n/u).filter((line) => line.length > 0).slice(0, 100);
+}
 function fallbackCommitMessage(files) {
 	if (files.length === 1) return `Update ${files[0]?.path ?? "repository files"}`;
 	return `Update ${files.length} repository files`;
@@ -5560,6 +5596,7 @@ var RepositoryActionService = class {
 		return operation;
 	}
 	async #execute(cwd, request) {
+		if (request.action === "resolve-continue" || request.action === "resolve-abort") return this.#resolve(cwd, request.action, request.push === true);
 		const before = await this.#preview(cwd);
 		if (before.fingerprint !== request.fingerprint) throw new RepositoryActionError("repository-changed", "Repository changes have changed. Refresh the commit panel.");
 		if (request.action === "push") {
@@ -5622,13 +5659,12 @@ var RepositoryActionService = class {
 				`origin/${base}`
 			], before.root, REMOTE_TIMEOUT_MS);
 			if (merged.exitCode !== 0 || merged.lossy) {
-				const conflicted = await this.#run(git, [
+				const conflicts = conflictPaths(await this.#run(git, [
 					"diff",
 					"--name-only",
 					"--diff-filter=U",
 					"--"
-				], before.root, GIT_TIMEOUT_MS$1);
-				const conflicts = conflicted.exitCode === 0 && !conflicted.lossy ? conflicted.stdout.split(/\r?\n/u).filter((line) => line.length > 0).slice(0, 100) : [];
+				], before.root, GIT_TIMEOUT_MS$1));
 				if (conflicts.length === 0) {
 					await this.#run(git, [method, "--abort"], before.root, GIT_TIMEOUT_MS$1).catch(() => void 0);
 					throw new RepositoryActionError("merge-failed", `Git could not ${method} the base branch.`);
@@ -5727,6 +5763,87 @@ var RepositoryActionService = class {
 			pullRequestUrl: url
 		};
 	}
+	/** Finishes or discards the merge, rebase, cherry-pick or revert git is
+	*  waiting on. The operation is read from the git dir rather than taken from
+	*  the caller: `--continue` and `--abort` are only safe against the one that
+	*  is actually in progress. */
+	async #resolve(cwd, action, push) {
+		const git = await this.#git();
+		const [rootValue, gitDirValue] = (await this.#mustRun(git, [
+			"rev-parse",
+			"--path-format=absolute",
+			"--show-toplevel",
+			"--absolute-git-dir"
+		], cwd, GIT_TIMEOUT_MS$1, "not-repository", "The session directory is not a Git repository.")).stdout.split(/\r?\n/u);
+		const root = (rootValue ?? "").trim();
+		const gitDir = (gitDirValue ?? "").trim();
+		if (root.length === 0 || gitDir.length === 0) throw new RepositoryActionError("repository-unavailable", "Repository state is unavailable.");
+		const state = await detectRepositoryOperation(gitDir);
+		if (state === void 0) throw new RepositoryActionError("no-operation", "No merge, rebase, cherry-pick or revert is in progress.");
+		const operation = state.operation;
+		if (action === "resolve-abort") {
+			await this.#mustRun(git, [operation, "--abort"], root, GIT_TIMEOUT_MS$1, "abort-failed", `Git could not abort the ${operation}.`);
+			this.#invalidate(root);
+			return {
+				commit: await this.#head(git, root),
+				pushed: false
+			};
+		}
+		if (conflictPaths(await this.#run(git, [
+			"diff",
+			"--name-only",
+			"--diff-filter=U",
+			"--"
+		], root, GIT_TIMEOUT_MS$1)).length > 0) throw new RepositoryActionError("unresolved-conflicts", "Resolve and stage every conflicted file before continuing.");
+		const continued = await this.#run(git, [
+			"-c",
+			"core.editor=true",
+			operation,
+			"--continue"
+		], root, REMOTE_TIMEOUT_MS);
+		this.#invalidate(root);
+		if (continued.exitCode !== 0 || continued.lossy) {
+			const next = conflictPaths(await this.#run(git, [
+				"diff",
+				"--name-only",
+				"--diff-filter=U",
+				"--"
+			], root, GIT_TIMEOUT_MS$1));
+			if (next.length > 0) return {
+				commit: await this.#head(git, root),
+				pushed: false,
+				conflicts: next
+			};
+			const reason = continued.stderr.split(/\r?\n/u).map((line) => line.trim()).filter((line) => line.length > 0).at(-1);
+			throw new RepositoryActionError("continue-failed", reason === void 0 || reason.length === 0 ? `Git could not continue the ${operation}.` : reason);
+		}
+		const head = await this.#head(git, root);
+		if (!push) return {
+			commit: head,
+			pushed: false
+		};
+		const branch = await this.#run(git, [
+			"symbolic-ref",
+			"--quiet",
+			"--short",
+			"HEAD"
+		], root, GIT_TIMEOUT_MS$1);
+		if (branch.exitCode !== 0 || branch.lossy) throw new RepositoryActionError("detached-head", "The finished operation left a detached HEAD, so nothing was pushed.", head);
+		try {
+			await this.#push(git, root, branch.stdout.trim(), operation === "rebase");
+		} catch (error) {
+			throw new RepositoryActionError("push-failed", error instanceof Error ? error.message : "Git push failed.", head);
+		}
+		this.#invalidate(root);
+		return {
+			commit: head,
+			pushed: true
+		};
+	}
+	async #head(git, root) {
+		const head = await this.#run(git, ["rev-parse", "HEAD"], root, GIT_TIMEOUT_MS$1);
+		return head.exitCode === 0 && !head.lossy ? head.stdout.trim() : "";
+	}
 	async #preview(cwd) {
 		const git = await this.#git();
 		const root = (await this.#mustRun(git, [
@@ -6012,7 +6129,17 @@ const ACTIONS = /* @__PURE__ */ new Set([
 	"push",
 	"create-pr",
 	"merge-pr",
-	"update-branch"
+	"update-branch",
+	"resolve-continue",
+	"resolve-abort"
+]);
+/** Actions that commit nothing of their own, so the panel sends no message. */
+const MESSAGELESS = /* @__PURE__ */ new Set([
+	"push",
+	"merge-pr",
+	"update-branch",
+	"resolve-continue",
+	"resolve-abort"
 ]);
 function record$9(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
@@ -6051,7 +6178,7 @@ function actionRequest(input) {
 	return {
 		action,
 		fingerprint: string$1(input, "fingerprint"),
-		message: action === "push" || action === "merge-pr" || action === "update-branch" ? optionalString(input, "message") ?? "" : string$1(input, "message"),
+		message: MESSAGELESS.has(action) ? optionalString(input, "message") ?? "" : string$1(input, "message"),
 		includeUnstaged: input.includeUnstaged,
 		...optionalString(input, "prTitle") === void 0 ? {} : { prTitle: optionalString(input, "prTitle") },
 		...optionalString(input, "prBody") === void 0 ? {} : { prBody: optionalString(input, "prBody") },
@@ -6059,6 +6186,9 @@ function actionRequest(input) {
 		...input.draft === void 0 ? {} : typeof input.draft === "boolean" ? { draft: input.draft } : (() => {
 			throw new RepositoryActionError("invalid-request", "The draft field must be a boolean.");
 		})(),
+		...input.push === void 0 ? {} : typeof input.push === "boolean" ? { push: input.push } : (() => {
+			throw new RepositoryActionError("invalid-request", "The push field must be a boolean.");
+		})(),
 		...input.mergeMethod === void 0 ? {} : input.mergeMethod === "merge" || input.mergeMethod === "squash" || input.mergeMethod === "rebase" ? { mergeMethod: input.mergeMethod } : (() => {
 			throw new RepositoryActionError("invalid-request", "The mergeMethod field is invalid.");
 		})()