pi-note 0.33.0 → 0.33.1

package/README.md

@@ -62,7 +62,8 @@ title previews it and double-clicking completes it. A suggested title requires a
 double-click to accept. Regular mode shows status; `/pinote` provides all actions.
 No Kitty action handler is needed for this extension.
 
-Completion keeps the conversation and editor. With an empty editor, **Ctrl+D**
+Completion keeps the conversation and editor, except for dedicated **Start in Kitty…**
+sessions (see below). With an empty editor, **Ctrl+D**
 (or your configured exit key) offers Cancel, Exit without completing, or Complete
 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.
@@ -89,6 +90,17 @@ client-local and is never sent to the service or persisted as launch state.
 Only a fresh session can consume it. The service must share the GUI's database;
 missing/stale revisions fail closed. Resume, reload and `/new` never replay the
 handoff or replace another selection. Pi keeps its normal endpoint/token settings.
+With pi-note 0.33.1+, completing the launched task from the menu, footer or
+**Complete task and exit** runs `git pull --ff-only --no-rebase --no-autostash` in
+Pi's working directory before exiting, so Kitty closes its dedicated tab (or the
+standalone window's last tab). It never merges, rebases or stashes local changes.
+If Git fails, times out (30 seconds), or the session/draft changes, Pi stays open;
+the task remains completed and is not retried. Check Git manually, then `/quit`.
+Non-Git directories or branches without an upstream also stay open after the
+failed pull. `/quit` and Exit without completing do not pull.
+This ownership survives `/reload`, but not `/new`, resume, fork, tree navigation
+or process restart. Completing a different task or an externally completed task
+does not pull or close Pi; failed/uncertain completion stays open.
 
 ### Agent tools and context
 

package/dist-mcp/mcp/core.js

@@ -183,7 +183,7 @@ function view(data, scoped = false, secondary = false, features = {}) {
     // Footer actions remain valid on every screen, including Settings.
     if (task) {
         action('preview', 'Preview full task', { description: 'Display only; never sent to the model' });
-        action('done', 'Complete task', { icon: icons.check, ...(features.footerNativeActions ? { description: 'Complete task; keep this conversation and draft' } : {}) });
+        action('done', 'Complete task', { icon: icons.check, ...(features.footerNativeActions ? { description: 'Complete the selected task' } : {}) });
     }
     else if (state.proposal) {
         const acceptance = 'task_id' in state.proposal ? `Start and select existing task #${state.proposal.task_id}; no new task is created.` : 'Create, start, and select this suggestion.';

package/mcp/core.ts

@@ -162,7 +162,7 @@ function view(data: Snapshot, scoped = false, secondary = false, features: { foo
   // Footer actions remain valid on every screen, including Settings.
   if (task) {
     action('preview', 'Preview full task', { description: 'Display only; never sent to the model' });
-    action('done', 'Complete task', { icon: icons.check, ...(features.footerNativeActions ? { description: 'Complete task; keep this conversation and draft' } : {}) });
+    action('done', 'Complete task', { icon: icons.check, ...(features.footerNativeActions ? { description: 'Complete the selected task' } : {}) });
   } else if (state.proposal) {
     const acceptance = 'task_id' in state.proposal ? `Start and select existing task #${state.proposal.task_id}; no new task is created.` : 'Create, start, and select this suggestion.';
     action('proposal:accept', 'Accept suggestion', { icon: icons.add, description: `${acceptance} ${features.footerNativeActions ? 'Double-click the suggested footer title to accept; use Dismiss suggestion to dismiss.' : 'Left-click to accept; right-click to dismiss.'}\n${suggestion!.text.slice(0, 4000)}` });

package/package.json

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

package/remote/exit.ts

@@ -1,10 +1,26 @@
-import { CustomEditor, type ExtensionAPI } from '@earendil-works/pi-coding-agent';
+import { CustomEditor, type ExtensionAPI, type ExtensionContext } from '@earendil-works/pi-coding-agent';
 import { truncateToWidth } from '@earendil-works/pi-tui';
 import { clean } from './protocol.ts';
 import type { RemoteSession } from './session.ts';
 
+/** Completion is already committed: pull failures must never retry the task action. */
+export async function pullBeforeExit(pi: ExtensionAPI, ctx: ExtensionContext, signal: AbortSignal, current: () => boolean): Promise<boolean> {
+  const sessionId = ctx.sessionManager.getSessionId(), branch = ctx.sessionManager.getLeafId();
+  const draft = ctx.ui.getEditorText();
+  const unchanged = () => current() && !signal.aborted && ctx.isIdle() &&
+    ctx.sessionManager.getSessionId() === sessionId && ctx.sessionManager.getLeafId() === branch && ctx.ui.getEditorText() === draft;
+  if (!unchanged()) return false;
+  ctx.ui.notify('Task completed. Running git pull --ff-only before closing Pi…', 'info');
+  try {
+    const result = await pi.exec('git', ['pull', '--ff-only', '--no-rebase', '--no-autostash'], { cwd: ctx.cwd, signal, timeout: 30_000 });
+    if (result.code === 0 && !result.killed && unchanged()) return true;
+  } catch { /* Completion succeeded; only the local pull failed. */ }
+  if (current()) ctx.ui.notify('Task completed, but Pi stayed open: git pull failed or the session changed. Check Git manually, then /quit. Completion will not be retried.', 'warning');
+  return false;
+}
+
 /** Default remote companion. /quit and nonempty-editor exit input remain Pi-owned. */
-export function registerRemoteExit(pi: ExtensionAPI, getSession: () => RemoteSession | undefined): void {
+export function registerRemoteExit(pi: ExtensionAPI, getSession: () => RemoteSession | undefined, ownsLaunch = (_taskId: number) => false): void {
   let invalidate: (() => void) | undefined;
   let stop: (() => void) | undefined;
   let confirm: ((reason: 'exit' | 'new') => Promise<boolean>) | undefined;
@@ -54,7 +70,12 @@ export function registerRemoteExit(pi: ExtensionAPI, getSession: () => RemoteSes
         // Approval belongs to this exact displayed view, never to a refreshed revision.
         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;
+        if (session.view && session.view.state.selectedId == null) {
+          if (reason === 'exit' && typeof view.state.selectedId === 'number' && ownsLaunch(view.state.selectedId)) {
+            return await pullBeforeExit(pi, ctx, operation.signal, current);
+          }
+          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 in this session. Completion was not confirmed and may have committed; refresh /pinote before retrying. /quit exits without completing.', 'warning');

package/remote/ui.ts

@@ -4,6 +4,7 @@ import { NativeFooter } from './footer.ts';
 import { clean, cleanUnbounded, editorText, footerText, literal, type NativeControl, type NativeView } from './protocol.ts';
 import { RemoteFailure } from './client.ts';
 import { RemoteSession } from './session.ts';
+import { pullBeforeExit } from './exit.ts';
 import { inlineHeight, remoteMenu, type MenuState } from './menu.ts';
 
 const line = (text: string) => clean(text).replace(/\n/g, ' ');
@@ -63,10 +64,12 @@ export class RemoteUI {
   private repaint = () => {};
   private menuChanged?: () => void;
   private opening = false;
+  private closing = false;
   private pi: ExtensionAPI;
   private session: RemoteSession;
-  constructor(pi: ExtensionAPI, session: RemoteSession) {
-    this.pi = pi; this.session = session;
+  private exitOnComplete: (taskId: number) => boolean;
+  constructor(pi: ExtensionAPI, session: RemoteSession, exitOnComplete = (_taskId: number) => false) {
+    this.pi = pi; this.session = session; this.exitOnComplete = exitOnComplete;
     session.onChange = () => { this.render(); this.menuChanged?.(); };
   }
   attach(ctx: ExtensionContext): void {
@@ -109,6 +112,14 @@ export class RemoteUI {
       if (!current()) return false;
       const result = await this.session.action(view, control, value, () => control.id !== 'done' || ctx.isIdle());
       if (!current()) return false;
+      if (control.id === 'done' && ctx.isIdle() && typeof view.state.selectedId === 'number' &&
+          this.session.view && this.session.view.state.selectedId == null && this.exitOnComplete(view.state.selectedId)) {
+        if (await pullBeforeExit(this.pi, ctx, signal, current)) {
+          this.closing = true;
+          ctx.shutdown();
+        }
+        return true;
+      }
       if (result.preview) this.pi.appendEntry('pinote-remote-preview', { title: line(view.title), text: clean(result.preview) });
       if (result.draft && await review(ctx, 'Insert server draft?', result.draft, signal) && current()) {
         if (ctx.ui.getEditorText().length) ctx.ui.notify('Draft not inserted: clear the editor first.', 'warning');
@@ -131,7 +142,7 @@ export class RemoteUI {
     const menus = new Map<string, MenuState>();
     try {
       await this.session.refresh(true);
-      while (current() && !signal.aborted) {
+      while (current() && !signal.aborted && !this.closing) {
         const view = this.session.view;
         if (!view) return;
         const screen = String(view.state.screen ?? 'tasks');

package/remote.ts

@@ -11,10 +11,13 @@ import { editorText } from './remote/protocol.ts';
 // Reload/resume/fork restore branch entries, never this map or a folder-global store.
 const key = Symbol.for('pinote.remote.new-transfer.v1');
 const transfers: Map<string, SavedState> = ((globalThis as any)[key] ??= new Map());
+// Process-local launch ownership survives /reload, never resume in another process.
+const launches: Map<string, number> = ((globalThis as any)[Symbol.for('pinote.remote.kitty-launch.v1')] ??= new Map());
 
 export default function pinoteRemote(pi: ExtensionAPI): void {
   let session: RemoteSession | undefined, ui: RemoteUI | undefined;
-  let file: string | undefined;
+  let file: string | undefined, launchKey = '';
+  const ownsLaunch = (taskId: number) => launches.get(launchKey) === taskId;
   let launchRequest = process.env.PINOTE_LAUNCH_TASK;
   delete process.env.PINOTE_LAUNCH_TASK; // Never inherit consent into another Pi process or /reload.
   const getSession = () => { if (!session) throw new RemoteFailure(); return session; };
@@ -37,12 +40,14 @@ export default function pinoteRemote(pi: ExtensionAPI): void {
   pi.registerCommand('pinote', { description: 'Open remote Pinote tasks and settings', handler: open });
   const start = async (ctx: ExtensionContext, reason?: string, previous?: string) => {
     const request = launchRequest; launchRequest = undefined; // Never replay an uncertain start.
+    if (reason !== 'reload') launches.clear();
     ui?.detach(); await session?.stop();
     ui = undefined; session = undefined;
     try {
       const config = remoteConfig();
       session = new RemoteSession(config, (saved) => pi.appendEntry(ENTRY_TYPE, saved));
-      ui = new RemoteUI(pi, session);
+      launchKey = `${config.scope}:${ctx.sessionManager.getSessionId()}`;
+      ui = new RemoteUI(pi, session, ownsLaunch);
       ui.attach(ctx);
       file = ctx.sessionManager.getSessionFile();
       const branch = ctx.sessionManager.getBranch();
@@ -73,6 +78,7 @@ export default function pinoteRemote(pi: ExtensionAPI): void {
         const control = view.controls.find((item) => item.id === `select:${launch.task_id}`);
         if (!control) throw new Error('Launch task changed or belongs to another service');
         await session.action(view, control); // The directory chooser's Start click granted consent.
+        if (session.view?.state.selectedId === launch.task_id) launches.set(launchKey, launch.task_id);
         if (prompt?.trim() && ctx.mode === 'tui' && ctx.isIdle()) {
           if (ctx.ui.getEditorText().length) ctx.ui.notify('Launch draft not inserted: the editor already contains a draft.', 'warning');
           else ctx.ui.setEditorText(prompt);
@@ -86,7 +92,8 @@ export default function pinoteRemote(pi: ExtensionAPI): void {
   };
   pi.on('session_start', (event, ctx) => start(ctx, event.reason, event.previousSessionFile));
   pi.on('session_tree', (_event, ctx) => start(ctx));
-  pi.on('session_shutdown', async () => {
+  pi.on('session_shutdown', async (event) => {
+    if (event.reason !== 'reload') launches.clear();
     const saved = session?.snapshot();
     if (file && saved?.retainOnNew) {
       if (transfers.size >= 32) transfers.delete(transfers.keys().next().value!);
@@ -105,5 +112,5 @@ export default function pinoteRemote(pi: ExtensionAPI): void {
         (char) => `\\u${char.charCodeAt(0).toString(16).padStart(4, '0')}`),
     ].join('\n\n');
   });
-  registerRemoteExit(pi, () => session);
+  registerRemoteExit(pi, () => session, ownsLaunch);
 }