@xingular/harness 1.2.0 → 1.3.1-unstable.1

package/dist/sdk/terminal/tui/pages/pluginsPage.js

@@ -6,28 +6,42 @@
 import { describePlugin, surfaceBadge } from "../../../plugins/surfaces.js";
 import { matchesKey, truncateToWidth, wrapTextWithAnsi } from '@earendil-works/pi-tui';
 import { BACK, applyPluginAction, menuRows, rowActions } from "../../pluginMenu.js";
-import { safeText } from "../chrome.js";
+import { inspectorListWidth, safeText, splitColumns } from "../chrome.js";
 import { FilterList } from "../list.js";
 const SECTIONS = [
     { id: 'plugins', title: 'Plugins' },
-    { id: 'trust', title: 'Trust' }
+    { id: 'trust', title: 'Trust' },
+    { id: 'packages', title: 'Packages' },
+    { id: 'proposals', title: 'Proposals' }
 ];
 const SETTINGS_ROW = 'settings:';
+const PACKAGE_ROW = 'package:';
+const INSTALL_PACKAGE = 'action:install-package';
 const isSwitch = (setting) => setting.min === 0 && setting.max === 1;
 const settingValueText = (setting) => isSwitch(setting)
     ? setting.value === 1 ? 'on' : 'off'
     : `${setting.value.toLocaleString('en-US')}${setting.value === setting.default ? ' · default' : ''}`;
 const settingsOf = (plugin) => plugin.settings ?? [];
+// Never execute or silently hide terminal controls in code being reviewed.
+const reviewText = (line) => line.replace(/[\x00-\x1f\x7f-\x9f\u200e\u200f\u202a-\u202e\u2066-\u2069]/g, char => `\\u${char.charCodeAt(0).toString(16).padStart(4, '0')}`);
 export class PluginsPage {
     options;
+    presentation = 'fullscreen';
     plugins;
+    proposals = [];
+    proposalError;
+    preview;
+    previewOffset = 0;
+    previewRows = 1;
     section = 'plugins';
     projectId = null;
+    hubManagedIds = new Set();
     error;
     restart = false;
     busy = false;
     disposed = false;
     list;
+    pointerLayout;
     /** The plugin whose settings are open, or null on the list. */
     settingsFor = null;
     saved = false;
@@ -57,6 +71,8 @@ export class PluginsPage {
     }
     activeTab() { return this.settingsPlugin() ? 'settings' : this.section; }
     hint() {
+        if (this.preview)
+            return this.preview.status === 'pending' ? '↑↓ scroll · PgUp/PgDn page · Enter decide · Esc back' : '↑↓ scroll · PgUp/PgDn page · Esc back';
         if (this.settingsPlugin())
             return this.settingsList.query ? 'Enter change · Esc clear' : 'Enter change · Esc back';
         return this.list.query ? 'Enter actions · Esc clear' : 'Enter actions · type to search';
@@ -70,6 +86,20 @@ export class PluginsPage {
             this.projectId = (await call('plugins.session').catch(() => ({ projectId: null }))).projectId;
             this.plugins = await call('plugins.list');
             this.error = undefined;
+            try {
+                this.proposals = await call('plugins.proposals.list');
+                this.proposalError = undefined;
+            }
+            catch (error) {
+                this.proposals = [];
+                this.proposalError = error instanceof Error ? error.message : String(error);
+            }
+            this.hubManagedIds = new Set();
+            try {
+                const overview = await call('hub.list');
+                this.hubManagedIds = new Set(overview.installed.filter(receipt => receipt.entry.delivery.kind === 'pi-package').flatMap(receipt => receipt.resourceIds));
+            }
+            catch { /* Package actions still go through the receipt-aware Harness service. */ }
         }
         catch (error) {
             this.error = error instanceof Error ? error.message : String(error);
@@ -91,8 +121,23 @@ export class PluginsPage {
                 searchText: `${setting.label} ${setting.description}`
             })));
     }
-    /** The menu rows, with a Settings row after the last row of each plugin that has settings. */
+    /** Switch, trust, settings and package actions stay grouped under their owning plugin. */
     rows() {
+        if (this.section === 'proposals')
+            return this.proposals.map(proposal => ({
+                id: `proposal:${proposal.id}`, label: safeText(proposal.name), detail: proposal.status,
+                tone: proposal.status === 'pending' ? 'warning' : 'muted',
+                searchText: `${proposal.name} ${proposal.description} ${proposal.status}`
+            }));
+        if (this.section === 'packages')
+            return [
+                ...(this.plugins ?? []).filter(plugin => plugin.install).map(plugin => {
+                    const source = plugin.install.kind === 'folder' ? 'local folder' : 'package';
+                    const hub = this.hubManagedIds.has(plugin.id);
+                    return { id: `${PACKAGE_ROW}${plugin.id}`, group: safeText(plugin.title), label: 'Manage package', detail: `${source} · ${hub ? 'Hub' : 'local'} · ${plugin.version ?? plugin.install.source}`, tone: 'muted', searchText: `${plugin.title} ${plugin.install.source} ${plugin.version ?? ''} package ${hub ? 'Hub' : 'local'}` };
+                }),
+                { id: INSTALL_PACKAGE, group: 'Packages', label: 'Install package…', detail: 'Folder, npm or Git', tone: 'accent', searchText: 'install add package plugin npm Git folder' }
+            ];
         const menu = this.menu();
         const out = [];
         const placed = new Set();
@@ -107,18 +152,19 @@ export class PluginsPage {
             if (this.section === 'plugins' && last && settingsOf(row.plugin).length)
                 out.push(settingsRow(row.plugin));
         });
-        if (this.section === 'plugins') {
+        if (this.section === 'plugins')
             for (const plugin of this.plugins ?? [])
                 if (settingsOf(plugin).length && !placed.has(plugin.id))
                     out.push(settingsRow(plugin));
-        }
         return out;
     }
     menu() {
         const rows = menuRows(this.plugins ?? [], this.projectId);
-        return this.section === 'trust'
-            ? rows.filter(row => row.whole && Boolean(row.plugin.code))
-            : rows.filter(row => rowActions(row, this.projectId).some(action => action.startsWith('Switch ')));
+        if (this.section === 'trust')
+            return rows.filter(row => row.whole && Boolean(row.plugin.code));
+        if (this.section === 'packages')
+            return [];
+        return rows.filter(row => rowActions(row, this.projectId).some(action => action.startsWith('Switch ')));
     }
     key(row) { return `${row.whole ? 'plugin' : 'item'}:${row.id}`; }
     toRow(row) {
@@ -130,6 +176,24 @@ export class PluginsPage {
         };
     }
     async open(id) {
+        if (this.section === 'proposals' && id.startsWith('proposal:')) {
+            if (this.busy)
+                return;
+            this.busy = true;
+            try {
+                this.preview = await this.options.call('plugins.proposals.preview', { id: id.slice('proposal:'.length) });
+                this.previewOffset = 0;
+                this.pointerLayout = undefined;
+            }
+            catch (error) {
+                this.options.ui.notify(error instanceof Error ? error.message : String(error), 'error');
+            }
+            finally {
+                this.busy = false;
+                this.options.changed();
+            }
+            return;
+        }
         if (id.startsWith(SETTINGS_ROW)) {
             this.settingsFor = id.slice(SETTINGS_ROW.length);
             this.saved = false;
@@ -137,6 +201,16 @@ export class PluginsPage {
             this.options.changed();
             return;
         }
+        if (id === INSTALL_PACKAGE) {
+            await this.installPackage();
+            return;
+        }
+        if (id.startsWith(PACKAGE_ROW)) {
+            const plugin = this.plugins?.find(candidate => candidate.id === id.slice(PACKAGE_ROW.length));
+            if (plugin?.install)
+                await this.managePackage(plugin);
+            return;
+        }
         const row = this.menu().find(candidate => this.key(candidate) === id);
         if (!row || this.busy)
             return;
@@ -151,6 +225,104 @@ export class PluginsPage {
         }
         await this.reload();
     }
+    async decideProposal() {
+        const preview = this.preview;
+        if (!preview || preview.status !== 'pending' || this.busy)
+            return;
+        this.busy = true;
+        try {
+            const action = await this.options.ui.select(`Proposal ${safeText(preview.name)} · ${preview.hash}`, ['Accept proposal', 'Reject proposal', BACK]);
+            if (action !== 'Accept proposal' && action !== 'Reject proposal')
+                return;
+            const accept = action === 'Accept proposal';
+            if (!await this.options.ui.confirm(action + '?', accept ? 'Install this reviewed proposal switched off and untrusted? Review and trust code separately.' : 'Reject this reviewed proposal?'))
+                return;
+            await this.options.call(accept ? 'plugins.proposals.accept' : 'plugins.proposals.reject', { id: preview.id, hash: preview.hash });
+            this.preview = undefined;
+            if (accept)
+                this.restart = true;
+            this.options.ui.notify(accept ? 'Accepted switched off and untrusted. Changes apply after restart.' : 'Proposal rejected.', 'info');
+            await this.reload();
+        }
+        catch (error) {
+            this.preview = undefined;
+            this.options.ui.notify(error instanceof Error ? error.message : String(error), 'error');
+            await this.reload();
+        }
+        finally {
+            this.busy = false;
+            if (!this.disposed)
+                this.options.changed();
+        }
+    }
+    async installPackage() {
+        if (this.busy)
+            return;
+        this.busy = true;
+        try {
+            const source = await this.options.ui.input('Install local plugin package', 'npm:package@version, Git address, or absolute folder path');
+            if (!source?.trim())
+                return;
+            const confirmed = await this.options.ui.confirm('Install package?', `${source.trim()} will be installed without running package code. It arrives switched off and code remains untrusted until reviewed.`);
+            if (!confirmed)
+                return;
+            await this.options.call('plugins.install', { source: source.trim() });
+            this.restart = true;
+            this.options.ui.notify('Installed switched off. Changes apply when this session restarts.', 'info');
+            await this.reload();
+        }
+        catch (error) {
+            this.options.ui.notify(error instanceof Error ? error.message : String(error), 'error');
+        }
+        finally {
+            this.busy = false;
+            if (!this.disposed)
+                this.options.changed();
+        }
+    }
+    async managePackage(plugin) {
+        if (this.busy || !plugin.install)
+            return;
+        const hubManaged = this.hubManagedIds.has(plugin.id);
+        const actions = [
+            ...(hubManaged || plugin.install.kind === 'folder' ? [] : ['Update package']),
+            hubManaged ? 'Uninstall Hub version' : 'Remove package',
+            BACK
+        ];
+        this.busy = true;
+        try {
+            const action = await this.options.ui.select(`${plugin.title}: ${plugin.install.source}`, actions);
+            if (!action || action === BACK)
+                return;
+            if (action === 'Update package') {
+                const confirmed = await this.options.ui.confirm(`Update ${plugin.title}?`, 'Fetches a newer package version without running its scripts. Changed code remains subject to trust review.');
+                if (!confirmed)
+                    return;
+                await this.options.call('plugins.update', { pluginId: plugin.id });
+                this.options.ui.notify('Updated. Changes apply when this session restarts.', 'info');
+            }
+            else {
+                const title = hubManaged ? `Uninstall ${plugin.title} from Hub?` : `Remove ${plugin.title}?`;
+                const message = hubManaged
+                    ? 'This removes the exact Hub receipt and only its recorded package resources.'
+                    : 'This removes the installed package. A local folder is moved to the Harness trash.';
+                if (!await this.options.ui.confirm(title, message))
+                    return;
+                await this.options.call('plugins.remove', { pluginId: plugin.id });
+                this.options.ui.notify(hubManaged ? 'Hub package uninstalled.' : 'Package removed.', 'info');
+            }
+            this.restart = true;
+            await this.reload();
+        }
+        catch (error) {
+            this.options.ui.notify(error instanceof Error ? error.message : String(error), 'error');
+        }
+        finally {
+            this.busy = false;
+            if (!this.disposed)
+                this.options.changed();
+        }
+    }
     back() {
         this.settingsFor = null;
         this.saved = false;
@@ -196,9 +368,30 @@ export class PluginsPage {
         }
     }
     handleMouse(event) {
-        return this.settingsPlugin() ? this.settingsList.handleMouse(event) : this.list.handleMouse(event);
+        if (this.preview)
+            return { handled: true, render: false };
+        const layout = this.pointerLayout;
+        if (!layout)
+            return undefined;
+        if (event.x < 0 || event.x >= layout.width || event.y < layout.top || event.y >= layout.top + layout.rows)
+            return { handled: true, render: false };
+        return layout.list.handleMouse({ ...event, y: event.y - layout.top });
     }
     handleInput(data) {
+        if (this.preview) {
+            if (matchesKey(data, 'escape'))
+                this.preview = undefined;
+            else if (matchesKey(data, 'enter'))
+                void this.decideProposal();
+            else if (matchesKey(data, 'home'))
+                this.previewOffset = 0;
+            else if (matchesKey(data, 'end'))
+                this.previewOffset = Number.MAX_SAFE_INTEGER;
+            else
+                this.previewOffset = Math.max(0, this.previewOffset + (matchesKey(data, 'down') ? 1 : matchesKey(data, 'up') ? -1 : matchesKey(data, 'pageDown') ? this.previewRows : matchesKey(data, 'pageUp') ? -this.previewRows : 0));
+            this.options.changed();
+            return true;
+        }
         if (this.settingsPlugin()) {
             if (matchesKey(data, 'tab') || matchesKey(data, 'shift+tab'))
                 return true;
@@ -206,44 +399,121 @@ export class PluginsPage {
         }
         if (matchesKey(data, 'tab') || matchesKey(data, 'shift+tab')) {
             if (!this.list.query) {
-                this.section = this.section === 'plugins' ? 'trust' : 'plugins';
+                const direction = matchesKey(data, 'shift+tab') ? -1 : 1;
+                const current = SECTIONS.findIndex(section => section.id === this.section);
+                this.section = SECTIONS[(current + direction + SECTIONS.length) % SECTIONS.length].id;
                 this.fill();
             }
             return true;
         }
         return this.list.handleInput(data);
     }
+    selectedPlugin() {
+        const selectedId = this.list.selected?.id;
+        return selectedId?.startsWith(SETTINGS_ROW)
+            ? this.plugins?.find(candidate => `${SETTINGS_ROW}${candidate.id}` === selectedId)
+            : selectedId?.startsWith(PACKAGE_ROW)
+                ? this.plugins?.find(candidate => `${PACKAGE_ROW}${candidate.id}` === selectedId)
+                : this.menu().find(candidate => this.key(candidate) === selectedId)?.plugin;
+    }
+    pluginInspector(plugin, width, rows) {
+        const theme = this.options.theme();
+        if (width < 1 || rows < 1)
+            return [];
+        if (!plugin) {
+            const action = this.list.selected?.id === INSTALL_PACKAGE;
+            return [theme.fg('muted', action ? 'Add a package from npm, Git, or a local folder.' : 'Select a plugin to inspect it.')].slice(0, rows).map(line => truncateToWidth(line, width, ''));
+        }
+        const selectedId = this.list.selected?.id;
+        const row = this.menu().find(candidate => this.key(candidate) === selectedId);
+        const title = row ? row.whole ? row.plugin.title : row.name : plugin.title;
+        const lines = [theme.bold(safeText(title))];
+        if (title !== plugin.title)
+            lines.push(theme.fg('dim', `Part of ${safeText(plugin.title)}`));
+        lines.push('', ...wrapTextWithAnsi(safeText(describePlugin(plugin)), width));
+        if (row) {
+            const status = this.section === 'trust' && row.whole
+                ? plugin.trust === 'trusted' ? 'Code trusted' : 'Code not trusted'
+                : row.on ? 'Enabled' : 'Disabled';
+            lines.push('', theme.fg(row.on ? 'success' : 'dim', status));
+        }
+        if (plugin.code) {
+            lines.push(theme.fg('muted', `Code trust: ${plugin.trust === 'trusted' ? 'trusted' : 'not trusted'}`));
+            lines.push(theme.fg('muted', `Fingerprint: ${plugin.code.hash.slice(0, 12)}`));
+        }
+        if (plugin.install) {
+            lines.push('', theme.fg('muted', `Package: ${this.hubManagedIds.has(plugin.id) ? 'Hub receipt' : 'local'}`));
+            lines.push(...wrapTextWithAnsi(theme.fg('dim', safeText(plugin.install.source)), width));
+        }
+        if (settingsOf(plugin).length)
+            lines.push('', theme.fg('muted', `${settingsOf(plugin).length} settings`));
+        return lines.slice(0, rows).map(line => truncateToWidth(line, width, ''));
+    }
     render(width, rows) {
         const theme = this.options.theme();
         if (width < 1 || rows < 1)
             return [];
-        if (!this.plugins)
+        if (this.preview) {
+            const proposal = this.preview;
+            const text = [`Name: ${proposal.name}`, `Description: ${proposal.description}`, `Status: ${proposal.status}`, `SHA-256: ${proposal.hash}`, '', '--- package.json ---', proposal.manifest, ...Object.entries(proposal.files).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).flatMap(([path, content]) => ['', `--- ${path} ---`, content])].join('\n');
+            const content = text.split('\n').flatMap(line => wrapTextWithAnsi(reviewText(line), width));
+            this.previewRows = Math.max(1, rows - 1);
+            this.previewOffset = Math.min(this.previewOffset, Math.max(0, content.length - this.previewRows));
+            return [theme.bold(`Proposal preview · ${this.previewOffset + 1}/${Math.max(1, content.length)}`), ...content.slice(this.previewOffset, this.previewOffset + this.previewRows)].slice(0, rows).map(line => truncateToWidth(line, width, ''));
+        }
+        if (this.section === 'proposals' && this.proposalError)
+            return [theme.fg('error', `Could not read proposals: ${safeText(this.proposalError)}`)];
+        if (!this.plugins) {
+            this.pointerLayout = undefined;
             return [theme.fg(this.error ? 'error' : 'dim', this.error ? `Could not read plugins: ${this.error}` : 'Reading plugins…')];
+        }
         const plugin = this.settingsPlugin();
         if (plugin)
             return this.renderSettings(plugin, width, rows);
-        const selectedId = this.list.selected?.id;
-        const selected = selectedId?.startsWith(SETTINGS_ROW)
-            ? this.plugins.find(candidate => `${SETTINGS_ROW}${candidate.id}` === selectedId)
-            : this.menu().find(candidate => this.key(candidate) === selectedId)?.plugin;
+        const note = this.restart ? [theme.fg('warning', 'Saved. Changes apply when this session restarts.')] : [];
+        const paneWidth = inspectorListWidth(width);
+        if (paneWidth !== undefined) {
+            const bodyRows = Math.max(0, rows - note.length);
+            const rightWidth = Math.max(0, width - paneWidth - 3);
+            const listLines = this.list.render(paneWidth, bodyRows);
+            this.pointerLayout = { list: this.list, width: paneWidth, top: note.length, rows: listLines.length };
+            return [...note, ...splitColumns(listLines, this.pluginInspector(this.selectedPlugin(), rightWidth, bodyRows), paneWidth, width, bodyRows, theme)]
+                .slice(0, rows).map(line => truncateToWidth(line, width, ''));
+        }
+        const selected = this.selectedPlugin();
         const detail = selected && rows >= 8 ? wrapTextWithAnsi(safeText(describePlugin(selected)), width).slice(0, 3) : [];
-        const note = this.restart ? ['Saved. Changes apply when this session restarts.'] : [];
-        const extra = detail.length + note.length;
-        const lines = this.list.render(width, Math.max(2, rows - (extra ? extra + 1 : 0)));
-        if (extra)
-            lines.push('', ...detail.map(line => theme.fg('muted', line)), ...note.map(line => theme.fg('warning', line)));
+        const listRows = Math.max(2, rows - note.length - (detail.length ? detail.length + 1 : 0));
+        const listLines = this.list.render(width, listRows);
+        this.pointerLayout = { list: this.list, width, top: note.length, rows: Math.min(listLines.length, Math.max(0, rows - note.length)) };
+        const lines = [...note, ...listLines];
+        if (detail.length)
+            lines.push('', ...detail.map(line => theme.fg('muted', line)));
         return lines.slice(0, rows).map(line => truncateToWidth(line, width, ''));
     }
     renderSettings(plugin, width, rows) {
         const theme = this.options.theme();
         const setting = settingsOf(plugin).find(candidate => candidate.key === this.settingsList.selected?.id);
         const range = setting && !isSwitch(setting) ? [`From ${setting.min.toLocaleString('en-US')} to ${setting.max.toLocaleString('en-US')} · default ${setting.default.toLocaleString('en-US')}`] : [];
+        const note = this.saved ? [theme.fg('success', 'Saved.')] : [];
+        const paneWidth = inspectorListWidth(width);
+        if (paneWidth !== undefined) {
+            const bodyRows = Math.max(0, rows - note.length);
+            const rightWidth = Math.max(0, width - paneWidth - 3);
+            const listLines = this.settingsList.render(paneWidth, bodyRows);
+            const details = setting
+                ? [theme.bold(safeText(setting.label)), '', ...wrapTextWithAnsi(safeText(setting.description), rightWidth), '', ...range.map(line => theme.fg('muted', line)), theme.fg('dim', `Current value: ${settingValueText(setting)}`)]
+                : [theme.fg('muted', 'Select a setting to review its value and description.')];
+            this.pointerLayout = { list: this.settingsList, width: paneWidth, top: note.length, rows: listLines.length };
+            return [...note, ...splitColumns(listLines, details, paneWidth, width, bodyRows, theme)]
+                .slice(0, rows).map(line => truncateToWidth(line, width, ''));
+        }
         const detail = setting && rows >= 8 ? [...wrapTextWithAnsi(safeText(setting.description), width).slice(0, 3), ...range] : [];
-        const note = this.saved ? ['Saved.'] : [];
-        const extra = detail.length + note.length;
-        const lines = this.settingsList.render(width, Math.max(2, rows - (extra ? extra + 1 : 0)));
-        if (extra)
-            lines.push('', ...detail.map(line => theme.fg('muted', line)), ...note.map(line => theme.fg('success', line)));
+        const listRows = Math.max(2, rows - note.length - (detail.length ? detail.length + 1 : 0));
+        const listLines = this.settingsList.render(width, listRows);
+        this.pointerLayout = { list: this.settingsList, width, top: note.length, rows: Math.min(listLines.length, Math.max(0, rows - note.length)) };
+        const lines = [...note, ...listLines];
+        if (detail.length)
+            lines.push('', ...detail.map(line => theme.fg('muted', line)));
         return lines.slice(0, rows).map(line => truncateToWidth(line, width, ''));
     }
 }

package/dist/sdk/terminal/tui/pages/subagentsPage.js

@@ -88,9 +88,11 @@ export class SubagentsPage {
     activeTab() { return 'subagents'; }
     hint() { return '↑↓ select · type to search'; }
     rows(width = 80, now = this.options.now?.() ?? Date.now()) {
+        // The main agent is pinned first so its children read against it.
         const ordered = [...this.options.snapshot()].sort((left, right) => {
+            const main = Number(right.relation === 'main') - Number(left.relation === 'main');
             const active = Number(ACTIVE_SUBAGENT_STATUSES.has(right.status)) - Number(ACTIVE_SUBAGENT_STATUSES.has(left.status));
-            return active || left.startedAt.localeCompare(right.startedAt) || left.id.localeCompare(right.id);
+            return main || active || left.startedAt.localeCompare(right.startedAt) || left.id.localeCompare(right.id);
         });
         return ordered.map(item => {
             const profile = clean(item.profile?.name ?? '') || 'subagent';
@@ -115,9 +117,10 @@ export class SubagentsPage {
     render(width, rows) {
         const items = this.rows(width, this.options.now?.() ?? Date.now());
         this.list.setRows(items);
-        const active = items.filter(item => item.data && ACTIVE_SUBAGENT_STATUSES.has(item.data.status)).length;
+        const children = items.filter(item => item.data?.relation !== 'main');
+        const active = children.filter(item => item.data && ACTIVE_SUBAGENT_STATUSES.has(item.data.status)).length;
         const selected = this.list.selected?.data;
-        const header = headerRow('Subagents', `${active} active · ${items.length} total`, width, this.options.theme());
+        const header = headerRow('Subagents', `${active} active · ${children.length} total`, width, this.options.theme());
         const bodyRows = Math.max(0, rows - 7);
         const listRows = Math.max(1, Math.min(this.list.height, Math.floor(bodyRows * 0.6)));
         const output = [header, '', ...this.list.render(width, listRows), ''];
@@ -129,8 +132,8 @@ export class SubagentsPage {
             output.push(neutralRule(width, theme));
             output.push(padded(theme.fg('muted', `Profile: ${clean(selected.profile?.name ?? '') || 'copy of the parent'}`), width));
             output.push(padded(theme.fg('accent', 'Task'), width));
-            output.push(...detailLines(selected.goal || 'Subagent'));
-            output.push(padded(theme.fg('muted', `Status: ${[selected.status.replaceAll('_', ' '), subagentTasks(selected.checklist), terminalSubagentDuration(selected)].filter(Boolean).join(' · ')}`), width));
+            output.push(...detailLines(selected.goal || (selected.relation === 'main' ? 'Main agent' : 'Subagent')));
+            output.push(padded(theme.fg('muted', `Status: ${[selected.status.replaceAll('_', ' '), subagentTasks(selected.todo), terminalSubagentDuration(selected)].filter(Boolean).join(' · ')}`), width));
             output.push(padded(theme.fg('accent', 'Current activity'), width));
             output.push(...detailLines(selected.activity));
         }

package/dist/sdk/terminal/tui/pages/usagePage.d.ts

@@ -2,7 +2,7 @@ import type { Theme } from '@earendil-works/pi-coding-agent';
 import type { UsagePeriod } from "../../../usage/types.js";
 import type { TabInfo } from "../chrome.js";
 import type { TerminalPage } from "../page.js";
-type UsageTab = 'analysis' | 'limits';
+type UsageTab = 'analysis' | 'limits' | 'accounts';
 interface UsagePageOptions {
     theme(): Theme;
     call(method: string, params?: Record<string, unknown>): Promise<unknown>;
@@ -12,7 +12,7 @@ interface UsagePageOptions {
 }
 export declare class UsagePage implements TerminalPage {
     private readonly options;
-    presentation: "centered";
+    presentation: "fullscreen";
     focused: boolean;
     private tab;
     private period;
@@ -20,7 +20,9 @@ export declare class UsagePage implements TerminalPage {
     private summary?;
     private limitsSummary?;
     private limits?;
+    private allLimits?;
     private busy;
+    private reloadPending;
     private error?;
     private refreshLimits;
     private offset;

package/dist/sdk/terminal/tui/pages/usagePage.js

@@ -118,7 +118,7 @@ function spread(left, right, width) {
 }
 export class UsagePage {
     options;
-    presentation = 'centered';
+    presentation = 'fullscreen';
     focused = false;
     tab;
     period = '7d';
@@ -126,7 +126,9 @@ export class UsagePage {
     summary;
     limitsSummary;
     limits;
+    allLimits;
     busy = false;
+    reloadPending = false;
     error;
     refreshLimits;
     offset = 0;
@@ -140,17 +142,19 @@ export class UsagePage {
         this.refreshLimits = this.tab === 'limits';
     }
     tabs() {
-        return [{ id: 'analysis', title: 'Analysis' }, { id: 'limits', title: 'Limits' }];
+        return [{ id: 'analysis', title: 'Analysis' }, { id: 'limits', title: 'Limits' }, { id: 'accounts', title: 'All accounts' }];
     }
     activeTab() {
         return this.tab;
     }
     selectTab(id) {
-        if ((id === 'analysis' || id === 'limits') && id !== this.tab) {
+        if ((id === 'analysis' || id === 'limits' || id === 'accounts') && id !== this.tab) {
             this.tab = id;
             this.offset = 0;
             this.options.changed();
-            if (id === 'limits' && !this.limits) {
+            if (id === 'accounts')
+                void this.load();
+            else if (id === 'limits' && !this.limits) {
                 this.refreshLimits = true;
                 void this.load();
             }
@@ -162,19 +166,23 @@ export class UsagePage {
     }
     hint() {
         return this.tab === 'analysis'
-            ? '↑/↓ scroll · PgUp/PgDn page · 1 today 2 7d 3 30d 0 all · c account s session p project a all accounts · r refresh · Tab limits · Esc close'
-            : '↑/↓ scroll · PgUp/PgDn page · r read provider limits · Tab analysis · Esc close';
+            ? '↑/↓ scroll · PgUp/PgDn page · 1 today 2 7d 3 30d 0 all · c account s session p project a all accounts · r refresh'
+            : '↑/↓ scroll · PgUp/PgDn page · r read provider limits';
     }
     activate() {
-        if (!this.summary && !this.limits)
+        if (!this.summary && !this.limits && !this.allLimits)
             void this.load();
     }
     dispose() {
         this.disposed = true;
     }
     async load() {
-        if (this.busy || this.disposed)
+        if (this.disposed)
+            return;
+        if (this.busy) {
+            this.reloadPending = true;
             return;
+        }
         this.busy = true;
         this.error = undefined;
         this.options.changed();
@@ -186,6 +194,14 @@ export class UsagePage {
                     timezoneOffsetMinutes: -new Date().getTimezoneOffset()
                 });
             }
+            else if (this.tab === 'accounts') {
+                if (!this.allLimits) {
+                    this.allLimits = await this.options.call('terminal.usage.allLimits', { refresh: false });
+                    if (!this.disposed)
+                        this.options.changed();
+                }
+                this.allLimits = await this.options.call('terminal.usage.allLimits', { refresh: true });
+            }
             else {
                 // The provider's windows and this app's own ledger answer different questions; show both.
                 const [limits, summary] = await Promise.all([
@@ -207,12 +223,23 @@ export class UsagePage {
         }
         finally {
             this.busy = false;
-            if (!this.disposed)
+            if (!this.disposed) {
                 this.options.changed();
+                if (this.reloadPending) {
+                    this.reloadPending = false;
+                    void this.load();
+                }
+            }
         }
     }
     handleInput(data) {
         const page = Math.max(1, this.scrollRows - 1);
+        if (matchesKey(data, 'tab') || matchesKey(data, 'shift+tab')) {
+            const tabs = ['analysis', 'limits', 'accounts'];
+            const direction = matchesKey(data, 'shift+tab') ? -1 : 1;
+            this.selectTab(tabs[(tabs.indexOf(this.tab) + direction + tabs.length) % tabs.length]);
+            return true;
+        }
         if (matchesKey(data, 'up'))
             this.offset = Math.max(0, this.offset - 1);
         else if (matchesKey(data, 'down'))
@@ -298,7 +325,7 @@ export class UsagePage {
         return { header, body };
     }
     limitsContent(width, theme) {
-        const report = this.limits;
+        const report = this.tab === 'accounts' ? this.allLimits : this.limits;
         const header = [];
         if (!report) {
             header.push(theme.fg(this.error ? 'error' : 'dim', this.error ?? (this.busy ? 'Reading provider limits…' : 'No limit readings yet.')));
@@ -318,7 +345,7 @@ export class UsagePage {
             }
             for (const provider of account.providers) {
                 body.push('');
-                const source = provider.source === 'provider' ? '' : provider.source;
+                const source = this.tab === 'accounts' ? `cached · ${provider.source}` : provider.source === 'provider' ? '' : provider.source;
                 const meta = [source, ago(provider.observedAt)].filter(Boolean).join(' · ');
                 const tone = provider.source === 'unavailable' ? 'warning' : 'muted';
                 body.push(...wrapTextWithAnsi(theme.fg(tone, `  ${provider.provider}${meta ? ` · ${meta}` : ''}${provider.reason ? ` · ${oneLine(provider.reason)}` : ''}`), width));
@@ -348,7 +375,7 @@ export class UsagePage {
         }
         if (!report.accounts.length)
             body.push(theme.fg('dim', 'No accounts.'));
-        const local = this.limitsSummary?.totals;
+        const local = this.tab === 'limits' ? this.limitsSummary?.totals : undefined;
         if (local) {
             if (body.length)
                 body.push('');

package/dist/sdk/terminal/tui/pluginCommands.d.ts

@@ -6,7 +6,7 @@ type PageOptions = {
     runId?: string;
     url?: string;
     annotate?: AnnotateStart;
-    usageTab?: 'analysis' | 'limit';
+    usageTab?: 'analysis' | 'limit' | 'accounts';
     usagePeriod?: 'today' | '7d' | '30d' | 'all';
 };
 type OpenPage = (id: CommandPageId, options?: PageOptions) => Promise<void>;