Yichen Jiang cba0948604 Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector ...

# Conflicts:
#	.agents/notes/implemented/architecture/2026-07-15-llm-model-catalog-and-acp-selection.i18n.yaml
#	.agents/notes/implemented/architecture/2026-07-23-client-plugin-loading-model.i18n.yaml
#	apps/cli/src/web.ts
#	apps/web/tests/session-title.snapshot.ts
#	apps/web/tests/smoke-fixture.e2e.ts
#	packages/client/connection/src/client/api.ts
#	packages/client/connection/src/client/fixture.ts
#	packages/client/connection/src/client/index.ts
#	packages/client/runtime/src/client/index.ts
#	packages/client/runtime/src/client/sessions/conversation.ts
#	packages/client/runtime/src/client/sessions/session.ts
#	packages/client/runtime/tests/fake-api.ts
#	packages/client/ui-conversation/src/client/contract/slots.ts
#	packages/client/ui-conversation/src/client/index.ts
#	packages/client/ui-conversation/src/client/skeleton/ConversationRoot.tsx
#	packages/client/ui-conversation/src/client/skeleton/InputBar.module.css
#	packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
#	packages/client/ui-conversation/tests/chat-stats-bash-sample.spec.tsx
#	packages/client/ui-conversation/tests/chat-toolview-slot.spec.tsx
#	packages/client/ui-conversation/tests/chat-view.spec.tsx
#	packages/client/ui-conversation/tests/gate-branch-tails.spec.tsx
#	packages/client/ui-conversation/tests/skeleton-branches.spec.tsx
#	packages/client/ui-conversation/tests/skeleton.spec.tsx
#	packages/host/apiproxy/README.md
#	packages/host/apiproxy/src/api-proxy.ts
#	packages/host/apiproxy/src/api/rpc.schema.ts
#	packages/host/apiproxy/src/api/rpc.ts
#	packages/host/apiproxy/tests/api-proxy-models.spec.ts
#	packages/host/apiproxy/tests/rpc-schemas.spec.ts
#	packages/host/runtime/README.md
#	packages/llm/llm-deepseek/README.md
#	scripts/translation-pairing.manifest.json
#	tsconfig.client.json

2026-07-26 13:13:53 +08:00

..

cookbook

docs(i18n): mirror ACP-automation edits into the zh pairs from master

2026-07-25 01:58:42 +08:00

cordis-catalog

Merge latest master into codex/consolidate-agent-notes

2026-07-26 00:57:51 +08:00

cordis-tutorial

refactor: drop obsolete expose-internals flag

2026-07-23 20:35:09 +08:00

core-data-structures

Merge remote-tracking branch 'origin/master' into session-query-tool

2026-07-25 15:43:45 +08:00

i18n

Merge remote-tracking branch 'origin/master' into worktree/pr343-retarget-latest-master

2026-07-24 21:20:17 +08:00

postmortem

docs(i18n): mirror ACP-automation edits into the zh pairs from master

2026-07-25 01:58:42 +08:00

user

refactor(acp): reduce bridge to automation protocol

2026-07-24 01:40:25 +08:00

agent-lifecycle.md

refactor(agent): align delivery method names

2026-07-24 15:08:36 +08:00

AGENTS.md

docs: restore generated Cordis core API

2026-07-20 16:33:44 +08:00

architecture.i18n.yaml

Merge remote-tracking branch 'origin/master' into session-query-tool

2026-07-25 14:17:24 +08:00

architecture.md

Merge remote-tracking branch 'origin/master' into session-query-tool

2026-07-25 14:17:24 +08:00

architecture.zh.md

Merge remote-tracking branch 'origin/master' into session-query-tool

2026-07-25 14:17:24 +08:00

capability-seams.md

Merge remote-tracking branch 'origin/master' into session-query-tool

2026-07-25 18:27:39 +08:00

config-catalog.md

Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector

2026-07-26 13:13:53 +08:00

cordis-primer.i18n.yaml

docs(i18n): clarify Cordis and test wording

2026-07-24 14:21:15 +08:00

cordis-primer.md

Merge remote-tracking branch 'origin/master' into worktree/pr343-retarget-latest-master

2026-07-23 13:40:29 +08:00

cordis-primer.zh.md

docs(i18n): clarify Cordis and test wording

2026-07-24 14:21:15 +08:00

defensive-patterns.i18n.yaml

Merge remote-tracking branch 'origin/master' into worktree/pr343-retarget-latest-master

2026-07-24 21:20:17 +08:00

defensive-patterns.md

Merge remote-tracking branch 'origin/master' into worktree/pr343-retarget-latest-master

2026-07-24 21:20:17 +08:00

defensive-patterns.zh.md

Merge remote-tracking branch 'origin/master' into worktree/pr343-retarget-latest-master

2026-07-24 21:20:17 +08:00

development.i18n.yaml

refactor(acp): reduce bridge to automation protocol

2026-07-24 01:40:25 +08:00

development.md

refactor(acp): reduce bridge to automation protocol

2026-07-24 01:40:25 +08:00

development.zh.md

refactor(acp): reduce bridge to automation protocol

2026-07-24 01:40:25 +08:00

event-producer-consumer.md

feat(web): add workspace-aware session flow

2026-07-25 17:45:26 +08:00

glossary.i18n.yaml

docs: align Goal Round step cardinality

2026-07-24 12:10:40 +08:00

glossary.md

docs: align Goal Round step cardinality

2026-07-24 12:10:40 +08:00

glossary.zh.md

docs(i18n): allow zero-step Goal Rounds

2026-07-23 21:13:34 +08:00

graph-atlas.md

refactor(acp): reduce bridge to automation protocol

2026-07-24 01:40:25 +08:00

module-graph.md

Merge branch 'master' into worktree/llm-mock-fault-server

2026-07-26 00:45:44 +08:00

persistence-catalog.md

docs(agent-notes): consolidate superseded decisions

2026-07-25 16:43:07 +08:00

testing.i18n.yaml

Merge remote-tracking branch 'origin/master' into web-e2e-lane

2026-07-25 14:20:19 +08:00

testing.md

Merge remote-tracking branch 'origin/master' into web-e2e-lane

2026-07-25 14:20:19 +08:00

testing.zh.md

Merge remote-tracking branch 'origin/master' into web-e2e-lane

2026-07-25 14:20:19 +08:00

tool-catalog.md

fix(session-query): keep model tools opt-in

2026-07-25 18:14:36 +08:00

tool-execution-pipeline.md

Merge remote-tracking branch 'origin/master' into feat/send-unify

2026-07-23 22:41:45 +08:00

web-styling.md

refactor(gui): slot system standard — single register, four props shares, framework store seat

2026-07-23 03:25:11 +08:00