Keep same-machine folders with matching Git remotes in separate projects

.oxlintrc.json

@@ -153,6 +153,14 @@
           {
             "property": "randomUUID",
             "message": "crypto.randomUUID is missing in non-secure contexts (Remote Web over plain HTTP), which white-screens the app. Use createBrowserUuid() from '@/lib/browser-uuid'."
+          },
+          {
+            "property": "endpointProjects",
+            "message": "Read canonical affiliation through project-host-setup-selector; endpoint facts are reserved for ingestion and concrete operation adapters."
+          },
+          {
+            "property": "endpointProjectHostSetups",
+            "message": "Read canonical affiliation through project-host-setup-selector; endpoint facts are reserved for ingestion and concrete operation adapters."
           }
         ]
       }
@@ -207,6 +215,39 @@
       "rules": {
         "max-lines": ["error", { "max": 800, "skipBlankLines": true, "skipComments": true }]
       }
+    },
+    {
+      "files": [
+        "src/renderer/src/store/project-host-setup-selector.ts",
+        "src/renderer/src/store/project-search-catalog.ts",
+        "src/renderer/src/store/repos/repo-catalog-identity.ts",
+        "src/renderer/src/store/repos/repo-catalog-actions.ts",
+        "src/renderer/src/store/repos/runtime-repo-catalog-actions.ts",
+        "src/renderer/src/store/repos/all-host-repo-catalog-actions.ts",
+        "src/renderer/src/store/repos/repo-add-actions.ts",
+        "src/renderer/src/store/repos/repo-update.ts",
+        "src/renderer/src/store/repos/repo-removal.ts",
+        "src/renderer/src/store/projects/project-host-setup-actions.ts",
+        "src/renderer/src/store/projects/project-update.ts",
+        "src/renderer/src/store/project-groups/project-group-mutations.ts",
+        "src/renderer/src/store/slices/worktrees/teardown/purge-stale-runtime-host-state.ts",
+        "src/renderer/src/store/slices/worktrees/teardown/orphaned-runtime-ssh-project-purge.ts",
+        "src/renderer/src/app-shell/use-runtime-graph-sync.ts",
+        "src/renderer/src/**/*.test.{ts,tsx}",
+        "src/renderer/src/**/*.spec.{ts,tsx}",
+        "src/renderer/src/**/*-test-*.ts",
+        "src/renderer/src/**/*.test-fixture.ts",
+        "src/renderer/src/components/automations/automations-page-runtime-fixtures.ts"
+      ],
+      "rules": {
+        "no-restricted-properties": [
+          "error",
+          {
+            "property": "randomUUID",
+            "message": "crypto.randomUUID is missing in non-secure contexts (Remote Web over plain HTTP), which white-screens the app. Use createBrowserUuid() from '@/lib/browser-uuid'."
+          }
+        ]
+      }
     }
   ],
   "ignorePatterns": [

config/oxlint-js-plugins.json

@@ -38,6 +38,7 @@
     {
       "files": ["**/src/renderer/src/**/*.{ts,tsx}"],
       "rules": {
+        "app-store-performance/no-raw-project-catalog-computed": "error",
         "renderer-scrollbar-style/require-styled-vertical-scrollbar": "error",
         "ime-enter-guard/require-ime-guard": "error"
       }
@@ -49,6 +50,32 @@
         "renderer-scrollbar-style/require-styled-vertical-scrollbar": "off",
         "ime-enter-guard/require-ime-guard": "off"
       }
+    },
+    {
+      "files": [
+        "src/renderer/src/store/project-host-setup-selector.ts",
+        "src/renderer/src/store/repos/repo-catalog-identity.ts",
+        "src/renderer/src/store/repos/repo-catalog-actions.ts",
+        "src/renderer/src/store/repos/runtime-repo-catalog-actions.ts",
+        "src/renderer/src/store/repos/all-host-repo-catalog-actions.ts",
+        "src/renderer/src/store/repos/repo-add-actions.ts",
+        "src/renderer/src/store/repos/repo-update.ts",
+        "src/renderer/src/store/repos/repo-removal.ts",
+        "src/renderer/src/store/projects/project-host-setup-actions.ts",
+        "src/renderer/src/store/projects/project-update.ts",
+        "src/renderer/src/store/project-groups/project-group-mutations.ts",
+        "src/renderer/src/store/slices/worktrees/teardown/purge-stale-runtime-host-state.ts",
+        "src/renderer/src/store/slices/worktrees/teardown/orphaned-runtime-ssh-project-purge.ts",
+        "src/renderer/src/app-shell/use-runtime-graph-sync.ts",
+        "src/renderer/src/**/*.test.{ts,tsx}",
+        "src/renderer/src/**/*.spec.{ts,tsx}",
+        "src/renderer/src/**/*-test-*.ts",
+        "src/renderer/src/**/*.test-fixture.ts",
+        "src/renderer/src/components/automations/automations-page-runtime-fixtures.ts"
+      ],
+      "rules": {
+        "app-store-performance/no-raw-project-catalog-computed": "off"
+      }
     }
   ],
   "ignorePatterns": ["**/node_modules", "**/dist", "**/out"]

config/oxlint-plugins/app-store-performance.mjs

@@ -354,12 +354,39 @@ function noNestedFreshUnderShallowRule(sourceCode) {
   })
 }
 
+function noRawProjectCatalogComputedRule(sourceCode) {
+  return {
+    MemberExpression(node) {
+      if (!node.computed || node.property.type !== 'Identifier') {
+        return
+      }
+      const definition = variableFor(node.property, { sourceCode })?.defs[0]
+      const declaration = definition?.node
+      if (
+        definition?.type === 'Variable' &&
+        declaration.parent.kind === 'const' &&
+        declaration.init?.type === 'Literal' &&
+        ['endpointProjects', 'endpointProjectHostSetups'].includes(declaration.init.value)
+      ) {
+        this.report({
+          node,
+          message: 'Read canonical project affiliation through the project catalog selector.'
+        })
+      }
+    }
+  }
+}
+
 // Skip JS AST deserialization in files that cannot name a store hook.
 const STORE_HOOK_TEXT = /use[A-Z][A-Za-z0-9]*Store/
 
 function bindContext(createVisitors) {
   return (context) => {
-    if (!STORE_HOOK_TEXT.test(context.sourceCode.text) && !context.sourceCode.text.includes('\\')) {
+    if (
+      createVisitors !== noRawProjectCatalogComputedRule &&
+      !STORE_HOOK_TEXT.test(context.sourceCode.text) &&
+      !context.sourceCode.text.includes('\\')
+    ) {
       return {}
     }
     const visitors = createVisitors(context.sourceCode)
@@ -374,6 +401,7 @@ export default {
   meta: { name: 'app-store-performance' },
   rules: {
     'require-selector': { create: bindContext(requireSelectorRule) },
+    'no-raw-project-catalog-computed': { create: bindContext(noRawProjectCatalogComputedRule) },
     'no-identity-selector': { create: bindContext(noIdentitySelectorRule) },
     'no-fresh-selector-result': { create: bindContext(noFreshSelectorResultRule) },
     'no-nested-fresh-under-shallow': { create: bindContext(noNestedFreshUnderShallowRule) }

config/scripts/project-catalog-read-boundary.test.mjs

@@ -0,0 +1,102 @@
+import { readFileSync, mkdtempSync, realpathSync, mkdirSync, writeFileSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { resolve, join, dirname } from 'node:path'
+import { spawnSync } from 'node:child_process'
+import { expect, it } from 'vitest'
+import { resolveOxcCliInvocation } from './oxc-cli-invocation.mjs'
+
+it('enforces five raw catalog forms with the actual config and narrow file exceptions', () => {
+  const config = JSON.parse(readFileSync(resolve('.oxlintrc.json'), 'utf8'))
+  const jsPluginConfig = JSON.parse(readFileSync(resolve('config/oxlint-js-plugins.json'), 'utf8'))
+  expect(config.ignorePatterns.every((pattern) => typeof pattern === 'string')).toBe(true)
+  const folder = realpathSync(mkdtempSync(join(tmpdir(), 'sta-10541-catalog-rule-')))
+  const source = `
+    const key = 'projects';
+    function read(state) {
+      state.endpointProjects;
+      state?.endpointProjectHostSetups;
+      const { endpointProjects: projects } = state;
+      state['endpointProjectHostSetups'];
+      const key = 'endpointProjects'; state[key];
+      { const key = 'projects'; state[key]; }
+      function shadow(key) { return state[key]; }
+      const unrelated = 'projectHostSetups'; state[unrelated];
+      state.projects;
+      state.projectHostSetups;
+      return projects;
+    }
+  `
+  try {
+    writeFileSync(join(folder, 'config.json'), JSON.stringify(config))
+    writeFileSync(
+      join(folder, 'js-config.json'),
+      JSON.stringify({
+        ...jsPluginConfig,
+        jsPlugins: jsPluginConfig.jsPlugins.map((plugin) => ({
+          ...plugin,
+          specifier: resolve('config', plugin.specifier)
+        }))
+      })
+    )
+    const lint = (file, content = source) => {
+      const target = join(folder, file)
+      mkdirSync(dirname(target), { recursive: true })
+      writeFileSync(target, content)
+      return ['config.json', 'js-config.json'].flatMap((configFile) => {
+        const invocation = resolveOxcCliInvocation('oxlint', 'oxlint')
+        const result = spawnSync(
+          invocation.command,
+          [
+            ...invocation.prefixArgs,
+            '--config',
+            join(folder, configFile),
+            '--format',
+            'json',
+            file
+          ],
+          { cwd: folder, encoding: 'utf8' }
+        )
+        expect(result.error).toBeUndefined()
+        const diagnostics = JSON.parse(result.stdout).diagnostics
+        expect(result.stderr).toBe('')
+        expect(JSON.parse(result.stdout).number_of_files, result.stdout).toBe(1)
+        return diagnostics.filter(
+          (entry) =>
+            entry.code.includes('no-restricted-properties') ||
+            entry.code.includes('no-raw-project-catalog-computed')
+        )
+      })
+    }
+    for (const file of [
+      'src/renderer/src/hooks/useActiveProjectSkillRuntime.ts',
+      'src/renderer/src/store/repos/repo-state.ts'
+    ]) {
+      const forbidden = lint(file)
+      expect(forbidden).toHaveLength(5)
+      expect(
+        forbidden.filter((entry) => entry.code.includes('no-restricted-properties'))
+      ).toHaveLength(4)
+      expect(
+        forbidden.filter((entry) => entry.code.includes('no-raw-project-catalog-computed'))
+      ).toHaveLength(1)
+    }
+    const allowed = 'src/renderer/src/store/project-host-setup-selector.ts'
+    expect(lint(allowed)).toEqual([])
+    const uuid = lint(allowed, 'crypto.randomUUID()')
+    expect(uuid).toHaveLength(1)
+    expect(uuid[0].message).toContain('randomUUID')
+    for (const file of [
+      'src/main/native-chat/agent-session-wire/structured-agent-session-host-test-harness.ts',
+      'src/main/runtime/rpc/methods/structured-chat-tab-table.test-fixture.ts',
+      'mobile/src/test-support/rpc-recording/native-mounting-substitutes.test.ts',
+      'tests/e2e/worktree-smart-sort.spec.ts'
+    ]) {
+      expect(lint(file, 'crypto.randomUUID()')).toEqual([])
+    }
+    const sharedUuid = lint('src/shared/tmux-status.test-fixture.ts', 'crypto.randomUUID()')
+    expect(sharedUuid).toHaveLength(1)
+    expect(sharedUuid[0].help).toContain('src/shared is compiled into the web bundle')
+  } finally {
+    rmSync(folder, { recursive: true, force: true })
+  }
+})

mobile/src/components/NewWorktreeModal.tsx

@@ -2,7 +2,7 @@ import { useMemo, useState } from 'react'
 import { Keyboard } from 'react-native'
 import { getComposerRepoWorktreeBranches } from '../../../src/shared/composer-branch-selection'
 import { getRepoExecutionHostId, parseExecutionHostId } from '../../../src/shared/execution-host'
-import { getProjectIdentityKey } from '../../../src/shared/project-host-setup-projection'
+import { getRepoHostIdentity } from '../../../src/shared/repo-host-identity'
 import { shouldPreserveWorkspaceSourceOnRepoChange } from '../../../src/shared/new-workspace/workspace-source'
 import type { SmartModeAvailabilityInput } from '../tasks/mobile-smart-source-modes'
 import { deriveRepoSlug, type PasteRepoCandidate } from '../tasks/smart-source-paste-intent'
@@ -22,6 +22,7 @@ import {
   type NewWorktreeModalProps
 } from './new-worktree-modal-types'
 import {
+  getNewWorkspaceProjectIds,
   buildNewWorkspaceProjectOptions,
   buildNewWorkspaceRunTargetOptions,
   getNewWorkspaceRunTarget
@@ -178,13 +179,26 @@ function NewWorktreeModalContent(props: NewWorktreeModalProps) {
       })),
     [hostRepos]
   )
-  const projectPickerItems = useMemo(() => buildNewWorkspaceProjectOptions(repos), [repos])
-  const selectedProjectId = selectedRepo ? getProjectIdentityKey(selectedRepo) : null
+  const projectIds = useMemo(() => getNewWorkspaceProjectIds(repos), [repos])
+  const projectPickerItems = useMemo(
+    () => buildNewWorkspaceProjectOptions(repos, projectIds),
+    [repos, projectIds]
+  )
+  const selectedProjectId = selectedRepo
+    ? (projectIds.get(getRepoHostIdentity(selectedRepo)) ?? null)
+    : null
   const selectedProject =
     projectPickerItems.find((project) => project.id === selectedProjectId) ?? null
   const runTargetPickerItems = useMemo(
-    () => buildNewWorkspaceRunTargetOptions(repos, selectedProjectId, hostPlatform, hostLabelById),
-    [hostLabelById, hostPlatform, repos, selectedProjectId]
+    () =>
+      buildNewWorkspaceRunTargetOptions(
+        repos,
+        selectedProjectId,
+        hostPlatform,
+        hostLabelById,
+        projectIds
+      ),
+    [hostLabelById, hostPlatform, repos, selectedProjectId, projectIds]
   )
   const selectedRunTarget = selectedRepo
     ? getNewWorkspaceRunTarget(selectedRepo, hostPlatform, hostLabelById)

mobile/src/components/new-workspace-project-targets.test.ts

@@ -75,7 +75,7 @@ describe('new workspace project targets', () => {
     })
   })
 
-  it('shows one target per host when the project has multiple local worktrees', () => {
+  it('keeps each same-host clone selectable with its concrete target', () => {
     const upstream = { owner: 'stablyai', repo: 'orca' }
     const repos = [
       { id: 'local-a', displayName: 'orca-a', path: '/src/orca-a', upstream },
@@ -88,7 +88,10 @@ describe('new workspace project targets', () => {
         upstream
       }
     ]
-    const projectId = buildNewWorkspaceProjectOptions(repos)[0]?.id ?? null
+    const projects = buildNewWorkspaceProjectOptions(repos)
+    expect(projects.map((project) => project.id)).toEqual(['github:stablyai/orca', 'repo:local-b'])
+    expect(buildNewWorkspaceRunTargetOptions(repos, 'repo:local-b')[0]?.repo).toBe(repos[1])
+    const projectId = projects[0]?.id ?? null
 
     expect(buildNewWorkspaceRunTargetOptions(repos, projectId, 'darwin')).toEqual([
       expect.objectContaining({ id: 'local', label: LOCAL_HOST_LABEL, detail: '/src/orca-a' }),
@@ -99,4 +102,13 @@ describe('new workspace project targets', () => {
       })
     ])
   })
+  it('uses the complete claim catalog before hiding ineligible create targets', () => {
+    const upstream = { owner: 'acme', repo: 'app' }
+    const repos = [
+      { id: 'a', displayName: 'A', path: '', addedAt: 1, upstream },
+      { id: 'b', displayName: 'B', path: '/b', addedAt: 2, upstream }
+    ]
+    expect(buildNewWorkspaceProjectOptions(repos).map((project) => project.id)).toEqual(['repo:b'])
+    expect(buildNewWorkspaceRunTargetOptions(repos, 'repo:b')[0]?.repo).toBe(repos[1])
+  })
 })