Merge origin/master into worktree/contain-result-observer-rejections

packages/core/tools/tests/code-mode.spec.ts

@@ -487,7 +487,6 @@ describe('the run_code dispatch bridge', () => {
           additionalContexts: [{
             content: [{ type: 'text' as const, text: `context for ${exec.callId}` }],
             source: { kind: 'plugin' as const, plugin: 'test' },
-            envelope: 'raw' as const,
             meta: { callId: exec.callId },
           }],
         })
@@ -505,13 +504,11 @@ describe('the run_code dispatch bridge', () => {
       {
         content: [{ type: 'text', text: 'context for call-1:code:1' }],
         source: { kind: 'plugin', plugin: 'test' },
-        envelope: 'raw',
         meta: { callId: 'call-1:code:1' },
       },
       {
         content: [{ type: 'text', text: 'context for call-1:code:2' }],
         source: { kind: 'plugin', plugin: 'test' },
-        envelope: 'raw',
         meta: { callId: 'call-1:code:2' },
       },
     ])

packages/core/tools/tests/tools.spec.ts

@@ -384,7 +384,7 @@ describe('ToolRegistry', () => {
       parameters: {},
       async execute(_args, exec) {
         exec.deferContext({ content: [{ type: 'text', text: 'nested-1' }], source: { kind: 'plugin', plugin: 'nested-1' }, meta: { n: 1 } })
-        exec.deferContext({ content: [{ type: 'text', text: 'nested-2' }], source: { kind: 'plugin', plugin: 'nested-2' }, envelope: 'raw' })
+        exec.deferContext({ content: [{ type: 'text', text: 'nested-2' }], source: { kind: 'plugin', plugin: 'nested-2' } })
         return [{ type: 'text', text: 'done' }]
       },
     }))
@@ -418,7 +418,6 @@ describe('ToolRegistry', () => {
       { kind: 'plugin', plugin: 'post' },
     ])
     expect(result.additionalContexts?.[0]?.meta).toEqual({ n: 1 })
-    expect(result.additionalContexts?.[1]?.envelope).toBe('raw')
   })
 
   it('keeps deferred contexts when a composite tool throws, but drops them when the outer call is blocked', async () => {