@gitkraken/core-gitlens 0.3.1 → 0.4.0

package/dist/utils/disposable.js.map

@@ -1 +1 @@
-{"version":3,"file":"disposable.js","sourceRoot":"","sources":["../../src/utils/disposable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"disposable.js","sourceRoot":"","sources":["../../src/utils/disposable.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@gitkraken/core-gitlens",
 	"description": "GitLens core — shared Git / AI / GitHub primitives for internal GitKraken consumption",
-	"version": "0.3.1",
+	"version": "0.4.0",
 	"license": "SEE LICENSE IN LICENSE",
 	"author": {
 		"name": "GitKraken",
@@ -138,6 +138,46 @@
 			"types": "./dist/plus/git-github/providers/github/*.d.ts",
 			"default": "./dist/plus/git-github/providers/github/*.js"
 		},
+		"./plus/integrations/*.js": {
+			"types": "./dist/plus/integrations/*.d.ts",
+			"default": "./dist/plus/integrations/*.js"
+		},
+		"./plus/integrations/authentication/*.js": {
+			"types": "./dist/plus/integrations/authentication/*.d.ts",
+			"default": "./dist/plus/integrations/authentication/*.js"
+		},
+		"./plus/integrations/models/*.js": {
+			"types": "./dist/plus/integrations/models/*.d.ts",
+			"default": "./dist/plus/integrations/models/*.js"
+		},
+		"./plus/integrations/providers/*.js": {
+			"types": "./dist/plus/integrations/providers/*.d.ts",
+			"default": "./dist/plus/integrations/providers/*.js"
+		},
+		"./plus/integrations/providers/azure/*.js": {
+			"types": "./dist/plus/integrations/providers/azure/*.d.ts",
+			"default": "./dist/plus/integrations/providers/azure/*.js"
+		},
+		"./plus/integrations/providers/bitbucket-server/*.js": {
+			"types": "./dist/plus/integrations/providers/bitbucket-server/*.d.ts",
+			"default": "./dist/plus/integrations/providers/bitbucket-server/*.js"
+		},
+		"./plus/integrations/providers/bitbucket/*.js": {
+			"types": "./dist/plus/integrations/providers/bitbucket/*.d.ts",
+			"default": "./dist/plus/integrations/providers/bitbucket/*.js"
+		},
+		"./plus/integrations/providers/github/*.js": {
+			"types": "./dist/plus/integrations/providers/github/*.d.ts",
+			"default": "./dist/plus/integrations/providers/github/*.js"
+		},
+		"./plus/integrations/providers/gitlab/*.js": {
+			"types": "./dist/plus/integrations/providers/gitlab/*.d.ts",
+			"default": "./dist/plus/integrations/providers/gitlab/*.js"
+		},
+		"./plus/integrations/utils/*.js": {
+			"types": "./dist/plus/integrations/utils/*.d.ts",
+			"default": "./dist/plus/integrations/utils/*.js"
+		},
 		"./utils/*.js": {
 			"types": "./dist/utils/*.d.ts",
 			"default": "./dist/utils/*.js"
@@ -156,8 +196,9 @@
 		}
 	},
 	"dependencies": {
+		"@gitkraken/provider-apis": "0.40.0",
 		"@octokit/graphql": "9.0.3",
-		"@octokit/request": "10.0.8",
+		"@octokit/request": "10.0.10",
 		"@octokit/request-error": "7.1.0",
 		"@octokit/types": "16.0.0",
 		"fast-string-truncated-width": "3.0.3",

package/src/git/context.ts

@@ -137,9 +137,10 @@ export interface GitServiceHooks {
 		/**
 		 * Called when a commit is signed successfully.
 		 *
-		 * Note: currently fired only from explicit-sign paths in the patch provider
-		 * (where signing is requested via `-S` and confirmed up front). Operations
-		 * that sign implicitly via `commit.gpgsign=true` (`commit`, `merge`, `pull`,
+		 * Note: currently fired only from explicit-sign paths — the patch provider's
+		 * `commit-tree -S` and the commit operation when the host signing override
+		 * (`config.signing.enabled`) adds `-S`. Operations that sign implicitly via
+		 * `commit.gpgsign=true` (`commit` without the override, `merge`, `pull`,
 		 * `rebase`, `revert`, `cherryPick`) do not fire this hook because the
 		 * library cannot cheaply confirm that signing actually occurred without an
 		 * extra `git config`/`log --show-signature` call.

package/src/git/providers/operations.ts

@@ -28,7 +28,7 @@ export interface GitOperationsSubProvider {
 	checkout(
 		repoPath: string,
 		ref: string,
-		options?: { createBranch?: string | undefined },
+		options?: { createBranch?: string | undefined; noTracking?: boolean },
 		runOptions?: GitOperationRunOptions,
 	): Promise<void>;
 	cherryPick(

package/src/git/providers/worktrees.ts

@@ -5,12 +5,24 @@ export interface GitWorktreesSubProvider {
 	createWorktree(
 		repoPath: string,
 		path: string,
-		options?: { commitish?: string; createBranch?: string; detach?: boolean; force?: boolean },
+		options?: {
+			commitish?: string;
+			createBranch?: string;
+			detach?: boolean;
+			force?: boolean;
+			noTracking?: boolean;
+		},
 	): Promise<void>;
 	createWorktreeWithResult(
 		repoPath: string,
 		path: string,
-		options?: { commitish?: string; createBranch?: string; detach?: boolean; force?: boolean },
+		options?: {
+			commitish?: string;
+			createBranch?: string;
+			detach?: boolean;
+			force?: boolean;
+			noTracking?: boolean;
+		},
 	): Promise<GitWorktree | undefined>;
 	getWorktree(
 		repoPath: string,

package/src/git/utils/conflictResolution.utils.ts

@@ -2,6 +2,71 @@ import type { GitFileConflictStatus } from '../models/fileStatus.js';
 
 export type ConflictResolutionAction = 'take-ours' | 'take-theirs' | 'delete' | 'unsupported';
 
+/**
+ * A richer description of a conflict than the raw XY status code — used to label conflicts the
+ * AI text resolver can't parse (binary, symlink, submodule, mode-only, add/add) and to surface
+ * rename conflicts. Derived by {@link classifyConflictKind} from the XY status plus, when
+ * available, the per-stage file modes/oids and rename/binary hints the caller computes.
+ */
+export type ConflictKind =
+	| 'text'
+	| 'binary'
+	| 'symlink'
+	| 'submodule'
+	| 'mode-only'
+	| 'add-add'
+	| 'delete-modify'
+	| 'both-deleted'
+	| 'rename-rename'
+	| 'rename-delete'
+	| 'rename-modify'
+	| 'unknown';
+
+export type ConflictRenameKind = 'rename-rename' | 'rename-delete' | 'rename-modify';
+
+const symlinkMode = '120000';
+const submoduleMode = '160000';
+
+/**
+ * Classifies a conflict into a {@link ConflictKind}. Pure — all detection that needs git/IO
+ * (rename correlation, binary sniffing) is computed by the caller and passed via `hints`. When
+ * `modes`/`oids` are omitted (e.g. a webview caller that only has the XY status), it still returns
+ * a useful coarse kind; pass the per-stage data for the fine-grained symlink/submodule/mode-only split.
+ */
+export function classifyConflictKind(
+	status: GitFileConflictStatus,
+	modes?: { base?: string; current?: string; incoming?: string },
+	oids?: { base?: string; current?: string; incoming?: string },
+	hints?: { binary?: boolean; rename?: ConflictRenameKind },
+): ConflictKind {
+	if (hints?.rename != null) return hints.rename;
+
+	if (status === 'DD') return 'both-deleted';
+	if (status === 'UD' || status === 'DU') return 'delete-modify';
+
+	const presentModes = [modes?.current, modes?.incoming, modes?.base].filter((m): m is string => m != null);
+	if (presentModes.includes(submoduleMode)) return 'submodule';
+	if (presentModes.includes(symlinkMode)) return 'symlink';
+
+	if (hints?.binary) return 'binary';
+
+	// Both sides present with identical content (same oid) but different mode → only the file mode
+	// conflicts (e.g. one side flipped the executable bit).
+	if (
+		modes?.current != null &&
+		modes?.incoming != null &&
+		modes.current !== modes.incoming &&
+		oids?.current != null &&
+		oids.current === oids?.incoming
+	) {
+		return 'mode-only';
+	}
+
+	if (status === 'AA' || status === 'AU' || status === 'UA') return 'add-add';
+
+	return 'text';
+}
+
 export function classifyConflictAction(
 	status: GitFileConflictStatus,
 	resolution: 'current' | 'incoming',
@@ -29,3 +94,64 @@ export function canStageCurrent(status: GitFileConflictStatus): boolean {
 export function canStageIncoming(status: GitFileConflictStatus): boolean {
 	return status !== 'AU' && status !== 'DD';
 }
+
+/** A short label + one-line description for a {@link ConflictKind}, used to explain conflicts the AI
+ *  resolver can't auto-merge (and rename conflicts) wherever they're surfaced. */
+export function getConflictKindLabel(kind: ConflictKind, renameOf?: string): { label: string; description: string } {
+	const named = renameOf ? `"${renameOf}"` : 'The file';
+	switch (kind) {
+		case 'binary':
+			return {
+				label: 'Binary conflict',
+				description: 'Binary file changed on both sides — choose a side to keep',
+			};
+		case 'symlink':
+			return {
+				label: 'Symlink conflict',
+				description: 'Symbolic link changed on both sides — choose a side to keep',
+			};
+		case 'submodule':
+			return {
+				label: 'Submodule conflict',
+				description: 'Submodule reference changed on both sides — choose a side to keep',
+			};
+		case 'mode-only':
+			return {
+				label: 'File mode conflict',
+				description: 'Only the file mode differs (e.g. the executable bit) — choose a side to keep',
+			};
+		case 'add-add':
+			// Covers AA (added on both sides) as well as AU/UA (added on one side) — keep the wording
+			// accurate for all three rather than asserting "both sides".
+			return {
+				label: 'Add conflict',
+				description: 'Conflicting file additions — choose a side to keep',
+			};
+		case 'delete-modify':
+			return {
+				label: 'Modified and deleted',
+				description: 'Deleted on one side and modified on the other — keep the file or delete it',
+			};
+		case 'both-deleted':
+			return { label: 'Deleted on both sides', description: 'Deleted on both sides — confirm the deletion' };
+		case 'rename-rename':
+			return {
+				label: 'Renamed differently',
+				description: `${named} was renamed differently on each side — choose which name to keep`,
+			};
+		case 'rename-delete':
+			return {
+				label: 'Renamed and deleted',
+				description: `${named} was renamed on one side and deleted on the other — keep the file or delete it`,
+			};
+		case 'rename-modify':
+			return {
+				label: 'Renamed and modified',
+				description: `${named} was renamed on one side and modified on the other`,
+			};
+		case 'text':
+			return { label: 'Text conflict', description: 'Conflicting changes on both sides' };
+		default:
+			return { label: 'Conflict', description: 'Resolve this conflict manually' };
+	}
+}

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

@@ -52,14 +52,18 @@ export class OperationsGitSubProvider implements GitOperationsSubProvider {
 	async checkout(
 		repoPath: string,
 		ref: string,
-		options?: { createBranch?: string },
+		options?: { createBranch?: string; noTracking?: boolean },
 		runOptions?: GitOperationRunOptions,
 	): Promise<void> {
 		const scope = getScopedLogger();
 
 		const params = ['checkout'];
 		if (options?.createBranch) {
-			params.push('-b', options.createBranch, ref, '--');
+			params.push('-b', options.createBranch);
+			if (options.noTracking) {
+				params.push('--no-track');
+			}
+			params.push(ref, '--');
 		} else {
 			params.push(ref, '--');
 		}
@@ -183,6 +187,13 @@ export class OperationsGitSubProvider implements GitOperationsSubProvider {
 		if (options?.date) {
 			params.push(`--date=${options.date}`);
 		}
+		// Host-level override (e.g. VS Code's `git.enableCommitSigning`) — request signing explicitly
+		// via `-S`. Implicit repo-config signing (`commit.gpgsign=true`) needs no flag, and `-S`
+		// alongside it is harmless, so the override can only enable signing, never force it off.
+		const sign = this.context.config?.signing?.enabled === true;
+		if (sign) {
+			params.push('-S');
+		}
 		// Read commit message from stdin via -F - to avoid shell escaping issues
 		params.push('-F', '-');
 
@@ -193,6 +204,15 @@ export class OperationsGitSubProvider implements GitOperationsSubProvider {
 			);
 			this.context.hooks?.cache?.onReset?.(repoPath, 'branches', 'status');
 			this.context.hooks?.repository?.onChanged?.(repoPath, ['head', 'heads', 'index']);
+			if (sign) {
+				// `-S` was passed and the commit succeeded, so signing is confirmed — fire the
+				// explicit-sign hook (same contract as the patch provider's `commit-tree -S` path).
+				let format: SigningFormat | undefined;
+				try {
+					format = (await this.provider.config.getSigningConfig?.(repoPath))?.format;
+				} catch {}
+				this.context.hooks?.commits?.onSigned?.(format ?? 'gpg', options?.source);
+			}
 		} catch (ex) {
 			scope?.error(ex);
 			await this.throwIfSigningError(repoPath, params, ex, options?.source);

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

@@ -29,7 +29,13 @@ export class WorktreesGitSubProvider implements GitWorktreesSubProvider {
 	async createWorktree(
 		repoPath: string,
 		path: string,
-		options?: { commitish?: string; createBranch?: string; detach?: boolean; force?: boolean },
+		options?: {
+			commitish?: string;
+			createBranch?: string;
+			detach?: boolean;
+			force?: boolean;
+			noTracking?: boolean;
+		},
 	): Promise<void> {
 		const scope = getScopedLogger();
 
@@ -40,6 +46,9 @@ export class WorktreesGitSubProvider implements GitWorktreesSubProvider {
 		if (options?.createBranch) {
 			args.push('-b', options.createBranch);
 		}
+		if (options?.createBranch && options.noTracking) {
+			args.push('--no-track');
+		}
 		if (options?.detach) {
 			args.push('--detach');
 		}
@@ -76,7 +85,13 @@ export class WorktreesGitSubProvider implements GitWorktreesSubProvider {
 	async createWorktreeWithResult(
 		repoPath: string,
 		path: string,
-		options?: { commitish?: string; createBranch?: string; detach?: boolean; force?: boolean },
+		options?: {
+			commitish?: string;
+			createBranch?: string;
+			detach?: boolean;
+			force?: boolean;
+			noTracking?: boolean;
+		},
 	): Promise<GitWorktree | undefined> {
 		await this.createWorktree(repoPath, path, options);
 		const normalized = normalizePath(path);

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

@@ -11,19 +11,19 @@ export function getActionName(action: AIActionType): string {
 		case 'generate-stashMessage':
 			return 'Generate Stash Message';
 		case 'generate-changelog':
-			return 'Generate Changelog (Preview)';
+			return 'Generate Changelog';
 		case 'generate-create-cloudPatch':
 			return 'Create Cloud Patch Details';
 		case 'generate-create-codeSuggestion':
 			return 'Create Code Suggestion Details';
 		case 'generate-create-pullRequest':
-			return 'Create Pull Request Details (Preview)';
+			return 'Create Pull Request Details';
 		case 'generate-commits':
-			return 'Generate Commits (Preview)';
+			return 'Generate Commits';
 		case 'conflict-resolution':
-			return 'Resolve Conflicts with AI (Preview)';
+			return 'Resolve Conflicts (Preview)';
 		case 'generate-searchQuery':
-			return 'Generate Search Query (Preview)';
+			return 'Generate Search Query';
 	}
 }
 

package/src/plus/git-github/api/github.ts

@@ -66,11 +66,6 @@ import {
 import type { GitHubApiConfig } from './config.js';
 import type { GitHubTokenInfo } from './token.js';
 
-interface CancellationToken {
-	isCancellationRequested: boolean;
-	onCancellationRequested(fn: () => void): { dispose(): void };
-}
-
 const emptyPagedResult: PagedResult<any> = Object.freeze({ values: [] });
 const emptyBlameResult: GitHubBlame = Object.freeze({ ranges: [] });
 
@@ -959,7 +954,7 @@ export class GitHubApi {
 			baseUrl?: string;
 			avatarSize?: number;
 		},
-		cancellation?: CancellationToken,
+		cancellation?: AbortSignal,
 	): Promise<PullRequest | undefined> {
 		const scope = getScopedLogger();
 
@@ -1049,7 +1044,7 @@ export class GitHubApi {
 		options?: {
 			baseUrl?: string;
 		},
-		cancellation?: CancellationToken,
+		cancellation?: AbortSignal,
 	): Promise<RepositoryMetadata | undefined> {
 		const scope = getScopedLogger();
 
@@ -2965,10 +2960,9 @@ export class GitHubApi {
 		query: string,
 		variables: RequestParameters,
 		scope: ScopedLogger | undefined,
-		cancellation?: CancellationToken | undefined,
+		cancellation?: AbortSignal | undefined,
 	): Promise<T | undefined> {
 		const { accessToken, ...tokenInfo } = token;
-
 		// Only dedupe when no cancellation/request option is in play — sharing a promise that
 		// carries one caller's AbortSignal would let one cancellation cancel for everyone.
 		const dedupable = cancellation == null && variables?.request == null;
@@ -2988,16 +2982,12 @@ export class GitHubApi {
 
 		const run = async (): Promise<T | undefined> => {
 			try {
-				let aborter: AbortController | undefined;
 				if (cancellation != null) {
-					if (cancellation.isCancellationRequested) throw new CancellationError();
-
-					aborter = new AbortController();
-					cancellation.onCancellationRequested(() => aborter!.abort());
+					if (cancellation.aborted) throw new CancellationError();
 
 					variables = {
 						...variables,
-						request: { ...variables?.request, signal: aborter.signal },
+						request: { ...variables?.request, signal: cancellation },
 					};
 				}
 
@@ -3010,7 +3000,7 @@ export class GitHubApi {
 							this.getDefaults(accessToken, graphql)(query, variables),
 						),
 					retryable,
-					aborter?.signal,
+					cancellation,
 					scope,
 				);
 			} catch (ex) {
@@ -3071,17 +3061,15 @@ export class GitHubApi {
 		route: R,
 		options: (Endpoints[R]['parameters'] & RequestParameters) | undefined,
 		scope: ScopedLogger | undefined,
-		cancellation?: CancellationToken | undefined,
+		cancellation?: AbortSignal | undefined,
 	): Promise<Endpoints[R]['response']> {
 		const { accessToken } = token;
 		try {
 			let signal: AbortSignal | undefined;
 			if (cancellation != null) {
-				if (cancellation.isCancellationRequested) throw new CancellationError();
+				if (cancellation.aborted) throw new CancellationError();
 
-				const aborter = new AbortController();
-				cancellation.onCancellationRequested(() => aborter.abort());
-				signal = aborter.signal;
+				signal = cancellation;
 				options = { ...options, request: { ...options?.request, signal: signal } };
 			}
 
@@ -3330,7 +3318,7 @@ export class GitHubApi {
 			avatarSize?: number;
 			silent?: boolean;
 		},
-		cancellation?: CancellationToken,
+		cancellation?: AbortSignal,
 	): Promise<PullRequest[]> {
 		const scope = getScopedLogger();
 
@@ -3445,7 +3433,7 @@ export class GitHubApi {
 			avatarSize?: number;
 			includeBody?: boolean;
 		},
-		cancellation?: CancellationToken,
+		cancellation?: AbortSignal,
 	): Promise<IssueShape[] | undefined> {
 		const scope = getScopedLogger();
 
@@ -3548,7 +3536,7 @@ export class GitHubApi {
 		provider: Provider,
 		token: GitHubTokenInfo,
 		options?: { search?: string; user?: string; repos?: string[]; baseUrl?: string; avatarSize?: number },
-		cancellation?: CancellationToken,
+		cancellation?: AbortSignal,
 	): Promise<PullRequest[]> {
 		const scope = getScopedLogger();
 
@@ -3618,7 +3606,7 @@ export class GitHubApi {
 		nodeId: string,
 		expectedSourceSha: string,
 		options?: { mergeMethod?: PullRequestMergeMethod; baseUrl?: string },
-		cancellation?: CancellationToken,
+		cancellation?: AbortSignal,
 	): Promise<boolean> {
 		const scope = getScopedLogger();
 		interface QueryResult {

package/src/plus/integrations/authentication/cloudIntegrationService.ts

@@ -0,0 +1,120 @@
+import { getScopedLogger } from '../../../utils/logger.scoped.js';
+import type { IntegrationIds } from '../constants.js';
+import type { IntegrationServiceContext } from '../context.js';
+import type { CloudIntegrationAuthenticationSession, CloudIntegrationConnection } from './models.js';
+import { toCloudIntegrationType } from './models.js';
+
+export class CloudIntegrationService {
+	constructor(private readonly ctx: IntegrationServiceContext) {}
+
+	async getConnections(): Promise<CloudIntegrationConnection[] | undefined> {
+		const scope = getScopedLogger();
+
+		const providersRsp = await this.ctx.account.fetchGkApi('v1/provider-tokens', { method: 'GET' });
+		if (!providersRsp.ok) {
+			const error = ((await providersRsp.json()) as { error?: unknown })?.error;
+			const errorMessage =
+				typeof error === 'string'
+					? error
+					: ((error as { message?: string })?.message ?? providersRsp.statusText);
+			if (error != null) {
+				scope?.error(undefined, `Failed to get connected providers from cloud: ${errorMessage}`);
+			}
+			this.ctx.hooks?.connection?.onConnectionsFetchFailed?.({ code: providersRsp.status });
+			return undefined;
+		}
+
+		return ((await providersRsp.json()) as { data?: unknown })?.data as CloudIntegrationConnection[] | undefined;
+	}
+
+	async getConnectionSession(
+		id: IntegrationIds,
+		refreshToken?: string,
+	): Promise<CloudIntegrationAuthenticationSession | undefined> {
+		const scope = getScopedLogger();
+
+		const refresh = Boolean(refreshToken);
+		const cloudIntegrationType = toCloudIntegrationType[id];
+		if (cloudIntegrationType == null) {
+			scope?.error(undefined, `Unsupported cloud integration type: ${id}`);
+			return undefined;
+		}
+
+		const reqInitOptions = refreshToken
+			? {
+					method: 'POST',
+					body: JSON.stringify({
+						access_token: refreshToken,
+					}),
+				}
+			: { method: 'GET' };
+
+		const tokenRsp = await this.ctx.account.fetchGkApi(
+			`v1/provider-tokens/${cloudIntegrationType}${refresh ? '/refresh' : ''}`,
+			reqInitOptions,
+		);
+		if (!tokenRsp.ok) {
+			const error = ((await tokenRsp.json()) as { error?: unknown })?.error;
+			const errorMessage =
+				typeof error === 'string' ? error : ((error as { message?: string })?.message ?? tokenRsp.statusText);
+			if (error != null) {
+				scope?.error(
+					undefined,
+					`Failed to ${refresh ? 'refresh' : 'get'} ${id} token from cloud: ${errorMessage}`,
+				);
+			}
+			this.ctx.hooks?.connection?.onConnectionFetchFailed?.({
+				id: id,
+				code: tokenRsp.status,
+				refreshing: refresh,
+			});
+
+			if (refresh) {
+				// try once to just get the latest token if the refresh fails, and give up if that fails too
+				const newTokenRsp = await this.ctx.account.fetchGkApi(`v1/provider-tokens/${cloudIntegrationType}`, {
+					method: 'GET',
+				});
+				if (newTokenRsp.ok) {
+					return ((await newTokenRsp.json()) as { data?: unknown })?.data as
+						| CloudIntegrationAuthenticationSession
+						| undefined;
+				}
+			}
+
+			return undefined;
+		}
+
+		return ((await tokenRsp.json()) as { data?: unknown })?.data as
+			| CloudIntegrationAuthenticationSession
+			| undefined;
+	}
+
+	async disconnect(id: IntegrationIds): Promise<boolean> {
+		const scope = getScopedLogger();
+
+		const cloudIntegrationType = toCloudIntegrationType[id];
+		if (cloudIntegrationType == null) {
+			scope?.error(undefined, `Unsupported cloud integration type: ${id}`);
+			return false;
+		}
+
+		const tokenRsp = await this.ctx.account.fetchGkApi(`v1/provider-tokens/${cloudIntegrationType}`, {
+			method: 'DELETE',
+		});
+		if (!tokenRsp.ok) {
+			const error = ((await tokenRsp.json()) as { error?: unknown })?.error;
+			const errorMessage =
+				typeof error === 'string' ? error : ((error as { message?: string })?.message ?? tokenRsp.statusText);
+			if (error != null) {
+				scope?.error(undefined, `Failed to disconnect ${id} token from cloud: ${errorMessage}`);
+			}
+			this.ctx.hooks?.connection?.onDisconnectFailed?.({
+				id: id,
+				code: tokenRsp.status,
+			});
+			return false;
+		}
+
+		return true;
+	}
+}