refactor(github): organize concrete feature owners (#41601)

src/shared/github/cache/github-cache-key.ts

@@ -1,11 +1,11 @@
-import type { GlobalSettings } from '../global-settings-types'
+import type { GlobalSettings } from '../../global-settings-types'
 import {
   LOCAL_EXECUTION_HOST_ID,
   normalizeExecutionHostId,
   toSshExecutionHostId,
   type ExecutionHostId
-} from '../execution-host'
-import { taskSourceCacheScopeHostId } from '../work-items/task-source-context'
+} from '../../execution-host'
+import { taskSourceCacheScopeHostId } from '../../work-items/task-source-context'
 
 export type RuntimeFocusSettings =
   | Pick<GlobalSettings, 'activeRuntimeEnvironmentId'>

src/shared/github/checks/checks-detail-polling-policy.ts

@@ -1,7 +1,7 @@
 import type { PRCheckDetail } from './check-types'
-import type { CheckStatus } from './pull-request-types'
-import type { HostedReviewState } from '../source-control/hosted-review/hosted-review-contracts'
-import { reviewRefreshIntervalMs } from '../review-refresh-policy'
+import type { CheckStatus } from '../pull-requests/pull-request-types'
+import type { HostedReviewState } from '../../source-control/hosted-review/hosted-review-contracts'
+import { reviewRefreshIntervalMs } from '../../review-refresh-policy'
 
 export function detailedChecksStatus(checks: readonly PRCheckDetail[]): CheckStatus | undefined {
   if (checks.length === 0) {

src/shared/github/checks/complete-pr-check-owner.test.ts

@@ -1,9 +1,5 @@
 import { expect, it } from 'vitest'
-import {
-  acceptPRCheckObservation,
-  isCompletePRCheckOwner,
-  projectPRCheckOwner
-} from './complete-pr-check-owner'
+import { acceptPRCheckObservation } from './complete-pr-check-owner'
 
 const summary = {
   state: 'success' as const,
@@ -49,17 +45,3 @@ it('retains last-good only for the same proved source, target and nonempty head'
     acceptPRCheckObservation({ ...pr, checksSummary: undefined }, pr, context)?.checksSummary
   ).toBeUndefined()
 })
-
-it('carries unavailable authority explicitly through display and review projections without lending it to another head', () => {
-  const unavailable = acceptPRCheckObservation({ ...pr, checksSummary: undefined }, null, context)!
-  const display = projectPRCheckOwner(unavailable, { ...unavailable })
-  expect(isCompletePRCheckOwner(display)).toBe(true)
-  const review = projectPRCheckOwner(display, { ...display, status: display.checksStatus })
-  expect(isCompletePRCheckOwner(review)).toBe(true)
-  expect(isCompletePRCheckOwner({ ...review })).toBe(false)
-  expect(isCompletePRCheckOwner(projectPRCheckOwner(review, { ...review, headSha: 'h2' }))).toBe(
-    false
-  )
-  const full = acceptPRCheckObservation(pr, null, context)!
-  expect(isCompletePRCheckOwner({ ...pr, checksSummary: full.checksSummary })).toBe(false)
-})

src/shared/github/checks/complete-pr-check-owner.ts

@@ -1,6 +1,10 @@
-import type { CheckStatus, GitHubOwnerRepo, ProviderCheckSummary } from './pull-request-types'
-import { githubRepoIdentityKey } from './repository-identity-key'
-import { matchesGitHubWorkItemTarget, parseGitHubItemRepository } from './work-item-target'
+import type { CheckStatus, ProviderCheckSummary } from '../pull-requests/pull-request-types'
+import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../repositories/repository-identity'
+import { githubRepoIdentityKey } from '../repositories/repository-identity-key'
+import {
+  matchesGitHubWorkItemTarget,
+  parseGitHubItemRepository
+} from '../work-items/work-item-target'
 
 type CheckOwner = {
   number?: number

src/shared/github/comments/comment-types.ts

@@ -1,4 +1,4 @@
-import type { GitHubRepositoryIdentity } from './pull-request-types'
+import type { GitHubRepositoryIdentity } from '../repositories/repository-identity'
 
 export type GitHubReactionContent =
   | '+1'

src/shared/github/markdown/github-reference-links.ts

@@ -1,5 +1,8 @@
-import type { Repo } from '../repo-types'
-import { githubHostFromIdentityKey, repoUpstreamIdentityKey } from './repository-identity-key'
+import type { Repo } from '../../repo-types'
+import {
+  githubHostFromIdentityKey,
+  repoUpstreamIdentityKey
+} from '../repositories/repository-identity-key'
 
 export type GitHubRepoReference = {
   owner: string

src/shared/github/project-ref-input.test.ts

@@ -1,18 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import {
-  GITHUB_PROJECT_REF_INPUT_MAX_BYTES,
-  hasBoundedGitHubProjectRefInputText,
-  isGitHubProjectRefInputTooLarge
-} from './project-ref-input'
-
-describe('GitHub project reference input limits', () => {
-  it('rejects oversized whitespace before submit checks trim the reference', () => {
-    const oversizedWhitespace = ' '.repeat(GITHUB_PROJECT_REF_INPUT_MAX_BYTES + 1)
-
-    expect(isGitHubProjectRefInputTooLarge(oversizedWhitespace)).toBe(true)
-    expect(hasBoundedGitHubProjectRefInputText(oversizedWhitespace)).toBe(false)
-    expect(hasBoundedGitHubProjectRefInputText('  acme/42  ')).toBe(true)
-    expect(hasBoundedGitHubProjectRefInputText('   ')).toBe(false)
-  })
-})

src/shared/github/projects/project-identity.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { githubProjectHost, githubProjectIdentityKey } from './project-identity'
+import { githubProjectIdentityKey } from './project-identity'
 
 describe('GitHub project identity', () => {
   it('keeps legacy github.com keys while isolating Enterprise hosts and ports', () => {
@@ -14,9 +14,4 @@ describe('GitHub project identity', () => {
       'ghe.example:8443:organization:acme:7'
     )
   })
-
-  it('pins host-less projects to github.com', () => {
-    expect(githubProjectHost()).toBe('github.com')
-    expect(githubProjectHost('ghe.example:8443')).toBe('ghe.example:8443')
-  })
 })

src/shared/github/projects/project-identity.ts

@@ -1,4 +1,4 @@
-import { isDefaultGitHubHost } from './repository-identity-key'
+import { isDefaultGitHubHost } from '../repositories/repository-identity-key'
 
 export type GitHubProjectIdentity = {
   owner: string

src/shared/github/projects/project-ref-input.ts

@@ -1,4 +1,4 @@
-import { isClipboardTextByteLengthOverLimit } from '../clipboard-text'
+import { isClipboardTextByteLengthOverLimit } from '../../clipboard-text'
 
 export const GITHUB_PROJECT_REF_INPUT_MAX_BYTES = 2 * 1024
 export const GITHUB_PROJECT_REF_INPUT_TOO_LARGE_ERROR = 'Project reference is too large to resolve.'

src/shared/github/projects/project-request-types.ts

@@ -1,6 +1,6 @@
 // Keep Project request payloads separate from ProjectV2 domain shapes so renderer domain imports do not pull IPC arguments.
 import type { GitHubProjectFieldMutationValue, GitHubProjectOwnerType } from './project-types'
-import type { GitHubIssueUpdate } from '../issue-mutation-types'
+import type { GitHubIssueUpdate } from '../../issue-mutation-types'
 
 /** Set by a click: it may start the stopped WSL distro gh lives in (E9). Loads that also run
  * unprompted (mount effects, restore) leave it unset. Local IPC only. */

src/shared/github/projects/project-result-types.ts

@@ -1,5 +1,5 @@
 // Project IPC envelopes share classified failures and cross-module work-item/comment/user types unnecessary in the ProjectV2 domain model.
-import type { PRComment } from './comment-types'
+import type { PRComment } from '../comments/comment-types'
 import type {
   GitHubIssueType,
   GitHubProjectOwnerType,
@@ -7,8 +7,8 @@ import type {
   GitHubProjectTable,
   GitHubProjectViewSummary
 } from './project-types'
-import type { GitHubAssignableUser } from './pull-request-types'
-import type { GitHubWorkItemDetails } from './work-item-types'
+import type { GitHubAssignableUser } from '../pull-requests/pull-request-types'
+import type { GitHubWorkItemDetails } from '../work-items/work-item-types'
 
 export type GitHubProjectViewErrorType =
   | 'auth_required'

src/shared/github/pull-requests/merge/pull-request-auto-merge-availability.ts

@@ -1,4 +1,4 @@
-import type { PRMergeableState, PRReviewDecision, PRState } from './pull-request-types'
+import type { PRMergeableState, PRReviewDecision, PRState } from '../pull-request-types'
 
 export type GitHubPRAutoMergeAvailabilityInput = {
   state: PRState

src/shared/github/pull-requests/merge/pull-request-merge-methods.test.ts

@@ -5,13 +5,6 @@ import {
 } from './pull-request-merge-methods'
 
 describe('GitHub PR merge methods', () => {
-  it('keeps the historical squash-first fallback when repository metadata is missing', () => {
-    expect(resolveGitHubPRMergeMethods()).toEqual({
-      defaultMethod: 'squash',
-      methods: ['squash', 'merge', 'rebase']
-    })
-  })
-
   it('uses GitHub viewer defaults and hides methods disabled by the repository', () => {
     const settings = normalizeGitHubPRMergeMethodSettings({
       defaultMethod: 'REBASE',

src/shared/github/pull-requests/merge/pull-request-merge-methods.ts

@@ -1,4 +1,4 @@
-import type { GitHubPRMergeMethod, GitHubPRMergeMethodSettings } from './pull-request-types'
+import type { GitHubPRMergeMethod, GitHubPRMergeMethodSettings } from '../pull-request-types'
 
 export const GITHUB_PR_MERGE_METHODS = ['squash', 'merge', 'rebase'] as const
 

src/shared/github/pull-requests/merge/pull-request-merge-state.ts

@@ -1,5 +1,5 @@
-import { getProviderChecksOutcome } from '../source-control/checks/provider-check-summary'
-import type { CheckStatus, ProviderCheckSummary } from './pull-request-types'
+import { getProviderChecksOutcome } from '../../../source-control/checks/provider-check-summary'
+import type { CheckStatus, ProviderCheckSummary } from '../pull-request-types'
 import {
   canShowGitHubPRAutoMergeControl,
   type GitHubPRAutoMergeAvailabilityInput

src/shared/github/pull-requests/merge/pull-request-stack-merge.ts

@@ -1,4 +1,4 @@
-import type { GitHubPRStack, GitHubPRStackEntry } from './pull-request-types'
+import type { GitHubPRStack, GitHubPRStackEntry } from '../pull-request-types'
 
 export type GitHubPRStackMergeScope = {
   count: number

src/shared/github/pull-requests/pr-reviewer-display.ts

@@ -1,6 +1,6 @@
 import type { GitHubAssignableUser } from './pull-request-types'
-import type { GitHubWorkItem } from './work-item-types'
-import { isClipboardTextByteLengthOverLimit } from '../clipboard-text'
+import type { GitHubWorkItem } from '../work-items/work-item-types'
+import { isClipboardTextByteLengthOverLimit } from '../../clipboard-text'
 
 type ReviewDisplayItem = Pick<GitHubWorkItem, 'reviewDecision' | 'reviewRequests' | 'latestReviews'>
 export type GitHubPRPrimaryReviewer = Pick<GitHubAssignableUser, 'login' | 'avatarUrl'> & {

src/shared/github/pull-requests/pull-request-types.ts

@@ -1,8 +1,13 @@
+import type { GitHubRepositoryIdentity } from '../repositories/repository-identity'
+
 export type PRState = 'open' | 'closed' | 'merged' | 'draft'
+
 export type IssueState = 'open' | 'closed'
+
 export type CheckStatus = 'pending' | 'success' | 'failure' | 'neutral'
 
 export type PRMergeableState = 'MERGEABLE' | 'CONFLICTING' | 'UNKNOWN'
+
 export type PRReviewDecision = 'APPROVED' | 'CHANGES_REQUESTED' | 'REVIEW_REQUIRED'
 
 export type PRConflictSummary = {
@@ -13,9 +18,6 @@ export type PRConflictSummary = {
   localMergeState?: 'clean'
 }
 
-// Keep GHES host identity across renderer/RPC boundaries to prevent actions targeting same-named github.com repos.
-export type GitHubRepositoryIdentity = { owner: string; repo: string; host?: string }
-
 export type GitHubPRMergeMethod = 'merge' | 'squash' | 'rebase'
 
 export type GitHubPRMergeMethodSettings = {
@@ -150,6 +152,3 @@ export type GitHubPRFileContents = {
   originalTooLarge?: boolean
   modifiedTooLarge?: boolean
 }
-
-// Share the identity shape across IPC/renderer without main imports; main’s gh-utils.ts retains the OwnerRepo alias.
-export type GitHubOwnerRepo = GitHubRepositoryIdentity

src/shared/github/pull-requests/refresh/linked-pr-staleness.ts

@@ -1,5 +1,5 @@
-import type { PRInfo } from './pull-request-types'
-import type { Worktree } from '../worktree/types'
+import type { PRInfo } from '../pull-request-types'
+import type { Worktree } from '../../../worktree/types'
 
 export function shouldClearDivergedLinkedMergedPR(args: {
   pr: PRInfo | null

src/shared/github/pull-requests/refresh/pr-branch-fallback-rule.ts

@@ -1,4 +1,4 @@
-import type { PRInfo } from './pull-request-types'
+import type { PRInfo } from '../pull-request-types'
 import type { GitHubPRRefreshCandidate } from './pull-request-refresh-types'
 
 export type PRBranchFallback = {

src/shared/github/pull-requests/refresh/pull-request-for-branch-outcome.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import type { PRInfo } from './pull-request-types'
+import type { PRInfo } from '../pull-request-types'
 import { normalizeGitHubPRForBranchOutcome } from './pull-request-for-branch-outcome'
 
 const PR: PRInfo = {
@@ -14,13 +14,6 @@ const PR: PRInfo = {
 }
 
 describe('normalizeGitHubPRForBranchOutcome', () => {
-  it.each([
-    { kind: 'no-pr' as const, fetchedAt: 10 },
-    { kind: 'no-pr' as const, fetchedAt: 10, rejectedPRUrls: [PR.url] }
-  ])('preserves no-PR responses from older and newer hosts', (outcome) => {
-    expect(normalizeGitHubPRForBranchOutcome(outcome, 20)).toEqual(outcome)
-  })
-
   it('normalizes legacy PRInfo and null responses', () => {
     expect(normalizeGitHubPRForBranchOutcome(PR, 20)).toEqual({
       kind: 'found',

src/shared/github/pull-requests/refresh/pull-request-for-branch-outcome.ts

@@ -1,5 +1,5 @@
 import type { PRRefreshOutcome } from './pull-request-refresh-types'
-import type { PRInfo } from './pull-request-types'
+import type { PRInfo } from '../pull-request-types'
 
 export type GitHubPRForBranchResponse = PRRefreshOutcome | PRInfo | null
 

src/shared/github/pull-requests/refresh/pull-request-refresh-types.ts

@@ -1,5 +1,5 @@
-import type { RepoKind } from '../repo-types'
-import type { CheckStatus, PRInfo, PRMergeableState, PRState } from './pull-request-types'
+import type { RepoKind } from '../../../repo-types'
+import type { CheckStatus, PRInfo, PRMergeableState, PRState } from '../pull-request-types'
 
 /** Classified failures drive stable empty-state copy. Auth/permission/repo_unavailable/gh_unavailable make existing-review lookup impossible and must hide Create. */
 export type PRRefreshErrorType =
@@ -12,9 +12,6 @@ export type PRRefreshErrorType =
   | 'server_error'
   | 'unknown'
 
-// Backward-compatible name used by outage-copy consumers added on main.
-export type PRRefreshUpstreamErrorType = PRRefreshErrorType
-
 export type PRRefreshOutcome =
   | { kind: 'found'; pr: PRInfo; fetchedAt: number }
   | { kind: 'no-pr'; fetchedAt: number; rejectedPRUrls?: string[] }

src/shared/github/repositories/repository-identity-key.ts

@@ -1,4 +1,4 @@
-import type { Repo } from '../repo-types'
+import type { Repo } from '../../repo-types'
 
 // Share github.com/GHES detection across cache identity, quota scoping and execution routing.
 export function isDefaultGitHubHost(host?: string): boolean {

src/shared/github/repositories/repository-identity.ts

@@ -0,0 +1,2 @@
+// Keep GHES host identity across renderer/RPC boundaries to prevent actions targeting same-named github.com repos.
+export type GitHubRepositoryIdentity = { owner: string; repo: string; host?: string }

src/shared/github/work-items/exact-work-item-operation.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod'
-import { SlugRepo } from '../rpc-contract/github-repo-target-params'
-import { ExpectedRuntimeSourceSchema } from '../runtime-rpc-envelope'
+import { SlugRepo } from '../../rpc-contract/github-repo-target-params'
+import { ExpectedRuntimeSourceSchema } from '../../runtime-rpc-envelope'
 
 const methods = new Set([
   'github.workItemDetails',

src/shared/github/work-items/work-item-page-errors.ts

@@ -1,4 +1,4 @@
-import type { ClassifiedError } from '../classified-error'
+import type { ClassifiedError } from '../../classified-error'
 import { GITHUB_SEARCH_RESULT_WINDOW_ERROR_PATTERN } from './work-items-query-bounds'
 
 export function getWorkItemPageErrorTypes(errors: unknown): ClassifiedError['type'][] {

src/shared/github/work-items/work-item-target.ts

@@ -1,6 +1,6 @@
-import type { GitHubOwnerRepo } from './pull-request-types'
+import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../repositories/repository-identity'
 import type { GitHubWorkItem, GitHubWorkItemDetails } from './work-item-types'
-import { githubRepoIdentityKey } from './repository-identity-key'
+import { githubRepoIdentityKey } from '../repositories/repository-identity-key'
 
 export type GitHubWorkItemTarget = {
   repository: GitHubOwnerRepo

src/shared/github/work-items/work-item-types.ts

@@ -1,18 +1,20 @@
-import type { ClassifiedError } from '../classified-error'
-import type { ExecutionHostId } from '../execution-host'
-import type { PRCheckDetail } from './check-types'
-import type { GitHubIssueTimelineItem, PRComment } from './comment-types'
+import type { ClassifiedError } from '../../classified-error'
+import type { ExecutionHostId } from '../../execution-host'
+import type { PRCheckDetail } from '../checks/check-types'
+import type { GitHubIssueTimelineItem, PRComment } from '../comments/comment-types'
 import type {
   GitHubAssignableUser,
-  GitHubOwnerRepo,
   GitHubPRFile,
   GitHubPRMergeMethodSettings,
   GitHubPRReviewSummary,
-  GitHubRepositoryIdentity,
   PRMergeableState,
   PRReviewDecision,
   ProviderCheckSummary
-} from './pull-request-types'
+} from '../pull-requests/pull-request-types'
+import type {
+  GitHubRepositoryIdentity as GitHubOwnerRepo,
+  GitHubRepositoryIdentity
+} from '../repositories/repository-identity'
 
 export type GitHubWorkItem = {
   id: string

src/shared/github/work-items/work-items-query-bounds.ts

@@ -1,4 +1,4 @@
-import { isClipboardTextByteLengthOverLimit } from '../clipboard-text'
+import { isClipboardTextByteLengthOverLimit } from '../../clipboard-text'
 
 export const GITHUB_WORK_ITEMS_QUERY_MAX_BYTES = 8 * 1024