 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
|
ce232f8e28
|
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
|
2026-07-23 22:07:31 +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
|
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 |
|
|
_Kerman
|
4e5166828b
|
fix: reserve cold loads across repair
|
2026-07-23 20:58:20 +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 |
|
|
_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 |
|
|
Hypatia May
|
1e457b22e0
|
refactor(session-query): unify query service
|
2026-07-23 20:18:05 +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 |
|
|
_Kerman
|
7f5ba286fe
|
fix: keep crash repair away from live sessions
|
2026-07-23 18:31:37 +08:00 |
|
|
Tianyi Cui
|
f666c39379
|
fix(web): generate model-backed session titles
|
2026-07-23 18:20:17 +08:00 |
|
|
_Kerman
|
022b42a450
|
Merge origin/master into refactor/eager-session-persistence
|
2026-07-23 18:00:36 +08:00 |
|
|
Tianyi Cui
|
fa5c3fa0b9
|
Merge origin/master into codex/code-mode-complete-result-card
|
2026-07-23 17:59:58 +08:00 |
|
|
_Kerman
|
406c82d1a7
|
refactor: eagerly persist session events
|
2026-07-23 17:57:26 +08:00 |
|
|
Hypatia May
|
0a0f19cf57
|
Merge remote-tracking branch 'origin/master' into session-query-search
# Conflicts:
# .agents/notes/implemented/feature/2026-07-10-session-query-service.md
# .agents/notes/implemented/feature/2026-07-10-sqlite-session-query-provider.md
# .agents/notes/proposed/feature/2026-07-10-sqlite-session-query-provider.md
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/core-data-structures/persistence.md
# docs/core-data-structures/session-query.md
# docs/module-graph.md
# docs/rfc/INDEX.md
# packages/README.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/hooks/hooks-claude/tests/coverage.spec.ts
# packages/session-persistence/session-persistence-jsonl/src/index.ts
# packages/session-persistence/session-persistence-jsonl/tests/jsonl.spec.ts
# packages/session-persistence/session-persistence-sqlite/README.md
# packages/session-persistence/session-persistence-sqlite/src/index.ts
# packages/session-persistence/session-persistence-sqlite/src/schema.ts
# packages/session-persistence/session-persistence-sqlite/tests/sqlite.spec.ts
# packages/session-persistence/session-persistence/README.md
# packages/session-persistence/session-persistence/package.json
# packages/session-query/README.md
# packages/session-query/session-query/README.md
# packages/session-query/session-query/package.json
# packages/session-query/session-query/src/config.ts
# packages/session-query/session-query/src/index.ts
# packages/session-query/session-query/src/types.ts
# pnpm-lock.yaml
# scripts/gen-doc-graphs.ts
# scripts/type-equiv.manifest.json
# tsconfig.host.json
# tsconfig.json
|
2026-07-23 13:56:56 +08:00 |
|
 ZiyaZhang
|
2a1b3139f9
|
feat(tui): add interactive extension service
|
2026-07-22 21:30:17 -07:00 |
|
|
Tianyi Cui
|
2821826e2c
|
fix(pty): close final review gaps
|
2026-07-23 02:53:43 +08:00 |
|
|
Tianyi Cui
|
a6b769c427
|
Merge codex/canonical-tool-output into codex/code-mode-typed-results
|
2026-07-23 02:32:53 +08:00 |
|
|
Tianyi Cui
|
4fc6d45259
|
Merge codex/tool-json-schema-dsl into codex/canonical-tool-output
|
2026-07-23 02:26:47 +08:00 |
|
|
Tianyi Cui
|
30bffb5642
|
test(cordis): cover balanced sparse schema lists
|
2026-07-23 02:20:12 +08:00 |
|
|
Tianyi Cui
|
9c5224c527
|
test(cordis): cover malformed schema arrays
|
2026-07-23 02:13:33 +08:00 |
|
|
Tianyi Cui
|
71a5c3fd4c
|
fix(cordis): reject lossy dynamic schemas
|
2026-07-23 02:12:47 +08:00 |
|
|
Tianyi Cui
|
fb74156cf8
|
fix(code-mode): generalize failures and bound diagnostics
|
2026-07-23 01:32:17 +08:00 |
|
|
Tianyi Cui
|
8c1a9b7752
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
|
2026-07-23 01:15:13 +08:00 |
|
|
Tianyi Cui
|
dd9124468f
|
Merge codex/tool-json-schema-dsl into codex/canonical-tool-output
# Conflicts:
# docs/core-data-structures/tools.md
# packages/core/tools/src/schema.ts
|
2026-07-23 01:08:18 +08:00 |
|
|
Tianyi Cui
|
e20dea1629
|
fix(schema): align projected and enforced declarations
|
2026-07-23 01:05:41 +08:00 |
|
|
Tianyi Cui
|
8dbea80294
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
|
2026-07-22 23:55:07 +08:00 |
|
|
Tianyi Cui
|
8d42d3c979
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
# Conflicts:
# docs/config-catalog.md
# docs/persistence-catalog.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/agent-loop/tests/contract-regressions.spec.ts
# packages/ui/acp/src/index.ts
# packages/ui/tui/src/index.ts
|
2026-07-22 23:50:41 +08:00 |
|
|
Tianyi Cui
|
065d20c249
|
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
# Conflicts:
# scripts/type-equiv.manifest.json
|
2026-07-22 23:34:17 +08:00 |
|
|
Tianyi Cui
|
5689d1a9b4
|
Merge remote-tracking branch 'origin/master' into worktree/pty-review-fixes
# Conflicts:
# docs/module-graph.md
|
2026-07-22 23:27:17 +08:00 |
|
|
Tianyi Cui
|
d5d6960184
|
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
# Conflicts:
# docs/architecture.i18n.yaml
# docs/module-graph.md
|
2026-07-22 23:17:02 +08:00 |
|
|
Tianyi Cui
|
fed32c767d
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
|
2026-07-22 23:12:20 +08:00 |
|
|
Tianyi Cui
|
1429c5d22f
|
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
|
2026-07-22 23:03:02 +08:00 |
|
|
Tianyi Cui
|
1da62658a9
|
Merge updated feature/persistent-pty-sessions into review fixes
|
2026-07-22 22:44:01 +08:00 |
|
|
Tianyi Cui
|
d99094b1ac
|
Merge updated rfc/pty into feature/persistent-pty-sessions
# Conflicts:
# docs/architecture.i18n.yaml
# docs/core-data-structures/core.md
# pnpm-lock.yaml
# scripts/gen-cordis-catalog.ts
|
2026-07-22 22:43:20 +08:00 |
|
|
Tianyi Cui
|
57a47b1fb3
|
fix(pty): close review lifecycle gaps
|
2026-07-22 22:37:20 +08:00 |
|
|
Tianyi Cui
|
8370365c01
|
Merge refreshed canonical outputs into typed Code Mode results
|
2026-07-22 22:10:44 +08:00 |
|
|
Tianyi Cui
|
a838af896e
|
Merge refreshed schema DSL into canonical tool outputs
# Conflicts:
# packages/bash/tool-bash/tests/tools.spec.ts
|
2026-07-22 22:03:54 +08:00 |
|
|
Tianyi Cui
|
277b65aa8c
|
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
# Conflicts:
# pnpm-lock.yaml
|
2026-07-22 22:00:00 +08:00 |
|
|
Tianyi Cui
|
ec51c1acb0
|
Merge latest master into schema DSL
|
2026-07-22 21:54:32 +08:00 |
|
|
Tianyi Cui
|
ce970bd31c
|
Merge refreshed canonical outputs into typed Code Mode results
# Conflicts:
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/session.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/system-prompt.expected.md
# packages/core/tools/src/ts-types.ts
|
2026-07-22 21:49:35 +08:00 |
|
|
Tianyi Cui
|
10a55d7a27
|
Merge remote-tracking branch 'origin/master' into codex/session-scoped-sandbox-roots
# Conflicts:
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.i18n.yaml
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.md
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.zh.md
# examples/acp-agent/README.md
# packages/examples/agent-spine-demo/package.json
# packages/fs/fs-sandbox/src/index.ts
# packages/fs/tool-fs-search/tests/tools.spec.ts
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/src/suite.ts
# pnpm-lock.yaml
# scripts/type-equiv.manifest.json
|
2026-07-22 21:37:30 +08:00 |
|
|
Tianyi Cui
|
54bc084e5d
|
Merge refreshed schema DSL into canonical tool output
# Conflicts:
# docs/config-catalog.md
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.jsonl
# packages/context/workspace-context/tests/workspace-context.spec.ts
# packages/core/tools/tests/tools.spec.ts
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/tui.snapshot.ts
|
2026-07-22 21:31:16 +08:00 |
|
|
Tianyi Cui
|
c848c7b15e
|
Merge refreshed rfc/pty into feature/persistent-pty-sessions
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/module-graph.md
# docs/tool-catalog.md
# examples/acp-agent/tests/acp.snapshot.ts
# examples/headless-agent/tests/headless.snapshot.ts
# examples/package.json
# packages/README.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/tests/gen-tool-catalog.spec.ts
# pnpm-lock.yaml
# pnpm-workspace.yaml
# scripts/gen-tool-catalog.ts
# scripts/type-equiv.manifest.json
# website/.vitepress/config/api-sidebar.json
|
2026-07-22 21:12:16 +08:00 |
|
|
Tianyi Cui
|
6613f43178
|
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
# Conflicts:
# docs/architecture.i18n.yaml
# docs/capability-seams.md
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/goal-snapshots/goal-session/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/bash-spill/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cancel-tool-calls/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cancel/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/config-options/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/escalation-approved/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-edit/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-escalation-approved/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-policy-reject/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-read-window/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-read/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-terminal-card/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-write-overwrite/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-write/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/goal-command-status/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/handshake/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-deny/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-stop-continue/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-pretool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-stop-continue/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/lsp-definition/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/model-switching/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/multi-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/parallel-tool-calls/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/repeat-tool-guard/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/skill-load/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/text-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/todo-plan/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/tool-call-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workspace-edit/stdout.expected.jsonl
# packages/ui/acp/acp-feature-support.md
# packages/ui/acp/src/index.ts
# packages/ui/acp/tests/harness.ts
# packages/ui/tui/README.md
# scripts/type-equiv.manifest.json
|
2026-07-22 21:06:50 +08:00 |
|