 Tianyi Cui
|
1352c4ecd2
|
Merge remote-tracking branch 'origin/master' into worktree/pr962-mergeable-20260731
|
2026-07-31 16:03:36 +08:00 |
|
 kingwl
|
c08e8d00f7
|
Merge origin/master into codex/web-default-search
# Conflicts:
# apps/web/tests/scaffold.ts
|
2026-07-31 15:26:29 +08:00 |
|
 NI0317
|
1b2f05d438
|
Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
|
2026-07-31 15:04:11 +08:00 |
|
|
NI0317
|
3da219461c
|
Merge origin/master into codex/sandbox-policy-context
|
2026-07-31 15:03:11 +08:00 |
|
 imccyu
|
95c238a74f
|
Merge remote-tracking branch 'origin/master' into mergebot/pr1016
|
2026-07-31 14:51:15 +08:00 |
|
|
imccyu
|
4c01550833
|
Merge remote-tracking branch 'origin/master' into mergebot/pr1016
|
2026-07-31 14:43:03 +08:00 |
|
|
imccyu
|
ec3761f66e
|
fix: ci
|
2026-07-31 14:33:39 +08:00 |
|
 Yichen Jiang
|
48152a7a1d
|
merge master and address permission settings review
|
2026-07-31 13:24:30 +08:00 |
|
|
NI0317
|
c171ce2944
|
Merge remote-tracking branch 'origin/master' into feature/gui-first-run-welcome
|
2026-07-31 13:10:06 +08:00 |
|
|
Tianyi Cui
|
fbf28700af
|
Merge master into codex/sandbox-policy-context
# Conflicts:
# apps/web/tests/snapshots/live-interactions/retry.expected.md
# apps/web/tsconfig.json
# tsconfig.host.json
|
2026-07-31 13:04:21 +08:00 |
|
|
kingwl
|
5759c287a2
|
fix(web): narrow default search review scope
|
2026-07-31 12:58:50 +08:00 |
|
|
kingwl
|
902926c7bb
|
feat(web): enable default search and fetch
|
2026-07-31 12:58:06 +08:00 |
|
|
NI0317
|
85d1c5e2ad
|
Merge remote-tracking branch 'origin/master' into feature/gui-first-run-welcome
# Conflicts:
# packages/client/ui-settings-general/src/client/index.ts
# packages/client/ui-settings-general/src/client/locales.ts
# packages/client/ui-settings-general/tests/apply.spec.ts
# packages/client/ui-settings/README.i18n.yaml
# packages/client/ui-settings/README.md
# packages/client/ui-settings/README.zh.md
# packages/client/ui-settings/src/client/index.ts
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
|
2026-07-31 12:48:39 +08:00 |
|
|
Yichen Jiang
|
ee74b5b07a
|
feat(permission): add new-session default setting
|
2026-07-31 12:48:19 +08:00 |
|
|
imccyu
|
37827c461d
|
Merge remote-tracking branch 'origin/master' into mergebot/pr998
# Conflicts:
# apps/web/tests/snapshots/code-mode-round/ui.expected.md
# apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
# apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/reloaded.expected.md
# apps/web/tests/snapshots/live-interactions/cancel.expected.md
# apps/web/tests/snapshots/live-interactions/error-auth.expected.md
# apps/web/tests/snapshots/live-interactions/retry.expected.md
# apps/web/tests/snapshots/message-actions/ui.expected.md
# apps/web/tests/snapshots/plan-review/approved.expected.md
# apps/web/tests/snapshots/question-composer/answered.expected.md
# apps/web/tests/snapshots/queue-actions/collapsed.expected.md
# apps/web/tests/snapshots/queue-actions/editing.expected.md
# apps/web/tests/snapshots/queue-actions/ui.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/tests/input-bar.spec.tsx
|
2026-07-31 11:25:16 +08:00 |
|
|
imccyu
|
9525cc9db2
|
Merge pull request #1005 from deepseek-harness/codex/new-task
Open command menu from composer plus button
|
2026-07-31 11:12:26 +08:00 |
|
|
NI0317
|
05c4b916cb
|
Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
|
2026-07-31 11:05:02 +08:00 |
|
|
NI0317
|
4e1ccebfff
|
Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
# Conflicts:
# examples/acp-agent/tests/goal-snapshots/goal-session/session.expected.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/acp-agent/tests/snapshots/bash-spill/session.jsonl
# examples/acp-agent/tests/snapshots/bash-tool-turn/session.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/cancel-tool-calls/session.jsonl
# examples/acp-agent/tests/snapshots/cancel/session.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/empty-response-retry/session.jsonl
# examples/acp-agent/tests/snapshots/error-finish/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/fs-edit/session.jsonl
# examples/acp-agent/tests/snapshots/fs-escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/fs-policy-reject/session.jsonl
# examples/acp-agent/tests/snapshots/fs-read-window/session.jsonl
# examples/acp-agent/tests/snapshots/fs-read/session.jsonl
# examples/acp-agent/tests/snapshots/fs-write-overwrite/session.jsonl
# examples/acp-agent/tests/snapshots/fs-write/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-invalid-matcher/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-block/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-context/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-deny/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-context/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-stop-continue/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-invalid-matcher/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-block/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-context/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-pretool-block/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-context/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-stop-continue/session.jsonl
# examples/acp-agent/tests/snapshots/lsp-definition/session.jsonl
# examples/acp-agent/tests/snapshots/multi-turn/session.jsonl
# examples/acp-agent/tests/snapshots/packed-chunks/session.jsonl
# examples/acp-agent/tests/snapshots/parallel-tool-calls/session.jsonl
# examples/acp-agent/tests/snapshots/pty-tools/session.jsonl
# examples/acp-agent/tests/snapshots/repeat-tool-guard/session.jsonl
# examples/acp-agent/tests/snapshots/session-query-spill/session.jsonl
# examples/acp-agent/tests/snapshots/session-sandbox-root/session.jsonl
# examples/acp-agent/tests/snapshots/session-title-after-turn/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/session.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/session.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# examples/acp-agent/tests/snapshots/todo-write/session.jsonl
# examples/acp-agent/tests/snapshots/tool-call-turn/session.jsonl
# examples/acp-agent/tests/snapshots/web-fetch/session.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/session.1.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/session.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/session.jsonl
# examples/acp-agent/tests/snapshots/workspace-edit/session.jsonl
# examples/headless-agent/tests/snapshots/pty-tools/session.jsonl
# examples/headless-agent/tests/snapshots/pty-tools/stream-json.expected.jsonl
# examples/headless-agent/tests/subagent-inheritance-snapshots/parent-override/child.expected.jsonl
# examples/headless-agent/tests/subagent-inheritance-snapshots/parent-override/parent.expected.jsonl
# examples/jsonrpc-agent/tests/snapshots/persistent-tools/notifications.expected.jsonl
# examples/jsonrpc-agent/tests/snapshots/persistent-tools/session.jsonl
# packages/core/agent-loop/src/agent.ts
|
2026-07-31 11:02:45 +08:00 |
|
 Ziya
|
7b95559f18
|
Merge branch 'master' into feat/gui-full-access-confirmation
|
2026-07-30 22:51:43 -04:00 |
|
|
imccyu
|
59ce4086ae
|
Merge remote-tracking branch 'origin/master' into mergebot/pr711
# Conflicts:
# packages/client/ui-workspace/src/client/WorkspaceBrowser.tsx
# packages/client/ui-workspace/src/client/index.ts
# packages/client/ui-workspace/src/client/rows/Rows.tsx
# packages/client/ui-workspace/src/client/tree.ts
# packages/client/ui-workspace/tests/apply.spec.ts
# packages/client/ui-workspace/tests/rows.spec.tsx
# packages/client/ui-workspace/tests/tree.spec.ts
# packages/client/ui-workspace/tests/workspace-browser.spec.tsx
|
2026-07-31 04:37:08 +08:00 |
|
|
imccyu
|
9433259f05
|
Merge remote-tracking branch 'origin/master' into mergebot/pr1005
# Conflicts:
# docs/module-graph.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/input-matrix.spec.tsx
# packages/client/ui-plan/README.i18n.yaml
# packages/client/ui-plan/README.md
# packages/client/ui-plan/README.zh.md
# packages/client/ui-plan/src/client/PlanModeControl.tsx
# packages/client/ui-plan/src/client/index.ts
# packages/client/ui-plan/tests/browser-plugin.spec.ts
# packages/client/ui-plan/tests/plan-mode-control.spec.tsx
|
2026-07-31 03:47:24 +08:00 |
|
|
imccyu
|
c9997311cf
|
Merge remote-tracking branch 'origin/master' into mergebot/pr998
# Conflicts:
# packages/client/ui-command/src/client/PopupSelectView.tsx
# 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
# packages/client/ui-conversation/src/client/skeleton/PermissionSelect.tsx
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/input-matrix.spec.tsx
# packages/client/ui-conversation/tests/input-scenarios.spec.tsx
# packages/client/ui-conversation/tests/skeleton.spec.tsx
# packages/client/ui-primitives/src/Modal.tsx
# packages/client/ui-primitives/tests/atoms.spec.tsx
|
2026-07-31 03:14:44 +08:00 |
|
|
imccyu
|
72a7307826
|
chore: regenerate module graph and refresh composer goldens after master merge
|
2026-07-31 02:28:43 +08:00 |
|
|
imccyu
|
1e10966ef6
|
wip
fix: docs
|
2026-07-31 02:13:53 +08:00 |
|
|
imccyu
|
2e034bbbd3
|
Merge remote-tracking branch 'origin/master' into mergebot/pr711
# Conflicts:
# apps/cli/README.i18n.yaml
# docs/module-graph.md
# packages/client/connection/README.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
|
2026-07-31 02:02:47 +08:00 |
|
|
imccyu
|
ecbd8babc1
|
Merge remote-tracking branch 'origin/master' into mergebot/pr711
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/cli/README.md
# apps/cli/README.zh.md
# apps/cli/cordis.yml
# apps/cli/package.json
# docs/config-catalog.md
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/contract/sessions.ts
# packages/client/test-runtime/src/sessions.ts
# packages/client/ui-workspace/README.i18n.yaml
# packages/client/ui-workspace/README.md
# packages/client/ui-workspace/README.zh.md
# packages/client/ui-workspace/src/client/WorkspaceBrowser.tsx
# packages/client/ui-workspace/src/client/tree.ts
# packages/client/ui-workspace/tests/apply.spec.ts
# packages/client/ui-workspace/tests/tree.spec.ts
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/index.ts
# packages/host/apiproxy/tests/client-handler.spec.ts
# packages/host/apiproxy/tests/rpc-schemas.spec.ts
# pnpm-lock.yaml
|
2026-07-31 01:28:15 +08:00 |
|
 ZiyaZhang
|
fa67427c39
|
Merge remote-tracking branch 'origin/master' into feat/gui-full-access-confirmation
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-30 07:48:33 -07:00 |
|
|
NI0317
|
564ba0df72
|
Merge updated DeepSeek onboarding base
|
2026-07-30 22:25:33 +08:00 |
|
|
Yichen Jiang
|
55ae4751b7
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
|
2026-07-30 22:21:05 +08:00 |
|
|
Yichen Jiang
|
015b065e9d
|
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
# Conflicts:
# apps/web/tests/scaffold.ts
|
2026-07-30 22:19:53 +08:00 |
|
|
NI0317
|
c311400945
|
Merge updated DeepSeek onboarding base
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
|
2026-07-30 22:19:31 +08:00 |
|
|
Yichen Jiang
|
80c36ff0d3
|
Merge latest master into worktree-llm-dynamic-config
|
2026-07-30 22:18:16 +08:00 |
|
|
NI0317
|
bef8db3add
|
feat(web): add versioned first-run welcome
|
2026-07-30 22:17:56 +08:00 |
|
|
NI0317
|
cef62c007d
|
Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
|
2026-07-30 22:16:50 +08:00 |
|
|
Ziya
|
a1738d3769
|
Merge branch 'master' into feat/gui-full-access-confirmation
|
2026-07-30 10:11:13 -04:00 |
|
|
Yichen Jiang
|
e5d7fa4cef
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
|
2026-07-30 21:52:25 +08:00 |
|
|
Yichen Jiang
|
cd6027125c
|
Merge latest master into worktree-llm-dynamic-config
|
2026-07-30 21:49:30 +08:00 |
|
|
Yichen Jiang
|
a5e0c5e7e7
|
Merge latest master into worktree-llm-web-config
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
|
2026-07-30 21:45:55 +08:00 |
|
 creatixchu
|
ddc4adb7a3
|
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
|
2026-07-30 21:42:30 +08:00 |
|
|
creatixchu
|
8d864c9549
|
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
|
2026-07-30 21:22:28 +08:00 |
|
|
Tianyi Cui
|
81e5eb9800
|
Merge latest master into worktree-config-settings-seam
|
2026-07-30 21:21:35 +08:00 |
|
|
Yichen Jiang
|
9ea613d859
|
fix(docs): drop the withdrawn sandbox-policy paths edge from the module graph
The sandbox read-deny mitigation was withdrawn, so sandbox-policy no longer
imports dsh-paths; the recorded graph still claimed the edge.
|
2026-07-30 21:18:50 +08:00 |
|
|
ZiyaZhang
|
8d4bf5ae41
|
chore(docs): refresh generated graph records
|
2026-07-30 06:01:47 -07:00 |
|
|
Yichen Jiang
|
b6130b178d
|
Merge remote-tracking branch 'origin/worktree-llm-web-config' into worktree/onboarding-deepseek-config
# Conflicts:
# packages/client/ui-models/README.i18n.yaml
# packages/client/ui-models/README.md
# packages/client/ui-models/README.zh.md
# packages/client/ui-models/src/client/store.ts
# packages/client/ui-models/tests/components.spec.tsx
|
2026-07-30 20:55:12 +08:00 |
|
|
Yichen Jiang
|
3957ce007a
|
Merge branch 'worktree-llm-dynamic-config' into worktree-llm-web-config
# Conflicts:
# apps/cli/cordis.yml
# apps/cli/package.json
# apps/cli/tests/tui-keyless-smoke.e2e.ts
# apps/web/tests/details-session-lifecycle.e2e.ts
# apps/web/tests/snapshots/code-mode-round/ui.expected.md
# apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
# apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/reloaded.expected.md
# apps/web/tests/snapshots/live-interactions/cancel.expected.md
# apps/web/tests/snapshots/live-interactions/error-auth.expected.md
# apps/web/tests/snapshots/live-interactions/retry.expected.md
# apps/web/tests/snapshots/message-actions/ui.expected.md
# apps/web/tests/snapshots/question-composer/answered.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# apps/web/tests/snapshots/steering/mid-steer.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/user/guide/config.i18n.yaml
# docs/user/guide/config.md
# docs/user/guide/config.zh.md
# docs/user/guide/index.i18n.yaml
# docs/user/guide/index.md
# docs/user/guide/index.zh.md
# examples/acp-agent/tests/snapshots/subagent-fork/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.2.jsonl
# examples/cordis-agent/cordis.yml
# examples/cordis-agent/tests/cordis-tools.e2e.ts
# examples/headless-agent/tests/semantic-checkpoint-snapshots/tool-outcome-unknown/session.expected.jsonl
# examples/headless-agent/tests/subagent-inheritance-snapshots/parent-override/parent.expected.jsonl
# examples/tui-agent/code-mode.cordis.yml
# examples/tui-agent/cordis.yml
# packages/examples/tui-demo/README.md
# packages/examples/tui-demo/README.zh.md
# packages/host/apiproxy/README.i18n.yaml
# packages/pty/tool-bash-persistent/README.i18n.yaml
# packages/ui/tui/tests/snapshots/status-diagnostics-narrow.expected.txt
# packages/ui/tui/tests/snapshots/status-diagnostics.expected.txt
# pnpm-lock.yaml
# scripts/snapshots/python-sdk-single-exe/advanced/result.json
# scripts/snapshots/python-sdk-single-exe/advanced/session.1.jsonl
# scripts/snapshots/python-sdk-single-exe/advanced/session.2.jsonl
# scripts/snapshots/python-sdk-single-exe/advanced/session.jsonl
|
2026-07-30 20:15:40 +08:00 |
|
 Hypatia May
|
fe97451604
|
Merge remote-tracking branch 'origin/master' into fix/human-transcript-projection
# Conflicts:
# .agents/notes/implemented/feature/2026-07-17-dedicated-full-screen-tui-front-door.i18n.yaml
# docs/cordis-catalog/services.md
# packages/host/apiproxy/README.i18n.yaml
# packages/ui/tui/README.i18n.yaml
|
2026-07-30 19:57:49 +08:00 |
|
|
Yichen Jiang
|
eae4219e04
|
Merge branch 'worktree-config-settings-seam' into worktree-llm-dynamic-config
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/cli/composition.md
# apps/cli/config/base.cordis.yml
# apps/cli/src/app-cli-entry.ts
# apps/cli/src/tui.ts
# apps/cli/tests/tui-keyless-smoke.e2e.ts
# examples/package.json
# packages/ui/app-boot/README.i18n.yaml
# packages/ui/app-boot/README.md
# packages/ui/app-boot/README.zh.md
# pnpm-lock.yaml
# python/sdk-runtime/package.json
|
2026-07-30 19:46:04 +08:00 |
|
|
NI0317
|
c54fed8a20
|
Merge origin/master into codex/sandbox-policy-context
|
2026-07-30 19:31:17 +08:00 |
|
|
Yichen Jiang
|
fc8f992cde
|
fix(web): address onboarding review feedback
|
2026-07-30 18:56:56 +08:00 |
|
|
NI0317
|
87a4aaa32e
|
feat(sandbox-policy): describe enforced file families
|
2026-07-30 18:51:29 +08:00 |
|