From c7fbe079f07385ec445cd0d1ccda20fdd297e856 Mon Sep 17 00:00:00 2001 From: pku-xht Date: Sat, 5 Sep 2026 05:57:39 +0800 Subject: [PATCH] fix: align delegated preset snapshots --- packages/interaction/auto-review/package.json | 2 +- .../tests/inheritance.spec.ts | 6 ++-- packages/subagent/subagent/src/child-agent.ts | 6 ++-- .../tests/continuation-inheritance.spec.ts | 10 ++++--- .../advanced/result.json | 28 ------------------- .../session.1.v2.jsonl | 1 + .../sdk/subagent-mixed/session.2.v2.jsonl | 1 + 7 files changed, 15 insertions(+), 39 deletions(-) diff --git a/packages/interaction/auto-review/package.json b/packages/interaction/auto-review/package.json index bec0bc70bb..881085ae1a 100644 --- a/packages/interaction/auto-review/package.json +++ b/packages/interaction/auto-review/package.json @@ -1,7 +1,7 @@ { "name": "@deepseek-ai/dsh-auto-review", "description": "Per-tool LLM authorization review for the DeepSeek Harness Auto permission preset", - "version": "0.1.2-rc.1", + "version": "0.1.3-alpha.1", "publishConfig": { "access": "public" }, diff --git a/packages/subagent/subagent-in-process-driver/tests/inheritance.spec.ts b/packages/subagent/subagent-in-process-driver/tests/inheritance.spec.ts index 1608163390..6dcb9909a7 100644 --- a/packages/subagent/subagent-in-process-driver/tests/inheritance.spec.ts +++ b/packages/subagent/subagent-in-process-driver/tests/inheritance.spec.ts @@ -97,9 +97,9 @@ describe('in-process policy inheritance', () => { await run.result const child = run.localAgent as Agent expect(child.session.snapshotEvents().slice(0, 3)).toMatchObject([ - { type: 'permission/preset', seq: 0, data: { preset } }, - { type: 'sandbox/mode', seq: 1, data: { mode: 'danger-full-access', source: 'delegation' } }, - { type: 'approval/policy', seq: 2, data: { policy: 'never', source: 'delegation' } }, + { type: 'sandbox/mode', seq: 0, data: { mode: 'danger-full-access', source: 'delegation' } }, + { type: 'approval/policy', seq: 1, data: { policy: 'never', source: 'delegation' } }, + { type: 'permission/preset', seq: 2, data: { preset } }, ]) } finally { await run.dispose() diff --git a/packages/subagent/subagent/src/child-agent.ts b/packages/subagent/subagent/src/child-agent.ts index 01db3e0552..fa347298ee 100644 --- a/packages/subagent/subagent/src/child-agent.ts +++ b/packages/subagent/subagent/src/child-agent.ts @@ -265,15 +265,15 @@ export function appendDelegatedPolicyOverrides( childSession: Session, overrides: DelegatedPolicyOverrides, ): void { - if (overrides.permissionPreset !== undefined) { - childSession.append('permission/preset', { preset: overrides.permissionPreset }) - } if (overrides.sandboxMode !== undefined) { childSession.append('sandbox/mode', { mode: overrides.sandboxMode, source: 'delegation' }) } if (overrides.approvalPolicy !== undefined) { childSession.append('approval/policy', { policy: overrides.approvalPolicy, source: 'delegation' }) } + if (overrides.permissionPreset !== undefined) { + childSession.append('permission/preset', { preset: overrides.permissionPreset }) + } } /** Identity and lineage inputs shared by every in-process child creation. */ diff --git a/packages/subagent/subagent/tests/continuation-inheritance.spec.ts b/packages/subagent/subagent/tests/continuation-inheritance.spec.ts index d3b557a573..27272e8702 100644 --- a/packages/subagent/subagent/tests/continuation-inheritance.spec.ts +++ b/packages/subagent/subagent/tests/continuation-inheritance.spec.ts @@ -103,12 +103,14 @@ describe('continuable policy inheritance', () => { await waitNoActivation(ctx, started.childId) const loaded = await loadStoredSession(ctx.sessionPersistence, started.childId) - expect(loaded.events.filter(event => event.type === 'permission/preset')).toMatchObject([ - { data: { preset } }, - ]) - expect(policyEvents(loaded.events)).toMatchObject([ + expect(loaded.events.filter(event => + event.type === 'sandbox/mode' + || event.type === 'approval/policy' + || event.type === 'permission/preset', + )).toMatchObject([ { type: 'sandbox/mode', data: { mode: 'danger-full-access', source: 'delegation' } }, { type: 'approval/policy', data: { policy: 'never', source: 'delegation' } }, + { type: 'permission/preset', data: { preset } }, ]) }, ) diff --git a/scripts/snapshots/python-sdk-single-exe/advanced/result.json b/scripts/snapshots/python-sdk-single-exe/advanced/result.json index 69f5cab602..516eb182e2 100644 --- a/scripts/snapshots/python-sdk-single-exe/advanced/result.json +++ b/scripts/snapshots/python-sdk-single-exe/advanced/result.json @@ -2504,20 +2504,6 @@ "childSessionId": "{{child-1}}" } }, - { - "method": "session.event", - "payload": { - "sessionId": "{{child-1}}", - "event": { - "type": "permission/preset", - "seq": 2, - "time": 0, - "data": { - "preset": "danger-full-access" - } - } - } - }, { "method": "session.event", "payload": { @@ -3146,20 +3132,6 @@ "childSessionId": "{{child-2}}" } }, - { - "method": "session.event", - "payload": { - "sessionId": "{{child-2}}", - "event": { - "type": "permission/preset", - "seq": 2, - "time": 0, - "data": { - "preset": "danger-full-access" - } - } - } - }, { "method": "session.event", "payload": { diff --git a/snapshots/sdk/subagent-fork-in-process/session.1.v2.jsonl b/snapshots/sdk/subagent-fork-in-process/session.1.v2.jsonl index ad84a5ccf7..48062809c3 100644 --- a/snapshots/sdk/subagent-fork-in-process/session.1.v2.jsonl +++ b/snapshots/sdk/subagent-fork-in-process/session.1.v2.jsonl @@ -17,6 +17,7 @@ {"type":"session/end-seed","data":{"inherited":true}} {"type":"sandbox/mode","data":{"mode":"danger-full-access","source":"delegation"}} {"type":"approval/policy","data":{"policy":"never","source":"delegation"}} +{"type":"permission/preset","data":{"preset":"danger-full-access"}} {"type":"agent/inbox/spliced","data":{"target":"next-turn","start":0,"inserted":[{"content":[{"type":"text","text":"What is the project codeword mentioned earlier in this conversation? Reply with exactly that one word and nothing else."}],"source":{"kind":"user"},"role":"user","id":"{{message:8}}"}]}} {"type":"turn/start","data":{"turn":2}} {"type":"agent/inbox/spliced","data":{"target":"next-turn","start":0,"removedCount":1,"inserted":[]}} diff --git a/snapshots/sdk/subagent-mixed/session.2.v2.jsonl b/snapshots/sdk/subagent-mixed/session.2.v2.jsonl index a2fa212844..77e9a4012c 100644 --- a/snapshots/sdk/subagent-mixed/session.2.v2.jsonl +++ b/snapshots/sdk/subagent-mixed/session.2.v2.jsonl @@ -17,6 +17,7 @@ {"type":"session/end-seed","data":{"inherited":true}} {"type":"sandbox/mode","data":{"mode":"danger-full-access","source":"delegation"}} {"type":"approval/policy","data":{"policy":"never","source":"delegation"}} +{"type":"permission/preset","data":{"preset":"danger-full-access"}} {"type":"agent/inbox/spliced","data":{"target":"next-turn","start":0,"inserted":[{"content":[{"type":"text","text":"What is the project codeword mentioned earlier in this conversation? Reply with exactly that one word and nothing else."}],"source":{"kind":"user"},"role":"user","id":"{{message:13}}"}]}} {"type":"turn/start","data":{"turn":2}} {"type":"agent/inbox/spliced","data":{"target":"next-turn","start":0,"removedCount":1,"inserted":[]}}