pi-note 0.32.0 → 0.33.1

package/LOCAL.md

@@ -3,7 +3,7 @@
 [npm](https://www.npmjs.com/package/pi-note) · [Pi package directory](https://pi.dev/packages/pi-note)
 
 Persistent [pinote](https://github.com/kvidzibo/pinote) tasks and Markdown handoffs
-in Pi: selected-task footer status, `/pi-note`, and agent current-task read/update,
+in Pi: selected-task footer status, `/pinote`, and agent current-task read/update,
 add, and tag-listing tools.
 The extension and Python app share a repository but install separately.
 
@@ -30,8 +30,8 @@ Install [uv](https://docs.astral.sh/uv/getting-started/installation/) first and
 restart Pi with `uv` on PATH. At startup the extension checks `note --version`
 against its bundled CLI version (currently 0.4.0), without network requests:
 
-- Missing/unrecognized CLI: `/pi-note` opens Settings directly, where **Install CLI** is available.
-- Older CLI: `/pi-note` opens Settings directly, where **Upgrade CLI** is available.
+- Missing/unrecognized CLI: `/pinote` opens Settings directly, where **Install CLI** is available.
+- Older CLI: `/pinote` opens Settings directly, where **Upgrade CLI** is available.
 - Equal/newer CLI: neither installation action is shown; no upgrade notification.
 
 Install and upgrade recheck the CLI version and ask before installing into uv's
@@ -54,7 +54,7 @@ Check `note --version`, then restart Pi or `/reload`. Network/build failures and
 conflicting executables are reported without forcibly overwriting another
 installer's commands. Fix the reported cause and retry; installs time out after
 three minutes. Installation actions are unavailable while installation runs.
-Setup hints direct users to `/pi-note` → Settings.
+Setup hints direct users to `/pinote` → Settings.
 Missing uv is reported with its installation link, not installed
 automatically. The [GTK desktop app](../README.md#optional-gtk-checklist) is optional
 and still requires separate system dependencies.
@@ -65,16 +65,16 @@ standalone `settings/pi/extensions/pinote.ts` entry if installed; load only one
 
 ## Use
 
-When the CLI is ready and no task is selected, `/pi-note` opens the task picker.
+When the CLI is ready and no task is selected, `/pinote` opens the task picker.
 It marks the chosen task in progress and adds this default prompt to the editor:
 “Read the current Pinote task. Summarize your understanding, but don’t start work yet.”
-If the CLI is missing or older than the bundled version, `/pi-note` opens Settings
+If the CLI is missing or older than the bundled version, `/pinote` opens Settings
 directly so the relevant CLI installation action remains accessible. **Tab** opens
 Settings from the picker or task view; **Tab** from Settings returns to tasks.
 The agent fetches current task text and saved handoff fields when you submit;
 they are not copied into the draft. The default prompt asks for a summary, not implementation.
 Existing drafts are preserved; nothing is submitted automatically.
-With a selected task, `/pi-note` offers **Continue**, **Done**, **Switch task**, and
+With a selected task, `/pinote` offers **Continue**, **Done**, **Switch task**, and
 **Settings**. Settings provides **Preview task**, **Complete task (new session)**,
 **Accept suggestion**, and **Dismiss suggestion** when applicable, plus
 **Install CLI** or **Upgrade CLI** only when needed. Settings also lists fields found
@@ -170,7 +170,7 @@ and selected tasks. Run `/reload` after changing this setting. Invalid policy
 values or unreadable/malformed configuration suppress offers; interactive startup
 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
+In `/pinote → 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.
 
@@ -219,7 +219,7 @@ configuration only; project-local files are not read.
 
 Version 0.7.0 replaces `pinote_get`/`pinote_update` with these current-task tools
 and removes `pinote_tag`, without aliases. Agents cannot read/update tasks by ID
-or retag existing tasks; use `/pi-note` to select an existing task.
+or retag existing tasks; use `/pinote` to select an existing task.
 
 When allowed by `taskOfferPolicy`, the agent uses `pinote_propose` instead of
 asking in chat. The pin footer shows a pending suggestion, distinct from a selected task:
@@ -242,7 +242,7 @@ The configured `footer.titleWidth` bounds the entire row (default 60 columns). C
 
 Controls use the [Kitty preview handler](#display-only-preview), with no additional configuration. Fullscreen Kitty uses **Ctrl+Shift+click**. The Settings actions **Accept suggestion** and **Dismiss suggestion** perform the corresponding footer actions. No action submits input or starts an agent turn. Add and Dismiss preserve editor drafts; **Complete task** starts a clean session and reloads Pi, discarding the editor draft, 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. 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.
+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 `/pinote` 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.
 
 If another task fits better, the agent can replace an unaccepted suggestion by calling `pinote_propose` again, without waiting for dismissal. Replacement invalidates the old ✚/✖ links; only the latest suggestion can be accepted or dismissed. 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, but dismissal does not block new proposals—even in sessions saved by older versions. 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.
@@ -310,7 +310,7 @@ Names are case-sensitive, trimmed and NFC-normalized, at most 64 characters;
 accepted. Missing/blank values do not display and do not consume the field limit.
 `[]` or `maxFields: 0` hides configured fields, including PR.
 
-In `/pi-note → Settings`, **Add field** adds a global display definition, not a
+In `/pinote → Settings`, **Add field** adds a global display definition, not a
 task value. Select any field to edit **Link**, **Label**, **Format**, and **Width**.
 Label starts as the field name; clear it for no prefix. Link off displays plain
 text without a clickable link. Toggles, field additions/removals, and edits confirmed
@@ -369,7 +369,7 @@ 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. `/pi-note` works in a TUI while the agent is running:
+Tools work without a TUI. `/pinote` works in a TUI while the agent is running:
 you can select/switch tasks, use Continue, preview tasks, respond to suggestions,
 and edit settings without interrupting the turn or submitting input. Completion
 and CLI installation/upgrades still require an idle session. Another pending

package/README.md

@@ -48,7 +48,7 @@ state routing, tools and UI.
 
 ## Use
 
-Open **`/pinote`** (`/pi-note` is an alias). Select or create a task, preview it,
+Open **`/pinote`**. Select or create a task, preview it,
 clear the selection, complete it, respond to suggestions, or edit shared settings.
 Selecting an existing task starts it immediately and returns focus to the prompt,
 with no extra confirmation. Creation and settings changes still require confirmation.
@@ -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.
@@ -77,6 +78,8 @@ cannot guarantee selection persistence.
 
 The GTK app's **Start in Kitty…** action (note 0.13.0+) chooses a working directory
 and opens a named tab with this task selected, without submitting a prompt.
+In note 0.16.0+, it uses the tag's default folder when available, otherwise keeps
+the directory chooser. Set or clear defaults in **Manage tags…**.
 With note 0.15.0+ and pi-note 0.32.0+, successful selection prefills an empty Pi editor
 with `is task clear?`. Configure `gui.kitty_start_prompt` in the
 [GUI config](../docs/gui.md#gui-configuration), or set it to `""` to disable; existing
@@ -87,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
 
@@ -121,6 +135,10 @@ separate from global display settings.
 
 ## Migration
 
+Since pi-note 0.33.0, `/pinote` is the only slash command in both modes.
+The `/pi-note` alias is removed; update saved shortcuts to `/pinote`.
+The npm package name and `pi-note.json` configuration filename are unchanged.
+
 1. Back up the service machine's Pinote data; keep `notes.db` local to that machine.
 2. Start the standalone service against that same database and settings directory.
 3. Remove Pinote's service entry and its unused package entry from the gateway

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/index.ts

@@ -107,7 +107,7 @@ function task(raw: string): Task | null {
 }
 function requiredTask(raw: string, id?: number): Task {
   const value = task(raw);
-  if (!value) throw new Error("No selected pinote task. Select one with /pi-note first.");
+  if (!value) throw new Error("No selected pinote task. Select one with /pinote first.");
   if (id !== undefined && value.id !== id) throw new Error(compatible);
   return value;
 }
@@ -187,7 +187,7 @@ export default function (pi: ExtensionAPI) {
     if (!alive || generation !== epoch || setupAbort) return;
     cliState = action;
     if (suggest && action === "upgrade") {
-      ctx.ui.notify(`Pinote CLI ${bundledCLIVersion} is bundled with this extension. Open /pi-note → Settings → Upgrade CLI to update your older CLI.`, "info");
+      ctx.ui.notify(`Pinote CLI ${bundledCLIVersion} is bundled with this extension. Open /pinote → Settings → Upgrade CLI to update your older CLI.`, "info");
     }
   };
 
@@ -314,7 +314,7 @@ export default function (pi: ExtensionAPI) {
       if (alive && generation === epoch && serial === refreshSerial) {
         previewBridge?.invalidate();
         clearTaskFooter(ctx);
-        ctx.ui.setStatus("pinote", suggestionStatus(ctx) ?? `${ctx.ui.theme.bold(noteIcon)} Pinote unavailable · /pi-note → Settings`);
+        ctx.ui.setStatus("pinote", suggestionStatus(ctx) ?? `${ctx.ui.theme.bold(noteIcon)} Pinote unavailable · /pinote → Settings`);
       }
     }
   };
@@ -357,10 +357,10 @@ export default function (pi: ExtensionAPI) {
       };
       const timer = setTimeout(() => {
         finish(false);
-        if (alive && activeContext === ctx) ctx.ui.notify("Pinote completion could not start. Open /pi-note → Settings → Complete task.", "warning");
+        if (alive && activeContext === ctx) ctx.ui.notify("Pinote completion could not start. Open /pinote → Settings → Complete task.", "warning");
       }, 4000);
       completionDispatch = { token, selection, task: displayed, started: () => clearTimeout(timer), finish };
-      try { pi.sendUserMessage(`/pi-note ${token}`, { expandPromptTemplates: true }); }
+      try { pi.sendUserMessage(`/pinote ${token}`, { expandPromptTemplates: true }); }
       catch { finish(false); }
     });
   };
@@ -454,7 +454,7 @@ export default function (pi: ExtensionAPI) {
       } catch {
         await bridge.stop();
         if (previewBridge === bridge) previewBridge = undefined;
-        ctx.ui.notify("Pinote task link unavailable; open /pi-note → Settings → Preview task.", "warning");
+        ctx.ui.notify("Pinote task link unavailable; open /pinote → Settings → Preview task.", "warning");
       }
     }
     if (!alive || generation !== epoch) return;
@@ -553,7 +553,7 @@ export default function (pi: ExtensionAPI) {
     }
   };
 
-  pi.registerCommand("pi-note", {
+  pi.registerCommand("pinote", {
     description: "Continue, complete, switch tasks, or edit global settings (Tab)",
     handler: async (args, ctx) => {
       if (!ctx.hasUI || ctx.mode !== "tui") return;
@@ -564,7 +564,7 @@ export default function (pi: ExtensionAPI) {
         await completeSelected(token, ctx);
         return;
       }
-      if (token) { ctx.ui.notify("Usage: /pi-note", "warning"); return; }
+      if (token) { ctx.ui.notify("Usage: /pinote", "warning"); return; }
       if (pending || menuPending) {
         ctx.ui.notify("Wait until the pinote operation has finished.", "warning");
         return;
@@ -724,7 +724,7 @@ export default function (pi: ExtensionAPI) {
       const canRun = () => alive && generation === epoch && branch === branchEpoch && selectedId === id;
       const current = await selected(ctx, signal);
       if (!canRun()) throw new Error("Pinote operation cancelled: the session or selected task changed.");
-      if (!current) throw new Error("No selected pinote task. Select one with /pi-note first.");
+      if (!current) throw new Error("No selected pinote task. Select one with /pinote first.");
       const argv = ["agent", "update", String(current.id), "--expected-updated-at", params.expected_updated_at,
         "--set-json", JSON.stringify(params.set ?? {})];
       for (const label of params.remove ?? []) argv.push(`--remove=${label}`);
@@ -789,7 +789,7 @@ export default function (pi: ExtensionAPI) {
       return true;
     } catch (error) {
       if (alive && generation === epoch) ctx.ui.notify(
-        `Pinote suggestion: ${clean(String(error))}${created ? ` Note #${created.id} was created; use /pi-note to select it. Do not add it again.` : " A write may have committed; check /pi-note before retrying."}`, "error");
+        `Pinote suggestion: ${clean(String(error))}${created ? ` Note #${created.id} was created; use /pinote to select it. Do not add it again.` : " A write may have committed; check /pinote before retrying."}`, "error");
       return false;
     } finally {
       if (pending === operation) pending = undefined;
@@ -854,10 +854,10 @@ export default function (pi: ExtensionAPI) {
       clearSuggestion(ctx);
       try {
         const created = requiredTask(await run(argv, signal, canAct, "0.4.0"));
-        if (!canAct()) throw new Error("Pinote operation cancelled: the session changed. The note was created; check /pi-note before retrying.");
+        if (!canAct()) throw new Error("Pinote operation cancelled: the session changed. The note was created; check /pinote before retrying.");
         const chosen = await startTask(created.id, canAct, signal);
         if (!chosen || !alive || generation !== epoch || branch !== branchEpoch || selectedId !== chosen.id) {
-          throw new Error("Pinote operation cancelled: the session changed. The note may have started; check /pi-note before retrying.");
+          throw new Error("Pinote operation cancelled: the session changed. The note may have started; check /pinote before retrying.");
         }
         return toolResult(chosen);
       } finally {

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.32.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; };
@@ -35,15 +38,16 @@ export default function pinoteRemote(pi: ExtensionAPI): void {
     await ui.open(ctx);
   };
   pi.registerCommand('pinote', { description: 'Open remote Pinote tasks and settings', handler: open });
-  pi.registerCommand('pi-note', { description: 'Open remote Pinote (compatibility alias)', 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();
@@ -74,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);
@@ -87,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!);
@@ -106,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);
 }

package/setup.ts

@@ -4,7 +4,7 @@ import { stripVTControlCharacters } from "node:util";
 // Immutable source: the Python app is not yet published to PyPI.
 export const cliSource = "https://github.com/kvidzibo/pinote/archive/1597baf60bff8bc96893be40781f152a001623d1.tar.gz";
 export const bundledCLIVersion = "0.4.0";
-export const setupHint = "Open /pi-note → Settings to install or upgrade the CLI; note must be on PATH.";
+export const setupHint = "Open /pinote → Settings to install or upgrade the CLI; note must be on PATH.";
 export type CLIAction = "setup" | "upgrade" | "ready";
 
 export function cliAction(version: string): CLIAction {
@@ -51,10 +51,10 @@ export async function setupCLI(
   const action = await detectCLI(pi, signal);
   if (!canAct() || signal.aborted) return;
   if (action === "ready") {
-    ctx.ui.notify(`Pinote CLI is ready (bundled version ${bundledCLIVersion} or newer). Use /pi-note.`, "info");
+    ctx.ui.notify(`Pinote CLI is ready (bundled version ${bundledCLIVersion} or newer). Use /pinote.`, "info");
     return;
   }
-  const command = `/pi-note → Settings → ${action === "upgrade" ? "Upgrade CLI" : "Install CLI"}`;
+  const command = `/pinote → Settings → ${action === "upgrade" ? "Upgrade CLI" : "Install CLI"}`;
   if (upgrade !== (action === "upgrade")) {
     ctx.ui.notify(`Use ${command} ${action === "upgrade" ? "to upgrade the older CLI" : "to install the missing CLI"}.`, "info");
     return;
@@ -88,7 +88,7 @@ export async function setupCLI(
   try {
     const version = await exec("note", ["--version"]);
     if (version.killed || version.code !== 0 || cliAction(version.stdout) !== "ready") throw new Error("note unavailable or older than bundled CLI");
-    if (canAct()) ctx.ui.notify(`${clean(version.stdout.trim())} is ready. Use /pi-note. GTK is optional and installed separately.`, "info");
+    if (canAct()) ctx.ui.notify(`${clean(version.stdout.trim())} is ready. Use /pinote. GTK is optional and installed separately.`, "info");
   } catch {
     if (canAct()) ctx.ui.notify("Pinote installed, but note on PATH is missing or older than the bundled CLI. Run uv tool dir --bin in your terminal, add that directory to PATH before older note executables, then restart Pi.", "warning");
   }