 Yichen Jiang
|
d3c6638b6d
|
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
# Conflicts:
# apps/cli/README.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.md
# packages/client/runtime/README.zh.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/tests/chat-view.spec.tsx
|
2026-07-31 10:19:14 +08:00 |
|
 _Kerman
|
7a463dbe44
|
Merge branch 'master' of https://github.com/deepseek-harness/deepseek-harness into xtr/react-loop-simplification
# Conflicts:
# .agents/notes/implemented/feature/2026-07-17-dedicated-full-screen-tui-front-door.i18n.yaml
# docs/architecture.i18n.yaml
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/core.md
# docs/core-data-structures/core.zh.md
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/core-data-structures/llm-streaming.md
# docs/core-data-structures/llm-streaming.zh.md
# docs/core-data-structures/session.i18n.yaml
# docs/event-producer-consumer.md
# docs/persistence-catalog.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent-loop/src/agent.ts
# packages/core/agent/README.i18n.yaml
# packages/core/session/README.i18n.yaml
# packages/core/session/src/types.ts
# packages/llm/llm/README.i18n.yaml
# packages/llm/llm/README.md
# packages/llm/llm/README.zh.md
# packages/llm/llm/src/index.ts
# packages/llm/llm/tests/service.spec.ts
# packages/sdk/sdk-client/README.i18n.yaml
# packages/sdk/sdk-protocol/README.i18n.yaml
# packages/sdk/sdk-protocol/README.md
# packages/sdk/sdk-protocol/README.zh.md
# packages/subagent/subagent-dsh-sdk/README.i18n.yaml
# packages/ui/jsonrpc/README.i18n.yaml
# packages/ui/jsonrpc/README.md
# packages/ui/jsonrpc/README.zh.md
# packages/ui/tui/src/index.ts
# python/sdk/README.i18n.yaml
# scripts/gen-cordis-catalog.ts
|
2026-07-31 10:16:14 +08:00 |
|
 Hypatia May
|
afe8d49691
|
Merge finalized manual compaction parent
|
2026-07-31 10:11:54 +08:00 |
|
|
_Kerman
|
060c0f78f0
|
fix(agent): restore public send method
|
2026-07-31 10:01:35 +08:00 |
|
|
Hypatia May
|
01e64c6350
|
Merge finalized Web transcript parent
|
2026-07-31 09:46:32 +08:00 |
|
|
Hypatia May
|
00cc600b14
|
fix(snapshot): canonicalize macOS cwd tokens
|
2026-07-31 09:45:48 +08:00 |
|
|
Hypatia May
|
ff8c5600f4
|
Merge pinned master into status bar projection
|
2026-07-31 09:28:52 +08:00 |
|
|
Hypatia May
|
074f0e4393
|
Merge pinned master into Web transcript
|
2026-07-31 09:18:45 +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 |
|
 Chinesezjc
|
22d8fa788b
|
Merge remote-tracking branch 'origin/master' into feat/web-diff-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.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 04:22:57 +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
|
e56da2e47e
|
test(client): align popup aria anchors with locale rollout
|
2026-07-31 03:19:10 +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
|
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 |
|
 fz
|
ed49f1d985
|
fix(compact): use English checkpoints
|
2026-07-31 01:36:20 +08:00 |
|
|
imccyu
|
faaed56719
|
fix: node-addon bump version
|
2026-07-31 01:34:43 +08:00 |
|
|
Tianyi Cui
|
a9e2489db8
|
fix(llm): keep request generations coherent
|
2026-07-31 01:30:29 +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 |
|
|
Tianyi Cui
|
afb05b4049
|
fix(settings-local): never steal writer locks
|
2026-07-31 01:27:46 +08:00 |
|
|
Tianyi Cui
|
f9f8148e79
|
refactor(credentials,llm): remove speculative mutation and route lifecycle
|
2026-07-31 01:27:46 +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 |
|
|
Hypatia May
|
f3963686bd
|
Merge final Web parent into manual compact
|
2026-07-31 00:38:21 +08:00 |
|
 NI0317
|
99aff882dc
|
Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
# Conflicts:
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/web-fetch/session.jsonl
|
2026-07-31 00:33:13 +08:00 |
|
|
Hypatia May
|
0378a72431
|
Align trajectory bundle test with session history
|
2026-07-31 00:33:03 +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 |
|
|
NI0317
|
bc69648f03
|
Merge updated DeepSeek onboarding base
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
|
2026-07-31 00:32:40 +08:00 |
|