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 |
|
creatixchu
|
c03753fe48
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/apply.ts
# 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/contract/slots.ts
# packages/client/ui-conversation/tests/chat-view.spec.tsx
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
# packages/host/apiproxy/src/api/sessions.ts
|
2026-07-31 00:09:49 +08:00 |
|
Yichen Jiang
|
9ebf7424f7
|
Merge latest master into worktree-llm-dynamic-config
|
2026-07-30 23:28:58 +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 |
|
Yichen Jiang
|
80c36ff0d3
|
Merge latest master into worktree-llm-dynamic-config
|
2026-07-30 22:18:16 +08:00 |
|
Tianyi Cui
|
b5f5a01dcb
|
Merge remote-tracking branch 'origin/master' into worktree/pr798-retarget-config-20260730
|
2026-07-30 22:14:08 +08:00 |
|
Tianyi Cui
|
6777e4fab9
|
fix(fs-search): make glob sampling an explicit choice
|
2026-07-30 21:14:03 +08:00 |
|
creatixchu
|
82df6dcc0b
|
fix(cli): avoid duplicate attachment backend
|
2026-07-30 20:33:11 +08:00 |
|
creatixchu
|
782c064d03
|
Merge remote-tracking branch 'origin/worktree/web-multimodal-image-input' into worktree/web-multimodal-image-input
# Conflicts:
# apps/cli/src/bin.ts
# apps/cli/tests/args.spec.ts
|
2026-07-30 20:05:34 +08:00 |
|
creatixchu
|
98ed9d8d4b
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# apps/cli/cordis.yml
# apps/cli/package.json
# apps/cli/src/bin.ts
# apps/cli/tests/args.spec.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/ui/tui/README.i18n.yaml
# pnpm-lock.yaml
|
2026-07-30 20:04:22 +08:00 |
|
Yichen Jiang
|
bc87c91bcd
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# apps/cli/cordis.yml
# apps/cli/package.json
# apps/cli/src/bin.ts
# apps/cli/tests/args.spec.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/ui/tui/README.i18n.yaml
# pnpm-lock.yaml
|
2026-07-30 19:54:30 +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 |
|
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 |
|
Turtle
|
a51143bded
|
fix(cli): close shared config review gaps
|
2026-07-30 14:56:39 +08:00 |
|
Turtle
|
208944645c
|
fix(cli): align shared config lifecycle docs
|
2026-07-30 11:34:46 +08:00 |
|
Turtle
|
93748e5b47
|
fix(cli): preserve DSH home fallback in config
|
2026-07-30 11:00:59 +08:00 |
|
Turtle
|
efcffa0495
|
fix(cli): evaluate session root in config context
|
2026-07-30 10:53:43 +08:00 |
|
Turtle
|
83360c3dca
|
fix(cli): default session root in shipped config
|
2026-07-30 10:24:04 +08:00 |
|
Turtle
|
5dbcedfbba
|
Merge origin/master into feature/shared-cli-config-foundation
|
2026-07-30 10:11:38 +08:00 |
|