pi-note 0.14.0 → 0.15.1

package/README.md

@@ -68,7 +68,7 @@ task, so existing values can be configured without creating another task.
 Type in the task picker to filter by text, ID, tag, or state (all words must match).
 Use ↑/↓ and Enter to select, or Esc to cancel. Rows show **●** for in progress or
 **○** for active, followed by the tag (`[Untagged]` when absent).
-The normal Pi status area shows selected-task controls and title without replacing other footers. The footer omits the task ID and state and shows only the first line, bounded by `footer.titleWidth` (default 60 terminal columns including the pin, controls, tag and title). Overflow ends with `...`. The title remains clickable for preview; task controls are separate. At very small widths controls are hidden (pin only). The pin and controls are bundled in `icons/note.txt`, `icons/check.txt`, `icons/cross.txt`, and `icons/add.txt`; they use terminal fonts, not a Nerd Font or icon theme.
+The normal Pi status area shows selected-task controls and title without replacing other footers. The footer omits the task ID and state and shows only the first line, bounded by `footer.titleWidth` (default 60 terminal columns including the pin, controls, tag and title). Overflow ends with `...`. The title remains clickable for preview; task controls are separate. At very small widths controls are hidden (pin only). The pin and controls are bundled in `icons/note.txt`, `icons/check.txt`, `icons/cross.txt`, and `icons/add.txt`; they use terminal fonts, not a Nerd Font or icon theme. Icons are bold; their apparent weight depends on the terminal font, and emoji may look unchanged.
 
 ### Display-only preview
 
@@ -185,25 +185,25 @@ asking in chat. The pin footer shows a pending suggestion, distinct from a selec
 
 ```text
 📌 ✕  + · [tag] Task title...
-📌 ✓    · [tag] Task title...
+📌 ✓ · [tag] Task title...
 ```
 
 ![Suggested task controls](../docs/images/pi-task-suggestion.png)
 ![Selected task with Done control](../docs/images/pi-task-selected.png)
 
-- Muted **✕** dismisses without creating a note; further offers are suppressed until a new session or reload.
+- Muted **✕** dismisses without creating a note; further offers are suppressed until a new session.
 - Accent **+** creates, starts, and selects the suggested task.
-- Green **✓** completes the selected task and clears the selection on success.
+- Green **✓** completes the selected task, starts a clean unselected session, and reloads Pi without a completion prompt. Menu **Done** and `/pi-note-done` do the same.
 
-Done occupies the former ✕ position, not the + position, so clicking Add twice cannot accidentally complete the new task. The former + cell stays blank. The selected task's title is a separate preview link.
+Done occupies the former ✕ position, not the + position, so clicking Add twice cannot accidentally complete the new task. The selected row removes the former + cell's padding. The selected task's title is a separate preview link.
 
 The configured `footer.titleWidth` bounds the entire row (default 60 columns). Controls stay first; the tag is dropped before truncating the first-line title with `...`. Tiny widths hide controls (pin only). Pi can still clip the combined status row on narrow terminals.
 
-Controls use the [Kitty preview handler](#display-only-preview), with no additional configuration. Fullscreen Kitty uses **Ctrl+Shift+click**. Keyboard alternatives are `/pi-note-no`, `/pi-note-yes`, and `/pi-note-done`. No action submits input or starts an agent turn; editor drafts stay unchanged.
+Controls use the [Kitty preview handler](#display-only-preview), with no additional configuration. Fullscreen Kitty uses **Ctrl+Shift+click**. Keyboard alternatives are `/pi-note-no`, `/pi-note-yes`, and `/pi-note-done`. No action submits input or starts an agent turn. Add and Dismiss preserve editor drafts; Done clears the new session's editor, so save unfinished input before completing a task.
 
-Completion requires an idle Pi session and no pending Pinote operation. It rejects stale selected-task links and externally changed revisions. Accepted mutations drain even if the helper disconnects. On an error, check `/pi-note` before retrying, because a write may already have committed.
+Completion requires an idle Pi session and no pending Pinote operation. It rejects stale selected-task links and externally changed revisions. Accepted mutations drain even if the helper disconnects. On an error, check `/pi-note` before retrying, because a write may already have committed. Failed or stale writes never restart Pi. If another extension cancels the new session, the task remains completed and Pi reports the cancellation. The reload runs through the new session's fresh context; retired contexts are not reused.
 
-An existing suggestion is retained rather than replaced. Selection, tree navigation, reload and shutdown invalidate its links; repeated acceptance cannot duplicate a note. A busy Pinote operation blocks acceptance. Noninteractive agents still ask in chat before using `pinote_add` with `select: true`. An existing selection is not replaced unless the user asks to switch. Reuse a saved
+An existing suggestion is retained rather than replaced. Pending suggestions survive `/reload` and session resume, including their full text and tag; new links replace stale capabilities. Accepted or dismissed suggestions never reappear on reload. New sessions and forks start without a suggestion; selecting a task or navigating the tree clears it. Suggestion state is local, display-only session metadata, not model context. Pi saves the session after the first submitted message; quitting before that can still lose unsaved session state. Repeated acceptance cannot duplicate a note. A busy Pinote operation blocks acceptance. Noninteractive agents still ask in chat before using `pinote_add` with `select: true`. An existing selection is not replaced unless the user asks to switch. Reuse a saved
 tag name when it fits.
 Task text starts with a short, action-oriented title (aim for at most 60 characters).
 Put context, URLs, commands, and acceptance criteria after a blank line; the title
@@ -217,7 +217,7 @@ list, append its label to `Bar`, one label per line. Do not list `PR` in `Bar`.
 Agents use `pinote_update_current`; there is no separate `add_to_bottom_bar` tool.
 This is guidance, not truncation or a storage limit.
 
-Values are Markdown strings; no fields are required. `PR` enables the watcher below.
+Values are Markdown strings; no fields are required. `PR` can display a clickable link without GitHub polling.
 `Bar` chooses extra footer fields unless configuration overrides it:
 
 ```markdown
@@ -314,40 +314,18 @@ Pi's final ellipsis is plain text; click the remaining task text to preview it.
 This extension does not replace other footers. Other fields, such as `Jira` and
 `CWD` in the example, stay off the footer unless selected.
 
-### PR merge watcher
-
-Set `PR` with `pinote_update_current` to one `https://github.com/owner/repo/pull/123` URL
-or Markdown link. Legacy footer settings show a clickable **PR #123**; global
-field settings can change or hide that presentation without disabling the watcher.
-Other hosts, multiple links, and prose are not watched.
-
-Interactive Pi checks only the selected task's PR using authenticated `gh`
-(`gh auth login`). Polling defaults to 60 seconds; launch Pi with
-`PINOTE_PR_POLL_SECONDS=120 pi` to change it, or `0` to disable polling.
-Allowed intervals are 10–86400 seconds. Configured links remain visible when polling is disabled.
-Network/authentication failures warn once until recovery and retry next interval.
-No polling runs in print/RPC mode or after Pi exits.
-
-On merge, Pi waits until idle and asks **Mark this task completed?** In Kitty,
-indeterminate progress animates the tab while the prompt awaits input (with Kitty's
-default progress-aware tab title or a working/ready renderer). Progress clears on
-response, cancellation, or shutdown; other terminals and redirected output are untouched.
-Confirmation uses the same guarded CLI Done operation as `/pi-note`; declining leaves
-the task unchanged. If it is already done, Pi says **PR #123 was merged and the task is
-already completed**, without completing it again. Completion clears the selection
-and hides the footer link, even with polling disabled. The background watch remains
-until another task is selected, the link is removed, or Pi exits. Removed/scheduled tasks are no longer watched.
-
-The watched task ID/link and merge acknowledgements are saved in the Pi session,
-so `/reload` and session resume retain completed-task watches without repeating
-acknowledged prompts. A new session can notify again for a
-selected task. Task or PR changes during confirmation cannot complete a different
-task. No completion-hook system is added; this uses Pinote's existing Done flow.
-A separate branch-based PR-status extension may show a duplicate link; disable it
-if you only want task-linked PRs.
-
-Task data stays local except for GitHub status requests. Tools work without a TUI,
-but `/pi-note` needs an idle TUI.
+### PR links without polling
+
+Set `PR` with `pinote_update_current` to one `https://github.com/owner/repo/pull/123`
+URL or Markdown link. Legacy footer settings show clickable **PR #123**; global
+field settings can change or hide it. PR and other field links are rendered locally
+for the active selection and disappear when that selection is cleared.
+
+Pinote no longer polls GitHub, runs `gh`, watches completed tasks, or prompts on
+PR merges. No GitHub authentication is required. `PINOTE_PR_POLL_SECONDS` is no
+longer used. Other separately installed Pi PR/Git extensions are unaffected.
+
+Tools work without a TUI, but `/pi-note` needs an idle TUI.
 This package does not synchronize databases or paths between machines. Note text
 and fields loaded into Pi are sent to the configured model when used as context;
 avoid secrets. Agent commands do not send desktop notifications.

package/footer-status.ts

@@ -0,0 +1,40 @@
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { footerChips, footerStatusKey, legacyFooterStatusKey, renderFooterLinks } from "./footer-links.ts";
+import type { FooterConfig } from "./footer-config.ts";
+
+export type FooterTask = {
+  id: number;
+  state: string;
+  updated_at: string;
+  agent_notes: Record<string, string>;
+};
+type PR = { url: string; number: string };
+
+// Accept one bare URL or Markdown link, never arbitrary hosts or terminal escapes.
+export function taskPR(task: FooterTask | null): PR | undefined {
+  const field = task?.agent_notes.PR?.trim();
+  if (!field) return;
+  const url = /^\[[^\r\n]*\]\(([^\s]+)\)$/u.exec(field)?.[1] ?? field;
+  const match = /^https:\/\/github\.com\/([A-Za-z0-9_-]+)\/([A-Za-z0-9_.-]+)\/pull\/([1-9][0-9]*)\/?$/u.exec(url);
+  if (!match || [".", ".."].includes(match[2]) || !Number.isSafeInteger(Number(match[3]))) return;
+  return { url: `https://github.com/${match[1]}/${match[2]}/pull/${match[3]}`, number: match[3] };
+}
+
+export function clearTaskFooter(ctx: ExtensionContext): void {
+  if (!ctx.hasUI || ctx.mode !== "tui") return;
+  ctx.ui.setStatus(legacyFooterStatusKey, undefined);
+  ctx.ui.setStatus(footerStatusKey, undefined);
+}
+
+export function updateTaskFooter(
+  ctx: ExtensionContext, current: FooterTask | null, config?: FooterConfig,
+): void {
+  if (!ctx.hasUI || ctx.mode !== "tui") return;
+  ctx.ui.setStatus(legacyFooterStatusKey, undefined);
+  const active = current && ["active", "in_progress"].includes(current.state) ? current : null;
+  const pr = active ? taskPR(active) : undefined;
+  const value = renderFooterLinks(
+    footerChips(active, pr, config), (text) => ctx.ui.theme.fg("mdLink", text),
+  );
+  ctx.ui.setStatus(footerStatusKey, value);
+}

package/index.ts

@@ -1,10 +1,11 @@
-import { getAgentDir, getMarkdownTheme, type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { getAgentDir, getMarkdownTheme, type ExtensionAPI, type ExtensionContext, type ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { Container, Editor, Markdown, Text, truncateToWidth, type Keybinding } from "@earendil-works/pi-tui";
 import { readFileSync } from "node:fs";
+import { randomBytes } from "node:crypto";
 import { join } from "node:path";
 import { stripVTControlCharacters } from "node:util";
 import { Type } from "typebox";
-import { createPRWatcher } from "./pr-watch.ts";
+import { updateTaskFooter, clearTaskFooter } from "./footer-status.ts";
 import { defaultFooterConfig, defaultHandoffPrompt, effectiveFooterFields, loadFooterConfig, parseHandoffPrompt, readFooterDocument, saveFooterConfig, type FooterConfig, type PinoteSettings } from "./footer-config.ts";
 import { FooterSettings, TaskMenu, withSettingsTab } from "./footer-settings.ts";
 import { TaskPicker, taskState, taskTag } from "./task-picker.ts";
@@ -126,13 +127,37 @@ export default function (pi: ExtensionAPI) {
     view.addChild(new Markdown(clean(entry.data.markdown), 0, 0, getMarkdownTheme()));
     return view;
   });
+  const runtimeToken = randomBytes(16).toString("hex");
+  let completionDispatch: {
+    token: string; selection: string; task: Task; started: () => void; finish: (accepted: boolean) => void;
+  } | undefined;
+  const cancelCompletionDispatch = () => completionDispatch?.finish(false);
   let previewBridge: ReturnType<typeof createPreviewBridge> | undefined;
+  const suggestionType = "pinote-suggestion";
   let suggestion: { text: string; tag?: string } | undefined;
   let offerDeclined = false;
-  const clearSuggestion = (ctx: ExtensionContext) => {
+  const saveSuggestion = () => pi.appendEntry(suggestionType, { suggestion: suggestion ?? null, declined: offerDeclined });
+  const clearSuggestion = (ctx: ExtensionContext, persist = true) => {
+    const hadSuggestion = suggestion !== undefined;
     previewBridge?.clearSuggestion();
-    if (suggestion && ctx.hasUI && ctx.mode === "tui") ctx.ui.setStatus("pinote", undefined);
+    if (hadSuggestion && ctx.hasUI && ctx.mode === "tui") ctx.ui.setStatus("pinote", undefined);
     suggestion = undefined;
+    if (persist && hadSuggestion) saveSuggestion();
+  };
+  const restoreSuggestion = (ctx: ExtensionContext) => {
+    suggestion = undefined;
+    offerDeclined = false;
+    for (const entry of ctx.sessionManager.getBranch()) {
+      if (entry.type !== "custom" || entry.customType !== suggestionType) continue;
+      const data = entry.data;
+      if (!record(data) || typeof data.declined !== "boolean") continue;
+      const value = data.suggestion;
+      suggestion = record(value) && text(value.text) && value.text.trim() &&
+        (value.tag === undefined || (text(value.tag) && value.tag.trim() && value.tag.length <= 64))
+        ? { text: value.text, ...(value.tag === undefined ? {} : { tag: value.tag as string }) } : undefined;
+      offerDeclined = data.declined;
+    }
+    if (selectedId !== null || offerDeclined) suggestion = undefined;
   };
   let alive = true;
   let epoch = 0;
@@ -270,38 +295,21 @@ export default function (pi: ExtensionAPI) {
           selectedId === previewId ? preview(ctx, signal) : Promise.resolve(false), current ? {
             revision: current.updated_at,
             invoke: () => alive && generation === epoch && previewBranch === branchEpoch && selectedId === previewId
-              ? completeTask(ctx, current) : Promise.resolve(false),
+              ? dispatchCompletion(ctx, current, `${runtimeToken}:${generation}:${previewBranch}:${previewId}`) : Promise.resolve(false),
           } : undefined);
         ctx.ui.setStatus("pinote", current ? renderSelectedTask(current, footerConfig.titleWidth, ctx.ui.theme, {
           preview: previewBridge?.url(), done: previewBridge?.doneUrl(),
         }) : suggestionStatus(ctx));
-        watcher.update(ctx, current);
+        updateTaskFooter(ctx, current, footerConfig);
       }
     } catch {
       if (alive && generation === epoch && serial === refreshSerial) {
         previewBridge?.invalidate();
-        ctx.ui.setStatus("pinote", suggestionStatus(ctx) ?? `${noteIcon} Pinote unavailable · ${cliState === "upgrade" ? "/pi-note-upgrade" : cliState === "setup" ? "/pi-note-setup" : "/pi-note"}`);
+        clearTaskFooter(ctx);
+        ctx.ui.setStatus("pinote", suggestionStatus(ctx) ?? `${ctx.ui.theme.bold(noteIcon)} Pinote unavailable · ${cliState === "upgrade" ? "/pi-note-upgrade" : cliState === "setup" ? "/pi-note-setup" : "/pi-note"}`);
       }
     }
   };
-  const watcher = createPRWatcher(pi, {
-    selected,
-    footerConfig: () => footerConfig,
-    get: async (id) => requiredTask(await run(["agent", "get", String(id)]), id),
-    done: async (current, canAct) => {
-      const result = requiredTask(await run([
-        "agent", "done", String(current.id), "--expected-updated-at", current.updated_at,
-      ], undefined, canAct), current.id);
-      if (result.state !== "done") throw new Error(compatible);
-    },
-    claim: () => {
-      if (pending) return;
-      const operation = Symbol();
-      pending = operation;
-      return () => { if (pending === operation) pending = undefined; };
-    },
-    refresh,
-  });
   const preview = async (ctx: ExtensionContext, requestSignal?: AbortSignal): Promise<boolean> => {
     if (!ctx.hasUI || ctx.mode !== "tui" || !ctx.isIdle() || pending || !validId(selectedId)) return false;
     const generation = epoch;
@@ -330,44 +338,75 @@ export default function (pi: ExtensionAPI) {
       if (pending === operation) pending = undefined;
     }
   };
-  const completeTask = async (ctx: ExtensionContext, displayed?: Task): Promise<boolean> => {
-    if (!alive || !ctx.hasUI || ctx.mode !== "tui" || !ctx.isIdle() || pending || setupAbort || !validId(selectedId)) return false;
+  const dispatchCompletion = (ctx: ExtensionContext, displayed: Task, selection: string): Promise<boolean> => {
+    if (!ctx.isIdle() || pending || completionDispatch) return Promise.resolve(false);
+    const token = `${selection}:${randomBytes(8).toString("hex")}`;
+    return new Promise((resolve) => {
+      const finish = (accepted: boolean) => {
+        clearTimeout(timer);
+        if (completionDispatch?.token === token) completionDispatch = undefined;
+        resolve(accepted);
+      };
+      const timer = setTimeout(() => {
+        finish(false);
+        if (alive && activeContext === ctx) ctx.ui.notify("Pinote completion could not start. Use /pi-note-done.", "warning");
+      }, 4000);
+      completionDispatch = { token, selection, task: displayed, started: () => clearTimeout(timer), finish };
+      try { pi.sendUserMessage(`/pi-note-done ${token}`, { expandPromptTemplates: true }); }
+      catch { finish(false); }
+    });
+  };
+  const completeSelected = async (args: string, ctx: ExtensionCommandContext, displayed?: Task) => {
+    const token = args.trim();
+    const request = token ? completionDispatch : undefined;
+    if (token && (request?.token !== token || request.selection !== `${runtimeToken}:${epoch}:${branchEpoch}:${selectedId}`)) return;
+    if (!alive || !ctx.hasUI || ctx.mode !== "tui" || !ctx.isIdle() || pending || setupAbort || !validId(selectedId)) {
+      request?.finish(false);
+      if (ctx.hasUI) ctx.ui.notify("Select a task and wait until Pi is idle and the Pinote operation has finished.", "warning");
+      return;
+    }
     const generation = epoch;
     const branch = branchEpoch;
     const id = selectedId;
     const operation = Symbol();
     pending = operation;
+    request?.started();
     refreshSerial++;
     const canAct = () => alive && generation === epoch && branch === branchEpoch && selectedId === id && ctx.isIdle();
     let wrote = false;
     try {
-      const current = displayed ?? await currentTask(undefined, canAct);
-      if (!current || current.id !== id || !canAct()) return false;
+      const current = request?.task ?? displayed ?? await currentTask(undefined, canAct);
+      if (!current || current.id !== id || !canAct()) return;
       const completed = requiredTask(await run([
         "agent", "done", String(id), "--expected-updated-at", current.updated_at,
       ], undefined, canAct), id);
       wrote = true;
       if (completed.state !== "done") throw new Error(compatible);
       if (!canAct()) throw new Error("The session or selection changed. Completion may have committed; read the task before retrying.");
+      request?.finish(true);
       remember(null, branch);
-      ctx.ui.notify(`Pinote #${id} completed.`, "info");
-      return true;
+      await refresh(ctx);
+      if (!alive || generation !== epoch || branch !== branchEpoch || selectedId !== null || !ctx.isIdle()) {
+        throw new Error("Task completed, but the session changed. Start a new session manually.");
+      }
+      // Only a fresh command context may clear the new editor and reload the runtime.
+      const result = await ctx.newSession({ withSession: async (fresh) => {
+        fresh.ui.setEditorText("");
+        await fresh.reload();
+      } });
+      if (result.cancelled) ctx.ui.notify("Task completed; new session was cancelled.", "warning");
     } catch (error) {
       if (alive && generation === epoch) ctx.ui.notify(
         `Pinote completion: ${clean(String(error))}${wrote ? " Check the task before retrying." : ""}`, "error");
-      return false;
     } finally {
+      request?.finish(false);
       if (pending === operation) pending = undefined;
       if (alive && generation === epoch) await refresh(ctx);
     }
   };
   pi.registerCommand("pi-note-done", {
-    description: "Complete the selected task (same as the footer ✓)",
-    handler: async (args, ctx) => {
-      if (!ctx.hasUI || ctx.mode !== "tui") return;
-      if (args.trim()) { ctx.ui.notify("Usage: /pi-note-done", "warning"); return; }
-      if (!await completeTask(ctx)) ctx.ui.notify("Select a task and wait until Pi is idle and Pinote is available before completing it.", "warning");
-    },
+    description: "Complete the selected task, start a clean session, and reload Pi",
+    handler: (args, ctx) => completeSelected(args, ctx),
   });
   pi.registerCommand("pi-note-preview", {
     description: "Display the selected task locally without sending it to the model",
@@ -379,10 +418,9 @@ export default function (pi: ExtensionAPI) {
   });
   pi.on("session_start", async (_event, ctx) => {
     setupAbort?.abort();
-    // Retire old polling before bridge teardown/startup yields to its scheduled callbacks.
-    watcher.stop();
-    clearSuggestion(activeContext ?? ctx);
-    offerDeclined = false;
+    cancelCompletionDispatch();
+    clearTaskFooter(activeContext ?? ctx);
+    clearSuggestion(activeContext ?? ctx, false);
     alive = false;
     epoch++;
     branchEpoch++;
@@ -394,6 +432,13 @@ export default function (pi: ExtensionAPI) {
     alive = true;
     activeContext = ctx;
     selectedId = readSelection(ctx);
+    restoreSuggestion(ctx);
+    if (_event.reason === "new" || _event.reason === "fork") {
+      // A fork may include an ancestor proposal whose consent was consumed elsewhere.
+      clearSuggestion(ctx, false);
+      offerDeclined = false;
+      if (ctx.sessionManager.getBranch().some((entry) => entry.type === "custom" && entry.customType === suggestionType)) saveSuggestion();
+    }
     footerConfig = loadFooterConfig((message) => {
       if (ctx.hasUI) ctx.ui.notify(message, "warning");
     });
@@ -418,13 +463,16 @@ export default function (pi: ExtensionAPI) {
     if (!setupAbort) pending = undefined;
     await checkCLI(ctx, true);
     if (!alive || generation !== epoch) return;
-    if (!setupAbort) watcher.start(ctx);
+    if (suggestion) previewBridge?.setSuggestion((choice) => respondToSuggestion(choice, ctx));
     await refresh(ctx);
   });
   pi.on("session_tree", async (_event, ctx) => {
     if (!alive) return;
     branchEpoch++;
-    clearSuggestion(ctx);
+    cancelCompletionDispatch();
+    clearSuggestion(ctx, false);
+    // Never resurrect an already consumed proposal by navigating behind its tombstone.
+    saveSuggestion();
     previewBridge?.invalidate();
     const generation = branchEpoch;
     const id = readSelection(ctx);
@@ -437,14 +485,15 @@ export default function (pi: ExtensionAPI) {
   pi.on("agent_end", async (_event, ctx) => { await refresh(ctx); });
   pi.on("session_shutdown", async (_event, ctx) => {
     setupAbort?.abort();
-    clearSuggestion(ctx);
+    cancelCompletionDispatch();
+    clearSuggestion(ctx, false);
     alive = false;
     activeContext = undefined;
     selectedId = null;
     epoch++;
     branchEpoch++;
     refreshSerial++;
-    watcher.stop();
+    clearTaskFooter(ctx);
     if (ctx.hasUI && ctx.mode === "tui") ctx.ui.setStatus("pinote", undefined);
     const bridge = previewBridge;
     previewBridge = undefined;
@@ -468,7 +517,7 @@ export default function (pi: ExtensionAPI) {
       const generation = epoch;
       const controller = new AbortController();
       setupAbort = controller;
-      watcher.stop();
+      clearTaskFooter(ctx);
       const currentSession = () => alive && generation === epoch;
       try {
         await setupCLI(pi, ctx, name === "pi-note-upgrade",
@@ -483,7 +532,6 @@ export default function (pi: ExtensionAPI) {
           const generation = epoch;
           await checkCLI(latestContext, !currentSession());
           if (!alive || generation !== epoch || setupAbort) return;
-          watcher.start(latestContext);
           await refresh(latestContext);
         }
       }
@@ -547,13 +595,8 @@ export default function (pi: ExtensionAPI) {
           if (!action || !canAct()) return;
           if (action === "Settings") { settings = true; continue; }
           if (action === "Done" && current) {
-            refreshSerial++;
-            const completed = requiredTask(await run([
-              "agent", "done", String(current.id), "--expected-updated-at", current.updated_at,
-            ], undefined, canAct), current.id);
-            if (completed.state !== "done") throw new Error(compatible);
-            if (currentSession() && branch === branchEpoch) remember(null, branch);
-            if (currentSession()) ctx.ui.notify(`Pinote #${current.id} completed.`, "info");
+            if (pending === operation) pending = undefined;
+            await completeSelected("", ctx, current);
             return;
           }
           let id: number;
@@ -601,7 +644,7 @@ export default function (pi: ExtensionAPI) {
     name: "pinote_update_current",
     label: "Pinote update current",
     promptGuidelines: [handoffGuidance],
-    description: "Patch arbitrary agent handoff fields on this session's current pinote task. No ID argument. Read first with pinote_get_current; pass its updated_at as expected_updated_at. Fails when no task is selected or the selection changes during the operation. set merges label/value pairs without replacing other fields or task text; values are Markdown, e.g. PR: [Fix #42](https://github.com/org/repo/pull/42). Set PR to one GitHub pull-request URL or Markdown link to show PR #N in the footer and watch for merge confirmation in interactive Pi. Read pinote_fields for the user's global field names, labels, link switches, formats, and widths; set those field names when their values are relevant. Fields without values stay hidden. When footer.fields is unset, set Bar to newline-separated field labels to show those Markdown fields in the footer; links in the text are clickable. remove deletes named fields. A stale revision fails; read again before retrying. Does not complete the task or change its tag.",
+    description: "Patch arbitrary agent handoff fields on this session's current pinote task. No ID argument. Read first with pinote_get_current; pass its updated_at as expected_updated_at. Fails when no task is selected or the selection changes during the operation. set merges label/value pairs without replacing other fields or task text; values are Markdown, e.g. PR: [Fix #42](https://github.com/org/repo/pull/42). Set PR to one GitHub pull-request URL or Markdown link to show PR #N in the footer. Pinote does not poll GitHub or prompt on PR merges. Read pinote_fields for the user's global field names, labels, link switches, formats, and widths; set those field names when their values are relevant. Fields without values stay hidden. When footer.fields is unset, set Bar to newline-separated field labels to show those Markdown fields in the footer; links in the text are clickable. remove deletes named fields. A stale revision fails; read again before retrying. Does not complete the task or change its tag.",
     parameters: Type.Object({
       expected_updated_at: Type.String({ minLength: 1 }),
       set: Type.Optional(Type.Record(Type.String(), Type.String())),
@@ -727,6 +770,7 @@ export default function (pi: ExtensionAPI) {
       if (offerDeclined) return result("dismissed; continue without a note and do not offer again");
       if (suggestion) return result("pending; existing suggestion retained, continue work without asking again");
       suggestion = { text: params.text, ...(params.tag === undefined ? {} : { tag: params.tag.trim() }) };
+      saveSuggestion();
       previewBridge?.setSuggestion((choice) => respondToSuggestion(choice, ctx));
       ctx.ui.setStatus("pinote", suggestionStatus(ctx));
       return result("pending; user can click ✓ to add and select or ✕ to dismiss, continue work without asking again");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-note",
-  "version": "0.14.0",
+  "version": "0.15.1",
   "description": "Persistent pinote tasks, Markdown handoffs, and task status for Pi",
   "license": "MIT",
   "type": "module",
@@ -27,7 +27,7 @@
   },
   "files": [
     "index.ts",
-    "pr-watch.ts",
+    "footer-status.ts",
     "footer-links.ts",
     "footer-config.ts",
     "footer-settings.ts",

package/task-suggestion.ts

@@ -11,11 +11,11 @@ const add = readFileSync(new URL("./icons/add.txt", import.meta.url), "utf8").tr
 const gap = "\u00a0";
 const link = (label: string, url?: string) => url ? `\x1b]8;;${url}\x07${label}\x1b]8;;\x07` : label;
 type Task = { text: string; tag?: string | null };
-type Colors = Pick<Theme, "fg">;
+type Colors = Pick<Theme, "fg" | "bold">;
 
 function renderTask(task: Task, width: number, theme: Colors, prefix: string, previewUrl?: string): string {
   // All controls or none: never let a narrow budget reveal only one pending choice.
-  if (visibleWidth(prefix) > width) return truncateToWidth(pin, width, "");
+  if (visibleWidth(prefix) > width) return truncateToWidth(theme.bold(pin), width, "");
   const remaining = width - visibleWidth(prefix) - 3; // separator: " · "
   if (remaining < 4) return prefix.trimEnd();
   const clean = (value: string) => stripVTControlCharacters(value).replace(/[\x00-\x1f\x7f-\x9f]/gu, " ").replace(/\s+/gu, " ").trim();
@@ -30,12 +30,12 @@ function renderTask(task: Task, width: number, theme: Colors, prefix: string, pr
 
 export function renderSuggestion(task: Task, width: number, theme: Colors, urls: { yes?: string; no?: string }): string {
   return renderTask(task, width, theme,
-    `${pin} ${theme.fg("muted", link(cross, urls.no))}${gap.repeat(2)}${theme.fg("accent", link(add, urls.yes))}`);
+    `${theme.bold(pin)} ${theme.fg("muted", link(theme.bold(cross), urls.no))}${gap.repeat(2)}${theme.fg("accent", link(theme.bold(add), urls.yes))}`);
 }
 
 export function renderSelectedTask(task: Task, width: number, theme: Colors, urls: { preview?: string; done?: string }): string {
-  // Reserve the former '+' cell: accepting twice at the same position cannot click Done.
+  // Done stays in the former '✕' cell, never the Add cell.
   return renderTask(task, width, theme,
-    `${pin} ${theme.fg("success", link(check, urls.done))}${gap.repeat(visibleWidth(cross) + 2 + visibleWidth(add) - visibleWidth(check))}`,
+    `${theme.bold(pin)} ${theme.fg("success", link(theme.bold(check), urls.done))}`,
     urls.preview);
 }

package/pr-watch.ts

@@ -1,236 +0,0 @@
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { footerChips, footerStatusKey, legacyFooterStatusKey, renderFooterLinks, type FooterChip } from "./footer-links.ts";
-import type { FooterConfig } from "./footer-config.ts";
-
-export type WatchedTask = {
-  id: number;
-  state: string;
-  updated_at: string;
-  agent_notes: Record<string, string>;
-};
-type PR = { url: string; number: string };
-type Dependencies = {
-  selected: (ctx: ExtensionContext) => Promise<WatchedTask | null>;
-  get: (id: number) => Promise<WatchedTask>;
-  done: (task: WatchedTask, canAct: () => boolean) => Promise<void>;
-  claim: () => (() => void) | undefined;
-  refresh: (ctx: ExtensionContext) => Promise<void>;
-  footerConfig?: () => FooterConfig;
-};
-const entryType = "pinote-pr-acknowledged";
-const watchEntryType = "pinote-pr-watched";
-
-// Accept one bare URL or Markdown link, never arbitrary hosts or terminal escapes.
-export function taskPR(task: WatchedTask | null): PR | undefined {
-  const field = task?.agent_notes.PR?.trim();
-  if (!field) return;
-  const url = /^\[[^\r\n]*\]\(([^\s]+)\)$/u.exec(field)?.[1] ?? field;
-  const match = /^https:\/\/github\.com\/([A-Za-z0-9_-]+)\/([A-Za-z0-9_.-]+)\/pull\/([1-9][0-9]*)\/?$/u.exec(url);
-  if (!match || [".", ".."].includes(match[2]) || !Number.isSafeInteger(Number(match[3]))) return;
-  return { url: `https://github.com/${match[1]}/${match[2]}/pull/${match[3]}`, number: match[3] };
-}
-const keyFor = (task: WatchedTask, pr: PR) => JSON.stringify([task.id, pr.url.toLowerCase()]);
-const watchKey = (task: WatchedTask | null) => {
-  const pr = taskPR(task);
-  return task && pr ? keyFor(task, pr) : undefined;
-};
-
-async function confirmCompletion(ctx: ExtensionContext, pr: PR, signal: AbortSignal) {
-  let timer: ReturnType<typeof setInterval> | undefined;
-  const report = () => process.stdout.write("\x1b]9;4;3\x1b\\");
-  const stop = () => {
-    if (timer === undefined) return;
-    clearInterval(timer);
-    timer = undefined;
-    process.stdout.write("\x1b]9;4;0\x1b\\");
-  };
-  if (process.stdout.isTTY && process.env.KITTY_WINDOW_ID && !signal.aborted) {
-    report();
-    // Refresh Kitty's progress timeout and redraw the tab while input is pending.
-    timer = setInterval(report, 125);
-    timer.unref();
-    signal.addEventListener("abort", stop, { once: true });
-  }
-  try {
-    return await ctx.ui.confirm(`PR #${pr.number} was merged`, "Mark this task completed?", { signal });
-  } finally {
-    signal.removeEventListener("abort", stop);
-    stop();
-  }
-}
-
-export function createPRWatcher(pi: ExtensionAPI, deps: Dependencies) {
-  let ctx: ExtensionContext | undefined;
-  let watched: WatchedTask | null = null;
-  let visiblePR: PR | undefined;
-  let visibleLinks: FooterChip[] = [];
-  let timer: ReturnType<typeof setTimeout> | undefined;
-  let controller = new AbortController();
-  let generation = 0;
-  let revision = 0;
-  let running = false;
-  let interval = 60_000;
-  let warned = false;
-  let acknowledged = new Set<string>();
-
-  const remember = (current: WatchedTask | null) => {
-    const changed = watchKey(current) !== watchKey(watched);
-    watched = current;
-    if (changed && ctx) pi.appendEntry(watchEntryType, {
-      cwd: ctx.cwd, task: current ? { id: current.id, url: taskPR(current)!.url } : null,
-    });
-    return changed;
-  };
-  const paint = () => {
-    const current = ctx;
-    if (!current) return;
-    // Clear the old key first so a reload cannot show PR twice.
-    current.ui.setStatus(legacyFooterStatusKey, undefined);
-    current.ui.setStatus(footerStatusKey, renderFooterLinks(
-      visibleLinks, (value) => current.ui.theme.fg("mdLink", value),
-    ));
-  };
-  const schedule = (delay = interval) => {
-    if (!ctx || !interval || running) return;
-    clearTimeout(timer);
-    timer = setTimeout(() => { void poll(); }, delay);
-    timer.unref();
-  };
-  const update = (context: ExtensionContext, current: WatchedTask | null) => {
-    if (!ctx || ctx.cwd !== context.cwd) return;
-    revision++;
-    // Display only the active selection, independently of the retained merge watch.
-    visiblePR = current && ["active", "in_progress"].includes(current.state) ? taskPR(current) : undefined;
-    visibleLinks = footerChips(current, visiblePR, deps.footerConfig?.());
-    // Completion clears selection. Keep the last task until poll verifies its state.
-    const changed = current ? remember(taskPR(current) ? current : null) : false;
-    paint();
-    if (changed) schedule(0);
-  };
-  const latest = async (context: ExtensionContext, previous: WatchedTask | null) => {
-    const current = await deps.selected(context);
-    if (current) return taskPR(current) ? current : null;
-    if (!previous) return null;
-    const old = await deps.get(previous.id);
-    return old.state === "done" && taskPR(old) ? old : null;
-  };
-  async function poll() {
-    if (!ctx || running) return;
-    const context = ctx;
-    const epoch = generation;
-    const signal = controller.signal;
-    const valid = () => ctx === context && generation === epoch && !signal.aborted;
-    running = true;
-    try {
-      await deps.refresh(context);
-      if (!valid()) return;
-      const snapshot = revision;
-      const candidate = await latest(context, watched);
-      if (!valid() || revision !== snapshot) return;
-      remember(candidate);
-      paint();
-      const pr = taskPR(candidate);
-      if (!candidate || !pr) return;
-      const key = keyFor(candidate, pr);
-      const same = () => valid() && watched !== null && taskPR(watched)?.url === pr.url && watched.id === candidate.id;
-      if (acknowledged.has(key)) return;
-      const result = await pi.exec("gh", ["pr", "view", pr.url, "--json", "state,url"], {
-        cwd: context.cwd, timeout: 10_000, signal,
-      });
-      if (!same()) return;
-      if (result.code !== 0 || result.killed) throw new Error("GitHub CLI failed");
-      const data = JSON.parse(result.stdout);
-      // GitHub canonicalizes owner/repository casing in its response URL.
-      if (typeof data.url !== "string" || data.url.toLowerCase() !== pr.url.toLowerCase() ||
-          !["OPEN", "CLOSED", "MERGED"].includes(data.state)) throw new Error("Invalid PR response");
-      warned = false;
-      if (data.state !== "MERGED" || !context.isIdle()) return;
-      const release = deps.claim();
-      if (!release) return;
-      try {
-        const current = await latest(context, candidate);
-        if (!same() || !current || current.id !== candidate.id || taskPR(current)?.url !== pr.url || !context.isIdle()) return;
-        const acknowledge = () => {
-          pi.appendEntry(entryType, { cwd: context.cwd, key });
-          acknowledged.add(key);
-        };
-        const alreadyDone = () => {
-          context.ui.notify(`PR #${pr.number} was merged and the task is already completed.`, "info");
-          acknowledge();
-        };
-        if (current.state === "done") { alreadyDone(); return; }
-        if (!["active", "in_progress"].includes(current.state)) return;
-        const confirmed = await confirmCompletion(context, pr, signal);
-        if (!same() || !context.isIdle()) return;
-        // Re-read selection, link, and revision after the dialog; never complete a changed task.
-        const fresh = await latest(context, current);
-        if (!same() || !fresh || fresh.id !== current.id || taskPR(fresh)?.url !== pr.url) return;
-        if (fresh.state === "done") { alreadyDone(); return; }
-        if (fresh.updated_at !== current.updated_at) {
-          context.ui.notify("Pinote task changed while confirming. The merge will be checked again.", "warning");
-          return;
-        }
-        if (confirmed) {
-          await deps.done(fresh, () => same() && context.isIdle());
-          if (!valid()) return;
-          context.ui.notify(`Pinote #${fresh.id} completed.`, "info");
-        }
-        acknowledge();
-      } finally {
-        release();
-        if (valid()) await deps.refresh(context);
-      }
-    } catch {
-      if (valid() && !warned) {
-        warned = true;
-        context.ui.notify("Pinote PR check failed. Check gh authentication and note availability; polling will retry.", "warning");
-      }
-    } finally {
-      // A previous session's request must not affect a replacement watcher's timer.
-      if (valid()) { running = false; schedule(); }
-    }
-  }
-  return {
-    update,
-    start(context: ExtensionContext) {
-      this.stop();
-      if (!context.hasUI || context.mode !== "tui") return;
-      const seconds = Number(process.env.PINOTE_PR_POLL_SECONDS ?? "60");
-      interval = Number.isInteger(seconds) && (seconds === 0 || seconds >= 10 && seconds <= 86400)
-        ? seconds * 1000 : 60_000;
-      if (interval !== seconds * 1000) context.ui.notify("Invalid PINOTE_PR_POLL_SECONDS; using 60 seconds (allowed: 0 or 10–86400).", "warning");
-      ctx = context;
-      const branch = context.sessionManager.getBranch();
-      // Persist only the identity; latest() must verify the real task state before polling.
-      for (const entry of branch) {
-        if (entry.type !== "custom" || entry.customType !== watchEntryType) continue;
-        const data = entry.data as { cwd?: unknown; task?: { id?: unknown; url?: unknown } | null } | undefined;
-        if (data?.cwd !== context.cwd) continue;
-        if (data.task === null) { watched = null; continue; }
-        if (!data.task || !Number.isSafeInteger(data.task.id) || Number(data.task.id) < 1 || typeof data.task.url !== "string") continue;
-        const restored = { id: Number(data.task.id), state: "unknown", updated_at: "", agent_notes: { PR: data.task.url } };
-        if (taskPR(restored)) watched = restored;
-      }
-      acknowledged = new Set(branch.flatMap((entry) => {
-        if (entry.type !== "custom" || entry.customType !== entryType) return [];
-        const data = entry.data as { cwd?: unknown; key?: unknown } | undefined;
-        return data?.cwd === context.cwd && typeof data.key === "string" ? [data.key] : [];
-      }));
-      schedule(0);
-    },
-    stop() {
-      generation++;
-      controller.abort();
-      controller = new AbortController();
-      clearTimeout(timer);
-      ctx?.ui.setStatus(legacyFooterStatusKey, undefined);
-      ctx?.ui.setStatus(footerStatusKey, undefined);
-      ctx = undefined;
-      watched = null;
-      visiblePR = undefined;
-      visibleLinks = [];
-      running = false;
-      warned = false;
-    },
-  };
-}