@gitkraken/core-gitlens 0.1.0 → 0.2.0

package/src/git-cli/providers/status.ts

@@ -142,7 +142,7 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 			);
 		}
 
-		return this.git.exec(
+		return this.git.run(
 			{
 				cwd: repoPath,
 				cancellation: cancellation,
@@ -168,7 +168,7 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 			const staged = options?.staged ?? true;
 			const unstaged = options?.unstaged ?? true;
 			if (staged || unstaged) {
-				const result = await this.git.exec(
+				const result = await this.git.run(
 					{ cwd: repoPath, cancellation: cancellation, errors: 'ignore' },
 					'diff',
 					'--quiet',
@@ -218,14 +218,14 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 		try {
 			const [stagedResult, unstagedResult, untrackedResult] = await Promise.allSettled([
 				// Check for staged changes
-				this.git.exec(
+				this.git.run(
 					{ cwd: repoPath, cancellation: cancellation, errors: 'ignore' },
 					'diff',
 					'--quiet',
 					'--staged',
 				),
 				// Check for unstaged changes
-				this.git.exec({ cwd: repoPath, cancellation: cancellation, errors: 'ignore' }, 'diff', '--quiet'),
+				this.git.run({ cwd: repoPath, cancellation: cancellation, errors: 'ignore' }, 'diff', '--quiet'),
 				// Check for untracked files
 				this.hasUntrackedFiles(repoPath, cancellation),
 			]);
@@ -279,7 +279,7 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 		const scope = getScopedLogger();
 
 		try {
-			const result = await this.git.exec(
+			const result = await this.git.run(
 				{ cwd: repoPath, cancellation: cancellation, errors: 'ignore' },
 				'ls-files',
 				'-z',
@@ -337,7 +337,7 @@ export class StatusGitSubProvider implements GitStatusSubProvider {
 		const scope = getScopedLogger();
 
 		try {
-			const result = await this.git.exec(
+			const result = await this.git.run(
 				{ cwd: repoPath, cancellation: cancellation, errors: 'ignore' },
 				'ls-files',
 				'-z',

package/src/git-cli/providers/tags.ts

@@ -56,7 +56,7 @@ export class TagsGitSubProvider implements GitTagsSubProvider {
 				try {
 					const parser = getTagParser();
 
-					const result = await this.git.exec(
+					const result = await this.git.run(
 						{ cwd: repoPath, cancellation: signal },
 						'for-each-ref',
 						...parser.arguments,
@@ -130,7 +130,7 @@ export class TagsGitSubProvider implements GitTagsSubProvider {
 		const params: string[] = ['tag', '--format=%(refname:short)'];
 		params.push(options?.mode === 'pointsAt' ? `--points-at=${sha}` : `--contains=${sha}`);
 
-		return this.git.exec(
+		return this.git.run(
 			{
 				cwd: repoPath,
 				cancellation: cancellation,
@@ -149,7 +149,7 @@ export class TagsGitSubProvider implements GitTagsSubProvider {
 		}
 
 		try {
-			await this.git.exec({ cwd: repoPath }, ...args);
+			await this.git.run({ cwd: repoPath }, ...args);
 			this.context.hooks?.cache?.onReset?.(repoPath, 'tags');
 			this.context.hooks?.repository?.onChanged?.(repoPath, ['tags']);
 		} catch (ex) {
@@ -170,7 +170,7 @@ export class TagsGitSubProvider implements GitTagsSubProvider {
 		const args = ['tag', '-d', name];
 
 		try {
-			await this.git.exec({ cwd: repoPath }, ...args);
+			await this.git.run({ cwd: repoPath }, ...args);
 			this.context.hooks?.cache?.onReset?.(repoPath, 'tags');
 			this.context.hooks?.repository?.onChanged?.(repoPath, ['tags']);
 		} catch (ex) {

package/src/git-cli/providers/worktrees.ts

@@ -49,7 +49,7 @@ export class WorktreesGitSubProvider implements GitWorktreesSubProvider {
 		}
 
 		try {
-			await this.git.exec({ cwd: repoPath }, ...args);
+			await this.git.run({ cwd: repoPath }, ...args);
 
 			this.context.hooks?.cache?.onReset?.(
 				repoPath,
@@ -106,7 +106,7 @@ export class WorktreesGitSubProvider implements GitWorktreesSubProvider {
 				// Prefer the aggregate signal from the cache; fall back to the caller's cancellation.
 				signal ??= cancellation;
 				const [dataResult, branchesResult] = await Promise.allSettled([
-					this.git.exec({ cwd: commonPath, cancellation: signal }, 'worktree', 'list', '--porcelain'),
+					this.git.run({ cwd: commonPath, cancellation: signal }, 'worktree', 'list', '--porcelain'),
 					this.provider.branches.getBranches(commonPath, undefined, signal),
 				]);
 
@@ -154,7 +154,7 @@ export class WorktreesGitSubProvider implements GitWorktreesSubProvider {
 
 		let deleted = false;
 		try {
-			await this.git.exec({ cwd: repoPath, errors: 'throw' }, ...args);
+			await this.git.run({ cwd: repoPath, errors: 'throw' }, ...args);
 			deleted = true;
 		} catch (ex) {
 			scope?.error(ex);

package/src/plus/ai/constants.ts

@@ -13,6 +13,7 @@ export type AIProviders =
 	| 'openai'
 	| 'openaicompatible'
 	| 'openrouter'
+	| 'simulator'
 	| 'vscode'
 	| 'xai';
 export type AIPrimaryProviders = Extract<AIProviders, 'gitkraken' | 'vscode'>;
@@ -119,3 +120,10 @@ export const ollamaProviderDescriptor: AIProviderDescriptor<'ollama'> = {
 	requiresAccount: true,
 	requiresUserKey: false,
 } as const;
+export const simulatorProviderDescriptor: AIProviderDescriptor<'simulator'> = {
+	id: 'simulator',
+	name: 'Simulator (Debugging)',
+	primary: false,
+	requiresAccount: false,
+	requiresUserKey: false,
+} as const;

package/src/plus/ai/models/model.ts

@@ -22,6 +22,7 @@ export interface AIModelDescriptor<Provider extends AIProviders = AIProviders, M
 
 export type AIActionType =
 	| 'explain-changes'
+	| 'review-changes'
 	| 'generate-commitMessage'
 	| 'generate-stashMessage'
 	| 'generate-changelog'

package/src/plus/ai/models/promptTemplates.ts

@@ -78,6 +78,26 @@ interface ReviewPullRequestPromptTemplateContext {
 	instructions?: string;
 }
 
+interface ReviewChangesPromptTemplateContext {
+	diff: string;
+	message: string;
+	instructions?: string;
+}
+
+interface ReviewOverviewPromptTemplateContext {
+	files: string;
+	message: string;
+	instructions?: string;
+}
+
+interface ReviewDetailPromptTemplateContext {
+	diff: string;
+	overview: string;
+	message: string;
+	focusArea: string;
+	instructions?: string;
+}
+
 interface StartWorkIssuePromptTemplateContext {
 	issue: string;
 	instructions?: string;
@@ -91,6 +111,9 @@ export type PromptTemplateType =
 	| 'generate-commits'
 	| 'generate-searchQuery'
 	| 'explain-changes'
+	| 'review-changes'
+	| 'review-overview'
+	| 'review-detail'
 	| 'start-review-pullRequest'
 	| 'start-work-issue';
 
@@ -115,6 +138,12 @@ export type PromptTemplateContext<T extends PromptTemplateType> = T extends 'gen
 	? SearchQueryPromptTemplateContext
 	: T extends 'explain-changes'
 	? ExplainChangesPromptTemplateContext
+	: T extends 'review-changes'
+	? ReviewChangesPromptTemplateContext
+	: T extends 'review-overview'
+	? ReviewOverviewPromptTemplateContext
+	: T extends 'review-detail'
+	? ReviewDetailPromptTemplateContext
 	: T extends 'start-review-pullRequest'
 	? ReviewPullRequestPromptTemplateContext
 	: T extends 'start-work-issue'

package/src/plus/ai/models/results.ts

@@ -1 +1,31 @@
 export type AISummarizedResult = { summary: string; body: string };
+
+export type AIReviewSeverity = 'critical' | 'warning' | 'suggestion';
+
+export interface AIReviewFinding {
+	readonly id: string;
+	readonly severity: AIReviewSeverity;
+	readonly title: string;
+	readonly description: string;
+	readonly filePath?: string;
+	readonly lineRange?: { readonly start: number; readonly end: number };
+}
+
+export interface AIReviewFocusArea {
+	readonly id: string;
+	readonly label: string;
+	readonly rationale: string;
+	readonly severity: AIReviewSeverity;
+	readonly files: readonly string[];
+	readonly findings?: readonly AIReviewFinding[];
+}
+
+export interface AIReviewResult {
+	readonly overview: string;
+	readonly focusAreas: readonly AIReviewFocusArea[];
+	readonly mode: 'single-pass' | 'two-pass';
+}
+
+export interface AIReviewDetailResult {
+	readonly findings: readonly AIReviewFinding[];
+}

package/src/plus/ai/prompts.ts

@@ -526,3 +526,132 @@ You can use GitKraken MCP tools to gather additional context about the repositor
 
 Now, proceed with your analysis and provide a comprehensive review of the PR. Return only the relevant information without any additional text.`,
 };
+
+export const reviewChanges: PromptTemplate<'review-changes'> = {
+	id: 'review-changes',
+	variables: ['diff', 'message', 'instructions'],
+	template: `You are an expert code reviewer analyzing a set of code changes. Your goal is to identify meaningful issues — bugs, logic errors, security vulnerabilities, missing error handling, and potential regressions — while ignoring style preferences and linter-level concerns. Focus on problems a careful human reviewer would catch.
+
+Examine the following code changes in Git diff format:
+<~~diff~~>
+\${diff}
+</~~diff~~>
+
+Author's description of the changes:
+<~~message~~>
+\${message}
+</~~message~~>
+
+Produce a structured review in the following XML format. Include ONLY the XML tags described — no other text:
+
+<overview>
+A concise 1-3 sentence summary of what these changes do and their overall quality. Note any systemic concerns.
+</overview>
+<focus-areas>
+<area severity="critical|warning|suggestion" files="comma-separated file paths">
+<label>Short title of the concern (under 60 chars)</label>
+<rationale>Why this matters — what could go wrong or what is suboptimal</rationale>
+<findings>
+<finding severity="critical|warning|suggestion" file="path/to/file.ts" lines="start-end">
+<title>Specific issue title</title>
+<description>Clear explanation of the problem and how to address it</description>
+</finding>
+</findings>
+</area>
+</focus-areas>
+
+Guidelines:
+- Severity levels: "critical" = bugs, security issues, data loss risks; "warning" = logic concerns, missing error handling, potential regressions; "suggestion" = improvements, maintainability, performance
+- Group related findings into focus areas by theme, not by file
+- If changes look correct and well-structured, say so in the overview and include zero focus areas
+- 3-5 high-quality findings are better than 15 low-quality ones
+- Reference specific lines from the diff when possible
+- Do not flag style issues, naming preferences, or things a linter would catch
+- Base conclusions only on the code shown — do not speculate about unseen code
+
+\${instructions}
+
+Review the changes and produce the structured XML output above.`,
+};
+
+export const reviewOverview: PromptTemplate<'review-overview'> = {
+	id: 'review-overview',
+	variables: ['files', 'message', 'instructions'],
+	template: `You are an expert code reviewer performing an initial assessment of a set of code changes. You are given a file manifest (not full diffs) — use the file paths, change types, and line counts to identify which areas deserve closer inspection.
+
+File manifest (JSON array of changed files):
+<~~files~~>
+\${files}
+</~~files~~>
+
+Author's description of the changes:
+<~~message~~>
+\${message}
+</~~message~~>
+
+Produce a structured assessment in the following XML format. Include ONLY the XML tags described — no other text:
+
+<overview>
+A concise 1-3 sentence summary of the scope and nature of these changes based on the file manifest and description.
+</overview>
+<focus-areas>
+<area severity="critical|warning|suggestion" files="comma-separated file paths">
+<label>Short title of the area to inspect (under 60 chars)</label>
+<rationale>Why this area deserves closer review — based on the types of files changed, the volume of changes, and potential risk</rationale>
+</area>
+</focus-areas>
+
+Guidelines:
+- Severity reflects potential risk: "critical" = security-sensitive files, auth/crypto/payment paths, database migrations; "warning" = core logic changes, API changes, large modifications; "suggestion" = refactoring, config changes, documentation
+- Rank focus areas from highest to lowest risk
+- Group related files into focus areas by theme
+- Include 2-6 focus areas. If changes are very simple, fewer is fine
+- Do NOT include <findings> — those come in a later pass when full diffs are available
+
+\${instructions}
+
+Assess the changes and produce the structured XML output above.`,
+};
+
+export const reviewDetail: PromptTemplate<'review-detail'> = {
+	id: 'review-detail',
+	variables: ['diff', 'overview', 'message', 'focusArea', 'instructions'],
+	template: `You are an expert code reviewer performing a detailed inspection of specific files that were flagged for closer review. You have the context from an initial overview assessment.
+
+Initial overview of the full changeset:
+<~~overview~~>
+\${overview}
+</~~overview~~>
+
+Focus area being inspected: \${focusArea}
+
+Author's description of the changes:
+<~~message~~>
+\${message}
+</~~message~~>
+
+Code changes for the files in this focus area (Git diff format):
+<~~diff~~>
+\${diff}
+</~~diff~~>
+
+Produce detailed findings in the following XML format. Include ONLY the XML tags — no other text:
+
+<findings>
+<finding severity="critical|warning|suggestion" file="path/to/file.ts" lines="start-end">
+<title>Specific issue title</title>
+<description>Clear explanation of the problem and how to address it</description>
+</finding>
+</findings>
+
+Guidelines:
+- Severity: "critical" = bugs, security, data loss; "warning" = logic concerns, error handling, regressions; "suggestion" = improvements, maintainability
+- Reference specific line numbers from the diff
+- Be concrete — explain what the problem is and how to fix it
+- If the code in this area looks correct, return an empty <findings></findings> block
+- Do not flag style issues or things a linter would catch
+
+\${instructions}
+
+Inspect the diff for this focus area and produce the structured XML findings above.`,
+};

package/src/plus/ai/utils/ai.utils.ts

@@ -4,6 +4,8 @@ export function getActionName(action: AIActionType): string {
 	switch (action) {
 		case 'explain-changes':
 			return 'Explain Changes';
+		case 'review-changes':
+			return 'Review Changes';
 		case 'generate-commitMessage':
 			return 'Generate Commit Message';
 		case 'generate-stashMessage':

package/src/plus/ai/utils/results.utils.ts

@@ -1,3 +1,11 @@
+import type {
+	AIReviewDetailResult,
+	AIReviewFinding,
+	AIReviewFocusArea,
+	AIReviewResult,
+	AIReviewSeverity,
+} from '../models/results.js';
+
 const summaryTagRegex = /<summary>([\s\S]*?)(?:<\/summary>|$)/;
 const bodyTagRegex = /<body>([\s\S]*?)(?:<\/body>|$)/;
 const codeBlockRegex = /```([\s\S]*?)```/;
@@ -48,3 +56,94 @@ export function splitMessageIntoSummaryAndBody(message: string): { readonly summ
 		body: message.substring(index + 1).trim(),
 	};
 }
+
+const overviewTagRegex = /<overview>([\s\S]*?)(?:<\/overview>|$)/;
+const areaTagRegex = /<area\s+([^>]*)>([\s\S]*?)(?:<\/area>|$)/g;
+const findingTagRegex = /<finding\s+([^>]*)>([\s\S]*?)(?:<\/finding>|$)/g;
+const labelTagRegex = /<label>([\s\S]*?)(?:<\/label>|$)/;
+const rationaleTagRegex = /<rationale>([\s\S]*?)(?:<\/rationale>|$)/;
+const titleTagRegex = /<title>([\s\S]*?)(?:<\/title>|$)/;
+const descriptionTagRegex = /<description>([\s\S]*?)(?:<\/description>|$)/;
+const findingsBlockRegex = /<findings>([\s\S]*?)(?:<\/findings>|$)/;
+
+function parseAttr(attrs: string, name: string): string | undefined {
+	const match = new RegExp(`${name}="([^"]*)"`, 'i').exec(attrs);
+	return match?.[1]?.trim() || undefined;
+}
+
+function parseSeverity(value: string | undefined): AIReviewSeverity {
+	if (value === 'critical' || value === 'warning' || value === 'suggestion') return value;
+	return 'suggestion';
+}
+
+function parseLineRange(value: string | undefined): { start: number; end: number } | undefined {
+	if (!value) return undefined;
+	const parts = value.split('-');
+	const start = parseInt(parts[0], 10);
+	if (isNaN(start)) return undefined;
+	const end = parts.length > 1 ? parseInt(parts[1], 10) : start;
+	return { start: start, end: isNaN(end) ? start : end };
+}
+
+function parseFindings(content: string, idPrefix: string): AIReviewFinding[] {
+	const findings: AIReviewFinding[] = [];
+	let findingIndex = 0;
+
+	for (const match of content.matchAll(findingTagRegex)) {
+		const attrs = match[1];
+		const inner = match[2];
+		findingIndex++;
+
+		findings.push({
+			id: `${idPrefix}-f${findingIndex}`,
+			severity: parseSeverity(parseAttr(attrs, 'severity')),
+			title: inner.match(titleTagRegex)?.[1]?.trim() ?? 'Untitled finding',
+			description: inner.match(descriptionTagRegex)?.[1]?.trim() ?? '',
+			filePath: parseAttr(attrs, 'file'),
+			lineRange: parseLineRange(parseAttr(attrs, 'lines')),
+		});
+	}
+
+	return findings;
+}
+
+export function parseReviewResult(result: string, mode: 'single-pass' | 'two-pass'): AIReviewResult {
+	result = result.trim();
+
+	const overview = result.match(overviewTagRegex)?.[1]?.trim() ?? '';
+
+	const focusAreas: AIReviewFocusArea[] = [];
+	let areaIndex = 0;
+
+	for (const match of result.matchAll(areaTagRegex)) {
+		const attrs = match[1];
+		const inner = match[2];
+		areaIndex++;
+
+		const id = `area-${areaIndex}`;
+		const filesAttr = parseAttr(attrs, 'files');
+
+		const findingsBlock = inner.match(findingsBlockRegex)?.[1];
+		const findings = findingsBlock ? parseFindings(findingsBlock, id) : undefined;
+
+		focusAreas.push({
+			id: id,
+			label: inner.match(labelTagRegex)?.[1]?.trim() ?? 'Untitled area',
+			rationale: inner.match(rationaleTagRegex)?.[1]?.trim() ?? '',
+			severity: parseSeverity(parseAttr(attrs, 'severity')),
+			files: filesAttr?.split(',').map(f => f.trim()) ?? [],
+			findings: findings,
+		});
+	}
+
+	return { overview: overview, focusAreas: focusAreas, mode: mode };
+}
+
+export function parseReviewDetailResult(result: string, focusAreaId: string): AIReviewDetailResult {
+	result = result.trim();
+
+	const findingsBlock = result.match(findingsBlockRegex)?.[1] ?? result;
+	const findings = parseFindings(findingsBlock, focusAreaId);
+
+	return { findings: findings };
+}

package/src/plus/ai/utils/truncation.utils.ts

@@ -52,7 +52,9 @@ type DiffTemplateType =
 	| 'generate-create-cloudPatch'
 	| 'generate-create-codeSuggestion'
 	| 'generate-create-pullRequest'
-	| 'explain-changes';
+	| 'explain-changes'
+	| 'review-changes'
+	| 'review-detail';
 
 /** File type base scores (0-100, higher = more important) */
 const fileTypeScores: Record<string, number> = {

package/src/plus/git-github/providers/github/branches.ts

@@ -8,6 +8,7 @@ import { debug } from '../../../../utils/decorators/log.js';
 import { getScopedLogger } from '../../../../utils/logger.scoped.js';
 import type { PagedResult, PagingOptions } from '../../../../utils/paging.js';
 import { emptyPagedResult } from '../../../../utils/paging.js';
+import { getSettledValue } from '../../../../utils/promise.js';
 import type { CacheController } from '../../../../utils/promiseCache.js';
 import { toTokenInfo } from '../../api/tokenUtils.js';
 import { HeadType } from '../../context.js';
@@ -206,6 +207,9 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 	): Promise<BranchContributionsOverview | undefined> {
 		const scope = getScopedLogger();
 
+		// No outer cache here — GitHub provider has no stored-target safety net (no Tier 1
+		// equivalent), so the result is purely PR-resolution-dependent and a `ref`-keyed cache
+		// would serve stale data when the PR is later retargeted.
 		try {
 			let mergeTarget: string | undefined;
 
@@ -223,11 +227,18 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 			const mergeBase = await this.provider.refs.getMergeBase(repoPath, ref, mergeTarget);
 			if (mergeBase == null) return undefined;
 
-			const result = await this.provider.contributors.getContributors(
-				repoPath,
-				createRevisionRange(mergeBase, ref, '..'),
-				{ stats: true },
-			);
+			// Fetch the merge-base commit's committer date in parallel with contributors so consumers
+			// that just need the date for the scope window don't pay a separate round-trip.
+			// `allSettled` so a transient failure in one side doesn't drop the overview entirely.
+			const [contributorsSettled, mergeBaseCommitSettled] = await Promise.allSettled([
+				this.provider.contributors.getContributors(repoPath, createRevisionRange(mergeBase, ref, '..'), {
+					stats: true,
+				}),
+				this.provider.commits.getCommit(repoPath, mergeBase),
+			]);
+
+			const result = getSettledValue(contributorsSettled) ?? { contributors: [] };
+			const mergeBaseCommit = getSettledValue(mergeBaseCommitSettled);
 
 			sortContributors(result.contributors, { orderBy: 'score:desc' });
 
@@ -265,6 +276,7 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 				branch: ref,
 				mergeTarget: mergeTarget,
 				mergeBase: mergeBase,
+				mergeBaseDate: mergeBaseCommit?.committer?.date ?? mergeBaseCommit?.author?.date,
 
 				commits: totalCommits,
 				files: totalFiles,

package/src/plus/git-github/providers/github/diff.ts

@@ -59,7 +59,7 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		repoPath: string,
 		to?: string,
 		_from?: string,
-		_options?: { uris?: (string | Uri)[] },
+		_options?: { uris?: (string | Uri)[]; includeUntracked?: boolean },
 		_cancellation?: AbortSignal,
 	): Promise<GitDiffShortStat | undefined> {
 		// TODO@eamodio if there is no ref we can't return anything, until we can get at the change store from RemoteHub
@@ -79,7 +79,13 @@ export class DiffGitSubProvider implements GitDiffSubProvider {
 		repoPath: string,
 		ref1OrRange: string | GitRevisionRange,
 		ref2?: string,
-		_options?: { filters?: GitDiffFilter[]; path?: string; renameLimit?: number; similarityThreshold?: number },
+		_options?: {
+			filters?: GitDiffFilter[];
+			includeUntracked?: boolean;
+			path?: string;
+			renameLimit?: number;
+			similarityThreshold?: number;
+		},
 	): Promise<GitFile[] | undefined> {
 		if (repoPath == null) return undefined;
 

package/src/utils/decorators/log.ts

@@ -265,7 +265,7 @@ function log<T extends (...arg: any[]) => any>(
 					}
 
 					if (result != null && isPromise(result)) {
-						result.then(logResult, logError);
+						void result.then(logResult, logError).catch(() => {});
 					} else {
 						logResult(result);
 					}

package/src/utils/decorators/sequentialize.ts

@@ -103,12 +103,14 @@ export function sequentialize<T extends (...args: any[]) => any>(
 			}
 
 			// Cleanup when done
-			void promise.finally(() => {
-				const s = this[prop];
-				if (s?.promise === promise && s.waiting == null) {
-					this[prop] = undefined;
-				}
-			});
+			void promise
+				.finally(() => {
+					const s = this[prop];
+					if (s?.promise === promise && s.waiting == null) {
+						this[prop] = undefined;
+					}
+				})
+				.catch(() => {});
 
 			return promise;
 		};

package/src/utils/env/node/base64.ts

@@ -5,7 +5,7 @@ export function base64(data: string | Uint8Array): string {
 }
 
 export function fromBase64(s: string): Uint8Array {
-	return Buffer.from(s, 'base64') as unknown as Uint8Array;
+	return Buffer.from(s, 'base64');
 }
 
 /**

package/src/utils/env/node/exec.ts

@@ -373,8 +373,8 @@ export function runSpawn<T extends string | Buffer>(
 		function getStdio<T>(
 			encoding: BufferEncoding | 'buffer' | string,
 		): { stdout: T; stderr: T } | Promise<{ stdout: T; stderr: T }> {
-			const stdout = Buffer.concat(stdoutBuffers as ReadonlyArray<Uint8Array>);
-			const stderr = Buffer.concat(stderrBuffers as ReadonlyArray<Uint8Array>);
+			const stdout = Buffer.concat(stdoutBuffers);
+			const stderr = Buffer.concat(stderrBuffers);
 			if (encoding === 'utf8' || encoding === 'binary') {
 				return { stdout: stdout.toString(encoding) as T, stderr: stderr.toString(encoding) as T };
 			}

package/src/utils/formatter.ts

@@ -176,23 +176,16 @@ export abstract class Formatter<Item = any, Options extends FormatOptions = Form
 			options.tokenOptions = tokenOptions;
 		}
 
-		if (this._formatter == null) {
-			this._formatter = new formatter(item, options);
-		} else {
-			this._formatter.reset(item, options);
-		}
-
-		return interpolateAsync(template, this._formatter);
+		// Always allocate a fresh formatter: `interpolateAsync` awaits between tokens, so a
+		// concurrent call that reset a shared instance would poison in-flight token resolution.
+		return interpolateAsync(template, new formatter(item, options));
 	}
 
 	static has<TOptions extends FormatOptions>(
 		template: string,
 		...tokens: (keyof NonNullable<TOptions['tokenOptions']>)[]
 	): boolean {
-		const token =
-			tokens.length === 1
-				? (tokens[0] as string)
-				: (`(${tokens.join('|')})` as keyof NonNullable<TOptions['tokenOptions']> as string);
+		const token = tokens.length === 1 ? (tokens[0] as string) : `(${tokens.join('|')})`;
 
 		let regex = hasTokenRegexMap.get(token);
 		if (regex == null) {

package/src/utils/iterable.ts

@@ -179,7 +179,7 @@ class FilterIterator<T, U extends T = T> implements IterableIterator<T | U> {
 			}
 
 			if (this.predicate === undefined ? result.value != null : this.predicate(result.value)) {
-				return { done: false, value: result.value as T | U };
+				return { done: false, value: result.value };
 			}
 		}
 	}