pku-xht b5fb52688f Merge commit 'f1a9ab14fe882f9b855ea9cc3f16ddc9a3b0284d' into codex/bounded-background-tasks-v2 ...

# Conflicts:
#	.agents/notes/implemented/architecture/2026-06-20-generic-long-running-tool-runtime.i18n.yaml
#	.agents/notes/implemented/architecture/2026-06-20-generic-long-running-tool-runtime.md
#	.agents/notes/implemented/architecture/2026-06-20-generic-long-running-tool-runtime.zh.md
#	.agents/notes/implemented/architecture/2026-07-26-task-registry-seam.i18n.yaml
#	.agents/notes/implemented/architecture/2026-07-26-task-registry-seam.md
#	.agents/notes/implemented/architecture/2026-07-26-task-registry-seam.zh.md
#	docs/config-catalog.i18n.yaml
#	docs/config-catalog.md
#	docs/config-catalog.zh.md
#	docs/subsystems/tasks.i18n.yaml
#	docs/subsystems/tasks.md
#	docs/subsystems/tasks.zh.md
#	packages/examples/acp-demo/src/index.ts
#	packages/tasks/tasks-local/tests/tasks.spec.ts
#	packages/tasks/tasks/README.i18n.yaml
#	packages/tasks/tasks/README.md
#	packages/tasks/tasks/README.zh.md

2026-08-11 16:44:05 +08:00

..

advanced-toolchain

test(snapshot): refresh pins after master merge

2026-08-11 14:45:14 +08:00

background-task-admission

fix(tasks): bound per-session background work

2026-08-11 16:23:05 +08:00

bash-spill

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

bash-tool-turn

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

both-mode-turn

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

cancel

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

cancel-tool-calls

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

code-mode-turn

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

code-mode-workspace-context

test: update conversation assembly coverage and docs

2026-08-09 18:16:44 +08:00

cordis-inspect-jsdoc

test: refresh terminology snapshots

2026-08-11 15:23:05 +08:00

empty-response-retry

test: update conversation assembly coverage and docs

2026-08-09 18:16:44 +08:00

error-finish

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

escalation-approved

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

escalation-rejected

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

fs-delete-recreate

fix(fs): observe absence before guarded recreation

2026-08-09 17:43:53 +08:00

fs-edit

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

fs-escalation-approved

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

fs-glob-sampling

test(session): align turn-end contract artifacts

2026-08-04 14:09:52 +08:00

fs-policy-reject

Merge pull request #1343 from deepseek-harness/feat/fs-tool-error-remedy

2026-08-07 14:15:08 +08:00

fs-read

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

fs-read-window

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

fs-write

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

fs-write-overwrite

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

fs-write-overwrite-bounded

fix(fs-local): degrade basis I/O failures to null

2026-08-08 11:49:42 -07:00

handshake

refactor(acp): reduce bridge to automation protocol

2026-07-24 01:40:25 +08:00

hook-cc-invalid-matcher

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

hook-cc-posttool-block

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

hook-cc-posttool-context

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

hook-cc-pretool-ask

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

hook-cc-pretool-deny

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

hook-cc-promptsubmit-block

fix(agent-loop): open turns before pre-step

2026-08-04 13:49:35 +08:00

hook-cc-promptsubmit-context

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

hook-cc-stop-continue

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

hook-codex-invalid-matcher

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

hook-codex-posttool-block

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

hook-codex-posttool-context

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

hook-codex-pretool-block

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

hook-codex-promptsubmit-block

fix(agent-loop): open turns before pre-step

2026-08-04 13:49:35 +08:00

hook-codex-promptsubmit-context

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

hook-codex-stop-continue

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

lsp-definition

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

missing-sandbox-runner

fix(sandbox): update the missing-runner snapshot for the Windows-aware SANDBOX_UNAVAILABLE text

2026-08-08 18:16:19 +08:00

multi-turn

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

packed-chunks

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

parallel-tool-calls

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

partial-landlock-child-failure

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

product-subagent-both

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

product-subagent-codex

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

pty-tools

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

pwsh-tool-turn

test(snapshot): refresh pwsh turn log

2026-08-05 10:54:45 +08:00

read-image

test(snapshot): refresh fork schema pins after master merge

2026-08-11 13:23:43 +08:00

read-image-text-route

feat(fs): add a minimal read_image tool over the attachment and fs seams

2026-08-10 15:09:07 +08:00

reject-extra-dirs

refactor(acp): reduce bridge to automation protocol

2026-07-24 01:40:25 +08:00

repeat-tool-guard

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

session-query-spill

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

session-sandbox-root

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

session-title-after-turn

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

skill-load

feat(tool-skill): teach the catalog about user-explicit skill injection

2026-08-08 00:55:37 +08:00

subagent-child-question-rejection

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

subagent-continuable

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

subagent-continuable-inheritance

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

subagent-depth-two-rejection

test(snapshot): refresh pins after master merge

2026-08-11 14:45:14 +08:00

subagent-fork

fix(subagent): pin delegated child approvals to 'never' within the inherited sandbox scope

2026-08-10 19:17:37 +08:00

subagent-list-agents

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

subagent-max-tokens-partial

Merge remote-tracking branch 'origin/master' into fix/subagent-empty-terminal-message-output

2026-08-10 22:59:23 +08:00

subagent-mixed

test(snapshot): refresh pins after master merge

2026-08-11 14:45:14 +08:00

subagent-multi

test(snapshot): refresh pins after master merge

2026-08-11 14:45:14 +08:00

subagent-parallel

test(snapshot): refresh pins after master merge

2026-08-11 14:45:14 +08:00

subagent-published-run-failure

fix(subagent): pin delegated child approvals to 'never' within the inherited sandbox scope

2026-08-10 19:17:37 +08:00

subagent-report

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

subagent-spawn

fix(subagent): pin delegated child approvals to 'never' within the inherited sandbox scope

2026-08-10 19:17:37 +08:00

text-turn

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

todo-write

Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress

2026-08-06 13:04:33 +08:00

tool-call-turn

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00

web-fetch

fix(subagent): report resumable children as ready

2026-08-11 12:38:57 +08:00

workflow-run

fix(subagent): pin delegated child approvals to 'never' within the inherited sandbox scope

2026-08-10 19:17:37 +08:00

workspace-context

test compact checkpoint snapshot identity

2026-08-09 20:42:39 +08:00

workspace-edit

Merge remote-tracking branch 'origin/worktree/context-source-cards' into worktree/context-forms-remaining

2026-08-06 11:49:03 +08:00