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
parent 72a7307826 8a3b47ae5e
commit 9433259f05
238 changed files with 3273 additions and 1304 deletions
@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write packages/client/ui-plan/README.md
-README.md: 2f83dd738e11ada5b24a55d1eec97e154ffd2aea
-README.zh.md: a026390191179f6492a55ee931a3406d8e1953e8
+README.md: fcc4fbab4fbe1a8cc27119366b21ef55c669ba30
+README.zh.md: b618199616e45f69d62f3507c96d367bb3b9909f
@@ -4,7 +4,7 @@ English | [中文](README.zh.md)

 Plan-mode status chip, a pure browser surface plugin. The browser half occupies the conversation-declared `conversation.input.plan` single seat (to the right of the access-mode control); the node half is an empty apply (the roster row). Plan behavior itself — the `/plan` command, the boundary-or-idle-committed `plan/mode` state, the `plan` projection unit, and the policy section — is owned by [`@deepseek-ai/dsh-plan-mode`](../../plan/plan-mode/README.md), composed independently on the host roster.

-Plan mode is entered through the `/plan` command path: users can choose Plan from the composer's `+` Command menu or type `/plan`, while this package renders no inactive plan control. While the host-computed `plan` projection's effective target is plan mode (`pending ? !active : active` — a folded host value, not client optimism, so an arriving frame corrects the chip either way), the seat renders the warn-colored "Plan ×" status button, which executes `/plan off` through `command.execute`; otherwise the seat stays empty — a host without plan-mode (or a Draft with no session) shows nothing. While plan mode is the effective target, the composer textarea's placeholder switches to the plan-task hint — "describe your task to generate plan", localized through ui-conversation's `command.hint` locale namespace and shared verbatim with the claimed `/plan` command hint (rendered by the composer from the same projection; owner-supplied placeholders win).
+Plan mode is entered through the `/plan` command path: users can choose Plan from the composer's `+` Command menu or type `/plan`, while this package renders no inactive plan control. While the host-computed `plan` projection's effective target is plan mode (`pending ? !active : active` — a folded host value, not client optimism, so an arriving frame corrects the chip either way), the seat renders the warn-colored "Plan ×" status button, which executes `/plan off` through `command.execute`; otherwise the seat stays empty — a host without plan-mode (or a Draft with no session) shows nothing. While plan mode is the effective target, the composer textarea's placeholder switches to the plan-task hint — "describe your task to generate plan", localized through ui-conversation's `conversation` locale namespace (the `placeholder.plan` / `hint.plan` keys) and shared verbatim with the claimed `/plan` command hint (rendered by the composer from the same projection; owner-supplied placeholders win).

 The chip carries the accessible description "Plan mode on, press to turn off". Admission failures (`matched: false`, business errors, transport faults) surface as an inline error and the chip stays until the projection confirms the exit.

@@ -4,7 +4,7 @@

 Plan mode 状态徽章，纯浏览器 surface 插件。浏览器侧占据会话声明的 `conversation.input.plan` 单座（位于 access 模式控件右侧）；node 侧是空 apply（roster 行）。plan 行为本身——`/plan` 命令、边界或空闲即时提交的 `plan/mode` 状态、`plan` 投影单元与 policy 段——归 [`@deepseek-ai/dsh-plan-mode`](../../plan/plan-mode/README.md) 所有，由 host roster 独立组合。

-plan mode 经 `/plan` 命令路径进入：用户可以从 composer 的 `+` Command 菜单选择 Plan，也可以输入 `/plan`，而本包（package）不渲染未激活态 plan 控件。当 host 计算的 `plan` 投影有效目标为 plan mode 时（`pending ? !active : active`——折叠的 host 值而非客户端乐观态，帧到达即自动纠正），座位渲染 warn 色的 "Plan ×" 状态按钮，该按钮经 `command.execute` 执行 `/plan off`；否则座位保持为空——未组合 plan-mode 的 host（或尚无会话的 Draft）不显示任何内容。plan mode 为有效目标期间，composer 文本框的 placeholder 切换为 plan 任务提示——"describe your task to generate plan"（中文「描述你的任务以生成计划」），经 ui-conversation 的 `command.hint` locale 命名空间本地化，并与已认领 `/plan` 命令的提示逐字共用同一份文案（由 composer 从同一投影渲染；owner 提供的 placeholder 优先）。
+plan mode 经 `/plan` 命令路径进入：用户可以从 composer 的 `+` Command 菜单选择 Plan，也可以输入 `/plan`，而本包（package）不渲染未激活态 plan 控件。当 host 计算的 `plan` 投影有效目标为 plan mode 时（`pending ? !active : active`——折叠的 host 值而非客户端乐观态，帧到达即自动纠正），座位渲染 warn 色的 "Plan ×" 状态按钮，该按钮经 `command.execute` 执行 `/plan off`；否则座位保持为空——未组合 plan-mode 的 host（或尚无会话的 Draft）不显示任何内容。plan mode 为有效目标期间，composer 文本框的 placeholder 切换为 plan 任务提示——"describe your task to generate plan"（中文「描述你的任务以生成计划」），经 ui-conversation 的 `conversation` locale 命名空间（`placeholder.plan` / `hint.plan` 键）本地化，并与已认领 `/plan` 命令的提示逐字共用同一份文案（由 composer 从同一投影渲染；owner 提供的 placeholder 优先）。

 chip 携带无障碍描述 "Plan mode on, press to turn off"。准入失败（`matched: false`、业务错误、传输故障）以内联错误呈现，chip 保持显示直至投影确认退出。

@@ -25,6 +25,7 @@
  "dshClient": {
    "inject": [
      "@deepseek-ai/dsh-client-connection",
+      "@deepseek-ai/dsh-client-locale",
      "@deepseek-ai/dsh-client-ui-conversation"
    ],
    "platform": "web"
@@ -36,6 +37,7 @@
  "license": "BSD-3-Clause",
  "peerDependencies": {
    "@deepseek-ai/dsh-client-connection": "^0.0.1",
+    "@deepseek-ai/dsh-client-locale": "^0.0.1",
    "@deepseek-ai/dsh-client-runtime": "^0.0.1",
    "@deepseek-ai/dsh-client-ui-conversation": "^0.0.1",
    "@deepseek-ai/dsh-client-ui-primitives": "^0.0.1",
@@ -47,7 +49,9 @@
  },
  "devDependencies": {
    "@deepseek-ai/dsh-client-connection": "workspace:^",
+    "@deepseek-ai/dsh-client-locale": "workspace:^",
    "@deepseek-ai/dsh-client-runtime": "workspace:^",
+    "@deepseek-ai/dsh-client-test-runtime": "workspace:^",
    "@deepseek-ai/dsh-client-ui-conversation": "workspace:^",
    "@deepseek-ai/dsh-client-ui-primitives": "workspace:^",
    "@deepseek-ai/dsh-client-ui-slots": "workspace:^",
@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from 'react'
-import type { InjectFace, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
+import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
 import { IconCloseFill14 } from '@deepseek-ai/dsh-client-ui-primitives'
 // Type-only: pulls the ui-conversation SlotMap merge (the input.plan seat and
 // its {locked} owner share).
@@ -7,16 +7,16 @@ import type {} from '@deepseek-ai/dsh-client-ui-conversation/client'
 import type { PlanChipInjected } from './index.ts'
 import css from './PlanModeControl.module.css'

-/** Full plan-seat component props: runtime share (standard kit + locked owner prop) & injected share. */
+/** Full plan-seat component props: runtime share (standard kit + locked owner prop) & injected share & the locale seat. */
 export type PlanChipProps =
-  PropsRuntime<'conversation.input.plan'> & InjectFace<PlanChipInjected>
+  PropsRuntime<'conversation.input.plan'> & InjectFace<PlanChipInjected> & PropsLocale<'plan'>

 /**
 * Plan-mode status over the host-computed `plan` projection. The chip renders
 * only while the effective target is plan mode (`pending ? !active : active`
 * — a folded host value, not client optimism) and executes /plan off.
 */
-export function PlanChip({ useProjection, locked, exitPlanMode }: PlanChipProps) {
+export function PlanChip({ useProjection, locked, exitPlanMode, t }: PlanChipProps) {
  const plan = useProjection('plan')
  const [leaving, setLeaving] = useState(false)
  const [error, setError] = useState<string | null>(null)
@@ -34,6 +34,7 @@ export function PlanChip({ useProjection, locked, exitPlanMode }: PlanChipProps)
  if (!target) return null

  const off = (): void => {
+    // No leaving/locked guard: both disable the button, so no click arrives.
    setLeaving(true)
    setError(null)
    void exitPlanMode().then((failure) => {
@@ -52,17 +53,19 @@ export function PlanChip({ useProjection, locked, exitPlanMode }: PlanChipProps)
      <button
        type="button"
        className={css.chip}
-        aria-label="Plan mode on, press to turn off"
-        title="Plan mode on — click to turn off (/plan off)"
+        aria-label={t('chip.on.aria')}
+        title={t('chip.on.title')}
        disabled={locked || leaving}
        onClick={off}
      >
+        {/* Design literal, not copy: the chip wordmark stays 'Plan' in every locale. */}
        Plan
        <span className={css.close} aria-hidden>
          <IconCloseFill14 size={12} />
        </span>
      </button>
-      {error !== null && <span className={css.error} role="status" title={error}>退出 plan mode 失败</span>}
+      {/* Failure copy stays English (error-surface policy: not localized). */}
+      {error !== null && <span className={css.error} role="status" title={error}>failed to exit plan mode</span>}
    </span>
  )
 }
@@ -11,9 +11,24 @@ import type { ConnectionHandle } from '@deepseek-ai/dsh-client-connection/client
 import type { ClientContext, SessionId } from '@deepseek-ai/dsh-client-runtime/client'
 // Type-only: pulls the ui-conversation SlotMap merge (the input.plan seat).
 import type {} from '@deepseek-ai/dsh-client-ui-conversation/client'
+// Type-only: pulls the locale plugin's Context merge (ctx.locale).
+import type {} from '@deepseek-ai/dsh-client-locale/client'
 // Type-only: pulls the `plan` SessionProjectionMap merge for useProjection.
 import type {} from '@deepseek-ai/dsh-plan-mode/client'
 import { PlanChip } from './PlanModeControl.tsx'
+import { en, zh, type PlanKey } from './locales.ts'
+
+export type { PlanKey } from './locales.ts'
+
+declare module '@deepseek-ai/dsh-client-ui-slots' {
+  interface LocaleNamespaceMap {
+    /** The composer plan chip's copy. */
+    plan: PlanKey
+  }
+}
+
+/** Dictionary namespace owned by this plugin. */
+const NS = 'plan'

 /** Injected business face of the composer plan seat. */
 export interface PlanChipInjected {
@@ -25,24 +40,29 @@ export interface PlanChipInjected {
 }

 /**
- * Required services: the seat's slot registry, the transport, and the
- * conversation service whose presence guarantees the seat is declared.
+ * Required services: the seat's slot registry, the transport, the copy's
+ * locale registry, and the conversation service whose presence guarantees
+ * the seat is declared.
 */
-export const inject = ['slots', 'connection', 'conversation']
+export const inject = ['slots', 'connection', 'conversation', 'locale']

 /**
 * Client plugin body: register the plan chip over the command channel.
 * @param ctx - client root context.
 */
 export function apply(ctx: ClientContext): void {
+  ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'ui-plan: dictionaries')
+
  ctx.effect(() => ctx.slots.register({
    name: 'conversation.input.plan',
+    locale: NS,
    inject: (sessionId: SessionId): PlanChipInjected => ({
+      // Failure strings stay English (error-surface policy: not localized).
      exitPlanMode: async () => {
        const connection = ctx.get('connection') as ConnectionHandle
        const { result } = await connection.api.commands.execute({ sessionId, line: '/plan off' })
-        if (!result.ok) return `${result.error.message}（${result.error.code}）`
-        if (!result.value.matched) return '未知命令：/plan off'
+        if (!result.ok) return `${result.error.message} (${result.error.code})`
+        if (!result.value.matched) return 'unknown command: /plan off'
        return null
      },
    }),
@@ -0,0 +1,20 @@
+/** `plan` namespace dictionaries (the composer plan chip's copy). */
+
+/** Simplified Chinese dictionary (the key-set source of truth). */
+export const zh = {
+  'chip.on.aria': 'plan mode 已开启，按下关闭',
+  'chip.on.title': 'plan mode 已开启 — 点击关闭（/plan off）',
+  'chip.off.aria': 'plan mode 已关闭，按下开启',
+  'chip.off.title': 'plan mode 已关闭 — 点击开启（/plan）',
+} satisfies Record<string, string>
+
+/** The plan namespace key union. */
+export type PlanKey = keyof typeof zh
+
+/** English dictionary, checked complete against the zh key set. */
+export const en = {
+  'chip.on.aria': 'Plan mode on, press to turn off',
+  'chip.on.title': 'Plan mode on — click to turn off (/plan off)',
+  'chip.off.aria': 'Plan mode off, press to turn on',
+  'chip.off.title': 'Plan mode off — click to turn on (/plan)',
+} satisfies Record<PlanKey, string>
@@ -9,6 +9,7 @@ import { Context } from 'cordis'
 import { describe, expect, it, vi } from 'vitest'
 import { SlotsService } from '@deepseek-ai/dsh-client-runtime/client'
 import type { SessionId } from '@deepseek-ai/dsh-client-runtime/client'
+import { LocaleService } from '@deepseek-ai/dsh-client-locale/client'
 import { PlanChip } from '../src/client/PlanModeControl.tsx'
 import type { PlanChipInjected } from '../src/client/index.ts'
 import { apply, inject } from '../src/client/index.ts'
@@ -28,12 +29,13 @@ async function bench() {
    Promise.resolve({ result: { ok: true as const, value: { matched: true as const, commandId: 'c1' } } }))
  ctx.provide('connection', { api: { commands: { execute } } })
  ctx.provide('conversation', {})
+  ctx.provide('locale', new LocaleService(ctx))
  return { ctx, slots, execute }
 }

 describe('ui-plan browser apply', () => {
  it('declares every service it binds', () => {
-    expect(inject).toEqual(['slots', 'connection', 'conversation'])
+    expect(inject).toEqual(['slots', 'connection', 'conversation', 'locale'])
  })

  it('node-half apply is an intentional no-op', () => {
@@ -45,6 +47,7 @@ describe('ui-plan browser apply', () => {
    await ctx.plugin(SlotsService).await()
    ctx.provide('connection', {})
    ctx.provide('conversation', {})
+    ctx.provide('locale', new LocaleService(ctx))
    await expect(ctx.plugin({ inject: [...inject], apply }))
      .rejects.toThrow(/slot "conversation.input.plan" is not declared/)
  })
@@ -64,13 +67,13 @@ describe('ui-plan browser apply', () => {
    b.execute.mockResolvedValueOnce({
      result: { ok: false as const, error: { code: 'session-not-found', message: 'gone', details: {} } },
    } as never)
-    await expect(injected.exitPlanMode()).resolves.toBe('gone（session-not-found）')
+    await expect(injected.exitPlanMode()).resolves.toBe('gone (session-not-found)')

    // Unmatched admission (plan-mode not composed host-side) is also a failure line.
    b.execute.mockResolvedValueOnce({
      result: { ok: true as const, value: { matched: false as const } },
    } as never)
-    await expect(injected.exitPlanMode()).resolves.toBe('未知命令：/plan off')
+    await expect(injected.exitPlanMode()).resolves.toBe('unknown command: /plan off')

    await fiber.dispose()
    expect(b.slots.entries('conversation.input.plan')).toHaveLength(0)
@@ -11,9 +11,15 @@ import { createSnapshotStore } from '@deepseek-ai/dsh-client-runtime/client'
 import { bindSnapshotSelector } from '@deepseek-ai/dsh-client-web-react'
 import type { PlanProjection } from '@deepseek-ai/dsh-plan-mode/client'
 import { PlanChip, type PlanChipProps } from '../src/client/PlanModeControl.tsx'
+import { makeTranslate } from '@deepseek-ai/dsh-client-test-runtime'
+import { zh as commonZh } from '@deepseek-ai/dsh-client-locale/src/locales/zh.ts'
+import { zh } from '../src/client/locales.ts'

 afterEach(cleanup)

+// The framework-injected t seat, stubbed over the zh dictionaries (the default locale).
+const t: PlanChipProps['t'] = makeTranslate(zh, commonZh)
+
 function setup(
  plan: PlanProjection | undefined,
  exitPlanMode = vi.fn(() => Promise.resolve<string | null>(null)),
@@ -22,12 +28,12 @@ function setup(
  const store = createSnapshotStore<{ value: PlanProjection | undefined }>({ value: plan })
  const useProjection = (_key: string, selector?: (v: unknown) => unknown) =>
    bindSnapshotSelector(store)(s => (selector ?? (v => v))(s.value))
-  const props = { useProjection, locked, exitPlanMode } as unknown as PlanChipProps
+  const props = { useProjection, locked, exitPlanMode, t } as unknown as PlanChipProps
  const view = render(<PlanChip {...props} />)
  return { store, exitPlanMode, view }
 }

-const chip = () => screen.getByRole('button', { name: 'Plan mode on, press to turn off' })
+const chip = () => screen.getByRole('button', { name: 'plan mode 已开启，按下关闭' })

 describe('PlanChip', () => {
  it('renders nothing for an absent capability or a default-mode target', () => {
@@ -60,7 +66,7 @@ describe('PlanChip', () => {
    resolve(null)
    store.set({ value: { active: true, pending: true } })
    await waitFor(() => {
-      expect(screen.queryByRole('button', { name: 'Plan mode on, press to turn off' })).toBeNull()
+      expect(screen.queryByRole('button', { name: 'plan mode 已开启，按下关闭' })).toBeNull()
    })
  })

@@ -76,7 +82,7 @@ describe('PlanChip', () => {
      .mockRejectedValueOnce('socket closed')
    setup({ active: true, pending: false }, exitPlanMode)
    fireEvent.click(chip())
-    expect((await screen.findByText('退出 plan mode 失败')).getAttribute('title')).toBe('host said no')
+    expect((await screen.findByText('failed to exit plan mode')).getAttribute('title')).toBe('host said no')
    expect(chip()).toBeTruthy()

    fireEvent.click(chip())
@@ -17,6 +17,9 @@
    {
      "path": "../connection"
    },
+    {
+      "path": "../locale"
+    },
    {
      "path": "../ui-conversation"
    },