ZiyaZhang
fef928a7e1
feat(gui): add native workspace folder picker
2026-07-27 03:50:22 -07:00
Chinesezjc
56d673c4d7
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 18:45:47 +08:00
_Kerman
4137405cdd
Merge remote-tracking branch 'github/master' into xtr/trajectory-inspection-ui
...
# Conflicts:
# packages/client/runtime/src/client/sessions/conversation.ts
# packages/client/runtime/src/client/sessions/session.ts
2026-07-27 18:41:28 +08:00
Hypatia May
01a12ecc98
Merge remote-tracking branch 'origin/master' into codex/basic-session-search
2026-07-27 18:38:18 +08:00
Hypatia May
4727d742db
fix(web): align session search contracts
2026-07-27 18:38:00 +08:00
fz
826c6fd243
feat(web): present Cordis lifecycle tools
2026-07-27 17:57:59 +08:00
Tianyi Cui
d897dcc7ea
Merge remote-tracking branch 'origin/master' into worktree/pr682-retarget-20260727
...
# Conflicts:
# .agents/notes/rejected/simplification/2026-07-26-dependency-swaps-rejected-by-nih-audit.i18n.yaml
2026-07-27 17:55:56 +08:00
Chinesezjc
a2e3c1b242
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 17:29:59 +08:00
Chinesezjc
f69124cc4a
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-23-web-todo-display.i18n.yaml
# .agents/notes/implemented/feature/2026-07-23-web-todo-display.md
# .agents/notes/implemented/feature/2026-07-23-web-todo-display.zh.md
# apps/web/tests/todo-display.snapshot.ts
# 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/skeleton/TodoPanel.tsx
# packages/client/ui-conversation/tests/todo-panel.spec.tsx
2026-07-27 17:29:44 +08:00
Tianyi Cui
1ee8029bc6
Merge remote-tracking branch 'origin/master' into worktree-process-service-seam
2026-07-27 17:24:20 +08:00
07akioni
e30f642e37
refactor(todos): update TodoRow styling and logic, add IconChecklistOutline16, and enhance AssistantMarkdown rendering
2026-07-27 17:23:36 +08:00
Yichen Jiang
7f4905c4bf
Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
2026-07-27 17:18:29 +08:00
Hypatia May
74b26adcac
Merge remote-tracking branch 'origin/master' into codex/basic-session-search
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-workspace/README.i18n.yaml
# packages/client/ui-workspace/README.md
# packages/client/ui-workspace/README.zh.md
# packages/client/ui-workspace/src/client/WorkspaceBrowser.tsx
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/tests/client-handler.spec.ts
2026-07-27 17:17:31 +08:00
Yichen Jiang
c47553f9f3
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
2026-07-27 17:13:24 +08:00
Hypatia May
8f9262edc3
test(web): refresh snapshots after master merge
2026-07-27 17:09:49 +08:00
Yichen Jiang
c0009e4603
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# 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/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/tests/chat-branch-tails.spec.tsx
2026-07-27 17:09:25 +08:00
imccyu
a020400286
Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector
2026-07-27 17:01:42 +08:00
imccyu
0052ea49ff
Merge branch 'master' into feature/delete-workspace
2026-07-27 16:59:28 +08:00
Hypatia May
2846f84bf1
Merge remote-tracking branch 'origin/master' into codex/basic-session-search
2026-07-27 16:55:56 +08:00
imccyu
50ec3b1db0
Merge branch 'master' into feat/todo-tool-ui
2026-07-27 16:54:34 +08:00
imccyu
5b81025b58
Merge branch 'master' into feature/delete-workspace
2026-07-27 16:52:24 +08:00
Chinesezjc
8461952f33
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
...
# Conflicts:
# docs/core-data-structures/session.i18n.yaml
2026-07-27 16:47:26 +08:00
Tianyi Cui
21fe97d19d
Merge remote-tracking branch 'origin/master' into worktree-process-service-seam
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/core-data-structures/core.i18n.yaml
2026-07-27 16:40:07 +08:00
07akioni
16598f7159
fix: cr
2026-07-27 16:36:36 +08:00
07akioni
900e45b365
feat: optimize todo tool ui
2026-07-27 16:24:30 +08:00
imccyu
9249c5504e
Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector
2026-07-27 16:16:17 +08:00
Yichen Jiang
0d084ab6ff
feat(web): support reasoning effort selection
2026-07-27 16:12:40 +08:00
NI0317
dcf06e8272
Merge remote-tracking branch 'origin/master' into feature/delete-workspace
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
2026-07-27 15:54:51 +08:00
NI0317
4701373fc2
fix(workspace): remove transient duplicate warning
2026-07-27 15:52:35 +08:00
Hypatia May
a2d108838e
fix(cli): install shutdown handlers before readiness
2026-07-27 15:49:43 +08:00
imccyu
228d503230
fix: code-mode fixture snapshot
2026-07-27 15:49:37 +08:00
Yichen Jiang
39c60d5d64
Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-20-routed-model-context-and-compaction-policy.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-20-routed-model-context-and-compaction-policy.md
# .agents/notes/implemented/architecture/2026-07-20-routed-model-context-and-compaction-policy.zh.md
# packages/llm/llm-deepseek/README.i18n.yaml
# packages/llm/llm-deepseek/tests/adapter.spec.ts
2026-07-27 15:49:09 +08:00
_Kerman
628c1bffe0
feat(ui): add trajectory inspection ledger
2026-07-27 15:47:44 +08:00
Yichen Jiang
181ac52f8e
Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector
...
# Conflicts:
# packages/client/connection/src/client/fixture.ts
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/tests/fake-api.ts
# packages/client/runtime/tests/session.spec.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/host/apiproxy/README.i18n.yaml
2026-07-27 15:41:01 +08:00
Hypatia May
de67a695ca
Merge remote-tracking branch 'origin/master' into codex/basic-session-search
...
# Conflicts:
# packages/client/connection/src/client/fixture.ts
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
2026-07-27 15:34:41 +08:00
Yichen Jiang
c3dfed668d
Merge branch 'master' into worktree/llm-reasoning-effort
2026-07-27 15:30:00 +08:00
Chinesezjc
07f9959d55
fix(gui): keep the parallel-active count outside the ellipsized hint
...
Both todo one-line surfaces truncate the active hint with overflow: hidden
and text-overflow: ellipsis. A "+N" appended to the first active task's name
therefore sat at the far end of the truncatable text, so a long task name or a
narrow viewport clipped exactly the part that reports the other running tasks,
leaving a parallel plan indistinguishable from a sequential one.
planSummary now returns activeContent and activeExtra as separate fields
instead of one joined activeHint, and each surface renders the count in its own
flex: none span beside the ellipsized name: .activeExtra in the collapsed plan
strip header, .extra in the todo_write row. Putting the count in front of the
name was rejected — the task name is what the reader looks for first.
The parallel-plan cases in todo-panel.spec.tsx now assert the count is a
separate element from the name, and both fail if the two are rejoined. The
assembled web snapshot re-records: the flex gap supplies the visual space, so
the transcript reads "实现 fixture 样本+1" with no space in the text nodes.
2026-07-27 15:07:43 +08:00
Hypatia May
76e185dcb6
test(cli): isolate lazy search startup smoke (round 10)
2026-07-27 14:54:27 +08:00
Hypatia May
0aa7f8c5cf
fix(web): converge session search boundaries (round 9)
2026-07-27 14:46:08 +08:00
NI0317
7bd96af5eb
fix(workspace): make deletion recoverable
2026-07-27 14:37:04 +08:00
Chinesezjc
f8b0bd31d3
fix(gui): the collapsed plan hint accounts for parallel active items
...
Lifting the single-in_progress cap makes a list shape reachable that the
web surfaces never received. Two sites derived their one-line summary with
todos.find(t => t.status === 'in_progress') — the collapsed TodoPanel header
and the todo_write row — which was total under the old cap and silently
dropped every active item but the first once several could match: a plan
with three running tasks collapsed to the name of one. The expanded list
was always correct, so neither PR's tests covered it.
Both sites now take planSummary in contract/todo-plan-model.ts, the
domain-shared face both the skeleton and toolviews domains may import; the
duplicated derivation was why one find could be fixed while the other
stayed wrong. The hint names the first active item and suffixes +<n> for
the rest, so the collapsed line reports how many tasks are running.
The web fixture's todo sample now runs two items in_progress, so the
assembled web transcript replays a parallel plan: the row reads
'1/4 已完成 · 实现 fixture 样本 +1' over the built bundles.
2026-07-27 14:25:02 +08:00
Hypatia May
ba2925c704
fix(web): converge search runtime boundaries (round 8)
2026-07-27 14:02:35 +08:00
imccyu
3b04941830
Merge the concurrent selector adaptation; ui-model stays the model owner
...
The remote side re-merged master (i18n workflow round) and restored the
pre-architecture ModelSelector package with the Session-side state
machine. Reconciliation keeps that merge's master content and reasserts
this branch's model architecture: business state lives in ui-model's
shared per-session directory (ctx.models), not on Session/
ConversationSnapshot; the input.model seat entry and the /model popup
stay the two same-source entries; the history modelTarget piggyback stays
removed. The ui-model-selector package, its roster row, and its allowlist
entry go; the smoke-real roster names ui-model.
2026-07-27 13:36:25 +08:00
Yichen Jiang
21aeff3029
Merge remote-tracking branch 'origin/master' into worktree/llm-reasoning-effort
...
# Conflicts:
# .agents/notes/implemented/testing/2026-07-24-web-gui-browser-e2e-lane.i18n.yaml
# docs/config-catalog.md
# docs/core-data-structures/session.i18n.yaml
# scripts/type-equiv.manifest.json
2026-07-27 13:35:10 +08:00
Hypatia May
bd42204e53
fix(cli): keep search index ephemeral
2026-07-27 12:51:47 +08:00
Hypatia May
31215687f9
fix(web): honor search ownership and cancellation
2026-07-27 12:42:46 +08:00
NI0317
187cf6f804
feat(web): delete workspace registrations
2026-07-27 12:38:11 +08:00
Hypatia May
222096e3cf
fix(web): validate search hit provenance (round 2)
2026-07-27 12:27:11 +08:00
Yichen Jiang
bde5e26a96
Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector
...
# Conflicts:
# apps/cli/package.json
# apps/web/tests/smoke-real.e2e.ts
# apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# docs/config-catalog.md
# packages/client/connection/tests/fake-api.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/apply.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.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/input-bar.spec.tsx
# packages/client/ui-conversation/tests/skeleton.spec.tsx
# packages/host/apiproxy/README.md
# packages/host/apiproxy/src/api-proxy.ts
# pnpm-lock.yaml
# scripts/verify-package-readme-model-experience.ts
# tsconfig.base.json
2026-07-27 12:17:38 +08:00
Hypatia May
891e9035e7
feat(web): add basic past-session search (round 1)
2026-07-27 12:15:06 +08:00
