ai-notify 0.4.4 → 0.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-notify",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "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/notify.mjs

@@ -184,11 +184,22 @@ export const emit = ({ provider = 'default', event = 'done', label = '', message
   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;
+  // Name this pane in the read-out, most-reliable identity first:
+  //   1. $AI_NOTIFY_LABEL — set in the pane's shell, inherited by the hook even
+  //      when the agent runs it detached (no tty). Always spoken: setting it is
+  //      explicit intent. The reliable way to name a pane for Claude Code.
+  //   2. pane.speakName — set from the menu bar, keyed by tty. Works only when
+  //      the hook resolves to the pane's tty (see controllingTty's tree walk).
+  //   3. the auto-derived label — only when speakLabel is on (else slow filler).
+  const envName = (process.env.AI_NOTIFY_LABEL || '').trim();
+  const spokenName = envName || pane.speakName || (config.speakLabel === true && label ? label : '');
+  // Join the pane name to the read-out as the SUBJECT. Japanese needs the は
+  // topic particle ("ジョンは、…") — a bare comma ("ジョン、…") reads as calling
+  // out TO John, not saying John is the one finishing / waiting. Other languages
+  // just get a comma.
+  const isJa = (s) => /[぀-ヿ㐀-鿿ｦ-ﾟ]/.test(s); // kana / kanji / half-width kana
+  const joinName = (name, body) => (name ? `${name}${isJa(body) ? 'は、' : ', '}${body}` : body);
+  const speakText = joinName(spokenName, spokenBody);
 
   // Per-pane voice (precedence: $AI_NOTIFY_* env > this pane's pick > global).
   const tts = pane.tts || config.tts;
@@ -233,7 +244,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 (spokenName) outText = `${spokenName}、${outText}`;
+    if (spokenName) outText = joinName(spokenName, outText);
     if (tts === 'voicevox') {
       const sm = ts.styleMap || voicevox.resolveStyles(outSpeaker, config.voicevox?.url);
       const axis = tsundere.axisFor(eff);

package/src/util.mjs

@@ -40,18 +40,34 @@ export const isEphemeralInstall = (cliPath) => /[/\\]_npx[/\\]/.test(cliPath);
 
 export const MARKER = 'ai-notify'; // substring used to detect our own wiring
 
-// The controlling terminal of this process (e.g. "/dev/ttys010"), which is
-// stable per terminal pane — used to scope per-pane settings. null if none.
+// The controlling terminal of the agent's pane (e.g. "/dev/ttys010"), used to
+// scope per-pane settings. Returns null if none can be found.
+//
+// Agents often run the notify hook detached (Claude Code wires it `async`), so
+// the hook process itself frequently has NO controlling tty — but its parent
+// (the agent, e.g. `claude`) still owns the pane's terminal. So we walk up the
+// process tree until we find a real tty, which makes the hook resolve to the
+// SAME tty the menu bar lists the pane under (it scans the agent process).
 export const controllingTty = () => {
-  try {
-    const t = execFileSync('ps', ['-o', 'tty=', '-p', String(process.pid)], {
-      stdio: ['ignore', 'pipe', 'ignore'],
-    })
-      .toString()
-      .trim();
-    if (!t || t === '??' || t === '?') return null;
-    return t.startsWith('/dev/') ? t : `/dev/${t}`;
-  } catch {
-    return null;
+  let pid = process.pid;
+  for (let depth = 0; depth < 8 && pid > 1; depth++) {
+    try {
+      const line = execFileSync('ps', ['-o', 'tty=', '-o', 'ppid=', '-p', String(pid)], {
+        stdio: ['ignore', 'pipe', 'ignore'],
+      })
+        .toString()
+        .trim();
+      if (!line) return null;
+      // "ttys010  1234"  or  "??  1234" (no controlling tty for this pid)
+      const sp = line.lastIndexOf(' ');
+      const tty = line.slice(0, sp).trim();
+      const ppid = parseInt(line.slice(sp + 1).trim(), 10);
+      if (tty && tty !== '??' && tty !== '?') return tty.startsWith('/dev/') ? tty : `/dev/${tty}`;
+      if (!Number.isFinite(ppid) || ppid <= 1) return null;
+      pid = ppid;
+    } catch {
+      return null;
+    }
   }
+  return null;
 };