creatixchu
b4517feed5
Merge remote-tracking branch 'origin/master' into worktree/2984-generic-file-upload
2026-09-04 14:46:36 +08:00
07akioni
1553862ac1
Merge remote-tracking branch 'origin/master' into feat/electron
2026-09-04 14:26:23 +08:00
Turtle
c58097a826
feat(session-persistence-jsonl): cross-process write-ownership lease
...
Write handles now hold a durable lease (session.lock.json beside the
log): a random owner token, diagnostic pid, and an expiry. Acquisition
wins by exclusive create; a second process's create or write open rejects
while the record is unrenewed for less than leaseTtlMs (default 5 min),
and takes over after that — a crashed holder is waited out, never
reclaimed by pid. The holder renews every leaseRenewIntervalMs (default
4 min); a renewal that finds a foreign, vanished, or expired record — or
fails outright — marks the lease lost permanently, so every later
append/flush rejects with SessionOwnershipLostError while reads continue.
Close releases the record; read handles never touch it. Takeover of an
expired record is eventually exclusive: a replaced holder stops within
one renewal interval.
Refs #3245
2026-09-04 14:12:14 +08:00
creatixchu
268cf0101e
Merge remote-tracking branch 'origin/master' into worktree/2984-generic-file-upload
2026-09-04 13:08:41 +08:00
creatixchu
f0e52c2731
refactor(file-upload): tighten service boundaries
2026-09-04 13:08:25 +08:00
_Kerman
891f07a2d0
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2672
...
# Conflicts:
# docs/event-producer-consumer.i18n.yaml
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/api/session-controller/README.i18n.yaml
# packages/api/session-controller/README.md
# packages/api/session-controller/README.zh.md
# packages/api/session-controller/tests/session-projections.host.spec.ts
# packages/bundle/headless/tests/headless.spec.ts
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent-loop/README.md
# packages/core/agent-loop/README.zh.md
# packages/core/agent/src/runtime-types.ts
# packages/fs/tool-str-replace-editor/tests/tools.spec.ts
# packages/llm/llm-retry/tests/retry.spec.ts
# packages/llm/llm-retry/tests/transport-recovery.spec.ts
# packages/shell/tool-bash-persistent/tests/loader-composition.spec.ts
# packages/shell/tool-bash-persistent/tests/tools.spec.ts
# packages/shell/tool-pwsh-persistent/tests/loader-composition.spec.ts
# packages/shell/tool-pwsh-persistent/tests/tools.spec.ts
# packages/terminal/terminal-bash/tests/index.spec.ts
# packages/test-support/agent-loop-testkit/package.json
2026-09-04 12:18:37 +08:00
Turtle
9656a1742b
Merge pull request #3521 from deepseek-harness/turtle/issue-2349-windows-root-workspace
...
fix(workspace): preserve Windows drive roots
2026-09-04 11:10:27 +08:00
creatixchu
fb743759a7
Merge remote-tracking branch 'origin/master' into worktree/2984-generic-file-upload
...
# Conflicts:
# apps/web/tests/scaffold.ts
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# docs/event-producer-consumer.i18n.yaml
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
# packages/api/session-controller/README.i18n.yaml
# packages/api/session-controller/README.md
# packages/api/session-controller/README.zh.md
# packages/extensions/tool-cordis/src/api-catalog.ts
# packages/llm/token-meter/src/index.ts
# packages/session-query/session-log-export/README.i18n.yaml
# packages/session-query/session-log-export/README.md
# packages/session-query/session-log-export/README.zh.md
# packages/session-query/session-log-export/src/archive.ts
# scripts/package-dependency-policy.ts
2026-09-04 10:12:19 +08:00
pku-xht
cffb09b02c
Merge commit '0d361e6eede9e8a739e776949aa7d5e3de4472da' into codex/subprocess-native-containment
...
# Conflicts:
# snapshots/session/cordis-inspect-jsdoc/session.v2.jsonl
2026-09-04 00:56:00 +08:00
Tianyi Cui
d58964a010
Merge commit 'be5db297c7' into worktree/session-format-05-v1-v2-chunk-migration
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-08-31-live-assistant-stream-frames.i18n.yaml
# .agents/notes/implemented/architecture/2026-08-31-live-assistant-stream-frames.md
# .agents/notes/implemented/architecture/2026-08-31-live-assistant-stream-frames.zh.md
# docs/event-producer-consumer.i18n.yaml
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
# packages/api/session-controller/README.i18n.yaml
# packages/api/session-controller/README.md
# packages/api/session-controller/README.zh.md
# packages/api/session-controller/src/assistant-stream.ts
# packages/api/session-controller/src/client/sessions/assistant-stream.ts
# packages/api/session-controller/src/types.ts
# packages/api/session-controller/tests/assistant-stream.client.spec.ts
# packages/api/session-controller/tests/session-history-journal.host.spec.ts
# packages/api/session-controller/tests/sessions-service.client.spec.ts
# packages/api/session-controller/tests/transport.client.spec.ts
# packages/core/agent/README.i18n.yaml
# packages/core/agent/README.md
# packages/core/agent/README.zh.md
# packages/extensions/tool-cordis/src/api-catalog.ts
# scripts/package-dependency-policy.ts
2026-09-03 22:09:31 +08:00
Tianyi Cui
fe9c2d7053
refactor(agent, session-controller): drop the unread startedTime frame field
...
The `start` frame and the reconnect baseline attempt carried a wall-clock
`startedTime` that no Host or Client consumer read: the Host accumulator
and the Client reconciler copied it into their attempt maps and nothing
looked at it again. Presentation frames now carry only the coordinates
consumers use (attempt, revision, turn, step, chunk index, and v1 seq
provenance); the type-equivalence block, event graph, READMEs, and the
live-stream Agent Note follow the type.
2026-09-03 21:58:34 +08:00
pku-xht
d79f5c04e8
Merge master into codex/subprocess-native-containment
2026-09-03 21:46:02 +08:00
fz
8d06ebb5ac
Revert "refactor: remove str_replace_editor"
...
This reverts commit d12b1146baa326e6facd3b10f81ae11db35ffd86.
2026-09-03 21:05:38 +08:00
creatixchu
ea669428be
refactor(attachment): unify prompt content admission
2026-09-03 20:53:29 +08:00
creatixchu
3eb9736eb6
refactor(file-upload): scope prompt binding rollback
2026-09-03 20:15:18 +08:00
Tianyi Cui
d5044d5675
Merge commit 'ee4bad5cde' into worktree/session-format-05-v1-v2-chunk-migration
2026-09-03 19:25:29 +08:00
Tianyi Cui
bb771b133c
Merge commit '09d3a185ab' into worktree/session-format-04-live-assistant-stream
2026-09-03 19:24:54 +08:00
Turtle
e609fd73a3
fix(workspace): harden qualified path handling
2026-09-03 19:01:30 +08:00
Tianyi Cui
778e0866c3
test(session): cover the migration read faults and the versioned export name
...
The JSONL backend rethrows storage errno failures and abort signals from the
source read of a pending migration unwrapped; a test now drives both through
the stat seam so the classification stays covered. The navigation-panes Web
e2e derives the exported archive entry from `SESSION_FORMAT_VERSION`, which
`session-log-export` uses for its `session.v<N>.jsonl` name. The module graph
records the `session-log-export` → `session` peer edge.
2026-09-03 19:00:16 +08:00
Tianyi Cui
28b16c011a
Merge commit 'a123cb0055' into worktree/session-format-05-v1-v2-chunk-migration
...
# Conflicts:
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
2026-09-03 18:39:44 +08:00
Tianyi Cui
13074e4aa2
Merge commit '308c1c69a6' into worktree/session-format-04-live-assistant-stream
2026-09-03 18:36:02 +08:00
Tianyi Cui
3aef64797d
Merge master into session format migration
...
# Conflicts:
# packages/test-support/session-snapshot/src/harness.ts
# scripts/smoke-python-runtime.py
2026-09-03 18:31:54 +08:00
creatixchu
b2c4483c9d
refactor(attachment): own prompt admission on service
2026-09-03 18:18:32 +08:00
Turtle
d33fe767c1
fix(workspace): preserve Windows drive roots
2026-09-03 17:14:02 +08:00
fz
79b3d7a594
refactor: remove str_replace_editor
2026-09-03 17:02:37 +08:00
creatixchu
7158227650
fix(file-upload): declare host runtime dependencies
2026-09-03 16:35:50 +08:00
creatixchu
345b5cdc6f
feat(session, llm): durable image offload watermark
...
Record the image offload point as the core image/offload session event so the
derived surface, every adapter, and the token meter share one offloaded set.
The agent loop plans the advance from the route's declared request-image
budget before dispatch; an adapter whose exact accounting still overflows
fails with IMAGE_OFFLOAD_REQUIRED and the loop advances by the named count.
2026-09-03 16:29:51 +08:00
creatixchu
8fc9a11c5e
refactor(attachment): isolate file upload service
2026-09-03 16:10:24 +08:00
fz
e9f8641e76
Merge remote-tracking branch 'origin/master' into feat/remove-str-replace-editor-from-minimal
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-10-single-file-executable-sdk-runtime-distribution.i18n.yaml
# .agents/notes/implemented/architecture/2026-08-23-python-sdk-dsh-profile-runtime.i18n.yaml
# .agents/notes/implemented/architecture/2026-08-23-python-sdk-windows-x64-runtime.i18n.yaml
2026-09-03 16:05:56 +08:00
fz
63795eaa5c
feat(minimal): remove str_replace_editor from minimal profiles
2026-09-03 16:03:59 +08:00
mektpoy
e26fc35d4b
fix(goal): keep manual pause authoritative and show activation
...
Expose a live goals/get read plus goal/activation-changed for the Web strip, reject model resume of durable paused goals, refresh snapshot and generated documentation surfaces, and record the follow-up decision.
2026-09-03 14:53:20 +08:00
creatixchu
1967bedd9f
Merge remote-tracking branch 'origin/master' into worktree/2984-generic-file-upload
2026-09-03 14:43:25 +08:00
creatixchu
b7e5d0b90e
docs(client): refresh generated catalogs
2026-09-03 14:25:05 +08:00
Yichen Jiang
a51474c436
docs(user): align provider guide wording with the effort menu, config button, and off semantics
2026-09-03 14:15:32 +08:00
Yichen Jiang
74c38ba9c7
Merge remote-tracking branch 'origin/master' into worktree/lark-docs-optimization-c86275
2026-09-03 14:07:26 +08:00
creatixchu
b8512fa5e5
Merge remote-tracking branch 'origin/master' into worktree/2984-generic-file-upload
2026-09-03 13:53:47 +08:00
07akioni
3e526474a3
Merge remote-tracking branch 'origin/master' into feat/electron
...
# Conflicts:
# pnpm-lock.yaml
# scripts/gen-cordis-catalog.ts
2026-09-03 13:46:37 +08:00
Yichen Jiang
34b33c2273
docs(user): simplify discovery, protocol, and OAuth wording in the provider guide
2026-09-03 13:31:47 +08:00
Yichen Jiang
13f467b15b
docs(user): gather settings.yaml fields under advanced configuration ahead of troubleshooting
2026-09-03 12:36:39 +08:00
Yichen Jiang
be1777084d
docs(user): call catalog providers built-in providers in the provider guide
2026-09-03 12:33:24 +08:00
Yichen Jiang
254c9b8b7f
docs(user): guide model discovery for third-party providers
2026-09-03 11:51:46 +08:00
Yichen Jiang
454d92dc34
docs(user): route reasoning levels and settings.yaml fields through the provider guide
2026-09-03 11:49:22 +08:00
pku-xht
29c68b6da9
docs(subprocess): sync native containment evidence
2026-09-03 07:03:00 +08:00
Tianyi Cui
67c8a58854
fix(session): address v2 migration review
2026-09-03 04:45:41 +08:00
Tianyi Cui
a88ef734cc
Merge remote-tracking branch 'origin/worktree/session-format-04-live-assistant-stream' into worktree/session-format-05-v1-v2-chunk-migration
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-08-31-live-assistant-stream-frames.i18n.yaml
# .agents/notes/implemented/architecture/2026-08-31-live-assistant-stream-frames.md
# .agents/notes/implemented/architecture/2026-08-31-live-assistant-stream-frames.zh.md
# .agents/notes/implemented/simplification/2026-08-06-buffer-free-feedback-telemetry.i18n.yaml
# .agents/notes/implemented/simplification/2026-08-06-buffer-free-feedback-telemetry.md
# .agents/notes/implemented/simplification/2026-08-06-buffer-free-feedback-telemetry.zh.md
# apps/web/tests/scaffold.ts
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# packages/api/session-controller/README.i18n.yaml
# packages/api/session-controller/README.md
# packages/api/session-controller/README.zh.md
# packages/api/session-controller/src/client/sessions/assistant-stream.ts
# packages/core/agent-loop/src/agent.ts
# packages/core/agent-loop/src/assistant-stream.ts
# packages/core/agent-loop/tests/loop.spec.ts
# packages/core/agent/src/runtime-types.ts
# packages/session/session-telemetry/tests/telemetry.spec.ts
# packages/test-support/llm-replay/README.i18n.yaml
# packages/test-support/llm-replay/README.md
# packages/test-support/llm-replay/README.zh.md
# packages/test-support/llm-replay/src/alpha-refusal-fixtures.ts
# packages/test-support/llm-replay/src/index.ts
# packages/test-support/llm-replay/tests/llm-replay.spec.ts
# packages/test-support/session-snapshot/README.i18n.yaml
# packages/test-support/session-snapshot/README.md
# packages/test-support/session-snapshot/README.zh.md
# packages/test-support/session-snapshot/src/suite.ts
# packages/test-support/session-snapshot/tests/suite.spec.ts
# snapshots/sdk/sdk.snapshot.ts
# snapshots/session/headless.snapshot.ts
2026-09-03 03:10:05 +08:00
Tianyi Cui
a65edc4810
fix(agent): terminate live assistant attempts
2026-09-03 02:25:25 +08:00
Tianyi Cui
a5c24f204d
Merge remote-tracking branch 'origin/worktree/session-format-03-v0-v1-migration' into worktree/session-format-04-live-assistant-stream
2026-09-03 02:02:47 +08:00
Tianyi Cui
f044d3fad2
fix(session): address v0 migration review
2026-09-03 01:52:25 +08:00
pku-xht
fe873955b4
Merge master@313ac567 into subprocess native containment
2026-09-02 23:00:02 +08:00
pku-xht
ac1a5891c2
fix(subprocess): close remaining native containment findings
2026-09-02 22:49:46 +08:00
creatixchu