@herbertgao/pi-extensions 2026.9.20 → 2026.10.0

package/README.md

@@ -8,7 +8,7 @@ Aggregate installer for HerbertGao-maintained Pi extensions and pinned upstream
 pi install npm:@herbertgao/pi-extensions
 ```
 
-Requires Node.js 24 or newer and Pi 0.85.1 or newer.
+Requires Node.js 24 or newer and Pi 1.0.4 or newer.
 
 ## Native MCP
 
@@ -18,14 +18,14 @@ When migrating from `pi-mcp-adapter`, remove any standalone adapter install as w
 
 ## Bundled extensions
 
-The package bundles 5 active `@herbertgao/*` child packages—`pi-bark`, `pi-cc-extensions`, `resume-from`, `pi-subagents`, and `sol-pi`—plus the following upstream packages under their original names:
+The package bundles 4 active `@herbertgao/*` child packages—`pi-bark`, `pi-cc-extensions`, `pi-subagents`, and `sol-pi`—plus the following upstream packages under their original names:
 
-- `pi-antigravity@0.8.1`
+- `pi-antigravity@0.9.0`
 - `@dietrichgebert/ponytail@4.10.0`
-- `@juicesharp/rpiv-ask-user-question@2.11.0`
+- `@juicesharp/rpiv-ask-user-question@2.12.0`
 - `@narumitw/pi-btw@0.61.1`
 - `@narumitw/pi-caffeinate@0.49.8`
-- `@pi-plugins/fast-mode@0.1.12`
+- `@pi-plugins/fast-mode@0.1.13`
 - `@tifan/pi-copy-response@0.2.7`
 - `@tifan/pi-handoff@2.2.2`
 - `@tifan/pi-inline-skills@1.0.6`
@@ -34,15 +34,20 @@ The package bundles 5 active `@herbertgao/*` child packages—`pi-bark`, `pi-cc-
 - `@tifan/pi-recap@0.4.7`
 - `@tifan/pi-rename@0.6.0`
 - `pi-typesafe@0.8.1`
-- `pi-multi-account@1.23.2`
+- `pi-multi-account@1.24.0`
 - `pi-next-cue@1.0.7`
 - `pi-jev-auto-mode@0.5.0`
 - `pi-lens@4.3.0`
-- `pi-web-access@0.34.0`
+- `pi-web-access@0.35.0`
 - `remote-pi@0.7.0`
+- `resume-from@0.4.1`
 
 Pi loads their extensions and skills through `node_modules/` paths inside one package root. The upstream companions are pinned and bundled, not forked or renamed.
 
+The local `@herbertgao/resume-from` fork is retired. If it is installed separately, remove that package before upgrading the aggregate to avoid registering `/resume-from` twice. The aggregate now uses upstream `resume-from@0.4.1`; its v0.4.0 start-directory fix supersedes our local patch.
+
+The locally customized CC and SoL-Pi packages now follow complete upstream baselines `pi-cc-extensions@0.9.10` and SoL-Pi main `e1a586af`, with local behavior replayed on top. Action Fusion and ccstyle write rich diffs coexist without disabling either feature. All four SoL-Pi features remain opt-in; its new non-persistent-session evidence archives remain on disk for consumers and require host or caller cleanup.
+
 ### Bark notifications
 
 `@herbertgao/pi-bark` sends localized Bark pushes when a user-facing Pi run fully settles or `@juicesharp/rpiv-ask-user-question` needs an answer. Notifications include emoji-labeled machine/path metadata and support the bundled official Pi badge through Bark's `icon` parameter. Configure it in `$PI_CODING_AGENT_DIR/bark.json` (normally `~/.pi/agent/bark.json`); see the [package README](../pi-bark/README.md). Without a valid endpoint it stays inactive.
@@ -51,7 +56,7 @@ Pi loads their extensions and skills through `node_modules/` paths inside one pa
 
 `pi-jev-auto-mode@0.5.0` adds fail-closed Jev safety gates for shell commands and file changes. `pi-typesafe@0.8.1` adds the `/typesafe` command and `typesafe_evaluate` tool for explicit structured decisions; both use the TypeSafe API after login.
 
-`@herbertgao/resume-from@0.2.0` keeps Claude Code sessions associated with their original repository when the active transcript later moves into a nested cwd. `@herbertgao/sol-pi@0.1.0` adds opt-in Action Fusion, ObservationPack, Evidence-Preserving Reducer, and Online Context Compact; see its [configuration guide](../sol-pi/docs/configuration.md). `pi-lens@4.3.0` expands language routing and bounds retained diagnostic facts across multi-root sessions. `pi-web-access@0.34.0` provides configurable web search and fetch tools; its `toolActivation` defaults to `auto`, choosing eager or dynamic tool activation per model. `pi-antigravity@0.8.1` reads Pi 0.86+ transcript system messages, so Antigravity requests carry Pi's system prompt and tools; it also registers `google_search` and `generate_image` tools that use the signed-in Antigravity account. Preferred Thinking 1.0.2 preserves an explicit subagent `--thinking` choice. Deprecated `@tifan/pi-titlebar-spinner` is no longer bundled; Rename remains the single owner of Herdr tab naming.
+`resume-from@0.4.1` continues sessions across Pi, Claude Code, and Codex; it keeps a Claude Code session matched to its start directory when the active transcript later moves into a nested cwd. `@herbertgao/sol-pi` adds opt-in Action Fusion, ObservationPack, Evidence-Preserving Reducer, and Online Context Compact; see its [configuration guide](../sol-pi/docs/configuration.md). `pi-lens@4.3.0` expands language routing and bounds retained diagnostic facts across multi-root sessions. `pi-web-access@0.35.0` provides configurable web search and fetch tools; its `toolActivation` defaults to `auto`, choosing eager or dynamic tool activation per model. `pi-antigravity@0.9.0` reads Pi 0.86+ transcript system messages, so Antigravity requests carry Pi's system prompt and tools; it also registers `google_search` and `generate_image` tools that use the signed-in Antigravity account. Preferred Thinking 1.0.2 preserves an explicit subagent `--thinking` choice. Deprecated `@tifan/pi-titlebar-spinner` is no longer bundled; Rename remains the single owner of Herdr tab naming.
 
 `pi-stash` is no longer bundled: `/btw` already preserves the main editor draft while handling side questions outside the main conversation. Prior `@herbertgao/pi-stash` releases remain available but are no longer maintained here.
 

package/THIRD_PARTY_NOTICES.md

@@ -34,6 +34,32 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
+## `resume-from`
+
+The aggregate bundles [`resume-from`](https://github.com/alexei-led/resume-from) version 0.4.1 under its original MIT license:
+
+MIT License
+
+Copyright (c) 2026 Alexei Led
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 ## `@narumitw/pi-caffeinate`
 
 The aggregate bundles [`@narumitw/pi-caffeinate`](https://github.com/narumiruna/pi-extensions/tree/main/packages/pi-caffeinate) version 0.49.7 under its original MIT license:
@@ -62,7 +88,7 @@ SOFTWARE.
 
 ## `@herbertgao/sol-pi`
 
-The aggregate bundles [`@herbertgao/sol-pi`](https://github.com/HerbertGao/pi-extensions/tree/master/packages/sol-pi) version 0.1.0. Its source is republished from [`NVlabs/SoL-Pi`](https://github.com/NVlabs/SoL-Pi) under the MIT license:
+The aggregate bundles [`@herbertgao/sol-pi`](https://github.com/HerbertGao/pi-extensions/tree/master/packages/sol-pi), adapted from [`NVlabs/SoL-Pi`](https://github.com/NVlabs/SoL-Pi) commit `e1a586af0ad8956f42ae5b26bba20e48fbf30e00` under the MIT license:
 
 Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
@@ -86,7 +112,7 @@ THE SOFTWARE.
 
 ## `pi-antigravity`
 
-The aggregate bundles the MIT-licensed [`pi-antigravity`](https://github.com/Rahularya01/pi-antigravity) package version 0.8.1 under its original attribution:
+The aggregate bundles the MIT-licensed [`pi-antigravity`](https://github.com/Rahularya01/pi-antigravity) package version 0.9.0 under its original attribution:
 
 MIT License
 
@@ -163,7 +189,7 @@ THE SOFTWARE.
 
 ## `pi-multi-account`
 
-The aggregate bundles the MIT-licensed [`pi-multi-account`](https://github.com/Sarrius/pi-multi-account) package version 1.23.2 under its original attribution:
+The aggregate bundles the MIT-licensed [`pi-multi-account`](https://github.com/Sarrius/pi-multi-account) package version 1.24.0 under its original attribution:
 
 MIT License
 

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()
   })
 }