dsh-working-activity 0.3.0 → 0.3.2

package/src/config.ts

@@ -0,0 +1,174 @@
+/**
+ * Working-activity user configuration, mirroring the pi extension's
+ * `~/.pi/agent/working-activity.json` shape: the UI owns the file (dsh-tui
+ * persists `frames` at `~/.dsh-tui/working-activity.json`) and consumers use
+ * the pure parser here to honor `mode` / `features` / `customPhrases` /
+ * `customActions` without duplicating validation. No I/O — filesystem
+ * ownership stays with the host.
+ * @module @deepseek-ai/dsh-working-activity/config
+ */
+
+import { DEFAULT_PRESET, isPresetName } from './frames.js'
+
+/** Feature flags that can be switched independently (pi extension parity). */
+export const FEATURE_FLAGS = [
+  'phrases',          // 俏皮文案池（思考/等待/收尾/工具动词）
+  'rareEggs',         // 稀有彩虹彩蛋
+  'nightPhrases',     // 深夜文案
+  'weekend',          // 周末问候
+  'holidays',         // 节假日彩蛋
+  'combo',            // 连击火力全开
+  'failPhrases',      // 失败文案池
+  'modelQuips',       // 模型切换梗
+  'shimmer',          // 文案星辉扫过/彩虹流光
+  'continuePhrases',  // 打断后接梗
+  'cost',             // 成本与 token 核算（结束时展示）
+] as const
+
+/** Feature-flag name type. */
+export type FeatureFlag = (typeof FEATURE_FLAGS)[number]
+
+/** Chinese labels for the settings panel / docs. */
+export const FEATURE_LABELS: Record<FeatureFlag, string> = {
+  phrases: '俏皮文案',
+  rareEggs: '稀有彩蛋',
+  nightPhrases: '深夜文案',
+  weekend: '周末问候',
+  holidays: '节假日彩蛋',
+  combo: '工具连击',
+  failPhrases: '失败文案',
+  modelQuips: '模型切换梗',
+  shimmer: '星辉效果',
+  continuePhrases: '打断接梗',
+  cost: '成本与 token',
+}
+
+/** The file-based config, same keys as the pi extension. */
+export type WorkingActivityConfig = {
+  /** Frame preset name (`random` picks one per process). */
+  frames?: string
+  /** Extra thinking phrases appended to the base pool. */
+  customPhrases?: readonly string[]
+  /** Exact tool-name → action-copy pools (case-insensitive match). */
+  customActions?: Readonly<Record<string, readonly string[]>>
+  /** Inject the `⏵` self-narration contract into the system prompt. */
+  narrate?: boolean
+  /** Debug logging to `working-activity-debug.log`. */
+  debugLog?: boolean
+  /** Context usage warning threshold in percent. */
+  contextWarnAt?: number
+  /** Context usage danger threshold in percent. */
+  contextDangerAt?: number
+  /** Show estimated output tokens per second. */
+  showTokPerSec?: boolean
+  /** Hourly work-reminder threshold (0–24, 0 = off). */
+  workRemindAt?: number
+  /** lively: full flourish (default) / minimal: functional labels only. */
+  mode?: 'lively' | 'minimal'
+  /** Per-feature switches; explicit values override `mode` defaults. */
+  features?: Readonly<Record<string, boolean>>
+}
+
+/** The defaults when nothing is configured. */
+export const DEFAULT_ACTIVITY_CONFIG: WorkingActivityConfig = {
+  frames: DEFAULT_PRESET,
+  narrate: true,
+}
+
+/** Result of parsing a config file. */
+export type ConfigReadResult = {
+  readonly config: WorkingActivityConfig
+  /** Raw parsed object, preserving unknown keys for lossless write-back. */
+  readonly raw: Record<string, unknown>
+  /** Parse error message, when the text was not a valid config object. */
+  readonly error?: string
+}
+
+function errorText(error: unknown): string {
+  return error instanceof Error ? error.message : String(error)
+}
+
+/** Clamp `dangerAt` to be at least `warnAt` (percent thresholds). */
+export function normalizeThresholds(cfg: WorkingActivityConfig): WorkingActivityConfig {
+  const warnAt = cfg.contextWarnAt ?? 80
+  const dangerAt = cfg.contextDangerAt ?? 95
+  return dangerAt < warnAt ? { ...cfg, contextDangerAt: warnAt } : cfg
+}
+
+/**
+ * Parse a `working-activity.json` text into a validated config. Unknown keys
+ * are preserved in `raw` (for lossless write-back); invalid values are
+ * dropped. A non-object root yields the defaults plus an `error`.
+ * @param text - Raw file contents.
+ * @returns Validated config + raw object (+ optional error).
+ */
+export function parseWorkingActivityConfig(text: string): ConfigReadResult {
+  let parsed: unknown
+  try {
+    parsed = JSON.parse(text)
+  } catch (error) {
+    return { config: { ...DEFAULT_ACTIVITY_CONFIG }, raw: {}, error: errorText(error) }
+  }
+  if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    return {
+      config: { ...DEFAULT_ACTIVITY_CONFIG },
+      raw: {},
+      error: '配置根节点必须是 JSON 对象',
+    }
+  }
+  const raw = parsed as Record<string, unknown>
+  const config: WorkingActivityConfig = { ...DEFAULT_ACTIVITY_CONFIG }
+  if (typeof raw.frames === 'string' && isPresetName(raw.frames)) config.frames = raw.frames
+  if (Array.isArray(raw.customPhrases)) {
+    const phrases = raw.customPhrases.filter((s): s is string => typeof s === 'string' && s.trim().length > 0)
+    if (phrases.length > 0) config.customPhrases = phrases
+  }
+  if (raw.customActions !== null && typeof raw.customActions === 'object' && !Array.isArray(raw.customActions)) {
+    const customActions: Record<string, string[]> = {}
+    for (const [key, value] of Object.entries(raw.customActions)) {
+      const actions = Array.isArray(value)
+        ? value.filter((entry): entry is string => typeof entry === 'string' && entry.trim().length > 0)
+          .map((entry) => entry.trim())
+        : []
+      if (key.trim().length > 0 && actions.length > 0) customActions[key.trim()] = actions
+    }
+    if (Object.keys(customActions).length > 0) config.customActions = customActions
+  }
+  if (typeof raw.narrate === 'boolean') config.narrate = raw.narrate
+  if (typeof raw.debugLog === 'boolean') config.debugLog = raw.debugLog
+  if (typeof raw.contextWarnAt === 'number' && Number.isFinite(raw.contextWarnAt)
+    && raw.contextWarnAt >= 0 && raw.contextWarnAt <= 100) {
+    config.contextWarnAt = raw.contextWarnAt
+  }
+  if (typeof raw.contextDangerAt === 'number' && Number.isFinite(raw.contextDangerAt)
+    && raw.contextDangerAt >= 0 && raw.contextDangerAt <= 100) {
+    config.contextDangerAt = raw.contextDangerAt
+  }
+  if (typeof raw.showTokPerSec === 'boolean') config.showTokPerSec = raw.showTokPerSec
+  if (typeof raw.workRemindAt === 'number' && Number.isFinite(raw.workRemindAt)
+    && raw.workRemindAt >= 0 && raw.workRemindAt <= 24) {
+    config.workRemindAt = raw.workRemindAt
+  }
+  if (raw.mode === 'lively' || raw.mode === 'minimal') config.mode = raw.mode
+  if (raw.features !== null && typeof raw.features === 'object' && !Array.isArray(raw.features)) {
+    const features: Record<string, boolean> = {}
+    for (const [key, value] of Object.entries(raw.features)) {
+      if (typeof value === 'boolean') features[key] = value
+    }
+    if (Object.keys(features).length > 0) config.features = features
+  }
+  return { config: normalizeThresholds(config), raw }
+}
+
+/**
+ * Whether a feature is on. Explicit `features` entries win; otherwise
+ * `minimal` mode turns everything off (except `cost`, always on).
+ * @param config - Parsed config.
+ * @param name - Feature flag name.
+ */
+export function featureOn(config: WorkingActivityConfig, name: FeatureFlag): boolean {
+  const explicit = config.features?.[name]
+  if (typeof explicit === 'boolean') return explicit
+  if (name === 'cost') return true
+  return config.mode !== 'minimal'
+}

package/src/frames.ts

@@ -0,0 +1,138 @@
+/**
+ * Working-activity indicator frame presets — the single home for every
+ * spinner animation, ported from the pi working-activity extension
+ * (`FRAME_PRESETS`) plus the dsh-tui additions (moon8 / rainbow / whale
+ * family / clock / traffic lights). Consumers (TUI row, Web slot) render the
+ * current frame next to the live working line; the preset name is chosen by
+ * the UI and persisted in `working-activity.json` (`frames` key).
+ *
+ * `\uFE0E` forces text rendering so Windows never paints the glyphs as color
+ * emoji (the green-block problem); emoji presets (moon8, clock, whales)
+ * deliberately omit it to keep colorful rendering on modern terminals.
+ * @module @deepseek-ai/dsh-working-activity/frames
+ */
+
+/** Text-variant selector: keep symbols monochrome on Windows. */
+const TE = '\uFE0E'
+
+/** One working-activity preset: the frame sequence and the per-frame interval. */
+export interface FramePreset {
+  readonly frames: readonly string[]
+  readonly intervalMs: number
+}
+
+/** Named working-activity frame presets, keyed by preset name (`claude`, `moon`, `sand`, ...). */
+export const FRAME_PRESETS: Record<string, FramePreset> = {
+  // Claude Code's real sequence: · ✢ * ✶ ✻ ✽ forward + backward.
+  claude: {
+    frames: ['·', `✢${TE}`, '*', `✶${TE}`, `✻${TE}`, `✽${TE}`, `✻${TE}`, `✶${TE}`, '*', `✢${TE}`],
+    intervalMs: 150,
+  },
+  star2: { frames: [`✶${TE}`, `✸${TE}`, `✹${TE}`, `✺${TE}`, `✹${TE}`, `✷${TE}`], intervalMs: 140 },
+  sand: {
+    frames: ['⠁', '⠂', '⠄', '⡀', '⡈', '⡐', '⡠', '⣀', '⣁', '⣂', '⣄', '⣌', '⣔', '⣤', '⣥', '⣦', '⣮', '⣶', '⣷', '⣿', '⡿', '⠿', '⢟', '⠟', '⡛', '⠛', '⠫', '⢋', '⠋', '⠍', '⡉', '⠉', '⠑', '⠡', '⢁'],
+    intervalMs: 120,
+  },
+  triangle: { frames: ['◢', '◣', '◤', '◥'], intervalMs: 180 },
+  box: { frames: ['▖', '▘', '▝', '▗'], intervalMs: 180 },
+  box2: { frames: ['▌', '▀', '▐', '▄'], intervalMs: 180 },
+  corners: { frames: ['◰', '◳', '◲', '◱'], intervalMs: 190 },
+  point: { frames: ['∙∙∙', '●∙∙', '∙●∙', '∙∙●', '∙∙∙'], intervalMs: 190 },
+  layer: { frames: ['-', '=', '≡'], intervalMs: 220 },
+  flip: { frames: ['_', '_', '_', '-', '`', '`', "'", '´', '-', '_', '_', '_'], intervalMs: 140 },
+  aesthetic: {
+    frames: ['▰▱▱▱▱▱▱', '▰▰▱▱▱▱▱', '▰▰▰▱▱▱▱', '▰▰▰▰▱▱▱', '▰▰▰▰▰▱▱', '▰▰▰▰▰▰▱', '▰▰▰▰▰▰▰', '▰▱▱▱▱▱▱'],
+    intervalMs: 140,
+  },
+  hamburger: { frames: ['☱', '☲', '☴'], intervalMs: 220 },
+  moon: { frames: ['◐', '◓', '◑', '◒'], intervalMs: 240 },
+  // kimi-code MoonLoader 同款：8 帧 emoji 月相，120ms 一帧，比半圆版更丝滑。
+  // 不带 \uFE0E：保留彩色 emoji 渲染（Windows Terminal 等现代终端效果最佳）。
+  moon8: { frames: ['🌑', '🌒', '🌓', '🌔', '🌕', '🌖', '🌗', '🌘'], intervalMs: 120 },
+  // 鲸鱼喷水：🐳 固定，水柱升起（· → | → ║）再回落，顶珠 ° 模拟水花（对齐 pi 版）。
+  'whale-spout': {
+    frames: ['🐳  ', '🐳° ', '🐳|°', '🐳║°', '🐳|°', '🐳° ', '🐳  '],
+    intervalMs: 160,
+  },
+  // 鲸鱼转圈：🐳 + 环绕方向指示（逆时针转圈语义，对齐 pi 版）。
+  'whale-spin': {
+    frames: ['🐳→', '🐳↘', '🐳↓', '🐳↙', '🐳←', '🐳↖', '🐳↑', '🐳↗'],
+    intervalMs: 150,
+  },
+  // 鲸鱼吐泡泡：🐳 固定，泡泡从头顶冒出（大泡 ○ 先行、小泡 ∘ 跟上）向右飘走。
+  'whale-bubbles': {
+    frames: ['🐳  ', '🐳○ ', '🐳 ○', '🐳  ', '🐳∘ ', '🐳 ∘', '🐳  '],
+    intervalMs: 170,
+  },
+  // 时钟：12 个整点表盘循环（🕛 → 🕚），emoji 彩色渲染（同 moon8，不带 \uFE0E）。
+  clock: {
+    frames: ['🕛', '🕐', '🕑', '🕒', '🕓', '🕔', '🕕', '🕖', '🕗', '🕘', '🕙', '🕚'],
+    intervalMs: 300,
+  },
+  // 红绿灯：🔴 → 🟡 → 🟢 循环，一轮 1.2s，节奏从容。
+  traffic_lights: {
+    frames: ['🔴', '🟡', '🟢'],
+    intervalMs: 400,
+  },
+  comet: {
+    frames: ['●    ', ' ●   ', '  ●  ', '   ● ', '    ●', '   ● ', '  ●  ', ' ●   '],
+    intervalMs: 160,
+  },
+  breathe: { frames: ['▁', '▃', '▅', '▇', '▅', '▃'], intervalMs: 210 },
+  dots: { frames: ['⣾', '⣷', '⣯', '⣟', '⡿', '⢿', '⣻', '⣽'], intervalMs: 140 },
+  arrow: { frames: ['←', '↖', '↑', '↗', '→', '↘', '↓', '↙'], intervalMs: 160 },
+  spark: { frames: ['·', '∘', '°', '✧', '°', '∘'], intervalMs: 240 },
+  bar: { frames: ['▏', '▎', '▍', '▌', '▋', '▊', '▉', '█', '▉', '▊', '▋', '▌', '▍', '▎'], intervalMs: 120 },
+  braille: { frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'], intervalMs: 120 },
+  arc: { frames: ['◜', '◠', '◝', '◞', '◡', '◟'], intervalMs: 160 },
+  circle: { frames: ['◴', '◷', '◶', '◵'], intervalMs: 190 },
+  grow: { frames: ['.', 'o', 'O', '0', 'O', 'o'], intervalMs: 210 },
+  noise: { frames: ['▓', '▒', '░', '▒'], intervalMs: 160 },
+  bounce: { frames: ['⠁', '⠂', '⠄', '⡀', '⢀', '⠠', '⠐', '⠈'], intervalMs: 140 },
+  rainbow: {
+    frames: ['▁', '▂', '▃', '▄', '▅', '▆', '▇', '█', '▇', '▆', '▅', '▄', '▃', '▂'],
+    intervalMs: 120,
+  },
+  // 双端进度条往返（pi 版独有，补全并集）。
+  bar2: {
+    frames: [
+      '[    ]', '[=   ]', '[==  ]', '[=== ]', '[ ===]',
+      '[  ==]', '[   =]', '[    ]', '[   =]', '[  ==]',
+      '[ ===]', '[=== ]', '[==  ]', '[=   ]',
+    ],
+    intervalMs: 140,
+  },
+  dqpb: { frames: ['d', 'q', 'p', 'b'], intervalMs: 210 },
+  toggle: { frames: ['⊶', '⊷'], intervalMs: 300 },
+}
+
+/** The default preset (moon8: the smoothest of the emoji moons). */
+export const DEFAULT_PRESET = 'moon8'
+
+/** Every selectable preset name, `random` first (the pi selector order). */
+export const PRESET_NAMES: readonly string[] = ['random', ...Object.keys(FRAME_PRESETS)]
+
+/**
+ * Whether `name` selects a known preset or `random`.
+ * @param name - Candidate preset name.
+ * @returns True when the name resolves to a preset.
+ */
+export function isPresetName(name: string): boolean {
+  return name === 'random' || Object.hasOwn(FRAME_PRESETS, name)
+}
+
+/**
+ * Resolve a preset name (`random` picks one per process).
+ * @param name - Preset name, or undefined for the default.
+ * @returns The matching preset; unknown or absent names fall back to the default.
+ */
+export function resolvePreset(name: string | undefined): FramePreset {
+  if (name === 'random') {
+    const names = Object.keys(FRAME_PRESETS)
+    // FRAME_PRESETS is non-empty by construction, so any random index is in
+    // range and the lookup always lands on a preset.
+    const pick = names[Math.floor(Math.random() * names.length)]
+    return FRAME_PRESETS[pick]
+  }
+  return FRAME_PRESETS[name ?? ''] ?? FRAME_PRESETS[DEFAULT_PRESET]
+}

package/src/index.ts

@@ -25,6 +25,7 @@ import type {} from '@deepseek-ai/dsh-system-prompt'
 import { ActivityTracker } from './status.js'
 import { registerActivityEventType } from './registration.js'
 import { setLangOverride, t } from './lang.js'
+import { DEFAULT_PRESET } from './frames.js'
 import type { ActivityState } from './status.js'
 import type { ActivityStatusEvent } from './events.js'
 // Re-export the event type + SessionEventMap merge: the package root must carry
@@ -58,6 +59,19 @@ export type Config = {
   /** UI language: `auto` follows `DSH_TUI_LANG` → `~/.dsh-tui/lang.json` →
    *  OS locale → zh; `zh`/`en` pin the copy directly. */
   lang?: 'auto' | 'zh' | 'en'
+  /** Default frame preset name (informational for UI consumers; the TUI
+   *  resolves the persisted `frames` choice itself). */
+  frames?: string
+  /** lively: full flourish (default) / minimal: functional labels only. */
+  mode?: 'lively' | 'minimal'
+  /** Per-feature switches; explicit values override `mode` defaults. */
+  features?: Record<string, boolean>
+  /** Extra thinking phrases appended to the base pool. */
+  customPhrases?: string[]
+  /** Show an estimated tokens/s prefix while streaming. */
+  showTokPerSec?: boolean
+  /** Work reminder after this many turn-hours (0 = off). */
+  workRemindAt?: number
 }
 
 // Explicit annotation: the inferred z.dict output references cosmokit's
@@ -73,6 +87,12 @@ export const Config: Schemastery<Config> = z.object({
   customActions: z.dict(z.array(z.string())).default({}),
   narrate: z.boolean().default(true),
   lang: z.union(['auto', 'zh', 'en']).default('auto'),
+  frames: z.string().default(DEFAULT_PRESET),
+  mode: z.union(['lively', 'minimal']).default('lively'),
+  features: z.dict(z.boolean()).default({}),
+  customPhrases: z.array(z.string()).default([]),
+  showTokPerSec: z.boolean().default(false),
+  workRemindAt: z.number().min(0).max(24).default(0),
 })
 
 /** Structural view of the TUI prompt service; the real type lives in dsh-tui. */
@@ -93,6 +113,12 @@ interface ResolvedConfig {
   customActions: Record<string, string[]>
   narrate: boolean
   lang: 'auto' | 'zh' | 'en'
+  frames: string
+  mode: 'lively' | 'minimal'
+  features: Record<string, boolean>
+  customPhrases: string[]
+  showTokPerSec: boolean
+  workRemindAt: number
 }
 
 /**
@@ -108,7 +134,8 @@ export function apply(ctx: Context, config: Config = {}): void {
   // in processes where publishing itself is off. See registration.ts.
   registerActivityEventType()
   const resolved: ResolvedConfig = {
-    phrases: config.phrases ?? true,
+    // `mode: minimal` renders functional labels only (pi extension parity).
+    phrases: config.phrases ?? config.mode !== 'minimal',
     publish: config.publish ?? false,
     tickMs: config.tickMs ?? 500,
     publishIntervalMs: config.publishIntervalMs ?? 2000,
@@ -116,6 +143,12 @@ export function apply(ctx: Context, config: Config = {}): void {
     narrate: config.narrate ?? true,
     lang: config.lang ?? 'auto',
     customActions: config.customActions ?? {},
+    frames: config.frames ?? DEFAULT_PRESET,
+    mode: config.mode ?? 'lively',
+    features: config.features ?? {},
+    customPhrases: config.customPhrases ?? [],
+    showTokPerSec: config.showTokPerSec ?? false,
+    workRemindAt: config.workRemindAt ?? 0,
   }
   // A pinned plugin-level language beats the env/file chain; releasing it on
   // dispose restores `auto` for any other composition in the process.
@@ -151,7 +184,15 @@ export function apply(ctx: Context, config: Config = {}): void {
     let tracker = trackers.get(session)
     if (tracker === undefined) {
       tracker = new ActivityTracker(
-        { phrases: resolved.phrases, detailLimit: resolved.detailLimit, showIdle: false },
+        {
+          phrases: resolved.phrases,
+          detailLimit: resolved.detailLimit,
+          showIdle: false,
+          features: resolved.features,
+          customPhrases: resolved.customPhrases,
+          showTokPerSec: resolved.showTokPerSec,
+          workRemindAt: resolved.workRemindAt,
+        },
         Date.now,
         resolved.customActions,
       )

package/src/lang.ts

@@ -57,6 +57,10 @@ const dict = {
   },
   'tool-count-one': { zh: '{{count}} 工具', en: '{{count}} tool' },
   'tool-count-many': { zh: '{{count}} 工具', en: '{{count}} tools' },
+  /** Subagent count in the done summary. */
+  'subagent-count': { zh: '子代理 {{count}} 个', en: '{{count}} subagents' },
+  /** Work-reminder copy after `workRemindAt` turn-hours. */
+  'work-remind': { zh: '已连续工作 {{hours}} 小时，歇会儿？', en: 'Worked {{hours}}h straight — take a break?' },
 } as const
 
 export type I18nKey = keyof typeof dict