5dbcedfbba
Merge origin/master into feature/shared-cli-config-foundation
2026-07-30 10:11:38 +08:00
0d5cf7ce4e
Merge origin/master (oxlint migration, webtest migration)
...
Conflict: apps/web/tests/workspace-flow.snapshot.ts was deleted on
master (#921 sinks assembled-app journeys to package-level benches)
and modified here (show-hidden/prefix-filter and crumb-back lanes).
Resolved by taking the deletion: the same behaviors are asserted at
package level in directory-picker-browse's directory-browser.spec.tsx
and client-flow.spec.tsx, which is the post-migration home for them.
2026-07-30 09:32:55 +08:00
b46dcb16cb
revert: restore the reviewer-approved tree (97a192d7b)
...
ZiyaZhang approved 97a192d7b; the subsequent bot-review rounds (7-24)
landed after that approval and were not requested by a human reviewer.
This commit restores the approved tree verbatim as a forward commit
(pushed history stays intact). git diff 97a192d7b is empty.
2026-07-30 09:22:16 +08:00
6e5a155868
Merge branch 'master' into fix/human-transcript-projection
...
Conflicts, all in files this branch and master both touched:
- `chat/helpers.ts` — kept both sides. Master replaced the inline env
filter in `gitBranch` with `scrubbedParentEnv()`; this branch added the
surface-marker and compaction-source imports.
- `docs/module-graph.md` — regenerated. Both sides added a `tui` edge
(master `subprocess`, this branch `compact`); the generated row now
carries both.
- Three `.i18n.yaml` pairing records — re-recorded from the merged files.
Blob hashes cannot be hand-merged, and both sides' prose survives on
each side of every pair.
`docs/cordis-catalog/services.md` also regenerated for shifted source
lines and master's new `sessionTitle.rename` entry.
2026-07-30 08:53:26 +08:00
112b0fbad1
fix(web): address queue review feedback
2026-07-30 04:12:38 +08:00
ebbcfdd03b
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
...
# Conflicts:
# packages/core/agent-loop/src/agent.ts
2026-07-30 03:33:41 +08:00
de24461b91
fix(host): review round 22 — note enumeration includes the create path; cross-method equality pinned; NFD-volume boundary recorded
2026-07-30 02:53:45 +08:00
983e6d07a4
fix(host): review round 20 — canonical shape declared at the interface; hermetic home-shape spec; single resolve
2026-07-30 02:10:07 +08:00
7ce330f0e4
refactor(agent): scope queue actions to edit and remove
2026-07-30 01:58:51 +08:00
cc92b6b578
fix(host,client): review round 19 — home ships resolved on the wire; client mirror shrinks to the draft side; scoped focus guarantee
2026-07-30 01:50:45 +08:00
93fc1e2ab8
Merge branch 'master' into feat/ask-question-gui
2026-07-30 01:46:05 +08:00
c8cdc42418
Merge remote-tracking branch 'origin/master' into codex/experimental-plugin-group-note
2026-07-30 01:38:34 +08:00
78cf5de686
Merge origin/master into fix/hook-matcher-validation
2026-07-30 01:38:18 +08:00
401afde164
Merge remote-tracking branch 'origin/master' into codex/experimental-plugin-group-note
...
# Conflicts:
# packages/README.i18n.yaml
# packages/README.md
# packages/README.zh.md
2026-07-30 01:32:41 +08:00
9545914c10
fix(host): review round 18 — draft dirs fully normalized; JSDoc reattached; third parking target documented
2026-07-30 01:28:55 +08:00
4582e1425c
Merge commit 'refs/codex/pr885/master-20260730' into worktree/retarget-pr885-20260729
...
# Conflicts:
# eslint.config.mjs
2026-07-30 01:18:28 +08:00
014e39203e
Merge commit '3a1b995e4fc3eb9acd6324c4b581f7aeb110b8be' into worktree/retarget-pr828-20260729
2026-07-30 01:18:18 +08:00
643f9be33f
Merge remote-tracking branch 'origin/master' into mergebot/pr883
...
# Conflicts:
# apps/web/tests/todo-display.snapshot.ts
# docs/event-producer-consumer.md
2026-07-30 01:16:46 +08:00
b7dbb25c08
docs: clarify release tooling exclusion
2026-07-30 01:14:25 +08:00
12d302ea59
fix(host): review round 17 — separator-fold drafts; UNC noise scrub; honest empty-chain fallback; toggle focus keep
2026-07-30 01:10:37 +08:00
0e53b7a8aa
cleanup(build): drop helper architecture parsing
2026-07-30 01:07:47 +08:00
76e14793a9
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.i18n.yaml
# docs/event-producer-consumer.md
2026-07-30 01:04:25 +08:00
d9eb3545d8
Merge remote-tracking branch 'origin/master' into mergebot/pr883
...
# Conflicts:
# packages/client/tsdown.client.ts
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/PendingCard.tsx
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
# packages/client/ui-conversation/src/client/toolviews/todo-row.module.css
# packages/client/ui-conversation/src/client/toolviews/todo-row.tsx
# packages/client/ui-conversation/tests/chat-apply.spec.tsx
# packages/client/ui-conversation/tests/coverage-tails.spec.tsx
# packages/client/ui-conversation/tests/todo-panel.spec.tsx
# packages/client/ui-primitives/src/icons/index.tsx
# packages/client/ui-primitives/tests/icons.spec.tsx
# packages/client/ui-question/README.i18n.yaml
# packages/client/ui-question/src/client/QuestionComposer.module.css
# packages/client/ui-question/src/client/QuestionComposer.tsx
2026-07-30 01:01:14 +08:00
c97b1d025e
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
...
# Conflicts:
# apps/web/tsconfig.json
# docs/architecture.i18n.yaml
# docs/event-producer-consumer.md
# packages/client/runtime/README.i18n.yaml
# packages/client/tsdown.client.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent/README.i18n.yaml
# packages/core/agent/README.zh.md
# packages/host/apiproxy/README.i18n.yaml
# tsconfig.host.json
2026-07-30 00:30:38 +08:00
3d5fe9ffab
Merge branch 'master' into fix/hook-matcher-validation
2026-07-30 00:21:43 +08:00
91a104acef
docs(pty): explain spawn-helper override precedence
2026-07-30 00:20:44 +08:00
92052c1220
docs(persistent-bash): define cancellation reset
2026-07-30 00:18:55 +08:00
9549c73f30
fix(persistent-bash): distinguish shell exit status
2026-07-30 00:15:39 +08:00
0440c4cc0c
Merge latest master into codex/migrate-to-oxlint
2026-07-30 00:13:30 +08:00
a150cbc63b
Merge branch 'master' into fix/ui-action-display
2026-07-30 00:10:25 +08:00
b71fbe770d
fix: ci
2026-07-30 00:08:59 +08:00
514238ee47
fix(editor): preserve tabs in file views
2026-07-30 00:05:58 +08:00
f893e2281d
feat(agent): add addressable queue operations
2026-07-30 00:05:00 +08:00
dcb8b592ee
Merge remote-tracking branch 'origin/master' into worktree-trpc
2026-07-30 00:04:52 +08:00
4e7f90667a
fix: chat agent message actions display
2026-07-30 00:01:49 +08:00
c00a54d334
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
...
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
2026-07-30 00:01:13 +08:00
f773985e71
feat(typert): add compiler-independent type pipeline
2026-07-29 23:45:42 +08:00
50350088f9
docs: correct the Oxlint workflow contract
2026-07-29 23:45:06 +08:00
19fc1575f3
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
...
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
2026-07-29 23:41:20 +08:00
1b89267d23
fix(host): review round 12 nits — two-stage create parking documented; CSS DOM order; busy-window caveat
2026-07-29 23:39:58 +08:00
fca0c05155
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/skills.i18n.yaml
# docs/core-data-structures/skills.md
# docs/core-data-structures/skills.zh.md
# packages/host/apiproxy/README.i18n.yaml
# packages/skill/skill-local/README.i18n.yaml
# packages/skill/skill/README.i18n.yaml
# packages/skill/skill/README.md
# packages/skill/skill/README.zh.md
# packages/skill/skill/src/index.ts
# packages/skill/skill/tests/skill.spec.ts
# packages/skill/tool-skill/README.i18n.yaml
# packages/skill/tool-skill/src/index.ts
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/README.md
# packages/ui/tui/README.zh.md
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/tui.spec.ts
2026-07-29 23:36:49 +08:00
4171f8eaa9
fix(host): review round 11 — every displacing exit re-parks focus; full trailing-separator trim
2026-07-29 23:21:35 +08:00
f477cafc90
Merge commit '01b34d4ff9e0726379b2d0c3febdc977e5ce9ebf' into worktree/retarget-pr828-20260729
2026-07-29 23:20:18 +08:00
1619d7686b
test(skill): close invocation policy coverage gaps
2026-07-29 23:17:07 +08:00
cae3c8c9a1
Merge commit 'refs/codex/pr831/master' into worktree/retarget-pr831-20260729
2026-07-29 23:16:57 +08:00
99daef69ef
fix(hooks): remove speculative regex runtime
2026-07-29 23:15:15 +08:00
5ab240d54f
Merge commit 'refs/codex/pr831/master' into worktree/retarget-pr831-20260729
2026-07-29 23:07:36 +08:00
976114becb
docs(skill): document fail-closed frontmatter validation
2026-07-29 23:03:04 +08:00
cfe77b3a35
Merge commit '834d9dbbceec1b41b009a7d809364adb52aeec43' into worktree/retarget-pr828-20260729-r3
2026-07-29 23:01:22 +08:00
a22d9aea0b
fix(host): review round 10 — trailing-separator home root; dead dep; lazy controller; focus-invariant doc home
2026-07-29 23:00:49 +08:00
Turtle