@herbertgao/pi-extensions 2026.9.20 → 2026.10.1

package/node_modules/@dietrichgebert/ponytail/scripts/uninstall.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 // ponytail — removes state ponytail wrote outside the plugin's own files:
-// the mode flag, the config file, the statusLine entry it added to
-// settings.json, and its entries in ~/.cursor/hooks.json. Plugin files
-// themselves are removed by each host's own uninstall command (see README);
-// this only cleans up what those commands can't see.
+// the mode flag, the config file, the statusline script copy, the
+// statusLine entry it added to settings.json, and its entries in
+// ~/.cursor/hooks.json. Plugin files themselves are removed by each host's
+// own uninstall command (see README); this only cleans up what those
+// commands can't see.
 
 const fs = require('fs');
 const os = require('os');
@@ -11,7 +12,7 @@ const path = require('path');
 const { getConfigPath, getClaudeDir } = require('../hooks/ponytail-config');
 const cursorHooks = require('./cursor-hooks');
 
-const STATUSLINE_SCRIPT = 'ponytail-statusline';
+const STATUSLINE_SCRIPT = /(?:^|[\s"'\\/])ponytail-statusline\.(?:sh|ps1)(?=$|[\s"'])/;
 
 function removeIfExists(filePath, label) {
   try {
@@ -23,8 +24,21 @@ function removeIfExists(filePath, label) {
 }
 
 removeIfExists(path.join(getClaudeDir(), '.ponytail-active'), 'mode flag');
+removeIfExists(path.join(getClaudeDir(), '.ponytail-statusline-nudged'), 'statusline nudge flag');
 removeIfExists(path.join(os.homedir(), '.cursor', '.ponytail-active'), 'Cursor mode flag');
+removeIfExists(path.join(os.homedir(), '.qoder', '.ponytail-active'), 'Qoder mode flag');
+for (const dir of [path.join(getClaudeDir(), 'ponytail-modes'), path.join(os.homedir(), '.cursor', 'ponytail-modes'), path.join(process.env.CODEBUDDY_CONFIG_DIR || path.join(os.homedir(), '.codebuddy'), 'ponytail-modes')]) {
+  if (fs.existsSync(dir)) {
+    fs.rmSync(dir, { recursive: true });
+    console.log(`Removed per-project mode flags: ${dir}`);
+  }
+}
+removeIfExists(path.join(process.env.CODEBUDDY_CONFIG_DIR || path.join(os.homedir(), '.codebuddy'), '.ponytail-active'), 'CodeBuddy mode flag');
 removeIfExists(getConfigPath(), 'config file');
+// Statusline script copies the activate hook keeps in the config dir (#1032).
+for (const name of ['ponytail-statusline.sh', 'ponytail-statusline.ps1']) {
+  removeIfExists(path.join(getClaudeDir(), name), 'statusline script');
+}
 
 // Cursor hooks (#817): drop only ponytail's entries from ~/.cursor/hooks.json,
 // keep every other hook the user configured there.
@@ -49,12 +63,12 @@ try {
   // (e.g. caveman && ponytail), keep the other plugin's command intact.
   // ponytail: splits on && / ; to detect other segments — good enough; a user
   // piping statuslines together is on their own.
-  if (typeof cmd === 'string' && cmd.includes(STATUSLINE_SCRIPT)) {
+  if (typeof cmd === 'string' && STATUSLINE_SCRIPT.test(cmd)) {
     const parts = cmd
       .split(/&&|;/)
       .map((s) => s.trim())
       .filter(Boolean);
-    const others = parts.filter((s) => !s.includes(STATUSLINE_SCRIPT));
+    const others = parts.filter((s) => !STATUSLINE_SCRIPT.test(s));
     if (others.length === 0) {
       delete settings.statusLine;
       fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');

package/node_modules/@dietrichgebert/ponytail/skills/plugin.json

@@ -0,0 +1,5 @@
+{
+  "name": "ponytail",
+  "description": "Lazy senior dev mode. Forces the simplest solution that works: YAGNI, stdlib first, one line over fifty.",
+  "skills": "."
+}

package/node_modules/@dietrichgebert/ponytail/skills/ponytail-audit/SKILL.md

@@ -19,6 +19,7 @@ Same as ponytail-review:
 - `delete:` dead code, unused flexibility, speculative feature. Replacement: nothing.
 - `stdlib:` hand-rolled thing the standard library ships. Name the function.
 - `native:` dependency or code doing what the platform already does. Name the feature.
+- `reuse:` equivalent helper, util, or pattern already in this repo. Name the path.
 - `yagni:` abstraction with one implementation, config nobody sets, layer with one caller.
 - `shrink:` same logic, fewer lines. Show the shorter form.
 
@@ -26,11 +27,15 @@ Same as ponytail-review:
 
 Deps the stdlib or platform already ships, single-implementation interfaces,
 factories with one product, wrappers that only delegate, files exporting one
-thing, dead flags and config, hand-rolled stdlib.
+thing, dead flags and config, hand-rolled stdlib, helpers duplicating an
+equivalent that already lives in this repo.
+Before emitting `delete:`, grep the whole tree for the symbol, including tests,
+fixtures and string or dynamic references.
 
 ## Output
 
-One line per finding, ranked: `<tag> <what to cut>. <replacement>. [path]`.
+One line per finding, numbered and ranked: `<N>. <tag> <what to cut>. <replacement>. [path]`,
+so the user can say "fix 2 and 5".
 End with `net: -<N> lines, -<M> deps possible.` Nothing to cut: `Lean already. Ship.`
 
 ## Boundaries

package/node_modules/@dietrichgebert/ponytail/skills/ponytail-debt/SKILL.md

@@ -17,7 +17,7 @@ can't quietly become permanent.
 Grep the repo for comment markers, skipping `node_modules`, `.git`, and build
 output:
 
-`grep -rnE '(#|//) ?ponytail:' .`  (add other comment prefixes if your stack uses them)
+`grep -rnE --exclude-dir=.git --exclude-dir=node_modules --exclude-dir=dist --exclude-dir=build '(#|//|/[*]) ?ponytail:' .`  (add other comment prefixes if your stack uses them)
 
 Each hit is one ledger row. The comment prefix keeps prose that merely mentions
 the convention out of the ledger.

package/node_modules/@dietrichgebert/ponytail/skills/ponytail-gain/SKILL.md

@@ -2,7 +2,7 @@
 name: ponytail-gain
 description: >
   Show ponytail's measured impact as a compact scoreboard: less code, less
-  cost, more speed, from the benchmark medians. One-shot display, not a
+  cost, more speed, from the agentic benchmark averages. One-shot display, not a
   persistent mode, and not a per-repo number. Trigger: /ponytail-gain,
   "ponytail gain", "what does ponytail save", "show ponytail impact",
   "ponytail scoreboard".
@@ -13,24 +13,26 @@ description: >
 Display this scoreboard when invoked. One-shot: do NOT change mode, write flag
 files, or persist anything.
 
-The figures are the published benchmark medians (5 everyday tasks: email
-validator, debounce, CSV sum, countdown timer, rate limiter; three models:
-Haiku, Sonnet, Opus). They are measured, not computed from the current repo.
-Source: `benchmarks/` and the README.
+The figures are the published agentic benchmark averages: a headless Claude
+Code session (Haiku 4.5) doing 12 feature tickets on a real FastAPI + React
+repo, each task averaged over 4 runs, against the same agent without the
+skill, plus 6 safety tasks. They are measured, not computed from the current
+repo. Source: `benchmarks/results/2026-06-18-agentic.md` and the README.
 
 ## Scoreboard
 
-Render plain ASCII bars. The bar length shows the measured range; the label
-carries the exact figure:
+Render plain ASCII bars. The bar length shows ponytail as a share of the
+no-skill baseline; the label carries the exact figure:
 
 ```
-  ponytail gain                     benchmark median · 5 tasks · 3 models
+  ponytail gain                  benchmark average · 12 tasks · Haiku 4.5
 
-  Lines of code   no-skill  ████████████████████  100%
-                  ponytail  ██▌·················    6–20%   ▼ 80–94%
-  Cost            no-skill  ████████████████████  100%
-                  ponytail  █████▌··············   23–53%  ▼ 47–77%
-  Speed           ponytail  ▸ 3–6× faster
+  no-skill        ████████████████████  100%
+  Lines of code   █████████···········   46%   ▼ 54%
+  Tokens          ████████████████····   78%   ▼ 22%
+  Cost            ████████████████····   80%   ▼ 20%
+  Time            ███████████████·····   73%   ▼ 27%
+  Safety kept     100%  (validation, error handling, security)
 
   This repo:  /ponytail-debt  (shortcuts you deferred)
               /ponytail-audit (what's still cuttable)
@@ -38,7 +40,7 @@ carries the exact figure:
 
 ## Honesty boundary
 
-These are benchmark medians, not this repo. NEVER print a per-repo savings
+These are benchmark averages, not this repo. NEVER print a per-repo savings
 number ("you saved X lines/tokens here"): the unbuilt version was never
 written, so there is no real baseline to subtract from in a live repo. The
 only real per-repo figures come from `/ponytail-debt` (a counted ledger), and

package/node_modules/@dietrichgebert/ponytail/skills/ponytail-help/SKILL.md

@@ -32,9 +32,9 @@ Level sticks until changed or session end.
 | **ponytail-gain** | `/ponytail-gain` | Measured-impact scoreboard: less code, less cost, more speed. |
 | **ponytail-help** | `/ponytail-help` | This card. |
 
-Codex uses `@ponytail`, `@ponytail-review`, and `@ponytail-help`; Claude Code
-and OpenCode use the slash-command forms above (OpenCode ships all six as
-slash commands).
+In Codex CLI and the IDE extension, invoke skills with `$ponytail:ponytail`,
+`$ponytail:ponytail-review`, or `$ponytail:ponytail-help`. Claude Code and OpenCode use the
+slash-command forms above (OpenCode ships all six as slash commands).
 
 ## Deactivate
 

package/node_modules/@dietrichgebert/ponytail/skills/ponytail-review/SKILL.md

@@ -15,31 +15,36 @@ to cut, what replaces it. The diff's best outcome is getting shorter.
 
 ## Format
 
-`L<line>: <tag> <what>. <replacement>.`, or `<file>:L<line>: ...` for
-multi-file diffs.
+`<N>. L<line>: <tag> <what>. <replacement>.`, or `<N>. <file>:L<line>: ...` for
+multi-file diffs. Number findings `1.`, `2.`, ... across the whole report, so the
+user can say "fix 2 and 5".
 
 Tags:
 
 - `delete:` dead code, unused flexibility, speculative feature. Replacement: nothing.
 - `stdlib:` hand-rolled thing the standard library ships. Name the function.
 - `native:` dependency or code doing what the platform already does. Name the feature.
+- `reuse:` equivalent helper, util, or pattern already in this repo. Name the path.
 - `yagni:` abstraction with one implementation, config nobody sets, layer with one caller.
 - `shrink:` same logic, fewer lines. Show the shorter form.
 
+
 ## Examples
 
 ❌ "This EmailValidator class might be more complex than necessary, have you
 considered whether all these validation rules are needed at this stage?"
 
-✅ `L12-38: stdlib: 27-line validator class. "@" in email, 1 line, real validation is the confirmation mail.`
+✅ `1. L12-38: stdlib: 27-line validator class. "@" in email, 1 line, real validation is the confirmation mail.`
+
+✅ `2. L4: native: moment.js imported for one format call. Intl.DateTimeFormat, 0 deps.`
 
-✅ `L4: native: moment.js imported for one format call. Intl.DateTimeFormat, 0 deps.`
+✅ `3. L18-29: reuse: slugify helper duplicates src/lib/slug.ts slugify. Delete it, import the existing one.`
 
-✅ `repo.py:L88: yagni: AbstractRepository with one implementation. Inline it until a second one exists.`
+✅ `4. repo.py:L88: yagni: AbstractRepository with one implementation. Inline it until a second one exists.`
 
-✅ `L52-71: delete: retry wrapper around an idempotent local call. Nothing replaces it.`
+✅ `5. L52-71: delete: retry wrapper around an idempotent local call. Nothing replaces it.`
 
-✅ `L30-44: shrink: manual loop builds dict. dict(zip(keys, values)), 1 line.`
+✅ `6. L30-44: shrink: manual loop builds dict. dict(zip(keys, values)), 1 line.`
 
 ## Scoring
 

package/node_modules/@herbertgao/pi-bark/README.md

@@ -1,6 +1,6 @@
 # @herbertgao/pi-bark
 
-Bark notifications for user-facing Pi sessions. It sends a notification when Pi fully settles and when [`@juicesharp/rpiv-ask-user-question`](https://github.com/juicesharp/rpiv-mono) opens a questionnaire. Requests follow Bark's official [POST form API](https://github.com/Finb/Bark/blob/master/docs/en-us/tutorial.md#request-methods).
+Bark notifications for user-facing Pi sessions. It sends a notification when Pi fully settles and when Pi blocks on a user-facing dialog — an approval, a select, an input prompt, a custom panel, or an [`@juicesharp/rpiv-ask-user-question`](https://github.com/juicesharp/rpiv-mono) questionnaire. Requests follow Bark's official [POST form API](https://github.com/Finb/Bark/blob/master/docs/en-us/tutorial.md#request-methods).
 
 ## Install
 
@@ -21,17 +21,53 @@ Create `$PI_CODING_AGENT_DIR/bark.json` (normally `~/.pi/agent/bark.json`):
   "locale": "zh-CN",
   "events": {
     "agentSettled": true,
-    "askUserQuestion": true
+    "needsInput": true
   },
   "params": {
     "group": "pi",
     "icon": "https://raw.githubusercontent.com/HerbertGao/pi-extensions/master/packages/pi-bark/assets/pi-icon.png"
   },
+  "title": {
+    "source": "session",
+    "maxLength": 40
+  },
+  "minDurationMs": 30000,
   "timeoutMs": 4000
 }
 ```
 
-`endpoint` is required. `locale` accepts `auto` (default), `zh-CN`, `zh-TW`, or `en`; unsupported languages fall back to English. `params` accepts additional Bark POST parameters such as `group`, `sound`, `icon`, and `level`; dynamic `title` and `body` values always take precedence. Set `"enabled": false` to disable all notifications without removing the package.
+`endpoint` is required. `locale` accepts `auto` (default), `zh-CN`, `zh-TW`, or `en`; unsupported languages fall back to English. `params` accepts additional Bark POST parameters such as `group`, `sound`, `icon`, and `level`; dynamic `title` and `body` values always take precedence. Set `"enabled": false` to disable all notifications without removing the package. `events.needsInput` covers every blocking dialog; `events.askUserQuestion` is the older name and is still honored as an alias.
+
+### Session titles
+
+The default `title.source` is `"fixed"`, which keeps Pi's localized copy (`✅ Pi 跑完了` / `🟡 Pi 等你回答`) as the notification title. Set it to `"session"` to title the notification with the session instead — Pi's session name when one is set, otherwise the first user message, which is the label hosts such as Paseo already show for the session:
+
+```json
+{ "title": { "source": "session", "maxLength": 40 } }
+```
+
+`maxLength` defaults to `40`, counts Unicode code points without splitting emoji surrogate pairs, and includes the ellipsis. Non-finite values or values below `1` fall back to the default. With `"session"`, the event state moves to the first line of the body:
+
+```
+title:  Please reply with exactly the single wo…
+body:   ✅ 已完成 · 用时 2m14s
+        💻 MacBook Pro M1 Max
+        📁 /Users/herbertgao/VSCodeProject/pi
+```
+
+The title is resolved when the notification is sent, so a session that is renamed or that has only just received its first message still gets the right one.
+
+### Short runs
+
+`minDurationMs` defaults to `0` (always notify). Raise it to skip the settle notification when the run finished faster, so one-line replies stop producing notification noise:
+
+```json
+{ "minDurationMs": 30000 }
+```
+
+`minDurationMs` never suppresses needs-input notifications. Input notifications wait 400ms so an unsupported, cancelled, or quickly answered UI call does not send a stale alert. Pending alerts are cancelled when the prompt, run, or session ends. Questionnaire fallback events use a 1.5s de-duplication window because they have no shared dialog ID; separate fallback-only prompts inside that window may be merged. Native dialogs are tracked independently.
+
+Completion notifications await the Bark request before Pi finishes settling, including during session switching or exit. This can delay those operations up to `timeoutMs` (default 4 seconds). Errors and timeouts are ignored; delivery is best-effort, with no persistent queue or retries.
 
 The notification body uses `💻` for the configured machine name and `📁` for Pi's full working directory. Questionnaire text is intentionally not sent because it may contain sensitive context. Only sessions with a user-facing UI notify, so nested `pi-subagents` sessions do not create duplicate pushes.
 

package/node_modules/@herbertgao/pi-bark/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-bark",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "description": "Send Bark notifications when Pi finishes or needs user input.",
   "keywords": [
     "bark",

package/node_modules/@herbertgao/pi-bark/src/index.ts

@@ -1,39 +1,75 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent"
+import type {
+  ExtensionAPI,
+  ExtensionContext,
+} from "@earendil-works/pi-coding-agent"
 import { readFileSync } from "node:fs"
 import { homedir, hostname } from "node:os"
 import { join } from "node:path"
 
 const ASK_USER_PROMPT_EVENT = "rpiv:ask-user:prompt"
+/** Give closed/unsupported UI calls time to finish before notifying. */
+const NEEDS_INPUT_DELAY_MS = 400
+// ponytail: fallback events lack dialog IDs; this window can merge distinct fallback prompts.
+// Replace it with dialog IDs if the event source provides them.
+const NEEDS_INPUT_DEDUP_MS = 1_500
 const DEFAULT_TIMEOUT_MS = 4_000
+const DEFAULT_MAX_TITLE_LENGTH = 40
+const DEFAULT_MIN_DURATION_MS = 0
 
 export type BarkLocale = "en" | "zh-CN" | "zh-TW"
-type NotificationEvent = "agentSettled" | "askUserQuestion"
+type NotificationEvent = "agentSettled" | "needsInput"
+export type BarkTitleSource = "fixed" | "session"
 
-const COPY: Record<BarkLocale, Record<NotificationEvent, string>> = {
+const COPY: Record<
+  BarkLocale,
+  {
+    agentSettled: string
+    settledWithDuration: (duration: string) => string
+    needsInput: string
+    needsInputBody: string
+  }
+> = {
   en: {
     agentSettled: "✅ Pi finished",
-    askUserQuestion: "🟡 Pi needs your input",
+    settledWithDuration: (duration) => `✅ Pi finished · ${duration}`,
+    needsInput: "🟡 Pi needs your input",
+    needsInputBody: "🟡 Needs your reply",
   },
   "zh-CN": {
     agentSettled: "✅ Pi 跑完了",
-    askUserQuestion: "🟡 Pi 等你回答",
+    settledWithDuration: (duration) => `✅ 已完成 · 用时 ${duration}`,
+    needsInput: "🟡 Pi 等你回答",
+    needsInputBody: "🟡 需要你回复",
   },
   "zh-TW": {
     agentSettled: "✅ Pi 已完成",
-    askUserQuestion: "🟡 Pi 等你回覆",
+    settledWithDuration: (duration) => `✅ 已完成 · 耗時 ${duration}`,
+    needsInput: "🟡 Pi 等你回覆",
+    needsInputBody: "🟡 需要你回覆",
   },
 }
 
+export interface BarkTitleOptions {
+  /** "fixed" keeps the localized Pi copy as the title (default). "session" uses the session title. */
+  source: BarkTitleSource
+  /** Maximum title length before truncation. */
+  maxLength: number
+}
+
 export interface BarkConfig {
   endpoint: string
   machine: string
   locale: BarkLocale
   events: {
     agentSettled: boolean
-    askUserQuestion: boolean
+    /** Any blocking user-facing dialog: approval, select, input, custom, ask_user_question. */
+    needsInput: boolean
   }
   params: Record<string, string | number | boolean>
   timeoutMs: number
+  title: BarkTitleOptions
+  /** Skip the settle notification when the run finished faster than this. 0 notifies always. */
+  minDurationMs: number
 }
 
 export function getConfigPath(): string {
@@ -61,6 +97,85 @@ export function notificationTitle(
   return COPY[locale][event]
 }
 
+/** Render a bounded, human-readable duration such as `45s`, `2m14s`, or `1h3m`. */
+export function formatDuration(ms: number): string {
+  const total = Math.max(0, Math.round(ms / 1000))
+  if (total < 60) return `${total}s`
+  const minutes = Math.floor(total / 60)
+  const seconds = total % 60
+  if (minutes < 60) return seconds ? `${minutes}m${seconds}s` : `${minutes}m`
+  const hours = Math.floor(minutes / 60)
+  const remainder = minutes % 60
+  return remainder ? `${hours}h${remainder}m` : `${hours}h`
+}
+
+function normalizeText(value: unknown): string {
+  if (typeof value !== "string") return ""
+  return value
+    .replace(/[\r\n\t]+/g, " ")
+    .replace(/\s{2,}/g, " ")
+    .trim()
+}
+
+export function truncateTitle(text: string, maxLength: number): string {
+  const characters = Array.from(normalizeText(text))
+  if (!maxLength || characters.length <= maxLength) return characters.join("")
+  return `${characters
+    .slice(0, maxLength - 1)
+    .join("")
+    .trimEnd()}…`
+}
+
+/** Read the text of a message content value (string or content-part array). */
+export function readMessageText(content: unknown): string {
+  if (typeof content === "string") return content
+  if (!Array.isArray(content)) return ""
+  return content
+    .filter(
+      (part) =>
+        part &&
+        typeof part === "object" &&
+        (part as { type?: string }).type === "text" &&
+        typeof (part as { text?: unknown }).text === "string",
+    )
+    .map((part) => (part as { text: string }).text)
+    .join(" ")
+}
+
+/**
+ * Pi session name if the user set one, else the first user message — the same
+ * label most hosts show for the session.
+ */
+export function resolveSessionTitle(
+  ctx: Pick<ExtensionContext, "sessionManager"> | undefined,
+  getSessionName?: () => string | undefined,
+): string {
+  try {
+    const named = getSessionName?.()
+    if (typeof named === "string" && named.trim()) return named.trim()
+  } catch {
+    // fall through
+  }
+  try {
+    const manager = ctx?.sessionManager
+    const named = manager?.getSessionName?.()
+    if (typeof named === "string" && named.trim()) return named.trim()
+  } catch {
+    // fall through
+  }
+  try {
+    const entries = ctx?.sessionManager?.getEntries?.() ?? []
+    for (const entry of entries) {
+      if (entry?.type !== "message" || entry.message?.role !== "user") continue
+      const text = normalizeText(readMessageText(entry.message.content))
+      if (text) return text
+    }
+  } catch {
+    // fall through
+  }
+  return ""
+}
+
 export function normalizeConfig(input: unknown): BarkConfig | undefined {
   if (!input || typeof input !== "object") return undefined
   const source = input as Record<string, unknown>
@@ -92,6 +207,10 @@ export function normalizeConfig(input: unknown): BarkConfig | undefined {
     source.timeoutMs > 0
       ? source.timeoutMs
       : DEFAULT_TIMEOUT_MS
+  const titleSource =
+    source.title && typeof source.title === "object"
+      ? (source.title as Record<string, unknown>)
+      : {}
 
   return {
     endpoint: source.endpoint,
@@ -102,10 +221,27 @@ export function normalizeConfig(input: unknown): BarkConfig | undefined {
     locale: resolveLocale(source.locale),
     events: {
       agentSettled: eventSource.agentSettled !== false,
-      askUserQuestion: eventSource.askUserQuestion !== false,
+      // `askUserQuestion` is the pre-0.2 name and is still honored.
+      needsInput:
+        (eventSource.needsInput ?? eventSource.askUserQuestion) !== false,
     },
     params,
     timeoutMs,
+    title: {
+      source: titleSource.source === "session" ? "session" : "fixed",
+      maxLength:
+        typeof titleSource.maxLength === "number" &&
+        Number.isFinite(titleSource.maxLength) &&
+        titleSource.maxLength >= 1
+          ? Math.floor(titleSource.maxLength)
+          : DEFAULT_MAX_TITLE_LENGTH,
+    },
+    minDurationMs:
+      typeof source.minDurationMs === "number" &&
+      Number.isFinite(source.minDurationMs) &&
+      source.minDurationMs >= 0
+        ? source.minDurationMs
+        : DEFAULT_MIN_DURATION_MS,
   }
 }
 
@@ -145,34 +281,158 @@ export default function piBark(pi: ExtensionAPI): void {
   let config: BarkConfig | undefined
   let cwd = process.cwd()
   let userFacingSession = false
+  let cachedTitle = ""
+  let runStartedAt: number | null = null
+  let pendingNeedsInput: ReturnType<typeof setTimeout> | undefined
+  let uiPromptActive = false
+  let lastFallbackAt = 0
+  let lastUIPromptEndAt = 0
 
-  const notify = async (title: string): Promise<void> => {
+  const refreshTitle = (ctx: ExtensionContext | undefined): string => {
+    const resolved = resolveSessionTitle(ctx, () => pi.getSessionName?.())
+    if (resolved) cachedTitle = resolved
+    return cachedTitle
+  }
+
+  const titleFor = (
+    ctx: ExtensionContext | undefined,
+    event: NotificationEvent,
+  ): string => {
+    if (!config) return ""
+    if (config.title.source === "fixed")
+      return notificationTitle(config.locale, event)
+    const session = ctx ? refreshTitle(ctx) : cachedTitle
+    return truncateTitle(session || config.machine, config.title.maxLength)
+  }
+
+  const notify = async (title: string, body: string): Promise<void> => {
     if (!config || !userFacingSession) return
     try {
-      await sendBark(config, title, formatBody(config, cwd))
+      await sendBark(config, title, body)
     } catch {
       // Notifications are best-effort and must never interrupt Pi.
     }
   }
 
+  const cancelNeedsInput = () => {
+    clearTimeout(pendingNeedsInput)
+    pendingNeedsInput = undefined
+  }
+
+  const resetNeedsInput = () => {
+    cancelNeedsInput()
+    uiPromptActive = false
+    lastFallbackAt = 0
+    lastUIPromptEndAt = 0
+  }
+
+  const scheduleNeedsInput = (ctx: ExtensionContext | undefined) => {
+    if (!config?.events.needsInput || !userFacingSession) return
+    cancelNeedsInput()
+    pendingNeedsInput = setTimeout(() => {
+      pendingNeedsInput = undefined
+      if (!config?.events.needsInput || !userFacingSession) return
+      if (!ctx) lastFallbackAt = Date.now()
+      const prefix =
+        config.title.source === "session"
+          ? `${COPY[config.locale].needsInputBody}\n`
+          : ""
+      void notify(
+        titleFor(ctx, "needsInput"),
+        `${prefix}${formatBody(config, cwd)}`,
+      )
+    }, NEEDS_INPUT_DELAY_MS)
+  }
+
   const unsubscribeAskUser = pi.events.on(ASK_USER_PROMPT_EVENT, () => {
-    if (config?.events.askUserQuestion)
-      void notify(notificationTitle(config.locale, "askUserQuestion"))
+    const now = Date.now()
+    if (
+      uiPromptActive ||
+      now - lastUIPromptEndAt < NEEDS_INPUT_DEDUP_MS ||
+      now - lastFallbackAt < NEEDS_INPUT_DEDUP_MS
+    )
+      return
+    scheduleNeedsInput(undefined)
+  })
+
+  // Native prompt lifecycle cancels notifications for UI calls that finish
+  // without opening a dialog, or that the user answers before the grace period.
+  pi.on("ui_prompt_start", (_event, ctx) => {
+    cwd = ctx.cwd
+    uiPromptActive = true
+    cancelNeedsInput()
+    if (Date.now() - lastFallbackAt >= NEEDS_INPUT_DEDUP_MS)
+      scheduleNeedsInput(ctx)
+  })
+
+  pi.on("ui_prompt_end", () => {
+    uiPromptActive = false
+    lastFallbackAt = 0
+    lastUIPromptEndAt = Date.now()
+    cancelNeedsInput()
   })
 
   pi.on("session_start", (_event, ctx) => {
+    resetNeedsInput()
     config = loadConfig()
     cwd = ctx.cwd
     userFacingSession = ctx.hasUI
+    runStartedAt = null
+    cachedTitle = ""
+    refreshTitle(ctx)
+  })
+
+  // Pi persists the user entry at message_end, not on submit, so the title cache has to be
+  // refreshed on message/turn events rather than only at agent_start.
+  pi.on("session_info_changed", (_event, ctx) => {
+    refreshTitle(ctx)
   })
 
-  pi.on("agent_settled", (_event, ctx) => {
+  pi.on("message_end", (_event, ctx) => {
+    refreshTitle(ctx)
+  })
+
+  pi.on("turn_end", (_event, ctx) => {
+    refreshTitle(ctx)
+  })
+
+  pi.on("agent_start", (_event, ctx) => {
+    if (runStartedAt === null) {
+      resetNeedsInput()
+      runStartedAt = Date.now()
+    }
+    refreshTitle(ctx)
+  })
+
+  pi.on("agent_settled", async (_event, ctx) => {
     cwd = ctx.cwd
-    if (config?.events.agentSettled)
-      void notify(notificationTitle(config.locale, "agentSettled"))
+    resetNeedsInput()
+    const startedAt = runStartedAt
+    runStartedAt = null
+    if (!config?.events.agentSettled) return
+
+    const elapsed = startedAt === null ? null : Date.now() - startedAt
+    if (elapsed !== null && elapsed < config.minDurationMs) return
+
+    const copy = COPY[config.locale]
+    const prefix =
+      config.title.source === "session"
+        ? `${
+            elapsed === null
+              ? copy.agentSettled
+              : copy.settledWithDuration(formatDuration(elapsed))
+          }\n`
+        : ""
+    // Await the request so a settle that races process shutdown still delivers.
+    await notify(
+      titleFor(ctx, "agentSettled"),
+      `${prefix}${formatBody(config, cwd)}`,
+    )
   })
 
   pi.on("session_shutdown", () => {
+    userFacingSession = false
+    resetNeedsInput()
     unsubscribeAskUser()
   })
 }