Yichen Jiang
|
b05b0a80fd
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
|
2026-07-30 23:33:14 +08:00 |
|
imccyu
|
da9f02221e
|
Merge remote-tracking branch 'origin/master' into worktree-forkweb
|
2026-07-30 22:53:07 +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 |
|
Tianyi Cui
|
dc5f270ae2
|
Merge branch 'master' into codex/queue-collapse
|
2026-07-30 22:18:44 +08:00 |
|
imccyu
|
f2bbc0f453
|
Merge branch 'master' into worktree-forkweb
|
2026-07-30 22:12:50 +08: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 |
|
Wenlu Wang
|
a1c8fa06a0
|
Merge branch 'master' into codex/queue-collapse
|
2026-07-30 21:46:37 +08:00 |
|
imccyu
|
3b370549a1
|
feat(client): increment forked session titles
|
2026-07-30 21:28:17 +08:00 |
|
imccyu
|
213de9a737
|
feat(ui-conversation): wire assistant session forks
|
2026-07-30 21:28:17 +08:00 |
|
imccyu
|
2f8f47e500
|
feat(ui-workspace): flatten session fork rows
|
2026-07-30 21:28:17 +08:00 |
|
imccyu
|
36f1489398
|
fix(web): address session fork review findings
|
2026-07-30 21:28:13 +08:00 |
|
creatixchu
|
8d864c9549
|
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
|
2026-07-30 21:22:28 +08: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 |
|
kingwl
|
29d8ca5ee5
|
Merge remote-tracking branch 'origin/master' into codex/queue-collapse
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-30 20:11:46 +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 |
|
creatixchu
|
692ada7485
|
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
|
2026-07-30 19:48:45 +08:00 |
|
imccyu
|
a1f1f9c29a
|
Merge branch 'master' into codex/figma-context-injection-row
|
2026-07-30 19:20:21 +08:00 |
|
kingwl
|
dec8173c43
|
Merge remote-tracking branch 'origin/master' into codex/queue-collapse
|
2026-07-30 19:20:20 +08:00 |
|
kingwl
|
5f87c7a89c
|
fix(web): close queue collapse review gaps
|
2026-07-30 19:20:13 +08:00 |
|
Yichen Jiang
|
fc8f992cde
|
fix(web): address onboarding review feedback
|
2026-07-30 18:56:56 +08:00 |
|
Yichen Jiang
|
234018032d
|
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-primitives/src/Modal.tsx
# packages/client/ui-settings/README.i18n.yaml
|
2026-07-30 18:43:06 +08:00 |
|
creatixchu
|
5e4922a761
|
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
# Conflicts:
# apps/cli/cordis.yml
# packages/host/README.i18n.yaml
|
2026-07-30 18:41:41 +08:00 |
|
kingwl
|
1f5d09c2d7
|
Merge origin/master into codex/figma-context-injection-row
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-30 18:27:49 +08:00 |
|
kingwl
|
cdd1074805
|
Merge remote-tracking branch 'origin/master' into codex/queue-collapse
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-30 18:21:07 +08:00 |
|
creatixchu
|
a60b25c528
|
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
|
2026-07-30 18:11:21 +08:00 |
|
Tianyi Cui
|
53ff5c6ef2
|
Merge branch 'master' into feature/shared-cli-config-foundation
|
2026-07-30 18:02:07 +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
|
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 |
|
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 |
|
kingwl
|
abf498b8dc
|
fix(web): align composer context stack
|
2026-07-30 17:26:44 +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 |
|
Tianyi Cui
|
abd7d57358
|
Merge branch 'master' into feature/shared-cli-config-foundation
|
2026-07-30 17:08:42 +08:00 |
|
kingwl
|
0a25c0d237
|
feat(web): add queue collapse control
|
2026-07-30 16:41:55 +08:00 |
|
kingwl
|
d7641ec028
|
Merge origin/master into codex/figma-context-injection-row
|
2026-07-30 16:20:47 +08:00 |
|
kingwl
|
17893c503e
|
feat(web): match context injection disclosure design
|
2026-07-30 16:20:34 +08:00 |
|
creatixchu
|
bfbab9d2ab
|
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-28-directory-picker-capability-seam.i18n.yaml
|
2026-07-30 16:20:22 +08:00 |
|
Turtle
|
674c25a6a2
|
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
# Conflicts:
# docs/tool-catalog.md
# examples/package.json
# packages/examples/agent-spine-demo/README.i18n.yaml
# packages/examples/agent-spine-demo/README.zh.md
# pnpm-lock.yaml
|
2026-07-30 16:11:21 +08:00 |
|
Hypatia May
|
8fdd01e4ae
|
Merge remote-tracking branch 'origin/master' into fix/human-transcript-projection
|
2026-07-30 15:52:09 +08:00 |
|
imccyu
|
69a58ddd6f
|
Merge branch 'master' into feat/ask-question-gui
|
2026-07-30 15:50:59 +08:00 |
|
Hypatia May
|
7bcf8d660d
|
Merge remote-tracking branch 'origin/master' into fix/human-transcript-projection
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
# packages/ui/tui/README.i18n.yaml
|
2026-07-30 15:42:47 +08:00 |
|
creatixchu
|
c90410deaa
|
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
|
2026-07-30 15:25:46 +08:00 |
|
Tianyi Cui
|
2550882875
|
Merge branch 'master' into worktree/persistent-bash-str-replace-editor
|
2026-07-30 15:19:27 +08:00 |
|
imccyu
|
03936cb320
|
Merge remote-tracking branch 'origin/master' into mergebot/pr883
# Conflicts:
# packages/client/ui-question/package.json
# packages/client/ui-question/src/client/QuestionComposer.tsx
# packages/client/ui-question/src/client/contract/slots.ts
# packages/client/ui-question/src/client/index.ts
# packages/client/ui-question/src/client/locales.ts
# packages/client/ui-question/tests/browser-plugin.spec.ts
# packages/client/ui-question/tests/question-composer.spec.tsx
|
2026-07-30 15:01:10 +08:00 |
|
Turtle
|
36f6d8fd05
|
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
# Conflicts:
# packages/ui/tui/README.i18n.yaml
|
2026-07-30 14:58:10 +08:00 |
|
Turtle
|
a51143bded
|
fix(cli): close shared config review gaps
|
2026-07-30 14:56:39 +08:00 |
|
Yichen Jiang
|
42d0f3c7ba
|
feat(web): route onboarding to Models settings
|
2026-07-30 13:11:07 +08:00 |
|
imccyu
|
01324f9167
|
Merge branch 'master' into fix/input-ui
|
2026-07-30 12:55:57 +08:00 |
|
Yichen Jiang
|
819a7a6751
|
docs: record DeepSeek onboarding credential flow
|
2026-07-30 12:41:32 +08:00 |
|
Tianyi Cui
|
d37b192aa9
|
Merge branch 'master' into fix/workspace-instruction-frame-metadata
|
2026-07-30 12:16:41 +08:00 |
|
Turtle
|
5a490553bc
|
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
# Conflicts:
# docs/event-producer-consumer.md
# packages/host/apiproxy/README.i18n.yaml
# tsconfig.base.json
|
2026-07-30 12:00:15 +08:00 |
|