Merge branch 'upstream-development'

pol-rivero · pol-rivero · commit 4ad1716b4c23 · 2026-05-23T14:30:45.000+02:00
diff --git a/app/package.json b/app/package.json
@@ -5,7 +5,7 @@
   "productName": "GitHub Desktop Plus",
   "bundleID": "com.polrivero.GitHubDesktopPlus",
   "companyName": "Pol Rivero",
-  "version": "3.5.9",
+  "version": "3.5.10",
   "main": "./main.js",
   "repository": {
     "type": "git",
diff --git a/app/src/lib/editors/darwin.ts b/app/src/lib/editors/darwin.ts
@@ -1,4 +1,4 @@
-import { pathExists } from '../../ui/lib/path-exists'
+import { pathExists } from '../path-exists'
 import { IFoundEditor } from './found-editor'
 import appPath from 'app-path'
 
diff --git a/app/src/lib/editors/linux.ts b/app/src/lib/editors/linux.ts
@@ -1,5 +1,4 @@
 import { pathExists } from '../helpers/linux'
-
 import { IFoundEditor } from './found-editor'
 
 /** Represents an external editor on Linux */
diff --git a/app/src/lib/editors/win32.ts b/app/src/lib/editors/win32.ts
@@ -7,7 +7,7 @@ import {
   RegistryValue,
   RegistryValueType,
 } from 'registry-js'
-import { pathExists } from '../../ui/lib/path-exists'
+import { pathExists } from '../path-exists'
 
 import { IFoundEditor } from './found-editor'
 import memoizeOne from 'memoize-one'
diff --git a/app/src/lib/feature-flag.ts b/app/src/lib/feature-flag.ts
@@ -128,4 +128,4 @@ export const enableHooksEnvironment = () => true
 
 export const enableHooksByDefault = enableBetaFeatures
 
-export const enableFormattingPreferences = enableBetaFeatures
+export const enableFormattingPreferences = () => true
diff --git a/app/src/lib/git/cherry-pick.ts b/app/src/lib/git/cherry-pick.ts
@@ -25,7 +25,7 @@ import { getCommit } from '.'
 import { IMultiCommitOperationProgress } from '../../models/progress'
 import { join } from 'path'
 import { readFile } from 'fs/promises'
-import { pathExists } from '../../ui/lib/path-exists'
+import { pathExists } from '../path-exists'
 
 /** The app-specific results from attempting to cherry pick commits*/
 export enum CherryPickResult {
diff --git a/app/src/lib/git/merge.ts b/app/src/lib/git/merge.ts
@@ -2,7 +2,7 @@ import { join } from 'path'
 import { git, HookCallbackOptions } from './core'
 import { GitError } from 'dugite'
 import { Repository } from '../../models/repository'
-import { pathExists } from '../../ui/lib/path-exists'
+import { pathExists } from '../path-exists'
 import { createMultiOperationTerminalOutputCallback } from './multi-operation-terminal-output'
 
 export enum MergeResult {
diff --git a/app/src/lib/git/rebase.ts b/app/src/lib/git/rebase.ts
@@ -30,7 +30,7 @@ import { getCommitsBetweenCommits } from './rev-list'
 import { Branch } from '../../models/branch'
 import { join } from 'path'
 import { readFile } from 'fs/promises'
-import { pathExists } from '../../ui/lib/path-exists'
+import { pathExists } from '../path-exists'
 
 /** The app-specific results from attempting to rebase a repository */
 export enum RebaseResult {
diff --git a/app/src/lib/git/submodule.ts b/app/src/lib/git/submodule.ts
@@ -1,7 +1,7 @@
 import { git, IGitStringExecutionOptions } from './core'
 import { Repository } from '../../models/repository'
 import { SubmoduleEntry } from '../../models/submodule'
-import { pathExists } from '../../ui/lib/path-exists'
+import { pathExists } from '../path-exists'
 import { executionOptionsWithProgress, IGitOutput } from '../progress'
 import {
   envForRemoteOperation,
diff --git a/app/src/lib/hooks/get-shell.ts b/app/src/lib/hooks/get-shell.ts
@@ -1,4 +1,4 @@
-import { pathExists } from '../../ui/lib/path-exists'
+import { pathExists } from '../path-exists'
 import { join } from 'path'
 import which from 'which'
 import { bash, cmd, powershell } from './shell-escape'
diff --git a/app/src/lib/path-exists.ts b/app/src/lib/path-exists.ts
diff --git a/app/src/lib/shells/win32.ts b/app/src/lib/shells/win32.ts
@@ -5,7 +5,7 @@ import { assertNever } from '../fatal-error'
 import { enableWSLDetection } from '../feature-flag'
 import { findGitOnPath } from '../is-git-on-path'
 import { parseEnumValue } from '../enum'
-import { pathExists } from '../../ui/lib/path-exists'
+import { pathExists } from '../path-exists'
 import { FoundShell } from './shared'
 import {
   expandTargetPathArgument,
diff --git a/app/src/lib/ssh/ssh.ts b/app/src/lib/ssh/ssh.ts
@@ -1,5 +1,5 @@
 import memoizeOne from 'memoize-one'
-import { pathExists } from '../../ui/lib/path-exists'
+import { pathExists } from '../path-exists'
 import { getBoolean } from '../local-storage'
 import {
   getDesktopAskpassTrampolinePath,
diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
@@ -419,7 +419,7 @@ import {
   getNotificationsEnabled,
 } from './notifications-store'
 import * as ipcRenderer from '../ipc-renderer'
-import { pathExists } from '../../ui/lib/path-exists'
+import { pathExists } from '../path-exists'
 import { offsetFromNow } from '../offset-from'
 import { findContributionTargetDefaultBranch } from '../branch'
 import { ValidNotificationPullRequestReview } from '../valid-notification-pull-request-review'
diff --git a/app/src/lib/stores/copilot-store.ts b/app/src/lib/stores/copilot-store.ts
@@ -37,6 +37,8 @@ import { pathToFileURL } from 'url'
 import { randomBytes } from 'crypto'
 import { BaseStore } from './base-store'
 import { IRepoRulesMetadataRule } from '../../models/repo-rules'
+import { pathExists } from '../path-exists'
+import { enableCopilotSdkCommitMessageGeneration } from '../feature-flag'
 
 /** The default model ID used for Copilot commit message generation. */
 export const DefaultCopilotModel = 'gpt-5-mini'
@@ -423,16 +425,25 @@ export class CopilotStore extends BaseStore {
     // CLI fails to parse the arguments correctly, so we ended up using --eval
     // and just importing the index.js from the CLI as a workaround.
     const cliDir = getCopilotCLIDir()
-    let importPath = join(cliDir, 'index.js')
-
-    if (__WIN32__) {
-      // On Windows, we need the import path to be a valid file:// URL.
-      importPath = pathToFileURL(importPath).href
+    const indexPath = join(cliDir, 'index.js')
+
+    // Make sure the import path exists before creating the client, so we don't
+    // end up with a half-broken client that can't start. We check the
+    // filesystem path here, before converting it to a file:// URL on Windows,
+    // because `fs.access` doesn't accept URL-form strings.
+    if (!(await pathExists(indexPath))) {
+      throw new Error('Cannot create Copilot client: CLI entry point not found')
     }
 
+    // On Windows, `import` requires a valid file:// URL rather than a bare
+    // absolute path.
+    const importSpecifier = __WIN32__
+      ? pathToFileURL(indexPath).href
+      : indexPath
+
     return new CopilotClient({
       cliPath: await getCopilotCLIPath(),
-      cliArgs: ['--eval', `import '${importPath}'`, '--'],
+      cliArgs: ['--eval', `import '${importSpecifier}'`, '--'],
       env: {
         ELECTRON_RUN_AS_NODE: '1',
         COPILOT_RUN_APP: '1',
@@ -817,7 +828,10 @@ export class CopilotStore extends BaseStore {
    * would mean Copilot legitimately reports no models.
    */
   public async listModels(): Promise<ReadonlyArray<ModelInfo> | null> {
-    if (this.currentAccount === null) {
+    if (
+      this.currentAccount === null ||
+      !enableCopilotSdkCommitMessageGeneration(this.currentAccount)
+    ) {
       return null
     }
 
@@ -847,7 +861,11 @@ export class CopilotStore extends BaseStore {
       return this.modelsInFlight
     }
 
-    this.modelsInFlight = this.fetchModels()
+    this.modelsInFlight = this.fetchModels().catch(e => {
+      log.warn('CopilotStore: Failed to fetch and cache models', e)
+      return null
+    })
+
     try {
       return await this.modelsInFlight
     } finally {
diff --git a/app/src/lib/stores/helpers/create-tutorial-repository.ts b/app/src/lib/stores/helpers/create-tutorial-repository.ts
@@ -12,7 +12,7 @@ import { git } from '../../git'
 import { IRemote } from '../../../models/remote'
 import { getDefaultBranch } from '../../helpers/default-branch'
 import { envForRemoteOperation } from '../../git/environment'
-import { pathExists } from '../../../ui/lib/path-exists'
+import { pathExists } from '../../path-exists'
 
 const nl = __WIN32__ ? '\r\n' : '\n'
 const InitialReadmeContents =
diff --git a/app/src/main-process/squirrel-updater.ts b/app/src/main-process/squirrel-updater.ts
@@ -3,7 +3,7 @@ import * as Os from 'os'
 
 import { mkdir, writeFile } from 'fs/promises'
 import { spawn, getPathSegments, setPathSegments } from '../lib/process/win32'
-import { pathExists } from '../ui/lib/path-exists'
+import { pathExists } from '../lib/path-exists'
 
 const appFolder = Path.resolve(process.execPath, '..')
 const rootAppDir = Path.resolve(appFolder, '..')
diff --git a/app/src/ui/add-repository/create-repository.tsx b/app/src/ui/add-repository/create-repository.tsx
@@ -28,7 +28,7 @@ import { Ref } from '../lib/ref'
 import { enableReadmeOverwriteWarning } from '../../lib/feature-flag'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 import { showOpenDialog } from '../main-process-proxy'
-import { pathExists } from '../lib/path-exists'
+import { pathExists } from '../../lib/path-exists'
 import { mkdir } from 'fs/promises'
 import { directoryExists } from '../../lib/directory-exists'
 import { FoldoutType } from '../../lib/app-state'
diff --git a/app/src/ui/dispatcher/error-handlers.ts b/app/src/ui/dispatcher/error-handlers.ts
@@ -18,7 +18,7 @@ import {
 import { hasWritePermission } from '../../models/github-repository'
 import { RetryActionType } from '../../models/retry-actions'
 import { parseFilesToBeOverwritten } from '../lib/parse-files-to-be-overwritten'
-import { pathExists } from '../lib/path-exists'
+import { pathExists } from '../../lib/path-exists'
 import {
   ISecretLocation,
   ISecretScanResult,
diff --git a/app/src/ui/history/selected-commits.tsx b/app/src/ui/history/selected-commits.tsx
@@ -33,7 +33,7 @@ import { IMenuItem } from '../../lib/menu-item'
 import { IChangesetData } from '../../lib/git'
 import { IConstrainedValue } from '../../lib/app-state'
 import { clamp } from '../../lib/clamp'
-import { pathExists } from '../lib/path-exists'
+import { pathExists } from '../../lib/path-exists'
 import { UnreachableCommitsTab } from './unreachable-commits-dialog'
 import { ExpandableCommitSummary } from './expandable-commit-summary'
 import { DiffHeader } from '../diff/diff-header'
diff --git a/app/src/ui/main-process-proxy.ts b/app/src/ui/main-process-proxy.ts
@@ -3,7 +3,7 @@ import { RequestResponseChannels, RequestChannels } from '../lib/ipc-shared'
 import * as ipcRenderer from '../lib/ipc-renderer'
 import { stat } from 'fs/promises'
 import { isApplicationBundle } from '../lib/is-application-bundle'
-import { pathExists } from './lib/path-exists'
+import { pathExists } from '../lib/path-exists'
 
 /**
  * Creates a strongly typed proxy method for sending a duplex IPC message to the
diff --git a/app/src/ui/open-pull-request/pull-request-files-changed.tsx b/app/src/ui/open-pull-request/pull-request-files-changed.tsx
@@ -9,7 +9,7 @@ import { openFile } from '../lib/open-file'
 import { Resizable } from '../resizable'
 import { FileList } from '../history/file-list'
 import { IMenuItem, showContextualMenu } from '../../lib/menu-item'
-import { pathExists } from '../lib/path-exists'
+import { pathExists } from '../../lib/path-exists'
 import {
   CopyFilePathLabel,
   CopyRelativeFilePathLabel,
diff --git a/app/test/unit/git/checkout-test.ts b/app/test/unit/git/checkout-test.ts
@@ -16,7 +16,7 @@ import { Branch, BranchType } from '../../../src/models/branch'
 import { getStatusOrThrow } from '../../helpers/status'
 import { exec } from 'dugite'
 import { TestStatsStore } from '../../helpers/test-stats-store'
-import { pathExists } from '../../../src/ui/lib/path-exists'
+import { pathExists } from '../../../src/lib/path-exists'
 
 describe('git/checkout', () => {
   it('throws when invalid characters are used for branch name', async t => {
diff --git a/app/test/unit/git/commit-test.ts b/app/test/unit/git/commit-test.ts
@@ -2,7 +2,7 @@ import { describe, it, TestContext } from 'node:test'
 import assert from 'node:assert'
 import * as path from 'path'
 import { readFile, unlink, writeFile } from 'fs/promises'
-import { pathExists } from '../../../src/ui/lib/path-exists'
+import { pathExists } from '../../../src/lib/path-exists'
 
 import { Repository } from '../../../src/models/repository'
 import {
diff --git a/app/test/unit/git/gitignore-test.ts b/app/test/unit/git/gitignore-test.ts
@@ -1,7 +1,7 @@
 import { describe, it } from 'node:test'
 import assert from 'node:assert'
 import { readFile, writeFile } from 'fs/promises'
-import { pathExists } from '../../../src/ui/lib/path-exists'
+import { pathExists } from '../../../src/lib/path-exists'
 import * as Path from 'path'
 import { exec } from 'dugite'
 
diff --git a/app/test/unit/ui/component-primitives-test.tsx b/app/test/unit/ui/component-primitives-test.tsx
@@ -61,15 +61,15 @@ describe('component primitives', () => {
       <>
         <FilesChangedBadge filesChangedCount={12} />
         <FilesChangedBadge filesChangedCount={301} />
+        <FilesChangedBadge filesChangedCount={3000} />
       </>
     )
 
     const badges = Array.from(view.container.querySelectorAll('.counter'))
 
     assert.deepEqual(
       badges.map(badge => badge.textContent),
-      // If enableFormattingPreferences() is true, the count is not currently capped at 300
-      ['12', '301']
+      ['12', '301', '3k']
     )
   })
 })
diff --git a/app/test/unit/ui/relative-time-test.tsx b/app/test/unit/ui/relative-time-test.tsx
@@ -68,7 +68,7 @@ describe('RelativeTime', () => {
 
     render(<RelativeTime date={then} onlyRelative={false} tooltip={false} />)
 
-    const absoluteDate = formatDate(then, { time: false, dateStyle: 'medium' })
+    const absoluteDate = formatDate(then, { date: true, time: false })
 
     assert.equal(screen.getByText(absoluteDate).textContent, absoluteDate)
   })
diff --git a/changelog.json b/changelog.json
@@ -1,5 +1,9 @@
 {
   "releases": {
+    "3.5.10": [
+      "[Fixed] Intermittent crash trying to load Copilot models",
+      "[Added] Add date, time, and number formatting preferences to the Appearance settings - #21836"
+    ],
     "3.5.9": [
       "[Fixed] Skip branches checked out in linked worktrees during pruning - #8043. Thanks @KRRT7!",
       "[Fixed] Fix styling of buttons in the commit message area - #22075",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { pathExists } from '../../ui/lib/path-exists'`
	`1`	`+import { pathExists } from '../path-exists'`
`2`	`2`	`import { IFoundEditor } from './found-editor'`
`3`	`3`	`import appPath from 'app-path'`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import { pathExists } from '../helpers/linux'`
`2`		`-`
`3`	`2`	`import { IFoundEditor } from './found-editor'`
`4`	`3`
`5`	`4`	`/** Represents an external editor on Linux */`
Original file line number	Diff line number	Diff line change
`@@ -128,4 +128,4 @@ export const enableHooksEnvironment = () => true`
`128`	`128`
`129`	`129`	`export const enableHooksByDefault = enableBetaFeatures`
`130`	`130`
`131`		`-export const enableFormattingPreferences = enableBetaFeatures`
	`131`	`+export const enableFormattingPreferences = () => true`