Commit Graph
9072 Commits
Author SHA1 Message Date
Tianyi Cui 02da758a68 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-15 17:55:57 +08:00
Tianyi Cui 6245094fe1 Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id 2026-07-15 17:55:57 +08:00
Tianyi Cui d48edf818f Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-15 17:55:57 +08:00
Tianyi Cui 87c900dfb2 Document compaction result diagnostics 2026-07-15 17:55:48 +08:00
Tianyi Cui 2176e25910 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-15 17:55:13 +08:00
Tianyi Cui cf5d6ddf59 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-15 17:55:06 +08:00
Tianyi Cui 0b585e1d27 Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-15 17:55:06 +08:00
Tianyi Cui e2c9048c16 Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory 2026-07-15 17:55:05 +08:00
Tianyi Cui 25a5dc35ba Refresh Cordis event API summaries 2026-07-15 17:53:51 +08:00
Hypatia May d66c926d7a fix(agent): preserve lifecycle recovery boundaries (PR3 round 2) 2026-07-15 17:43:33 +08:00
Tianyi Cui 263d8a6dff Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-15 17:37:08 +08:00
Tianyi Cui e1c0d0b579 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-15 17:37:08 +08:00
Tianyi Cui cdeec6fc1d Update built JSON-RPC probe path 2026-07-15 17:36:51 +08:00
Dudu-0223 66b2cfc609 docs(rfc): propose LSP capability seam 2026-07-15 17:34:24 +08:00
Tianyi Cui 3460f9c10b Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id 2026-07-15 17:26:29 +08:00
Tianyi Cui 8c7e2b4426 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-15 17:26:29 +08:00
Tianyi Cui 6ee2655cab Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-15 17:26:29 +08:00
Tianyi Cui 9035ef1f98 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-15 17:26:29 +08:00
Tianyi Cui f20f5c2958 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-15 17:26:28 +08:00
Tianyi Cui 8eccd5416e Document restored compaction result fields 2026-07-15 17:26:28 +08:00
Tianyi Cui 0521ec02ef Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-15 17:24:08 +08:00
Tianyi Cui 7fd7261bcd Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-15 17:24:08 +08:00
Tianyi Cui d6ba1fef26 Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id 2026-07-15 17:24:07 +08:00
Tianyi Cui 6edb44657c Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-15 17:24:07 +08:00
Tianyi Cui 623c2fa8d2 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-15 17:24:07 +08:00
Tianyi Cui d25a56b431 Restore CompactionResult diagnostics 2026-07-15 17:23:39 +08:00
Tianyi Cui 9c1e847a4f Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-15 17:10:54 +08:00
Tianyi Cui a631edd27c Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-15 17:10:54 +08:00
Tianyi Cui f6350ac553 Keep root instructions within budget 2026-07-15 17:10:46 +08:00
Tianyi Cui a15ac13a74 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-15 17:09:32 +08:00
Tianyi Cui 41e711c01e Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id 2026-07-15 17:09:32 +08:00
Tianyi Cui 54485f7767 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-15 17:09:32 +08:00
Tianyi Cui c2081d8abf Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-15 17:09:32 +08:00
Tianyi Cui 80fc984ee2 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-15 17:09:32 +08:00
Tianyi Cui 5a2f9182f6 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-15 17:09:32 +08:00
Tianyi Cui 4c2ed42f48 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-15 17:09:32 +08:00
Tianyi Cui 8e7cf8cc10 Update ACP launcher example path 2026-07-15 17:09:18 +08:00
Tianyi Cui 5b814652b3 Merge remote-tracking branch 'origin/master' into codex/simp-drop-unused-schema-default 2026-07-15 17:07:50 +08:00
Tianyi Cui 9f96b74e21 Merge remote-tracking branch 'origin/master' into codex/simp-hide-web-provider-helpers 2026-07-15 17:07:46 +08:00
Tianyi Cui 29a47a1fba Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers 2026-07-15 17:07:42 +08:00
Tianyi Cui 70e01ab96c Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract 2026-07-15 17:07:39 +08:00
Tianyi Cui 7f53340f41 Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface 2026-07-15 17:07:35 +08:00
Tianyi Cui 0da51d416e Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-15 17:06:48 +08:00
Tianyi Cui 92bf506fb0 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/config-catalog.md
#	packages/core/README.md
2026-07-15 17:06:39 +08:00
Tianyi Cui 3d26e83930 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	AGENTS.md
#	knip.json
#	packages/ui/jsonrpc/README.md
#	scripts/run-gates.ts
2026-07-15 17:06:13 +08:00
Yichen Jiang ff3d893f74 Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
# Conflicts:
#	AGENTS.md
#	docs/config-catalog.md
#	docs/module-graph.md
#	examples/echo-agent/composition.md
#	packages/README.md
#	packages/core/README.md
#	packages/examples/acp-demo/package.json
#	packages/examples/acp-demo/src/index.ts
#	packages/examples/acp-demo/tests/acp-agent.spec.ts
#	packages/examples/acp-demo/tests/built-bin.e2e.ts
#	packages/examples/acp-demo/tsconfig.json
#	packages/examples/agent-spine-demo/README.md
#	packages/examples/agent-spine-demo/package.json
#	packages/examples/agent-spine-demo/tests/agent-core.spec.ts
#	packages/examples/stdio-demo/package.json
#	packages/examples/stdio-demo/src/index.ts
#	packages/examples/stdio-demo/tests/built-bin.e2e.ts
#	packages/examples/stdio-demo/tests/stdio-agent.spec.ts
#	packages/examples/stdio-demo/tsconfig.json
#	pnpm-lock.yaml
#	python/sdk-runtime/README.i18n.yaml
#	python/sdk-runtime/src/deepseek_harness_runtime/runtime/cordis.yml
#	python/sdk/tests/test_bundled_runtime.py
2026-07-15 17:04:16 +08:00
Hypatia May dffe51dbf0 Merge token-meter-service into compact-post-step-overflow-recovery
# Conflicts:
#	docs/cookbook/extension-cookbook.i18n.yaml
2026-07-15 17:03:46 +08:00
Tianyi Cui 5ef3dd979f Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	docs/config-catalog.md
#	docs/cookbook/extension-cookbook.i18n.yaml
#	docs/module-graph.md
#	packages/examples/stdio-demo/README.md
#	packages/examples/stdio-demo/src/index.ts
#	pnpm-lock.yaml
2026-07-15 17:01:59 +08:00
Hypatia May 9d8f81c8e0 Merge compact-tool-pairing into token-meter-service
# Conflicts:
#	examples/coding-agent/composition.md
#	pnpm-lock.yaml
2026-07-15 16:57:53 +08:00
Tianyi Cui edd990c5d9 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-15 16:57:39 +08:00