mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 16:02:32 +00:00
`orca worktree list` returned zero of 24 SSH worktrees at the default limit (#18104). Rows are resolved repo by repo, so every SSH repo's rows land contiguously at the end of the fleet order — the 24 remote rows sat at indices 496-520 of 521 and a plain `slice(0, 200)` never reached them. The omission was not fully silent: text output printed `truncated: showing 200 of 521` and JSON carried `totalCount` / `truncated`. What was missing is that the omission was *categorically every remote host* — no host column, no `hostScope`, nothing to distinguish "200 of 521" from "one host is entirely absent". Per docs/reference/ssh-execution-boundary.md, a listing that does not name its scope reads as absolute. Adopt the mechanism `terminal list` already has rather than inventing a second one: - `RuntimeTerminalListHostScope` becomes an alias of a shared `RuntimeListingHostScope`, now also carried (optional, so old hosts are unaffected) on `worktree.list` and `worktree.ps` results. - `src/shared/host-balanced-listing-page.ts` round-robins the row cap across hosts and returns the survivors in the caller's original relative order, so the page stays a subsequence of the unbounded listing and nothing downstream re-sorts. An uncapped listing is returned unchanged. - `worktree list` / `worktree ps` text output gains a `host=` column and the same trailing `scope:` line `terminal list` prints. Third defect, same mechanism: `hostScope.omittedHostIds` is built from the runtime's own bookkeeping, so it names `runtime:` ids for servers that are no longer paired — 6 of 9 in the recorded QA run hard-error when queried. Since `hostScope` is *the* documented way to complete a partial listing, that makes the mechanism unreliable for its intended use. Annotate rather than filter. Dropping an id would shrink what the listing admits it did not cover, and the boundary doc requires a listing to name its gaps — the gap is real whether or not this machine can name the host that owns it. `src/cli/omitted-host-scope-selectors.ts` resolves each omitted id against this machine's pairing store and the runtime's SSH-target registry and attaches the exact flag that reaches it, or `null` marked "not selectable from this machine". This is a client-side annotation: nothing new goes over the wire, it answers "can I select it" and never "is it up", and the SSH round trip is only paid when an `ssh:` host was actually omitted. No `--host` filter was added; the host column plus scope line covers the reported need without a new selector axis.
159 lines
4.4 KiB
TypeScript
159 lines
4.4 KiB
TypeScript
import type { AgentStatusState, AgentType, AgentWorkingMode } from './agent-status-types'
|
|
import type { BaseRefSearchResult, Repo } from './repo-types'
|
|
import type { CreateWorktreeResult, RemoveWorktreeResult } from './worktree/create-types'
|
|
import type {
|
|
WorkspaceLineage,
|
|
WorktreeLineage,
|
|
WorktreeLineageWarning
|
|
} from './worktree/lineage-types'
|
|
import type { RuntimeListingHostScope } from './runtime-listing-host-scope'
|
|
import type { GitWorktreeInfo, Worktree } from './worktree/types'
|
|
|
|
export type RuntimeWorktreeAgentRow = {
|
|
paneKey: string
|
|
parentPaneKey: string | null
|
|
state: AgentStatusState
|
|
workingMode?: AgentWorkingMode
|
|
agentType: AgentType | null
|
|
prompt: string
|
|
taskTitle: string | null
|
|
displayName: string | null
|
|
lastAssistantMessage: string | null
|
|
toolName: string | null
|
|
toolInput: string | null
|
|
interrupted: boolean
|
|
stateStartedAt: number
|
|
updatedAt: number
|
|
restoredUnconfirmed?: boolean
|
|
}
|
|
|
|
export type RuntimeWorktreePsSummary = {
|
|
workspaceKind?: 'git' | 'folder-workspace'
|
|
worktreeId: string
|
|
repoId: string
|
|
hostId?: Worktree['hostId']
|
|
terminalPlatform?: NodeJS.Platform
|
|
repo: string
|
|
path: string
|
|
branch: string
|
|
isArchived: boolean
|
|
isMainWorktree: boolean
|
|
hasHostSidebarActivity: boolean
|
|
worktreeInstanceId?: string
|
|
lineageWorktreeInstanceId?: string
|
|
parentWorktreeInstanceId?: string
|
|
parentWorktreeId: string | null
|
|
childWorktreeIds: string[]
|
|
displayName: string
|
|
workspaceStatus: string
|
|
sortOrder: number
|
|
manualOrder?: number
|
|
lastActivityAt?: number
|
|
createdAt?: number
|
|
creatorProvenance?: Worktree['creatorProvenance']
|
|
linkedIssue: number | null
|
|
linkedPR: { number: number; state: string } | null
|
|
linkedLinearIssue: string | null
|
|
linkedGitLabMR: number | null
|
|
linkedGitLabIssue: number | null
|
|
comment: string
|
|
isPinned: boolean
|
|
isActive: boolean
|
|
unread: boolean
|
|
liveTerminalCount: number
|
|
hasAttachedPty: boolean
|
|
lastOutputAt: number | null
|
|
preview: string
|
|
status: RuntimeWorktreeStatus
|
|
/** Optional discriminator for a working workspace; older clients fall back to ordinary working. */
|
|
workingMode?: AgentWorkingMode
|
|
agents: RuntimeWorktreeAgentRow[]
|
|
}
|
|
|
|
export type RuntimeGitLocalBranches = {
|
|
current: string | null
|
|
branches: string[]
|
|
}
|
|
|
|
export type RuntimeSpeechModelSummary = {
|
|
id: string
|
|
label: string
|
|
provider: 'local' | 'openai'
|
|
sizeBytes: number | null
|
|
recommended: boolean
|
|
status: 'ready' | 'not-downloaded' | 'downloading' | 'extracting' | 'error'
|
|
progress: number | null
|
|
}
|
|
|
|
export type RuntimeSpeechSetupState = {
|
|
enabled: boolean
|
|
selectedModelId: string
|
|
dictationMode: 'toggle' | 'hold'
|
|
models: RuntimeSpeechModelSummary[]
|
|
}
|
|
|
|
export type RuntimeGitCheckoutResult = {
|
|
ok: true
|
|
branch: string
|
|
}
|
|
|
|
export type RuntimeWorktreeStatus = 'active' | 'working' | 'permission' | 'done' | 'inactive'
|
|
|
|
export type RuntimeWorktreeRecord = Worktree & {
|
|
parentWorktreeId: string | null
|
|
childWorktreeIds: string[]
|
|
lineage: WorktreeLineage | null
|
|
workspaceLineage?: WorkspaceLineage | null
|
|
git: GitWorktreeInfo
|
|
}
|
|
|
|
export type RuntimeWorktreeCreateResult = {
|
|
worktree: RuntimeWorktreeRecord
|
|
lineage: WorktreeLineage | null
|
|
workspaceLineage?: WorkspaceLineage | null
|
|
warnings: WorktreeLineageWarning[]
|
|
warning?: string
|
|
startupTerminal?: CreateWorktreeResult['startupTerminal']
|
|
agentTerminalHandle?: string
|
|
}
|
|
|
|
export type RuntimeWorktreeRemoveResult = RemoveWorktreeResult & {
|
|
removed: boolean
|
|
warning?: string
|
|
}
|
|
|
|
export type RuntimeWorktreePsResult = {
|
|
worktrees: RuntimeWorktreePsSummary[]
|
|
totalCount: number
|
|
truncated: boolean
|
|
/** Absent from hosts that predate the field; treat that scope as unverifiable. */
|
|
hostScope?: RuntimeListingHostScope
|
|
}
|
|
|
|
export type RuntimeWorktreePsSnapshotResult = RuntimeWorktreePsResult & { snapshotId: string }
|
|
|
|
export type RuntimeWorktreePsUnchangedResult = {
|
|
unchanged: true
|
|
snapshotId: string
|
|
}
|
|
|
|
export type RuntimeWorktreePsConditionalResult =
|
|
| RuntimeWorktreePsSnapshotResult
|
|
| RuntimeWorktreePsUnchangedResult
|
|
|
|
export type RuntimeRepoList = { repos: Repo[] }
|
|
|
|
export type RuntimeRepoSearchRefs = {
|
|
refs: string[]
|
|
refDetails?: BaseRefSearchResult[]
|
|
truncated: boolean
|
|
}
|
|
|
|
export type RuntimeWorktreeListResult = {
|
|
worktrees: RuntimeWorktreeRecord[]
|
|
totalCount: number
|
|
truncated: boolean
|
|
/** Absent from hosts that predate the field; treat that scope as unverifiable. */
|
|
hostScope?: RuntimeListingHostScope
|
|
}
|