 Chinesezjc
|
eebcbbbe4e
|
Merge remote-tracking branch 'origin/feat/search-presenter' into feat/web-search-card
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx
# packages/client/ui-conversation/src/client/chat/ToolRow.module.css
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
# packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx
# packages/client/ui-primitives/README.i18n.yaml
# packages/client/ui-primitives/src/index.ts
|
2026-07-31 12:27:30 +08:00 |
|
|
Chinesezjc
|
df5b09cd6e
|
Merge remote-tracking branch 'origin/master' into feat/search-presenter
# Conflicts:
# docs/config-catalog.md
# docs/cookbook/adding-a-tool.i18n.yaml
# docs/cookbook/adding-a-tool.md
# docs/cookbook/adding-a-tool.zh.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/tools.i18n.yaml
# docs/core-data-structures/tools.md
# docs/core-data-structures/tools.zh.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/README.i18n.yaml
# packages/core/tools/README.md
# packages/core/tools/README.zh.md
# packages/core/tools/src/index.ts
# packages/core/tools/src/presentation.ts
# packages/fs/tool-fs-search/src/glob.ts
# packages/fs/tool-fs-search/src/index.ts
# packages/ui/tui/src/components/transcript.ts
# packages/ui/tui/tests/tui.spec.ts
|
2026-07-31 11:31:32 +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 |
|
|
imccyu
|
c0733ba46b
|
Merge branch 'master' into fix/nodeboot-dep
|
2026-07-31 10:34:07 +08:00 |
|
|
imccyu
|
f850676785
|
Merge pull request #711 from deepseek-harness/codex/basic-session-search
Add basic past-session search
|
2026-07-31 10:33:53 +08:00 |
|
 Turtle
|
1332360d53
|
Merge pull request #1013 from deepseek-harness/fix/node26-vitest-webstorage
fix(test): isolate jsdom storage on Node 26
|
2026-07-31 10:31:59 +08:00 |
|
|
Turtle
|
aa39d6c6ed
|
Merge remote-tracking branch 'origin/master' into fix/node26-vitest-webstorage
# Conflicts:
# scripts/run-gates.spec.ts
# vitest.config.ts
|
2026-07-31 10:26:05 +08:00 |
|
|
imccyu
|
d6da16b7f3
|
Merge branch 'master' into codex/basic-session-search
|
2026-07-31 10:23:52 +08:00 |
|
|
imccyu
|
ce57438ac0
|
Merge branch 'master' into codex/new-task
|
2026-07-31 10:23:14 +08: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
|
05d73d6571
|
fix(app-boot): await only failed activation fibers
|
2026-07-31 03:20:20 +08:00 |
|
|
imccyu
|
c92a6c3b76
|
fix(app-boot): preserve published loader composition
|
2026-07-31 03:20:20 +08:00 |
|
 imccyu
|
a691e2ab16
|
fix: preserve plugin activation errors
|
2026-07-31 03:20:20 +08:00 |
|
|
imccyu
|
890e6daa22
|
test: normalize client module fixture paths
|
2026-07-31 03:02:45 +08:00 |
|
|
imccyu
|
296cb1c35f
|
fix: app-boot report plugin error detail
|
2026-07-31 03:02:45 +08:00 |
|
|
imccyu
|
4517aa349c
|
fix: client module loader report package resolve info
|
2026-07-31 03:02:45 +08:00 |
|
|
imccyu
|
810b45a377
|
Merge remote-tracking branch 'origin/master' into mergebot/pr1008
# Conflicts:
# apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
# apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
# packages/client/ui-conversation/src/client/contract/terminal-card-model.ts
# packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx
# packages/client/ui-conversation/src/client/toolviews/ask-question-row.tsx
# packages/client/ui-conversation/src/client/toolviews/bash-sample.tsx
# packages/client/ui-conversation/src/client/toolviews/todo-row.tsx
# packages/client/ui-conversation/tests/chat-tool-row.spec.tsx
# packages/client/ui-conversation/tests/terminal-card.spec.tsx
# packages/client/ui-trajectory/tests/client-bundle.spec.ts
|
2026-07-31 03:00:08 +08:00 |
|
|
imccyu
|
7730ffad4e
|
test(web): refresh plan-review and seeded-history goldens after master merge
|
2026-07-31 02:45:22 +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
|
4e7e99d748
|
Merge remote-tracking branch 'origin/master' into mergebot/pr1005
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-31 01:58:09 +08:00 |
|
 Tianyi Cui
|
023a9aee9d
|
Merge origin/master into worktree/pr1006-merge-20260731
|
2026-07-31 01:56:19 +08:00 |
|
|
Tianyi Cui
|
464a57d3ca
|
Merge commit 'refs/codex/pr1006/master' into worktree/pr1006-merge-20260731
# Conflicts:
# docs/architecture.i18n.yaml
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/headless-agent/cordis.yml
# packages/cordis/tool-cordis/src/api-catalog.ts
# 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
# packages/llm/llm-deepseek/src/index.ts
# packages/llm/llm-deepseek/tests/adapter.spec.ts
# packages/llm/llm/README.i18n.yaml
# packages/llm/llm/README.md
# packages/llm/llm/README.zh.md
# packages/subagent/subagent-dsh-sdk/README.i18n.yaml
# packages/ui/jsonrpc/README.i18n.yaml
|
2026-07-31 01:55:19 +08:00 |
|
|
imccyu
|
47dafc28bc
|
Merge pull request #957 from deepseek-harness/worktree-guiopentelemetry
Wire session telemetry (OTel) into the dsh web composition
|
2026-07-31 01:49:38 +08:00 |
|
|
imccyu
|
faaed56719
|
fix: node-addon bump version
|
2026-07-31 01:34:43 +08:00 |
|
|
Tianyi Cui
|
cc119e39a6
|
Merge master into fix/turn-actions
|
2026-07-31 01:29:03 +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 |
|
|
Tianyi Cui
|
145a5eb9da
|
Merge master into fix/turn-actions
|
2026-07-31 01:27:56 +08:00 |
|
|
imccyu
|
5d29a8aff3
|
Merge remote-tracking branch 'origin/master' into mergebot/pr1008
# Conflicts:
# examples/web-cordis/cordis.yml
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/src/client/chat/ToolRow.module.css
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
# packages/client/ui-conversation/src/client/contract/slots.ts
# packages/client/ui-conversation/tests/chat-branch-tails.spec.tsx
# packages/client/ui-conversation/tests/chat-view.spec.tsx
|
2026-07-31 01:16:34 +08:00 |
|
 Yichen Jiang
|
aa888d1c4a
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
|
2026-07-31 01:10:16 +08:00 |
|
|
Yichen Jiang
|
c71af0f3bb
|
Merge latest master into worktree-llm-web-config
|
2026-07-31 01:09:50 +08:00 |
|
|
imccyu
|
b6917b6e62
|
Merge pull request #981 from deepseek-harness/worktree/command-row-copy
feat(ui): drop the slash and the argument echo from the command row
|
2026-07-31 01:09:06 +08:00 |
|
|
Yichen Jiang
|
11ffab7400
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
|
2026-07-31 01:06:55 +08:00 |
|
|
Yichen Jiang
|
a37a90548a
|
Merge latest master into worktree-llm-web-config
|
2026-07-31 01:06:28 +08:00 |
|
|
Tianyi Cui
|
26ef1b7e6c
|
Merge commit '557cff8871e86a7a9be85c2ee2d8225db8b439fe' into worktree/pr977-merge-20260731
|
2026-07-31 00:52:43 +08:00 |
|
|
imccyu
|
a3ddc90df6
|
Merge branch 'master' into worktree/command-row-copy
|
2026-07-31 00:50:47 +08:00 |
|
|
Yichen Jiang
|
15636fbb8e
|
fix(web): skip unavailable DeepSeek onboarding modal
|
2026-07-31 00:44:24 +08:00 |
|
|
imccyu
|
5099f72ea0
|
Merge branch 'master' into worktree/command-row-copy
|
2026-07-31 00:41:04 +08:00 |
|
|
Yichen Jiang
|
c580b1b634
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
|
2026-07-31 00:32:59 +08:00 |
|
|
Tianyi Cui
|
dc0c52bb03
|
Merge commit 'aab64371402d93293bde384139aaa607906928a8' into worktree/pr977-merge-20260731
|
2026-07-31 00:32:10 +08:00 |
|
|
Yichen Jiang
|
e8c550d0e5
|
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
|
2026-07-31 00:31:42 +08:00 |
|
|
Yichen Jiang
|
f64026d7e3
|
Merge latest master into worktree-llm-dynamic-config
|
2026-07-31 00:31:06 +08:00 |
|
|
Yichen Jiang
|
52c997d01d
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
|
2026-07-31 00:22:45 +08:00 |
|
|
imccyu
|
e4e78e7a31
|
Merge remote-tracking branch 'origin/master' into mergebot/pr981
|
2026-07-31 00:22:36 +08:00 |
|
|
Yichen Jiang
|
ce3a75ecca
|
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
|
2026-07-31 00:21:49 +08:00 |
|
|
Yichen Jiang
|
564f04e2e2
|
Merge latest master into worktree-llm-dynamic-config
|
2026-07-31 00:20:57 +08:00 |
|
|
Tianyi Cui
|
286a287809
|
Merge remote-tracking branch 'origin/master' into worktree/pr975-retarget-20260730
|
2026-07-31 00:14:42 +08:00 |
|
 Wenlu Wang
|
edefdd96b9
|
Merge remote-tracking branch 'origin/master' into codex/new-task
|
2026-07-31 00:10:46 +08:00 |
|
|
Yichen Jiang
|
39072f8c58
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
|
2026-07-31 00:07:11 +08:00 |
|