fz
576f17ce99
Merge branch 'codex/fix-compact-agents-reinjection' into codex/fix-resume-baseline-dedup
2026-08-06 11:48:30 +08:00
fz
0e49ed2c76
Merge remote-tracking branch 'origin/master' into codex/fix-compact-agents-reinjection
...
# Conflicts:
# docs/architecture.i18n.yaml
2026-08-06 11:48:16 +08:00
imccyu
c93438e6b3
docs(jsonl): align restore slice interval
2026-08-06 10:40:32 +08:00
imccyu
82eb1dde46
fix(jsonl): avoid duplicate decoder control flow
2026-08-06 10:40:32 +08:00
imccyu
e89b1e612f
fix(session): address restore review feedback
2026-08-06 10:40:32 +08:00
imccyu
2551b757fb
perf(jsonl): shorten cooperative decode slices
2026-08-06 10:40:31 +08:00
imccyu
03bb663966
test(jsonl): cover reusable decoder branches
2026-08-06 10:40:31 +08:00
imccyu
456d4319bf
fix(subagent): skip ordinary forks during child listing
2026-08-06 10:40:31 +08:00
imccyu
02c61d4481
fix(jsonl): preserve private decoder checksum validation
2026-08-06 10:40:31 +08:00
imccyu
d19e598d5e
test(jsonl): cover reusable decoders in node matrix
2026-08-06 10:40:31 +08:00
imccyu
9cd2a20141
perf(session): streamline restored event admission
2026-08-06 10:40:31 +08:00
imccyu
03983ff986
perf(jsonl): scan decoded frames incrementally
2026-08-06 10:40:31 +08:00
imccyu
353226246e
perf(jsonl): add reusable zstd frame decoders
2026-08-06 10:40:31 +08:00
fz
de8ec21f80
Merge remote-tracking branch 'origin/codex/fix-compact-agents-reinjection' into codex/fix-resume-baseline-dedup
...
# Conflicts:
# .agents/notes/implemented/feature/2026-06-24-workspace-context.i18n.yaml
# .agents/notes/implemented/feature/2026-06-24-workspace-context.md
# .agents/notes/implemented/feature/2026-06-24-workspace-context.zh.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/session.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/session.jsonl
# packages/context/workspace-context/README.i18n.yaml
# packages/context/workspace-context/README.md
# packages/context/workspace-context/README.zh.md
# packages/context/workspace-context/src/index.ts
# packages/context/workspace-context/src/state.ts
# packages/context/workspace-context/tests/workspace-context.spec.ts
2026-08-06 10:37:43 +08:00
imccyu
e37aa41f87
fix(session-persistence): close preparation races
2026-08-06 10:19:51 +08:00
fz
dccd6bf79f
Merge remote-tracking branch 'origin/master' into codex/fix-compact-agents-reinjection
...
# Conflicts:
# .agents/notes/implemented/feature/2026-06-24-workspace-context.i18n.yaml
# .agents/notes/implemented/feature/2026-06-24-workspace-context.md
# .agents/notes/implemented/feature/2026-06-24-workspace-context.zh.md
# docs/architecture.i18n.yaml
# docs/architecture.md
# docs/architecture.zh.md
# docs/cordis-catalog/events.md
# docs/core-data-structures/system-prompt.i18n.yaml
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/workspace-context/session.jsonl
# packages/context/workspace-context/README.i18n.yaml
# packages/context/workspace-context/README.md
# packages/context/workspace-context/README.zh.md
# packages/context/workspace-context/src/index.ts
# packages/context/workspace-context/tests/workspace-context.spec.ts
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent-loop/src/agent.ts
# packages/core/agent/README.i18n.yaml
# packages/core/agent/README.md
# packages/core/agent/README.zh.md
# packages/core/agent/tests/agent.spec.ts
# packages/core/system-prompt/README.i18n.yaml
2026-08-06 10:16:16 +08:00
imccyu
2f98f29992
fix(session): address restore review feedback
2026-08-06 05:13:26 +08:00
imccyu
f0868d6a70
test(session): cover remaining preparation races
2026-08-06 04:29:39 +08:00
imccyu
bb5e9ea1c7
test(session): cover persistence revision races
2026-08-06 04:11:58 +08:00
imccyu
ede74b1926
fix(session-persistence): invalidate stale preparations
2026-08-06 04:11:58 +08:00
imccyu
5e317371e5
test(session): accept pre-epoch event timestamps
2026-08-06 04:11:58 +08:00
imccyu
feb2c35cef
fix(session-persistence): address preparation review feedback
2026-08-06 04:11:58 +08:00
imccyu
466390c1af
test: cover restored suffix init failure
2026-08-06 04:11:57 +08:00
imccyu
beb9b2a7fa
test: close session preparation CI gaps
2026-08-06 04:11:57 +08:00
imccyu
2b9428f35d
fix(session-persistence): satisfy preparation gates
2026-08-06 04:11:57 +08:00
imccyu
c026ad61a9
fix(session): reconcile restore after rebase
2026-08-06 04:11:57 +08:00
imccyu
e089ef92d8
docs: document session preparation flow
2026-08-06 04:11:57 +08:00
imccyu
deefceaf8a
test: cover session preparation lifecycle
2026-08-06 04:11:57 +08:00
imccyu
0afc42309d
feat: add reusable session preparation
2026-08-06 04:11:57 +08:00
Huanqi Cao
17ff1e0d4a
Merge pull request #1624 from deepseek-harness/feat/pwsh-ui-parity
...
feat(pwsh): render pwsh calls as bash-shaped terminal cards in the Web UI
2026-08-05 22:20:11 +08:00
Huanqi Cao
ca65cf1e14
Merge remote-tracking branch 'origin/master' into feat/pwsh-ui-parity
...
# Conflicts:
# apps/web/tsconfig.json
2026-08-05 21:51:31 +08:00
_Kerman
dc2e2821b9
Merge follow-up: re-record translation hashes and fix e2e fixture shape
2026-08-05 21:42:59 +08:00
_Kerman
207e32493c
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
Resolve translation-pairing hashes after the merge and adapt the
math-rendering e2e fixture to the simplified turn/start event shape.
2026-08-05 21:42:33 +08:00
_Kerman
d3249f096b
refactor(agent): publish agent/inbox/claimed from Inbox.claim
...
Move the claimed-message notification loop out of the loop's pre-step
into Inbox.claim(target, turn), so the step-boundary operation publishes
its own claimed notifications like insertions and discards do.
2026-08-05 21:36:51 +08:00
fz
7604e82bf0
Merge remote-tracking branch 'origin/master' into codex/fix-math-rendering
2026-08-05 20:51:06 +08:00
fz
e0328fc44d
Merge remote-tracking branch 'origin/master' into codex/fix-math-rendering
...
# Conflicts:
# packages/client/ui-primitives/README.i18n.yaml
2026-08-05 20:50:50 +08:00
fz
1580fc0536
Merge remote-tracking branch 'origin/codex/fix-compact-agents-reinjection' into codex/fix-resume-baseline-dedup
2026-08-05 20:43:33 +08:00
_Kerman
488b8df547
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-25-web-client-session-scope-and-provide-channel.i18n.yaml
# docs/architecture.i18n.yaml
# docs/architecture.md
# docs/architecture.zh.md
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/cookbook/extension-cookbook.md
# docs/cookbook/extension-cookbook.zh.md
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/core-data-structures/session.i18n.yaml
# docs/defensive-patterns.i18n.yaml
# packages/acp/acp/README.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-goal/README.i18n.yaml
# packages/compact/compact-basic/README.i18n.yaml
# packages/context/README.i18n.yaml
# packages/context/README.md
# packages/context/README.zh.md
# packages/context/session-reference/README.i18n.yaml
# packages/context/session-reference/README.md
# packages/context/session-reference/README.zh.md
# packages/context/tmux-context/README.i18n.yaml
# packages/core/session/README.i18n.yaml
# packages/core/session/README.md
# packages/core/session/README.zh.md
# packages/goal/command-goal/README.i18n.yaml
# packages/goal/goal-session/README.i18n.yaml
# packages/goal/goal-session/README.zh.md
# packages/guard/README.i18n.yaml
# packages/guard/README.md
# packages/guard/README.zh.md
# packages/guard/repeat-tool-guard/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
# packages/plan/plan-mode/README.i18n.yaml
# packages/sdk/sdk-client/README.i18n.yaml
# packages/sdk/sdk-client/README.md
# packages/sdk/sdk-client/README.zh.md
# packages/session-persistence/session-persistence/README.i18n.yaml
# packages/subagent/subagent-dsh-sdk/README.i18n.yaml
# python/sdk/README.i18n.yaml
2026-08-05 20:43:30 +08:00
fz
b308c8ee64
Merge remote-tracking branch 'origin/master' into codex/fix-compact-agents-reinjection
2026-08-05 20:42:28 +08:00
_Kerman
208ec20dd9
docs(agent): mark claim as the loop-internal step-boundary operation
2026-08-05 20:26:46 +08:00
imccyu
749108c2b0
Merge branch 'master' into xtr/trajectory-virtual-scroll
2026-08-05 20:02:53 +08:00
creatixchu
452462a504
Merge remote-tracking branch 'origin/master' into worktree/composer-scrollbar-gutter
2026-08-05 18:20:36 +08:00
_Kerman
2d2b542372
Merge remote-tracking branch 'origin/master' into xtr/trajectory-virtual-scroll
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
2026-08-05 18:11:51 +08:00
fz
9db951b1e7
Merge remote-tracking branch 'origin/codex/fix-compact-agents-reinjection' into codex/fix-resume-baseline-dedup
2026-08-05 17:42:58 +08:00
fz
27623f52dc
Merge origin/master into codex/fix-compact-agents-reinjection
2026-08-05 17:42:08 +08:00
Huanqi Cao
8fcb392fe1
Merge origin/master into feat/pwsh-ui-parity
2026-08-05 17:41:03 +08:00
_Kerman
a006d19bde
Merge remote-tracking branch 'origin/master' into fix/workspace-blank-session-reuse-membership
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
2026-08-05 16:58:36 +08:00
_Kerman
829539a11b
Merge remote-tracking branch 'origin/master' into xtr/trajectory-virtual-scroll
2026-08-05 16:57:08 +08:00
creatixchu
e627c156f6
Merge remote-tracking branch 'origin/master' into worktree/composer-scrollbar-gutter
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-08-05 16:55:12 +08:00
_Kerman
c634fc2917
fix(trajectory): show exact millisecond durations consistently
...
Drop the details-panel Duration toggle: Duration rows always show
integer milliseconds, matching the cell time column. Timeline labels
(Total/TTFT/Decoding) and step-group descriptions previously fell back
to second labels at or above one second; they now also show exact
milliseconds via the shared formatDurationMillis formatter.
2026-08-05 16:46:23 +08:00