Merge branch 'upstream-development'

Author: pol-rivero

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ on:
       APPLE_APPLICATION_CERT_PASSWORD:
 
 env:
-  NODE_VERSION: 24.11.1
+  NODE_VERSION: 24.15.0
 
 jobs:
   lint:

.node-version

@@ -1 +1 @@
-24.11.1
+24.15.0

.nvmrc

@@ -1 +1 @@
-v24.11.1
+v24.15.0

.tool-versions

@@ -1,2 +1,2 @@
 python 3.9.5
-nodejs 24.11.1
+nodejs 24.15.0

app/.npmrc

@@ -1,3 +1,3 @@
 runtime = electron
 disturl = https://electronjs.org/headers
-target = 40.1.0
+target = 42.0.1

app/src/lib/copilot-error.ts

@@ -75,6 +75,51 @@ function isPaymentRequiredErrorCode(
   )
 }
 
+/**
+ * Builds a {@link CopilotError} from a Copilot SDK `session.error` event
+ * payload when its upstream HTTP status code is 402 (Payment Required).
+ * Returns null for any other status (or no status), so callers can
+ * distinguish payment-required failures from generic session errors.
+ */
+export function getCopilotPaymentRequiredErrorFromSessionError(data: {
+  readonly message?: string
+  readonly statusCode?: number
+  readonly errorCode?: string
+}): CopilotError | null {
+  if (data.statusCode !== HttpStatusCode.PaymentRequired) {
+    return null
+  }
+
+  const code = isPaymentRequiredErrorCode(data.errorCode)
+    ? data.errorCode
+    : undefined
+  const cleaned = cleanSessionErrorMessage(data.message ?? '', data.statusCode)
+  const message =
+    cleaned.length > 0 ? cleaned : getFallbackPaymentRequiredMessage(code)
+
+  return new CopilotError(message, HttpStatusCode.PaymentRequired, {
+    paymentRequiredErrorCode: code,
+  })
+}
+
+/**
+ * SDK `session.error` messages are sometimes formatted as
+ * `"<statusCode> <message> (Request ID: <id>)"`. Strip the leading status
+ * code and trailing request-id annotation so the user sees just the
+ * human-readable reason.
+ *
+ * Exported for testing.
+ */
+export function cleanSessionErrorMessage(
+  message: string,
+  statusCode: number
+): string {
+  return message
+    .replace(new RegExp(`^\\s*${statusCode}\\s+`), '')
+    .replace(/\s*\(Request ID:[^)]*\)\s*$/i, '')
+    .trim()
+}
+
 function getFallbackPaymentRequiredMessage(
   code: CopilotPaymentRequiredErrorCode | undefined
 ) {

app/src/lib/git/worktree.ts

@@ -1,10 +1,40 @@
+import { git } from './core'
+import { Repository } from '../../models/repository'
 import * as Path from 'path'
 import * as Fs from 'fs'
-import type { Repository } from '../../models/repository'
 import type { WorktreeEntry, WorktreeType } from '../../models/worktree'
-import { git } from './core'
 import { normalizePath } from '../helpers/path'
 
+/**
+ * Get the set of canonical branch refs (e.g. `refs/heads/feature`)
+ * checked out in any worktree (main or linked).
+ */
+export async function getWorktreeCheckedOutBranches(
+  repository: Repository
+): Promise<ReadonlySet<string>> {
+  const result = await git(
+    ['worktree', 'list', '--porcelain', '-z'],
+    repository.path,
+    'getWorktreeCheckedOutBranches'
+  )
+
+  const branches = new Set<string>()
+
+  // With -z, lines are NUL-terminated and blocks are separated by
+  // double NUL (i.e. an empty string between two NUL terminators).
+  const blocks = result.stdout.split('\0\0')
+
+  for (const block of blocks) {
+    for (const line of block.split('\0')) {
+      if (line.startsWith('branch ')) {
+        branches.add(line.substring('branch '.length))
+      }
+    }
+  }
+
+  return branches
+}
+
 function getDotGitPath(repositoryPath: string): string {
   return Path.join(repositoryPath, '.git')
 }

app/src/lib/stores/app-store.ts

@@ -3318,7 +3318,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
 
     const { step, operationDetail } = multiCommitOperationState
-    if (step.kind !== MultiCommitOperationStepKind.ShowConflicts) {
+    if (
+      step.kind !== MultiCommitOperationStepKind.ShowConflicts &&
+      step.kind !== MultiCommitOperationStepKind.ShowCopilotConflicts
+    ) {
       return
     }
 
@@ -3327,7 +3330,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.repositoryStateCache.updateMultiCommitOperationState(
       repository,
       () => ({
-        step: { ...step, manualResolutions },
+        step: {
+          ...step,
+          conflictState: { ...step.conflictState, manualResolutions },
+        },
       })
     )
 
@@ -3403,20 +3409,32 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     this.statsStore.increment('mergeConflictFromExplicitMergeCount')
 
+    const mcoConflictState = {
+      kind: 'multiCommitOperation' as const,
+      manualResolutions,
+      ourBranch,
+      theirBranch,
+    }
+
+    const useCopilot = multiCommitOperationState.useCopilotConflictResolution
+
     this._setMultiCommitOperationStep(repository, {
-      kind: MultiCommitOperationStepKind.ShowConflicts,
-      conflictState: {
-        kind: 'multiCommitOperation',
-        manualResolutions,
-        ourBranch,
-        theirBranch,
-      },
+      kind: useCopilot
+        ? MultiCommitOperationStepKind.ShowCopilotConflictsLoading
+        : MultiCommitOperationStepKind.ShowConflicts,
+      conflictState: mcoConflictState,
     })
 
     this._showPopup({
       type: PopupType.MultiCommitOperation,
       repository,
     })
+
+    if (useCopilot) {
+      // Auto-route to Copilot: the user previously opted into Copilot
+      // resolution during this operation, so skip the manual dialog.
+      await this._startCopilotConflictResolution(repository)
+    }
   }
 
   private async getMergeConflictsTheirBranch(
@@ -6889,14 +6907,24 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return
     }
 
-    const { copilotResolutions } = multiCommitOperationState
+    const { copilotResolutions, step } = multiCommitOperationState
     if (copilotResolutions === null || copilotResolutions.length === 0) {
       return
     }
 
+    // Respect any manual overrides the user chose in the result dialog
+    const manualResolutions =
+      step.kind === MultiCommitOperationStepKind.ShowCopilotConflicts
+        ? step.conflictState.manualResolutions
+        : new Map<string, ManualConflictResolution>()
+
     const pathsToStage: string[] = []
 
     for (const resolution of copilotResolutions) {
+      if (manualResolutions.has(resolution.path)) {
+        continue
+      }
+
       const absolutePath = await resolveWithin(repository.path, resolution.path)
       if (absolutePath === null) {
         log.warn(
@@ -8648,8 +8676,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
     if (
       changesState.conflictState === null ||
       multiCommitOperationState === null ||
-      multiCommitOperationState.step.kind !==
-        MultiCommitOperationStepKind.ShowConflicts
+      (multiCommitOperationState.step.kind !==
+        MultiCommitOperationStepKind.ShowConflicts &&
+        multiCommitOperationState.step.kind !==
+          MultiCommitOperationStepKind.ShowCopilotConflicts)
     ) {
       return
     }

app/src/lib/stores/copilot-store.ts

@@ -1,11 +1,17 @@
-import { CopilotClient } from '@github/copilot-sdk'
-import type { ModelInfo, SessionConfig } from '@github/copilot-sdk'
+import { CopilotClient, CopilotSession } from '@github/copilot-sdk'
+import type {
+  AssistantMessageEvent,
+  MessageOptions,
+  ModelInfo,
+  SessionConfig,
+} from '@github/copilot-sdk'
 import { AccountsStore } from './accounts-store'
 import { Account, isDotComAccount } from '../../models/account'
 import {
   ICopilotCommitMessage,
   parseCopilotCommitMessage,
 } from '../copilot-commit-message'
+import { getCopilotPaymentRequiredErrorFromSessionError } from '../copilot-error'
 import {
   CopilotValidationError,
   ConflictResolutionSystemPrompt,
@@ -448,6 +454,48 @@ export class CopilotStore extends BaseStore {
     }
   }
 
+  /**
+   * Sends a prompt on the given session and waits for the assistant
+   * response, while capturing any `session.error` events emitted during
+   * the round-trip.
+   *
+   * If the SDK emits a `session.error` whose upstream HTTP status code is
+   * 402 (Payment Required), the corresponding `CopilotError` is thrown
+   * instead of whatever {@link CopilotSession.sendAndWait} would have
+   * rejected with — the underlying rejection is intentionally swallowed
+   * because the SDK surfaces the same failure twice (once on the event
+   * channel, once on the awaited promise) and only the parsed 402 error
+   * carries actionable billing metadata for the UI.
+   *
+   * Any other `session.error` event is logged and otherwise ignored so
+   * the original `sendAndWait` rejection (or success) is propagated
+   * unchanged.
+   */
+  private async sendAndWait(
+    session: CopilotSession,
+    options: MessageOptions,
+    timeoutMs: number
+  ): Promise<AssistantMessageEvent | undefined> {
+    let paymentRequiredError: Error | undefined
+
+    const unsubscribe = session.on('session.error', e => {
+      const captured = getCopilotPaymentRequiredErrorFromSessionError(e.data)
+      if (captured !== null) {
+        paymentRequiredError = captured
+      } else {
+        log.error(`CopilotStore: Session error: ${e.toString()}`)
+      }
+    })
+
+    try {
+      return await session.sendAndWait(options, timeoutMs)
+    } catch (e) {
+      throw paymentRequiredError ?? e
+    } finally {
+      unsubscribe()
+    }
+  }
+
   /**
    * Generates a commit message for the given diff using Copilot.
    *
@@ -538,7 +586,9 @@ export class CopilotStore extends BaseStore {
         tags,
         cleanedRuleDescriptions
       )
-      const response = await session.sendAndWait(
+
+      const response = await this.sendAndWait(
+        session,
         { prompt: userPrompt },
         timeoutMs
       )
@@ -700,7 +750,7 @@ export class CopilotStore extends BaseStore {
           }),
         })
 
-        const response = await session.sendAndWait({ prompt }, 600_000)
+        const response = await this.sendAndWait(session, { prompt }, 600_000)
 
         if (!response || !response.data.content) {
           throw new Error('No response from Copilot')

app/src/lib/stores/helpers/branch-pruner.ts

@@ -12,6 +12,7 @@ import {
   formatAsLocalRef,
   getBranches,
   deleteLocalBranch,
+  getWorktreeCheckedOutBranches,
 } from '../../git'
 import { fatalError } from '../../fatal-error'
 import { RepositoryStateCache } from '../repository-state-cache'
@@ -198,6 +199,11 @@ export class BranchPruner {
       await getBranches(this.repository, `refs/remotes/`)
     ).map(b => formatAsLocalRef(b.name))
 
+    // get branches checked out in linked worktrees so we don't delete them
+    const worktreeBranches = await getWorktreeCheckedOutBranches(
+      this.repository
+    )
+
     // create list of branches to be pruned
     const branchesReadyForPruning = Array.from(mergedBranches.keys()).filter(
       ref => {
@@ -207,6 +213,9 @@ export class BranchPruner {
         if (recentlyCheckedOutCanonicalRefs.has(ref)) {
           return false
         }
+        if (worktreeBranches.has(ref)) {
+          return false
+        }
         const upstreamRef = getUpstreamRefForLocalBranchRef(ref, allBranches)
         if (upstreamRef === undefined) {
           return false