Tianyi Cui
9fdbae66e7
Merge remote-tracking branch 'origin/master' into worktree/pr576-merge-master-20260723
2026-07-23 22:18:30 +08:00
Tianyi Cui
c688aa486c
Merge remote-tracking branch 'origin/master' into worktree/remove-expose-internals
2026-07-23 22:08:44 +08:00
Tianyi Cui
ce232f8e28
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
2026-07-23 22:07:31 +08:00
Tianyi Cui
85335acd10
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
2026-07-23 22:00:59 +08:00
Tianyi Cui
404da65595
Merge branch 'master' into worktree/web-session-titles
...
# Conflicts:
# apps/web/tests/smoke-real.e2e.ts
# packages/client/connection/tests/fixture.spec.ts
# packages/host/runtime/README.md
# packages/host/runtime/src/api-proxy.ts
2026-07-23 22:00:17 +08:00
Hypatia May
00191e75dd
Merge remote-tracking branch 'origin/master' into session-query-search
2026-07-23 21:55:59 +08:00
Tianyi Cui
64eebc1b35
Merge branch 'master' into codex/plan-mode-active-exit
2026-07-23 21:52:23 +08:00
Hypatia May
72fdf57c00
Merge remote-tracking branch 'origin/session-query-search' into session-query-search
2026-07-23 21:34:23 +08:00
Hypatia May
9482affc48
fix(session-query): make persisted observation non-mutating
2026-07-23 21:33:28 +08:00
Tianyi Cui
f9120a944c
Merge master into session-query-search
2026-07-23 21:18:05 +08:00
Hypatia May
c1fa985c20
Merge remote-tracking branch 'origin/master' into session-query-search
...
# Conflicts:
# docs/architecture.i18n.yaml
# packages/client/ui-sidebar/tests/sidebar-root.spec.tsx
# packages/session-persistence/session-persistence-jsonl/src/index.ts
# packages/session-persistence/session-persistence/README.md
2026-07-23 21:13:29 +08:00
Tianyi Cui
bd04f759a0
Merge master into worktree/pty-review-fixes
2026-07-23 21:09:10 +08:00
fz
8e4f666238
feat(plan): add direct plan exit command
2026-07-23 21:06:03 +08:00
Tianyi Cui
0fb6a2540c
Merge commit 'fc123040d824069a679a52bac84b2e3554589436' into worktree/pty-review-fixes
2026-07-23 20:52:05 +08:00
Tianyi Cui
ea019beae9
Merge branch 'master' into worktree/web-session-titles
2026-07-23 20:51:17 +08:00
Tianyi Cui
26bfd37da0
Merge commit 'refs/codex-unblock/20260723/master' into worktree/pty-review-fixes
...
# Conflicts:
# .agents/notes/implemented/feature/2026-06-30-interception-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/tools.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/README.md
# packages/core/tools/src/index.ts
# packages/core/tools/src/schema.ts
# packages/core/tools/tests/tools.spec.ts
# packages/pty/tool-pty/README.md
# packages/pty/tool-pty/src/index.ts
# packages/pty/tool-pty/src/render.ts
# packages/tasks/tool-tasks/README.md
# packages/tasks/tool-tasks/src/index.ts
2026-07-23 20:50:45 +08:00
Tianyi Cui
d1f9230384
Merge branch 'master' into worktree/remove-expose-internals
2026-07-23 20:50:38 +08:00
Hypatia May
d24a875c5d
fix(session-query): protect live reconciliation
2026-07-23 20:50:29 +08:00
Tianyi Cui
ea75abd71e
docs(gui): correct client coverage lane
2026-07-23 20:45:36 +08:00
imccyu
8f54ccae7f
Merge branch 'worktree/web-carrier-chain' into worktree/web-ask-user-question
2026-07-23 20:36:20 +08:00
Tianyi Cui
eb0cc4eb18
refactor: drop obsolete expose-internals flag
2026-07-23 20:35:09 +08:00
Tianyi Cui
6cb0372d86
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
2026-07-23 20:19:50 +08:00
imccyu
8930b4f5fb
Merge branch 'master' into worktree/web-carrier-chain
2026-07-23 20:19:20 +08:00
Hypatia May
1e457b22e0
refactor(session-query): unify query service
2026-07-23 20:18:05 +08:00
Tianyi Cui
d7c4822f95
Merge origin/master into worktree/web-session-titles
...
# Conflicts:
# packages/client/connection/src/client/fixture.ts
2026-07-23 20:12:40 +08:00
Tianyi Cui
a5cb16cc0e
Merge master into codex/jsonl-storage-identity
2026-07-23 20:12:26 +08:00
imccyu
0f63666522
Merge branch 'worktree/web-carrier-chain' into worktree/web-ask-user-question
2026-07-23 20:09:11 +08:00
imccyu
31c2198a98
Merge branch 'master' into worktree/web-carrier-chain
2026-07-23 20:04:03 +08:00
imccyu
abe3da3656
Merge branch 'master' into worktree/web-carrier-chain
2026-07-23 19:49:26 +08:00
Tianyi Cui
91653be917
Merge branch 'master' into worktree/tui-file-autocomplete
2026-07-23 19:47:29 +08:00
imccyu
3f6158f2c6
Merge branch 'master' into worktree/web-carrier-chain
2026-07-23 19:46:13 +08:00
imccyu
6a896e62a1
Merge branch 'worktree/web-carrier-chain' into worktree/web-ask-user-question
2026-07-23 19:45:41 +08:00
Yichen Jiang
4bf5a85a32
Merge branch 'master' into worktree/tui-file-autocomplete
2026-07-23 19:45:08 +08:00
Tianyi Cui
a3c0b5a3b4
Merge branch 'master' into worktree/ci-subminute-stability
2026-07-23 19:43:54 +08:00
imccyu
ed6bd6d25c
Merge branch 'master' into worktree/web-carrier-chain
2026-07-23 19:38:19 +08:00
Hypatia May
a2a89bf300
fix(session-query): protect derived index permissions
2026-07-23 19:36:05 +08:00
Yichen Jiang
40ce342d81
Merge remote-tracking branch 'origin/master' into worktree/tui-file-autocomplete
...
# Conflicts:
# docs/config-catalog.md
2026-07-23 19:32:13 +08:00
Yichen Jiang
6f624c67c4
feat(web): render assistant Markdown
2026-07-23 19:18:05 +08:00
Tianyi Cui
3bd27df5a2
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
2026-07-23 19:06:03 +08:00
imccyu
2b06aa0102
Merge branch 'worktree/web-carrier-chain' into worktree/web-ask-user-question
...
Restack the ask-user domain layer onto the carrier-chain architecture
branch. Conflict policy: runtime and ui-conversation take the
carrier-chain side (master sessions shape, dual-kind PendingCard,
'internal' envelope shell tests); the 'cancelled' wire code and its
semantics tests stay in apiproxy + ui-question (domain layer); the
smoke fixture keeps the nine-bundle success pass with the resident
question round over the carrier-chain first-describe shape.
2026-07-23 18:50:30 +08:00
imccyu
8e3378d08f
Merge branch 'master' into fix/web-zstd-session-logs
2026-07-23 18:46:51 +08:00
Tianyi Cui
45f3e260fd
Merge remote-tracking branch 'origin/master' into worktree/ci-subminute-stability
2026-07-23 18:41:43 +08:00
Tianyi Cui
7e27f1b00f
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
2026-07-23 18:40:13 +08:00
Tianyi Cui
d2dc618e3f
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
...
# Conflicts:
# .agents/notes/implemented/process/2026-07-20-gui-testing-system.i18n.yaml
# packages/client/ui-conversation/tests/apply-inject.spec.tsx
# packages/client/ui-conversation/tests/chat-stats-bash-sample.spec.tsx
# packages/client/ui-conversation/tests/gate-branch-tails.spec.tsx
# packages/client/ui-conversation/tests/selection-survival.spec.ts
# packages/client/ui-conversation/tests/skeleton-branches.spec.tsx
# packages/client/ui-conversation/tests/skeleton.spec.tsx
# packages/client/ui-layout/tests/service.spec.ts
# packages/client/ui-sidebar/tests/apply.spec.tsx
# packages/client/ui-sidebar/tests/store.spec.ts
# packages/client/ui-trajectory/tests/views.spec.tsx
# packages/client/web/src/app.tsx
# packages/client/web/tests/boot.spec.tsx
# packages/host/runtime/README.md
# packages/host/runtime/tests/host-runtime.spec.ts
2026-07-23 18:39:48 +08:00
Tianyi Cui
0d87f7ee27
Merge remote-tracking branch 'origin/master' into worktree/ci-subminute-stability
2026-07-23 18:33:04 +08:00
imccyu
97428e9922
Merge branch 'master' into fix/demo-web-build
2026-07-23 18:32:50 +08:00
imccyu
d4ec819acb
Merge branch 'master' into fix/web-zstd-session-logs
2026-07-23 18:32:47 +08:00
imccyu
ddd9e4a3bb
Merge branch 'master' into fix/demo-web-build
2026-07-23 18:29:57 +08:00
imccyu
5c53af88b3
Merge branch 'master' into fix/web-zstd-session-logs
2026-07-23 18:29:44 +08:00
Tianyi Cui
c88fade5b3
Merge branch 'master' into worktree/ci-enterprise-subminute
2026-07-23 18:29:15 +08:00
