pi-optchat 0.5.0 → 0.5.1

package/README.md

@@ -171,7 +171,7 @@ To delete a profile, delete its folder. Your original Pi sessions are kept in Pi
 
 - **Profiles separate memory and instructions only.** Agents keep full filesystem access and share provider credentials.
 - **Use worktrees** when parallel agents edit the same repository; they share the filesystem.
-- **Instructions**: only the profile's `AGENTS.md` is injected. Repository and global Pi `AGENTS.md` files are not; ask the agent to read them when needed. Skills and prompt templates still work in the main session.
+- **Instructions**: the main agent and subagents get Pi's usual global and repository `AGENTS.md` files and your skills, followed by the profile's `AGENTS.md`, which comes last and wins. OptChat replaces only Pi's opening prompt. Prompt templates work in the main session only.
 - **Images** are available during the current run but stored in memory as text placeholders.
 - **Pi's auto-compaction is off.** A single very long run can still hit the model's context limit; stop it and continue in a new turn.
 - **Restarts**: unsent inputs are recovered into memory, and pending subagent reports are delivered. Interrupted subagents are not restarted.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-optchat",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "type": "module",
   "pi": {
     "extensions": [

package/src/agents.ts

@@ -115,16 +115,20 @@ export class Children {
         if (cancelled()) throw new Error('Parent or profile is stopping.');
         const id = randomUUID().slice(0, 8), directory = task.cwd ?? cwd;
         const delegation = depth < 3 ? 'You may delegate parts of your assigned task with spawn when useful. Child reports arrive automatically after your current run ends; the harness keeps you alive to receive them. Never poll, sleep, or wait in a tool for children. Finish your current work and return; you will be prompted with their results. The profile allows 8 active agents total.' : 'You are at the maximum delegation depth. Complete your task with your own tools.';
-        const prompt = `${SUBAGENT}\n\n${VIEW_DOC}\n\n${this.instructions()}\n\n${delegation}\n\n${connected ? 'You are speaking directly with the user in a connected window. Continue this conversation across requests. Use tell_main for questions or findings the main agent needs now. A handoff will be generated when the user completes or disconnects the window.' : ''}\n\nWorking directory: ${directory}`;
+        const instructions = [this.instructions(), delegation, connected ? 'You are speaking directly with the user in a connected window. Continue this conversation across requests. Use tell_main for questions or findings the main agent needs now. A handoff will be generated when the user completes or disconnects the window.' : ''].filter(Boolean).join('\n\n');
         // The user's settings list their installed packages; a copy in memory keeps the child from writing them back.
         const settingsManager = SettingsManager.inMemory({ ...SettingsManager.create(directory, getAgentDir()).getSettings(), compaction: { enabled: false }, cacheWarming: 'off' });
         const loader = new DefaultResourceLoader({ cwd: directory, agentDir: getAgentDir(), settingsManager,
-          noContextFiles: true, noSkills: true, noPromptTemplates: true, systemPrompt: prompt,
+          noPromptTemplates: true,
           extensionsOverride: base => ({ ...base, extensions: base.extensions.filter(e => !isOptchat(e.resolvedPath)) }),
           extensionFactories: [pi => {
             const provider = this.registry.getRegisteredProviderConfig(selected.provider);
             if (provider) pi.registerProvider(selected.provider, provider);
-            pi.on('before_agent_start', () => ({ systemPrompt: prompt }));
+            // Same prompt as the main agent (AGENTS.md files, skills, cwd); only the OptChat preamble differs.
+            pi.on('before_agent_start', event => {
+              event.systemPromptOptions.customPrompt = `${SUBAGENT}\n\n${VIEW_DOC}`;
+              event.systemPromptOptions.sections.instructions = instructions;
+            });
             pi.on('before_provider_request', (event, ctx) => ctx.model?.api === 'anthropic-messages' ? cachePayload(event.payload) : event.payload);
           }],
         });

package/src/index.ts

@@ -194,12 +194,15 @@ export default function optchat(pi: ExtensionAPI) {
     }
     return { action: 'continue' };
   });
-  pi.on('before_agent_start', (_event, ctx) => {
+  pi.on('before_agent_start', (event, ctx) => {
     flush(); run = []; logged = 0; view = undefined; runStarted = true;
     previous = previousExchange(ctx.sessionManager.getBranch());
     pi.appendEntry(RUN_BOUNDARY, { state: 'start' });
     const a = required();
-    prompt = `${MASTER}\n\n${VIEW_DOC}\n\nFor conversational continuity, the memory view may be followed by the immediately preceding completed exchange (its user requests and final answer, in full text), then the new input. Use that exact wording to understand follow-ups; older exchanges and previous tool output remain accessible through memory and zoom.\n\n${instructions(a.dir)}\n\n${IMPORT_GUIDANCE}\n\nWorking directory: ${ctx.cwd}`;
+    // Pi's own prompt sections (AGENTS.md files, skills, cwd) stay; the profile's instructions go last.
+    event.systemPromptOptions.customPrompt = `${MASTER}\n\n${VIEW_DOC}\n\nFor conversational continuity, the memory view may be followed by the immediately preceding completed exchange (its user requests and final answer, in full text), then the new input. Use that exact wording to understand follow-ups; older exchanges and previous tool output remain accessible through memory and zoom.`;
+    event.systemPromptOptions.sections.instructions = `${instructions(a.dir)}\n\n${IMPORT_GUIDANCE}`;
+    prompt = event.systemPrompt;
   });
   pi.on('message_end', (event, ctx) => {
     if (!active || !runStarted) return;

package/src/inspector.ts

@@ -1,4 +1,4 @@
-import { Input, matchesKey, truncateToWidth, wrapTextWithAnsi, type Component, type Focusable } from '@earendil-works/pi-tui';
+import { Input, matchesKey, sliceByColumn, truncateToWidth, visibleWidth, wrapTextWithAnsi, type Component, type Focusable } from '@earendil-works/pi-tui';
 import type { ExtensionContext } from '@earendil-works/pi-coding-agent';
 import type { AgentMessage } from '@earendil-works/pi-agent-core';
 import type { Children } from './agents.ts';
@@ -11,11 +11,24 @@ export const clean = (text: string) => text.replace(/[\x00-\x08\x0b-\x1f\x7f-\x9
 export const oneLine = (text: string) => clean(text).replace(/\n/g, ' ');
 export const count = (n: number) => n.toLocaleString('en-US');
 export const elapsed = (ms: number) => ms < 60_000 ? `${Math.max(0, Math.floor(ms / 1000))}s` : `${Math.floor(ms / 60_000)}m ${Math.floor(ms / 1000) % 60}s`;
+/** Shortens plain text with an ellipsis, preferring a word boundary. */
+export function fit(text: string, width: number) {
+  if (visibleWidth(text) <= width) return text;
+  if (width < 2) return sliceByColumn(text, 0, width, true);
+  const cut = sliceByColumn(text, 0, width - 1, true), space = cut.lastIndexOf(' '); // Unlike truncateToWidth, adds no style reset.
+  return `${(space > cut.length * 0.6 ? cut.slice(0, space) : cut).trimEnd()}…`;
+}
+/** Left text and right text on one line, the right side flush with the edge when both fit. */
+const spread = (left: string, right: string, width: number) => {
+  const gap = width - visibleWidth(left) - visibleWidth(right);
+  return gap >= 2 ? `${left}${' '.repeat(gap)}${right}` : left;
+};
 export type InspectorPage = 'agents' | 'usage';
+type Tone = 'accent' | 'muted' | 'dim' | 'error' | 'border';
 interface Options {
   profile: string; session: string; children: Children; usage: UsageLedger; page: InspectorPage;
   rows: () => number; redraw: () => void; done: (action?: 'model') => void;
-  color: (tone: 'accent' | 'dim' | 'error', text: string) => string;
+  color: (tone: Tone, text: string) => string;
   context: () => number | null | undefined;
   refreshUsage?: () => void;
   signal?: AbortSignal;
@@ -30,6 +43,7 @@ export class Inspector implements Component, Focusable {
   private top = 0;
   private scroll = 0;
   private lineCount = 0;
+  private hintLines = 1;
   private follow = true;
   private details = false;
   private range: UsageRange = 'This session';
@@ -55,7 +69,8 @@ export class Inspector implements Component, Focusable {
     this.ended = true; clearInterval(this.timer); this.unsubscribe(); this.options.signal?.removeEventListener('abort', this.abort);
   }
   invalidate() { this.composer?.invalidate(); }
-  private get height() { return Math.max(1, Math.floor(this.options.rows() * 0.9) - (this.composer ? 9 : 7)); }
+  /** Body rows left after the rules, title, hint, spacing and composer; the rest of the screen keeps the footer visible. */
+  private get height() { return Math.max(1, Math.floor(this.options.rows() * 0.8) - (this.composer ? 7 : 6) - (this.hintLines - 1)); }
   private select(delta: number) {
     const list = this.options.children.history.list();
     const index = Math.max(0, list.findIndex(r => r.id === this.selected));
@@ -178,17 +193,18 @@ export class Inspector implements Component, Focusable {
   }
   render(width: number): string[] {
     const { color, children, profile } = this.options;
+    const inner = Math.max(1, width - 2);
     const inspected = this.opened ? children.history.records.get(this.opened) : undefined;
-    const header = color('accent', `OptChat · ${profile} · ${inspected ? `${inspected.state}: ${oneLine(inspected.task)}` : this.page === 'usage' ? 'Usage' : 'Agents'}`);
-    let body: string[], hint: string;
+    let title = `OptChat · ${profile} · ${inspected ? `${inspected.state}: ${oneLine(inspected.task)}` : this.page === 'usage' ? 'Usage' : 'Agents'}`;
+    let info: string, body: string[], hint: string;
     if (this.page === 'usage' || this.opened) {
       const run = this.opened ? children.history.records.get(this.opened) : undefined;
       const text = this.page === 'usage' ? this.usageLines() : run ? `${run.state} · ${elapsed((run.ended ?? Date.now()) - run.started)} · ${run.id}\n\n${this.transcript(run)}` : 'Run unavailable.';
-      const lines = wrapTextWithAnsi(clean(text), Math.max(1, width)); this.lineCount = lines.length;
+      const lines = wrapTextWithAnsi(clean(text), inner); this.lineCount = lines.length;
       if (this.opened && this.follow) this.scroll = Math.max(0, lines.length - this.height);
       this.scroll = Math.max(0, Math.min(this.scroll, lines.length - this.height));
       body = lines.slice(this.scroll, this.scroll + this.height);
-      body.push(color('dim', `${this.scroll + 1}–${Math.min(this.scroll + this.height, lines.length)} / ${lines.length}${this.opened ? this.follow ? ' · following' : ' · scroll paused (f follows)' : ''}`));
+      info = `${this.scroll + 1}–${Math.min(this.scroll + this.height, lines.length)} / ${lines.length}${this.opened ? this.follow ? ' · following' : ' · scroll paused' : ''}`;
       hint = this.page === 'usage' ? '←→ period · ↑↓/PgUp/PgDn scroll · Tab agents · Esc close' : '↑↓/PgUp/PgDn scroll · t tools · f follow · s message · x stop tree · Esc back';
     } else {
       const list = children.history.list();
@@ -197,24 +213,47 @@ export class Inspector implements Component, Focusable {
       this.top = Math.max(0, Math.min(this.top, list.length - this.height));
       if (cursor < this.top) this.top = cursor;
       if (cursor >= this.top + this.height) this.top = cursor - this.height + 1;
-      body = list.slice(this.top, this.top + this.height).map(run => {
+      const rows = list.slice(this.top, this.top + this.height).map(run => {
         const live = children.live(run.id), tools = live ? [...live.tools.values()].map(t => t.name).join(', ') : '';
-        const activity = live ? `${run.state === 'stopping' ? 'stopping' : run.state === 'waiting' ? 'waiting for children' : tools || (live.streaming ? 'responding' : 'working')} · last activity ${elapsed(Date.now() - live.updated)} ago` : run.state;
-        const label = `${run.id === this.selected ? '→' : ' '} ${'  '.repeat(run.depth - 1)}${run.parentId ? '↳ ' : ''}${oneLine(run.task).slice(0, 55)} · ${activity} · ${elapsed((run.ended ?? Date.now()) - run.started)}`;
-        return run.id === this.selected ? color('accent', label) : label;
+        const status = live ? `${run.state === 'stopping' ? 'stopping' : run.state === 'waiting' ? 'waiting for children' : tools || (live.streaming ? 'responding' : 'working')} · ${elapsed(Date.now() - live.updated)} ago` : run.state;
+        return { run, task: `${'  '.repeat(run.depth - 1)}${run.parentId ? '↳ ' : ''}${oneLine(run.task)}`, status, time: elapsed((run.ended ?? Date.now()) - run.started) };
+      });
+      // Columns: task (flexible) · status · duration (right-aligned); status yields first on narrow screens.
+      const timeWidth = Math.max(0, ...rows.map(r => r.time.length));
+      let statusWidth = Math.min(Math.max(0, ...rows.map(r => visibleWidth(r.status))), Math.floor(inner * 0.4));
+      if (inner - 2 - statusWidth - timeWidth - 4 < 12) statusWidth = 0;
+      const taskWidth = Math.max(1, inner - 2 - timeWidth - 2 - (statusWidth ? statusWidth + 2 : 0));
+      body = rows.map(({ run, task, status, time }) => {
+        const selected = run.id === this.selected;
+        const name = truncateToWidth(fit(task, taskWidth), taskWidth, '', true);
+        const meta = `${statusWidth ? `${truncateToWidth(fit(status, statusWidth), statusWidth, '', true)}  ` : ''}${time.padStart(timeWidth)}`;
+        return selected ? color('accent', `→ ${name}  ${meta}`) : `  ${name}  ${color('muted', meta)}`;
       });
-      if (!body.length) body.push('No agents yet. Ask the main agent to delegate a task.');
-      body.push(color('dim', `${list.filter(isActiveRun).length} active · ${list.length} saved · ${list.length ? cursor + 1 : 0}/${list.length}`));
+      if (!body.length) body.push(color('muted', 'No agents yet. Ask the main agent to delegate a task.'));
+      info = `${list.filter(isActiveRun).length} active · ${list.length} saved${list.length ? ` · ${cursor + 1}/${list.length}` : ''}`;
       hint = '↑↓ select · Enter inspect · m model · Tab usage · Esc close';
     }
-    if (this.composer) { this.composer.focused = this.focused; body.push(...this.composer.render(width)); hint = 'Enter sends guidance · Esc cancels message'; }
-    return [header, '', ...body, '', color(this.error ? 'error' : 'dim', this.error || (this.busy ? 'Updating agent…' : hint))].map(line => truncateToWidth(line, width));
+    if (this.composer) { this.composer.focused = this.focused; body.push(...this.composer.render(inner)); hint = 'Enter sends guidance · Esc cancels message'; }
+    title = fit(title, Math.max(1, inner - visibleWidth(info) - 2));
+    const footer = wrapTextWithAnsi(this.error || (this.busy ? 'Updating agent…' : hint), inner).map(line => color(this.error ? 'error' : 'dim', line));
+    this.hintLines = footer.length;
+    const rule = color('border', '─'.repeat(Math.max(1, width)));
+    // Same layout as Pi's own selectors: rules above and below, content indented by one column.
+    const content = [spread(color('accent', title), color('dim', info), inner), '', ...body, '', ...footer].map(line => ` ${truncateToWidth(line, inner, '…')}`);
+    return [rule, ...content, rule].map(line => truncateToWidth(line, width));
   }
 }
 
+let showing = false;
+/** True while the panel is on screen; cleared before Pi restores the editor so the agent bar returns in the same frame. */
+export const inspectorShowing = () => showing;
+/** Takes the editor's place, like Pi's own selectors; Pi restores the editor and its draft on close. */
 export function showInspector(ctx: ExtensionContext, options: Omit<Options, 'rows' | 'redraw' | 'done' | 'color' | 'context'>) {
-  return ctx.ui.custom<'model' | undefined>((tui, theme, _keys, done) => new Inspector({ ...options,
-    rows: () => tui.terminal.rows, redraw: () => tui.requestRender(), done,
-    color: (tone, text) => theme.fg(tone, text), context: () => ctx.getContextUsage()?.tokens,
-  }), { overlay: true, overlayOptions: { width: '96%', maxHeight: '90%', anchor: 'center' } });
+  return ctx.ui.custom<'model' | undefined>((tui, theme, _keys, done) => {
+    showing = true;
+    return new Inspector({ ...options,
+      rows: () => tui.terminal.rows, redraw: () => tui.requestRender(), done: action => { showing = false; done(action); },
+      color: (tone, text) => theme.fg(tone, text), context: () => ctx.getContextUsage()?.tokens,
+    });
+  });
 }

package/src/navigation.ts

@@ -1,7 +1,7 @@
 import { CustomEditor, type ExtensionContext } from '@earendil-works/pi-coding-agent';
-import { matchesKey, truncateToWidth, type KeyId } from '@earendil-works/pi-tui';
+import { matchesKey, truncateToWidth, visibleWidth, type KeyId } from '@earendil-works/pi-tui';
 import type { Children } from './agents.ts';
-import type { InspectorPage } from './inspector.ts';
+import { inspectorShowing, type InspectorPage } from './inspector.ts';
 import { isActiveRun } from './runs.ts';
 
 /** Configured before extension registration; this also works in legacy terminals with F6. */
@@ -50,10 +50,13 @@ export function mountNavigation(ctx: ExtensionContext, children: Children, short
     return {
       invalidate() {},
       render(width: number) {
+        if (inspectorShowing()) return []; // The open panel replaces the editor and this bar.
         const list = children.history.list(), running = list.filter(isActiveRun).length;
-        const agents = `${running} agents running · ${list.length - running} saved`;
-        const label = (page: InspectorPage, text: string) => theme.fg(navigation.selected === page ? 'accent' : 'dim', `${navigation.selected === page ? '› ' : ''}${text}`);
-        return [truncateToWidth(`${label('agents', agents)}  |  ${label('usage', 'Usage')}  · ${navigation.selected ? '←→ select · Enter open · Esc input' : `${previous ? '' : '↓ select · '}${shortcut} inspect`}`, width)];
+        const label = (page: InspectorPage, text: string) => navigation.selected === page ? theme.fg('accent', `› ${text}`) : theme.fg('muted', text);
+        const left = `${label('agents', `Agents: ${running} running · ${list.length - running} saved`)}   ${label('usage', 'Usage')}`;
+        const hint = theme.fg('dim', navigation.selected ? '←→ select · Enter open · Esc input' : `${previous ? '' : '↓ select · '}${shortcut} inspect`);
+        const gap = width - visibleWidth(left) - visibleWidth(hint);
+        return [truncateToWidth(gap >= 3 ? `${left}${' '.repeat(gap)}${hint}` : `${left}   ${hint}`, width)];
       },
     };
   }, { placement: 'belowEditor' });