ai-notify 0.6.0 → 0.7.1

package/README.ja.md

@@ -87,6 +87,28 @@ AI_NOTIFY_VOLUME=0.5              # この窓の音量（0.0〜2.0）
 AI_NOTIFY_TSUNDERE_LEVEL=0.8     # この窓のツンデレ既定値（0=デレ〜1=ツン）
 ```
 
+## 🔔 どの種類で通知するか
+
+すべての出来事に音とバナーが要るわけではありません。ai-notify は各イベントを（Claude Code の `notification_type`・サブエージェント判定で）**種類**に分類し、どの種類で通知するかを選べます：
+
+```sh
+ai-notify notify                       # 一覧を表示
+ai-notify notify done off              # ターン完了では鳴らさない
+ai-notify notify subagent-done on      # サブエージェント完了で鳴らす
+```
+
+| 種類 | いつ | 既定 |
+| ---- | ---- | ---- |
+| `input` | **あなたの入力**待ち（`idle_prompt`） | 🔔 ON |
+| `permission` | **許可**プロンプト | 🔔 ON |
+| `info` | 認証 / MCP elicitation（情報通知） | 🔕 OFF |
+| `done` | ターン**完了**（Stop） | 🔔 ON |
+| `subagent-done` | **サブエージェント**完了（SubagentStop） | 🔕 OFF |
+
+OFF の種類は完全に無音（音・バナー・読み上げ・ポップアップなし）。ただし待ち状態は正しく保たれます（無音化した `done` でもポップアップは消えます）。同じ切替はメニューバーの **通知する種類** にもあります。（`subagent-done` は SubagentStop フック配線のため一度 `ai-notify init` が必要）
+
+> 注意：Claude は「サブエージェントの実行を待っているだけ」では通知を出しません（`Notification` は**あなたが必要なとき**だけ発火）。つまり「入力待ち」と「サブエージェントで作業中」は別々の通知ではなく、上の種類が実際に区別できる単位です。
+
 ## 🎛️ ネイティブのメニューバー — ミュート・音量・声
 
 エージェントが走っているターミナルにはコマンドを打てないので、**メニューバー**から全部操作します：

package/README.md

@@ -88,6 +88,28 @@ AI_NOTIFY_TSUNDERE_LEVEL=0.8      # this window's tsundere baseline (0=デレ
 AI_NOTIFY_VOLUME=0.5              # this window's volume (0.0–2.0)
 ```
 
+## 🔔 Which events alert
+
+Not every agent event deserves a sound and a banner. ai-notify classifies each one (using Claude Code's `notification_type` / sub-agent markers) into a **kind**, and you choose which kinds alert:
+
+```sh
+ai-notify notify                       # show the matrix
+ai-notify notify done off              # finished a turn → stay silent
+ai-notify notify subagent-done on      # a sub-agent finished → alert
+```
+
+| kind | when | default |
+| ---- | ---- | ------- |
+| `input` | Claude is waiting for **your input** (`idle_prompt`) | 🔔 on |
+| `permission` | a **permission** prompt | 🔔 on |
+| `info` | auth / MCP elicitation (informational) | 🔕 off |
+| `done` | a turn **finished** (Stop) | 🔔 on |
+| `subagent-done` | a **sub-agent** finished (SubagentStop) | 🔕 off |
+
+A disabled kind is fully silent — no sound, banner, voice, or popup — but still keeps the waiting state correct (a suppressed `done` still clears a popup). Same toggles live in the menu bar under **通知する種類**. (`subagent-done` needs `ai-notify init` once to wire the SubagentStop hook.)
+
+> Note: Claude does **not** emit a notification while merely waiting on a sub-agent to run — `Notification` fires only when *you* are needed. So "waiting for input" and "busy with a sub-agent" aren't separate notifications; the kinds above are what's actually distinguishable.
+
 ## 🎛️ Native menu bar app — mute, volume, and voices
 
 You can't type into the terminal that's running an agent, so drive everything from the **menu bar**:

package/menubar/AiNotifyMenuBar.swift

@@ -140,6 +140,16 @@ enum State {
             }
     }
 
+    // Per-kind notification toggles (must mirror state.mjs defaults).
+    static func notifyKinds() -> [(key: String, label: String, on: Bool)] {
+        let defaults: [String: Bool] = ["input": true, "permission": true, "info": false, "done": true, "subagent-done": false]
+        let labels = ["input": "入力待ち", "permission": "許可待ち", "info": "その他の通知", "done": "完了", "subagent-done": "サブエージェント完了"]
+        let saved = json("notify-kinds.json")
+        return ["input", "permission", "info", "done", "subagent-done"].map { k in
+            (k, labels[k] ?? k, (saved[k] as? Bool) ?? defaults[k] ?? true)
+        }
+    }
+
     // Tsundere baseline level 0.0 (デレ) – 1.0 (ツン). Same file the CLI reads.
     static func setTsundereLevel(_ v: Double) {
         try? FileManager.default.createDirectory(atPath: dir(), withIntermediateDirectories: true)
@@ -165,6 +175,15 @@ enum State {
     }
 }
 
+// A card view that reliably dismisses on click even when its window isn't the
+// active app (a gesture recognizer on a non-key floating window is unreliable;
+// acceptsFirstMouse + mouseDown is not).
+final class ClickableCardView: NSView {
+    var onClick: () -> Void = {}
+    override func acceptsFirstMouse(for event: NSEvent?) -> Bool { true }
+    override func mouseDown(with event: NSEvent) { onClick() }
+}
+
 // One floating "応答待ち" card, built once and updated in place.
 final class PopupCard: NSObject {
     let window: NSWindow
@@ -174,8 +193,16 @@ final class PopupCard: NSObject {
     var onClick: () -> Void = {}
 
     override init() {
-        window = NSWindow(contentRect: NSRect(x: 0, y: 0, width: 300, height: 96),
-                          styleMask: [.borderless], backing: .buffered, defer: false)
+        // A non-activating floating panel: it receives clicks (the close button
+        // and the card's mouseDown both fire) without the background menu-bar app
+        // ever becoming active — the reliable way to make a HUD-style window
+        // clickable. A plain NSWindow drops the first click while inactive.
+        let panel = NSPanel(contentRect: NSRect(x: 0, y: 0, width: 300, height: 96),
+                            styleMask: [.borderless, .nonactivatingPanel], backing: .buffered, defer: false)
+        panel.isFloatingPanel = true
+        panel.becomesKeyOnlyIfNeeded = true
+        panel.worksWhenModal = true
+        window = panel
         super.init()
         window.isOpaque = false
         window.backgroundColor = .clear
@@ -184,7 +211,8 @@ final class PopupCard: NSObject {
         window.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary]
         window.ignoresMouseEvents = false
 
-        let card = NSView(frame: NSRect(x: 0, y: 0, width: 300, height: 96))
+        let card = ClickableCardView(frame: NSRect(x: 0, y: 0, width: 300, height: 96))
+        card.onClick = { [weak self] in self?.onClick() }
         card.wantsLayer = true
         card.layer?.cornerRadius = 16
         card.layer?.backgroundColor = NSColor(calibratedWhite: 0.10, alpha: 0.95).cgColor
@@ -203,7 +231,7 @@ final class PopupCard: NSObject {
         card.addSubview(face)
 
         let badge = NSTextField(labelWithString: "🟡 応答待ち")
-        badge.frame = NSRect(x: 96, y: 56, width: 196, height: 22)
+        badge.frame = NSRect(x: 96, y: 56, width: 150, height: 22)
         badge.font = .systemFont(ofSize: 13, weight: .bold)
         badge.textColor = .systemYellow
         badge.isBordered = false
@@ -218,7 +246,17 @@ final class PopupCard: NSObject {
         label.backgroundColor = .clear
         card.addSubview(label)
 
-        card.addGestureRecognizer(NSClickGestureRecognizer(target: self, action: #selector(clicked)))
+        // Visible close button (✕) at the top-right.
+        let close = NSButton(frame: NSRect(x: 272, y: 70, width: 20, height: 20))
+        close.title = "✕"
+        close.font = .systemFont(ofSize: 11, weight: .bold)
+        close.isBordered = false
+        close.contentTintColor = .secondaryLabelColor
+        close.setButtonType(.momentaryChange)
+        close.target = self
+        close.action = #selector(clicked)
+        card.addSubview(close)
+
         window.contentView = card
     }
 
@@ -673,6 +711,20 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         popupParent.submenu = popupSub
         menu.addItem(popupParent)
 
+        // Which kinds of event actually alert (sound / banner / popup).
+        let notifyParent = NSMenuItem(title: "通知する種類", action: nil, keyEquivalent: "")
+        let notifySub = NSMenu()
+        notifySub.addItem(disabledHeader("チェック＝音・バナーを出す"))
+        for kind in State.notifyKinds() {
+            let it = NSMenuItem(title: kind.label, action: #selector(runItem(_:)), keyEquivalent: "")
+            it.target = self
+            it.representedObject = ["notify", kind.key, "toggle"]
+            it.state = kind.on ? .on : .off
+            notifySub.addItem(it)
+        }
+        notifyParent.submenu = notifySub
+        menu.addItem(notifyParent)
+
         menu.addItem(.separator())
         let quitItem = NSMenuItem(title: "ai-notify を終了", action: #selector(quit), keyEquivalent: "q")
         quitItem.target = self

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-notify",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "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

@@ -41,6 +41,10 @@ import {
   setPopupDelay,
   getPopupIgnore,
   setPopupIgnore,
+  NOTIFY_KINDS,
+  getNotifyKinds,
+  setNotifyKind,
+  isNotifyKindEnabled,
 } from './state.mjs';
 import { resolve as resolvePath, join as pathJoin } from 'node:path';
 
@@ -598,6 +602,38 @@ const cmds = {
     log(`✓ ${bits.join('  ·  ')}`);
   },
 
+  // Per-kind notification toggles: which kinds of agent event actually alert
+  // (sound / banner / voice / popup). Lets you, e.g., keep input-waiting but
+  // silence "done", or turn on sub-agent completions.
+  //   notify [<kind> on|off|toggle]
+  notify() {
+    const KIND_LABELS = {
+      input: '入力待ち  (Claude is waiting for your input)',
+      permission: '許可待ち  (a permission prompt)',
+      info: 'その他  (auth / MCP elicitation — informational)',
+      done: '完了  (a turn finished)',
+      'subagent-done': 'サブエージェント完了  (a sub-agent finished)',
+    };
+    const [kind, action] = positionals;
+    if (kind) {
+      if (!NOTIFY_KINDS.includes(kind)) {
+        console.error(`unknown kind: ${kind}\n  kinds: ${NOTIFY_KINDS.join(', ')}`);
+        process.exit(1);
+      }
+      const cur = !!getNotifyKinds()[kind];
+      const on = action === 'toggle' ? !cur : action !== 'off';
+      setNotifyKind(kind, on);
+      if (kind === 'subagent-done' && on) {
+        log('subagent-done: ON — run `ai-notify init` once so the SubagentStop hook is wired.');
+      }
+      return log(`${kind}: ${on ? '🔔 ON (notify)' : '🔕 OFF (silent)'}`);
+    }
+    const k = getNotifyKinds();
+    log('Notify on these events:\n');
+    for (const key of NOTIFY_KINDS) log(`  ${k[key] ? '🔔' : '🔕'} ${key.padEnd(14)} ${KIND_LABELS[key]}`);
+    log('\nToggle:  ai-notify notify done off    ·    ai-notify notify subagent-done on');
+  },
+
   // The "waiting" character popup (menu bar app): an always-on-top window that
   // shows a character saying which pane is waiting for input. macOS-only effect.
   //   popup [on|off|toggle|image <path>|delay <sec>|ignore <kw,kw>|status]
@@ -845,6 +881,8 @@ const cmds = {
     let event = opt('event', 'done');
     let cwd = '';
     let message = '';
+    let ntype = '';
+    let isSubagent = false;
 
     if (source === 'codex') {
       // Codex passes a single JSON argument.
@@ -859,16 +897,24 @@ const cmds = {
       const data = readStdinJson();
       cwd = data.cwd || '';
       message = data.message || '';
+      ntype = data.notification_type || ''; // idle_prompt | permission_prompt | ...
+      isSubagent = !!data.agent_id; // present => fired from inside a sub-agent
       // The Stop hook has no message, so "done" would only say "finished".
       // Pull the agent's last reply from the transcript so the notification
       // says WHAT was done.
-      if (!message && event === 'done' && data.transcript_path) {
+      if (!message && (event === 'done' || event === 'subagent-done') && data.transcript_path) {
         message = lastAssistantText(data.transcript_path);
       }
     }
 
+    // Classify the event into a kind and honor the per-kind notification toggle.
+    // A disabled kind still calls emit (to keep the waiting state correct), but
+    // silently. SubagentStop arrives as event "subagent-done" → emit as "done".
+    const kind = classifyKind(event, ntype, isSubagent);
+    const alert = isNotifyKindEnabled(kind);
     const label = deriveLabel(cwd);
-    emit({ provider: byId(source) ? source : 'default', event, label, message });
+    const emitEvent = event === 'subagent-done' ? 'done' : event;
+    emit({ provider: byId(source) ? source : 'default', event: emitEvent, label, message, alert });
   },
 
   version() { log(VERSION); },
@@ -879,6 +925,17 @@ function emitConfirm() {
   emit({ provider: 'default', event: 'done', label: 'ai-notify', message: readConfig().onMessage });
 }
 
+// Map a raw hook event + Claude's notification_type/agent_id to a notify "kind"
+// the user can toggle. See state.mjs NOTIFY_KINDS.
+function classifyKind(event, ntype, isSubagent) {
+  if (event === 'subagent-done' || (event === 'done' && isSubagent)) return 'subagent-done';
+  if (event === 'done') return 'done';
+  // waiting (Claude Notification): the type tells us *why*.
+  if (ntype === 'permission_prompt') return 'permission';
+  if (ntype === 'idle_prompt' || ntype === 'elicitation_dialog' || ntype === '') return 'input';
+  return 'info'; // auth_success, elicitation_complete/response, anything else
+}
+
 function printHelp() {
   log(`ai-notify ${VERSION} — notifications for terminal AI coding agents
 
@@ -893,6 +950,7 @@ Usage:
   ai-notify tsundere [on|off|level <0-1>|test|status]   tsundere persona (ツン⇄デレ by urgency)
   ai-notify voice-prosody [speed|pitch|intonation <v>|reset]  VOICEVOX read-out tuning
   ai-notify menubar [install|uninstall|status]       native menu bar bell (macOS)
+  ai-notify notify [<kind> on|off]                   which events alert: input|permission|info|done|subagent-done
   ai-notify popup [on|off|image <p>|delay <s>|ignore <kw>|portraits]  per-pane "waiting" popup, in the pane's voice (macOS)
   ai-notify translate [on <lang>|off|test]           speak agent text in your language
   ai-notify doctor                                    check deps & wiring

package/src/notify.mjs

@@ -145,7 +145,12 @@ const shortenForSpeech = (text, max = 40) => {
 };
 
 // Public entry. Called by the hook handler with already-parsed fields.
-export const emit = ({ provider = 'default', event = 'done', label = '', message = '' }) => {
+// `alert` (default true) gates whether this event actually makes noise — sound,
+// spoken read-out, banner, highlight, and the waiting popup. When false the call
+// still keeps the pane/waiting state correct (so a suppressed "done" still clears
+// a popup), it just stays silent. The hook decides `alert` from the per-kind
+// notification toggles.
+export const emit = ({ provider = 'default', event = 'done', label = '', message = '', alert = true }) => {
   const config = readConfig();
   const muted = isMuted();
   const p = config.providers[provider] || config.providers.default;
@@ -181,9 +186,10 @@ export const emit = ({ provider = 'default', event = 'done', label = '', message
   // pane's assigned name. Also remember the pane so the menu bar can list it.
   const tty = controllingTty();
   recordPane(tty, label);
-  // waiting -> yellow menu bar status (+ the popup); done clears it. Pass the
-  // reason text so the popup can filter by it (e.g. ignore sub-agent waits).
-  setPaneWaiting(tty, event === 'waiting', event === 'waiting' ? message || fromTemplate : '');
+  // waiting -> yellow menu bar status (+ the popup); done clears it. A suppressed
+  // (alert=false) waiting must NOT light up the popup, so only set it when alert.
+  // "done" always clears regardless of alert. Pass the reason text for filtering.
+  setPaneWaiting(tty, event === 'waiting' && alert, event === 'waiting' ? message || fromTemplate : '');
   const pane = readPaneSetting(tty);
 
   // Name this pane in the read-out, most-reliable identity first:
@@ -254,7 +260,7 @@ export const emit = ({ provider = 'default', event = 'done', label = '', message
     }
   }
 
-  if (!muted) {
+  if (alert && !muted) {
     playSound(soundName, outVol);
     if (config.speak && outVol > 0) {
       let spoken = false;
@@ -266,7 +272,7 @@ export const emit = ({ provider = 'default', event = 'done', label = '', message
     }
   }
 
-  if (!muted || config.bannerWhenMuted) {
+  if (alert && (!muted || config.bannerWhenMuted)) {
     const waiting = event === 'waiting';
     banner(
       waiting ? `⏳ ${label || 'input'}` : `✓ ${label || 'done'}`,
@@ -283,7 +289,7 @@ export const emit = ({ provider = 'default', event = 'done', label = '', message
   // Visual highlight of *this* terminal window so a waiting pane stands out
   // among many. Always best-effort, and applied even when muted (you still want
   // to see which window needs you during a meeting).
-  if (config.highlightWaiting) {
+  if (alert && config.highlightWaiting) {
     try {
       if (event === 'waiting') highlightWaiting(label, config.highlightColor);
       else if (event === 'done') clearHighlight();

package/src/providers/claude.mjs

@@ -44,13 +44,17 @@ const entry = (node, cliPath, event) => ({
   ],
 });
 
-const EVENTS = { Notification: 'waiting', Stop: 'done' };
+// SubagentStop lets the user (optionally) be alerted when a sub-agent finishes,
+// distinctly from the main turn's Stop. Off by default (see notify kinds), but
+// wired so the toggle works. Only the CORE events count toward "wired" status.
+const EVENTS = { Notification: 'waiting', Stop: 'done', SubagentStop: 'subagent-done' };
+const CORE_EVENTS = ['Notification', 'Stop'];
 
 export const status = () => {
   if (!detect()) return { installed: false, wired: false };
   const data = load();
   const hooks = data.hooks || {};
-  const wired = Object.keys(EVENTS).every((k) =>
+  const wired = CORE_EVENTS.every((k) =>
     (hooks[k] || []).some((g) => (g.hooks || []).some((h) => isOurs(h.command)))
   );
   return { installed: true, wired };

package/src/state.mjs

@@ -234,6 +234,24 @@ export const setPopupImage = (p) => {
   else rmSync(popupImagePath(), { force: true });
 };
 
+// Per-kind notification toggles — which kinds of agent event actually alert
+// (sound / banner / voice / popup). Lets you, e.g., keep "input waiting" but
+// silence "done", or enable "sub-agent done". Disabled kinds still update the
+// waiting state correctly (so a suppressed "done" still clears a popup).
+export const NOTIFY_KINDS = ['input', 'permission', 'info', 'done', 'subagent-done'];
+const NOTIFY_KIND_DEFAULTS = { input: true, permission: true, info: false, done: true, 'subagent-done': false };
+const notifyKindsPath = () => join(stateDir(), 'notify-kinds.json');
+export const getNotifyKinds = () => ({ ...NOTIFY_KIND_DEFAULTS, ...readJson(notifyKindsPath(), {}) });
+export const isNotifyKindEnabled = (kind) => {
+  const k = getNotifyKinds();
+  return kind in k ? !!k[kind] : true; // unknown kinds default to alerting
+};
+export const setNotifyKind = (kind, on) => {
+  const all = readJson(notifyKindsPath(), {});
+  all[kind] = !!on;
+  writeJson(notifyKindsPath(), all);
+};
+
 // Popup notify threshold: only show the popup once a pane has been waiting this
 // many seconds (0 = immediately) — so transient / sub-agent waits don't nag.
 const popupDelayPath = () => join(stateDir(), 'popup-delay');