@gitkraken/core-gitlens 0.7.1 → 0.8.0

package/dist/git-cli/exec/gitQueue.js.map

@@ -1 +1 @@
-{"version":3,"file":"gitQueue.js","names":[],"sources":["../../../../git-cli/src/exec/gitQueue.ts"],"sourcesContent":["import type { GitCommandPriority } from './exec.types.js';\n\ninterface QueuedCommand {\n\trun: () => Promise<unknown>;\n\tresolve: (value: unknown) => void;\n\treject: (reason: unknown) => void;\n\tqueuedAt: number;\n\tpriority: GitCommandPriority;\n\tsignal?: AbortSignal;\n\tabortHandler?: () => void;\n}\n\n/** Priority levels in descending order (highest first) */\nconst priorities: GitCommandPriority[] = ['interactive', 'normal', 'background'];\n\n/** How many extra slots interactive commands can use when at capacity */\nconst interactiveBurstCapacity = 2;\n\nfunction abortReason(signal: AbortSignal): Error {\n\treturn signal.reason instanceof Error ? signal.reason : new Error('Aborted');\n}\n\nexport interface GitQueueConfig {\n\t/** Maximum number of concurrent git processes. Defaults to 7. */\n\tmaxConcurrent?: number;\n\t/** Maximum number of queued commands per priority level. Defaults to 500. Set to 0 to disable. */\n\tmaxQueueDepth?: number;\n}\n\nexport interface GitQueueHooks {\n\t/** Called when a queued command waited longer than 1 second before executing */\n\tonSlowQueue?(info: {\n\t\tpriority: GitCommandPriority;\n\t\twaitTime: number;\n\t\tactive: number;\n\t\tqueued: Record<GitCommandPriority, number>;\n\t\tmaxConcurrent: number;\n\t}): void;\n}\n\n/**\n * Priority-based concurrent queue for git command execution.\n *\n * Implements a multi-level feedback queue with:\n * - Configurable max concurrent processes\n * - Strict priority ordering (interactive > normal > background)\n * - Burst capacity for interactive commands under pressure\n *\n * Capacity rules (with limit N, burst B=2):\n * - All priorities share N slots normally\n * - When at capacity, interactive can burst up to N+B total\n *\n * Scheduling rules:\n * - Higher priority preempts: if interactive is waiting, normal/background queue\n * - Lower priority yields: background won't run if normal is waiting\n */\nexport class GitQueue {\n\tprivate readonly _queues = new Map<GitCommandPriority, QueuedCommand[]>([\n\t\t['interactive', []],\n\t\t['normal', []],\n\t\t['background', []],\n\t]);\n\n\tprivate _activeCount = 0;\n\tprivate _disposed = false;\n\n\tconstructor(\n\t\tprivate readonly _config: GitQueueConfig = {},\n\t\tprivate readonly _hooks: GitQueueHooks = {},\n\t) {}\n\n\tdispose(): void {\n\t\tthis._disposed = true;\n\t\tfor (const queue of this._queues.values()) {\n\t\t\tfor (const cmd of queue) {\n\t\t\t\tif (cmd.signal != null && cmd.abortHandler != null) {\n\t\t\t\t\tcmd.signal.removeEventListener('abort', cmd.abortHandler);\n\t\t\t\t}\n\t\t\t\tcmd.reject(new Error('GitQueue disposed'));\n\t\t\t}\n\t\t\tqueue.length = 0;\n\t\t}\n\t}\n\n\t/** Get the configured max concurrent processes */\n\tprivate get maxConcurrent(): number {\n\t\treturn this._config.maxConcurrent ?? 7;\n\t}\n\n\t/** Update configuration (e.g., when user changes settings) */\n\tupdateConfig(config: Partial<GitQueueConfig>): void {\n\t\tif (config.maxConcurrent != null && config.maxConcurrent > 0) {\n\t\t\tthis._config.maxConcurrent = config.maxConcurrent;\n\t\t}\n\t\tif (config.maxQueueDepth != null && config.maxQueueDepth > 0) {\n\t\t\tthis._config.maxQueueDepth = config.maxQueueDepth;\n\t\t}\n\t}\n\n\t/** Check if a command at the given priority can execute immediately */\n\tprivate canRunNow(priority: GitCommandPriority): boolean {\n\t\t// Must yield to higher priority waiting\n\t\tif (this.hasHigherPriorityWaiting(priority)) return false;\n\n\t\tconst max = this.maxConcurrent;\n\n\t\t// Under normal limit - all priorities can run\n\t\tif (this._activeCount < max) return true;\n\n\t\t// At or over normal limit - only interactive can burst\n\t\tif (priority === 'interactive' && this._activeCount < max + interactiveBurstCapacity) {\n\t\t\treturn true;\n\t\t}\n\n\t\treturn false;\n\t}\n\n\t/** Check if any higher-priority commands are waiting */\n\tprivate hasHigherPriorityWaiting(priority: GitCommandPriority): boolean {\n\t\tfor (const p of priorities) {\n\t\t\tif (p === priority) return false;\n\t\t\tif (this._queues.get(p)!.length > 0) return true;\n\t\t}\n\t\treturn false;\n\t}\n\n\t/**\n\t * Execute a git command with the specified priority.\n\t *\n\t * When `signal` is provided:\n\t * - If already aborted, rejects immediately without running.\n\t * - If aborted while queued, the command is removed from the queue and rejected before it ever runs.\n\t * - If aborted while running, the in-flight spawn must honor the same signal separately\n\t *   (callers pass it via `runOpts.cancellation`); the queue does not interrupt running work.\n\t */\n\trun<T>(priority: GitCommandPriority, fn: () => Promise<T>, signal?: AbortSignal): Promise<T> {\n\t\tif (this._disposed) {\n\t\t\treturn Promise.reject(new Error('GitQueue disposed'));\n\t\t}\n\n\t\tif (signal?.aborted) {\n\t\t\treturn Promise.reject(abortReason(signal));\n\t\t}\n\n\t\tif (!this.canRunNow(priority)) {\n\t\t\treturn this.enqueue(fn, priority, signal);\n\t\t}\n\n\t\treturn this.runcore(fn);\n\t}\n\n\tprivate async runcore<T>(fn: () => Promise<T>): Promise<T> {\n\t\tthis._activeCount++;\n\t\ttry {\n\t\t\treturn await fn();\n\t\t} finally {\n\t\t\tthis._activeCount--;\n\t\t\tthis.processQueues();\n\t\t}\n\t}\n\n\tprivate enqueue<T>(fn: () => Promise<T>, priority: GitCommandPriority, signal?: AbortSignal): Promise<T> {\n\t\tconst queue = this._queues.get(priority)!;\n\t\tconst maxDepth = this._config.maxQueueDepth ?? 500;\n\t\tif (maxDepth > 0 && queue.length >= maxDepth) {\n\t\t\treturn Promise.reject(new Error(`GitQueue '${priority}' queue is full (${maxDepth} commands pending)`));\n\t\t}\n\n\t\treturn new Promise<T>((resolve, reject) => {\n\t\t\tconst cmd: QueuedCommand = {\n\t\t\t\trun: fn,\n\t\t\t\tresolve: resolve as (value: unknown) => void,\n\t\t\t\treject: reject,\n\t\t\t\tqueuedAt: Date.now(),\n\t\t\t\tpriority: priority,\n\t\t\t\tsignal: signal,\n\t\t\t};\n\n\t\t\tif (signal != null) {\n\t\t\t\tcmd.abortHandler = () => {\n\t\t\t\t\tconst idx = queue.indexOf(cmd);\n\t\t\t\t\t// If still queued, remove and reject so it never runs.\n\t\t\t\t\t// If already dequeued, the running command should honor the signal at its own layer.\n\t\t\t\t\tif (idx !== -1) {\n\t\t\t\t\t\tqueue.splice(idx, 1);\n\t\t\t\t\t\tcmd.reject(abortReason(signal));\n\t\t\t\t\t}\n\t\t\t\t};\n\t\t\t\tsignal.addEventListener('abort', cmd.abortHandler, { once: true });\n\t\t\t}\n\n\t\t\tqueue.push(cmd);\n\t\t});\n\t}\n\n\tprivate processQueues(): void {\n\t\tif (this._disposed) return;\n\n\t\tconst max = this.maxConcurrent;\n\n\t\tfor (const priority of priorities) {\n\t\t\tconst queue = this._queues.get(priority)!;\n\t\t\tconst limit = priority === 'interactive' ? max + interactiveBurstCapacity : max;\n\n\t\t\twhile (queue.length > 0 && this._activeCount < limit && !this.hasHigherPriorityWaiting(priority)) {\n\t\t\t\tthis.runQueued(queue.shift()!);\n\t\t\t}\n\t\t}\n\t}\n\n\tprivate runQueued(cmd: QueuedCommand): void {\n\t\t// Detach the abort listener now that the command has left the queue — any subsequent\n\t\t// abort must be handled by the running spawn itself (via runOpts.cancellation).\n\t\tif (cmd.signal != null && cmd.abortHandler != null) {\n\t\t\tcmd.signal.removeEventListener('abort', cmd.abortHandler);\n\t\t\tcmd.abortHandler = undefined;\n\t\t}\n\n\t\tconst waitTime = Date.now() - cmd.queuedAt;\n\t\tif (waitTime > 1000) {\n\t\t\tthis._hooks.onSlowQueue?.({\n\t\t\t\tpriority: cmd.priority,\n\t\t\t\twaitTime: waitTime,\n\t\t\t\tactive: this._activeCount,\n\t\t\t\tqueued: {\n\t\t\t\t\tinteractive: this._queues.get('interactive')!.length,\n\t\t\t\t\tnormal: this._queues.get('normal')!.length,\n\t\t\t\t\tbackground: this._queues.get('background')!.length,\n\t\t\t\t},\n\t\t\t\tmaxConcurrent: this.maxConcurrent,\n\t\t\t});\n\t\t}\n\n\t\tthis._activeCount++;\n\t\ttry {\n\t\t\tcmd.run()\n\t\t\t\t.then(cmd.resolve, cmd.reject)\n\t\t\t\t.finally(() => {\n\t\t\t\t\tthis._activeCount--;\n\t\t\t\t\tthis.processQueues();\n\t\t\t\t});\n\t\t} catch (ex) {\n\t\t\tthis._activeCount--;\n\t\t\tcmd.reject(ex);\n\t\t\tthis.processQueues();\n\t\t}\n\t}\n\n\t/** Returns current queue statistics for diagnostics */\n\tgetStats(): { active: number; queued: Record<GitCommandPriority, number>; maxConcurrent: number } {\n\t\treturn {\n\t\t\tactive: this._activeCount,\n\t\t\tqueued: {\n\t\t\t\tinteractive: this._queues.get('interactive')!.length,\n\t\t\t\tnormal: this._queues.get('normal')!.length,\n\t\t\t\tbackground: this._queues.get('background')!.length,\n\t\t\t},\n\t\t\tmaxConcurrent: this.maxConcurrent,\n\t\t};\n\t}\n}\n\n/**\n * Git global options that consume the next positional arg as their value\n * (e.g. `--work-tree <path>`). Long-form `--name=value` is already skipped by\n * the leading-dash check, so only the separated form needs explicit handling.\n */\nconst optionsTakingValue = new Set([\n\t'-c',\n\t'-C',\n\t'--git-dir',\n\t'--work-tree',\n\t'--namespace',\n\t'--exec-path',\n\t'--super-prefix',\n\t'--config-env',\n\t'--attr-source',\n\t'--list-cmds',\n]);\n\n/** Extracts the primary git subcommand from an arg list, skipping global options and their values. */\nexport function getPrimaryGitCommand(args: readonly (string | undefined)[]): string | undefined {\n\tfor (let i = 0; i < args.length; i++) {\n\t\tconst a = args[i];\n\t\tif (a == null) continue;\n\t\tif (optionsTakingValue.has(a)) {\n\t\t\tconst next = args[i + 1];\n\t\t\tif (next != null && !next.startsWith('-')) {\n\t\t\t\ti++;\n\t\t\t}\n\t\t\tcontinue;\n\t\t}\n\t\tif (a.startsWith('-')) continue;\n\n\t\treturn a;\n\t}\n\treturn undefined;\n}\n\n/**\n * Infers a queue priority from the git command being invoked.\n *\n * Intentionally narrow: only returns 'background' for commands that are\n * *always* read-only AND *always* potentially expensive. Polymorphic commands\n * like `log` and `rev-list` (which can be quick bounded lookups or full-history\n * walks) are deliberately omitted — call sites that perform heavy walks must\n * pass `priority: 'background'` explicitly. Never upgrades to 'interactive'.\n *\n * No subcommand awareness (e.g. `stash list`, `branch -l`): the risk of\n * misclassifying a write subcommand as background outweighs the gain.\n */\nexport function inferGitCommandPriority(args: readonly (string | undefined)[]): GitCommandPriority {\n\tswitch (getPrimaryGitCommand(args)) {\n\t\tcase 'for-each-ref':\n\t\tcase 'shortlog':\n\t\tcase 'reflog':\n\t\tcase 'name-rev':\n\t\tcase 'describe':\n\t\tcase 'cherry':\n\t\tcase 'count-objects':\n\t\tcase 'fsck':\n\t\t\treturn 'background';\n\t\tdefault:\n\t\t\treturn 'normal';\n\t}\n}\n"],"mappings":"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"}
+{"version":3,"file":"gitQueue.js","names":[],"sources":["../../../../git-cli/src/exec/gitQueue.ts"],"sourcesContent":["import type { GitCommandPriority } from './exec.types.js';\n\ninterface QueuedCommand {\n\trun: () => Promise<unknown>;\n\tresolve: (value: unknown) => void;\n\treject: (reason: unknown) => void;\n\tqueuedAt: number;\n\tpriority: GitCommandPriority;\n\tsignal?: AbortSignal;\n\tabortHandler?: () => void;\n}\n\n/** Priority levels in descending order (highest first) */\nconst priorities: GitCommandPriority[] = ['interactive', 'normal', 'background'];\n\n/** How many extra slots interactive commands can use when at capacity */\nconst interactiveBurstCapacity = 2;\n\nfunction abortReason(signal: AbortSignal): Error {\n\treturn signal.reason instanceof Error ? signal.reason : new Error('Aborted');\n}\n\nexport interface GitQueueConfig {\n\t/**\n\t * Maximum number of concurrent git processes. Defaults to 20, the default of GitLens'\n\t * `advanced.git.maxConcurrentProcesses`.\n\t */\n\tmaxConcurrent?: number;\n\t/** Maximum number of queued commands per priority level. Defaults to 500. Set to 0 to disable. */\n\tmaxQueueDepth?: number;\n}\n\nexport interface GitQueueHooks {\n\t/** Called when a queued command waited longer than 1 second before executing */\n\tonSlowQueue?(info: {\n\t\tpriority: GitCommandPriority;\n\t\twaitTime: number;\n\t\tactive: number;\n\t\tqueued: Record<GitCommandPriority, number>;\n\t\tmaxConcurrent: number;\n\t}): void;\n}\n\n/**\n * Priority-based concurrent queue for git command execution.\n *\n * Implements a multi-level feedback queue with:\n * - Configurable max concurrent processes\n * - Strict priority ordering (interactive > normal > background)\n * - Burst capacity for interactive commands under pressure\n *\n * Capacity rules (with limit N, burst B=2):\n * - All priorities share N slots normally\n * - When at capacity, interactive can burst up to N+B total\n *\n * Scheduling rules:\n * - Higher priority preempts: if interactive is waiting, normal/background queue\n * - Lower priority yields: background won't run if normal is waiting\n */\nexport class GitQueue {\n\tprivate readonly _queues = new Map<GitCommandPriority, QueuedCommand[]>([\n\t\t['interactive', []],\n\t\t['normal', []],\n\t\t['background', []],\n\t]);\n\n\tprivate _activeCount = 0;\n\tprivate _disposed = false;\n\n\tconstructor(\n\t\tprivate readonly _config: GitQueueConfig = {},\n\t\tprivate readonly _hooks: GitQueueHooks = {},\n\t) {}\n\n\tdispose(): void {\n\t\tthis._disposed = true;\n\t\tfor (const queue of this._queues.values()) {\n\t\t\tfor (const cmd of queue) {\n\t\t\t\tif (cmd.signal != null && cmd.abortHandler != null) {\n\t\t\t\t\tcmd.signal.removeEventListener('abort', cmd.abortHandler);\n\t\t\t\t}\n\t\t\t\tcmd.reject(new Error('GitQueue disposed'));\n\t\t\t}\n\t\t\tqueue.length = 0;\n\t\t}\n\t}\n\n\t/** Get the configured max concurrent processes */\n\tprivate get maxConcurrent(): number {\n\t\treturn this._config.maxConcurrent ?? 20;\n\t}\n\n\t/** Update configuration (e.g., when user changes settings) */\n\tupdateConfig(config: Partial<GitQueueConfig>): void {\n\t\tif (config.maxConcurrent != null && config.maxConcurrent > 0) {\n\t\t\tthis._config.maxConcurrent = config.maxConcurrent;\n\t\t}\n\t\tif (config.maxQueueDepth != null && config.maxQueueDepth > 0) {\n\t\t\tthis._config.maxQueueDepth = config.maxQueueDepth;\n\t\t}\n\t}\n\n\t/** Check if a command at the given priority can execute immediately */\n\tprivate canRunNow(priority: GitCommandPriority): boolean {\n\t\t// Must yield to higher priority waiting\n\t\tif (this.hasHigherPriorityWaiting(priority)) return false;\n\n\t\tconst max = this.maxConcurrent;\n\n\t\t// Under normal limit - all priorities can run\n\t\tif (this._activeCount < max) return true;\n\n\t\t// At or over normal limit - only interactive can burst\n\t\tif (priority === 'interactive' && this._activeCount < max + interactiveBurstCapacity) {\n\t\t\treturn true;\n\t\t}\n\n\t\treturn false;\n\t}\n\n\t/** Check if any higher-priority commands are waiting */\n\tprivate hasHigherPriorityWaiting(priority: GitCommandPriority): boolean {\n\t\tfor (const p of priorities) {\n\t\t\tif (p === priority) return false;\n\t\t\tif (this._queues.get(p)!.length > 0) return true;\n\t\t}\n\t\treturn false;\n\t}\n\n\t/**\n\t * Execute a git command with the specified priority.\n\t *\n\t * When `signal` is provided:\n\t * - If already aborted, rejects immediately without running.\n\t * - If aborted while queued, the command is removed from the queue and rejected before it ever runs.\n\t * - If aborted while running, the in-flight spawn must honor the same signal separately\n\t *   (callers pass it via `runOpts.cancellation`); the queue does not interrupt running work.\n\t */\n\trun<T>(priority: GitCommandPriority, fn: () => Promise<T>, signal?: AbortSignal): Promise<T> {\n\t\tif (this._disposed) {\n\t\t\treturn Promise.reject(new Error('GitQueue disposed'));\n\t\t}\n\n\t\tif (signal?.aborted) {\n\t\t\treturn Promise.reject(abortReason(signal));\n\t\t}\n\n\t\tif (!this.canRunNow(priority)) {\n\t\t\treturn this.enqueue(fn, priority, signal);\n\t\t}\n\n\t\treturn this.runcore(fn);\n\t}\n\n\tprivate async runcore<T>(fn: () => Promise<T>): Promise<T> {\n\t\tthis._activeCount++;\n\t\ttry {\n\t\t\treturn await fn();\n\t\t} finally {\n\t\t\tthis._activeCount--;\n\t\t\tthis.processQueues();\n\t\t}\n\t}\n\n\tprivate enqueue<T>(fn: () => Promise<T>, priority: GitCommandPriority, signal?: AbortSignal): Promise<T> {\n\t\tconst queue = this._queues.get(priority)!;\n\t\tconst maxDepth = this._config.maxQueueDepth ?? 500;\n\t\tif (maxDepth > 0 && queue.length >= maxDepth) {\n\t\t\treturn Promise.reject(new Error(`GitQueue '${priority}' queue is full (${maxDepth} commands pending)`));\n\t\t}\n\n\t\treturn new Promise<T>((resolve, reject) => {\n\t\t\tconst cmd: QueuedCommand = {\n\t\t\t\trun: fn,\n\t\t\t\tresolve: resolve as (value: unknown) => void,\n\t\t\t\treject: reject,\n\t\t\t\tqueuedAt: Date.now(),\n\t\t\t\tpriority: priority,\n\t\t\t\tsignal: signal,\n\t\t\t};\n\n\t\t\tif (signal != null) {\n\t\t\t\tcmd.abortHandler = () => {\n\t\t\t\t\tconst idx = queue.indexOf(cmd);\n\t\t\t\t\t// If still queued, remove and reject so it never runs.\n\t\t\t\t\t// If already dequeued, the running command should honor the signal at its own layer.\n\t\t\t\t\tif (idx !== -1) {\n\t\t\t\t\t\tqueue.splice(idx, 1);\n\t\t\t\t\t\tcmd.reject(abortReason(signal));\n\t\t\t\t\t}\n\t\t\t\t};\n\t\t\t\tsignal.addEventListener('abort', cmd.abortHandler, { once: true });\n\t\t\t}\n\n\t\t\tqueue.push(cmd);\n\t\t});\n\t}\n\n\tprivate processQueues(): void {\n\t\tif (this._disposed) return;\n\n\t\tconst max = this.maxConcurrent;\n\n\t\tfor (const priority of priorities) {\n\t\t\tconst queue = this._queues.get(priority)!;\n\t\t\tconst limit = priority === 'interactive' ? max + interactiveBurstCapacity : max;\n\n\t\t\twhile (queue.length > 0 && this._activeCount < limit && !this.hasHigherPriorityWaiting(priority)) {\n\t\t\t\tthis.runQueued(queue.shift()!);\n\t\t\t}\n\t\t}\n\t}\n\n\tprivate runQueued(cmd: QueuedCommand): void {\n\t\t// Detach the abort listener now that the command has left the queue — any subsequent\n\t\t// abort must be handled by the running spawn itself (via runOpts.cancellation).\n\t\tif (cmd.signal != null && cmd.abortHandler != null) {\n\t\t\tcmd.signal.removeEventListener('abort', cmd.abortHandler);\n\t\t\tcmd.abortHandler = undefined;\n\t\t}\n\n\t\tconst waitTime = Date.now() - cmd.queuedAt;\n\t\tif (waitTime > 1000) {\n\t\t\tthis._hooks.onSlowQueue?.({\n\t\t\t\tpriority: cmd.priority,\n\t\t\t\twaitTime: waitTime,\n\t\t\t\tactive: this._activeCount,\n\t\t\t\tqueued: {\n\t\t\t\t\tinteractive: this._queues.get('interactive')!.length,\n\t\t\t\t\tnormal: this._queues.get('normal')!.length,\n\t\t\t\t\tbackground: this._queues.get('background')!.length,\n\t\t\t\t},\n\t\t\t\tmaxConcurrent: this.maxConcurrent,\n\t\t\t});\n\t\t}\n\n\t\tthis._activeCount++;\n\t\ttry {\n\t\t\tcmd.run()\n\t\t\t\t.then(cmd.resolve, cmd.reject)\n\t\t\t\t.finally(() => {\n\t\t\t\t\tthis._activeCount--;\n\t\t\t\t\tthis.processQueues();\n\t\t\t\t});\n\t\t} catch (ex) {\n\t\t\tthis._activeCount--;\n\t\t\tcmd.reject(ex);\n\t\t\tthis.processQueues();\n\t\t}\n\t}\n\n\t/** Returns current queue statistics for diagnostics */\n\tgetStats(): { active: number; queued: Record<GitCommandPriority, number>; maxConcurrent: number } {\n\t\treturn {\n\t\t\tactive: this._activeCount,\n\t\t\tqueued: {\n\t\t\t\tinteractive: this._queues.get('interactive')!.length,\n\t\t\t\tnormal: this._queues.get('normal')!.length,\n\t\t\t\tbackground: this._queues.get('background')!.length,\n\t\t\t},\n\t\t\tmaxConcurrent: this.maxConcurrent,\n\t\t};\n\t}\n}\n\n/**\n * Git global options that consume the next positional arg as their value\n * (e.g. `--work-tree <path>`). Long-form `--name=value` is already skipped by\n * the leading-dash check, so only the separated form needs explicit handling.\n */\nconst optionsTakingValue = new Set([\n\t'-c',\n\t'-C',\n\t'--git-dir',\n\t'--work-tree',\n\t'--namespace',\n\t'--exec-path',\n\t'--super-prefix',\n\t'--config-env',\n\t'--attr-source',\n\t'--list-cmds',\n]);\n\n/** Extracts the primary git subcommand from an arg list, skipping global options and their values. */\nexport function getPrimaryGitCommand(args: readonly (string | undefined)[]): string | undefined {\n\tfor (let i = 0; i < args.length; i++) {\n\t\tconst a = args[i];\n\t\tif (a == null) continue;\n\t\tif (optionsTakingValue.has(a)) {\n\t\t\tconst next = args[i + 1];\n\t\t\tif (next != null && !next.startsWith('-')) {\n\t\t\t\ti++;\n\t\t\t}\n\t\t\tcontinue;\n\t\t}\n\t\tif (a.startsWith('-')) continue;\n\n\t\treturn a;\n\t}\n\treturn undefined;\n}\n\n/**\n * Infers a queue priority from the git command being invoked.\n *\n * Intentionally narrow: only returns 'background' for commands that are\n * *always* read-only AND *always* potentially expensive. Polymorphic commands\n * like `log` and `rev-list` (which can be quick bounded lookups or full-history\n * walks) are deliberately omitted — call sites that perform heavy walks must\n * pass `priority: 'background'` explicitly. Never upgrades to 'interactive'.\n *\n * No subcommand awareness (e.g. `stash list`, `branch -l`): the risk of\n * misclassifying a write subcommand as background outweighs the gain.\n */\nexport function inferGitCommandPriority(args: readonly (string | undefined)[]): GitCommandPriority {\n\tswitch (getPrimaryGitCommand(args)) {\n\t\tcase 'for-each-ref':\n\t\tcase 'shortlog':\n\t\tcase 'reflog':\n\t\tcase 'name-rev':\n\t\tcase 'describe':\n\t\tcase 'cherry':\n\t\tcase 'count-objects':\n\t\tcase 'fsck':\n\t\t\treturn 'background';\n\t\tdefault:\n\t\t\treturn 'normal';\n\t}\n}\n"],"mappings":"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"}

package/dist/git-cli/providers/branches.d.ts

@@ -16,7 +16,9 @@ export declare class BranchesGitSubProvider implements GitBranchesSubProvider {
   private readonly cache;
   private readonly provider;
   constructor(context: GitServiceContext, git: Git, cache: Cache, provider: CliGitProviderInternal);
-  getBranch(repoPath: string, name?: string, cancellation?: AbortSignal): Promise<GitBranch | undefined>;
+  getBranch(repoPath: string, name?: string, options?: {
+    force?: boolean;
+  }, cancellation?: AbortSignal): Promise<GitBranch | undefined>;
   private getCurrentBranch;
   getBranches(repoPath: string, options?: {
     filter?: (b: GitBranch) => boolean;
@@ -59,6 +61,13 @@ export declare class BranchesGitSubProvider implements GitBranchesSubProvider {
   deleteLocalBranch(repoPath: string, names: string | string[], options?: {
     force?: boolean;
   }): Promise<void>;
+  /**
+   * Drops what GitLens keeps for a local branch beyond its ref, for both ways one is deleted
+   * (`deleteLocalBranch` and `refs.deleteReference`). The persisted gk metadata goes too, not just the
+   * cached resolution: `getBaseBranchName` reads `branch.<ref>.gk-merge-base` before falling back to the
+   * reflog, so leaving it behind would hand a later branch reusing this name its predecessor's base.
+   */
+  forgetDeletedBranch(repoPath: string, name: string): Promise<void>;
   /**
    * Drops the cached and persisted per-branch metadata for whichever of `names` no longer exists. Only
    * for the partial-failure path — one extra `for-each-ref` is cheap while already handling an error,

package/dist/git-cli/providers/branches.js

@@ -34,7 +34,8 @@ var BranchesGitSubProvider = class {
 		this.cache = cache;
 		this.provider = provider;
 	}
-	async getBranch(repoPath, name, cancellation) {
+	async getBranch(repoPath, name, options, cancellation) {
+		if (options?.force) this.cache.evictCaches(repoPath, "branches");
 		if (name != null) {
 			const { values: [branch] } = await this.getBranches(repoPath, { filter: (b) => b.name === name }, cancellation);
 			return branch;
@@ -244,7 +245,7 @@ var BranchesGitSubProvider = class {
 			if (mergeTarget == null && options?.associatedPullRequest != null) {
 				const pr = await options.associatedPullRequest;
 				if (pr?.refs?.base != null) {
-					const branch = await this.getBranch(repoPath, ref, cancellation);
+					const branch = await this.getBranch(repoPath, ref, void 0, cancellation);
 					if (branch == null) return void 0;
 					mergeTarget = `${branch.remoteName}/${pr.refs.base.branch}`;
 					if (pr.stack == null) this.storeMergeTargetBranchName(repoPath, ref, mergeTarget, { skipInvalidation: ["branchOverviews"] });
@@ -460,10 +461,7 @@ var BranchesGitSubProvider = class {
 		];
 		try {
 			await this.git.run({ cwd: repoPath }, ...args);
-			for (const branch of branches) {
-				this.cache.deleteBaseBranchName(repoPath, branch);
-				await this.provider.config.removeGkConfigBranchSection(repoPath, branch);
-			}
+			for (const branch of branches) await this.forgetDeletedBranch(repoPath, branch);
 			this.context.hooks?.cache?.onReset?.(repoPath, "branches");
 			this.context.hooks?.repository?.onChanged?.(repoPath, ["heads"]);
 		} catch (ex) {
@@ -491,6 +489,16 @@ var BranchesGitSubProvider = class {
 		}
 	}
 	/**
+	* Drops what GitLens keeps for a local branch beyond its ref, for both ways one is deleted
+	* (`deleteLocalBranch` and `refs.deleteReference`). The persisted gk metadata goes too, not just the
+	* cached resolution: `getBaseBranchName` reads `branch.<ref>.gk-merge-base` before falling back to the
+	* reflog, so leaving it behind would hand a later branch reusing this name its predecessor's base.
+	*/
+	async forgetDeletedBranch(repoPath, name) {
+		this.cache.deleteBaseBranchName(repoPath, name);
+		await this.provider.config.removeGkConfigBranchSection(repoPath, name);
+	}
+	/**
 	* Drops the cached and persisted per-branch metadata for whichever of `names` no longer exists. Only
 	* for the partial-failure path — one extra `for-each-ref` is cheap while already handling an error,
 	* and keeps the success path free of it.
@@ -511,8 +519,7 @@ var BranchesGitSubProvider = class {
 			for (const name of names) {
 				if (surviving.has(name)) continue;
 				anyDeleted = true;
-				this.cache.deleteBaseBranchName(repoPath, name);
-				await this.provider.config.removeGkConfigBranchSection(repoPath, name);
+				await this.forgetDeletedBranch(repoPath, name);
 			}
 			return anyDeleted;
 		} catch {