From e2d01851767d322610b9eebef6b79a9cac8b56d6 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Thu, 13 Aug 2026 23:06:31 -0700 Subject: [PATCH] fix(worktree): import shared types from their real modules Main dropped the src/shared/types barrel, so the retirement module's import resolved locally but not against the PR's merge base. --- src/main/worktree-name-retirement.test.ts | 3 ++- src/main/worktree-name-retirement.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/worktree-name-retirement.test.ts b/src/main/worktree-name-retirement.test.ts index 9d603f68ae3..a554b15aec6 100644 --- a/src/main/worktree-name-retirement.test.ts +++ b/src/main/worktree-name-retirement.test.ts @@ -3,7 +3,8 @@ import { mkdir, mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { MARINE_CREATURES } from '../shared/marine-creatures' -import type { GlobalSettings, Repo } from '../shared/types' +import type { GlobalSettings } from '../shared/global-settings-types' +import type { Repo } from '../shared/repo-types' import { collectRetiredNamesFromLeafNames, discoverRetiredWorktreeNames, diff --git a/src/main/worktree-name-retirement.ts b/src/main/worktree-name-retirement.ts index 16d3c3ce024..c9a3f0b7569 100644 --- a/src/main/worktree-name-retirement.ts +++ b/src/main/worktree-name-retirement.ts @@ -4,7 +4,8 @@ import { join } from 'node:path' import { MARINE_CREATURES } from '../shared/marine-creatures' import { getRepoExecutionHostId } from '../shared/execution-host' import { isFolderRepo } from '../shared/repo-kind' -import type { GlobalSettings, Repo } from '../shared/types' +import type { GlobalSettings } from '../shared/global-settings-types' +import type { Repo } from '../shared/repo-types' import { encodeClaudeProjectPath, isClaudeProjectDirInScope