 Tianyi Cui
|
bd0a1855b9
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
|
2026-07-14 19:06:25 +08:00 |
|
|
Tianyi Cui
|
93dc0f30a9
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# packages/core/agent-loop/tests/agent.spec.ts
# packages/core/agent-loop/tests/contract-regressions.spec.ts
|
2026-07-14 18:58:29 +08:00 |
|
|
Tianyi Cui
|
83271191d1
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/architecture/2026-06-18-agent-lifecycle-and-ownership-seams.md
# docs/rfc/implemented/architecture/2026-06-20-branded-ids.md
# docs/rfc/implemented/simplification/2026-06-20-remove-agent-boundary-mirror-events.md
# docs/rfc/proposed/feature/2026-07-07-claude-code-and-codex-subagent-backends.md
# docs/rfc/proposed/simplification/2026-06-20-unify-agent-and-session-id.md
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/tests/properties.spec.ts
# packages/core/agent/README.md
# packages/core/agent/src/index.ts
# packages/guard/repeat-tool-guard/src/index.ts
# packages/hooks/hooks-claude/tests/bridge.spec.ts
# packages/subagent/subagent-acp/tests/mock-acp-server.ts
# packages/ui/acp/tests/dispose.spec.ts
# packages/ui/stdio-agent/src/index.ts
# packages/ui/stdio-agent/src/stdio-chat.ts
# packages/ui/stdio-agent/tests/stdio-chat.spec.ts
# packages/util/brand/src/index.ts
|
2026-07-14 18:51:24 +08:00 |
|
 Yichen Jiang
|
9956528495
|
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/bash.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# docs/rfc/proposed/architecture/2026-06-20-generic-long-running-tool-runtime.md
# examples/AGENTS.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/permission-switching/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/system-prompt.golden.md
# examples/coding-agent/cordis.yml
# examples/sandbox-acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/sandbox-acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl
# packages/bash/bash-local/README.md
# packages/bash/bash-local/src/index.ts
# packages/bash/bash-local/tests/executor.spec.ts
# packages/bash/bash-sandbox/README.md
# packages/bash/bash-sandbox/src/index.ts
# packages/bash/bash/README.md
# packages/bash/bash/src/index.ts
# packages/bash/bash/src/types.ts
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-core/README.md
# packages/core/agent-core/src/index.ts
# packages/subagent/subagent/README.md
# packages/subagent/tool-subagent/README.md
# packages/subagent/tool-subagent/src/index.ts
# packages/ui/acp-agent/README.md
# packages/ui/acp/README.md
# packages/ui/stdio-agent/README.md
# packages/util/brand/src/index.ts
# scripts/doc-budgets.manifest.json
|
2026-07-14 18:05:46 +08:00 |
|
|
Yichen Jiang
|
0d67c16d56
|
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/bash.md
# docs/module-graph.md
# docs/rfc/INDEX.md
# docs/rfc/implemented/architecture/2026-06-30-bash-stdin-env-trusted-plugin-surface.md
# docs/rfc/implemented/feature/2026-06-30-hook-bridges.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl
# packages/bash/bash-local/README.md
# packages/bash/bash-local/src/run.ts
# packages/bash/bash-local/tests/run.spec.ts
# packages/bash/bash/README.md
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-core/src/index.ts
# packages/session-persistence/session-persistence-jsonl/src/index.ts
# packages/session-persistence/session-persistence-sqlite/src/index.ts
# packages/session-persistence/session-persistence/README.md
# packages/session-persistence/session-persistence/src/index.ts
# packages/ui/acp-agent/README.md
# packages/ui/stdio-agent/README.md
|
2026-07-14 18:04:05 +08:00 |
|
|
Tianyi Cui
|
3c1470046a
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
# Conflicts:
# docs/config-catalog.md
# packages/bash/tool-bash/src/index.ts
|
2026-07-14 17:38:15 +08:00 |
|
|
Tianyi Cui
|
d83618c1dc
|
Merge branch 'codex/simp-prune-bash-surface' into codex/simp-prune-sandbox-surface
|
2026-07-14 15:44:33 +08:00 |
|
|
Tianyi Cui
|
f119de8b2e
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
# Conflicts:
# packages/bash/tool-bash/README.md
|
2026-07-14 15:44:25 +08:00 |
|
|
Tianyi Cui
|
6cbb3270c3
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
|
2026-07-14 15:42:52 +08:00 |
|
|
Tianyi Cui
|
a5e1717059
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-14 15:31:20 +08:00 |
|
|
Tianyi Cui
|
440afff96e
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# packages/ui/stdio-agent/README.md
|
2026-07-14 15:27:32 +08:00 |
|
|
Tianyi Cui
|
8590ba00a4
|
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
# Conflicts:
# docs/AGENTS.md
# docs/config-catalog.md
# packages/bash/bash-sandbox/src/index.ts
# packages/bash/bash/src/session-mode.ts
# packages/bash/tool-bash/README.md
# packages/code-runtime/code-runtime-worker/README.md
# packages/compact/compact/src/index.ts
# packages/core/agent-core/README.md
# packages/hooks/hooks-claude/src/config.ts
# packages/hooks/hooks-claude/src/index.ts
# packages/hooks/hooks-codex/src/config.ts
# packages/hooks/hooks-codex/src/index.ts
# packages/llm/llm/README.md
# packages/session-persistence/session-persistence-jsonl/README.md
# packages/session-persistence/session-persistence/README.md
# packages/skill/skill-local/README.md
# packages/support/acp-snapshot/README.md
# packages/support/invariants/src/index.ts
# packages/ui/acp/README.md
# packages/ui/jsonrpc-agent/README.md
# packages/ui/jsonrpc/README.md
# packages/ui/permission/README.md
# packages/ui/user-approval/README.md
# packages/ui/user-interaction/README.md
# packages/web/web-search-deepseek/README.md
|
2026-07-14 14:37:16 +08:00 |
|
|
Tianyi Cui
|
1ab64dba62
|
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
# Conflicts:
# docs/config-catalog.md
# docs/development.i18n.yaml
# docs/development.zh.md
# docs/rfc/implemented/feature/2026-06-14-acp-agent-client-protocol.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# examples/AGENTS.md
# examples/README.md
# examples/acp-agent/README.md
# examples/acp-agent/cordis.yml
# examples/acp-agent/tests/acp.e2e.ts
# examples/acp-agent/tests/escalation.e2e.ts
# examples/sandbox-acp-agent/README.md
# examples/sandbox-acp-agent/cordis.snapshot.yml
# examples/sandbox-acp-agent/cordis.yml
# examples/sandbox-acp-agent/tests/acp.snapshot.ts
# packages/ui/acp-agent/src/bin.ts
# packages/ui/acp/README.md
# packages/ui/jsonrpc-agent/README.md
# packages/ui/jsonrpc-agent/src/bin.ts
# scripts/verify-translation-pairing.ts
|
2026-07-14 12:34:14 +08:00 |
|
|
Tianyi Cui
|
9702c07191
|
Merge branch 'codex/simp-prune-bash-surface' into codex/simp-prune-sandbox-surface
|
2026-07-14 11:58:13 +08:00 |
|
|
Tianyi Cui
|
c8aa2302dc
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
|
2026-07-14 11:58:10 +08:00 |
|
|
Tianyi Cui
|
c4c8ba1b8c
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
|
2026-07-14 11:57:56 +08:00 |
|
|
Tianyi Cui
|
e2ba1e61da
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-14 11:56:47 +08:00 |
|
|
Tianyi Cui
|
9272d2871b
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
|
2026-07-14 11:56:09 +08:00 |
|
|
Tianyi Cui
|
4d5fb2cb1d
|
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
# Conflicts:
# docs/core-data-structures/session.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# examples/acp-agent/tests/snapshots/permission-switching/system-prompt.golden.md
# examples/sandbox-acp-agent/tests/acp.snapshot.ts
# examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl
# packages/core/session/README.md
# packages/core/session/src/index.ts
# packages/core/session/src/surface.ts
# packages/core/session/tests/surface.spec.ts
# scripts/type-equiv.manifest.json
|
2026-07-14 11:49:46 +08:00 |
|
|
Tianyi Cui
|
a50e8bc1f3
|
Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712
# Conflicts:
# packages/bash/bash-sandbox/README.md
# packages/sandbox/sandbox-local/README.md
|
2026-07-14 11:28:08 +08:00 |
|
 Dudu-0223
|
30ba5bd23c
|
Merge remote-tracking branch 'origin/master' into codex/truncated-design
# Conflicts:
# docs/config-catalog.md
# docs/rfc/INDEX.md
# examples/acp-agent/README.md
# packages/bash/tool-bash/tests/tools.spec.ts
|
2026-07-14 10:57:29 +08:00 |
|
|
Yichen Jiang
|
cb78634bf2
|
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
# Conflicts:
# docs/event-producer-consumer.md
# packages/bash/tool-bash/tests/tools.spec.ts
|
2026-07-14 09:59:21 +08:00 |
|
|
Yichen Jiang
|
f570d2201e
|
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
# docs/config-catalog.md
# packages/hooks/hooks-codex/src/index.ts
# packages/ui/acp-agent/src/index.ts
# packages/ui/stdio-agent/src/index.ts
|
2026-07-14 09:51:50 +08:00 |
|
|
Tianyi Cui
|
ba8a5c89ed
|
docs: name the public agent injection seam
|
2026-07-14 09:29:02 +08:00 |
|
|
Tianyi Cui
|
14ed3a9914
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-14 07:30:06 +08:00 |
|
|
Tianyi Cui
|
99b5f04c9b
|
fix: use unified identity for bash ownership
|
2026-07-14 07:26:46 +08:00 |
|
|
Tianyi Cui
|
26e2fe9356
|
refactor: drop assembled section order echo
|
2026-07-14 04:41:23 +08:00 |
|
|
Tianyi Cui
|
b2025337b5
|
refactor: hide sandbox implementation helpers
|
2026-07-14 03:47:32 +08:00 |
|
|
Tianyi Cui
|
419370ea4b
|
fix: keep bash status rendering and parsing together
|
2026-07-14 03:45:22 +08:00 |
|
|
Tianyi Cui
|
8c8b422f17
|
refactor: prune bash implementation surface
|
2026-07-14 03:37:51 +08:00 |
|
|
Tianyi Cui
|
225796c90d
|
refactor: hide the concrete agent loop
|
2026-07-14 02:32:35 +08:00 |
|
|
Tianyi Cui
|
709cc7200e
|
refactor: unify agent and session identity
|
2026-07-14 01:59:21 +08:00 |
|
|
Tianyi Cui
|
e3d7bb62d8
|
fix(permission): address human review feedback
|
2026-07-14 01:09:44 +08:00 |
|
|
Tianyi Cui
|
cdc3522e48
|
Merge remote-tracking branch 'origin/master' into unify-acp-example
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# pnpm-lock.yaml
|
2026-07-14 00:56:28 +08:00 |
|
|
Tianyi Cui
|
788fb48d4c
|
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-14 00:34:46 +08:00 |
|
|
Tianyi Cui
|
4d9f771f94
|
Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712
# Conflicts:
# package.json
# packages/code-runtime/code-runtime-worker/README.md
# packages/workflow/tool-workflow/README.md
|
2026-07-14 00:34:25 +08:00 |
|
|
Tianyi Cui
|
eed43abe66
|
docs: address final model experience review
|
2026-07-14 00:22:52 +08:00 |
|
|
Tianyi Cui
|
274db4966a
|
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
# Conflicts:
# packages/ui/acp/tests/stream-update.spec.ts
|
2026-07-14 00:08:53 +08:00 |
|
|
Tianyi Cui
|
1123e946c0
|
refactor: simplify session log representation
|
2026-07-13 23:56:10 +08:00 |
|
|
Tianyi Cui
|
20402b637c
|
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/rfc/proposed/feature/2026-07-08-interactive-side-sessions.md
# docs/rfc/proposed/simplification/2026-06-20-unify-agent-and-session-id.md
# examples/coding-agent/tests/keyless-smoke.e2e.ts
# packages/ui/acp/src/index.ts
|
2026-07-13 23:44:44 +08:00 |
|
|
Tianyi Cui
|
661504b3ec
|
chore: gate TypeScript duplication in CI
|
2026-07-13 23:42:54 +08:00 |
|
|
Tianyi Cui
|
148046b9c8
|
docs: rebalance prose cleanup and add trimming skill
|
2026-07-13 23:27:00 +08:00 |
|
|
Tianyi Cui
|
a4417f4924
|
docs: classify consumer-owned model effects as indirect
|
2026-07-13 22:40:19 +08:00 |
|
|
Tianyi Cui
|
d77f797d89
|
docs: replace model experience tables with sections
|
2026-07-13 22:26:33 +08:00 |
|
|
Tianyi Cui
|
646f3d2d0c
|
docs: apply verbatim model experience guidance repo-wide
|
2026-07-13 21:33:23 +08:00 |
|
|
Tianyi Cui
|
3fc2a4ca82
|
fix: harden model experience documentation gate
|
2026-07-13 20:13:46 +08:00 |
|
|
Yichen Jiang
|
351a2e42b3
|
fix(tasks): close background task review findings
|
2026-07-13 16:29:50 +08:00 |
|
|
Tianyi Cui
|
c45d7927cf
|
docs: tighten prose audit after master retarget
|
2026-07-13 16:24:32 +08:00 |
|
|
Yichen Jiang
|
ba329b16ce
|
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
# docs/module-graph.md
# docs/rfc/INDEX.md
# packages/core/agent-core/tests/agent-core.spec.ts
# pnpm-lock.yaml
|
2026-07-13 16:18:44 +08:00 |
|
|
Yichen Jiang
|
e2bc79a0ef
|
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/tool-catalog.md
# packages/bash/tool-bash/tests/integration.spec.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/core/agent-core/tests/agent-core.spec.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/index.ts
# packages/core/agent/README.md
# packages/core/agent/src/index.ts
# packages/core/agent/tests/agent.spec.ts
# packages/subagent/subagent/README.md
# packages/subagent/subagent/src/index.ts
# packages/subagent/tool-subagent/README.md
# packages/subagent/tool-subagent/src/index.ts
# pnpm-lock.yaml
# scripts/doc-budgets.manifest.json
|
2026-07-13 15:57:17 +08:00 |
|