starred/orca
1
0
Fork 0
mirror of https://github.com/stablyai/orca.git synced 2026-10-30 16:47:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(persistence): repo writes take the row's identity, never a bare id (#30616)

Browse Source 
* fix(persistence): repo writes take the row's identity, never a bare id

updateRepo(target, updates) now takes Pick<Repo,'id'|'connectionId'|'executionHostId'>
(RepoHostTarget) and resolves the host from it, so a caller that holds the row can no
longer drop its host and write a same-id sibling on another host. The id-only callers
(project host setup controller and IPC handler, folder-to-Git upgrade watch, both
clone paths, registration adoption, fork backfill) pass the row they resolved.

Co-Authored-By: Claude <noreply@anthropic.com>

* test: migrate the remaining Store.updateRepo callers to row targets

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Neil
2026-10-19 00:33:50 -07:00
committed by GitHub
co-authored by Claude
parent cb82bc80da
commit 36ed236394
46 changed files with 380 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/automations/automation-worker-durability.test.ts
+1 -1
View File
@@ -210,7 +210,7 @@ describe('automation background writer durability', () => {
try {
const pending = service.runNow(automation.id)
await acknowledgement.blocked
store.updateRepo('repo-local', { executionHostId: 'runtime:other-host' })
store.updateRepo({ id: 'repo-local' }, { executionHostId: 'runtime:other-host' })
acknowledgement.release()
await expect(pending).resolves.toMatchObject({ status: 'skipped_unavailable' })
expect(dispatcher).not.toHaveBeenCalled()
src/main/folder-repo-git-conversion.ts
+1 -1
View File
@@ -141,7 +141,7 @@ export async function updateProjectHostSetupWithProvenKind(
if (!result?.repo || !proven.folderUpgradeGitRootPath) {
return result
}
const stamped = store.updateRepo(result.repo.id, proven, getRepoExecutionHostId(result.repo))
const stamped = store.updateRepo(result.repo, proven)
return stamped ? { ...result, repo: stamped } : result
},
allowRuntimeHost
src/main/ipc/folder-repo-git-upgrade-lifetime.test.ts
+1 -1
View File
@@ -60,7 +60,7 @@ function begin(repos = [folder()], meta: ReturnType<Store['getAllWorktreeMeta']>
getRepos: () => repos,
getRepo: (id: string) => repos.find((repo) => repo.id === id),
getAllWorktreeMeta: () => meta,
updateRepo: vi.fn((id: string, patch: Partial<Repo>) => {
updateRepo: vi.fn(({ id }: Pick<Repo, 'id'>, patch: Partial<Repo>) => {
const repo = repos.find((row) => row.id === id)
return repo ? Object.assign(repo, patch) : null
})
src/main/ipc/folder-repo-git-upgrade.test.ts
+10 -9
View File
@@ -82,6 +82,7 @@ import {
stopFolderRepoGitUpgradeWatch
} from './folder-repo-git-upgrade'
import { wakeFolderRepoGitUpgradeWatch } from './folder-repo-git-upgrade-wake'
import { repoTarget } from '../persistence/repo-host-target-matcher.test-fixture'
type TestWindow = {
destroyed: boolean
@@ -128,7 +129,7 @@ function makeStore(
getAllWorktreeMeta: () => worktreeMeta,
getRepos: () => repos,
getRepo: vi.fn((id: string) => repos.find((repo) => repo.id === id)),
updateRepo: vi.fn((id: string, updates: Partial<Repo>) => {
updateRepo: vi.fn(({ id }: Pick<Repo, 'id'>, updates: Partial<Repo>) => {
const repo = repos.find((candidate) => candidate.id === id)
if (!repo) {
return null
@@ -199,7 +200,7 @@ describe('folder repo git upgrade watch', () => {
gitInit(repoPath)
await tick()
expect(store.updateRepo).toHaveBeenCalledWith('folder-repo', {
expect(store.updateRepo).toHaveBeenCalledWith(repoTarget('folder-repo'), {
kind: 'git',
folderUpgradeGitRootPath: repoPath.replaceAll('\\', '/'),
externalWorktreeVisibility: 'hide'
@@ -226,7 +227,7 @@ describe('folder repo git upgrade watch', () => {
// A fixed tick wait can finish before the marker stat resolves under load.
await vi.waitFor(
() => {
expect(store.updateRepo).toHaveBeenCalledWith('folder-repo', {
expect(store.updateRepo).toHaveBeenCalledWith(repoTarget('folder-repo'), {
kind: 'git',
folderUpgradeGitRootPath: join(root, 'symlinked-project').replaceAll('\\', '/')
})
@@ -257,7 +258,7 @@ describe('folder repo git upgrade watch', () => {
await tick(2)
expect(store.updateRepo).toHaveBeenCalledWith(
'folder-repo',
repoTarget('folder-repo'),
expect.objectContaining({ kind: 'git' })
)
})
@@ -316,7 +317,7 @@ describe('folder repo git upgrade watch', () => {
await tick(2)
expect(store.updateRepo).toHaveBeenCalledWith(
'folder-repo',
repoTarget('folder-repo'),
expect.objectContaining({ kind: 'git' })
)
})
@@ -349,7 +350,7 @@ describe('folder repo git upgrade watch', () => {
await tick(2)
expect(store.updateRepo).toHaveBeenCalledWith(
'folder-repo',
repoTarget('folder-repo'),
expect.objectContaining({ kind: 'git' })
)
expect(notifyReposChanged).toHaveBeenCalledWith(nextWindow)
@@ -374,7 +375,7 @@ describe('folder repo git upgrade watch', () => {
expect(store.updateRepo).toHaveBeenCalledTimes(1)
expect(store.updateRepo).toHaveBeenCalledWith(
'repo-a',
repoTarget('repo-a'),
expect.objectContaining({ kind: 'git' })
)
})
@@ -434,7 +435,7 @@ describe('folder repo git upgrade watch', () => {
await tick(2)
expect(store.updateRepo).toHaveBeenCalledWith(
'late-repo',
repoTarget('late-repo'),
expect.objectContaining({ kind: 'git' })
)
})
@@ -463,7 +464,7 @@ describe('folder repo git upgrade watch', () => {
await tick()
expect(store.updateRepo).toHaveBeenCalledWith(
'folder-repo',
repoTarget('folder-repo'),
expect.objectContaining({
kind: 'git'
})
src/main/ipc/folder-repo-git-upgrade.ts
+1 -1
View File
@@ -117,7 +117,7 @@ async function upgradeFolderRepo(watch: UpgradeWatch, repoId: string): Promise<U
if (!updates) {
return 'rejected'
}
const upgraded = watch.store.updateRepo(repoId, { kind: 'git', ...updates })
const upgraded = watch.store.updateRepo(latest, { kind: 'git', ...updates })
if (!upgraded) {
return 'upgraded'
}
src/main/ipc/repos-local-add-and-project-setup.test.ts
+9 -5
View File
@@ -28,6 +28,7 @@ import { resetSshProviderAuthorities } from '../ssh/ssh-provider-authority'
import { getGitRepoRoot } from '../git/repo'
import { DEFAULT_REPO_BADGE_COLOR } from '../../shared/constants'
import { createRepoHandlerHarness, resetLocalRepoMocks } from './repos-remote-test-harness'
import { repoTarget } from '../persistence/repo-host-target-matcher.test-fixture'
const {
handleMock,
@@ -262,7 +263,7 @@ describe('repos:add + repos:clone', () => {
setupMethod: 'imported-existing-folder'
})
expect(mockStore.updateRepo).toHaveBeenNthCalledWith(1, existing.id, {
expect(mockStore.updateRepo).toHaveBeenNthCalledWith(1, repoTarget(existing.id), {
upstream: {
owner: 'acme',
repo: 'orca',
@@ -275,7 +276,7 @@ describe('repos:add + repos:clone', () => {
const added: Record<string, unknown>[] = []
mockStore.getRepos.mockImplementation(() => added)
mockStore.addRepo.mockImplementation((repo: Record<string, unknown>) => added.push(repo))
mockStore.updateRepo.mockImplementation((id, updates) => {
mockStore.updateRepo.mockImplementation(({ id }: { id: string }, updates) => {
const repo = added.find((entry) => entry.id === id)
if (!repo) {
return null
@@ -363,6 +364,7 @@ describe('repos:add + repos:clone', () => {
badgeColor: '#22c55e',
worktreeBasePath: '../worktrees'
}
mockStore.getRepo.mockReturnValue(updated)
mockStore.updateRepo.mockReturnValue(updated)
const result = await handlers.get('repos:update')!(null, {
@@ -371,7 +373,7 @@ describe('repos:add + repos:clone', () => {
})
expect(result).toBe(updated)
expect(mockStore.updateRepo).toHaveBeenCalledWith(updated.id, {
expect(mockStore.updateRepo).toHaveBeenCalledWith(repoTarget(updated.id), {
worktreeBasePath: '../worktrees'
})
expect(mockStore.getRepos).not.toHaveBeenCalled()
@@ -388,6 +390,7 @@ describe('repos:add + repos:clone', () => {
badgeColor: '#22c55e',
agentWorktreeVisibility: 'show'
}
mockStore.getRepo.mockReturnValue(updated)
mockStore.updateRepo.mockReturnValue(updated)
const result = await handlers.get('repos:update')!(null, {
@@ -396,7 +399,7 @@ describe('repos:add + repos:clone', () => {
})
expect(result).toBe(updated)
expect(mockStore.updateRepo).toHaveBeenCalledWith(updated.id, {
expect(mockStore.updateRepo).toHaveBeenCalledWith(repoTarget(updated.id), {
agentWorktreeVisibility: 'show'
})
})
@@ -409,6 +412,7 @@ describe('repos:add + repos:clone', () => {
kind: 'git',
badgeColor: '#22c55e'
}
mockStore.getRepo.mockReturnValue(updated)
mockStore.updateRepo.mockReturnValue(updated)
await handlers.get('repos:update')!(null, {
@@ -425,7 +429,7 @@ describe('repos:add + repos:clone', () => {
}
})
expect(mockStore.updateRepo).toHaveBeenCalledWith(updated.id, {
expect(mockStore.updateRepo).toHaveBeenCalledWith(repoTarget(updated.id), {
customWorktreeVisibilitySources: [{ id: 'team', rootPath: '/srv/team' }],
worktreeVisibilitySourcePreferences: {
builtIn: { claude: 'show' },
src/main/ipc/repos-local-clone-lifecycle.test.ts
+2 -1
View File
@@ -38,6 +38,7 @@ import {
resetLocalRepoMocks,
waitForAssertion
} from './repos-remote-test-harness'
import { repoTarget } from '../persistence/repo-host-target-matcher.test-fixture'
const {
handleMock,
@@ -197,7 +198,7 @@ describe('repos:add + repos:clone', () => {
expect(mockStore.updateRepo).not.toHaveBeenCalled()
expect(result).toEqual(current)
} else {
expect(mockStore.updateRepo).toHaveBeenCalledWith(current.id, {
expect(mockStore.updateRepo).toHaveBeenCalledWith(repoTarget(current.id), {
kind: 'git',
folderUpgradeGitRootPath: clonePath,
projectHostSetupMethod: 'cloned'
src/main/ipc/repos-remote-test-harness.ts
+1 -1
View File
@@ -30,7 +30,7 @@ export type ReposIpcMocks = {
| 'getSshTargets',
ReposIpcSpy
> & {
updateRepo: Mock<(repoId: string, updates: Record<string, unknown>) => unknown>
updateRepo: Mock<(target: { id: string }, updates: Record<string, unknown>) => unknown>
}
gitSpawnMock: ReposIpcSpy
gitSpawnAfterWindowsEnvironmentReadyMock: ReposIpcSpy
src/main/ipc/repos/project-host-setup-handlers.ts
+2 -2
View File
@@ -64,7 +64,7 @@ function alignRepoWithRequestedProject(
throw new Error('Imported folder does not match the selected project identity.')
}
// Why: stamp the selected project's provider identity when the folder lacks upstream, so projection can merge it.
const updated = store.updateRepo(repo.id, {
const updated = store.updateRepo(repo, {
upstream: {
owner: identity.owner,
repo: identity.repo,
@@ -77,7 +77,7 @@ function alignRepoWithRequestedProject(
repo = updated
setup = getProjectHostSetupForRepo(store.getProjectHostSetups(), repo)
}
const updated = store.updateRepo(repo.id, { projectHostSetupMethod: setupMethod })
const updated = store.updateRepo(repo, { projectHostSetupMethod: setupMethod })
if (!updated) {
throw new Error(
`Project setup repo disappeared before setup metadata could be linked: ${repo.id}`
src/main/ipc/repos/repo-clone-lifecycle.ts
+1 -1
View File
@@ -264,7 +264,7 @@ export function registerRepoCloneHandlers(mainWindow: BrowserWindow, store: Stor
isFolderRepo(current) &&
getRepoExecutionHostId(current) === getRepoExecutionHostId(existing)
) {
const updated = store.updateRepo(current.id, {
const updated = store.updateRepo(current, {
kind: 'git',
...conversion,
projectHostSetupMethod: 'cloned'
src/main/ipc/repos/repo-update-handler.ts
+13 -11
View File
@@ -2,6 +2,7 @@ import type { BrowserWindow } from 'electron'
import { ipcMain } from 'electron'
import type { Store } from '../../persistence'
import type { Repo } from '../../../shared/repo-types'
import type { RepoHostTarget } from '../../../shared/repo-host-identity'
import { isFolderRepo } from '../../../shared/repo-kind'
import type { ExecutionHostId } from '../../../shared/execution-host'
import { getRepoExecutionHostId, normalizeExecutionHostId } from '../../../shared/execution-host'
@@ -227,26 +228,27 @@ export function registerRepoUpdateHandler(mainWindow: BrowserWindow, store: Stor
if (args.hostId && !hostId) {
return null
}
// Why: some renderer callers send only the id; they keep the first row with it, as before.
const target: RepoHostTarget | undefined = hostId
? { id: args.repoId, executionHostId: hostId }
: store.getRepo(args.repoId)
if (!target) {
return null
}
const write = (proven: Pick<Repo, 'folderUpgradeGitRootPath'>): Repo | null => {
if (isWslMoveSourceHost(args.hostId)) {
assertWslMoveProjectWritable(store, { repoId: args.repoId })
}
return hostId
? store.updateRepo(args.repoId, { ...updates, ...proven }, hostId)
: store.updateRepo(args.repoId, { ...updates, ...proven })
return store.updateRepo(target, { ...updates, ...proven })
}
let updated: Repo | null
if (updates.kind === 'git') {
const target = store
const targetHostId = getRepoExecutionHostId(target)
const row = store
.getRepos()
.find(
(repo) =>
repo.id === args.repoId && (!hostId || getRepoExecutionHostId(repo) === hostId)
)
.find((repo) => repo.id === target.id && getRepoExecutionHostId(repo) === targetHostId)
updated =
target && isFolderRepo(target)
? await commitProvenRepoKindChange(store, target, write)
: write({})
row && isFolderRepo(row) ? await commitProvenRepoKindChange(store, row, write) : write({})
} else {
updated = write({})
}
src/main/managed-server/lifecycle/orcad-runtime-conversion.test.ts
+1 -1
View File
@@ -245,7 +245,7 @@ describe('the source frozen during a conversion', () => {
it('still refuses a catalog change mid-conversion', async () => {
const stage = destination.stage.getMockImplementation()!
destination.stage.mockImplementationOnce(async (manifest) => {
store.updateRepo('repo-1', { displayName: 'Renamed' })
store.updateRepo(store.getRepo('repo-1')!, { displayName: 'Renamed' })
return stage(manifest)
})
await expect(convert()).rejects.toThrow('orcad_migration_source_changed')
src/main/persistence-initial-load.test.ts
+9 -6
View File
@@ -391,13 +391,16 @@ describe('Store', () => {
const store = await createStore()
// A re-probe that now prefers the `upstream` remote rewrites the derived project id.
store.updateRepo('r1', {
gitRemoteIdentity: {
canonicalKey: 'git.example.com/acme/app-upstream',
remoteName: 'upstream',
remoteUrl: 'git@git.example.com:acme/app-upstream.git'
store.updateRepo(
{ id: 'r1' },
{
gitRemoteIdentity: {
canonicalKey: 'git.example.com/acme/app-upstream',
remoteName: 'upstream',
remoteUrl: 'git@git.example.com:acme/app-upstream.git'
}
}
})
)
const upstreamProjectId = 'git:git.example.com/acme/app-upstream'
expect(store.getProjects().map((project) => project.id)).toEqual([upstreamProjectId])
src/main/persistence-jira-project.test.ts
+4 -4
View File
@@ -18,13 +18,13 @@ describe('persisted repository Jira defaults', () => {
it('persists and clears the project default across restart without requiring Git', () => {
const store = createStore()
store.addRepo(makeRepo({ kind: 'folder' }))
expect(store.updateRepo('r1', { defaultJiraProject: project })?.defaultJiraProject).toEqual(
project
)
expect(
store.updateRepo({ id: 'r1' }, { defaultJiraProject: project })?.defaultJiraProject
).toEqual(project)
store.flush()
const reloaded = createStore()
expect(reloaded.getRepo('r1')?.defaultJiraProject).toEqual(project)
reloaded.updateRepo('r1', { defaultJiraProject: null })
reloaded.updateRepo({ id: 'r1' }, { defaultJiraProject: null })
reloaded.flush()
expect(createStore().getRepo('r1')?.defaultJiraProject).toBeNull()
})
src/main/persistence-orcad-repository-cache-reimport.test.ts
+5 -5
View File
@@ -34,7 +34,7 @@ describe('reimporting a repository after the destination resolves its Git identi
async (identity) => {
const store = createStore()
commit(store, manifest())
store.updateRepo(REPOSITORY.id, { gitRemoteIdentity: identity })
store.updateRepo(store.getRepos()[0]!, { gitRemoteIdentity: identity })
await store.flushPendingOrThrowAsync()
await closeTestStores()
const restored = createStore()
@@ -50,7 +50,7 @@ describe('reimporting a repository after the destination resolves its Git identi
it('preserves the current cache when the incoming cache is stale', () => {
const store = createStore()
commit(store, manifest())
store.updateRepo(REPOSITORY.id, { gitRemoteIdentity: remoteIdentity })
store.updateRepo(store.getRepos()[0]!, { gitRemoteIdentity: remoteIdentity })
const next = manifest({
migrationId: 'migration-stale-cache',
payload: { ...manifest().payload, repositories: [{ ...REPOSITORY, gitRemoteIdentity: null }] }
@@ -64,7 +64,7 @@ describe('reimporting a repository after the destination resolves its Git identi
(changes) => {
const store = createStore()
commit(store, manifest())
store.updateRepo(REPOSITORY.id, { gitRemoteIdentity: remoteIdentity })
store.updateRepo(store.getRepos()[0]!, { gitRemoteIdentity: remoteIdentity })
const next = manifest({
migrationId: 'migration-conflict',
payload: { ...manifest().payload, repositories: [{ ...REPOSITORY, ...changes }] }
@@ -91,7 +91,7 @@ describe('reimporting a repository after the destination resolves its Git identi
manifest({ migrationId, payload: { ...manifest().payload, repositories: [source] } })
const store = createStore()
commit(store, withSource('m1'))
store.updateRepo(REPOSITORY.id, { gitRemoteIdentity: remoteIdentity, repoIcon: newIcon })
store.updateRepo(store.getRepos()[0]!, { gitRemoteIdentity: remoteIdentity, repoIcon: newIcon })
expect(commit(store, withSource('m2'))).toMatchObject({ state: 'committed' })
expect(store.getRepos()[0]).toMatchObject({
@@ -103,7 +103,7 @@ describe('reimporting a repository after the destination resolves its Git identi
it('still refuses a changed icon the user chose', () => {
const store = createStore()
commit(store, manifest())
store.updateRepo(REPOSITORY.id, {
store.updateRepo(store.getRepos()[0]!, {
repoIcon: githubAvatarIcon({ owner: 'example', repo: 'project' })
})
const next = manifest({
src/main/persistence-repo-lifecycle.test.ts
+8 -5
View File
@@ -255,10 +255,13 @@ describe('Store', () => {
const group = store.createProjectGroup({ name: 'Platform', createdFrom: 'manual' })
store.addRepo(makeRepo({ id: 'r1', projectGroupId: group.id, projectGroupOrder: 1 }))
const updated = store.updateRepo('r1', {
projectGroupId: '',
projectGroupOrder: Number.POSITIVE_INFINITY
} as never)
const updated = store.updateRepo(
{ id: 'r1' },
{
projectGroupId: '',
projectGroupOrder: Number.POSITIVE_INFINITY
}
)
expect(updated?.projectGroupId).toBeNull()
expect(updated?.projectGroupOrder).toBe(1)
@@ -268,7 +271,7 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo({ id: 'r1' }))
const updated = store.updateRepo('r1', { executionHostId: 'runtime:env-1' })
const updated = store.updateRepo({ id: 'r1' }, { executionHostId: 'runtime:env-1' })
expect(updated?.executionHostId).toBe('runtime:env-1')
expect(store.getRepo('r1')?.executionHostId).toBe('runtime:env-1')
src/main/persistence-update-repo.test.ts
+77 -43
View File
@@ -82,7 +82,7 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo())
const updated = store.updateRepo('r1', { displayName: 'renamed' })
const updated = store.updateRepo({ id: 'r1' }, { displayName: 'renamed' })
expect(updated).not.toBeNull()
expect(updated!.displayName).toBe('renamed')
expect(store.getRepo('r1')!.displayName).toBe('renamed')
@@ -95,14 +95,14 @@ describe('Store', () => {
const initialGeneration = getLocalWorktreeScanGeneration('scan-round-trip')
expect(isLocalWorktreeScanGenerationCurrent('scan-round-trip', initialGeneration)).toBe(true)
const folder = store.updateRepo('scan-round-trip', { kind: 'folder' })
const folder = store.updateRepo({ id: 'scan-round-trip' }, { kind: 'folder' })
expect(folder?.kind).toBe('folder')
expect(isLocalWorktreeScanGenerationCurrent('scan-round-trip', initialGeneration)).toBe(false)
const folderGeneration = getLocalWorktreeScanGeneration('scan-round-trip')
expect(isLocalWorktreeScanGenerationCurrent('scan-round-trip', folderGeneration)).toBe(true)
const git = store.updateRepo('scan-round-trip', { kind: 'git' })
const git = store.updateRepo({ id: 'scan-round-trip' }, { kind: 'git' })
expect(git?.kind).toBe('git')
expect(isLocalWorktreeScanGenerationCurrent('scan-round-trip', folderGeneration)).toBe(false)
})
@@ -119,7 +119,10 @@ describe('Store', () => {
})
)
const updated = store.updateRepo('shared', { displayName: 'Remote renamed' }, 'ssh:server')
const updated = store.updateRepo(
{ id: 'shared', executionHostId: 'ssh:server' },
{ displayName: 'Remote renamed' }
)
expect(updated?.path).toBe('/remote/repo')
expect(store.getRepos().filter((repo) => repo.id === 'shared')).toMatchObject([
@@ -128,15 +131,30 @@ describe('Store', () => {
])
})
it('updateRepo writes the row it was handed, not the first row with that id', async () => {
const store = await createStore()
store.addRepo(makeRepo({ id: 'shared', path: '/remote/repo', connectionId: 'server' }))
store.addRepo(makeRepo({ id: 'shared', path: '/local/repo' }))
const local = store.getRepos().find((repo) => repo.path === '/local/repo')!
const updated = store.updateRepo(local, { displayName: 'Local renamed' })
expect(updated?.path).toBe('/local/repo')
expect(store.getRepos().map((repo) => repo.displayName)).toEqual(['test', 'Local renamed'])
})
it('updateRepo keeps project host setup compatibility records in sync', async () => {
const store = await createStore()
store.addRepo(makeRepo({ worktreeBasePath: '../worktrees' }))
store.updateRepo('r1', {
displayName: 'renamed',
worktreeBasePath: '../new-worktrees',
upstream: { owner: 'stablyai', repo: 'orca' }
})
store.updateRepo(
{ id: 'r1' },
{
displayName: 'renamed',
worktreeBasePath: '../new-worktrees',
upstream: { owner: 'stablyai', repo: 'orca' }
}
)
expect(store.getProjects()).toEqual([
expect.objectContaining({
@@ -176,7 +194,7 @@ describe('Store', () => {
})
const store = await createStore()
store.updateRepo('r1', { displayName: 'renamed' })
store.updateRepo({ id: 'r1' }, { displayName: 'renamed' })
store.reorderRepos(['r1'])
expect(store.getProjects().map((project) => project.id)).toEqual(['repo:r1', 'cloud-project'])
@@ -459,7 +477,7 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo())
store.updateRepo('r1', { projectHostSetupMethod: 'cloned' })
store.updateRepo({ id: 'r1' }, { projectHostSetupMethod: 'cloned' })
expect(store.getRepo('r1')?.projectHostSetupMethod).toBe('cloned')
expect(store.getProjectHostSetups()).toEqual([
@@ -474,13 +492,16 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo())
const updated = store.updateRepo('r1', {
repoIcon: {
type: 'image',
source: 'upload',
src: 'data:image/svg+xml;base64,PHN2Zz48L3N2Zz4='
} as never
})
const updated = store.updateRepo(
{ id: 'r1' },
{
repoIcon: {
type: 'image',
source: 'upload',
src: 'data:image/svg+xml;base64,PHN2Zz48L3N2Zz4='
} as never
}
)
expect(updated).not.toBeNull()
expect(updated!.repoIcon).toBeUndefined()
@@ -491,7 +512,7 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo())
const updated = store.updateRepo('r1', { badgeColor: ' ABCDEF ' })
const updated = store.updateRepo({ id: 'r1' }, { badgeColor: ' ABCDEF ' })
expect(updated!.badgeColor).toBe('#abcdef')
expect(store.getRepo('r1')!.badgeColor).toBe('#abcdef')
@@ -501,7 +522,7 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo({ badgeColor: '#123456' }))
const updated = store.updateRepo('r1', { badgeColor: 'blue' })
const updated = store.updateRepo({ id: 'r1' }, { badgeColor: 'blue' })
expect(updated!.badgeColor).toBe('#123456')
expect(store.getRepo('r1')!.badgeColor).toBe('#123456')
@@ -527,12 +548,15 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo())
const updated = store.updateRepo('r1', {
upstream: { owner: ' stablyai ', repo: ' orca ' }
})
const updated = store.updateRepo(
{ id: 'r1' },
{
upstream: { owner: ' stablyai ', repo: ' orca ' }
}
)
expect(updated!.upstream).toEqual({ owner: 'stablyai', repo: 'orca' })
store.updateRepo('r1', { upstream: null })
store.updateRepo({ id: 'r1' }, { upstream: null })
store.flush()
const reloaded = await createStore()
expect(reloaded.getRepo('r1')!.upstream).toBeNull()
@@ -542,20 +566,23 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo())
const updated = store.updateRepo('r1', {
gitRemoteIdentity: {
canonicalKey: 'gitlab.example.com/team/orca',
remoteName: 'origin',
remoteUrl: 'git@gitlab.example.com:team/orca.git'
const updated = store.updateRepo(
{ id: 'r1' },
{
gitRemoteIdentity: {
canonicalKey: 'gitlab.example.com/team/orca',
remoteName: 'origin',
remoteUrl: 'git@gitlab.example.com:team/orca.git'
}
}
})
)
expect(updated!.gitRemoteIdentity).toEqual({
canonicalKey: 'gitlab.example.com/team/orca',
remoteName: 'origin',
remoteUrl: 'git@gitlab.example.com:team/orca.git'
})
store.updateRepo('r1', { gitRemoteIdentity: null })
store.updateRepo({ id: 'r1' }, { gitRemoteIdentity: null })
store.flush()
const reloaded = await createStore()
expect(reloaded.getRepo('r1')!.gitRemoteIdentity).toBeNull()
@@ -573,9 +600,12 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo())
const updated = store.updateRepo('r1', {
upstream: { owner: ' acme ', repo: ' widgets ', host: ' GHE.example:8443 ' }
})
const updated = store.updateRepo(
{ id: 'r1' },
{
upstream: { owner: ' acme ', repo: ' widgets ', host: ' GHE.example:8443 ' }
}
)
expect(updated!.upstream).toEqual({
owner: 'acme',
repo: 'widgets',
@@ -608,14 +638,14 @@ describe('Store', () => {
it('updateRepo returns null for nonexistent id', async () => {
const store = await createStore()
expect(store.updateRepo('nope', { displayName: 'x' })).toBeNull()
expect(store.updateRepo({ id: 'nope' }, { displayName: 'x' })).toBeNull()
})
it('updateRepo persists issueSourcePreference across reloads', async () => {
const store = await createStore()
store.addRepo(makeRepo())
const updated = store.updateRepo('r1', { issueSourcePreference: 'upstream' })
const updated = store.updateRepo({ id: 'r1' }, { issueSourcePreference: 'upstream' })
expect(updated!.issueSourcePreference).toBe('upstream')
store.flush()
@@ -627,16 +657,19 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo())
const updated = store.updateRepo('r1', {
ghAccount: { host: ' GitHub.COM ', user: ' Alice ' }
})
const updated = store.updateRepo(
{ id: 'r1' },
{
ghAccount: { host: ' GitHub.COM ', user: ' Alice ' }
}
)
expect(updated!.ghAccount).toEqual({ host: 'github.com', user: 'Alice' })
store.flush()
const reloaded = await createStore()
expect(reloaded.getRepo('r1')!.ghAccount).toEqual({ host: 'github.com', user: 'Alice' })
const cleared = reloaded.updateRepo('r1', { ghAccount: null })
const cleared = reloaded.updateRepo({ id: 'r1' }, { ghAccount: null })
expect(cleared!.ghAccount).toBeUndefined()
})
@@ -644,7 +677,7 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo())
const updated = store.updateRepo('r1', { forkSyncMode: 'safe-auto' })
const updated = store.updateRepo({ id: 'r1' }, { forkSyncMode: 'safe-auto' })
expect(updated!.forkSyncMode).toBe('safe-auto')
store.flush()
@@ -656,7 +689,8 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo({ forkSyncMode: 'ask' }))
const updated = store.updateRepo('r1', { forkSyncMode: 'always' as never })
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: feeds the sanitizer a value its type forbids, on purpose.
const updated = store.updateRepo({ id: 'r1' }, { forkSyncMode: 'always' as never })
expect(updated!.forkSyncMode).toBe('ask')
@@ -683,7 +717,7 @@ describe('Store', () => {
expect(store.getRepo('r1')!.issueSourcePreference).toBe('origin')
// Why: `Object.assign` skips undefined, so updateRepo needs an explicit delete branch or the key with value undefined wouldn't clear.
store.updateRepo('r1', { issueSourcePreference: undefined })
store.updateRepo({ id: 'r1' }, { issueSourcePreference: undefined })
expect(store.getRepo('r1')!.issueSourcePreference).toBeUndefined()
store.flush()
src/main/persistence-worktree-visibility.test.ts
+54 -41
View File
@@ -75,7 +75,7 @@ describe('Store', () => {
})
)
const updated = store.updateRepo('r1', { externalWorktreeVisibility: 'hide' })
const updated = store.updateRepo({ id: 'r1' }, { externalWorktreeVisibility: 'hide' })
expect(updated!.externalWorktreeVisibility).toBe('hide')
expect(updated!.externalWorktreeVisibilityLegacy).toBe(true)
@@ -172,7 +172,7 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo({ externalWorktreeVisibility: 'hide' }))
const updated = store.updateRepo('r1', { agentWorktreeVisibility: 'show' })
const updated = store.updateRepo({ id: 'r1' }, { agentWorktreeVisibility: 'show' })
expect(updated).toMatchObject({
externalWorktreeVisibility: 'hide',
@@ -197,16 +197,19 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo())
const updated = store.updateRepo('r1', {
customWorktreeVisibilitySources: [
{ id: 'team', rootPath: ' /srv/team-worktrees ' },
{ id: 'invalid', rootPath: '../relative' }
],
worktreeVisibilitySourcePreferences: {
builtIn: { claude: 'show', gsd: 'hide' },
custom: { team: 'show' }
const updated = store.updateRepo(
{ id: 'r1' },
{
customWorktreeVisibilitySources: [
{ id: 'team', rootPath: ' /srv/team-worktrees ' },
{ id: 'invalid', rootPath: '../relative' }
],
worktreeVisibilitySourcePreferences: {
builtIn: { claude: 'show', gsd: 'hide' },
custom: { team: 'show' }
}
}
})
)
expect(updated).toMatchObject({
customWorktreeVisibilitySources: [{ id: 'team', rootPath: '/srv/team-worktrees' }],
@@ -232,7 +235,7 @@ describe('Store', () => {
})
)
const updated = store.updateRepo('r1', { externalWorktreeVisibility: null })
const updated = store.updateRepo({ id: 'r1' }, { externalWorktreeVisibility: null })
expect(updated?.externalWorktreeVisibility).toBeUndefined()
expect(updated?.externalWorktreeVisibilityLegacy).toBe(false)
@@ -281,10 +284,13 @@ describe('Store', () => {
})
)
store.updateRepo('r1', {
issueSourcePreference: undefined,
sourceControlAi: undefined
})
store.updateRepo(
{ id: 'r1' },
{
issueSourcePreference: undefined,
sourceControlAi: undefined
}
)
expect(store.getRepo('r1')!.issueSourcePreference).toBeUndefined()
expect(store.getRepo('r1')!.sourceControlAi).toBeUndefined()
@@ -306,9 +312,12 @@ describe('Store', () => {
})
)
store.updateRepo('r1', {
sourceControlAi: null
})
store.updateRepo(
{ id: 'r1' },
{
sourceControlAi: null
}
)
expect(store.getRepo('r1')!.sourceControlAi).toBeUndefined()
@@ -321,29 +330,32 @@ describe('Store', () => {
const store = await createStore()
store.addRepo(makeRepo())
const updated = store.updateRepo('r1', {
sourceControlAi: {
instructionsByOperation: {
commitMessage: 'Repo style',
pullRequest: 42,
unknown: 'ignored'
},
prCreationDefaults: {
draft: true,
useTemplate: null,
openAfterCreate: 'yes'
},
modelOverridesByOperation: {
commitMessage: {
selectedModelByAgent: { codex: 'gpt-5.4', claude: false },
selectedThinkingByModel: { 'gpt-5.4': 'high', bad: true }
const updated = store.updateRepo(
{ id: 'r1' },
{
sourceControlAi: {
instructionsByOperation: {
commitMessage: 'Repo style',
pullRequest: 42,
unknown: 'ignored'
},
unknown: {
selectedModelByAgent: { codex: 'ignored' }
prCreationDefaults: {
draft: true,
useTemplate: null,
openAfterCreate: 'yes'
},
modelOverridesByOperation: {
commitMessage: {
selectedModelByAgent: { codex: 'gpt-5.4', claude: false },
selectedThinkingByModel: { 'gpt-5.4': 'high', bad: true }
},
unknown: {
selectedModelByAgent: { codex: 'ignored' }
}
}
}
} as never
})
} as never
}
)
expect(updated!.sourceControlAi).toEqual({
instructionsByOperation: {
@@ -377,7 +389,8 @@ describe('Store', () => {
})
)
const updated = store.updateRepo('r1', { sourceControlAi: 'bad' as never })
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: feeds the sanitizer a value its type forbids, on purpose.
const updated = store.updateRepo({ id: 'r1' }, { sourceControlAi: 'bad' as never })
expect(updated!.sourceControlAi).toEqual({
instructionsByOperation: { commitMessage: 'Keep me' },
src/main/persistence/loading-store/repo-lifecycle-operations.ts
+5 -5
View File
@@ -1,6 +1,7 @@
import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
import type { ProjectHostSetup, ProjectHostSetupUpdateArgs } from '../../../shared/project-types'
import type { Repo } from '../../../shared/repo-types'
import type { RepoHostTarget } from '../../../shared/repo-host-identity'
import type { GhAccountBinding } from '../../../shared/github/account-binding'
import {
removeRepoFromHostWorkspaceSessions,
@@ -151,7 +152,7 @@ export class RepoLifecycleOperations {
}
updateRepo(
id: string,
target: RepoHostTarget,
updates: Partial<
Pick<
Repo,
@@ -185,10 +186,9 @@ export class RepoLifecycleOperations {
sourceControlAi?: Repo['sourceControlAi'] | null
externalWorktreeDiscoverySuppressedAt?: Repo['externalWorktreeDiscoverySuppressedAt'] | null
ghAccount?: GhAccountBinding | null
},
hostId?: ExecutionHostId
}
): Repo | null {
return getRepoUpdateOperations(this).updateRepo(id, updates, hostId)
return getRepoUpdateOperations(this).updateRepo(target, updates)
}
}
@@ -274,7 +274,7 @@ export function getProjectHostSetupOperations(
owner[repoLifecycleOperationsContext].runtime.projectHostSetupOperations ??=
new ProjectHostSetupPersistenceOperations({
state: owner[repoLifecycleOperationsContext].runtime.state,
updateRepo: (id, updates, hostId) => owner.updateRepo(id, updates, hostId),
updateRepo: (target, updates) => owner.updateRepo(target, updates),
scheduleSave: () => scheduleSave(owner[repoLifecycleOperationsContext].scheduling)
})
return owner[repoLifecycleOperationsContext].runtime.projectHostSetupOperations
src/main/persistence/repo-host-target-matcher.test-fixture.ts
+12
View File
@@ -0,0 +1,12 @@
import { getRepoExecutionHostId, type ExecutionHostId } from '../../shared/execution-host'
import type { RepoHostTarget } from '../../shared/repo-host-identity'
/** Matches an `updateRepo` target for `id` on `hostId`, however the target spells its host. */
export function repoTarget(id: string, hostId: ExecutionHostId = 'local') {
return {
asymmetricMatch: (target: RepoHostTarget) =>
target?.id === id && getRepoExecutionHostId(target) === hostId,
toString: () => `repoTarget(${id}, ${hostId})`,
toAsymmetricMatcher: () => `repoTarget(${id}, ${hostId})`
}
}
src/main/persistence/tracking-repos/project-host-setup-update.ts
+1 -1
View File
@@ -56,7 +56,7 @@ export class ProjectHostSetupPersistenceOperations {
repoUpdates.projectHostSetupMethod = updates.setupMethod
}
const updatedRepo =
Object.keys(repoUpdates).length > 0 ? this.updateRepo(repo.id, repoUpdates) : repo
Object.keys(repoUpdates).length > 0 ? this.updateRepo(repo, repoUpdates) : repo
if (!updatedRepo) {
return null
}
src/main/persistence/tracking-repos/repo-update-host-guard.test.ts
+35 -10
View File
@@ -42,7 +42,10 @@ describe('updateRepo host guard', () => {
makeRepo({ id: 'repo-1', executionHostId: 'runtime:env-1' })
])
const result = operations.updateRepo('repo-1', { displayName: 'Renamed' }, 'local')
const result = operations.updateRepo(
{ id: 'repo-1', executionHostId: 'local' },
{ displayName: 'Renamed' }
)
expect(result).toBeNull()
expect(scheduleSave).not.toHaveBeenCalled()
@@ -57,7 +60,12 @@ describe('updateRepo host guard', () => {
makeRepo({ id: 'repo-1', executionHostId: 'runtime:env-1' })
])
expect(operations.updateRepo('repo-missing', { displayName: 'Renamed' }, 'local')).toBeNull()
expect(
operations.updateRepo(
{ id: 'repo-missing', executionHostId: 'local' },
{ displayName: 'Renamed' }
)
).toBeNull()
expect(errors).toEqual([])
})
@@ -66,7 +74,10 @@ describe('updateRepo host guard', () => {
makeRepo({ id: 'repo-1', executionHostId: 'runtime:env-1' })
])
const result = operations.updateRepo('repo-1', { displayName: 'Renamed' }, 'runtime:env-1')
const result = operations.updateRepo(
{ id: 'repo-1', executionHostId: 'runtime:env-1' },
{ displayName: 'Renamed' }
)
expect(result?.displayName).toBe('Renamed')
expect(state.repos[0].displayName).toBe('Renamed')
@@ -79,20 +90,34 @@ describe('updateRepo host guard', () => {
const peer = makeRepo({ id: 'repo-1', displayName: 'Peer', executionHostId: 'ssh:peer' })
const { operations, state } = makeOperations([local, peer])
const result = operations.updateRepo('repo-1', { displayName: 'Local edit' }, 'local')
const result = operations.updateRepo(
{ id: 'repo-1', executionHostId: 'local' },
{ displayName: 'Local edit' }
)
expect(result?.displayName).toBe('Local edit')
// The peer's row is untouched: a client-local write must never repair another host's metadata.
expect(state.repos[1].displayName).toBe('Peer')
})
it('writes without a host argument exactly as before', () => {
const { operations, state } = makeOperations([
makeRepo({ id: 'repo-1', executionHostId: 'runtime:env-1' })
])
it('reads a target without host fields as the local row, never the first same-id row', () => {
const peer = makeRepo({ id: 'repo-1', displayName: 'Peer', connectionId: 'peer' })
const local = makeRepo({ id: 'repo-1', displayName: 'Local' })
const { operations, state } = makeOperations([peer, local])
expect(operations.updateRepo('repo-1', { displayName: 'Renamed' })?.displayName).toBe('Renamed')
expect(state.repos[0].displayName).toBe('Renamed')
operations.updateRepo({ id: 'repo-1' }, { displayName: 'Renamed' })
expect(state.repos.map((repo) => repo.displayName)).toEqual(['Peer', 'Renamed'])
})
it('addresses an SSH row through its connectionId alone', () => {
const local = makeRepo({ id: 'repo-1', displayName: 'Local' })
const peer = makeRepo({ id: 'repo-1', displayName: 'Peer', connectionId: 'peer' })
const { operations, state } = makeOperations([local, peer])
operations.updateRepo(peer, { displayName: 'Peer edit' })
expect(state.repos.map((repo) => repo.displayName)).toEqual(['Local', 'Peer edit'])
expect(errors).toEqual([])
})
})
src/main/persistence/tracking-repos/repo-update-operations.ts
+10 -9
View File
@@ -1,6 +1,7 @@
import type { PersistedState } from '../../../shared/persisted-state-types'
import type { Repo } from '../../../shared/repo-types'
import type { ExecutionHostId } from '../../../shared/execution-host'
import type { RepoHostTarget } from '../../../shared/repo-host-identity'
import { getRepoExecutionHostId } from '../../../shared/execution-host'
import { isLegacyRepoForExternalWorktreeVisibility } from '../../../shared/external-worktree-visibility'
import { normalizeRepoSourceControlAiOverrides } from '../../../shared/source-control-ai'
@@ -30,11 +31,8 @@ export type RepoUpdateMutationOperations = {
export function findRepoRowForHostScopedWrite(
repos: readonly Repo[],
id: string,
hostId: ExecutionHostId | undefined
hostId: ExecutionHostId
): Repo | undefined {
if (!hostId) {
return repos.find((candidate) => candidate.id === id)
}
const matched = repos.find(
(candidate) => candidate.id === id && getRepoExecutionHostId(candidate) === hostId
)
@@ -97,7 +95,7 @@ export class RepoUpdatePersistenceOperations {
}
updateRepo(
id: string,
target: RepoHostTarget,
updates: Partial<
Pick<
Repo,
@@ -131,10 +129,13 @@ export class RepoUpdatePersistenceOperations {
sourceControlAi?: Repo['sourceControlAi'] | null
externalWorktreeDiscoverySuppressedAt?: Repo['externalWorktreeDiscoverySuppressedAt'] | null
ghAccount?: GhAccountBinding | null
},
hostId?: ExecutionHostId
}
): Repo | null {
const repo = findRepoRowForHostScopedWrite(this.state.repos, id, hostId)
const repo = findRepoRowForHostScopedWrite(
this.state.repos,
target.id,
getRepoExecutionHostId(target)
)
if (!repo) {
return null
}
@@ -260,7 +261,7 @@ export class RepoUpdatePersistenceOperations {
}
}
Object.assign(repo, sanitizedUpdates)
this.bumpLocalWorktreeScanGeneration(id)
this.bumpLocalWorktreeScanGeneration(repo.id)
this.syncProjectHostSetupCompatibilityState()
this.scheduleSave()
return this.hydrateRepo(repo)
src/main/repo-backfill-wsl-move.test.ts
+6 -3
View File
@@ -2,8 +2,9 @@ import { mkdtempSync, rmSync } from 'node:fs'
import { tmpdir } from 'node:os'
import { join } from 'node:path'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { getRepoExecutionHostId, type ExecutionHostId } from '../shared/execution-host'
import { getRepoExecutionHostId } from '../shared/execution-host'
import type { Repo } from '../shared/repo-types'
import type { RepoHostTarget } from '../shared/repo-host-identity'
import { closeTestStores, createStore, testState } from './persistence-test-harness'
import { wslMoveCutoverFixture as cutover } from './persistence/__fixtures__/wsl-mover/wsl-move-cutover-fixture'
import { seedWslMoveCutover } from './persistence/__fixtures__/wsl-mover/wsl-move-journal-seeding'
@@ -69,9 +70,11 @@ describe('git remote identity enrichment under a WSL move', () => {
]
const store = {
getRepos: () => rows,
updateRepo: (id: string, updates: Partial<Repo>, hostId?: ExecutionHostId) => {
updateRepo: (target: RepoHostTarget, updates: Partial<Repo>) => {
const row = rows.find(
(candidate) => candidate.id === id && getRepoExecutionHostId(candidate) === hostId
(candidate) =>
candidate.id === target.id &&
getRepoExecutionHostId(candidate) === getRepoExecutionHostId(target)
)
return row ? Object.assign(row, updates) : null
}
src/main/repo-git-remote-avatar-refresh.test.ts
+16 -15
View File
@@ -4,6 +4,8 @@ import { deriveGitRemoteIdentity } from '../shared/git-remote-identity'
import { projectHostSetupProjectionFromRepos } from '../shared/project-host-setup-projection'
import { githubAvatarIcon, type RepoIcon } from '../shared/repo-icon'
import type { Repo } from '../shared/repo-types'
import type { RepoHostTarget } from '../shared/repo-host-identity'
import { repoTarget } from './persistence/repo-host-target-matcher.test-fixture'
import { probeGitRemoteIdentity, type GitRemoteIdentityProbe } from './repo-git-remote-identity'
import {
enrichMissingRepoGitRemoteIdentities,
@@ -39,8 +41,8 @@ function repo(overrides: Partial<Repo> = {}): Repo {
function storeFor(repos: Repo[]) {
const getRepo = (id: string, hostId?: ExecutionHostId) =>
repos.find((row) => row.id === id && (!hostId || getRepoExecutionHostId(row) === hostId))
const updateRepo = vi.fn((id: string, updates: Partial<Repo>, hostId?: ExecutionHostId) => {
const current = getRepo(id, hostId)
const updateRepo = vi.fn((target: RepoHostTarget, updates: Partial<Repo>) => {
const current = getRepo(target.id, getRepoExecutionHostId(target))
if (!current) {
return null
}
@@ -223,11 +225,9 @@ it('repairs only the matching owner when repo IDs and paths collide across hosts
const store = storeFor([local, ssh])
vi.mocked(probeGitRemoteIdentity).mockResolvedValue({ status: 'resolved', identity: identity() })
await refresh(store)
expect(store.updateRepo).toHaveBeenCalledWith(
'app',
{ repoIcon: githubAvatarIcon({ owner: 'org-b', repo: 'app' }) },
'ssh:build'
)
expect(store.updateRepo).toHaveBeenCalledWith(repoTarget('app', 'ssh:build'), {
repoIcon: githubAvatarIcon({ owner: 'org-b', repo: 'app' })
})
expect(projectHostSetupProjectionFromRepos([local, ssh]).projects).toHaveLength(1)
})
@@ -250,11 +250,10 @@ it('keeps local metadata writes scoped when a same-id ssh:build row comes first'
expect(foreign.repoIcon).toBe(foreignIcon)
expect(local.gitRemoteIdentity).toEqual(identity())
expect(local.repoIcon).toEqual(githubAvatarIcon({ owner: 'org-b', repo: 'app' }))
expect(store.updateRepo).toHaveBeenCalledExactlyOnceWith(
'app',
{ gitRemoteIdentity: identity(), repoIcon: local.repoIcon },
'local'
)
expect(store.updateRepo).toHaveBeenCalledExactlyOnceWith(repoTarget('app', 'local'), {
gitRemoteIdentity: identity(),
repoIcon: local.repoIcon
})
})
// Why this row is repaired where the `ssh:build` one above is not: a `runtime:` stamp reaches this
@@ -282,8 +281,8 @@ it('repairs a same-id runtime-addressed row under its own stamp', async () => {
}
expect(runtimeRow).toMatchObject(repaired)
expect(local).toMatchObject(repaired)
expect(store.updateRepo).toHaveBeenCalledWith('app', repaired, 'runtime:env-a')
expect(store.updateRepo).toHaveBeenCalledWith('app', repaired, 'local')
expect(store.updateRepo).toHaveBeenCalledWith(repoTarget('app', 'runtime:env-a'), repaired)
expect(store.updateRepo).toHaveBeenCalledWith(repoTarget('app', 'local'), repaired)
})
it('does not write after a pending local probe becomes peer-owned', async () => {
@@ -328,7 +327,9 @@ it('does not overwrite a custom icon selected while the probe is pending', async
answer({ status: 'resolved', identity: identity() })
await flushRepoGitRemoteIdentityEnrichmentForTests()
expect(row.repoIcon).toBe(selected)
expect(store.updateRepo).toHaveBeenCalledWith('app', { gitRemoteIdentity: identity() }, 'local')
expect(store.updateRepo).toHaveBeenCalledWith(repoTarget('app', 'local'), {
gitRemoteIdentity: identity()
})
})
it('never probes folder workspaces for an avatar repair', async () => {
src/main/repo-git-remote-identity-enrichment.test.ts
+27 -29
View File
@@ -1,7 +1,9 @@
import { afterEach, describe, expect, it, vi } from 'vitest'
import { getRepoExecutionHostId, type ExecutionHostId } from '../shared/execution-host'
import { getRepoExecutionHostId } from '../shared/execution-host'
import type { GitRemoteIdentity } from '../shared/git-remote-identity'
import type { Repo } from '../shared/repo-types'
import type { RepoHostTarget } from '../shared/repo-host-identity'
import { repoTarget } from './persistence/repo-host-target-matcher.test-fixture'
import { type GitRemoteIdentityProbe, probeGitRemoteIdentity } from './repo-git-remote-identity'
import {
enrichMissingRepoGitRemoteIdentities,
@@ -17,9 +19,8 @@ type RepoIdentityStore = {
getRepos: () => Repo[]
getRepo: (id: string) => Repo | undefined
updateRepo: (
id: string,
updates: Pick<Partial<Repo>, 'gitRemoteIdentity'>,
hostId?: ExecutionHostId
target: RepoHostTarget,
updates: Pick<Partial<Repo>, 'gitRemoteIdentity'>
) => Repo | null
}
@@ -47,18 +48,19 @@ function makeStore(...repos: Repo[]): RepoIdentityStore & { updateRepo: ReturnTy
return {
getRepos: () => repos,
getRepo: (id) => repos.find((candidate) => candidate.id === id),
// Mirrors the real store: `hostId` is matched against the row's own stamp, so a write
// addressed to the wrong host finds no row (src/main/persistence/tracking-repos).
updateRepo: vi.fn((id, updates, hostId) => {
const target = repos.find(
// Mirrors the real store: the target's host is matched against the row's own stamp, so a
// write addressed to the wrong host finds no row (src/main/persistence/tracking-repos).
updateRepo: vi.fn((target: RepoHostTarget, updates) => {
const row = repos.find(
(candidate) =>
candidate.id === id && (!hostId || getRepoExecutionHostId(candidate) === hostId)
candidate.id === target.id &&
getRepoExecutionHostId(candidate) === getRepoExecutionHostId(target)
)
if (!target) {
if (!row) {
return null
}
Object.assign(target, updates)
return target
Object.assign(row, updates)
return row
})
}
}
@@ -170,11 +172,9 @@ describe('enrichMissingRepoGitRemoteIdentities', () => {
'local',
expect.objectContaining({ signal: expect.any(AbortSignal) })
)
expect(store.updateRepo).toHaveBeenCalledWith(
'repo-1',
{ gitRemoteIdentity: remoteIdentity },
'runtime:env-a'
)
expect(store.updateRepo).toHaveBeenCalledWith(repoTarget('repo-1', 'runtime:env-a'), {
gitRemoteIdentity: remoteIdentity
})
expect(repo.gitRemoteIdentity).toEqual(remoteIdentity)
})
@@ -238,7 +238,9 @@ describe('enrichMissingRepoGitRemoteIdentities', () => {
enrichMissingRepoGitRemoteIdentities(store)
await flushRepoGitRemoteIdentityEnrichmentForTests()
expect(store.updateRepo).toHaveBeenCalledWith('repo-1', { gitRemoteIdentity: null }, 'local')
expect(store.updateRepo).toHaveBeenCalledWith(repoTarget('repo-1', 'local'), {
gitRemoteIdentity: null
})
expect(repo.gitRemoteIdentity).toBeNull()
})
@@ -273,11 +275,9 @@ describe('enrichMissingRepoGitRemoteIdentities', () => {
enrichMissingRepoGitRemoteIdentities(store)
await flushRepoGitRemoteIdentityEnrichmentForTests()
expect(store.updateRepo).toHaveBeenCalledWith(
'repo-1',
{ gitRemoteIdentity: remoteIdentity },
'local'
)
expect(store.updateRepo).toHaveBeenCalledWith(repoTarget('repo-1', 'local'), {
gitRemoteIdentity: remoteIdentity
})
})
it('does not re-probe a resolved identity before the refresh window elapses', async () => {
@@ -330,11 +330,9 @@ describe('enrichMissingRepoGitRemoteIdentities', () => {
enrichMissingRepoGitRemoteIdentities(store, { onChanged })
await drainEnrichmentSweep()
expect(store.updateRepo).toHaveBeenCalledWith(
'repo-1',
{ gitRemoteIdentity: movedIdentity },
'local'
)
expect(store.updateRepo).toHaveBeenCalledWith(repoTarget('repo-1', 'local'), {
gitRemoteIdentity: movedIdentity
})
expect(repo.gitRemoteIdentity).toEqual(movedIdentity)
expect(onChanged).toHaveBeenCalledTimes(1)
})
@@ -502,7 +500,7 @@ describe('retiring probes for removed repos', () => {
return {
getRepos: () => live,
getRepo: (id) => live.find((candidate) => candidate.id === id),
updateRepo: vi.fn((id, updates) => {
updateRepo: vi.fn(({ id }: RepoHostTarget, updates) => {
const target = live.find((candidate) => candidate.id === id)
if (!target) {
return null
src/main/repo-git-remote-identity-enrichment.ts
+6 -7
View File
@@ -5,6 +5,7 @@ import {
type ExecutionHostId
} from '../shared/execution-host'
import type { Repo } from '../shared/repo-types'
import type { RepoHostTarget } from '../shared/repo-host-identity'
import { githubAvatarIcon, type RepoIcon } from '../shared/repo-icon'
import { isUnresolvedSshHostAlias } from '../shared/git-remote-host-alias'
import { getProjectProviderIdentity } from '../shared/project-host-setup-projection'
@@ -28,9 +29,8 @@ type RepoIdentityStore = {
getRepos(): Repo[]
getRepo?(id: string, hostId?: ExecutionHostId): Repo | undefined
updateRepo(
id: string,
updates: Pick<Partial<Repo>, 'gitRemoteIdentity' | 'repoIcon'>,
hostId?: ExecutionHostId
target: RepoHostTarget,
updates: Pick<Partial<Repo>, 'gitRemoteIdentity' | 'repoIcon'>
): Repo | null
}
@@ -145,11 +145,10 @@ function writeIdentity(
const icon = gitRemoteIdentity
? getAutomaticGitHubIconRefresh(current, gitRemoteIdentity)
: undefined
// The row's own host, not the probe's: the store matches this argument against the row's stamp,
// so a `runtime:` row probed locally is only addressable here under that stamp.
const storeHostId = getRepoExecutionHostId(snapshot)
// The row's own identity, not the probe's host: a `runtime:` row probed locally is only
// addressable under its own stamp.
const update = (updates: Pick<Partial<Repo>, 'gitRemoteIdentity' | 'repoIcon'>): Repo | null => {
return store.updateRepo(snapshot.id, updates, storeHostId)
return store.updateRepo(snapshot, updates)
}
if (icon) {
return !!update({ ...(writeRemote ? { gitRemoteIdentity } : {}), repoIcon: icon })
src/main/runtime/acknowledged-terminal-tab-retirement.test.ts
+1 -1
View File
@@ -139,7 +139,7 @@ it('rechecks current pins after renderer acknowledgement', async () => {
it('keeps persistence writable when worktree teardown finds remaining terminal rows', async () => {
const f = fixture()
f.store.updateRepo('repo1', { executionHostId: 'ssh:target' })
f.store.updateRepo({ id: 'repo1' }, { executionHostId: 'ssh:target' })
f.store.setWorktreeMeta(ACK_WORKTREE, { hostId: 'ssh:target' })
f.store.setWorkspaceSession(f.store.getWorkspaceSession(), 'ssh:target')
vi.spyOn(f.runtime, 'closeMobileSessionTab').mockResolvedValue(delegatedMobileSessionTabClose())
src/main/runtime/orca-runtime-test-fixtures.spec.ts
+1 -1
View File
@@ -406,7 +406,7 @@ const store = {
getRetiredWorktreeNameRegistry: () => ({ exhaustedTiers: 0, names: [] }),
mergeRetiredWorktreeNames: () => false,
addRepo: () => {},
updateRepo: (id: string, updates: Record<string, unknown>) =>
updateRepo: ({ id }: { id: string }, updates: Record<string, unknown>) =>
({
...store.getRepo(id),
...updates
src/main/runtime/orca-runtime-tests/repository-project-operations-part-02.spec.ts
+3 -3
View File
@@ -43,7 +43,7 @@ describe('OrcaRuntimeService', () => {
repos.push(repo)
},
getRepo: (id: string) => repos.find((repo) => repo.id === id) as never,
updateRepo: (id: string, updates: Record<string, unknown>) => {
updateRepo: ({ id }: { id: string }, updates: Record<string, unknown>) => {
const index = repos.findIndex((repo) => repo.id === id)
if (index === -1) {
return null
@@ -123,7 +123,7 @@ describe('OrcaRuntimeService', () => {
repos.push(repo)
},
getRepo: (id: string) => repos.find((repo) => repo.id === id) as never,
updateRepo: (id: string, updates: Record<string, unknown>) => {
updateRepo: ({ id }: { id: string }, updates: Record<string, unknown>) => {
const index = repos.findIndex((repo) => repo.id === id)
if (index === -1) {
return null
@@ -379,7 +379,7 @@ describe('OrcaRuntimeService', () => {
const colorStore = {
...store,
getRepos: () => [existing],
updateRepo: (id: string, repoUpdates: Record<string, unknown>) => {
updateRepo: ({ id }: { id: string }, repoUpdates: Record<string, unknown>) => {
updates.push({ id, updates: repoUpdates })
return upgraded as never
}
src/main/runtime/orca-runtime-tests/repository-project-operations.spec.ts
+7 -7
View File
@@ -130,7 +130,7 @@ describe('OrcaRuntimeService', () => {
repos.push(repo)
},
getRepo: (id: string) => repos.find((repo) => repo.id === id) as never,
updateRepo: (id: string, updates: Record<string, unknown>) => {
updateRepo: ({ id }: { id: string }, updates: Record<string, unknown>) => {
const index = repos.findIndex((repo) => repo.id === id)
if (index === -1) {
return null
@@ -207,7 +207,7 @@ describe('OrcaRuntimeService', () => {
getRepos: () => [...repos] as never,
addRepo: (repo: Record<string, unknown>) => repos.push(repo),
getRepo: (id: string) => repos.find((repo) => repo.id === id) as never,
updateRepo: (id: string, updates: Record<string, unknown>) => {
updateRepo: ({ id }: { id: string }, updates: Record<string, unknown>) => {
const repo = repos.find((entry) => entry.id === id)
if (!repo) {
return null
@@ -259,7 +259,7 @@ describe('OrcaRuntimeService', () => {
getRepos: () => [...repos] as never,
addRepo: (repo: Record<string, unknown>) => repos.push(repo),
getRepo: (id: string) => repos.find((repo) => repo.id === id) as never,
updateRepo: (id: string, updates: Record<string, unknown>) => {
updateRepo: ({ id }: { id: string }, updates: Record<string, unknown>) => {
const repo = repos.find((entry) => entry.id === id)
if (!repo) {
return null
@@ -348,7 +348,7 @@ describe('OrcaRuntimeService', () => {
repos.push(repo)
},
getRepo: (id: string) => repos.find((repo) => repo.id === id) as never,
updateRepo: (id: string, updates: Record<string, unknown>) => {
updateRepo: ({ id }: { id: string }, updates: Record<string, unknown>) => {
const index = repos.findIndex((repo) => repo.id === id)
if (index === -1) {
return null
@@ -465,7 +465,7 @@ describe('OrcaRuntimeService', () => {
repos.push(repo)
},
getRepo: (id: string) => repos.find((repo) => repo.id === id) as never,
updateRepo: (id: string, updates: Record<string, unknown>) => {
updateRepo: ({ id }: { id: string }, updates: Record<string, unknown>) => {
const index = repos.findIndex((repo) => repo.id === id)
if (index === -1) {
return null
@@ -506,7 +506,7 @@ describe('OrcaRuntimeService', () => {
repos.push(repo)
},
getRepo: (id: string) => repos.find((repo) => repo.id === id) as never,
updateRepo: (id: string, updates: Record<string, unknown>) => {
updateRepo: ({ id }: { id: string }, updates: Record<string, unknown>) => {
const index = repos.findIndex((repo) => repo.id === id)
if (index === -1) {
return null
@@ -539,7 +539,7 @@ describe('OrcaRuntimeService', () => {
repos.push(repo)
},
getRepo: (id: string) => repos.find((repo) => repo.id === id) as never,
updateRepo: (id: string, updates: Record<string, unknown>) => {
updateRepo: ({ id }: { id: string }, updates: Record<string, unknown>) => {
const index = repos.findIndex((repo) => repo.id === id)
if (index === -1) {
return null
src/main/runtime/repo-icon-fork-backfill.test.ts
+24 -35
View File
@@ -2,6 +2,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
import type { Repo } from '../../shared/repo-types'
import * as client from '../github/client'
import { OrcaRuntimeService } from './orca-runtime'
import { repoTarget } from '../persistence/repo-host-target-matcher.test-fixture'
vi.mock('../github/client', async (importOriginal) => ({
...(await importOriginal<Record<string, unknown>>()),
@@ -33,8 +34,8 @@ function makeRepo(overrides: Partial<Repo> = {}): Repo {
}
function attachStore(runtime: OrcaRuntimeService, repos: Repo[]) {
const updateRepo = vi.fn((repoId: string, updates: Partial<Repo>) => {
const index = repos.findIndex((repo) => repo.id === repoId)
const updateRepo = vi.fn((target: Pick<Repo, 'id'>, updates: Partial<Repo>) => {
const index = repos.findIndex((repo) => repo.id === target.id)
repos[index] = { ...repos[index], ...updates }
})
Object.assign(runtime, { store: { getRepos: () => repos, updateRepo } })
@@ -54,19 +55,15 @@ describe('startup fork-upstream backfill', () => {
await (runtime as unknown as BackfillInternals).repositoryForkBackfill.run()
expect(updateRepo).toHaveBeenCalledExactlyOnceWith(
'repo-1',
{
upstream: { owner: 'upstream-org', repo: 'rocket' },
repoIcon: {
type: 'image',
src: 'https://github.com/acme.png?size=64',
source: 'github',
label: 'acme/rocket-pro'
}
},
'local'
)
expect(updateRepo).toHaveBeenCalledExactlyOnceWith(repoTarget('repo-1'), {
upstream: { owner: 'upstream-org', repo: 'rocket' },
repoIcon: {
type: 'image',
src: 'https://github.com/acme.png?size=64',
source: 'github',
label: 'acme/rocket-pro'
}
})
})
it('migrates a same-name fork to the upstream owner avatar', async () => {
@@ -87,19 +84,15 @@ describe('startup fork-upstream backfill', () => {
await (runtime as unknown as BackfillInternals).repositoryForkBackfill.run()
expect(updateRepo).toHaveBeenCalledExactlyOnceWith(
'repo-1',
{
upstream: { owner: 'upstream-org', repo: 'rocket' },
repoIcon: {
type: 'image',
src: 'https://github.com/upstream-org.png?size=64',
source: 'github',
label: 'upstream-org/rocket'
}
},
'local'
)
expect(updateRepo).toHaveBeenCalledExactlyOnceWith(repoTarget('repo-1'), {
upstream: { owner: 'upstream-org', repo: 'rocket' },
repoIcon: {
type: 'image',
src: 'https://github.com/upstream-org.png?size=64',
source: 'github',
label: 'upstream-org/rocket'
}
})
})
it('skips every row whose files sit on an SSH host', async () => {
@@ -145,12 +138,8 @@ describe('startup fork-upstream backfill', () => {
resolveSlug({ owner: 'acme', repo: 'rocket-pro' })
await backfill
expect(updateRepo).toHaveBeenCalledExactlyOnceWith(
'repo-1',
{
upstream: { owner: 'upstream-org', repo: 'rocket' }
},
'local'
)
expect(updateRepo).toHaveBeenCalledExactlyOnceWith(repoTarget('repo-1'), {
upstream: { owner: 'upstream-org', repo: 'rocket' }
})
})
})
src/main/runtime/runtime-project-host-setup-controller.test.ts
+1 -1
View File
@@ -29,7 +29,7 @@ function makeController(): {
const store = {
getProjects: () => projectHostSetupProjectionFromRepos([repo]).projects,
getProjectHostSetups: () => [],
updateRepo: (_id: string, updates: Record<string, unknown>) => ({ ...repo, ...updates })
updateRepo: (_target: unknown, updates: Record<string, unknown>) => ({ ...repo, ...updates })
}
const addRepo = vi.fn().mockResolvedValue(repo)
const cloneRepo = vi.fn().mockResolvedValue(repo)
src/main/runtime/runtime-project-host-setup-controller.ts
+2 -2
View File
@@ -286,7 +286,7 @@ export class RuntimeProjectHostSetupController {
if (!identity || getProjectIdForProviderIdentity(identity) !== args.projectId) {
throw new Error('Imported folder does not match the selected project identity.')
}
const updated = store.updateRepo(repo.id, {
const updated = store.updateRepo(repo, {
upstream: {
owner: identity.owner,
repo: identity.repo,
@@ -300,7 +300,7 @@ export class RuntimeProjectHostSetupController {
setup = getProjectHostSetupForRepo(this.listSetups(), repo)
}
const setupMethod = args.setupMethod ?? 'imported-existing-folder'
const updated = store.updateRepo(repo.id, { projectHostSetupMethod: setupMethod })
const updated = store.updateRepo(repo, { projectHostSetupMethod: setupMethod })
if (!updated) {
throw new Error(
`Project setup repo disappeared before setup metadata could be linked: ${repo.id}`
src/main/runtime/runtime-remove-project-host-scope.spec.ts
+4 -3
View File
@@ -9,7 +9,8 @@ import { describe, expect, it, vi } from 'vitest'
import type { Repo } from '../../shared/repo-types'
import { OrcaRuntimeService } from './orca-runtime'
import { findRepoRowForHostScopedWrite } from '../persistence/tracking-repos/repo-update-operations'
import type { ExecutionHostId } from '../../shared/execution-host'
import { getRepoExecutionHostId } from '../../shared/execution-host'
import type { RepoHostTarget } from '../../shared/repo-host-identity'
export function registerRuntimeRemoveProjectHostScopeTests(): void {
function makeRepos(): Repo[] {
@@ -55,8 +56,8 @@ export function registerRuntimeRemoveProjectHostScopeTests(): void {
removeWorktreeMeta: vi.fn(),
getGitHubCache: () => null,
// Same row lookup the real store's host-scoped write uses.
updateRepo: (id: string, updates: Partial<Repo>, hostId?: ExecutionHostId) => {
const row = findRepoRowForHostScopedWrite(repos, id, hostId)
updateRepo: (target: RepoHostTarget, updates: Partial<Repo>) => {
const row = findRepoRowForHostScopedWrite(repos, target.id, getRepoExecutionHostId(target))
return row ? Object.assign(row, updates) : null
},
removeProjectForHost
src/main/runtime/runtime-repository-clone-controller.ts
+1 -1
View File
@@ -166,7 +166,7 @@ export class RuntimeRepositoryCloneController {
isFolderRepo(current) &&
runtimeRepoMatchesExecutionHost(current, executionHostId)
) {
const updated = store.updateRepo(current.id, { kind: 'git', ...conversion })
const updated = store.updateRepo(current, { kind: 'git', ...conversion })
if (updated) {
await prepareLocalWorktreeRootForRepo(store, updated)
invalidateAuthorizedRootsCache()
src/main/runtime/runtime-repository-fork-backfill.ts
+1 -1
View File
@@ -74,7 +74,7 @@ export class RuntimeRepositoryForkBackfill {
) {
updates.repoIcon = repoIcon
}
store.updateRepo(repo.id, updates, hostId)
store.updateRepo(current, updates)
changed = true
}
if (changed) {
src/main/runtime/runtime-repository-registration-controller.ts
+1 -1
View File
@@ -66,7 +66,7 @@ export class RuntimeRepositoryRegistrationController {
parseExecutionHostId(executionHostId)?.kind === 'runtime'
) {
const adopted =
store.updateRepo(existing.id, { executionHostId }) ??
store.updateRepo(existing, { executionHostId }) ??
({ ...existing, executionHostId } as Repo)
this.invalidate(existing.id)
return adopted
src/main/runtime/runtime-repository-settings-controller.ts
+2 -11
View File
@@ -73,11 +73,7 @@ export class RuntimeRepositorySettingsController {
if (isFolderRepo(repo)) {
throw new Error('Folder mode does not support base refs.')
}
const updated = store.updateRepo(
repo.id,
{ worktreeBaseRef: baseRef },
getRepoExecutionHostId(repo)
)
const updated = store.updateRepo(repo, { worktreeBaseRef: baseRef })
if (!updated) {
throw new Error('repo_not_found')
}
@@ -105,12 +101,7 @@ export class RuntimeRepositorySettingsController {
}
const write = (proven: Pick<Repo, 'folderUpgradeGitRootPath'>): Repo | null => {
assertWslMoveRepoWritable(store, repo)
// Why the host: a same-id sibling on another host would take an id-only write.
return store.updateRepo(
repo.id,
{ ...sanitizedUpdates, ...proven },
getRepoExecutionHostId(repo)
)
return store.updateRepo(repo, { ...sanitizedUpdates, ...proven })
}
const updated =
sanitizedUpdates.kind === 'git' && isFolderRepo(repo)
src/main/runtime/runtime-rpc-worktree-store-fixtures.ts
+1 -1
View File
@@ -13,7 +13,7 @@ export const makeStore = (overrides?: { isUnread?: boolean }) => ({
}
],
addRepo: () => {},
updateRepo: (id: string, updates: Record<string, unknown>) =>
updateRepo: ({ id }: { id: string }, updates: Record<string, unknown>) =>
({
...makeStore(overrides).getRepo(id),
...updates
src/main/runtime/terminal-list-payload-size.test.ts
+1 -1
View File
@@ -30,7 +30,7 @@ const makeStore = () => ({
{ id: REPO_ID, path: '/tmp/repo', displayName: 'repo', badgeColor: 'blue', addedAt: 1 }
],
addRepo: () => {},
updateRepo: (id: string) => makeStore().getRepo(id) as never,
updateRepo: () => null,
getAllWorktreeMeta: () => ({
[WORKTREE_ID]: {
displayName: 'foo',
src/main/ssh/orcad-migration-cutover-coordinator.test.ts
+2 -2
View File
@@ -142,7 +142,7 @@ describe('migration cutover coordinator', () => {
it.each([
[
'a source row changed',
(store: Store) => store.updateRepo('repo-1', { displayName: 'Renamed' }),
(store: Store) => store.updateRepo(store.getRepo('repo-1')!, { displayName: 'Renamed' }),
'orcad_migration_source_changed'
],
[
@@ -165,7 +165,7 @@ describe('migration cutover coordinator', () => {
it('refuses a commit whose source changed after staging', async () => {
const h = await setup()
await stageOrcadMigrationDestination(h.context, h.migrationId)
h.store.updateRepo('repo-1', { displayName: 'Renamed' })
h.store.updateRepo(h.store.getRepo('repo-1')!, { displayName: 'Renamed' })
await expect(commitOrcadMigrationDestination(h.context, h.migrationId)).rejects.toThrow(
'orcad_migration_source_changed'
)
src/main/ssh/orcad-migration-delta-move.test.ts
+1 -1
View File
@@ -136,7 +136,7 @@ async function convertedThenChangedOnOlderBuild(): Promise<void> {
})
).resolves.toMatchObject({ outcome: 'converted' })
store.addRepo(repo('repo-2', '/srv/tool'))
store.updateRepo('repo-1', { displayName: 'app-renamed' })
store.updateRepo(store.getRepo('repo-1')!, { displayName: 'app-renamed' })
reconcileManagedOrcadSshTargets(userDataPath, store, now)
expect(store.getSshTarget(TARGET.id)?.orcadFence?.sourceChangedAt).toBeDefined()
}
src/main/ssh/orcad-migration-repository-link.test.ts
+1 -1
View File
@@ -345,7 +345,7 @@ describe('moving onto a server another desktop already added the same project to
})
await expect(convert()).rejects.toThrow('socket closed')
otherDesktopAddsSameCheckout()
store.updateRepo('desktop-only', { displayName: 'Renamed' })
store.updateRepo(store.getRepo('desktop-only')!, { displayName: 'Renamed' })
await expect(convert()).rejects.toThrow('orcad_migration_source_changed')
expect(listOrcadMigrationSourceCutovers(userDataPath)[0]?.linkedRepositoryIds).toBeUndefined()
})
src/shared/repo-host-identity.ts
+5
View File
@@ -1,8 +1,13 @@
import type { Repo } from './repo-types'
declare const hostScopedRepoKeyBrand: unique symbol
// Why: for new code only; existing raw-id stores stay as they are (D7).
export type HostScopedRepoKey = string & { readonly [hostScopedRepoKeyBrand]: true }
/** A repo write's target: the row's own identity fields, so its host can't be dropped or guessed. */
export type RepoHostTarget = Pick<Repo, 'id' | 'connectionId' | 'executionHostId'>
export function getRepoHostIdentityForParts(repoId: string, hostId: string): HostScopedRepoKey {
// Why: host ids and repo ids can contain punctuation; NUL keeps the composite
// key collision-free without escaping user/provider-owned strings.
tests/e2e/folder-upgrade-identity-persistence.unit.test.ts
+3 -3
View File
@@ -37,7 +37,7 @@ it('retains the folder instance and metadata through upgrade, listing, and Store
activeTabId: 'omp-tab',
tabsByWorktree: { [id]: [makeTerminalTab({ id: 'omp-tab', worktreeId: id })] }
})
store.updateRepo(owner.id, { kind: 'git', folderUpgradeGitRootPath: 'C:/projects/draft' })
store.updateRepo(owner, { kind: 'git', folderUpgradeGitRootPath: 'C:/projects/draft' })
store.flush()
const reloaded = createStore()
const repo = reloaded.getRepo(owner.id)
@@ -95,7 +95,7 @@ it('retains the folder instance and metadata through upgrade, listing, and Store
it('drops upgrade path evidence when execution ownership changes', () => {
const store = createStore()
store.addRepo(makeRepo({ id: 'folder', path: 'C:\\projects\\draft', kind: 'git' }))
store.updateRepo('folder', { folderUpgradeGitRootPath: 'C:/projects/draft' })
store.updateRepo('folder', { executionHostId: 'ssh:builder' })
store.updateRepo({ id: 'folder' }, { folderUpgradeGitRootPath: 'C:/projects/draft' })
store.updateRepo({ id: 'folder' }, { executionHostId: 'ssh:builder' })
expect(store.getRepo('folder')?.folderUpgradeGitRootPath).toBeUndefined()
})