Tianyi Cui
|
f7c68394a5
|
Merge branch 'master' into docs/i18n-prompt-v4
|
2026-07-23 23:26:29 +08:00 |
|
Tianyi Cui
|
f27f8f6162
|
Merge commit 'refs/codex-unblock/20260723/pr570-master-initial' into worktree/pr570-merge-master-20260723
# Conflicts:
# .agents/notes/implemented/architecture/2026-06-18-shared-persistence-write-coordinator.md
# docs/core-data-structures/persistence.md
# packages/session-persistence/session-persistence/README.md
|
2026-07-23 23:21:08 +08:00 |
|
Tianyi Cui
|
6e05708ef4
|
Merge remote-tracking branch 'origin/master' into worktree/pr348-retarget-latest-master
|
2026-07-23 23:13:43 +08:00 |
|
Tianyi Cui
|
3a87104a9a
|
fix(i18n): harden prompt response handling
|
2026-07-23 23:12:56 +08:00 |
|
Tianyi Cui
|
d1b5f5c64f
|
Merge remote-tracking branch 'origin/master' into worktree/pr348-retarget-latest-master
# Conflicts:
# vitest.snapshot.config.ts
|
2026-07-23 22:46:19 +08:00 |
|
Tianyi Cui
|
caaf4f8d18
|
fix(i18n): complete prompt v4 pipeline path
|
2026-07-23 22:41:53 +08:00 |
|
Tianyi Cui
|
7a09ca8cd2
|
Merge remote-tracking branch 'origin/master' into worktree/pr540-merge-master-20260723
|
2026-07-23 22:34:49 +08:00 |
|
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 |
|
Tianyi Cui
|
db99f6881d
|
Merge remote-tracking branch 'origin/master' into worktree/pr348-retarget-latest-master
|
2026-07-23 21:56:10 +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 |
|
Tianyi Cui
|
6046a13a29
|
fix(i18n): harden prompt v4 contract
|
2026-07-23 21:44:41 +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 |
|
_Kerman
|
c596dddfe1
|
fix: return stored metadata from live loads
|
2026-07-23 21:28:52 +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 |
|
_Kerman
|
4e5166828b
|
fix: reserve cold loads across repair
|
2026-07-23 20:58:20 +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 |
|
_Kerman
|
816907ba2d
|
Merge remote-tracking branch 'origin/master' into refactor/eager-session-persistence
# Conflicts:
# .agents/notes/implemented/architecture/2026-06-18-shared-persistence-write-coordinator.md
# packages/session-persistence/session-persistence-jsonl/README.md
# packages/session-persistence/session-persistence/src/coordinator.ts
# packages/session-persistence/session-persistence/tests/persistence.spec.ts
|
2026-07-23 20:32:19 +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 |
|