fix(batch): preserve typed error recovery signals (#1761)

* fix(batch): preserve typed error recovery signals

* test(batch): cover typed error recovery signals

* fix(batch): omit unknown typed error signals

* test(batch): keep unknown typed signals absent

Author: cosin2077

src/core/__tests__/batch.test.ts

@@ -58,6 +58,38 @@ function batchRequest(commands: string[], responseLevel?: ResponseLevel): BatchR
   };
 }
 
+test('batch preserves typed error recovery signals from a failing step', async () => {
+  const response = await runBatch(batchRequest(['open']), 'session', async () => ({
+    ok: false,
+    error: {
+      code: 'DEVICE_IN_USE',
+      message: 'device busy',
+      retriable: true,
+      supportedOn: 'android, web',
+    },
+  }));
+
+  assert.equal(response.ok, false);
+  if (response.ok) return;
+  assert.equal(response.error.retriable, true);
+  assert.equal(response.error.supportedOn, 'android, web');
+});
+
+test('batch keeps unknown typed error recovery signals absent', async () => {
+  const response = await runBatch(batchRequest(['open']), 'session', async () => ({
+    ok: false,
+    error: {
+      code: 'INVALID_ARGS',
+      message: 'bad args',
+    },
+  }));
+
+  assert.equal(response.ok, false);
+  if (response.ok) return;
+  assert.equal('retriable' in response.error, false);
+  assert.equal('supportedOn' in response.error, false);
+});
+
 test('batch elides intermediate steps to digest, final step keeps requested level (full)', async () => {
   const seen: (ResponseLevel | undefined)[] = [];
   const response = await runBatch(

src/core/batch.ts

@@ -7,7 +7,7 @@ import {
   type ResponseLevel,
   isNonDefaultResponseLevel,
 } from '@agent-device/kernel/contracts';
-import { AppError, asAppError } from '@agent-device/kernel/errors';
+import { AppError, asAppError, type DaemonError } from '@agent-device/kernel/errors';
 import { isRecord } from '../utils/parsing.ts';
 import {
   DEFAULT_BATCH_MAX_STEPS,
@@ -105,6 +105,12 @@ export async function runBatch(
             hint: stepResponse.error.hint,
             diagnosticId: stepResponse.error.diagnosticId,
             logPath: stepResponse.error.logPath,
+            ...(stepResponse.error.retriable === undefined
+              ? {}
+              : { retriable: stepResponse.error.retriable }),
+            ...(stepResponse.error.supportedOn === undefined
+              ? {}
+              : { supportedOn: stepResponse.error.supportedOn }),
             details: {
               ...(stepResponse.error.details ?? {}),
               step: stepResponse.step,
@@ -250,14 +256,7 @@ async function runBatchStep(
   | {
       ok: false;
       step: number;
-      error: {
-        code: string;
-        message: string;
-        hint?: string;
-        diagnosticId?: string;
-        logPath?: string;
-        details?: Record<string, unknown>;
-      };
+      error: DaemonError;
     }
 > {
   const stepStartedAt = Date.now();