925 Commits

Author	SHA1	Message	Date
Chinesezjc	6f0405ed84	docs: re-record ui-conversation README pairing after master merge	2026-07-31 11:27:13 +08:00
Chinesezjc	e4cb667184	Merge remote-tracking branch 'origin/master' into feat/web-web-card ... # Conflicts: # packages/client/ui-conversation/README.i18n.yaml	2026-07-31 11:26:35 +08:00
Chinesezjc	5a52f33dd1	Merge remote-tracking branch 'origin/master' into feat/web-diff-card ... # Conflicts: # packages/client/ui-conversation/README.i18n.yaml	2026-07-31 11:26:21 +08:00
imccyu	37827c461d	Merge remote-tracking branch 'origin/master' into mergebot/pr998 ... # Conflicts: # apps/web/tests/snapshots/code-mode-round/ui.expected.md # apps/web/tests/snapshots/cordis-tool-round/ui.expected.md # apps/web/tests/snapshots/fresh-round-trip/ui.expected.md # apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md # apps/web/tests/snapshots/lifecycle-chrome/reloaded.expected.md # apps/web/tests/snapshots/live-interactions/cancel.expected.md # apps/web/tests/snapshots/live-interactions/error-auth.expected.md # apps/web/tests/snapshots/live-interactions/retry.expected.md # apps/web/tests/snapshots/message-actions/ui.expected.md # apps/web/tests/snapshots/plan-review/approved.expected.md # apps/web/tests/snapshots/question-composer/answered.expected.md # apps/web/tests/snapshots/queue-actions/collapsed.expected.md # apps/web/tests/snapshots/queue-actions/editing.expected.md # apps/web/tests/snapshots/queue-actions/ui.expected.md # apps/web/tests/snapshots/seeded-history/ui.expected.md # apps/web/tests/snapshots/steering/settled.expected.md # packages/client/ui-conversation/README.i18n.yaml # packages/client/ui-conversation/tests/input-bar.spec.tsx	2026-07-31 11:25:16 +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
kingwl	28d308b469	Merge remote-tracking branch 'origin/master' into codex/responsive-queue-panel ... # Conflicts: # packages/client/ui-conversation/src/client/queue/QueueDock.module.css # packages/client/ui-conversation/src/client/skeleton/ConversationRoot.module.css # packages/client/ui-conversation/src/client/skeleton/InputBar.module.css # packages/client/ui-conversation/src/client/skeleton/TodoPanel.module.css	2026-07-31 11:10:08 +08:00
Chinesezjc	40b9ccff20	Merge remote-tracking branch 'origin/master' into feat/web-diff-card ... # Conflicts: # packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx # packages/client/ui-conversation/src/client/chat/ToolRow.module.css # packages/client/ui-conversation/src/client/chat/ToolRow.tsx	2026-07-31 11:07:52 +08:00
Chinesezjc	2cad75a217	test(client-ui-conversation): assert localized 输出 section title in web-card panel ... master's locale rollout renders the details Output section title through t('details.output') (输出 under the zh seat the test uses). The spec still asserted the English 'Output' literal and failed. Match the sibling terminal-card suite's localized assertion.	2026-07-31 10:59:43 +08:00
Hypatia May	3a99cf7446	Merge current master into status bar projection	2026-07-31 10:56:34 +08:00
Chinesezjc	452ba583d2	test(client-ui-conversation): pass locale seat to web-card GenericToolCard/DetailsPanel renders ... master's locale rollout made `t` a required prop on GenericToolCardProps and the details slot; the web-card spec predates it. Supply the makeTranslate seat the sibling suites use.	2026-07-31 10:54:36 +08:00
Chinesezjc	bf26cfd2ff	docs: re-record ui README pairings after master merge	2026-07-31 10:51:58 +08:00
Chinesezjc	83f3ed8b91	Merge remote-tracking branch 'origin/master' into feat/web-web-card ... # Conflicts: # packages/client/ui-conversation/README.i18n.yaml # packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx # packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx # packages/client/ui-primitives/README.i18n.yaml # packages/client/ui-primitives/README.md # packages/client/ui-primitives/README.zh.md # packages/client/ui-primitives/src/index.ts	2026-07-31 10:51:09 +08:00
creatixchu	ddc008f448	Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input ... # Conflicts: # packages/client/connection/README.i18n.yaml # packages/client/connection/src/client/api.ts # packages/client/connection/src/client/fixture.ts # packages/client/connection/src/client/index.ts # packages/client/runtime/README.i18n.yaml # packages/client/runtime/src/client/sessions/service.ts # packages/client/ui-conversation/src/client/apply.ts # packages/client/ui-conversation/src/client/chat/ChatView.tsx # packages/client/ui-conversation/src/client/contract/slots.ts # packages/client/ui-conversation/src/client/stores.ts # packages/client/ui-conversation/tests/chat-view.spec.tsx # packages/host/apiproxy/README.i18n.yaml # packages/host/apiproxy/src/api-proxy.ts # packages/host/apiproxy/src/api/index.ts # packages/host/apiproxy/src/api/sessions.ts	2026-07-31 10:46:45 +08:00
Chinesezjc	224e3f85be	docs: re-record ui-conversation README pairing after base merge	2026-07-31 10:43:51 +08:00
Chinesezjc	fa6ba79ddf	Merge remote-tracking branch 'origin/feat/web-presenter' into feat/web-web-card ... # Conflicts: # packages/client/ui-conversation/README.i18n.yaml	2026-07-31 10:42:43 +08:00
ZiyaZhang	83d6be50aa	Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation	2026-07-30 19:32:51 -07:00
Yichen Jiang	11fde7bc1a	Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry ... # Conflicts: # packages/client/ui-conversation/tests/chat-view.spec.tsx	2026-07-31 10:26:23 +08:00
imccyu	ce57438ac0	Merge branch 'master' into codex/new-task	2026-07-31 10:23:14 +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
_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	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
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	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
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	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
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	cc119e39a6	Merge master into fix/turn-actions	2026-07-31 01:29:03 +08:00
Tianyi Cui	145a5eb9da	Merge master into fix/turn-actions	2026-07-31 01:27:56 +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
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
Hypatia May	ceb37f3377	Merge final master into Web transcript	2026-07-31 00:27:16 +08:00
imccyu	e4e78e7a31	Merge remote-tracking branch 'origin/master' into mergebot/pr981	2026-07-31 00:22:36 +08:00
ZiyaZhang	bf4ff3a696	Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation ... # Conflicts: # packages/client/ui-conversation/README.i18n.yaml	2026-07-30 09:20:43 -07:00
Wenlu Wang	edefdd96b9	Merge remote-tracking branch 'origin/master' into codex/new-task	2026-07-31 00:10:46 +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
imccyu	c6c0f5de6a	Merge branch 'master' into worktree/approval-panel-max-height	2026-07-30 23:49:19 +08:00
imccyu	5c4398c96c	Merge branch 'master' into worktree/command-row-copy	2026-07-30 23:45:49 +08:00
Chinesezjc	91244321af	Merge remote-tracking branch 'origin/master' into feat/web-diff-card ... # Conflicts: # packages/client/ui-conversation/README.i18n.yaml	2026-07-30 23:19:36 +08:00
creatixchu	7a52bedae7	Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input ... # Conflicts: # packages/client/ui-conversation/README.i18n.yaml # scripts/test-invariants.ts	2026-07-30 23:05:51 +08:00
Chinesezjc	f9a40d555f	docs: record ui-conversation README pairing hash after master merge	2026-07-30 22:59:34 +08:00
imccyu	da9f02221e	Merge remote-tracking branch 'origin/master' into worktree-forkweb	2026-07-30 22:53:07 +08:00
Hypatia May	b86ce10741	Merge Web queue collapse from master	2026-07-30 22:50:09 +08:00
Chinesezjc	4a4ec6fd4d	fix(web-search-card): follow base rename kind->shape and view-drops-content ... The base (feat/search-presenter) renamed the search result view's discriminant from `kind` to `shape` and removed the view's `content` field (a UI without a card now falls back to the raw tool/result content). Adapt the web consumer: - searchCardModel switches on `result.shape`; SearchBlock's own `kind` prop is mapped from it. - The truncation recovery footer reads the block's raw `content` (where the `Full … stored at …` locator now lives) instead of the removed view content. - Fixture grep/glob views use `shape` and drop `content`; the recovery footer rides the raw tool/result text. - Tests and the bilingual Agent Note follow the rename and the recovery source.	2026-07-30 22:49:41 +08:00
Hypatia May	c2940f620e	Merge Web queue collapse from master	2026-07-30 22:48:45 +08:00