Cover shell background progress states

Author: SqlRush

docs/cc-100-roadmap.md

@@ -175,7 +175,7 @@ M5 补充：Bash 和 Unix PowerShell 取消进程时现在会先对受管 proces
 
 M5 补充：Bash 前台输出和 `BashOutput` 现在都走统一 tool-result budget 截断/落盘路径；`BashOutput` 增加 100k 最大结果限制，大后台输出会保存完整内容并返回 `full_output_path` 元数据。
 
-M5 补充：Bash/PowerShell 后台任务现在会发 `*_background_started` 和 `*_background_finished` tool progress 事件，包含后台 ID、shell/status、exit/timed_out/cancelled、duration、时间戳和输出字节数，不携带 command 文本。
+M5 补充：Bash/PowerShell 后台任务现在会发 `*_background_started` 和 `*_background_finished` tool progress 事件，包含后台 ID、shell/status、exit/timed_out/cancelled、duration、时间戳和输出字节数，不携带 command 文本；completed、timed_out、cancelled 终态均已覆盖测试。
 
 M5 补充：Bash/PowerShell 现在接受官方 `dangerouslyDisableSandbox` semantic boolean 输入，并在 structured content 中记录该请求；真实 sandbox adapter/override 行为仍按 sandbox parity 项继续推进。
 

docs/claude-code-go-rewrite-plan.md

@@ -206,7 +206,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：Bash/PowerShell 前台执行现在区分调用方 cancellation、timeout 和普通非零退出；context 取消会返回 `cancelled=true`、`timed_out=false`、`exit_code=-1`，并显示 cancelled 状态文本。
 - 本轮补充：Bash 和 Unix PowerShell 工具取消现在会先向受管 process group 发 SIGTERM，再用短 `WaitDelay` 兜底 SIGKILL；Bash 前台/后台取消测试通过 `trap TERM` 证明 cleanup signal 可被脚本收到。
 - 本轮补充：`BashOutput` 现在设置 100k 最大结果大小，和前台 `Bash` 一起覆盖大输出 tool-result preview 截断、完整输出落盘及 `full_output_path` 元数据。
-- 本轮补充：Bash/PowerShell 后台命令现在会通过 tool progress 通道发 started/finished 事件，记录后台 ID、shell/status、exit/timed_out/cancelled、duration、时间戳和 stdout/stderr byte count，且测试确保 progress 不携带 command 文本。
+- 本轮补充：Bash/PowerShell 后台命令现在会通过 tool progress 通道发 started/finished 事件，记录后台 ID、shell/status、exit/timed_out/cancelled、duration、时间戳和 stdout/stderr byte count，且 completed、timed_out、cancelled 终态测试确保 progress 不携带 command 文本。
 - 本轮补充：WebSearch domain filters 现在在 schema 层声明 array `items:string`，通用 tool schema validator 同步支持 `items` 校验；`allowed_domains`/`blocked_domains` 会拒绝空字符串、URL/port、非法 wildcard 和非域名 label。
 - 本轮补充：通用 tool schema validator 现在支持 `enum`，可直接执行 Grep output mode、NotebookEdit edit mode/cell type、Todo status/priority、Task target/action、LSP severity 等工具 schema 的枚举契约。
 - 本轮补充：通用 tool schema validator 现在支持数字 `minimum`/`maximum`，可直接执行 LSPDiagnostics `limit` 等工具 schema 的数值范围契约。

docs/first-second-parity-audit.md

@@ -206,7 +206,7 @@ Covered behavior:
 - `Bash`/`PowerShell` foreground execution now distinguishes caller cancellation from timeout and ordinary nonzero exit in structured results: cancelled commands return `cancelled=true`, `timed_out=false`, `exit_code=-1`, and visible cancelled status text.
 - `Bash` and Unix `PowerShell` process cancellation now sends SIGTERM to the managed process group first and uses a short `WaitDelay` SIGKILL fallback, allowing cooperative shell cleanup while still bounding ignored-signal commands.
 - `BashOutput` now has the same 100k result budget surface as foreground `Bash`, so oversized background output is truncated in the visible tool result and persisted with `full_output_path` metadata.
-- `Bash` and `PowerShell` background commands now emit tool progress events when the background task starts and finishes, carrying only task IDs, shell/status fields, exit/timed-out/cancelled state, duration, timestamps, and output byte counts without command text.
+- `Bash` and `PowerShell` background commands now emit tool progress events when the background task starts and finishes, carrying only task IDs, shell/status fields, exit/timed-out/cancelled state, duration, timestamps, and output byte counts without command text; completed, timed-out, and cancelled finish paths are covered.
 - `Bash`/`PowerShell` now accept the official `dangerouslyDisableSandbox` semantic boolean input and record it in structured results; full sandbox adapter and override execution semantics remain a separate incomplete parity area.
 - `Bash`/`PowerShell` now surface `dangerouslyDisableSandbox` to the permission engine: normal/default/auto/plan/acceptEdits modes ask for confirmation, `dontAsk` denies it, and only available `bypassPermissions` mode allows it, preventing read-only classification or allow rules from silently approving sandbox override requests.
 - Settings now propagate `sandbox.allowUnsandboxedCommands` into the permission context; when it is `false`, sandbox override requests are denied even in `bypassPermissions`, and settings validation flags non-boolean values for the known sandbox boolean fields.

internal/tools/bash/tools_test.go

@@ -625,6 +625,80 @@ func TestBashBackgroundProgressEvents(t *testing.T) {
 	}
 }
 
+func TestBashBackgroundTimeoutProgressEvent(t *testing.T) {
+	executor := bashExecutor(t)
+	ctx := WithBackgroundState(tool.Context{
+		Context:  context.Background(),
+		Metadata: map[string]any{},
+	}, NewBackgroundState())
+	progressCh := make(chan contracts.ToolProgress, 8)
+	result, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_bash_background_timeout_progress",
+		Name:  "Bash",
+		Input: json.RawMessage(`{"command":"sleep 1","run_in_background":true,"timeout":50}`),
+	}, tool.ProgressFunc(func(progress contracts.ToolProgress) error {
+		progressCh <- progress
+		return nil
+	}))
+	if err != nil {
+		t.Fatal(err)
+	}
+	bashID := result.StructuredContent["bash_id"].(string)
+	finished := waitForBashProgress(t, progressCh, "bash_background_finished")
+	if finished.ToolUseID != "toolu_bash_background_timeout_progress" || finished.Data["bash_id"] != bashID || finished.Data["status"] != "timed_out" {
+		t.Fatalf("finished progress = %#v", finished)
+	}
+	if finished.Data["exit_code"] != -1 || finished.Data["timed_out"] != true || finished.Data["cancelled"] != false {
+		t.Fatalf("timeout progress status = %#v", finished.Data)
+	}
+	if _, ok := finished.Data["command"]; ok {
+		t.Fatalf("timeout progress should not expose command: %#v", finished.Data)
+	}
+}
+
+func TestBashBackgroundCancelProgressEvent(t *testing.T) {
+	executor := bashExecutor(t)
+	ctx := WithBackgroundState(tool.Context{
+		Context:  context.Background(),
+		Metadata: map[string]any{},
+	}, NewBackgroundState())
+	progressCh := make(chan contracts.ToolProgress, 8)
+	result, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_bash_background_cancel_progress",
+		Name:  "Bash",
+		Input: json.RawMessage(`{"command":"trap 'printf term; exit 42' TERM; while :; do sleep 1; done","run_in_background":true,"timeout":5000}`),
+	}, tool.ProgressFunc(func(progress contracts.ToolProgress) error {
+		progressCh <- progress
+		return nil
+	}))
+	if err != nil {
+		t.Fatal(err)
+	}
+	bashID := result.StructuredContent["bash_id"].(string)
+	started := waitForBashProgress(t, progressCh, "bash_background_started")
+	if started.Data["bash_id"] != bashID {
+		t.Fatalf("started progress = %#v", started)
+	}
+	time.Sleep(50 * time.Millisecond)
+	if _, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_bash_background_cancel_progress_kill",
+		Name:  "KillBash",
+		Input: json.RawMessage(`{"bash_id":` + strconvQuote(bashID) + `}`),
+	}, nil); err != nil {
+		t.Fatal(err)
+	}
+	finished := waitForBashProgress(t, progressCh, "bash_background_finished")
+	if finished.ToolUseID != "toolu_bash_background_cancel_progress" || finished.Data["bash_id"] != bashID || finished.Data["status"] != "cancelled" {
+		t.Fatalf("finished progress = %#v", finished)
+	}
+	if finished.Data["exit_code"] != -1 || finished.Data["timed_out"] != false || finished.Data["cancelled"] != true {
+		t.Fatalf("cancel progress status = %#v", finished.Data)
+	}
+	if _, ok := finished.Data["command"]; ok {
+		t.Fatalf("cancel progress should not expose command: %#v", finished.Data)
+	}
+}
+
 func TestBashBackgroundTimeout(t *testing.T) {
 	executor := bashExecutor(t)
 	ctx := WithBackgroundState(tool.Context{

internal/tools/powershell/tools_test.go

@@ -529,6 +529,81 @@ func TestPowerShellBackgroundProgressEvents(t *testing.T) {
 	}
 }
 
+func TestPowerShellBackgroundTimeoutProgressEvent(t *testing.T) {
+	requirePowerShell(t)
+	executor := powerShellExecutor(t)
+	ctx := WithBackgroundState(tool.Context{
+		Context:  context.Background(),
+		Metadata: map[string]any{},
+	}, NewBackgroundState())
+	progressCh := make(chan contracts.ToolProgress, 8)
+	result, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_powershell_background_timeout_progress",
+		Name:  "PowerShell",
+		Input: json.RawMessage(`{"command":"Start-Sleep -Milliseconds 1000","run_in_background":true,"timeout":50}`),
+	}, tool.ProgressFunc(func(progress contracts.ToolProgress) error {
+		progressCh <- progress
+		return nil
+	}))
+	if err != nil {
+		t.Fatal(err)
+	}
+	powerShellID := result.StructuredContent["powershell_id"].(string)
+	finished := waitForPowerShellProgress(t, progressCh, "powershell_background_finished")
+	if finished.ToolUseID != "toolu_powershell_background_timeout_progress" || finished.Data["powershell_id"] != powerShellID || finished.Data["status"] != "timed_out" {
+		t.Fatalf("finished progress = %#v", finished)
+	}
+	if finished.Data["exit_code"] != -1 || finished.Data["timed_out"] != true || finished.Data["cancelled"] != false {
+		t.Fatalf("timeout progress status = %#v", finished.Data)
+	}
+	if _, ok := finished.Data["command"]; ok {
+		t.Fatalf("timeout progress should not expose command: %#v", finished.Data)
+	}
+}
+
+func TestPowerShellBackgroundCancelProgressEvent(t *testing.T) {
+	requirePowerShell(t)
+	executor := powerShellExecutor(t)
+	ctx := WithBackgroundState(tool.Context{
+		Context:  context.Background(),
+		Metadata: map[string]any{},
+	}, NewBackgroundState())
+	progressCh := make(chan contracts.ToolProgress, 8)
+	result, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_powershell_background_cancel_progress",
+		Name:  "PowerShell",
+		Input: json.RawMessage(`{"command":"Start-Sleep -Seconds 5","run_in_background":true,"timeout":5000}`),
+	}, tool.ProgressFunc(func(progress contracts.ToolProgress) error {
+		progressCh <- progress
+		return nil
+	}))
+	if err != nil {
+		t.Fatal(err)
+	}
+	powerShellID := result.StructuredContent["powershell_id"].(string)
+	started := waitForPowerShellProgress(t, progressCh, "powershell_background_started")
+	if started.Data["powershell_id"] != powerShellID {
+		t.Fatalf("started progress = %#v", started)
+	}
+	if _, err := executor.Execute(ctx, contracts.ToolUse{
+		ID:    "toolu_powershell_background_cancel_progress_kill",
+		Name:  "KillPowerShell",
+		Input: json.RawMessage(`{"powershell_id":` + strconvQuote(powerShellID) + `}`),
+	}, nil); err != nil {
+		t.Fatal(err)
+	}
+	finished := waitForPowerShellProgress(t, progressCh, "powershell_background_finished")
+	if finished.ToolUseID != "toolu_powershell_background_cancel_progress" || finished.Data["powershell_id"] != powerShellID || finished.Data["status"] != "cancelled" {
+		t.Fatalf("finished progress = %#v", finished)
+	}
+	if finished.Data["exit_code"] != -1 || finished.Data["timed_out"] != false || finished.Data["cancelled"] != true {
+		t.Fatalf("cancel progress status = %#v", finished.Data)
+	}
+	if _, ok := finished.Data["command"]; ok {
+		t.Fatalf("cancel progress should not expose command: %#v", finished.Data)
+	}
+}
+
 func TestPowerShellBackgroundTimeout(t *testing.T) {
 	requirePowerShell(t)
 	executor := powerShellExecutor(t)