Skip to content

fix(acp): repair main's typecheck after the legacy journal-path removal #26094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jinwoo-H merged 1 commit into from
Oct 7, 2026
Merged

fix(acp): repair main's typecheck after the legacy journal-path removal #26094

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/main/acp/acp-structured-host-restore-failed.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import type { AcpScriptedAgent } from './acp-scripted-agent.test-support'
import { GROK, GROK_CONFIG_OPTIONS, PROVIDER_SESSION } from './acp-structured-adapter.test-support'
import { ACP_HANDLE_TRANSPORT } from './acp-structured-agent-definitions'
import { replayJournal } from '../native-chat/agent-session-journal/journal-open'
import { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store'
import { createAcpStructuredLaunchResolver } from './acp-structured-launch-resolution'
import {
attachParams,
Expand Down Expand Up @@ -220,13 +221,13 @@ describe('a created Grok session Grok reports missing on the first reopen', () =
describe('the warning row of a replacement whose attach failed', () => {
async function replaceThenFailAttach() {
const opened = await openRestoreRig(-32603, 'session file is corrupt')
const { host, store, fence, journalDatabase, warnings } = opened
const { host, store, fence, warnings } = opened
expect(await host.attach(CALLER, attachParams())).toMatchObject({ ok: true })
await host.close(SESSION, 'user-close')
// The journal's open fails after the fresh session's link is durable, before its row is written.
vi.spyOn(journalDatabase, 'legacyDirectoryFor').mockImplementationOnce(() => {
throw new Error('journal path unavailable')
})
vi.spyOn(AgentSessionJournal.prototype, 'open').mockRejectedValueOnce(
new Error('journal path unavailable')
)
await expect(host.attach(CALLER, attachParams(fence()))).rejects.toThrow(
'journal path unavailable'
)
Expand Down
Loading