Merge remote-tracking branch 'origin/master' into feature/subagent-policy-inheritance

# Conflicts:
#	.agents/notes/implemented/feature/2026-07-06-sandbox.i18n.yaml
#	docs/cordis-catalog/services.md
#	docs/persistence-catalog.md
#	examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
#	packages/core/session/README.i18n.yaml
#	packages/subagent/subagent-inprocess/README.i18n.yaml
#	packages/ui/user-approval/src/index.ts

packages/core/session/tests/invariant.spec.ts

@@ -102,7 +102,7 @@ describe('session-log invariants', () => {
     } as never) }).toThrow(/seq must strictly increase/)
   })
 
-  it('enforces turn numbering and enclosure', async () => {
+  it('enforces turn numbering and encloses events other than idle context', async () => {
     const first = await setup()
     const open = first.ctx.sessions.create()
     open.append('turn/start', { turn: 1, trigger: { kind: 'message', source: { kind: 'user' } } })
@@ -119,9 +119,9 @@ describe('session-log invariants', () => {
 
     const outside = (await setup()).ctx.sessions.create()
     expect(() => outside.append('user/message', {
-      content: [{ type: 'text', text: 'hi' }],
-      source: { kind: 'user' },
-    }, { surfaceOp: 'append' })).toThrow(/outside any open turn/)
+      content: [{ type: 'text', text: 'idle context' }],
+      source: { kind: 'plugin', plugin: 'test' },
+    }, { surfaceOp: 'append' })).not.toThrow()
     expect(() => outside.append('steering/message', {
       turn: 1,
       content: [{ type: 'text', text: 'go' }],

packages/core/session/tests/request-header.spec.ts

@@ -3,7 +3,7 @@
 import { describe, expect, it } from 'vitest'
 import { Session, SessionId, canonicalHeader, foldRequestHeader, headerEquals } from '@deepseek-ai/dsh-session'
 import type { EpochHeader, SessionEvent } from '@deepseek-ai/dsh-session'
-import type { Message, ToolSchema } from '@deepseek-ai/dsh-llm'
+import type { ToolSchema } from '@deepseek-ai/dsh-llm'
 import { ReasoningEffortId } from '@deepseek-ai/dsh-llm'
 
 const CONFIG = { provider: 'mock', model: 'm' }
@@ -12,20 +12,16 @@ function tool(name: string, description = 'd'): ToolSchema {
   return { name, description, parameters: { type: 'object' } }
 }
 
-function msg(text: string): Message {
-  return { role: 'user', content: [{ type: 'text', text }] }
-}
-
 describe('canonicalHeader', () => {
   it('normalizes empty optional fields to absence and preserves populated fields', () => {
-    expect(canonicalHeader({ config: CONFIG, system: '', tools: [], messagePrefix: [] })).toEqual({ config: CONFIG })
-    const full = canonicalHeader({ config: CONFIG, system: 's', tools: [tool('a')], messagePrefix: [msg('p')] })
-    expect(full).toEqual({ config: CONFIG, system: 's', tools: [tool('a')], messagePrefix: [msg('p')] })
+    expect(canonicalHeader({ config: CONFIG, system: '', tools: [] })).toEqual({ config: CONFIG })
+    const full = canonicalHeader({ config: CONFIG, system: 's', tools: [tool('a')] })
+    expect(full).toEqual({ config: CONFIG, system: 's', tools: [tool('a')] })
   })
 })
 
 describe('headerEquals', () => {
-  const base = canonicalHeader({ config: CONFIG, system: 's', tools: [tool('a')], messagePrefix: [msg('p')] })
+  const base = canonicalHeader({ config: CONFIG, system: 's', tools: [tool('a')] })
 
   it('compares every canonical field and preserves tool order', () => {
     expect(headerEquals(base, structuredClone(base))).toBe(true)
@@ -35,14 +31,13 @@ describe('headerEquals', () => {
       config: { ...base.config, reasoningEffort: ReasoningEffortId('high') },
     })).toBe(false)
     expect(headerEquals(base, { ...base, system: 'other' })).toBe(false)
-    expect(headerEquals(base, { ...base, messagePrefix: [msg('other')] })).toBe(false)
     expect(headerEquals(base, { ...base, tools: [] })).toBe(false)
     expect(headerEquals(base, { ...base, tools: [tool('a', 'changed')] })).toBe(false)
     expect(headerEquals({ config: CONFIG, tools: [tool('a'), tool('b')] }, { config: CONFIG, tools: [tool('b'), tool('a')] })).toBe(false)
   })
 
-  it('treats absent and empty prefix/tool arrays as equivalent canonical absence', () => {
-    expect(headerEquals({ config: CONFIG }, { config: CONFIG, tools: [], messagePrefix: [] })).toBe(true)
+  it('treats absent and empty tool arrays as equivalent canonical absence', () => {
+    expect(headerEquals({ config: CONFIG }, { config: CONFIG, tools: [] })).toBe(true)
   })
 })
 

packages/core/session/tests/session.spec.ts

@@ -2,7 +2,6 @@ import { describe, expect, expectTypeOf, it, vi } from 'vitest'
 import { Context } from 'cordis'
 import { CallId, ReasoningEffortId } from '@deepseek-ai/dsh-llm'
 import SessionStore, {
-  displayPromptContent,
   findLastMessageTurnEnd,
   SESSION_FORMAT_VERSION,
   Session,
@@ -118,11 +117,6 @@ describe('Session', () => {
   })
 
   it('renders injected-context and steering messages as plain user content', () => {
-    expect(displayPromptContent({
-      content: [{ type: 'text', text: 'plain prompt' }],
-      source: { kind: 'user' },
-    })).toEqual([{ type: 'text', text: 'plain prompt' }])
-
     const session = new Session(SessionId('s2'))
     session.append('user/message', {
       content: [{ type: 'text', text: 'file changed: a.ts' }],
@@ -141,46 +135,11 @@ describe('Session', () => {
     expect(steeringMessage!.content).toEqual([{ type: 'text', text: 'focus on tests' }])
   })
 
-  it('derives baked prompt context while exposing only the direct prompt for display', () => {
-    const session = new Session(SessionId('prompt-envelope'))
-    const event = session.append('user/message', {
-      content: [
-        { type: 'text', text: 'background' },
-        { type: 'text', text: '\n\n## My request:\n' },
-        { type: 'text', text: 'question' },
-      ],
-      source: { kind: 'user' },
-      envelope: {
-        displayContent: [{ type: 'text', text: 'question' }],
-        prefixContexts: [{ source: { kind: 'plugin', plugin: 'reference' }, meta: { kind: 'card' } }],
-      },
-    }, { surfaceOp: 'append' })
-
-    expect(session.deriveMessages()).toEqual([{
-      role: 'user',
-      content: [
-        { type: 'text', text: 'background' },
-        { type: 'text', text: '\n\n## My request:\n' },
-        { type: 'text', text: 'question' },
-      ],
-    }])
-    expect(displayPromptContent(event.data)).toEqual([{ type: 'text', text: 'question' }])
-    expect(Object.isFrozen(event.data.envelope?.displayContent)).toBe(true)
-    expect(new Session(SessionId('prompt-envelope-replay'), session.events).deriveMessages())
-      .toEqual(session.deriveMessages())
-  })
-
-  it('keeps context meta durable in the event while hiding it from the projection', () => {
+  it('keeps context source durable in the event while hiding it from the projection', () => {
     const session = new Session(SessionId('s2-raw'))
-    const meta = {
-      kind: 'workspace-instructions',
-      version: 1,
-      changes: [{ action: 'set', scope: 'pkg', path: 'pkg/AGENTS.md', digest: 'abc123' }],
-    }
     session.append('user/message', {
       content: [{ type: 'text', text: '<system-reminder>Additional instructions from: pkg/AGENTS.md</system-reminder>' }],
       source: { kind: 'plugin', plugin: 'workspace-context' },
-      meta,
     }, { surfaceOp: 'append' })
 
     expect(session.deriveMessages()).toEqual([{
@@ -188,7 +147,7 @@ describe('Session', () => {
       content: [{ type: 'text', text: '<system-reminder>Additional instructions from: pkg/AGENTS.md</system-reminder>' }],
     }])
     const event = session.events[0]
-    expect(event?.type === 'user/message' && event.data.meta).toEqual(meta)
+    expect(event?.type === 'user/message' && event.data.source).toEqual({ kind: 'plugin', plugin: 'workspace-context' })
   })
 
   it('replays identically from a seeded event log', () => {