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

# Conflicts:
#	packages/core/session/README.i18n.yaml
#	packages/session-persistence/session-persistence-jsonl/README.i18n.yaml
#	packages/session-persistence/session-persistence-jsonl/README.md
#	packages/session-persistence/session-persistence-jsonl/README.zh.md
This commit is contained in:
kingwl
2026-07-27 11:26:39 +08:00
900 changed files with 29735 additions and 10352 deletions

View File

@@ -1,7 +1,7 @@
terminal 96x36 buffer=normal length=36 base=0 viewport=0
lifecycle started=1 stopped=0 progress=inactive
title "DSH snapshot"
cursor hidden column=1 viewportRow=13 bufferRow=13
cursor hidden column=1 viewportRow=12 bufferRow=12
buffer
0| " DEEPSEEK HARNESS"
style 1-8 fg=bright-blue bold
@@ -13,30 +13,27 @@ buffer
3| <blank>
4| "▌ "
style 0-0 fg=yellow
5| "▌ ◌ const first = await tools.bash({ command: 'echo CODE_ONE' }) "
5| "▌ ◌ Echo two markers and combine them "
style 0-0 fg=yellow
style 2-2 fg=yellow bold
style 3-95 bold
6| "▌ const second = await tools.bas "
style 3-36 bold
6| "▌ const first = await tools.bash({ command: 'echo CODE_ONE' }) "
style 0-0 fg=yellow
style 2-31 bold
7| "▌ const first = await tools.bash({ command: 'echo CODE_ONE' }) "
7| "▌ const second = await tools.bash({ command: 'echo CODE_TWO' }) "
style 0-0 fg=yellow
8| "▌ const second = await tools.bash({ command: 'echo CODE_TWO' }) "
8| "▌ console.log(first, second) "
style 0-0 fg=yellow
9| "▌ console.log(first, second) "
9| "▌ return `${first}+${second}` "
style 0-0 fg=yellow
10| "▌ return `${first}+${second}` "
10| "▌ "
style 0-0 fg=yellow
11| "▌ "
style 0-0 fg=yellow
12| "────────────────────────────────────────────────────────────────────────────────────────────────"
11| "────────────────────────────────────────────────────────────────────────────────────────────────"
style 0-95 dim
13| " "
12| " "
style 1-1 inverse
14| "────────────────────────────────────────────────────────────────────────────────────────────────"
13| "────────────────────────────────────────────────────────────────────────────────────────────────"
style 0-95 dim
15| "deepseek-v4-flash /workspace/project ↑0 ↓0 0% context tools:collapsed"
14| "deepseek-v4-flash /workspace/project ↑0 ↓0 0% context tools:collapsed"
style 0-43 dim
style 69-95 dim
16-35| <blank>
15-35| <blank>

View File

@@ -364,6 +364,7 @@ describe('TUI terminal-state snapshots', () => {
name: 'run_code',
arguments: {
code: "const first = await tools.bash({ command: 'echo CODE_ONE' })\nconst second = await tools.bash({ command: 'echo CODE_TWO' })\nconsole.log(first, second)\nreturn `${first}+${second}`",
description: 'Echo two markers and combine them',
},
}
await renderAfter(harness, () => { appendToolCalls(harness.session, [call]) })

View File

@@ -998,8 +998,9 @@ describe('resume command and /resume', () => {
await tick(); await tick()
result.terminal.send('Fallback target')
result.terminal.send('\r')
await tick()
expect(result.terminal.output).toContain('This host cannot hand off in place. Exit and run:')
await vi.waitFor(() => {
expect(result.terminal.output).toContain('This host cannot hand off in place. Exit and run:')
})
expect(result.terminal.output).toContain('dsh --resume fallback-session')
expect(result.terminal.stopped).toBe(0)
await dispose(result)
@@ -1019,8 +1020,9 @@ describe('resume command and /resume', () => {
await tick(); await tick()
result.terminal.send('No fallback target')
result.terminal.send('\r')
await tick()
expect(result.terminal.output).toContain('Session is resumable, but this host cannot hand it off in place')
await vi.waitFor(() => {
expect(result.terminal.output).toContain('Session is resumable, but this host cannot hand it off in place')
})
await dispose(result)
})