From 78d3570957e2727fed36e9660b172892800f244b Mon Sep 17 00:00:00 2001 From: Nikita Bhagat Date: Tue, 10 Nov 2026 20:04:27 +0530 Subject: [PATCH 1/2] fix(remote): correct fill recording recovery guidance --- ...mon-client-lifecycle-recorded-fill.test.ts | 26 +++++++++++++++++++ .../src/daemon-client-lifecycle.ts | 13 ++++++++++ .../interaction-recorded-input.test.ts | 12 ++++++--- .../internal/interaction-recorded-input.ts | 1 + 4 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 packages/daemon-client/src/__tests__/daemon-client-lifecycle-recorded-fill.test.ts 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..5bfd6512a9 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 and run open --save-script first, 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..76dd4fe7bf 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,13 @@ 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).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' }, ); } } From abdf3fa705b14f20fe6a1fd9014837f9cfffa0c9 Mon Sep 17 00:00:00 2001 From: Nikita Bhagat Date: Tue, 10 Nov 2026 20:27:19 +0530 Subject: [PATCH 2/2] fix(remote): clarify fresh recording session recovery --- packages/daemon-client/src/daemon-client-lifecycle.ts | 2 +- .../internal/__tests__/interaction-recorded-input.test.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/daemon-client/src/daemon-client-lifecycle.ts b/packages/daemon-client/src/daemon-client-lifecycle.ts index 5bfd6512a9..bbf0f40ff0 100644 --- a/packages/daemon-client/src/daemon-client-lifecycle.ts +++ b/packages/daemon-client/src/daemon-client-lifecycle.ts @@ -534,7 +534,7 @@ export function attachSessionAddressHints( error: { ...response.error, message: - 'fill --record-as requires an armed script recording, but remote clients cannot start one. Connect to a local daemon and run open --save-script first, or omit --record-as.', + '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.', }, }; } 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 76dd4fe7bf..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 @@ -36,6 +36,7 @@ test('--record-as keeps requiring an armed recording when the text came from std 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/); });