Tianyi Cui
|
a5ac5b0ad2
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-16 11:21:58 +08:00 |
|
Tianyi Cui
|
6a516693a3
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
|
2026-07-16 11:21:57 +08:00 |
|
Tianyi Cui
|
c0c0f8b3a4
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
|
2026-07-16 11:21:57 +08:00 |
|
Tianyi Cui
|
28641fdc46
|
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
|
2026-07-16 11:21:57 +08:00 |
|
Tianyi Cui
|
6825918ead
|
docs: finish session simplification prose cleanup
|
2026-07-16 11:15:58 +08:00 |
|
Hypatia May
|
a6c8775f12
|
fix(session): reject sparse provenance arrays
|
2026-07-16 11:08:59 +08:00 |
|
Hypatia May
|
da48435e8c
|
Merge remote-tracking branch 'origin/token-meter-service' into compact-post-step-overflow-recovery
# Conflicts:
# docs/architecture.md
|
2026-07-16 10:14:33 +08:00 |
|
Hypatia May
|
8d0d9bdd1d
|
Merge remote-tracking branch 'origin/compact-tool-pairing' into token-meter-service
# Conflicts:
# docs/capability-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# packages/cordis/tool-cordis/src/api-catalog.ts
|
2026-07-16 10:04:17 +08:00 |
|
Hypatia May
|
3cccecee0a
|
Merge remote-tracking branch 'origin/master' into compact-tool-pairing
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-16 09:55:02 +08:00 |
|
Hypatia May
|
8184332918
|
Merge remote-tracking branch 'origin/master' into session-query-trace
# Conflicts:
# packages/README.md
# packages/support/invariants/src/index.ts
|
2026-07-16 09:55:02 +08:00 |
|
Yichen Jiang
|
a621d2f9a6
|
Merge branch 'master' into codex/project-instruction-files
|
2026-07-16 09:52:52 +08:00 |
|
hypatiamay
|
5dd37a4f99
|
Merge branch 'master' into debug-pangwenjie
|
2026-07-16 09:49:28 +08:00 |
|
Tianyi Cui
|
9da038de7d
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/cordis-catalog/services.md
# packages/core/agent-loop/src/index.ts
|
2026-07-16 02:35:16 +08:00 |
|
Tianyi Cui
|
0decadd5e4
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
|
2026-07-16 02:30:59 +08:00 |
|
Tianyi Cui
|
b2064cba10
|
fix(agent-loop): reject duplicate configured identities
|
2026-07-16 02:26:57 +08:00 |
|
Tianyi Cui
|
c2cf2cbbd8
|
test(agent-loop): name regression contracts
|
2026-07-16 02:05:44 +08:00 |
|
Tianyi Cui
|
90220b235f
|
docs(core): describe the public loop contract
|
2026-07-16 01:17:46 +08:00 |
|
Tianyi Cui
|
283b9070e3
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-16 01:17:36 +08:00 |
|
Tianyi Cui
|
e74399ef04
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
|
2026-07-16 01:16:59 +08:00 |
|
Tianyi Cui
|
a6e406a778
|
docs(agent-loop): correct identity limitations
|
2026-07-16 01:16:52 +08:00 |
|
Tianyi Cui
|
60c4d523d1
|
docs(tools): align schema default contract
|
2026-07-16 00:59:24 +08:00 |
|
Tianyi Cui
|
2a6fef66ef
|
test(agent-loop): remove review bookkeeping
|
2026-07-16 00:52:49 +08:00 |
|
Tianyi Cui
|
680395e7f4
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-16 00:03:13 +08:00 |
|
Tianyi Cui
|
a83847f987
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
|
2026-07-16 00:02:55 +08:00 |
|
Tianyi Cui
|
a48a95edde
|
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
|
2026-07-16 00:02:54 +08:00 |
|
Tianyi Cui
|
3765abf731
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
|
2026-07-16 00:02:54 +08:00 |
|
Tianyi Cui
|
70be6c7944
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
|
2026-07-16 00:02:44 +08:00 |
|
Tianyi Cui
|
c0d6258281
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-unused-schema-default
|
2026-07-16 00:02:38 +08:00 |
|
Tianyi Cui
|
c3c4197040
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/integration.spec.ts
# packages/ui/acp/README.md
|
2026-07-15 23:34:17 +08:00 |
|
Tianyi Cui
|
694e323403
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# packages/ui/acp/README.md
|
2026-07-15 23:32:16 +08:00 |
|
Tianyi Cui
|
6143537d4e
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/bash.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# 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/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/tests/agent-core.spec.ts
# packages/subagent/tool-subagent/tests/tool-subagent.spec.ts
# packages/util/brand/README.md
# packages/util/brand/src/index.ts
|
2026-07-15 23:29:47 +08:00 |
|
Tianyi Cui
|
c5284205d0
|
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
|
2026-07-15 23:21:02 +08:00 |
|
Tianyi Cui
|
08dbb74ce1
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
# Conflicts:
# docs/tool-catalog.md
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/session.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/system-prompt.golden.md
|
2026-07-15 23:18:26 +08:00 |
|
imccyu
|
42b07a7022
|
feat(sdk): add developer project tooling
docs(rfc): propose SDK developer project tooling
feat: rename / docs
ci: fix windows gates
docs: revert
|
2026-07-15 23:17:29 +08:00 |
|
Tianyi Cui
|
b01647bf95
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-unused-schema-default
|
2026-07-15 23:13:50 +08:00 |
|
Tianyi Cui
|
6c846531e7
|
Merge current master into PR #106
|
2026-07-15 22:44:47 +08:00 |
|
Yichen Jiang
|
f47a87fcf5
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/config-catalog.md
# packages/examples/acp-demo/tests/acp-agent.spec.ts
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
|
2026-07-15 20:14:09 +08:00 |
|
Hypatia May
|
d66c926d7a
|
fix(agent): preserve lifecycle recovery boundaries (PR3 round 2)
|
2026-07-15 17:43:33 +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
|
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 |
|
Yichen Jiang
|
306b79fa2c
|
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# examples/coding-agent/README.md
# examples/coding-agent/cordis.yml
# packages/README.md
# packages/examples/acp-demo/README.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/examples/agent-spine-demo/src/index.ts
# packages/examples/stdio-demo/README.md
# pnpm-lock.yaml
# scripts/doc-budgets.manifest.json
# scripts/verify-package-readme-model-experience.ts
|
2026-07-15 16:57:03 +08:00 |
|
Tianyi Cui
|
7d4fd14a1c
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
# Conflicts:
# docs/rfc/implemented/feature/2026-07-14-time-context-plugin.i18n.yaml
|
2026-07-15 16:56:04 +08:00 |
|
Hypatia May
|
94346513ec
|
Merge origin/master into compact-tool-pairing
|
2026-07-15 16:52:50 +08:00 |
|
Hypatia May
|
12484104c8
|
feat(compact): recover context overflow (PR3 phase 2)
|
2026-07-15 16:50:44 +08:00 |
|