diff --git a/packages/daemon-client/src/__tests__/daemon-client-lifecycle-recorded-fill.test.ts b/packages/daemon-client/src/__tests__/daemon-client-lifecycle-recorded-fill.test.ts new file mode 100644 index 0000000000..006c0d90bb --- /dev/null +++ b/packages/daemon-client/src/__tests__/daemon-client-lifecycle-recorded-fill.test.ts @@ -0,0 +1,26 @@ +import assert from 'node:assert/strict'; +import { test } from 'vitest'; +import { attachSessionAddressHints } from '../daemon-client-lifecycle.ts'; + +test('remote fill recording errors give a recovery path the remote client supports', () => { + const response = { + ok: false as const, + error: { + code: 'INVALID_ARGS', + message: + 'fill --record-as requires an armed script recording. Start a fresh session with open --save-script, then retry the fill.', + details: { reason: 'fill_record_as_requires_armed_recording' }, + }, + }; + const settings = { remoteBaseUrl: 'https://device.example' } as never; + + const remote = attachSessionAddressHints(response, {} as never, settings); + assert.equal(remote.ok, false); + if (remote.ok) return; + assert.match(remote.error.message, /remote clients cannot start one/); + assert.match(remote.error.message, /Connect to a local daemon/); + assert.equal(remote.error.details?.reason, 'fill_record_as_requires_armed_recording'); + + const local = attachSessionAddressHints(response, {} as never, {} as never); + assert.equal(local, response); +}); diff --git a/packages/daemon-client/src/daemon-client-lifecycle.ts b/packages/daemon-client/src/daemon-client-lifecycle.ts index dad095ea49..bbf0f40ff0 100644 --- a/packages/daemon-client/src/daemon-client-lifecycle.ts +++ b/packages/daemon-client/src/daemon-client-lifecycle.ts @@ -525,6 +525,19 @@ export function attachSessionAddressHints( settings: DaemonClientSettings, ): DaemonResponse { if (!response.ok) { + if ( + settings.remoteBaseUrl && + response.error.details?.reason === 'fill_record_as_requires_armed_recording' + ) { + return { + ...response, + error: { + ...response.error, + message: + 'fill --record-as requires an armed script recording, but remote clients cannot start one. Connect to a local daemon, start a fresh session with open --save-script, then retry the fill, or omit --record-as.', + }, + }; + } return settings.ownedStateDir && isHeldRepairDivergence(response) ? attachRepairSessionAddressHint(response, settings.paths.baseDir) : response; diff --git a/packages/daemon/src/execution/interaction/internal/__tests__/interaction-recorded-input.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-recorded-input.test.ts index 36978b9a1f..c112a99749 100644 --- a/packages/daemon/src/execution/interaction/internal/__tests__/interaction-recorded-input.test.ts +++ b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-recorded-input.test.ts @@ -29,7 +29,14 @@ test.each([ }); test('--record-as keeps requiring an armed recording when the text came from stdin', () => { - expect(() => check({ textStdin: true, recordAs: 'PASSWORD' }, false)).toThrow( - /requires an armed script recording/, - ); + let caught: unknown; + try { + check({ textStdin: true, recordAs: 'PASSWORD' }, false); + } catch (error) { + caught = error; + } + expect(caught).toBeInstanceOf(AppError); + expect((caught as AppError).code).toBe('INVALID_ARGS'); + expect((caught as AppError).details?.reason).toBe('fill_record_as_requires_armed_recording'); + expect((caught as AppError).message).toMatch(/open --save-script/); }); diff --git a/packages/daemon/src/execution/interaction/internal/interaction-recorded-input.ts b/packages/daemon/src/execution/interaction/internal/interaction-recorded-input.ts index a5caf3e1b1..8553bae632 100644 --- a/packages/daemon/src/execution/interaction/internal/interaction-recorded-input.ts +++ b/packages/daemon/src/execution/interaction/internal/interaction-recorded-input.ts @@ -23,6 +23,7 @@ export function assertRecordedFillParameterization(params: { throw new AppError( 'INVALID_ARGS', 'fill --record-as requires an armed script recording. Start a fresh session with open --save-script, then retry the fill.', + { reason: 'fill_record_as_requires_armed_recording' }, ); } }