pi-note 0.40.0 → 0.41.0

package/README.md

@@ -52,10 +52,11 @@ state routing, tools and UI.
 
 ## Use
 
-Open **`/pinote`** for the selected task's actions, pending suggestion, task picker
-and shared settings. **Choose a task… / Switch task…** opens task-only search:
-all search terms must match the title, description, tag or numeric ID. Results show
-status and the current selection; selection waits for fresh search results.
+Open **`/pinote`** for the searchable task list, newest-created first, with
+**+ New task** as its first option. All search terms must match the title,
+description, tag or numeric ID. Results show status and the current selection;
+selection waits for fresh search results. Selected-task and pending-suggestion
+actions follow the task results.
 Press **F1** on a result to read its full title and text without selecting it.
 Selecting a task starts it and returns to the unchanged prompt without another
 confirmation. **Clear selection** leaves its progress unchanged.
@@ -68,9 +69,10 @@ Footer double-click directly approves suggestion acceptance or completion;
 completion requires idle Pi. Failed or uncertain
 writes offer refresh/verification, never automatic replay.
 
-**Settings** groups prompts/guidance, task-offer policy, footer layout and field
-definitions. Editors accept plain text or numbers, not JSON; validation retains
-the draft. Cancelling a change's confirmation returns to its text draft. Values
+Press **Tab** for **Settings**: **Agent guidance**, **Fields**, **Task offers**,
+then **Footer layout**. **Tab** or **Escape** returns to tasks with the search
+retained. Editors accept plain text or numbers, not JSON; validation retains the
+draft. Cancelling a change's confirmation returns to its text draft. Values
 are saved only after review and confirmation.
 
 Menus use Pi's native inline components, themes and configured selection keys.
@@ -105,6 +107,15 @@ Unrelated fresh launches start unselected.
 Changing endpoints starts a separate selection namespace. Unsaved Pi sessions
 cannot guarantee selection persistence.
 
+With pi-note 0.41.0+ on both client and service, and note 0.25.0+, selecting a task
+(including accepting a suggestion, creating one, or **Start in Kitty…**) appends
+the actual Pi session ID to its persistent `pi-sessions` array, without duplicates.
+Task reads and injected agent context include the array so later agents can locate
+previous sessions on the machine that saved them. Reads, previews, reload/resume,
+and carried selections do not append IDs; select the task in a new session to record it.
+IDs are metadata only: transcripts are not uploaded, and unsaved/deleted sessions
+may no longer be available. The array is separate from editable handoff fields.
+
 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
@@ -212,7 +223,7 @@ CLI/service instead of silently truncating.
 
 ### Field watchers (pi-note 0.40.0+)
 
-Open **Settings → Footer fields → Watchers** to enable bundled watchers or add a
+Open **Settings → Fields → Watchers** to enable bundled watchers or add a
 trusted executable on the service machine. Files in the packaged `watchers/`
 folder are discovered automatically, but remain disabled until enabled explicitly.
 Each watcher handles task-field changes and scheduled checks independently.
@@ -226,6 +237,10 @@ See [setup, script contract and safeguards](mcp/FIELD_EVENTS.md).
 
 ## Migration
 
+Since pi-note 0.40.1, `/pinote` opens tasks directly and **Tab** opens settings.
+Update both client and service for newest-created-first search results, then
+`/reload` Pi.
+
 Since pi-note 0.40.0, `fieldWatchers` replaces `fieldHandler`. Existing handlers
 appear disabled and need explicit re-enabling: enabling now authorizes automatic
 worker turns, not just notifications. Update/restart the service and `/reload` Pi.

package/dist-mcp/mcp/core.js

@@ -34,7 +34,7 @@ const ProposalInput = z.union([
     ExistingProposal,
 ]);
 const Proposal = z.union([NewProposal.extend({ id: z.string().uuid() }), ExistingProposal.extend({ id: z.string().uuid() })]);
-const Context = z.object({ conversationId: z.string().min(1).max(256), contextId: z.string().min(1).max(256).optional(), fieldReceipts: z.array(z.string().uuid()).max(4096).optional(), state: z.object({
+const Context = z.object({ conversationId: z.string().min(1).max(256), piSessionId: z.string().max(256).regex(/^[A-Za-z0-9](?:[A-Za-z0-9._-]*[A-Za-z0-9])?$/).optional(), contextId: z.string().min(1).max(256).optional(), fieldReceipts: z.array(z.string().uuid()).max(4096).optional(), state: z.object({
         proposal: Proposal.nullable().optional(),
         launch: z.object({ task_id: TaskId, updated_at: z.string().min(1).max(128) }).strict().optional(),
         selectedId: z.number().int().positive().safe().nullable().optional(), screen: z.enum(['tasks', 'settings', 'field']).optional(),
@@ -90,8 +90,8 @@ async function note(args, signal) {
     const options = { signal, timeout: 10_000, maxBuffer: 4 * 1024 * 1024 };
     const version = (await exec(noteCommand, ['--version'], options)).stdout.trim();
     const match = /^pinote (\d+)\.(\d+)\.(\d+)$/.exec(version);
-    if (!match || Number(match[1]) === 0 && Number(match[2]) < 12)
-        throw new Error('Pinote MCP requires note 0.12.0+');
+    if (!match || Number(match[1]) === 0 && Number(match[2]) < 25)
+        throw new Error('Pinote service requires note 0.25.0+');
     return (await exec(noteCommand, ['--no-notify', ...args], options)).stdout;
 }
 async function selected(state, signal) {
@@ -266,6 +266,8 @@ function view(data, scoped = false, secondary = false, features = {}) {
         const matches = tasks.filter((t) => state.launch
             ? t.id === state.launch.task_id && t.updated_at === state.launch.updated_at
             : terms.every((term) => `${t.text} ${t.tag ?? ''} #${t.id}`.toLowerCase().includes(term)));
+        // IDs are assigned by SQLite AUTOINCREMENT at creation and retained on edits/restores.
+        matches.sort((a, b) => b.id - a.id);
         for (const candidate of matches.slice(0, 200))
             action(`select:${candidate.id}`, taskTitle(candidate.text), { description: `#${candidate.id} · ${candidate.tag || 'No tag'} · ${humanStatus(candidate.state)}${candidate.id === task?.id ? ' · CURRENT' : ''} · Select and start this task for this conversation` });
         if (matches.length > 200)
@@ -361,7 +363,7 @@ async function agentContext(state, signal, automation) {
     const guidance = agentGuidance();
     const config = task ? settings().config : null;
     const data = task
-        ? `Selected task (complete text, revision and handoff notes):\n${JSON.stringify({ id: task.id, text: task.text, tag: task.tag, state: task.state, updated_at: task.updated_at, agent_notes: task.agent_notes })}\nEffective handoff field definitions:\n${JSON.stringify({ ...config, fields: fields(config, task.agent_notes) })}`
+        ? `Selected task (complete text, revision and handoff notes):\n${JSON.stringify({ id: task.id, text: task.text, tag: task.tag, state: task.state, updated_at: task.updated_at, agent_notes: task.agent_notes, 'pi-sessions': task['pi-sessions'] })}\nEffective handoff field definitions:\n${JSON.stringify({ ...config, fields: fields(config, task.agent_notes) })}`
         : `No task is selected (including unavailable or completed selected targets).\nSaved tags:\n${await note(['agent', 'tags'], signal)}\nPending suggestion (not selected):\n${JSON.stringify(proposal ? { ...proposal, ...('task_id' in proposal ? { text: proposedTask.text, tag: proposedTask.tag } : {}) } : null)}`;
     const statuses = task ? automation?.statuses(task) ?? [] : [];
     let text = guidance ? `${guidance}\n${data}` : data;
@@ -419,6 +421,7 @@ export function createPinoteServer(options = {}) {
         const caller = context(request.params._meta);
         const state = caller.state;
         const owner = caller.contextId ?? caller.conversationId;
+        const sessionArgs = caller.piSessionId ? ['--pi-session-id', caller.piSessionId] : [];
         const before = await snapshot(state, extra.signal, options.fieldAutomation, owner, caller.fieldReceipts);
         const scoped = scopedActions(request.params._meta);
         const { action, value } = request.params;
@@ -438,7 +441,7 @@ export function createPinoteServer(options = {}) {
             next.proposal = null;
             if (action === 'proposal:accept') {
                 const task = 'task_id' in proposal ? before.proposedTask : JSON.parse(await note(['agent', 'add', `--text=${proposal.text}`, ...(proposal.tag ? [`--tag=${proposal.tag}`] : [])], extra.signal));
-                await note(['agent', 'start', String(task.id), '--expected-updated-at', task.updated_at], extra.signal);
+                await note(['agent', 'start', String(task.id), '--expected-updated-at', task.updated_at, ...sessionArgs], extra.signal);
                 next.selectedId = task.id;
             }
         }
@@ -468,7 +471,7 @@ export function createPinoteServer(options = {}) {
                 staleAction();
             if (next.proposal)
                 await consume(next.proposal.id);
-            await note(['agent', 'start', String(id), '--expected-updated-at', target.updated_at], extra.signal);
+            await note(['agent', 'start', String(id), '--expected-updated-at', target.updated_at, ...sessionArgs], extra.signal);
             next.selectedId = id;
             next.proposal = null;
         }
@@ -477,7 +480,7 @@ export function createPinoteServer(options = {}) {
                 await consume(next.proposal.id);
             next.proposal = null;
             const task = JSON.parse(await note(['agent', 'add', `--text=${z.string().min(1).parse(value)}`], extra.signal));
-            await note(['agent', 'start', String(task.id), '--expected-updated-at', task.updated_at], extra.signal);
+            await note(['agent', 'start', String(task.id), '--expected-updated-at', task.updated_at, ...sessionArgs], extra.signal);
             next.selectedId = task.id;
         }
         else if (action === 'done') {

package/mcp/README.md

@@ -7,7 +7,8 @@ resources, notifications and its native terminal UI. No browser UI is served.
 ## Build and run
 
 On the machine holding your notes, requires **Node.js 22.19+**, **Python 3.11+**
-and the checkout's `note` CLI:
+and the checkout's `note` CLI **0.25.0+** (schema 8). Upgrade all installations
+sharing the database before starting the service:
 
 ```sh
 uv sync --locked

package/mcp/core.ts

@@ -36,14 +36,14 @@ const ProposalInput = z.union([
   ExistingProposal,
 ]);
 const Proposal = z.union([NewProposal.extend({ id: z.string().uuid() }), ExistingProposal.extend({ id: z.string().uuid() })]);
-const Context = z.object({ conversationId: z.string().min(1).max(256), contextId: z.string().min(1).max(256).optional(), fieldReceipts: z.array(z.string().uuid()).max(4096).optional(), state: z.object({
+const Context = z.object({ conversationId: z.string().min(1).max(256), piSessionId: z.string().max(256).regex(/^[A-Za-z0-9](?:[A-Za-z0-9._-]*[A-Za-z0-9])?$/).optional(), contextId: z.string().min(1).max(256).optional(), fieldReceipts: z.array(z.string().uuid()).max(4096).optional(), state: z.object({
   proposal: Proposal.nullable().optional(),
   launch: z.object({ task_id: TaskId, updated_at: z.string().min(1).max(128) }).strict().optional(),
   selectedId: z.number().int().positive().safe().nullable().optional(), screen: z.enum(['tasks', 'settings', 'field']).optional(),
   field: z.string().refine((value) => [...value].length <= 64, 'Field name exceeds 64 code points').optional(), search: z.string().max(256).optional(),
 }).default({}) });
 type State = z.infer<typeof Context>['state'];
-type Task = { id: number; text: string; state: string; tag: string | null; updated_at: string; agent_notes: Record<string, string> };
+type Task = { id: number; text: string; state: string; tag: string | null; updated_at: string; agent_notes: Record<string, string>; 'pi-sessions': string[] };
 type Scalar = string | number | boolean | null;
 type Control = { id: string; label: string; revision?: string; kind: 'action' | 'text' | 'number' | 'toggle' | 'select'; value?: Scalar; icon?: string; description?: string; multiline?: boolean; confirm?: string; options?: { label: string; value: Scalar }[] };
 const Action = z.object({ method: z.literal('native-ui/action'), params: z.object({
@@ -81,7 +81,7 @@ async function note(args: string[], signal: AbortSignal): Promise<string> {
   const options = { signal, timeout: 10_000, maxBuffer: 4 * 1024 * 1024 };
   const version = (await exec(noteCommand, ['--version'], options)).stdout.trim();
   const match = /^pinote (\d+)\.(\d+)\.(\d+)$/.exec(version);
-  if (!match || Number(match[1]) === 0 && Number(match[2]) < 12) throw new Error('Pinote MCP requires note 0.12.0+');
+  if (!match || Number(match[1]) === 0 && Number(match[2]) < 25) throw new Error('Pinote service requires note 0.25.0+');
   return (await exec(noteCommand, ['--no-notify', ...args], options)).stdout;
 }
 async function selected(state: State, signal: AbortSignal): Promise<Task | null> {
@@ -234,6 +234,8 @@ function view(data: Snapshot, scoped = false, secondary = false, features: { foo
     const matches = tasks.filter((t) => state.launch
       ? t.id === state.launch.task_id && t.updated_at === state.launch.updated_at
       : terms.every((term) => `${t.text} ${t.tag ?? ''} #${t.id}`.toLowerCase().includes(term)));
+    // IDs are assigned by SQLite AUTOINCREMENT at creation and retained on edits/restores.
+    matches.sort((a, b) => b.id - a.id);
     for (const candidate of matches.slice(0, 200)) action(`select:${candidate.id}`, taskTitle(candidate.text), { description: `#${candidate.id} · ${candidate.tag || 'No tag'} · ${humanStatus(candidate.state)}${candidate.id === task?.id ? ' · CURRENT' : ''} · Select and start this task for this conversation` });
     if (matches.length > 200) body += '\nShowing the first 200 matches; use Filter tasks to narrow the list.';
   }
@@ -304,7 +306,7 @@ async function agentContext(state: State, signal: AbortSignal, automation?: Fiel
   const guidance = agentGuidance();
   const config = task ? settings().config : null;
   const data = task
-    ? `Selected task (complete text, revision and handoff notes):\n${JSON.stringify({ id: task.id, text: task.text, tag: task.tag, state: task.state, updated_at: task.updated_at, agent_notes: task.agent_notes })}\nEffective handoff field definitions:\n${JSON.stringify({ ...config, fields: fields(config!, task.agent_notes) })}`
+    ? `Selected task (complete text, revision and handoff notes):\n${JSON.stringify({ id: task.id, text: task.text, tag: task.tag, state: task.state, updated_at: task.updated_at, agent_notes: task.agent_notes, 'pi-sessions': task['pi-sessions'] })}\nEffective handoff field definitions:\n${JSON.stringify({ ...config, fields: fields(config!, task.agent_notes) })}`
     : `No task is selected (including unavailable or completed selected targets).\nSaved tags:\n${await note(['agent', 'tags'], signal)}\nPending suggestion (not selected):\n${JSON.stringify(proposal ? { ...proposal, ...('task_id' in proposal ? { text: proposedTask!.text, tag: proposedTask!.tag } : {}) } : null)}`;
   const statuses = task ? automation?.statuses(task) ?? [] : [];
   let text = guidance ? `${guidance}\n${data}` : data;
@@ -356,6 +358,7 @@ server.setRequestHandler(Action, (request, extra) => serial(async () => {
   const caller = context(request.params._meta);
   const state = caller.state;
   const owner = caller.contextId ?? caller.conversationId;
+  const sessionArgs = caller.piSessionId ? ['--pi-session-id', caller.piSessionId] : [];
   const before = await snapshot(state, extra.signal, options.fieldAutomation, owner, caller.fieldReceipts);
   const scoped = scopedActions(request.params._meta);
   const { action, value } = request.params;
@@ -372,7 +375,7 @@ server.setRequestHandler(Action, (request, extra) => serial(async () => {
     next.proposal = null;
     if (action === 'proposal:accept') {
       const task: Task = 'task_id' in proposal ? before.proposedTask! : JSON.parse(await note(['agent', 'add', `--text=${proposal.text}`, ...(proposal.tag ? [`--tag=${proposal.tag}`] : [])], extra.signal));
-      await note(['agent', 'start', String(task.id), '--expected-updated-at', task.updated_at], extra.signal); next.selectedId = task.id;
+      await note(['agent', 'start', String(task.id), '--expected-updated-at', task.updated_at, ...sessionArgs], extra.signal); next.selectedId = task.id;
     }
   } else if (action.startsWith('screen:')) next.screen = action.slice(7) as State['screen'];
   else if (action.startsWith('field:')) { next.screen = 'field'; next.field = action.slice(6); }
@@ -388,12 +391,12 @@ server.setRequestHandler(Action, (request, extra) => serial(async () => {
     const target: Task = JSON.parse(await note(['agent', 'get', String(id)], extra.signal));
     if (target.text !== candidate.text || target.state !== candidate.state || target.tag !== candidate.tag || state.launch && target.updated_at !== state.launch.updated_at) staleAction();
     if (next.proposal) await consume(next.proposal.id);
-    await note(['agent', 'start', String(id), '--expected-updated-at', target.updated_at], extra.signal); next.selectedId = id; next.proposal = null;
+    await note(['agent', 'start', String(id), '--expected-updated-at', target.updated_at, ...sessionArgs], extra.signal); next.selectedId = id; next.proposal = null;
   } else if (action === 'add') {
     if (next.proposal) await consume(next.proposal.id);
     next.proposal = null;
     const task: Task = JSON.parse(await note(['agent', 'add', `--text=${z.string().min(1).parse(value)}`], extra.signal));
-    await note(['agent', 'start', String(task.id), '--expected-updated-at', task.updated_at], extra.signal); next.selectedId = task.id;
+    await note(['agent', 'start', String(task.id), '--expected-updated-at', task.updated_at, ...sessionArgs], extra.signal); next.selectedId = task.id;
   } else if (action === 'done') {
     await note(['agent', 'done', String(before.task!.id), '--expected-updated-at', before.task!.updated_at], extra.signal);
     next.selectedId = null;

package/package.json

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

package/remote/menu.ts

@@ -2,11 +2,12 @@ import { DynamicBorder, getSelectListTheme, keyText, type ExtensionContext } fro
 import { Input, Key, matchesKey, SelectList, truncateToWidth, visibleWidth, wrapTextWithAnsi, type Component, type Container, type TUI } from '@earendil-works/pi-tui';
 import { clean, editorText, type NativeView } from './protocol.ts';
 
-export interface MenuState { search: string; selected?: string; input?: Input }
+export interface MenuState { search: string; selected?: string; input?: Input; pendingSearch?: Promise<void> }
 export interface MenuChoice { id: string }
 export interface MenuOptions {
   search?: 'none' | 'local' | 'tasks';
   searchLabel?: string;
+  tab?: 'settings' | 'tasks';
   onSearch?: (query: string) => Promise<void>;
   notice?: string;
 }
@@ -55,21 +56,28 @@ export function remoteMenu(ctx: ExtensionContext, view: NativeView, state: MenuS
     const fresh = () => !tasks || state.search === String(view.state.search ?? '');
     const schedule = () => {
       clearTimeout(timer);
-      if (fresh() || !options.onSearch || searching || disposed) return;
+      if (fresh() || !options.onSearch || state.pendingSearch || disposed) return;
       timer = setTimeout(() => {
         if (disposed || signal.aborted) return;
         searching = true;
-        void options.onSearch!(state.search).catch(() => { error = 'Search unavailable · Ctrl+R refresh'; }).finally(() => {
+        const query = state.search;
+        const pending = options.onSearch!(query).catch(() => { error = 'Search unavailable · Ctrl+R refresh'; });
+        state.pendingSearch = pending;
+        void pending.then(() => {
+          if (state.pendingSearch === pending) state.pendingSearch = undefined;
           searching = false;
-          if (!disposed) tui.requestRender();
+          if (!disposed) { if (!error && state.search !== query) schedule(); tui.requestRender(); }
         });
       }, 250);
     };
+    // A notification can replace this component before its search action settles.
+    // Share the in-flight read so replacements never queue stale duplicate searches.
+    if (state.pendingSearch) void state.pendingSearch.then(() => { if (!disposed) { schedule(); tui.requestRender(); } });
     schedule();
     const activate = (preview = false) => {
       if (signal.aborted || !usable || !layout || !fresh() || searching || geometry !== `${tui.terminal.columns}:${tui.terminal.rows}:${inlineHeight(tui, tui.terminal.columns, component)}`) return;
       const item = list?.getSelectedItem();
-      if (item) done({ id: preview && tasks ? `__preview:${item.value.slice('select:'.length)}` : item.value });
+      if (item && (!preview || item.value.startsWith('select:'))) done({ id: preview ? `__preview:${item.value.slice('select:'.length)}` : item.value });
     };
     const component: Component & { dispose(): void; focused: boolean; capturesViewportInput: boolean } = {
       capturesViewportInput: true,
@@ -82,7 +90,7 @@ export function remoteMenu(ctx: ExtensionContext, view: NativeView, state: MenuS
         if (!usable) { layout = ''; return [truncateToWidth('Enlarge terminal · Esc back', width)]; }
         const compact = height < 18;
         const border = new DynamicBorder((s) => theme.fg('border', s)).render(width);
-        const hints = wrapTextWithAnsi(`${keyText('tui.select.up')}/${keyText('tui.select.down')} move · ${keyText('tui.select.confirm')} ${tasks ? 'select · F1 preview' : 'open'} · ${keyText('tui.select.cancel')} back · Ctrl+R refresh`, width);
+        const hints = wrapTextWithAnsi(`${keyText('tui.select.up')}/${keyText('tui.select.down')} move · ${keyText('tui.select.confirm')} ${tasks ? 'open · F1 preview task' : 'open'}${options.tab ? ` · ${keyText('tui.input.tab')} ${options.tab}` : ''} · ${keyText('tui.select.cancel')} back · Ctrl+R refresh`, width);
         const summary = (view.body ?? '').split('\n').flatMap((s) => wrapTextWithAnsi(clean(s), width - 2));
         const summaryLimit = compact ? 1 : 3;
         const header = [...border, theme.fg('accent', heading(view.title, width)),
@@ -98,12 +106,14 @@ export function remoteMenu(ctx: ExtensionContext, view: NativeView, state: MenuS
         if (layout !== signature) {
           layout = signature;
           list = new SelectList(filtered, capacity, {
-            ...getSelectListTheme(), noMatch: () => theme.fg('muted', tasks ? state.search ? '  No tasks match this search.' : '  No active tasks. Esc back to create one.' : '  No matching items.'),
+            ...getSelectListTheme(), noMatch: () => theme.fg('muted', tasks ? state.search ? '  No tasks match this search.' : '  No active tasks.' : '  No matching items.'),
           }, { minPrimaryColumnWidth: 12, maxPrimaryColumnWidth: Math.min(40, Math.floor(width * 0.6)) });
-          list.setSelectedIndex(Math.max(0, filtered.findIndex((item) => item.value === state.selected)));
+          const selected = filtered.some((item) => item.value === state.selected) ? state.selected
+            : tasks && state.search.trim() ? filtered.find((item) => item.value.startsWith('select:'))?.value : undefined;
+          list.setSelectedIndex(Math.max(0, filtered.findIndex((item) => item.value === selected)));
           list.onSelectionChange = (item) => { state.selected = item.value; };
           list.onSelect = () => activate(); list.onCancel = cancel;
-          if (list.getSelectedItem()) state.selected = list.getSelectedItem()!.value;
+          if (fresh() && list.getSelectedItem()) state.selected = list.getSelectedItem()!.value;
         }
         const selectedIndex = filtered.findIndex((item) => item.value === list?.getSelectedItem()?.value);
         const selected = filtered[selectedIndex];
@@ -122,7 +132,8 @@ export function remoteMenu(ctx: ExtensionContext, view: NativeView, state: MenuS
       handleInput(data) {
         if (keys.matches(data, 'tui.select.cancel') || matchesKey(data, Key.ctrl('c'))) cancel();
         else if (usable && geometry === `${tui.terminal.columns}:${tui.terminal.rows}:${inlineHeight(tui, tui.terminal.columns, component)}`) {
-          if (matchesKey(data, Key.ctrl('r'))) done({ id: '__refresh' });
+          if (options.tab && keys.matches(data, 'tui.input.tab')) done({ id: `__${options.tab}` });
+          else if (matchesKey(data, Key.ctrl('r'))) done({ id: '__refresh' });
           else if (tasks && matchesKey(data, Key.f1)) activate(true);
           else if (keys.matches(data, 'tui.select.confirm')) activate();
           else if (keys.matches(data, 'tui.select.pageUp') || keys.matches(data, 'tui.select.pageDown')) {

package/remote/navigation.ts

@@ -2,34 +2,30 @@ import { defaultFooterField, parseAgentGuidance, parseFooterConfig, parseHandoff
 import { parseFieldWatchers } from '../field-watchers.ts';
 import { clean, editorText, type NativeControl, type NativeView } from './protocol.ts';
 
-export type Screen = 'home' | 'tasks' | 'settings' | 'prompts' | 'footer' | 'fields' | 'field' | 'watchers';
+export type Screen = 'tasks' | 'settings' | 'prompts' | 'footer' | 'fields' | 'field' | 'watchers';
 const group = (id: Screen, label: string, description: string): NativeControl => ({ id: `__${id}`, label, description, kind: 'action' });
-export const parentScreen = (screen: Screen): Screen | undefined => ({ tasks: 'home', settings: 'home', prompts: 'settings', footer: 'settings', fields: 'settings', field: 'fields', watchers: 'fields' } as const)[screen as Exclude<Screen, 'home'>];
-export const serverScreen = (screen: Screen) => screen === 'home' || screen === 'tasks' ? 'tasks' : screen === 'field' ? 'field' : 'settings';
+export const parentScreen = (screen: Screen): Screen | undefined => ({ settings: 'tasks', prompts: 'settings', footer: 'settings', fields: 'settings', field: 'fields', watchers: 'fields' } as const)[screen as Exclude<Screen, 'tasks'>];
+export const serverScreen = (screen: Screen) => screen === 'tasks' ? 'tasks' : screen === 'field' ? 'field' : 'settings';
 
 /** Local navigation only. Server controls/revisions remain the authority for every action. */
 export function menuView(view: NativeView, screen: Screen): NativeView {
   const take = (...ids: string[]) => ids.flatMap((id) => view.controls.filter((c) => c.id === id));
   let controls: NativeControl[], title: string, body: string;
   switch (screen) {
-    case 'home':
-      title = 'Pinote'; body = view.body ?? '';
-      controls = [...take('preview', 'proposal:preview', 'proposal:accept', 'proposal:dismiss', 'continue'),
-        group('tasks', view.state.selectedId ? 'Switch task…' : 'Choose a task…', 'Search tasks by title, description, tag or #ID. Enter starts and selects the chosen task.'),
-        ...take('add'), group('settings', 'Settings…', 'Shared prompts, task suggestions and footer display settings.'), ...take('done', 'clear')];
-      break;
     case 'tasks':
-      title = 'Pinote / Tasks'; body = view.body ?? '';
-      controls = view.controls.filter((c) => c.id.startsWith('select:'));
+      title = 'Pinote'; body = view.body ?? '';
+      controls = [...take('add'), ...view.controls.filter((c) => c.id.startsWith('select:')),
+        ...take('preview', 'proposal:preview', 'proposal:accept', 'proposal:dismiss', 'continue', 'done', 'clear')];
+      if (!controls.some((c) => c.id.startsWith('select:'))) body = view.state.search ? 'No tasks match this search.' : 'No active tasks. Create one with + New task.';
       break;
     case 'settings':
       title = 'Pinote / Settings'; body = 'Shared service settings · affects all connected clients. Task values are unchanged.';
-      controls = [group('prompts', 'Prompts and agent guidance…', 'Edit shared task prompts and injected instructions.'),
-        ...take('taskOfferPolicy'), group('footer', 'Footer layout…', 'Set title/field widths and the maximum visible handoff fields.'),
-        group('fields', 'Footer fields…', 'Edit display definitions, not saved task values.')];
+      controls = [group('prompts', 'Agent guidance', 'Edit shared task prompts and injected instructions.'),
+        group('fields', 'Fields', 'Edit display definitions, not saved task values.'),
+        ...take('taskOfferPolicy'), group('footer', 'Footer layout', 'Set title/field widths and the maximum visible handoff fields.')];
       break;
     case 'prompts':
-      title = 'Pinote / Settings / Prompts'; body = 'Shared prompts and instructions · each change requires review and confirmation.';
+      title = 'Pinote / Settings / Agent guidance'; body = 'Shared prompts and instructions · each change requires review and confirmation.';
       controls = take('handoffPrompt', 'newSessionPrompt', 'agentGuidance', 'reset-agent-guidance');
       // The service deliberately omits oversized editors. Keep its explanation visible.
       if (view.body?.includes('editor limit')) body = view.body;
@@ -39,7 +35,7 @@ export function menuView(view: NativeView, screen: Screen): NativeView {
       controls = take('titleWidth', 'fieldWidth', 'maxFields');
       break;
     case 'fields':
-      title = 'Pinote / Settings / Footer fields'; body = 'Display definitions only. Populated task values appear in the footer.';
+      title = 'Pinote / Settings / Fields'; body = 'Display definitions only. Populated task values appear in the footer.';
       controls = [group('watchers', 'Watchers…', 'Bundled and custom field watchers; explicitly enable trusted code and automatic worker actions.'),
         ...view.controls.filter((c) => c.id.startsWith('field:')), ...take('add-field')];
       break;

package/remote/session.ts

@@ -31,6 +31,7 @@ export class RemoteSession {
   private refreshing = false;
   private active = false;
   private conversationId = '';
+  private piSessionId?: string;
   private saved?: SavedState;
   view?: NativeView;
   fullscreen = false;
@@ -46,10 +47,11 @@ export class RemoteSession {
   get signal(): AbortSignal { return this.lifetime.signal; }
   snapshot(): SavedState | undefined { return this.saved && structuredClone(this.saved); }
   current(): () => boolean { const epoch = this.epoch; return () => this.active && epoch === this.epoch; }
-  async start(branch: readonly BranchEntry[], conversationId: string, carried?: SavedState): Promise<void> {
+  async start(branch: readonly BranchEntry[], conversationId: string, carried?: SavedState, piSessionId?: string): Promise<void> {
     await this.stop();
     this.lifetime = new AbortController(); this.active = true;
     this.conversationId = conversationId;
+    this.piSessionId = piSessionId;
     this.saved = carried?.scope === this.config.scope ? structuredClone(carried) : restoreState(branch, this.config.scope);
     this.persist(this.saved);
     await this.refresh(true);
@@ -64,7 +66,7 @@ export class RemoteSession {
   private meta(): Record<string, unknown> {
     if (!this.saved) throw new RemoteFailure();
     return {
-      [UI_CONTEXT]: { conversationId: this.conversationId, contextId: this.saved.contextId, state: this.saved.state, fieldReceipts: this.saved.fieldReceipts ?? [] },
+      [UI_CONTEXT]: { conversationId: this.conversationId, piSessionId: this.piSessionId, contextId: this.saved.contextId, state: this.saved.state, fieldReceipts: this.saved.fieldReceipts ?? [] },
       [UI_FEATURES]: { actionRevisions: true, fieldEvents: true, fieldWatchers: true, footerStyles: true, footerDoubleActions: true, footerSecondaryActions: true, footerNativeActions: this.fullscreen },
     };
   }

package/remote/ui.ts

@@ -148,8 +148,11 @@ export class RemoteUI {
     this.opening = true;
     const current = this.session.current(), signal = this.session.signal;
     const menus = new Map<string, MenuState>(), drafts = new Map<string, Draft>();
-    let screen = 'home' as Screen, notice = '';
+    let screen = 'tasks' as Screen, notice = '';
     const go = async (next: Screen): Promise<boolean> => {
+      // Search changes view revisions. Navigate only after it settles, using fresh controls.
+      await menus.get('tasks')?.pendingSearch;
+      if (!current()) return false;
       const view = this.session.view;
       if (!view) return false;
       const target = serverScreen(next);
@@ -163,7 +166,7 @@ export class RemoteUI {
     };
     try {
       await this.refresh(ctx);
-      await go('home');
+      await go('tasks');
       while (current() && !signal.aborted && !this.closing) {
         if (this.failure || !this.session.view) {
           const failure = this.failure;
@@ -184,6 +187,7 @@ export class RemoteUI {
           this.menuChanged = changed;
           return () => { if (this.menuChanged === changed) this.menuChanged = undefined; };
         }, { search: screen === 'tasks' ? 'tasks' : screen === 'fields' ? 'local' : 'none', notice,
+          tab: screen === 'tasks' ? 'settings' : screen === 'settings' ? 'tasks' : undefined,
           searchLabel: screen === 'fields' ? 'Filter fields' : undefined,
           onSearch: async (query) => {
             const latest = this.session.view, control = latest?.controls.find((c) => c.id === 'search');

package/remote.ts

@@ -89,7 +89,8 @@ export default function pinoteRemote(pi: ExtensionAPI): void {
           ctx.ui.notify('Pinote launch ignored: invalid request or nonempty/resumed session. Existing selection is unchanged.', 'warning');
         }
       }
-      await session.start(branch, ctx.sessionManager.getSessionId() || randomUUID(), carried);
+      const piSessionId = ctx.sessionManager.getSessionId();
+      await session.start(branch, piSessionId || randomUUID(), carried, piSessionId || undefined);
       if (launch) {
         const view = session.view!;
         // The service exposes this control only for the exact GUI-displayed revision.