Merge master into worktree-windows-runtime

packages/ui/acp/tests/harness.ts

@@ -100,7 +100,7 @@ export function errorResponse(message: string): StreamChunk[] {
   return [
     { type: 'block-start', index: 0, blockType: 'text' },
     { type: 'text-delta', index: 0, text: 'partial' },
-    { type: 'finish', reason: { kind: 'error', message, code: 'PROVIDER_ERROR' } },
+    { type: 'finish', reason: { kind: 'error', failure: { message, code: 'PROVIDER_ERROR' } } },
   ]
 }
 

packages/ui/acp/tests/stream-update.spec.ts

@@ -76,6 +76,37 @@ describe('streamSessionEventUpdate', () => {
       .toEqual([])
   })
 
+  it('marks retry and terminal model failure boundaries but not ordinary turn errors', () => {
+    expect(updatesFor(evt('llm/retry', {
+      turn: 1,
+      step: 1,
+      retry: 1,
+      maxRetries: 2,
+      delayMs: 500,
+      failure: { message: 'backend busy', code: 'SERVER' },
+    }))).toEqual([{
+      sessionUpdate: 'agent_message_chunk',
+      content: {
+        type: 'text',
+        text: '\n\n[Previous model attempt discarded; retrying 1/2 in 500ms: backend busy]\n\n',
+      },
+    }])
+    expect(updatesFor(evt('turn/end', {
+      turn: 1,
+      reason: { kind: 'error', step: 2, failure: { message: 'still busy', code: 'SERVER' } },
+    }))).toEqual([{
+      sessionUpdate: 'agent_message_chunk',
+      content: {
+        type: 'text',
+        text: '\n\n[Model attempt failed; any partial output above is discarded: still busy]\n\n',
+      },
+    }])
+    expect(updatesFor(evt('turn/end', {
+      turn: 1,
+      reason: { kind: 'error', step: 2, message: 'post-step failed' },
+    }))).toEqual([])
+  })
+
   it('maps tool/call to an in_progress tool_call with kind other and parsed rawInput (generic fallback, no presenter)', () => {
     const updates = updatesFor(evt('tool/call', { turn: 1, step: 1, callId: CallId('c1'), name: 'bash', arguments: '{"command":"ls"}' }))
     expect(updates).toEqual([{

packages/ui/acp/tests/turns.spec.ts

@@ -49,6 +49,15 @@ describe('acp bridge — turn outcomes', () => {
       .rejects.toThrow(/turn failed: provider boom/)
   })
 
+  it('rejects an ordinary plugin turn failure through the same ACP boundary', async () => {
+    harness = await makeBridgeHarness({ storageDir, script: [textResponse('must not run')] })
+    harness.ctx.on('agent/pre-step', () => { throw new Error('plugin pre-step failed') })
+    const sessionId = await newSession(harness)
+
+    await expect(harness.client.prompt({ sessionId, prompt: [{ type: 'text', text: 'go' }] }))
+      .rejects.toThrow(/turn failed: plugin pre-step failed/)
+  })
+
   it('streams a tool call as tool_call then tool_call_update', async () => {
     harness = await makeBridgeHarness({
       storageDir,