ai-notify 0.4.1 → 0.4.3

package/menubar/AiNotifyMenuBar.swift

@@ -13,6 +13,35 @@
 
 import Cocoa
 
+// NSSlider.trackFillColor is unreliable for blue: AppKit matches the resolved fill
+// to the system accent and routes it through the accent path, which desaturates to
+// gray while the control isn't the key view (a menu slider never is). A non-accent
+// color like the ツンデレ pink is exempt, which is why only the blue volume slider
+// went gray. Drawing the bar ourselves sidesteps the accent path completely.
+final class FilledSliderCell: NSSliderCell {
+    var fillColor: NSColor = NSColor(srgbRed: 0, green: 122.0 / 255.0, blue: 1, alpha: 1)
+
+    override func drawBar(inside rect: NSRect, flipped: Bool) {
+        let h: CGFloat = 4
+        var bar = rect
+        bar.origin.y += (bar.height - h) / 2
+        bar.size.height = h
+        let radius = h / 2
+
+        NSColor.tertiaryLabelColor.setFill()
+        NSBezierPath(roundedRect: bar, xRadius: radius, yRadius: radius).fill()
+
+        let span = maxValue - minValue
+        guard span > 0 else { return }
+        let frac = CGFloat((doubleValue - minValue) / span)
+        guard frac > 0 else { return }
+        var fill = bar
+        fill.size.width = min(bar.width, max(h, bar.width * frac))
+        fillColor.setFill()
+        NSBezierPath(roundedRect: fill, xRadius: radius, yRadius: radius).fill()
+    }
+}
+
 enum State {
     static func dir() -> String {
         let env = ProcessInfo.processInfo.environment
@@ -146,6 +175,28 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     @objc private func paneVolumeChanged(_ s: NSSlider) {
         if let tty = s.identifier?.rawValue { State.cli(["volume-pane", tty, String(format: "%.2f", s.doubleValue)]) }
     }
+    // Editing a text field *inside* an NSMenu is unreliable — the menu's tracking
+    // loop swallows the keystrokes. So naming a pane opens a normal modal dialog
+    // (NSAlert with a text field), which takes keyboard focus properly. Empty =>
+    // clear (the pane falls back to its label / the speakLabel default).
+    @objc private func promptPaneName(_ sender: NSMenuItem) {
+        guard let info = sender.representedObject as? [String], let tty = info.first else { return }
+        let current = info.count > 1 ? info[1] : ""
+        let alert = NSAlert()
+        alert.messageText = "読み上げ名"
+        alert.informativeText = "このペインを通知で読み上げる名前（空欄で解除）"
+        let field = NSTextField(frame: NSRect(x: 0, y: 0, width: 240, height: 24))
+        field.stringValue = current
+        field.placeholderString = "例: バックエンド"
+        alert.accessoryView = field
+        alert.addButton(withTitle: "保存")
+        alert.addButton(withTitle: "キャンセル")
+        NSApp.activate(ignoringOtherApps: true)
+        alert.window.initialFirstResponder = field
+        guard alert.runModal() == .alertFirstButtonReturn else { return }
+        let name = field.stringValue.trimmingCharacters(in: .whitespacesAndNewlines)
+        State.cli(["name-pane", tty, name.isEmpty ? "clear" : name])
+    }
     // identifier carries the prosody key (speed | pitch | intonation).
     @objc private func prosodyChanged(_ s: NSSlider) {
         if let key = s.identifier?.rawValue { State.cli(["voice-prosody", key, String(format: "%.3f", s.doubleValue)]) }
@@ -172,10 +223,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     private func sliderRow(value: Double, action: Selector, identifier: String?) -> NSMenuItem {
         let row = NSView(frame: NSRect(x: 0, y: 0, width: 220, height: 26))
         let icon = NSTextField(labelWithString: "🔊"); icon.frame = NSRect(x: 12, y: 4, width: 20, height: 18)
-        let slider = NSSlider(value: value, minValue: 0, maxValue: 2, target: self, action: action)
-        slider.frame = NSRect(x: 36, y: 3, width: 170, height: 20)
+        let slider = NSSlider(frame: NSRect(x: 36, y: 3, width: 170, height: 20))
+        slider.cell = FilledSliderCell() // self-drawn blue fill; see FilledSliderCell
+        slider.minValue = 0; slider.maxValue = 2; slider.doubleValue = value
+        slider.target = self; slider.action = action
         slider.isContinuous = (identifier == nil)
-        slider.trackFillColor = .controlAccentColor // stay blue even when not focused
         if let id = identifier { slider.identifier = NSUserInterfaceItemIdentifier(id) }
         row.addSubview(icon); row.addSubview(slider)
         let item = NSMenuItem(); item.view = row
@@ -293,8 +345,30 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
                 guard let tty = p["tty"] as? String else { continue }
                 let label = p["label"] as? String ?? tty
                 let cur = p["current"] as? String
-                let item = NSMenuItem(title: cur != nil ? "\(label) — \(cur!)" : label, action: nil, keyEquivalent: "")
+                let pname = p["speakName"] as? String ?? ""
+                // Parent row shows at a glance WHO the pane is (its custom 🗣 name,
+                // or its label/tty) AND which 🔊 voice it uses (omitted when it just
+                // follows the global voice). Naming a pane must not hide the voice —
+                // surfacing the per-pane voice is what this list is for.
+                let who = pname.isEmpty ? label : "🗣 \(pname)"
+                let voiceTag = cur != nil ? " — 🔊 \(cur!)" : ""
+                let item = NSMenuItem(title: who + voiceTag, action: nil, keyEquivalent: "")
                 let sub = NSMenu()
+                // Per-pane spoken name — opens a dialog (menu fields can't type).
+                sub.addItem(disabledHeader("読み上げ名"))
+                let nameItem = NSMenuItem(
+                    title: pname.isEmpty ? "（クリックして設定…）" : "「\(pname)」を変更…",
+                    action: #selector(promptPaneName(_:)), keyEquivalent: ""
+                )
+                nameItem.target = self
+                nameItem.representedObject = [tty, pname]
+                sub.addItem(nameItem)
+                if !pname.isEmpty {
+                    let clr = NSMenuItem(title: "読み上げ名を解除", action: #selector(runItem(_:)), keyEquivalent: "")
+                    clr.target = self; clr.representedObject = ["name-pane", tty, "clear"]
+                    sub.addItem(clr)
+                }
+                sub.addItem(.separator())
                 // Per-pane volume.
                 let pv = (p["volume"] as? Double) ?? State.volume
                 sub.addItem(disabledHeader("音量"))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-notify",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Desktop, sound, and spoken notifications for terminal AI coding agents (Claude Code, Codex, Gemini, ...) — with one mute switch that covers all of them, across every terminal.",
   "type": "module",
   "bin": {

package/src/cli.mjs

@@ -479,6 +479,24 @@ const cmds = {
     log(`pane ${tty}: tsundere level ${v}`);
   },
 
+  // Name a specific pane in the spoken read-out (set from the menu bar), or
+  // `clear` to fall back to the label / speakLabel default.
+  //   name-pane <tty> <name|clear>
+  'name-pane'() {
+    const [tty, ...rest] = positionals;
+    const arg = rest.join(' ').trim(); // a name may contain spaces
+    if (!tty || arg === '') {
+      console.error('usage: name-pane <tty> <name|clear>');
+      process.exit(1);
+    }
+    if (arg === 'clear') {
+      updatePaneSetting(tty, { speakName: null });
+      return log(`pane ${tty}: name cleared`);
+    }
+    updatePaneSetting(tty, { speakName: arg });
+    log(`pane ${tty}: name ${arg}`);
+  },
+
   // Get/set the VOICEVOX base prosody (the normal-tone scales the menu bar
   // sliders drive). With no args, prints the current values as JSON.
   //   voice-prosody [speed|pitch|intonation <value> | reset]
@@ -534,6 +552,7 @@ const cmds = {
         tty,
         label: recorded.get(tty) || tty.replace('/dev/', ''),
         current: labelFor(s.tts ? s : null),
+        speakName: typeof s.speakName === 'string' ? s.speakName : '',
         volume: typeof s.volume === 'number' ? s.volume : globalVol,
         volumeSet: typeof s.volume === 'number',
         tsundere: typeof s.tsundere === 'number' ? s.tsundere : tsLevel,

package/src/notify.mjs

@@ -176,19 +176,21 @@ export const emit = ({ provider = 'default', event = 'done', label = '', message
   if (!message) spokenBody = fromTemplate || fallback;
   else if (config.speakAgentMessage) spokenBody = fullBody;
   else spokenBody = shortenForSpeech(fullBody, config.speakMaxChars || 40);
-  // The task gist already tells you which pane; the label (often the working
-  // dir) is just slow filler. Prefix it only if explicitly enabled.
-  const speakText = config.speakLabel === true && label ? `${label}、${spokenBody}` : spokenBody;
-
-  // Per-pane voice: remember this pane (so the menu bar can list it) and apply
-  // any voice assigned to it. Precedence (most specific first):
-  //   $AI_NOTIFY_* env  — set in the pane's shell
-  //   this pane's pick  — assigned from the menu bar (keyed by tty)
-  //   provider / global — config defaults
+  // Per-pane settings (voice / volume / tsundere / name), keyed by tty. Read
+  // here — before the read-out is assembled — so the spoken text can use this
+  // pane's assigned name. Also remember the pane so the menu bar can list it.
   const tty = controllingTty();
   recordPane(tty, label);
   setPaneWaiting(tty, event === 'waiting'); // waiting -> yellow menu bar status; done clears it
   const pane = readPaneSetting(tty);
+
+  // Name this pane in the read-out. An explicit per-pane name (set from the menu
+  // bar) is ALWAYS spoken; the auto-derived label (often just the working dir)
+  // is prefixed only when speakLabel is on — it's slow filler otherwise.
+  const spokenName = pane.speakName || (config.speakLabel === true && label ? label : '');
+  const speakText = spokenName ? `${spokenName}、${spokenBody}` : spokenBody;
+
+  // Per-pane voice (precedence: $AI_NOTIFY_* env > this pane's pick > global).
   const tts = pane.tts || config.tts;
   const voice = process.env.AI_NOTIFY_VOICE || pane.voice || p.voice || config.voice;
   const speaker = process.env.AI_NOTIFY_VOICEVOX_SPEAKER || pane.speaker || config.voicevox?.speaker;
@@ -231,7 +233,7 @@ export const emit = ({ provider = 'default', event = 'done', label = '', message
     speakTone = tsundere.axisFor(eff);
     outVol = Math.min(2, Math.max(0, vol * tsundere.volumeMul(tier, ts.volumeBoost !== false)));
     outText = tsundere.wrap(spokenBody, eff, tier, ts.lang || 'ja', nextCounter('tsundere'));
-    if (config.speakLabel === true && label) outText = `${label}、${outText}`;
+    if (spokenName) outText = `${spokenName}、${outText}`;
     if (tts === 'voicevox') {
       const sm = ts.styleMap || voicevox.resolveStyles(outSpeaker, config.voicevox?.url);
       const axis = tsundere.axisFor(eff);