 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 |
|
|
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 |
|
|
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 |
|
 imccyu
|
8f54ccae7f
|
Merge branch 'worktree/web-carrier-chain' into worktree/web-ask-user-question
|
2026-07-23 20:36:20 +08:00 |
|
|
Tianyi Cui
|
6cb0372d86
|
Merge remote-tracking branch 'origin/master' into worktree/web-session-titles
|
2026-07-23 20:19:50 +08:00 |
|
|
Hypatia May
|
1e457b22e0
|
refactor(session-query): unify query service
|
2026-07-23 20:18:05 +08:00 |
|
|
Tianyi Cui
|
a5cb16cc0e
|
Merge master into codex/jsonl-storage-identity
|
2026-07-23 20:12:26 +08:00 |
|
|
imccyu
|
6a896e62a1
|
Merge branch 'worktree/web-carrier-chain' into worktree/web-ask-user-question
|
2026-07-23 19:45:41 +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
|
f666c39379
|
fix(web): generate model-backed session titles
|
2026-07-23 18:20:17 +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 |
|
|
Tianyi Cui
|
94adb60e1a
|
fix(tools): preserve bounded fallback guidance
|
2026-07-23 03:15:15 +08:00 |
|
|
Tianyi Cui
|
2821826e2c
|
fix(pty): close final review gaps
|
2026-07-23 02:53:43 +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
|
7f0f70ce3c
|
fix(pty): retain backend cleanup failures
|
2026-07-23 00:59:16 +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 |
|
 Yichen Jiang
|
f0a9bb1ccd
|
Merge remote-tracking branch 'origin/master' into worktree/web-ask-user-question
# Conflicts:
# apps/web/tests/smoke-fixture.e2e.ts
|
2026-07-22 23:48:53 +08:00 |
|
|
Yichen Jiang
|
03889cee1a
|
feat(gui): add ask-user question composer
|
2026-07-22 23:39:50 +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
|
b65afd320a
|
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
|
2026-07-22 23:00:05 +08:00 |
|
|
Tianyi Cui
|
73353d7a0f
|
Merge remote-tracking branch 'origin/feature/persistent-pty-sessions' into worktree/pty-review-fixes
|
2026-07-22 22:53:05 +08:00 |
|
|
Tianyi Cui
|
cf5dfe46e7
|
Merge remote-tracking branch 'origin/rfc/pty' into worktree/pr467-retarget-latest-master
|
2026-07-22 22:50:55 +08:00 |
|
|
Tianyi Cui
|
d92bb12963
|
Merge refreshed canonical outputs into typed Code Mode results
|
2026-07-22 22:50:28 +08:00 |
|
|
Tianyi Cui
|
3d9240e423
|
Merge refreshed schema DSL into canonical tool outputs
|
2026-07-22 22:46:10 +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
|
c51c02cafa
|
Merge latest master into schema DSL
|
2026-07-22 22:42:43 +08:00 |
|
|
Tianyi Cui
|
57a47b1fb3
|
fix(pty): close review lifecycle gaps
|
2026-07-22 22:37:20 +08:00 |
|
|
Tianyi Cui
|
b0f5d9e313
|
Merge commit 'refs/codex-unblock/20260722-pr338-master' into HEAD
# Conflicts:
# docs/event-producer-consumer.md
# examples/acp-agent/tests/acp.snapshot.ts
# packages/core/session/src/index.ts
# packages/examples/acp-demo/src/index.ts
# packages/session-persistence/session-persistence-jsonl/src/format.ts
# vitest.config.ts
|
2026-07-22 22:37:16 +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 |
|