pku-xht
e6818bd697
Merge commit '4913489a6184d124900273e3a76d595e25d76099' into codex/subprocess-win32-process-primitives
...
# Conflicts:
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
2026-08-21 21:42:39 +08:00
imccyu
8081620a35
fix: loopback
2026-08-21 20:35:34 +08:00
imccyu
3cc90952cc
chore(gates): regenerate catalogs and keep repository gates green
...
Config catalog, module graph, event producer-consumer tables, and
third-party notices regenerate over the webworker surface; the oxlint
rule fingerprint and the ui-renderer NodeNext import face follow.
2026-08-21 20:35:33 +08:00
creatixchu
d4b24b5148
Merge remote-tracking branch 'origin/master' into worktree/image-management-strategy
2026-08-21 16:55:00 +08:00
imccyu
7ce85283b5
Revert "Merge pull request #2608 from deepseek-harness/fix/permission-copy-and-default"
...
This reverts commit d51f4106a2b0669d33e0f5dc1d5dcf21a764d313, reversing
changes made to 69ace51625b6ac665b2f2ec1e81005d5b055f152.
2026-08-21 16:21:13 +08:00
creatixchu
de8ea5d715
docs: refresh image pipeline module graph
2026-08-21 15:05:55 +08:00
pku-xht
6d9bc90532
Merge origin/master into codex/subprocess-win32-process-primitives
2026-08-20 18:38:46 +08:00
Yichen Jiang
564e4d1610
chore(sync): regenerate the module graph after the projection merges
2026-08-20 17:58:39 +08:00
Yichen Jiang
6428b844ef
fix(ci): catch the branch up with the static and smoke gates
...
- dsh-authorization's manifest becomes a release member on current
master's terms: version matches the root 0.1.0-rc.6 and
publishConfig.access is public, which the constraints gate and the
tarball pack's version verify both enforce after the master merge.
- Regenerate docs/module-graph (zh mirror included) for the
authorization package and the llm-pi-ai -> authorization edge; the
graph gate lives outside doc-sync and was never regenerated when the
package was added.
- The built-bin smoke seeds the versioned credentials document; this
branch's provider refuses the pre-release flat layout by design, and
the master-side test still wrote the old shape.
2026-08-20 17:58:38 +08:00
pku-xht
b2d344771e
Merge origin/master into codex/subprocess-win32-process-primitives
2026-08-20 15:21:28 +08:00
Kaige-Gao
a0bfc2c3fe
test: sync permission origin artifacts
2026-08-20 00:01:28 +08:00
imccyu
70a3bf4554
docs: refresh Agent Teams catalogs
2026-08-19 22:44:23 +08:00
pku-xht
615d910f04
Merge origin/master into codex/subprocess-win32-process-primitives
2026-08-19 20:01:10 +08:00
Magolor
93b4b98ef3
feat(session): optimize SQLite persistence layout
2026-08-19 18:36:27 +08:00
imccyu
319d9a7984
feat(client): compose deployment branding through slots
2026-08-19 18:21:35 +08:00
pku-xht
ce46af97f2
Merge commit '84d329db60462a97ff7de82d8c7bd101676a3f0e' into codex/subprocess-win32-process-primitives
2026-08-19 16:19:10 +08:00
_Kerman
7d3ba2a85b
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2300
2026-08-19 15:39:30 +08:00
_Kerman
ea35359b86
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2300
2026-08-19 15:12:21 +08:00
creatixchu
e7a668906a
Merge remote-tracking branch 'origin/master' into worktree/web-file-session-references
...
# Conflicts:
# packages/client/connection/src/client/fixture.ts
# packages/client/ui-conversation/src/client/input/facade.ts
# packages/client/ui-conversation/src/client/input/hub.ts
# packages/client/ui-conversation/tests/input-matrix.client.spec.tsx
# packages/client/ui-conversation/tests/input-scenarios.client.spec.tsx
# packages/client/ui-conversation/tests/skeleton.client.spec.tsx
2026-08-19 14:49:57 +08:00
pku-xht
051851ac60
Merge commit '806f0f1ae7af106f12237bbd56cfe6f16b79cecb' into codex/subprocess-win32-process-primitives
2026-08-19 14:35:58 +08:00
pku-xht
5f6936b4f6
Merge commit 'ccadc8a43aca7c11d7a42b75ae8115730ce57e68' into codex/subprocess-win32-process-primitives
2026-08-19 14:28:39 +08:00
Yichen Jiang
458a742cfe
Merge remote-tracking branch 'origin/master' into worktree/deepseek-native-multimodal
2026-08-19 14:22:22 +08:00
pku-xht
163fef7d64
Merge commit '881f7fe696c64e7775572680a38af07be6e9d158' into codex/subprocess-win32-process-primitives
2026-08-19 14:12:26 +08:00
Yichen Jiang
4a02791c9a
fix(llm): address multimodal review findings
2026-08-19 12:47:24 +08:00
07akioni
149d4ba01c
Merge remote-tracking branch 'origin/master' into feat/home-path-abbr
2026-08-19 12:24:40 +08:00
_Kerman
7a5bfe187a
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2300
2026-08-19 11:56:27 +08:00
creatixchu
fcaa0efec5
Merge remote-tracking branch 'origin/master' into worktree/command-attachment-envelope
2026-08-19 11:11:15 +08:00
Yichen Jiang
67a7c79004
Merge remote-tracking branch 'origin/master' into worktree/web-file-session-references
...
# Conflicts:
# docs/event-producer-consumer.i18n.yaml
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
# packages/context/agent-instructions/tests/agent-instructions.spec.ts
2026-08-19 11:01:27 +08:00
_Kerman
450a1f8811
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2300
2026-08-19 10:33:31 +08:00
pku-xht
668da7f507
refactor(win32-process): share native process primitives
2026-08-19 04:08:46 +08:00
07akioni
51c86af1e9
chore: refresh client catalog and module graph for connection inject
2026-08-18 20:09:55 +08:00
pku-xht
1ec9c0c4a6
Merge codex/installable-product-subagents into codex/installable-codex-provider
2026-08-18 18:29:37 +08:00
_Kerman
815b6ce5ad
Merge remote-tracking branch 'origin/master' into feat/pwsh-persistent-pty
2026-08-18 16:47:45 +08:00
creatixchu
d007f437cc
Merge remote-tracking branch 'origin/master' into worktree/command-attachment-envelope
2026-08-18 16:25:11 +08:00
creatixchu
35a10ec41a
Merge remote-tracking branch 'origin/master' into worktree/web-file-session-references
...
# Conflicts:
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/tests/input-bar.client.spec.tsx
# packages/client/ui-subagent/package.json
# pnpm-lock.yaml
2026-08-18 15:22:32 +08:00
_Kerman
b72bd6f5be
merge: bring master into feat/pwsh-persistent-pty
2026-08-18 13:36:46 +08:00
creatixchu
1492b0cfee
Merge remote-tracking branch 'origin/master' into worktree/command-attachment-envelope
...
# Conflicts:
# apps/web/tests/assembled-boot.ts
2026-08-18 12:00:46 +08:00
Dudu-0223
570aff0e27
refactor(team): incubate Agent Teams packages
2026-08-18 11:58:11 +08:00
Dudu-0223
3546f595b9
feat(team): add durable Agent Teams runtime
2026-08-18 11:58:11 +08:00
imccyu
885df835a1
docs: refresh module dependency graph
2026-08-18 01:34:54 +08:00
imccyu
85fa5b6943
docs(client): synchronize UI boundary references
2026-08-18 01:34:23 +08:00
creatixchu
29de639e99
fix(web): 按评审意见调整引用职责
2026-08-17 21:13:33 +08:00
creatixchu
56efd81d19
fix(ci): sync release version and module graph
2026-08-17 20:32:14 +08:00
Chinesezjc
177fbfad4f
Merge remote-tracking branch 'origin/master' into feat/code-runtime-python-protocol
2026-08-17 18:52:50 +08:00
Chinesezjc
b90b45158e
Merge remote-tracking branch 'origin/master' into feat/code-runtime-python-protocol
...
Resolutions:
- docs/module-graph.md, docs/config-catalog.md: generated files. Regenerated
with gen-module-graph and gen-config-catalog on the merged tree, then carried
the new package's entries into the Chinese sides and re-recorded both
pairings. Each side now differs from master by exactly the
code-runtime-python rows.
- scripts/verify-package-readme-model-experience.ts, tsconfig.host.json: master
renamed packages/bash -> packages/shell, packages/pty -> packages/terminal,
code-runtime-worker -> code-runtime-worker-thread and agent-tool-mode ->
agent-tool-presentation. Kept master's names and re-added this branch's
code-runtime-python entry.
Adapted the package to conventions master introduced while the branch was open:
version 0.1.0-rc.6 with publishConfig.access "public" (the release-member rule
check-workspace-constraints now enforces), the invariants project reference
moved to packages/runtime-diagnostics/invariants, and the README companion link
retargeted to code-runtime-worker-thread.
2026-08-17 17:26:11 +08:00
Tianyi Cui
b2f23f88ad
Merge commit '70396085b141370ce32de1be4e225b4384eaf46d' into HEAD
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-07-mcp-client-plugin.i18n.yaml
# .agents/notes/implemented/feature/2026-07-20-code-mode-typed-tool-returns.i18n.yaml
# .agents/notes/implemented/feature/2026-07-22-web-multimodal-image-input-and-durable-attachments.i18n.yaml
# .agents/notes/implemented/feature/2026-07-22-web-multimodal-image-input-and-durable-attachments.md
# .agents/notes/implemented/feature/2026-07-22-web-multimodal-image-input-and-durable-attachments.zh.md
# .agents/notes/implemented/simplification/2026-07-23-acp-automation-only-protocol.i18n.yaml
# docs/config-catalog.i18n.yaml
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# docs/tool-catalog.i18n.yaml
# docs/tool-catalog.md
# docs/tool-catalog.zh.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/both-mode-turn/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/code-mode-turn/tool-schemas.expected.json
# packages/core/tools/README.i18n.yaml
# packages/core/tools/README.zh.md
# packages/core/tools/src/code-mode.ts
# packages/host/apiproxy/tests/api-proxy-models.spec.ts
# packages/host/plugin-inventory/tests/inventory.spec.ts
# packages/mcp/mcp-client/tests/mcp-client.e2e.ts
# packages/mcp/mcp-client/tests/mcp-client.spec.ts
# packages/self-modification/tool-cordis/src/api-catalog.ts
# packages/test-support/acp-snapshot/README.i18n.yaml
# pnpm-lock.yaml
2026-08-17 11:31:59 +08:00
pku-xht
b2178ade80
feat(subagent): make Codex provider directly installable
2026-08-15 03:25:43 +08:00
pku-xht
b4366e711d
feat(subagent): make Claude Code provider directly installable
2026-08-14 16:05:48 +08:00
pku-xht
22152e39be
Merge commit 'f2685aa648d9d7239ae553ff42f3811ced59d393' into codex/installable-product-subagents
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-08-05-profile-plugin-bundles.i18n.yaml
# .agents/notes/implemented/architecture/2026-08-05-profile-plugin-bundles.zh.md
# .agents/notes/implemented/simplification/2026-08-12-production-dsh-excludes-product-subagent-providers.i18n.yaml
# .agents/notes/implemented/simplification/2026-08-12-production-dsh-excludes-product-subagent-providers.md
# .agents/notes/implemented/simplification/2026-08-12-production-dsh-excludes-product-subagent-providers.zh.md
# apps/cli/composition.md
# apps/cli/tests/web-agent-presets.e2e.ts
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/bundle/base/README.i18n.yaml
# packages/bundle/base/README.zh.md
# packages/bundle/base/package.json
# packages/subagent/subagent-claude-code/package.json
# packages/subagent/subagent-codex/package.json
# pnpm-lock.yaml
2026-08-13 15:58:24 +08:00
Huanqi Cao
f5c0d7e522
merge: bring master's rc.5 release and cordis tool renames into feat/pwsh-persistent-pty
2026-08-13 11:54:16 +08:00
pku-xht