creatixchu
e497ea69b1
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 19:56:17 +08:00
pku-xht
d372dceee1
Merge commit '74a6e1e5cf520cdde8bf461d9051c81142fd6afe' into codex/dsh-sdk-dynamic-subagent-routing
2026-08-25 19:25:22 +08:00
Ziya and ZiyaZhang
b565df3442
feat(web): show exact per-turn token usage ( #3005 )
...
* feat(web): show exact per-turn token usage
* test(runtime): refresh exact token usage snapshots
* refactor(token-meter): own per-turn usage folding
* perf(ui-chat): bound paging anchor layout reads
* test(web): align usage golden with system prompt row
* fix(test): resolve token-meter client from source
* test(token-meter): cover retry without usage
---------
Co-authored-by: ZiyaZhang <199893125+ZiyaZhang@users.noreply.github.com >
2026-08-25 19:05:52 +08:00
pku-xht
311d565ace
Merge commit '8385aeecf95a4b842e8c317ab75ce26cafe8ba90' into codex/dsh-sdk-dynamic-subagent-routing
2026-08-25 18:31:27 +08:00
pku-xht
c2fb21d13a
Merge commit 'ead58a4a476200de2a2f2549ef6a02e73752b618' into codex/dsh-sdk-dynamic-subagent-routing
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-27-typescript-sdk-and-sdk-subagent-backend.i18n.yaml
# .agents/notes/implemented/feature/2026-07-27-typescript-sdk-and-sdk-subagent-backend.md
# .agents/notes/implemented/feature/2026-07-27-typescript-sdk-and-sdk-subagent-backend.zh.md
# examples/python-sdk-agent/tests/sdk.snapshot.ts
# packages/sdk/client/README.i18n.yaml
# packages/sdk/client/README.md
# packages/sdk/client/README.zh.md
# packages/sdk/client/src/types.ts
# packages/sdk/protocol/README.i18n.yaml
# packages/sdk/protocol/README.md
# packages/sdk/protocol/README.zh.md
# packages/sdk/server/src/server.ts
# packages/subagent/subagent-dsh-sdk/tests/fixtures/loader/snapshot.cordis.yml
# packages/subagent/subagent-dsh-sdk/tests/fixtures/loader/snapshot.replay.cordis.yml
2026-08-25 18:01:08 +08:00
Dudu-0223
44468d4583
Merge remote-tracking branch 'origin/master' into fix/web-fetch-ssrf
2026-08-25 15:53:46 +08:00
creatixchu
eea65e5275
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 15:52:17 +08:00
imccyu
a1781cc4a8
Merge pull request #3054 from deepseek-harness/worktree-revert2698
...
revert(session): remove streaming format migration pipeline
2026-08-25 15:47:19 +08:00
imccyu
211e6939e3
Revert "Merge pull request #2698 from deepseek-harness/xtr/session-format-migration"
...
This reverts commit 4b592eb90df20dc53dd12215921d5a9137214777, reversing
changes made to d15d3275d905e4d21229cd70a074388a428189d1.
2026-08-25 15:30:10 +08:00
creatixchu
d978d6f90c
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 15:04:56 +08:00
Dudu-0223
8e681a66b9
Merge origin/master into fix/web-fetch-ssrf
2026-08-25 14:46:26 +08:00
07akioni
61b65d3147
fix(web): show system prompts in chat
...
Render reconstructable system prompts at each request-series boundary, preserve series declarations through pre-step wrappers, and keep the presentation and replay snapshots aligned across clients.
2026-08-25 14:44:08 +08:00
Dudu-0223
aaf0924b48
Merge origin/master into fix/web-fetch-ssrf
2026-08-25 14:40:51 +08:00
Dudu-0223
797c711e11
refactor(web): remove fetch approval policy
2026-08-25 14:25:12 +08:00
Tianyi Cui
3e24087bfa
fix(web): authenticate the browser Host API
2026-08-25 14:23:45 +08:00
creatixchu
718dd4d1b4
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 14:19:37 +08:00
creatixchu
0d9bdccb7b
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 14:03:24 +08:00
Yichen Jiang
152d949f3e
Merge remote-tracking branch 'origin/master' into worktree/system-prompt-order-bands
2026-08-25 13:53:44 +08:00
creatixchu
bcdbd85d15
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 13:43:45 +08:00
_Kerman
d385dfb3e3
Merge remote-tracking branch 'github/master' into xtr/session-format-migration
...
# Conflicts:
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# packages/session/session-persistence-jsonl/src/index.ts
# packages/session/session-persistence/src/coordinator.ts
# packages/session/session-persistence/src/index.ts
2026-08-25 12:41:23 +08:00
Yichen Jiang
145e060992
Merge remote-tracking branch 'origin/master' into worktree/system-prompt-order-bands
2026-08-25 12:07:56 +08:00
Yichen Jiang
8020f6386d
docs(system-prompt): sync first-party order references
2026-08-25 12:05:38 +08:00
creatixchu
1c065f3cd4
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
...
# Conflicts:
# apps/cli/tests/profiles/acp/image-compaction.cordis.snapshot.yml
# apps/cli/tests/profiles/acp/image-compaction.cordis.yml
# apps/cli/tests/profiles/acp/tests/snapshots/image-compaction/input.json
# apps/cli/tests/profiles/acp/tests/snapshots/image-compaction/session.jsonl
# apps/cli/tests/profiles/acp/tests/snapshots/image-compaction/stdout.expected.jsonl
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# examples/acp-agent/tests/acp.snapshot.ts
# packages/llm/token-meter/README.i18n.yaml
# packages/llm/token-meter/README.md
# packages/llm/token-meter/README.zh.md
# packages/llm/token-meter/src/index.ts
# packages/llm/token-meter/src/surface-fold.ts
2026-08-25 11:15:35 +08:00
Yichen Jiang
43ac97b554
fix(system-prompt): centralize sparse section orders
2026-08-25 11:06:01 +08:00
creatixchu
dde6c8d7fc
Merge remote-tracking branch 'origin/master' into worktree/2986-trajectory-image-attachments
2026-08-25 10:50:06 +08:00
Dudu-0223
8bf8e42b63
Merge remote-tracking branch 'origin/master' into fix/web-fetch-ssrf
2026-08-25 09:38:28 +08:00
Dudu-0223
070a180a10
Merge remote-tracking branch 'origin/master' into fix/web-fetch-ssrf
...
# Conflicts:
# examples/acp-agent/tests/acp.snapshot.ts
# examples/acp-agent/tests/snapshots/web-fetch/input.json
# examples/acp-agent/tests/snapshots/web-fetch/stdout.expected.jsonl
# knip.json
# packages/test-support/session-snapshot/tests/fixtures/web-fetch-network.ts
# snapshots/sdk/subagent-mixed/session.1.jsonl
# snapshots/sdk/subagent-mixed/session.2.jsonl
# snapshots/session/advanced-toolchain-runtime/session.1.jsonl
# snapshots/session/advanced-toolchain-runtime/session.2.jsonl
# snapshots/session/subagent-depth-two-rejection/session.1.jsonl
# snapshots/session/subagent-depth-two-rejection/session.2.jsonl
# snapshots/session/subagent-multi/session.1.jsonl
# snapshots/session/subagent-multi/session.2.jsonl
# snapshots/session/subagent-parallel/session.1.jsonl
# snapshots/session/subagent-parallel/session.2.jsonl
# snapshots/session/web-fetch/session.jsonl
# snapshots/session/web-fetch/web-fetch-fixture-server.mjs
2026-08-25 09:14:36 +08:00
imccyu
075a46cdec
fix(client): preserve combo source identities
2026-08-25 06:43:25 +08:00
imccyu
83463aa896
feat(client): use bounded plugin combo URLs
2026-08-25 06:43:24 +08:00
imccyu
08ed5a54a8
refactor(webserver): minimize HTTP gzip integration
2026-08-25 06:43:24 +08:00
imccyu
1229292497
docs(session): refresh architecture and generated contracts
2026-08-25 06:10:25 +08:00
Tianyi Cui
4125514a08
refactor(repo): retire top-level examples
2026-08-24 22:02:44 +08:00
Dudu-0223
709e5edaba
fix(web): enforce approval before DNS resolution
2026-08-24 21:39:24 +08:00
pku-xht
57eba4341c
fix(subagent): narrow provider route defaults
2026-08-24 21:38:28 +08:00
pku-xht
096ae14db2
fix(subagent): bind preflight to provider route defaults
2026-08-24 21:38:28 +08:00
pku-xht
3c79979d1d
fix(subagent): resolve DSH defaults before preflight
2026-08-24 21:38:28 +08:00
pku-xht
1044db218d
feat(subagent): carry model routing through DSH SDK
2026-08-24 21:38:28 +08:00
Dudu-0223
357d9749d1
Merge remote-tracking branch 'origin/master' into fix/web-fetch-ssrf
...
# Conflicts:
# apps/web/tests/preview-boot.e2e.ts
2026-08-24 21:13:00 +08:00
imccyu
9c3a0893f6
perf(client-modules): defer per-plugin revision hashing
...
Preserve sourcemaps through the production Client build and verify batched loading across Host, HMR, and Web Worker paths.
2026-08-24 20:49:13 +08:00
lsdsjy
5bbaf168d9
perf(client-modules): batch startup plugin scripts
2026-08-24 20:48:12 +08:00
creatixchu
9f2ba9f5aa
Merge origin/master (regenerate config catalog)
2026-08-24 19:51:16 +08:00
creatixchu
42164508c8
feat(llm): 在 compaction 中按路由为图片请求压力计价
...
Closes #2848 .
- dsh-llm 新增 LlmAdapter.imageRequestPricing 同步钩子与 LlmImageRequestPricing/LlmImageRequestPrice 词汇，ctx.llm 按路由解析
- llm-deepseek 用官方公布的 v4 视觉计算器逐句移植（14px patch、3:1 降采样、384 上限、最坏对齐 pad）实现该钩子，复现请求投影的最旧优先 offload 与像素预算缩放；纯几何 requestImageDimensions 上移到 dsh-attachment
- token-meter 表层 fold 存储与路由无关的节点事实，measure() 按生效 envelope 的路由为图片出现处定价；锚点存快照并按同一路由重定价；TokenSurfaceNode 同时携带路由价 tokens 与固定启发式 heuristicTokens
- compaction 触发、保留与选段读取同一套路由价，记录的 shadowedTokenCount 保持启发式以维持 O(1) 投影 fold 一致
- llm-replay 支持按模型的 imageRequestTokens 声明；新增 keyless 的 image-compaction ACP 快照场景端到端验证装配应用
2026-08-24 19:15:30 +08:00
creatixchu
00d3c82563
Merge remote-tracking branch 'origin/master' into worktree/2986-trajectory-image-attachments
2026-08-24 19:12:37 +08:00
creatixchu
d420292400
fix(web): 处理评审发现的图片记录边界情况
...
- 图片错误结果在 Result 页签保留错误名称与代码
- 空文本块加图片的记录按纯图片标注，不再空行
- sourceBlock 的持久化图片守卫检查 attachmentId 字段
- 移除 ui-chat 对 util/crypto 的过期 tsconfig 引用
- 同步 slots.md 层级图与 2026-08-20 所有权 Note
2026-08-24 18:58:25 +08:00
Dudu-0223
f76a225a7d
Merge pull request #2663 from deepseek-harness/feat/subagent-provider
...
让 subagent 按需发现并选择子 Agent 模型
2026-08-24 18:23:42 +08:00
creatixchu
30704dc1df
fix(attachment): budget master pixels and share the encoding ladder
...
Master dimensions move from a 2048 long-edge rule to a total-pixel
budget (normalizedImageMaxPixels, default 2048x2048) with an 8192
long-edge cap, so extreme aspect ratios keep short-edge resolution.
The shared quality ladder and lazy execution move to encoding.ts,
review-round doc fixes land across attachment and llm packages, and
the superseded facts in the unified-image-pipeline note now describe
the shipped routing.
2026-08-24 17:10:59 +08:00
creatixchu
ebb8010b56
Merge remote-tracking branch 'origin/master' into worktree/2885-image-compression
...
# Conflicts:
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# packages/llm/llm-deepseek/README.i18n.yaml
# packages/llm/llm-deepseek/README.md
# packages/llm/llm-deepseek/README.zh.md
# packages/llm/llm-deepseek/src/adapter.ts
2026-08-24 16:23:34 +08:00
creatixchu
4863890535
fix(attachment): route image encoding by alpha over shared quality ladders
...
Delete the 5-bit colour-count classifier and palette PNG branch that
misrouted high-frequency photographic JPEGs (issue #2885 images 23/24)
into an encoder 100x slower with 4x larger output. Both normalization
and request-image encoding now route by the decoded alpha fact alone:
opaque sources down a JPEG ladder and alpha sources down a WebP
effort-0 ladder, each at qualities 85/75/60. Byte budgets become ladder
targets: the downscale retry loop is gone and a ladder-exhausted encode
keeps its smallest output, while provider byte caps stay enforced at
the transmitting route. Request transforms move to request-image-v5.
2026-08-24 16:14:32 +08:00
creatixchu
558f08780c
refactor(attachment): 分离宿主位置与模型访问路径
2026-08-24 14:51:03 +08:00
Dudu-0223
9fbcea099b
feat(web): require one-shot fetch approval
2026-08-24 13:38:06 +08:00
creatixchu