Commit Graph
2957 Commits
Author SHA1 Message Date
Tianyi Cui 3d4ed10d77 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-15 16:27:52 +08:00
Tianyi Cui 9082cebc56 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-15 16:27:37 +08:00
Tianyi Cui debd4ae5c8 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/event-producer-consumer.md
#	docs/module-graph.md
2026-07-15 16:26:12 +08:00
Tianyi Cui 6d1870c8c1 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/event-producer-consumer.md
#	docs/module-graph.md
#	packages/bash/tool-bash/src/index.ts
#	packages/ui/stdio-agent/README.md
#	packages/ui/stdio-agent/src/index.ts
#	packages/ui/stdio/src/index.ts
#	packages/workflow/workflow-workerthread/tests/workflow-workerthread.spec.ts
#	packages/workflow/workflow/package.json
#	scripts/gen-doc-graphs.ts
2026-07-15 16:24:43 +08:00
Huanqi Cao 65d07a490f fix(scripts): handle .cmd bin shims on Windows (CVE-2024-27980)
execFileSync on a .cmd shim returns EINVAL on recent Node without shell:true. Same bug class as install-lefthook.mjs. Affected publint-all.ts and verify-node-next-types.ts.

(cherry picked from commit 5ae40bee1c840fbbdd197ee15907aa660a343c52)
2026-07-15 16:09:12 +08:00
Huanqi Cao 4cbd722074 Declare LF and final-newline conventions in .editorconfig
Pairs with .gitattributes: eol=lf pins what git produces at checkout;
.editorconfig pins what editors write to disk - the one CRLF vector
git's filters cannot reach (git never rewrites the working tree, so an
editor-written CRLF file would persist with a clean status while the
doc gates misbehave on it). insert_final_newline declares the existing
one-trailing-newline policy (AGENTS.md, gated by git diff --check) at
the editor layer too.

(cherry picked from commit 7a09602fd76efff81a0875fb177289004c3dfc9b)
2026-07-15 16:09:12 +08:00
Huanqi Cao d42b118fe3 Spawn tsc by its JS entry so doc-typecheck runs on Windows
execFileSync('node_modules/.bin/tsc') spawns an extensionless shim
that is not executable on Windows (the CVE-2024-27980 class the
sibling scripts hit); the catch treated the spawn failure as a compile
failure with empty diagnostics. The .cmd shim would need shell:true,
which concatenates args unescaped - a hazard for the temp project
path - so invoke typescript/bin/tsc through the current node instead;
identical behavior on every platform.

Note this gate had never actually run on this Windows checkout: with
the pre-eol=lf CRLF working copy the fence regex matched no ts blocks
('.' does not match \\r), so it reported 'no ts code blocks to check'
and exited green. The LF working tree surfaced the spawn bug; with
this fix the gate compiles all 21 blocks on Windows.

(cherry picked from commit b49993c28e068c2beb411eae1f0c8ac4985aa3ae)
2026-07-15 16:09:12 +08:00
Huanqi Cao 1c4bb7008d Pin LF working trees via .gitattributes
The repo's committed content is already 100% LF (verified: 802/802
text files); until now the working-tree form depended on each
contributor's core.autocrlf, and autocrlf=true checkouts produced CRLF
working copies that byte-level gates had to tolerate (fence parsing,
consistency-record parsing, blob hashing, README splice comparison).
eol=lf removes the smudge boundary entirely: attributes override any
local autocrlf, so every checkout on every host sees the repo's
canonical form. git add --renormalize confirmed a zero-change no-op -
no committed blob (including vendor/) is rewritten. The script-side
CRLF tolerances remain as defense in depth for editor-introduced CRLF
in not-yet-committed files. If a file class ever needs CRLF in the
working tree (.bat/.cmd), a per-pattern eol=crlf override keeps the
in-repo form LF while smudging those checkouts only.

(cherry picked from commit 5d21ebee20391c3d5c1d3812bd3aaa92bc652973)
2026-07-15 16:09:12 +08:00
Huanqi Cao 8e6ad0a347 fix(scripts): launch lefthook bin shim via shell on Windows
spawnSync on a .cmd shim returns EINVAL/null status on recent Node (CVE-2024-27980) unless shell:true, which made postinstall fail and blocked every 'pnpm run' on Windows.

(cherry picked from commit 65a08f889ff9738ddaceeeb724e6e24f3be4b2ea)
2026-07-15 16:09:12 +08:00
Tianyi Cui d42cea85c7 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-15 16:05:07 +08:00
Tianyi Cui 551b665d0f Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-15 16:05:02 +08:00
Tianyi Cui 75fc4a9dce Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-15 16:04:56 +08:00
Tianyi Cui 2ae7f6ac3f Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
# Conflicts:
#	packages/support/README.md
#	packages/support/acp-snapshot/README.md
2026-07-15 16:04:40 +08:00
Tianyi Cui dc00509910 Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
# Conflicts:
#	packages/support/acp-snapshot/README.md
#	packages/support/acp-snapshot/src/suite.ts
#	packages/support/acp-snapshot/tests/suite.spec.ts
2026-07-15 16:03:33 +08:00
Tianyi Cui d0cf9cd411 Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation 2026-07-15 15:56:11 +08:00
Tianyi Cui 281eed3e57 Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
# Conflicts:
#	docs/cordis-catalog/services.md
#	docs/rfc/INDEX.md
#	docs/rfc/implemented/testing/2026-07-06-pin-request-header-content-in-one-scenario.md
#	docs/rfc/proposed/simplification/2026-07-12-simplify-session-log-representation.md
#	packages/support/acp-snapshot/README.md
#	packages/support/acp-snapshot/src/normalize.ts
#	packages/support/acp-snapshot/src/suite.ts
#	packages/support/acp-snapshot/tests/fixtures/suite/pin-turn/session.jsonl
#	packages/support/acp-snapshot/tests/suite.spec.ts
2026-07-15 15:53:56 +08:00
TianleLin b4ec4060a7 Merge pull request #202 from deepseek-harness/feat/mcp-client
feat: add MCP client plugin (dsh-mcp-client)
2026-07-15 15:53:27 +08:00
Tianyi Cui e7bae3aa3b Merge branch 'master' into feat/mcp-client 2026-07-15 15:50:59 +08:00
Yichen Jiang 162da52082 Merge branch 'master' into worktree/provider-routed-llm-adapters 2026-07-15 15:42:19 +08:00
Yichen Jiang 4f92ede4a0 Merge branch 'master' into codex/rfc-subagent-background-tasks 2026-07-15 15:41:56 +08:00
lintianle b9eeb2162c Fix lockfile broken by hand-resolved merge conflict
The web-editor conflict resolution renamed the cordis snapshot keys to
rc.7 but left the mcp-client importer pointing at the deleted
cordis@4.0.0-rc.6(...rc.4) key, so every CI lane failed at
'pnpm install --frozen-lockfile' with ERR_PNPM_LOCKFILE_MISSING_DEPENDENCY.

Align the mcp-client cordis range with the repo-wide ^4.0.0-rc.7 sweep
from master and re-resolve the lockfile with pnpm.
2026-07-15 15:40:02 +08:00
Hypatia May 2433971df6 Merge remote-tracking branch 'origin/master' into codex/document-host-sandbox-retries 2026-07-15 15:39:40 +08:00
Hypatia May a28c9f46d1 Merge remote-tracking branch 'origin/master' into debug-pangwenjie 2026-07-15 15:39:30 +08:00
Hypatia May a2adaf8087 Merge remote-tracking branch 'origin/master' into debug-pangwenjie 2026-07-15 15:38:20 +08:00
Tianyi Cui 1ac6c15907 Merge remote-tracking branch 'origin/master' into codex/simp-drop-unused-schema-default 2026-07-15 15:37:19 +08:00
Tianyi Cui 9cd31c7259 Merge pull request #300 from deepseek-harness/codex/simp-drop-assembled-section-order
refactor: drop assembled section order echo
2026-07-15 15:36:57 +08:00
Hypatia May 43896a8566 Merge remote-tracking branch 'origin/master' into codex/document-host-sandbox-retries 2026-07-15 15:36:22 +08:00
Yichen Jiang 17511ea0d8 Merge branch 'master' into codex/rfc-subagent-background-tasks 2026-07-15 15:33:53 +08:00
Hypatia May 41c4b4fe48 Merge remote-tracking branch 'origin/master' into codex/document-host-sandbox-retries 2026-07-15 15:33:18 +08:00
Tianyi Cui dbae83d573 Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order 2026-07-15 15:31:29 +08:00
Hypatia May 9cddfe7fd7 Merge remote-tracking branch 'origin/master' into debug-pangwenjie
# Conflicts:
#	docs/event-producer-consumer.md
#	packages/core/agent-loop/src/loop.ts
2026-07-15 15:31:27 +08:00
Tianyi Cui 6c8e856552 Merge pull request #290 from deepseek-harness/codex/simp-prune-code-runtime-surface
refactor: prune code runtime surface
2026-07-15 15:31:09 +08:00
Yichen Jiang 27ec11e1e8 Merge remote-tracking branch 'origin/worktree/provider-routed-llm-adapters' into worktree/provider-routed-llm-adapters 2026-07-15 15:27:17 +08:00
Hypatia May e55e96eec6 Merge compact-tool-pairing into token-meter-service
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-15 15:27:10 +08:00
Yichen Jiang 634840d406 fix(llm-pi-ai): validate replay provenance 2026-07-15 15:26:03 +08:00
Hypatia May 63330ac638 Merge origin/master into compact-tool-pairing
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-15 15:24:59 +08:00
TianleLin 905b8ead9f Merge branch 'master' into feat/mcp-client 2026-07-15 15:22:32 +08:00
Hypatia May 99dccf559a fix(compact): preserve replay ownership (PR2 round 2) 2026-07-15 15:13:57 +08:00
Tianyi Cui 72596afe08 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-15 15:08:25 +08:00
Tianyi Cui c2c38b18c4 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/cordis-catalog/events.md
#	docs/event-producer-consumer.md
#	packages/core/agent/src/types.ts
2026-07-15 15:08:10 +08:00
Tianyi Cui 130140feda Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-15 15:07:35 +08:00
Tianyi Cui 10f50c1b55 Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	docs/cordis-catalog/events.md
#	docs/core-data-structures/core.md
#	docs/event-producer-consumer.md
#	packages/core/agent/src/types.ts
2026-07-15 15:07:11 +08:00
Tianyi Cui 76c35dee8f Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-15 15:04:48 +08:00
Tianyi Cui af267aa8c0 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-15 15:04:47 +08:00
Tianyi Cui a2acfb858e Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-15 15:04:47 +08:00
Tianyi Cui 188698723c Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-15 15:04:47 +08:00
Tianyi Cui 17693d20c4 Merge remote-tracking branch 'origin/codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
# Conflicts:
#	packages/support/acp-snapshot/src/suite.ts
2026-07-15 15:04:29 +08:00
Tianyi Cui 649865043d docs: preserve prose cleanup in session simplification 2026-07-15 14:59:20 +08:00
Hypatia May f038780ff6 feat(llm): add replay token metering (PR2 round 1) 2026-07-15 14:47:29 +08:00
Tianyi Cui c386d12794 Merge branch 'codex/simp-drop-assembled-section-order' into codex/simp-drop-unused-schema-default 2026-07-15 14:07:25 +08:00