Yichen Jiang
caf2db0929
Merge branch 'worktree-config-settings-seam' into worktree-llm-dynamic-config
...
# Conflicts:
# packages/settings/settings-local/src/index.ts
2026-07-30 17:39:07 +08:00
ZiyaZhang
96156eaa1d
Merge remote-tracking branch 'upstream/master' into fix/workspace-context-rendered-change-proof
2026-07-30 02:36:30 -07:00
ZiyaZhang
9eee7cb462
Merge remote-tracking branch 'upstream/master' into fix/session-waiting-approval
2026-07-30 02:36:30 -07:00
Tianyi Cui
66e182b516
Merge branch 'master' into feature/shared-cli-config-foundation
2026-07-30 17:35:47 +08:00
kingwl
3d6cacc59b
Merge remote-tracking branch 'origin/master' into codex/composer-dock-stacking
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 17:35:22 +08:00
kingwl
0f0564b3d0
Merge origin/master into codex/figma-context-injection-row
2026-07-30 17:35:04 +08:00
creatixchu
eba513340c
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 17:34:59 +08:00
Yichen Jiang
c86b7c2c3a
Merge remote-tracking branch 'origin/master' into worktree/fix-multi-select-custom-answer
...
# Conflicts:
# packages/client/ui-question/README.i18n.yaml
# packages/client/ui-question/src/client/QuestionComposer.tsx
# packages/host/apiproxy/README.i18n.yaml
# packages/ui/tui/README.i18n.yaml
2026-07-30 17:34:48 +08:00
creatixchu
0f8cde3e02
Merge remote-tracking branch 'origin/master' into worktree/command-row-copy
2026-07-30 17:34:38 +08:00
kingwl
f5228e7c71
Merge origin/master into codex/figma-context-injection-row
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ToolRow.module.css
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
2026-07-30 17:34:14 +08:00
creatixchu
d9fb03deec
Merge remote-tracking branch 'origin/feat/directory-picker-show-hidden' into feat/directory-picker-quiet-navigation
2026-07-30 17:34:09 +08:00
creatixchu
d9cb19f276
feat(ui): drop the slash and the argument echo from the command row
...
The web command row renders `title · summary` from one logged command
lifecycle pair, and the two halves were written without knowing about each
other: the title was the dispatched line rebuilt from `command/run` and the
summary was `command/done`'s verbatim text, so every Access-chip pick read
`/permission workspace-write · Permission preset: workspace-write.` — the
command name twice and its argument twice.
The title is now the bare command name (no `/`, no arguments — the summary
already says what the command did), and a command handler's settlement text
never repeats the command's own name, so `/permission` returns `preset
workspace-write`. The row reads `permission · preset workspace-write`, and
the TUI notice still names the preset that now applies. The log is
unchanged: `command/run` keeps its structured name/args split for a richer
registered row.
2026-07-30 17:34:03 +08:00
Hypatia May
16378e4ba7
Merge remote-tracking branch 'origin/fix/human-transcript-projection' into fix/web-transcript-projection
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 17:33:55 +08:00
ZiyaZhang
10c1339177
docs(workspace-context): define partial render commits
2026-07-30 02:33:33 -07:00
creatixchu
295813f6eb
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 17:32:46 +08:00
_Kerman
d1dc303bc6
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/session.i18n.yaml
# docs/persistence-catalog.md
# packages/cordis/tool-cordis/src/api-catalog.ts
2026-07-30 17:30:10 +08:00
Hypatia May
cc7c1f44de
Merge remote-tracking branch 'origin/master' into codex/status-bar-token-metrics
2026-07-30 17:29:50 +08:00
Hypatia May
47d2bcb18c
Merge remote-tracking branch 'origin/master' into fix/human-transcript-projection
2026-07-30 17:28:49 +08:00
imccyu
aaf8fd07e0
Merge pull request #954 from deepseek-harness/codex/details-default-closed
...
fix(web): keep details closed by default
2026-07-30 17:28:32 +08:00
Hypatia May
82817570b0
Merge remote-tracking branch 'origin/master' into fix/human-transcript-projection
...
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/session.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
# packages/ui/tui/src/index.ts
2026-07-30 17:28:26 +08:00
_Kerman
3c4a185e35
fix(ui): balance trajectory context icon
2026-07-30 17:28:04 +08:00
_Kerman
5a0d26a0e4
test: migrate consumers to inbox and owned-run APIs
2026-07-30 17:28:03 +08:00
kingwl
abf498b8dc
fix(web): align composer context stack
2026-07-30 17:26:44 +08:00
Yichen Jiang
0a263941ef
Merge branch 'worktree-llm-dynamic-config' into worktree-llm-web-config
...
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/event-producer-consumer.md
# examples/headless-agent/tests/headless.snapshot.ts
# examples/headless-agent/tests/snapshots/missing-credential/stream-json.expected.jsonl
# packages/llm/llm-deepseek/README.i18n.yaml
# packages/llm/llm-deepseek/src/index.ts
# packages/llm/llm-pi-ai/README.i18n.yaml
# packages/llm/llm-pi-ai/src/index.ts
# packages/llm/llm/README.i18n.yaml
# packages/llm/llm/src/index.ts
2026-07-30 17:22:44 +08:00
Hypatia May
fd0fa8806f
Merge remote-tracking branch 'origin/master' into codex/status-bar-token-metrics
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 17:22:42 +08:00
Turtle
e3be0c5195
Merge remote-tracking branch 'origin/feature/shared-cli-config-foundation' into feature/shared-cli-config-foundation
2026-07-30 17:22:39 +08:00
Hypatia May
6d58953f30
fix(token-meter): close projected usage review gaps
2026-07-30 17:22:15 +08:00
_Kerman
80e55ecaf8
fix(ui): enlarge trajectory context icon
2026-07-30 17:21:28 +08:00
creatixchu
8cf1603d56
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 17:18:43 +08:00
NI0317
33cbb00fb9
Merge remote-tracking branch 'origin/master' into feature/readme-current-capabilities
2026-07-30 17:18:14 +08:00
creatixchu
e7f35ccf18
Merge remote-tracking branch 'origin/feat/directory-picker-show-hidden' into feat/directory-picker-quiet-navigation
2026-07-30 17:17:49 +08:00
Turtle
873d3cee57
chore(docs): re-record generated artifacts after the master merge
2026-07-30 17:17:49 +08:00
Tianyi Cui
d8f4a0efda
chore(docs): refresh merged generated records
2026-07-30 17:17:38 +08:00
creatixchu
44d7dc7a73
fix(web): keep image intake inert without a session
2026-07-30 17:17:25 +08:00
NI0317
013761f850
docs: verify and simplify launch instructions
2026-07-30 17:17:22 +08:00
ZiyaZhang
472ba33cd9
refactor(ui-workspace): reuse status dot vocabulary
2026-07-30 02:17:14 -07:00
creatixchu
b8d9fb1ede
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 17:17:03 +08:00
creatixchu
352d669e4d
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-25-web-input-machine-and-slash-pipeline.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/contract/slots.ts
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
2026-07-30 17:16:28 +08:00
imccyu
4cd5745b94
Merge branch 'master' into codex/details-default-closed
2026-07-30 17:14:51 +08:00
ZiyaZhang
90b4b0fad2
Merge remote-tracking branch 'upstream/master' into fix/workspace-context-rendered-change-proof
2026-07-30 02:13:18 -07:00
ZiyaZhang
c153b51281
Merge remote-tracking branch 'upstream/master' into fix/session-waiting-approval
2026-07-30 02:13:11 -07:00
ZiyaZhang
8014abffa0
test(web): cover waiting approval in built graph
2026-07-30 02:13:02 -07:00
_Kerman
0bc495c465
Merge remote-tracking branch 'github/master' into xtr/trajectory-timeline-click-focus
2026-07-30 17:12:30 +08:00
Hypatia May
e23cd8e406
Merge remote-tracking branch 'origin/master' into codex/status-bar-token-metrics
...
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/session.i18n.yaml
# docs/core-data-structures/session.md
# docs/core-data-structures/session.zh.md
# docs/persistence-catalog.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/session/src/types.ts
2026-07-30 17:11:53 +08:00
_Kerman
411bbdf2aa
feat(ui): compact trajectory role labels
2026-07-30 17:11:07 +08:00
Hypatia May
da41677049
fix(web): address transcript review follow-ups
2026-07-30 17:10:45 +08:00
creatixchu
85a2789833
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 17:10:36 +08:00
Yichen Jiang
a90ccc4453
revert(sandbox): withdraw the credential-document read denial
...
The `readDenyPaths` policy field shipped in the previous commit broke Linux
confinement outright. bwrap has to create the `/dev/null` bind's mount point
inside a tree its own profile has already made read-only, so it refused the
entire confinement whenever the parent directory was absent — every host that
has not stored a credential yet, including a fresh install:
bwrap: Can't mkdir parents for /home/runner/.dsh/.env: Read-only file system
which the executor correctly classifies as SANDBOX_UNAVAILABLE, so every
confined bash call failed closed. Landlock cannot subtract from its own `/`
read grant, so it reported `partial` enforcement on every confined call for a
file it never hid, with no way to switch the denial off (schemastery fills an
omitted array with `[]`, so empty and omitted were indistinguishable).
A protection that breaks confinement where it works and misreports it where it
does not is worse than a documented absence. Revert the field, both expressible
backends, the enforcement downgrade, and the policy default; state the residue
plainly in the credentials-local READMEs — file mode stops other OS users, not
the model — and keep the OS-keychain provider recorded as the real answer.
The narrower discipline stands: no surface hoists the credential document into
`process.env`, and the model is never handed a resolved path to it.
2026-07-30 17:09:42 +08:00
Yichen Jiang
52ae578982
test(tui): pin the personal overlay to the environment layers the CLI loads
...
The personal-config smoke asserted that `$DSH_HOME/.env` feeds a `!!js`
expression in the personal `config.yaml` — the hoist this branch removed so
`credentials-local` can own that document and keep stored keys rotatable.
Seed both layers instead and let one expression separate them: the welcome
prefers the personal variable, so it can only render the invoking directory's
value while the harness home's `.env` stays out of `process.env`. The negative
that made the removal worth doing is now asserted in the assembled
application, not just in the provider's unit tests.
2026-07-30 17:09:29 +08:00
Tianyi Cui
abd7d57358
Merge branch 'master' into feature/shared-cli-config-foundation
2026-07-30 17:08:42 +08:00
Yichen Jiang
ZiyaZhang
Tianyi Cui
kingwl
creatixchu
Hypatia May
_Kerman
imccyu
Turtle
NI0317