@pellux/goodvibes-agent 1.4.4 → 1.5.1

package/src/renderer/tool-call.ts

@@ -3,9 +3,10 @@ import { LAYOUT, TOOL_STATUS } from './layout.ts';
 import { getDisplayWidth, truncateDisplay } from '../utils/terminal-width.ts';
 import type { ToolCall } from '@pellux/goodvibes-sdk/platform/types';
 import { stripDangerousAnsi } from './ansi-sanitize.ts';
+import { friendlyToolLabel } from './tool-labels.ts';
 
 const TOOL_NAME_MIN_WIDTH = 8;
-const TOOL_NAME_MAX_WIDTH = 20;
+const TOOL_NAME_MAX_WIDTH = 30;
 
 function isRecord(value: unknown): value is Record<string, unknown> {
   return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
@@ -137,11 +138,11 @@ function extractKeyArg(toolCall: ToolCall): string {
     if (url) return url;
   }
   // Agent
-  if (typeof args.task === 'string') return args.task.slice(0, 40);
+  if (typeof args.task === 'string') return [...args.task].slice(0, 40).join('');
   if (typeof args.mode === 'string') return args.mode;
   // Fallback: first string value
   for (const val of Object.values(args)) {
-    if (typeof val === 'string' && val.length > 0) return val.slice(0, 40);
+    if (typeof val === 'string' && val.length > 0) return [...val].slice(0, 40).join('');
   }
   return '';
 }
@@ -200,13 +201,11 @@ export function renderToolCallBlock(
   }
   col += 2; // icon + space
 
-  // Tool name — extract short name for long MCP tool names, but keep a readable dynamic width.
-  const rawName = toolCall.name.includes('__')
-    ? toolCall.name.split('__').pop()!
-    : toolCall.name;
+  // Human phrase for the tool ("Searching the web") instead of the raw name.
+  const rawName = friendlyToolLabel(toolCall.name);
   const keyArg = stripDangerousAnsi(extractKeyArg(toolCall));
   const suffixText = status === 'error' && errorMsg
-    ? `- ${stripDangerousAnsi(errorMsg).slice(0, 40)}`
+    ? `- ${[...stripDangerousAnsi(errorMsg)].slice(0, 40).join('')}`
     : status === 'done' && resultSummary
       ? `(${stripDangerousAnsi(resultSummary)})`
       : '';

package/src/renderer/tool-labels.ts

@@ -0,0 +1,92 @@
+/**
+ * Friendly tool labels — turn internal tool names into the phrase a person
+ * would say. Shown on tool-call lines in the conversation; the raw tool name
+ * is still discoverable in the Agent workspace tool catalog.
+ */
+
+const TOOL_LABELS: Record<string, string> = {
+  // SDK file/shell/web tools
+  read: 'Reading files',
+  write: 'Writing a file',
+  edit: 'Editing a file',
+  exec: 'Running a command',
+  fetch: 'Fetching a web page',
+  web_search: 'Searching the web',
+  find: 'Searching files',
+  analyze: 'Analyzing code',
+  inspect: 'Inspecting files',
+
+  // Agent first-class tools
+  personal_ops: 'Checking your inbox & calendar',
+  research: 'Researching',
+  agent_research_runs: 'Researching',
+  agent_research_sources: 'Reviewing sources',
+  agent_research_report: 'Writing a research report',
+  schedule: 'Checking schedules',
+  agent_schedule_edit: 'Updating a schedule',
+  agent_autonomy_schedule: 'Scheduling background work',
+  agent_reminder_schedule: 'Setting a reminder',
+  autonomy: 'Checking background work',
+  channels: 'Checking message channels',
+  agent_channel_send: 'Sending a message',
+  notify: 'Sending a notification',
+  memory: 'Recalling memory',
+  agent_knowledge: 'Searching knowledge',
+  agent_knowledge_ingest: 'Saving to knowledge',
+  agent_learning_consolidation: 'Consolidating what I learned',
+  agent_local_registry: 'Checking notes & routines',
+  models: 'Checking models',
+  agent_model_compare: 'Comparing models',
+  settings: 'Adjusting settings',
+  agent_settings_import: 'Importing settings',
+  setup: 'Checking setup',
+  security: 'Reviewing safety',
+  sessions: 'Looking at past conversations',
+  computer: 'Using the browser',
+  device: 'Checking this device',
+  host: 'Checking the assistant service',
+  execution: 'Managing background work',
+  terminal_process: 'Watching a process',
+  support: 'Preparing a support bundle',
+  vibe: 'Reading your VIBE profile',
+  workspace: 'Driving the workspace',
+  agent_harness: 'Checking app internals',
+  route: 'Choosing the best route',
+  delegation: 'Handing work off',
+  audit: 'Reviewing evidence',
+  context: 'Reading project context',
+  agent_documents: 'Working on a document',
+  agent_artifacts: 'Managing saved files',
+  agent_media_generate: 'Generating media',
+  agent_operator_method: 'Calling the assistant service',
+  agent_operator_briefing: 'Preparing a briefing',
+  agent_operator_action: 'Running an approved action',
+  agent_work_plan: 'Organizing work',
+  agent_review_packet_presets: 'Preparing a review packet',
+  agent_review_packet_share: 'Sharing a review packet',
+  propose_skill_drafts: 'Proposing skill drafts',
+};
+
+/**
+ * Exported catalog of all registered tool IDs and their human phrases.
+ * Tests import this to enumerate the full set of tool IDs for coverage checks.
+ */
+export const TOOL_LABELS_CATALOG: Readonly<Record<string, string>> = TOOL_LABELS;
+
+function humanize(name: string): string {
+  const short = name.includes('__') ? name.split('__').pop()! : name;
+  return (short
+    .replace(/^agent[_-]/, '')
+    .replace(/[_-]+/g, ' ')
+    .trim())
+    .replace(/^./, (c) => c.toUpperCase());
+}
+
+/**
+ * Return the human phrase for a tool call, falling back to a humanized
+ * version of the raw name for unknown tools (including MCP tools).
+ */
+export function friendlyToolLabel(toolName: string): string {
+  const short = toolName.includes('__') ? toolName.split('__').pop()! : toolName;
+  return TOOL_LABELS[short] ?? TOOL_LABELS[toolName] ?? humanize(toolName);
+}

package/src/renderer/ui-factory.ts

@@ -215,113 +215,65 @@ export class UIFactory {
     const bottomLine = createBaseLine();
     for (let x = 0; x < boxWidth; x++) bottomLine[boxStartX + x] = { char: GLYPHS.surface.bottom, fg: BORDER_COLOR, bg: '', bold: false, dim: false, underline: false, italic: false, strikethrough: false };
     lines.push(bottomLine);
-    lines.push(createBaseLine());
-    const composerTokens: Array<{ text: string; fg: string; bold?: boolean; dim?: boolean }> = [];
-    if (composerMode) composerTokens.push({ text: ` ${GLYPHS.status.active} ${composerMode} `, fg: '#38bdf8', bold: true });
-    if (composerPendingRisk && composerPendingRisk !== 'none') {
-      const riskColor = composerPendingRisk === 'approval-wait'
-        ? '#f59e0b'
-        : composerPendingRisk === 'shell'
-          ? '#ef4444'
-          : composerPendingRisk === 'remote'
-            ? '#a78bfa'
-            : '#f59e0b';
-      composerTokens.push({ text: ` risk:${composerPendingRisk} `, fg: riskColor, bold: true });
-    }
-    if (composerStatus && composerStatus !== 'idle') composerTokens.push({ text: ` state:${composerStatus} `, fg: '244', dim: true });
-    if (composerFlags && composerFlags.length > 0) composerTokens.push({ text: ` flags:${composerFlags.join(',')} `, fg: '244', dim: true });
-    if (composerTokens.length > 0) {
-      const postureLine = createBaseLine();
-      let px = 2;
-      for (const token of composerTokens) {
-        for (const ch of token.text) {
-          if (px >= width) break;
-          postureLine[px] = {
-            char: ch,
-            fg: token.fg,
-            bg: '',
-            bold: token.bold ?? false,
-            dim: token.dim ?? false,
-            underline: false,
-            italic: false,
-            strikethrough: false,
-          };
-          px += getDisplayWidth(ch);
-        }
-        if (px >= width) break;
-      }
-      lines.push(postureLine);
-      lines.push(createBaseLine());
-    }
+
+    // ── Status line: model · context meter · tokens, with alerts on the right ──
     const isRecentlyCopied = Date.now() - lastCopyTime < 2000;
-    // Token usage line
-    const u = usage as { input?: number; output?: number; cacheRead?: number; cacheWrite?: number; up?: number; down?: number };
+    const u = usage as { input?: number; output?: number; up?: number; down?: number };
     const inp = u.input ?? u.up ?? 0;
     const out = u.output ?? u.down ?? 0;
-    const cr = u.cacheRead ?? 0;
-    const cw = u.cacheWrite ?? 0;
-    const total = inp + out + cr + cw;
-    const tokenSep = ` ${GLYPHS.navigation.pipeSeparator} `;
-    const tokenLine = ` Token Usage [ Input: ${fmtNum(inp)}${tokenSep}Output: ${fmtNum(out)}${tokenSep}Cache Read: ${fmtNum(cr)}${tokenSep}Cache Write: ${fmtNum(cw)}${tokenSep}Total: ${fmtNum(total)} ]`;
-    const copiedNotice = isRecentlyCopied ? ` [COPIED] ` : '';
-    const statsLine = '  ' + tokenLine + ' '.repeat(Math.max(0, width - 4 - getDisplayWidth(tokenLine) - getDisplayWidth(copiedNotice))) + copiedNotice;
-    lines.push(this.stringToLine(statsLine, width, { fg: isRecentlyCopied ? '81' : '244', bold: isRecentlyCopied }));
-    // Context usage progress bar
+    const statusTokens: Array<{ text: string; fg: string; bold?: boolean }> = [];
+    if (model) {
+      statusTokens.push({ text: provider ? `${model} · ${provider}` : model, fg: '245' });
+    }
     if (contextWindow && contextWindow > 0) {
       const ctxTokens = lastInputTokens ?? 0;
-      const label = '   Context Usage: ';
-      const suffix = ` [ ${fmtNum(ctxTokens)} / ${fmtNum(contextWindow)} ]`;
-      const barWidth = Math.max(10, Math.min(30, width - getDisplayWidth(label) - getDisplayWidth(suffix) - 8));
-      const ctxPct = Math.min(1, ctxTokens / contextWindow);
-      lines.push(createBaseLine());
-      lines.push(this.createProgressBarLine(label, ctxPct, barWidth, width, suffix));
+      const pct = Math.min(100, Math.round((ctxTokens / contextWindow) * 100));
+      const filled = Math.round((pct / 100) * 6);
+      const meter = GLYPHS.meter.filled.repeat(filled) + GLYPHS.meter.empty.repeat(6 - filled);
+      const meterFg = pct >= 85 ? '#ef4444' : pct >= 65 ? '#f59e0b' : '240';
+      statusTokens.push({ text: `context ${meter} ${pct}%`, fg: meterFg, bold: pct >= 85 });
+    }
+    if (inp > 0 || out > 0) {
+      statusTokens.push({ text: `↑${fmtNum(inp)} ↓${fmtNum(out)}`, fg: '240' });
+    }
+    if (composerPendingRisk === 'approval-wait') {
+      statusTokens.push({ text: 'waiting for your approval', fg: '#f59e0b', bold: true });
     }
-    // Context info line (working dir, model+provider, tools)
-    if (workingDir || model) {
-      const home = typeof process !== 'undefined' ? process.env.HOME ?? '' : '';
-      const displayDir = workingDir && home && workingDir.startsWith(home)
-        ? '~' + workingDir.slice(home.length)
-        : workingDir ?? '';
-      const ctxParts: string[] = [];
-      if (displayDir) ctxParts.push(displayDir);
-      if (model) {
-        ctxParts.push(model + (provider ? ` (${provider})` : ''));
+    const rightNotice = isRecentlyCopied
+      ? { text: `copied ${GLYPHS.status.success} `, fg: '81', bold: true }
+      : dangerMode
+        ? { text: '⚠ auto-approve is on ', fg: '#ef4444', bold: true }
+        : null;
+    const statusLine = createBaseLine();
+    let sx = 3;
+    const writeStatusText = (text: string, fg: string, bold = false) => {
+      for (const ch of text) {
+        if (sx >= width - 1) break;
+        statusLine[sx] = { char: ch, fg, bg: '', bold, dim: false, underline: false, italic: false, strikethrough: false };
+        sx += getDisplayWidth(ch);
+      }
+    };
+    statusTokens.forEach((token, index) => {
+      if (index > 0) writeStatusText(`  ${GLYPHS.navigation.pipeSeparator}  `, '238');
+      writeStatusText(token.text, token.fg, token.bold ?? false);
+    });
+    if (rightNotice) {
+      let col = Math.max(sx + 2, width - getDisplayWidth(rightNotice.text));
+      for (const ch of rightNotice.text) {
+        if (col >= width) break;
+        statusLine[col] = { char: ch, fg: rightNotice.fg, bg: '', bold: rightNotice.bold ?? false, dim: false, underline: false, italic: false, strikethrough: false };
+        col += getDisplayWidth(ch);
       }
-      if (toolCount) ctxParts.push(`${toolCount} tools`);
-      if (hitlMode) ctxParts.push(`hitl:${hitlMode}`);
-      if (composerMode) ctxParts.push(`mode:${composerMode}`);
-      if (composerStatus && composerStatus !== 'idle') ctxParts.push(`status:${composerStatus}`);
-      if (composerFlags && composerFlags.length > 0) ctxParts.push(composerFlags.join(','));
-      const ctxLine = '   ' + ctxParts.join(`  ${GLYPHS.navigation.pipeSeparator}  `);
-      lines.push(createBaseLine());
-      lines.push(this.stringToLine(truncateDisplay(ctxLine, width), width, { fg: '240', dim: true }));
-      lines.push(createBaseLine());
     }
+    lines.push(statusLine);
+
+    // ── Hints line ──
     if (showExitNotice) {
-      const notice = `   !!! Press Ctrl+C again to exit !!! `;
-      lines.push(this.stringToLine(fitDisplay(notice, width), width, { fg: '196', bold: true }));
+      lines.push(this.stringToLine(fitDisplay('   Press Ctrl+C again to exit ', width), width, { fg: '196', bold: true }));
     } else {
-      const help = `   /help for commands  -  Ctrl+C to quit `;
-      const dangerWarn = dangerMode ? `! DANGER MODE - ALL CHANGES AUTO-APPROVED ` : '';
-      const helpW = getDisplayWidth(help);
-      const dangerW = getDisplayWidth(dangerWarn);
-      const spacerW = Math.max(0, width - helpW - dangerW);
-      const combinedLine = help + ' '.repeat(spacerW) + dangerWarn;
-      const line = this.stringToLine(truncateDisplay(combinedLine, width), width, { fg: '240', dim: true });
-      // Overlay the danger warning in red bold
-      if (dangerMode && dangerW > 0) {
-        let col = helpW + spacerW;
-        for (const ch of dangerWarn) {
-          if (col >= width) break;
-          const cw = getDisplayWidth(ch);
-          line[col] = { char: ch, fg: '#ef4444', bg: '', bold: true, dim: false, underline: false, italic: false, strikethrough: false };
-          if (cw === 2 && col + 1 < width) line[col + 1] = { ...line[col], char: '' };
-          col += cw;
-        }
-      }
-      lines.push(line);
+      const hints = `   /help commands  ${GLYPHS.navigation.pipeSeparator}  Ctrl+P settings  ${GLYPHS.navigation.pipeSeparator}  Ctrl+O activity `;
+      lines.push(this.stringToLine(truncateDisplay(hints, width), width, { fg: '240', dim: true }));
     }
-    lines.push(createBaseLine());
     return lines;
   }
 

package/src/runtime/bootstrap-command-context.ts

@@ -4,7 +4,6 @@ import type { ConversationManager } from '../core/conversation';
 import type { KnowledgeApi } from '@pellux/goodvibes-sdk/platform/knowledge';
 import type { HookApi } from '@pellux/goodvibes-sdk/platform/hooks';
 import type { McpApi } from '@pellux/goodvibes-sdk/platform/mcp';
-import type { PanelManager } from '../panels/panel-manager.ts';
 import type { ProviderApi } from '@pellux/goodvibes-sdk/platform/providers';
 import type { OpsApi } from '@/runtime/index.ts';
 import type { MutableRuntimeState } from '@/runtime/index.ts';
@@ -116,7 +115,6 @@ export type CreateBootstrapCommandContextOptions = {
   mcpApi?: McpApi;
   opsApi?: OpsApi;
   directTransport?: DirectTransport;
-  panelManager: PanelManager;
   worktreeRegistry: WorktreeRegistry;
   sandboxSessionRegistry: SandboxSessionRegistry;
   loadSystemPrompt: () => string;
@@ -192,7 +190,6 @@ export function createBootstrapCommandContext(
     mcpApi,
     opsApi,
     directTransport,
-    panelManager,
     worktreeRegistry,
     sandboxSessionRegistry,
     loadSystemPrompt,
@@ -247,7 +244,6 @@ export function createBootstrapCommandContext(
   const workspace = createBootstrapCommandWorkspaceSection({
     keybindingsManager,
     fileUndoManager,
-    panelManager,
     processManager,
     profileManager,
     bookmarkManager,
@@ -277,7 +273,6 @@ export function createBootstrapCommandContext(
     conversation,
     runtime,
     requestRender,
-    panelManager,
     loadSystemPrompt,
     activatePlan,
     requestPermission,

package/src/runtime/bootstrap-command-parts.ts

@@ -6,7 +6,6 @@ import type { KnowledgeApi } from '@pellux/goodvibes-sdk/platform/knowledge';
 import type { AgentPromptContextReceiptStore } from '../agent/prompt-context-receipts.ts';
 import type { HookApi } from '@pellux/goodvibes-sdk/platform/hooks';
 import type { McpApi } from '@pellux/goodvibes-sdk/platform/mcp';
-import type { PanelManager } from '../panels/panel-manager.ts';
 import type { ProviderApi } from '@pellux/goodvibes-sdk/platform/providers';
 import type { OpsApi } from '@/runtime/index.ts';
 import type { MutableRuntimeState } from '@/runtime/index.ts';
@@ -62,7 +61,6 @@ export interface BootstrapCommandActionOptions {
   readonly conversation: ConversationManager;
   readonly runtime: MutableRuntimeState;
   readonly requestRender: () => void;
-  readonly panelManager: PanelManager;
   readonly loadSystemPrompt: () => string;
   readonly activatePlan: (planId: string, task: string) => void;
   readonly requestPermission: PermissionRequestHandler;
@@ -76,7 +74,6 @@ export interface BootstrapCommandSectionOptions {
   readonly runtime: MutableRuntimeState;
   readonly keybindingsManager?: KeybindingsManager;
   readonly processManager?: import('@pellux/goodvibes-sdk/platform/tools').ProcessManager;
-  readonly panelManager: PanelManager;
   readonly requestRender: () => void;
   readonly requestPermission: PermissionRequestHandler;
   readonly toolRegistry: ToolRegistry;
@@ -158,7 +155,6 @@ export function createBootstrapCommandActions(
   | 'print'
   | 'exit'
   | 'reloadSystemPrompt'
-  | 'showPanel'
   | 'openMcpWorkspace'
   | 'openAgentWorkspace'
   | 'dismissAgentWorkspace'
@@ -172,17 +168,14 @@ export function createBootstrapCommandActions(
     conversation,
     runtime,
     requestRender,
-    panelManager,
     loadSystemPrompt,
     activatePlan,
     requestPermission,
     completeModelSelectionSideEffect,
   } = options;
 
-  const showPanel = (panelId: string, pane?: 'top' | 'bottom') => {
-    void pane;
-    panelManager.hide();
-    conversation.log(`Panel route "${panelId}" is handled through Agent Workspace. Use /agent for current operator controls.`, { fg: '214' });
+  const pointToWorkspace = (what: string) => {
+    conversation.log(`${what} lives in the Agent workspace — press Ctrl+P or run /agent.`, { fg: '214' });
     requestRender();
   };
 
@@ -246,18 +239,17 @@ export function createBootstrapCommandActions(
     },
     exit: () => unwiredShellAction('exit'),
     reloadSystemPrompt: loadSystemPrompt,
-    showPanel,
     openMcpWorkspace: () => unwiredShellAction('openMcpWorkspace'),
     openAgentWorkspace: () => unwiredShellAction('openAgentWorkspace'),
     dismissAgentWorkspace: () => unwiredShellAction('dismissAgentWorkspace'),
     openSecurityPanel: () => {
-      showPanel('security');
+      pointToWorkspace('Security review');
     },
     openKnowledgePanel: () => {
-      showPanel('knowledge');
+      pointToWorkspace('Knowledge');
     },
     openSubscriptionPanel: () => {
-      showPanel('subscription');
+      pointToWorkspace('Provider subscriptions');
     },
   };
 }
@@ -295,7 +287,7 @@ export function createBootstrapCommandProviderSection(
 export function createBootstrapCommandWorkspaceSection(
   options: Pick<
     BootstrapCommandSectionOptions,
-    'keybindingsManager' | 'fileUndoManager' | 'panelManager' | 'profileManager' | 'bookmarkManager'
+    'keybindingsManager' | 'fileUndoManager' | 'profileManager' | 'bookmarkManager'
     | 'processManager' | 'projectPlanningService' | 'projectPlanningProjectId' | 'workPlanStore'
   >,
   shellServices: BootstrapCommandShellServices,
@@ -303,7 +295,6 @@ export function createBootstrapCommandWorkspaceSection(
   return {
     keybindingsManager: options.keybindingsManager,
     fileUndoManager: options.fileUndoManager,
-    panelManager: options.panelManager,
     processManager: options.processManager,
     profileManager: options.profileManager,
     bookmarkManager: options.bookmarkManager,

package/src/runtime/bootstrap-core.ts

@@ -6,8 +6,8 @@ import { getProviderIdFromModel } from '../config/provider-model.ts';
 import { ToolRegistry } from '@pellux/goodvibes-sdk/platform/tools';
 import { registerAllTools } from '@pellux/goodvibes-sdk/platform/tools';
 import { PermissionManager, createPermissionConfigReader } from '@pellux/goodvibes-sdk/platform/permissions';
-import { Notifier } from '@pellux/goodvibes-sdk/platform/integrations';
-import { WebhookNotifier } from '@pellux/goodvibes-sdk/platform/integrations';
+import { Notifier, WebhookNotifier } from '@pellux/goodvibes-sdk/platform/integrations';
+
 import { Compositor } from '../renderer/compositor.ts';
 import type { PermissionRequestHandler } from '@pellux/goodvibes-sdk/platform/permissions';
 import type { SystemMessageRouter } from '../core/system-message-router.ts';
@@ -94,6 +94,26 @@ export interface BootstrapCoreState {
 
 export type CompanionMessagePayload = Extract<SessionEvent, { type: 'COMPANION_MESSAGE_RECEIVED' }>;
 
+/**
+ * Registers the webhook notifier for the runtime session.
+ *
+ * Configures the provided WebhookNotifier with the given URL list, attaches it
+ * to the runtime bus so it receives SESSION_NOTIFICATION events, and pushes a
+ * detach() cleanup into runtimeUnsubs for shutdown. When webhookUrls is empty
+ * this function is a complete no-op.
+ */
+export function registerWebhookNotifier(
+  webhookNotifier: WebhookNotifier,
+  webhookUrls: string[],
+  runtimeBus: RuntimeEventBus,
+  runtimeUnsubs: Array<() => void>,
+): void {
+  if (webhookUrls.length === 0) return;
+  webhookNotifier.setUrls(webhookUrls);
+  webhookNotifier.attachToRuntimeBus(runtimeBus);
+  runtimeUnsubs.push(() => webhookNotifier.detach());
+}
+
 export function companionMessageToOrchestratorInputOptions(
   payload: CompanionMessagePayload,
 ): OrchestratorUserInputOptions {
@@ -161,7 +181,7 @@ export async function initializeBootstrapCore(
     sessionId: userSessionId,
     authenticatedAt: Date.now(),
     lastSeenAt: Date.now(),
-    capabilities: ['session', 'panels', 'commands', 'automation'],
+    capabilities: ['session', 'commands', 'automation'],
     metadata: {
       product: 'goodvibes-agent',
       surfaceRoot: GOODVIBES_AGENT_SURFACE_ROOT,
@@ -176,7 +196,6 @@ export async function initializeBootstrapCore(
     hookDispatcher,
     hookWorkbench,
     memoryStore,
-    panelManager,
     routeBindings,
     sessionBroker: sharedSessionBroker,
     surfaceRegistry,
@@ -215,13 +234,7 @@ export async function initializeBootstrapCore(
     getControlPlaneRecentEvents,
   });
 
-  const conversation = new ConversationManager(() => {
-    const width = getTerminalSize(stdout).width;
-    if (panelManager.isVisible() && panelManager.getAllOpen().length > 0) {
-      return Math.max(1, panelManager.getLeftWidth(width) - 1);
-    }
-    return width;
-  });
+  const conversation = new ConversationManager(() => getTerminalSize(stdout).width);
   conversation.setConfigManager(configManager);
   getConversationTitle = () => conversation.title;
 
@@ -321,6 +334,11 @@ export async function initializeBootstrapCore(
   });
 
   const bootstrapUnsubs: Array<() => void> = [];
+  // D5 fix: stop the heartbeat watcher on shutdown so the setInterval is cleared.
+  // Registered here (after declaration) rather than inside the watcher block above.
+  if (configManager.get('watchers.enabled')) {
+    bootstrapUnsubs.push(() => watcherRegistry.stopWatcher('runtime-heartbeat'));
+  }
   await memoryStore.init();
   bootstrapUnsubs.push(() => {
     void memoryStore.save();
@@ -420,8 +438,11 @@ export async function initializeBootstrapCore(
 
   const webhookUrls = (configManager.getCategory('notifications') as { webhookUrls?: string[] }).webhookUrls ?? [];
   if (webhookUrls.length > 0) {
-    const webhookNotifier = WebhookNotifier.fromConfig(webhookUrls);
-    webhookNotifier.attachToRuntimeBus(runtimeBus);
+    // Reuse the services.webhookNotifier instance (constructed no-arg in services.ts).
+    // Configure it with the resolved URL list via setUrls(), attach it to the runtime
+    // bus so it receives SESSION_NOTIFICATION events, and register detach() in
+    // runtimeUnsubs so the bus subscription is cleaned up on shutdown.
+    registerWebhookNotifier(services.webhookNotifier, webhookUrls, runtimeBus, runtimeUnsubs);
     domainDispatch.syncIntegration({
       id: 'webhooks',
       displayName: 'Webhooks',

package/src/runtime/bootstrap-hook-bridge.ts

@@ -52,9 +52,11 @@ export function createResumeSessionHandler(options: ResumeSessionOptions): (sess
       options.writeLastSessionPointer(sessionId);
       void options.sharedSessionBroker.reopenSession(sessionId).catch((err) => { logger.debug('session broker reopen session failed', { err }); });
       options.conversation.log(`Resumed session: ${sessionId}`, { fg: '135' });
-      const ignoredPanels = meta.returnContext?.openPanels?.slice(0, 4) ?? [];
       const returnContextMode = getReturnContextMode(options.configManager);
       if (returnContextMode !== 'off' && meta.returnContext) {
+        // N1 fix: compute ignoredPanels inside the guard so it is only evaluated
+        // when returnContext is present and the mode is not 'off'.
+        const ignoredPanels = meta.returnContext.openPanels?.slice(0, 4) ?? [];
         for (const line of formatReturnContextForDisplay(meta.returnContext)) {
           if (line.startsWith('Open panels:')) continue;
           options.conversation.log(`Resume: ${line}`, { fg: '244' });

package/src/runtime/bootstrap-shell.ts

@@ -13,8 +13,7 @@ import { CommandRegistry } from '../input/command-registry.ts';
 import { registerBuiltinCommands } from '../input/commands.ts';
 import { InputHistory } from '../input/input-history.ts';
 import type { PermissionRequestHandler } from '@pellux/goodvibes-sdk/platform/permissions';
-import { registerBuiltinPanels } from '../panels/builtin-panels.ts';
-import { SystemMessagesPanel } from '../panels/system-messages-panel.ts';
+import { ActivityFeed } from '../core/activity-feed.ts';
 import { createSystemMessageRouter, type SystemMessageRouter } from '../core/system-message-router.ts';
 import { getConfigSnapshot } from '../config/index.ts';
 import { createBootstrapCommandContext } from './bootstrap-command-context.ts';
@@ -24,7 +23,6 @@ import { loadBootstrapSystemPrompt } from '@/runtime/index.ts';
 import { createShellPlanRuntime, createShellRemoteCommandService } from '@/runtime/index.ts';
 import { createRuntimeFoundationClients } from '@/runtime/index.ts';
 import type { ControlPlaneRecentEvent } from '@pellux/goodvibes-sdk/platform/control-plane';
-import type { BuiltinPanelDeps } from '../panels/builtin/shared.ts';
 import type { ToolRegistry } from '@pellux/goodvibes-sdk/platform/tools';
 import type { ForensicsRegistry } from '@/runtime/index.ts';
 import type { PolicyRuntimeState } from '@/runtime/index.ts';
@@ -125,7 +123,7 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     completeModelSelectionSideEffect,
   } = options;
 
-  const systemMessagesPanel = new SystemMessagesPanel(configManager, services.componentHealthMonitor);
+  const activityFeed = new ActivityFeed();
   const resumeSession = createResumeSessionHandler({
     runtimeBus,
     runtime,
@@ -141,54 +139,10 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
   });
 
   let commandContextRef: CommandContext | null = null;
-  registerBuiltinPanels(services.panelManager, {
-    configManager,
-    getOrchestratorUsage: () => orchestrator.usage as { input: number; output: number; cacheRead: number; cacheWrite: number; model?: string },
-    toolRegistry,
-    providerRegistry: services.providerRegistry,
-    contextWindow: services.providerRegistry.getContextWindowForModel(services.providerRegistry.getCurrentModel()),
-    orchestrator,
-    getCtxWindow: () => services.providerRegistry.getContextWindowForModel(services.providerRegistry.getCurrentModel()),
-    resumeSession,
-    requestRender,
-    submitPlanningAnswer: (answer) => {
-      submitPlanningAnswerWithShellFallback(answer, {
-        getSubmitInput: () => commandContextRef?.submitInput,
-        addSystemMessage: (message) => conversation.addSystemMessage(message),
-        requestRender,
-      });
-    },
-    dismissPlanning: () => {
-      services.panelManager.close('project-planning');
-      commandContextRef?.focusPrompt?.();
-      requestRender();
-    },
-    forensicsRegistry,
-    policyRuntimeState,
-    approvalBroker: services.approvalBroker,
-    sessionBroker: services.sessionBroker,
-    automationManager: services.automationManager,
-    getControlPlaneRecentEvents,
-    tokenAuditor: services.tokenAuditor,
-    componentHealthMonitor: services.componentHealthMonitor,
-    worktreeRegistry: services.worktreeRegistry,
-    sandboxSessionRegistry: services.sandboxSessionRegistry,
-    systemMessagesPanel,
-    memoryRegistry: services.memoryRegistry,
-    agentKnowledgeService: services.agentKnowledgeService,
-    uiServices,
-    pluginManager: services.pluginManager,
-    hookDispatcher: services.hookDispatcher,
-    hookActivityTracker: services.hookActivityTracker,
-    hookWorkbench: services.hookWorkbench,
-    mcpRegistry: services.mcpRegistry,
-    connectedHostTokenDir: join(services.homeDirectory, '.goodvibes', 'daemon'),
-  });
-  services.panelManager.prewarmRegistered();
 
   const systemMessageRouter = createSystemMessageRouter(
     conversation,
-    systemMessagesPanel,
+    activityFeed,
     (kind) => {
       const ui = getConfigSnapshot(configManager).ui;
       if (kind === 'wrfc') return ui.wrfcMessages;
@@ -287,7 +241,6 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     mcpApi,
     opsApi,
     directTransport,
-    panelManager: services.panelManager,
     worktreeRegistry: services.worktreeRegistry,
     sandboxSessionRegistry: services.sandboxSessionRegistry,
     loadSystemPrompt: () => loadBootstrapSystemPrompt(configManager),