fix(lint): the focus-read ratchet counts shared focus helpers and destructuring reads

Author: m4air

config/focus-setting-read-baseline.txt

@@ -1,12 +1,15 @@
-# Renderer reads of the Active Server setting (`.activeRuntimeEnvironmentId`), the
-# focus-routing helpers and defaultCreationHost(, per file.
+# Renderer reads of the Active Server setting (member, element and destructuring reads of
+# activeRuntimeEnvironmentId) plus helpers that read it for the caller, per file.
 # This is a RATCHET: counts may only go DOWN. Only creation flows with no source row may read
 # the default host, through defaultCreationHost. Everything else routes by the owner.
 # Prune after removing reads: pnpm check:owner-routing-ratchet --prune
 1 src/renderer/src/components/LinearIssueWorkspace.tsx
+2 src/renderer/src/components/activity/activity-thread-actions.ts
+1 src/renderer/src/components/activity/use-agent-pane-threads.ts
 2 src/renderer/src/components/agent/AgentSettingsDialog.tsx
 1 src/renderer/src/components/automations/automation-host-client.ts
 2 src/renderer/src/components/automations/use-automations-page-setup-state.ts
+1 src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-stream-activation.ts
 1 src/renderer/src/components/cmd-j/quick-action-context.ts
 2 src/renderer/src/components/editor/EditorPanel.tsx
 1 src/renderer/src/components/editor/ExternalFileChangeBanner.tsx
@@ -57,6 +60,7 @@
 1 src/renderer/src/components/right-sidebar/use-git-status-upstream-ref-watch.ts
 1 src/renderer/src/components/right-sidebar/useFileExplorerHandlers.ts
 1 src/renderer/src/components/right-sidebar/useFileExplorerInlineInput.ts
+1 src/renderer/src/components/settings/BrowserPane.tsx
 1 src/renderer/src/components/settings/CliSkillRuntimeSetup.tsx
 1 src/renderer/src/components/settings/GeneralPane.tsx
 2 src/renderer/src/components/settings/RepositoryGitHubAccountSection.tsx
@@ -68,12 +72,20 @@
 1 src/renderer/src/components/settings/use-settings-store-model.ts
 1 src/renderer/src/components/setup-guide/setup-guide-progress-readiness.ts
 2 src/renderer/src/components/sidebar/LinearAgentSkillSetupPrompt.tsx
+1 src/renderer/src/components/sidebar/WorktreeList.tsx
 1 src/renderer/src/components/sidebar/add-repo-runtime-owner.ts
 1 src/renderer/src/components/sidebar/linear-agent-skill-runtime.ts
+1 src/renderer/src/components/sidebar/rendered-sidebar-worktree-order.ts
 2 src/renderer/src/components/sidebar/sidebar-host-options.ts
 1 src/renderer/src/components/sidebar/sidebar-project-drop.ts
+1 src/renderer/src/components/sidebar/use-add-repo-host-selection.ts
+1 src/renderer/src/components/sidebar/use-visible-workspace-kanban-worktree-ids.ts
+1 src/renderer/src/components/sidebar/visible-worktree-options-from-state.ts
+2 src/renderer/src/components/sidebar/visible-worktrees.ts
 1 src/renderer/src/components/sidebar/worktree-card-secondary-rows.tsx
-1 src/renderer/src/components/sidebar/worktree-list/listing/use-folder-path-statuses.ts
+1 src/renderer/src/components/sidebar/worktree-filter-visibility.ts
+2 src/renderer/src/components/sidebar/worktree-list/listing/use-filters.ts
+2 src/renderer/src/components/sidebar/worktree-list/listing/use-folder-path-statuses.ts
 5 src/renderer/src/components/status-bar/ClaudeSwitcherMenu.tsx
 1 src/renderer/src/components/status-bar/SshStatusSegment.tsx
 2 src/renderer/src/components/status-bar/provider-account-sync-key.ts
@@ -98,6 +110,8 @@
 2 src/renderer/src/components/terminal-pane/terminal-path-existence-batch.ts
 1 src/renderer/src/components/terminal-pane/terminal-worktree-path-link.ts
 1 src/renderer/src/components/use-task-page-github-issue-draft.ts
+1 src/renderer/src/components/use-task-page-source-availability.ts
+1 src/renderer/src/components/use-worktree-jump-palette-filter.ts
 2 src/renderer/src/components/use-worktree-jump-palette-quick-actions.ts
 3 src/renderer/src/hooks/composer-state/attachment-drop-state.ts
 1 src/renderer/src/hooks/composer-state/composer-navigation-actions.ts
@@ -109,7 +123,7 @@
 1 src/renderer/src/hooks/ipc-events/app-lifetime-ipc-bridge.ts
 1 src/renderer/src/hooks/ipc-events/runtime-environment-subscription-selection.ts
 1 src/renderer/src/hooks/ipc-events/settings-sidebar-ipc-bridge.ts
-1 src/renderer/src/hooks/use-active-skill-discovery-runtime-target.ts
+3 src/renderer/src/hooks/use-active-skill-discovery-runtime-target.ts
 2 src/renderer/src/hooks/useGitHubRepoMetadata.ts
 4 src/renderer/src/hooks/useGitHubSlugMetadata.ts
 1 src/renderer/src/hooks/useIssueMetadata.ts
@@ -124,6 +138,7 @@
 1 src/renderer/src/lib/codex-pane-selection-lane.ts
 1 src/renderer/src/lib/default-creation-host.ts # the sanctioned reader of the default host
 1 src/renderer/src/lib/file-search-result-owner.ts
+2 src/renderer/src/lib/folder-workspace-runtime-owner.ts
 1 src/renderer/src/lib/github-pr-start-point.ts
 1 src/renderer/src/lib/github-source-runtime-context.ts
 1 src/renderer/src/lib/hosted-review-repo-read.ts
@@ -133,17 +148,19 @@
 2 src/renderer/src/lib/local-file-access.ts
 1 src/renderer/src/lib/local-preflight-context.ts
 2 src/renderer/src/lib/provider-runtime-context.ts
-1 src/renderer/src/lib/repo-runtime-owner.ts
+2 src/renderer/src/lib/repo-runtime-owner.ts
 1 src/renderer/src/lib/repo-slug-cache.ts
 1 src/renderer/src/lib/repo-slug-index.ts
 1 src/renderer/src/lib/resolve-owner.ts
 1 src/renderer/src/lib/runtime-session-mirror-owners.ts
 1 src/renderer/src/lib/single-runtime-legacy-owner.ts
 1 src/renderer/src/lib/structured-agent-session-tab-activation.ts
-2 src/renderer/src/lib/unread-badge-count-selector.ts
+2 src/renderer/src/lib/terminal-worktree-route.ts
+3 src/renderer/src/lib/unread-badge-count-selector.ts
 1 src/renderer/src/lib/workspace-file-host-routing.ts
 1 src/renderer/src/lib/worktree-creation-flow-startup.ts
 1 src/renderer/src/lib/worktree-operation-route.ts
+1 src/renderer/src/lib/worktree-runtime-owner.ts
 1 src/renderer/src/runtime/mobile-markdown-bridge.ts
 1 src/renderer/src/runtime/runtime-client-target.ts
 1 src/renderer/src/runtime/runtime-file-import-client.ts
@@ -167,7 +184,7 @@
 3 src/renderer/src/runtime/runtime-terminal-inspection.ts
 1 src/renderer/src/runtime/runtime-terminal-stream.ts
 1 src/renderer/src/runtime/runtime-terminal-verified-input.ts
-2 src/renderer/src/runtime/use-runtime-session-mirror-environment-key.ts
+3 src/renderer/src/runtime/use-runtime-session-mirror-environment-key.ts
 1 src/renderer/src/runtime/web-runtime-browser-creation.ts
 1 src/renderer/src/runtime/web-runtime-session-tab-lifecycle.ts
 1 src/renderer/src/runtime/web-runtime-session-tab-move.ts
@@ -183,7 +200,8 @@
 1 src/renderer/src/store/github/project-actions.ts
 1 src/renderer/src/store/github/project-field-mutations.ts
 2 src/renderer/src/store/github/project-row-actions.ts
-1 src/renderer/src/store/github/repository-routing.ts
+2 src/renderer/src/store/github/repository-routing.ts
+1 src/renderer/src/store/github/visible-hosted-review-refresh-targets.ts
 1 src/renderer/src/store/github/work-item-mutation-actions.ts
 6 src/renderer/src/store/project-groups/nested-repository-operations.ts
 2 src/renderer/src/store/project-groups/project-group-catalog-actions.ts
@@ -196,28 +214,33 @@
 1 src/renderer/src/store/repos/repo-removal.ts
 1 src/renderer/src/store/repos/repo-update.ts
 2 src/renderer/src/store/repos/runtime-repo-catalog-actions.ts
+1 src/renderer/src/store/slices/browser/browser-host-state.ts
 1 src/renderer/src/store/slices/diff-comment-persistence.ts
 1 src/renderer/src/store/slices/editor/actions/markdown-link-action.ts
 1 src/renderer/src/store/slices/editor/actions/markdown-preview-actions.ts
 1 src/renderer/src/store/slices/editor/actions/open-file-apply.ts
 1 src/renderer/src/store/slices/github-cache-key.ts
+1 src/renderer/src/store/slices/hosted-review-cache-identity.ts
 4 src/renderer/src/store/slices/hosted-review.ts
 1 src/renderer/src/store/slices/preflight.ts
 1 src/renderer/src/store/slices/project-group-owner-routing.ts
+1 src/renderer/src/store/slices/repo-host-identity.ts
+1 src/renderer/src/store/slices/repo-reorder-host-split.ts
 1 src/renderer/src/store/slices/runtime-status.ts
-1 src/renderer/src/store/slices/settings.ts
+3 src/renderer/src/store/slices/settings.ts
 1 src/renderer/src/store/slices/worktree-visibility-owner-settings.ts
 3 src/renderer/src/store/slices/worktree-visibility-settings-write.ts
 1 src/renderer/src/store/slices/worktrees/create/create-worktree.ts
 1 src/renderer/src/store/slices/worktrees/create/prefetch-worktree-create-base.ts
 2 src/renderer/src/store/slices/worktrees/listing/detected-worktree-provider-request.ts
 1 src/renderer/src/store/slices/worktrees/listing/detected-worktree-refresh.ts
-1 src/renderer/src/store/slices/worktrees/listing/fetch-worktrees.ts
+2 src/renderer/src/store/slices/worktrees/listing/fetch-worktrees.ts
+1 src/renderer/src/store/slices/worktrees/listing/worktree-host-ownership.ts
 1 src/renderer/src/store/slices/worktrees/listing/worktree-owner-settings.ts
 2 src/renderer/src/store/slices/worktrees/metadata/hosted-review-push-target.ts
 1 src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts
 1 src/renderer/src/store/slices/worktrees/metadata/worktree-lineage-actions.ts
-3 src/renderer/src/store/slices/worktrees/metadata/worktree-lineage-refresh.ts
+5 src/renderer/src/store/slices/worktrees/metadata/worktree-lineage-refresh.ts
 1 src/renderer/src/store/slices/worktrees/metadata/worktree-meta-persist.ts
 1 src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts
 1 src/renderer/src/store/slices/worktrees/teardown/missing-worktree-terminal-teardown.ts

config/scripts/check-owner-routing-ratchet.mjs

@@ -8,31 +8,52 @@ import { pathToFileURL } from 'node:url'
 // instead of by the resource's own host. Per-file counts may only go down.
 // - Owner routing: the three focus-routing helpers, counted together so renaming one into another
 //   never lowers the count.
-// - Focus reads: every read of the setting, including the helpers and `defaultCreationHost`, so
-//   swapping a helper for a direct read or for the creation default never lowers it either.
+// - Focus reads: every read of the setting, including helpers that read it for the caller
+//   (`defaultCreationHost`, `getSettingsFocusedExecutionHostId`, …), so swapping one form for
+//   another never lowers it either.
 
 const SCAN_ROOT = 'src/renderer/src'
 const HELPER_NAMES = 'getActiveRuntimeTarget|legacyRouteFromSettings|settingsForRuntimeOwner'
 const HELPERS = `(?:${HELPER_NAMES})`
 const IMPORT_EXPORT_LIST = /\b(?:import|export)\s+(?:type\s+)?\{[^}]*\}/g
 // Calls and value uses (`.map(helper)`); definitions and type queries are not routing.
 const FOCUS_ROUTING_USE = new RegExp(`(?<!(?:function|typeof)\\s+)\\b${HELPERS}\\b`, 'g')
-const FOCUS_ROUTING_ALIAS = new RegExp(`\\b(?:${HELPER_NAMES}|defaultCreationHost)\\s+as\\b`)
-const FOCUS_SETTING_READ = /\??\.activeRuntimeEnvironmentId\b/g
-const DEFAULT_CREATION_HOST_USE = /(?<!(?:function|typeof)\s+)\bdefaultCreationHost\b/g
+// Helpers that read the setting on the caller's behalf, counted as reads by the focus ratchet.
+const FOCUS_READER_NAMES = new Set([
+  ...HELPER_NAMES.split('|'),
+  'defaultCreationHost',
+  'getSettingsFocusedExecutionHostId',
+  'getSingleFocusedRuntimeEnvironmentId'
+])
+const FOCUS_ROUTING_ALIAS = new RegExp(`\\b(?:${[...FOCUS_READER_NAMES].join('|')})\\s+as\\b`)
 
 /** Imports and re-exports are not uses; an aliased one is reported by {@link hasFocusRoutingAlias}. */
 export function countFocusRoutingCalls(sourceText) {
   return sourceText.replace(IMPORT_EXPORT_LIST, '').match(FOCUS_ROUTING_USE)?.length ?? 0
 }
 
-/** Member reads of the setting plus every helper that reads it on the caller's behalf. */
+const FOCUS_READER_USE = new RegExp(
+  `(?<!(?:function|typeof)\\s+)\\b(?:${[...FOCUS_READER_NAMES].join('|')})\\b`,
+  'g'
+)
+// Element reads after a PascalCase name or `>` are indexed types (`GlobalSettings['…']`), not reads.
+const SETTING_MEMBER_READ =
+  /\??\.\s*activeRuntimeEnvironmentId\b|(?<!(?:\b[A-Z][\w$]*|>)\s*)\[\s*['"]activeRuntimeEnvironmentId['"]\s*\]/g
+// `const { activeRuntimeEnvironmentId } = s` or `{ activeRuntimeEnvironmentId: id }: T = s`;
+// object literals and `({ … }) =>` parameters are not reads of the setting.
+const SETTING_DESTRUCTURE_READ =
+  /\{[^{}]*\bactiveRuntimeEnvironmentId\b[^{}]*\}\s*(?::[^=;{}]*)?=(?![=>])/g
+
+/**
+ * Reads of the setting (member, element and destructuring reads) plus every helper that reads it
+ * on the caller's behalf. Object-literal keys are writes and are not counted.
+ */
 export function countFocusSettingReads(sourceText) {
   const body = sourceText.replace(IMPORT_EXPORT_LIST, '')
   return (
-    (body.match(FOCUS_SETTING_READ)?.length ?? 0) +
-    (body.match(DEFAULT_CREATION_HOST_USE)?.length ?? 0) +
-    countFocusRoutingCalls(sourceText)
+    (body.match(SETTING_MEMBER_READ)?.length ?? 0) +
+    (body.match(SETTING_DESTRUCTURE_READ)?.length ?? 0) +
+    (body.match(FOCUS_READER_USE)?.length ?? 0)
   )
 }
 
@@ -60,8 +81,8 @@ export const RATCHETS = [
     baselinePath: 'config/focus-setting-read-baseline.txt',
     count: countFocusSettingReads,
     header: [
-      '# Renderer reads of the Active Server setting (`.activeRuntimeEnvironmentId`), the',
-      '# focus-routing helpers and defaultCreationHost(, per file.',
+      '# Renderer reads of the Active Server setting (member, element and destructuring reads of',
+      '# activeRuntimeEnvironmentId) plus helpers that read it for the caller, per file.',
       '# This is a RATCHET: counts may only go DOWN. Only creation flows with no source row may read',
       '# the default host, through defaultCreationHost. Everything else routes by the owner.',
       '# Prune after removing reads: pnpm check:owner-routing-ratchet --prune'

config/scripts/check-owner-routing-ratchet.test.mjs

@@ -47,18 +47,40 @@ describe('countFocusSettingReads', () => {
       "import { defaultCreationHost } from './default-creation-host'",
       'const a = settings?.activeRuntimeEnvironmentId',
       'const b = state.settings.activeRuntimeEnvironmentId',
-      'const c = getActiveRuntimeTarget(settings)',
-      'const d = defaultCreationHost(settings)',
+      "const c = settings['activeRuntimeEnvironmentId']",
+      'const d = getActiveRuntimeTarget(settings)',
+      'const e = defaultCreationHost(settings)',
       'export function defaultCreationHost(settings) {}'
     ].join('\n')
-    expect(countFocusSettingReads(src)).toBe(4)
+    expect(countFocusSettingReads(src)).toBe(5)
   })
 
-  it('does not count writes, keys or type positions', () => {
+  it('counts a shared focus helper, so wrapping one in an owner transport lowers nothing', () => {
+    expect(
+      countFocusSettingReads(
+        'const t = runtimeTargetForOwnerHostId(getSettingsFocusedExecutionHostId(s))'
+      )
+    ).toBe(1)
+    expect(countFocusSettingReads('const id = getSingleFocusedRuntimeEnvironmentId(state)')).toBe(1)
+  })
+
+  it('counts destructuring reads', () => {
+    expect(countFocusSettingReads('const { activeRuntimeEnvironmentId } = s')).toBe(1)
+    expect(
+      countFocusSettingReads(
+        "const { theme, activeRuntimeEnvironmentId: id }: Pick<GlobalSettings, 'theme'> = s"
+      )
+    ).toBe(1)
+  })
+
+  it('does not count writes, keys, props or type positions', () => {
     const src = [
       'const owner = { activeRuntimeEnvironmentId: id }',
+      'settings = { ...settings, activeRuntimeEnvironmentId: null }',
       "type T = GlobalSettings['activeRuntimeEnvironmentId']",
-      'updateSettings({ activeRuntimeEnvironmentId: null })'
+      'updateSettings({ activeRuntimeEnvironmentId: null })',
+      'const f = ({ activeRuntimeEnvironmentId }) => activeRuntimeEnvironmentId',
+      'if (a === b) { x = { activeRuntimeEnvironmentId } }'
     ].join('\n')
     expect(countFocusSettingReads(src)).toBe(0)
   })
@@ -73,6 +95,9 @@ describe('hasFocusRoutingAlias', () => {
       hasFocusRoutingAlias("export {\n  settingsForRuntimeOwner as owner\n} from './target'")
     ).toBe(true)
     expect(hasFocusRoutingAlias("import { defaultCreationHost as host } from './d'")).toBe(true)
+    expect(
+      hasFocusRoutingAlias("import { getSettingsFocusedExecutionHostId as h } from './e'")
+    ).toBe(true)
     expect(hasFocusRoutingAlias("import { getActiveRuntimeTarget } from './rpc'")).toBe(false)
   })
 })