 creatixchu
|
1a9039cdb4
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
|
2026-07-31 14:51:31 +08:00 |
|
|
Yichen Jiang
|
6acdb6631d
|
Merge pull request #1036 from deepseek-harness/worktree/permission-default-settings
feat(permission): configure new-session defaults in Web settings
|
2026-07-31 14:05:00 +08:00 |
|
|
Yichen Jiang
|
75f2489ba1
|
Merge pull request #1031 from deepseek-harness/worktree/fix-models-settings
fix(web): improve Models settings presentation and safety
|
2026-07-31 13:44:11 +08:00 |
|
|
creatixchu
|
1f0b5b1ebf
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# apps/web/tests/built-boot.snapshot.ts
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/sessions/conversation.ts
# 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/host/apiproxy/README.i18n.yaml
|
2026-07-31 13:43:10 +08:00 |
|
|
Yichen Jiang
|
cb60e1759a
|
Merge remote-tracking branch 'origin/master' into worktree/permission-default-settings
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
|
2026-07-31 13:27:43 +08:00 |
|
|
Yichen Jiang
|
48152a7a1d
|
merge master and address permission settings review
|
2026-07-31 13:24:30 +08:00 |
|
|
imccyu
|
9aa867b6ea
|
Merge branch 'master' into fix/command-execute-transport-timeout
|
2026-07-31 13:18:12 +08:00 |
|
|
Hypatia May
|
322950487e
|
fix(apiproxy): let commands outlive unary deadline
|
2026-07-31 11:51:49 +08:00 |
|
|
Yichen Jiang
|
2e07da19e5
|
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/cli/README.md
# apps/cli/README.zh.md
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-31 11:39:58 +08:00 |
|
|
creatixchu
|
702336be02
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
|
2026-07-31 11:32:58 +08:00 |
|
|
Yichen Jiang
|
049e64b002
|
Merge remote-tracking branch 'origin/master' into worktree/fix-models-settings
|
2026-07-31 11:32:17 +08:00 |
|
|
Yichen Jiang
|
788b9eb986
|
fix(web): hide provider liveness badges
|
2026-07-31 11:32:10 +08:00 |
|
|
creatixchu
|
23e0ef7bb2
|
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
# 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
|
2026-07-31 11:19:51 +08:00 |
|
|
Tianyi Cui
|
a632934ad7
|
Merge branch 'master' into worktree/pr884-simplify
|
2026-07-31 11:19:00 +08:00 |
|
|
Yichen Jiang
|
61edbe400f
|
Merge remote-tracking branch 'origin/master' into worktree/fix-models-settings
|
2026-07-31 11:14:25 +08:00 |
|
|
Yichen Jiang
|
311aca3663
|
fix(web): improve models settings safety and contrast
|
2026-07-31 11:14:07 +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 |
|
|
Tianyi Cui
|
e9096c891c
|
Merge latest master into worktree/pr884-simplify
|
2026-07-31 11:00:07 +08:00 |
|
|
creatixchu
|
3135639867
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
|
2026-07-31 10:47:25 +08:00 |
|
|
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 |
|
|
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 |
|
|
creatixchu
|
d4a78965b5
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# docs/module-graph.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/AssistantMarkdown.tsx
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/src/client/skeleton/ConversationSession.tsx
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-trajectory/tests/client-bundle.spec.ts
|
2026-07-31 03:12:38 +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 |
|
|
creatixchu
|
a975eda638
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# docs/architecture.i18n.yaml
# docs/architecture.md
# docs/architecture.zh.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/client/connection/README.i18n.yaml
# packages/client/connection/README.md
# packages/client/connection/README.zh.md
# packages/client/connection/src/client/fixture.ts
# 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/AssistantMarkdown.tsx
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
# packages/llm/llm-deepseek/tests/adapter.spec.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/README.md
# packages/llm/llm/README.zh.md
# packages/llm/llm/src/index.ts
# packages/llm/llm/src/types.ts
|
2026-07-31 02:14:07 +08:00 |
|
|
imccyu
|
1e10966ef6
|
wip
fix: docs
|
2026-07-31 02:13:53 +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
|
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 |
|
|
Tianyi Cui
|
a9e2489db8
|
fix(llm): keep request generations coherent
|
2026-07-31 01:30:29 +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 |
|
|
creatixchu
|
451d15429e
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
|
2026-07-31 01:12:39 +08:00 |
|
|
creatixchu
|
c814cea183
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# docs/architecture.i18n.yaml
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/README.i18n.yaml
# packages/llm/llm-pi-ai/README.i18n.yaml
# packages/llm/llm-pi-ai/package.json
# packages/llm/llm-pi-ai/src/adapter.ts
# packages/llm/llm-pi-ai/src/index.ts
# packages/llm/llm-pi-ai/tests/adapter.spec.ts
# packages/llm/llm-pi-ai/tsconfig.json
# packages/llm/llm/README.i18n.yaml
# pnpm-lock.yaml
# tsconfig.host.json
|
2026-07-31 01:11:50 +08:00 |
|
|
Yichen Jiang
|
c71af0f3bb
|
Merge latest master into worktree-llm-web-config
|
2026-07-31 01:09:50 +08:00 |
|
|
imccyu
|
a3ddc90df6
|
Merge branch 'master' into worktree/command-row-copy
|
2026-07-31 00:50:47 +08:00 |
|
|
Wenlu Wang
|
edefdd96b9
|
Merge remote-tracking branch 'origin/master' into codex/new-task
|
2026-07-31 00:10:46 +08:00 |
|
|
imccyu
|
5c4398c96c
|
Merge branch 'master' into worktree/command-row-copy
|
2026-07-30 23:45:49 +08:00 |
|
|
kingwl
|
1986de9ac1
|
fix(web): show plan status only while active
|
2026-07-30 22:42:25 +08:00 |
|
|
Yichen Jiang
|
e37680ffb7
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
|
2026-07-30 22:21:06 +08:00 |
|
|
Tianyi Cui
|
9a0ee6fbfe
|
Merge branch 'master' into worktree/deepseek-max-tokens-defaults
|
2026-07-30 22:20:47 +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 |
|
|
Yichen Jiang
|
80c36ff0d3
|
Merge latest master into worktree-llm-dynamic-config
|
2026-07-30 22:18:16 +08:00 |
|
|
Yichen Jiang
|
02b8529405
|
Merge origin/master into worktree/deepseek-max-tokens-defaults
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/session.i18n.yaml
# packages/core/session/README.i18n.yaml
|
2026-07-30 21:55:07 +08:00 |
|
|
creatixchu
|
58d628a5fe
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# docs/core-data-structures/core.i18n.yaml
# packages/README.i18n.yaml
|
2026-07-30 21:50:20 +08:00 |
|
|
Yichen Jiang
|
5fd34f9109
|
fix(agent-loop): rematerialize adapter defaults
|
2026-07-30 21:49:58 +08:00 |
|
|
creatixchu
|
ddc4adb7a3
|
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
|
2026-07-30 21:42:30 +08:00 |
|
|
Yichen Jiang
|
7022ab4a75
|
Merge worktree-llm-dynamic-config (884) into worktree-llm-web-config
|
2026-07-30 21:19:17 +08:00 |
|
|
creatixchu
|
92d6029780
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
|
2026-07-30 21:18:13 +08:00 |
|