mirror of
https://github.com/stablyai/orca.git
synced 2026-09-21 16:02:20 +00:00
* fix(remote): keep the host's last assistant message on client-owned agent rows A remote pane has two writers for one agent-status key: this renderer's OSC byte pipeline and the mirrored host session.tabs snapshot. When the client owns the key, buildMirroredAgentStatusPatch keeps the client's entry wholesale and copies only paneKey/worktreeId/tabId/providerSession off the host frame. lastAssistantMessage is hook-only content the byte pipeline can never see, and setAgentStatus writes payload.lastAssistantMessage straight through, so every OSC write also blanks it. The host publishes the text and the client receives it, then discards it on every republication — the remote agent row's message line is permanently empty while identity and status render fine (#12906). Adopt it across the fence the same way providerSession already is, falling back to the mirrored value so a host that stops publishing the field cannot blank a line it already delivered. * refactor: mirror providerSession's coalesce shape and tighten the comment
This commit is contained in:
Brennan Benson
@@ -0,0 +1,422 @@
|
||||
/**
|
||||
* #12906 / STA-3596: on a paired (remote) runtime the sidebar agent row renders
|
||||
* its identity line and its status subtitle, but the last-assistant-message line
|
||||
* below is permanently blank. Local panes show it.
|
||||
*
|
||||
* Causal boundary: buildMirroredAgentStatusPatch in web-session-tabs-sync.ts.
|
||||
* A remote pane has TWO writers for one store key — this renderer's OSC byte
|
||||
* pipeline (pty-connection claims every pane with a runtimeEnvironmentId) and
|
||||
* the mirrored host `session.tabs` snapshot. When the client owns the key the
|
||||
* merge keeps the client's entry wholesale and copies only paneKey/worktreeId/
|
||||
* tabId/providerSession off the host frame. `lastAssistantMessage` is hook-only
|
||||
* content the byte pipeline can never see (setAgentStatus writes
|
||||
* `payload.lastAssistantMessage` straight through, so each OSC write also blanks
|
||||
* it), so the host's text is discarded on every republication.
|
||||
*
|
||||
* Everything runs through the real seams: the real host-snapshot mirror, the
|
||||
* real store, the real sidebar row builder. The oracle is the field both row
|
||||
* renderers read — DashboardAgentRowMessage and the compact row's secondary
|
||||
* line consume `entry.lastAssistantMessage` and nothing else.
|
||||
*/
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-types'
|
||||
import { makePaneKey } from '../../../shared/stable-pane-id'
|
||||
import { toWebTerminalSurfaceTabId } from '../../../shared/terminal-surface-id'
|
||||
import { getDefaultSettings } from '../../../shared/constants'
|
||||
import type { AppState } from '../store/types'
|
||||
import { createTestStore, makeWorktree, seedStore } from '../store/slices/store-test-helpers'
|
||||
import {
|
||||
markRendererOwnedAgentStatusWrite,
|
||||
registerRendererOwnedAgentStatusPane,
|
||||
resetRendererOwnedAgentStatusPanesForTests
|
||||
} from '../components/terminal-pane/renderer-owned-agent-status-registry'
|
||||
import {
|
||||
applyFreshWebSessionTabsSnapshot,
|
||||
resetWebSessionTabsSnapshotFreshnessForTests
|
||||
} from './web-session-tabs-sync'
|
||||
import { buildWorktreeAgentRows } from '../components/sidebar/worktree-agent-rows'
|
||||
import {
|
||||
selectLiveAgentStatusEntriesForWorktree,
|
||||
selectRetainedAgentEntriesForWorktree
|
||||
} from '../components/sidebar/worktree-agent-row-selectors'
|
||||
import {
|
||||
selectLivePtyIdsForWorktree,
|
||||
selectRuntimePaneTitlesForWorktree
|
||||
} from '../components/sidebar/worktree-card-status-inputs'
|
||||
|
||||
// Why: web-session-tabs-sync imports the app-level store singleton; this
|
||||
// harness drives a createTestStore instance instead, like its sibling suites.
|
||||
vi.mock('../store', () => ({
|
||||
useAppStore: {
|
||||
setState: vi.fn(),
|
||||
getState: vi.fn(() => ({})),
|
||||
subscribe: vi.fn(() => () => {})
|
||||
}
|
||||
}))
|
||||
|
||||
const WT = 'repo1::/path/wt1'
|
||||
const ENV = 'remote-env-1'
|
||||
const HOST_EPOCH = 'host-epoch-1'
|
||||
const T0 = 1_700_000_000_000
|
||||
|
||||
/** The pane this renderer streams and therefore claims (pty-connection claims
|
||||
* every pane whose transport has a runtimeEnvironmentId). */
|
||||
const OWNED = {
|
||||
hostTabId: 'host-tab-1',
|
||||
leafId: '11111111-1111-4111-8111-111111111111'
|
||||
} as const
|
||||
/** A pane mirrored from the same host that this renderer never wrote status for,
|
||||
* so the host stays authoritative for it. */
|
||||
const CEDED = {
|
||||
hostTabId: 'host-tab-2',
|
||||
leafId: '22222222-2222-4222-8222-222222222222'
|
||||
} as const
|
||||
|
||||
const HOST_MESSAGE = '좌→우 가로 파이프라인으로 다시 그렸습니다'
|
||||
|
||||
type PaneRef = { hostTabId: string; leafId: string }
|
||||
|
||||
function mirrorTabId(pane: PaneRef): string {
|
||||
return toWebTerminalSurfaceTabId(pane.hostTabId)
|
||||
}
|
||||
|
||||
function mirrorPaneKey(pane: PaneRef): string {
|
||||
return makePaneKey(mirrorTabId(pane), pane.leafId)
|
||||
}
|
||||
|
||||
type HostPaneStatus = {
|
||||
state: 'working' | 'done'
|
||||
/** Omitted entirely for the old-host skew case. */
|
||||
lastAssistantMessage?: string
|
||||
stateStartedAt: number
|
||||
}
|
||||
|
||||
function makeHostSnapshot(args: {
|
||||
snapshotVersion: number
|
||||
hostNow: number
|
||||
statusByHostTabId: Record<string, HostPaneStatus>
|
||||
}): RuntimeMobileSessionTabsResult {
|
||||
const panes: PaneRef[] = [OWNED, CEDED]
|
||||
return {
|
||||
worktree: WT,
|
||||
publicationEpoch: HOST_EPOCH,
|
||||
snapshotVersion: args.snapshotVersion,
|
||||
activeGroupId: 'host-group-1',
|
||||
activeTabId: `${OWNED.hostTabId}::${OWNED.leafId}`,
|
||||
activeTabType: 'terminal',
|
||||
tabs: panes.map((pane, index) => {
|
||||
const status = args.statusByHostTabId[pane.hostTabId]
|
||||
return {
|
||||
type: 'terminal' as const,
|
||||
id: `${pane.hostTabId}::${pane.leafId}`,
|
||||
title: 'Claude Code',
|
||||
parentTabId: pane.hostTabId,
|
||||
leafId: pane.leafId,
|
||||
isActive: index === 0,
|
||||
launchAgent: 'claude' as const,
|
||||
status: 'ready' as const,
|
||||
terminal: `terminal-${index + 1}`,
|
||||
...(status
|
||||
? {
|
||||
agentStatus: {
|
||||
state: status.state,
|
||||
prompt: '',
|
||||
updatedAt: args.hostNow,
|
||||
stateStartedAt: status.stateStartedAt,
|
||||
agentType: 'claude' as const,
|
||||
paneKey: makePaneKey(pane.hostTabId, pane.leafId),
|
||||
tabId: pane.hostTabId,
|
||||
worktreeId: WT,
|
||||
stateHistory: [],
|
||||
...(status.lastAssistantMessage !== undefined
|
||||
? { lastAssistantMessage: status.lastAssistantMessage }
|
||||
: {})
|
||||
}
|
||||
}
|
||||
: {})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
type TestStore = ReturnType<typeof createTestStore>
|
||||
|
||||
/** Mirrors applyWebSessionTabsStorePatch: build the patch from live state, then
|
||||
* set it. Returns false when the mirror produced no change — pre-fix, a
|
||||
* republication onto a client-owned pane is exactly that no-op. */
|
||||
function applyHostSnapshot(
|
||||
store: TestStore,
|
||||
snapshot: RuntimeMobileSessionTabsResult,
|
||||
now: number
|
||||
): boolean {
|
||||
vi.setSystemTime(now)
|
||||
const state = store.getState()
|
||||
const patch = applyFreshWebSessionTabsSnapshot(state, snapshot, ENV, now)
|
||||
store.setState(patch as Partial<AppState>)
|
||||
return patch !== state
|
||||
}
|
||||
|
||||
/**
|
||||
* Byte-identical replay of what pty-connection does for a remote pane: claim the
|
||||
* key at transport creation, then prove the claim with a byte-derived write. The
|
||||
* OSC pipeline sees a title and a state — never a Stop event — so the payload it
|
||||
* writes carries no lastAssistantMessage.
|
||||
*/
|
||||
function replayClientByteStatus(
|
||||
store: TestStore,
|
||||
pane: PaneRef,
|
||||
state: 'working' | 'done',
|
||||
clientNow: number
|
||||
): void {
|
||||
vi.setSystemTime(clientNow)
|
||||
const paneKey = mirrorPaneKey(pane)
|
||||
registerRendererOwnedAgentStatusPane(paneKey, ENV)
|
||||
markRendererOwnedAgentStatusWrite(paneKey)
|
||||
store
|
||||
.getState()
|
||||
.setAgentStatus(paneKey, { state, prompt: '', agentType: 'claude' }, 'Claude Code', undefined, {
|
||||
tabId: mirrorTabId(pane),
|
||||
worktreeId: WT
|
||||
})
|
||||
}
|
||||
|
||||
function seedPairedClientStore(): TestStore {
|
||||
const store = createTestStore()
|
||||
seedStore(store, {
|
||||
settings: { ...getDefaultSettings('/tmp'), tabAutoGenerateTitle: true },
|
||||
worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/path/wt1' })] },
|
||||
activeWorktreeId: WT
|
||||
} as Partial<AppState>)
|
||||
return store
|
||||
}
|
||||
|
||||
/** The value both agent-row renderers read, keyed by pane. Byte-identical to
|
||||
* useWorktreeAgentRows' inputs, minus React. */
|
||||
function observeRowMessages(store: TestStore, now: number): Record<string, string | undefined> {
|
||||
const state = store.getState()
|
||||
const tabs = state.tabsByWorktree[WT] ?? []
|
||||
const rows = buildWorktreeAgentRows({
|
||||
tabs,
|
||||
entries: selectLiveAgentStatusEntriesForWorktree(state, WT),
|
||||
retained: selectRetainedAgentEntriesForWorktree(state, WT),
|
||||
runtimePaneTitlesByTabId: selectRuntimePaneTitlesForWorktree(state, WT),
|
||||
ptyIdsByTabId: selectLivePtyIdsForWorktree(state, WT),
|
||||
terminalLayoutsByTabId: Object.fromEntries(
|
||||
tabs.map((tab) => [tab.id, state.terminalLayoutsByTabId[tab.id]])
|
||||
),
|
||||
now
|
||||
})
|
||||
const byPaneKey: Record<string, string | undefined> = {}
|
||||
for (const row of rows) {
|
||||
if (row.rowSource !== 'subagent') {
|
||||
byPaneKey[row.paneKey] = row.entry.lastAssistantMessage
|
||||
}
|
||||
}
|
||||
return byPaneKey
|
||||
}
|
||||
|
||||
describe('#12906: remote agent rows keep the host-published last assistant message', () => {
|
||||
beforeEach(() => {
|
||||
vi.useFakeTimers()
|
||||
vi.setSystemTime(T0)
|
||||
resetWebSessionTabsSnapshotFreshnessForTests()
|
||||
resetRendererOwnedAgentStatusPanesForTests()
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
vi.useRealTimers()
|
||||
resetRendererOwnedAgentStatusPanesForTests()
|
||||
})
|
||||
|
||||
it('shows the message on a pane this renderer owns from the byte stream', () => {
|
||||
const store = seedPairedClientStore()
|
||||
// The agent finished its turn: the host hook has the completion text, and
|
||||
// this renderer's OSC pipeline independently saw the pane go idle.
|
||||
const mirrored = applyHostSnapshot(
|
||||
store,
|
||||
makeHostSnapshot({
|
||||
snapshotVersion: 1,
|
||||
hostNow: T0 - 1_000,
|
||||
statusByHostTabId: {
|
||||
[OWNED.hostTabId]: {
|
||||
state: 'done',
|
||||
lastAssistantMessage: HOST_MESSAGE,
|
||||
stateStartedAt: T0 - 2_000
|
||||
}
|
||||
}
|
||||
}),
|
||||
T0
|
||||
)
|
||||
expect(mirrored, 'harness must reach the mirror, not stop at the freshness gate').toBe(true)
|
||||
replayClientByteStatus(store, OWNED, 'done', T0)
|
||||
// Republication is where the loss happens: the client now owns the key.
|
||||
applyHostSnapshot(
|
||||
store,
|
||||
makeHostSnapshot({
|
||||
snapshotVersion: 2,
|
||||
hostNow: T0 + 1_000,
|
||||
statusByHostTabId: {
|
||||
[OWNED.hostTabId]: {
|
||||
state: 'done',
|
||||
lastAssistantMessage: HOST_MESSAGE,
|
||||
stateStartedAt: T0 - 2_000
|
||||
}
|
||||
}
|
||||
}),
|
||||
T0 + 2_000
|
||||
)
|
||||
|
||||
const messages = observeRowMessages(store, T0 + 2_000)
|
||||
expect(messages, JSON.stringify(messages, null, 2)).toMatchObject({
|
||||
[mirrorPaneKey(OWNED)]: HOST_MESSAGE
|
||||
})
|
||||
})
|
||||
|
||||
it('control: a pane this renderer never wrote status for already showed it', () => {
|
||||
const store = seedPairedClientStore()
|
||||
applyHostSnapshot(
|
||||
store,
|
||||
makeHostSnapshot({
|
||||
snapshotVersion: 1,
|
||||
hostNow: T0 - 1_000,
|
||||
statusByHostTabId: {
|
||||
[CEDED.hostTabId]: {
|
||||
state: 'done',
|
||||
lastAssistantMessage: HOST_MESSAGE,
|
||||
stateStartedAt: T0 - 2_000
|
||||
}
|
||||
}
|
||||
}),
|
||||
T0
|
||||
)
|
||||
|
||||
// Pins the causal boundary to the ownership fence, not the mirror as a whole.
|
||||
expect(observeRowMessages(store, T0)[mirrorPaneKey(CEDED)]).toBe(HOST_MESSAGE)
|
||||
})
|
||||
|
||||
it('never invents a message the host did not publish (old host / new client)', () => {
|
||||
const store = seedPairedClientStore()
|
||||
applyHostSnapshot(
|
||||
store,
|
||||
makeHostSnapshot({
|
||||
snapshotVersion: 1,
|
||||
hostNow: T0 - 1_000,
|
||||
statusByHostTabId: {
|
||||
[OWNED.hostTabId]: { state: 'done', stateStartedAt: T0 - 2_000 }
|
||||
}
|
||||
}),
|
||||
T0
|
||||
)
|
||||
replayClientByteStatus(store, OWNED, 'done', T0)
|
||||
applyHostSnapshot(
|
||||
store,
|
||||
makeHostSnapshot({
|
||||
snapshotVersion: 2,
|
||||
hostNow: T0 + 1_000,
|
||||
statusByHostTabId: {
|
||||
[OWNED.hostTabId]: { state: 'done', stateStartedAt: T0 - 2_000 }
|
||||
}
|
||||
}),
|
||||
T0 + 2_000
|
||||
)
|
||||
|
||||
const messages = observeRowMessages(store, T0 + 2_000)
|
||||
// Guard against a vacuous pass: the row must exist for its blank message to mean anything.
|
||||
expect(Object.keys(messages)).toContain(mirrorPaneKey(OWNED))
|
||||
expect(messages[mirrorPaneKey(OWNED)]).toBeUndefined()
|
||||
})
|
||||
|
||||
it('keeps a mirrored message when a later host frame omits the field (old host / new client)', () => {
|
||||
const store = seedPairedClientStore()
|
||||
applyHostSnapshot(
|
||||
store,
|
||||
makeHostSnapshot({
|
||||
snapshotVersion: 1,
|
||||
hostNow: T0 - 1_000,
|
||||
statusByHostTabId: {
|
||||
[OWNED.hostTabId]: { state: 'done', stateStartedAt: T0 - 2_000 }
|
||||
}
|
||||
}),
|
||||
T0
|
||||
)
|
||||
replayClientByteStatus(store, OWNED, 'done', T0)
|
||||
applyHostSnapshot(
|
||||
store,
|
||||
makeHostSnapshot({
|
||||
snapshotVersion: 2,
|
||||
hostNow: T0 + 1_000,
|
||||
statusByHostTabId: {
|
||||
[OWNED.hostTabId]: {
|
||||
state: 'done',
|
||||
lastAssistantMessage: HOST_MESSAGE,
|
||||
stateStartedAt: T0 - 2_000
|
||||
}
|
||||
}
|
||||
}),
|
||||
T0 + 2_000
|
||||
)
|
||||
expect(
|
||||
observeRowMessages(store, T0 + 2_000)[mirrorPaneKey(OWNED)],
|
||||
'precondition: the fenced pane adopted the host message'
|
||||
).toBe(HOST_MESSAGE)
|
||||
|
||||
// A host that predates #9914's fix drops lastAssistantMessage when it demotes
|
||||
// a stale status under a neutral title. That must not blank the mirrored line.
|
||||
applyHostSnapshot(
|
||||
store,
|
||||
makeHostSnapshot({
|
||||
snapshotVersion: 3,
|
||||
hostNow: T0 + 3_000,
|
||||
statusByHostTabId: {
|
||||
[OWNED.hostTabId]: { state: 'done', stateStartedAt: T0 - 2_000 }
|
||||
}
|
||||
}),
|
||||
T0 + 4_000
|
||||
)
|
||||
|
||||
expect(observeRowMessages(store, T0 + 4_000)[mirrorPaneKey(OWNED)]).toBe(HOST_MESSAGE)
|
||||
})
|
||||
|
||||
it('does not paste last turn’s message under a turn the client already restarted', () => {
|
||||
const store = seedPairedClientStore()
|
||||
applyHostSnapshot(
|
||||
store,
|
||||
makeHostSnapshot({
|
||||
snapshotVersion: 1,
|
||||
hostNow: T0 - 10_000,
|
||||
statusByHostTabId: {
|
||||
[OWNED.hostTabId]: {
|
||||
state: 'done',
|
||||
lastAssistantMessage: HOST_MESSAGE,
|
||||
stateStartedAt: T0 - 20_000
|
||||
}
|
||||
}
|
||||
}),
|
||||
T0 - 9_000
|
||||
)
|
||||
// A new prompt starts: the byte pipeline sees the spinner before the host's
|
||||
// hook catches up, so its `done` frame is now the previous turn's evidence.
|
||||
replayClientByteStatus(store, OWNED, 'working', T0)
|
||||
applyHostSnapshot(
|
||||
store,
|
||||
makeHostSnapshot({
|
||||
snapshotVersion: 2,
|
||||
hostNow: T0 + 1_000,
|
||||
statusByHostTabId: {
|
||||
[OWNED.hostTabId]: {
|
||||
state: 'done',
|
||||
lastAssistantMessage: HOST_MESSAGE,
|
||||
stateStartedAt: T0 - 20_000
|
||||
}
|
||||
}
|
||||
}),
|
||||
T0 + 2_000
|
||||
)
|
||||
|
||||
// Local parity: setAgentStatus writes payload.lastAssistantMessage straight
|
||||
// through, so a local pane starting a new turn shows no completion text.
|
||||
const messages = observeRowMessages(store, T0 + 2_000)
|
||||
expect(Object.keys(messages)).toContain(mirrorPaneKey(OWNED))
|
||||
expect(messages[mirrorPaneKey(OWNED)]).toBeUndefined()
|
||||
})
|
||||
})
|
||||
@@ -1247,7 +1247,13 @@ function buildMirroredAgentStatusPatch(
|
||||
tabId: entry.tabId,
|
||||
providerSession:
|
||||
existing.providerSession ??
|
||||
(hostIdentityPredatesCurrentTurn ? undefined : entry.providerSession)
|
||||
(hostIdentityPredatesCurrentTurn ? undefined : entry.providerSession),
|
||||
// Why: hook-only content the byte pipeline can never see, and every OSC
|
||||
// write blanks it, so a fenced pane's message line stayed empty forever
|
||||
// (#12906). Host-first unlike providerSession: only the host can mint one.
|
||||
lastAssistantMessage:
|
||||
(hostIdentityPredatesCurrentTurn ? undefined : entry.lastAssistantMessage) ??
|
||||
existing.lastAssistantMessage
|
||||
}
|
||||
: entry
|
||||
nextByPaneKey.set(entry.paneKey, nextEntry)
|
||||
|
||||
Reference in New Issue
Block a user