Tianyi Cui
1b102b7279
Merge branch 'master' into feat/website-docs
2026-07-17 18:23:01 +08:00
Dudu-0223
a3f62478e1
Merge origin/master into codex/truncated-design
2026-07-17 18:21:54 +08:00
Hypatia May
3cf31113b7
build-review round 2: correct time-context documentation contracts
2026-07-17 10:47:24 +08:00
Yichen Jiang
98ea306c5e
fix(session-persistence): retire disposed coordinator state
2026-07-17 10:31:44 +08:00
Hypatia May
760dd8f5de
build-review round 1: add durable time refresh scheduling
2026-07-17 10:12:27 +08:00
lintianle
2cde2a9032
Merge origin/master into feat/website-docs
...
Conflict resolution notes:
- package.json/run-gates: both sides' new doc-sync gates kept (master's
scoped-events/readme gates + this branch's website-api/website-yaml);
js-yaml devDeps deduped (master added them independently).
- pnpm-workspace/knip: website AND python/sdk-runtime entries kept.
- doc-typecheck/verify-type-equiv: master's condensed headers kept, website
glob retained in both scan scopes.
- vendor/cordis/src/fiber.ts: master's lifecycle-hardening code taken; this
branch's richer FiberState JSDoc reapplied on top. vendor/README.md logs
both local modifications (hardening = 6, JSDoc enrichment = 7).
- pnpm-lock: regenerated from master's side (pnpm install).
Post-merge sync the gates forced (the system working as designed):
- verify-website-yaml caught 4 stale plugin names from master's package
reorg (dsh-stdio-agent -> dsh-stdio-demo, dsh-acp-agent -> dsh-acp-demo);
8 references fixed across guide/ and develop/.
- gen-website-api picked up master's 6 new services automatically
(ctx.approval/permission/sandbox/sessionQuery/skills/tasks -> 6 new pages
+ sidebar); api/index.md hub updated to list them.
- AGENTS.md budget ceiling 1370 -> 1400: the website rows (layout line + two
command lines) and master's own growth collided with the old ceiling; all
three website rows are load-bearing (new top-level dir, new CI command).
2026-07-16 21:36:43 +08:00
lintianle
83cb48441e
vendor(cordis): document the full plugin-author surface (@param/@returns everywhere)
...
Comment-only enrichment across cordis/src/*.ts — Context, EventsService (+ the
ctx merges), Fiber, RegistryService, ReflectService, Service, logger — so the
website API generator can render a complete reference and hard-error on any
future undocumented member (vendor sync included). Logged as local
modification 6 in vendor/README.md; retire it when upstreamed to the fork.
INHERITED_SERVICES/EVENTS source pointers refreshed for the shifted lines;
cordis catalogs regenerated.
2026-07-16 18:12:36 +08:00
Hypatia May
46e63a004c
time-context: durable per-step history (round 1)
2026-07-16 17:47:51 +08:00
Yichen Jiang
d3b959389a
test(support): add shared AgentLoop testkit
2026-07-16 17:39:53 +08:00
Yichen Jiang
027af418a2
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
...
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/bash.md
# docs/module-graph.md
# docs/tool-catalog.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/tool-schemas.golden.json
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/both-mode-turn/tool-schemas.golden.json
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/permission-switching/tool-schemas.golden.json
# examples/acp-agent/tests/snapshots/skill-load/tool-schemas.golden.json
# examples/acp-agent/tests/snapshots/text-turn/tool-schemas.golden.json
# examples/acp-agent/tests/snapshots/workspace-edit/tool-schemas.golden.json
# packages/bash/bash-local/README.md
# packages/bash/bash-local/src/index.ts
# packages/bash/bash-local/tests/executor.spec.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/package.json
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/bash/tool-bash/tsconfig.json
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/src/index.ts
# packages/examples/agent-spine-demo/tests/agent-core.spec.ts
# pnpm-lock.yaml
2026-07-16 16:47:31 +08:00
Yichen Jiang
182c622eab
docs: stay within architecture word budget
2026-07-16 16:42:04 +08:00
Yichen Jiang
97190c81ba
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
...
# Conflicts:
# docs/event-producer-consumer.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
2026-07-16 16:39:13 +08:00
Hypatia May
c3ddbde3c9
Merge remote-tracking branch 'origin/compact-tool-pairing' into token-meter-service
2026-07-16 16:06:27 +08:00
Tianyi Cui
72bb02e68e
refactor(workspace-context): move package to context group
2026-07-16 16:01:06 +08:00
Hypatia May
06e0450b8d
fix(token-meter): keep pressure anchors conservative
2026-07-16 15:26:30 +08:00
Hypatia May
6d96b3e4a8
refactor(token-meter): merge measurement snapshots (round 1)
2026-07-16 14:38:24 +08:00
Hypatia May
19a56ec542
fix(token-meter): reject stale config (round 2)
2026-07-16 13:23:20 +08:00
Hypatia May
5c243e8a8d
refactor(token-meter): simplify singleton service (round 1)
2026-07-16 12:58:07 +08:00
Hypatia May
2793325df0
refactor(compact): store tool-pairing balance once per surface cut
...
toolPairingBalancedAfter previously answered by resolving a cached
positional successor and reading its before-balance, with a null-successor
depth fallback. Both queries are the same prefix property sampled at
adjacent cuts, so the cache now holds one per-cut balance sequence
(N nodes -> N+1 cuts) plus a seq->position index; before/after differ
only by a cut offset. The successor map, the duplicate rebuild/extend
fold loops, and the non-null assertion are gone, and the running counter
is named inProgressToolCalls. Docs describing the successor mechanism
are updated in place.
2026-07-16 11:42:17 +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
be367fd981
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
...
# Conflicts:
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
2026-07-16 11:21:41 +08:00
Tianyi Cui
3817411aa5
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-16 11:21:08 +08:00
Tianyi Cui
90afd0ce81
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-16 11:21:07 +08:00
Tianyi Cui
2f1dac68ea
Merge remote-tracking branch 'origin/codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-16 11:20:55 +08:00
Tianyi Cui
6825918ead
docs: finish session simplification prose cleanup
2026-07-16 11:15:58 +08:00
Hypatia May
4bf36e4dd1
docs: condense tool-context lifecycle contract
2026-07-16 10:29:08 +08:00
Hypatia May
7250aaea7e
fix(sdk): compose token meter for compact projects
2026-07-16 10:07:11 +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
486362d2f8
docs(catalog): refresh ACP config source link
2026-07-16 02:57:32 +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
b77cfd64a1
docs(catalog): refresh repeat guard source link
2026-07-16 02:29:32 +08:00
Tianyi Cui
68b5c716b1
docs(catalog): refresh AgentLoop source link
2026-07-16 02:29:08 +08:00
Tianyi Cui
70c6c0ac39
docs(approval): qualify audit guarantees
2026-07-16 02:04:59 +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
0a58a7ad5a
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-16 00:02:54 +08:00
Tianyi Cui
3fcd262890
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-16 00:02:54 +08:00
Tianyi Cui
71e1242909
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-16 00:02:54 +08:00
Tianyi Cui
17ebc0e999
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
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
imccyu
8d4f64e5ce
docs: update pre-push scheduler contract
2026-07-15 23:57:44 +08:00
Tianyi Cui
419b0bcf7d
docs: refresh module graph for UI identity
2026-07-15 23:51:45 +08:00
Tianyi Cui
474365ca28
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-15 23:51:34 +08:00
Tianyi Cui
8e37abb6c9
docs: refresh module graph for unified identity
2026-07-15 23:50:33 +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