dsh-working-activity 0.2.6 → 0.3.0

package/lib/types/status.js

@@ -5,7 +5,8 @@
  * no timers, no cordis — deterministic given the event stream and a clock.
  * @module @deepseek-ai/dsh-working-activity/status
  */
-import { actionFor, fmtDuration, isGitTool, isNight, pickPhrase, thinkingPhrase, WAITING_PHRASES, DONE_PHRASES, FAIL_PHRASES, } from './phrases.js';
+import { actionFor, donePhrase, failPhrase, fmtDuration, isGitTool, isNight, thinkingPhrase, waitingPhrase, } from './phrases.js';
+import { t } from './lang.js';
 /** Format one tool into its display fragment (`跑个命令 npm test`). */
 function toolFragment(tool) {
     return tool.detail.length === 0 ? tool.action : `${tool.action} ${tool.detail}`;
@@ -94,7 +95,7 @@ export class ActivityTracker {
     /** Total tokens reported across the turn's assistant messages. */
     turnTokens = 0;
     /** Completion prefix drawn ONCE at turn end so the done line stays stable. */
-    donePrefix = '搞定 ✓';
+    donePrefix = t('done-prefix');
     /**
      * @param config - Behavioral knobs.
      * @param now - Wall-clock supplier (injectable for tests).
@@ -231,13 +232,15 @@ export class ActivityTracker {
                     this.thinkingMs += Math.max(0, at - this.thinkingStartedAt);
                 }
                 // Draw the completion prefix ONCE so repeated renders of the done line
-                // stay stable (a fresh random per render would make it flicker).
+                // stay stable (a fresh random per render would make it flicker). The
+                // pools are language-aware, so the line matches the language the turn
+                // ended in.
                 const lastTool = this.doneQueue.at(-1);
                 if (this.config.phrases) {
-                    this.donePrefix = lastTool?.failed ? pickPhrase(FAIL_PHRASES) : pickPhrase(DONE_PHRASES);
+                    this.donePrefix = lastTool?.failed ? failPhrase() : donePhrase();
                 }
                 else {
-                    this.donePrefix = '搞定 ✓';
+                    this.donePrefix = t('done-prefix');
                 }
                 this.setPhase('done', at);
                 return;
@@ -314,11 +317,12 @@ export class ActivityTracker {
             ? 0
             : this.thinkingMs + Math.max(0, nowMs - this.thinkingStartedAt);
         const elapsed = fmtDuration(this.turnElapsedMs(nowMs));
+        const elapsedLine = t('line-elapsed', { elapsed });
         const narration = this.freshNarration(nowMs);
         if (narration !== null) {
             return {
                 phase: this.phase,
-                line: `⏵ ${narration} · 总${elapsed}`,
+                line: `⏵ ${narration} · ${elapsedLine}`,
                 phrase: narration,
                 toolCount: this.toolCount,
                 turnElapsedMs: this.turnElapsedMs(nowMs),
@@ -328,28 +332,29 @@ export class ActivityTracker {
         if (this.config.phrases) {
             if (nowMs - this.phraseChangedAt >= PHRASE_ROTATE_MS) {
                 // Waiting (pre-first-token) draws from the waiting pool; thinking
-                // rotates the playful copy pool with night mixing.
+                // rotates the playful copy pool with night mixing. Both pools are
+                // language-aware, so a `/lang` switch shows on the next rotation.
                 this.previousPhrase = this.phase === 'waiting'
-                    ? pickPhrase(WAITING_PHRASES, this.previousPhrase)
+                    ? waitingPhrase(this.previousPhrase)
                     : thinkingPhrase(thinkingMs, this.previousPhrase, isNight(new Date(nowMs).getHours()));
                 this.phraseChangedAt = nowMs;
             }
             const phrase = this.previousPhrase ?? (this.phase === 'waiting'
-                ? pickPhrase(WAITING_PHRASES)
+                ? waitingPhrase()
                 : thinkingPhrase(thinkingMs, undefined, isNight(new Date(nowMs).getHours())));
             return {
                 phase: this.phase,
-                line: `${phrase} · 总${elapsed}`,
+                line: `${phrase} · ${elapsedLine}`,
                 phrase,
                 toolCount: this.toolCount,
                 turnElapsedMs: this.turnElapsedMs(nowMs),
                 phaseStartedAt: this.phaseStartedAt,
             };
         }
-        const label = this.phase === 'waiting' ? '等待模型响应' : '思考中';
+        const label = this.phase === 'waiting' ? t('waiting-label') : t('thinking-label');
         return {
             phase: this.phase,
-            line: `${label} · 总${elapsed}`,
+            line: `${label} · ${elapsedLine}`,
             label,
             toolCount: this.toolCount,
             turnElapsedMs: this.turnElapsedMs(nowMs),
@@ -359,16 +364,21 @@ export class ActivityTracker {
     doneSummary(nowMs) {
         const { thinkingMs, toolMs, toolCount } = this.stats();
         const tokens = this.turnTokens > 0 ? ` · 🔥 ${fmtTokens(this.turnTokens)}` : '';
-        const base = `${this.donePrefix} · ${toolCount} 工具 · 想${fmtDuration(thinkingMs)} 干${fmtDuration(toolMs)}${tokens}`;
+        const tools = t(toolCount === 1 ? 'tool-count-one' : 'tool-count-many', { count: toolCount });
+        const summary = t('done-summary', {
+            tools,
+            thinking: fmtDuration(thinkingMs),
+            tooling: fmtDuration(toolMs),
+        });
         if (!this.config.phrases) {
-            return { line: `搞定 ✓ · ${toolCount} 工具 · 想${fmtDuration(thinkingMs)} 干${fmtDuration(toolMs)}${tokens}` };
+            return { line: `${t('done-prefix')} · ${summary}${tokens}` };
         }
         const last = this.doneQueue.at(-1);
         if (last !== undefined && nowMs - last.endedAt < DONE_FRAGMENT_MS) {
             const fragment = toolFragment(last);
-            return { line: `${this.donePrefix} · ${fragment} · ${toolCount} 工具${tokens}`, phrase: this.donePrefix };
+            return { line: `${this.donePrefix} · ${fragment} · ${tools}${tokens}`, phrase: this.donePrefix };
         }
-        return { line: base, ...(this.donePrefix === '搞定 ✓' ? {} : { phrase: this.donePrefix }) };
+        return { line: `${this.donePrefix} · ${summary}${tokens}`, phrase: this.donePrefix };
     }
     /** The fresh self-narration line, or null once the stream has been quiet. */
     freshNarration(nowMs) {

package/package.json

@@ -1,117 +1,119 @@
-{
-  "name": "dsh-working-activity",
-  "description": "Live model working-status line: playful copy, running tool, turn elapsed — for TUI prompt and Web UI",
-  "version": "0.2.6",
-  "type": "module",
-  "main": "lib/types/index.js",
-  "types": "lib/types/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./lib/types/index.d.ts",
-      "default": "./lib/types/index.js"
-    },
-    "./client": {
-      "types": "./lib/types/client/index.d.ts",
-      "default": "./lib/client.js"
-    },
-    "./events": {
-      "types": "./lib/types/events.d.ts",
-      "default": "./lib/types/events.js"
-    },
-    "./invariant": {
-      "types": "./lib/types/invariant.d.ts",
-      "default": "./lib/types/invariant.js"
-    },
-    "./status": {
-      "types": "./lib/types/status.d.ts",
-      "default": "./lib/types/status.js"
-    },
-    "./cordis.patch.yml": "./cordis.patch.yml",
-    "./src/*": "./src/*",
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib",
-    "src",
-    "cordis.patch.yml"
-  ],
-  "engines": {
-    "node": "^22.19 || >=24"
-  },
-  "scripts": {
-    "build": "tsc -p tsconfig.json && tsc -p tsconfig.client.json",
-    "build:client": "tsdown -c tsdown.config.ts",
-    "verify:deps": "node scripts/verify-manifest-deps.mjs",
-    "verify:lockfiles": "node scripts/verify-lockfiles.mjs",
-    "prepublishOnly": "npm run verify:deps && npm run verify:lockfiles && npm run build && npm run build:client"
-  },
-  "license": "BSD-3-Clause",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ccch1mneyyy/working-activity.git"
-  },
-  "bugs": {
-    "url": "https://github.com/ccch1mneyyy/working-activity/issues"
-  },
-  "homepage": "https://github.com/ccch1mneyyy/working-activity#readme",
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-ui-conversation",
-        "@deepseek-ai/dsh-client-ui-slots"
-      ]
-    }
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-invariants": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-session": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.6",
-    "@deepseek-ai/schemastery": "^3.18.1",
-    "react": "^18.2.0"
-  },
-  "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-agent-loop": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-agent-loop-testkit": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-invariants": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-session": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
-    "@deepseek-ai/schemastery": "^3.18.1",
-    "@types/node": "^22.0.0",
-    "@types/react": "~18.3.1",
-    "lightningcss": "^1.32.0",
-    "react": "^18.2.0",
-    "tsdown": "^0.22.2",
-    "typescript": "^6.0.3"
-  },
-  "peerDependenciesMeta": {
-    "@deepseek-ai/dsh-client-runtime": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-client-ui-conversation": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-client-ui-slots": {
-      "optional": true
-    },
-    "react": {
-      "optional": true
-    }
-  }
-}
+{
+  "name": "dsh-working-activity",
+  "description": "Live model working-status line: playful copy, running tool, turn elapsed — for TUI prompt and Web UI",
+  "version": "0.3.0",
+  "type": "module",
+  "main": "lib/types/index.js",
+  "types": "lib/types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/types/index.d.ts",
+      "default": "./lib/types/index.js"
+    },
+    "./client": {
+      "types": "./lib/types/client/index.d.ts",
+      "default": "./lib/client.js"
+    },
+    "./events": {
+      "types": "./lib/types/events.d.ts",
+      "default": "./lib/types/events.js"
+    },
+    "./invariant": {
+      "types": "./lib/types/invariant.d.ts",
+      "default": "./lib/types/invariant.js"
+    },
+    "./status": {
+      "types": "./lib/types/status.d.ts",
+      "default": "./lib/types/status.js"
+    },
+    "./cordis.patch.yml": "./cordis.patch.yml",
+    "./src/*": "./src/*",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "src",
+    "cordis.patch.yml"
+  ],
+  "engines": {
+    "node": "^22.19 || >=24"
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.json && tsc -p tsconfig.client.json",
+    "build:client": "tsdown -c tsdown.config.ts",
+    "test": "vitest run",
+    "verify:deps": "node scripts/verify-manifest-deps.mjs",
+    "verify:lockfiles": "node scripts/verify-lockfiles.mjs",
+    "prepublishOnly": "npm run verify:deps && npm run verify:lockfiles && npm run build && npm run build:client"
+  },
+  "license": "BSD-3-Clause",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ccch1mneyyy/working-activity.git"
+  },
+  "bugs": {
+    "url": "https://github.com/ccch1mneyyy/working-activity/issues"
+  },
+  "homepage": "https://github.com/ccch1mneyyy/working-activity#readme",
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-conversation",
+        "@deepseek-ai/dsh-client-ui-slots"
+      ]
+    }
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-invariants": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-session": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.6",
+    "@deepseek-ai/schemastery": "^3.18.1",
+    "react": "^18.2.0"
+  },
+  "devDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-agent": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-agent-loop": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-agent-loop-testkit": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-invariants": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-session": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
+    "@deepseek-ai/schemastery": "^3.18.1",
+    "@types/node": "^22.0.0",
+    "@types/react": "~18.3.1",
+    "lightningcss": "^1.32.0",
+    "react": "^18.2.0",
+    "tsdown": "^0.22.2",
+    "typescript": "^6.0.3",
+    "vitest": "^3.2.4"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-client-runtime": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-conversation": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-slots": {
+      "optional": true
+    },
+    "react": {
+      "optional": true
+    }
+  }
+}

package/src/client/WorkingLine.module.css

@@ -1,74 +1,74 @@
-/* Working line row: one dim line with a phase-colored breathing marker and
-   the turn's tool-count badge, sized to the composer dock inset like the
-   queue strip. Mirrors the pre-slots patch's WorkingLine visuals, re-targeted
-   at the rc.6 design tokens. */
-
-.line {
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  width: 100%;
-  max-width: var(--dsh-composer-card-max-width);
-  margin: 0 auto;
-  padding: 4px 16px 0;
-  font-family: var(--dsw-font-family);
-  font-size: 13px;
-  line-height: 18px;
-  color: var(--dsw-alias-label-secondary);
-}
-
-.marker {
-  flex: none;
-  width: 7px;
-  height: 7px;
-  border-radius: 50%;
-  background: var(--dsw-alias-label-tertiary);
-  animation: working-pulse 1.6s ease-in-out infinite;
-}
-
-/* The model's turn is done: steady marker in the brand tone, no pulse. */
-.line[data-activity-phase='done'] .marker {
-  background: var(--dsw-alias-state-business-primary);
-  animation: none;
-}
-
-/* A tool is actually executing: brand-tone pulse. */
-.line[data-activity-phase='tool'] .marker {
-  background: var(--dsw-alias-state-business-primary);
-}
-
-/* Waiting for the first token: muted pulse. */
-.line[data-activity-phase='waiting'] .marker {
-  background: var(--dsw-alias-label-tertiary);
-  opacity: 0.6;
-}
-
-.text {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.tools {
-  flex: none;
-  min-width: 18px;
-  padding: 0 5px;
-  border-radius: 9px;
-  background: var(--dsw-alias-surface-tertiary);
-  color: var(--dsw-alias-label-secondary);
-  font-size: 11px;
-  line-height: 18px;
-  text-align: center;
-}
-
-@keyframes working-pulse {
-  0%,
-  100% {
-    opacity: 1;
-  }
-
-  50% {
-    opacity: 0.35;
-  }
-}
+/* Working line row: one dim line with a phase-colored breathing marker and
+   the turn's tool-count badge, sized to the composer dock inset like the
+   queue strip. Mirrors the pre-slots patch's WorkingLine visuals, re-targeted
+   at the rc.6 design tokens. */
+
+.line {
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  max-width: var(--dsh-composer-card-max-width);
+  margin: 0 auto;
+  padding: 4px 16px 0;
+  font-family: var(--dsw-font-family);
+  font-size: 13px;
+  line-height: 18px;
+  color: var(--dsw-alias-label-secondary);
+}
+
+.marker {
+  flex: none;
+  width: 7px;
+  height: 7px;
+  border-radius: 50%;
+  background: var(--dsw-alias-label-tertiary);
+  animation: working-pulse 1.6s ease-in-out infinite;
+}
+
+/* The model's turn is done: steady marker in the brand tone, no pulse. */
+.line[data-activity-phase='done'] .marker {
+  background: var(--dsw-alias-state-business-primary);
+  animation: none;
+}
+
+/* A tool is actually executing: brand-tone pulse. */
+.line[data-activity-phase='tool'] .marker {
+  background: var(--dsw-alias-state-business-primary);
+}
+
+/* Waiting for the first token: muted pulse. */
+.line[data-activity-phase='waiting'] .marker {
+  background: var(--dsw-alias-label-tertiary);
+  opacity: 0.6;
+}
+
+.text {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.tools {
+  flex: none;
+  min-width: 18px;
+  padding: 0 5px;
+  border-radius: 9px;
+  background: var(--dsw-alias-surface-tertiary);
+  color: var(--dsw-alias-label-secondary);
+  font-size: 11px;
+  line-height: 18px;
+  text-align: center;
+}
+
+@keyframes working-pulse {
+  0%,
+  100% {
+    opacity: 1;
+  }
+
+  50% {
+    opacity: 0.35;
+  }
+}

package/src/client/WorkingLine.tsx

@@ -1,42 +1,42 @@
-// Working-line dock entry: one dim full-width row above the composer card
-// showing the live working-activity snapshot — phase-colored breathing
-// marker, the host-composed status line, and the turn's tool count badge.
-// Renders for every live phase (waiting/thinking/tool) and the done summary;
-// hides while idle or before the first publish.
-//
-// The 'conversation.input.dock' SlotMap declaration lives in
-// @deepseek-ai/dsh-client-ui-conversation/client (contract/slots.ts); this
-// entry contributes into it without owning it.
-import type { PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
-import css from './WorkingLine.module.css'
-
-/** Full props of the dock entry: the input-zone runtime share (session standard kit). */
-export type WorkingLineProps = PropsRuntime<'conversation.input.dock'>
-
-/** Tool-count badge copy (no locale seat: the line text itself is host-composed). */
-const TOOLS_LABEL = 'tools this turn'
-
-/**
- * Working-line dock entry: reads the latest activity snapshot off the
- * conversation snapshot and renders the row, or nothing when idle/absent.
- */
-export function WorkingLine({ useSession }: WorkingLineProps) {
-  // Defensive read: the runtime patch that puts `activity` onto the
-  // conversation snapshot ships separately — on an unpatched host the field
-  // is absent (undefined), not null, and this component must render nothing
-  // instead of crashing into the slot error boundary. Same never-throw
-  // discipline as the node side's registration.js.
-  const activity = useSession(s => s.activity ?? null)
-  if (activity === null || activity.phase === 'idle' || activity.line === '') return null
-  return (
-    <div className={css.line} data-activity-phase={activity.phase}>
-      <span className={css.marker} aria-hidden="true" />
-      <span className={css.text}>{activity.line}</span>
-      {activity.toolCount > 0 && (
-        <span className={css.tools} title={`${activity.toolCount} ${TOOLS_LABEL}`}>
-          {activity.toolCount}
-        </span>
-      )}
-    </div>
-  )
-}
+// Working-line dock entry: one dim full-width row above the composer card
+// showing the live working-activity snapshot — phase-colored breathing
+// marker, the host-composed status line, and the turn's tool count badge.
+// Renders for every live phase (waiting/thinking/tool) and the done summary;
+// hides while idle or before the first publish.
+//
+// The 'conversation.input.dock' SlotMap declaration lives in
+// @deepseek-ai/dsh-client-ui-conversation/client (contract/slots.ts); this
+// entry contributes into it without owning it.
+import type { PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
+import css from './WorkingLine.module.css'
+
+/** Full props of the dock entry: the input-zone runtime share (session standard kit). */
+export type WorkingLineProps = PropsRuntime<'conversation.input.dock'>
+
+/** Tool-count badge copy (no locale seat: the line text itself is host-composed). */
+const TOOLS_LABEL = 'tools this turn'
+
+/**
+ * Working-line dock entry: reads the latest activity snapshot off the
+ * conversation snapshot and renders the row, or nothing when idle/absent.
+ */
+export function WorkingLine({ useSession }: WorkingLineProps) {
+  // Defensive read: the runtime patch that puts `activity` onto the
+  // conversation snapshot ships separately — on an unpatched host the field
+  // is absent (undefined), not null, and this component must render nothing
+  // instead of crashing into the slot error boundary. Same never-throw
+  // discipline as the node side's registration.js.
+  const activity = useSession(s => s.activity ?? null)
+  if (activity === null || activity.phase === 'idle' || activity.line === '') return null
+  return (
+    <div className={css.line} data-activity-phase={activity.phase}>
+      <span className={css.marker} aria-hidden="true" />
+      <span className={css.text}>{activity.line}</span>
+      {activity.toolCount > 0 && (
+        <span className={css.tools} title={`${activity.toolCount} ${TOOLS_LABEL}`}>
+          {activity.toolCount}
+        </span>
+      )}
+    </div>
+  )
+}