dsh-speak 1.7.0 → 1.7.2

package/README.md

@@ -315,7 +315,7 @@ document):
 | `longTextMessage` | `本次播报内容较长，请自行阅读。` | the fixed prompt spoken for over-long text in `message` mode (editable in the UI) |
 | `maxChars` | platform | per-utterance ceiling. **macOS default 0 (`say` has no ceiling); Windows default 300** (SAPI fails silently beyond ~375-470) |
 | `volume` | `50` | Windows only (0-100); macOS volume follows the system |
-| `rate` | `0` | `0` = engine default (Windows SAPI scale, e.g. 1; macOS words-per-minute, e.g. 175) |
+| `rate` | `0` | speech rate: Windows SAPI scale (-10 to 10, 0 = normal; try 1-3 for faster); macOS words-per-minute (default 175, 200 is a bit faster) |
 | `announceTurnEnd` | `false` | announce "第 N 轮对话完成/中断/异常结束" on turn end (`turn/end`) |
 | `announceCommandDone` | `false` | announce when a command finishes or fails (`command/done`) |
 | `announceGoalChange` | `false` | announce goal created/updated/completed/paused/resumed (`goal/change`, objective head) |

package/README.zh-CN.md

@@ -295,7 +295,7 @@ speak.ps1 -Text "…" -Volume 50 -Rate 1 -MaxChars 300 -LongTextMessage "本次
 | `longTextMessage` | `本次播报内容较长，请自行阅读。` | `message` 模式下超长文本改念的固定提示语（UI 可编辑） |
 | `maxChars` | 平台相关 | 引擎单次朗读上限。**macOS 默认 0（`say` 无上限）；Windows 默认 300**（SAPI 超过约 375-470 字会静默失败） |
 | `volume` | `50` | 仅 Windows（0-100）；macOS 音量跟随系统 |
-| `rate` | `0` | `0` = 引擎默认（Windows SAPI 刻度如 1；macOS words-per-minute 如 175） |
+| `rate` | `0` | 语速：Windows SAPI 刻度（-10 到 10，0 = 正常，推荐 0 / 稍快 1-3）；macOS words-per-minute（默认 175，稍快 200） |
 | `announceTurnEnd` | `false` | 回合结束时播报"第 N 轮对话完成/中断/异常结束"（`turn/end`） |
 | `announceCommandDone` | `false` | 命令执行完成/失败时播报（`command/done`） |
 | `announceGoalChange` | `false` | 目标创建/更新/完成/暂停/恢复时播报（`goal/change`，含目标标题前 40 字） |

package/adapters/dsh/speech-hook.js

@@ -264,7 +264,9 @@ module.exports = {
         if (fullRead) args.push('-F')
         child = spawn('/bin/bash', [cfg.engine].concat(args), { detached: true, stdio: 'ignore' })
       } else {
-        child = spawn('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', cfg.engine, '-File', tmp, '-Volume', String(cfg.volume), '-Rate', String(cfg.rate > 0 ? cfg.rate : 1), '-MaxChars', String(cfg.maxChars), '-LongTextMode', cfg.longTextMode, '-LongTextMessage', cfg.longTextMessage, '-CleanMarkdownFormatting', cfg.cleanMarkdownFormatting ? '1' : '0', '-ReadInlineCode', cfg.readInlineCode ? '1' : '0', '-CodeBlocks', cfg.codeBlocks, '-CodeBlockMaxChars', String(cfg.codeBlockMaxChars), '-CodeBlockReplacementText', cfg.codeBlockReplacementText, '-FullRead', fullRead ? '1' : '0'], { windowsHide: true, stdio: 'ignore' })
+        // Windows 语速 = SAPI 刻度（-10 到 10，0 = 正常；负值变慢），直接透传，
+        // 不要把 0/负值替换成 1（否则无法回到正常语速/减慢）
+        child = spawn('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', cfg.engine, '-File', tmp, '-Volume', String(cfg.volume), '-Rate', String(cfg.rate), '-MaxChars', String(cfg.maxChars), '-LongTextMode', cfg.longTextMode, '-LongTextMessage', cfg.longTextMessage, '-CleanMarkdownFormatting', cfg.cleanMarkdownFormatting ? '1' : '0', '-ReadInlineCode', cfg.readInlineCode ? '1' : '0', '-CodeBlocks', cfg.codeBlocks, '-CodeBlockMaxChars', String(cfg.codeBlockMaxChars), '-CodeBlockReplacementText', cfg.codeBlockReplacementText, '-FullRead', fullRead ? '1' : '0'], { windowsHide: true, stdio: 'ignore' })
       }
       const token = ++speechToken
       activeSpeech = { process: child, tmp, token, item, gapMs: item.gapMs || 0 }

package/client/client.js

@@ -45,6 +45,8 @@ window.__ModuleLoader__.load({
       replayFullReadHint: '手动重播时跳过超长文本的标题截断，完整朗读。',
       queueAllMessages: '入队所有消息',
       queueAllMessagesHint: '每一条 assistant 消息到达即入队朗读（中间消息也读，FIFO），而不只读最终回复。',
+      throttleMs: '合并延迟（毫秒）',
+      throttleMsHint: '回复文本等待多久才播报（合并同一回复的多步消息）。',
       cleanMarkdown: '清理 Markdown',
       cleanMarkdownHint: '把 Markdown 转成自然的语音文本。',
       markdownCleaning: 'Markdown 清理',
@@ -61,6 +63,13 @@ window.__ModuleLoader__.load({
       codeBlockReplacementTextHint: '代码块被替换时朗读的文本。',
       maxChars: '最大朗读字数',
       maxCharsHint: 'macOS 上 0 = 不限；Windows 保留安全默认值。',
+      volume: '音量',
+      volumeHint: '仅 Windows（0-100）；macOS 音量跟随系统。',
+      rate: '语速',
+      rateHintWin: 'Windows SAPI 语速（-10 到 10，0 = 正常；推荐 0，稍快 1-3）。',
+      rateHintMac: 'words-per-minute（wpm），数值越大语速越快：默认 175，稍快 200。',
+      engine: '引擎路径',
+      engineHint: '自定义引擎脚本路径；留空自动解析（包内引擎 → ~/.dsh/hooks）。',
       longTextBehavior: '超长文本行为',
       longTextBehaviorHint: '超过正数上限时如何处理。',
       longTextMessageOption: '朗读替换提示语',
@@ -69,6 +78,8 @@ window.__ModuleLoader__.load({
       fixedPromptHint: '超长文本（message 模式）时朗读的提示语。',
       announceApprovals: '播报审批',
       announceApprovalsHint: '朗读审批请求。',
+      stripApprovalPrefix: '剥离审批前缀',
+      stripApprovalPrefixHint: '剥离审批原因里的固定英文模板前缀（escalate sandbox to …: ）。',
       announceQuestions: '播报提问',
       announceQuestionsHint: '朗读 ask_user_question 问题。',
       questionGap: '问题间隔（毫秒）',
@@ -102,6 +113,8 @@ window.__ModuleLoader__.load({
       replayFullReadHint: 'When replaying, read the full text instead of the heading fallback.',
       queueAllMessages: 'Queue All Messages',
       queueAllMessagesHint: 'Also speaks intermediate assistant messages in a FIFO queue, not only the final reply.',
+      throttleMs: 'Merge Delay (ms)',
+      throttleMsHint: 'How long a reply waits before being announced (merges multi-step messages).',
       cleanMarkdown: 'Clean Markdown Formatting',
       cleanMarkdownHint: 'Converts Markdown into natural speech text.',
       markdownCleaning: 'Markdown cleaning',
@@ -118,6 +131,13 @@ window.__ModuleLoader__.load({
       codeBlockReplacementTextHint: 'Used when a code block is replaced.',
       maxChars: 'Max Speech Characters',
       maxCharsHint: '0 is unlimited on macOS; Windows keeps its safe default.',
+      volume: 'Volume',
+      volumeHint: 'Windows only (0-100); macOS volume follows the system.',
+      rate: 'Speech Rate',
+      rateHintWin: 'Windows SAPI rate scale (-10 to 10, 0 = normal; try 1-3 for faster).',
+      rateHintMac: 'words-per-minute (wpm) — higher = faster: default 175, 200 is a bit faster.',
+      engine: 'Engine Path',
+      engineHint: 'Custom engine script path; empty = auto-resolve (package engine → ~/.dsh/hooks).',
       longTextBehavior: 'Long Text Behavior',
       longTextBehaviorHint: 'When a positive maximum is exceeded.',
       longTextMessageOption: 'Read replacement message',
@@ -126,6 +146,8 @@ window.__ModuleLoader__.load({
       fixedPromptHint: 'The prompt spoken when the text is too long (message mode).',
       announceApprovals: 'Announce Approvals',
       announceApprovalsHint: 'Announces approval requests.',
+      stripApprovalPrefix: 'Strip Approval Prefix',
+      stripApprovalPrefixHint: 'Strip the fixed English template prefix (escalate sandbox to …:) from approval reasons.',
       announceQuestions: 'Announce Questions',
       announceQuestionsHint: 'Announces ask-user questions.',
       questionGap: 'Question Gap (ms)',
@@ -254,7 +276,15 @@ window.__ModuleLoader__.load({
         return e('div', { className: 'dsh-speak-field' }, inline ? e('div', { className: 'dsh-speak-inline-field' }, e('div', { className: 'dsh-speak-field-label' }, label), children) : e('div', { className: 'dsh-speak-field-label' }, label), inline ? null : children, e('p', { className: 'dsh-speak-field-hint' }, hint))
       }
       function Toggle({ label, value, disabled, onChange, hint }) { return e(Field, { label: `${label}:`, hint, inline: true }, e('div', { className: 'dsh-speak-option-row' }, e(Button, { variant: 'outline', size: 'sm', disabled, 'aria-pressed': value, onClick: () => onChange(!value) }, value ? t('toggleOn') : t('toggleOff')))) }
-      function SettingInput({ label, value, disabled, numeric, onChange, hint }) { const id = `dsh-speak-${label.toLowerCase().replace(/[^a-z0-9]+/g, '-')}`; return e(Field, { label: `${label}:`, hint }, e('div', { className: 'dsh-speak-input-row' }, e(Input, { id, value: String(value), disabled, inputMode: numeric ? 'numeric' : undefined, onChange: event => onChange(event.target.value) }))) }
+      function SettingInput({ label, value, disabled, numeric, onChange, hint }) {
+        const id = `dsh-speak-${label.toLowerCase().replace(/[^a-z0-9]+/g, '-')}`
+        // 缓冲输入：受控 value 来自配置，直接绑定会让"-"这类中间态被弹回
+        // （Number('-') = NaN 拒绝后 value 不变），负数字段无法输入。这里用
+        // 局部 state 缓冲，输入过程自由，onChange 里校验合法后才写配置。
+        const [text, setText] = React.useState(String(value))
+        React.useEffect(() => { setText(String(value)) }, [value])
+        return e(Field, { label: `${label}:`, hint }, e('div', { className: 'dsh-speak-input-row' }, e(Input, { id, value: text, disabled, inputMode: numeric ? 'numeric' : undefined, onChange: event => { setText(event.target.value); onChange(event.target.value) } })))
+      }
       function Options({ label, value, disabled, onChange, hint, options }) { return e(Field, { label, hint }, e('div', { className: 'dsh-speak-option-row' }, ...options.map(option => e(Button, { key: option.value, variant: value === option.value ? 'primary' : 'outline', size: 'sm', disabled, 'aria-pressed': value === option.value, onClick: () => onChange(option.value) }, option.label)))) }
       function MarkdownCleaning({ value, clean, disabled, set }) {
         const [open, setOpen] = React.useState(true); const controlsDisabled = disabled || !clean
@@ -270,16 +300,22 @@ window.__ModuleLoader__.load({
         const [eventsOpen, setEventsOpen] = React.useState(false)
         const snapshot = useSettings(); if (snapshot.status !== 'ready' || !snapshot.value) return null
         const value = snapshot.value; const disabled = !snapshot.writable; const clean = value.cleanMarkdownFormatting !== false; const set = (field, next) => { void settings.set(field, next).catch(console.error) }
+        const isMac = /Mac|iPhone|iPad|iPod/.test(navigator.userAgent || navigator.platform || '')
         return e('section', { 'aria-label': t('settingsAria') }, e('h3', null, t('settingsTitle')), e('p', null, t('settingsIntro')),
           e(Toggle, { label: t('masterSwitch'), value: value.enabled !== false, disabled, onChange: next => set('enabled', next), hint: t('masterSwitchHint') }),
           e(Toggle, { label: t('automaticSpeech'), value: value.automaticSpeech !== false, disabled, onChange: next => set('automaticSpeech', next), hint: t('automaticSpeechHint') }),
           e(Toggle, { label: t('replayFullRead'), value: value.replayFullRead === true, disabled, onChange: next => set('replayFullRead', next), hint: t('replayFullReadHint') }),
           e(Toggle, { label: t('queueAllMessages'), value: value.queueAllMessages === true, disabled: disabled || value.automaticSpeech === false, onChange: next => set('queueAllMessages', next), hint: t('queueAllMessagesHint') }),
+          e(SettingInput, { label: t('throttleMs'), value: value.throttleMs == null ? 1500 : value.throttleMs, numeric: true, disabled, onChange: next => { if (/^\d+$/.test(next)) set('throttleMs', Number(next)) }, hint: t('throttleMsHint') }),
           e(Toggle, { label: t('cleanMarkdown'), value: clean, disabled, onChange: next => set('cleanMarkdownFormatting', next), hint: t('cleanMarkdownHint') }), e(MarkdownCleaning, { value, clean, disabled, set }),
           e(SettingInput, { label: t('maxChars'), value: value.maxChars == null ? 0 : value.maxChars, numeric: true, disabled, onChange: next => { if (/^\d+$/.test(next)) set('maxChars', Number(next)) }, hint: t('maxCharsHint') }),
+          e(SettingInput, { label: t('volume'), value: value.volume == null ? 50 : value.volume, numeric: true, disabled, onChange: next => { if (/^\d+$/.test(next)) set('volume', Number(next)) }, hint: t('volumeHint') }),
+          e(SettingInput, { label: t('rate'), value: value.rate == null ? 0 : value.rate, numeric: true, disabled, onChange: next => { if (/^-?\d*\.?\d*$/.test(next)) { const n = Number(next); if (Number.isFinite(n)) set('rate', n) } }, hint: isMac ? t('rateHintMac') : t('rateHintWin') }),
+          e(SettingInput, { label: t('engine'), value: value.engine || '', disabled, onChange: next => set('engine', next), hint: t('engineHint') }),
           e(Options, { label: t('longTextBehavior'), value: value.longTextMode || 'message', disabled, onChange: next => set('longTextMode', next), hint: t('longTextBehaviorHint'), options: [{ value: 'message', label: t('longTextMessageOption') }, { value: 'heading', label: t('longTextHeadingOption') }] }),
           e(SettingInput, { label: t('fixedPrompt'), value: value.longTextMessage || '本次播报内容较长，请自行阅读。', disabled: disabled || value.longTextMode !== 'message', onChange: next => set('longTextMessage', next), hint: t('fixedPromptHint') }),
           e(Toggle, { label: t('announceApprovals'), value: value.announceApprovals !== false, disabled, onChange: next => set('announceApprovals', next), hint: t('announceApprovalsHint') }),
+          e(Toggle, { label: t('stripApprovalPrefix'), value: value.stripApprovalPrefix !== false, disabled: disabled || value.announceApprovals === false, onChange: next => set('stripApprovalPrefix', next), hint: t('stripApprovalPrefixHint') }),
           e(Toggle, { label: t('announceQuestions'), value: value.announceQuestions !== false, disabled, onChange: next => set('announceQuestions', next), hint: t('announceQuestionsHint') }),
           e(SettingInput, { label: t('questionGap'), value: value.questionGapMs == null ? 2000 : value.questionGapMs, numeric: true, disabled: disabled || value.announceQuestions === false, onChange: next => { if (/^\d+$/.test(next)) set('questionGapMs', Number(next)) }, hint: t('questionGapHint') }),
           e(DisclosureRow, { icon: null, title: t('optionalEvents'), open: eventsOpen, expandable: true, onToggle: () => setEventsOpen(!eventsOpen), expandOnRowClick: true }, e('div', { style: { paddingLeft: '22px' } },

package/docs/DESIGN.md

@@ -253,7 +253,7 @@ config:
   longTextMessage: '本次播报内容较长，请自行阅读。'
   maxChars: 300                # macOS default 0 = unlimited
   volume: 50                   # Windows only
-  rate: 0                      # 0 = engine default
+  rate: 0                      # rate: Win SAPI scale -10..10 (0=normal) / mac wpm (175)
   # —— optional event announcements (off by default) ——
   announceTurnEnd: false     # turn/end
   announceCommandDone: false # command/done

package/docs/DESIGN.zh-CN.md

@@ -232,7 +232,7 @@ config:
   longTextMessage: '本次播报内容较长，请自行阅读。'
   maxChars: 300                # macOS 默认 0 = 不限
   volume: 50                   # 仅 Windows
-  rate: 0                      # 0 = 引擎默认
+  rate: 0                      # 语速：Win SAPI 刻度 -10~10（0=正常）/ mac wpm（175）
   # —— 可选事件播报（默认全关）——
   announceTurnEnd: false     # turn/end
   announceCommandDone: false # command/done

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-speak",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "Make your AI harness speak — voice announcements for DSH and other AI coding harnesses (Windows SAPI5 + macOS system voices)",
   "main": "adapters/dsh/speech-hook.js",
   "exports": {