Merge remote-tracking branch 'origin/master' into feat/web-cards-toolrow

# Conflicts: # packages/client/connection/src/client/fixture.ts # packages/client/ui-conversation/README.i18n.yaml # packages/client/ui-conversation/src/client/apply.ts # packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx # packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx # packages/client/ui-conversation/src/client/toolviews/file-mutation-row.tsx # packages/client/ui-conversation/src/client/toolviews/search-row.tsx # packages/client/ui-conversation/tests/chat-apply.spec.tsx # packages/client/ui-primitives/src/index.ts
2026-07-31 17:38:17 +08:00
parent 4276a7386f 7e07d0179d
commit b93120a280
210 changed files with 5925 additions and 3254 deletions
--- a/apps/web/tests/message-actions.e2e.ts
+++ b/apps/web/tests/message-actions.e2e.ts
@@ -64,14 +64,14 @@ describe('web e2e: message IconActions and clocks on settled history', () => {
    await expect.poll(() => page.getByText('DONE', { exact: true }).count(), { timeout: 15_000 }).toBe(1)

    // Focus-reveal the footers (hover:hover keeps them opacity-hidden until
-    // hover/focus-within). User has three actions; each turn's last content
-    // assistant has copy + branch.
+    // hover/focus-within). User and each turn's last content assistant both
+    // have copy + branch.
    const copyButtons = page.getByRole('button', { name: 'Copy' })
    await expect.poll(() => copyButtons.count(), { timeout: 10_000 }).toBeGreaterThanOrEqual(2)
    await copyButtons.first().focus()
    await expect.poll(() => page.getByRole('button', { name: 'Branch into a new conversation' }).count(), { timeout: 5_000 })
      .toBeGreaterThanOrEqual(2)
-    await expect.poll(() => page.getByRole('button', { name: 'Edit' }).count(), { timeout: 5_000 }).toBe(1)
+    await expect.poll(() => page.getByRole('button', { name: 'Edit' }).count(), { timeout: 5_000 }).toBe(0)
  }, 60_000)

  it.skipIf(MODE === 'record')('matches the conversation aria golden with IconActions and clocks', async () => {
--- a/apps/web/tests/smoke-real.e2e.ts
+++ b/apps/web/tests/smoke-real.e2e.ts
@@ -163,6 +163,8 @@ describe('dsh web keyless CLI smoke', () => {
        env: {
          ...process.env,
          DEEPSEEK_API_KEY: 'keyless-web-no-call',
+          DSH_HOME: join(sessionsDir, '.dsh'),
+          DSH_AGENTS_HOME: join(sessionsDir, '.agents'),
          TSX_TSCONFIG_PATH: join(REPO_ROOT, 'tsconfig.json'),
        },
        stdio: ['ignore', 'pipe', 'pipe'],
@@ -226,6 +228,7 @@ describe('dsh web keyless CLI smoke', () => {
          DEEPSEEK_API_KEY: 'keyless-web-workspace',
          DEEPSEEK_BASE_URL: `http://127.0.0.1:${address.port}`,
          DSH_HOME: join(workspace, '.dsh'),
+          DSH_AGENTS_HOME: join(workspace, '.agents'),
          TSX_TSCONFIG_PATH: join(REPO_ROOT, 'tsconfig.json'),
        },
        stdio: ['ignore', 'pipe', 'pipe'],
@@ -245,6 +248,8 @@ describe('dsh web keyless CLI smoke', () => {
          setTimeout(() => { reject(new Error('provider request not received in 10s')) }, 10_000).unref()
        }),
      ])
+      expect(captured.messages?.some(message =>
+        message.role === 'user' && message.content?.includes('<available_skills>'))).toBe(false)
      const workspaceMessage = captured.messages?.find(message =>
        message.role === 'user' && message.content?.includes('web-workspace-context-probe'))
      expect(workspaceMessage).toMatchInlineSnapshot(`
@@ -413,6 +418,7 @@ describe('dsh web keyless CLI smoke', () => {
          DEEPSEEK_BASE_URL: `http://127.0.0.1:${address.port}`,
          DSH_TOOLS_MODE: 'code',
          DSH_HOME: join(workspace, '.dsh'),
+          DSH_AGENTS_HOME: join(workspace, '.agents'),
          TSX_TSCONFIG_PATH: join(REPO_ROOT, 'tsconfig.json'),
        },
        stdio: ['ignore', 'pipe', 'pipe'],
@@ -461,8 +467,8 @@ describe.skipIf(!process.env.DEEPSEEK_API_KEY || notReady.length > 0)('web smoke
    sessionsDir = mkdtempSync(join(tmpdir(), 'dsh-web-w5-'))
    const port = await probeFreePort()
    // tsx boot mirrors demo:web — lib/ may be unbuilt in this worktree. Isolate
-    // the global Harness home inside the temp world; tsx also needs the repo's
-    // loader and tsconfig paths pointed at explicitly.
+    // the host-level Harness and shared-agent homes inside the temp world; tsx
+    // also needs the repo's loader and tsconfig paths pointed at explicitly.
    const tsxLoader = pathToFileURL(createRequire(join(REPO_ROOT, 'package.json')).resolve('tsx')).href
    child = spawn(
      process.execPath,
@@ -472,6 +478,7 @@ describe.skipIf(!process.env.DEEPSEEK_API_KEY || notReady.length > 0)('web smoke
        env: {
          ...process.env,
          DSH_HOME: join(sessionsDir, '.dsh'),
+          DSH_AGENTS_HOME: join(sessionsDir, '.agents'),
          TSX_TSCONFIG_PATH: join(REPO_ROOT, 'tsconfig.json'),
        },
        stdio: ['ignore', 'pipe', 'pipe'],
--- a/apps/web/tests/snapshots/code-mode-round/ui.expected.md
+++ b/apps/web/tests/snapshots/code-mode-round/ui.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
@@ -46,4 +44,4 @@
  - text: DeepSeek-V4-Flash
  - img
 - button "Send message" [disabled]
- text: 1 turns · 2 steps Tool call {{duration}} Cache hit 52% Input 17.2K tok · Output 252 tok
+- text: 1 turns · 2 steps Tool call {{duration}} Context 7% of 128K Cache hit 52% Input 17.2K tok · Output 252 tok
--- a/apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
+++ b/apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
@@ -61,4 +59,4 @@
  - text: DeepSeek-V4-Flash
  - img
 - button "Send message" [disabled]
- text: 1 turns · 4 steps Tool call {{duration}} Cache hit 77% Input 66.5K tok · Output 312 tok
+- text: 1 turns · 4 steps Tool call {{duration}} Context 13% of 128K Cache hit 77% Input 66.5K tok · Output 312 tok
--- a/apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
+++ b/apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
@@ -41,4 +39,4 @@
  - text: DeepSeek-V4-Flash
  - img
 - button "Send message" [disabled]
- text: 1 turns · 2 steps Tool call {{duration}} Cache hit 99% Input 15.7K tok · Output 111 tok
+- text: 1 turns · 2 steps Tool call {{duration}} Context 6% of 128K Cache hit 99% Input 15.7K tok · Output 111 tok
--- a/apps/web/tests/snapshots/lifecycle-chrome/reloaded.expected.md
+++ b/apps/web/tests/snapshots/lifecycle-chrome/reloaded.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
@@ -33,4 +31,4 @@
  - text: DeepSeek-V4-Flash
  - img
 - button "Send message" [disabled]
- text: 1 turns · 1 steps Cache hit 99% Input 7.8K tok · Output 21 tok
+- text: 1 turns · 1 steps Context 6% of 128K Cache hit 99% Input 7.8K tok · Output 21 tok
--- a/apps/web/tests/snapshots/live-interactions/cancel.expected.md
+++ b/apps/web/tests/snapshots/live-interactions/cancel.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
--- a/apps/web/tests/snapshots/live-interactions/error-auth.expected.md
+++ b/apps/web/tests/snapshots/live-interactions/error-auth.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
--- a/apps/web/tests/snapshots/live-interactions/loading.expected.md
+++ b/apps/web/tests/snapshots/live-interactions/loading.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
--- a/apps/web/tests/snapshots/live-interactions/retry.expected.md
+++ b/apps/web/tests/snapshots/live-interactions/retry.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
@@ -35,4 +33,4 @@
  - text: DeepSeek-V4-Flash
  - img
 - button "Send message" [disabled]
- text: 1 turns · 1 steps Cache hit 99% Input 7.8K tok · Output 79 tok
+- text: 1 turns · 1 steps Context 6% of 128K Cache hit 99% Input 7.8K tok · Output 79 tok
--- a/apps/web/tests/snapshots/message-actions/ui.expected.md
+++ b/apps/web/tests/snapshots/message-actions/ui.expected.md
@@ -10,8 +10,6 @@
 - tooltip "Copy"
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Think The user wants me to read a.txt and b.txt, then reply with \"DONE\". Let me do both reads in parallel.":
  - img
  - img
--- a/apps/web/tests/snapshots/plan-review/approved.expected.md
+++ b/apps/web/tests/snapshots/plan-review/approved.expected.md
@@ -10,8 +10,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
@@ -46,4 +44,4 @@
  - text: DeepSeek-V4-Flash
  - img
 - button "Send message" [disabled]
- text: 1 turns · 2 steps Tool call {{duration}} Cache hit 51% Input 10.2K tok · Output 346 tok
+- text: 1 turns · 2 steps Tool call {{duration}} Context 4% of 128K Cache hit 51% Input 10.2K tok · Output 346 tok
--- a/apps/web/tests/snapshots/question-composer/answered.expected.md
+++ b/apps/web/tests/snapshots/question-composer/answered.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
@@ -41,4 +39,4 @@
  - text: DeepSeek-V4-Flash
  - img
 - button "Send message" [disabled]
- text: 1 turns · 2 steps Tool call {{duration}} Cache hit 95% Input 8.6K tok · Output 180 tok
+- text: 1 turns · 2 steps Tool call {{duration}} Context 3% of 128K Cache hit 95% Input 8.6K tok · Output 180 tok
--- a/apps/web/tests/snapshots/queue-actions/collapsed.expected.md
+++ b/apps/web/tests/snapshots/queue-actions/collapsed.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
--- a/apps/web/tests/snapshots/queue-actions/editing.expected.md
+++ b/apps/web/tests/snapshots/queue-actions/editing.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
--- a/apps/web/tests/snapshots/queue-actions/ui.expected.md
+++ b/apps/web/tests/snapshots/queue-actions/ui.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
--- a/apps/web/tests/snapshots/search-card/grep-card.expected.txt
+++ b/apps/web/tests/snapshots/search-card/grep-card.expected.txt
@@ -24,4 +24,4 @@ Line 35:   const search = searchCardModel(block)
 Line 52:       search={search}
 Line 73:     ctx.slots.register({ name: 'conversation.chat.toolview', key: 'grep', locale: NS }, SearchRow)

-(Full grep result stored at: fixture://spill/grep-68. Read it to see every match.)
+(Full grep result stored at: fixture://spill/grep-66. Read it to see every match.)
--- a/apps/web/tests/snapshots/seeded-history/command-row.expected.md
+++ b/apps/web/tests/snapshots/seeded-history/command-row.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Think The user wants me to read a.txt and b.txt, then reply with \"DONE\". Let me do both reads in parallel.":
  - img
  - img
--- a/apps/web/tests/snapshots/seeded-history/ui.expected.md
+++ b/apps/web/tests/snapshots/seeded-history/ui.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Think The user wants me to read a.txt and b.txt, then reply with \"DONE\". Let me do both reads in parallel.":
  - img
  - img
--- a/apps/web/tests/snapshots/steering/mid-steer.expected.md
+++ b/apps/web/tests/snapshots/steering/mid-steer.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
--- a/apps/web/tests/snapshots/steering/settled.expected.md
+++ b/apps/web/tests/snapshots/steering/settled.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
@@ -42,4 +40,4 @@
  - text: DeepSeek-V4-Flash
  - img
 - button "Send message" [disabled]
- text: 1 turns · 2 steps Tool call {{duration}} Cache hit 98% Input 15.8K tok · Output 156 tok
+- text: 1 turns · 2 steps Tool call {{duration}} Context 6% of 128K Cache hit 98% Input 15.8K tok · Output 156 tok
--- a/apps/web/tests/snapshots/web-search-round/ui.expected.md
+++ b/apps/web/tests/snapshots/web-search-round/ui.expected.md
@@ -9,8 +9,6 @@
  - img
 - button "Branch into a new conversation":
  - img
- button "Edit":
-  - img
 - button "Context injection":
  - img
  - img
@@ -33,4 +31,4 @@
  - text: DeepSeek-V4-Flash
  - img
 - button "Send message" [disabled]
- text: 1 turns · 2 steps Tool call {{duration}} Cache hit 0% Input 22 tok · Output 7 tok
+- text: 1 turns · 2 steps Tool call {{duration}} Context 0% of 128K Cache hit 0% Input 22 tok · Output 7 tok