pi-note 0.29.1 → 0.30.0

package/README.md

@@ -63,11 +63,14 @@ No Kitty action handler is needed for this extension.
 
 Completion keeps the conversation and editor. With an empty editor, **Ctrl+D**
 (or your configured exit key) offers Cancel, Exit without completing, or Complete
-task and exit. Completion requires idle Pi and a current displayed revision;
-failures leave Pi open. `/quit` exits without completing.
-
-Reload/resume restores the active
-branch's selection; `/new` retains it. Unrelated fresh launches start unselected.
+task and exit. **`/new`** offers Cancel, Start new session without completing, or
+Complete task and start new session. With no selected task, `/new` proceeds normally.
+Completion requires idle Pi and a current displayed revision; failures keep the
+current session open. `/quit` exits without completing.
+
+Reload/resume restores the active branch's selection. Starting a new session
+without completing retains the selection; completing starts it unselected.
+Unrelated fresh launches start unselected.
 Changing endpoints starts a separate selection namespace. Unsaved Pi sessions
 cannot guarantee selection persistence.
 

package/package.json

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

package/remote/exit.ts

@@ -3,13 +3,11 @@ import { truncateToWidth } from '@earendil-works/pi-tui';
 import { clean } from './protocol.ts';
 import type { RemoteSession } from './session.ts';
 
-const leave = 'Exit without completing';
-const complete = 'Complete task and exit';
-
-/** Default remote companion. /quit and nonempty-editor input remain Pi-owned. */
+/** Default remote companion. /quit and nonempty-editor exit input remain Pi-owned. */
 export function registerRemoteExit(pi: ExtensionAPI, getSession: () => RemoteSession | undefined): void {
   let invalidate: (() => void) | undefined;
   let stop: (() => void) | undefined;
+  let confirm: ((reason: 'exit' | 'new') => Promise<boolean>) | undefined;
   pi.on('session_start', (_event, ctx) => {
     stop?.();
     if (ctx.mode !== 'tui' || !ctx.hasUI) return;
@@ -17,33 +15,36 @@ export function registerRemoteExit(pi: ExtensionAPI, getSession: () => RemoteSes
     let alive = true, pending = false, epoch = 0;
     let controller: AbortController | undefined;
     invalidate = () => { epoch++; controller?.abort(); };
-    const exit = async () => {
-      if (!alive || pending) return;
+    confirm = async (reason) => {
+      if (!alive || pending) return false;
+      const leave = reason === 'new' ? 'Start new session without completing' : 'Exit without completing';
+      const complete = reason === 'new' ? 'Complete task and start new session' : 'Complete task and exit';
       pending = true;
       const generation = epoch, session = getSession();
       const operation = controller = new AbortController();
       const sessionId = ctx.sessionManager.getSessionId();
+      const draft = ctx.ui.getEditorText();
       const validSession = session?.current();
       const current = () => alive && generation === epoch && !operation.signal.aborted &&
         session === getSession() && !!validSession?.() &&
-        ctx.sessionManager.getSessionId() === sessionId && ctx.ui.getEditorText().length === 0;
-      const shutdown = () => { if (!ctx.isIdle()) ctx.abort(); ctx.shutdown(); };
+        ctx.sessionManager.getSessionId() === sessionId &&
+        (reason === 'exit' ? ctx.ui.getEditorText().length === 0 : ctx.ui.getEditorText() === draft);
       try {
         if (!session) throw new Error('unavailable');
         await session.refresh(true);
-        if (!current()) return;
+        if (!current()) return false;
         const view = session.view;
         if (!view) throw new Error('unavailable');
-        if (view.state.selectedId == null) { shutdown(); return; }
+        if (view.state.selectedId == null) return true;
         const branch = ctx.sessionManager.getLeafId();
         const done = view.controls.find((c) => c.id === 'done' && c.kind === 'action');
         const title = truncateToWidth(clean((view.body ?? view.title).split('\n', 1)[0]), 70);
         const choice = await ctx.ui.select(`Pinote · ${title}`, ['Cancel', leave, complete], {
           signal: AbortSignal.any([operation.signal, session.signal]),
         });
-        if (!current()) return;
-        if (choice === leave) { shutdown(); return; }
-        if (choice !== complete) return;
+        if (!current()) return false;
+        if (choice === leave) return true;
+        if (choice !== complete) return false;
         const latest = session.view;
         if (!ctx.isIdle() || ctx.sessionManager.getLeafId() !== branch || !done ||
             !latest || latest.state.selectedId !== view.state.selectedId || latest.revision !== view.revision ||
@@ -51,13 +52,20 @@ export function registerRemoteExit(pi: ExtensionAPI, getSession: () => RemoteSes
           throw new Error('changed');
         }
         // Approval belongs to this exact displayed view, never to a refreshed revision.
-        await session.action(view, done, undefined, () => ctx.isIdle());
-        if (!current()) return;
-        if (session.view && session.view.state.selectedId == null) ctx.shutdown();
-        else ctx.ui.notify('Pinote: Pi stayed open because the selection was not cleared. Refresh /pinote before retrying.', 'warning');
+        await session.action(view, done, undefined, () => current() && ctx.isIdle() && ctx.sessionManager.getLeafId() === branch);
+        if (!current()) return false;
+        if (session.view && session.view.state.selectedId == null) return true;
+        ctx.ui.notify('Pinote: Pi stayed in this session because the selection was not cleared. Refresh /pinote before retrying.', 'warning');
       } catch {
-        if (alive && generation === epoch) ctx.ui.notify('Pinote: Pi stayed open. Completion was not confirmed and may have committed; refresh /pinote before retrying. /quit exits without completing.', 'warning');
+        if (alive && generation === epoch) ctx.ui.notify('Pinote: Pi stayed in this session. Completion was not confirmed and may have committed; refresh /pinote before retrying. /quit exits without completing.', 'warning');
       } finally { pending = false; }
+      return false;
+    };
+    const exit = async () => {
+      if (await confirm?.('exit')) {
+        if (!ctx.isIdle()) ctx.abort();
+        ctx.shutdown();
+      }
     };
     const factory: NonNullable<ReturnType<typeof ctx.ui.getEditorComponent>> = (tui, theme, keybindings) => {
       const editor = previous ? previous(tui, theme, keybindings) : new CustomEditor(tui, theme, keybindings);
@@ -75,10 +83,15 @@ export function registerRemoteExit(pi: ExtensionAPI, getSession: () => RemoteSes
       if (ctx.ui.getEditorComponent() === factory) ctx.ui.setEditorComponent(previous);
     };
   });
-  pi.on('session_shutdown', () => { stop?.(); stop = invalidate = undefined; });
+  pi.on('session_shutdown', () => { stop?.(); stop = invalidate = confirm = undefined; });
   const interrupted = () => { invalidate?.(); };
   pi.on('agent_start', interrupted);
-  pi.on('session_before_switch', interrupted);
+  pi.on('session_before_switch', async (event, ctx) => {
+    interrupted();
+    if (event.reason === 'new' && ctx.mode === 'tui' && ctx.hasUI && !await confirm?.('new')) {
+      return { cancel: true };
+    }
+  });
   pi.on('session_before_fork', interrupted);
   pi.on('session_before_tree', interrupted);
 }