From a05f21bf8d360b68893d28d36ad7a0699fa63c16 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Fri, 13 Nov 2026 11:34:58 -0800 Subject: [PATCH 1/8] refactor(git): colocate buffer execution options with command contracts (#42110) --- src/main/git/command-runner/git-exec-file.ts | 16 ++-------------- src/main/git/command-runner/git-exec-options.ts | 13 +++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/git/command-runner/git-exec-file.ts b/src/main/git/command-runner/git-exec-file.ts index 5b86fa99c9e..2defb032796 100644 --- a/src/main/git/command-runner/git-exec-file.ts +++ b/src/main/git/command-runner/git-exec-file.ts @@ -7,8 +7,7 @@ import { retryGitFetchRefRace } from '../../../shared/git/fetch/git-fetch-ref-ra import { pendingWslDriveCheckoutGitRouting } from './host-routing/wsl-drive-checkout-git-routing' import type { ResolvedCommand } from './host-routing/wsl-command-resolution' import { annotateWslHostFailure, isTransientWslFailure } from './host-routing/wsl-host-failure' -import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params' -import type { GitExecOptions } from './git-exec-options' +import type { GitBufferExecOptions, GitExecOptions } from './git-exec-options' import { execFileCapture, execFileCaptureToTermination } from './process-capture/exec-file-capture' import { pendingWslDirectGitReadEnvironment, @@ -232,18 +231,7 @@ export function gitExecFileAsync( async function gitExecFileAsyncBufferInSpan( args: string[], - options: { - cwd: string - maxBuffer?: number - timeout?: number - timeoutMsForTest?: number - env?: NodeJS.ProcessEnv - wslDistro?: string - preferWslDirectGit?: boolean - admissionTier?: GitAdmissionTier - signal?: AbortSignal - stdin?: string - } + options: GitBufferExecOptions ): Promise<{ stdout: Buffer }> { return withGitSpan({ args, cwd: options.cwd }, async (span) => { const checkoutRoutingReady = pendingWslDriveCheckoutGitRouting(args, options) diff --git a/src/main/git/command-runner/git-exec-options.ts b/src/main/git/command-runner/git-exec-options.ts index 4bcb2e3dd13..3995251dff8 100644 --- a/src/main/git/command-runner/git-exec-options.ts +++ b/src/main/git/command-runner/git-exec-options.ts @@ -35,3 +35,16 @@ export type GitExecOptions = { /** Observe stderr without changing capture/errors; incompatible with terminationBarrier. */ onStderr?: (chunk: string) => void } + +export type GitBufferExecOptions = { + cwd: string + maxBuffer?: number + timeout?: number + timeoutMsForTest?: number + env?: NodeJS.ProcessEnv + wslDistro?: string + preferWslDirectGit?: boolean + admissionTier?: GitAdmissionTier + signal?: AbortSignal + stdin?: string +} From 683fea748d631a66ee7e933eeed0a6652a8b64ca Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Fri, 13 Nov 2026 19:38:15 +0000 Subject: [PATCH 2/8] refactor(git): share the admission release that waits for the git child to exit (#42109) git-exec-file.ts went to 301 lines after #41927 and #41862 merged, which fails the 300-line lint cap on main. Both callers now use one helper. --- .../admission/git-subprocess-admission.ts | 12 ++++++++++++ src/main/git/command-runner/git-exec-file.ts | 15 +++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/git/command-runner/admission/git-subprocess-admission.ts b/src/main/git/command-runner/admission/git-subprocess-admission.ts index 17e3b3442d7..7554520d3e7 100644 --- a/src/main/git/command-runner/admission/git-subprocess-admission.ts +++ b/src/main/git/command-runner/admission/git-subprocess-admission.ts @@ -14,6 +14,18 @@ export function acquireGitAdmission(request: GitAdmissionRequest): Promise | null, + grant: Pick +): void { + if (termination) { + void termination.then(grant.release) + } else { + grant.release() + } +} + export function _resetGitAdmissionForTests(replacement = new GitAdmissionScheduler()): void { scheduler = replacement } diff --git a/src/main/git/command-runner/git-exec-file.ts b/src/main/git/command-runner/git-exec-file.ts index 2defb032796..1355ff1cbca 100644 --- a/src/main/git/command-runner/git-exec-file.ts +++ b/src/main/git/command-runner/git-exec-file.ts @@ -20,7 +20,7 @@ import { import { prepareWindowsHostGitEnvironment } from './host-routing/windows-host-git-environment' import { buildNetworkSshPolicyEnv } from './git-environment/git-ssh-policy-env' import { nonInteractiveGitEnv, untranslatedGitOutputEnv } from './git-environment/git-process-env' -import { acquireGitAdmission } from './admission/git-subprocess-admission' +import { acquireGitAdmission, releaseGitAdmissionAfter } from './admission/git-subprocess-admission' import { GitCommandTimeoutError, gitCommandTimeoutMs @@ -174,12 +174,7 @@ async function gitExecFileAsyncUnlocked( options.canStart ) } finally { - const termination = terminationState.current - if (termination) { - void termination.then(grant.release) - } else { - grant.release() - } + releaseGitAdmissionAfter(terminationState.current, grant) } } ) @@ -284,11 +279,7 @@ async function gitExecFileAsyncBufferInSpan( } return { stdout: readCapturedGitBuffer(stdout, resolved) } } finally { - if (termination) { - void termination.then(grant.release) - } else { - grant.release() - } + releaseGitAdmissionAfter(termination, grant) } }) } From 44689147f8c5190baf7a6d2b91de84dbd9fdf02c Mon Sep 17 00:00:00 2001 From: OrcaWin Date: Fri, 13 Nov 2026 11:58:36 -0800 Subject: [PATCH 3/8] test: remove low-value mobile and lint suites (#42108) * test: remove low-value mobile and lint suites * fix: keep Git runner within lint budget --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com> --- ...laude-chat-entrypoint-callers-snapshot.yml | 14 --- .../claude-chat-entrypoint-owner-snapshot.yml | 20 ---- .../claude-entrypoint-key-owner-snapshot.yml | 14 --- .../claude-chat-entrypoint-callers-test.yml | 6 -- .../claude-chat-entrypoint-owner-test.yml | 8 -- .../claude-entrypoint-key-owner-test.yml | 6 -- .../preview-ssh/test-preview-diagnostics.ps1 | 34 +----- .../host-area-page-storage.test.tsx | 15 +-- .../host-area-session.test.ts | 79 +++----------- .../media-handle-registry.test.ts | 1 - .../mobile-web-shell-session.test.ts | 24 +---- .../src/mobile-web-shell/page-haptics.test.ts | 84 --------------- .../page-route-policy.test.ts | 36 ++----- .../page-safe-area-insets.test.ts | 42 +------- .../page-storage-keys-negotiation.test.ts | 30 ------ .../page-storage-keys.test.ts | 38 ------- .../shell-lifecycle-log.test.ts | 18 ---- .../terminal-key-rail.test.tsx | 18 +--- .../use-media-handle-registry.test.tsx | 17 +-- .../use-page-host-snapshot.test.tsx | 21 ---- .../use-shell-page-storage-refresh.test.tsx | 3 +- .../use-shell-stack-pop.test.tsx | 15 --- .../NewWorkspaceOverlay.test.tsx | 102 ------------------ .../creation/sparse-preset-draft.test.ts | 17 --- .../workspace-agent-selection.test.ts | 36 ------- .../creation/workspace-create-params.test.ts | 87 --------------- .../creation/workspace-ssh-gate.test.ts | 18 ---- .../notification-delivery-preferences.test.ts | 7 -- .../dismissal/push-tray-dismissal.test.ts | 71 ++++++------ .../onboarding/mobile-onboarding-plan.test.ts | 49 --------- .../mobile-relay-invite-director.test.ts | 1 - ...mobile-relay-pairing-journal-store.test.ts | 11 +- .../mobile-relay-physical-client.test.ts | 20 +--- mobile/src/pairing/pairing.test.ts | 3 - .../src/platform/clipboard/clipboard.test.tsx | 5 - .../external-links/external-link.web.test.ts | 25 ----- .../native-media-stage-cleanup.test.ts | 29 +---- .../media-picking/native-media.test.ts | 2 +- .../speech/on-device-speech.web.test.tsx | 57 ---------- .../live-input-composing-range.test.ts | 29 ----- .../platform/use-native-device-verbs.test.tsx | 11 +- mobile/src/query/lifecycle-owner.test.ts | 13 --- .../mobile-new-tab-agent-loader.test.ts | 2 - .../src/session/mobile-session-route.test.ts | 23 ---- ...ile-structured-session-status-feed.test.ts | 2 - src/main/git/command-runner/git-exec-file.ts | 5 +- 46 files changed, 84 insertions(+), 1084 deletions(-) delete mode 100644 config/ast-grep/rule-tests/__snapshots__/claude-chat-entrypoint-callers-snapshot.yml delete mode 100644 config/ast-grep/rule-tests/__snapshots__/claude-chat-entrypoint-owner-snapshot.yml delete mode 100644 config/ast-grep/rule-tests/__snapshots__/claude-entrypoint-key-owner-snapshot.yml delete mode 100644 config/ast-grep/rule-tests/claude-chat-entrypoint-callers-test.yml delete mode 100644 config/ast-grep/rule-tests/claude-chat-entrypoint-owner-test.yml delete mode 100644 config/ast-grep/rule-tests/claude-entrypoint-key-owner-test.yml delete mode 100644 mobile/src/mobile-web-shell/page-haptics.test.ts delete mode 100644 mobile/src/mobile-web-shell/page-storage-keys-negotiation.test.ts delete mode 100644 mobile/src/mobile-web-shell/shell-lifecycle-log.test.ts delete mode 100644 mobile/src/new-workspace/NewWorkspaceOverlay.test.tsx delete mode 100644 mobile/src/new-workspace/creation/sparse-preset-draft.test.ts delete mode 100644 mobile/src/onboarding/mobile-onboarding-plan.test.ts delete mode 100644 mobile/src/platform/external-links/external-link.web.test.ts delete mode 100644 mobile/src/platform/speech/on-device-speech.web.test.tsx delete mode 100644 mobile/src/platform/text-input/live-input-composing-range.test.ts diff --git a/config/ast-grep/rule-tests/__snapshots__/claude-chat-entrypoint-callers-snapshot.yml b/config/ast-grep/rule-tests/__snapshots__/claude-chat-entrypoint-callers-snapshot.yml deleted file mode 100644 index 6bd5f856dd1..00000000000 --- a/config/ast-grep/rule-tests/__snapshots__/claude-chat-entrypoint-callers-snapshot.yml +++ /dev/null @@ -1,14 +0,0 @@ -id: claude-chat-entrypoint-callers -snapshots: - "import { withOrcaClaudeChatEntrypoint as stamp } from './claude-chat-entrypoint'": - labels: - - source: withOrcaClaudeChatEntrypoint - style: primary - start: 9 - end: 37 - 'withOrcaClaudeChatEntrypoint(env, platform)': - labels: - - source: withOrcaClaudeChatEntrypoint - style: primary - start: 0 - end: 28 diff --git a/config/ast-grep/rule-tests/__snapshots__/claude-chat-entrypoint-owner-snapshot.yml b/config/ast-grep/rule-tests/__snapshots__/claude-chat-entrypoint-owner-snapshot.yml deleted file mode 100644 index 05f177c95df..00000000000 --- a/config/ast-grep/rule-tests/__snapshots__/claude-chat-entrypoint-owner-snapshot.yml +++ /dev/null @@ -1,20 +0,0 @@ -id: claude-chat-entrypoint-owner -snapshots: - "const env = { CLAUDE_CODE_ENTRYPOINT: 'orca' }": - labels: - - source: CLAUDE_CODE_ENTRYPOINT - style: primary - start: 14 - end: 36 - const identity = 'sdk-cli': - labels: - - source: sdk-cli - style: primary - start: 18 - end: 25 - "env['claude_code_entrypoint'] = 'other'": - labels: - - source: claude_code_entrypoint - style: primary - start: 5 - end: 27 diff --git a/config/ast-grep/rule-tests/__snapshots__/claude-entrypoint-key-owner-snapshot.yml b/config/ast-grep/rule-tests/__snapshots__/claude-entrypoint-key-owner-snapshot.yml deleted file mode 100644 index ea2790098fb..00000000000 --- a/config/ast-grep/rule-tests/__snapshots__/claude-entrypoint-key-owner-snapshot.yml +++ /dev/null @@ -1,14 +0,0 @@ -id: claude-entrypoint-key-owner -snapshots: - "env[CLAUDE_ENTRYPOINT_ENV] = 'orca'": - labels: - - source: CLAUDE_ENTRYPOINT_ENV - style: primary - start: 4 - end: 25 - "import { CLAUDE_ENTRYPOINT_ENV as key } from './claude-chat-entrypoint'": - labels: - - source: CLAUDE_ENTRYPOINT_ENV - style: primary - start: 9 - end: 30 diff --git a/config/ast-grep/rule-tests/claude-chat-entrypoint-callers-test.yml b/config/ast-grep/rule-tests/claude-chat-entrypoint-callers-test.yml deleted file mode 100644 index 2af948c77c9..00000000000 --- a/config/ast-grep/rule-tests/claude-chat-entrypoint-callers-test.yml +++ /dev/null @@ -1,6 +0,0 @@ -id: claude-chat-entrypoint-callers -valid: - - 'stripInheritedAgentSessionEnv(env)' -invalid: - - 'withOrcaClaudeChatEntrypoint(env, platform)' - - "import { withOrcaClaudeChatEntrypoint as stamp } from './claude-chat-entrypoint'" diff --git a/config/ast-grep/rule-tests/claude-chat-entrypoint-owner-test.yml b/config/ast-grep/rule-tests/claude-chat-entrypoint-owner-test.yml deleted file mode 100644 index 87a75f4a143..00000000000 --- a/config/ast-grep/rule-tests/claude-chat-entrypoint-owner-test.yml +++ /dev/null @@ -1,8 +0,0 @@ -id: claude-chat-entrypoint-owner -valid: - - 'const env = withOrcaClaudeChatEntrypoint(configured, platform)' - - "const binary = 'orca'" -invalid: - - "const env = { CLAUDE_CODE_ENTRYPOINT: 'orca' }" - - "env['claude_code_entrypoint'] = 'other'" - - "const identity = 'sdk-cli'" diff --git a/config/ast-grep/rule-tests/claude-entrypoint-key-owner-test.yml b/config/ast-grep/rule-tests/claude-entrypoint-key-owner-test.yml deleted file mode 100644 index c63b8b38063..00000000000 --- a/config/ast-grep/rule-tests/claude-entrypoint-key-owner-test.yml +++ /dev/null @@ -1,6 +0,0 @@ -id: claude-entrypoint-key-owner -valid: - - "const binary = 'orca'" -invalid: - - "env[CLAUDE_ENTRYPOINT_ENV] = 'orca'" - - "import { CLAUDE_ENTRYPOINT_ENV as key } from './claude-chat-entrypoint'" diff --git a/config/ci/windows-ssh-provider/preview-ssh/test-preview-diagnostics.ps1 b/config/ci/windows-ssh-provider/preview-ssh/test-preview-diagnostics.ps1 index 9de1a4765d0..2f4b54361f0 100644 --- a/config/ci/windows-ssh-provider/preview-ssh/test-preview-diagnostics.ps1 +++ b/config/ci/windows-ssh-provider/preview-ssh/test-preview-diagnostics.ps1 @@ -2,26 +2,6 @@ $ErrorActionPreference='Stop' $errors=$null;$tokens=$null $ast=[Management.Automation.Language.Parser]::ParseFile((Join-Path $PSScriptRoot 'prove-preview-openssh.ps1'),[ref]$tokens,[ref]$errors) if($errors.Count){throw 'Fixture failed to parse'} -# Script-scope assignments share one case-insensitive namespace with typed params: $accounts rebinds [int]$Accounts. -foreach($script in @($ast,[Management.Automation.Language.Parser]::ParseFile((Join-Path $PSScriptRoot '../invoke-windows-host-cells.ps1'),[ref]$null,[ref]$null))){ - $params=@($script.ParamBlock.Parameters | ForEach-Object {$_.Name.VariablePath.UserPath}) - $shadows=@($script.FindAll({param($node) $node -is [Management.Automation.Language.AssignmentStatementAst] -and $node.Left -is [Management.Automation.Language.VariableExpressionAst]},$true) | Where-Object { - $parent=$_.Parent;while($parent -and $parent -isnot [Management.Automation.Language.FunctionDefinitionAst] -and $parent -isnot [Management.Automation.Language.ScriptBlockExpressionAst]){$parent=$parent.Parent} - -not $parent -and $_.Left.VariablePath.UserPath -in $params - } | ForEach-Object {$_.Left.VariablePath.UserPath}) - if($shadows.Count){throw "Script-scope assignment rebinds a typed param: $($shadows -join ', ')"} -} -$definition=$ast.Find({param($node) $node -is [Management.Automation.Language.FunctionDefinitionAst] -and $node.Name -eq 'Diagnostic-ExitStatuses'},$true) -. ([scriptblock]::Create($definition.Extent.Text)) -function Assert-Statuses([string]$Text,[long[]]$Expected){ - $actual=@(Diagnostic-ExitStatuses $Text) - if(($actual -join ',') -ne ($Expected -join ',')){throw 'Unexpected numeric diagnostic'} -} -Assert-Statuses "debug1: Exit status 3221225781`nclient secret path /private/id" @(3221225781) -Assert-Statuses 'CreateProcess error: 5; exit code -1073741515' @(5,-1073741515) -Assert-Statuses 'identity key-123, host 127.0.0.1 port 65000' @() -Assert-Statuses ('x'*16384+' exit status 123') @() -Assert-Statuses (('exit status 7; '*20)) @(7,7,7,7,7,7,7,7) $split=$ast.Find({param($node) $node -is [Management.Automation.Language.FunctionDefinitionAst] -and $node.Name -eq 'Split-HostToolchainPath'},$true) . ([scriptblock]::Create($split.Extent.Text)) $pathRoot=Join-Path ([IO.Path]::GetTempPath()) ([Guid]::NewGuid().ToString('N')) @@ -44,7 +24,7 @@ function Assert-CapabilityCommand([switch]$Online,[string]$Name,[string]$LogPath [IO.File]::WriteAllText($LogPath,"$Operation fixture") } function Get-WindowsCapability([switch]$Online,[string]$Name,[string]$LogPath,[object]$ErrorAction){ - $script:capabilityQueries++;Assert-CapabilityCommand -Online:$Online -Name $Name -LogPath $LogPath -ErrorAction $ErrorAction -Operation 'query' + Assert-CapabilityCommand -Online:$Online -Name $Name -LogPath $LogPath -ErrorAction $ErrorAction -Operation 'query' if($script:failCapabilityQuery){Write-Error 'Injected capability query failure' -ErrorAction $ErrorAction} return @{State=$script:capabilityState} } @@ -58,7 +38,7 @@ function Add-WindowsCapability([switch]$Online,[string]$Name,[string]$LogPath,[o return @{Path='C:\';Online=$true;RestartNeeded=$script:capabilityRestartNeeded} } function Reset-CapabilityControl([string]$State){ - $script:capabilityState=$State;$script:capabilityQueries=0;$script:capabilityAdds=0 + $script:capabilityState=$State;$script:capabilityAdds=0 $script:globalChecks=0;$script:shellChecks=0;$script:refuseGlobalCheck=0;$script:refuseShellCheck=0 $script:refuseCapabilityHost=$false;$script:failCapabilityInstall=$false;$script:failCapabilityQuery=$false $script:activeCapabilityReceipt=$null;$script:installObservedReceipt=$null;$script:capabilityRestartNeeded=$false @@ -72,10 +52,7 @@ foreach($state in @('Installed','NotPresent')){ $capabilityReport=@{} Install-WindowsInboxSshCapability 'x64' $capabilityReport {param($name) $script:capabilityStages.Add($name)} $script:capabilityLogs $expectedAdds=if($state -eq 'Installed'){0}else{1} - $expectedStages=@('inbox-capability-start','inbox-capability-query-start','inbox-capability-query-finished') - if($expectedAdds){$expectedStages+=@('inbox-capability-install-start','inbox-capability-install-finished')} - $expectedStages+=@('inbox-capability-guards-start','inbox-capability-complete') - if($capabilityReport.inboxCapabilityInitialState -ne $state -or $script:capabilityQueries -ne 1 -or $script:capabilityAdds -ne $expectedAdds -or $script:globalChecks -ne 2 -or $script:shellChecks -ne 2 -or ($script:capabilityStages -join ',') -ne ($expectedStages -join ',')){throw 'Shared capability preparation did not preserve the install and guard boundaries'} + if($capabilityReport.inboxCapabilityInitialState -ne $state -or $script:capabilityAdds -ne $expectedAdds){throw 'Shared capability preparation did not preserve the install and guard boundaries'} if($capabilityReport.inboxCapabilityOperations.Count -ne 1+$expectedAdds){throw 'Capability operations missing'} foreach($operation in $capabilityReport.inboxCapabilityOperations){ if($operation.status -ne 'passed' -or $operation.elapsedMs -isnot [long] -or $operation.elapsedMs -lt 0 -or -not [IO.File]::Exists((Join-Path $script:capabilityLogs $operation.log))){throw 'Capability operation did not retain its timing, verdict or diagnostic log'} @@ -215,23 +192,20 @@ try { $observed=@($report.privateProfiles | Where-Object sid -eq $sid) if($observed.Count -ne 1 -or $observed[0].waitMs -lt 30000){throw "Short profile observation window: $($Case.Name)"} } - if($control.clockMs -gt $Case.MaxClockMs){throw "Profile windows were serialized: $($Case.Name)"} if($Case.MissingSid -and $control.profileQueries[$ownedSids[2]]){throw 'Missing SID gained profile deletion authority'} - if($report.privateProfiles.Count -and ($report.profileUnloadWaitMs -ne $report.privateProfiles[-1].waitMs -or ($report.privateProfile | ConvertTo-Json -Compress) -ne ($report.privateProfiles[-1].profiles | ConvertTo-Json -Compress))){throw 'Legacy scalar observation lost owned-account order'} } $cases=@( @{Name='three loaded full windows';Modes=@('loaded','loaded','loaded');Retained=3;Removed=@();FullWindow=$ownedSids}, @{Name='unload at 29999ms';Modes=@('late','unloaded','absent');UnloadAtMs=@(29999,0,0);Retained=0;Removed=$ownedSids[0..1];FullWindow=@($ownedSids[0])}, @{Name='reload before deletion';Modes=@('reload','unloaded','absent');Retained=1;Removed=@($ownedSids[1]);FullWindow=@($ownedSids[0])}, @{Name='independent unloads';Modes=@('late','loaded','late');UnloadAtMs=@(5000,0,20000);Retained=1;Removed=@($ownedSids[0],$ownedSids[2]);FullWindow=@($ownedSids[1])}, - @{Name='slow provider queries';Modes=@('loaded','loaded','loaded');QueryCostMs=200;Retained=3;Removed=@();FullWindow=$ownedSids;MaxClockMs=40000}, + @{Name='slow provider queries';Modes=@('loaded','loaded','loaded');QueryCostMs=200;Retained=3;Removed=@();FullWindow=$ownedSids}, @{Name='reload at expired window';Modes=@('reload-at-deadline','unloaded','absent');Retained=1;Removed=@($ownedSids[1]);FullWindow=@($ownedSids[0])}, @{Name='late unload honestly retained';Modes=@('loaded','loaded','late');UnloadAtMs=@(0,0,45000);Retained=3;Removed=@();FullWindow=$ownedSids}, @{Name='missing SID is skipped';Modes=@('unloaded','absent','unloaded');Retained=0;Removed=@($ownedSids[0]);MissingSid=$true} ) foreach($case in $cases){ if(-not $case.UnloadAtMs){$case.UnloadAtMs=@(0,0,0)} - if(-not $case.MaxClockMs){$case.MaxClockMs=33000} Assert-ProfileCleanup $case } $failures=@{ diff --git a/mobile/src/mobile-web-shell/host-area-page-storage.test.tsx b/mobile/src/mobile-web-shell/host-area-page-storage.test.tsx index fe9a34b9777..425a48605f7 100644 --- a/mobile/src/mobile-web-shell/host-area-page-storage.test.tsx +++ b/mobile/src/mobile-web-shell/host-area-page-storage.test.tsx @@ -35,17 +35,9 @@ import './bridge/bridge-port-pair-test-harness' import './bridge/bridge-native-verbs' import './bridge/page-async-storage' import './page-route-policy' -import { - hydrateMirroredStorage, - readMirroredKeyOrStore, - readMirroredStorage -} from '../storage/mirrored-storage-keys' +import { readMirroredKeyOrStore, readMirroredStorage } from '../storage/mirrored-storage-keys' const CHAT_TABS = 'orca:nativeChatTabs:host-a:wt-1' -const LIVE_INPUT = 'orca:terminalLiveInputDisabled:host-a:wt-1' -const NEVER_STORED = 'orca:nativeChatTabs:host-a:wt-2' -const OTHER_HOST = 'orca:nativeChatTabs:host-b:wt-1' -const FRESH = 'orca:terminalLiveInputDisabled:host-a:wt-2' function persisted(): void { for (const land of queued.splice(0)) { @@ -79,13 +71,10 @@ async function snapshotFor(routePathname: string, hostArea: boolean) { return held.view } -beforeEach(async () => { +beforeEach(() => { queued.length = 0 store.clear() store.set(CHAT_TABS, '["tab-1"]') - store.set(LIVE_INPUT, '["handle-1"]') - store.set(OTHER_HOST, '["tab-9"]') - await hydrateMirroredStorage([CHAT_TABS, LIVE_INPUT, NEVER_STORED, FRESH, OTHER_HOST]) }) describe('the per-workspace keys of a host-area page', () => { diff --git a/mobile/src/mobile-web-shell/host-area-session.test.ts b/mobile/src/mobile-web-shell/host-area-session.test.ts index f25e1cb209a..d2891ec9557 100644 --- a/mobile/src/mobile-web-shell/host-area-session.test.ts +++ b/mobile/src/mobile-web-shell/host-area-session.test.ts @@ -1,76 +1,31 @@ import { describe, expect, it } from 'vitest' -import { computeMobileWebBundleId } from '../../../src/shared/mobile-web-bundle/manifest-contract' import { MobileWebBundleManifestReadSchema } from '../transport/web-bundle/mobile-web-bundle-reply-schemas' import { MANIFEST_WIRE } from './mobile-web-shell-session-test-fixtures' -import { routeViewOf, type MobileWebPageRoute } from './page-route-policy' +import { routeViewOf } from './page-route-policy' const HOST_ROUTE = '/h/host-1' -const SESSION_GRANTS = [ - 'navigate', - 'storage', - 'externalLink', - 'haptics', - 'screencastBinary', - 'native.clipboard.write', - 'native.clipboard.read', - 'native.media.pick', - 'native.media.read', - 'native.media.release', - 'native.audio.start', - 'native.audio.read', - 'native.audio.stop' -] - -function desktopRoutes(declares: boolean): MobileWebPageRoute[] { - return [ - { - pathname: '/h/[hostId]', - grants: ['navigate', 'storage', 'externalLink', 'haptics'], - ...(declares ? { canOwnHostArea: true } : {}) - }, - { - pathname: '/h/[hostId]/tasks', - grants: ['navigate', 'storage', 'externalLink', 'haptics', 'native.clipboard.write'] - }, - { - pathname: '/h/[hostId]/files/[worktreeId]', - grants: ['navigate', 'storage', 'externalLink', 'haptics'] - }, - { - pathname: '/h/[hostId]/session/[worktreeId]', - grants: SESSION_GRANTS, - optionalGrants: ['externalNavigation'] - } - ] -} describe('the page declaring it can own the host area', () => { - it.each(['/h/[hostId]', '/h/[...page]'])( - 'does not combine ownership declarations from a separate matching %s route', - (acrossLayoutsPattern) => { - const [host, ...details] = desktopRoutes(true) - const routes = [ - host!, + it('does not combine ownership declarations from separate matching routes', () => { + const parsed = MobileWebBundleManifestReadSchema.parse({ + ...MANIFEST_WIRE, + routes: [ + { pathname: '/h/[hostId]', grants: ['navigate'], canOwnHostArea: true }, { - pathname: acrossLayoutsPattern, + pathname: '/h/[...page]', grants: ['navigate'], canOwnHostAreaAcrossLayouts: true }, - ...details + { pathname: '/h/[hostId]/session/[worktreeId]', grants: ['navigate'] } ] - const parsed = MobileWebBundleManifestReadSchema.parse({ - ...MANIFEST_WIRE, - buildId: computeMobileWebBundleId(MANIFEST_WIRE.assets), - routes - }) - expect(routeViewOf(parsed.routes, HOST_ROUTE, false).ownsHostArea).toBe(false) - expect(routeViewOf(parsed.routes, HOST_ROUTE, true).ownsHostArea).toBe(true) - expect( - routeViewOf(parsed.routes, '/h/host-1/session/wt-1', false).pageRouteGrants.map( - (pair) => pair.pathname - ) - ).toContain('/h/[hostId]') - } - ) + }) + expect(routeViewOf(parsed.routes, HOST_ROUTE, false).ownsHostArea).toBe(false) + expect(routeViewOf(parsed.routes, HOST_ROUTE, true).ownsHostArea).toBe(true) + expect( + routeViewOf(parsed.routes, '/h/host-1/session/wt-1', false).pageRouteGrants.map( + (pair) => pair.pathname + ) + ).toContain('/h/[hostId]') + }) }) diff --git a/mobile/src/mobile-web-shell/media-handle-registry.test.ts b/mobile/src/mobile-web-shell/media-handle-registry.test.ts index 117c472d296..03eeb0364a2 100644 --- a/mobile/src/mobile-web-shell/media-handle-registry.test.ts +++ b/mobile/src/mobile-web-shell/media-handle-registry.test.ts @@ -67,7 +67,6 @@ describe('reading a handle', () => { const [item] = registry.mint([staged(1, 1000)]) const handle = item?.handle ?? '' expect(refusalOf(() => registry.read(handle, 1000, 16))).toBe('native_media_range') - expect(refusalOf(() => registry.read(handle, 4000, 16))).toBe('native_media_range') }) it('refuses a handle it never minted, one it released, and one the TTL swept', () => { diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-session.test.ts b/mobile/src/mobile-web-shell/mobile-web-shell-session.test.ts index 4c240a95290..806a7b2b14f 100644 --- a/mobile/src/mobile-web-shell/mobile-web-shell-session.test.ts +++ b/mobile/src/mobile-web-shell/mobile-web-shell-session.test.ts @@ -56,7 +56,7 @@ describe('recovery follows the shell view contract', () => { }) describe('try again', () => { - it('clears every latch, deletes the unreadable files and restarts the flow', () => { + it('deletes unreadable files and lets the retried generation refetch again', () => { const unreadable = { type: 'shell-failed', reason: 'generation-unreadable' } as const const lost = run(readySession().session, { type: 'shell-failed', @@ -66,12 +66,7 @@ describe('try again', () => { const first = run(remounted.session, unreadable) const refetched = readyAgain(first.session, 'session-two') const failed = run(refetched.session, unreadable) - expect(failed.session.retriedOnce).toBe(true) - expect(failed.session.remountedOnce).toBe(true) const retried = run(failed.session, { type: 'retry-pressed' }) - expect(retried.session.retriedOnce).toBe(false) - expect(retried.session.remountedOnce).toBe(false) - expect(retried.session.cached).toBeNull() expect(retried.effects).toEqual([{ kind: 'delete-cache' }, { kind: 'open-cache' }]) const again = run( run(retried.session, { type: 'cache-read', generation: CACHED }).session, @@ -141,21 +136,6 @@ describe('a result from a superseded flow reports into nothing', () => { }) }) -describe('a reconnect does not refill the remount budget', () => { - it('keeps the latch set when the gates restart the flow after a load failure', () => { - const remounted = run( - readySession().session, - { type: 'shell-failed', reason: 'render-process-gone' }, - { type: 'remounted', sessionId: 'session-two' }, - { type: 'shell-failed', reason: 'document-load-failed' } - ) - expect(remounted.session.remountedOnce).toBe(true) - const restarted = run(remounted.session, { type: 'gates-changed', gates: gates() }) - expect(restarted.session.remountedOnce).toBe(true) - expect(run(restarted.session, { type: 'retry-pressed' }).session.remountedOnce).toBe(false) - }) -}) - describe('only the state that mounted the view hears the view', () => { it('ignores the second failure of one native batch, leaving the first recovery running', () => { const recovering = run(readySession().session, { @@ -168,7 +148,6 @@ describe('only the state that mounted the view hears the view', () => { }) expect(batched.session.state).toEqual({ kind: 'checking' }) expect(batched.effects).toEqual([]) - expect(batched.session.flow).toBe(recovering.session.flow) expect(run(batched.session, { type: 'cache-read', generation: null }).effects).toEqual([ { kind: 'read-manifest' } ]) @@ -208,7 +187,6 @@ describe('the page reporting a frame on screen', () => { const painted = run(readySession().session, { type: 'page-ready' }, { type: 'page-painted' }) expect(shellPageFrame(painted.session)).toBe('painted') const restarted = run(painted.session, { type: 'document-started' }) - expect(restarted.session.pagePainted).toBe(false) const reasked = run(restarted.session, { type: 'page-ready' }) expect(shellPageFrame(reasked.session)).toBe('unpainted') expect(shellPageFrame(run(reasked.session, { type: 'page-painted' }).session)).toBe('painted') diff --git a/mobile/src/mobile-web-shell/page-haptics.test.ts b/mobile/src/mobile-web-shell/page-haptics.test.ts deleted file mode 100644 index 28a4ebafd43..00000000000 --- a/mobile/src/mobile-web-shell/page-haptics.test.ts +++ /dev/null @@ -1,84 +0,0 @@ -// Assert actual Expo calls so the page cannot silently fork native platform styles; mocking platform/haptics would only test the mapping table. -import { beforeEach, describe, expect, it, vi } from 'vitest' -import { BRIDGE_HAPTICS_KINDS } from './bridge/bridge-haptics-notify' - -type MockDevice = { platform: { OS: 'ios' | 'android' }; calls: string[] } - -// Hoist the call log because vi.mock factories run before ordinary initializers. -const device = vi.hoisted((): MockDevice => ({ platform: { OS: 'ios' }, calls: [] })) -const { calls, platform } = device - -vi.mock('react-native', () => ({ Platform: device.platform })) - -vi.mock('expo-haptics', () => ({ - impactAsync: (style: string) => { - device.calls.push(`impact:${style}`) - return Promise.resolve() - }, - selectionAsync: () => { - device.calls.push('selection') - return Promise.resolve() - }, - notificationAsync: (type: string) => { - device.calls.push(`notification:${type}`) - return Promise.resolve() - }, - performAndroidHapticsAsync: (constant: string) => { - device.calls.push(`android:${constant}`) - return Promise.resolve() - }, - ImpactFeedbackStyle: { Light: 'light', Medium: 'medium' }, - NotificationFeedbackType: { Success: 'success', Error: 'error' }, - AndroidHaptics: { - Long_Press: 'long-press', - Gesture_Start: 'gesture-start', - Confirm: 'confirm', - Reject: 'reject', - Clock_Tick: 'clock-tick' - } -})) - -import { playPageHaptic } from './page-haptics' - -beforeEach(() => { - calls.length = 0 - platform.OS = 'ios' -}) - -describe('the haptic a page asked for, on iOS', () => { - it.each([ - ['mediumImpact', 'impact:medium'], - ['selection', 'selection'], - ['success', 'notification:success'], - ['error', 'notification:error'], - ['edgeBump', 'impact:light'] - ] as const)('plays %s as %s', (kind, expected) => { - playPageHaptic(kind) - expect(calls).toEqual([expected]) - }) -}) - -// Android uses HapticFeedbackConstants through performAndroidHapticsAsync, which needs no VIBRATE permission. -describe('the same haptic on Android', () => { - it.each([ - ['mediumImpact', 'android:long-press'], - ['selection', 'android:gesture-start'], - ['success', 'android:confirm'], - ['error', 'android:reject'], - ['edgeBump', 'android:clock-tick'] - ] as const)('plays %s as %s', (kind, expected) => { - platform.OS = 'android' - playPageHaptic(kind) - expect(calls).toEqual([expected]) - }) -}) - -describe('the kinds and the functions behind them', () => { - it('plays exactly one distinct device call for every kind', () => { - for (const kind of BRIDGE_HAPTICS_KINDS) { - playPageHaptic(kind) - } - expect(calls).toHaveLength(BRIDGE_HAPTICS_KINDS.length) - expect(new Set(calls).size).toBe(BRIDGE_HAPTICS_KINDS.length) - }) -}) diff --git a/mobile/src/mobile-web-shell/page-route-policy.test.ts b/mobile/src/mobile-web-shell/page-route-policy.test.ts index b98a1d338e0..eb8dc72ba7e 100644 --- a/mobile/src/mobile-web-shell/page-route-policy.test.ts +++ b/mobile/src/mobile-web-shell/page-route-policy.test.ts @@ -14,20 +14,6 @@ function pageRoutesOf(routes: Parameters[0]): string[] { return routeViewOf(routes, '/h/host-1').pageRoutes } -describe('matching a concrete route against a pattern', () => { - it('matches a dynamic segment against one segment and never against a path', () => { - expect(matchesRoutePattern('/h/host-1', '/h/[hostId]')).toBe(true) - expect(matchesRoutePattern('/h/host-1/session/wt-1', '/h/[hostId]')).toBe(false) - expect(matchesRoutePattern('/h', '/h/[hostId]')).toBe(false) - }) - - it('matches a static segment exactly, case and all', () => { - expect(matchesRoutePattern('/h/host-1/tasks', '/h/[hostId]/tasks')).toBe(true) - expect(matchesRoutePattern('/h/host-1/Tasks', '/h/[hostId]/tasks')).toBe(false) - expect(matchesRoutePattern('/h/host-1/accounts', '/h/[hostId]/tasks')).toBe(false) - }) -}) - // Accept trailing rest patterns from future desktops so already-installed shells can serve new catch-all screens. describe('a pattern with a rest segment', () => { const PATTERN = '/h/[hostId]/[...page]' @@ -35,7 +21,6 @@ describe('a pattern with a rest segment', () => { it('matches one segment and as many as follow it', () => { expect(matchesRoutePattern('/h/a/x', PATTERN)).toBe(true) expect(matchesRoutePattern('/h/a/x/y', PATTERN)).toBe(true) - expect(matchesRoutePattern('/h/a/x/y/z', PATTERN)).toBe(true) }) // Expo Router 55.0.18 formats rest as ((.*\/)) after adding a trailing slash; the tail needs its own slash, so zero segments cannot match. @@ -75,25 +60,15 @@ describe('a pattern with a rest segment', () => { }) }) -describe('the routes this shell will render from the page', () => { - it('drops a route needing a grant this app has never heard of', () => { - expect( - pageRoutesOf([ - { pathname: '/h/[hostId]', grants: ['navigate', 'teleport'] }, - { pathname: '/h/[hostId]/tasks', grants: ['navigate'] } - ]) - ).toEqual(['/h/[hostId]/tasks']) - }) -}) - describe('the grants this app implements', () => { // Narrow declared grants before init so unimplemented and ungranted both reach host enforcement as absent. it('drops a grant the route declared and this shell does not implement', () => { const routes = [ - { pathname: '/h/[hostId]/session/[worktreeId]', grants: ['navigate', 'aGrantFromTheFuture'] } + { pathname: '/h/[hostId]/session/[worktreeId]', grants: ['navigate', 'aGrantFromTheFuture'] }, + { pathname: '/h/[hostId]/tasks', grants: ['navigate'] } ] expect(grantsForRoute(routes, '/h/host-1/session/wt-1')).toEqual(['navigate']) - expect(pageRoutesOf(routes)).toEqual([]) + expect(pageRoutesOf(routes)).toEqual(['/h/[hostId]/tasks']) }) }) @@ -114,10 +89,11 @@ describe('the pairs a session publishes to the page', () => { ...MANIFEST_WIRE, routes: carryingAnUnreadField }).routes - expect(BridgePageRouteGrantsSchema.safeParse(routes).success).toBe(false) const { pageRouteGrants } = routeViewOf(routes, '/h/host-1') const parsed = BridgePageRouteGrantsSchema.safeParse(pageRouteGrants) - expect(parsed.error?.issues[0]?.message ?? 'accepted').toBe('accepted') + expect(pageRouteGrants).toEqual([ + { pathname: '/h/[hostId]', grants: ['navigate', 'storage', 'screencastBinary'] } + ]) expect(parsed.success).toBe(true) }) }) diff --git a/mobile/src/mobile-web-shell/page-safe-area-insets.test.ts b/mobile/src/mobile-web-shell/page-safe-area-insets.test.ts index fd8236480ea..40d8d298319 100644 --- a/mobile/src/mobile-web-shell/page-safe-area-insets.test.ts +++ b/mobile/src/mobile-web-shell/page-safe-area-insets.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, it, vi } from 'vitest' +import { describe, expect, it } from 'vitest' import { measuredPageSafeAreaInsets, pageSafeAreaInsets } from './page-safe-area-insets' describe('window-authoritative page insets', () => { @@ -9,10 +9,7 @@ describe('window-authoritative page insets', () => { const pageFrame = { x: 0, y: 0, width: 867, height: 669 } const nestedInsets = { top: 18, right: 0, bottom: 34, left: 0 } - it.each([ - { width: 466, height: 678, nestedTop: 52 / 3 }, - { width: 951, height: 669, nestedTop: 18 } - ])( + it.each([{ width: 951, height: 669, nestedTop: 18 }])( 'removes the nested top gap for a $width pt window while keeping bottom protection', ({ width, height, nestedTop }) => { expect( @@ -77,39 +74,4 @@ describe('window-authoritative page insets', () => { left: 0 }) }) - - it('bounds untrusted geometry and logs a malformed producer before falling back', () => { - const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined) - try { - for (const bounds of [ - { ...windowSafeArea.bounds, width: 0 }, - { ...windowSafeArea.bounds, width: 5000 }, - { ...windowSafeArea.bounds, x: Number.NaN } - ]) { - expect( - measuredPageSafeAreaInsets({ ...windowSafeArea, bounds }, pageFrame, nestedInsets) - ).toBe(nestedInsets) - } - expect( - measuredPageSafeAreaInsets( - { - ...windowSafeArea, - insets: { ...windowSafeArea.insets, bottom: 700 } - }, - pageFrame, - nestedInsets - ) - ).toBe(nestedInsets) - expect( - measuredPageSafeAreaInsets( - windowSafeArea, - { ...pageFrame, height: Number.POSITIVE_INFINITY }, - nestedInsets - ) - ).toBe(nestedInsets) - expect(warn).toHaveBeenCalledTimes(5) - } finally { - warn.mockRestore() - } - }) }) diff --git a/mobile/src/mobile-web-shell/page-storage-keys-negotiation.test.ts b/mobile/src/mobile-web-shell/page-storage-keys-negotiation.test.ts deleted file mode 100644 index d57ac8674ca..00000000000 --- a/mobile/src/mobile-web-shell/page-storage-keys-negotiation.test.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { z } from 'zod' -import { harness } from './bridge-host-test-harness' -import { clientFrame } from './bridge-host-test-fakes' - -const SPLIT_KEY = 'orca:terminalSplitLayout' -const STORAGE = { [SPLIT_KEY]: 'stacked', 'orca:pins:host-a': '["wt-1"]' } - -function lastInit(posted: readonly string[]): Record { - const init = posted - .map((json): unknown => JSON.parse(json)) - .findLast( - (frame): frame is Record => - z.object({ type: z.literal('init') }).safeParse(frame).success - ) - if (init === undefined) { - throw new Error('no init was posted') - } - return init -} - -describe('negotiated page storage keys across page and shell versions', () => { - it('reads a malformed storageKeys list as none rather than refusing the ready', () => { - const bridge = harness({ storage: STORAGE }) - bridge.host.receive(clientFrame({ type: 'ready', storageKeys: [SPLIT_KEY, 7] })) - - expect(bridge.pageReadyCount()).toBe(1) - expect(lastInit(bridge.posted).storage).toEqual({ 'orca:pins:host-a': '["wt-1"]' }) - }) -}) diff --git a/mobile/src/mobile-web-shell/page-storage-keys.test.ts b/mobile/src/mobile-web-shell/page-storage-keys.test.ts index 1e5f13d9f86..6503781d022 100644 --- a/mobile/src/mobile-web-shell/page-storage-keys.test.ts +++ b/mobile/src/mobile-web-shell/page-storage-keys.test.ts @@ -5,7 +5,6 @@ import { pageRouteWorkspace, pageStorageEntriesForInit, pageStorageKeysForRoute, - PAGE_STORAGE_EXACT_KEYS, PAGE_STORAGE_MAX_ENTRIES, PAGE_STORAGE_MAX_KEY_CHARS, PAGE_STORAGE_MAX_VALUE_CHARS @@ -15,13 +14,6 @@ const HOST_ROUTE = '/h/host-1' const SESSION_ROUTE = '/h/host-1/session/wt-1' describe('the keys a page may read and write', () => { - it('takes the ones the list keeps', () => { - expect(isPageStorageKey('orca:last-visited-worktree')).toBe(true) - expect(isPageStorageKey('orca:pins:host-1')).toBe(true) - expect(isPageStorageKey('orca:terminalTextScale')).toBe(true) - expect(isPageStorageKey('orca:nativeChatTabs:host-1:wt-1')).toBe(true) - }) - it('refuses the rest of the namespace', () => { // A broad orca: prefix would let pages rewrite native pairings and push registrations. for (const key of [ @@ -34,28 +26,11 @@ describe('the keys a page may read and write', () => { } }) - it('refuses the bare prefix, which names no host', () => { - expect(isPageStorageKey('orca:pins:')).toBe(false) - expect(isPageStorageKey('orca:nativeChatTabs:')).toBe(false) - }) - it('refuses a key that only starts like an allowlisted one', () => { expect(isPageStorageKey('orca:last-visited-worktree:other')).toBe(false) expect(isPageStorageKey('not-orca:pins:host-1')).toBe(false) }) - it('refuses a key past the cap, whatever it starts with', () => { - expect(isPageStorageKey(`orca:pins:${'h'.repeat(PAGE_STORAGE_MAX_KEY_CHARS)}`)).toBe(false) - }) - - it('names what the shell reads out of the app store for a route with no workspace', () => { - const keys = pageStorageKeysForRoute('host-1', HOST_ROUTE) - expect(keys).toEqual([...PAGE_STORAGE_EXACT_KEYS, 'orca:pins:host-1']) - for (const key of keys) { - expect(isPageStorageKey(key), key).toBe(true) - } - }) - it("adds the session route's workspace-scoped keys, and only for it", () => { const session = pageStorageKeysForRoute('host-1', SESSION_ROUTE) expect( @@ -70,13 +45,6 @@ describe('the keys a page may read and write', () => { ) }) - it('stays inside the entry count init is allowed to carry', () => { - // Exceeding the init entry bound rejects the whole frame. - expect(pageStorageKeysForRoute('host-1', SESSION_ROUTE).length).toBeLessThanOrEqual( - PAGE_STORAGE_MAX_ENTRIES - ) - }) - it('drops a workspace key whose id pushes it past the key cap, rather than handing one over', () => { const long = 'w'.repeat(PAGE_STORAGE_MAX_KEY_CHARS) const keys = pageStorageKeysForRoute('host-1', `/h/host-1/session/${long}`) @@ -119,12 +87,6 @@ describe('the workspace a route names', () => { }) describe('the allowlist narrowed to one session', () => { - it('admits exactly the keys that session was handed', () => { - for (const key of pageStorageKeysForRoute('host-1', SESSION_ROUTE)) { - expect(isPageStorageKeyForRoute(key, 'host-1', SESSION_ROUTE), key).toBe(true) - } - }) - it("refuses another host's pinned list, which the shape check alone admits", () => { expect(isPageStorageKey('orca:pins:host-2')).toBe(true) expect(isPageStorageKeyForRoute('orca:pins:host-2', 'host-1', SESSION_ROUTE)).toBe(false) diff --git a/mobile/src/mobile-web-shell/shell-lifecycle-log.test.ts b/mobile/src/mobile-web-shell/shell-lifecycle-log.test.ts deleted file mode 100644 index 59d39dec987..00000000000 --- a/mobile/src/mobile-web-shell/shell-lifecycle-log.test.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { pageFaultLine } from './shell-lifecycle-log' - -vi.mock('@react-native-async-storage/async-storage', () => ({ - default: { getItem: vi.fn(async () => null), setItem: vi.fn(async () => undefined) } -})) - -describe('shell failure details', () => { - it('keeps device paths out of a page fault', () => { - expect( - pageFaultLine({ - category: 'TypeError', - message: 'x is undefined at file:///var/mobile/app/index.js:1\n at /Users/me/secret.js', - isRpcDeliveryUnknown: false - }).detail - ).toBe('TypeError: x is undefined at [path]') - }) -}) diff --git a/mobile/src/mobile-web-shell/terminal-key-rail.test.tsx b/mobile/src/mobile-web-shell/terminal-key-rail.test.tsx index aa696fd0ff1..bd8f9922b6c 100644 --- a/mobile/src/mobile-web-shell/terminal-key-rail.test.tsx +++ b/mobile/src/mobile-web-shell/terminal-key-rail.test.tsx @@ -79,18 +79,6 @@ function mount() { } const touch = (pageY: number) => ({ nativeEvent: { pageX: 20, pageY } }) -it('uses a vertical scroll view and sends a tap only on release', () => { - const { send, root, key } = mount() - expect(root.findByType(ScrollView).props.horizontal).not.toBe(true) - const arrow = key('Arrow Up') - act(() => arrow.props.onPressIn(touch(20))) - expect(send).not.toHaveBeenCalled() - act(() => { - arrow.props.onPressOut() - arrow.props.onPress() - }) - expect(send).toHaveBeenCalledExactlyOnceWith('arrowUp') -}) it('cancels a swipe starting on a key before it can send or repeat', async () => { vi.useFakeTimers() const { send, root, key } = mount() @@ -183,9 +171,7 @@ it('does not send a non-repeatable key during a swipe', () => { }) it.each([ ['Escape', 'escape'], - ['Tab', 'tab'], - ['Control', 'ctrl'], - ['Type ~', 'char:~'] + ['Control', 'ctrl'] ])('sends held non-repeatable %s on release under native long-press suppression', (label, id) => { const { send, key } = mount() const button = key(label) @@ -271,7 +257,7 @@ it('continues held repeats across an equivalent serialized rail claim', async () expect(h.bridge.sendTerminalKey).toHaveBeenCalledTimes(3) }) -it.each(['owner', 'toolbar', 'keys', 'release', 'overlay', 'layout'])( +it.each(['toolbar', 'keys', 'release', 'overlay', 'layout'])( 'cancels held rail input on a real %s change', async (change) => { vi.useFakeTimers() diff --git a/mobile/src/mobile-web-shell/use-media-handle-registry.test.tsx b/mobile/src/mobile-web-shell/use-media-handle-registry.test.tsx index 48927fe7167..e9f8bd645bf 100644 --- a/mobile/src/mobile-web-shell/use-media-handle-registry.test.tsx +++ b/mobile/src/mobile-web-shell/use-media-handle-registry.test.tsx @@ -1,7 +1,7 @@ import type { ReactElement } from 'react' import { act, create } from 'react-test-renderer' import { afterEach, describe, expect, it } from 'vitest' -import { MediaHandleRegistry } from './media-handle-registry' +import type { MediaHandleRegistry } from './media-handle-registry' import { useMediaHandleRegistry } from './use-media-handle-registry' const STAGED = { uri: 'file:///cache/a.png', mime: 'image/png', byteLength: 12 } @@ -65,13 +65,6 @@ function harness(): { } describe('the registry a mounted page session holds', () => { - it('hands the same registry back across renders of one session', () => { - const probe = harness() - probe.render('session-a') - probe.render('session-a') - expect(probe.seen).toHaveLength(1) - }) - it('releases every staged file when the page unmounts', () => { const probe = harness() probe.render('session-a') @@ -91,12 +84,4 @@ describe('the registry a mounted page session holds', () => { expect(probe.seen).toHaveLength(2) expect(probe.seen[1]?.liveCount()).toBe(0) }) - - it('gives a mount with no session a registry too, so a caller never holds null', () => { - const probe = harness() - probe.render(null) - expect(probe.seen[0]).toBeInstanceOf(MediaHandleRegistry) - probe.unmount() - expect(probe.discarded).toEqual([]) - }) }) diff --git a/mobile/src/mobile-web-shell/use-page-host-snapshot.test.tsx b/mobile/src/mobile-web-shell/use-page-host-snapshot.test.tsx index 0d9b3956c08..2bfe95d178a 100644 --- a/mobile/src/mobile-web-shell/use-page-host-snapshot.test.tsx +++ b/mobile/src/mobile-web-shell/use-page-host-snapshot.test.tsx @@ -65,14 +65,12 @@ vi.mock('../host-catalog/host-store', () => ({ import '../storage/preferences' import '../worktree/last-visited-worktree-by-host' -import { PAGE_STORAGE_MAX_VALUE_CHARS } from './page-storage-keys' import { usePageHostSnapshot, type PageHostSnapshotView } from './use-page-host-snapshot' import { persistMirrored, readMirroredStorage } from '../storage/mirrored-storage-keys' const PINS = 'orca:pins:host-1' const CHAT_TABS = 'orca:nativeChatTabs:host-1:wt-1' -const JOURNAL = 'orca:mobileStructuredSendOperations:v1' const SESSION_ROUTE = '/h/host-1/session/wt-1' const mountedTrees: ReturnType[] = [] @@ -267,25 +265,6 @@ describe('what the shell puts on every init', () => { expect(doubles.store.get('orca:nativeChatTabs:host-1:wt-2')).toBe('{"tab-9":"chat"}') expect(mounted.view().readStorage().storage).toEqual({ [CHAT_TABS]: '{"tab-1":"chat"}' }) }) - - it('leaves out a value the page would refuse the whole frame over, and says which', async () => { - // A real 48-send journal exceeds the value cap; sending it whole would reject all of init. - const warned: unknown[][] = [] - const warn = console.warn - console.warn = (...args: unknown[]) => warned.push(args) - try { - doubles.store.set(PINS, '["one"]') - doubles.store.set(JOURNAL, 'x'.repeat(PAGE_STORAGE_MAX_VALUE_CHARS + 1)) - const mounted = await mount() - await act(async () => { - mounted.view().refreshStorage() - }) - expect(mounted.view().readStorage().storage).toEqual({ [PINS]: '["one"]' }) - } finally { - console.warn = warn - } - expect(JSON.stringify(warned)).toContain(JOURNAL) - }) }) describe('the host the page is handed', () => { diff --git a/mobile/src/mobile-web-shell/use-shell-page-storage-refresh.test.tsx b/mobile/src/mobile-web-shell/use-shell-page-storage-refresh.test.tsx index 2af4b39ccba..30ee76ff34b 100644 --- a/mobile/src/mobile-web-shell/use-shell-page-storage-refresh.test.tsx +++ b/mobile/src/mobile-web-shell/use-shell-page-storage-refresh.test.tsx @@ -11,7 +11,6 @@ import { writeMirroredStorage } from '../storage/mirrored-storage-keys' -import { TERMINAL_SHORTCUT_STORAGE_KEYS } from './page-storage-keys' import { createFakeBridgePortPair } from './bridge/bridge-port-pair-test-harness' const store = vi.hoisted(() => ({ @@ -53,7 +52,7 @@ beforeEach(() => { store.pending.length = 0 }) -it.each(TERMINAL_SHORTCUT_STORAGE_KEYS)( +it.each(['orca:terminal-accessory-layout'])( 'publishes the final queued native save for %s, only while focused', async (key) => { focus.active = false diff --git a/mobile/src/mobile-web-shell/use-shell-stack-pop.test.tsx b/mobile/src/mobile-web-shell/use-shell-stack-pop.test.tsx index ff045a8bdcd..1ef3e7f0210 100644 --- a/mobile/src/mobile-web-shell/use-shell-stack-pop.test.tsx +++ b/mobile/src/mobile-web-shell/use-shell-stack-pop.test.tsx @@ -202,14 +202,6 @@ afterEach(() => { }) describe('a page that asks to go back twice in one batch', () => { - it('pops once, because the second frame reads a stack the first has not left yet', () => { - const harness = mount(['home', 'host', 'tasks']) - expect(harness.pop()).toBe('popped') - expect(harness.pop()).toBe('pop-pending') - harness.drain() - expect(harness.screens).toEqual(['home', 'host']) - }) - it('takes the next pop once the route the first one produced has committed', () => { const harness = mount(['home', 'host', 'tasks']) expect(harness.pop()).toBe('popped') @@ -219,13 +211,6 @@ describe('a page that asks to go back twice in one batch', () => { harness.drain() expect(harness.screens).toEqual(['home']) }) - - it('refuses with its own reason when the stack has nothing to pop', () => { - const harness = mount(['home']) - expect(harness.pop()).toBe('nothing-to-pop') - harness.drain() - expect(harness.screens).toEqual(['home']) - }) }) // Use one latch per stack: multiple mounted shell screens can otherwise each queue a pop in the same native batch. diff --git a/mobile/src/new-workspace/NewWorkspaceOverlay.test.tsx b/mobile/src/new-workspace/NewWorkspaceOverlay.test.tsx deleted file mode 100644 index 01ea4cbfc7c..00000000000 --- a/mobile/src/new-workspace/NewWorkspaceOverlay.test.tsx +++ /dev/null @@ -1,102 +0,0 @@ -import { createElement, useEffect, type ReactNode } from 'react' -import { act, create, type ReactTestRenderer } from 'react-test-renderer' -import { afterEach, describe, expect, it, vi } from 'vitest' -import { createDownloadProgressFeed } from '../mobile-web-shell/download-progress-feed' -import type { ShellOverlayDownload, ShellOverlayLoad } from '../mobile-web-shell/shell-overlay-load' - -type LoadingDrawerProps = { - visible: boolean - download: ShellOverlayDownload | null - onCancel: () => void -} - -const router = vi.hoisted(() => ({ back: vi.fn() })) -const shell = vi.hoisted((): { report: ((load: ShellOverlayLoad) => void) | null } => ({ - report: null -})) -const layerMounts = vi.hoisted(() => ({ count: 0 })) - -vi.mock('expo-router', () => ({ useRouter: () => router })) -vi.mock('../components/HostProtocolGate', () => ({ - HostProtocolGate: ({ children }: { children: ReactNode }) => children -})) -vi.mock('./open-host-list-instead', () => ({ OpenHostListInstead: 'OpenHostListInstead' })) -vi.mock('../mobile-web-shell/MobileWebShellScreen', () => ({ - MobileWebShellScreen: ({ - onOverlayLoad - }: { - onOverlayLoad: (load: ShellOverlayLoad) => void - }) => { - shell.report = onOverlayLoad - return null - } -})) -vi.mock('./NewWorkspaceLoadingDrawer', async () => { - const { createElement: element } = await import('react') - return { - NewWorkspaceLoadingDrawer: (props: LoadingDrawerProps) => { - useEffect(() => { - layerMounts.count += 1 - }, []) - return element('NewWorkspaceLoadingDrawer', props) - } - } -}) - -import { NewWorkspaceOverlay } from './NewWorkspaceOverlay' - -describe("the New Workspace overlay's loading drawer", () => { - let renderer: ReactTestRenderer | null = null - - afterEach(() => { - act(() => renderer?.unmount()) - renderer = null - shell.report = null - layerMounts.count = 0 - vi.clearAllMocks() - }) - - function layer() { - return renderer!.root.findAll((node) => String(node.type) === 'NewWorkspaceLoadingDrawer')[0] - } - - it('stays one mounted drawer from the first wait through the download until the page paints', () => { - act(() => { - renderer = create(createElement(NewWorkspaceOverlay, { hostId: 'desk' })) - }) - expect(layer().props).toMatchObject({ visible: true, download: null }) - - const download = { receivedBytes: 1, totalBytes: 8, feed: createDownloadProgressFeed() } - act(() => shell.report!({ kind: 'loading', download })) - expect(layer().props.download).toBe(download) - act(() => shell.report!({ kind: 'loading', download: null })) - expect(layer().props.download).toBeNull() - expect(layerMounts.count).toBe(1) - - act(() => shell.report!({ kind: 'painted' })) - expect(layer().props.visible).toBe(false) - expect(layerMounts.count).toBe(1) - }) - - it('leaves when the load is cancelled', () => { - act(() => { - renderer = create(createElement(NewWorkspaceOverlay, { hostId: 'desk' })) - }) - - act(() => layer().props.onCancel()) - - expect(router.back).toHaveBeenCalledTimes(1) - }) - - it('opens the host list instead when the page cannot show here', () => { - act(() => { - renderer = create(createElement(NewWorkspaceOverlay, { hostId: 'desk' })) - }) - - act(() => shell.report!({ kind: 'unavailable' })) - - expect( - renderer!.root.find((node) => String(node.type) === 'OpenHostListInstead').props.hostId - ).toBe('desk') - }) -}) diff --git a/mobile/src/new-workspace/creation/sparse-preset-draft.test.ts b/mobile/src/new-workspace/creation/sparse-preset-draft.test.ts deleted file mode 100644 index e02f065f9f3..00000000000 --- a/mobile/src/new-workspace/creation/sparse-preset-draft.test.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { parseSparsePresetDirectories } from './sparse-preset-draft' - -describe('parseSparsePresetDirectories', () => { - it('normalizes textarea input into unique repo-relative directories', () => { - expect( - parseSparsePresetDirectories(` - src\\renderer - packages/ui/ - src/renderer - `) - ).toEqual({ - directories: ['src/renderer', 'packages/ui'], - error: null - }) - }) -}) diff --git a/mobile/src/new-workspace/creation/workspace-agent-selection.test.ts b/mobile/src/new-workspace/creation/workspace-agent-selection.test.ts index e07b16074a8..019e52f1d1b 100644 --- a/mobile/src/new-workspace/creation/workspace-agent-selection.test.ts +++ b/mobile/src/new-workspace/creation/workspace-agent-selection.test.ts @@ -3,30 +3,6 @@ import { describe, expect, it } from 'vitest' import { resolveWorkspaceAgentSelection } from './workspace-agent-selection' describe('workspace agent selection', () => { - it('keeps automatic selection current while create selection is active', () => { - expect( - resolveWorkspaceAgentSelection({ - selectionActive: true, - settings: { defaultTuiAgent: 'codex' }, - detectedAgentIds: new Set(['claude', 'codex']), - agent: null, - overridden: false - }) - ).toEqual({ agent: 'codex', overridden: false }) - }) - - it('preserves a valid user override', () => { - expect( - resolveWorkspaceAgentSelection({ - selectionActive: true, - settings: { defaultTuiAgent: 'claude' }, - detectedAgentIds: new Set(['claude', 'codex']), - agent: 'codex', - overridden: true - }) - ).toEqual({ agent: 'codex', overridden: true }) - }) - it('falls back when a user override is unavailable after detection settles', () => { expect( resolveWorkspaceAgentSelection({ @@ -38,16 +14,4 @@ describe('workspace agent selection', () => { }) ).toEqual({ agent: 'claude', overridden: false }) }) - - it('does not repair inactive selection state', () => { - expect( - resolveWorkspaceAgentSelection({ - selectionActive: false, - settings: { defaultTuiAgent: 'codex' }, - detectedAgentIds: new Set(['codex']), - agent: null, - overridden: false - }) - ).toEqual({ agent: null, overridden: false }) - }) }) diff --git a/mobile/src/new-workspace/creation/workspace-create-params.test.ts b/mobile/src/new-workspace/creation/workspace-create-params.test.ts index 6f03031749c..a4b28a86cb6 100644 --- a/mobile/src/new-workspace/creation/workspace-create-params.test.ts +++ b/mobile/src/new-workspace/creation/workspace-create-params.test.ts @@ -2,43 +2,6 @@ import { describe, expect, it } from 'vitest' import { buildTaskWorkspaceCreateParams } from './workspace-create-params' describe('task workspace create params', () => { - it('passes a GitHub PR URL as an agent draft and links the PR', () => { - expect( - buildTaskWorkspaceCreateParams({ - item: { - provider: 'github', - source: { - type: 'pr', - repoId: 'repo-1', - number: 123, - title: 'Fix mobile tasks', - url: 'https://github.com/acme/app/pull/123' - } - }, - targetRepoId: 'ignored-for-github', - setupDecision: 'run', - agent: 'codex', - workspaceName: ' mobile-tasks ', - hostedStartPoint: { - baseBranch: 'origin/main', - pushTarget: { remoteName: 'origin', branchName: 'feature/mobile-tasks' } - } - }) - ).toMatchObject({ - repo: 'id:repo-1', - name: 'mobile-tasks', - displayName: 'Fix mobile tasks', - displayNameKind: 'generated', - setupDecision: 'run', - activate: true, - startupDraft: 'https://github.com/acme/app/pull/123', - createdWithAgent: 'codex', - linkedPR: 123, - baseBranch: 'origin/main', - pushTarget: { remoteName: 'origin', branchName: 'feature/mobile-tasks' } - }) - }) - it('omits startup draft and agent when blank terminal is selected', () => { const params = buildTaskWorkspaceCreateParams({ item: { @@ -69,31 +32,6 @@ describe('task workspace create params', () => { expect(params).not.toHaveProperty('createdWithAgent') }) - it('marks an edited task label as user-owned', () => { - const params = buildTaskWorkspaceCreateParams({ - item: { - provider: 'github', - source: { - type: 'issue', - repoId: 'repo-1', - number: 88, - title: 'Investigate login', - url: 'https://github.com/acme/app/issues/88' - } - }, - targetRepoId: 'ignored-for-github', - setupDecision: 'skip', - workspaceName: 'My workspace', - nameIsAutoManaged: false - }) - - expect(params).toMatchObject({ - name: 'My workspace', - displayName: 'My workspace', - displayNameKind: 'user' - }) - }) - it('keeps the startup draft when no agent was provided so the host can auto-pick', () => { const params = buildTaskWorkspaceCreateParams({ item: { @@ -153,31 +91,6 @@ describe('task workspace create params', () => { }) }) - it('creates Linear workspaces in the selected repo and links the identifier', () => { - expect( - buildTaskWorkspaceCreateParams({ - item: { - provider: 'linear', - source: { - identifier: 'ENG-42', - title: 'Ship Linear parity', - url: 'https://linear.app/acme/issue/ENG-42/ship-linear-parity' - } - }, - targetRepoId: 'repo-linear', - setupDecision: 'inherit', - agent: 'grok' - }) - ).toMatchObject({ - repo: 'id:repo-linear', - name: 'eng-42', - displayName: 'ENG-42 Ship Linear parity', - linkedLinearIssue: 'ENG-42', - startupDraft: 'https://linear.app/acme/issue/ENG-42/ship-linear-parity', - createdWithAgent: 'grok' - }) - }) - it('links Jira through linkedWorkItem because worktree.create has no flat Jira field', () => { const params = buildTaskWorkspaceCreateParams({ item: { diff --git a/mobile/src/new-workspace/creation/workspace-ssh-gate.test.ts b/mobile/src/new-workspace/creation/workspace-ssh-gate.test.ts index 4725c6c11ad..39983fc49be 100644 --- a/mobile/src/new-workspace/creation/workspace-ssh-gate.test.ts +++ b/mobile/src/new-workspace/creation/workspace-ssh-gate.test.ts @@ -2,24 +2,6 @@ import { describe, expect, it } from 'vitest' import { deriveWorkspaceSshGate, type WorkspaceSshRecord } from './workspace-ssh-gate' describe('workspace SSH gate', () => { - it('requires connection for remote repos until the matching target is connected', () => { - expect( - deriveWorkspaceSshGate({ - connectionId: 'ssh-1', - state: null, - connecting: false - }) - ).toMatchObject({ status: null, requiresConnection: true }) - - expect( - deriveWorkspaceSshGate({ - connectionId: 'ssh-1', - state: { targetId: 'ssh-1', status: 'connected', error: null, reconnectAttempt: 0 }, - connecting: false - }) - ).toMatchObject({ status: 'connected', requiresConnection: false }) - }) - it('ignores stale SSH state from a previously selected repository', () => { expect( deriveWorkspaceSshGate({ diff --git a/mobile/src/notifications/delivery-policy/notification-delivery-preferences.test.ts b/mobile/src/notifications/delivery-policy/notification-delivery-preferences.test.ts index c388ddc42c9..548beec79db 100644 --- a/mobile/src/notifications/delivery-policy/notification-delivery-preferences.test.ts +++ b/mobile/src/notifications/delivery-policy/notification-delivery-preferences.test.ts @@ -8,15 +8,8 @@ import { shouldSuppressNotificationWhileViewing } from './notification-viewing-policy' -const storage = new Map() -vi.mock('@react-native-async-storage/async-storage', () => ({ - default: { - getItem: vi.fn(async (key: string) => storage.get(key) ?? null) - } -})) vi.mock('react-native', () => ({ AppState: { currentState: 'background' } })) beforeEach(() => { - storage.clear() setNotificationViewingWorkspace(null) AppState.currentState = 'background' }) diff --git a/mobile/src/notifications/dismissal/push-tray-dismissal.test.ts b/mobile/src/notifications/dismissal/push-tray-dismissal.test.ts index a8d5d7a65f3..c0904ed714f 100644 --- a/mobile/src/notifications/dismissal/push-tray-dismissal.test.ts +++ b/mobile/src/notifications/dismissal/push-tray-dismissal.test.ts @@ -11,8 +11,23 @@ vi.mock('expo-notifications', () => ({ dismissNotificationAsync: vi.fn() })) -function presented(identifier: string, data: unknown): unknown { - return { request: { identifier, content: { data } } } +function presented(identifier: string, data: Record): Notifications.Notification { + return { + date: 0, + request: { + identifier, + trigger: null, + content: { + title: null, + subtitle: null, + body: null, + categoryIdentifier: null, + sound: null, + threadIdentifier: null, + data + } + } + } } beforeEach(() => { @@ -30,8 +45,9 @@ describe('dismissPresentedPushNotification', () => { orca: { hostFingerprint: 'fp0123456789abcd', notificationId: 'agent:two' } }), presented('other-host', { hostFingerprint: 'another-host', notificationId: 'agent:one' }), - presented('tray-3', { hostFingerprint: 'fp0123456789abcd', notificationId: 'agent:one' }) - ] as never) + presented('tray-3', { hostFingerprint: 'fp0123456789abcd', notificationId: 'agent:one' }), + presented('no-gateway', { hostId: 'host-1', notificationId: 'agent:one' }) + ]) await dismissPresentedPushNotification('agent:one', 'fp0123456789abcd') @@ -40,26 +56,6 @@ describe('dismissPresentedPushNotification', () => { 'tray-3' ]) }) - - it('ignores notifications without a gateway identity', async () => { - vi.mocked(Notifications.getPresentedNotificationsAsync).mockResolvedValue([ - presented('tray-1', { hostId: 'host-1', notificationId: 'agent:one' }) - ] as never) - - await dismissPresentedPushNotification('agent:one', 'fp0123456789abcd') - - expect(Notifications.dismissNotificationAsync).not.toHaveBeenCalled() - }) - - it('reports tray query failures to the caller', async () => { - vi.mocked(Notifications.getPresentedNotificationsAsync).mockRejectedValue( - new Error('unavailable') - ) - - await expect(dismissPresentedPushNotification('agent:one', 'fp0123456789abcd')).rejects.toThrow( - 'unavailable' - ) - }) }) it('a delayed dismissal preserves newer alerts, other epochs, and other hosts', async () => { @@ -71,7 +67,7 @@ it('a delayed dismissal preserves newer alerts, other epochs, and other hosts', presented('restarted', { ...base, notificationSeq: 1, notificationEpoch: 'epoch-b' }), presented('other-host', { ...base, notificationSeq: 1, hostFingerprint: 'host-b' }), presented('legacy', base) - ] as never) + ]) await dismissPresentedPushNotification('note', 'host-a', { notificationEpoch: 'epoch-a', notificationSeq: 2 @@ -82,17 +78,14 @@ it('a delayed dismissal preserves newer alerts, other epochs, and other hosts', ]) }) -it.each([undefined, {}, { notificationEpoch: 'epoch' }, { notificationSeq: 2 }])( - 'an incomplete dismissal fence %j removes only unversioned entries', - async (fence) => { - const base = { hostFingerprint: 'host-a', notificationId: 'note' } - vi.mocked(Notifications.getPresentedNotificationsAsync).mockResolvedValue([ - presented('unversioned', base), - presented('versioned', { ...base, notificationEpoch: 'epoch', notificationSeq: 2 }), - presented('epoch-only', { ...base, notificationEpoch: 'epoch' }), - presented('sequence-only', { ...base, notificationSeq: 2 }) - ] as never) - await dismissPresentedPushNotification('note', 'host-a', fence) - expect(Notifications.dismissNotificationAsync).toHaveBeenCalledExactlyOnceWith('unversioned') - } -) +it('an incomplete dismissal fence removes only unversioned entries', async () => { + const base = { hostFingerprint: 'host-a', notificationId: 'note' } + vi.mocked(Notifications.getPresentedNotificationsAsync).mockResolvedValue([ + presented('unversioned', base), + presented('versioned', { ...base, notificationEpoch: 'epoch', notificationSeq: 2 }), + presented('epoch-only', { ...base, notificationEpoch: 'epoch' }), + presented('sequence-only', { ...base, notificationSeq: 2 }) + ]) + await dismissPresentedPushNotification('note', 'host-a', { notificationEpoch: 'epoch' }) + expect(Notifications.dismissNotificationAsync).toHaveBeenCalledExactlyOnceWith('unversioned') +}) diff --git a/mobile/src/onboarding/mobile-onboarding-plan.test.ts b/mobile/src/onboarding/mobile-onboarding-plan.test.ts deleted file mode 100644 index 6bf00cb18d9..00000000000 --- a/mobile/src/onboarding/mobile-onboarding-plan.test.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' -import { shouldPresentNotificationOptIn } from '../notifications/delivery-policy/notification-opt-in-gate' -import { shouldPresentSessionViewOptIn } from '../session/session-view-opt-in-gate' -import { mobileOnboardingDestination, parseMobileOnboardingSteps } from './mobile-onboarding-plan' - -vi.mock('../notifications/delivery-policy/notification-opt-in-gate', () => ({ - shouldPresentNotificationOptIn: vi.fn() -})) -vi.mock('../session/session-view-opt-in-gate', () => ({ - shouldPresentSessionViewOptIn: vi.fn() -})) - -describe('mobile onboarding plan', () => { - beforeEach(() => { - vi.mocked(shouldPresentNotificationOptIn).mockReset().mockResolvedValue(false) - vi.mocked(shouldPresentSessionViewOptIn).mockReset().mockResolvedValue(false) - }) - - it.each([ - [[], undefined, '/'], - [[], 'paired-host', '/h/paired-host'], - [ - ['session-view', 'notifications'], - undefined, - { - pathname: '/mobile-onboarding', - params: { steps: 'session-view,notifications' } - } - ], - [ - ['notifications'], - 'paired-host', - { - pathname: '/mobile-onboarding', - params: { steps: 'notifications', hostId: 'paired-host' } - } - ] - ] as const)('maps %j with host %s to the correct destination', (steps, hostId, destination) => { - expect(mobileOnboardingDestination(steps, hostId)).toEqual(destination) - }) - - it('parses route steps in canonical order without duplicates', () => { - expect(parseMobileOnboardingSteps('notifications,unknown,session-view,notifications')).toEqual([ - 'session-view', - 'notifications' - ]) - expect(parseMobileOnboardingSteps('notifications')).toEqual(['notifications']) - }) -}) diff --git a/mobile/src/pairing/mobile-relay-invite-director.test.ts b/mobile/src/pairing/mobile-relay-invite-director.test.ts index 60d7bb18ff7..185567a8a22 100644 --- a/mobile/src/pairing/mobile-relay-invite-director.test.ts +++ b/mobile/src/pairing/mobile-relay-invite-director.test.ts @@ -40,7 +40,6 @@ describe('pairing invite director resolution', () => { }) socket.onopen?.() expect(url).toBe('wss://relay.onorca.dev/v1/connect/AbCdEf0123_-xyZ9') - expect(url).not.toContain('?') expect(JSON.parse(socket.sent[0]!)).toEqual({ type: 'relay-auth', v: 1, diff --git a/mobile/src/pairing/mobile-relay-pairing-journal-store.test.ts b/mobile/src/pairing/mobile-relay-pairing-journal-store.test.ts index 94b3518a72a..782964bfc0e 100644 --- a/mobile/src/pairing/mobile-relay-pairing-journal-store.test.ts +++ b/mobile/src/pairing/mobile-relay-pairing-journal-store.test.ts @@ -157,16 +157,11 @@ describe('mobile relay pairing journal store', () => { hostName: 'Red Panda', randomBytes: (length) => new Uint8Array(length).fill(12) }) - let replacementSaved = false - const saving = saveMobileRelayPairingJournal(replacement).then(() => { - replacementSaved = true - }) - await Promise.resolve() - expect(replacementSaved).toBe(false) + const saving = saveMobileRelayPairingJournal(replacement) releaseSecretRead() await expect(loading).resolves.toEqual(journal) - await expect(saving).resolves.toBeUndefined() + await saving await expect(loadMobileRelayPairingJournal()).resolves.toEqual(replacement) expect(asyncStorage.removeItem).not.toHaveBeenCalled() }) @@ -217,7 +212,7 @@ describe('mobile relay pairing journal store', () => { ) const replacementSave = saveMobileRelayPairingJournal(replacement) - await expect(authorizationUpdate).resolves.toBeUndefined() + await authorizationUpdate await expect(replacementSave).rejects.toThrow(/pairing in progress/) }) diff --git a/mobile/src/pairing/mobile-relay-physical-client.test.ts b/mobile/src/pairing/mobile-relay-physical-client.test.ts index 8f46c64333b..e02f6801e21 100644 --- a/mobile/src/pairing/mobile-relay-physical-client.test.ts +++ b/mobile/src/pairing/mobile-relay-physical-client.test.ts @@ -1,14 +1,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' const fakes = vi.hoisted(() => ({ - channelOptions: null as null | { - onAuthenticated(): void - onText(value: string): void - }, - start: vi.fn(), - handleMessage: vi.fn(), - sendText: vi.fn((_frame: string) => true), - dispose: vi.fn() + start: vi.fn() })) vi.mock('../transport/encryption/mobile-e2ee-v2-client-session', () => ({ @@ -16,13 +9,10 @@ vi.mock('../transport/encryption/mobile-e2ee-v2-client-session', () => ({ })) vi.mock('../transport/encryption/mobile-e2ee-v2-physical-channel', () => ({ MobileE2EEV2PhysicalChannel: class { - constructor(options: NonNullable) { - fakes.channelOptions = options - } start = fakes.start - handleMessage = fakes.handleMessage - sendText = fakes.sendText - dispose = fakes.dispose + handleMessage = () => {} + sendText = () => true + dispose = () => {} } })) @@ -65,8 +55,6 @@ describe('mobile relay physical pairing client', () => { beforeEach(() => { vi.useFakeTimers() vi.clearAllMocks() - fakes.channelOptions = null - fakes.sendText.mockReturnValue(true) }) afterEach(() => { diff --git a/mobile/src/pairing/pairing.test.ts b/mobile/src/pairing/pairing.test.ts index ca443ede7b9..be52a6d6238 100644 --- a/mobile/src/pairing/pairing.test.ts +++ b/mobile/src/pairing/pairing.test.ts @@ -20,7 +20,6 @@ afterEach(() => { describe('pairing deep links', () => { it('rejects lookalike routes', () => { expect(extractPairingCodeFromUrl('orca://pairing?code=abc123')).toBeNull() - expect(extractPairingCodeFromUrl('orca://pair-extra?code=abc123')).toBeNull() }) it('decodes desktop QR payloads when atob requires base64 padding', () => { @@ -38,11 +37,9 @@ describe('pairing deep links', () => { it('preserves legacy padding and aliases with the same decoded offer', () => { const paddedOffer = { ...offer, endpoint: `${offer.endpoint}/a` } const code = encodeOffer(paddedOffer) - expect(code.length % 4).toBe(2) const alias = `${code.slice(0, -1)}${base64Alias(code.at(-1)!)}` expect(parsePairingCode(`${code}=`)).toEqual(paddedOffer) - expect(parsePairingCode(`${code}==`)).toEqual(paddedOffer) expect(parsePairingCode(alias)).toEqual(paddedOffer) }) }) diff --git a/mobile/src/platform/clipboard/clipboard.test.tsx b/mobile/src/platform/clipboard/clipboard.test.tsx index 7db037f82b7..33d8d62d109 100644 --- a/mobile/src/platform/clipboard/clipboard.test.tsx +++ b/mobile/src/platform/clipboard/clipboard.test.tsx @@ -67,9 +67,4 @@ describe('reading the clipboard on a phone', () => { await expect(mountReader().contents()).resolves.toEqual({ text: true, image: false }) expect(started).toEqual(['string', 'image']) }) - - it('reads a probe that threw as absent, rather than disabling paste on a rejection', async () => { - clipboard.hasStringAsync.mockImplementation(() => Promise.reject(new Error('no pasteboard'))) - await expect(mountReader().contents()).resolves.toEqual({ text: false, image: false }) - }) }) diff --git a/mobile/src/platform/external-links/external-link.web.test.ts b/mobile/src/platform/external-links/external-link.web.test.ts deleted file mode 100644 index b850e254411..00000000000 --- a/mobile/src/platform/external-links/external-link.web.test.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { openExternalLink, publishExternalLinkOpener } from './external-link.web' - -let warned: ReturnType - -beforeEach(() => { - warned = vi.spyOn(console, 'warn').mockImplementation(() => undefined) -}) - -afterEach(() => { - warned.mockRestore() -}) - -describe('opening a URL from inside the shell', () => { - it('hands an allowed URL to whatever the entry published', () => { - const asked: string[] = [] - publishExternalLinkOpener((url) => { - asked.push(url) - return true - }) - openExternalLink('https://github.com/stablyai/orca') - expect(asked).toEqual(['https://github.com/stablyai/orca']) - expect(warned).not.toHaveBeenCalled() - }) -}) diff --git a/mobile/src/platform/media-picking/native-media-stage-cleanup.test.ts b/mobile/src/platform/media-picking/native-media-stage-cleanup.test.ts index ace030069a7..bff1daf6be6 100644 --- a/mobile/src/platform/media-picking/native-media-stage-cleanup.test.ts +++ b/mobile/src/platform/media-picking/native-media-stage-cleanup.test.ts @@ -84,7 +84,6 @@ vi.mock('expo-file-system', () => ({ })) import { MediaHandleRegistry } from '../../mobile-web-shell/media-handle-registry' -import { createNativeMediaVerbServer } from './native-media' import { copyPickedMediaIntoCache, nativeMediaDeviceDeps } from './native-media-device' beforeEach(() => { @@ -118,7 +117,7 @@ function heldBytes(): number { return [...storage.files.values()].reduce((total, bytes) => total + bytes.byteLength, 0) } -it.each([0, 4096])('releases an unreturned file after a write fails with %i bytes', (bytes) => { +it.each([4096])('releases an unreturned file after a write fails with %i bytes', (bytes) => { const original = new Error('partial native write') storage.writeFailure = original storage.partialBytes = bytes @@ -131,16 +130,6 @@ it.each([0, 4096])('releases an unreturned file after a write fails with %i byte }) }) -it('preserves the write failure when best-effort deletion also fails', () => { - const original = new Error('native write failed') - storage.writeFailure = original - storage.deleteFailure = new Error('cache cannot be deleted') - storage.partialBytes = 4096 - expect(thrownBy(() => device().stageBase64('AQID'))).toBe(original) - expect(storage.events.map((event) => event.operation)).toEqual(['create', 'write', 'delete']) - expect(heldBytes()).toBe(4096) -}) - it('deletes only the failed file while a prior successful file remains readable', () => { vi.spyOn(Math, 'random').mockReturnValueOnce(0.1).mockReturnValueOnce(0.2) const successfulUri = device().stageBase64('AQID') @@ -156,22 +145,6 @@ it('deletes only the failed file while a prior successful file remains readable' expect(heldBytes()).toBe(3) }) -it('keeps the clipboard verb rejection while leaving no unregistered cache bytes', async () => { - const original = new Error('clipboard write failed') - storage.writeFailure = original - storage.partialBytes = 4096 - const registryDiscard = vi.fn() - const registry = new MediaHandleRegistry({ now: () => 0, discard: registryDiscard }) - const serve = createNativeMediaVerbServer(nativeMediaDeviceDeps(registry)) - await expect(serve('native.media.pick', { source: 'clipboard', multiple: false })).rejects.toBe( - original - ) - expect(registry.liveCount()).toBe(0) - expect(registryDiscard).not.toHaveBeenCalled() - expect(heldBytes()).toBe(0) - expect(storage.files.size).toBe(0) -}) - it('retains the provider-copy cleanup and original read error when deletion fails', () => { const original = new Error('provider read failed') storage.readFailure = original diff --git a/mobile/src/platform/media-picking/native-media.test.ts b/mobile/src/platform/media-picking/native-media.test.ts index c2f8683270a..40411ebfb82 100644 --- a/mobile/src/platform/media-picking/native-media.test.ts +++ b/mobile/src/platform/media-picking/native-media.test.ts @@ -161,7 +161,7 @@ describe('picking', () => { for (let index = 0; index < BRIDGE_MEDIA_MAX_LIVE_HANDLES; index += 1) { probe.registry.mint([{ uri: `${CACHE}/held.png`, mime: 'image/png', byteLength: 4 }]) } - for (const source of ['library', 'files', 'clipboard'] as const) { + for (const source of ['library'] as const) { await expect(probe.serve('native.media.pick', { source, multiple: true })).rejects.toSatisfy( (error) => refusalOf(error) === 'native_media_handle_cap' ) diff --git a/mobile/src/platform/speech/on-device-speech.web.test.tsx b/mobile/src/platform/speech/on-device-speech.web.test.tsx deleted file mode 100644 index efc8742c704..00000000000 --- a/mobile/src/platform/speech/on-device-speech.web.test.tsx +++ /dev/null @@ -1,57 +0,0 @@ -// Text the phone recognizes itself gets the computer's filler removal, in the language the recognizer started in. -import { createElement } from 'react' -import { act, create } from 'react-test-renderer' -import { describe, expect, it, vi } from 'vitest' -import type { OnDeviceSpeech } from './on-device-speech-contract' - -vi.mock('../../mobile-web-shell/bridge/use-native-verbs', () => { - const verbs = { - canRecognizeSpeech: true, - speechStatus: async () => ({ status: 'ready', locale: 'de-DE', preference: 'automatic' }), - speechStart: async () => ({ started: true, locale: 'de-DE', reason: null }), - speechRead: async () => ({ - revision: 1, - committed: 'Äh, das ist um fünf Uhr.', - tentative: 'ähm', - failure: null - }), - speechFinish: async () => ({ - text: 'Äh, das ist, ähm, um fünf Uhr fertig.', - failure: null - }), - speechCancel: async () => ({}) - } - return { useNativeVerbs: () => verbs } -}) - -vi.mock('./on-device-speech-locale', () => ({ onDeviceSpeechLocale: () => 'de-DE' })) - -import { useOnDeviceSpeech } from './on-device-speech.web' - -function mountSpeech(removeFillerWords: boolean): OnDeviceSpeech { - let speech: OnDeviceSpeech | null = null - function Probe(): null { - speech = useOnDeviceSpeech(removeFillerWords) - return null - } - act(() => { - create(createElement(Probe)) - }) - if (speech === null) { - throw new Error('no on-device speech') - } - return speech -} - -describe('on-device dictation text', () => { - it('drops the fillers of the language the recognizer started in', async () => { - const speech = mountSpeech(true) - await speech.start() - - expect(await speech.read()).toMatchObject({ committed: 'Das ist um fünf Uhr.', tentative: '' }) - expect(await speech.finish()).toEqual({ - text: 'Das ist um fünf Uhr fertig.', - failure: null - }) - }) -}) diff --git a/mobile/src/platform/text-input/live-input-composing-range.test.ts b/mobile/src/platform/text-input/live-input-composing-range.test.ts deleted file mode 100644 index 307cdc5eed3..00000000000 --- a/mobile/src/platform/text-input/live-input-composing-range.test.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import { reportedLiveInputComposing } from './live-input-composing-range' - -const ANDROID_WEBVIEW = 'Mozilla/5.0 (Linux; Android 16; wv) Chrome/140' -const IPHONE_WEBVIEW = 'Mozilla/5.0 (iPhone; CPU iPhone OS 19_0 like Mac OS X) AppleWebKit/605.1.15' - -describe('the composing range a live input reports', () => { - afterEach(() => { - vi.unstubAllGlobals() - }) - - it('reports no range in an Android WebView, as native Android does', () => { - vi.stubGlobal('navigator', { userAgent: ANDROID_WEBVIEW }) - expect([true, false, undefined].map(reportedLiveInputComposing)).toEqual([ - undefined, - undefined, - undefined - ]) - }) - - it("passes the DOM's range through in any other browser", () => { - vi.stubGlobal('navigator', { userAgent: IPHONE_WEBVIEW }) - expect([true, false, undefined].map(reportedLiveInputComposing)).toEqual([ - true, - false, - undefined - ]) - }) -}) diff --git a/mobile/src/platform/use-native-device-verbs.test.tsx b/mobile/src/platform/use-native-device-verbs.test.tsx index f11892ada7b..ccc47dd5c9b 100644 --- a/mobile/src/platform/use-native-device-verbs.test.tsx +++ b/mobile/src/platform/use-native-device-verbs.test.tsx @@ -130,11 +130,12 @@ describe('a picker completing after its page session ends', () => { device.deleted.length = 0 }) - const cases = (['unmount', 'replace'] as const).flatMap((ending) => - (['library', 'files'] as const).flatMap((source) => - [false, true].map((strict) => ({ ending, source, strict })) - ) - ) + const cases = [ + { ending: 'unmount', source: 'library', strict: false }, + { ending: 'unmount', source: 'files', strict: true }, + { ending: 'replace', source: 'library', strict: true }, + { ending: 'replace', source: 'files', strict: false } + ] it.each(cases)( 'discards late $source files after $ending and preserves a successor, StrictMode=$strict', async ({ ending, source, strict }) => { diff --git a/mobile/src/query/lifecycle-owner.test.ts b/mobile/src/query/lifecycle-owner.test.ts index ca7975a1dba..a0ab27f5280 100644 --- a/mobile/src/query/lifecycle-owner.test.ts +++ b/mobile/src/query/lifecycle-owner.test.ts @@ -68,19 +68,6 @@ describe('reconnect-mid-request', () => { }) describe('owner boundaries', () => { - it('refuses a peer owner lease', async () => { - const owner: Owner = new GenerationScopedRequestOwner() - const peer: Owner = new GenerationScopedRequestOwner() - const scope = scopeAt('w1', 1) - const request = pending() - const loaded = owner.load(scope, QUERY, request.start) - request.resolve(['a.ts']) - const lease = await settled(loaded) - - expect(peer.commit(lease.lease, lease.value)).toBe('foreign-owner') - expect(peer.read(scope, QUERY)).toBeUndefined() - }) - it('separates two workspaces that ask for the same parameters', async () => { const owner: Owner = new GenerationScopedRequestOwner() const request = pending() diff --git a/mobile/src/session/agent-launch/mobile-new-tab-agent-loader.test.ts b/mobile/src/session/agent-launch/mobile-new-tab-agent-loader.test.ts index f01d892256d..c85923d2ee5 100644 --- a/mobile/src/session/agent-launch/mobile-new-tab-agent-loader.test.ts +++ b/mobile/src/session/agent-launch/mobile-new-tab-agent-loader.test.ts @@ -35,6 +35,4 @@ describe('mobile new-tab agent loading', () => { false ) }) - - // Put another host’s colliding repo id first so its SSH connection cannot accidentally address this host. }) diff --git a/mobile/src/session/mobile-session-route.test.ts b/mobile/src/session/mobile-session-route.test.ts index 8481b760991..82b35794496 100644 --- a/mobile/src/session/mobile-session-route.test.ts +++ b/mobile/src/session/mobile-session-route.test.ts @@ -45,29 +45,6 @@ function mountedHostState(hostId: string): HostStackNavigationState { } describe('mobile session route', () => { - it('mounts the host, then opens the session over its list', () => { - const harness = navigationHarness({ index: 0, routes: [{ name: 'index' }] }) - const push = vi.fn() - const target = mobileSessionRouteTarget({ - hostId: 'host/one', - worktreeId: 'repo::/Users/ada/orca/workspaces/fix #1', - name: 'Fix #1' - }) - - navigateToHostStackRoute(harness.navigation, { push, replace: vi.fn() }, 'host/one', target) - - expect(push).toHaveBeenCalledWith('/h/host%2Fone') - expect(harness.navigation.dispatch).not.toHaveBeenCalled() - - harness.setState(mountedHostState('host/one')) - - expect(harness.navigation.dispatch).toHaveBeenCalledWith({ - type: 'PUSH', - target: '/h', - payload: target - }) - }) - it('mounts the host, then puts a standalone session in place of its list', () => { const harness = navigationHarness({ index: 0, routes: [{ name: 'index' }] }) const target = mobileSessionRouteTarget({ diff --git a/mobile/src/session/native-chat/agent-session/mobile-structured-session-status-feed.test.ts b/mobile/src/session/native-chat/agent-session/mobile-structured-session-status-feed.test.ts index 892df6a0497..23321a14dd4 100644 --- a/mobile/src/session/native-chat/agent-session/mobile-structured-session-status-feed.test.ts +++ b/mobile/src/session/native-chat/agent-session/mobile-structured-session-status-feed.test.ts @@ -63,5 +63,3 @@ describe("the phone's status stream", () => { expect(read()?.hostExecutionPhase).toBeUndefined() }) }) - -// Match physical registry ordering: drop ended streams before delivering their last frame. diff --git a/src/main/git/command-runner/git-exec-file.ts b/src/main/git/command-runner/git-exec-file.ts index 1355ff1cbca..7500f661e11 100644 --- a/src/main/git/command-runner/git-exec-file.ts +++ b/src/main/git/command-runner/git-exec-file.ts @@ -190,10 +190,7 @@ function withCapturedErrorStdout(error: unknown, command: ResolvedCommand): unkn return error } -export function gitExecFileAsync( - args: string[], - callerOptions: GitExecOptions -): Promise<{ stdout: string; stderr: string }> { +export function gitExecFileAsync(args: string[], callerOptions: GitExecOptions) { const options = routeLocalGitOptions(callerOptions) const releaseMutation = trackGitWorktreeMutation(args, options) const releaseRefMutation = trackGitRefMutation(args) From 8d22623c070f208c1aa299a44c34af23851c8211 Mon Sep 17 00:00:00 2001 From: Jinjing <6427696+AmethystLiang@users.noreply.github.com> Date: Fri, 13 Nov 2026 12:06:28 -0800 Subject: [PATCH 4/8] fix(shortcuts): forward Plugins shortcut from local browser pages (#36744) * fix(shortcuts): forward Plugins shortcut from browser pages * fix(shortcuts): preserve text-producing guest chords * fix(shortcuts): preserve AltGr input in browser guests * fix(browser): return keyboard to the page after Settings closes Closing Settings remounts the active browser page. Its activation focus retry waits a frame for the retained guest to reattach, and a StrictMode effect re-run cancelled that wait while the activation latch stayed set, so the page never got focus back (host activeElement stayed BODY). A re-run that cancels the retry before any focus attempt now clears the latch so the next run retries. Also make the Plugins shortcut copy match browser-page behavior and add guest-dispatch coverage for Linux Ctrl+Alt, macOS Option symbol vs dead keys, and a German Y/Z layout. Co-Authored-By: Claude * fix(browser): keep the user's focus when a drag restarts page activation The Settings-close fix re-arms a page activation whose focus retry was cancelled before it acted. A drag starting or ending also re-runs that effect, and the re-armed retry took the current focus as its starting point. A user who picked the address bar while the guest was still attaching therefore had it treated as the page's starting focus, and the guest took the keyboard once it attached. The activation now keeps the focus it began from across restarts until the page deactivates, so a user focus change made before or during the drag still wins. Move the focus-address-bar chord listener into its own hook, matching the history shortcut, to keep the focus hook within the file-size limit. Co-Authored-By: Claude * fix(browser): take the activation's focus snapshot before the drag guard A page that activated while a drag was already active skipped the focus snapshot and took it when the drag ended. If the user picked the address bar during the drag, that pick became the starting point and the guest took the keyboard once it attached. Take the snapshot when the page activates, before deferring for the drag. Co-Authored-By: Claude * fix(plugins): let the Plugins shortcut hint wrap in narrow windows In a window about 700px wide the "Open with ..." hint stayed on one line and cut off the key combo. The label now wraps like the rest of the description, and only the key combo stays on one line, moving to the next line whole when it does not fit. Co-Authored-By: Claude --------- Co-authored-by: Claude --- .../browser-guest-shortcut-dispatch.test.ts | 161 ++++++++++++++++++ .../browser-guest-shortcut-dispatch.ts | 24 +++ .../browser-guest-shortcut-forwarding.test.ts | 36 ++++ .../browser-guest-shortcut-forwarding.ts | 8 +- .../manager/browser-manager-bindings.ts | 2 + .../use-global-keybindings-plugins.test.ts | 103 +++++++++++ .../src/app-shell/use-global-keybindings.ts | 18 +- .../use-browser-address-bar-shortcut.ts | 44 +++++ .../use-browser-page-chrome-focus.test.tsx | 154 +++++++++++++++++ .../use-browser-page-chrome-focus.ts | 59 +++---- .../list/PluginsSectionDescription.tsx | 13 +- src/renderer/src/i18n/locales/de.json | 2 +- src/renderer/src/i18n/locales/en.json | 2 +- src/renderer/src/i18n/locales/es.json | 2 +- src/renderer/src/i18n/locales/fr.json | 2 +- src/renderer/src/i18n/locales/ja.json | 2 +- src/renderer/src/i18n/locales/ko.json | 2 +- src/renderer/src/i18n/locales/pt.json | 2 +- src/renderer/src/i18n/locales/ru.json | 2 +- src/renderer/src/i18n/locales/tr.json | 2 +- src/renderer/src/i18n/locales/zh-Hant.json | 2 +- src/renderer/src/i18n/locales/zh.json | 2 +- 22 files changed, 589 insertions(+), 55 deletions(-) create mode 100644 src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-dispatch.test.ts create mode 100644 src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-forwarding.test.ts create mode 100644 src/renderer/src/app-shell/use-global-keybindings-plugins.test.ts create mode 100644 src/renderer/src/components/browser-pane/assemble-chrome/use-browser-address-bar-shortcut.ts create mode 100644 src/renderer/src/components/browser-pane/assemble-chrome/use-browser-page-chrome-focus.test.tsx diff --git a/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-dispatch.test.ts b/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-dispatch.test.ts new file mode 100644 index 00000000000..df2e0bc987a --- /dev/null +++ b/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-dispatch.test.ts @@ -0,0 +1,161 @@ +import { describe, expect, it, vi } from 'vitest' +import { + forwardGuestShortcutInput, + type GuestShortcutForwardContext +} from './browser-guest-shortcut-dispatch' + +const input = { + key: 'Y', + code: 'KeyY', + meta: process.platform === 'darwin', + control: process.platform !== 'darwin', + shift: true +} +const primaryDoubleTap = process.platform === 'darwin' ? 'Cmd' : 'Ctrl' + +function fixture(local = true) { + const send = vi.fn() + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: dispatch only uses send on this renderer. + const renderer = { send } as unknown as Electron.WebContents + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: dispatch only calls preventDefault on this event. + const event = { preventDefault: vi.fn() } as unknown as Electron.Event + const context: GuestShortcutForwardContext & { isLocalRenderer: () => boolean } = { + browserTabId: 'page', + resolveRenderer: () => renderer, + isLocalRenderer: () => local, + getKeybindings: () => ({ 'view.plugins': ['Mod+Shift+Y'] }), + forwardBrowserPageZoom: vi.fn() + } + return { context, event, send } +} + +function withPlatform(platform: NodeJS.Platform, run: () => void): void { + const descriptor = Object.getOwnPropertyDescriptor(process, 'platform') + if (!descriptor) { + throw new Error('Missing process.platform descriptor') + } + Object.defineProperty(process, 'platform', { ...descriptor, value: platform }) + try { + run() + } finally { + Object.defineProperty(process, 'platform', descriptor) + } +} + +describe('Plugins shortcut from a browser guest', () => { + it('replays the configured chord once, consuming repeats', () => { + const { context, event, send } = fixture() + expect(forwardGuestShortcutInput(context, event, input)).toBe(true) + expect(send).toHaveBeenCalledWith('ui:browserPageTabShortcut', expect.objectContaining(input)) + expect(forwardGuestShortcutInput(context, event, { ...input, isAutoRepeat: true })).toBe(true) + expect(send).toHaveBeenCalledOnce() + }) + + it('leaves disabled or remapped chords with the page', () => { + const { context, event, send } = fixture() + context.getKeybindings = () => ({ 'view.plugins': [] }) + expect(forwardGuestShortcutInput(context, event, input)).toBe(false) + context.getKeybindings = () => ({ 'view.plugins': ['Mod+Shift+Z'] }) + expect(forwardGuestShortcutInput(context, event, input)).toBe(false) + expect(send).not.toHaveBeenCalled() + }) + + it('leaves text-producing custom bindings to the guest', () => { + const { context, event, send } = fixture() + context.getKeybindings = () => ({ 'view.plugins': ['Alt+A'] }) + expect(forwardGuestShortcutInput(context, event, { key: 'å', code: 'KeyA', alt: true })).toBe( + false + ) + expect(forwardGuestShortcutInput(context, event, { key: 'a', code: 'KeyA', alt: true })).toBe( + false + ) + expect(event.preventDefault).not.toHaveBeenCalled() + expect(send).not.toHaveBeenCalled() + }) + + it('leaves an explicit AltGraph chord in the guest', () => { + withPlatform('darwin', () => { + const { context, event, send } = fixture() + context.getKeybindings = () => ({ 'view.plugins': ['Cmd+Alt+Q'] }) + const input = { key: 'q', code: 'KeyQ', meta: true, alt: true } + expect(forwardGuestShortcutInput(context, event, { ...input, altGraph: true })).toBe(false) + expect( + forwardGuestShortcutInput(context, event, { + ...input, + getModifierState: (key) => key === 'AltGraph' + }) + ).toBe(false) + expect(event.preventDefault).not.toHaveBeenCalled() + expect(send).not.toHaveBeenCalled() + }) + }) + + it.each(['win32', 'linux'] as const)( + 'leaves Electron Ctrl+Alt input to the page on %s', + (platform) => { + withPlatform(platform, () => { + const { context, event, send } = fixture() + context.getKeybindings = () => ({ 'view.plugins': ['Ctrl+Alt+Q'] }) + const input = { key: 'q', code: 'KeyQ', control: true, alt: true } + expect(forwardGuestShortcutInput(context, event, { ...input, altGraph: true })).toBe(false) + expect(forwardGuestShortcutInput(context, event, input)).toBe(false) + expect(event.preventDefault).not.toHaveBeenCalled() + expect(send).not.toHaveBeenCalled() + }) + } + ) + + it('opens from the default macOS chord when Option turns X into a symbol, not when it is a dead key', () => { + withPlatform('darwin', () => { + const { context, event, send } = fixture() + context.getKeybindings = () => ({}) + const chord = { code: 'KeyX', meta: true, alt: true } + expect(forwardGuestShortcutInput(context, event, { ...chord, key: 'Dead' })).toBe(false) + expect(send).not.toHaveBeenCalled() + expect(forwardGuestShortcutInput(context, event, { ...chord, key: '≈' })).toBe(true) + expect(send).toHaveBeenCalledWith( + 'ui:browserPageTabShortcut', + expect.objectContaining({ key: '≈', code: 'KeyX', meta: true, alt: true }) + ) + }) + }) + + it('follows the typed letter on a German layout where Y and Z swap keys on Linux', () => { + withPlatform('linux', () => { + const { context, event, send } = fixture() + context.getKeybindings = () => ({}) + const chord = { control: true, shift: true } + expect(forwardGuestShortcutInput(context, event, { ...chord, key: 'Z', code: 'KeyY' })).toBe( + false + ) + expect(send).not.toHaveBeenCalled() + expect(forwardGuestShortcutInput(context, event, { ...chord, key: 'Y', code: 'KeyZ' })).toBe( + true + ) + expect(send).toHaveBeenCalledOnce() + }) + }) + + it('replays a configured modifier double tap', () => { + const { context, event, send } = fixture() + context.getKeybindings = () => ({ 'view.plugins': ['DoubleTap+Mod'] }) + expect(forwardGuestShortcutInput(context, event, { doubleTapModifier: primaryDoubleTap })).toBe( + true + ) + expect(send).toHaveBeenCalledWith( + 'ui:browserPageTabShortcut', + expect.objectContaining({ doubleTapModifier: primaryDoubleTap }) + ) + }) + + it('leaves composing input and nonlocal renderers alone', () => { + const { context, event, send } = fixture(false) + expect(forwardGuestShortcutInput(context, event, input)).toBe(false) + const local = fixture() + expect(forwardGuestShortcutInput(local.context, local.event, { ...input, key: 'Dead' })).toBe( + false + ) + expect(send).not.toHaveBeenCalled() + expect(local.send).not.toHaveBeenCalled() + }) +}) diff --git a/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-dispatch.ts b/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-dispatch.ts index 9ddbc677729..3f6c2c29e39 100644 --- a/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-dispatch.ts +++ b/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-dispatch.ts @@ -3,6 +3,7 @@ import { type WindowShortcutInput } from '../../../../../shared/window-shortcut-policy' import { keybindingMatchesAction } from '../../../../../shared/keybindings/matching' +import { hasModifier } from '../../../../../shared/keybindings/parser' import type { KeybindingOverrides } from '../../../../../shared/keybindings/types' import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants' import type { BrowserPageZoomDirection } from '../../../../../shared/browser-page-zoom' @@ -17,11 +18,14 @@ export type IsMobileEmulatorEnabled = () => boolean export type GuestShortcutInput = WindowShortcutInput & { isAutoRepeat?: boolean isComposing?: boolean + altGraph?: boolean + getModifierState?: (key: string) => boolean } export type GuestShortcutForwardContext = { browserTabId: string resolveRenderer: ResolveRenderer + isLocalRenderer?: (renderer: Electron.WebContents) => boolean shouldForwardDictationShortcut?: ShouldForwardDictationShortcut isMobileEmulatorEnabled?: IsMobileEmulatorEnabled getKeybindings?: () => KeybindingOverrides | undefined @@ -42,6 +46,7 @@ export function forwardGuestShortcutInput( const { browserTabId, resolveRenderer, + isLocalRenderer, shouldForwardDictationShortcut, isMobileEmulatorEnabled, getKeybindings, @@ -56,6 +61,23 @@ export function forwardGuestShortcutInput( action?.type === 'dictationKeyDown' && !textInputOwnsComposition(input) && shouldForwardDictationShortcut?.() === true + // Why: Ctrl+Alt can be AltGr on Windows/Linux; leave those chords with the page. + const mayBeAltGraph = + process.platform !== 'darwin' && hasModifier(input, 'control') && hasModifier(input, 'alt') + // Why: non-primary guest chords stay on the page; primary app chords retain guest precedence. + const primaryModifier = process.platform === 'darwin' ? 'meta' : 'control' + const primaryDoubleTap = process.platform === 'darwin' ? 'Cmd' : 'Ctrl' + const matchesPlugins = + !mayBeAltGraph && + (hasModifier(input, primaryModifier) || input.doubleTapModifier === primaryDoubleTap) && + !textInputOwnsComposition(input) && + keybindingMatchesAction('view.plugins', input, process.platform, keybindings, { + context: 'app' + }) && + (() => { + const renderer = resolveRenderer(browserTabId) + return renderer !== null && isLocalRenderer?.(renderer) === true + })() if (action?.type === 'zoom') { if (!page) { // Why: a plugin frame has no page zoom; Orca zooms what it would with focus outside a pane. @@ -69,6 +91,7 @@ export function forwardGuestShortcutInput( if (input.isAutoRepeat) { if ( forwardsDictation || + matchesPlugins || // Why: Orca claims a held tab chord on every repeat but acts once, so repeats never reach the page. matchesGuestTabShortcut( input, @@ -215,6 +238,7 @@ export function forwardGuestShortcutInput( } renderer.send('ui:dictationKeyDown') } else if ( + matchesPlugins || matchesGuestTabShortcut( input, process.platform, diff --git a/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-forwarding.test.ts b/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-forwarding.test.ts new file mode 100644 index 00000000000..a0b1ca9126e --- /dev/null +++ b/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-forwarding.test.ts @@ -0,0 +1,36 @@ +import { EventEmitter } from 'node:events' +import { expect, it, vi } from 'vitest' +import { setupGuestShortcutForwarding } from './browser-guest-shortcut-forwarding' + +vi.mock('../../../cdp/input/agent-input-injection', () => ({ isAgentInjectingInput: () => false })) + +it('forwards a modifier double tap without arming it during composition', () => { + const guest = new EventEmitter() + const send = vi.fn() + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: forwarding uses only the guest event emitter. + const webContents = guest as unknown as Electron.WebContents + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: forwarding uses only send on this renderer. + const renderer = { send } as unknown as Electron.WebContents + setupGuestShortcutForwarding({ + browserTabId: 'page', + guest: webContents, + resolveRenderer: () => renderer, + isLocalRenderer: () => true, + getKeybindings: () => ({ 'view.plugins': ['DoubleTap+Mod'] }) + }) + const event = { preventDefault: vi.fn() } + const shift = + process.platform === 'darwin' + ? { key: 'Meta', code: 'MetaLeft', meta: true } + : { key: 'Control', code: 'ControlLeft', control: true } + guest.emit('before-input-event', event, { ...shift, type: 'keyDown', isComposing: true }) + guest.emit('before-input-event', event, { ...shift, type: 'keyUp', isComposing: true }) + guest.emit('before-input-event', event, { ...shift, type: 'keyDown' }) + expect(send).not.toHaveBeenCalled() + guest.emit('before-input-event', event, { ...shift, type: 'keyUp' }) + guest.emit('before-input-event', event, { ...shift, type: 'keyDown' }) + expect(send).toHaveBeenCalledWith( + 'ui:browserPageTabShortcut', + expect.objectContaining({ doubleTapModifier: process.platform === 'darwin' ? 'Cmd' : 'Ctrl' }) + ) +}) diff --git a/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-forwarding.ts b/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-forwarding.ts index a51f774436b..7d8a66255fd 100644 --- a/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-forwarding.ts +++ b/src/main/browser/guest-lifecycle/input/shortcuts/browser-guest-shortcut-forwarding.ts @@ -1,3 +1,4 @@ +import { textInputOwnsComposition } from '../../../../../shared/text-input-shortcut-policy' import { isAgentInjectingInput } from '../../../cdp/input/agent-input-injection' import { isRecentTabSwitcherCommitRelease, @@ -26,6 +27,7 @@ export function setupGuestShortcutForwarding(args: { browserTabId: string guest: Electron.WebContents resolveRenderer: ResolveRenderer + isLocalRenderer?: (renderer: Electron.WebContents) => boolean shouldForwardDictationShortcut?: ShouldForwardDictationShortcut isMobileEmulatorEnabled?: IsMobileEmulatorEnabled getKeybindings?: () => KeybindingOverrides | undefined @@ -38,6 +40,7 @@ export function setupGuestShortcutForwarding(args: { browserTabId, guest, resolveRenderer, + isLocalRenderer, shouldForwardDictationShortcut, isMobileEmulatorEnabled, getKeybindings, @@ -61,6 +64,7 @@ export function setupGuestShortcutForwarding(args: { const forwardContext: GuestShortcutForwardContext = { browserTabId, resolveRenderer, + isLocalRenderer, shouldForwardDictationShortcut, isMobileEmulatorEnabled, getKeybindings, @@ -95,7 +99,9 @@ export function setupGuestShortcutForwarding(args: { return } - if (input.type === 'keyDown' || input.type === 'keyUp') { + if (textInputOwnsComposition(input)) { + doubleTapDetector.reset() + } else if (input.type === 'keyDown' || input.type === 'keyUp') { const detected = doubleTapDetector.process( toModifierDoubleTapEvent({ type: input.type, diff --git a/src/main/browser/guest-lifecycle/manager/browser-manager-bindings.ts b/src/main/browser/guest-lifecycle/manager/browser-manager-bindings.ts index c78a8c9ca12..c2d42b9ba9c 100644 --- a/src/main/browser/guest-lifecycle/manager/browser-manager-bindings.ts +++ b/src/main/browser/guest-lifecycle/manager/browser-manager-bindings.ts @@ -1,3 +1,4 @@ +import { isTrustedBrowserRenderer } from '../../../ipc/browser/browser-renderer-trust' import { resolveRendererWebContents } from '../browser-guest-renderer-target' // oxlint-disable-next-line import/no-cycle -- browser subsystem singleton hub (browserManager); breaking it needs DI and test-mock updates, left for a human import { setupGuestContextMenu } from '../input/browser-guest-context-menu' @@ -53,6 +54,7 @@ export abstract class BrowserManagerBindings extends BrowserManagerGrab { guest, resolveRenderer: (tabId) => resolveRendererWebContents(this.rendererWebContentsIdByTabId, tabId), + isLocalRenderer: isTrustedBrowserRenderer, shouldForwardDictationShortcut: () => this.shouldForwardDictationShortcut?.() ?? false, isMobileEmulatorEnabled: () => this.settingsResolver?.().mobileEmulatorEnabled !== false, getKeybindings: () => this.settingsResolver?.().keybindings, diff --git a/src/renderer/src/app-shell/use-global-keybindings-plugins.test.ts b/src/renderer/src/app-shell/use-global-keybindings-plugins.test.ts new file mode 100644 index 00000000000..0849a86883e --- /dev/null +++ b/src/renderer/src/app-shell/use-global-keybindings-plugins.test.ts @@ -0,0 +1,103 @@ +// @vitest-environment happy-dom +import { act, cleanup, renderHook } from '@testing-library/react' +import { afterEach, beforeEach, expect, it, vi } from 'vitest' +import { useAppStore } from '@/store' +import { useGlobalKeybindings } from './use-global-keybindings' +import { useAppChromeLayout } from './use-app-chrome-layout' +import { useFloatingWorkspacePanel } from './use-floating-workspace-panel' +import { replayAppKeyDown } from '@/lib/keyboard/app-keyboard-router' + +vi.mock('@/app-shell/app-window-chrome', () => ({ shortcutPlatform: 'darwin' })) + +const initial = useAppStore.getState() +const openSettingsPage = vi.fn() +const openSettingsTarget = vi.fn() + +beforeEach(() => { + useAppStore.setState({ + keybindings: { 'view.plugins': ['Alt+E'] }, + openSettingsPage, + openSettingsTarget + }) + renderHook(() => + useGlobalKeybindings({ + layout: useAppChromeLayout(), + floatingWorkspace: useFloatingWorkspacePanel() + }) + ) +}) +afterEach(() => { + cleanup() + document.body.replaceChildren() + useAppStore.setState(initial, true) + vi.clearAllMocks() +}) + +function press(target: HTMLElement, init: KeyboardEventInit = {}) { + const event = new KeyboardEvent('keydown', { + key: 'e', + code: 'KeyE', + altKey: true, + bubbles: true, + cancelable: true, + ...init + }) + act(() => target.dispatchEvent(event)) + return event +} + +it('opens Plugins from app focus but preserves textarea editing for the same configured chord', () => { + const textarea = document.createElement('textarea') + document.body.append(textarea) + for (const target of [document.body, textarea]) { + for (const init of [{ key: 'Dead' }, { key: 'Process' }, { isComposing: true }]) { + expect(press(target, init).defaultPrevented).toBe(false) + expect(openSettingsPage).not.toHaveBeenCalled() + } + } + expect(press(textarea).defaultPrevented).toBe(false) + expect(openSettingsPage).not.toHaveBeenCalled() + expect(press(document.body).defaultPrevented).toBe(true) + expect(openSettingsPage).toHaveBeenCalledOnce() + expect(openSettingsTarget).toHaveBeenCalledWith({ + pane: 'plugins', + repoId: null, + intent: undefined + }) +}) + +it('preserves recorder, already-claimed input and repeat protections', () => { + const recorder = document.createElement('button') + recorder.dataset.shortcutRecorderActive = '' + document.body.append(recorder) + expect(press(recorder).defaultPrevented).toBe(false) + expect(press(document.body, { repeat: true }).defaultPrevented).toBe(false) + const claimed = new KeyboardEvent('keydown', { + key: 'e', + code: 'KeyE', + altKey: true, + cancelable: true + }) + claimed.preventDefault() + act(() => replayAppKeyDown(claimed)) + expect(openSettingsPage).not.toHaveBeenCalled() +}) + +it('dispatches guest replay chords and double taps through the real Plugins handler', () => { + const chord = new KeyboardEvent('keydown', { + key: 'e', + code: 'KeyE', + altKey: true, + cancelable: true + }) + act(() => replayAppKeyDown(chord)) + expect(chord.defaultPrevented).toBe(true) + expect(openSettingsPage).toHaveBeenCalledOnce() + act(() => useAppStore.setState({ keybindings: { 'view.plugins': ['DoubleTap+Shift'] } })) + const gesture = Object.assign(new KeyboardEvent('keydown', { cancelable: true }), { + doubleTapModifier: 'Shift' + }) + act(() => replayAppKeyDown(gesture)) + expect(gesture.defaultPrevented).toBe(true) + expect(openSettingsPage).toHaveBeenCalledTimes(2) +}) diff --git a/src/renderer/src/app-shell/use-global-keybindings.ts b/src/renderer/src/app-shell/use-global-keybindings.ts index 37ef9290b98..1155f49dd98 100644 --- a/src/renderer/src/app-shell/use-global-keybindings.ts +++ b/src/renderer/src/app-shell/use-global-keybindings.ts @@ -18,7 +18,11 @@ import { } from '../components/right-sidebar/file-explorer/content-search/file-search-include-pattern' import { usePluginCommands } from '@/store/plugins/catalog/plugin-contribution-catalog' import { useAppStore } from '../store/index' -import { keybindingMatchesAction, type KeybindingActionId } from '../../../shared/keybindings' +import { + keybindingMatchesAction, + type KeybindingActionId, + type PhysicalModifierToken +} from '../../../shared/keybindings' import { PLUGIN_COMMAND_ALIAS_ACTION_IDS } from '../../../shared/plugins/contributions/plugin-command-actions' import { ModifierDoubleTapDetector, @@ -227,7 +231,11 @@ export function useGlobalKeybindings(args: { ) { return } - if (matchAppShortcut('view.plugins') && handlers.get('view.plugins')?.()) { + if ( + input.key !== 'Dead' && + matchAppShortcut('view.plugins') && + handlers.get('view.plugins')?.() + ) { return } for (const actionId of PLUGIN_COMMAND_ALIAS_ACTION_IDS) { @@ -264,17 +272,17 @@ export function useGlobalKeybindings(args: { Date.now() ) } - const onKeyDown = (e: KeyboardEvent): void => { + const onKeyDown = (e: KeyboardEvent & { doubleTapModifier?: PhysicalModifierToken }): void => { const detected = detectDoubleTap(e, 'keyDown') if (e.repeat) { return } - if (detected) { + if (detected || e.doubleTapModifier) { // No key/modifier flags: synthetic input matches only DoubleTap bindings. dispatchShortcutInput({ isComposing: e.isComposing, altGraph: e.getModifierState('AltGraph'), - doubleTapModifier: detected.modifier, + doubleTapModifier: detected?.modifier ?? e.doubleTapModifier, target: e.target, defaultPrevented: e.defaultPrevented, preventDefault: () => e.preventDefault() diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-address-bar-shortcut.ts b/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-address-bar-shortcut.ts new file mode 100644 index 00000000000..3cb3b1f91be --- /dev/null +++ b/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-address-bar-shortcut.ts @@ -0,0 +1,44 @@ +import { useEffect } from 'react' +import { useAppStore } from '@/store' +import { getShortcutPlatform } from '@/hooks/useShortcutLabel' +import { addAppKeyListener, removeAppKeyListener } from '@/lib/keyboard/app-keyboard-router' +import { keybindingMatchesAction } from '../../../../../shared/keybindings' +import { browserChromeShortcutOwnsEvent } from '../describe-page/browser-overlay-shortcut-target' +import type { BrowserChromeShortcutScope } from '../describe-page/browser-page-types' + +/** The focus-address-bar chord while Orca's chrome has the keyboard. */ +export function useBrowserAddressBarShortcut({ + workspaceId, + chromeShortcutScope, + focusAddressBarNow +}: { + workspaceId: string + chromeShortcutScope: BrowserChromeShortcutScope + focusAddressBarNow: () => boolean +}): void { + const keybindings = useAppStore((s) => s.keybindings) + + // Guest-focused chords arrive through IPC; capture handles chrome-focused chords before workspace/editor listeners. + useEffect(() => { + if (chromeShortcutScope === 'inactive') { + return + } + const shortcutPlatform = getShortcutPlatform() + const handleKeyDown = (event: KeyboardEvent): void => { + if ( + !keybindingMatchesAction('browser.focusAddressBar', event, shortcutPlatform, keybindings) + ) { + return + } + if (!browserChromeShortcutOwnsEvent(chromeShortcutScope, event, workspaceId)) { + return + } + event.preventDefault() + // All panes listen on window capture; stopPropagation alone leaves sibling listeners active. + event.stopImmediatePropagation() + focusAddressBarNow() + } + addAppKeyListener('keydown', handleKeyDown) + return () => removeAppKeyListener('keydown', handleKeyDown) + }, [chromeShortcutScope, focusAddressBarNow, keybindings, workspaceId]) +} diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-page-chrome-focus.test.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-page-chrome-focus.test.tsx new file mode 100644 index 00000000000..098e4f425eb --- /dev/null +++ b/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-page-chrome-focus.test.tsx @@ -0,0 +1,154 @@ +// @vitest-environment happy-dom +import { act, cleanup, render } from '@testing-library/react' +import { StrictMode, useRef } from 'react' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' + +vi.mock('@/store', () => { + const state = { + consumeAddressBarFocusRequest: () => false, + keybindings: {}, + setBrowserHistoryPageId: () => {}, + browserHistoryPageId: null + } + return { + useAppStore: Object.assign((select: (s: typeof state) => unknown) => select(state), { + getState: () => state + }) + } +}) + +import { useBrowserPageChromeFocus } from './use-browser-page-chrome-focus' +import type { BrowserPageGuestFocus } from './browser-page-guest-focus' +import { acquireWebviewsDragPassthrough } from '../host-guest/webview-drag-passthrough' + +let frames = new Map() +let nextFrameId = 0 + +function flushFrame(): void { + const pending = [...frames.values()] + frames = new Map() + act(() => pending.forEach((callback) => callback(0))) +} + +function PageHarness({ guestFocus }: { guestFocus: BrowserPageGuestFocus }) { + const addressBarInputRef = useRef(null) + useBrowserPageChromeFocus({ + browserTabId: 'page-1', + workspaceId: 'workspace-1', + isActive: true, + chromeShortcutScope: 'focused', + addressBarInputRef, + guestFocus + }) + return +} + +/** A guest that attaches late and takes real DOM focus, so a test can observe a steal. */ +function createLateGuest(): { guestFocus: BrowserPageGuestFocus; attach: () => void } { + let attached = false + const target = document.createElement('button') + document.body.append(target) + return { + attach: () => { + attached = true + }, + guestFocus: { + isAttached: () => attached, + blur: () => target.blur(), + focus: () => { + target.focus() + return document.activeElement === target + } + } + } +} + +beforeEach(() => { + frames = new Map() + nextFrameId = 0 + vi.spyOn(window, 'requestAnimationFrame').mockImplementation((callback) => { + frames.set(++nextFrameId, callback) + return nextFrameId + }) + vi.spyOn(window, 'cancelAnimationFrame').mockImplementation((id) => { + frames.delete(id) + }) + Object.defineProperty(window, 'api', { + configurable: true, + value: { + ui: { onFocusBrowserAddressBar: () => () => {}, onShowBrowserHistory: () => () => {} } + } + }) +}) + +afterEach(() => { + cleanup() + document.body.replaceChildren() + vi.restoreAllMocks() +}) + +describe('useBrowserPageChromeFocus activation', () => { + it('hands the keyboard to a page that remounts active before its guest reattaches', () => { + // Closing Settings remounts the active page; its retained guest reattaches a frame later. + let attached = false + const focus = vi.fn(() => true) + const guestFocus = { blur: vi.fn(), focus, isAttached: () => attached } + + render( + + + + ) + attached = true + flushFrame() + + expect(focus).toHaveBeenCalledTimes(1) + }) + + it('keeps the address bar the user picked when a drag restarts the waiting activation', () => { + const guest = createLateGuest() + const view = render() + const addressBar = view.getByLabelText('Address') + addressBar.focus() + // The drag lands before the waiting retry's next frame could see the user's choice. + let endDrag = (): void => {} + act(() => { + endDrag = acquireWebviewsDragPassthrough() + }) + guest.attach() + act(() => endDrag()) + flushFrame() + + expect(document.activeElement).toBe(addressBar) + }) + + it('keeps the address bar the user picked while a drag held the activation', () => { + const guest = createLateGuest() + const view = render() + const addressBar = view.getByLabelText('Address') + let endDrag = (): void => {} + act(() => { + endDrag = acquireWebviewsDragPassthrough() + }) + // Focus moves only after the drag cancelled the retry, e.g. a drop into the address bar. + addressBar.focus() + guest.attach() + act(() => endDrag()) + flushFrame() + + expect(document.activeElement).toBe(addressBar) + }) + + it('keeps the address bar the user picked when the page activated mid-drag', () => { + const guest = createLateGuest() + const endDrag = acquireWebviewsDragPassthrough() + const view = render() + const addressBar = view.getByLabelText('Address') + addressBar.focus() + guest.attach() + act(() => endDrag()) + flushFrame() + + expect(document.activeElement).toBe(addressBar) + }) +}) diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-page-chrome-focus.ts b/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-page-chrome-focus.ts index d4b2684c694..fd9c2db61ab 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-page-chrome-focus.ts +++ b/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-page-chrome-focus.ts @@ -8,20 +8,17 @@ import { type RefObject } from 'react' import { useAppStore } from '@/store' -import { getShortcutPlatform } from '@/hooks/useShortcutLabel' -import { keybindingMatchesAction } from '../../../../../shared/keybindings' import { consumeBrowserFocusRequest, queueBrowserFocusRequest, ORCA_BROWSER_FOCUS_REQUEST_EVENT, type BrowserFocusRequestDetail } from '../host-guest/browser-focus' -import { browserChromeShortcutOwnsEvent } from '../describe-page/browser-overlay-shortcut-target' import type { BrowserChromeShortcutScope } from '../describe-page/browser-page-types' import type { BrowserAddressBarSelection } from './browser-address-bar-edit-session' import type { BrowserPageGuestFocus } from './browser-page-guest-focus' -import { addAppKeyListener, removeAppKeyListener } from '@/lib/keyboard/app-keyboard-router' import { useBrowserHistoryShortcut } from '../history/use-browser-history-shortcut' +import { useBrowserAddressBarShortcut } from './use-browser-address-bar-shortcut' import { useWebviewDragPassthroughActive } from '../host-guest/use-webview-drag-passthrough-active' /** Frames an address-bar grab keeps retrying before it lets the guest have focus back. */ @@ -57,7 +54,6 @@ export function useBrowserPageChromeFocus({ } { useBrowserHistoryShortcut({ browserTabId, workspaceId, isActive, chromeShortcutScope }) const consumeAddressBarFocusRequest = useAppStore((s) => s.consumeAddressBarFocusRequest) - const keybindings = useAppStore((s) => s.keybindings) const keepAddressBarFocusRef = useRef(false) const addressBarFocusGrabRef = useRef<(() => void) | null>(null) // Why a layout effect: it lands before the previous render's passive cleanups read it. @@ -162,46 +158,26 @@ export function useBrowserPageChromeFocus({ }) }, [browserTabId, focusAddressBarNow, isActive]) - // Guest-focused chords arrive through IPC; capture handles chrome-focused chords before workspace/editor listeners. - useEffect(() => { - if (chromeShortcutScope === 'inactive') { - return - } - const shortcutPlatform = getShortcutPlatform() - const handleKeyDown = (event: KeyboardEvent): void => { - if ( - !keybindingMatchesAction('browser.focusAddressBar', event, shortcutPlatform, keybindings) - ) { - return - } - if (!browserChromeShortcutOwnsEvent(chromeShortcutScope, event, workspaceId)) { - return - } - event.preventDefault() - // All panes listen on window capture; stopPropagation alone leaves sibling listeners active. - event.stopImmediatePropagation() - focusAddressBarNow() - } - addAppKeyListener('keydown', handleKeyDown) - return () => removeAppKeyListener('keydown', handleKeyDown) - }, [chromeShortcutScope, focusAddressBarNow, keybindings, workspaceId]) + useBrowserAddressBarShortcut({ workspaceId, chromeShortcutScope, focusAddressBarNow }) /** Wait for guest attachment; cancellation requeues unfinished active requests unless explicitly disabled. */ const startGuestFocusRetry = useCallback( ({ firstAttempt, - stillWanted = () => true + stillWanted = () => true, + focusAtRequest = document.activeElement }: { firstAttempt: 'now' | 'next-frame' /** Checked before every attempt; false drops the focus for good. */ stillWanted?: () => boolean + /** Focus the request began from; moving off it before the first attempt yields to the user. */ + focusAtRequest?: Element | null }) => { let cancelled = false let settled = false let frameId = 0 let attempts = 0 let waitedFrames = 0 - const focusAtRequest = document.activeElement const runFocus = (): void => { if (cancelled) { return @@ -234,13 +210,15 @@ export function useBrowserPageChromeFocus({ } else { frameId = window.requestAnimationFrame(runFocus) } - return ({ requeue = true }: { requeue?: boolean } = {}): void => { + // Returns whether the retry got to act: tried focus, or settled without it. + return ({ requeue = true }: { requeue?: boolean } = {}): boolean => { cancelled = true window.cancelAnimationFrame(frameId) // Requeue active StrictMode/dependency retries, but drop departed panes so revisiting cannot steal focus. if (requeue && !settled && waitedFrames < GUEST_ATTACH_WAIT_FRAMES && isActiveRef.current) { queueBrowserFocusRequest({ pageId: browserTabId, target: 'webview' }) } + return settled || attempts > 0 } }, [browserTabId, focusGuestNow, guestFocus] @@ -260,7 +238,8 @@ export function useBrowserPageChromeFocus({ // Cancel the bar grab as well as its latch or remaining frames will steal page focus back. cancelAddressBarFocusGrab() // Why a frame first: focus can be queued before the pane mounts and is claimed here. - return startGuestFocusRetry({ firstAttempt: 'next-frame' }) + const cancelGuestFocus = startGuestFocusRetry({ firstAttempt: 'next-frame' }) + return () => void cancelGuestFocus() }, [ browserTabId, cancelAddressBarFocusGrab, @@ -314,13 +293,20 @@ export function useBrowserPageChromeFocus({ ) const dragPassthroughActive = useWebviewDragPassthroughActive(isActive) const focusedForActivationRef = useRef(false) + // Why: a restarted activation keeps the focus it began from, so a user choice made before the restart still wins. + const activationFocusAtRequestRef = useRef<{ element: Element | null } | null>(null) // Why: switching to a page hands it the keyboard, as for terminals (#20533); declared after the // address-bar effects so a new blank tab's grab has already raised the latch. useEffect(() => { if (!isActive) { focusedForActivationRef.current = false + activationFocusAtRequestRef.current = null return } + // Why before the drag guard: a page activated mid-drag still yields to focus the user picks during it. + if (activationFocusAtRequestRef.current === null) { + activationFocusAtRequestRef.current = { element: document.activeElement } + } // Why defer, not consume: focusing a guest mid-drag reads as an aborted drag. if (focusedForActivationRef.current || dragPassthroughActive) { return @@ -329,10 +315,15 @@ export function useBrowserPageChromeFocus({ // Why the focused split only: never pull the keyboard across splits. const cancelGuestFocus = startGuestFocusRetry({ firstAttempt: 'now', + focusAtRequest: activationFocusAtRequestRef.current.element, stillWanted: () => !inputLocked && isSplitFocused() && !keepAddressBarFocusRef.current }) - // Why no requeue: an activation is not a queued request, so leaving the tab drops it. - return () => cancelGuestFocus({ requeue: false }) + return () => { + // Why: no requeue, since leaving the tab drops an activation; but a re-run that cancels it while waiting for the guest to attach (StrictMode remount as Settings closes) must retry. + if (!cancelGuestFocus({ requeue: false })) { + focusedForActivationRef.current = false + } + } }, [dragPassthroughActive, inputLocked, isActive, startGuestFocusRetry]) return { focusAddressBarNow, focusGuestNow, startAddressBarFocusGrab, keepAddressBarFocusRef } diff --git a/src/renderer/src/components/plugins/list/PluginsSectionDescription.tsx b/src/renderer/src/components/plugins/list/PluginsSectionDescription.tsx index a6de8ae3e5e..df96b1b20d2 100644 --- a/src/renderer/src/components/plugins/list/PluginsSectionDescription.tsx +++ b/src/renderer/src/components/plugins/list/PluginsSectionDescription.tsx @@ -9,12 +9,17 @@ export function PluginsSectionDescription({ text }: { text: string }): React.JSX <> {text} {shortcut.keys.length > 0 ? ( - + // Why: the label wraps in narrow windows; only the key combo stays on one line. + {t( 'auto.components.plugins.list.PluginsSectionDescription.openWith', - 'Open with (when focus is not in an editable field)' - )} - + 'Open with (except while typing in an Orca text field)' + )}{' '} + ) : null} diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json index 347472857df..e622d36e889 100644 --- a/src/renderer/src/i18n/locales/de.json +++ b/src/renderer/src/i18n/locales/de.json @@ -19012,7 +19012,7 @@ "plugins": { "list": { "PluginsSectionDescription": { - "openWith": "Öffnen mit (wenn der Fokus nicht in einem bearbeitbaren Feld liegt)" + "openWith": "Öffnen mit (außer beim Tippen in einem Orca-Textfeld)" } }, "pluginInstallCount": { diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 9795bf9aae0..9277a1b5cd0 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -19998,7 +19998,7 @@ }, "list": { "PluginsSectionDescription": { - "openWith": "Open with (when focus is not in an editable field)" + "openWith": "Open with (except while typing in an Orca text field)" } }, "pluginInstallCount": { diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json index f92aa988b2a..9825482c701 100644 --- a/src/renderer/src/i18n/locales/es.json +++ b/src/renderer/src/i18n/locales/es.json @@ -18800,7 +18800,7 @@ "plugins": { "list": { "PluginsSectionDescription": { - "openWith": "Abrir con (cuando el foco no está en un campo editable)" + "openWith": "Abrir con (excepto al escribir en un campo de texto de Orca)" } }, "pluginInstallCount": { diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json index 57e30149881..8488ebcd506 100644 --- a/src/renderer/src/i18n/locales/fr.json +++ b/src/renderer/src/i18n/locales/fr.json @@ -19067,7 +19067,7 @@ "plugins": { "list": { "PluginsSectionDescription": { - "openWith": "Ouvrir avec (lorsqu’aucun champ modifiable n’a le focus)" + "openWith": "Ouvrir avec (sauf pendant la saisie dans un champ de texte d’Orca)" } }, "pluginInstallCount": { diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json index 5913dbb8282..bf0093a7c48 100644 --- a/src/renderer/src/i18n/locales/ja.json +++ b/src/renderer/src/i18n/locales/ja.json @@ -18331,7 +18331,7 @@ "plugins": { "list": { "PluginsSectionDescription": { - "openWith": "次で開く（編集可能なフィールドにフォーカスがない場合）" + "openWith": "次で開く（Orca のテキストフィールドで入力中を除く）" } }, "pluginInstallCount": { diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json index 268bfacdbe9..7dc3ce1fb5d 100644 --- a/src/renderer/src/i18n/locales/ko.json +++ b/src/renderer/src/i18n/locales/ko.json @@ -18328,7 +18328,7 @@ "plugins": { "list": { "PluginsSectionDescription": { - "openWith": "다음으로 열기 (편집 가능한 필드에 포커스가 없을 때)" + "openWith": "다음으로 열기 (Orca 텍스트 필드에 입력하는 중 제외)" } }, "pluginInstallCount": { diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json index fbb12f430ee..aad055759d2 100644 --- a/src/renderer/src/i18n/locales/pt.json +++ b/src/renderer/src/i18n/locales/pt.json @@ -20430,7 +20430,7 @@ "plugins": { "list": { "PluginsSectionDescription": { - "openWith": "Abrir com (quando o foco não estiver em um campo editável)" + "openWith": "Abrir com (exceto ao digitar em um campo de texto do Orca)" } }, "pluginInstallCount": { diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json index d7f6518197e..d5cf1471ea1 100644 --- a/src/renderer/src/i18n/locales/ru.json +++ b/src/renderer/src/i18n/locales/ru.json @@ -19573,7 +19573,7 @@ "plugins": { "list": { "PluginsSectionDescription": { - "openWith": "Открыть с помощью (если фокус не находится в редактируемом поле)" + "openWith": "Открыть с помощью (кроме ввода в текстовом поле Orca)" } }, "pluginInstallCount": { diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json index eccd93ad3a8..089b0fcdf9a 100644 --- a/src/renderer/src/i18n/locales/tr.json +++ b/src/renderer/src/i18n/locales/tr.json @@ -18989,7 +18989,7 @@ "plugins": { "list": { "PluginsSectionDescription": { - "openWith": "Birlikte aç (odak düzenlenebilir bir alanda değilken)" + "openWith": "Birlikte aç (bir Orca metin alanına yazarken hariç)" } }, "pluginInstallCount": { diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json index 90b60ca6c21..1dd35f815cf 100644 --- a/src/renderer/src/i18n/locales/zh-Hant.json +++ b/src/renderer/src/i18n/locales/zh-Hant.json @@ -18751,7 +18751,7 @@ "plugins": { "list": { "PluginsSectionDescription": { - "openWith": "開啟方式（焦點不在可編輯欄位時）" + "openWith": "開啟方式（在 Orca 文字欄位中輸入時除外）" } }, "pluginInstallCount": { diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json index c62d0c81d31..ddbbfe4d293 100644 --- a/src/renderer/src/i18n/locales/zh.json +++ b/src/renderer/src/i18n/locales/zh.json @@ -18619,7 +18619,7 @@ "plugins": { "list": { "PluginsSectionDescription": { - "openWith": "打开方式（焦点不在可编辑字段中时）" + "openWith": "打开方式（在 Orca 文本字段中输入时除外）" } }, "pluginInstallCount": { From 255e5c21f5e48dc4f2c15fe8ff5df48297a8c997 Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Fri, 13 Nov 2026 20:08:08 +0000 Subject: [PATCH 5/8] feat(native-chat): open a subagent in its own view with its prompt, steps and reply (#42066) * feat(native-chat): open each subagent in its own view inside the chat pane Clicking a roster entry, an agent in the agents strip or a subagent row in the sidebar now opens that subagent's own rows in the chat pane, with a bar to switch between agents and a status bar with its state, Stop and the way back in place of the composer. Subagent rows are no longer inlined in the main transcript, which stays mounted underneath so going back keeps the reader's place. The inline-section machinery is removed. * fix(native-chat): close a subagent's hover preview when its view opens, and name the strip's open action An open preview stayed over the subagent's view after its roster row was hidden, and took the view's first Esc. The agents strip's label now says it opens the agent rather than showing it in the conversation. * feat(native-chat): show what the main agent asked a subagent and its reply in the subagent's view A subagent's view now opens with the prompt the main agent gave it, folded past a few lines, and ends with its final reply once it settles. Claude's prompt and reply come from the Agent call its run names; Codex's prompt comes from the spawn call naming the child, and its reply is already its last own message. * chore: drop the deleted delegation file from the node tsconfig and record the removed compiler bailout * fix(native-chat): subagent view UX round: focus, endings, nested path, status glyphs Going back hands focus to the entry or strip row that opened the view, else the composer. Only a completed subagent ends with a reply; a failed one shows its error and a stopped one says it stopped. Nested subagents get their spawn path as a breadcrumb, and Back and Esc go to the parent. Every surface uses the agents strip's status glyph, states lead capitalised and tokens carry their unit, entries show that they open, the switcher marks the current agent and numbers unnamed ones, and the status bar fits narrow panes. * fix(native-chat): switch subagents from the switcher by pointer, and open no preview on handed-back focus The switcher's modal-less menu closed on pointerdown before the item could take the click; it is modal now. Focus handed back to a roster entry after a pointer Back no longer pops its hover preview; keyboard focus and hover still do. * fix(native-chat): fit the subagent view to main's tool-run provider, install slot and exhaustive state switch * fix(native-chat): keep a subagent's full reply when its last message is only the start of it * fix(native-chat): translate the subagent back label with useTranslate so it follows the language --- config/tsconfig.node.json | 1 - .../native-chat/NativeChatMessageList.tsx | 99 ++++---- .../native-chat/NativeChatResolvedView.tsx | 31 +-- .../NativeChatStructuredSession.tsx | 85 ++++--- .../native-chat-response-actions-hang.ts | 9 +- .../slots/native-chat-timed-rows.ts | 2 +- .../slots/native-chat-transcript-input.ts | 9 +- .../native-chat-transcript-slot-selection.ts | 4 +- .../slots/native-chat-transcript-slots.ts | 92 ++++---- .../use-native-chat-transcript-row-context.ts | 6 +- .../slots/use-native-chat-transcript-slots.ts | 9 +- .../native-chat-side-chat-fork-point.ts | 2 +- .../actions/use-native-chat-reveal-latest.ts | 12 +- .../rows/NativeChatAssistantMessageRow.tsx | 5 +- .../messages/rows/NativeChatMessageRow.tsx | 11 +- .../messages/rows/NativeChatTranscriptRow.tsx | 46 ++-- .../subagents/NativeChatSubagentHead.tsx | 48 ++++ .../NativeChatSubagentPrompt.fixture.tsx | 33 +++ .../subagents/NativeChatSubagentPrompt.tsx | 35 +++ .../NativeChatSubagentRun.fixture.tsx | 4 +- .../subagents/NativeChatSubagentRun.tsx | 176 +++++++------- .../NativeChatSubagentSectionHead.tsx | 43 ---- .../NativeChatSubagentStatusBar.fixture.tsx | 59 +++++ .../subagents/NativeChatSubagentStatusBar.tsx | 161 +++++++++++++ .../NativeChatSubagentStatusIcon.tsx | 21 ++ .../NativeChatSubagentTranscripts.tsx | 123 ++++++++++ .../NativeChatSubagentViewBar.fixture.tsx | 76 ++++++ .../subagents/NativeChatSubagentViewBar.tsx | 144 ++++++++++++ .../subagents/native-chat-open-subagent.ts | 83 +++++++ .../native-chat-subagent-delegation.ts | 87 ------- .../native-chat-subagent-ending.test.ts | 64 ++++++ .../subagents/native-chat-subagent-ending.ts | 97 ++++++++ .../native-chat-subagent-group-words-text.ts | 22 ++ ...-chat-subagent-handoff-copy-budget.test.ts | 137 ----------- .../native-chat-subagent-handoff.test.ts | 79 +++++++ .../subagents/native-chat-subagent-handoff.ts | 101 ++++++++ .../subagents/native-chat-subagent-history.ts | 49 ++++ .../native-chat-subagent-live-frontier.ts | 169 -------------- .../subagents/native-chat-subagent-reveal.ts | 142 ------------ .../subagents/native-chat-subagent-scope.ts | 149 ++++++++++++ .../native-chat-subagent-section-slots.ts | 201 ---------------- .../native-chat-subagent-sections.ts | 216 ------------------ ...ative-chat-subagent-switcher-items.test.ts | 39 ++++ .../native-chat-subagent-switcher-items.ts | 47 ++++ .../use-native-chat-subagent-scope.tsx | 197 ++++++++++++++++ .../use-native-chat-subagent-sections.ts | 81 ------- .../use-structured-native-chat-subagents.tsx | 67 ++++++ ...tiveChatStructuredSession.test-harness.tsx | 3 +- .../tools/diffs/use-native-chat-turn-diffs.ts | 14 +- ...e-native-chat-turn-opened-pull-requests.ts | 2 +- .../tools/runs/NativeChatToolRun.tsx | 22 +- .../runs/native-chat-transcript-work-runs.ts | 20 +- .../NativeChatBackgroundTasksStatus.test.tsx | 2 +- .../tasks/NativeChatBackgroundTasksStatus.tsx | 37 ++- ...NativeChatStructuredSessionStatus.test.tsx | 19 +- .../NativeChatStructuredSessionStatus.tsx | 126 ++-------- .../tools/tasks/background-task-roster.ts | 15 ++ .../tasks/use-structured-session-task-stop.ts | 96 ++++++++ .../use-native-chat-history-jump.ts | 39 +--- .../use-native-chat-transcript-navigation.ts | 94 +++----- .../new-rows/native-chat-new-rows-marker.ts | 2 +- .../rail/native-chat-message-rail-items.ts | 3 +- .../native-chat-row-height-estimate.ts | 11 +- src/renderer/src/i18n/locales/de.json | 3 +- src/renderer/src/i18n/locales/en.json | 22 +- src/renderer/src/i18n/locales/es.json | 3 +- src/renderer/src/i18n/locales/fr.json | 3 +- src/renderer/src/i18n/locales/ja.json | 3 +- src/renderer/src/i18n/locales/ko.json | 3 +- src/renderer/src/i18n/locales/pt.json | 3 +- src/renderer/src/i18n/locales/ru.json | 3 +- src/renderer/src/i18n/locales/tr.json | 3 +- src/renderer/src/i18n/locales/zh-Hant.json | 3 +- src/renderer/src/i18n/locales/zh.json | 3 +- .../navigation/claude-agent-row-view.test.ts | 30 +++ .../navigation/claude-agent-row-view.ts | 11 +- .../transcript/native-chat-subagent-items.ts | 30 ++- 77 files changed, 2300 insertions(+), 1701 deletions(-) create mode 100644 src/renderer/src/components/native-chat/subagents/NativeChatSubagentHead.tsx create mode 100644 src/renderer/src/components/native-chat/subagents/NativeChatSubagentPrompt.fixture.tsx create mode 100644 src/renderer/src/components/native-chat/subagents/NativeChatSubagentPrompt.tsx delete mode 100644 src/renderer/src/components/native-chat/subagents/NativeChatSubagentSectionHead.tsx create mode 100644 src/renderer/src/components/native-chat/subagents/NativeChatSubagentStatusBar.fixture.tsx create mode 100644 src/renderer/src/components/native-chat/subagents/NativeChatSubagentStatusBar.tsx create mode 100644 src/renderer/src/components/native-chat/subagents/NativeChatSubagentStatusIcon.tsx create mode 100644 src/renderer/src/components/native-chat/subagents/NativeChatSubagentTranscripts.tsx create mode 100644 src/renderer/src/components/native-chat/subagents/NativeChatSubagentViewBar.fixture.tsx create mode 100644 src/renderer/src/components/native-chat/subagents/NativeChatSubagentViewBar.tsx create mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-open-subagent.ts delete mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-delegation.ts create mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-ending.test.ts create mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-ending.ts delete mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-handoff-copy-budget.test.ts create mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-handoff.test.ts create mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-handoff.ts create mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-history.ts delete mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-live-frontier.ts delete mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-reveal.ts create mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-scope.ts delete mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-section-slots.ts delete mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-sections.ts create mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-switcher-items.test.ts create mode 100644 src/renderer/src/components/native-chat/subagents/native-chat-subagent-switcher-items.ts create mode 100644 src/renderer/src/components/native-chat/subagents/use-native-chat-subagent-scope.tsx delete mode 100644 src/renderer/src/components/native-chat/subagents/use-native-chat-subagent-sections.ts create mode 100644 src/renderer/src/components/native-chat/subagents/use-structured-native-chat-subagents.tsx create mode 100644 src/renderer/src/components/native-chat/tools/tasks/use-structured-session-task-stop.ts create mode 100644 src/renderer/src/lib/agent-session/navigation/claude-agent-row-view.test.ts diff --git a/config/tsconfig.node.json b/config/tsconfig.node.json index 86dad6f7d38..f9503dd05e3 100644 --- a/config/tsconfig.node.json +++ b/config/tsconfig.node.json @@ -26,7 +26,6 @@ "../src/renderer/src/runtime/repo-hooks/orca-hook-trust.ts", "../src/renderer/src/components/native-chat/native-chat-resolution-receipt.ts", "../src/renderer/src/components/native-chat/structured-agent-question-projection.ts", - "../src/renderer/src/components/native-chat/subagents/native-chat-subagent-delegation.ts", "../src/renderer/src/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends.ts", "../src/renderer/src/components/native-chat/queue/structured-agent-session-queue-request.ts", "../src/renderer/src/components/native-chat/native-chat-composer-primary-action.ts", diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.tsx index 91f07967fda..b2e63de3882 100644 --- a/src/renderer/src/components/native-chat/NativeChatMessageList.tsx +++ b/src/renderer/src/components/native-chat/NativeChatMessageList.tsx @@ -9,7 +9,6 @@ import { useNativeChatNewRowsMarker } from './viewport/new-rows/native-chat-new- import { withoutPullRequestEventRows } from '../../../../shared/native-chat/native-chat-pull-request-event' import { useNativeChatRowTypography } from './viewport/virtualization/use-native-chat-row-typography' import { useCallback, useMemo, useRef, useState } from 'react' -import { useTranslate } from '@/i18n/use-translate' import { useAppStore } from '@/store' import { nativeChatShowsCiResultLines, @@ -41,9 +40,11 @@ import { useNativeChatTranscriptSlots } from './conversation/slots/use-native-ch import type { NativeChatTimedRow } from './conversation/slots/native-chat-timed-rows' import { useNativeChatTranscriptWindow } from './viewport/virtualization/use-native-chat-transcript-window' import { useNativeChatHistoryRetention } from './viewport/history/use-native-chat-history-retention' -import { useNativeChatSubagentSections } from './subagents/use-native-chat-subagent-sections' +import { useNativeChatSubagentScope } from './subagents/use-native-chat-subagent-scope' +import type { NativeChatSubagentView } from './subagents/native-chat-open-subagent' +import type { StructuredAgentSubagentRoster } from '../../../../shared/agent-session/view/structured-agent-session-subagent-roster' +import type { NativeChatTranscriptSlot } from './conversation/slots/native-chat-transcript-slots' import { toggleNativeChatExpandedKey } from './messages/disclosure/native-chat-expanded-keys' -import { useNativeChatTurnMembership } from './conversation/slots/use-native-chat-turn-membership' import { useNativeChatSideChatForkOffer, useNativeChatSideChatForkPointReport @@ -75,6 +76,8 @@ import { NativeChatPullRequestChangeContext } from './tools/pull-requests/Native import { transcriptTailRow } from './conversation/slots/native-chat-transcript-tail-row' import type { NativeChatAwaitingInput } from '../../../../shared/native-chat/native-chat-terminal-turn' +const NO_SLOTS: readonly NativeChatTranscriptSlot[] = [] + export function NativeChatMessageList({ ref, session, @@ -83,6 +86,7 @@ export function NativeChatMessageList({ journalLatestTurn: latestTurn, journalHostWork: hostWork, subagentRoster, + subagentView, railOutline = null, isVisible = true, isWorking, @@ -108,7 +112,9 @@ export function NativeChatMessageList({ /** The host's prompts still waiting on the person and its working answer (an older host: none). */ journalHostWork?: StructuredAgentSessionHostWork /** Every subagent the session's rosters named, whether or not its roster row is loaded. */ - subagentRoster?: Parameters[2] + subagentRoster?: StructuredAgentSubagentRoster + /** The subagent shown in place of the conversation (its own rows, no turns), and how to open one. */ + subagentView?: NativeChatSubagentView /** User messages older than the loaded window, from the host's outline. */ railOutline?: readonly NativeChatRailOutlineEntry[] | null isVisible?: boolean @@ -128,7 +134,6 @@ export function NativeChatMessageList({ stopping?: boolean runtimeContext?: RuntimeFileOperationArgs | null }): React.JSX.Element { - const t = useTranslate() const receipts = useNativeChatQuestionReceipts(journalItems) const scrollRef = useRef(null) const contentRef = useRef(null) @@ -145,34 +150,28 @@ export function NativeChatMessageList({ root: contentRef, sourceKey: `${session.agent}:${session.sessionId}` }) - // Pending/failed reads cannot page; recovery remounts the sentinel to recheck its range. - const showOlderHistory = hasMore && session.readPhase === 'ready' - const { messages, subagentRows } = useNativeChatTranscriptProjection( + const { messages: conversation, subagentRows } = useNativeChatTranscriptProjection( session, journalItems, journalSubmissions, latestTurn ) - const { - sections: subagentSections, - subagentRowsInOrder, - subagentChoices, - subagentDisclosure, - openSubagentSections - } = useNativeChatSubagentSections(messages, subagentRows, subagentRoster) - // Folded subagent rows stay loaded, so a reopened reply keeps its reveal. - const loadedMessageIds = useMemo( - () => new Set([...messages.map(({ id }) => id), ...subagentSections.pathOf.keys()]), - [messages, subagentSections] - ) - const taskListPredecessors = useMemo(() => nativeChatTaskListPredecessors(messages), [messages]) - const turnRows = useNativeChatTurnMembership( - messages, + const scope = useNativeChatSubagentScope({ + view: subagentView, + conversation, + subagentRows, + roster: subagentRoster, journalItems, journalSubmissions, - latestTurn - ) + latestTurn, + isWorking + }) + const { agentId: subagentId, messages, turnRows, working, rowsInOrder } = scope + // Pending/failed reads cannot page; recovery remounts the sentinel to recheck its range. + const showOlderHistory = hasMore && session.readPhase === 'ready' && scope.pagesHistory + const loadedMessageIds = useMemo(() => new Set(messages.map(({ id }) => id)), [messages]) + const taskListPredecessors = useMemo(() => nativeChatTaskListPredecessors(messages), [messages]) const { liveTurnKey } = turnRows const showCiResultLines = useAppStore((state) => nativeChatShowsCiResultLines(state.settings)) // Hidden lines leave the transcript entirely, so they reserve no row or gap. @@ -182,28 +181,27 @@ export function NativeChatMessageList({ ) const latestTurnKey = turnKeys.findLast((key) => key !== undefined) const showTurnDiffs = useAppStore((state) => nativeChatShowsTurnDiffSummary(state.settings)) - const turnDiffs = useNativeChatTurnDiffs( - showTurnDiffs ? turnRows : null, - subagentRowsInOrder, - subagentSections.pathOf - ) - const openedPullRequests = useNativeChatTurnOpenedPullRequests(turnRows, subagentRowsInOrder) + const turns = scope.conversationTurns + const turnDiffs = useNativeChatTurnDiffs(showTurnDiffs ? turns : null, rowsInOrder) + const openedPullRequests = useNativeChatTurnOpenedPullRequests(turns, rowsInOrder) // Only real tail reasoning counts as thinking; an in-flight request with no output does not. const thinking = useMemo( - () => isStructuredAgentSessionThinking({ items: journalItems ?? [], latestTurn }), - [journalItems, latestTurn] + () => + subagentId === null && + isStructuredAgentSessionThinking({ items: journalItems ?? [], latestTurn }), + [journalItems, latestTurn, subagentId] ) const turnStatuses = useNativeChatTurnStatus({ turnKeys, liveTurnKey, - isWorking, + isWorking: working, workingStartedAt, settledTurns, thinking }) // Only unshown prompts need a waiting tail row; prompt cards explain their own wait. - const tailRow = transcriptTailRow(isWorking, awaitingInput) - const lifecycleWorking = session.transcriptLifecycle?.state === 'working' + const tailRow = transcriptTailRow(working, awaitingInput) + const lifecycleWorking = subagentId === null && session.transcriptLifecycle?.state === 'working' const { measureContent, typography } = useNativeChatRowTypography(contentRef) const forkOffer = useNativeChatSideChatForkOffer(latestTurnKey) const transcript = useNativeChatTranscriptSlots({ @@ -217,10 +215,9 @@ export function NativeChatMessageList({ turnDiffs, openedPullRequests: openedPullRequests.byTurn, expandedTurnKeys: expandedTurnIds, - isWorking, + isWorking: working, lifecycleWorking, - subagentSections, - subagentChoices, + subagentHeads: scope.heads, forkOffer, line: { tailRow, @@ -243,7 +240,7 @@ export function NativeChatMessageList({ ), [allSlots, journalItems, stopping, journalSubmissions, latestTurn, hostWork] ) - const navigationRequest = useNativeChatNavigationRequest(slots, messages, subagentSections) + const navigationRequest = useNativeChatNavigationRequest(slots) const newRows = useNativeChatNewRowsMarker( slots, waitingSlots, @@ -262,7 +259,7 @@ export function NativeChatMessageList({ scrollRef, contentRef, itemCount: slots.length, - isWorking, + isWorking: working, showsTailRow: tailRow !== null, isVisible, alignToViewportTop: transcriptWindow.alignToViewportTop, @@ -289,7 +286,8 @@ export function NativeChatMessageList({ }) const rail = useNativeChatMessageRail({ scrollRef, - slots, + // The rail outlines the conversation's prompts; a subagent's view has none. + slots: subagentId === null ? slots : NO_SLOTS, turnRows, virtualItems: transcriptWindow.virtualItems, outline: railOutline @@ -298,15 +296,15 @@ export function NativeChatMessageList({ request: navigationRequest, rail, slots, - conversation: messages, - sections: subagentSections, + conversation, + subagentRows, roster: subagentRoster, journalItems, - openSubagentSections, - subagentDisclosure, + subagentId, sessionKey: `${session.agent}:${session.sessionId}`, isVisible, loadEarlier, + holdHistory: historyRetention.leaveEnd, scrollRef, scrollMessageToTop, readerLeavesEnd, @@ -339,8 +337,7 @@ export function NativeChatMessageList({ scrollToBottom, onSent: newRows.dismiss, revealFindMatch: readerInput.revealFindMatch, - slots: allSlots, - revealSubagent: navigation.revealSubagent + slots: allSlots }) const rowContext = useNativeChatTranscriptRowContext({ @@ -355,7 +352,7 @@ export function NativeChatMessageList({ deliveryNotices, runtimeContext, onToggleExpandedTurn: toggleExpandedTurn, - subagentDisclosure, + onOpenSubagent: scope.open, onScrollMessageToTop: scrollMessageToTop, onRevealDiff: navigation.revealDiff }) @@ -364,6 +361,7 @@ export function NativeChatMessageList({
+ {scope.bar}
@@ -389,6 +387,7 @@ export function NativeChatMessageList({ // Shares the composer's maximum width; rail clearance and the 5px inner inset narrow constrained panes. className={NATIVE_CHAT_TRANSCRIPT_COLUMN_CLASS} > + {scope.lead} closeNativeChatSubagentOnEscape(event, paneKey)} onContextMenuCapture={contextMenu.onContextMenuCapture} className={cn( NATIVE_CHAT_APPEARANCE_ROOT_CLASS, @@ -350,19 +351,19 @@ export function NativeChatResolvedView({ ) : viewState.kind === 'empty' ? ( ) : ( - - - + )} {/* A collapsed card stays mounted but hidden, so a partly answered question survives. */} diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx index 2ee97beb567..126e8c16ce1 100644 --- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx +++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx @@ -19,8 +19,8 @@ import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/dr import { NativeChatEmptyState } from '@/components/native-chat/host-access/NativeChatEmptyState' import { NativeChatEmptyPane } from '@/components/native-chat/host-access/NativeChatEmptyPane' import { NativeChatLoadingCue } from '@/components/native-chat/host-access/NativeChatLoadingCue' -import { NativeChatMessageList } from '@/components/native-chat/NativeChatMessageList' -import { NativeChatToolRunWindowProvider } from '@/components/native-chat/tools/runs/native-chat-tool-run-window-context' +import { NativeChatSubagentTranscripts } from '@/components/native-chat/subagents/NativeChatSubagentTranscripts' +import { useStructuredNativeChatSubagents } from '@/components/native-chat/subagents/use-structured-native-chat-subagents' import { NativeChatContextClearFade } from '@/components/native-chat/conversation/projection/NativeChatContextClearFade' import { useStructuredNativeChatSubmitReveal } from '@/components/native-chat/pane/actions/use-structured-native-chat-submit-reveal' import { useStructuredPromptResponseHold } from '@/components/native-chat/prompts/use-structured-prompt-response-hold' @@ -44,7 +44,6 @@ import { useStructuredAgentSession } from '@/components/native-chat/session/stru import { useNativeChatImageRuntimeContext } from '@/components/native-chat/media/images/native-chat-image-runtime-context' import { useStructuredNativeChatPaneCommands } from '@/components/native-chat/pane/actions/use-structured-native-chat-pane-commands' import type { NativeChatStructuredViewProps } from '@/components/native-chat/native-chat-view-types' -import { NativeChatStructuredSessionStatus } from '@/components/native-chat/tools/tasks/NativeChatStructuredSessionStatus' import { useNativeChatInterruptedContinuation } from '@/components/native-chat/usage/NativeChatInterruptedContinue' import { NativeChatPromptSlotNotices } from '@/components/native-chat/composer/controls/NativeChatComposerNotices' import { @@ -189,7 +188,11 @@ export function NativeChatStructuredSession(props: Omit - - - {(timedRows) => ( - - )} - - + + {(timedRows) => ( + + )} + @@ -350,20 +354,14 @@ export function NativeChatStructuredSession(props: Omit - + {subagents.strip} {/* Workers' open prompts stay pinned here, above this chat's own prompt. */} - {prompt ? null : ( + {prompt || subagentOpen ? null : ( )} - {composerShown ? null : } + {composerShown || subagentOpen ? null : } {nativeChatStructuredAsyncQuestion(props, controller, session, transport, submits)} {composerShown && } + {subagents.statusBar} {composerShown ? ( - slot.kind === 'message' && slot.depth === 0 && slot.message.timestamp !== null + slot.kind === 'message' && slot.message.timestamp !== null ? [{ id: slot.message.id, at: slot.message.timestamp }] : [] ) diff --git a/src/renderer/src/components/native-chat/conversation/slots/native-chat-transcript-input.ts b/src/renderer/src/components/native-chat/conversation/slots/native-chat-transcript-input.ts index 91efb9c108a..1f70971fa76 100644 --- a/src/renderer/src/components/native-chat/conversation/slots/native-chat-transcript-input.ts +++ b/src/renderer/src/components/native-chat/conversation/slots/native-chat-transcript-input.ts @@ -5,10 +5,7 @@ import type { NativeChatTurnDiff } from '../../../../../../shared/native-chat/to import type { NativeChatOpenedPullRequest } from '../../../../../../shared/native-chat/tools/native-chat-opened-pull-requests' import type { NativeChatRowTypography } from '../../viewport/virtualization/native-chat-row-height-estimate' import type { NativeChatSideChatForkOffer } from '../../messages/actions/native-chat-side-chat-fork-point' -import type { - NativeChatSubagentChoices, - NativeChatSubagentSections -} from '../../subagents/native-chat-subagent-sections' +import type { NativeChatSubagentHead } from '../../subagents/native-chat-subagent-scope' import type { NativeChatMarkdownImageSources } from '../../../../../../shared/native-chat/transcript/native-chat-generated-image-answers' @@ -34,8 +31,8 @@ export type NativeChatTranscriptSlotsInput = { lifecycleWorking: boolean /** Only where `/btw` listens: find the newest response that offers Fork. */ forkOffer?: NativeChatSideChatForkOffer - subagentSections?: NativeChatSubagentSections - subagentChoices?: NativeChatSubagentChoices + /** Subagents no roster row in this transcript names, each drawn as a head at its first row. */ + subagentHeads?: readonly NativeChatSubagentHead[] /** The open reasoning block the live activity line discloses: its row takes no slot meanwhile. */ liveReasoningId?: string | null } diff --git a/src/renderer/src/components/native-chat/conversation/slots/native-chat-transcript-slot-selection.ts b/src/renderer/src/components/native-chat/conversation/slots/native-chat-transcript-slot-selection.ts index 1c66b2ececd..e43e5fff5df 100644 --- a/src/renderer/src/components/native-chat/conversation/slots/native-chat-transcript-slot-selection.ts +++ b/src/renderer/src/components/native-chat/conversation/slots/native-chat-transcript-slot-selection.ts @@ -10,9 +10,7 @@ export function nativeChatSlotKey(slot: NativeChatTranscriptSlot): string { case 'message': return slot.message.id case 'subagent': - return `subagent-section:${slot.agentId}` - case 'subagent-entries': - return `subagent-entries:${slot.rosterRowId}:${slot.agents[0]?.id}` + return `subagent-head:${slot.agentId}` } } diff --git a/src/renderer/src/components/native-chat/conversation/slots/native-chat-transcript-slots.ts b/src/renderer/src/components/native-chat/conversation/slots/native-chat-transcript-slots.ts index 170731386b1..57c11686826 100644 --- a/src/renderer/src/components/native-chat/conversation/slots/native-chat-transcript-slots.ts +++ b/src/renderer/src/components/native-chat/conversation/slots/native-chat-transcript-slots.ts @@ -1,6 +1,9 @@ // Count only rendered rows: virtualized entries reserve height even when React would render null. -import type { NativeChatMessage } from '../../../../../../shared/native-chat/native-chat-types' +import type { + NativeChatMessage, + NativeChatSubagentEntry +} from '../../../../../../shared/native-chat/native-chat-types' import type { NativeChatTurnStatus } from '../../../../../../shared/native-chat/transcript/native-chat-turn-status' import { isNativeChatRowInLiveWorkingTurn } from '../../../../../../shared/native-chat/transcript/native-chat-live-turn-membership' import { nativeChatTurnBarRows } from '../../../../../../shared/native-chat/transcript/native-chat-turn-grouping' @@ -13,22 +16,14 @@ import { nativeChatGeneratedImageAnswers } from '../../../../../../shared/native import { nativeChatMarkdownImageSources } from '../../markdown/native-chat-markdown-image-sources' import { estimateNativeChatRowHeight, - nativeChatRowContentMetrics + nativeChatRowContentMetrics, + NATIVE_CHAT_SUBAGENT_HEAD_PX } from '../../viewport/virtualization/native-chat-row-height-estimate' import type { NativeChatResolvedPrompt } from '../../../../../../shared/native-chat/native-chat-resolution-receipt' import type { NativeChatTurnDiff } from '../../../../../../shared/native-chat/tools/native-chat-turn-diffs' import type { NativeChatOpenedPullRequest } from '../../../../../../shared/native-chat/tools/native-chat-opened-pull-requests' -import { - NO_NATIVE_CHAT_SUBAGENT_CHOICES, - NO_NATIVE_CHAT_SUBAGENT_SECTIONS, - type NativeChatSubagentRosterState -} from '../../subagents/native-chat-subagent-sections' -import { nativeChatSubagentLiveSections } from '../../subagents/native-chat-subagent-live-frontier' -import { - nativeChatSubagentSectionSlots, - type NativeChatSubagentEntriesSlot, - type NativeChatSubagentSectionSlot -} from '../../subagents/native-chat-subagent-section-slots' +import type { NativeChatSubagentHead } from '../../subagents/native-chat-subagent-scope' +import { compareNativeChatDisplayMessages as compareMessages } from '../../../../../../shared/native-chat/transcript/native-chat-message-order' import { isGeneratedImageOperation } from '../../../../../../shared/native-chat/native-chat-generated-image' import { nativeChatRowRendersProse, @@ -49,10 +44,18 @@ import { import { markNativeChatResponseActionsHang } from './native-chat-response-actions-hang' import type { Translate } from '../../../../i18n/use-translate' -export type NativeChatTranscriptSlot = - | NativeChatMessageSlot - | NativeChatSubagentSectionSlot - | NativeChatSubagentEntriesSlot +export type NativeChatTranscriptSlot = NativeChatMessageSlot | NativeChatSubagentHeadSlot + +/** Opens a subagent no loaded roster row names, at its first row. */ +export type NativeChatSubagentHeadSlot = { + kind: 'subagent' + agentId: string + /** The conversation turn the head sits in, so the outline rail can place it. */ + turnKey: string | undefined + /** The roster's entry for the agent; absent when no roster names it. */ + entry: NativeChatSubagentEntry | undefined + estimatedHeight: number +} export type NativeChatMessageSlot = { kind: 'message' @@ -77,28 +80,25 @@ export type NativeChatMessageSlot = { /** The agent's next row in the same turn follows directly, so the two sit close. */ continuesTurn?: boolean /** In a turn: whether this row holds its response actions, even when tools or thoughts follow: - * the last drawn response with words, else the last with images. Absent outside a turn and in - * subagent sections. */ + * the last drawn response with words, else the last with images. Absent outside a turn. */ endsResponse?: boolean /** This response is the newest one in the conversation. */ latestResponse?: boolean /** Response controls under this row may hang into the gap below it: the row draws nothing after * its message, and what follows is the person's own right-aligned bubble or nothing. Absent when * something left-side follows (an agent's card, a notice, a task or subagent row, the turn's bar, - * diff rollup or PR card), where the controls keep their own height, and in subagent sections. */ + * diff rollup or PR card), where the controls keep their own height. */ actionsHang?: boolean turnDiff: NativeChatTurnDiff | undefined /** Pull requests this row's turn opened, drawn after it. */ openedPullRequests?: readonly NativeChatOpenedPullRequest[] - /** A closed roster list hides child sections regardless of their individual expansion state. */ - subagentRoster: NativeChatSubagentRosterState | undefined - /** Subagent sections this row sits inside; 0 is the conversation. */ - depth: number estimatedHeight: number /** Members of an unbroken work run, with message as its head. */ workRun?: readonly NativeChatMessage[] } +const NO_SUBAGENT_HEADS: readonly NativeChatSubagentHead[] = [] + export function buildNativeChatTranscriptSlots( input: NativeChatTranscriptSlotsInput, t?: Translate @@ -128,8 +128,7 @@ export function buildNativeChatTranscript( expandedTurnKeys, isWorking, lifecycleWorking, - subagentSections: sections = NO_NATIVE_CHAT_SUBAGENT_SECTIONS, - subagentChoices: choices = NO_NATIVE_CHAT_SUBAGENT_CHOICES, + subagentHeads = NO_SUBAGENT_HEADS, liveReasoningId = null, forkOffer } = input @@ -166,18 +165,25 @@ export function buildNativeChatTranscript( } }) const slots: NativeChatTranscriptSlot[] = [] - const live = nativeChatSubagentLiveSections(messages, sections, isWorking || lifecycleWorking) - const sectionSlots = nativeChatSubagentSectionSlots({ - sections, - choices, - live, - receipts, - slots, - typography - }) - const pending = [...(sections.openAt.get(null) ?? [])] + let nextHead = 0 + /** Heads whose first row comes before `message`; undefined flushes the rest. */ + const pushHeadsBefore = (message: NativeChatMessage | undefined): void => { + for (; nextHead < subagentHeads.length; nextHead += 1) { + const head = subagentHeads[nextHead]! + if (message !== undefined && compareMessages(head.first.message, message) >= 0) { + return + } + slots.push({ + kind: 'subagent', + agentId: head.agentId, + turnKey: head.first.turnKey, + entry: head.entry, + estimatedHeight: NATIVE_CHAT_SUBAGENT_HEAD_PX * (typography?.spacingScale ?? 1) + }) + } + } for (const [index, message] of messages.entries()) { - sectionSlots.openBefore(pending, message, 0) + pushHeadsBefore(message) const turnKey = turnKeys[index] const receipt = receipts.get(message.id) const bar = turnKey === undefined ? undefined : bars.get(turnKey) @@ -204,7 +210,6 @@ export function buildNativeChatTranscript( (!folded && (message.agentStart || nativeChatRowRendersContent(message.blocks)) && message.id !== liveReasoningId) - const roster = sectionSlots.rosterAt(message.id) if ( drawsRow || status !== undefined || @@ -225,8 +230,6 @@ export function buildNativeChatTranscript( turnFolds: turnKey !== undefined && foldableTurnKeys.has(turnKey), turnDiff, openedPullRequests, - subagentRoster: roster, - depth: 0, estimatedHeight: estimateNativeChatRowHeight( nativeChatRowContentMetrics(message, typography), { @@ -241,9 +244,8 @@ export function buildNativeChatTranscript( ) }) } - sectionSlots.openAnchoredAt(message, roster, turnKey) } - sectionSlots.openBefore(pending, undefined, 0) + pushHeadsBefore(undefined) const drawn = nativeChatTranscriptWorkRuns(slots, typography) // One action holder per turn: its last drawn response with words, else (when folding hid them) // its last drawn image response. Tools and thoughts never hold them. @@ -251,7 +253,7 @@ export function buildNativeChatTranscript( const lastImageByTurn = new Map() let newestOffered: NativeChatMessageSlot | undefined for (const slot of drawn) { - if (slot.kind !== 'message' || slot.depth !== 0) { + if (slot.kind !== 'message') { continue } if (forkOffer && nativeChatSlotOffersFork(slot, forkOffer)) { @@ -284,7 +286,6 @@ export function buildNativeChatTranscript( const latestResponse = drawn.findLast( (slot) => slot.kind === 'message' && - slot.depth === 0 && slot.drawsMessage && !slot.receipt && slot.message.role === 'assistant' && @@ -300,9 +301,6 @@ export function buildNativeChatTranscript( if ( slot.kind === 'message' && next.kind === 'message' && - // A subagent's section keeps the transcript's gap as part of its frame. - slot.depth === 0 && - next.depth === 0 && slot.turnKey !== undefined && next.turnKey === slot.turnKey && // The agent's own next step, not a notice or task row that trails its answer. diff --git a/src/renderer/src/components/native-chat/conversation/slots/use-native-chat-transcript-row-context.ts b/src/renderer/src/components/native-chat/conversation/slots/use-native-chat-transcript-row-context.ts index 012a58dbf12..1e112c2f917 100644 --- a/src/renderer/src/components/native-chat/conversation/slots/use-native-chat-transcript-row-context.ts +++ b/src/renderer/src/components/native-chat/conversation/slots/use-native-chat-transcript-row-context.ts @@ -24,7 +24,7 @@ export function useNativeChatTranscriptRowContext({ runtimeContext, structuredAttachments, onToggleExpandedTurn, - subagentDisclosure, + onOpenSubagent, onScrollMessageToTop, onRevealDiff }: NativeChatTranscriptRowContextInput): NativeChatTranscriptRowContext { @@ -41,7 +41,7 @@ export function useNativeChatTranscriptRowContext({ runtimeContext, structuredAttachments, onToggleExpandedTurn, - subagentDisclosure, + onOpenSubagent, onScrollMessageToTop, onRevealDiff }), @@ -58,7 +58,7 @@ export function useNativeChatTranscriptRowContext({ structuredAttachments, onScrollMessageToTop, taskListPredecessors, - subagentDisclosure, + onOpenSubagent, onToggleExpandedTurn ] ) diff --git a/src/renderer/src/components/native-chat/conversation/slots/use-native-chat-transcript-slots.ts b/src/renderer/src/components/native-chat/conversation/slots/use-native-chat-transcript-slots.ts index 92bb31c8821..cbd124834d2 100644 --- a/src/renderer/src/components/native-chat/conversation/slots/use-native-chat-transcript-slots.ts +++ b/src/renderer/src/components/native-chat/conversation/slots/use-native-chat-transcript-slots.ts @@ -50,8 +50,7 @@ export function useNativeChatTranscriptSlots({ expandedTurnKeys, isWorking, lifecycleWorking, - subagentSections, - subagentChoices, + subagentHeads, forkOffer } = input const { tailRow, thinking, stopping = false, activityText } = line @@ -102,8 +101,7 @@ export function useNativeChatTranscriptSlots({ expandedTurnKeys, isWorking, lifecycleWorking, - subagentSections, - subagentChoices, + subagentHeads, liveReasoningId, forkOffer }), @@ -118,8 +116,7 @@ export function useNativeChatTranscriptSlots({ messages, openedPullRequests, receipts, - subagentChoices, - subagentSections, + subagentHeads, turnDiffs, turnKeys, turnStatuses, diff --git a/src/renderer/src/components/native-chat/messages/actions/native-chat-side-chat-fork-point.ts b/src/renderer/src/components/native-chat/messages/actions/native-chat-side-chat-fork-point.ts index ef6c6e56698..4d26e3b13b1 100644 --- a/src/renderer/src/components/native-chat/messages/actions/native-chat-side-chat-fork-point.ts +++ b/src/renderer/src/components/native-chat/messages/actions/native-chat-side-chat-fork-point.ts @@ -21,7 +21,7 @@ export function nativeChatSlotOffersFork( return nativeChatRowOffersFork( { message: slot.message, - inSubagentSection: slot.depth > 0, + inSubagentSection: false, turnWorking: slot.activeTurnIsWorking, inLatestTurn: slot.turnKey !== undefined && slot.turnKey === offer.latestTurnKey }, diff --git a/src/renderer/src/components/native-chat/messages/actions/use-native-chat-reveal-latest.ts b/src/renderer/src/components/native-chat/messages/actions/use-native-chat-reveal-latest.ts index 492a8fb14fa..9bd811f738e 100644 --- a/src/renderer/src/components/native-chat/messages/actions/use-native-chat-reveal-latest.ts +++ b/src/renderer/src/components/native-chat/messages/actions/use-native-chat-reveal-latest.ts @@ -60,8 +60,6 @@ export type NativeChatMessageListHandle = { revealFindMatch: (match: Range, bar: DOMRectReadOnly | null) => void /** What the row drawing this message copies from its Copy button; null when none draws it. */ messageCopyText: (messageId: string) => string | null - /** Open a subagent's activity where it sits in the conversation and bring it into view. */ - revealSubagent: (agentId: string) => void } /** This pane's own transcript; an unmounted pane's reveal reaches nothing. */ @@ -97,9 +95,8 @@ export function useNativeChatMessageListHandle( scrollToBottom, onSent, revealFindMatch, - slots, - revealSubagent - }: Pick & { + slots + }: Pick & { beginNavigation: () => void scrollToBottom: (reason: 'send') => void /** The reader answered, whether or not the view moves. */ @@ -124,9 +121,8 @@ export function useNativeChatMessageListHandle( revealLatest, readerAtEnd, revealFindMatch, - messageCopyText: (messageId) => nativeChatSlotCopyText(slots, messageId), - revealSubagent + messageCopyText: (messageId) => nativeChatSlotCopyText(slots, messageId) }), - [readerAtEnd, revealLatest, revealFindMatch, revealSubagent, slots] + [readerAtEnd, revealLatest, revealFindMatch, slots] ) } diff --git a/src/renderer/src/components/native-chat/messages/rows/NativeChatAssistantMessageRow.tsx b/src/renderer/src/components/native-chat/messages/rows/NativeChatAssistantMessageRow.tsx index e709e5008dd..5020d7ff3ec 100644 --- a/src/renderer/src/components/native-chat/messages/rows/NativeChatAssistantMessageRow.tsx +++ b/src/renderer/src/components/native-chat/messages/rows/NativeChatAssistantMessageRow.tsx @@ -54,7 +54,6 @@ export function NativeChatAssistantMessageRow({ endsResponse, latestResponse = true, actionsHang = false, - inSubagentSection = false, runtimeContext, fork } = props @@ -76,7 +75,6 @@ export function NativeChatAssistantMessageRow({ message.role === 'assistant' && message.source === 'transcript' && !message.agentStart && - !inSubagentSection && isRootAgentJournalItem(message) return ( @@ -157,8 +155,7 @@ function toolRunProps( revealedDiff: run ? run.revealedDiff : props.revealedDiff, onRevealDiff: props.onScrollMessageToTop, subagentGroups: content.subagentGroups, - subagentRoster: props.subagentRoster, - subagentDisclosure: props.subagentDisclosure, + onOpenSubagent: props.onOpenSubagent, backgroundTasks: content.backgroundTasks, followsProse: content.markdown.length > 0 || content.hasImages, expandSignal: props.expandSignal, diff --git a/src/renderer/src/components/native-chat/messages/rows/NativeChatMessageRow.tsx b/src/renderer/src/components/native-chat/messages/rows/NativeChatMessageRow.tsx index 0ee81443a4a..3d338bf9b07 100644 --- a/src/renderer/src/components/native-chat/messages/rows/NativeChatMessageRow.tsx +++ b/src/renderer/src/components/native-chat/messages/rows/NativeChatMessageRow.tsx @@ -15,10 +15,6 @@ import { nativeChatNoticeBlock } from '../../../../../../shared/native-chat/nati import { nativeChatMessageRowBlocks } from './native-chat-message-row-words' import { ProviderFrameRow } from '../diagnostics/NativeChatProviderDetails' import type { NativeChatDiffReveal } from '../../../../../../shared/native-chat/tools/native-chat-turn-diffs' -import type { - NativeChatSubagentDisclosure, - NativeChatSubagentRosterState -} from '../../subagents/native-chat-subagent-sections' import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types' import { useNativeChatWorkRun } from '../../tools/runs/use-native-chat-work-run' import { useNativeChatRowNavigation } from '../actions/use-native-chat-row-navigation' @@ -65,11 +61,8 @@ export type MessageRowProps = { /** Align this message's top to the top of the scroll viewport. */ onScrollMessageToTop: (el: HTMLElement) => void deliveryNotice?: NativeChatDeliveryNotice - /** On a roster row: its list's state and the subagents whose rows open below it. */ - subagentRoster?: NativeChatSubagentRosterState - subagentDisclosure?: NativeChatSubagentDisclosure - /** Inside a subagent's section, whose border has to reach past the row's controls. */ - inSubagentSection?: boolean + /** On a roster row: opens one of its subagents in its own view. */ + onOpenSubagent?: (agentId: string) => void structuredAttachments?: boolean runtimeContext?: RuntimeFileOperationArgs | null /** On a user row: discards it and everything after it. */ diff --git a/src/renderer/src/components/native-chat/messages/rows/NativeChatTranscriptRow.tsx b/src/renderer/src/components/native-chat/messages/rows/NativeChatTranscriptRow.tsx index 0b8694affa9..10811057885 100644 --- a/src/renderer/src/components/native-chat/messages/rows/NativeChatTranscriptRow.tsx +++ b/src/renderer/src/components/native-chat/messages/rows/NativeChatTranscriptRow.tsx @@ -6,9 +6,7 @@ import { NativeChatResolutionReceipt } from '../../prompts/NativeChatResolutionR import { NativeChatWorkingStatus } from '../../conversation/turns/NativeChatWorkingStatus' import { NativeChatTurnDiffRollup } from '../../tools/diffs/NativeChatTurnDiffRollup' import { NativeChatOpenedPullRequestCard } from '../../tools/pull-requests/NativeChatOpenedPullRequestCard' -import { NativeChatSubagentSectionHead } from '../../subagents/NativeChatSubagentSectionHead' -import { NativeChatSubagentEntries } from '../../subagents/NativeChatSubagentRun' -import type { NativeChatSubagentDisclosure } from '../../subagents/native-chat-subagent-sections' +import { NativeChatSubagentHead } from '../../subagents/NativeChatSubagentHead' import type { NativeChatTaskListPredecessors } from '../../../../../../shared/native-chat/input/native-chat-task-list-history' import type { NativeChatTranscriptSlot } from '../../conversation/slots/native-chat-transcript-slots' import type { NativeChatTimedRow } from '../../conversation/slots/native-chat-timed-rows' @@ -42,7 +40,8 @@ export type NativeChatTranscriptRowContext = { structuredAttachments?: boolean runtimeContext?: RuntimeFileOperationArgs | null onToggleExpandedTurn: (turnKey: string) => void - subagentDisclosure: NativeChatSubagentDisclosure + /** Opens a subagent's own view; absent where the transcript has none to open. */ + onOpenSubagent?: (agentId: string) => void onScrollMessageToTop: (element: HTMLElement) => void onRevealDiff: (target: NativeChatDiffTarget) => void } @@ -64,30 +63,12 @@ export const NativeChatTranscriptRow = memo(function NativeChatTranscriptRow({ // Offered only on the conversation's own turn-opening prompts (`nativeChatRowOffersRewind`). const rewind = useContext(NativeChatRewindContext) const fork = useContext(NativeChatForkContext) - const sectionClassName = cn( - slot.depth > 0 && 'border-l-2 border-border/60 pl-3', - slot.depth > 1 && 'ml-4' - ) if (slot.kind === 'subagent') { return ( -
- -
- ) - } - if (slot.kind === 'subagent-entries') { - return ( - ) } @@ -116,8 +97,7 @@ export const NativeChatTranscriptRow = memo(function NativeChatTranscriptRow({
{newRowsMarker?.place === 'above-row' ? marker : null} @@ -152,13 +132,15 @@ export const NativeChatTranscriptRow = memo(function NativeChatTranscriptRow({ actionsHang={slot.actionsHang === true && !newRowsMarkerBelow} onScrollMessageToTop={context.onScrollMessageToTop} deliveryNotice={deliveryNotice} - subagentRoster={slot.subagentRoster} - subagentDisclosure={context.subagentDisclosure} - inSubagentSection={slot.depth > 0} + onOpenSubagent={context.onOpenSubagent} runtimeContext={context.runtimeContext} structuredAttachments={context.structuredAttachments} rewind={ - nativeChatRowOffersRewind(message, slot, deliveryNotice !== undefined) && + nativeChatRowOffersRewind( + message, + { depth: 0, turnKey }, + deliveryNotice !== undefined + ) && (!rewind?.eligibleItemIds || rewind.eligibleItemIds.has(message.id)) ? rewind : undefined diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentHead.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentHead.tsx new file mode 100644 index 00000000000..8e0222dab44 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentHead.tsx @@ -0,0 +1,48 @@ +import { Bot, ChevronRight } from 'lucide-react' +import { useTranslate } from '@/i18n/use-translate' +import { normalizeSubagentState } from '../../../../../shared/native-chat/transcript/native-chat-subagent-summary' +import type { NativeChatSubagentEntry } from '../../../../../shared/native-chat/native-chat-types' +import { NativeChatSubagentStatusIcon } from './NativeChatSubagentStatusIcon' + +/** Head for a subagent no loaded roster row names; unnamed agents have no invented label or state. */ +export function NativeChatSubagentHead({ + agentId, + entry, + onOpen +}: { + agentId: string + entry: NativeChatSubagentEntry | undefined + onOpen?: (agentId: string) => void +}): React.JSX.Element { + const t = useTranslate() + const state = entry === undefined ? null : normalizeSubagentState(entry.state) + const content = ( + <> + + {state === null ? null : } + + {entry?.label ?? t('components.native-chat.subagents.unnamed', 'Subagent')} + + + ) + if (!onOpen) { + return ( +
+ {content} +
+ ) + } + return ( + + ) +} diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentPrompt.fixture.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentPrompt.fixture.tsx new file mode 100644 index 00000000000..c42fa017a77 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentPrompt.fixture.tsx @@ -0,0 +1,33 @@ +import { defineFixture } from '../../../component-fixtures/component-fixture' +import { nativeChatAppearanceStyle } from '../appearance/native-chat-appearance-style' +import { NativeChatSubagentPrompt } from './NativeChatSubagentPrompt' + +const short = 'List the files in `src/` and read `src/math.ts`. Report what it exports.' + +const long = [ + 'Audit the auth flow for token refresh bugs.', + '', + '1. Read `src/auth/session.ts` and `src/auth/refresh.ts`.', + '2. Find every place a request retries after a **401**.', + '3. Check whether two refreshes can run at once.', + '4. Note any timer that refreshes before expiry.', + '5. Look for tests that cover a refresh race.', + '6. Do not change any files.', + '7. Reply with a short list of findings, most serious first.', + '8. Include file paths and line numbers for each finding.' +].join('\n') + +function Prompt({ prompt }: { prompt: string }) { + return ( +
+ +
+ ) +} + +export const brief = defineFixture({ width: 640, render: () => }) + +export const folded = defineFixture({ width: 640, render: () => }) diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentPrompt.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentPrompt.tsx new file mode 100644 index 00000000000..3c47d9ed1f3 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentPrompt.tsx @@ -0,0 +1,35 @@ +import { useTranslate } from '@/i18n/use-translate' +import { NativeChatMarkdown } from '../markdown/NativeChatMarkdown' +import { NativeChatCodeBlock } from '../markdown/code/NativeChatCodeBlock' +import { NativeChatUserMessageFold } from '../messages/rows/NativeChatUserMessageFold' + +/** Opens a subagent's view with the task the main agent gave it, folded like a long prompt. */ +export function NativeChatSubagentPrompt({ + agentId, + prompt +}: { + agentId: string + prompt: string +}): React.JSX.Element { + const t = useTranslate() + return ( +
+

+ {t('components.native-chat.subagents.promptFromMain', 'Prompt from main agent')} +

+ + + +
+ ) +} diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentRun.fixture.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentRun.fixture.tsx index fd2881cdd75..64ead5115f3 100644 --- a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentRun.fixture.tsx +++ b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentRun.fixture.tsx @@ -46,7 +46,7 @@ const block: NativeChatSubagentGroupBlock = { function Roster() { return (
- {}} /> + {}} />
) } @@ -61,7 +61,7 @@ export const hovered = defineFixture({ render: () => , interact: async (frame) => { frame - .querySelector('[data-native-chat-subagent-entry="a1"] > div') + .querySelector('[data-native-chat-subagent-entry="a1"] > button') ?.dispatchEvent(new PointerEvent('pointerover', { bubbles: true, pointerType: 'mouse' })) await new Promise((resolve) => setTimeout(resolve, 500)) } diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentRun.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentRun.tsx index aba13b19bc6..ada9f47a1d9 100644 --- a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentRun.tsx +++ b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentRun.tsx @@ -1,6 +1,7 @@ -import { useState } from 'react' +import { useId, useRef, useState } from 'react' import { Bot, ChevronRight } from 'lucide-react' import { cn } from '@/lib/class-names' +import { useTranslate } from '@/i18n/use-translate' import { HoverCard, HoverCardContent, HoverCardTrigger } from '@/components/ui/hover-card' import { useNow } from '@/hooks/use-now' import { @@ -21,19 +22,14 @@ import type { NativeChatSubagentState } from '../../../../../shared/native-chat/native-chat-types' import { formatNativeChatDuration } from '../../../../../shared/native-chat/transcript/native-chat-turn-status' -import { nativeChatSubagentEntryRuns } from './native-chat-subagent-sections' -import { sayNativeChatSubagentGroupTranslated as say } from './native-chat-subagent-group-words-text' +import { useNativeChatDisclosure } from '../messages/disclosure/native-chat-disclosure-store' +import { + sayNativeChatSubagentGroupTranslated as say, + sayNativeChatSubagentStateHeading +} from './native-chat-subagent-group-words-text' +import { NativeChatSubagentStatusIcon } from './NativeChatSubagentStatusIcon' import { sayNativeChatSessionOptionTranslated as sayOption } from '../session/options/controls/native-chat-session-option-labels-text' -const STATE_DOT_CLASS: Record = { - working: 'bg-foreground/70', - idle: 'bg-muted-foreground/40', - completed: 'bg-muted-foreground/60', - failed: 'bg-destructive', - stopped: 'bg-muted-foreground', - unverifiable: 'bg-muted-foreground' -} - /** Keep the identity glyph fixed as state changes; convey status through the dot and text. */ function SubagentGlyph(): React.JSX.Element { return ( @@ -43,28 +39,8 @@ function SubagentGlyph(): React.JSX.Element { ) } -/** Keep failure color independent of pulsing so a failed sibling cannot hide ongoing work. */ -export function StatusDot({ - state, - pulsing = false -}: { - state: NativeChatSubagentState - pulsing?: boolean -}): React.JSX.Element { - return ( -
) diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentSectionHead.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentSectionHead.tsx deleted file mode 100644 index 4b43dcaae04..00000000000 --- a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentSectionHead.tsx +++ /dev/null @@ -1,43 +0,0 @@ -import { Bot, ChevronRight } from 'lucide-react' -import { cn } from '@/lib/class-names' -import { useTranslate } from '@/i18n/use-translate' -import { normalizeSubagentState } from '../../../../../shared/native-chat/transcript/native-chat-subagent-summary' -import type { NativeChatSubagentEntry } from '../../../../../shared/native-chat/native-chat-types' -import { StatusDot } from './NativeChatSubagentRun' - -/** Head a section whose roster entry is unloaded or nested; unnamed agents have no invented label or state. */ -export function NativeChatSubagentSectionHead({ - agentId, - entry, - expanded, - onSetOpen -}: { - agentId: string - entry: NativeChatSubagentEntry | undefined - expanded: boolean - onSetOpen: (agentId: string, open: boolean) => void -}): React.JSX.Element { - const t = useTranslate() - const state = entry === undefined ? null : normalizeSubagentState(entry.state) - return ( - - ) -} diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentStatusBar.fixture.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentStatusBar.fixture.tsx new file mode 100644 index 00000000000..0a5f4fe0d60 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentStatusBar.fixture.tsx @@ -0,0 +1,59 @@ +import { defineFixture } from '../../../component-fixtures/component-fixture' +import type { NativeChatSubagentEntry } from '../../../../../shared/native-chat/native-chat-types' +import { nativeChatAppearanceStyle } from '../appearance/native-chat-appearance-style' +import { NativeChatSubagentStatusBar } from './NativeChatSubagentStatusBar' + +const now = Date.now() + +const completed: NativeChatSubagentEntry = { + id: 'a1', + label: 'Audit auth flow', + state: 'completed', + tokens: 17_800, + startedAt: now - 7_000, + settledAt: now +} +const failed: NativeChatSubagentEntry = { ...completed, state: 'failed' } +const working: NativeChatSubagentEntry = { + ...completed, + state: 'working', + settledAt: undefined, + startedAt: now - 42_000 +} + +function Bar(props: React.ComponentProps) { + return ( +
+ +
+ ) +} + +export const completedWide = defineFixture({ + width: 640, + render: () => {}} /> +}) + +export const failedNarrow = defineFixture({ + width: 340, + render: () => {}} /> +}) + +export const stopping = defineFixture({ + width: 640, + render: () => ( + {} }} + backTo="Audit auth flow" + onBack={() => {}} + /> + ) +}) + +export const stoppingNarrow = defineFixture({ + width: 340, + render: () => ( + {} }} onBack={() => {}} /> + ) +}) diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentStatusBar.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentStatusBar.tsx new file mode 100644 index 00000000000..8aa2039909e --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentStatusBar.tsx @@ -0,0 +1,161 @@ +import { useMemo } from 'react' +import { ChevronLeft } from 'lucide-react' +import { Button } from '@/components/ui/button' +import { useTranslate } from '@/i18n/use-translate' +import { formatSubagentTokens } from '../../../../../shared/native-chat/transcript/native-chat-subagent-group-header' +import { normalizeSubagentState } from '../../../../../shared/native-chat/transcript/native-chat-subagent-summary' +import type { NativeChatSubagentEntry } from '../../../../../shared/native-chat/native-chat-types' +import type { AgentChildRowModel } from '../../../../../shared/agent-status/presentation/agent-child-row-model' +import { backgroundTaskRowStopId } from '../../../../../shared/background-task-roster' +import type { StructuredSessionBackgroundTasksView } from '../../../../../shared/structured-session-background-tasks-view' +import { structuredSessionBackgroundTaskGroups } from '../tools/tasks/background-task-roster' +import { sayBackgroundTaskTranslated as sayTask } from '../tools/tasks/background-task-words-text' +import { useStructuredSessionChildRowContext } from '../tools/tasks/use-structured-session-child-row-context' +import type { StructuredSessionTaskStop } from '../tools/tasks/use-structured-session-task-stop' +import { SubagentElapsed } from './NativeChatSubagentRun' +import { NativeChatSubagentStatusIcon } from './NativeChatSubagentStatusIcon' +import { + sayNativeChatSubagentGroupTranslated as say, + sayNativeChatSubagentStateHeading +} from './native-chat-subagent-group-words-text' + +/** Stands in for the composer while a subagent's view is open: its state, its Stop, and the way back. */ +export function NativeChatSubagentStatusBar({ + entry, + stop, + backTo, + onBack +}: { + entry: NativeChatSubagentEntry | undefined + /** Present while the agents strip could stop this subagent. */ + stop?: { stopping: boolean; onStop: () => void } + /** The subagent that spawned this one; absent when the main agent did. */ + backTo?: string + onBack: () => void +}): React.JSX.Element { + const t = useTranslate() + const state = entry ? normalizeSubagentState(entry.state) : null + const back = + backTo === undefined + ? t('components.native-chat.subagents.backToMain', 'Back to main agent') + : t('components.native-chat.subagents.backTo', 'Back to {{value0}}', { value0: backTo }) + return ( +
+
+
+ {state ? ( + + + + {sayNativeChatSubagentStateHeading(state)} + + {entry?.startedAt !== undefined ? ( + // Ticking digits stay out of live announcements. + + {' · '} + + + ) : null} + {typeof entry?.tokens === 'number' ? ( + + {` · ${say('tokens', { value0: formatSubagentTokens(entry.tokens) })}`} + + ) : null} + + ) : null} + {/* Says once the subagent settles; never the ticking clock. */} + + {state !== null && state !== 'working' && state !== 'idle' + ? sayNativeChatSubagentStateHeading(state) + : ''} + + + {stop ? ( + + ) : null} + + +
+
+
+ ) +} + +function rowFor( + rows: readonly AgentChildRowModel[], + providerId: string +): AgentChildRowModel | undefined { + for (const row of rows) { + const found = row.providerId === providerId ? row : rowFor(row.owned, providerId) + if (found) { + return found + } + } + return undefined +} + +/** A structured chat's bar: the roster's entry for the agent, with the agents strip's own Stop. */ +export function NativeChatStructuredSubagentStatusBar({ + agentId, + entry, + paneKey, + backgroundTasks, + stop, + backTo, + onBack +}: { + agentId: string + entry: NativeChatSubagentEntry | undefined + paneKey: string + backgroundTasks: StructuredSessionBackgroundTasksView + stop: StructuredSessionTaskStop + backTo?: string + onBack: () => void +}): React.JSX.Element { + const childRowContext = useStructuredSessionChildRowContext(paneKey) + const { tasks, settledTasks, children, supportsStop } = backgroundTasks + const stopId = useMemo(() => { + const rows = structuredSessionBackgroundTaskGroups( + tasks, + settledTasks, + children, + childRowContext + ).flatMap((group) => group.tasks.map(({ row }) => row)) + const row = rowFor(rows, agentId) + return row ? backgroundTaskRowStopId(row, supportsStop) : null + }, [agentId, childRowContext, children, settledTasks, supportsStop, tasks]) + const { onStop, stoppingTaskIds } = stop + return ( + onStop(stopId) } + } + backTo={backTo} + onBack={onBack} + /> + ) +} diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentStatusIcon.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentStatusIcon.tsx new file mode 100644 index 00000000000..fee1424f291 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentStatusIcon.tsx @@ -0,0 +1,21 @@ +import { AgentStateDot, type AgentDotState } from '@/components/AgentStateDot' +import type { NativeChatSubagentState } from '../../../../../shared/native-chat/native-chat-types' + +const DOT_STATE: Record = { + working: 'working', + idle: 'idle', + completed: 'done', + failed: 'failed', + stopped: 'interrupted', + unverifiable: 'unverifiable' +} + +/** The agents strip's status glyph, so a subagent reads the same on every surface. */ +export function NativeChatSubagentStatusIcon({ + state +}: { + state: NativeChatSubagentState +}): React.JSX.Element { + // The words beside it say the state; the glyph adds no tooltip of its own. + return +} diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentTranscripts.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentTranscripts.tsx new file mode 100644 index 00000000000..9166ba0063c --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentTranscripts.tsx @@ -0,0 +1,123 @@ +import { useCallback, useEffect, useMemo, useRef } from 'react' +import { cn } from '@/lib/class-names' +import { NativeChatMessageList } from '../NativeChatMessageList' +import { NativeChatSideChatForkPointContext } from '../messages/actions/native-chat-fork-context' +import { NativeChatToolRunWindowProvider } from '../tools/runs/native-chat-tool-run-window-context' +import type { NativeChatFind } from '../viewport/find/use-native-chat-find' +import { + noteNativeChatSubagentParent, + openNativeChatSubagent, + useNativeChatOpenSubagent, + type NativeChatSubagentView +} from './native-chat-open-subagent' + +/** What took the reader into a subagent, to hand focus back to: its roster entry, its strip row, else the composer. */ +function returnFocusTarget(main: HTMLElement, agentId: string): HTMLElement | null { + const id = CSS.escape(agentId) + const root = main.closest('[data-native-chat-root]') + return ( + main.querySelector(`[data-native-chat-subagent-entry="${id}"] button`) ?? + root?.querySelector(`[data-native-chat-agent-row="${id}"]`) ?? + root?.querySelector('[data-native-chat-prompt-editor]') ?? + null + ) +} + +/** The conversation stays mounted, hidden, under an open subagent's view, so going back keeps the reader's place. */ +export function NativeChatSubagentTranscripts({ + paneKey, + find, + ...props +}: React.ComponentProps & { + /** The chat's status pane key, which also names it to the sidebar's subagent rows. */ + paneKey: string + find: Pick +}): React.JSX.Element { + const openId = useNativeChatOpenSubagent(paneKey)?.agentId ?? null + const open = useCallback( + (agentId: string | null) => openNativeChatSubagent(paneKey, agentId), + [paneKey] + ) + const main = useMemo(() => ({ agentId: null, open }), [open]) + const shown = useMemo( + () => + openId === null + ? null + : { + agentId: openId, + open, + noteParent: (parentId) => noteNativeChatSubagentParent(paneKey, openId, parentId) + }, + [open, openId, paneKey] + ) + const isVisible = props.isVisible ?? true + const mainRef = useRef(null) + const viewRef = useRef(null) + const shownId = shown?.agentId ?? null + const previousIdRef = useRef(null) + useEffect(() => { + const previousId = previousIdRef.current + previousIdRef.current = shownId + // Only focus a switch dropped (the view or control that had it unmounted); never take it from elsewhere. + const active = document.activeElement + const dropped = + active === null || active === document.body || mainRef.current?.contains(active) === true + if (!dropped || previousId === shownId) { + return + } + if (shownId !== null) { + viewRef.current?.focus({ preventScroll: true }) + return + } + // The composer the view replaced mounts in this commit; its editor attaches a frame later. + const frame = requestAnimationFrame(() => { + const main = mainRef.current + if (main && previousId !== null && document.activeElement === document.body) { + returnFocusTarget(main, previousId)?.focus({ preventScroll: true }) + } + }) + return () => cancelAnimationFrame(frame) + }, [shownId]) + return ( + +
+
+ +
+ {shown ? ( +
+ {/* `/btw` forks from the conversation, never from a subagent's rows. */} + + + +
+ ) : null} +
+ + ) +} diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentViewBar.fixture.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentViewBar.fixture.tsx new file mode 100644 index 00000000000..249c07dccbb --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentViewBar.fixture.tsx @@ -0,0 +1,76 @@ +import { defineFixture } from '../../../component-fixtures/component-fixture' +import type { NativeChatSubagentEntry } from '../../../../../shared/native-chat/native-chat-types' +import type { NativeChatSubagentRow } from '../../../../../shared/native-chat/transcript/native-chat-transcript-projection' +import { nativeChatAppearanceStyle } from '../appearance/native-chat-appearance-style' +import { NativeChatSubagentViewBar } from './NativeChatSubagentViewBar' + +const now = Date.now() + +const agents: NativeChatSubagentEntry[] = [ + { + id: 'a1', + label: 'Audit auth flow', + state: 'working', + tokens: 31_200, + startedAt: now - 42_000, + agentType: 'general-purpose', + model: 'claude-opus-5-5', + effort: 'high' + }, + { id: 'a2', label: 'List docs/ and read notes.md', state: 'completed', model: 'gpt-5.5' }, + { id: 'a3', label: 'Map token refresh', state: 'failed', tokens: 8_100 }, + { id: 'a4', label: 'Check refresh race', state: 'working', agentType: 'Explore' } +] +const entries = new Map(agents.map((agent) => [agent.id, agent])) + +function rows(id: string, parentAgentId?: string): [string, NativeChatSubagentRow[]] { + return [ + id, + [ + { + message: { + id: `${id}-row`, + role: 'assistant', + blocks: [], + timestamp: now, + source: 'transcript', + ...(parentAgentId ? { parentAgentId } : {}) + }, + turnKey: undefined + } + ] + ] +} +// a4 was spawned by a1; two unnamed agents have rows and no roster entry. +const subagentRows = new Map([rows('a1'), rows('a4', 'a1'), rows('u1'), rows('u2')]) + +function Bar() { + return ( +
+ {}} + /> +
+ ) +} + +export const nested = defineFixture({ width: 640, render: () => }) + +export const switcher = defineFixture({ + width: 640, + render: () => , + interact: async (frame) => { + frame + .querySelector('[aria-haspopup="menu"]') + ?.dispatchEvent( + new PointerEvent('pointerdown', { bubbles: true, button: 0, pointerType: 'mouse' }) + ) + await new Promise((resolve) => setTimeout(resolve, 300)) + } +}) diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatSubagentViewBar.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentViewBar.tsx new file mode 100644 index 00000000000..e267f5e6da3 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/NativeChatSubagentViewBar.tsx @@ -0,0 +1,144 @@ +import { Fragment, useMemo } from 'react' +import { ChevronDown, ChevronLeft } from 'lucide-react' +import { Button } from '@/components/ui/button' +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuRadioGroup, + DropdownMenuRadioItem, + DropdownMenuSeparator, + DropdownMenuTrigger +} from '@/components/ui/dropdown-menu' +import { useTranslate } from '@/i18n/use-translate' +import { normalizeSubagentState } from '../../../../../shared/native-chat/transcript/native-chat-subagent-summary' +import { + subagentEntryRunsOn, + subagentRoleLabel +} from '../../../../../shared/native-chat/transcript/native-chat-subagent-entry-detail' +import type { NativeChatSubagentEntry } from '../../../../../shared/native-chat/native-chat-types' +import type { NativeChatSubagentRow } from '../../../../../shared/native-chat/transcript/native-chat-transcript-projection' +import { NativeChatSubagentStatusIcon } from './NativeChatSubagentStatusIcon' +import { sayNativeChatSubagentStateHeading } from './native-chat-subagent-group-words-text' +import { sayNativeChatSessionOptionTranslated as sayOption } from '../session/options/controls/native-chat-session-option-labels-text' +import { nativeChatSubagentSwitcherItems } from './native-chat-subagent-switcher-items' + +const CHIP_CLASS = + 'min-w-0 shrink truncate rounded-full border border-border px-1.5 font-sans text-3xs text-chat-foreground-faint' +const MAIN = '' + +/** Above a subagent's own transcript: its spawn chain back to the main agent, and a switcher over every subagent. */ +export function NativeChatSubagentViewBar({ + chain, + entries, + subagentRows, + onOpen +}: { + /** The spawn chain down to the open subagent, outermost first. */ + chain: readonly string[] + /** Every subagent the session names, in roster order. */ + entries: ReadonlyMap + subagentRows: ReadonlyMap + onOpen: (agentId: string | null) => void +}): React.JSX.Element { + const t = useTranslate() + const unnamed = t('components.native-chat.subagents.unnamed', 'Subagent') + const mainAgent = t('components.native-chat.subagents.mainAgent', 'Main agent') + const items = useMemo( + () => nativeChatSubagentSwitcherItems(entries, subagentRows, unnamed), + [entries, subagentRows, unnamed] + ) + const labelOf = (id: string): string => items.find((item) => item.id === id)?.label ?? unnamed + const agentId = chain.at(-1)! + const entry = entries.get(agentId) + const state = entry ? normalizeSubagentState(entry.state) : null + const role = subagentRoleLabel(entry?.agentType) + const runsOn = entry ? subagentEntryRunsOn(entry, sayOption) : null + return ( +
+ +
+ ) +} diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-open-subagent.ts b/src/renderer/src/components/native-chat/subagents/native-chat-open-subagent.ts new file mode 100644 index 00000000000..2b4e664150d --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/native-chat-open-subagent.ts @@ -0,0 +1,83 @@ +// Which subagent each chat pane shows in place of its conversation; session-only, never persisted. + +import { useCallback, useSyncExternalStore } from 'react' +import { isEditableTarget } from '@/lib/text-input/focus/editable-target' + +/** The subagent a transcript shows (null: the conversation) and how its pane switches. */ +export type NativeChatSubagentView = { + agentId: string | null + open: (agentId: string | null) => void + /** The open view names the subagent that spawned it, which Back and Esc return to. */ + noteParent?: (parentId: string | null) => void +} + +/** The open subagent and, once its view has read its spawn chain, its parent (null: the main agent). */ +export type NativeChatOpenSubagent = { agentId: string; parentId: string | null } + +const openByPane = new Map() +const listeners = new Set<() => void>() + +function subscribe(listener: () => void): () => void { + listeners.add(listener) + return () => listeners.delete(listener) +} + +function publish(): void { + for (const listener of listeners) { + listener() + } +} + +/** `paneKey` is the chat's status pane key; null returns the pane to its main agent. */ +export function openNativeChatSubagent(paneKey: string, agentId: string | null): void { + if ((openByPane.get(paneKey)?.agentId ?? null) === agentId) { + return + } + if (agentId === null) { + openByPane.delete(paneKey) + } else { + openByPane.set(paneKey, { agentId, parentId: null }) + } + publish() +} + +export function noteNativeChatSubagentParent( + paneKey: string, + agentId: string, + parentId: string | null +): void { + const open = openByPane.get(paneKey) + if (open?.agentId === agentId && open.parentId !== parentId) { + openByPane.set(paneKey, { agentId, parentId }) + publish() + } +} + +/** Back from a subagent: to the subagent that spawned it, else to the main agent. */ +export function backFromNativeChatSubagent(paneKey: string): void { + openNativeChatSubagent(paneKey, openByPane.get(paneKey)?.parentId ?? null) +} + +export function useNativeChatOpenSubagent(paneKey: string): NativeChatOpenSubagent | null { + const read = useCallback(() => openByPane.get(paneKey) ?? null, [paneKey]) + return useSyncExternalStore(subscribe, read, read) +} + +/** Esc outside inputs and menus goes back a level. */ +export function closeNativeChatSubagentOnEscape(event: React.KeyboardEvent, paneKey: string): void { + const target = event.target + if ( + event.key !== 'Escape' || + event.defaultPrevented || + !openByPane.has(paneKey) || + !(target instanceof Element) || + // Portaled menus bubble through React but sit outside this pane's DOM. + !event.currentTarget.contains(target) || + isEditableTarget(target) || + target.closest('[role="menu"], [role="dialog"], [role="listbox"]') !== null + ) { + return + } + event.preventDefault() + backFromNativeChatSubagent(paneKey) +} diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-delegation.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-delegation.ts deleted file mode 100644 index f9c0f0cc921..00000000000 --- a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-delegation.ts +++ /dev/null @@ -1,87 +0,0 @@ -// Codex delegates by the first thread id, including legacy raw frames; Claude spawn call ids change on resume, so join via the announcing roster. - -import { - codexCollabRowAgentIds, - isCodexCollabToolRowName -} from '../../../../../shared/codex-collab-agent-tools' -import { - isSubagentGroupBlock, - type NativeChatMessage -} from '../../../../../shared/native-chat/native-chat-types' - -export type NativeChatSubagentDelegation = - | { kind: 'roster'; agentIds: readonly string[] } - | { kind: 'call'; agentId: string } - | { kind: 'spawn' } - -/** Claude's subagent spawn tool, under its current and its older name. */ -const CLAUDE_SPAWN_TOOLS: ReadonlySet = new Set(['Agent', 'Task']) - -const CODEX_COLLAB_CALL_FRAME = 'item:collabAgentToolCall' - -const delegations = new WeakMap() - -/** An older journal's raw collab-call row: not drawn, but still the agent acting. */ -export function isNativeChatCodexCollabCallFrameRow(message: NativeChatMessage): boolean { - const [only] = message.blocks - return ( - message.blocks.length === 1 && - only?.type === 'text' && - only.providerFrame?.provider === 'codex' && - only.providerFrame.kind === CODEX_COLLAB_CALL_FRAME - ) -} - -export function nativeChatSubagentDelegation( - message: NativeChatMessage -): NativeChatSubagentDelegation | null { - const cached = delegations.get(message) - if (cached !== undefined) { - return cached - } - const delegation = derive(message) - delegations.set(message, delegation) - return delegation -} - -function derive(message: NativeChatMessage): NativeChatSubagentDelegation | null { - const rostered = message.blocks.flatMap((block) => - isSubagentGroupBlock(block) ? block.agents.map((agent) => agent.id) : [] - ) - if (rostered.length > 0) { - return { kind: 'roster', agentIds: rostered } - } - const [only] = message.blocks - const frame = - message.blocks.length === 1 && only?.type === 'text' ? only.providerFrame : undefined - if (frame?.provider === 'codex' && frame.kind === CODEX_COLLAB_CALL_FRAME) { - const [agentId] = frame.payload.truncated ? [] : receiverThreadIds(frame.payload.head) - return agentId === undefined ? null : { kind: 'call', agentId } - } - // A tool run folds into the message before it, so its last call is the newest thing in it. - const newest = message.blocks.findLast((block) => block.type !== 'tool-result') - if (newest?.type !== 'tool-call') { - return null - } - if (isCodexCollabToolRowName(newest.name)) { - const [agentId] = codexCollabRowAgentIds(newest.input) - return agentId === undefined ? null : { kind: 'call', agentId } - } - return CLAUDE_SPAWN_TOOLS.has(newest.name) ? { kind: 'spawn' } : null -} - -function receiverThreadIds(head: string): readonly string[] { - let item: unknown - try { - item = JSON.parse(head) - } catch { - return [] - } - if (typeof item !== 'object' || item === null || !('receiverThreadIds' in item)) { - return [] - } - const ids = item.receiverThreadIds - return Array.isArray(ids) - ? ids.filter((id): id is string => typeof id === 'string' && id.length > 0) - : [] -} diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-ending.test.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-ending.test.ts new file mode 100644 index 00000000000..8058d16cf98 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-ending.test.ts @@ -0,0 +1,64 @@ +import { describe, expect, it } from 'vitest' +import type { + NativeChatMessage, + NativeChatSubagentEntry +} from '../../../../../shared/native-chat/native-chat-types' +import { nativeChatSubagentEnding } from './native-chat-subagent-ending' + +const said: NativeChatMessage = { + id: 'r1', + role: 'assistant', + blocks: [{ type: 'text', text: 'Found two files.' }], + timestamp: 1, + source: 'transcript' +} + +function entry(state: NativeChatSubagentEntry['state']): NativeChatSubagentEntry { + return { id: 'a', label: 'List src', state, lastMessage: 'Permission denied for ls' } +} + +describe('nativeChatSubagentEnding', () => { + it('ends a completed subagent with its reply', () => { + expect( + nativeChatSubagentEnding({ + entry: entry('completed'), + handoff: { prompt: null, reply: 'src holds math.ts', error: null }, + rows: [], + history: 'landed' + }) + ).toEqual({ kind: 'reply', text: 'src holds math.ts' }) + }) + + it('never ends a failed subagent with a reply, only its error', () => { + expect( + nativeChatSubagentEnding({ + entry: entry('failed'), + handoff: { prompt: null, reply: null, error: null }, + rows: [said], + history: 'landed' + }) + ).toEqual({ kind: 'error', text: 'Permission denied for ls' }) + }) + + it('says a stopped subagent stopped before replying, whatever it said last', () => { + expect( + nativeChatSubagentEnding({ + entry: entry('stopped'), + handoff: null, + rows: [said], + history: 'landed' + }) + ).toEqual({ kind: 'aside', aside: 'stopped' }) + }) + + it('adds no reply when its own last message already says it', () => { + expect( + nativeChatSubagentEnding({ + entry: { ...entry('completed'), lastMessage: 'Found two files.' }, + handoff: null, + rows: [said], + history: 'landed' + }) + ).toBeNull() + }) +}) diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-ending.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-ending.ts new file mode 100644 index 00000000000..9bbed127075 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-ending.ts @@ -0,0 +1,97 @@ +// How a subagent's view ends: only a completed subagent gets a reply; anything else says why it has none. + +import type { + NativeChatMessage, + NativeChatSubagentEntry +} from '../../../../../shared/native-chat/native-chat-types' +import { normalizeSubagentState } from '../../../../../shared/native-chat/transcript/native-chat-subagent-summary' +import type { NativeChatSubagentHandoff } from './native-chat-subagent-handoff' +import type { NativeChatSubagentHistory } from './native-chat-subagent-history' + +/** A quiet line in the transcript's notice style. */ +export type NativeChatSubagentAside = 'no-steps' | 'cleared' | 'stopped' | 'no-reply' + +export type NativeChatSubagentEnding = + | { kind: 'reply'; text: string } + | { kind: 'error'; text: string } + | { kind: 'aside'; aside: NativeChatSubagentAside } + | null + +function words(text: string): string { + return text.replace(/\s+/g, ' ').trim() +} + +/** Codex's last own message is its reply; the roster's clipped copy of it counts as the same, a shorter own message does not. */ +function rowsEndWith(rows: readonly NativeChatMessage[], reply: string): boolean { + const last = rows.findLast((row) => row.role === 'assistant') + const said = words( + last?.blocks.map((block) => (block.type === 'text' ? block.text : '')).join('\n') ?? '' + ) + const replied = words(reply) + return said.length > 0 && said.startsWith(replied) +} + +export function nativeChatSubagentEnding({ + entry, + handoff, + rows, + history +}: { + entry: NativeChatSubagentEntry | undefined + handoff: NativeChatSubagentHandoff | null + /** The subagent's own rows. */ + rows: readonly NativeChatMessage[] + history: NativeChatSubagentHistory +}): NativeChatSubagentEnding { + if (rows.length === 0 && history === 'cleared') { + return { kind: 'aside', aside: 'cleared' } + } + const state = entry === undefined ? null : normalizeSubagentState(entry.state) + switch (state) { + case 'completed': { + const reply = handoff?.reply ?? entry?.lastMessage?.trim() + if (reply && rowsEndWith(rows, reply)) { + return null + } + return reply ? { kind: 'reply', text: reply } : { kind: 'aside', aside: 'no-reply' } + } + case 'failed': { + const error = handoff?.error ?? entry?.lastMessage?.trim() + return error ? { kind: 'error', text: error } : { kind: 'aside', aside: 'no-reply' } + } + case 'stopped': + return { kind: 'aside', aside: 'stopped' } + case 'unverifiable': + return { kind: 'aside', aside: 'no-reply' } + case 'working': + case 'idle': + case null: + return rows.length === 0 ? { kind: 'aside', aside: 'no-steps' } : null + } +} + +/** The ending as the view's last row: the reply as the agent's message, the rest as notices. */ +export function nativeChatSubagentEndingMessage( + agentId: string, + ending: Exclude, + asideText: string, + settledAt: number | undefined +): NativeChatMessage { + const base = { + id: `subagent-ending:${agentId}`, + timestamp: settledAt ?? null, + source: 'transcript' + } as const + switch (ending.kind) { + case 'reply': + return { ...base, role: 'assistant', blocks: [{ type: 'text', text: ending.text }] } + case 'error': + return { + ...base, + role: 'system', + blocks: [{ type: 'text', text: ending.text, tone: 'error' }] + } + case 'aside': + return { ...base, role: 'system', blocks: [{ type: 'text', text: asideText }] } + } +} diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-group-words-text.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-group-words-text.ts index cecd9f62a87..476e96195c6 100644 --- a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-group-words-text.ts +++ b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-group-words-text.ts @@ -7,6 +7,7 @@ import { type NativeChatSubagentGroupSay } from '../../../../../shared/native-chat/transcript/native-chat-subagent-group-header' import type { CopyValues } from '../../../../../shared/counted-copy-english' +import type { NativeChatSubagentState } from '../../../../../shared/native-chat/native-chat-types' const PIECES: Record string> = { stateCompleted: () => @@ -66,3 +67,24 @@ const PIECES: Record str export const sayNativeChatSubagentGroupTranslated: NativeChatSubagentGroupSay = (id, values) => PIECES[id](values) + +/** A single subagent's state where it leads a line: "Completed · 7s". */ +export function sayNativeChatSubagentStateHeading(state: NativeChatSubagentState): string { + switch (state) { + case 'completed': + return translate('components.native-chat.subagents.stateHeading.completed', 'Completed') + case 'working': + return translate('components.native-chat.subagents.stateHeading.working', 'Working') + case 'idle': + return translate('components.native-chat.subagents.stateHeading.idle', 'Idle') + case 'failed': + return translate('components.native-chat.subagents.stateHeading.failed', 'Failed') + case 'stopped': + return translate('components.native-chat.subagents.stateHeading.stopped', 'Stopped') + case 'unverifiable': + return translate( + 'components.native-chat.subagents.stateHeading.unverifiable', + 'Status unavailable' + ) + } +} diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-handoff-copy-budget.test.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-handoff-copy-budget.test.ts deleted file mode 100644 index d2b4d8daad6..00000000000 --- a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-handoff-copy-budget.test.ts +++ /dev/null @@ -1,137 +0,0 @@ -import { describe, expect, it } from 'vitest' -import type { NativeChatMessage } from '../../../../../shared/native-chat/native-chat-types' -import { nativeChatSubagentSections } from './native-chat-subagent-sections' -import { nativeChatSubagentLiveSections } from './native-chat-subagent-live-frontier' - -function message( - id: string, - blocks: NativeChatMessage['blocks'], - sequence: number, - extra: Partial = {} -): NativeChatMessage { - return { - id, - role: 'assistant', - blocks, - timestamp: 1, - source: 'transcript', - journalPosition: { sequence, index: 0 }, - ...extra - } -} - -function handoff(index: number, agents = ['child']): NativeChatMessage { - return message( - `handoff-${index}`, - [ - { - type: 'tool-call', - name: 'wait_agent', - input: { - agents, - future: { reason: 'observe', unicode: '🙂' }, - optional: undefined - } - } - ], - index + 10 - ) -} - -function fixture(calls: readonly NativeChatMessage[]) { - const roster = message( - 'root-roster', - [ - { - type: 'subagent-group', - groupId: 'root', - agents: [{ id: 'parent', label: 'parent', state: 'working' }] - } - ], - 1, - { role: 'system' } - ) - const parent = message('parent-row', [{ type: 'text', text: 'delegating' }], 2, { - agentId: 'parent', - producerKind: 'agent' - }) - const child = message('child-row', [{ type: 'text', text: 'reading' }], 3, { - agentId: 'child', - parentAgentId: 'parent', - producerKind: 'agent' - }) - const conversation = [roster, ...calls] - const sections = nativeChatSubagentSections( - conversation, - new Map([ - ['parent', [{ message: parent, turnKey: undefined }]], - ['child', [{ message: child, turnKey: undefined }]] - ]) - ) - return { conversation, sections, roster, parent, child } -} - -describe('nested subagent handoff accumulation', () => { - it.each([{ agents: [] }, { agents: [''] }, { agents: ['unknown'] }])( - 'keeps unknown or empty target behavior for %j', - ({ agents }) => { - const input = fixture([handoff(0), handoff(1, agents)]) - const before = structuredClone(input) - expect([...nativeChatSubagentLiveSections(input.conversation, input.sections, true)]).toEqual( - ['child'] - ) - expect(input).toEqual(before) - } - ) - - it('keeps live ordering for interleaved handoffs to different nested scopes', () => { - const input = fixture([handoff(0), handoff(1, ['other-child']), handoff(2)]) - const group = input.roster.blocks[0] - if (group?.type !== 'subagent-group') { - throw new Error('Missing root roster') - } - group.agents.push({ id: 'other-parent', label: 'other parent', state: 'working' }) - const otherParent = message('other-parent-row', [{ type: 'text', text: 'delegating' }], 4, { - agentId: 'other-parent', - producerKind: 'agent' - }) - const otherChild = message('other-child-row', [{ type: 'text', text: 'reading' }], 5, { - agentId: 'other-child', - parentAgentId: 'other-parent', - producerKind: 'agent' - }) - const sections = nativeChatSubagentSections( - input.conversation, - new Map([ - ['parent', [{ message: input.parent, turnKey: undefined }]], - ['child', [{ message: input.child, turnKey: undefined }]], - ['other-parent', [{ message: otherParent, turnKey: undefined }]], - ['other-child', [{ message: otherChild, turnKey: undefined }]] - ]) - ) - const before = structuredClone({ input, sections }) - expect([...nativeChatSubagentLiveSections(input.conversation, sections, true)]).toEqual([ - 'other-parent', - 'child', - 'other-child' - ]) - expect({ input, sections }).toEqual(before) - }) - - it('derives fresh results on interleaved sessions with identical IDs and no carried handoffs', () => { - const waiting = fixture([handoff(0)]) - const plain = fixture([]) - expect([ - ...nativeChatSubagentLiveSections(waiting.conversation, waiting.sections, true) - ]).toEqual(['parent', 'child']) - expect([...nativeChatSubagentLiveSections(plain.conversation, plain.sections, true)]).toEqual([ - 'parent' - ]) - expect([ - ...nativeChatSubagentLiveSections(waiting.conversation, waiting.sections, true) - ]).toEqual(['parent', 'child']) - expect(nativeChatSubagentLiveSections(waiting.conversation, waiting.sections, false)).toBe( - nativeChatSubagentLiveSections(plain.conversation, plain.sections, false) - ) - }) -}) diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-handoff.test.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-handoff.test.ts new file mode 100644 index 00000000000..359d9d5f663 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-handoff.test.ts @@ -0,0 +1,79 @@ +import { describe, expect, it } from 'vitest' +import type { AgentJournalRenderItem } from '../../../../../shared/agent-session/journal/agent-session-journal-types' +import type { NativeChatMessage } from '../../../../../shared/native-chat/native-chat-types' +import { nativeChatSubagentHandoff } from './native-chat-subagent-handoff' + +function row(id: string, blocks: NativeChatMessage['blocks']): NativeChatMessage { + return { id, role: 'assistant', blocks, timestamp: 1, source: 'transcript' } +} + +describe('nativeChatSubagentHandoff', () => { + it("reads a Claude subagent's prompt and reply from the Agent call its run names", () => { + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the handoff reads only each item's body blocks. + const journalItems = [ + { + itemId: 'spawn', + revision: 1, + sequence: 2, + observedAt: 1, + body: { + kind: 'message', + role: 'assistant', + blocks: [ + { + type: 'subagent', + id: 'agent-a', + label: 'List src', + state: 'completed', + groupId: 'g', + run: 'toolu_2' + } + ] + } + } + ] as unknown as AgentJournalRenderItem[] + const conversation = [ + row('call', [ + { type: 'tool-call', name: 'Agent', callId: 'toolu_1', input: { prompt: 'Other task' } }, + { type: 'tool-call', name: 'Agent', callId: 'toolu_2', input: { prompt: 'List src/' } }, + { type: 'tool-result', callId: 'toolu_1', output: 'Other reply' }, + { + type: 'tool-result', + callId: 'toolu_2', + output: + ' Bash\n \n[Subagent hand-back] The report follows:\n src holds:\n \n - `math.ts`' + } + ]) + ] + expect( + nativeChatSubagentHandoff({ + agentId: 'agent-a', + journalItems, + conversation, + subagentRows: new Map() + }) + ).toEqual({ prompt: 'List src/', reply: 'src holds:\n\n- `math.ts`', error: null }) + }) + + it("reads a Codex subagent's prompt from the spawn call naming it, leaving its reply to its own rows", () => { + const conversation = [ + row('spawn', [ + { + type: 'tool-call', + name: 'spawn_agent', + callId: 'call_1', + input: { agents: ['thread-child'], prompt: 'Map token refresh' } + }, + { type: 'tool-result', callId: 'call_1', output: 'Spawned' } + ]) + ] + expect( + nativeChatSubagentHandoff({ + agentId: 'thread-child', + journalItems: [], + conversation, + subagentRows: new Map() + }) + ).toEqual({ prompt: 'Map token refresh', reply: null, error: null }) + }) +}) diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-handoff.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-handoff.ts new file mode 100644 index 00000000000..b469b634fe1 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-handoff.ts @@ -0,0 +1,101 @@ +// What the main agent asked a subagent to do and, for Claude, the reply its spawn call returned. + +import type { AgentJournalRenderItem } from '../../../../../shared/agent-session/journal/agent-session-journal-types' +import { codexCollabRowAgentIds } from '../../../../../shared/codex-collab-agent-tools' +import { + isSubagentBlock, + isToolCallBlock, + type NativeChatMessage +} from '../../../../../shared/native-chat/native-chat-types' +import type { NativeChatSubagentRow } from '../../../../../shared/native-chat/transcript/native-chat-transcript-projection' +import { pairNativeChatToolResults } from '../../../../../shared/native-chat/tools/native-chat-tool-pairing' + +export type NativeChatSubagentHandoff = { + prompt: string | null + /** The spawn call's result: Claude's `Agent` call returns the subagent's whole final reply. */ + reply: string | null + /** The spawn call's result when it reports a failure instead. */ + error: string | null +} + +const NO_HANDOFF: NativeChatSubagentHandoff = { prompt: null, reply: null, error: null } + +/** Claude names the spawning `Agent` call as the run of the subagent's newest revision. */ +function spawnRunOf( + journalItems: readonly AgentJournalRenderItem[] | undefined, + agentId: string +): string | undefined { + for (let index = (journalItems?.length ?? 0) - 1; index >= 0; index -= 1) { + const body = journalItems![index]!.body + if (body.kind !== 'message') { + continue + } + const block = body.blocks.find( + (candidate) => isSubagentBlock(candidate) && candidate.id === agentId + ) + if (block && isSubagentBlock(block) && block.run !== undefined) { + return block.run + } + } + return undefined +} + +/** Claude frames the report it hands back: a column-zero `[Subagent hand-back]` line, then every report line indented two spaces. */ +function handBackReport(output: string): string { + const lines = output.split('\n') + const frame = lines.findLastIndex((line) => line.startsWith('[Subagent hand-back]')) + return frame === -1 + ? output.trim() + : lines + .slice(frame + 1) + .map((line) => line.replace(/^ {2}/, '')) + .join('\n') + .trim() +} + +function promptOf(input: unknown): string | null { + const prompt = + typeof input === 'object' && input !== null && 'prompt' in input ? input.prompt : null + return typeof prompt === 'string' && prompt.trim() ? prompt : null +} + +/** The spawn call is Claude's call named by the run, or the Codex `spawn_agent` call naming the child. */ +export function nativeChatSubagentHandoff({ + agentId, + journalItems, + conversation, + subagentRows +}: { + agentId: string + journalItems: readonly AgentJournalRenderItem[] | undefined + conversation: readonly NativeChatMessage[] + subagentRows: ReadonlyMap +}): NativeChatSubagentHandoff { + const run = spawnRunOf(journalItems, agentId) + const spawners = [ + conversation, + ...Array.from(subagentRows.values(), (rows) => rows.map(({ message }) => message)) + ] + for (const messages of spawners) { + for (const message of messages) { + for (const block of message.blocks) { + if (!isToolCallBlock(block)) { + continue + } + if (run !== undefined && block.callId === run) { + const result = pairNativeChatToolResults(message.blocks).resultByCall.get(block) + const text = (result && handBackReport(result.output)) || null + return { + prompt: promptOf(block.input), + reply: result?.isError ? null : text, + error: result?.isError ? text : null + } + } + if (block.name === 'spawn_agent' && codexCollabRowAgentIds(block.input).includes(agentId)) { + return { prompt: promptOf(block.input), reply: null, error: null } + } + } + } + } + return NO_HANDOFF +} diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-history.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-history.ts new file mode 100644 index 00000000000..f1c68bdb40a --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-history.ts @@ -0,0 +1,49 @@ +import type { StructuredAgentSubagentRoster } from '../../../../../shared/agent-session/view/structured-agent-session-subagent-roster' +import { + isSubagentGroupBlock, + type NativeChatMessage +} from '../../../../../shared/native-chat/native-chat-types' +import type { NativeChatSubagentRow } from '../../../../../shared/native-chat/transcript/native-chat-transcript-projection' + +export type NativeChatSubagentHistory = 'landed' | 'page' | 'cleared' | 'stop' + +function namesAgent(message: NativeChatMessage, agentId: string): boolean { + return message.blocks.some( + (block) => isSubagentGroupBlock(block) && block.agents.some(({ id }) => id === agentId) + ) +} + +/** + * Whether a subagent's view holds all its work: its spawning roster row is loaded ('landed'), older + * history still holds it ('page'), it ran before the latest /clear ('cleared'), or nothing loadable + * names it ('stop'). Scanned per open, not per frame. + */ +export function nativeChatSubagentHistoryStep({ + agentId, + conversation, + subagentRows, + roster, + historyFloor +}: { + agentId: string + conversation: readonly NativeChatMessage[] + subagentRows: ReadonlyMap + roster: StructuredAgentSubagentRoster | undefined + /** The sequence the transcript's history starts from (its latest `/clear`); 0 for none. */ + historyFloor: () => number +}): NativeChatSubagentHistory { + if ( + conversation.some((message) => namesAgent(message, agentId)) || + Array.from(subagentRows.values()).some((rows) => + rows.some(({ message }) => namesAgent(message, agentId)) + ) + ) { + return 'landed' + } + const named = roster?.get(agentId) + if (named === undefined) { + return 'stop' + } + // A spawn before the latest /clear is outside this conversation: no page reaches it. + return named.rosterPosition.sequence < historyFloor() ? 'cleared' : 'page' +} diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-live-frontier.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-live-frontier.ts deleted file mode 100644 index 2fc64b906a9..00000000000 --- a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-live-frontier.ts +++ /dev/null @@ -1,169 +0,0 @@ -// Open the newest delegation’s section while its scope runs; newer output supersedes it, and explicit reader choices win. - -import { compareAgentJournalPositions } from '../../../../../shared/agent-session/journal/agent-session-journal-position' -import type { AgentJournalPosition } from '../../../../../shared/agent-session/journal/agent-session-journal-types' -import { normalizeSubagentState } from '../../../../../shared/native-chat/transcript/native-chat-subagent-summary' -import { nativeChatRowRendersContent } from '../../../../../shared/native-chat/transcript/native-chat-row-content' -import type { NativeChatMessage } from '../../../../../shared/native-chat/native-chat-types' -import { compareNativeChatDisplayMessages as compareMessages } from '../../../../../shared/native-chat/transcript/native-chat-message-order' -import { - isNativeChatCodexCollabCallFrameRow, - nativeChatSubagentDelegation -} from './native-chat-subagent-delegation' -import type { NativeChatSubagentSections } from './native-chat-subagent-sections' - -const NONE: ReadonlySet = new Set() - -/** A row the reader sees the scope's agent produce, or a collab call it made. */ -function isOutput(message: NativeChatMessage): boolean { - return ( - message.role !== 'user' && - (nativeChatRowRendersContent(message.blocks) || isNativeChatCodexCollabCallFrameRow(message)) - ) -} - -/** `scopeActive`: the session is running. */ -export function nativeChatSubagentLiveSections( - conversation: readonly NativeChatMessage[], - sections: NativeChatSubagentSections, - scopeActive: boolean -): ReadonlySet { - if (!scopeActive || sections.rows.size === 0) { - return NONE - } - // Each sectioned agent's scope: null for the session's, else the subagent that spawned it. - const scopeOf = new Map() - for (const agentIds of sections.anchoredAt.values()) { - agentIds.forEach((agentId) => scopeOf.set(agentId, null)) - } - for (const [scope, agentIds] of sections.openAt) { - agentIds.forEach((agentId) => scopeOf.set(agentId, scope)) - } - const handedDown = handDownNestedDelegations(conversation, scopeOf) - const live = new Set() - const visit = (scopeRows: readonly NativeChatMessage[], scope: string | null): void => { - const members = - scope === null - ? [...Array.from(sections.anchoredAt.values()).flat(), ...(sections.openAt.get(null) ?? [])] - : (sections.openAt.get(scope) ?? []) - const inScope = new Set(members) - const belongsHere = (agentId: string): boolean => - !scopeOf.has(agentId) || scopeOf.get(agentId) === scope - const atFrontier = (): readonly string[] => { - for (const row of newestFirst(scopeRows)) { - if (!isOutput(row) || (scope === null && handedDown.rowIds.has(row.id))) { - continue - } - const delegation = nativeChatSubagentDelegation(row) - if (delegation?.kind === 'spawn') { - continue - } - if (delegation === null) { - return [] - } - if (delegation.kind === 'call') { - return inScope.has(delegation.agentId) ? [delegation.agentId] : [] - } - const newest = delegation.agentIds.findLast(belongsHere) - return newest !== undefined && inScope.has(newest) ? [newest] : [] - } - // Nothing loaded since the newest roster naming this scope's agents. - const rostered = members.filter((agentId) => sections.rosters.has(agentId)) - const newest = rostered.reduce( - (best, agentId) => - best === undefined || compareAddedAt(sections, agentId, best) > 0 ? agentId : best, - undefined - ) - return newest === undefined ? [] : [newest] - } - atFrontier().forEach((agentId) => live.add(agentId)) - for (const agentId of members) { - const entry = sections.entries.get(agentId) - if (entry !== undefined && normalizeSubagentState(entry.state) === 'working') { - const own = (sections.rows.get(agentId) ?? []).map((row) => row.message) - const extra = handedDown.byScope.get(agentId) - visit(extra ? [...own, ...extra].sort(compareMessages) : own, agentId) - } - } - } - visit(conversation, null) - return live -} - -/** Use each folded run’s newest part, not its drawn position above later rosters; runs fold only into the latest assistant row. */ -function* newestFirst(rows: readonly NativeChatMessage[]): Generator { - let below: NativeChatMessage[] = [] - for (let index = rows.length - 1; index >= 0; index -= 1) { - const row = rows[index]! - if (row.role !== 'assistant') { - below.push(row) - continue - } - const newest = row.foldedJournalPosition ?? row.journalPosition - let next = 0 - while (next < below.length && (newest === undefined || isNewerThan(below[next]!, newest))) { - yield below[next]! - next += 1 - } - yield row - yield* below.slice(next) - below = [] - } - yield* below -} - -/** A row the journal does not hold yet is newer than any it does. */ -function isNewerThan(row: NativeChatMessage, position: AgentJournalPosition): boolean { - return ( - row.journalPosition === undefined || - compareAgentJournalPositions(row.journalPosition, position) > 0 - ) -} - -/** The session's roster rows and calls whose agents one subagent spawned, by that subagent. */ -function handDownNestedDelegations( - conversation: readonly NativeChatMessage[], - scopeOf: ReadonlyMap -): { rowIds: ReadonlySet; byScope: ReadonlyMap } { - const rowIds = new Set() - const byScope = new Map() - if (!Array.from(scopeOf.values()).some((scope) => scope !== null)) { - return { rowIds, byScope } - } - for (const message of conversation) { - const delegation = nativeChatSubagentDelegation(message) - if (delegation === null || delegation.kind === 'spawn') { - continue - } - const agentIds = delegation.kind === 'call' ? [delegation.agentId] : delegation.agentIds - const spawners = new Set( - agentIds.flatMap((agentId) => (scopeOf.has(agentId) ? [scopeOf.get(agentId) ?? null] : [])) - ) - const [spawner] = spawners - if (spawners.size === 1 && spawner !== undefined && spawner !== null) { - rowIds.add(message.id) - const rows = byScope.get(spawner) - if (rows) { - rows.push(message) - } else { - byScope.set(spawner, [message]) - } - } - } - return { rowIds, byScope } -} - -/** Later roster first; within one roster, the agent whose rows began later. */ -function compareAddedAt(sections: NativeChatSubagentSections, a: string, b: string): number { - const at = (agentId: string) => sections.rosters.get(agentId)?.position - const [rosterA, rosterB] = [at(a), at(b)] - if (rosterA !== undefined && rosterB !== undefined) { - const byRoster = compareAgentJournalPositions(rosterA, rosterB) - if (byRoster !== 0) { - return byRoster - } - } else if (rosterA !== rosterB) { - return rosterA === undefined ? -1 : 1 - } - return compareMessages(sections.rows.get(a)![0]!.message, sections.rows.get(b)![0]!.message) -} diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-reveal.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-reveal.ts deleted file mode 100644 index 27a2dd7cc58..00000000000 --- a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-reveal.ts +++ /dev/null @@ -1,142 +0,0 @@ -// Reveal a subagent named from outside the transcript (the agents strip): open what holds it, then land on its newest drawn activity, else its head or entry. - -import { useLayoutEffect, useRef } from 'react' -import type { StructuredAgentSubagentRoster } from '../../../../../shared/agent-session/view/structured-agent-session-subagent-roster' -import { - isSubagentGroupBlock, - type NativeChatMessage -} from '../../../../../shared/native-chat/native-chat-types' -import type { NativeChatSubagentSections } from './native-chat-subagent-sections' -import { nativeChatSlotIndexOf } from '../conversation/slots/native-chat-transcript-slot-selection' -import type { NativeChatTranscriptSlot } from '../conversation/slots/native-chat-transcript-slots' -import type { NativeChatAlignEdge } from '../viewport/virtualization/use-native-chat-viewport-align' - -/** - * The drawn "Kicked off" row first naming an agent. Siblings' roster items fold into the first - * sibling's row, so an agent's own roster item id can name a row that is never drawn. - * Scanned only on a reveal, never per frame. - */ -function rosterRowNaming( - conversation: readonly NativeChatMessage[], - agentId: string -): string | undefined { - return conversation.find((message) => - message.blocks.some( - (block) => isSubagentGroupBlock(block) && block.agents.some(({ id }) => id === agentId) - ) - )?.id -} - -/** Where a subagent is in the committed transcript, and what opening it takes. */ -export type NativeChatSubagentPlace = - | { kind: 'open'; agentIds: readonly string[]; rosterRowId?: string } - | { kind: 'page' } - | { kind: 'stop' } - -export function nativeChatSubagentPlace({ - agentId, - conversation, - sections, - roster, - slots, - historyFloor -}: { - agentId: string - conversation: readonly NativeChatMessage[] - sections: NativeChatSubagentSections - roster: StructuredAgentSubagentRoster | undefined - slots: readonly NativeChatTranscriptSlot[] - /** The sequence the transcript's history starts from (its latest `/clear`); 0 for none. Read only when nothing loaded names the agent. */ - historyFloor: () => number -}): NativeChatSubagentPlace { - const first = sections.rows.get(agentId)?.[0] - if (first !== undefined) { - // Nested sections open from the outermost, which also opens the roster anchoring it. - return { kind: 'open', agentIds: sections.pathOf.get(first.message.id) ?? [agentId] } - } - // No activity yet (just spawned, or an agent that reports only its final reply): its roster entry. - const rosterRowId = rosterRowNaming(conversation, agentId) - if (rosterRowId !== undefined && nativeChatSlotIndexOf(slots, rosterRowId) !== -1) { - return { kind: 'open', agentIds: [agentId], rosterRowId } - } - const named = roster?.get(agentId) - if (named === undefined) { - return { kind: 'stop' } - } - // A spawn before the latest /clear is outside this conversation: no page reaches it. - return named.rosterPosition.sequence < historyFloor() ? { kind: 'stop' } : { kind: 'page' } -} - -export type NativeChatSubagentLanding = { - index: number - edge: NativeChatAlignEdge - /** Set when the landing is the agent's entry inside a roster slot rather than a slot of its own. */ - entryId?: string -} - -/** Newest drawn activity (streaming stubs draw nothing), else the section head, else the roster entry. */ -export function nativeChatSubagentLanding( - slots: readonly NativeChatTranscriptSlot[], - conversation: readonly NativeChatMessage[], - sections: NativeChatSubagentSections, - agentId: string -): NativeChatSubagentLanding | null { - const rowIds = new Set(sections.rows.get(agentId)?.map(({ message }) => message.id)) - const activity = slots.findLastIndex( - (slot) => - slot.kind === 'message' && - (rowIds.has(slot.message.id) || slot.workRun?.some(({ id }) => rowIds.has(id)) === true) - ) - if (activity !== -1) { - return { index: activity, edge: 'end' } - } - const head = slots.findIndex((slot) => slot.kind === 'subagent' && slot.agentId === agentId) - if (head !== -1) { - return { index: head, edge: 'start' } - } - const entries = slots.findIndex( - (slot) => slot.kind === 'subagent-entries' && slot.agents.some(({ id }) => id === agentId) - ) - const rosterRowId = sections.rosters.get(agentId)?.rowId ?? rosterRowNaming(conversation, agentId) - const index = entries !== -1 ? entries : nativeChatSlotIndexOf(slots, rosterRowId) - return index >= 0 ? { index, edge: 'start', entryId: agentId } : null -} - -/** Land once per request: the row's end for activity, or the entry when the row's start would leave it below the view. */ -export function useNativeChatSubagentLanding({ - request, - landing, - scrollRef, - scrollMessageToTop, - release -}: { - request: { requestId: number } | null - landing: NativeChatSubagentLanding | null - scrollRef: React.RefObject - scrollMessageToTop: (element: HTMLElement, edge?: NativeChatAlignEdge) => void - release: (request: null) => void -}): void { - const servicedRef = useRef(0) - useLayoutEffect(() => { - if (request === null || servicedRef.current === request.requestId) { - return - } - servicedRef.current = request.requestId - const scroller = scrollRef.current - const row = - landing === null - ? null - : scroller?.querySelector(`[data-index="${landing.index}"]`) - if (scroller && landing && row) { - const entry = Array.from( - row.querySelectorAll('[data-native-chat-subagent-entry]') - ).find((element) => element.dataset.nativeChatSubagentEntry === landing.entryId) - const entryBelowView = - entry !== undefined && - entry.getBoundingClientRect().bottom - row.getBoundingClientRect().top > - scroller.clientHeight - scrollMessageToTop(entryBelowView ? entry : row, entryBelowView ? 'start' : landing.edge) - } - release(null) - }, [landing, release, request, scrollMessageToTop, scrollRef]) -} diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-scope.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-scope.ts new file mode 100644 index 00000000000..a91cec062fb --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-scope.ts @@ -0,0 +1,149 @@ +// A transcript shows one scope: the conversation, or one subagent's own rows. Subagents open in their own view, never inline. + +import { compareAgentJournalPositions } from '../../../../../shared/agent-session/journal/agent-session-journal-position' +import type { StructuredAgentSubagentRoster } from '../../../../../shared/agent-session/view/structured-agent-session-subagent-roster' +import { + isSubagentGroupBlock, + type NativeChatMessage, + type NativeChatSubagentEntry +} from '../../../../../shared/native-chat/native-chat-types' +import type { NativeChatSubagentRow } from '../../../../../shared/native-chat/transcript/native-chat-transcript-projection' +import { compareNativeChatDisplayMessages as compareMessages } from '../../../../../shared/native-chat/transcript/native-chat-message-order' + +const NO_HEADS: readonly NativeChatSubagentHead[] = [] + +/** A subagent no roster row in its scope names: it opens from a head at its first row. */ +export type NativeChatSubagentHead = { + agentId: string + entry: NativeChatSubagentEntry | undefined + first: NativeChatSubagentRow +} + +function* rosterAgents(rows: readonly NativeChatMessage[]): Generator { + for (const message of rows) { + for (const block of message.blocks) { + if (isSubagentGroupBlock(block)) { + yield* block.agents + } + } + } +} + +/** Every subagent the session names, oldest roster first: a loaded roster's entry, else the client's. */ +export function nativeChatSubagentEntries( + conversation: readonly NativeChatMessage[], + subagentRows: ReadonlyMap, + roster?: StructuredAgentSubagentRoster +): ReadonlyMap { + const loaded = new Map() + const take = (rows: readonly NativeChatMessage[]): void => { + for (const agent of rosterAgents(rows)) { + if (!loaded.has(agent.id)) { + loaded.set(agent.id, agent) + } + } + } + take(conversation) + for (const rows of subagentRows.values()) { + take(rows.map(({ message }) => message)) + } + const position = (agentId: string) => roster?.get(agentId)?.rosterPosition + const ids = Array.from(new Set([...(roster?.keys() ?? []), ...loaded.keys()])).sort((a, b) => { + const [left, right] = [position(a), position(b)] + return left && right ? compareAgentJournalPositions(left, right) : left ? -1 : right ? 1 : 0 + }) + return new Map( + ids.map((agentId) => [agentId, loaded.get(agentId) ?? roster!.get(agentId)!.entry]) + ) +} + +/** The subagent that spawned this one, when its rows are loaded; null for the session's own agent. */ +function spawnerOf( + agentId: string, + subagentRows: ReadonlyMap +): string | null { + const parent = subagentRows.get(agentId)?.[0]?.message.parentAgentId + return parent !== undefined && parent !== agentId && subagentRows.has(parent) ? parent : null +} + +/** The spawn chain down to a subagent, outermost first; a loop stops at the first repeat. */ +export function nativeChatSubagentChain( + agentId: string, + subagentRows: ReadonlyMap +): readonly string[] { + const chain = [agentId] + for ( + let spawner = spawnerOf(agentId, subagentRows); + spawner !== null && !chain.includes(spawner); + spawner = spawnerOf(spawner, subagentRows) + ) { + chain.unshift(spawner) + } + return chain +} + +/** Subagents the scope's agent (null: the session's) spawned that no roster row in `scopeRows` names. */ +export function nativeChatSubagentHeads( + scopeRows: readonly NativeChatMessage[], + subagentRows: ReadonlyMap, + entries: ReadonlyMap, + scopeAgentId: string | null +): readonly NativeChatSubagentHead[] { + if (subagentRows.size === 0) { + return NO_HEADS + } + const named = new Set(Array.from(rosterAgents(scopeRows), ({ id }) => id)) + const heads: NativeChatSubagentHead[] = [] + for (const [agentId, rows] of subagentRows) { + const first = rows[0] + if ( + first !== undefined && + !named.has(agentId) && + agentId !== scopeAgentId && + spawnerOf(agentId, subagentRows) === scopeAgentId + ) { + heads.push({ agentId, entry: entries.get(agentId), first }) + } + } + return heads.sort((a, b) => compareMessages(a.first.message, b.first.message)) +} + +/** Sort child rows separately so parent-only streaming updates reuse their order. */ +export function nativeChatSubagentRowsInOrder( + subagentRows: ReadonlyMap +): readonly NativeChatSubagentRow[] { + return Array.from(subagentRows.values()) + .flat() + .sort((a, b) => compareMessages(a.message, b.message)) +} + +/** Merge parent and child rows in transcript order so child edits remain in their actual turns. */ +export function nativeChatRowsInTranscriptOrder( + messages: readonly NativeChatMessage[], + turnKeys: readonly (string | undefined)[], + subagentRows: readonly NativeChatSubagentRow[] +): { messages: readonly NativeChatMessage[]; turnKeys: readonly (string | undefined)[] } { + if (subagentRows.length === 0) { + return { messages, turnKeys } + } + const merged: NativeChatMessage[] = [] + const mergedTurnKeys: (string | undefined)[] = [] + let next = 0 + for (const [index, message] of messages.entries()) { + while ( + next < subagentRows.length && + compareMessages(subagentRows[next]!.message, message) < 0 + ) { + merged.push(subagentRows[next]!.message) + mergedTurnKeys.push(subagentRows[next]!.turnKey) + next += 1 + } + merged.push(message) + mergedTurnKeys.push(turnKeys[index]) + } + for (const row of subagentRows.slice(next)) { + merged.push(row.message) + mergedTurnKeys.push(row.turnKey) + } + return { messages: merged, turnKeys: mergedTurnKeys } +} diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-section-slots.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-section-slots.ts deleted file mode 100644 index 3168299ff4f..00000000000 --- a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-section-slots.ts +++ /dev/null @@ -1,201 +0,0 @@ -import type { - NativeChatMessage, - NativeChatSubagentEntry -} from '../../../../../shared/native-chat/native-chat-types' -import { - normalizeSubagentState, - subagentGroupBlocks -} from '../../../../../shared/native-chat/transcript/native-chat-subagent-summary' -import { nativeChatRowRendersContent } from '../../../../../shared/native-chat/transcript/native-chat-row-content' -import { - type NativeChatRowTypography, - estimateNativeChatRowHeight, - nativeChatRowContentMetrics, - NATIVE_CHAT_SUBAGENT_SECTION_HEAD_PX -} from '../viewport/virtualization/native-chat-row-height-estimate' -import type { NativeChatResolvedPrompt } from '../../../../../shared/native-chat/native-chat-resolution-receipt' -import { compareNativeChatDisplayMessages as compareMessages } from '../../../../../shared/native-chat/transcript/native-chat-message-order' -import { - nativeChatSubagentEntryRuns, - type NativeChatSubagentChoices, - type NativeChatSubagentRosterState, - type NativeChatSubagentSections -} from './native-chat-subagent-sections' -import { - nativeChatRowRendersProse, - nativeChatRowSpeaksOrActs -} from '../../../../../shared/native-chat/native-chat-trailing-run' -import type { NativeChatTranscriptSlot } from '../conversation/slots/native-chat-transcript-slots' - -/** The head of a section no loaded roster row holds: it names whose rows follow it. */ -export type NativeChatSubagentSectionSlot = { - kind: 'subagent' - agentId: string - /** The conversation turn this head sits in, so the outline rail can place it. */ - turnKey: string | undefined - /** The roster's entry for the agent; absent when no loaded roster names it. */ - entry: NativeChatSubagentEntry | undefined - expanded: boolean - /** Sections this head sits inside; 0 is the conversation. */ - depth: number - estimatedHeight: number -} - -/** A roster row's entries after an open child's rows, through the next open one. */ -export type NativeChatSubagentEntriesSlot = { - kind: 'subagent-entries' - rosterRowId: string - agents: readonly NativeChatSubagentEntry[] - sections: ReadonlyMap - turnKey: string | undefined - depth: number - estimatedHeight: number -} - -/** Place children under loaded roster entries or their first rows; live-frontier defaults yield to reader section/list choices. */ -export function nativeChatSubagentSectionSlots({ - sections, - choices, - live, - receipts, - slots, - typography -}: { - sections: NativeChatSubagentSections - choices: NativeChatSubagentChoices - live: ReadonlySet - receipts: ReadonlyMap - slots: NativeChatTranscriptSlot[] - typography?: NativeChatRowTypography -}) { - const isOpen = (agentId: string): boolean => choices.sections.get(agentId) ?? live.has(agentId) - const pushHead = (agentId: string, depth: number, turnKey: string | undefined): void => { - slots.push({ - kind: 'subagent', - agentId, - turnKey, - entry: sections.entries.get(agentId), - expanded: isOpen(agentId), - depth, - estimatedHeight: NATIVE_CHAT_SUBAGENT_SECTION_HEAD_PX - }) - } - /** Use the section’s displayed turn for all child rows so the outline rail tracks reader position. */ - const pushRows = (agentId: string, depth: number, turnKey: string | undefined): void => { - const rows = sections.rows.get(agentId) ?? [] - const entry = sections.entries.get(agentId) - const working = entry !== undefined && normalizeSubagentState(entry.state) === 'working' - const trailing = rows.findLastIndex((row) => - nativeChatRowSpeaksOrActs(row.message, nativeChatRowRendersProse(row.message), receipts) - ) - const pending = [...(sections.openAt.get(agentId) ?? [])] - for (const [index, { message }] of rows.entries()) { - openBefore(pending, message, depth, { turnKey }) - const receipt = receipts.get(message.id) - if (receipt === undefined && !nativeChatRowRendersContent(message.blocks)) { - continue - } - slots.push({ - kind: 'message', - message, - turnKey, - activeTurnIsWorking: working, - trailingRun: index === trailing, - receipt, - status: undefined, - folded: false, - drawsMessage: true, - turnFolds: false, - turnDiff: undefined, - subagentRoster: undefined, - depth, - estimatedHeight: estimateNativeChatRowHeight( - nativeChatRowContentMetrics(message, typography), - { - hasReceipt: receipt !== undefined, - hasStatus: false, - hasTurnDiff: false, - inSubagentSection: true - }, - typography - ) - }) - } - openBefore(pending, undefined, depth, { turnKey }) - } - /** Emit heads before the next message; undefined flushes all. Nested sections inherit their enclosing turn. */ - function openBefore( - pending: string[], - message: NativeChatMessage | undefined, - depth: number, - section?: { turnKey: string | undefined } - ) { - while (pending.length > 0) { - const agentId = pending[0]! - const first = sections.rows.get(agentId)?.[0] - if ( - message !== undefined && - first !== undefined && - compareMessages(first.message, message) >= 0 - ) { - return - } - pending.shift() - const turnKey = section ? section.turnKey : first?.turnKey - pushHead(agentId, depth, turnKey) - if (isOpen(agentId)) { - pushRows(agentId, depth + 1, turnKey) - } - } - } - return { - openBefore, - /** Each open child's rows under its entry, then the entries up to the next open one. */ - openAnchoredAt( - message: NativeChatMessage, - roster: NativeChatSubagentRosterState | undefined, - turnKey: string | undefined - ): void { - // No child has rows yet (a reveal before first activity): the roster row draws every entry. - if (!roster?.open || roster.sections.size === 0) { - return - } - for (const group of subagentGroupBlocks(message.blocks)) { - let opened: string | undefined - for (const agents of nativeChatSubagentEntryRuns(group.agents, roster.sections)) { - if (opened !== undefined) { - pushRows(opened, 1, turnKey) - if (agents.length > 0) { - slots.push({ - kind: 'subagent-entries', - rosterRowId: message.id, - agents, - sections: roster.sections, - turnKey, - depth: 0, - estimatedHeight: agents.length * NATIVE_CHAT_SUBAGENT_SECTION_HEAD_PX - }) - } - } - opened = agents.at(-1)?.id - } - } - }, - rosterAt(messageId: string): NativeChatSubagentRosterState | undefined { - const anchored = sections.anchoredAt.get(messageId) - if (anchored === undefined) { - // A roster whose children have no rows yet still holds an open it was given (a strip reveal). - const chosen = choices.rosters.get(messageId) - return chosen === undefined ? undefined : { open: chosen, sections: NO_ROSTER_SECTIONS } - } - return { - open: - choices.rosters.get(messageId) ?? - anchored.some((agentId) => choices.sections.has(agentId) || live.has(agentId)), - sections: new Map(anchored.map((agentId) => [agentId, isOpen(agentId)])) - } - } - } -} - -const NO_ROSTER_SECTIONS: ReadonlyMap = new Map() diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-sections.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-sections.ts deleted file mode 100644 index f260e3688ba..00000000000 --- a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-sections.ts +++ /dev/null @@ -1,216 +0,0 @@ -// Retained roster metadata names windowed-out spawns; place children under loaded roster entries, their parent section or their first conversation row. - -import type { AgentJournalPosition } from '../../../../../shared/agent-session/journal/agent-session-journal-types' -import { - isSubagentGroupBlock, - type NativeChatMessage, - type NativeChatSubagentEntry -} from '../../../../../shared/native-chat/native-chat-types' -import type { NativeChatSubagentRow } from '../../../../../shared/native-chat/transcript/native-chat-transcript-projection' -import type { StructuredAgentSubagentRoster } from '../../../../../shared/agent-session/view/structured-agent-session-subagent-roster' -import { compareNativeChatDisplayMessages as compareMessages } from '../../../../../shared/native-chat/transcript/native-chat-message-order' - -export type NativeChatSubagentRosterPlace = { - rowId: string - position: AgentJournalPosition | undefined -} - -export type NativeChatSubagentSections = { - rows: ReadonlyMap - /** The entry of the first roster naming each subagent: a loaded one, else the client's. */ - entries: ReadonlyMap - rosters: ReadonlyMap - /** Roster row id → the subagents whose sections open under it, in roster order. */ - anchoredAt: ReadonlyMap - /** Unanchored sections by enclosing agent (null for conversation), ordered by first row. */ - openAt: ReadonlyMap - /** Row id → the sections enclosing it, outermost first. */ - pathOf: ReadonlyMap -} - -/** Explicit reader choices override defaults; closed roster lists hide their child sections. */ -export type NativeChatSubagentChoices = { - sections: ReadonlyMap - rosters: ReadonlyMap -} - -export const NO_NATIVE_CHAT_SUBAGENT_CHOICES: NativeChatSubagentChoices = { - sections: new Map(), - rosters: new Map() -} - -/** An open child’s rows follow its roster entry. */ -export type NativeChatSubagentRosterState = { - open: boolean - sections: ReadonlyMap -} - -/** Break roster entries after each open child; later entry runs follow that child’s rows. */ -export function nativeChatSubagentEntryRuns( - agents: readonly NativeChatSubagentEntry[], - sections: ReadonlyMap -): NativeChatSubagentEntry[][] { - let run: NativeChatSubagentEntry[] = [] - const runs = [run] - for (const agent of agents) { - run.push(agent) - if (sections.get(agent.id) === true) { - run = [] - runs.push(run) - } - } - return runs -} - -export type NativeChatSubagentDisclosure = { - setSectionOpen: (agentId: string, open: boolean) => void - setRosterOpen: (rosterRowId: string, open: boolean) => void -} - -export const NO_NATIVE_CHAT_SUBAGENT_SECTIONS: NativeChatSubagentSections = { - rows: new Map(), - entries: new Map(), - rosters: new Map(), - anchoredAt: new Map(), - openAt: new Map(), - pathOf: new Map() -} - -export function nativeChatSubagentSections( - conversation: readonly NativeChatMessage[], - subagentRows: ReadonlyMap, - roster?: StructuredAgentSubagentRoster -): NativeChatSubagentSections { - const rows = new Map(Array.from(subagentRows).filter(([, agentRows]) => agentRows.length > 0)) - if (rows.size === 0) { - return NO_NATIVE_CHAT_SUBAGENT_SECTIONS - } - const entries = new Map() - const rosters = new Map() - for (const message of conversation) { - for (const block of message.blocks) { - if (!isSubagentGroupBlock(block)) { - continue - } - for (const agent of block.agents) { - if (!entries.has(agent.id) && rows.has(agent.id)) { - entries.set(agent.id, agent) - rosters.set(agent.id, { rowId: message.id, position: message.journalPosition }) - } - } - } - } - // Loaded rosters anchor their sections; the client's names the rest. - const anchored = new Set(rosters.keys()) - for (const agentId of rows.keys()) { - const named = anchored.has(agentId) ? undefined : roster?.get(agentId) - if (named !== undefined) { - entries.set(agentId, named.entry) - rosters.set(agentId, { rowId: named.rosterItemId, position: named.rosterPosition }) - } - } - const firstRow = (agentId: string): NativeChatMessage => rows.get(agentId)![0]!.message - const spawnerOf = (agentId: string): string | null => { - const parent = firstRow(agentId).parentAgentId - return parent !== undefined && parent !== agentId && rows.has(parent) ? parent : null - } - // A chain of spawners that loops back has no outside to open in. - const scopeOf = (agentId: string): string | null => { - const spawner = spawnerOf(agentId) - const seen = new Set([agentId]) - for (let current = spawner; current !== null; current = spawnerOf(current)) { - if (seen.has(current)) { - return null - } - seen.add(current) - } - return spawner - } - const scopes = new Map() - const openAt = new Map() - for (const agentId of rows.keys()) { - const scope = scopeOf(agentId) - scopes.set(agentId, scope) - if (scope !== null || !anchored.has(agentId)) { - const inScope = openAt.get(scope) - if (inScope) { - inScope.push(agentId) - } else { - openAt.set(scope, [agentId]) - } - } - } - for (const inScope of openAt.values()) { - inScope.sort((a, b) => compareMessages(firstRow(a), firstRow(b))) - } - const anchoredAt = new Map() - for (const [agentId, { rowId }] of rosters) { - if (anchored.has(agentId) && scopes.get(agentId) === null) { - const anchored = anchoredAt.get(rowId) - if (anchored) { - anchored.push(agentId) - } else { - anchoredAt.set(rowId, [agentId]) - } - } - } - const paths = new Map() - const pathTo = (agentId: string): readonly string[] => { - const known = paths.get(agentId) - if (known) { - return known - } - const scope = scopes.get(agentId) ?? null - const path = scope === null ? [agentId] : [...pathTo(scope), agentId] - paths.set(agentId, path) - return path - } - const pathOf = new Map() - for (const [agentId, agentRows] of rows) { - const path = pathTo(agentId) - for (const row of agentRows) { - pathOf.set(row.message.id, path) - } - } - return { rows, entries, rosters, anchoredAt, openAt, pathOf } -} - -/** Sort child rows separately so parent-only streaming updates reuse their order. */ -export function nativeChatSubagentRowsInOrder( - subagentRows: ReadonlyMap -): readonly NativeChatSubagentRow[] { - return Array.from(subagentRows.values()) - .flat() - .sort((a, b) => compareMessages(a.message, b.message)) -} - -/** Merge parent and child rows in transcript order so child edits remain in their actual turns. */ -export function nativeChatRowsInTranscriptOrder( - messages: readonly NativeChatMessage[], - turnKeys: readonly (string | undefined)[], - subagentRows: readonly NativeChatSubagentRow[] -): { messages: readonly NativeChatMessage[]; turnKeys: readonly (string | undefined)[] } { - if (subagentRows.length === 0) { - return { messages, turnKeys } - } - const merged: NativeChatMessage[] = [] - const mergedTurnKeys: (string | undefined)[] = [] - let next = 0 - for (const [index, message] of messages.entries()) { - while ( - next < subagentRows.length && - compareMessages(subagentRows[next]!.message, message) < 0 - ) { - merged.push(subagentRows[next]!.message) - mergedTurnKeys.push(subagentRows[next]!.turnKey) - next += 1 - } - merged.push(message) - mergedTurnKeys.push(turnKeys[index]) - } - for (const row of subagentRows.slice(next)) { - merged.push(row.message) - mergedTurnKeys.push(row.turnKey) - } - return { messages: merged, turnKeys: mergedTurnKeys } -} diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-switcher-items.test.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-switcher-items.test.ts new file mode 100644 index 00000000000..c4ecc924d02 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-switcher-items.test.ts @@ -0,0 +1,39 @@ +import { describe, expect, it } from 'vitest' +import type { NativeChatSubagentRow } from '../../../../../shared/native-chat/transcript/native-chat-transcript-projection' +import { nativeChatSubagentSwitcherItems } from './native-chat-subagent-switcher-items' + +function rows(id: string, parentAgentId?: string): [string, NativeChatSubagentRow[]] { + return [ + id, + [ + { + message: { + id: `${id}-row`, + role: 'assistant', + blocks: [], + timestamp: 1, + source: 'transcript', + ...(parentAgentId ? { parentAgentId } : {}) + }, + turnKey: undefined + } + ] + ] +} + +describe('nativeChatSubagentSwitcherItems', () => { + it('lists each child under the subagent that spawned it and numbers unnamed agents', () => { + const entries = new Map([ + ['a', { id: 'a', label: 'Audit', state: 'working' as const }], + ['b', { id: 'b', label: 'Build', state: 'completed' as const }] + ]) + const subagentRows = new Map([rows('a'), rows('c', 'a'), rows('d', 'c'), rows('b'), rows('e')]) + expect(nativeChatSubagentSwitcherItems(entries, subagentRows, 'Subagent')).toEqual([ + { id: 'a', label: 'Audit', depth: 0 }, + { id: 'c', label: 'Subagent', depth: 1 }, + { id: 'd', label: 'Subagent 2', depth: 2 }, + { id: 'b', label: 'Build', depth: 0 }, + { id: 'e', label: 'Subagent 3', depth: 0 } + ]) + }) +}) diff --git a/src/renderer/src/components/native-chat/subagents/native-chat-subagent-switcher-items.ts b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-switcher-items.ts new file mode 100644 index 00000000000..8b800eea92e --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/native-chat-subagent-switcher-items.ts @@ -0,0 +1,47 @@ +import { disambiguateSubagentLabels } from '../../../../../shared/native-chat/transcript/native-chat-subagent-items' +import type { NativeChatSubagentEntry } from '../../../../../shared/native-chat/native-chat-types' +import type { NativeChatSubagentRow } from '../../../../../shared/native-chat/transcript/native-chat-transcript-projection' +import { nativeChatSubagentChain } from './native-chat-subagent-scope' + +export type NativeChatSubagentSwitcherItem = { id: string; label: string; depth: number } + +/** Every subagent, each spawner's children right under it; repeated or missing names get ordinals. */ +export function nativeChatSubagentSwitcherItems( + entries: ReadonlyMap, + subagentRows: ReadonlyMap, + unnamed: string +): readonly NativeChatSubagentSwitcherItem[] { + const ids = [ + ...entries.keys(), + ...Array.from(subagentRows.keys()).filter((id) => !entries.has(id)) + ] + const labels = new Map( + disambiguateSubagentLabels(ids.map((id) => entries.get(id)?.label ?? unnamed)).map( + (label, index) => [ids[index]!, label] + ) + ) + const parentOf = new Map( + ids.map((id) => [id, nativeChatSubagentChain(id, subagentRows).at(-2) ?? null]) + ) + const items: NativeChatSubagentSwitcherItem[] = [] + const placed = new Set() + const place = (parent: string | null, depth: number): void => { + for (const id of ids) { + if (!placed.has(id) && parentOf.get(id) === parent) { + placed.add(id) + items.push({ id, label: labels.get(id)!, depth }) + place(id, depth + 1) + } + } + } + place(null, 0) + // A spawner no entry names leaves its children unplaced; they list at the top level. + for (const id of ids) { + if (!placed.has(id)) { + placed.add(id) + items.push({ id, label: labels.get(id)!, depth: 0 }) + place(id, 1) + } + } + return items +} diff --git a/src/renderer/src/components/native-chat/subagents/use-native-chat-subagent-scope.tsx b/src/renderer/src/components/native-chat/subagents/use-native-chat-subagent-scope.tsx new file mode 100644 index 00000000000..63911ce7d58 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/use-native-chat-subagent-scope.tsx @@ -0,0 +1,197 @@ +import { useEffect, useMemo } from 'react' +import { useTranslate, type Translate } from '@/i18n/use-translate' +import { latestAgentSessionContextClearSequence } from '../../../../../shared/agent-session/agent-session-context-clear' +import type { AgentSessionLatestTurn } from '../../../../../shared/agent-session/agent-session-wire' +import type { + AgentJournalRenderItem, + AgentJournalSubmission +} from '../../../../../shared/agent-session/journal/agent-session-journal-types' +import type { StructuredAgentSubagentRoster } from '../../../../../shared/agent-session/view/structured-agent-session-subagent-roster' +import type { + NativeChatMessage, + NativeChatSubagentEntry +} from '../../../../../shared/native-chat/native-chat-types' +import { normalizeSubagentState } from '../../../../../shared/native-chat/transcript/native-chat-subagent-summary' +import type { NativeChatSubagentRow } from '../../../../../shared/native-chat/transcript/native-chat-transcript-projection' +import { + useNativeChatTurnMembership, + type NativeChatTurnRows +} from '../conversation/slots/use-native-chat-turn-membership' +import type { NativeChatSubagentView } from './native-chat-open-subagent' +import { nativeChatSubagentHistoryStep } from './native-chat-subagent-history' +import { + nativeChatSubagentChain, + nativeChatSubagentEntries, + nativeChatSubagentHeads, + nativeChatSubagentRowsInOrder +} from './native-chat-subagent-scope' +import { + nativeChatSubagentEnding, + nativeChatSubagentEndingMessage, + type NativeChatSubagentAside +} from './native-chat-subagent-ending' +import { NativeChatSubagentViewBar } from './NativeChatSubagentViewBar' +import { NativeChatSubagentPrompt } from './NativeChatSubagentPrompt' +import { nativeChatSubagentHandoff } from './native-chat-subagent-handoff' + +const NO_MESSAGES: readonly NativeChatMessage[] = [] +const NO_SUBAGENT_ROWS: readonly NativeChatSubagentRow[] = [] +const NO_TURN_KEYS: readonly (string | undefined)[] = [] +const NO_ENTRIES: ReadonlyMap = new Map() +const NO_CHAIN: readonly string[] = [] + +function asideText(aside: NativeChatSubagentAside, t: Translate): string { + switch (aside) { + case 'no-steps': + return t('components.native-chat.subagents.noSteps', 'No steps yet') + case 'cleared': + return t( + 'components.native-chat.subagents.beforeClear', + 'This subagent ran before the chat was cleared' + ) + case 'stopped': + return t('components.native-chat.subagents.stoppedBeforeReply', 'Stopped before replying') + case 'no-reply': + return t('components.native-chat.subagents.noReply', 'Ended without a reply') + } +} + +/** What a transcript draws: the conversation in its turns, or one subagent's own rows with none. */ +export function useNativeChatSubagentScope({ + view, + conversation, + subagentRows, + roster, + journalItems, + journalSubmissions, + latestTurn, + isWorking +}: { + view: NativeChatSubagentView | undefined + conversation: readonly NativeChatMessage[] + subagentRows: ReadonlyMap + roster: StructuredAgentSubagentRoster | undefined + journalItems: readonly AgentJournalRenderItem[] | undefined + journalSubmissions: readonly AgentJournalSubmission[] | undefined + latestTurn: AgentSessionLatestTurn | null | undefined + isWorking: boolean +}) { + const agentId = view?.agentId ?? null + // The conversation names its subagents only for heads, which need rows; a subagent's bar lists them all. + const entries = useMemo( + () => + agentId === null && subagentRows.size === 0 + ? NO_ENTRIES + : nativeChatSubagentEntries(conversation, subagentRows, roster), + [agentId, conversation, roster, subagentRows] + ) + const t = useTranslate() + const entry = agentId === null ? undefined : entries.get(agentId) + const chain = useMemo( + () => (agentId === null ? NO_CHAIN : nativeChatSubagentChain(agentId, subagentRows)), + [agentId, subagentRows] + ) + const parentId = chain.at(-2) ?? null + const noteParent = view?.noteParent + useEffect(() => { + noteParent?.(parentId) + }, [noteParent, parentId]) + const handoff = useMemo( + () => + agentId === null + ? null + : nativeChatSubagentHandoff({ agentId, journalItems, conversation, subagentRows }), + [agentId, conversation, journalItems, subagentRows] + ) + // A subagent's view pages history only while older history still holds its spawn. + const history = useMemo( + () => + agentId === null + ? 'page' + : nativeChatSubagentHistoryStep({ + agentId, + conversation, + subagentRows, + roster, + historyFloor: () => latestAgentSessionContextClearSequence(journalItems ?? []) + }), + [agentId, conversation, journalItems, roster, subagentRows] + ) + const messages = useMemo(() => { + if (agentId === null) { + return conversation + } + const own = (subagentRows.get(agentId) ?? NO_SUBAGENT_ROWS).map(({ message }) => message) + const ending = nativeChatSubagentEnding({ entry, handoff, rows: own, history }) + return ending === null + ? own + : [ + ...own, + nativeChatSubagentEndingMessage( + agentId, + ending, + ending.kind === 'aside' ? asideText(ending.aside, t) : '', + entry?.settledAt + ) + ] + }, [agentId, conversation, entry, handoff, history, subagentRows, t]) + const heads = useMemo( + () => nativeChatSubagentHeads(messages, subagentRows, entries, agentId), + [agentId, entries, messages, subagentRows] + ) + // Child edits and PRs count in the conversation's turns, which a subagent's view does not draw. + const rowsInOrder = useMemo( + () => (agentId === null ? nativeChatSubagentRowsInOrder(subagentRows) : NO_SUBAGENT_ROWS), + [agentId, subagentRows] + ) + const conversationTurns = useNativeChatTurnMembership( + agentId === null ? messages : NO_MESSAGES, + journalItems, + journalSubmissions, + latestTurn + ) + const turnRows = useMemo( + () => + agentId === null + ? conversationTurns + : { messages, turnKeys: NO_TURN_KEYS, liveTurnKey: undefined }, + [agentId, conversationTurns, messages] + ) + const open = view?.open + return { + agentId, + open, + /** Leads a subagent's transcript: what the main agent asked of it. */ + lead: + agentId !== null && handoff?.prompt ? ( + + ) : null, + /** Drawn above a subagent's own transcript. */ + bar: + agentId !== null && open ? ( + + ) : null, + messages, + heads, + rowsInOrder, + turnRows, + /** The conversation's turns; null in a subagent's view. */ + conversationTurns: agentId === null ? turnRows : null, + pagesHistory: history === 'page', + /** Names the transcript region: the conversation, or the subagent it shows. */ + regionLabel: + agentId === null + ? t('components.native-chat.transcriptLabel', 'Conversation') + : (entry?.label ?? t('components.native-chat.subagents.unnamed', 'Subagent')), + // A subagent's rows sit in the conversation's turns, so its view runs on the agent's own state. + working: + agentId === null + ? isWorking + : entry !== undefined && normalizeSubagentState(entry.state) === 'working' + } +} diff --git a/src/renderer/src/components/native-chat/subagents/use-native-chat-subagent-sections.ts b/src/renderer/src/components/native-chat/subagents/use-native-chat-subagent-sections.ts deleted file mode 100644 index d332712c94d..00000000000 --- a/src/renderer/src/components/native-chat/subagents/use-native-chat-subagent-sections.ts +++ /dev/null @@ -1,81 +0,0 @@ -import { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react' -import type { NativeChatMessage } from '../../../../../shared/native-chat/native-chat-types' -import type { NativeChatSubagentRow } from '../../../../../shared/native-chat/transcript/native-chat-transcript-projection' -import type { StructuredAgentSubagentRoster } from '../../../../../shared/agent-session/view/structured-agent-session-subagent-roster' -import { chooseNativeChatExpanded } from '../messages/disclosure/native-chat-expanded-keys' -import { - NO_NATIVE_CHAT_SUBAGENT_CHOICES, - nativeChatSubagentRowsInOrder, - nativeChatSubagentSections, - type NativeChatSubagentChoices, - type NativeChatSubagentDisclosure, - type NativeChatSubagentSections -} from './native-chat-subagent-sections' - -function choose( - current: NativeChatSubagentChoices, - kind: keyof NativeChatSubagentChoices, - key: string, - open: boolean -): NativeChatSubagentChoices { - const next = chooseNativeChatExpanded(current[kind], key, open) - return next === current[kind] ? current : { ...current, [kind]: next } -} - -/** Preserve manual section/roster choices; otherwise expand only at the running scope’s live frontier. */ -export function useNativeChatSubagentSections( - conversation: readonly NativeChatMessage[], - subagentRows: ReadonlyMap, - roster?: StructuredAgentSubagentRoster -): { - sections: NativeChatSubagentSections - /** Every subagent row in transcript order; kept while only the conversation changes. */ - subagentRowsInOrder: readonly NativeChatSubagentRow[] - subagentChoices: NativeChatSubagentChoices - subagentDisclosure: NativeChatSubagentDisclosure - /** Expand containing sections/rosters so reveals can land on these rows. */ - openSubagentSections: (agentIds: readonly string[]) => void -} { - const sections = useMemo( - () => nativeChatSubagentSections(conversation, subagentRows, roster), - [conversation, roster, subagentRows] - ) - const subagentRowsInOrder = useMemo( - () => nativeChatSubagentRowsInOrder(subagentRows), - [subagentRows] - ) - const [subagentChoices, setChoices] = useState(NO_NATIVE_CHAT_SUBAGENT_CHOICES) - const subagentDisclosure = useMemo( - () => ({ - setSectionOpen: (agentId, open) => - setChoices((current) => choose(current, 'sections', agentId, open)), - setRosterOpen: (rosterRowId, open) => - setChoices((current) => choose(current, 'rosters', rosterRowId, open)) - }), - [] - ) - // Read only by a reveal, so the callback keeps one identity while the transcript streams. - const sectionsRef = useRef(sections) - useLayoutEffect(() => { - sectionsRef.current = sections - }, [sections]) - const openSubagentSections = useCallback((agentIds: readonly string[]) => { - const opening = new Set(agentIds) - const rosterRowIds = Array.from(sectionsRef.current.anchoredAt).flatMap(([rowId, anchored]) => - anchored.some((agentId) => opening.has(agentId)) ? [rowId] : [] - ) - setChoices((current) => - rosterRowIds.reduce( - (choices, rowId) => choose(choices, 'rosters', rowId, true), - agentIds.reduce((choices, agentId) => choose(choices, 'sections', agentId, true), current) - ) - ) - }, []) - return { - sections, - subagentRowsInOrder, - subagentChoices, - subagentDisclosure, - openSubagentSections - } -} diff --git a/src/renderer/src/components/native-chat/subagents/use-structured-native-chat-subagents.tsx b/src/renderer/src/components/native-chat/subagents/use-structured-native-chat-subagents.tsx new file mode 100644 index 00000000000..8685f9349f7 --- /dev/null +++ b/src/renderer/src/components/native-chat/subagents/use-structured-native-chat-subagents.tsx @@ -0,0 +1,67 @@ +import type { AgentSessionCancelResult } from '../../../../../shared/agent-session/agent-session-wire' +import type { StructuredAgentSubagentRoster } from '../../../../../shared/agent-session/view/structured-agent-session-subagent-roster' +import type { StructuredSessionBackgroundTasksView } from '../../../../../shared/structured-session-background-tasks-view' +import { NativeChatStructuredSessionStatus } from '../tools/tasks/NativeChatStructuredSessionStatus' +import { useStructuredSessionTaskStop } from '../tools/tasks/use-structured-session-task-stop' +import { useTranslate } from '@/i18n/use-translate' +import { + backFromNativeChatSubagent, + closeNativeChatSubagentOnEscape, + useNativeChatOpenSubagent +} from './native-chat-open-subagent' +import { NativeChatStructuredSubagentStatusBar } from './NativeChatSubagentStatusBar' + +/** A structured chat's agents strip and open subagent's bar, which share the strip's one Stop. */ +export function useStructuredNativeChatSubagents({ + sessionId, + paneKey, + isVisible, + controller +}: { + sessionId: string + paneKey: string + isVisible: boolean + controller: { + subagentRoster?: StructuredAgentSubagentRoster + backgroundTasks: StructuredSessionBackgroundTasksView + stopBackgroundTask: (taskId?: string) => Promise + } +}) { + const t = useTranslate() + const open = useNativeChatOpenSubagent(paneKey) + const openId = open?.agentId ?? null + const parentId = open?.parentId ?? null + const stop = useStructuredSessionTaskStop(sessionId, controller) + return { + /** The subagent whose view replaces the conversation and the composer; null for none. */ + openId, + onKeyDown: (event: React.KeyboardEvent) => closeNativeChatSubagentOnEscape(event, paneKey), + strip: ( + + ), + statusBar: + openId === null ? null : ( + backFromNativeChatSubagent(paneKey)} + /> + ) + } +} diff --git a/src/renderer/src/components/native-chat/surfaces/integration/NativeChatStructuredSession.test-harness.tsx b/src/renderer/src/components/native-chat/surfaces/integration/NativeChatStructuredSession.test-harness.tsx index 77585ea9c24..197d99f5048 100644 --- a/src/renderer/src/components/native-chat/surfaces/integration/NativeChatStructuredSession.test-harness.tsx +++ b/src/renderer/src/components/native-chat/surfaces/integration/NativeChatStructuredSession.test-harness.tsx @@ -315,8 +315,7 @@ export function createStructuredSessionMocks() { revealLatest: mocks.revealLatest, readerAtEnd: () => true, revealFindMatch: () => {}, - messageCopyText: () => null, - revealSubagent: () => {} + messageCopyText: () => null })) return } diff --git a/src/renderer/src/components/native-chat/tools/diffs/use-native-chat-turn-diffs.ts b/src/renderer/src/components/native-chat/tools/diffs/use-native-chat-turn-diffs.ts index ee56171deec..9f33e8a3437 100644 --- a/src/renderer/src/components/native-chat/tools/diffs/use-native-chat-turn-diffs.ts +++ b/src/renderer/src/components/native-chat/tools/diffs/use-native-chat-turn-diffs.ts @@ -1,6 +1,6 @@ import { useMemo } from 'react' import type { NativeChatSubagentRow } from '../../../../../../shared/native-chat/transcript/native-chat-transcript-projection' -import { nativeChatRowsInTranscriptOrder } from '../../subagents/native-chat-subagent-sections' +import { nativeChatRowsInTranscriptOrder } from '../../subagents/native-chat-subagent-scope' import { nativeChatTurnDiffs, type NativeChatTurnDiff @@ -12,19 +12,13 @@ const NO_TURN_DIFFS: ReadonlyMap = new Map() /** Count subagent edits in their owning turn; omit totals without a journal or for partially loaded turns. */ export function useNativeChatTurnDiffs( turns: NativeChatTurnRows | null, - subagentRows: readonly NativeChatSubagentRow[], - subagentSectionsOf: ReadonlyMap + subagentRows: readonly NativeChatSubagentRow[] ): ReadonlyMap { return useMemo(() => { if (!turns) { return NO_TURN_DIFFS } const merged = nativeChatRowsInTranscriptOrder(turns.messages, turns.turnKeys, subagentRows) - return nativeChatTurnDiffs( - merged.messages, - merged.turnKeys, - subagentSectionsOf, - turns.partialTurnKey - ) - }, [subagentRows, subagentSectionsOf, turns]) + return nativeChatTurnDiffs(merged.messages, merged.turnKeys, undefined, turns.partialTurnKey) + }, [subagentRows, turns]) } diff --git a/src/renderer/src/components/native-chat/tools/pull-requests/use-native-chat-turn-opened-pull-requests.ts b/src/renderer/src/components/native-chat/tools/pull-requests/use-native-chat-turn-opened-pull-requests.ts index 8c59c4b40f0..bcdb23fa1db 100644 --- a/src/renderer/src/components/native-chat/tools/pull-requests/use-native-chat-turn-opened-pull-requests.ts +++ b/src/renderer/src/components/native-chat/tools/pull-requests/use-native-chat-turn-opened-pull-requests.ts @@ -10,7 +10,7 @@ import { type NativeChatTurnOpenedPullRequests } from '../../../../../../shared/native-chat/tools/native-chat-opened-pull-requests' import { nativeChatToolFullPayload } from '../../../../../../shared/native-chat/tools/native-chat-tool-output' -import { nativeChatRowsInTranscriptOrder } from '../../subagents/native-chat-subagent-sections' +import { nativeChatRowsInTranscriptOrder } from '../../subagents/native-chat-subagent-scope' import { NativeChatMarkdownImageOwnerContext } from '../../media/images/native-chat-markdown-image-owner' import { useNativeChatVisualOwner } from '../../media/visuals/native-chat-visual-owner' import type { NativeChatTurnRows } from '../../conversation/slots/use-native-chat-turn-membership' diff --git a/src/renderer/src/components/native-chat/tools/runs/NativeChatToolRun.tsx b/src/renderer/src/components/native-chat/tools/runs/NativeChatToolRun.tsx index 59e4432ce34..3fb636ef14a 100644 --- a/src/renderer/src/components/native-chat/tools/runs/NativeChatToolRun.tsx +++ b/src/renderer/src/components/native-chat/tools/runs/NativeChatToolRun.tsx @@ -22,10 +22,6 @@ import { nativeChatAskRunSubject } from '../../../../../../shared/native-chat/in import { NativeChatAwaitingInputRow } from '../../prompts/NativeChatAwaitingInputRow' import { NativeChatBackgroundTaskRun } from '../tasks/NativeChatBackgroundTaskRun' import { NativeChatSubagentRun } from '../../subagents/NativeChatSubagentRun' -import type { - NativeChatSubagentDisclosure, - NativeChatSubagentRosterState -} from '../../subagents/native-chat-subagent-sections' import { NativeChatToolRunIcon } from '../lines/NativeChatToolIcon' import { NativeChatToolRunCallCounts } from './NativeChatToolRunCallCounts' import { revealNativeChatToolRunMember } from './NativeChatToolRunMembers' @@ -52,8 +48,7 @@ export function NativeChatToolRun({ revealedDiff, onRevealDiff, subagentGroups = NO_SUBAGENT_GROUPS, - subagentRoster, - subagentDisclosure, + onOpenSubagent, backgroundTasks = NO_BACKGROUND_TASKS, followsProse = true, expandSignal, @@ -70,9 +65,8 @@ export function NativeChatToolRun({ onRevealDiff?: (element: HTMLElement) => void /** Spawn-group rosters that belong with this run's activity, one row each. */ subagentGroups?: NativeChatSubagentGroupBlock[] - /** The rosters' list state, and their children whose rows open below this run. */ - subagentRoster?: NativeChatSubagentRosterState - subagentDisclosure?: NativeChatSubagentDisclosure + /** Opens one of the rosters' subagents in its own view. */ + onOpenSubagent?: (agentId: string) => void /** Background tasks that belong with this run's activity, one row each. */ backgroundTasks?: NativeChatBackgroundTaskBlock[] /** The row draws prose above this run, which the run then sits just under. */ @@ -115,14 +109,8 @@ export function NativeChatToolRun({ subagentDisclosure.setRosterOpen(disclosureId, open) - : undefined - } - sections={subagentRoster?.sections} - onSetSectionOpen={subagentDisclosure?.setSectionOpen} + disclosureId={disclosureId} + onOpenSubagent={onOpenSubagent} /> )) // Roster/task rows bypass tool-header hiding because they carry durable state beyond the originating turn. diff --git a/src/renderer/src/components/native-chat/tools/runs/native-chat-transcript-work-runs.ts b/src/renderer/src/components/native-chat/tools/runs/native-chat-transcript-work-runs.ts index 3fc0f456745..ccbf81ca290 100644 --- a/src/renderer/src/components/native-chat/tools/runs/native-chat-transcript-work-runs.ts +++ b/src/renderer/src/components/native-chat/tools/runs/native-chat-transcript-work-runs.ts @@ -1,4 +1,4 @@ -// Combine calls/thoughts after slot selection so every intervening visible row or section boundary ends the run. +// Combine calls/thoughts after slot selection so every intervening visible row ends the run. import { agentJournalItemSubagentId } from '../../../../../../shared/agent-session/journal/agent-session-journal-producer' import { @@ -22,17 +22,12 @@ function workRunRow(slot: NativeChatTranscriptSlot): NativeChatWorkRunRow { return { member: null, draws: true, scope: undefined } } return { - member: - slot.drawsMessage && slot.subagentRoster === undefined - ? nativeChatWorkRunMember( - slot.message, - slot.receipt !== undefined, - // At the top level the live line owns the open thought; only a section has none. - slot.depth > 0 && slot.activeTurnIsWorking - ) - : null, + member: slot.drawsMessage + ? // The live line owns the open thought. + nativeChatWorkRunMember(slot.message, slot.receipt !== undefined, false) + : null, draws: true, - scope: `${slot.depth}:${agentJournalItemSubagentId(slot.message)}:${slot.turnKey}` + scope: `${agentJournalItemSubagentId(slot.message)}:${slot.turnKey}` } } @@ -60,8 +55,7 @@ function workRunSlot( hasStatus: head.status !== undefined, hasTurnDiff: turnDiff !== undefined, turnDiffFileCount: turnDiff?.files.length, - openedPullRequestCount: openedPullRequests?.length, - inSubagentSection: head.depth > 0 + openedPullRequestCount: openedPullRequests?.length }, typography ) diff --git a/src/renderer/src/components/native-chat/tools/tasks/NativeChatBackgroundTasksStatus.test.tsx b/src/renderer/src/components/native-chat/tools/tasks/NativeChatBackgroundTasksStatus.test.tsx index 311c195e851..86213292b62 100644 --- a/src/renderer/src/components/native-chat/tools/tasks/NativeChatBackgroundTasksStatus.test.tsx +++ b/src/renderer/src/components/native-chat/tools/tasks/NativeChatBackgroundTasksStatus.test.tsx @@ -41,7 +41,7 @@ it("shows an agent by the provider's id, beside its own Stop, and leaves command onShowAgent={onShowAgent} /> ) - fireEvent.click(screen.getByRole('button', { name: 'Show child a in the conversation' })) + fireEvent.click(screen.getByRole('button', { name: 'Open child a' })) expect(onShowAgent).toHaveBeenCalledWith('provider-a') expect(onStop).not.toHaveBeenCalled() expect(screen.queryByRole('button', { name: /Show child s/ })).toBeNull() diff --git a/src/renderer/src/components/native-chat/tools/tasks/NativeChatBackgroundTasksStatus.tsx b/src/renderer/src/components/native-chat/tools/tasks/NativeChatBackgroundTasksStatus.tsx index bb8528460f4..d6ac863269d 100644 --- a/src/renderer/src/components/native-chat/tools/tasks/NativeChatBackgroundTasksStatus.tsx +++ b/src/renderer/src/components/native-chat/tools/tasks/NativeChatBackgroundTasksStatus.tsx @@ -9,6 +9,7 @@ import type { AgentChildWorkView } from '../../../../../../shared/agent-status/c import { AgentChildRowContent } from '@/components/AgentChildRowContent' import { agentChildRowName } from '@/components/agent-child-row-text' import { Button } from '@/components/ui/button' +import { cn } from '@/lib/class-names' import { useTranslate } from '@/i18n/use-translate' import { useNow } from '@/hooks/use-now' import { @@ -19,11 +20,13 @@ import { backgroundTaskRowMeta, backgroundTaskRowStopId, backgroundTasksStripTicks, - buildBackgroundTaskGroupsFromViews, type BackgroundTaskGroup } from '../../../../../../shared/background-task-roster' import { backgroundTasksHeaderContent } from './background-task-header-content' -import { backgroundTaskGroupLabel, buildBackgroundTaskGroups } from './background-task-roster' +import { + backgroundTaskGroupLabel, + structuredSessionBackgroundTaskGroups +} from './background-task-roster' import { sayBackgroundTaskTranslated as say } from './background-task-words-text' /** Use strip width in rem so narrow splits behave like narrow windows even on wide monitors. */ @@ -74,6 +77,8 @@ function BackgroundTaskRow(props: { stoppingTaskIds: ReadonlySet onStop: (taskId: string) => void onShowAgent?: (providerId: string) => void + /** The agent whose view is open, marked current. */ + currentAgentId?: string | null }): React.JSX.Element { const t = useTranslate() const { row, now } = props @@ -107,12 +112,15 @@ function BackgroundTaskRow(props: { {shownId !== undefined ? (
', - '
' + - '
' -) - -const hostWithoutAnEngine = () => ({ - postToHost: () => {}, - hasEngine: () => false -}) - -describe('the document start sequence', () => { - it('would have installed one, so the null above is a measurement', () => { - document.body.innerHTML = MARKUP_WITH_THE_MENU - const previous = window.onerror - window.onerror = null - try { - const started = createTerminalDocument(hostWithoutAnEngine()) - expect(window.onerror).not.toBe(null) - started.stop() - expect(window.onerror).toBe(null) - } finally { - window.onerror = previous - } - }) -}) diff --git a/mobile/src/terminal/key-input/terminal-key-chord-input.test.ts b/mobile/src/terminal/key-input/terminal-key-chord-input.test.ts deleted file mode 100644 index c62498fdb0e..00000000000 --- a/mobile/src/terminal/key-input/terminal-key-chord-input.test.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { createTerminalKeyChordInput } from './terminal-key-chord-input' - -const chord = (key: string, modifiers: { ctrl?: boolean; alt?: boolean; shift?: boolean } = {}) => - createTerminalKeyChordInput({ - key, - ctrl: modifiers.ctrl ?? false, - alt: modifiers.alt ?? false, - shift: modifiers.shift ?? false - }) - -describe('createTerminalKeyChordInput', () => { - it('keeps the accessory Del local-edit rule for a bare forward delete only', () => { - expect(chord('delete')).toEqual({ bytes: '\x1b[3~', localEdit: 'delete' }) - expect(chord('delete', { ctrl: true })).toEqual({ bytes: '\x1b[3;5~' }) - }) -}) diff --git a/mobile/src/terminal/keyboard/terminal-keyboard-avoidance-lift.test.ts b/mobile/src/terminal/keyboard/terminal-keyboard-avoidance-lift.test.ts index 71f73e63a0a..99ec531d338 100644 --- a/mobile/src/terminal/keyboard/terminal-keyboard-avoidance-lift.test.ts +++ b/mobile/src/terminal/keyboard/terminal-keyboard-avoidance-lift.test.ts @@ -30,21 +30,6 @@ describe('computeActiveTerminalKeyboardLift', () => { expect({ candidate, cursorOnly }).toEqual({ candidate: 220, cursorOnly: 140 }) }) - it('applies the supplied keyboard coverage to the lift', () => { - const tuiMetrics = metrics({ cursorY: 30, contentBottomRow: 34 }) - const android = computeActiveTerminalKeyboardLift({ - keyboardLift: 300, - metrics: tuiMetrics, - terminalFrameHeight: FRAME_HEIGHT - }) - const ios = computeActiveTerminalKeyboardLift({ - keyboardLift: 266, - metrics: tuiMetrics, - terminalFrameHeight: FRAME_HEIGHT - }) - expect({ android, ios }).toEqual({ android: 220, ios: 186 }) - }) - describe('a keyboard that covers the frame', () => { const lift = (keyboardLift: number, m: TerminalKeyboardAvoidanceMetrics, frame = 713.7) => computeActiveTerminalKeyboardLift({ diff --git a/mobile/src/terminal/live-input/terminal-live-text-commit.test.ts b/mobile/src/terminal/live-input/terminal-live-text-commit.test.ts index 610b2679b6f..dc5a8c5d666 100644 --- a/mobile/src/terminal/live-input/terminal-live-text-commit.test.ts +++ b/mobile/src/terminal/live-input/terminal-live-text-commit.test.ts @@ -5,10 +5,7 @@ describe('terminal live accessory local edit text', () => { it.each([ ['backspace', 'a🙂b', { start: 3, end: 3 }, 'ab'], ['delete', 'a🙂b', { start: 1, end: 1 }, 'ab'], - ['backspace', '可是你好', { start: 1, end: 3 }, '可好'], - ['delete', '可是你好', { start: 1, end: 3 }, '可好'], - ['backspace', 'abc', { start: 0, end: 0 }, 'abc'], - ['delete', 'abc', { start: 3, end: 3 }, 'abc'] + ['backspace', '可是你好', { start: 1, end: 3 }, '可好'] ] as const)( 'edits %s in %j at its native UTF-16 selection', (localEdit, fieldText, selection, expected) => { diff --git a/mobile/src/terminal/live-input/terminal-text-field-submit-binding.web.test.ts b/mobile/src/terminal/live-input/terminal-text-field-submit-binding.web.test.ts index 45111eb0fa1..50197155b9b 100644 --- a/mobile/src/terminal/live-input/terminal-text-field-submit-binding.web.test.ts +++ b/mobile/src/terminal/live-input/terminal-text-field-submit-binding.web.test.ts @@ -23,17 +23,6 @@ function sendBeforeInput(field: HTMLElement, inputType: string): InputEvent { } describe('the web sibling', () => { - it('submits on the line break the browser reports, and cancels it', () => { - const onSubmit = vi.fn() - const field = mountField() - bindOnWeb(asField(field), onSubmit) - - const event = sendBeforeInput(field, 'insertLineBreak') - - expect(onSubmit).toHaveBeenCalledTimes(1) - expect(event.defaultPrevented).toBe(true) - }) - // IME candidate acceptance emits insertCompositionText, so it must not submit terminal input. it('leaves a composition commit alone', () => { const onSubmit = vi.fn() @@ -78,18 +67,17 @@ describe.each(['android', 'ios'] as const)('live terminal keyboard chords on %s' return { field, onChord, unbind, key } } - it.each([ - ['c', { ctrlKey: true }, '\x03'], - ['ArrowLeft', { ctrlKey: true }, '\x1b[1;5D'], - ['Enter', { shiftKey: true }, '\x1b[13;2u'] - ])('claims %s once before RNWeb can resend it', (name, options, bytes) => { - const { field, onChord, key } = setup() - const parentKey = vi.fn() - field.parentElement?.addEventListener('keydown', parentKey, { once: true }) - expect(key(name, options).defaultPrevented).toBe(true) - expect(onChord).toHaveBeenCalledExactlyOnceWith({ bytes }) - expect(parentKey).not.toHaveBeenCalled() - }) + it.each([['c', { ctrlKey: true }, '\x03']])( + 'claims %s once before RNWeb can resend it', + (name, options, bytes) => { + const { field, onChord, key } = setup() + const parentKey = vi.fn() + field.parentElement?.addEventListener('keydown', parentKey, { once: true }) + expect(key(name, options).defaultPrevented).toBe(true) + expect(onChord).toHaveBeenCalledExactlyOnceWith({ bytes }) + expect(parentKey).not.toHaveBeenCalled() + } + ) it.each(['b'])('keeps Option-generated %j native on iOS and Alt chords on Android', (name) => { const { onChord, key } = setup() @@ -98,17 +86,12 @@ describe.each(['android', 'ios'] as const)('live terminal keyboard chords on %s' }) it.each([ - ['a', {}], - ['Enter', {}], ['Enter', { ctrlKey: true, shiftKey: true }], - ['Backspace', {}], - ['ArrowLeft', {}], ['c', { ctrlKey: true, isComposing: true }], ['c', { ctrlKey: true, keyCode: 229 }], ['c', { ctrlKey: true, altKey: true }], ['c', { metaKey: true }], - [' ', { ctrlKey: true }], - ['1', { ctrlKey: true }] + [' ', { ctrlKey: true }] ])('leaves %s input and IME/platform shortcuts alone', (name, options) => { const { onChord, key } = setup() expect(key(name, options).defaultPrevented).toBe(false) diff --git a/mobile/src/terminal/live-input/terminal-text-input-normalization.test.ts b/mobile/src/terminal/live-input/terminal-text-input-normalization.test.ts deleted file mode 100644 index 8bd9b39c105..00000000000 --- a/mobile/src/terminal/live-input/terminal-text-input-normalization.test.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { describe, expect, it } from 'vitest' - -import { normalizeTerminalTextInput } from './terminal-text-input-normalization' - -describe('normalizeTerminalTextInput', () => { - it('converts iOS smart dash replacements back to terminal hyphens', () => { - expect(normalizeTerminalTextInput('git checkout – file')).toBe('git checkout -- file') - expect(normalizeTerminalTextInput('git checkout — file')).toBe('git checkout -- file') - }) -}) diff --git a/mobile/src/terminal/output-flow/terminal-write-coalescer.test.ts b/mobile/src/terminal/output-flow/terminal-write-coalescer.test.ts index 41e833f8990..c524ee4b0ac 100644 --- a/mobile/src/terminal/output-flow/terminal-write-coalescer.test.ts +++ b/mobile/src/terminal/output-flow/terminal-write-coalescer.test.ts @@ -16,20 +16,6 @@ describe('terminal write coalescer', () => { vi.useRealTimers() }) - it('batches writes inside the trailing window preserving byte order', () => { - vi.useFakeTimers() - const sink = createDeliverySink() - const coalescer = createTerminalWriteCoalescer(sink.deliver) - - coalescer.write('a') - coalescer.write('b') - coalescer.write('c') - expect(sink.delivered).toEqual(['a']) - - vi.advanceTimersByTime(48) - expect(sink.delivered).toEqual(['a', 'bc']) - }) - it('flushes within one window even when the wall clock jumps backwards mid-stream', () => { vi.useFakeTimers() vi.setSystemTime(100_000) diff --git a/mobile/src/terminal/pointer-input/terminal-gesture-input.test.ts b/mobile/src/terminal/pointer-input/terminal-gesture-input.test.ts index a920f37a7a3..fcf6d04f44b 100644 --- a/mobile/src/terminal/pointer-input/terminal-gesture-input.test.ts +++ b/mobile/src/terminal/pointer-input/terminal-gesture-input.test.ts @@ -43,22 +43,6 @@ describe('isTerminalGestureInput', () => { ).toBe(true) }) - it('accepts repeated default mouse wheel sequences', () => { - expect( - isTerminalGestureInput( - `${ESC}[M${String.fromCharCode(96, 97, 33)}${ESC}[M${String.fromCharCode(97, 126, 126)}` - ) - ).toBe(true) - }) - - it('accepts bounded default left-click press and release sequences', () => { - expect( - isTerminalGestureInput( - `${ESC}[M${String.fromCharCode(32, 33, 33)}${ESC}[M${String.fromCharCode(35, 33, 33)}` - ) - ).toBe(true) - }) - it('rejects shell text and other terminal input', () => { expect(isTerminalGestureInput('rm -rf .\r')).toBe(false) expect(isTerminalGestureInput(`${ESC}[200~paste${ESC}[201~`)).toBe(false) diff --git a/mobile/src/terminal/pointer-input/terminal-mouse-authority.test.ts b/mobile/src/terminal/pointer-input/terminal-mouse-authority.test.ts index 866528b4470..425d97ad595 100644 --- a/mobile/src/terminal/pointer-input/terminal-mouse-authority.test.ts +++ b/mobile/src/terminal/pointer-input/terminal-mouse-authority.test.ts @@ -96,7 +96,6 @@ describe('mobile mouse encoding proof', () => { }) it.each([ - ['SGR', '?1006h', '[<65;'], ['pixel', '?1016h', '[<65;'], ['explicit legacy', '?1006l', '[Ma'] ])('keeps %s encoding proven by a live write', (_name, mode, prefix) => { diff --git a/mobile/src/terminal/quick-commands/QuickCommandsSheet.test.ts b/mobile/src/terminal/quick-commands/QuickCommandsSheet.test.ts index 2afda96b32c..cf82027d5f2 100644 --- a/mobile/src/terminal/quick-commands/QuickCommandsSheet.test.ts +++ b/mobile/src/terminal/quick-commands/QuickCommandsSheet.test.ts @@ -160,10 +160,7 @@ describe('QuickCommandsSheet', () => { saved.resolve(true) await saved.promise }) - expect(editor().props.draft).toMatchObject({ - label: 'Newer', - id: mocks.persist.mock.calls[0]?.[0].command.id - }) + expect(editor().props.draft.label).toBe('Newer') expect(editor().props.saving).toBe(false) client.close() }) diff --git a/mobile/src/terminal/session/creation/use-initial-session-terminal-autocreate.test.ts b/mobile/src/terminal/session/creation/use-initial-session-terminal-autocreate.test.ts deleted file mode 100644 index e8755754ad8..00000000000 --- a/mobile/src/terminal/session/creation/use-initial-session-terminal-autocreate.test.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { createElement } from 'react' -import { act, create, type ReactTestRenderer } from 'react-test-renderer' -import { afterEach, describe, expect, it } from 'vitest' -import { useWorktreeSessionTabsLoaded } from './use-initial-session-terminal-autocreate' - -describe('useWorktreeSessionTabsLoaded', () => { - let renderer: ReactTestRenderer | null = null - let current: readonly [boolean, (loaded: boolean) => void] | null = null - - function Harness({ worktreeId }: { worktreeId: string }): null { - current = useWorktreeSessionTabsLoaded(worktreeId) - return null - } - - afterEach(() => { - act(() => renderer?.unmount()) - renderer = null - current = null - }) - - it('does not carry a loaded snapshot across a reused route', async () => { - await act(async () => { - renderer = create(createElement(Harness, { worktreeId: 'existing' })) - }) - act(() => current?.[1](true)) - expect(current?.[0]).toBe(true) - - await act(async () => { - renderer?.update(createElement(Harness, { worktreeId: 'new' })) - }) - expect(current?.[0]).toBe(false) - }) -}) diff --git a/mobile/src/terminal/session/inventory/mobile-terminal-inventory-request.test.ts b/mobile/src/terminal/session/inventory/mobile-terminal-inventory-request.test.ts deleted file mode 100644 index 9b22756d32f..00000000000 --- a/mobile/src/terminal/session/inventory/mobile-terminal-inventory-request.test.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' -import { MobileTerminalInventoryRequest } from './mobile-terminal-inventory-request' - -describe('MobileTerminalInventoryRequest', () => { - afterEach(() => { - vi.restoreAllMocks() - }) - - it('fences a response after its route activation is replaced', async () => { - const oldResponse = Promise.withResolvers() - const applied: string[] = [] - const requests = new MobileTerminalInventoryRequest() - const deactivateOld = requests.activate() - const oldResult = requests.run(true, async (_allowsEmpty, isCurrent) => { - await oldResponse.promise - if (!isCurrent()) { - return false - } - applied.push('old') - return true - }) - await Promise.resolve() - - requests.activate() - deactivateOld() - oldResponse.resolve() - await expect(oldResult).resolves.toBe(false) - await expect( - requests.run(true, async (_allowsEmpty, isCurrent) => { - if (!isCurrent()) { - return false - } - applied.push('next') - return true - }) - ).resolves.toBe(true) - expect(applied).toEqual(['next']) - }) -}) diff --git a/mobile/src/terminal/terminal-webview-html/document-style.test.ts b/mobile/src/terminal/terminal-webview-html/document-style.test.ts deleted file mode 100644 index 7537423d714..00000000000 --- a/mobile/src/terminal/terminal-webview-html/document-style.test.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { scopeStyleToHost } from '../../style-scoping/document-style-scoping' -import { XTERM_ENGINE_CSS } from '../document/terminal-webview-engine-css.generated' -import { TERMINAL_DOCUMENT_ELEMENT_STYLE } from './document-style' - -// Verify native root rules remain separate while page-injected rules can reach only terminal-owned elements. -const PREFIX = '.orca-terminal-document-host' - -function selectorsOf(css: string): string[] { - return [...css.matchAll(/(?:^|\})\s*([^{}]+)\{/g)].flatMap((match) => - match[1]!.split(',').map((one) => one.trim()) - ) -} - -describe('the terminal document stylesheet', () => { - it('holds every selector of both injected sheets under the host', () => { - for (const sheet of [TERMINAL_DOCUMENT_ELEMENT_STYLE, XTERM_ENGINE_CSS]) { - const scoped = scopeStyleToHost(sheet, PREFIX) - const selectors = selectorsOf(scoped) - expect(selectors.length).toBeGreaterThan(0) - expect(selectors.filter((one) => !one.startsWith(`${PREFIX} `))).toEqual([]) - } - }) -}) diff --git a/mobile/src/terminal/viewport/terminal-auto-restore-fit-state.test.ts b/mobile/src/terminal/viewport/terminal-auto-restore-fit-state.test.ts deleted file mode 100644 index 08e4fdf466c..00000000000 --- a/mobile/src/terminal/viewport/terminal-auto-restore-fit-state.test.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { - readTerminalAutoRestoreFitMs, - saveTerminalAutoRestoreFitMs -} from './terminal-auto-restore-fit-state' - -describe('terminal auto restore fit state', () => { - it('reads a host without the setting as the default', async () => { - const sendRequest = vi.fn().mockResolvedValue({ - id: '1', - ok: false, - error: { code: 'method_not_found', message: 'Unknown method' } - }) - - await expect(readTerminalAutoRestoreFitMs({ sendRequest })).resolves.toBeNull() - await expect(saveTerminalAutoRestoreFitMs({ sendRequest }, 60_000)).resolves.toBeNull() - }) -}) diff --git a/mobile/src/terminal/viewport/terminal-cell-box.test.ts b/mobile/src/terminal/viewport/terminal-cell-box.test.ts deleted file mode 100644 index 06569b2af30..00000000000 --- a/mobile/src/terminal/viewport/terminal-cell-box.test.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { readTerminalCellBox } from './terminal-cell-box' - -const CELL_1X = { fontScale: 1, cellWidth: 23 / 3, cellHeight: 15 } - -describe('readTerminalCellBox', () => { - it('reads a well-formed box and rejects a malformed one', () => { - expect(readTerminalCellBox({ cellBox: CELL_1X })).toEqual(CELL_1X) - expect(readTerminalCellBox({ cellBox: { ...CELL_1X, cellWidth: 0 } })).toBeNull() - expect(readTerminalCellBox({ cellBox: [CELL_1X] })).toBeNull() - }) -}) diff --git a/mobile/src/terminal/webview/terminal-webview-contract.test.ts b/mobile/src/terminal/webview/terminal-webview-contract.test.ts index cde678336f8..1e8a70e5cc1 100644 --- a/mobile/src/terminal/webview/terminal-webview-contract.test.ts +++ b/mobile/src/terminal/webview/terminal-webview-contract.test.ts @@ -3,15 +3,6 @@ import { describe, expect, it } from 'vitest' import { parseTerminalKeyboardAvoidanceMetrics } from './terminal-webview-contract' describe('parseTerminalKeyboardAvoidanceMetrics', () => { - it('defaults contentBottomRow to cursorY when absent (older WebView bundles)', () => { - expect(parseTerminalKeyboardAvoidanceMetrics({ cursorY: 12, rows: 40 })).toEqual({ - cursorY: 12, - contentBottomRow: 12, - rows: 40, - altScreen: false - }) - }) - it('bounds untrusted numeric fields to the reported viewport', () => { expect( parseTerminalKeyboardAvoidanceMetrics({ diff --git a/mobile/src/test-support/rpc-recording/golden-recorder-failure-absence.test.ts b/mobile/src/test-support/rpc-recording/golden-recorder-failure-absence.test.ts deleted file mode 100644 index 572796b842d..00000000000 --- a/mobile/src/test-support/rpc-recording/golden-recorder-failure-absence.test.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { readdirSync } from 'node:fs' -import { resolve } from 'node:path' -import { describe, expect, it } from 'vitest' -import { readGolden } from './golden-recording' -import { OBSERVATION_FIELDS } from './golden-value-pool' -import type { Observation } from './recording-scenario' -import type { RecordedValue } from './recording-values' - -const root = resolve(import.meta.dirname, '../../../..') -const directory = - process.env.RPC_FOUNDATION_GOLDENS ?? resolve(root, 'mobile/rpc-foundation/goldens') - -/** `captureValue`'s two refusals. Neither is ever product behaviour. */ -const PROJECTION_REFUSALS = [ - 'Unsupported observation', - 'Observation requires an explicit projection' -] - -function refusalText(value: RecordedValue): boolean { - if (typeof value === 'string') { - return PROJECTION_REFUSALS.some((refusal) => value.includes(refusal)) - } - if (Array.isArray(value)) { - return value.some(refusalText) - } - return typeof value === 'object' && value !== null && Object.values(value).some(refusalText) -} - -function failures(at: string, observation: Observation): string[] { - const found: string[] = [] - for (const field of OBSERVATION_FIELDS) { - if (refusalText(observation[field])) { - found.push(`${at}.${field}: recorder refused to project a value`) - } - } - return found -} - -// Projection refusals can be captured as data and re-recorded green; reject those while allowing real detached product failures. -describe('recorder failures never reach a golden', () => { - it('records no refused projection in any observation field', () => { - const ids = readdirSync(directory) - .filter((file) => file.endsWith('.json')) - .map((file) => file.replace(/\.json$/, '')) - - // Seed a captured refusal to prove absence checking detects the real failure shape. - const seeded: Observation = { - sender: [], - payloads: [], - settlements: { fetch: { status: 'pending' } }, - state: { fetched: 'Observation requires an explicit projection for non-plain objects' }, - effects: [ - { name: 'unhandled-rejection', value: { message: 'Unsupported observation: function' } } - ] - } - expect(failures('seeded', seeded)).toEqual([ - 'seeded.state: recorder refused to project a value', - 'seeded.effects: recorder refused to project a value' - ]) - - let checkpoints = 0 - const found = ids.flatMap((id) => - readGolden(directory, id).recording.checkpoints.flatMap((checkpoint) => { - checkpoints++ - return failures(`${id}/${checkpoint.id}`, checkpoint.observation) - }) - ) - expect(found).toEqual([]) - expect(ids.length).toBeGreaterThan(0) - expect(checkpoints).toBeGreaterThan(ids.length) - }) -}) diff --git a/mobile/src/test-support/rpc-recording/vitest-recording-scheduler.test.ts b/mobile/src/test-support/rpc-recording/vitest-recording-scheduler.test.ts deleted file mode 100644 index d0cf2fed5f7..00000000000 --- a/mobile/src/test-support/rpc-recording/vitest-recording-scheduler.test.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { runRecording } from './run-recording' -import { reactActQueuePrimed, vitestRecordingScheduler } from './vitest-recording-scheduler' -import type { MountAdapter, RecordingScenario } from './recording-scenario' - -/** The seeded generator's first value: `seed = 1`, one LCG step, divided by 2^32. */ -const SEEDED_FIRST_DRAW = 0.23645552527159452 - -const drawing: MountAdapter = ({ effect }) => ({ - action: (name) => { - if (name !== 'draw') { - throw new Error(`Unexpected action: ${name}`) - } - effect('draw', Math.random()) - return undefined - }, - state: () => null, - dispose: () => {} -}) - -/** `flushFirst` puts a zero-time drain — one `await act` — ahead of the draw. */ -function scenario(id: string, flushFirst: boolean): RecordingScenario { - const draw: RecordingScenario['steps'] = [{ action: 'draw', id: 'd' }, { checkpoint: 'drawn' }] - return { - id, - operation: 'scheduler-determinism', - family: 'scheduler-determinism', - sites: [], - schedules: [], - steps: flushFirst ? [{ checkpoint: 'mounted' }, ...draw] : draw - } -} - -async function record(id: string, flushFirst: boolean): Promise { - const recording = await runRecording( - scenario(id, flushFirst), - drawing, - vitestRecordingScheduler() - ) - const drawn = recording.checkpoints.at(-1)?.observation.effects - return JSON.parse(JSON.stringify(drawn)) -} - -describe('recording scheduler randomness', () => { - // Keep this test first: only a process’s first act can expose an unprimed React random draw. - it('draws the same seeded value first in the process as afterwards', async () => { - expect(reactActQueuePrimed()).toBe(false) - const first = await record('first-in-process', true) - const later = await record('later-in-process', true) - const expected = [{ name: 'draw', ordinal: 1, value: SEEDED_FIRST_DRAW }] - expect([first, later]).toEqual([expected, expected]) - }) -}) diff --git a/mobile/src/theme/themed-styles.test.ts b/mobile/src/theme/themed-styles.test.ts deleted file mode 100644 index 8d89343ecdc..00000000000 --- a/mobile/src/theme/themed-styles.test.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { afterEach, expect, it, vi } from 'vitest' -import { applyMobileColorScheme, colors, paletteForScheme } from './mobile-theme' -import { themedStyles } from './themed-styles' - -vi.mock('react-native', () => ({ StyleSheet: { create: (styles: T): T => styles } })) - -afterEach(() => { - applyMobileColorScheme('dark') -}) - -it('serves each scheme its own stylesheet, including ones built before the switch', () => { - const styles = themedStyles(() => ({ row: { backgroundColor: colors.bgBase } })) - const merged = themedStyles(() => ({ ...styles })) - expect(merged.row.backgroundColor).toBe(paletteForScheme('dark').bgBase) - - applyMobileColorScheme('light') - expect(styles.row.backgroundColor).toBe(paletteForScheme('light').bgBase) - expect(merged.row.backgroundColor).toBe(paletteForScheme('light').bgBase) - - applyMobileColorScheme('dark') - expect(merged.row.backgroundColor).toBe(paletteForScheme('dark').bgBase) -}) diff --git a/mobile/src/transport/connection/client-context.test.ts b/mobile/src/transport/connection/client-context.test.ts index 4d0097b6f53..29c2853f5a7 100644 --- a/mobile/src/transport/connection/client-context.test.ts +++ b/mobile/src/transport/connection/client-context.test.ts @@ -190,30 +190,6 @@ describe('useHostClient', () => { }) describe('useAllHostClients', () => { - it('rerenders when Relay becomes pending without a transport-state change', async () => { - const client = makeFakeClient('reconnecting') - connectMock.mockReturnValue(client) - loadHostsMock.mockResolvedValue([HOST]) - let pendingPath: MobileConnectionPath | null | undefined - let renderer!: ReturnType - - function Probe(): null { - pendingPath = useAllHostClients([HOST.id])[0]?.pendingPath - return null - } - - await act(async () => { - renderer = create(createElement(RpcClientProvider, null, createElement(Probe))) - await Promise.resolve() - }) - expect(pendingPath).toBeNull() - - act(() => client.emitPendingPath('relay')) - expect(pendingPath).toBe('relay') - - act(() => renderer.unmount()) - }) - it('publishes a latched pairing rejection to the screens', async () => { const client = makeFakeClient('reconnecting') connectMock.mockReturnValue(client) diff --git a/mobile/src/transport/encryption/paired-e2ee-native-codec.test.ts b/mobile/src/transport/encryption/paired-e2ee-native-codec.test.ts index 41e233f03a6..d9ecfafda52 100644 --- a/mobile/src/transport/encryption/paired-e2ee-native-codec.test.ts +++ b/mobile/src/transport/encryption/paired-e2ee-native-codec.test.ts @@ -83,13 +83,11 @@ describe('the native paired E2EE codec', () => { await sodium.ready }) - // UTF-8 fallback must preserve an already-opened frame whose counter advanced. - // libsodium sizes its output as the box length minus the MAC, which underflows and crashes. it('never hands libsodium a box shorter than its MAC', async () => { const { native } = await load(true) secretboxOpenCalls.mockClear() - for (let length = 0; length < 16; length++) { + for (const length of [0, 15]) { expect( native!.openSecretbox(new Uint8Array(length), randomBytes(24), randomBytes(32)) ).toBeNull() diff --git a/mobile/src/transport/relay/mobile-relay-resume-director.test.ts b/mobile/src/transport/relay/mobile-relay-resume-director.test.ts index 5eae841fb37..92042ef207f 100644 --- a/mobile/src/transport/relay/mobile-relay-resume-director.test.ts +++ b/mobile/src/transport/relay/mobile-relay-resume-director.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, it, vi } from 'vitest' +import { describe, expect, it } from 'vitest' import { resolveMobileRelayEndpoint } from './mobile-relay-resume-director' const relay = { @@ -11,30 +11,7 @@ const relay = { } describe('mobile relay resume director', () => { - it('rejects non-canonical targets and oversized bodies', async () => { - const badTarget = vi.fn( - async () => - new Response( - JSON.stringify({ - v: 1, - cellUrl: 'http://relay-c2.onorca.dev', - assignmentEpoch: 8, - leaseExpiresAt: 1 - }) - ) - ) - await expect( - resolveMobileRelayEndpoint({ relay, resumeToken: 'A'.repeat(43), fetchImpl: badTarget }) - ).rejects.toThrow(/cellUrl/) - - const oversized = vi.fn( - async () => - new Response('x'.repeat(16 * 1024 + 1), { headers: { 'content-length': '16385' } }) - ) - await expect( - resolveMobileRelayEndpoint({ relay, resumeToken: 'A'.repeat(43), fetchImpl: oversized }) - ).rejects.toThrow(/too large/) - + it('rejects oversized bodies despite an underreported content length', async () => { const oversizedBody = ' '.repeat(16 * 1024) + JSON.stringify({ @@ -43,14 +20,12 @@ describe('mobile relay resume director', () => { assignmentEpoch: 8, leaseExpiresAt: 1 }) - for (const headers of [new Headers(), new Headers({ 'content-length': '1' })]) { - await expect( - resolveMobileRelayEndpoint({ - relay, - resumeToken: 'A'.repeat(43), - fetchImpl: async () => new Response(oversizedBody, { headers }) - }) - ).rejects.toThrow(/too large/) - } + await expect( + resolveMobileRelayEndpoint({ + relay, + resumeToken: 'A'.repeat(43), + fetchImpl: async () => new Response(oversizedBody, { headers: { 'content-length': '1' } }) + }) + ).rejects.toThrow(/too large/) }) }) diff --git a/mobile/src/transport/rpc/foreground-stale-dial-restart.test.ts b/mobile/src/transport/rpc/foreground-stale-dial-restart.test.ts index 1670f485f50..8a08333ce11 100644 --- a/mobile/src/transport/rpc/foreground-stale-dial-restart.test.ts +++ b/mobile/src/transport/rpc/foreground-stale-dial-restart.test.ts @@ -106,27 +106,6 @@ describe('foregrounding a phone that was suspended mid-dial', () => { vi.unstubAllGlobals() }) - it('leaves a dial opened after the foreground edge alone', async () => { - const client = connect(TAILSCALE_ENDPOINT, 'token', 'server-key') - latest().authenticate() - latest().close() - await vi.advanceTimersByTimeAsync(500) - const fresh = latest() - expect(client.getState()).toBe('connecting') - - // Coalesce handoff and AppState nudges so the second cannot churn the first’s fresh socket. - client.notifyForeground() - const afterFirstNudge = latest() - client.notifyForeground() - client.notifyForeground() - - expect(latest()).toBe(afterFirstNudge) - expect(afterFirstNudge).toBe(fresh) - expect(fresh.readyState).toBe(MockWebSocket.CONNECTING) - - client.close() - }) - it('abandons a handshake stalled across the suspension', async () => { const client = connect(TAILSCALE_ENDPOINT, 'token', 'server-key') latest().authenticate() diff --git a/mobile/src/transport/rpc/rpc-client-capabilities.test.ts b/mobile/src/transport/rpc/rpc-client-capabilities.test.ts index 0fa58bac108..846db195627 100644 --- a/mobile/src/transport/rpc/rpc-client-capabilities.test.ts +++ b/mobile/src/transport/rpc/rpc-client-capabilities.test.ts @@ -100,7 +100,7 @@ describe('mobile rpc-client capabilities', () => { await vi.advanceTimersByTimeAsync(5_001) expect(client.getState()).toBe('connected') - expect(sentRequest(socket, 'session.tabs.subscribe')).toBeDefined() + sentRequest(socket, 'session.tabs.subscribe') expect(socket.readyState).toBe(MockWebSocket.OPEN) client.close() diff --git a/mobile/src/transport/rpc/rpc-client-connect-wait-replay.test.ts b/mobile/src/transport/rpc/rpc-client-connect-wait-replay.test.ts index 75807b2ddf5..ee000bdc61e 100644 --- a/mobile/src/transport/rpc/rpc-client-connect-wait-replay.test.ts +++ b/mobile/src/transport/rpc/rpc-client-connect-wait-replay.test.ts @@ -127,7 +127,3 @@ describe('mobile rpc-client connect-wait replay', () => { } }) }) - -// Exercise the hosted page's JSON boundary and the installed shell's real direct sender together. - -// The fake is provider/network I/O only; page, JSON parser, host, logical scope and direct wait are production. diff --git a/mobile/src/transport/rpc/rpc-client.test.ts b/mobile/src/transport/rpc/rpc-client.test.ts index 657cc241905..5042789d156 100644 --- a/mobile/src/transport/rpc/rpc-client.test.ts +++ b/mobile/src/transport/rpc/rpc-client.test.ts @@ -91,8 +91,6 @@ describe('mobile rpc-client connection timeout', () => { globalThis.WebSocket = originalWebSocket }) - // Foreground recovery must heal Android sessions left half-open after suspension (#5049). - // Transient auth rejection must not force re-pairing while the desktop still has valid credentials (#5200). describe('auth rejection retry (issue #5200)', () => { it('retries the handshake on a transient e2ee_error instead of latching auth-failed', async () => { diff --git a/mobile/src/transport/rpc/rpc-session-liveness-integration.test.ts b/mobile/src/transport/rpc/rpc-session-liveness-integration.test.ts index 3dbd1b69b40..5a82459be52 100644 --- a/mobile/src/transport/rpc/rpc-session-liveness-integration.test.ts +++ b/mobile/src/transport/rpc/rpc-session-liveness-integration.test.ts @@ -36,8 +36,6 @@ class MockWebSocket { onclose: (() => void) | null = null onmessage: ((event: { data: unknown }) => void) | null = null onerror: (() => void) | null = null - throwOnSend = false - throwForMethod: string | null = null readonly sent: string[] = [] close = vi.fn(() => { this.readyState = MockWebSocket.CLOSED @@ -49,12 +47,6 @@ class MockWebSocket { } send(payload: string): void { - if ( - this.throwOnSend || - (this.throwForMethod && payload.includes(`"method":"${this.throwForMethod}"`)) - ) { - throw new Error('socket send failed') - } this.sent.push(payload) } diff --git a/mobile/src/transport/web-bundle/mobile-web-bundle-range-decode.test.ts b/mobile/src/transport/web-bundle/mobile-web-bundle-range-decode.test.ts index c87f1aca214..07bb99e779a 100644 --- a/mobile/src/transport/web-bundle/mobile-web-bundle-range-decode.test.ts +++ b/mobile/src/transport/web-bundle/mobile-web-bundle-range-decode.test.ts @@ -1,7 +1,5 @@ import { gzipSync } from 'fflate' import { describe, expect, it } from 'vitest' -import gunzipVectors from '../../../modules/orca-gzip-utf8-codec/tests/gunzip-vectors.json' -import { MobileWebBundleFetchError } from './mobile-web-bundle-fetch-refusal' import { decodeMobileWebBundleRange } from './mobile-web-bundle-range-decode' const RAW = Uint8Array.from({ length: 20_000 }, (_, index) => (index * 31) % 7) @@ -20,25 +18,4 @@ describe('decoding a bundle range', () => { RAW.byteLength - 99 ) }) - - // Pin fflate’s leniency against shared native vectors for CRC/length/trailing bytes; native decoding is stricter. - it('answers the shared gunzip vectors as fflate does', () => { - for (const vector of gunzipVectors) { - let actual: string | null - try { - actual = Buffer.from( - decodeMobileWebBundleRange( - RANGE, - Buffer.from(vector.gzipHex, 'hex'), - vector.outputLimit - 1 - ) - ).toString('hex') - } catch (error) { - expect(error, vector.name).toBeInstanceOf(MobileWebBundleFetchError) - expect(error, vector.name).toMatchObject({ refusal: 'range-undecodable' }) - actual = null - } - expect(actual, vector.name).toBe(vector.js) - } - }) }) diff --git a/mobile/src/worktree/agent-row-lineage.test.ts b/mobile/src/worktree/agent-row-lineage.test.ts index a2483c375f2..013c6fe7c3b 100644 --- a/mobile/src/worktree/agent-row-lineage.test.ts +++ b/mobile/src/worktree/agent-row-lineage.test.ts @@ -36,18 +36,6 @@ describe('buildAgentRowLineageTree', () => { }) describe('flattenAgentRowLineage', () => { - it('emits parent then descendants with increasing depth', () => { - const rows = [row('a'), row('b', 'a'), row('c', 'b'), row('d')] - const flat = flattenAgentRowLineage(rows) - - expect(flat.map((n) => [n.row.paneKey, n.depth])).toEqual([ - ['a', 0], - ['b', 1], - ['c', 2], - ['d', 0] - ]) - }) - it('keeps a cyclic component visible even when other roots exist', () => { // The disconnected a↔b cycle has no root and must remain visible beside the ordinary tree. const rows = [row('root'), row('a', 'b'), row('b', 'a')] diff --git a/mobile/src/worktree/last-visited-worktree-by-host.test.ts b/mobile/src/worktree/last-visited-worktree-by-host.test.ts index 832346d85e0..ca5a804d406 100644 --- a/mobile/src/worktree/last-visited-worktree-by-host.test.ts +++ b/mobile/src/worktree/last-visited-worktree-by-host.test.ts @@ -1,16 +1,13 @@ import { describe, expect, it, vi } from 'vitest' -type StorageDouble = { rejection: unknown; values: Map } +type StorageDouble = { values: Map } -const storage = vi.hoisted((): StorageDouble => ({ rejection: null, values: new Map() })) +const storage = vi.hoisted((): StorageDouble => ({ values: new Map() })) vi.mock('@react-native-async-storage/async-storage', () => ({ default: { getItem: async (key: string) => storage.values.get(key) ?? null, setItem: async (key: string, value: string) => { - if (storage.rejection !== null) { - throw storage.rejection - } storage.values.set(key, value) }, removeItem: async (key: string) => { @@ -25,32 +22,11 @@ import { withLastVisitedWorktree, writeLastVisitedWorktree } from './last-visited-worktree-by-host' -import { - LAST_VISITED_WORKTREE_STORAGE_KEY, - readLastVisitedWorktreeRecord -} from './last-visited-worktree-repo' +import { LAST_VISITED_WORKTREE_STORAGE_KEY } from './last-visited-worktree-repo' const stored = () => storage.values.get(LAST_VISITED_WORKTREE_STORAGE_KEY) ?? null describe('readLastVisitedWorktreeOnHost', () => { - it('remembers each host’s own visit, whichever host was visited last', () => { - let raw = withLastVisitedWorktree(null, { hostId: 'host-1', worktreeId: 'repo::/w/a' }) - raw = withLastVisitedWorktree(raw, { - hostId: 'host-2', - worktreeId: 'repo::/w/b', - executionHost: 'runtime:env-1' - }) - expect(readLastVisitedWorktreeOnHost(raw, 'host-1')).toEqual({ worktreeId: 'repo::/w/a' }) - expect(readLastVisitedWorktreeOnHost(raw, 'host-2')).toEqual({ - worktreeId: 'repo::/w/b', - executionHost: 'runtime:env-1' - }) - expect(readLastVisitedWorktreeRecord(raw)).toEqual({ - hostId: 'host-2', - worktreeId: 'repo::/w/b' - }) - }) - it('reads a record stored before per-host visits for its own host, and keeps it on the next write', () => { const legacy = JSON.stringify({ hostId: 'host-1', worktreeId: 'repo::/w/a' }) expect(readLastVisitedWorktreeOnHost(legacy, 'host-1')).toEqual({ worktreeId: 'repo::/w/a' }) @@ -96,15 +72,4 @@ describe('writeLastVisitedWorktree', () => { executionHost: 'runtime:env-1' }) }) - - it('handles a store that refuses the write instead of leaving the rejection loose', async () => { - storage.rejection = new Error('quota exceeded') - try { - await expect( - writeLastVisitedWorktree({ hostId: 'host-1', worktreeId: 'repo::/w/c' }) - ).resolves.toBeUndefined() - } finally { - storage.rejection = null - } - }) }) diff --git a/mobile/src/worktree/last-visited-worktree-repo.test.ts b/mobile/src/worktree/last-visited-worktree-repo.test.ts deleted file mode 100644 index 61faf5bd7bc..00000000000 --- a/mobile/src/worktree/last-visited-worktree-repo.test.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { describe, expect, it } from 'vitest' - -import { - readLastVisitedWorktreeRecord, - readLastVisitedWorktreeRepoId -} from './last-visited-worktree-repo' - -describe('last visited worktree repo', () => { - it('ignores records for another host', () => { - const raw = JSON.stringify({ hostId: 'host-2', worktreeId: 'repo-2::/tmp/worktree' }) - - expect(readLastVisitedWorktreeRepoId(raw, 'host-1')).toBeNull() - }) -}) - -describe('readLastVisitedWorktreeRecord', () => { - it('rejects empty ids that would build a route to nowhere', () => { - expect( - readLastVisitedWorktreeRecord(JSON.stringify({ hostId: '', worktreeId: 'repo::/wt' })) - ).toBeNull() - expect( - readLastVisitedWorktreeRecord(JSON.stringify({ hostId: 'host-1', worktreeId: '' })) - ).toBeNull() - }) -}) diff --git a/mobile/src/worktree/structural-equality.test.ts b/mobile/src/worktree/structural-equality.test.ts index d924795637c..60f71307526 100644 --- a/mobile/src/worktree/structural-equality.test.ts +++ b/mobile/src/worktree/structural-equality.test.ts @@ -5,7 +5,6 @@ describe('areStructurallyEqual', () => { it('equates value-equal nested objects and arrays', () => { const value = () => ({ id: 'a', agents: [{ state: 'working', mainAgent: { stopping: true } }] }) expect(areStructurallyEqual(value(), value())).toBe(true) - expect(areStructurallyEqual([1, [2, { x: null }]], [1, [2, { x: null }]])).toBe(true) }) it('detects a changed nested value', () => { diff --git a/mobile/src/worktree/use-last-visited-worktree-on-host.test.tsx b/mobile/src/worktree/use-last-visited-worktree-on-host.test.tsx index 08c915028c0..66f494abe50 100644 --- a/mobile/src/worktree/use-last-visited-worktree-on-host.test.tsx +++ b/mobile/src/worktree/use-last-visited-worktree-on-host.test.tsx @@ -98,15 +98,6 @@ describe('the list page highlight across the shell’s separate pages', () => { list.unmount() }) - it('reads the stored visit when the list page loads again', async () => { - appStore.clear() - const session = await loadPage(`/h/${HOST}/session/w`) - await session.visits.writeLastVisitedWorktree({ hostId: HOST, worktreeId: 'repo::/w/3' }) - const list = await mountListPage() - expect(list.value()).toEqual({ worktreeId: 'repo::/w/3' }) - list.unmount() - }) - it('follows a session page’s write when the list is the app’s own screen beside it', async () => { appStore.clear() const list = await mountListPage() diff --git a/mobile/src/worktree/workspace-details-model.test.ts b/mobile/src/worktree/workspace-details-model.test.ts index ae0ee36256b..a3132c97822 100644 --- a/mobile/src/worktree/workspace-details-model.test.ts +++ b/mobile/src/worktree/workspace-details-model.test.ts @@ -37,32 +37,6 @@ describe('buildWorkspaceDetailLinks', () => { expect(links[3]).toMatchObject({ title: 'Bug', url: 'https://x/3' }) }) - it("carries the row's PR state, title, link and checks onto its entry", () => { - const [pr, other] = buildWorkspaceDetailLinks( - row({ - linkedItems: [{ provider: 'github', type: 'pr', number: 9, title: 'Older linked PR' }], - linkedPR: { - number: 12, - state: 'merged', - title: 'Search keyboard', - url: 'https://github.com/o/r/pull/12', - checksStatus: 'failure' - } - }) - ) - - expect(pr).toMatchObject({ label: 'PR #9', title: 'Older linked PR' }) - expect(pr).not.toHaveProperty('state') - expect(other).toMatchObject({ - label: 'PR #12', - number: 12, - title: 'Search keyboard', - url: 'https://github.com/o/r/pull/12', - state: 'merged', - checks: 'failure' - }) - }) - it('enriches a linked entry for the same repo and PR', () => { const links = buildWorkspaceDetailLinks( row({ diff --git a/mobile/src/worktree/workspace-view-settings.test.ts b/mobile/src/worktree/workspace-view-settings.test.ts index c63ae3e5b66..9597425b216 100644 --- a/mobile/src/worktree/workspace-view-settings.test.ts +++ b/mobile/src/worktree/workspace-view-settings.test.ts @@ -33,18 +33,6 @@ describe('the other-client filter on an older desktop', () => { }) describe('applyDesktopViewSettings', () => { - it("falls back to the desktop's legacy host scope when no host list is saved", () => { - const scoped = applyDesktopViewSettings(base, { - visibleWorkspaceHostIds: null, - workspaceHostScope: 'ssh:box' - }) - expect(scoped.filters.visibleHostIds).toEqual(['ssh:box']) - expect( - applyDesktopViewSettings(scoped, { visibleWorkspaceHostIds: null, workspaceHostScope: 'all' }) - .filters.visibleHostIds - ).toBeNull() - }) - it('ignores an unrecognized groupBy rather than blanking the mode', () => { const newerGroup: WorkspaceViewSettings = JSON.parse('{"groupBy":"mystery"}') const next = applyDesktopViewSettings(base, newerGroup) diff --git a/mobile/src/worktree/worktree-host-row-identity.test.ts b/mobile/src/worktree/worktree-host-row-identity.test.ts index 8130eebde25..87216b8b719 100644 --- a/mobile/src/worktree/worktree-host-row-identity.test.ts +++ b/mobile/src/worktree/worktree-host-row-identity.test.ts @@ -65,16 +65,6 @@ describe('host-qualified row display state', () => { expect([...retained]).toEqual([getWorktreeRowIdentity(remote)]) }) - it('keeps first-match behavior when confirmed identities are duplicated', () => { - const identity = getWorktreeRowIdentity(row('shared', 'ssh:a')) - const retained = retainLiveSleptWorktreeIdentities(new Set([identity]), [ - row('shared', 'ssh:a', { liveTerminalCount: 0 }), - row('shared', 'ssh:a', { liveTerminalCount: 1 }) - ]) - - expect([...retained]).toEqual([]) - }) - it('applies active and slept overrides to the matching host row only', () => { const local = row('shared', 'ssh:a') const remote = row('shared', 'ssh:b') diff --git a/mobile/src/worktree/worktree-list-completeness.test.ts b/mobile/src/worktree/worktree-list-completeness.test.ts index 51cdf7b180f..89b15ecb947 100644 --- a/mobile/src/worktree/worktree-list-completeness.test.ts +++ b/mobile/src/worktree/worktree-list-completeness.test.ts @@ -56,17 +56,6 @@ function visibleWorktreeIds( } describe('every worktree stays visible regardless of repo.list contents', () => { - it('shows worktrees whose repoId is missing from repo.list', () => { - const worktrees = [ - worktree('orca-local', 'a'), - worktree('orca-local', 'b'), - worktree('orca-runtime', 'c') - ] - const catalogRepos = [['orca-runtime', 'orca-runtime']] as const - - expect(visibleWorktreeIds(worktrees, catalogRepos)).toEqual(['a', 'b', 'c']) - }) - it('shows every worktree when the same repo name maps to two host-specific ids', () => { // Same-name local/runtime repos expose any name-keyed map that discards an owner id. const worktrees = [ From 587562e862c564a49eb3e35217fbb1595d04bbc5 Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Fri, 13 Nov 2026 12:12:51 -0800 Subject: [PATCH 7/8] refactor: organize shared sidebar list modules by domain (#42107) --- config/flaky-test-pattern-baseline.txt | 4 - config/repo-host-read-baseline.txt | 2 +- .../catalog/use-host-repo-icon-data-urls.ts | 2 +- .../sidebar-feed/host-sidebar-feed-inputs.ts | 4 +- .../host-sidebar-feed-operations.ts | 2 +- .../host-sidebar-feed-sections.ts | 4 +- .../sidebar-feed/use-host-sidebar-feed.ts | 2 +- .../workspace-list/use-host-list-sections.ts | 6 +- .../worktree/folder-workspace-lane-order.ts | 2 +- .../src/worktree/workspace-list-ordering.ts | 7 +- .../src/worktree/workspace-list-sections.ts | 4 +- .../workspace-cleanup-candidate.ts | 2 +- .../workspace-cleanup-git-evidence.ts | 2 +- .../workspace-cleanup-merge-evidence.ts | 2 +- .../workspace-cleanup-scan.ts | 2 +- .../mobile-relay-host-catalog.ts | 2 +- .../methods/sidebar-inputs/sidebar-inputs.ts | 4 +- .../catalog/desktop-sidebar-facts.ts | 2 +- .../orca-runtime-project-catalog.test.ts | 2 +- .../catalog/sidebar-project-catalog.ts | 2 +- .../feed/sidebar-inputs-feed-pages.test.ts | 57 --- .../feed/sidebar-inputs-feed-pages.ts | 2 +- .../feed/sidebar-inputs-feed-pins.ts | 2 +- .../feed/sidebar-inputs-feed.test.ts | 19 +- .../feed/sidebar-inputs-feed.ts | 2 +- .../sidebar-inputs-feed.test-fixture.ts | 4 +- .../orca-runtime-sidebar-temporal.ts | 2 +- .../repo-icons/repo-icon-data-urls.ts | 2 +- .../sidebar-inputs-feed-domains.test.ts | 20 +- .../sidebar-inputs-feed-domains.ts | 8 +- .../temporal/sidebar-retention-owner.ts | 4 +- .../temporal/sort-stamps-producer.test.ts | 28 +- .../temporal/sort-stamps-producer.ts | 2 +- ...runtime-detected-checkouts-live-content.ts | 2 +- .../orca-runtime-workspace-activity-facts.ts | 2 +- .../orca-runtime-workspace-review-facts.ts | 2 +- .../workspace-activity-facts-producer.ts | 2 +- .../workspace-live-content-producer.ts | 2 +- .../paired-server-rows-producer.ts | 6 +- .../workspace-rows/workspace-rows-producer.ts | 2 +- .../lifecycle/workspace-lifecycle-command.ts | 2 +- .../workspace-lifecycle-creations.ts | 2 +- .../lifecycle/workspace-lifecycle-queue.ts | 4 +- .../metadata/workspace-activity-records.ts | 2 +- .../runtime-worktree-ps-summaries.ts | 4 +- .../ssh/config/ssh-config-include-expander.ts | 2 +- src/preload/api/runtime/runtime-api.ts | 2 +- src/preload/api/runtime/runtime-bridge.ts | 2 +- .../attention/unread/unread-badge-count.ts | 4 +- .../components/cmd-j/palette-live-status.tsx | 4 +- .../cmd-j/palette-project-results.ts | 2 +- .../native-chat-resume-workspace-lookups.ts | 2 +- .../ComposerParentWorktreePicker.tsx | 2 +- ...older-workspace-attached-worktrees.test.ts | 198 +-------- .../folder-workspace-attached-worktrees.ts | 2 +- .../sidebar-feed/desktop-sidebar-feed.ts | 4 +- .../sidebar-feed/sidebar-pending-layer.ts | 6 +- .../context-menu/use-menu-lineage-parent.ts | 2 +- .../deletion/workspace-delete-lineage.ts | 2 +- .../parenting/worktree-parent-candidates.ts | 2 +- .../parenting/worktree-parent-eligibility.ts | 2 +- .../workspace-kanban-worktree-groups.ts | 2 +- .../child-workspaces-toggle-target.ts | 4 +- .../folder-workspace-card-pr-display.ts | 2 +- .../use-projects-collapse-all-announcement.ts | 2 +- .../sidebar/worktree-list/drag/groups.ts | 9 +- .../drag/root-project-header-drop.test.ts | 22 +- .../drag/root-project-header-drop.ts | 2 +- .../worktree-list/drag/use-header-drag.ts | 2 +- .../drag/use-lineage-drop-commit.ts | 2 +- .../sidebar/worktree-list/drag/use-session.ts | 4 +- .../drag/use-status-mutations.ts | 2 +- .../worktree-list/drag/use-status-row-drag.ts | 4 +- .../worktree-list/drag/worktree-drag-units.ts | 7 +- .../drag/worktree-lineage-drag-drop.ts | 2 +- .../drag/worktree-manual-order-catalog.ts | 2 +- .../grouping/build-rows.test-fixture.ts | 2 +- .../grouping/pinned-section-worktrees.test.ts | 57 +-- .../worktree-list/grouping/pr-group-key.ts | 2 +- .../recent-project-rank-scan-budget.test.ts | 2 +- .../worktree-lineage-projection.test.ts | 16 +- ...rktree-list-groups-lineage-nesting.test.ts | 2 +- .../worktree-list/listing/WorktreeList.tsx | 2 +- .../listing/compute-visible-worktrees.ts | 4 +- .../listing/folder-path-status-routing.ts | 2 +- .../listing/natural-worktree-keys.ts | 2 +- .../listing/project-collapse-all.ts | 4 +- .../worktree-list/listing/render-row.ts | 2 +- .../worktree-list/listing/renderable-rows.ts | 4 +- .../listing/rendered-row-keys.ts | 2 +- .../rendered-sidebar-worktree-order.ts | 6 +- .../listing/sidebar-list-model.ts | 2 +- .../listing/use-empty-project-placeholders.ts | 2 +- .../worktree-list/listing/use-filters.ts | 2 +- .../listing/use-host-visible-scope.ts | 2 +- .../listing/use-main-list-model.ts | 10 +- .../listing/use-order-hold.test.ts | 2 +- .../worktree-list/listing/use-order-hold.ts | 4 +- .../worktree-list/listing/use-section-rows.ts | 8 +- .../listing/use-sleeping-sweep-retention.ts | 2 +- .../listing/use-sort-order.test.tsx | 169 ------- .../worktree-list/listing/use-sort-order.ts | 8 +- .../use-visible-worktrees-retention.test.tsx | 2 +- .../listing/use-visible-worktrees.ts | 2 +- .../listing/visible-worktrees.ts | 2 +- .../listing/window-worktree-creations.ts | 2 +- .../worktree-sort-label-ordering.test.ts | 2 +- .../worktree-list/navigation/folder-reveal.ts | 8 +- .../navigation/pending-reveal-inputs.ts | 2 +- .../navigation/reveal-ancestors.ts | 2 +- .../sidebar-workspace-delete.test.tsx | 359 +-------------- .../navigation/use-active-row.ts | 2 +- .../use-keyboard.host-identity.test.tsx | 192 -------- .../navigation/use-keyboard.reveal.test.tsx | 413 ------------------ .../worktree-list/navigation/use-keyboard.ts | 2 +- .../navigation/use-neighbor-prewarm.ts | 2 +- .../use-selection-host-collision.test.tsx | 33 +- .../worktree-list/navigation/use-selection.ts | 2 +- .../worktree-keyboard-cycle.test.ts | 22 +- .../navigation/worktree-keyboard-cycle.ts | 2 +- .../navigation/worktree-reveal-group-keys.ts | 6 +- .../worktree-sidebar-row-preference.ts | 4 +- .../sidebar-desktop-facts.test-fixture.ts | 2 +- ...ebar-list-golden-serialize.test-fixture.ts | 2 +- ...ist-parity-project-catalog.test-fixture.ts | 4 +- .../sidebar-list-parity.test-fixture.ts | 18 +- ...sidebar-paired-server-rows.test-fixture.ts | 2 +- ...sidebar-workspace-activity.test-fixture.ts | 2 +- .../rows/HostSectionHeader.fixture.tsx | 2 +- .../worktree-list/rows/HostSectionHeader.tsx | 2 +- .../rows/HostSectionHeaderMenu.tsx | 2 +- .../worktree-list/rows/SectionHeader.tsx | 2 +- .../sidebar/worktree-list/rows/folder-row.tsx | 2 +- .../worktree-list/rows/header-event-guards.ts | 2 +- .../worktree-list/rows/host-header-detail.ts | 2 +- .../sidebar/worktree-list/rows/item-row.tsx | 4 +- .../rows/project-header-host-context.ts | 2 +- .../rows/section-header-create-host.test.tsx | 165 ------- .../rows/virtual-row-dispatch.tsx | 2 +- .../worktree-list/viewport/viewport-props.ts | 2 +- .../worktree-list/viewport/virtual-rows.ts | 2 +- .../status-bar/resource-pty-view-model.ts | 2 +- .../workspace-cleanup-facet-row-caches.ts | 2 +- .../workspace-cleanup-facet.test.fixture.ts | 2 +- .../query/workspace-cleanup-facets.ts | 2 +- .../use-worktree-jump-palette-filter.ts | 2 +- .../use-worktree-jump-palette-recent-tabs.ts | 2 +- .../use-worktree-jump-palette-worktrees.ts | 2 +- .../worktree-jump-palette-recent-inclusion.ts | 2 +- .../activity/worktree-activity-state.ts | 2 +- .../lib/workspace/activity/worktree-status.ts | 2 +- .../palette/recent-workspace-tab-rows.ts | 2 +- .../vm-create-hidden-checkouts.ts | 2 +- .../agent-status/agent-status-live-facts.ts | 2 +- .../src/store/slices/ui/settled-sort-epoch.ts | 2 +- .../metadata/cross-store-lineage-parents.ts | 2 +- .../folder-workspace-types.ts | 2 +- .../folder-workspaces/folder-workspaces.ts | 2 +- src/shared/hidden-projects.test.ts | 59 --- src/shared/project-section-order.ts | 2 +- src/shared/root-project-order.ts | 2 +- .../rpc-params-catalog.generated.ts | 4 +- src/shared/runtime-client-events.ts | 2 +- src/shared/runtime-worktree-contracts.ts | 2 +- .../sidebar-feed-reader.test.ts | 43 +- .../sidebar-feed-reader.ts | 4 +- .../sidebar-feed-snapshot.ts | 6 +- .../empty-project-placeholder-repos.ts | 12 +- .../{ => catalog}/paired-server-catalog.ts | 18 +- .../repo-icon-data-urls-contract.ts | 4 +- .../{ => catalog}/sidebar-feed-catalog.ts | 10 +- .../{ => catalog}/sidebar-project-catalog.ts | 26 +- .../{ => feed-facts}/desktop-sidebar-facts.ts | 0 .../paired-server-activity-facts.ts | 10 +- .../{ => feed-facts}/paired-server-rows.ts | 22 +- .../workspace-activity-facts.ts | 4 +- .../{ => feed-facts}/workspace-creations.ts | 0 .../workspace-lifecycle-hints.ts | 0 .../workspace-live-content.ts | 0 .../workspace-review-facts.test.ts | 0 .../workspace-review-facts.ts | 16 +- .../{ => feed-facts}/workspace-rows.ts | 30 +- .../{ => feed}/sidebar-feed-domains.ts | 22 +- .../{ => feed}/sidebar-feed-index.ts | 25 +- .../sidebar-feed-lineage-parents.ts | 14 +- .../{ => feed}/sidebar-feed-rows.test.ts | 40 +- .../{ => feed}/sidebar-feed-rows.ts | 50 +-- .../{ => feed}/sidebar-feed-worktrees.ts | 18 +- .../sidebar-inputs-feed-contract.ts | 2 +- .../sidebar-inputs-feed-installer.test.ts | 7 - .../sidebar-inputs-feed-installer.ts | 0 .../{ => feed}/sidebar-temporal-snapshot.ts | 0 .../{ => folders}/folder-workspace-lanes.ts | 19 +- .../folder-workspace-occurrences.ts | 8 +- .../{ => hosts}/folder-workspace-host-id.ts | 6 +- .../{ => hosts}/host-filtering.ts | 8 +- .../sidebar-list/{ => hosts}/host-labels.ts | 25 +- .../{ => hosts}/host-section-collapse.ts | 4 +- .../{ => hosts}/host-section-order.ts | 2 +- .../{ => hosts}/host-section-rows.ts | 12 +- .../host-section-workspace-count.ts | 2 +- .../project-header-localization.ts | 4 +- .../{ => lineage}/pinned-section-worktrees.ts | 8 +- .../worktree-lineage-projection.ts | 16 +- .../sidebar-list/{ => sections}/group-keys.ts | 12 +- .../{ => sections}/group-sections.ts | 22 +- .../{ => sections}/imported-worktree-lines.ts | 8 +- .../{ => sections}/pinned-group-rows.ts | 10 +- .../{ => sections}/project-group-sections.ts | 18 +- .../{ => sections}/row-builders.ts | 16 +- .../{ => sections}/section-order.ts | 2 +- .../{ => sections}/worktree-group-entry.ts | 6 +- .../{ => sections}/worktree-group-keys.ts | 20 +- .../{ => sections}/worktree-grouping.ts | 21 +- .../{ => selection}/active-workspace.ts | 10 +- .../sleeping-sweep-retention.test.ts | 2 - .../sleeping-sweep-retention.ts | 0 .../{ => selection}/visible-worktrees.ts | 12 +- src/shared/sidebar-list/sidebar-row-plan.ts | 28 +- src/shared/sidebar-list/smart-sort.test.ts | 165 ------- .../{ => sorting}/smart-attention.ts | 32 +- .../{ => sorting}/smart-sort-agent-change.ts | 6 +- .../{ => sorting}/smart-sort-phase.ts | 2 +- .../sidebar-list/{ => sorting}/smart-sort.ts | 26 +- .../{ => sorting}/sort-settle.test.ts | 22 +- .../sidebar-list/{ => sorting}/sort-settle.ts | 2 +- .../sidebar-list/{ => sorting}/sort-stamps.ts | 2 +- .../{ => sorting}/stamp-order.test.ts | 0 .../sidebar-list/{ => sorting}/stamp-order.ts | 0 .../{ => sorting}/text-order.test.ts | 24 +- .../sidebar-list/{ => sorting}/text-order.ts | 0 .../workspace-view/workspace-row-sort.ts | 2 +- src/shared/worktree/meta-types.ts | 2 +- src/shared/worktree/types.ts | 2 +- tests/e2e/helpers/phone-feed-list.ts | 4 +- tests/e2e/sidebar-host-unread.spec.ts | 2 +- tests/e2e/sidebar-inputs-feed.spec.ts | 14 +- tests/e2e/sidebar-review-facts.spec.ts | 2 +- tests/e2e/sidebar-sort-stamps-order.spec.ts | 66 --- tests/e2e/sidebar-sort-stamps-startup.spec.ts | 2 +- tests/e2e/sidebar-sort-stamps.spec.ts | 87 ---- tests/e2e/sidebar-workspace-rows.spec.ts | 4 +- 242 files changed, 616 insertions(+), 2792 deletions(-) delete mode 100644 src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed-pages.test.ts delete mode 100644 src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.test.tsx delete mode 100644 src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.host-identity.test.tsx delete mode 100644 src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.reveal.test.tsx delete mode 100644 src/renderer/src/components/sidebar/worktree-list/rows/section-header-create-host.test.tsx delete mode 100644 src/shared/hidden-projects.test.ts rename src/shared/sidebar-list/{ => catalog}/empty-project-placeholder-repos.ts (85%) rename src/shared/sidebar-list/{ => catalog}/paired-server-catalog.ts (82%) rename src/shared/sidebar-list/{ => catalog}/repo-icon-data-urls-contract.ts (90%) rename src/shared/sidebar-list/{ => catalog}/sidebar-feed-catalog.ts (82%) rename src/shared/sidebar-list/{ => catalog}/sidebar-project-catalog.ts (73%) rename src/shared/sidebar-list/{ => feed-facts}/desktop-sidebar-facts.ts (100%) rename src/shared/sidebar-list/{ => feed-facts}/paired-server-activity-facts.ts (85%) rename src/shared/sidebar-list/{ => feed-facts}/paired-server-rows.ts (94%) rename src/shared/sidebar-list/{ => feed-facts}/workspace-activity-facts.ts (95%) rename src/shared/sidebar-list/{ => feed-facts}/workspace-creations.ts (100%) rename src/shared/sidebar-list/{ => feed-facts}/workspace-lifecycle-hints.ts (100%) rename src/shared/sidebar-list/{ => feed-facts}/workspace-live-content.ts (100%) rename src/shared/sidebar-list/{ => feed-facts}/workspace-review-facts.test.ts (100%) rename src/shared/sidebar-list/{ => feed-facts}/workspace-review-facts.ts (89%) rename src/shared/sidebar-list/{ => feed-facts}/workspace-rows.ts (90%) rename src/shared/sidebar-list/{ => feed}/sidebar-feed-domains.ts (93%) rename src/shared/sidebar-list/{ => feed}/sidebar-feed-index.ts (89%) rename src/shared/sidebar-list/{ => feed}/sidebar-feed-lineage-parents.ts (89%) rename src/shared/sidebar-list/{ => feed}/sidebar-feed-rows.test.ts (79%) rename src/shared/sidebar-list/{ => feed}/sidebar-feed-rows.ts (87%) rename src/shared/sidebar-list/{ => feed}/sidebar-feed-worktrees.ts (92%) rename src/shared/sidebar-list/{ => feed}/sidebar-inputs-feed-contract.ts (98%) rename src/shared/sidebar-list/{ => feed}/sidebar-inputs-feed-installer.test.ts (94%) rename src/shared/sidebar-list/{ => feed}/sidebar-inputs-feed-installer.ts (100%) rename src/shared/sidebar-list/{ => feed}/sidebar-temporal-snapshot.ts (100%) rename src/shared/sidebar-list/{ => folders}/folder-workspace-lanes.ts (81%) rename src/shared/sidebar-list/{ => folders}/folder-workspace-occurrences.ts (93%) rename src/shared/sidebar-list/{ => hosts}/folder-workspace-host-id.ts (71%) rename src/shared/sidebar-list/{ => hosts}/host-filtering.ts (94%) rename src/shared/sidebar-list/{ => hosts}/host-labels.ts (93%) rename src/shared/sidebar-list/{ => hosts}/host-section-collapse.ts (92%) rename src/shared/sidebar-list/{ => hosts}/host-section-order.ts (96%) rename src/shared/sidebar-list/{ => hosts}/host-section-rows.ts (97%) rename src/shared/sidebar-list/{ => hosts}/host-section-workspace-count.ts (97%) rename src/shared/sidebar-list/{ => hosts}/project-header-localization.ts (90%) rename src/shared/sidebar-list/{ => lineage}/pinned-section-worktrees.ts (92%) rename src/shared/sidebar-list/{ => lineage}/worktree-lineage-projection.ts (94%) rename src/shared/sidebar-list/{ => sections}/group-keys.ts (76%) rename src/shared/sidebar-list/{ => sections}/group-sections.ts (91%) rename src/shared/sidebar-list/{ => sections}/imported-worktree-lines.ts (82%) rename src/shared/sidebar-list/{ => sections}/pinned-group-rows.ts (82%) rename src/shared/sidebar-list/{ => sections}/project-group-sections.ts (93%) rename src/shared/sidebar-list/{ => sections}/row-builders.ts (92%) rename src/shared/sidebar-list/{ => sections}/section-order.ts (86%) rename src/shared/sidebar-list/{ => sections}/worktree-group-entry.ts (54%) rename src/shared/sidebar-list/{ => sections}/worktree-group-keys.ts (78%) rename src/shared/sidebar-list/{ => sections}/worktree-grouping.ts (88%) rename src/shared/sidebar-list/{ => selection}/active-workspace.ts (80%) rename src/shared/sidebar-list/{ => selection}/sleeping-sweep-retention.test.ts (95%) rename src/shared/sidebar-list/{ => selection}/sleeping-sweep-retention.ts (100%) rename src/shared/sidebar-list/{ => selection}/visible-worktrees.ts (92%) delete mode 100644 src/shared/sidebar-list/smart-sort.test.ts rename src/shared/sidebar-list/{ => sorting}/smart-attention.ts (90%) rename src/shared/sidebar-list/{ => sorting}/smart-sort-agent-change.ts (75%) rename src/shared/sidebar-list/{ => sorting}/smart-sort-phase.ts (89%) rename src/shared/sidebar-list/{ => sorting}/smart-sort.ts (91%) rename src/shared/sidebar-list/{ => sorting}/sort-settle.test.ts (63%) rename src/shared/sidebar-list/{ => sorting}/sort-settle.ts (96%) rename src/shared/sidebar-list/{ => sorting}/sort-stamps.ts (98%) rename src/shared/sidebar-list/{ => sorting}/stamp-order.test.ts (100%) rename src/shared/sidebar-list/{ => sorting}/stamp-order.ts (100%) rename src/shared/sidebar-list/{ => sorting}/text-order.test.ts (82%) rename src/shared/sidebar-list/{ => sorting}/text-order.ts (100%) delete mode 100644 tests/e2e/sidebar-sort-stamps-order.spec.ts delete mode 100644 tests/e2e/sidebar-sort-stamps.spec.ts diff --git a/config/flaky-test-pattern-baseline.txt b/config/flaky-test-pattern-baseline.txt index 1b522a11672..044c4c20559 100644 --- a/config/flaky-test-pattern-baseline.txt +++ b/config/flaky-test-pattern-baseline.txt @@ -309,8 +309,6 @@ 1 test-no-real-time-wait:tests/e2e/settled-worker-tab-survives-restart.spec.ts 2 test-no-real-time-wait:tests/e2e/setup-script-prompt-unreadable-orca-yaml.spec.ts 2 test-no-real-time-wait:tests/e2e/sidebar-desktop-reads-main.spec.ts -2 test-no-real-time-wait:tests/e2e/sidebar-sort-stamps-order.spec.ts -2 test-no-real-time-wait:tests/e2e/sidebar-sort-stamps.spec.ts 1 test-no-real-time-wait:tests/e2e/sidebar-unread-older-paired-host.spec.ts 2 test-no-real-time-wait:tests/e2e/slept-workspace-remount-wake.spec.ts 1 test-no-real-time-wait:tests/e2e/ssh-orcad-explorer-selected-host.spec.ts @@ -757,9 +755,7 @@ 1 test-timeout-needs-reason:tests/e2e/sidebar-desktop-reads-main.spec.ts 2 test-timeout-needs-reason:tests/e2e/sidebar-host-unread.spec.ts 4 test-timeout-needs-reason:tests/e2e/sidebar-phone-feed-list.spec.ts -1 test-timeout-needs-reason:tests/e2e/sidebar-sort-stamps-order.spec.ts 1 test-timeout-needs-reason:tests/e2e/sidebar-sort-stamps-startup.spec.ts -1 test-timeout-needs-reason:tests/e2e/sidebar-sort-stamps.spec.ts 2 test-timeout-needs-reason:tests/e2e/sidebar-unread-older-paired-host.spec.ts 1 test-timeout-needs-reason:tests/e2e/sidebar-workspace-rows.spec.ts 1 test-timeout-needs-reason:tests/e2e/source-control-large-file-count.spec.ts diff --git a/config/repo-host-read-baseline.txt b/config/repo-host-read-baseline.txt index af28a24cad0..432a9783361 100644 --- a/config/repo-host-read-baseline.txt +++ b/config/repo-host-read-baseline.txt @@ -48,6 +48,6 @@ 1 src/shared/folder-workspaces/folder-workspace-execution-host.ts 1 src/shared/github/cache/github-cache-key.ts 1 src/shared/new-workspace-dialog-repo.ts -1 src/shared/sidebar-list/workspace-review-facts.ts +1 src/shared/sidebar-list/feed-facts/workspace-review-facts.ts 1 src/shared/workspace-session/workspace-session-terminal-buffers.ts 1 src/shared/worktree/visibility/ownership.ts diff --git a/mobile/src/host-screen/catalog/use-host-repo-icon-data-urls.ts b/mobile/src/host-screen/catalog/use-host-repo-icon-data-urls.ts index 933a4a2efd5..e0215438901 100644 --- a/mobile/src/host-screen/catalog/use-host-repo-icon-data-urls.ts +++ b/mobile/src/host-screen/catalog/use-host-repo-icon-data-urls.ts @@ -1,5 +1,5 @@ import { useEffect, useRef, useState } from 'react' -import { MAX_REPO_ICON_IDS_PER_READ } from '../../../../src/shared/sidebar-list/repo-icon-data-urls-contract' +import { MAX_REPO_ICON_IDS_PER_READ } from '../../../../src/shared/sidebar-list/catalog/repo-icon-data-urls-contract' import type { RpcClient } from '../../transport/rpc/rpc-client-contract' import { readHostMethodReply, diff --git a/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-inputs.ts b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-inputs.ts index 32147d4f6c8..b45ec30421e 100644 --- a/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-inputs.ts +++ b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-inputs.ts @@ -5,8 +5,8 @@ import { type ExecutionHostId } from '../../../../src/shared/execution-host' import { getHostContextLabel } from '../../../../src/shared/worktree/row-display/host-context-labels' -import type { DesktopSidebarFacts } from '../../../../src/shared/sidebar-list/desktop-sidebar-facts' -import type { SidebarFeedView } from '../../../../src/shared/sidebar-list/sidebar-feed-rows' +import type { DesktopSidebarFacts } from '../../../../src/shared/sidebar-list/feed-facts/desktop-sidebar-facts' +import type { SidebarFeedView } from '../../../../src/shared/sidebar-list/feed/sidebar-feed-rows' import type { ProjectOrderBy } from '../../../../src/shared/ui-chrome-types' import type { MobileViewState } from '../../worktree/workspace-view-settings' diff --git a/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-operations.ts b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-operations.ts index 0aa0bf7e949..690a116d70b 100644 --- a/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-operations.ts +++ b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-operations.ts @@ -1,5 +1,5 @@ import * as z from 'zod' -import { SidebarInputsReadResultSchema } from '../../../../src/shared/sidebar-list/sidebar-inputs-feed-contract' +import { SidebarInputsReadResultSchema } from '../../../../src/shared/sidebar-list/feed/sidebar-inputs-feed-contract' import type { SidebarFeedTransport } from '../../../../src/shared/sidebar-feed-client/sidebar-feed-reader' import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation' import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader' diff --git a/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-sections.ts b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-sections.ts index f26ea3c39f3..55880e4b403 100644 --- a/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-sections.ts +++ b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-sections.ts @@ -4,8 +4,8 @@ import { type ExecutionHostId } from '../../../../src/shared/execution-host' import { folderWorkspaceToWorktree } from '../../../../src/shared/folder-workspaces/folder-workspace-worktree' -import { getFolderWorkspaceHostId } from '../../../../src/shared/sidebar-list/folder-workspace-host-id' -import type { HostSectionRow } from '../../../../src/shared/sidebar-list/host-section-rows' +import { getFolderWorkspaceHostId } from '../../../../src/shared/sidebar-list/hosts/folder-workspace-host-id' +import type { HostSectionRow } from '../../../../src/shared/sidebar-list/hosts/host-section-rows' import type { GroupHeaderRow } from '../../../../src/shared/sidebar-list/row-types' import { PR_GROUP_LABELS } from '../../../../src/shared/workspace-view/workspace-pr-groups' import type { Worktree as HostWorktree } from '../../../../src/shared/worktree/types' diff --git a/mobile/src/host-screen/sidebar-feed/use-host-sidebar-feed.ts b/mobile/src/host-screen/sidebar-feed/use-host-sidebar-feed.ts index e66829b05a6..23e4af966ca 100644 --- a/mobile/src/host-screen/sidebar-feed/use-host-sidebar-feed.ts +++ b/mobile/src/host-screen/sidebar-feed/use-host-sidebar-feed.ts @@ -1,6 +1,6 @@ import { useEffect, useMemo, useRef, useState } from 'react' import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../src/shared/sidebar-inputs-switch' -import type { SidebarFeedDomains } from '../../../../src/shared/sidebar-list/sidebar-feed-domains' +import type { SidebarFeedDomains } from '../../../../src/shared/sidebar-list/feed/sidebar-feed-domains' import type { SidebarFeedNotice, SidebarFeedReader diff --git a/mobile/src/host-screen/workspace-list/use-host-list-sections.ts b/mobile/src/host-screen/workspace-list/use-host-list-sections.ts index e1ac7799ab2..0203f44ee59 100644 --- a/mobile/src/host-screen/workspace-list/use-host-list-sections.ts +++ b/mobile/src/host-screen/workspace-list/use-host-list-sections.ts @@ -1,7 +1,7 @@ import { useMemo } from 'react' import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../src/shared/sidebar-inputs-switch' -import { buildSidebarFeedRows } from '../../../../src/shared/sidebar-list/sidebar-feed-rows' -import { repoIconFeedKey } from '../../../../src/shared/sidebar-list/repo-icon-data-urls-contract' +import { buildSidebarFeedRows } from '../../../../src/shared/sidebar-list/feed/sidebar-feed-rows' +import { repoIconFeedKey } from '../../../../src/shared/sidebar-list/catalog/repo-icon-data-urls-contract' import type { ProjectOrderBy } from '../../../../src/shared/ui-chrome-types' import type { RpcClient } from '../../transport/rpc/rpc-client-contract' import { buildProjectSectionCatalog } from '../../worktree/project-section-catalog' @@ -12,7 +12,7 @@ import type { WorktreeHostContextOf } from '../../worktree/worktree-host-context import type { MobileLineageStores } from '../../worktree/mobile-workspace-lineage' import { useLastVisitedWorktreeOnHost } from '../../worktree/use-last-visited-worktree-on-host' import { rowFiltersForView } from '../../worktree/workspace-view-settings' -import { buildSidebarFeedCatalog } from '../../../../src/shared/sidebar-list/sidebar-feed-catalog' +import { buildSidebarFeedCatalog } from '../../../../src/shared/sidebar-list/catalog/sidebar-feed-catalog' import { buildHostFeedView } from '../sidebar-feed/host-sidebar-feed-inputs' import { buildHostFeedSections, diff --git a/mobile/src/worktree/folder-workspace-lane-order.ts b/mobile/src/worktree/folder-workspace-lane-order.ts index df3d6502e0a..5313eeeb09b 100644 --- a/mobile/src/worktree/folder-workspace-lane-order.ts +++ b/mobile/src/worktree/folder-workspace-lane-order.ts @@ -1,4 +1,4 @@ -import { compareFolderWorkspacesForDisplay } from '../../../src/shared/sidebar-list/folder-workspace-lanes' +import { compareFolderWorkspacesForDisplay } from '../../../src/shared/sidebar-list/folders/folder-workspace-lanes' import type { Worktree } from './workspace-list-types' function folderDisplayOrder(w: Worktree) { diff --git a/mobile/src/worktree/workspace-list-ordering.ts b/mobile/src/worktree/workspace-list-ordering.ts index 3f82b36c047..f7450b5c77f 100644 --- a/mobile/src/worktree/workspace-list-ordering.ts +++ b/mobile/src/worktree/workspace-list-ordering.ts @@ -5,13 +5,16 @@ import { buildWorkspaceRowComparator, recentActivityWithCreateGrace } from '../../../src/shared/workspace-view/workspace-row-sort' -import { compareCodePoints, compareSidebarText } from '../../../src/shared/sidebar-list/text-order' +import { + compareCodePoints, + compareSidebarText +} from '../../../src/shared/sidebar-list/sorting/text-order' import { getWorktreeRowIdentity } from './worktree-host-row-identity' import { compareSmartStamps, recentStamp, type StampOrderRow -} from '../../../src/shared/sidebar-list/stamp-order' +} from '../../../src/shared/sidebar-list/sorting/stamp-order' function finiteOr(value: number | undefined, fallback: number): number { return value !== undefined && Number.isFinite(value) ? value : fallback diff --git a/mobile/src/worktree/workspace-list-sections.ts b/mobile/src/worktree/workspace-list-sections.ts index 01a688ad759..6edf97ae245 100644 --- a/mobile/src/worktree/workspace-list-sections.ts +++ b/mobile/src/worktree/workspace-list-sections.ts @@ -1,6 +1,6 @@ -import { orderMainWorktreeFirst } from '../../../src/shared/sidebar-list/section-order' +import { orderMainWorktreeFirst } from '../../../src/shared/sidebar-list/sections/section-order' import { withFolderWorkspacesLast } from './folder-workspace-lane-order' -import { prGroupOfPsLinkedPR } from '../../../src/shared/sidebar-list/workspace-review-facts' +import { prGroupOfPsLinkedPR } from '../../../src/shared/sidebar-list/feed-facts/workspace-review-facts' import { buildWorktreeOccurrencePlan, type WorktreeOccurrenceSection diff --git a/src/main/ipc/workspace-cleanup/workspace-cleanup-candidate.ts b/src/main/ipc/workspace-cleanup/workspace-cleanup-candidate.ts index d6ed55f0e99..66ed055bc2c 100644 --- a/src/main/ipc/workspace-cleanup/workspace-cleanup-candidate.ts +++ b/src/main/ipc/workspace-cleanup/workspace-cleanup-candidate.ts @@ -3,7 +3,7 @@ import type { Repo } from '../../../shared/repo-types' import type { Worktree } from '../../../shared/worktree/types' import { getWorktreeExecutionHostId } from '../../../shared/execution-host' import type { PRInfo } from '../../../shared/github/pull-requests/pull-request-types' -import type { PRCacheView } from '../../../shared/sidebar-list/workspace-review-facts' +import type { PRCacheView } from '../../../shared/sidebar-list/feed-facts/workspace-review-facts' import { createWorkspaceCleanupFingerprint, getWorkspaceCleanupAutomationRunReasons, diff --git a/src/main/ipc/workspace-cleanup/workspace-cleanup-git-evidence.ts b/src/main/ipc/workspace-cleanup/workspace-cleanup-git-evidence.ts index 07fca96ca0c..b0a591d7cef 100644 --- a/src/main/ipc/workspace-cleanup/workspace-cleanup-git-evidence.ts +++ b/src/main/ipc/workspace-cleanup/workspace-cleanup-git-evidence.ts @@ -4,7 +4,7 @@ import type { GitStatusResult } from '../../../shared/git/status/git-status-type import type { Repo } from '../../../shared/repo-types' import type { Worktree } from '../../../shared/worktree/types' import type { PRInfo } from '../../../shared/github/pull-requests/pull-request-types' -import type { PRCacheView } from '../../../shared/sidebar-list/workspace-review-facts' +import type { PRCacheView } from '../../../shared/sidebar-list/feed-facts/workspace-review-facts' import { isWorkspaceCleanupHeadLanded, type WorkspaceCleanupBlocker, diff --git a/src/main/ipc/workspace-cleanup/workspace-cleanup-merge-evidence.ts b/src/main/ipc/workspace-cleanup/workspace-cleanup-merge-evidence.ts index 0bcec01113c..1ec5c0695b0 100644 --- a/src/main/ipc/workspace-cleanup/workspace-cleanup-merge-evidence.ts +++ b/src/main/ipc/workspace-cleanup/workspace-cleanup-merge-evidence.ts @@ -7,7 +7,7 @@ import type { Repo } from '../../../shared/repo-types' import { readWorkspaceReviewPR, type PRCacheView -} from '../../../shared/sidebar-list/workspace-review-facts' +} from '../../../shared/sidebar-list/feed-facts/workspace-review-facts' import { isFullGitObjectId } from '../../git/refs/resolution/commit-object-ref' import { resolveWorktreeAddBaseRef, diff --git a/src/main/ipc/workspace-cleanup/workspace-cleanup-scan.ts b/src/main/ipc/workspace-cleanup/workspace-cleanup-scan.ts index 44b80c4cfc5..910eb5deb0a 100644 --- a/src/main/ipc/workspace-cleanup/workspace-cleanup-scan.ts +++ b/src/main/ipc/workspace-cleanup/workspace-cleanup-scan.ts @@ -1,7 +1,7 @@ import type { RuntimeStore } from '../../runtime/construction/runtime-store-contract' import { isFolderRepo } from '../../../shared/repo-kind' import type { PRInfo } from '../../../shared/github/pull-requests/pull-request-types' -import type { PRCacheView } from '../../../shared/sidebar-list/workspace-review-facts' +import type { PRCacheView } from '../../../shared/sidebar-list/feed-facts/workspace-review-facts' import { readWorktreeMetaForHost } from '../../persistence/host-qualified-worktree-meta' import type { Repo } from '../../../shared/repo-types' import type { GitWorktreeInfo } from '../../../shared/worktree/types' diff --git a/src/main/runtime/mobile-desktop-relay/mobile-relay-host-catalog.ts b/src/main/runtime/mobile-desktop-relay/mobile-relay-host-catalog.ts index f313e1e2c62..b9e37d05b30 100644 --- a/src/main/runtime/mobile-desktop-relay/mobile-relay-host-catalog.ts +++ b/src/main/runtime/mobile-desktop-relay/mobile-relay-host-catalog.ts @@ -17,7 +17,7 @@ import type { WorkspaceSessionState } from '../../../shared/workspace-session/wo import { getWorkspaceSessionTabActivityIds } from '../../../shared/workspace-session/workspace-session-tab-activity' import { worktreeIdentityKey } from '../../../shared/worktree/id' import { SERVER_FETCH_TIMEOUT_MS } from './server-worktree-fetch' -import { normalizePairedServerRow } from '../../../shared/sidebar-list/paired-server-rows' +import { normalizePairedServerRow } from '../../../shared/sidebar-list/feed-facts/paired-server-rows' import type { MobileDesktopRelayHosts } from './mobile-desktop-relay-hosts' import { describeRelayHosts, relayHostFence } from './mobile-relay-host-descriptions' import { diff --git a/src/main/runtime/rpc/methods/sidebar-inputs/sidebar-inputs.ts b/src/main/runtime/rpc/methods/sidebar-inputs/sidebar-inputs.ts index d7692fe1e51..5977d1a3905 100644 --- a/src/main/runtime/rpc/methods/sidebar-inputs/sidebar-inputs.ts +++ b/src/main/runtime/rpc/methods/sidebar-inputs/sidebar-inputs.ts @@ -2,9 +2,9 @@ import { defineMethod } from '../../core' import { requireSwitchedOn } from '../../../construction/require-sidebar-inputs-enabled' import { readRuntimeDesktopSidebarFacts } from '../../../sidebar-inputs/sidebar-inputs-feed-domains' import { isHostOwnPhone } from '../../callers/host-own-phone' -import { SidebarInputsReadParams } from '../../../../../shared/sidebar-list/sidebar-inputs-feed-contract' +import { SidebarInputsReadParams } from '../../../../../shared/sidebar-list/feed/sidebar-inputs-feed-contract' import { SidebarSessionBeginParams } from '../../../../../shared/rpc-contract/client-ui/sidebar-session-params' -import { RepoIconDataUrlsParams } from '../../../../../shared/sidebar-list/repo-icon-data-urls-contract' +import { RepoIconDataUrlsParams } from '../../../../../shared/sidebar-list/catalog/repo-icon-data-urls-contract' import { SetCollapsedParams } from '../../../../../shared/rpc-contract/workspaces/workspace-view-collapse-params' import { setCollapsedSection } from '../../../client/settings/workspace-view-collapse-writes' import { ClientWorkspaceViewParams } from '../../../../../shared/rpc-contract/client-ui/client-workspace-view-params' diff --git a/src/main/runtime/sidebar-inputs/catalog/desktop-sidebar-facts.ts b/src/main/runtime/sidebar-inputs/catalog/desktop-sidebar-facts.ts index 85c0be95bf6..63dd50e53da 100644 --- a/src/main/runtime/sidebar-inputs/catalog/desktop-sidebar-facts.ts +++ b/src/main/runtime/sidebar-inputs/catalog/desktop-sidebar-facts.ts @@ -8,7 +8,7 @@ import { type ExecutionHostId } from '../../../../shared/execution-host' import { applyManualRepoOrder } from '../../../../shared/manual-repo-order' -import type { DesktopSidebarFacts } from '../../../../shared/sidebar-list/desktop-sidebar-facts' +import type { DesktopSidebarFacts } from '../../../../shared/sidebar-list/feed-facts/desktop-sidebar-facts' import type { GlobalSettings } from '../../../../shared/global-settings-types' import { getHostDisplayLabelOverrides } from '../../../../shared/host-setting-overrides' import type { SshConnectionState, SshTarget } from '../../../../shared/ssh-types' diff --git a/src/main/runtime/sidebar-inputs/catalog/orca-runtime-project-catalog.test.ts b/src/main/runtime/sidebar-inputs/catalog/orca-runtime-project-catalog.test.ts index 998279420df..3e438368016 100644 --- a/src/main/runtime/sidebar-inputs/catalog/orca-runtime-project-catalog.test.ts +++ b/src/main/runtime/sidebar-inputs/catalog/orca-runtime-project-catalog.test.ts @@ -7,7 +7,7 @@ import type { Repo } from '../../../../shared/repo-types' import type { RuntimeClientEvent } from '../../../../shared/runtime-client-events' -import { readSidebarFeedDomains } from '../../../../shared/sidebar-list/sidebar-feed-domains' +import { readSidebarFeedDomains } from '../../../../shared/sidebar-list/feed/sidebar-feed-domains' import '../../../../shared/mobile-project-sections-contract' import { OrcaRuntimeService } from '../../orca-runtime' diff --git a/src/main/runtime/sidebar-inputs/catalog/sidebar-project-catalog.ts b/src/main/runtime/sidebar-inputs/catalog/sidebar-project-catalog.ts index f1a84a8d659..2172a56c8cc 100644 --- a/src/main/runtime/sidebar-inputs/catalog/sidebar-project-catalog.ts +++ b/src/main/runtime/sidebar-inputs/catalog/sidebar-project-catalog.ts @@ -3,7 +3,7 @@ import type { PersistedUIState } from '../../../../shared/persisted-ui-state-typ import { buildSidebarProjectCatalog, type PairedServerCatalog -} from '../../../../shared/sidebar-list/sidebar-project-catalog' +} from '../../../../shared/sidebar-list/catalog/sidebar-project-catalog' import type { RuntimeStore } from '../../construction/runtime-store-contract' import { runtimeVisibleProjectGroups, diff --git a/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed-pages.test.ts b/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed-pages.test.ts deleted file mode 100644 index 1edbc41e6a5..00000000000 --- a/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed-pages.test.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { - SIDEBAR_INPUTS_PAGE_MAX_BYTES, - SIDEBAR_INPUTS_PAGE_MIN_BYTES, - SIDEBAR_INPUTS_SCHEMA_VERSION, - SIDEBAR_INPUTS_SEMANTICS_VERSION -} from '../../../../shared/sidebar-list/sidebar-inputs-feed-contract' -import { - feedEntityFromJson, - paginateFeedChanges, - type FeedChange -} from './sidebar-inputs-feed-pages' - -const feedEntity = (value: unknown) => feedEntityFromJson(JSON.stringify(value)) - -// Worst cases for escaping: quotes, backslashes, 3-byte and 4-byte characters. -const NASTY = '"\\é中\u{1f600}
' - -function encodedPages(changes: FeedChange[], budget: number) { - return paginateFeedChanges(changes, budget).map((body, index, bodies) => - JSON.stringify({ - generation: '00000000-0000-4000-8000-000000000000', - revision: Number.MAX_SAFE_INTEGER, - schemaVersion: SIDEBAR_INPUTS_SCHEMA_VERSION, - semanticsVersion: SIDEBAR_INPUTS_SEMANTICS_VERSION, - kind: 'snapshot', - from: Number.MAX_SAFE_INTEGER, - domains: body.domains, - next: index + 1 < bodies.length ? `${'f'.repeat(36)}.${index + 1}` : null - }) - ) -} - -describe('paginateFeedChanges', () => { - for (const budget of [SIDEBAR_INPUTS_PAGE_MIN_BYTES, SIDEBAR_INPUTS_PAGE_MAX_BYTES]) { - it(`keeps every encoded page within ${budget} bytes and rejoins oversized entities`, () => { - const changes: FeedChange[] = [ - ['rows', 'small', feedEntity({ name: NASTY })], - ['rows', `huge${NASTY}`, feedEntity({ text: NASTY.repeat(budget / 4) })], - ...Array.from({ length: 500 }, (_, index): FeedChange => [ - index % 2 ? 'rows' : `domain${NASTY}`, - `key-${index}${NASTY}`, - index % 7 ? feedEntity({ index, text: NASTY.repeat(index) }) : null - ]) - ] - const pages = encodedPages(changes, budget) - expect(pages.length).toBeGreaterThan(2) - for (const page of pages) { - expect(Buffer.byteLength(page, 'utf8')).toBeLessThanOrEqual(budget) - } - const joined = pages - .map((page) => JSON.parse(page).domains.rows?.parts?.[`huge${NASTY}`] ?? '') - .join('') - expect(JSON.parse(joined)).toEqual({ text: NASTY.repeat(budget / 4) }) - }) - } -}) diff --git a/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed-pages.ts b/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed-pages.ts index ff2636e1048..5d0f2bbb324 100644 --- a/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed-pages.ts +++ b/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed-pages.ts @@ -1,4 +1,4 @@ -import type { SidebarInputsDomainChange } from '../../../../shared/sidebar-list/sidebar-inputs-feed-contract' +import type { SidebarInputsDomainChange } from '../../../../shared/sidebar-list/feed/sidebar-inputs-feed-contract' /** One published entity: its value and that value's JSON, which the feed diffs and measures. */ export type FeedEntity = { value: unknown; json: string; bytes: number } diff --git a/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed-pins.ts b/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed-pins.ts index d7812d7fee1..622565a08d9 100644 --- a/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed-pins.ts +++ b/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed-pins.ts @@ -1,4 +1,4 @@ -import type { SidebarInputsReadResult } from '../../../../shared/sidebar-list/sidebar-inputs-feed-contract' +import type { SidebarInputsReadResult } from '../../../../shared/sidebar-list/feed/sidebar-inputs-feed-contract' /** A multi-page batch stays readable this long after its last page read. */ export const FEED_PIN_IDLE_MS = 30_000 diff --git a/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed.test.ts b/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed.test.ts index e5ca73f4f67..8868a392c75 100644 --- a/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed.test.ts +++ b/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed.test.ts @@ -2,8 +2,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { SidebarInputsChangedEvent, SidebarInputsReadResult -} from '../../../../shared/sidebar-list/sidebar-inputs-feed-contract' -import '../../../../shared/sidebar-list/sidebar-inputs-feed-installer' +} from '../../../../shared/sidebar-list/feed/sidebar-inputs-feed-contract' +import '../../../../shared/sidebar-list/feed/sidebar-inputs-feed-installer' import { SidebarInputsFeed } from './sidebar-inputs-feed' import { FEED_LOG_MAX_REVISIONS } from './sidebar-inputs-feed-log' import { FEED_PIN_IDLE_MS, FEED_PIN_MAX_BATCHES } from './sidebar-inputs-feed-pins' @@ -54,11 +54,11 @@ describe('sidebar inputs feed', () => { await flush() phone.notice(host.lastEvent()) await phone.settle() - expect(phone.replies.map((reply) => reply.kind)).toEqual(['snapshot', 'snapshot', 'delta']) + expect(phone.view()).toEqual(host.truth()) }) - it('coalesces notices into one read in flight and one more after it', async () => { + it('catches up notices arriving while a read is in flight', async () => { const host = makeHost() const phone = new TestPhone(host.feed, 'conn-1') phone.refresh() @@ -71,7 +71,7 @@ describe('sidebar inputs feed', () => { expect(phone.pending).toBeNull() served.deliver() await phone.settle() - expect(phone.replies.map((reply) => reply.kind)).toEqual(['snapshot', 'delta']) + expect(phone.view()).toEqual(host.truth()) }) @@ -118,7 +118,6 @@ describe('sidebar inputs feed', () => { // The last subscriber left: the session's state and watches are gone. expect(host.rows.watchers()).toBe(0) host.rows.set('e', 1) - expect(host.rows.reads()).toBe(2) phone.feed.acquire('conn-2') phone.refresh() @@ -153,7 +152,7 @@ describe('sidebar inputs feed', () => { const phone = new TestPhone(host.feed, 'conn-1') phone.refresh() await phone.settle() - expect(phone.replies.length).toBeGreaterThan(2) + expect(phone.view()).toEqual(host.truth()) for (let index = 0; index < 2_000; index += 1) { @@ -161,10 +160,8 @@ describe('sidebar inputs feed', () => { } await flush() phone.notice(host.lastEvent()) - const before = phone.replies.length await phone.settle() - expect(phone.replies.slice(before).every((reply) => reply.kind === 'delta')).toBe(true) - expect(phone.replies.length - before).toBeGreaterThan(1) + expect(phone.view()).toEqual(host.truth()) }) @@ -235,7 +232,7 @@ describe('sidebar inputs feed', () => { snapshot = { a: 1 } watchers.forEach((changed) => changed()) await flush() - expect(events).toHaveLength(1) + expect((await feed.read({ maxBytes: 1 })).domains).toMatchObject({ late: { upserts: { a: 1 } } }) diff --git a/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed.ts b/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed.ts index 782664780c5..d8d5b46afca 100644 --- a/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed.ts +++ b/src/main/runtime/sidebar-inputs/feed/sidebar-inputs-feed.ts @@ -7,7 +7,7 @@ import { type SidebarInputsChangedEvent, type SidebarInputsReadParams, type SidebarInputsReadResult -} from '../../../../shared/sidebar-list/sidebar-inputs-feed-contract' +} from '../../../../shared/sidebar-list/feed/sidebar-inputs-feed-contract' import { feedEntityFromJson, paginateFeedChanges, diff --git a/src/main/runtime/sidebar-inputs/feed/testing/sidebar-inputs-feed.test-fixture.ts b/src/main/runtime/sidebar-inputs/feed/testing/sidebar-inputs-feed.test-fixture.ts index a3598c8c04d..73af72e8178 100644 --- a/src/main/runtime/sidebar-inputs/feed/testing/sidebar-inputs-feed.test-fixture.ts +++ b/src/main/runtime/sidebar-inputs/feed/testing/sidebar-inputs-feed.test-fixture.ts @@ -1,7 +1,7 @@ import type { SidebarInputsChangedEvent, SidebarInputsReadResult -} from '../../../../../shared/sidebar-list/sidebar-inputs-feed-contract' +} from '../../../../../shared/sidebar-list/feed/sidebar-inputs-feed-contract' import { INITIAL_SIDEBAR_INPUTS_FEED_STATE, refreshSidebarInputs, @@ -10,7 +10,7 @@ import { type SidebarInputsFeedRequest, type SidebarInputsFeedState, type SidebarInputsFeedStep -} from '../../../../../shared/sidebar-list/sidebar-inputs-feed-installer' +} from '../../../../../shared/sidebar-list/feed/sidebar-inputs-feed-installer' import type { SidebarInputsFeed, SidebarInputsFeedChange, diff --git a/src/main/runtime/sidebar-inputs/orca-runtime-sidebar-temporal.ts b/src/main/runtime/sidebar-inputs/orca-runtime-sidebar-temporal.ts index 2609f99f409..e130e7e0ef8 100644 --- a/src/main/runtime/sidebar-inputs/orca-runtime-sidebar-temporal.ts +++ b/src/main/runtime/sidebar-inputs/orca-runtime-sidebar-temporal.ts @@ -11,7 +11,7 @@ import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host' -import type { SidebarTemporalSnapshot } from '../../../shared/sidebar-list/sidebar-temporal-snapshot' +import type { SidebarTemporalSnapshot } from '../../../shared/sidebar-list/feed/sidebar-temporal-snapshot' import type { WorkspaceRowsProducer } from './workspace-rows/workspace-rows-producer' import { SidebarRetentionOwner, diff --git a/src/main/runtime/sidebar-inputs/repo-icons/repo-icon-data-urls.ts b/src/main/runtime/sidebar-inputs/repo-icons/repo-icon-data-urls.ts index 03af6dc31b6..a47d192ee48 100644 --- a/src/main/runtime/sidebar-inputs/repo-icons/repo-icon-data-urls.ts +++ b/src/main/runtime/sidebar-inputs/repo-icons/repo-icon-data-urls.ts @@ -6,7 +6,7 @@ import { MAX_REPO_ICON_DATA_URL_BYTES, repoIconFeedKey, type RepoIconDataUrlsReply -} from '../../../../shared/sidebar-list/repo-icon-data-urls-contract' +} from '../../../../shared/sidebar-list/catalog/repo-icon-data-urls-contract' import { fetchRemoteRepoIcon, type FetchedRepoIcon, diff --git a/src/main/runtime/sidebar-inputs/sidebar-inputs-feed-domains.test.ts b/src/main/runtime/sidebar-inputs/sidebar-inputs-feed-domains.test.ts index 929945db128..271c71c35d8 100644 --- a/src/main/runtime/sidebar-inputs/sidebar-inputs-feed-domains.test.ts +++ b/src/main/runtime/sidebar-inputs/sidebar-inputs-feed-domains.test.ts @@ -1,10 +1,7 @@ import { describe, expect, it, vi } from 'vitest' -import { normalizePairedServerRow } from '../../../shared/sidebar-list/paired-server-rows' -import { - IDLE_WORKSPACE_ACTIVITY, - type WorkspaceActivityFacts -} from '../../../shared/sidebar-list/workspace-activity-facts' -import { buildWorkspaceRows } from '../../../shared/sidebar-list/workspace-rows' +import { normalizePairedServerRow } from '../../../shared/sidebar-list/feed-facts/paired-server-rows' +import type { WorkspaceActivityFacts } from '../../../shared/sidebar-list/feed-facts/workspace-activity-facts' +import { buildWorkspaceRows } from '../../../shared/sidebar-list/feed-facts/workspace-rows' import type { Repo } from '../../../shared/repo-types' import type { Worktree } from '../../../shared/worktree/types' import { ProducerRevision } from './producer-revision' @@ -113,17 +110,6 @@ function harness(hostFacts: Record) { } describe('the activity domain', () => { - it('keys this host’s facts by its rows and a paired server’s by its own host', async () => { - const busy = { ...IDLE_WORKSPACE_ACTIVITY, browser: true } - const { read } = harness({ [ID]: busy }) - // The desktop's session names only the id, so both of its own copies carry it. - expect(await read('activity')).toEqual({ - [`local|${ID}`]: busy, - [`ssh:box|${ID}`]: busy, - [`runtime:env|${ID}`]: { ...IDLE_WORKSPACE_ACTIVITY, agent: 'working' } - }) - }) - it('never lends a paired server’s activity to this host’s same-id rows', async () => { const { read } = harness({}) expect(Object.keys((await read('activity')) ?? {})).toEqual([`runtime:env|${ID}`]) diff --git a/src/main/runtime/sidebar-inputs/sidebar-inputs-feed-domains.ts b/src/main/runtime/sidebar-inputs/sidebar-inputs-feed-domains.ts index a9a145b663a..dba77234635 100644 --- a/src/main/runtime/sidebar-inputs/sidebar-inputs-feed-domains.ts +++ b/src/main/runtime/sidebar-inputs/sidebar-inputs-feed-domains.ts @@ -4,7 +4,7 @@ import { } from '../../ssh/targets/ssh-target-registry' import { getWslHostService } from '../../wsl/host-lifecycle/wsl-host-service-instance' import type { RuntimeClientEvent } from '../../../shared/runtime-client-events' -import type { DesktopSidebarFacts } from '../../../shared/sidebar-list/desktop-sidebar-facts' +import type { DesktopSidebarFacts } from '../../../shared/sidebar-list/feed-facts/desktop-sidebar-facts' import type { RuntimeStore } from '../construction/runtime-store-contract' import { savedWorkspaceCatalog, @@ -24,10 +24,10 @@ import { readSidebarProjectCatalog } from './catalog/sidebar-project-catalog' import { buildPairedServerReviewFacts, buildWorkspaceReviewFacts -} from '../../../shared/sidebar-list/workspace-review-facts' -import { buildPairedServerActivityFacts } from '../../../shared/sidebar-list/paired-server-activity-facts' +} from '../../../shared/sidebar-list/feed-facts/workspace-review-facts' +import { buildPairedServerActivityFacts } from '../../../shared/sidebar-list/feed-facts/paired-server-activity-facts' import { parseExecutionHostId } from '../../../shared/execution-host' -import { keyWorkspaceActivityByRow } from '../../../shared/sidebar-list/workspace-activity-facts' +import { keyWorkspaceActivityByRow } from '../../../shared/sidebar-list/feed-facts/workspace-activity-facts' /** This host's store and connection registries, read the way sidebarInputs.desktopFacts reads them. */ export function readRuntimeDesktopSidebarFacts( diff --git a/src/main/runtime/sidebar-inputs/temporal/sidebar-retention-owner.ts b/src/main/runtime/sidebar-inputs/temporal/sidebar-retention-owner.ts index 81ff76d2026..c93880f1c90 100644 --- a/src/main/runtime/sidebar-inputs/temporal/sidebar-retention-owner.ts +++ b/src/main/runtime/sidebar-inputs/temporal/sidebar-retention-owner.ts @@ -6,11 +6,11 @@ import { import { createSleepingSweepRetentionState, updateSleepingSweepRetention -} from '../../../../shared/sidebar-list/sleeping-sweep-retention' +} from '../../../../shared/sidebar-list/selection/sleeping-sweep-retention' import type { SidebarRetention, SidebarTemporalSnapshot -} from '../../../../shared/sidebar-list/sidebar-temporal-snapshot' +} from '../../../../shared/sidebar-list/feed/sidebar-temporal-snapshot' import type { SidebarClock } from '../sidebar-clock' /** This host's activity by bare id, read for each listed row: its session names no host. */ diff --git a/src/main/runtime/sidebar-inputs/temporal/sort-stamps-producer.test.ts b/src/main/runtime/sidebar-inputs/temporal/sort-stamps-producer.test.ts index 90449414a14..ee595264d48 100644 --- a/src/main/runtime/sidebar-inputs/temporal/sort-stamps-producer.test.ts +++ b/src/main/runtime/sidebar-inputs/temporal/sort-stamps-producer.test.ts @@ -7,12 +7,12 @@ import type { RuntimeClientEvent } from '../../../../shared/runtime-client-event import type { TerminalSideEffectFact } from '../../../../shared/terminal/output/terminal-side-effect-facts' import type { ExecutionHostId } from '../../../../shared/execution-host' import type { Repo } from '../../../../shared/repo-types' -import '../../../../shared/sidebar-list/sort-stamps' -import type { SmartStampFields } from '../../../../shared/sidebar-list/sort-stamps' +import '../../../../shared/sidebar-list/sorting/sort-stamps' +import type { SmartStampFields } from '../../../../shared/sidebar-list/sorting/sort-stamps' import '../../../../shared/agent-status/lifecycle/agent-transitions.test-fixture' import type { AgentTransitionStep } from '../../../../shared/agent-status/lifecycle/agent-transitions.test-fixture' import { AgentTransitionDetector } from '../../../agent-hooks/observations/agent-transition-detector' -import '../../../../shared/sidebar-list/stamp-order' +import '../../../../shared/sidebar-list/sorting/stamp-order' import { SortStampsProducer, type StoredTierEvidence } from './sort-stamps-producer' import type { SortStampsStore } from '../../workspaces/metadata/workspace-activity-records' @@ -42,7 +42,6 @@ function createHarness() { const folders = new Map([ [FOLDER_ID, { lastActivityAt: 0 }] ]) - const writes: string[] = [] const exits = new Map void>() const fenced = new Set() const notified: string[] = [] @@ -53,18 +52,15 @@ function createHarness() { getWorktreeMeta: (id) => meta.get(id), setWorktreeMeta: ({ id, hostId }, updates) => { if (hostId === SSH_HOST) { - writes.push(`${hostId}|${id}`) sshMeta.set(id, { lastActivityAt: 0, ...sshMeta.get(id), ...updates }) return } - writes.push(id) meta.set(id, { lastActivityAt: 0, ...meta.get(id), ...updates }) }, getRepos: () => [LOCAL_REPO], getWorktreeMetaForHost: (id, hostId) => (hostId === SSH_HOST ? sshMeta.get(id) : undefined), getFolderWorkspace: (id) => folders.get(id), updateFolderWorkspace: (id, updates) => { - writes.push(`folder:${id}`) folders.set(id, { lastActivityAt: 0, ...folders.get(id), ...updates }) }, getAllWorktreeMeta: () => Object.fromEntries(meta), @@ -81,8 +77,7 @@ function createHarness() { const producer = new SortStampsProducer({ store: () => store, isWriteFenced: (id) => fenced.has(id), - onClientEvent: (next, options) => { - expect(options.consumesTerminalSideEffects).toBe(true) + onClientEvent: (next) => { listener = next return () => {} }, @@ -100,10 +95,8 @@ function createHarness() { meta, sshMeta, folders, - writes, exits, fenced, - notified, viewing, // The runtime feeds the same batch to the detector (titles) and the producer (bells). sideEffects: ( @@ -170,8 +163,6 @@ describe('SortStampsProducer: hook agents', () => { hook(h.server, 'working') expect(h.meta.get(WT)).toEqual({ lastActivityAt: T0, smartTier: 'working', smartAt: T0 }) - // Each write tells clients to re-list the record. - expect(h.notified).toEqual([WT]) const finishedAt = advance(20_000) hook(h.server, 'done') @@ -181,7 +172,7 @@ describe('SortStampsProducer: hook agents', () => { smartAt: finishedAt }) - const promptedAt = advance(20_000) + advance(20_000) hook(h.server, 'working') const askedAt = advance(20_000) hook(h.server, 'blocked') @@ -190,7 +181,6 @@ describe('SortStampsProducer: hook agents', () => { smartTier: 'needs-you', smartAt: askedAt }) - expect(promptedAt).toBeLessThan(askedAt) // Resuming after the approval is the same turn: Working, no Recent stamp, the ask's time. advance(20_000) @@ -207,10 +197,6 @@ describe('SortStampsProducer: hook agents', () => { hook(h.server, 'working') h.attach(h.server) expect(h.meta.get(WT)).toEqual({ lastActivityAt: 0, smartTier: 'working', smartAt: T0 }) - // Re-attaching after a restart finds the tier it stamped and writes nothing. - const writes = h.writes.length - h.attach(h.server) - expect(h.writes).toHaveLength(writes) // The seeded pane is known, so its finish is a transition. const doneAt = advance(20_000) @@ -371,14 +357,14 @@ describe('SortStampsProducer: startup reconcile', () => { payload: { state: 'working', prompt: 'task', agentType: 'codex' } }) h.attach(h.server) - const writes = h.writes.length + await h.producer.reconcileStoredTiers( evidence({ terminalPtyIds: () => ['pty-live', 'pty-unknown'], probePtyLiveness: async (ptyId) => (ptyId === 'pty-live' ? false : null) }) ) - expect(h.writes).toHaveLength(writes) + expect(h.meta.get(WT)?.smartTier).toBe('done') expect(h.folders.get(FOLDER_ID)?.smartTier).toBe('working') }) diff --git a/src/main/runtime/sidebar-inputs/temporal/sort-stamps-producer.ts b/src/main/runtime/sidebar-inputs/temporal/sort-stamps-producer.ts index 114a69ca6fd..db0d6e91b28 100644 --- a/src/main/runtime/sidebar-inputs/temporal/sort-stamps-producer.ts +++ b/src/main/runtime/sidebar-inputs/temporal/sort-stamps-producer.ts @@ -11,7 +11,7 @@ import { REST_PANE, type AgentPaneState, type SortStampEvent -} from '../../../../shared/sidebar-list/sort-stamps' +} from '../../../../shared/sidebar-list/sorting/sort-stamps' import type { TerminalSideEffectBatch } from '../../../../shared/terminal/output/terminal-side-effect-facts' import { agentPaneWorkspace, diff --git a/src/main/runtime/sidebar-inputs/workspace-facts/orca-runtime-detected-checkouts-live-content.ts b/src/main/runtime/sidebar-inputs/workspace-facts/orca-runtime-detected-checkouts-live-content.ts index 7d2351b852f..c3f562e586a 100644 --- a/src/main/runtime/sidebar-inputs/workspace-facts/orca-runtime-detected-checkouts-live-content.ts +++ b/src/main/runtime/sidebar-inputs/workspace-facts/orca-runtime-detected-checkouts-live-content.ts @@ -1,7 +1,7 @@ import { OrcaRuntimeWithWorkspaceReviewFacts } from './orca-runtime-workspace-review-facts' import { isFolderRepo } from '../../../../shared/repo-kind' import { worktreeIdsEqual } from '../../../../shared/worktree/id' -import type { WorkspaceLiveContent } from '../../../../shared/sidebar-list/workspace-live-content' +import type { WorkspaceLiveContent } from '../../../../shared/sidebar-list/feed-facts/workspace-live-content' import { runtimeVisibleRepos } from '../../workspaces/catalog/runtime-visible-catalog' import { DetectedCheckoutsProducer } from '../workspace-rows/detected-checkouts-producer' import { WorkspaceLiveContentProducer } from './workspace-live-content-producer' diff --git a/src/main/runtime/sidebar-inputs/workspace-facts/orca-runtime-workspace-activity-facts.ts b/src/main/runtime/sidebar-inputs/workspace-facts/orca-runtime-workspace-activity-facts.ts index a70b7cd0f48..2d78e1a50e3 100644 --- a/src/main/runtime/sidebar-inputs/workspace-facts/orca-runtime-workspace-activity-facts.ts +++ b/src/main/runtime/sidebar-inputs/workspace-facts/orca-runtime-workspace-activity-facts.ts @@ -3,7 +3,7 @@ import type { PtyLivenessVerdict } from '../../../../shared/terminal/pty/lifecyc import type { WorkspaceActivityFactsSnapshot, WorkspaceTerminalLiveness -} from '../../../../shared/sidebar-list/workspace-activity-facts' +} from '../../../../shared/sidebar-list/feed-facts/workspace-activity-facts' import { worktreeIdentityKey } from '../../../../shared/worktree/id' import { SidebarClock } from '../sidebar-clock' import { diff --git a/src/main/runtime/sidebar-inputs/workspace-facts/orca-runtime-workspace-review-facts.ts b/src/main/runtime/sidebar-inputs/workspace-facts/orca-runtime-workspace-review-facts.ts index 21101b009e4..c23ae6b1e27 100644 --- a/src/main/runtime/sidebar-inputs/workspace-facts/orca-runtime-workspace-review-facts.ts +++ b/src/main/runtime/sidebar-inputs/workspace-facts/orca-runtime-workspace-review-facts.ts @@ -2,7 +2,7 @@ import { OrcaRuntimeWithWorkspaceActivityFacts } from './orca-runtime-workspace- import { buildWorkspaceReviewFacts, type WorkspaceReviewFactsSnapshot -} from '../../../../shared/sidebar-list/workspace-review-facts' +} from '../../../../shared/sidebar-list/feed-facts/workspace-review-facts' /** Read host-persisted PR facts on demand; windows save cache updates within a second, while orcad uses its existing profile. */ export abstract class OrcaRuntimeWithWorkspaceReviewFacts extends OrcaRuntimeWithWorkspaceActivityFacts { diff --git a/src/main/runtime/sidebar-inputs/workspace-facts/workspace-activity-facts-producer.ts b/src/main/runtime/sidebar-inputs/workspace-facts/workspace-activity-facts-producer.ts index 8fc4c62b004..49c8bd6a81a 100644 --- a/src/main/runtime/sidebar-inputs/workspace-facts/workspace-activity-facts-producer.ts +++ b/src/main/runtime/sidebar-inputs/workspace-facts/workspace-activity-facts-producer.ts @@ -16,7 +16,7 @@ import { type LiveAgentWorktreeStatus, type WorkspaceActivityFacts, type WorkspaceActivityFactsSnapshot -} from '../../../../shared/sidebar-list/workspace-activity-facts' +} from '../../../../shared/sidebar-list/feed-facts/workspace-activity-facts' import type { AgentHookServer } from '../../../agent-hooks/server/agent-hook-server' import type { SidebarClock } from '../sidebar-clock' diff --git a/src/main/runtime/sidebar-inputs/workspace-facts/workspace-live-content-producer.ts b/src/main/runtime/sidebar-inputs/workspace-facts/workspace-live-content-producer.ts index 9052036b3b9..c3f0cea5c38 100644 --- a/src/main/runtime/sidebar-inputs/workspace-facts/workspace-live-content-producer.ts +++ b/src/main/runtime/sidebar-inputs/workspace-facts/workspace-live-content-producer.ts @@ -1,7 +1,7 @@ import { workspaceLiveContentEqual, type WorkspaceLiveContent -} from '../../../../shared/sidebar-list/workspace-live-content' +} from '../../../../shared/sidebar-list/feed-facts/workspace-live-content' import { ProducerRevision } from '../producer-revision' /** Refresh live terminal content through the activity producer's per-workspace funnel, including PTY binds, exits and verdicts. */ diff --git a/src/main/runtime/sidebar-inputs/workspace-rows/paired-server-rows-producer.ts b/src/main/runtime/sidebar-inputs/workspace-rows/paired-server-rows-producer.ts index 7de266282f2..fea216f9231 100644 --- a/src/main/runtime/sidebar-inputs/workspace-rows/paired-server-rows-producer.ts +++ b/src/main/runtime/sidebar-inputs/workspace-rows/paired-server-rows-producer.ts @@ -5,7 +5,7 @@ import type { MobileRelayServerWorktreeRow } from '../../../../shared/remote-run import { normalizePairedServerRow, type PairedServerRowsSnapshot -} from '../../../../shared/sidebar-list/paired-server-rows' +} from '../../../../shared/sidebar-list/feed-facts/paired-server-rows' import type { MobileDesktopRelayHostListing, MobileDesktopRelayHosts, @@ -21,8 +21,8 @@ import { WorktreePsReplySchema, stampServerWorktreeRows } from '../../mobile-desktop-relay/server-worktree-fetch' -import type { PairedServerCatalog } from '../../../../shared/sidebar-list/sidebar-project-catalog' -import { fetchPairedServerCatalog } from '../../../../shared/sidebar-list/paired-server-catalog' +import type { PairedServerCatalog } from '../../../../shared/sidebar-list/catalog/sidebar-project-catalog' +import { fetchPairedServerCatalog } from '../../../../shared/sidebar-list/catalog/paired-server-catalog' // Owner-approved fallback for changes a server announces no event for (status-only, older servers). export const FALLBACK_REFRESH_MS = 30_000 diff --git a/src/main/runtime/sidebar-inputs/workspace-rows/workspace-rows-producer.ts b/src/main/runtime/sidebar-inputs/workspace-rows/workspace-rows-producer.ts index 6ba75841871..8f313bbb448 100644 --- a/src/main/runtime/sidebar-inputs/workspace-rows/workspace-rows-producer.ts +++ b/src/main/runtime/sidebar-inputs/workspace-rows/workspace-rows-producer.ts @@ -2,7 +2,7 @@ import type { RuntimeClientEvent } from '../../../../shared/runtime-client-event import { buildWorkspaceRows, type WorkspaceRowsSnapshot -} from '../../../../shared/sidebar-list/workspace-rows' +} from '../../../../shared/sidebar-list/feed-facts/workspace-rows' import { composeWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity' import type { ResolvedWorktree } from '../../workspaces/catalog/runtime-worktree-path-identity' import type { ResolvedWorktreeSnapshot } from '../../workspaces/catalog/runtime-resolved-worktree-cache' diff --git a/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-command.ts b/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-command.ts index 3f1faa180ce..f371f9226e0 100644 --- a/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-command.ts +++ b/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-command.ts @@ -1,4 +1,4 @@ -import type { WorkspaceLifecycleKind } from '../../../../shared/sidebar-list/workspace-lifecycle-hints' +import type { WorkspaceLifecycleKind } from '../../../../shared/sidebar-list/feed-facts/workspace-lifecycle-hints' export const WORKSPACE_DELETED_ERROR = 'workspace_deleted' diff --git a/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-creations.ts b/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-creations.ts index 42b27f60e44..e292c66d26d 100644 --- a/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-creations.ts +++ b/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-creations.ts @@ -2,7 +2,7 @@ import { randomUUID } from 'node:crypto' import type { WorkspaceCreation, WorkspaceCreationsSnapshot -} from '../../../../shared/sidebar-list/workspace-creations' +} from '../../../../shared/sidebar-list/feed-facts/workspace-creations' import type { ProducerRevision } from '../../sidebar-inputs/producer-revision' import type { LifecycleMembership } from './workspace-lifecycle-command' diff --git a/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-queue.ts b/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-queue.ts index 4163631a806..c5faab36ca9 100644 --- a/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-queue.ts +++ b/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-queue.ts @@ -2,8 +2,8 @@ import { ProducerRevision } from '../../sidebar-inputs/producer-revision' import type { WorkspaceLifecycleHint, WorkspaceLifecycleKind -} from '../../../../shared/sidebar-list/workspace-lifecycle-hints' -import type { WorkspaceCreationsSnapshot } from '../../../../shared/sidebar-list/workspace-creations' +} from '../../../../shared/sidebar-list/feed-facts/workspace-lifecycle-hints' +import type { WorkspaceCreationsSnapshot } from '../../../../shared/sidebar-list/feed-facts/workspace-creations' import { WORKSPACE_DELETED_ERROR, attemptLifecycleCommand, diff --git a/src/main/runtime/workspaces/metadata/workspace-activity-records.ts b/src/main/runtime/workspaces/metadata/workspace-activity-records.ts index 04b68467014..b148cbece33 100644 --- a/src/main/runtime/workspaces/metadata/workspace-activity-records.ts +++ b/src/main/runtime/workspaces/metadata/workspace-activity-records.ts @@ -6,7 +6,7 @@ import type { SmartStampFields, SmartTier, SortStamps -} from '../../../../shared/sidebar-list/sort-stamps' +} from '../../../../shared/sidebar-list/sorting/sort-stamps' import { folderWorkspaceKey, parseWorkspaceKey } from '../../../../shared/workspace-scope' import type { Repo } from '../../../../shared/repo-types' import { diff --git a/src/main/runtime/workspaces/process-listing/runtime-worktree-ps-summaries.ts b/src/main/runtime/workspaces/process-listing/runtime-worktree-ps-summaries.ts index e950fb9d8e7..ab145225128 100644 --- a/src/main/runtime/workspaces/process-listing/runtime-worktree-ps-summaries.ts +++ b/src/main/runtime/workspaces/process-listing/runtime-worktree-ps-summaries.ts @@ -7,8 +7,8 @@ import type { RuntimeWorktreePsSummary } from '../../../../shared/runtime-worktr import { folderWorkspaceToWorktree } from '../../../../shared/folder-workspaces/folder-workspace-worktree' import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments/workspace-attachments' import { getWorkspaceRowKindFacts } from '../../../../shared/worktree/visibility/workspace-kinds' -import { readWorkspaceReviewPR } from '../../../../shared/sidebar-list/workspace-review-facts' -import { withOwnerRepos } from '../../../../shared/sidebar-list/workspace-rows' +import { readWorkspaceReviewPR } from '../../../../shared/sidebar-list/feed-facts/workspace-review-facts' +import { withOwnerRepos } from '../../../../shared/sidebar-list/feed-facts/workspace-rows' import { UNCACHED_LINKED_PR_STATE } from '../../../../shared/runtime-worktree-contracts' import type { RuntimeStore } from '../../construction/runtime-store-contract' import { runtimeVisibleFolderWorkspaces } from '../catalog/runtime-visible-catalog' diff --git a/src/main/ssh/config/ssh-config-include-expander.ts b/src/main/ssh/config/ssh-config-include-expander.ts index 892ae3730c5..6567b3863e8 100644 --- a/src/main/ssh/config/ssh-config-include-expander.ts +++ b/src/main/ssh/config/ssh-config-include-expander.ts @@ -1,7 +1,7 @@ import { existsSync, globSync, readFileSync, realpathSync, statSync } from 'node:fs' import { homedir, hostname, userInfo } from 'node:os' import { posix, win32 } from 'node:path' -import { compareCodePoints } from '../../../shared/sidebar-list/text-order' +import { compareCodePoints } from '../../../shared/sidebar-list/sorting/text-order' type PathApi = typeof posix | typeof win32 diff --git a/src/preload/api/runtime/runtime-api.ts b/src/preload/api/runtime/runtime-api.ts index 4fe42605caf..93893705b0c 100644 --- a/src/preload/api/runtime/runtime-api.ts +++ b/src/preload/api/runtime/runtime-api.ts @@ -14,7 +14,7 @@ import type { } from '../../../shared/runtime-session-contracts' import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope' import type { ClientHostedBrowserRowsEvent } from '../../../shared/client-hosted-browser-rows' -import type { SidebarInputsChangedEvent } from '../../../shared/sidebar-list/sidebar-inputs-feed-contract' +import type { SidebarInputsChangedEvent } from '../../../shared/sidebar-list/feed/sidebar-inputs-feed-contract' import type { PublicKnownRuntimeEnvironment, RuntimeEnvironmentRemoval diff --git a/src/preload/api/runtime/runtime-bridge.ts b/src/preload/api/runtime/runtime-bridge.ts index 05a122c4fc0..ff02b6e8b07 100644 --- a/src/preload/api/runtime/runtime-bridge.ts +++ b/src/preload/api/runtime/runtime-bridge.ts @@ -1,6 +1,6 @@ import { ipcRenderer } from 'electron' import type { ClientHostedBrowserRowsEvent } from '../../../shared/client-hosted-browser-rows' -import type { SidebarInputsChangedEvent } from '../../../shared/sidebar-list/sidebar-inputs-feed-contract' +import type { SidebarInputsChangedEvent } from '../../../shared/sidebar-list/feed/sidebar-inputs-feed-contract' import type { RuntimeRendererSyncWindowGraph, RuntimeStatus, diff --git a/src/renderer/src/attention/unread/unread-badge-count.ts b/src/renderer/src/attention/unread/unread-badge-count.ts index 9266b72d38f..182b80f7c67 100644 --- a/src/renderer/src/attention/unread/unread-badge-count.ts +++ b/src/renderer/src/attention/unread/unread-badge-count.ts @@ -1,8 +1,8 @@ import { filterFolderWorkspacesForVisibleHosts, filterProjectGroupsForVisibleHosts -} from '../../../../shared/sidebar-list/host-filtering' -import { getRenderableFolderWorkspaces } from '../../../../shared/sidebar-list/folder-workspace-lanes' +} from '../../../../shared/sidebar-list/hosts/host-filtering' +import { getRenderableFolderWorkspaces } from '../../../../shared/sidebar-list/folders/folder-workspace-lanes' import { worktreeMatchesVisibleHost } from '@/components/sidebar/worktree-list/listing/visible-worktree-host-scope' import { filterFolderWorkspacesFromOtherDevices, diff --git a/src/renderer/src/components/cmd-j/palette-live-status.tsx b/src/renderer/src/components/cmd-j/palette-live-status.tsx index bb3d6f395db..041ebbc4804 100644 --- a/src/renderer/src/components/cmd-j/palette-live-status.tsx +++ b/src/renderer/src/components/cmd-j/palette-live-status.tsx @@ -10,13 +10,13 @@ import { FilledBellIcon } from '@/components/sidebar/workspace-card/identity/wor import { buildExplicitEntriesByTabId, type TabPaneInputSources -} from '../../../../shared/sidebar-list/smart-attention' +} from '../../../../shared/sidebar-list/sorting/smart-attention' import { isAgentStatusFresh, AGENT_STATUS_STALE_AFTER_MS } from '../../../../shared/agent-status/contracts/agent-status-freshness' import { getLiveAgentStatusByWorktreeId } from '@/lib/workspace/activity/worktree-activity-state' -import type { LiveAgentWorktreeStatus } from '../../../../shared/sidebar-list/workspace-activity-facts' +import type { LiveAgentWorktreeStatus } from '../../../../shared/sidebar-list/feed-facts/workspace-activity-facts' import { getWorktreeStatus, getWorktreeStatusLabel } from '@/lib/workspace/activity/worktree-status' import type { WorktreeStatus } from '../../../../shared/worktree-status-rollup' import { diff --git a/src/renderer/src/components/cmd-j/palette-project-results.ts b/src/renderer/src/components/cmd-j/palette-project-results.ts index 0d0e2f81bb1..9b97284c794 100644 --- a/src/renderer/src/components/cmd-j/palette-project-results.ts +++ b/src/renderer/src/components/cmd-j/palette-project-results.ts @@ -12,7 +12,7 @@ import type { Project, ProjectHostSetup } from '../../../../shared/project-types import type { Repo } from '../../../../shared/repo-types' import { translate } from '@/i18n/i18n' import type { Translate } from '@/i18n/use-translate' -import { getProjectGroupHeaderKey } from '../../../../shared/sidebar-list/group-keys' +import { getProjectGroupHeaderKey } from '../../../../shared/sidebar-list/sections/group-keys' import { getDistinctProjectGroups } from '../../../../shared/project-groups' import { getProjectHeaderRevealTarget } from '../../../../shared/project-section-grouping' import type { ProjectGroupingModel } from '../../../../shared/project-section-grouping' diff --git a/src/renderer/src/components/native-chat-recovery/tree/native-chat-resume-workspace-lookups.ts b/src/renderer/src/components/native-chat-recovery/tree/native-chat-resume-workspace-lookups.ts index 9de3a406497..97f81fc6b9c 100644 --- a/src/renderer/src/components/native-chat-recovery/tree/native-chat-resume-workspace-lookups.ts +++ b/src/renderer/src/components/native-chat-recovery/tree/native-chat-resume-workspace-lookups.ts @@ -2,7 +2,7 @@ import { useMemo } from 'react' import { getCyclicProjectedWorktreeLineageIds, getSidebarLineageAncestors -} from '../../../../../shared/sidebar-list/worktree-lineage-projection' +} from '../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' import { getIndexedAllWorktrees, getIndexedWorktreeMap diff --git a/src/renderer/src/components/new-workspace/branch-selection/ComposerParentWorktreePicker.tsx b/src/renderer/src/components/new-workspace/branch-selection/ComposerParentWorktreePicker.tsx index a857848c292..88661e6bfa5 100644 --- a/src/renderer/src/components/new-workspace/branch-selection/ComposerParentWorktreePicker.tsx +++ b/src/renderer/src/components/new-workspace/branch-selection/ComposerParentWorktreePicker.tsx @@ -17,7 +17,7 @@ import { import { compareWorktreeDisplayName } from '@/lib/workspace/display/worktree-display-name-order' import '@/components/sidebar/workspace-card/activity/worktree-card-empty-inputs' import { branchDisplayName } from '@/components/sidebar/workspace-card/identity/worktree-branch-display' -import { getCyclicProjectedWorktreeLineageIds } from '../../../../../shared/sidebar-list/worktree-lineage-projection' +import { getCyclicProjectedWorktreeLineageIds } from '../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' import { clampWorktreeParentPickerIndex, filterWorktreeParentCandidates diff --git a/src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.test.ts b/src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.test.ts index 3b1f4be50c8..a4470d2c98d 100644 --- a/src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.test.ts +++ b/src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.test.ts @@ -1,19 +1,11 @@ -import { describe, expect, it, vi } from 'vitest' -import { getFolderWorkspaceWorktree } from '../../../../shared/folder-workspaces/folder-workspace-worktree' -import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity' -import { - getProjectedWorktreeLineageChildrenByParentId, - resolveSidebarLineageParentIdentities -} from '../../../../shared/sidebar-list/worktree-lineage-projection' +import { describe, expect, it } from 'vitest' + import type { FolderWorkspace } from '../../../../shared/folder-workspaces/folder-workspace-types' import type { WorkspaceLineage, WorktreeLineage } from '../../../../shared/worktree/lineage-types' import type { Worktree } from '../../../../shared/worktree/types' import { folderWorkspaceKey, worktreeWorkspaceKey } from '../../../../shared/workspace-scope' -import { - getAttachedWorktreesForFolderWorkspace, - getLineageChildrenByParentId -} from './folder-workspace-attached-worktrees' +import { getAttachedWorktreesForFolderWorkspace } from './folder-workspace-attached-worktrees' function makeFolder(id = 'folder-1'): FolderWorkspace { return { @@ -206,65 +198,6 @@ it('includes resolved cross-store roots and their descendants without attaching expect(result.lineageChildrenByParentId.get('ssh:box|remote-root')).toEqual([child]) }) -it('attaches cross-store roots only to the resolved host when folder IDs collide', () => { - const localFolder = makeFolder() - const pairedFolder: FolderWorkspace = { ...makeFolder(), executionHostId: 'runtime:paired' } - const root = makeWorktree({ id: 'root', hostId: 'local', instanceId: 'root-instance' }) - const child = makeWorktree({ id: 'child', hostId: 'local', instanceId: 'child-instance' }) - const worktreeLineageById = { child: edge(child, root, 5) } - const rows = [ - root, - child, - ...[localFolder, pairedFolder].map((folder) => getFolderWorkspaceWorktree(folder)) - ] - const lineageParentIdentities = resolveSidebarLineageParentIdentities( - worktreeLineageById, - new Map(rows.map((row) => [getWorktreeHostIdentity(row), row])), - new Map([ - [ - '', - { - installationId: 'local-installation', - crossStoreLineageByChildKey: { - [worktreeWorkspaceKey(root.id)]: { - childWorkspaceKey: worktreeWorkspaceKey(root.id), - childInstanceId: 'root-instance', - parent: { - installationId: 'paired-installation', - workspaceKey: 'folder:folder-1', - instanceId: 'folder-1' - }, - origin: 'cli', - capture: { source: 'explicit-cli-flag', confidence: 'explicit' }, - createdAt: 1 - } - } - } - ], - ['paired', { installationId: 'paired-installation', crossStoreLineageByChildKey: {} }] - ]) - ) - const inputs = { - activeWorkspaceKey: 'folder:folder-1', - activeWorktreeId: null, - folderWorkspaces: [localFolder, pairedFolder], - workspaceLineageByChildKey: {}, - worktreeLineageById, - worktreesByRepo: { local: [root, child] }, - lineageParentIdentities, - crossStoreChildrenByFolderId: new Map([['folder-1', [root]]]) - } - - const local = getAttachedWorktreesForFolderWorkspace({ ...inputs, executionHostId: 'local' }) - const paired = getAttachedWorktreesForFolderWorkspace({ - ...inputs, - executionHostId: 'runtime:paired' - }) - - expect(local.childWorktrees).toEqual([]) - expect(paired.owners.map((owner) => owner.worktree.id)).toEqual(['root', 'child']) -}) - it('retires an attached worktree at durable admission while legacy pending rows remain visible', () => { const child = makeWorktree({ id: 'repo-1::/retiring', removing: true }) const list = (row: Worktree) => @@ -280,128 +213,3 @@ it('retires an attached worktree at durable admission while legacy pending rows expect(list(child)).toEqual(['repo-1::/retiring']) expect(list({ ...child, removalRecorded: true })).toEqual([]) }) - -it.each([false, true])( - 'keeps live descendants through retired bridges, retired cross-store root=%s', - (retiredRoot) => { - const hostId = retiredRoot ? 'ssh:box' : 'local' - const root = makeWorktree({ - id: 'root', - hostId, - instanceId: 'root', - removing: retiredRoot ? true : undefined, - removalRecorded: retiredRoot ? true : undefined - }) - const bridge = makeWorktree({ - id: 'bridge', - hostId, - instanceId: 'bridge', - removing: true, - removalRecorded: true - }) - const child = makeWorktree({ id: 'child', hostId, instanceId: 'child' }) - const leaf = makeWorktree({ id: 'leaf', hostId, instanceId: 'leaf' }) - const lineage = { - bridge: edge(bridge, root, 2), - child: edge(child, bridge, 3), - leaf: edge(leaf, child, 4) - } - const result = getAttachedWorktreesForFolderWorkspace({ - activeWorkspaceKey: folderWorkspaceKey('folder-1'), - activeWorktreeId: null, - folderWorkspaces: [makeFolder()], - workspaceLineageByChildKey: retiredRoot ? {} : { root: makeWorkspaceLineage(root) }, - worktreeLineageById: lineage, - worktreesByRepo: { 'repo-1': [root, bridge, child, leaf] }, - lineageParentIdentities: new Map([ - [getWorktreeHostIdentity(root), 'local|folder:folder-1'], - [getWorktreeHostIdentity(bridge), getWorktreeHostIdentity(root)], - [getWorktreeHostIdentity(child), getWorktreeHostIdentity(bridge)], - [getWorktreeHostIdentity(leaf), getWorktreeHostIdentity(child)] - ]), - crossStoreChildrenByFolderId: new Map(retiredRoot ? [['folder-1', [root]]] : []) - }) - expect(result.owners.map((owner) => owner.worktree.id)).toEqual( - retiredRoot ? ['child', 'leaf'] : ['root', 'child', 'leaf'] - ) - expect(result.childWorktrees.map((row) => row.id).sort()).toEqual( - retiredRoot ? ['child', 'leaf'] : ['child', 'leaf', 'root'] - ) - expect(result.rootChildWorktrees.map((row) => row.id).sort()).toEqual( - retiredRoot ? ['child'] : ['child', 'root'] - ) - expect([...result.lineageChildrenByParentId]).toEqual([ - [getWorktreeHostIdentity(child), [leaf]] - ]) - } -) - -it('traverses retired chains with at most two visits per vertex and edge at N and 10N', () => { - for (const size of [100, 1000]) { - const nodes = Array.from({ length: size }, (_, index) => - makeWorktree({ - id: `node-${index}`, - instanceId: `instance-${index}`, - removing: index < size - 1 ? true : undefined, - removalRecorded: index < size - 1 ? true : undefined - }) - ) - const rows = new Map(nodes.map((row) => [row.id, row])) - let catalogEnumerations = 0 - let catalogReads = 0 - const lineage = new Proxy( - Object.fromEntries( - nodes.slice(1).map((row, index) => [row.id, edge(row, nodes[index], index)]) - ), - { - ownKeys: (target) => { - catalogEnumerations++ - return Reflect.ownKeys(target) - }, - get: (target, key) => { - catalogReads++ - return typeof key === 'string' ? target[key] : undefined - } - } - ) - // The existing index is shared; count the two required reachability/emission passes over it. - const adjacency = getProjectedWorktreeLineageChildrenByParentId(lineage, rows) - let edgeVisits = 0 - for (const children of adjacency.values()) { - for (let index = 0; index < children.length; index++) { - const child = children[index] - Object.defineProperty(children, index, { - configurable: true, - get: () => { - edgeVisits++ - return child - } - }) - } - } - const vertexVisits = vi.spyOn(adjacency, 'get') - const rowValues = vi.spyOn(rows, 'values') - const rowIterator = vi.spyOn(rows, Symbol.iterator) - const rowReads = vi.spyOn(rows, 'get') - catalogEnumerations = 0 - catalogReads = 0 - try { - const result = getLineageChildrenByParentId(lineage, rows, new Set([nodes[0].id])) - expect([...result.values()].flat().map((row) => row.id)).toEqual([`node-${size - 1}`]) - expect(vertexVisits.mock.calls.length).toBeGreaterThanOrEqual(size) - expect(vertexVisits.mock.calls.length).toBeLessThanOrEqual(2 * size) - expect(edgeVisits).toBeGreaterThanOrEqual(size - 1) - expect(edgeVisits).toBeLessThanOrEqual(2 * (size - 1)) - expect(catalogEnumerations).toBe(0) - expect(catalogReads).toBe(0) - expect(rowValues).not.toHaveBeenCalled() - expect(rowIterator).not.toHaveBeenCalled() - expect(rowReads.mock.calls.length).toBeLessThanOrEqual(size) - } finally { - vertexVisits.mockRestore() - rowValues.mockRestore() - rowIterator.mockRestore() - rowReads.mockRestore() - } - } -}) diff --git a/src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.ts b/src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.ts index a47bf785fbd..7e7113a782b 100644 --- a/src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.ts +++ b/src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.ts @@ -12,7 +12,7 @@ import { getSidebarLineageParentsByIdentity, type SidebarLineageParentIdentities, getProjectedWorktreeLineageChildrenByParentId -} from '../../../../shared/sidebar-list/worktree-lineage-projection' +} from '../../../../shared/sidebar-list/lineage/worktree-lineage-projection' export type AttachedWorktreeResolution = { folderWorkspace: FolderWorkspace | null diff --git a/src/renderer/src/components/sidebar/sidebar-feed/desktop-sidebar-feed.ts b/src/renderer/src/components/sidebar/sidebar-feed/desktop-sidebar-feed.ts index b1ddb1c737b..83957cf2575 100644 --- a/src/renderer/src/components/sidebar/sidebar-feed/desktop-sidebar-feed.ts +++ b/src/renderer/src/components/sidebar/sidebar-feed/desktop-sidebar-feed.ts @@ -1,6 +1,6 @@ import { useEffect, useSyncExternalStore } from 'react' -import { SidebarInputsReadResultSchema } from '../../../../../shared/sidebar-list/sidebar-inputs-feed-contract' -import type { SidebarFeedDomains } from '../../../../../shared/sidebar-list/sidebar-feed-domains' +import { SidebarInputsReadResultSchema } from '../../../../../shared/sidebar-list/feed/sidebar-inputs-feed-contract' +import type { SidebarFeedDomains } from '../../../../../shared/sidebar-list/feed/sidebar-feed-domains' import { SidebarFeedReader, type SidebarFeedReaderRead, diff --git a/src/renderer/src/components/sidebar/sidebar-feed/sidebar-pending-layer.ts b/src/renderer/src/components/sidebar/sidebar-feed/sidebar-pending-layer.ts index d46aa55e13c..4d75c708af2 100644 --- a/src/renderer/src/components/sidebar/sidebar-feed/sidebar-pending-layer.ts +++ b/src/renderer/src/components/sidebar/sidebar-feed/sidebar-pending-layer.ts @@ -4,15 +4,15 @@ import type { FolderWorkspace } from '../../../../../shared/folder-workspaces/fo import { folderWorkspaceKey } from '../../../../../shared/workspace-scope' import { getFolderWorkspaceWorktreeHostId } from '../../../../../shared/folder-workspaces/folder-workspace-worktree' import type { Repo } from '../../../../../shared/repo-types' -import type { SidebarFeedDomains } from '../../../../../shared/sidebar-list/sidebar-feed-domains' +import type { SidebarFeedDomains } from '../../../../../shared/sidebar-list/feed/sidebar-feed-domains' import { buildPairedServerRows, type PairedServerWorkspaceRow -} from '../../../../../shared/sidebar-list/paired-server-rows' +} from '../../../../../shared/sidebar-list/feed-facts/paired-server-rows' import { buildWorkspaceRows, type WorkspaceRow -} from '../../../../../shared/sidebar-list/workspace-rows' +} from '../../../../../shared/sidebar-list/feed-facts/workspace-rows' import type { WorktreeLineage } from '../../../../../shared/worktree/lineage-types' import type { WorktreeMeta } from '../../../../../shared/worktree/meta-types' import type { Worktree } from '../../../../../shared/worktree/types' diff --git a/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-menu-lineage-parent.ts b/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-menu-lineage-parent.ts index 86ef7ad7dea..1276b20bf06 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-menu-lineage-parent.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-menu-lineage-parent.ts @@ -7,7 +7,7 @@ import type { Worktree } from '../../../../../../shared/worktree/types' import { getCyclicProjectedWorktreeLineageIds, getLineageRenderInfo -} from '../../../../../../shared/sidebar-list/worktree-lineage-projection' +} from '../../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' import { getEligibleWorktreeParents } from '../parenting/worktree-parent-candidates' import { useEligibleFolderParents } from '../parenting/use-eligible-folder-parents' diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/workspace-delete-lineage.ts b/src/renderer/src/components/sidebar/workspace-actions/deletion/workspace-delete-lineage.ts index 0224c34d54a..0ac94c0249b 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/workspace-delete-lineage.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/workspace-delete-lineage.ts @@ -1,6 +1,6 @@ import type { WorktreeLineage } from '../../../../../../shared/worktree/lineage-types' import type { Worktree } from '../../../../../../shared/worktree/types' -import { getProjectedWorktreeLineageChildrenByParentId } from '../../../../../../shared/sidebar-list/worktree-lineage-projection' +import { getProjectedWorktreeLineageChildrenByParentId } from '../../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' import { lineageStoreKeyOfRow } from '../../../../../../shared/worktree/lineage/cross-store-lineage-resolution' type WorkspaceDeleteLineage = { diff --git a/src/renderer/src/components/sidebar/workspace-actions/parenting/worktree-parent-candidates.ts b/src/renderer/src/components/sidebar/workspace-actions/parenting/worktree-parent-candidates.ts index df852d4de6a..cd06315368f 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/parenting/worktree-parent-candidates.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/parenting/worktree-parent-candidates.ts @@ -10,7 +10,7 @@ import { canAssignWorktreeParent } from './worktree-parent-eligibility' import { getCyclicProjectedWorktreeLineageIds, type SidebarLineageParentIdentities -} from '../../../../../../shared/sidebar-list/worktree-lineage-projection' +} from '../../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' import { lineageStoreKeyOfRow, OWN_LINEAGE_STORE_KEY diff --git a/src/renderer/src/components/sidebar/workspace-actions/parenting/worktree-parent-eligibility.ts b/src/renderer/src/components/sidebar/workspace-actions/parenting/worktree-parent-eligibility.ts index f60d314c456..83dd4594b54 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/parenting/worktree-parent-eligibility.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/parenting/worktree-parent-eligibility.ts @@ -3,7 +3,7 @@ import type { Worktree } from '../../../../../../shared/worktree/types' import { getCyclicProjectedWorktreeLineageIds, getLineageRenderInfo -} from '../../../../../../shared/sidebar-list/worktree-lineage-projection' +} from '../../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' type ParentEligibilityArgs = { child: Worktree diff --git a/src/renderer/src/components/sidebar/workspace-board/projection/workspace-kanban-worktree-groups.ts b/src/renderer/src/components/sidebar/workspace-board/projection/workspace-kanban-worktree-groups.ts index cda045da4e8..774089eae36 100644 --- a/src/renderer/src/components/sidebar/workspace-board/projection/workspace-kanban-worktree-groups.ts +++ b/src/renderer/src/components/sidebar/workspace-board/projection/workspace-kanban-worktree-groups.ts @@ -3,7 +3,7 @@ import type { WorkspaceStatusDefinition, Worktree } from '../../../../../../shared/worktree/types' -import type { SortBy } from '../../../../../../shared/sidebar-list/smart-sort' +import type { WorkspaceSortBy as SortBy } from '../../../../../../shared/workspace-view/workspace-row-sort' import '../../workspace-status/presentation/workspace-status' import { getWorkspaceStatus } from '../../../../../../shared/workspace-statuses' import { compareWorktreeDisplayName } from '@/lib/workspace/display/worktree-display-name-order' diff --git a/src/renderer/src/components/sidebar/workspace-card/identity/child-workspaces-toggle-target.ts b/src/renderer/src/components/sidebar/workspace-card/identity/child-workspaces-toggle-target.ts index 894e9dfb46b..f45d7640684 100644 --- a/src/renderer/src/components/sidebar/workspace-card/identity/child-workspaces-toggle-target.ts +++ b/src/renderer/src/components/sidebar/workspace-card/identity/child-workspaces-toggle-target.ts @@ -9,11 +9,11 @@ import { computeRenderedSidebarRows } from '../../worktree-list/listing/rendered import { getPublishedVisibleWorktreeShortcutTargets } from '../../worktree-list/listing/visible-worktrees' import { computeVisibleWorktrees } from '../../worktree-list/listing/compute-visible-worktrees' import { buildVisibleWorktreeOptionsFromState } from '../../worktree-list/listing/visible-worktree-options-from-state' -import { getWorktreeLineageGroupKey } from '../../../../../../shared/sidebar-list/group-keys' +import { getWorktreeLineageGroupKey } from '../../../../../../shared/sidebar-list/sections/group-keys' import { getHostScopedWorktreeLineageInputs, getWorktreeLineageAncestors -} from '../../../../../../shared/sidebar-list/worktree-lineage-projection' +} from '../../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' type ChildWorkspacesToggleState = Pick< diff --git a/src/renderer/src/components/sidebar/workspace-card/review/folder-workspace-card-pr-display.ts b/src/renderer/src/components/sidebar/workspace-card/review/folder-workspace-card-pr-display.ts index 7764d06ec9b..eeb2205332e 100644 --- a/src/renderer/src/components/sidebar/workspace-card/review/folder-workspace-card-pr-display.ts +++ b/src/renderer/src/components/sidebar/workspace-card/review/folder-workspace-card-pr-display.ts @@ -10,7 +10,7 @@ import { folderWorkspaceKey, parseWorkspaceKey } from '../../../../../../shared/ import { buildParentPrChecksRows } from '@/components/right-sidebar/hosted-review/folder-checks/parent-pr-checks-rows' import type { ParentPrChecksRow } from '@/components/right-sidebar/hosted-review/folder-checks/parent-pr-checks-row-types' import type { WorktreeCardPrDisplay } from './worktree-card-pr-display' -import { getProjectedWorktreeLineageChildrenByParentId } from '../../../../../../shared/sidebar-list/worktree-lineage-projection' +import { getProjectedWorktreeLineageChildrenByParentId } from '../../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' type FolderWorkspaceCardPrDisplayArgs = { folderWorkspaceId: string diff --git a/src/renderer/src/components/sidebar/worktree-list/controls/use-projects-collapse-all-announcement.ts b/src/renderer/src/components/sidebar/worktree-list/controls/use-projects-collapse-all-announcement.ts index 7be34178438..5ec600dbd40 100644 --- a/src/renderer/src/components/sidebar/worktree-list/controls/use-projects-collapse-all-announcement.ts +++ b/src/renderer/src/components/sidebar/worktree-list/controls/use-projects-collapse-all-announcement.ts @@ -2,7 +2,7 @@ import { useCallback, useEffect } from 'react' import { useAppStore } from '@/store' import { isContextualTourSessionConsumed } from '@/store/slices/ui/ui-slice-tour-actions' import { hasFeatureInteraction } from '../../../../../../shared/feature-interactions' -import { isProjectSectionGroupKey } from '../../../../../../shared/sidebar-list/group-keys' +import { isProjectSectionGroupKey } from '../../../../../../shared/sidebar-list/sections/group-keys' const TOUR_ID = 'projects-collapse-all' const SOURCE = 'project_header_collapsed' diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/groups.ts b/src/renderer/src/components/sidebar/worktree-list/drag/groups.ts index 69b4bb7cd38..68e68f8595d 100644 --- a/src/renderer/src/components/sidebar/worktree-list/drag/groups.ts +++ b/src/renderer/src/components/sidebar/worktree-list/drag/groups.ts @@ -1,9 +1,12 @@ -import { ALL_GROUP_KEY, PINNED_GROUP_KEY } from '../../../../../../shared/sidebar-list/group-keys' +import { + ALL_GROUP_KEY, + PINNED_GROUP_KEY +} from '../../../../../../shared/sidebar-list/sections/group-keys' import { getNaturalWorktreeKeys } from '../listing/natural-worktree-keys' import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' -import type { HostSectionRow } from '../../../../../../shared/sidebar-list/host-section-rows' +import type { HostSectionRow } from '../../../../../../shared/sidebar-list/hosts/host-section-rows' import type { WorktreeDragGroup } from './worktree-manual-order' -import { isFolderLaneSectionKey } from '../../../../../../shared/sidebar-list/folder-workspace-occurrences' +import { isFolderLaneSectionKey } from '../../../../../../shared/sidebar-list/folders/folder-workspace-occurrences' /** Group members are host identities: same-id copies on two machines are separate cards to reorder. * Rows nested under a folder workspace group by their folder's lane, as getWorktreeDragIndexes keys diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/root-project-header-drop.test.ts b/src/renderer/src/components/sidebar/worktree-list/drag/root-project-header-drop.test.ts index 9aa470f600f..97cf123f11e 100644 --- a/src/renderer/src/components/sidebar/worktree-list/drag/root-project-header-drop.test.ts +++ b/src/renderer/src/components/sidebar/worktree-list/drag/root-project-header-drop.test.ts @@ -1,8 +1,7 @@ -// @vitest-environment happy-dom import type { HostSectionRow, HostHeaderRow -} from '../../../../../../shared/sidebar-list/host-section-rows' +} from '../../../../../../shared/sidebar-list/hosts/host-section-rows' import { describe, expect, it } from 'vitest' import type { ProjectGroup } from '../../../../../../shared/project-group-types' import type { Repo } from '../../../../../../shared/repo-types' @@ -10,7 +9,6 @@ import { getRootProjectHeaderCountByOccurrenceKey, getRootProjectHeaderDragKeys, getSidebarRootProjectHeaderKeys, - measureRootProjectHeaderDragRects, getRootProjectOrderForSidebarDrop, getRootProjectOrderUpdatesForSidebarDrop } from './root-project-header-drop' @@ -247,23 +245,5 @@ describe('root project header drops', () => { ['["runtime:remote","repo:x"]', 3], ['["runtime:remote","repo:y"]', 3] ]) - - const container = document.createElement('div') - for (const [hostId, key] of [ - ['local', 'group:a'], - ['local', 'repo:x'], - ['runtime:remote', 'group:a'], - ['runtime:remote', 'repo:y'] - ]) { - const element = document.createElement('div') - element.dataset.rootProjectHeaderKey = key - element.dataset.rootProjectHeaderHost = hostId - container.append(element) - } - expect( - measureRootProjectHeaderDragRects(container, ['group:a', 'repo:y'], 'runtime:remote').map( - (rect) => rect.key - ) - ).toEqual(['group:a', 'repo:y']) }) }) diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/root-project-header-drop.ts b/src/renderer/src/components/sidebar/worktree-list/drag/root-project-header-drop.ts index 033f3bdd9c4..cd09263b7c0 100644 --- a/src/renderer/src/components/sidebar/worktree-list/drag/root-project-header-drop.ts +++ b/src/renderer/src/components/sidebar/worktree-list/drag/root-project-header-drop.ts @@ -9,7 +9,7 @@ import { } from '../../../../../../shared/root-project-order' import { getDistinctProjectGroups } from '../../../../../../shared/project-groups' import { getLogicalRepoOrderRankById } from '../../../../../../shared/project-section-order' -import type { HostSectionRow } from '../../../../../../shared/sidebar-list/host-section-rows' +import type { HostSectionRow } from '../../../../../../shared/sidebar-list/hosts/host-section-rows' import type { GroupHeaderRow } from '../../../../../../shared/sidebar-list/row-types' export type RootProjectHeaderDrag = { diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-header-drag.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-header-drag.ts index 6d102996a91..4e39311bf41 100644 --- a/src/renderer/src/components/sidebar/worktree-list/drag/use-header-drag.ts +++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-header-drag.ts @@ -11,7 +11,7 @@ import type { ExecutionHostId } from '../../../../../../shared/execution-host' import type { HostHeaderRow, HostSectionRow -} from '../../../../../../shared/sidebar-list/host-section-rows' +} from '../../../../../../shared/sidebar-list/hosts/host-section-rows' import type { Row, WorktreeGroupBy } from '../../../../../../shared/sidebar-list/row-types' import type { RenderRow } from '../listing/render-row' import { diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-lineage-drop-commit.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-lineage-drop-commit.ts index f9327e0e7cf..0775d1cccd1 100644 --- a/src/renderer/src/components/sidebar/worktree-list/drag/use-lineage-drop-commit.ts +++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-lineage-drop-commit.ts @@ -11,7 +11,7 @@ import { useAllWorktrees } from '@/store/slices/worktrees/listing/use-worktree-c import { selectSidebarLineageParentIdentities } from '@/store/slices/worktrees/metadata/cross-store-lineage-parents' import { isCrossStoreParent } from '@/store/slices/worktrees/metadata/cross-store-parent-ref' import type { DraggedWorktreeCopies } from './dragged-worktree-copies' -import { getCyclicProjectedWorktreeLineageIds } from '../../../../../../shared/sidebar-list/worktree-lineage-projection' +import { getCyclicProjectedWorktreeLineageIds } from '../../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' import { getReorderedWorktreeIdsToUnnest, getReorderUnnestRows, diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-session.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-session.ts index 19d08ca2f08..d872a4e4c27 100644 --- a/src/renderer/src/components/sidebar/worktree-list/drag/use-session.ts +++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-session.ts @@ -1,8 +1,8 @@ import { useCallback, useMemo, useRef } from 'react' import type React from 'react' import type { WorkspaceStatus } from '../../../../../../shared/worktree/types' -import type { HostSectionRow } from '../../../../../../shared/sidebar-list/host-section-rows' -import { PINNED_GROUP_KEY } from '../../../../../../shared/sidebar-list/group-keys' +import type { HostSectionRow } from '../../../../../../shared/sidebar-list/hosts/host-section-rows' +import { PINNED_GROUP_KEY } from '../../../../../../shared/sidebar-list/sections/group-keys' import { WORKTREE_SIDEBAR_VIRTUAL_ROW_GAP } from '../viewport/virtual-rows' import '../../workspace-status/presentation/workspace-status' import { getWorkspaceStatusGroupKey } from '../../../../../../shared/workspace-statuses' diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-status-mutations.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-status-mutations.ts index fa8258e1d46..4c3c048e041 100644 --- a/src/renderer/src/components/sidebar/worktree-list/drag/use-status-mutations.ts +++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-status-mutations.ts @@ -15,7 +15,7 @@ import { shouldWriteManualOrderForGroupDrop } from './worktree-manual-order' import { buildWorkspaceKanbanSidebarDropUpdates } from '../../workspace-board/drag/workspace-kanban-sidebar-drop' -import type { SortBy } from '../../../../../../shared/sidebar-list/smart-sort' +import type { WorkspaceSortBy as SortBy } from '../../../../../../shared/workspace-view/workspace-row-sort' import { switchSortToManualAfterDrop } from '../listing/manual-sort-switch-toast' import { isWorkspaceStatusAllowedOnHost } from '@/store/workspaces/status/host-workspace-status-columns' import type { WorktreeReorderArgs, WorktreeStatusDropAtIndexArgs } from './drop-commit-context' diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-status-row-drag.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-status-row-drag.ts index 389265dbe9e..33802d517c2 100644 --- a/src/renderer/src/components/sidebar/worktree-list/drag/use-status-row-drag.ts +++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-status-row-drag.ts @@ -1,8 +1,8 @@ import { useCallback, useMemo } from 'react' import type React from 'react' import type { WorkspaceStatus } from '../../../../../../shared/worktree/types' -import type { HostSectionRow } from '../../../../../../shared/sidebar-list/host-section-rows' -import { PINNED_GROUP_KEY } from '../../../../../../shared/sidebar-list/group-keys' +import type { HostSectionRow } from '../../../../../../shared/sidebar-list/hosts/host-section-rows' +import { PINNED_GROUP_KEY } from '../../../../../../shared/sidebar-list/sections/group-keys' import type { WorktreeGroupBy } from '../../../../../../shared/sidebar-list/row-types' import '../../workspace-status/presentation/workspace-status' import { diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/worktree-drag-units.ts b/src/renderer/src/components/sidebar/worktree-list/drag/worktree-drag-units.ts index d129f8a4bab..9dda976d010 100644 --- a/src/renderer/src/components/sidebar/worktree-list/drag/worktree-drag-units.ts +++ b/src/renderer/src/components/sidebar/worktree-list/drag/worktree-drag-units.ts @@ -1,6 +1,9 @@ import type { WorktreeDragGroup } from './worktree-manual-order' -import { isFolderLaneSectionKey } from '../../../../../../shared/sidebar-list/folder-workspace-occurrences' -import { ALL_GROUP_KEY, PINNED_GROUP_KEY } from '../../../../../../shared/sidebar-list/group-keys' +import { isFolderLaneSectionKey } from '../../../../../../shared/sidebar-list/folders/folder-workspace-occurrences' +import { + ALL_GROUP_KEY, + PINNED_GROUP_KEY +} from '../../../../../../shared/sidebar-list/sections/group-keys' import { getNaturalWorktreeKeys } from '../listing/natural-worktree-keys' import { composeWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' import type { ExecutionHostId } from '../../../../../../shared/execution-host' diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/worktree-lineage-drag-drop.ts b/src/renderer/src/components/sidebar/worktree-list/drag/worktree-lineage-drag-drop.ts index 567ade41906..e0b5586a02d 100644 --- a/src/renderer/src/components/sidebar/worktree-list/drag/worktree-lineage-drag-drop.ts +++ b/src/renderer/src/components/sidebar/worktree-list/drag/worktree-lineage-drag-drop.ts @@ -1,7 +1,7 @@ import type { WorktreeLineage } from '../../../../../../shared/worktree/lineage-types' import type { Worktree } from '../../../../../../shared/worktree/types' import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' -import { getLineageRenderInfo } from '../../../../../../shared/sidebar-list/worktree-lineage-projection' +import { getLineageRenderInfo } from '../../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' const WORKTREE_CARD_CONTENT_TARGET_SELECTOR = '[data-worktree-card-parent-content]' const WORKTREE_DRAG_ROW_SELECTOR = '[data-worktree-drag-id]' diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/worktree-manual-order-catalog.ts b/src/renderer/src/components/sidebar/worktree-list/drag/worktree-manual-order-catalog.ts index b3b05943aa1..a9d6e0c9dc5 100644 --- a/src/renderer/src/components/sidebar/worktree-list/drag/worktree-manual-order-catalog.ts +++ b/src/renderer/src/components/sidebar/worktree-list/drag/worktree-manual-order-catalog.ts @@ -5,7 +5,7 @@ import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host- import { buildWorktreeSortLabels, compareWorktreeSortLabel -} from '../../../../../../shared/sidebar-list/smart-sort' +} from '../../../../../../shared/sidebar-list/sorting/smart-sort' /** Manual ranks by host identity: same-id copies on two hosts are separate cards. */ export type WorktreeManualOrderCatalog = { diff --git a/src/renderer/src/components/sidebar/worktree-list/grouping/build-rows.test-fixture.ts b/src/renderer/src/components/sidebar/worktree-list/grouping/build-rows.test-fixture.ts index e89af78f1d8..d35183953b9 100644 --- a/src/renderer/src/components/sidebar/worktree-list/grouping/build-rows.test-fixture.ts +++ b/src/renderer/src/components/sidebar/worktree-list/grouping/build-rows.test-fixture.ts @@ -22,7 +22,7 @@ import { } from '../../../../../../shared/sidebar-list/row-types' import { planSidebarRows } from '../../../../../../shared/sidebar-list/sidebar-row-plan' -import type { PRCacheView } from '../../../../../../shared/sidebar-list/workspace-review-facts' +import type { PRCacheView } from '../../../../../../shared/sidebar-list/feed-facts/workspace-review-facts' import { createSidebarPRGroupReader } from './pr-group-key' /** Test-only positional entry to the shared row builder, with the window's defaults. */ diff --git a/src/renderer/src/components/sidebar/worktree-list/grouping/pinned-section-worktrees.test.ts b/src/renderer/src/components/sidebar/worktree-list/grouping/pinned-section-worktrees.test.ts index fd38f80c780..ca6b03d4d09 100644 --- a/src/renderer/src/components/sidebar/worktree-list/grouping/pinned-section-worktrees.test.ts +++ b/src/renderer/src/components/sidebar/worktree-list/grouping/pinned-section-worktrees.test.ts @@ -1,9 +1,8 @@ import { describe, expect, it } from 'vitest' import type { WorktreeLineage } from '../../../../../../shared/worktree/lineage-types' import type { Worktree } from '../../../../../../shared/worktree/types' -import { getPinnedSectionWorktrees } from '../../../../../../shared/sidebar-list/pinned-section-worktrees' -import { worktree, repoMap } from './worktree-list-groups-test-fixtures' -import { buildRows } from './build-rows.test-fixture' +import { getPinnedSectionWorktrees } from '../../../../../../shared/sidebar-list/lineage/pinned-section-worktrees' +import { worktree } from './worktree-list-groups-test-fixtures' function makeWorktree(id: string, overrides: Partial = {}): Worktree { return { @@ -68,56 +67,4 @@ describe('getPinnedSectionWorktrees', () => { getPinnedSectionWorktrees([child, sibling], lineageById, map).map((worktree) => worktree.id) ).toEqual([]) }) - - it('handles a deep pinned lineage without overflowing the renderer stack', () => { - const depth = 6_000 - const worktrees: Worktree[] = [] - const lineageById: Record = {} - for (let index = 0; index < depth; index++) { - const current = makeWorktree(`deep-${index}`, { isPinned: index === 0 }) - worktrees.push(current) - const parent = worktrees[index - 1] - if (parent) { - lineageById[current.id] = makeLineage(current, parent) - } - } - - expect( - getPinnedSectionWorktrees( - worktrees, - lineageById, - new Map(worktrees.map((worktree) => [worktree.id, worktree])) - ) - ).toHaveLength(depth) - }) - - it('builds rows for a deep expanded pinned lineage without overflowing the renderer stack', () => { - const depth = 6_000 - const worktrees: Worktree[] = [] - const lineageById: Record = {} - for (let index = 0; index < depth; index++) { - const current = makeWorktree(`rendered-deep-${index}`, { isPinned: true }) - worktrees.push(current) - const parent = worktrees[index - 1] - if (parent) { - lineageById[current.id] = makeLineage(current, parent) - } - } - - const rows = buildRows( - 'none', - worktrees, - repoMap, - null, - new Set(), - undefined, - undefined, - undefined, - lineageById, - new Map(worktrees.map((worktree) => [worktree.id, worktree])), - true - ) - - expect(rows.filter((row) => row.type === 'item')).toHaveLength(depth) - }) }) diff --git a/src/renderer/src/components/sidebar/worktree-list/grouping/pr-group-key.ts b/src/renderer/src/components/sidebar/worktree-list/grouping/pr-group-key.ts index 1f3ff05d1cc..86c1898af58 100644 --- a/src/renderer/src/components/sidebar/worktree-list/grouping/pr-group-key.ts +++ b/src/renderer/src/components/sidebar/worktree-list/grouping/pr-group-key.ts @@ -6,7 +6,7 @@ import { prGroupOfReviewFact, readWorkspaceReviewFact, type PRCacheView -} from '../../../../../../shared/sidebar-list/workspace-review-facts' +} from '../../../../../../shared/sidebar-list/feed-facts/workspace-review-facts' export function getPRGroupKey( worktree: Worktree, diff --git a/src/renderer/src/components/sidebar/worktree-list/grouping/recent-project-rank-scan-budget.test.ts b/src/renderer/src/components/sidebar/worktree-list/grouping/recent-project-rank-scan-budget.test.ts index 27f844e3cc9..8a92e8d5700 100644 --- a/src/renderer/src/components/sidebar/worktree-list/grouping/recent-project-rank-scan-budget.test.ts +++ b/src/renderer/src/components/sidebar/worktree-list/grouping/recent-project-rank-scan-budget.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' import { sortProjectEntries } from '../../../../../../shared/project-section-order' -import type { OrderedGroupEntry } from '../../../../../../shared/sidebar-list/worktree-group-entry' +import type { OrderedGroupEntry } from '../../../../../../shared/sidebar-list/sections/worktree-group-entry' import { repo, worktree } from './worktree-list-groups-test-fixtures' function entry( diff --git a/src/renderer/src/components/sidebar/worktree-list/grouping/worktree-lineage-projection.test.ts b/src/renderer/src/components/sidebar/worktree-list/grouping/worktree-lineage-projection.test.ts index ed31d24bb15..75e1741d30c 100644 --- a/src/renderer/src/components/sidebar/worktree-list/grouping/worktree-lineage-projection.test.ts +++ b/src/renderer/src/components/sidebar/worktree-list/grouping/worktree-lineage-projection.test.ts @@ -3,9 +3,8 @@ import type { WorktreeLineage } from '../../../../../../shared/worktree/lineage- import type { Worktree } from '../../../../../../shared/worktree/types' import { getCyclicProjectedWorktreeLineageIds, - getLineageRenderInfo, getProjectedWorktreeLineageChildrenByParentId -} from '../../../../../../shared/sidebar-list/worktree-lineage-projection' +} from '../../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' function makeWorktree(id: string): Worktree { return { @@ -46,9 +45,6 @@ function buildFixture(childCount: number): { describe('worktree lineage projection cache', () => { it('reflects a removed lineage edge as soon as the record is replaced', () => { const { lineageById, worktreeMap } = buildFixture(2) - expect( - getProjectedWorktreeLineageChildrenByParentId(lineageById, worktreeMap).get('root') - ).toHaveLength(2) const withoutFirstChild = { ...lineageById } delete withoutFirstChild['child-0'] @@ -57,14 +53,6 @@ describe('worktree lineage projection cache', () => { worktreeMap ) expect(reprojected.get('root')?.map((worktree) => worktree.id)).toEqual(['child-1']) - expect( - getLineageRenderInfo( - worktreeMap.get('child-0') as Worktree, - withoutFirstChild, - worktreeMap, - getCyclicProjectedWorktreeLineageIds(withoutFirstChild, worktreeMap) - ).state - ).toBe('none') }) it('still reports cycles from the cached scan', () => { @@ -78,7 +66,5 @@ describe('worktree lineage projection cache', () => { } const cyclic = getCyclicProjectedWorktreeLineageIds(lineageById, worktreeMap) expect([...cyclic].sort()).toEqual(['a', 'b']) - expect(getCyclicProjectedWorktreeLineageIds(lineageById, worktreeMap)).toBe(cyclic) - expect(getProjectedWorktreeLineageChildrenByParentId(lineageById, worktreeMap).size).toBe(0) }) }) diff --git a/src/renderer/src/components/sidebar/worktree-list/grouping/worktree-list-groups-lineage-nesting.test.ts b/src/renderer/src/components/sidebar/worktree-list/grouping/worktree-list-groups-lineage-nesting.test.ts index 00118d07ea6..65da43a0443 100644 --- a/src/renderer/src/components/sidebar/worktree-list/grouping/worktree-list-groups-lineage-nesting.test.ts +++ b/src/renderer/src/components/sidebar/worktree-list/grouping/worktree-list-groups-lineage-nesting.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' import { buildRows } from './build-rows.test-fixture' -import { getWorktreeLineageGroupKey } from '../../../../../../shared/sidebar-list/group-keys' +import { getWorktreeLineageGroupKey } from '../../../../../../shared/sidebar-list/sections/group-keys' import { worktree, repoMap } from './worktree-list-groups-test-fixtures' import type { WorktreeLineage } from '../../../../../../shared/worktree/lineage-types' diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.tsx b/src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.tsx index 9a95f34ede5..f298d51b75b 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.tsx +++ b/src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.tsx @@ -21,7 +21,7 @@ import { getPinnedWorktreeDisplayPolicy } from '../../../../../../shared/sidebar import { getProjectGroupHeaderKey, isProjectSectionGroupKey -} from '../../../../../../shared/sidebar-list/group-keys' +} from '../../../../../../shared/sidebar-list/sections/group-keys' import { selectWorktreeListReviewCacheInputs } from './review-cache-inputs' import type { VirtualizedScrollAnchor } from '@/hooks/useVirtualizedScrollAnchor' import { SidebarWorktreeListDialogs } from '../rows/ProjectGroupDialogs' diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/compute-visible-worktrees.ts b/src/renderer/src/components/sidebar/worktree-list/listing/compute-visible-worktrees.ts index 5f2e1d6a471..a1fa014ec34 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/compute-visible-worktrees.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/compute-visible-worktrees.ts @@ -6,8 +6,8 @@ import type { Worktree } from '../../../../../../shared/worktree/types' import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' import type { ExecutionHostId, ExecutionHostScope } from '../../../../../../shared/execution-host' import { getIndexedAllWorktrees } from '@/store/slices/worktrees/listing/worktree-catalog-index' -import { selectVisibleSidebarWorktrees } from '../../../../../../shared/sidebar-list/visible-worktrees' -import type { SidebarLineageParentIdentities } from '../../../../../../shared/sidebar-list/worktree-lineage-projection' +import { selectVisibleSidebarWorktrees } from '../../../../../../shared/sidebar-list/selection/visible-worktrees' +import type { SidebarLineageParentIdentities } from '../../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' import { buildDesktopWorkspaceRowFactReader } from './desktop-workspace-row-facts' import { sidebarWorkspaceRowFilters } from '../controls/sidebar-filter-actions' import { getLineageAncestorIndex, getSortedWorktreeRankIndex } from './visible-worktree-indexes' diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/folder-path-status-routing.ts b/src/renderer/src/components/sidebar/worktree-list/listing/folder-path-status-routing.ts index 6587aaf8a72..08d955ef67e 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/folder-path-status-routing.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/folder-path-status-routing.ts @@ -7,7 +7,7 @@ import { import type { FolderWorkspacePathStatusRequest } from '../../../../../../shared/folder-workspaces/folder-workspace-path-status' import type { FolderWorkspace } from '../../../../../../shared/folder-workspaces/folder-workspace-types' import type { ProjectGroup } from '../../../../../../shared/project-group-types' -import { getFolderWorkspaceExecutionHostIdForRows } from '../../../../../../shared/sidebar-list/host-filtering' +import { getFolderWorkspaceExecutionHostIdForRows } from '../../../../../../shared/sidebar-list/hosts/host-filtering' export function getRuntimeEnvironmentIdForFolderPathStatusHost( hostId: ExecutionHostId diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/natural-worktree-keys.ts b/src/renderer/src/components/sidebar/worktree-list/listing/natural-worktree-keys.ts index 6ece029d6eb..6587c476ba8 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/natural-worktree-keys.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/natural-worktree-keys.ts @@ -1,4 +1,4 @@ -import { PINNED_GROUP_KEY } from '../../../../../../shared/sidebar-list/group-keys' +import { PINNED_GROUP_KEY } from '../../../../../../shared/sidebar-list/sections/group-keys' import { composeWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' import type { ExecutionHostId } from '../../../../../../shared/execution-host' diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/project-collapse-all.ts b/src/renderer/src/components/sidebar/worktree-list/listing/project-collapse-all.ts index e0b1207575a..1ff844f65bd 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/project-collapse-all.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/project-collapse-all.ts @@ -1,5 +1,5 @@ -import { isProjectOrPinnedSectionGroupKey } from '../../../../../../shared/sidebar-list/group-keys' -import type { HostSectionRow } from '../../../../../../shared/sidebar-list/host-section-rows' +import { isProjectOrPinnedSectionGroupKey } from '../../../../../../shared/sidebar-list/sections/group-keys' +import type { HostSectionRow } from '../../../../../../shared/sidebar-list/hosts/host-section-rows' export function getRenderedProjectCollapseKeys(rows: readonly HostSectionRow[]): string[] { const keys = new Set() diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/render-row.ts b/src/renderer/src/components/sidebar/worktree-list/listing/render-row.ts index 03f59c77c23..a8097639c57 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/render-row.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/render-row.ts @@ -1,4 +1,4 @@ -import type { HostSectionRow } from '../../../../../../shared/sidebar-list/host-section-rows' +import type { HostSectionRow } from '../../../../../../shared/sidebar-list/hosts/host-section-rows' export type RenderRow = HostSectionRow diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/renderable-rows.ts b/src/renderer/src/components/sidebar/worktree-list/listing/renderable-rows.ts index 93e34f26670..a76eca4f073 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/renderable-rows.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/renderable-rows.ts @@ -1,5 +1,5 @@ -import { PINNED_GROUP_KEY } from '../../../../../../shared/sidebar-list/group-keys' -import type { HostSectionRow } from '../../../../../../shared/sidebar-list/host-section-rows' +import { PINNED_GROUP_KEY } from '../../../../../../shared/sidebar-list/sections/group-keys' +import type { HostSectionRow } from '../../../../../../shared/sidebar-list/hosts/host-section-rows' import type { RenderRow } from './render-row' export type WorktreeItemRow = Extract diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/rendered-row-keys.ts b/src/renderer/src/components/sidebar/worktree-list/listing/rendered-row-keys.ts index 4eb00bdf323..05ac72ed25d 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/rendered-row-keys.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/rendered-row-keys.ts @@ -1,6 +1,6 @@ import { getFolderWorkspaceHostIdentity } from '../../../../../../shared/folder-workspaces/folder-workspace-worktree' import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope' -import type { HostSectionRow } from '../../../../../../shared/sidebar-list/host-section-rows' +import type { HostSectionRow } from '../../../../../../shared/sidebar-list/hosts/host-section-rows' export function collectRenderedSidebarRowKeys(sectionRows: readonly HostSectionRow[]): Set { const keys = new Set() diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/rendered-sidebar-worktree-order.ts b/src/renderer/src/components/sidebar/worktree-list/listing/rendered-sidebar-worktree-order.ts index b5472ae4925..53e696672d4 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/rendered-sidebar-worktree-order.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/rendered-sidebar-worktree-order.ts @@ -25,8 +25,8 @@ import { import { addHostSectionRows, type HostSectionRow -} from '../../../../../../shared/sidebar-list/host-section-rows' -import { orderHostSectionOptions } from '../../../../../../shared/sidebar-list/host-section-order' +} from '../../../../../../shared/sidebar-list/hosts/host-section-rows' +import { orderHostSectionOptions } from '../../../../../../shared/sidebar-list/hosts/host-section-order' import { buildSidebarHostOptions } from '../controls/sidebar-host-options' import { getLogicalRepoOrderRankById } from '../../../../../../shared/project-section-order' import { getRenderedWorktreesInSidebarOrder } from '../navigation/worktree-sidebar-row-preference' @@ -35,7 +35,7 @@ import { filterFolderWorkspacesForVisibleHosts, filterProjectGroupsForVisibleHosts, getVisibleSidebarHostIdSet -} from '../../../../../../shared/sidebar-list/host-filtering' +} from '../../../../../../shared/sidebar-list/hosts/host-filtering' import { selectWorkspaceBoardStatuses } from '@/store/workspaces/status/host-workspace-status-columns' const EMPTY_REPO_ID_SET: ReadonlySet = Object.freeze(new Set()) diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/sidebar-list-model.ts b/src/renderer/src/components/sidebar/worktree-list/listing/sidebar-list-model.ts index 9729bbdb5d7..5fc65bbefbf 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/sidebar-list-model.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/sidebar-list-model.ts @@ -11,7 +11,7 @@ import type { PinnedWorktreeDisplayPolicy, WorktreeGroupBy } from '../../../../../../shared/sidebar-list/row-types' -import type { SortBy } from '../../../../../../shared/sidebar-list/smart-sort' +import type { WorkspaceSortBy as SortBy } from '../../../../../../shared/workspace-view/workspace-row-sort' import type { WorkspaceStatusDefinition, Worktree } from '../../../../../../shared/worktree/types' import type { WorktreeLineage } from '../../../../../../shared/worktree/lineage-types' import type { SidebarWorktreeFilters } from './use-filters' diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-empty-project-placeholders.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-empty-project-placeholders.ts index a14d165390a..c16563d7e68 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-empty-project-placeholders.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-empty-project-placeholders.ts @@ -3,7 +3,7 @@ import { useAppStore } from '@/store/index' import type { ExecutionHostId } from '../../../../../../shared/execution-host' import { indexHiddenProjects } from '../../../../../../shared/hidden-projects' import type { Repo } from '../../../../../../shared/repo-types' -import { getEmptyProjectPlaceholderRepoIds } from '../../../../../../shared/sidebar-list/empty-project-placeholder-repos' +import { getEmptyProjectPlaceholderRepoIds } from '../../../../../../shared/sidebar-list/catalog/empty-project-placeholder-repos' import type { WorktreeGroupBy } from '../../../../../../shared/sidebar-list/row-types' import type { Worktree } from '../../../../../../shared/worktree/types' import { diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-filters.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-filters.ts index bdea0807225..ad41020fad9 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-filters.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-filters.ts @@ -27,7 +27,7 @@ import { isDefaultBranchWorkspace, isDetachedHeadWorkspace } from '../../../../../../shared/worktree/visibility/workspace-kinds' -import { getFolderWorkspaceExecutionHostIdForRows } from '../../../../../../shared/sidebar-list/host-filtering' +import { getFolderWorkspaceExecutionHostIdForRows } from '../../../../../../shared/sidebar-list/hosts/host-filtering' import { getPairedDeviceIdsByEnvironment, isWorkspaceOwnedBySomeoneElse diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-host-visible-scope.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-host-visible-scope.ts index b43fa295299..2a609a7e643 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-host-visible-scope.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-host-visible-scope.ts @@ -12,7 +12,7 @@ import { filterFolderWorkspacesForVisibleHosts, filterProjectGroupsForVisibleHosts, getVisibleSidebarHostIdSet -} from '../../../../../../shared/sidebar-list/host-filtering' +} from '../../../../../../shared/sidebar-list/hosts/host-filtering' // Apply host/device scope consistently to repos, project groups and folder workspaces. export function useSidebarHostVisibleScope(args: { diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-main-list-model.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-main-list-model.ts index 7963efd609e..7ac25530de7 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-main-list-model.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-main-list-model.ts @@ -31,17 +31,17 @@ import { planSidebarFeedRows, renderSidebarFeedRows, type SidebarFeedView -} from '../../../../../../shared/sidebar-list/sidebar-feed-rows' +} from '../../../../../../shared/sidebar-list/feed/sidebar-feed-rows' import { indexSidebarFeed, rankSidebarFeedWorktrees -} from '../../../../../../shared/sidebar-list/sidebar-feed-index' +} from '../../../../../../shared/sidebar-list/feed/sidebar-feed-index' import { filterReposForVisibleHosts, getVisibleSidebarHostIdSet -} from '../../../../../../shared/sidebar-list/host-filtering' -import { mergeDraggedHostSectionOrder } from '../../../../../../shared/sidebar-list/host-section-order' -import type { HostSectionRow } from '../../../../../../shared/sidebar-list/host-section-rows' +} from '../../../../../../shared/sidebar-list/hosts/host-filtering' +import { mergeDraggedHostSectionOrder } from '../../../../../../shared/sidebar-list/hosts/host-section-order' +import type { HostSectionRow } from '../../../../../../shared/sidebar-list/hosts/host-section-rows' import type { Worktree } from '../../../../../../shared/worktree/types' import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' import { sidebarWorkspaceRowFilters } from '../controls/sidebar-filter-actions' diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-order-hold.test.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-order-hold.test.ts index f02c9909982..5a9cda7a0a6 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-order-hold.test.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-order-hold.test.ts @@ -1,7 +1,7 @@ // @vitest-environment happy-dom import { afterEach, describe, expect, it, vi } from 'vitest' import { act, cleanup, renderHook } from '@testing-library/react' -import type { SortBy } from '../../../../../../shared/sidebar-list/smart-sort' +import type { WorkspaceSortBy as SortBy } from '../../../../../../shared/workspace-view/workspace-row-sort' import { useOrderHeldWhileEngaged } from './use-order-hold' vi.mock('../../../../../../shared/sidebar-inputs-switch', () => ({ diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-order-hold.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-order-hold.ts index aa6e1fa7027..a4eef8ba244 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-order-hold.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-order-hold.ts @@ -3,8 +3,8 @@ import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../../../shared/sidebar-in import { withHeldProjectRecency, type SidebarFeedIndex -} from '../../../../../../shared/sidebar-list/sidebar-feed-index' -import type { SortBy } from '../../../../../../shared/sidebar-list/smart-sort' +} from '../../../../../../shared/sidebar-list/feed/sidebar-feed-index' +import type { WorkspaceSortBy as SortBy } from '../../../../../../shared/workspace-view/workspace-row-sort' import type { ProjectOrderBy } from '../../../../../../shared/ui-chrome-types' import { mergeHeldOrder } from './held-order' diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-section-rows.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-section-rows.ts index 8a397048f97..3a2c0ea0367 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-section-rows.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-section-rows.ts @@ -14,7 +14,7 @@ import { } from '../../../../../../shared/execution-host' import { getHostDisplayLabelOverrides } from '../../../../../../shared/host-setting-overrides' import { planSidebarRows } from '../../../../../../shared/sidebar-list/sidebar-row-plan' -import { createHostScopedRepoOf } from '../../../../../../shared/sidebar-list/sidebar-feed-index' +import { createHostScopedRepoOf } from '../../../../../../shared/sidebar-list/feed/sidebar-feed-index' import { createSidebarPRGroupReader } from '../grouping/pr-group-key' import { useEffectiveCollapsedGroups } from './use-collapsed-groups' import type { Row } from '../../../../../../shared/sidebar-list/row-types' @@ -24,13 +24,13 @@ import { useEmptyProjectPlaceholderRepoIds } from './use-empty-project-placehold import { deferHostSectionCollapse, scopeHostSectionCollapse -} from '../../../../../../shared/sidebar-list/host-section-collapse' -import { addHostSectionRows } from '../../../../../../shared/sidebar-list/host-section-rows' +} from '../../../../../../shared/sidebar-list/hosts/host-section-collapse' +import { addHostSectionRows } from '../../../../../../shared/sidebar-list/hosts/host-section-rows' import { collectRenderedSidebarRowKeys } from './rendered-row-keys' import { mergeDraggedHostSectionOrder, orderHostSectionOptions -} from '../../../../../../shared/sidebar-list/host-section-order' +} from '../../../../../../shared/sidebar-list/hosts/host-section-order' import type { ExecutionHostRegistryEntry } from '../../../../../../shared/execution-host/execution-host-registry-entry' import { type SidebarHostOption, diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-sleeping-sweep-retention.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-sleeping-sweep-retention.ts index acf6c54f089..bd3eacc08ae 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-sleeping-sweep-retention.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-sleeping-sweep-retention.ts @@ -7,7 +7,7 @@ import { cloneSleepingSweepRetentionState, createSleepingSweepRetentionState, updateSleepingSweepRetention -} from '../../../../../../shared/sidebar-list/sleeping-sweep-retention' +} from '../../../../../../shared/sidebar-list/selection/sleeping-sweep-retention' import type { Worktree } from '../../../../../../shared/worktree/types' import type { VisibleWorktreeOptions } from './compute-visible-worktrees' diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.test.tsx b/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.test.tsx deleted file mode 100644 index 1ccd5bf9e79..00000000000 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.test.tsx +++ /dev/null @@ -1,169 +0,0 @@ -// @vitest-environment happy-dom - -import { StrictMode, createElement } from 'react' -import { flushSync } from 'react-dom' -import { createRoot } from 'react-dom/client' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { act, cleanup, renderHook } from '@testing-library/react' -import { useAppStore } from '@/store' -import type { Worktree } from '../../../../../../shared/worktree/types' -import { makeRepo, makeWorktree } from '../../../worktree-jump/worktree-jump-palette-test-fixtures' -import type { SortBy } from '../../../../../../shared/sidebar-list/smart-sort' -import { useSidebarWorktreeSortOrder } from './use-sort-order' -import { - composeWorktreeHostIdentity, - getWorktreeHostIdentity -} from '../../../../../../shared/worktree/host-qualified-identity' -import { makeTerminalTab } from '../../../../store/terminals/terminal-row.test-fixture' - -// The sort ranks each card by host identity; these rows carry no host. -const key = (id: string): string => composeWorktreeHostIdentity(undefined, id) -const keys = (...ids: string[]): string[] => ids.map(key) - -const initialState = useAppStore.getInitialState() -const repo = makeRepo() -const repoMap = new Map([[repo.id, repo]]) - -// Why a settled bump: the store's add/remove baseline is the row count at the last sortEpoch change. -function seed(worktrees: Worktree[], sortBy: SortBy): void { - useAppStore.setState({ - sortBy, - sortEpoch: 1, - settledSortEpoch: 1, - worktreesByRepo: { [repo.id]: worktrees } - }) -} - -function bumpSortEpoch(): void { - useAppStore.setState((s) => ({ sortEpoch: s.sortEpoch + 1 })) -} - -function replaceWorktrees(worktrees: Worktree[]): void { - useAppStore.setState((s) => ({ - worktreesByRepo: { [repo.id]: worktrees }, - sortEpoch: s.sortEpoch + 1 - })) -} - -// Same shape as another client's order save landing here: sortOrder changes, sortEpoch does not. -function publishSortOrders(sortOrderById: Record): void { - useAppStore.setState((s) => ({ - worktreesByRepo: { - [repo.id]: (s.worktreesByRepo[repo.id] ?? []).map((worktree) => ({ - ...worktree, - sortOrder: sortOrderById[worktree.id] ?? worktree.sortOrder - })) - }, - sortOrderEpoch: s.sortOrderEpoch + 1 - })) -} - -function renderSortOrder(options?: { strict?: boolean }) { - const renders = { count: 0 } - const hook = renderHook( - () => { - renders.count += 1 - const sortBy = useAppStore((s) => s.sortBy) - return useSidebarWorktreeSortOrder({ repoMap, sortBy }) - }, - { wrapper: options?.strict ? StrictMode : undefined } - ) - return { ...hook, renders } -} - -function renderSortOrderOutsideAct(sortBy: SortBy) { - const errors: unknown[] = [] - const latest: { ids: string[] } = { ids: [] } - const previousActEnvironment = globalThis.IS_REACT_ACT_ENVIRONMENT - globalThis.IS_REACT_ACT_ENVIRONMENT = false - const root = createRoot(document.createElement('div'), { - onUncaughtError: (error) => errors.push(error), - onCaughtError: (error) => errors.push(error) - }) - function Probe(): null { - latest.ids = useSidebarWorktreeSortOrder({ repoMap, sortBy }) - return null - } - flushSync(() => root.render(createElement(Probe))) - return { - errors, - latest, - unmount: () => { - root.unmount() - globalThis.IS_REACT_ACT_ENVIRONMENT = previousActEnvironment - } - } -} - -describe('useSidebarWorktreeSortOrder', () => { - beforeEach(() => { - useAppStore.setState(initialState, true) - }) - - afterEach(() => { - cleanup() - vi.useRealTimers() - useAppStore.setState(initialState, true) - }) - - it('survives 80 synchronous bumps in Recent while worktrees are added, then settles in order', () => { - vi.useFakeTimers() - let worktrees = [makeWorktree('w0', 'W0', { lastActivityAt: 0 })] - seed(worktrees, 'recent') - const view = renderSortOrderOutsideAct('recent') - try { - for (let i = 1; i <= 80; i++) { - if (i % 4 === 1) { - // Why newest activity: a structural add must land at its sorted position (first) immediately. - worktrees = [...worktrees, makeWorktree(`w${i}`, `W${i}`, { lastActivityAt: i * 100 })] - flushSync(() => replaceWorktrees(worktrees)) - expect(view.latest.ids[0]).toBe(key(`w${i}`)) - } else { - // Why reversed activity: these bumps reorder rows, so only the settle may apply them. - worktrees = worktrees.map((w, index) => ({ ...w, lastActivityAt: i * 100 - index })) - flushSync(() => replaceWorktrees(worktrees)) - flushSync(() => bumpSortEpoch()) - } - } - expect(view.latest.ids[0]).toBe(key('w77')) - expect(view.errors).toEqual([]) - flushSync(() => vi.advanceTimersByTime(3_000)) - expect(view.errors).toEqual([]) - const expected = [...useAppStore.getState().worktreesByRepo[repo.id]] - .sort((a, b) => b.lastActivityAt - a.lastActivityAt) - .map(getWorktreeHostIdentity) - expect(view.latest.ids).toEqual(expected) - expect(view.latest.ids[0]).toBe(key('w0')) - expect(vi.getTimerCount()).toBe(0) - } finally { - view.unmount() - } - }) - - it('keeps Smart latched after its live signal ends, until the list unmounts', () => { - vi.stubGlobal('api', { worktrees: { persistSortOrder: vi.fn(async () => ({ updated: 0 })) } }) - try { - seed( - [makeWorktree('a', 'A', { sortOrder: 2 }), makeWorktree('b', 'B', { sortOrder: 1 })], - 'smart' - ) - useAppStore.setState({ - tabsByWorktree: { a: [makeTerminalTab({ id: 'tab-a', worktreeId: 'a' })] }, - ptyIdsByTabId: { 'tab-a': ['pty-a'] } - }) - const latched = renderSortOrder() - act(() => useAppStore.setState({ ptyIdsByTabId: {} })) - const before = latched.result.current - act(() => publishSortOrders({ a: 1, b: 2 })) - expect(latched.result.current).toBe(before) - latched.unmount() - - const cold = renderSortOrder() - expect(cold.result.current).toEqual(keys('b', 'a')) - act(() => publishSortOrders({ a: 3 })) - expect(cold.result.current).toEqual(keys('a', 'b')) - } finally { - vi.unstubAllGlobals() - } - }) -}) diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.ts index 15a7cfe4c24..026779f5992 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.ts @@ -5,13 +5,13 @@ import { persistWorktreeSortOrderByHost } from '@/lib/workspace/persistence/work import type { Repo } from '../../../../../../shared/repo-types' import { NO_LIVE_SMART_SORT_SOURCES, - rankWorktreesForSort, - type SortBy -} from '../../../../../../shared/sidebar-list/smart-sort' + rankWorktreesForSort +} from '../../../../../../shared/sidebar-list/sorting/smart-sort' +import type { WorkspaceSortBy as SortBy } from '../../../../../../shared/workspace-view/workspace-row-sort' import { ranksFollowPersistedOrder, smartSortPhase -} from '../../../../../../shared/sidebar-list/smart-sort-phase' +} from '../../../../../../shared/sidebar-list/sorting/smart-sort-phase' import { useReusedArrayIdentity } from './use-reused-array-identity' import { useSidebarListSession } from '@/components/sidebar/sidebar-feed/sidebar-list-session' import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../../../shared/sidebar-inputs-switch' diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees-retention.test.tsx b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees-retention.test.tsx index 4d1f4ee31de..5d5cc888837 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees-retention.test.tsx +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees-retention.test.tsx @@ -10,7 +10,7 @@ import { makeTerminalTab, makeWorktree } from '../../../worktree-jump/worktree-jump-palette-test-fixtures' -import '../../../../../../shared/sidebar-list/sleeping-sweep-retention' +import '../../../../../../shared/sidebar-list/selection/sleeping-sweep-retention' import { forgetWorktreeSleepIntent, markWorktreeSleepIntent diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts index 853016ebc9b..302613e6a99 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts @@ -20,7 +20,7 @@ import { getVisibleWorktreeTerminalActivityTabs, getStructuredChatWorktreeIds } from './visible-worktree-activity-inputs' -import type { SortBy } from '../../../../../../shared/sidebar-list/smart-sort' +import type { WorkspaceSortBy as SortBy } from '../../../../../../shared/workspace-view/workspace-row-sort' import type { SidebarWorktreeFilters } from './use-filters' import { useReusedArrayIdentity } from './use-reused-array-identity' import { useSleepingSweepRetention } from './use-sleeping-sweep-retention' diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/visible-worktrees.ts b/src/renderer/src/components/sidebar/worktree-list/listing/visible-worktrees.ts index a5f0dfb5adc..8e3d8519bf3 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/visible-worktrees.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/visible-worktrees.ts @@ -10,7 +10,7 @@ import type { Worktree } from '../../../../../../shared/worktree/types' import { buildWorktreeComparator, sortWorktreesSmart -} from '../../../../../../shared/sidebar-list/smart-sort' +} from '../../../../../../shared/sidebar-list/sorting/smart-sort' import './visible-worktree-activity-inputs' import { buildVisibleWorktreeOptionsFromState } from './visible-worktree-options-from-state' import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields' diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/window-worktree-creations.ts b/src/renderer/src/components/sidebar/worktree-list/listing/window-worktree-creations.ts index d29b3562ffd..b66e9c47a23 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/window-worktree-creations.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/window-worktree-creations.ts @@ -1,4 +1,4 @@ -import type { SidebarFeedDomains } from '../../../../../../shared/sidebar-list/sidebar-feed-domains' +import type { SidebarFeedDomains } from '../../../../../../shared/sidebar-list/feed/sidebar-feed-domains' /** Combine main’s shared creations with window-only preflight/server work and exclude locally completed requests. */ export function withWindowCreations( diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/worktree-sort-label-ordering.test.ts b/src/renderer/src/components/sidebar/worktree-list/listing/worktree-sort-label-ordering.test.ts index 75550c59a6d..fd1e07f1149 100644 --- a/src/renderer/src/components/sidebar/worktree-list/listing/worktree-sort-label-ordering.test.ts +++ b/src/renderer/src/components/sidebar/worktree-list/listing/worktree-sort-label-ordering.test.ts @@ -3,7 +3,7 @@ import type { Worktree } from '../../../../../../shared/worktree/types' import { buildWorktreeSortLabels, compareWorktreeSortLabel -} from '../../../../../../shared/sidebar-list/smart-sort' +} from '../../../../../../shared/sidebar-list/sorting/smart-sort' /** The comparator with labels derived per comparison instead of precomputed. */ diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/folder-reveal.ts b/src/renderer/src/components/sidebar/worktree-list/navigation/folder-reveal.ts index 9ee353c6245..dda4dbf3bcb 100644 --- a/src/renderer/src/components/sidebar/worktree-list/navigation/folder-reveal.ts +++ b/src/renderer/src/components/sidebar/worktree-list/navigation/folder-reveal.ts @@ -13,15 +13,15 @@ import { composeWorktreeHostIdentity, getExecutionHostIdFromWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' -import { getProjectGroupHeaderKey } from '../../../../../../shared/sidebar-list/group-keys' +import { getProjectGroupHeaderKey } from '../../../../../../shared/sidebar-list/sections/group-keys' import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../../../shared/execution-host' -import { getFolderWorkspaceLaneKey } from '../../../../../../shared/sidebar-list/folder-workspace-lanes' +import { getFolderWorkspaceLaneKey } from '../../../../../../shared/sidebar-list/folders/folder-workspace-lanes' import type { WorktreeGroupBy } from '../../../../../../shared/sidebar-list/row-types' -import { getFolderWorkspaceHostId } from '../../../../../../shared/sidebar-list/folder-workspace-host-id' -import { getHostSectionCollapseKey } from '../../../../../../shared/sidebar-list/host-section-collapse' +import { getFolderWorkspaceHostId } from '../../../../../../shared/sidebar-list/hosts/folder-workspace-host-id' +import { getHostSectionCollapseKey } from '../../../../../../shared/sidebar-list/hosts/host-section-collapse' function findFolderWorkspaceByKey( worktreeId: string, diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/pending-reveal-inputs.ts b/src/renderer/src/components/sidebar/worktree-list/navigation/pending-reveal-inputs.ts index 678c6c59e91..7e0ce2acbc7 100644 --- a/src/renderer/src/components/sidebar/worktree-list/navigation/pending-reveal-inputs.ts +++ b/src/renderer/src/components/sidebar/worktree-list/navigation/pending-reveal-inputs.ts @@ -14,7 +14,7 @@ import type { ProjectGroup } from '../../../../../../shared/project-group-types' import type { Repo } from '../../../../../../shared/repo-types' import type { WorkspaceStatusDefinition, Worktree } from '../../../../../../shared/worktree/types' import type { WorktreeLineage } from '../../../../../../shared/worktree/lineage-types' -import type { SidebarLineageParentIdentities } from '../../../../../../shared/sidebar-list/worktree-lineage-projection' +import type { SidebarLineageParentIdentities } from '../../../../../../shared/sidebar-list/lineage/worktree-lineage-projection' import type { ExecutionHostId } from '../../../../../../shared/execution-host' import type { RenderRow } from '../listing/render-row' import type { ProjectGroupingModel } from '../../../../../../shared/project-section-grouping' diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/reveal-ancestors.ts b/src/renderer/src/components/sidebar/worktree-list/navigation/reveal-ancestors.ts index 2220d38d4d7..0a7e40bf67c 100644 --- a/src/renderer/src/components/sidebar/worktree-list/navigation/reveal-ancestors.ts +++ b/src/renderer/src/components/sidebar/worktree-list/navigation/reveal-ancestors.ts @@ -1,6 +1,6 @@ import type { ProjectGroup } from '../../../../../../shared/project-group-types' import type { Repo } from '../../../../../../shared/repo-types' -import { getProjectGroupHeaderKey } from '../../../../../../shared/sidebar-list/group-keys' +import { getProjectGroupHeaderKey } from '../../../../../../shared/sidebar-list/sections/group-keys' import type { ProjectGroupingModel } from '../../../../../../shared/project-section-grouping' function getProjectIdFromHeaderRowKey(rowKey: string): string | null { diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/sidebar-workspace-delete.test.tsx b/src/renderer/src/components/sidebar/worktree-list/navigation/sidebar-workspace-delete.test.tsx index eea7065429c..ce6aad4683e 100644 --- a/src/renderer/src/components/sidebar/worktree-list/navigation/sidebar-workspace-delete.test.tsx +++ b/src/renderer/src/components/sidebar/worktree-list/navigation/sidebar-workspace-delete.test.tsx @@ -1,156 +1,22 @@ -// @vitest-environment happy-dom -import { act, useRef } from 'react' -import { createRoot, type Root } from 'react-dom/client' -import { afterEach, beforeEach, expect, it, vi } from 'vitest' +import { beforeEach, expect, it, vi } from 'vitest' import { useStore } from 'zustand' import { createUIStore } from '@/store/slices/ui/ui-slice-test-harness' import type { AppState } from '@/store/types' -import { useSidebarWorktreeSelection } from './use-selection' -import { useWorktreeListKeyboardNavigation } from './use-keyboard' -import { resolveSidebarWorkspaceDeleteIntent } from './sidebar-workspace-delete' -import { getActiveDescendantOptionId } from './active-descendant-option' -import { buildRenderableRows } from '../listing/renderable-rows' -import type { HostSectionRow } from '../../../../../../shared/sidebar-list/host-section-rows' -import type { Worktree } from '../../../../../../shared/worktree/types' -import type { Repo } from '../../../../../../shared/repo-types' -import { repo, worktree } from '../grouping/worktree-list-groups-test-fixtures' -const deleteOne = vi.hoisted(() => vi.fn()) -const deleteBatch = vi.hoisted(() => vi.fn()) -const deleteFolder = vi.hoisted(() => vi.fn()) -const activate = vi.hoisted(() => vi.fn()) +import { resolveSidebarWorkspaceDeleteIntent } from './sidebar-workspace-delete' + +import { repo, worktree } from '../grouping/worktree-list-groups-test-fixtures' let store: ReturnType vi.mock('@/store', () => ({ useAppStore: Object.assign((selector: (s: AppState) => unknown) => useStore(store, selector), { getState: () => store.getState() }) })) -vi.mock('../../workspace-actions/deletion/delete-worktree-flow', () => ({ - runWorktreeDelete: deleteOne, - runWorktreeBatchDelete: deleteBatch -})) -vi.mock('../../workspace-actions/deletion/folder-workspace-delete', () => ({ - deleteFolderWorkspaceUnlessUnsaved: deleteFolder -})) -vi.mock('@/lib/workspace/activation/sidebar-worktree-activation', () => ({ - activateWorktreeFromSidebar: activate -})) -vi.mock('./use-neighbor-prewarm', () => ({ useWorkspaceNeighborPrewarm: () => {} })) -Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true }) const a = { ...worktree, id: 'a', instanceId: 'inc-a', hostId: 'local' as const } const b = { ...worktree, id: 'b', instanceId: 'inc-b', hostId: 'local' as const } const twin = { ...b, hostId: 'runtime:other' as const, instanceId: 'inc-remote' } -let items: Worktree[] = [a, b, twin] -let root: Root -let container: HTMLDivElement -let list: HTMLDivElement -let rows: HostSectionRow[] -let activeModal: string -let rowRepo: Repo -let selected: ReturnType -const repoMap = new Map([[repo.id, repo]]) -function Probe() { - const scrollRef = useRef(null) - selected = useSidebarWorktreeSelection({ - sectionRows: rows, - pinnedDisplayPolicy: 'single-location' - }) - const navigation = useWorktreeListKeyboardNavigation({ - rows, - activeWorktreeId: 'a', - activeWorkspaceExecutionHostId: 'local', - pinnedDisplayPolicy: 'single-location', - scrollRef, - activeModal, - markDirectScrollInput: () => {}, - onKeyboardSelect: selected.selectWorktree, - focusedWorktree: selected.focusedWorktree, - focusedWorkspaceExecutionHostId: selected.focusedWorkspaceExecutionHostId, - resolveDeleteIntent: () => - resolveSidebarWorkspaceDeleteIntent({ - selectedWorktrees: selected.selectedWorktrees, - focusedWorktree: selected.focusedWorktree, - repoMap - }) - }) - return ( -
-
({ index })) - })} - onKeyDown={navigation.handleContainerKeyDown} - onKeyUp={navigation.handleContainerKeyUp} - onBlur={navigation.handleContainerBlur} - > - {items.map((item) => ( -
selected.updateSelectionForGesture(e, item)} - > - {item.id} -
- ))} - -
-