pi-note 0.17.1 → 0.18.0

package/README.md

@@ -112,8 +112,11 @@ are rejected. The **Preview task** Settings action is also available when the
 socket cannot start; the task remains visible without a link.
 
 Each Pi session remembers its own task, including several sessions in one folder.
-Resume restores that session's task; a new session starts unselected and does not import
-an older per-folder selection. Pi saves the session after the first submitted message;
+Resume restores that session's task. `/new` keeps the current task selected and
+prepopulates the editor with `newSessionPrompt`; nothing is submitted automatically.
+A fresh Pi launch starts unselected and does not import an older per-folder selection.
+Completion still starts a clean, unselected session. Retention requires normal
+file-backed Pi sessions; `--no-session` does not retain the selection across `/new`. Pi saves the session after the first submitted message;
 quitting before that leaves the next launch unselected, while the task stays in progress.
 Use **Continue**
 to insert the same configured prompt. Completing, removing, or scheduling a task clears it
@@ -131,6 +134,7 @@ Configure `~/.pi/agent/pi-note.json` (or the agent directory set by
 ```json
 {
   "handoffPrompt": "Read the current Pinote task. Summarize your understanding and proposed approach, but don’t start work yet.",
+  "newSessionPrompt": "Read the current Pinote task. Summarize your understanding and proposed approach, but don’t start work yet.",
   "taskOfferPolicy": "github-remote"
 }
 ```
@@ -158,6 +162,13 @@ warns until you fix the file and reload. No project-local configuration is read.
 In `/pi-note → Settings`, select **Task prompt** to edit the text inserted after
 selection or **Continue**. **Shift+Enter** or **Ctrl+J** adds a newline; **Enter** saves it
 globally, **Ctrl+C** clears the edit, and **Esc** cancels that unfinished edit.
+
+**New session prompt** edits the separate draft inserted by `/new` when a task is
+retained. Its default matches the built-in task prompt; an empty/whitespace-only
+value disables insertion without clearing the task. `/new` rereads it each time,
+so changes need no `/reload`. Invalid configuration warns and leaves the retained
+task selected without inserting a prompt. Both prompts are literal text, not templates.
+
 Settings and fields save automatically after each confirmed change; no separate
 Save action is needed. Leaving Settings with **Esc** or **Tab** keeps saved changes
 and discards only unfinished input. Saving never changes existing editor input or submits anything.
@@ -309,7 +320,7 @@ String definitions and the older `{ "label": "Next", "width": 24 }` form still
 work. Absent/`null` fields retain the legacy automatic PR link plus `Bar` fields;
 the first Settings save turns this legacy list into explicit global definitions.
 
-Settings saves apply immediately in this Pi session. Run `/reload` after manual
+Settings saves include both prompts and apply immediately in this Pi session. Run `/reload` after manual
 footer edits or in other running sessions; settings are also reread on session start.
 Invalid footer configuration warns and uses footer defaults; missing files silently
 use defaults. The task prompt is also read separately on selection/Continue as

package/footer-config.ts

@@ -4,13 +4,20 @@ import { join } from "node:path";
 import { randomUUID } from "node:crypto";
 
 export const defaultHandoffPrompt = "Read the current Pinote task. Summarize your understanding, but don’t start work yet.";
+export const defaultNewSessionPrompt = defaultHandoffPrompt;
+export function parseNewSessionPrompt(value: unknown): string {
+  if (typeof value !== "string" || /[\x00-\x08\x0b-\x1f\x7f-\x9f]/u.test(value)) {
+    throw new Error("newSessionPrompt in pi-note.json must be a string without control characters (except tabs/newlines).");
+  }
+  return value;
+}
 export function parseHandoffPrompt(value: unknown): string {
   if (typeof value !== "string" || !value.trim() || /[\x00-\x08\x0b-\x1f\x7f-\x9f]/u.test(value)) {
     throw new Error("handoffPrompt in pi-note.json must be a nonblank string without control characters (except tabs/newlines).");
   }
   return value;
 }
-export type PinoteSettings = { footer: FooterConfig; handoffPrompt: string };
+export type PinoteSettings = { footer: FooterConfig; handoffPrompt: string; newSessionPrompt?: string };
 
 export type FooterField = { name: string; label: string; link: boolean; format: string; width?: number };
 export type FooterConfig = { titleWidth: number; fieldWidth: number; maxFields: number; fields: FooterField[] | null };
@@ -90,9 +97,12 @@ export function loadFooterConfig(warn: (message: string) => void): FooterConfig
 
 // Synchronous compare-and-replace: reject edits made while the settings dialog was open,
 // preserve unrelated keys, and never leave partial JSON behind.
-export function saveFooterConfig(config: FooterConfig, expectedRaw: string | null, handoffPrompt?: string) {
+export function saveFooterConfig(config: FooterConfig, expectedRaw: string | null, handoffPrompt?: string, newSessionPrompt?: string) {
   const checked = parseFooterConfig({ footer: config });
-  const prompt = handoffPrompt === undefined ? {} : { handoffPrompt: parseHandoffPrompt(handoffPrompt) };
+  const prompts = {
+    ...(handoffPrompt === undefined ? {} : { handoffPrompt: parseHandoffPrompt(handoffPrompt) }),
+    ...(newSessionPrompt === undefined ? {} : { newSessionPrompt: parseNewSessionPrompt(newSessionPrompt) }),
+  };
   const directory = getAgentDir();
   mkdirSync(directory, { recursive: true });
   const path = join(directory, "pi-note.json");
@@ -107,7 +117,7 @@ export function saveFooterConfig(config: FooterConfig, expectedRaw: string | nul
     if (lstatSync(path, { throwIfNoEntry: false })?.isSymbolicLink()) throw new Error("pi-note.json is a symlink. Edit its target manually rather than replacing the link.");
     const root = expectedRaw === null ? {} : JSON.parse(expectedRaw);
     if (!object(root)) throw new Error("Invalid pi-note configuration; expected an object.");
-    raw = `${JSON.stringify({ ...root, ...prompt, footer: checked }, null, 2)}\n`;
+    raw = `${JSON.stringify({ ...root, ...prompts, footer: checked }, null, 2)}\n`;
     writeFileSync(temp, raw, { flag: "wx", mode: 0o600 });
     renameSync(temp, path);
   } finally { rmSync(temp, { force: true }); closeSync(descriptor); rmSync(lock, { force: true }); }

package/footer-settings.ts

@@ -1,6 +1,6 @@
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { Editor, Input, matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
-import { defaultFooterField, parseFooterConfig, parseHandoffPrompt, type PinoteSettings, type FooterConfig, type FooterField } from "./footer-config.ts";
+import { defaultFooterField, defaultNewSessionPrompt, parseFooterConfig, parseHandoffPrompt, parseNewSessionPrompt, type PinoteSettings, type FooterConfig, type FooterField } from "./footer-config.ts";
 
 type Matches = (data: string, action: string) => boolean;
 type Row = { label: string; action: () => void };
@@ -42,7 +42,9 @@ export class TaskMenu {
 export class FooterSettings {
   private draft: FooterConfig;
   private prompt: string;
+  private newSessionPrompt: string;
   private editor?: Editor;
+  private editorMode?: "handoff" | "newSession";
   private createEditor: () => Editor;
   private knownFields: string[];
   private theme: Theme;
@@ -65,6 +67,7 @@ export class FooterSettings {
     this.configurationError = configurationError;
     this.draft = structuredClone(config.footer);
     this.prompt = config.handoffPrompt;
+    this.newSessionPrompt = config.newSessionPrompt === undefined ? defaultNewSessionPrompt : parseNewSessionPrompt(config.newSessionPrompt);
     this.createEditor = createEditor;
     this.save = save;
     this.draft.fields ??= [];
@@ -86,11 +89,13 @@ export class FooterSettings {
   private validate(field: FooterField): FooterField {
     return parseFooterConfig({ footer: { fields: [field] } }).fields![0];
   }
-  private persist(footer = this.draft, handoffPrompt = this.prompt) {
-    const settings = { footer: parseFooterConfig({ footer }), handoffPrompt: parseHandoffPrompt(handoffPrompt) };
+  private persist(footer = this.draft, handoffPrompt = this.prompt, newSessionPrompt = this.newSessionPrompt) {
+    const settings = { footer: parseFooterConfig({ footer }), handoffPrompt: parseHandoffPrompt(handoffPrompt),
+      newSessionPrompt: parseNewSessionPrompt(newSessionPrompt) };
     this.save(structuredClone(settings));
     this.draft = settings.footer;
     this.prompt = settings.handoffPrompt;
+    this.newSessionPrompt = settings.newSessionPrompt;
   }
   private persistField(field: FooterField) {
     const candidate = this.validate(field);
@@ -119,11 +124,19 @@ export class FooterSettings {
       }),
     }));
     rows.push({ label: `Task prompt: ${display(this.prompt)}`, action: () => {
+      this.editorMode = "handoff";
       this.editor = this.createEditor();
       this.editor.disableSubmit = true;
       this.editor.setText(this.prompt);
       this.editor.focused = this.hasFocus;
     } });
+    rows.push({ label: `New session prompt: ${display(this.newSessionPrompt).trim() || "(disabled)"}`, action: () => {
+      this.editorMode = "newSession";
+      this.editor = this.createEditor();
+      this.editor.disableSubmit = true;
+      this.editor.setText(this.newSessionPrompt);
+      this.editor.focused = this.hasFocus;
+    } });
     const configured = this.draft.fields!.map((field) => field.name);
     for (const name of [...configured, ...this.knownFields.filter((name) => !configured.includes(name))]) {
       rows.push({ label: `Field: ${display(name)}${configured.includes(name) ? "" : " (not configured)"}`, action: () => this.edit(name) });
@@ -168,11 +181,13 @@ export class FooterSettings {
       if (isTab(data)) this.done("tasks");
       else if (this.editor) {
         if (matchesKey(data, "ctrl+c")) this.editor.setText("");
-        else if (this.matches(data, "tui.select.cancel")) this.editor = undefined;
+        else if (this.matches(data, "tui.select.cancel")) { this.editor = undefined; this.editorMode = undefined; }
         else if (this.matches(data, "tui.input.newLine")) this.editor.handleInput(data);
         else if (this.matches(data, "tui.select.confirm")) {
-          this.persist(this.draft, this.editor.getExpandedText());
+          if (this.editorMode === "newSession") this.persist(this.draft, this.prompt, this.editor.getExpandedText());
+          else this.persist(this.draft, this.editor.getExpandedText(), this.newSessionPrompt);
           this.editor = undefined;
+          this.editorMode = undefined;
         } else this.editor.handleInput(data);
       } else if (this.input) {
         if (this.matches(data, "tui.select.cancel")) this.input = undefined;
@@ -197,7 +212,7 @@ export class FooterSettings {
     const lines = [this.theme.fg("accent", "Pinote — Global Settings"), this.theme.fg("dim", "Tasks (Tab) · Settings · Fields")];
     if (this.configurationError) lines.push(this.theme.fg("warning", this.configurationError));
     if (this.editor) {
-      lines.push(this.theme.fg("accent", "Task prompt"), ...this.editor.render(width),
+      lines.push(this.theme.fg("accent", this.editorMode === "newSession" ? "New session prompt" : "Task prompt"), ...this.editor.render(width),
         this.theme.fg("dim", "Enter save · Shift+Enter/Ctrl+J newline · Ctrl+C clear · Esc cancel edit"));
     } else if (this.input) {
       lines.push(this.theme.fg("accent", this.input.heading), ...this.input.widget.render(width),

package/index.ts

@@ -6,7 +6,7 @@ import { join } from "node:path";
 import { stripVTControlCharacters } from "node:util";
 import { Type } from "typebox";
 import { updateTaskFooter, clearTaskFooter } from "./footer-status.ts";
-import { defaultFooterConfig, defaultHandoffPrompt, effectiveFooterFields, loadFooterConfig, parseHandoffPrompt, readFooterDocument, saveFooterConfig, type FooterConfig, type PinoteSettings } from "./footer-config.ts";
+import { defaultFooterConfig, defaultHandoffPrompt, defaultNewSessionPrompt, effectiveFooterFields, loadFooterConfig, parseHandoffPrompt, parseNewSessionPrompt, readFooterDocument, saveFooterConfig, type FooterConfig, type PinoteSettings } from "./footer-config.ts";
 import { FooterSettings, TaskMenu, withSettingsTab, type SettingsOption, type SettingsResult } from "./footer-settings.ts";
 import { TaskPicker, taskState, taskTag } from "./task-picker.ts";
 import { bundledCLIVersion, detectCLI, setupCLI, setupHint, versionAtLeast, type CLIAction } from "./setup.ts";
@@ -36,6 +36,13 @@ type Summary = Pick<Task, "id" | "text" | "state" | "tag">;
 // The standard Pi footer accepts text, so ship a portable terminal glyph, not a theme icon.
 const noteIcon = readFileSync(new URL("./icons/note.txt", import.meta.url), "utf8").trim();
 const previewType = "pinote-preview";
+// /new replaces the extension runtime, even before the outgoing session is saved.
+// Transfer only the ID, keyed by the exact destination session file, within this process.
+const continuationKey = Symbol.for("pi-note.new-session-selections");
+const processState = globalThis as typeof globalThis & {
+  [continuationKey]?: Map<string, number>;
+};
+const continuations = processState[continuationKey] ??= new Map<string, number>();
 const compatible = "Incompatible note CLI response. Install pinote 0.3.0+ and check note on PATH.";
 const validId = (value: unknown): value is number => Number.isSafeInteger(value) && Number(value) > 0;
 const record = (value: unknown): value is Record<string, unknown> =>
@@ -420,6 +427,11 @@ export default function (pi: ExtensionAPI) {
     alive = true;
     activeContext = ctx;
     selectedId = readSelection(ctx);
+    const sessionFile = ctx.sessionManager.getSessionFile?.();
+    const continuation = sessionFile ? continuations.get(sessionFile) : undefined;
+    if (sessionFile) continuations.delete(sessionFile);
+    const carrying = _event.reason === "new" && validId(continuation);
+    if (carrying) remember(continuation);
     restoreSuggestion(ctx);
     if (_event.reason === "new" || _event.reason === "fork") {
       // A fork may include an ancestor proposal whose consent was consumed elsewhere.
@@ -451,6 +463,22 @@ export default function (pi: ExtensionAPI) {
     if (!alive || generation !== epoch) return;
     if (suggestion) previewBridge?.setSuggestion((choice) => respondToSuggestion(choice, ctx));
     await refresh(ctx);
+    if (carrying && alive && generation === epoch) {
+      try {
+        const branch = branchEpoch;
+        const current = await selected(ctx);
+        if (!current || !alive || generation !== epoch || branch !== branchEpoch || selectedId !== current.id ||
+            !ctx.hasUI || ctx.mode !== "tui") return;
+        const config = readConfig();
+        const prompt = "newSessionPrompt" in config ? parseNewSessionPrompt(config.newSessionPrompt) : defaultNewSessionPrompt;
+        if (prompt.trim()) {
+          const draft = ctx.ui.getEditorText();
+          ctx.ui.setEditorText(draft ? `${draft}\n\n${prompt}` : prompt);
+        }
+      } catch (error) {
+        if (alive && generation === epoch && ctx.hasUI) ctx.ui.notify(`Pinote new session: ${clean(String(error))}`, "warning");
+      }
+    }
   });
   pi.on("session_tree", async (_event, ctx) => {
     if (!alive) return;
@@ -470,6 +498,12 @@ export default function (pi: ExtensionAPI) {
   pi.on("before_agent_start", async (_event, ctx) => { await refresh(ctx); });
   pi.on("agent_end", async (_event, ctx) => { await refresh(ctx); });
   pi.on("session_shutdown", async (_event, ctx) => {
+    // Shutdown means replacement was accepted; cancelled /new never leaves a transfer.
+    if (_event.reason === "new" && _event.targetSessionFile && validId(selectedId)) {
+      // Bound orphaned transfers if creating the replacement runtime fails.
+      if (continuations.size >= 32) continuations.delete(continuations.keys().next().value!);
+      continuations.set(_event.targetSessionFile, selectedId);
+    }
     setupAbort?.abort();
     cancelCompletionDispatch();
     clearSuggestion(ctx, false);
@@ -551,7 +585,7 @@ export default function (pi: ExtensionAPI) {
             return;
           }
           if (settings) {
-            let config: PinoteSettings = { footer: { ...defaultFooterConfig, fields: [] }, handoffPrompt: defaultHandoffPrompt };
+            let config: PinoteSettings = { footer: { ...defaultFooterConfig, fields: [] }, handoffPrompt: defaultHandoffPrompt, newSessionPrompt: defaultNewSessionPrompt };
             let expectedRaw: string | null = null;
             let configurationError: string | undefined;
             try {
@@ -560,6 +594,7 @@ export default function (pi: ExtensionAPI) {
               config = {
                 footer: { ...document.config, fields: effectiveFooterFields(document.config, current?.agent_notes) },
                 handoffPrompt: "handoffPrompt" in root ? parseHandoffPrompt(root.handoffPrompt) : defaultHandoffPrompt,
+                newSessionPrompt: "newSessionPrompt" in root ? parseNewSessionPrompt(root.newSessionPrompt) : defaultNewSessionPrompt,
               };
               expectedRaw = document.raw;
             } catch (error) {
@@ -590,7 +625,7 @@ export default function (pi: ExtensionAPI) {
                 }), (updated) => {
                   if (!canAct()) throw new Error("This session changed. Reopen settings before editing.");
                   if (configurationError) throw new Error(configurationError);
-                  const saved = saveFooterConfig(updated.footer, expectedRaw, updated.handoffPrompt);
+                  const saved = saveFooterConfig(updated.footer, expectedRaw, updated.handoffPrompt, updated.newSessionPrompt);
                   expectedRaw = saved.raw;
                   footerConfig = saved.config;
                   void refresh(ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-note",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "Persistent pinote tasks, Markdown handoffs, and task status for Pi",
   "license": "MIT",
   "type": "module",