@pi-unipi/notify 2.0.4 → 2.0.7

package/ask-user-prompt-message.ts

@@ -0,0 +1,75 @@
+/**
+ * @pi-unipi/notify — Internal helper: build notification message from
+ * ask-user prompt event payloads.
+ *
+ * Supports both UniPi's flat `unipi:ask-user:prompt` payload and the
+ * lossless `rpiv:ask-user:prompt` questionnaire projection.
+ *
+ * @internal — not part of the public API. Shared by the event listener and tests.
+ */
+
+export interface AskUserPromptEventPayload {
+  questions: ReadonlyArray<AskUserPromptQuestion>;
+}
+
+export interface AskUserPromptQuestion {
+  question: string;
+  header: string;
+  multiSelect: boolean;
+  options: ReadonlyArray<AskUserPromptOption>;
+}
+
+export interface AskUserPromptOption {
+  label: string;
+  description: string;
+  hasPreview: boolean;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return value !== null && typeof value === "object";
+}
+
+function nonEmptyString(value: unknown, fallback: string): string {
+  return typeof value === "string" && value.trim().length > 0 ? value : fallback;
+}
+
+function buildFlatPromptMessage(payload: Record<string, unknown>): string {
+  const question = nonEmptyString(payload.question, "A question");
+  const context = nonEmptyString(payload.context, "");
+  return context ? `Agent asks: ${question} — ${context}` : `Agent asks: ${question}`;
+}
+
+/** Build a human-readable notification message from an ask-user prompt payload. */
+export function buildAskUserPromptMessage(payload: unknown): string {
+  const p = isRecord(payload) ? payload : {};
+
+  const questions = Array.isArray(p.questions)
+    ? p.questions.filter(isRecord)
+    : [];
+
+  if (questions.length === 0 && ("question" in p || "context" in p)) {
+    return buildFlatPromptMessage(p);
+  }
+
+  const firstQ = questions[0];
+
+  const baseQuestion = firstQ
+    ? nonEmptyString(firstQ.question, "A question")
+    : "A question";
+
+  const suffix = questions.length > 1 ? ` (+${questions.length - 1} more)` : "";
+
+  const optionLabels =
+    firstQ && Array.isArray(firstQ.options)
+      ? firstQ.options
+          .filter(isRecord)
+          .map((o) => nonEmptyString(o.label, ""))
+          .filter((label) => label.length > 0)
+      : [];
+
+  const options = optionLabels.join(", ");
+
+  return options
+    ? `Agent asks: ${baseQuestion}${suffix} — ${options}`
+    : `Agent asks: ${baseQuestion}${suffix}`;
+}

package/events.ts

@@ -13,11 +13,28 @@ import { sendNativeNotification, SuppressedError } from "./platforms/native.js";
 import { sendGotifyNotification } from "./platforms/gotify.js";
 import { sendTelegramNotification } from "./platforms/telegram.js";
 import { sendNtfyNotification } from "./platforms/ntfy.js";
+import { buildAskUserPromptMessage } from "./ask-user-prompt-message.js";
 import { summarizeLastMessage } from "./summarize.js";
 
+// Event emitted by @juicesharp/rpiv-ask-user-question before showing its UI.
+// Keep this as a local string until that package publishes an importable
+// `./events` contract in npm.
+const ASK_USER_PROMPT_EVENT = "rpiv:ask-user:prompt" as const;
+
 /** Stored session context for modelRegistry access */
 let sessionCtx: ExtensionContext | null = null;
 
+/** Unsubscribe functions for pi.events.on() listeners. Cleared before each registration to avoid accumulation across reloads. */
+const unsubs: Array<() => void> = [];
+
+/** Unregister all previously registered pi.events.on() listeners. */
+function unregisterAll(): void {
+  for (const unsub of unsubs) {
+    try { unsub(); } catch { /* ignore */ }
+  }
+  unsubs.length = 0;
+}
+
 /** Store session context (called from index.ts on session_start) */
 export function setSessionContext(ctx: ExtensionContext): void {
   sessionCtx = ctx;
@@ -42,6 +59,12 @@ export const BUILTIN_EVENTS: Record<
   ask_user_prompt: { hook: UNIPI_EVENTS.ASK_USER_PROMPT, label: "Question Asked" },
 };
 
+/**
+ * Pi lifecycle event types (dispatched by ExtensionRunner).
+ * These must use pi.on() — not pi.events.on() — to receive events.
+ */
+const LIFECYCLE_EVENTS = new Set(["agent_end", "session_shutdown"]);
+
 /**
  * Register event listeners for all enabled notification events.
  * Attaches listeners to pi hooks and routes notifications to platforms.
@@ -51,6 +74,9 @@ export function registerEventListeners(
   config: NotifyConfig,
   cwd: string
 ): void {
+  // Remove all previously registered EventBus listeners to prevent accumulation
+  // across reloads (EventBus persists but module instances are replaced).
+  unregisterAll();
   // Register built-in events (except agent_end which has custom logic)
   for (const [eventKey, def] of Object.entries(BUILTIN_EVENTS)) {
     if (eventKey === "agent_end") continue; // handled separately below
@@ -69,7 +95,29 @@ export function registerEventListeners(
       );
     };
 
-    (pi as any).on(def.hook, handler);
+    // pi lifecycle events (agent_end, session_shutdown) are dispatched via
+    // ExtensionRunner — must use pi.on(). These are stored in
+    // extension.handlers and automatically replaced on reload, so they
+    // do NOT accumulate like EventBus listeners.
+    if (LIFECYCLE_EVENTS.has(eventKey)) {
+      (pi as any).on(def.hook, handler);
+    } else {
+      unsubs.push(pi.events.on(def.hook, handler));
+    }
+  }
+
+  // Listen for rpiv:ask-user:prompt from @juicesharp/rpiv-ask-user-question
+  const askUserConfig = config.events["ask_user_prompt"];
+  if (askUserConfig?.enabled) {
+    unsubs.push(pi.events.on(ASK_USER_PROMPT_EVENT, (payload: unknown) => {
+      const title = `Pi — ${BUILTIN_EVENTS.ask_user_prompt.label}`;
+      const message = buildAskUserPromptMessage(payload);
+      dispatchNotification(pi, title, message, askUserConfig.platforms, "ask_user_prompt", config, cwd).catch(
+        () => {
+          // Silently ignore — background notification failure is non-blocking.
+        }
+      );
+    }));
   }
 
   // agent_end — custom handler with session name and recap support
@@ -130,7 +178,7 @@ export function registerEventListeners(
       // For now, modules register their own events through MODULE_READY
     }
   };
-  (pi as any).on(UNIPI_EVENTS.MODULE_READY, moduleHandler);
+  unsubs.push(pi.events.on(UNIPI_EVENTS.MODULE_READY, moduleHandler));
 }
 
 /** Get all platforms that are currently enabled in config */
@@ -144,7 +192,9 @@ function getEnabledPlatforms(config: NotifyConfig, ntfyEnabled: boolean): Notify
 }
 
 /** No-op — cleanup handled by session teardown */
-export function unregisterEventListeners(): void {}
+export function unregisterEventListeners(): void {
+  unregisterAll();
+}
 
 /**
  * Dispatch a notification to the configured platforms.
@@ -291,9 +341,7 @@ function buildEventMessage(eventKey: string, payload: unknown): string {
     case "session_shutdown":
       return "Session ending";
     case "ask_user_prompt":
-      return p.context
-        ? `Agent asks: ${String(p.question || "")} — ${String(p.context)}`
-        : `Agent asks: ${String(p.question || "A question")}`;
+      return buildAskUserPromptMessage(payload);
     default:
       return p.message ? String(p.message) : "Event occurred";
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/notify",
-  "version": "2.0.4",
+  "version": "2.0.7",
   "description": "Cross-platform notification extension for Pi — native OS, Gotify, and Telegram notifications for agent lifecycle events",
   "type": "module",
   "license": "MIT",
@@ -18,12 +18,17 @@
     "notify",
     "notifications"
   ],
+  "scripts": {
+    "test": "tsc --noEmit && node --experimental-strip-types --test src/__tests__/*.test.ts",
+    "typecheck": "tsc --noEmit"
+  },
   "files": [
     "index.ts",
     "tools.ts",
     "commands.ts",
     "settings.ts",
     "events.ts",
+    "ask-user-prompt-message.ts",
     "ntfy-config.ts",
     "summarize.ts",
     "types.ts",