@pellux/goodvibes-agent 0.1.116 → 1.0.0

package/src/renderer/mcp-workspace.ts

@@ -1,4 +1,4 @@
-import type { McpWorkspace, McpWorkspaceRow } from '../input/mcp-workspace.ts';
+import type { McpWorkspace, McpWorkspaceRow, McpWorkspaceServerRow } from '../input/mcp-workspace.ts';
 import type { Line } from '../types/grid.ts';
 import { wrapText } from '../utils/terminal-width.ts';
 import { GLYPHS } from './ui-primitives.ts';
@@ -11,6 +11,117 @@ import {
   type WorkspaceRow,
 } from './fullscreen-workspace.ts';
 
+const MCP_WORKSPACE_TITLE = 'MCP Workspace / Servers';
+const MCP_WORKSPACE_LEFT_HEADER = 'Servers';
+const MCP_WORKSPACE_GROUP_SERVERS = 'SERVERS';
+const MCP_WORKSPACE_GROUP_ACTIONS = 'ACTIONS';
+const MCP_WORKSPACE_NO_CONFIGURED_SERVERS = '  No configured servers';
+const MCP_WORKSPACE_FORM_WRITE_CONFIRMATION = 'Workspace writes require explicit confirmation. Type yes on the Confirm field, then save from here.';
+const MCP_WORKSPACE_FORM_CONFIG_LOCATIONS = 'Project/global config locations are shown for review. The workspace dispatches confirmed MCP changes through the TUI command router.';
+const MCP_WORKSPACE_REMOVE_HELP = 'Press Enter or y to remove through the TUI command router.';
+const MCP_WORKSPACE_REMOVE_CANCEL_HELP = 'Press n or Esc to return without changing config.';
+const MCP_WORKSPACE_RELOAD_TITLE = 'Reload MCP runtime';
+const MCP_WORKSPACE_RELOAD_HELP = 'Press Enter or y to reload MCP runtime from the current config through the TUI command router.';
+const MCP_WORKSPACE_RELOAD_CANCEL_HELP = 'Press n or Esc to return without reloading.';
+const MCP_WORKSPACE_NO_ROWS = 'No MCP rows available.';
+const MCP_WORKSPACE_RUNTIME_ONLY_COMMAND = '(runtime only; no launch config found)';
+const MCP_WORKSPACE_NONE = '(none)';
+const MCP_WORKSPACE_STATUS_PREFIX = 'Status:';
+const MCP_WORKSPACE_FORM_HEADER_FIELD = 'Field';
+const MCP_WORKSPACE_FORM_HEADER_VALUE = 'Value';
+const MCP_WORKSPACE_FORM_HEADER_EDIT = 'Edit';
+const MCP_WORKSPACE_FORM_TEXT_EDIT = 'text';
+const MCP_WORKSPACE_FORM_ACTION_EDIT = 'cycle/action';
+const MCP_WORKSPACE_EMPTY_VALUE = '(empty)';
+const MCP_WORKSPACE_TOOL_HEADER_TOOL = 'Tool';
+const MCP_WORKSPACE_TOOL_HEADER_SERVER = 'Server';
+const MCP_WORKSPACE_TOOL_HEADER_DESCRIPTION = 'Description';
+const MCP_WORKSPACE_TOOLS_LOADING = 'Tools: loading...';
+const MCP_WORKSPACE_TOOLS_LOADING_DETAIL = 'Loading tool list from connected MCP servers.';
+const MCP_WORKSPACE_TOOLS_EMPTY = 'No tools cached for the selected server. Press t to refresh.';
+const MCP_WORKSPACE_CONFIRM_CANCEL_ROW = '  Cancel and return to MCP server browser';
+const MCP_WORKSPACE_CONFIRM_RELOAD = 'Confirm MCP runtime reload';
+const MCP_WORKSPACE_FOOTER_FORM = 'Focus MCP server form · Up/Down field · Left/Right cycle · Type edit · Enter save/cancel · Esc back';
+const MCP_WORKSPACE_FOOTER_DELETE = 'Focus remove confirmation · Enter/y remove · n/Esc cancel';
+const MCP_WORKSPACE_FOOTER_RELOAD = 'Focus reload confirmation · Enter/y reload · n/Esc cancel';
+const MCP_WORKSPACE_FOOTER_BROWSE = 'Focus MCP workspace · Up/Down choose · Enter view/action · a add · d remove · r reload · t tools · Esc close';
+
+function mcpWorkspaceStateLabel(mode: McpWorkspace['mode']): string {
+  return mode === 'browse' ? 'Browse' : mode === 'form' ? 'Server Form' : mode === 'delete-confirm' ? 'Remove Confirm' : 'Reload Confirm';
+}
+
+function mcpWorkspaceMainHeader(mode: McpWorkspace['mode'], connected: string | number, servers: string | number, tools: string | number): string {
+  if (mode === 'form') return 'MCP server form';
+  if (mode === 'delete-confirm') return 'MCP remove confirmation';
+  if (mode === 'reload-confirm') return 'MCP reload confirmation';
+  return `Servers ${connected}/${servers} connected · Tools ${tools}`;
+}
+
+function mcpWorkspaceToolsLabel(loading: boolean, server: string | undefined, count: string | number): string {
+  if (loading) return MCP_WORKSPACE_TOOLS_LOADING;
+  return server ? `Tools for ${server}: ${count}` : `Tools: ${count}`;
+}
+
+export function renderMcpWorkspacePackageText(): string {
+  return [
+    MCP_WORKSPACE_TITLE,
+    MCP_WORKSPACE_LEFT_HEADER,
+    mcpWorkspaceStateLabel('browse'),
+    mcpWorkspaceStateLabel('form'),
+    mcpWorkspaceStateLabel('delete-confirm'),
+    mcpWorkspaceStateLabel('reload-confirm'),
+    mcpWorkspaceMainHeader('browse', '<connected>', '<servers>', '<tools>'),
+    mcpWorkspaceMainHeader('form', '<connected>', '<servers>', '<tools>'),
+    mcpWorkspaceMainHeader('delete-confirm', '<connected>', '<servers>', '<tools>'),
+    mcpWorkspaceMainHeader('reload-confirm', '<connected>', '<servers>', '<tools>'),
+    MCP_WORKSPACE_GROUP_SERVERS,
+    MCP_WORKSPACE_GROUP_ACTIONS,
+    MCP_WORKSPACE_NO_CONFIGURED_SERVERS.trim(),
+    'project config',
+    'global config',
+    'external config',
+    'runtime',
+    'Drafting an MCP server',
+    'Editing server <server>',
+    MCP_WORKSPACE_FORM_WRITE_CONFIRMATION,
+    MCP_WORKSPACE_FORM_CONFIG_LOCATIONS,
+    'Remove server: <server>',
+    MCP_WORKSPACE_REMOVE_HELP,
+    MCP_WORKSPACE_REMOVE_CANCEL_HELP,
+    MCP_WORKSPACE_RELOAD_TITLE,
+    MCP_WORKSPACE_RELOAD_HELP,
+    MCP_WORKSPACE_RELOAD_CANCEL_HELP,
+    MCP_WORKSPACE_NO_ROWS,
+    'Connected: <yes-no>    Origin: <origin>    Config: <freshness>',
+    'Role: <role>    Review policy: <trust-mode>',
+    `Command: ${MCP_WORKSPACE_RUNTIME_ONLY_COMMAND}`,
+    `Allowed paths: ${MCP_WORKSPACE_NONE}`,
+    `Allowed hosts: ${MCP_WORKSPACE_NONE}`,
+    `${MCP_WORKSPACE_STATUS_PREFIX} <status>`,
+    MCP_WORKSPACE_FORM_HEADER_FIELD,
+    MCP_WORKSPACE_FORM_HEADER_VALUE,
+    MCP_WORKSPACE_FORM_HEADER_EDIT,
+    MCP_WORKSPACE_FORM_TEXT_EDIT,
+    MCP_WORKSPACE_FORM_ACTION_EDIT,
+    MCP_WORKSPACE_EMPTY_VALUE,
+    mcpWorkspaceToolsLabel(true, undefined, '<count>'),
+    mcpWorkspaceToolsLabel(false, '<server>', '<count>'),
+    mcpWorkspaceToolsLabel(false, undefined, '<count>'),
+    MCP_WORKSPACE_TOOL_HEADER_TOOL,
+    MCP_WORKSPACE_TOOL_HEADER_SERVER,
+    MCP_WORKSPACE_TOOL_HEADER_DESCRIPTION,
+    MCP_WORKSPACE_TOOLS_LOADING_DETAIL,
+    MCP_WORKSPACE_TOOLS_EMPTY,
+    'Confirm remove <server>',
+    MCP_WORKSPACE_CONFIRM_RELOAD,
+    MCP_WORKSPACE_CONFIRM_CANCEL_ROW.trim(),
+    MCP_WORKSPACE_FOOTER_FORM,
+    MCP_WORKSPACE_FOOTER_DELETE,
+    MCP_WORKSPACE_FOOTER_RELOAD,
+    MCP_WORKSPACE_FOOTER_BROWSE,
+  ].join('\n');
+}
+
 function statusColor(text: string): string {
   if (text.includes('failed') || text.includes('Save failed') || text.includes('Remove failed')) return PALETTE.bad;
   if (text.includes('attention') || text.includes('quarantine')) return PALETTE.warn;
@@ -21,15 +132,28 @@ function connectedColor(connected: boolean): string {
   return connected ? PALETTE.good : PALETTE.warn;
 }
 
+function serverOriginLabel(source: McpWorkspaceServerRow['source']): string {
+  switch (source) {
+    case 'project':
+      return 'project config';
+    case 'global':
+      return 'global config';
+    case 'external':
+      return 'external config';
+    case 'runtime':
+      return 'runtime';
+  }
+}
+
 function rowLabel(row: McpWorkspaceRow): string {
-  if (row.type === 'server') return `${row.server.name} (${row.server.source})`;
+  if (row.type === 'server') return `${row.server.name} (${serverOriginLabel(row.server.source)})`;
   return row.label;
 }
 
 function rowDetail(row: McpWorkspaceRow): string {
   if (row.type === 'server') {
     const server = row.server;
-    return `${server.connected ? 'connected' : 'offline'} · ${server.role} · ${server.trustMode} · schema ${server.freshness}`;
+    return `${server.connected ? 'connected' : 'offline'} · ${server.role} · ${server.trustMode} · config ${server.freshness}`;
   }
   return row.detail;
 }
@@ -42,13 +166,13 @@ function buildLeftRows(workspace: McpWorkspace, height: number): WorkspaceRow[]
 
   workspace.rows.forEach((row, rowIndex) => {
     if (row.type === 'server' && !sawServerGroup) {
-      rendered.push({ text: 'SERVERS', kind: 'group', bold: true });
+      rendered.push({ text: MCP_WORKSPACE_GROUP_SERVERS, kind: 'group', bold: true });
       sawServerGroup = true;
     }
     if (row.type === 'action' && !sawActionGroup) {
-      if (!sawServerGroup) rendered.push({ text: 'SERVERS', kind: 'group', bold: true });
-      if (workspace.servers.length === 0) rendered.push({ text: '  No configured servers', kind: 'item', fg: PALETTE.dim, dim: true });
-      rendered.push({ text: 'ACTIONS', kind: 'group', bold: true });
+      if (!sawServerGroup) rendered.push({ text: MCP_WORKSPACE_GROUP_SERVERS, kind: 'group', bold: true });
+      if (workspace.servers.length === 0) rendered.push({ text: MCP_WORKSPACE_NO_CONFIGURED_SERVERS, kind: 'item', fg: PALETTE.dim, dim: true });
+      rendered.push({ text: MCP_WORKSPACE_GROUP_ACTIONS, kind: 'group', bold: true });
       sawActionGroup = true;
     }
 
@@ -82,41 +206,47 @@ function selectedDetailLines(workspace: McpWorkspace, width: number): WorkspaceR
   if (workspace.mode === 'form') {
     const field = workspace.formFields[workspace.formIndex];
     lines.push(
-      workspace.editingServerName ? `Previewing server: ${workspace.editingServerName}` : 'Drafting an MCP server command',
-      'Workspace writes/reloads are blocked. Use the generated /mcp add ... --yes command from the prompt.',
+      workspace.editingServerName ? `Editing server ${workspace.editingServerName}` : 'Drafting an MCP server',
+      MCP_WORKSPACE_FORM_WRITE_CONFIRMATION,
       field ? `${field.label}: ${field.help}` : '',
-      'Project/global config locations are shown for review. This workspace does not write or reload MCP config.',
+      MCP_WORKSPACE_FORM_CONFIG_LOCATIONS,
     );
   } else if (workspace.mode === 'delete-confirm') {
     lines.push(
-      `Removal blocked for server: ${workspace.editingServerName ?? '(unknown)'}`,
-      'Use /mcp remove <server> --scope <project|global> --yes from the prompt for explicit removal.',
-      'Press n or Esc to return.',
+      `Remove server: ${workspace.editingServerName ?? '(unknown)'}`,
+      MCP_WORKSPACE_REMOVE_HELP,
+      MCP_WORKSPACE_REMOVE_CANCEL_HELP,
+    );
+  } else if (workspace.mode === 'reload-confirm') {
+    lines.push(
+      MCP_WORKSPACE_RELOAD_TITLE,
+      MCP_WORKSPACE_RELOAD_HELP,
+      MCP_WORKSPACE_RELOAD_CANCEL_HELP,
     );
   } else {
     const selected = workspace.selectedRow;
-    if (!selected) lines.push('No MCP rows available.');
+    if (!selected) lines.push(MCP_WORKSPACE_NO_ROWS);
     else if (selected.type === 'action') lines.push(selected.label, selected.detail);
     else {
       const server = selected.server;
       lines.push(
         server.name,
-        `Connected: ${server.connected ? 'yes' : 'no'}    Source: ${server.source}    Schema: ${server.freshness}`,
-        `Role: ${server.role}    Trust: ${server.trustMode}`,
-        `Command: ${server.command ? `${server.command}${server.args?.length ? ` ${server.args.join(' ')}` : ''}` : '(runtime only; no launch config found)'}`,
-        `Allowed paths: ${server.allowedPaths.length > 0 ? server.allowedPaths.join(', ') : '(none)'}`,
-        `Allowed hosts: ${server.allowedHosts.length > 0 ? server.allowedHosts.join(', ') : '(none)'}`,
+        `Connected: ${server.connected ? 'yes' : 'no'}    Origin: ${serverOriginLabel(server.source)}    Config: ${server.freshness}`,
+        `Role: ${server.role}    Review policy: ${server.trustMode}`,
+        `Command: ${server.command ? `${server.command}${server.args?.length ? ` ${server.args.join(' ')}` : ''}` : MCP_WORKSPACE_RUNTIME_ONLY_COMMAND}`,
+        `Allowed paths: ${server.allowedPaths.length > 0 ? server.allowedPaths.join(', ') : MCP_WORKSPACE_NONE}`,
+        `Allowed hosts: ${server.allowedHosts.length > 0 ? server.allowedHosts.join(', ') : MCP_WORKSPACE_NONE}`,
         ...(server.quarantineReason ? [`Quarantine: ${server.quarantineReason}${server.quarantineDetail ? ` - ${server.quarantineDetail}` : ''}`] : []),
       );
     }
   }
 
-  lines.push('', `Status: ${workspace.status}`);
+  lines.push('', `${MCP_WORKSPACE_STATUS_PREFIX} ${workspace.status}`);
   return lines.flatMap((text, index): WorkspaceRow[] => {
     if (text === '') return [{ text: '', dim: true }];
     return wrapText(text, Math.max(1, width)).map((wrapped, wrapIndex): WorkspaceRow => ({
       text: wrapped,
-      fg: index === 0 ? PALETTE.title : text.startsWith('Status:') ? statusColor(workspace.status) : PALETTE.text,
+      fg: index === 0 ? PALETTE.title : text.startsWith(MCP_WORKSPACE_STATUS_PREFIX) ? statusColor(workspace.status) : PALETTE.text,
       bold: index === 0 && wrapIndex === 0,
       dim: text.length === 0,
     }));
@@ -129,7 +259,7 @@ function buildFormRows(workspace: McpWorkspace, width: number, height: number):
   const labelWidth = Math.min(24, Math.max(14, Math.floor(width * 0.24)));
   const valueWidth = Math.max(12, width - labelWidth - 20);
   rows.push({
-    text: `  ${padDisplay('Field', labelWidth)}  ${padDisplay('Value', valueWidth)}  ${padDisplay('Edit', 10)}`,
+    text: `  ${padDisplay(MCP_WORKSPACE_FORM_HEADER_FIELD, labelWidth)}  ${padDisplay(MCP_WORKSPACE_FORM_HEADER_VALUE, valueWidth)}  ${padDisplay(MCP_WORKSPACE_FORM_HEADER_EDIT, 10)}`,
     fg: PALETTE.muted,
     bold: true,
   });
@@ -143,9 +273,9 @@ function buildFormRows(workspace: McpWorkspace, width: number, height: number):
     const marker = selected ? GLYPHS.navigation.selected : ' ';
     const value = field.id === 'save' || field.id === 'cancel'
       ? field.help
-      : field.value.length > 0 ? field.value : '(empty)';
+      : field.value.length > 0 ? field.value : MCP_WORKSPACE_EMPTY_VALUE;
     rows.push({
-      text: `${marker} ${padDisplay(field.label, labelWidth)}  ${padDisplay(value, valueWidth)}  ${padDisplay(field.editable ? 'text' : 'cycle/action', 12)}`,
+      text: `${marker} ${padDisplay(field.label, labelWidth)}  ${padDisplay(value, valueWidth)}  ${padDisplay(field.editable ? MCP_WORKSPACE_FORM_TEXT_EDIT : MCP_WORKSPACE_FORM_ACTION_EDIT, 12)}`,
       selected,
       fg: field.id === 'save' ? PALETTE.good : field.id === 'cancel' ? PALETTE.warn : field.editable ? PALETTE.text : PALETTE.info,
       bold: selected,
@@ -162,19 +292,15 @@ function buildToolRows(workspace: McpWorkspace, width: number, height: number):
   const toolWidth = Math.min(36, Math.max(18, Math.floor(width * 0.34)));
   const serverWidth = Math.min(24, Math.max(12, Math.floor(width * 0.20)));
   const descriptionWidth = Math.max(12, width - toolWidth - serverWidth - 8);
-  const label = workspace.loadingTools
-    ? 'Tools: loading...'
-    : server
-      ? `Tools for ${server}: ${tools.length}`
-      : `Tools: ${tools.length}`;
+  const label = mcpWorkspaceToolsLabel(workspace.loadingTools, server, tools.length);
   const rows: WorkspaceRow[] = [
     { text: label, fg: PALETTE.subtitle, bold: true },
-    { text: `  ${padDisplay('Tool', toolWidth)}  ${padDisplay('Server', serverWidth)}  ${padDisplay('Description', descriptionWidth)}`, fg: PALETTE.muted, bold: true },
+    { text: `  ${padDisplay(MCP_WORKSPACE_TOOL_HEADER_TOOL, toolWidth)}  ${padDisplay(MCP_WORKSPACE_TOOL_HEADER_SERVER, serverWidth)}  ${padDisplay(MCP_WORKSPACE_TOOL_HEADER_DESCRIPTION, descriptionWidth)}`, fg: PALETTE.muted, bold: true },
   ];
 
   if (tools.length === 0) {
     rows.push({
-      text: workspace.loadingTools ? 'Loading tool list from connected MCP servers.' : 'No tools cached for the selected server. Press t to refresh.',
+      text: workspace.loadingTools ? MCP_WORKSPACE_TOOLS_LOADING_DETAIL : MCP_WORKSPACE_TOOLS_EMPTY,
       fg: PALETTE.muted,
       dim: true,
     });
@@ -194,7 +320,16 @@ function buildToolRows(workspace: McpWorkspace, width: number, height: number):
 function buildDeleteRows(workspace: McpWorkspace, height: number): WorkspaceRow[] {
   const rows: WorkspaceRow[] = [
     { text: `${GLYPHS.navigation.selected} Confirm remove ${workspace.editingServerName ?? '(unknown)'}`, selected: true, fg: PALETTE.bad, bold: true },
-    { text: '  Cancel and return to MCP server browser', fg: PALETTE.muted },
+    { text: MCP_WORKSPACE_CONFIRM_CANCEL_ROW, fg: PALETTE.muted },
+  ];
+  while (rows.length < height) rows.push({ text: '', kind: 'empty' });
+  return rows.slice(0, height);
+}
+
+function buildReloadRows(height: number): WorkspaceRow[] {
+  const rows: WorkspaceRow[] = [
+    { text: `${GLYPHS.navigation.selected} ${MCP_WORKSPACE_CONFIRM_RELOAD}`, selected: true, fg: PALETTE.warn, bold: true },
+    { text: MCP_WORKSPACE_CONFIRM_CANCEL_ROW, fg: PALETTE.muted },
   ];
   while (rows.length < height) rows.push({ text: '', kind: 'empty' });
   return rows.slice(0, height);
@@ -203,31 +338,29 @@ function buildDeleteRows(workspace: McpWorkspace, height: number): WorkspaceRow[
 function buildControlRows(workspace: McpWorkspace, width: number, height: number): WorkspaceRow[] {
   if (workspace.mode === 'form') return buildFormRows(workspace, width, height);
   if (workspace.mode === 'delete-confirm') return buildDeleteRows(workspace, height);
+  if (workspace.mode === 'reload-confirm') return buildReloadRows(height);
   return buildToolRows(workspace, width, height);
 }
 
 function footerText(workspace: McpWorkspace): string {
-  if (workspace.mode === 'form') return 'Focus server command preview · Up/Down field · Left/Right cycle · Type edit · Enter show command · Esc back';
-  if (workspace.mode === 'delete-confirm') return 'Focus remove guidance · n/Esc cancel';
-  return 'Focus MCP workspace · Up/Down choose · Enter view/action · a draft · d removal command · r reload command · t tools · Esc close';
+  if (workspace.mode === 'form') return MCP_WORKSPACE_FOOTER_FORM;
+  if (workspace.mode === 'delete-confirm') return MCP_WORKSPACE_FOOTER_DELETE;
+  if (workspace.mode === 'reload-confirm') return MCP_WORKSPACE_FOOTER_RELOAD;
+  return MCP_WORKSPACE_FOOTER_BROWSE;
 }
 
 export function renderMcpWorkspace(workspace: McpWorkspace, width: number, height: number): Line[] {
   const metrics = getFullscreenWorkspaceMetrics({ width, height });
   const connected = workspace.servers.filter((server) => server.connected).length;
-  const stateLabel = workspace.mode === 'browse' ? 'Browse' : workspace.mode === 'form' ? 'Command Preview' : 'Remove Guidance';
-  const mainHeader = workspace.mode === 'form'
-    ? 'MCP server command preview'
-    : workspace.mode === 'delete-confirm'
-      ? 'MCP remove command'
-      : `Servers ${connected}/${workspace.servers.length} connected · Tools ${workspace.tools.length}`;
+  const stateLabel = mcpWorkspaceStateLabel(workspace.mode);
+  const mainHeader = mcpWorkspaceMainHeader(workspace.mode, connected, workspace.servers.length, workspace.tools.length);
 
   return renderFullscreenWorkspace({
     width,
     height,
-    title: 'MCP Workspace / Servers',
+    title: MCP_WORKSPACE_TITLE,
     stateLabel,
-    leftHeader: 'Servers',
+    leftHeader: MCP_WORKSPACE_LEFT_HEADER,
     mainHeader,
     leftRows: buildLeftRows(workspace, metrics.bodyRows),
     contextRows: selectedDetailLines(workspace, metrics.contextWidth),

package/src/renderer/model-picker-overlay.ts

@@ -28,6 +28,22 @@ const MODE_TITLES: Record<string, string> = {
   contextCap: 'Set Context Window',
 };
 
+const CONTEXT_WINDOW_SOURCE_LABELS = {
+  provider_api: 'provider catalog',
+  configured_cap: 'configured limit',
+  fallback: 'default limit',
+  registry: 'model registry',
+} as const satisfies Readonly<Record<string, string>>;
+
+type ContextWindowSourceKey = keyof typeof CONTEXT_WINDOW_SOURCE_LABELS;
+
+function formatContextWindowSource(value: string | undefined): string {
+  const normalized = (value ?? '').trim().toLowerCase();
+  if (!normalized) return 'configured limit';
+  if (normalized in CONTEXT_WINDOW_SOURCE_LABELS) return CONTEXT_WINDOW_SOURCE_LABELS[normalized as ContextWindowSourceKey];
+  return normalized.replace(/[_-]+/g, ' ').replace(/\s+/g, ' ');
+}
+
 /**
  * Number of fixed chrome lines in the model-picker overlay (title + search + divider + detail×2 + footer).
  * Used by callers to compute maxVisible item rows.
@@ -42,6 +58,46 @@ function putRowText(line: Line, startX: number, maxWidth: number, text: string,
   putOverlayText(line, startX, maxWidth, text, { fg, bg, bold, dim });
 }
 
+export function renderModelPickerPackageText(): string {
+  return [
+    ...Object.values(MODE_TITLES),
+    'Search',
+    'Filter: All',
+    'Filter: Free',
+    'Filter: Paid',
+    'Filter: Sub',
+    'Group: provider',
+    'Group: family',
+    'Group: pricingTier',
+    'Group: qualityTier',
+    'No models available',
+    'No models match query',
+    'No providers available',
+    'No providers match query',
+    'Provider:',
+    'Context:',
+    'Reasoning:',
+    'Vision:',
+    'Tools:',
+    'Select a provider to browse its models',
+    'Context window (tokens):',
+    'Leave blank to use default',
+    'Model:',
+    'provider catalog',
+    'configured limit',
+    'default limit',
+    'model registry',
+    'configured via environment',
+    'configured via secret reference',
+    'configured via subscription',
+    'configured anonymously',
+    '[Up/Down] [Enter] [/] Search [Space] Ctx [Esc] [Tab] Filter [G] Group',
+    '[Enter] Confirm  [Esc] Cancel',
+    '[Up/Down] Nav  [Enter] Select  [Esc] Cancel',
+    ...Object.entries(EFFORT_DESCRIPTIONS).flatMap(([level, description]) => [level, description]),
+  ].join('\n');
+}
+
 /**
  * Render the model picker modal as Line[] for overlay in the viewport.
  * Handles model, provider, and effort modes.
@@ -240,7 +296,6 @@ export function renderModelPickerOverlay(
       if (caps.reasoning)  capParts.push('Reasoning: \u2713');
       if (caps.multimodal) capParts.push('Vision: \u2713');
       if (caps.toolCalling) capParts.push('Tools: \u2713');
-      if (caps.codeEditing) capParts.push('Code: \u2713');
       const capText = capParts.join('  ');
       const capLine = createOverlayContentLine(width, layout, borderFg, DEFAULT_OVERLAY_PALETTE.bodyBg);
       putRowText(capLine, layout.margin + 2, contentW, fitDisplay(truncateDisplay(capText, contentW), contentW), '244');
@@ -339,7 +394,7 @@ export function renderModelPickerOverlay(
     const capModel = picker.contextCapPendingModel;
     const modelName = capModel ? capModel.displayName : 'unknown';
     const currentCtx = capModel ? fmtContext(capModel.contextWindow) : '?';
-    const provenance = capModel?.contextWindowProvenance ?? 'configured_cap';
+    const sourceLabel = formatContextWindowSource(capModel?.contextWindowProvenance);
 
     const promptLabel = 'Context window (tokens):';
     const cursorChar = OVERLAY_GLYPHS.cursor;
@@ -350,7 +405,7 @@ export function renderModelPickerOverlay(
 
     lines.push(createOverlayContentLine(width, layout, borderFg, DEFAULT_OVERLAY_PALETTE.bodyBg));
 
-    const hintText = `Leave blank to use default (current: ${currentCtx}, source: ${provenance})`;
+    const hintText = `Leave blank to use default (current: ${currentCtx}, from ${sourceLabel})`;
     const hintTrunc = getDisplayWidth(hintText) > contentW
       ? hintText.slice(0, contentW - 3) + '...'
       : hintText;

package/src/renderer/model-workspace.ts

@@ -33,6 +33,31 @@ const PALETTE = {
 const renderCache = new WeakMap<ModelPickerModal, { key: string; lines: Line[] }>();
 const objectIds = new WeakMap<object, number>();
 let nextObjectId = 1;
+const MODEL_WORKSPACE_TITLE = ' Model Workspace / Providers And Models ';
+const MODEL_WORKSPACE_TARGETS_TITLE = 'Targets';
+const MODEL_WORKSPACE_MODE_LABELS = {
+  provider: 'Provider list',
+  model: 'Model list',
+  effort: 'Reasoning effort',
+  contextCap: 'Context cap',
+} as const;
+const MODEL_WORKSPACE_TABLE_HEADERS = {
+  provider: 'Provider                         Configuration       Catalog',
+  effort: 'Reasoning effort                 Meaning',
+  contextCap: 'Context cap input',
+  modelKey: 'Model key',
+  displayName: 'Display name',
+  providerColumn: 'Provider',
+  context: 'Context',
+  tier: 'Tier',
+  caps: 'Caps',
+} as const;
+const MODEL_WORKSPACE_REASONING_EFFORT_DETAIL = 'Reasoning effort applies to the main chat model. Select the default effort for this model.';
+const MODEL_WORKSPACE_CONTEXT_CAP_DETAIL = 'Context cap overrides the detected local-model context window for this selection.';
+const MODEL_WORKSPACE_CONTEXT_CAP_INPUT_HELP = 'Type digits to set a cap. Enter confirms; Esc returns to the model list.';
+const MODEL_WORKSPACE_FOOTER_SEARCH_ACTIVE = 'Typing filters search; Esc clears search';
+const MODEL_WORKSPACE_FOOTER_SEARCH_INACTIVE = '/ search';
+const MODEL_WORKSPACE_FOOTER_CONTROLS = 'Up/Down navigate • Left/Right pane • Enter select • <search> • Tab price • C caps • A available • B benchmark • G group • Esc close';
 
 function clamp(value: number, min: number, max: number): number {
   return Math.max(min, Math.min(max, value));
@@ -164,6 +189,65 @@ function targetLabelFor(target: string): string {
   return 'Main Chat';
 }
 
+function providerSelectionDetail(targetLabel: string): string {
+  return `Provider selection: choose a provider, then choose a model for ${targetLabel}.`;
+}
+
+function modelSelectionDetail(targetLabel: string): string {
+  return `Model selection: choose the model to store for ${targetLabel}. Use filters to narrow large catalogs.`;
+}
+
+function modelWorkspaceFilterText(
+  query: string,
+  price: string,
+  capability: string,
+  group: string,
+  availableOnly: string,
+): string {
+  return `Search: ${query} | Price: ${price} | Capability: ${capability} | Group: ${group} | Available only: ${availableOnly}`;
+}
+
+function modelWorkspaceFooterControls(searchHint: string): string {
+  return MODEL_WORKSPACE_FOOTER_CONTROLS.replace('<search>', searchHint);
+}
+
+export function renderModelWorkspacePackageText(): string {
+  return [
+    MODEL_WORKSPACE_TITLE.trim(),
+    MODEL_WORKSPACE_TARGETS_TITLE,
+    MODEL_WORKSPACE_MODE_LABELS.provider,
+    MODEL_WORKSPACE_MODE_LABELS.model,
+    MODEL_WORKSPACE_MODE_LABELS.effort,
+    MODEL_WORKSPACE_MODE_LABELS.contextCap,
+    'Target: <target> (<state>)',
+    'Current: <route>',
+    providerSelectionDetail('<target>'),
+    'Selected provider: <provider>',
+    modelSelectionDetail('<target>'),
+    'Selected: <model> | <display> | context <context> | <capabilities>',
+    MODEL_WORKSPACE_REASONING_EFFORT_DETAIL,
+    MODEL_WORKSPACE_CONTEXT_CAP_DETAIL,
+    modelWorkspaceFilterText('<query>', '<price>', '<capability>', '<group>', '<available-only>'),
+    MODEL_WORKSPACE_TABLE_HEADERS.provider,
+    MODEL_WORKSPACE_TABLE_HEADERS.effort,
+    MODEL_WORKSPACE_TABLE_HEADERS.contextCap,
+    MODEL_WORKSPACE_TABLE_HEADERS.modelKey,
+    MODEL_WORKSPACE_TABLE_HEADERS.displayName,
+    MODEL_WORKSPACE_TABLE_HEADERS.providerColumn,
+    MODEL_WORKSPACE_TABLE_HEADERS.context,
+    MODEL_WORKSPACE_TABLE_HEADERS.tier,
+    MODEL_WORKSPACE_TABLE_HEADERS.caps,
+    'Model: <model>',
+    'Detected context: <context>',
+    'Override: <cap>',
+    MODEL_WORKSPACE_CONTEXT_CAP_INPUT_HELP,
+    'Focus targets',
+    'Focus list',
+    modelWorkspaceFooterControls(MODEL_WORKSPACE_FOOTER_SEARCH_ACTIVE),
+    modelWorkspaceFooterControls(MODEL_WORKSPACE_FOOTER_SEARCH_INACTIVE),
+  ].join('\n');
+}
+
 function detailLines(picker: ModelPickerModal, width: number): string[] {
   const target = picker.getSelectedTargetInfo();
   const targetLabel = target?.label ?? targetLabelFor(picker.target);
@@ -174,26 +258,25 @@ function detailLines(picker: ModelPickerModal, width: number): string[] {
   if (target) lines.push(`Current: ${targetSummary(target)}`);
   if (picker.mode === 'provider') {
     const provider = picker.getFilteredProviders()[picker.selectedIndex] ?? '';
-    lines.push(`Provider selection: choose a provider, then choose a model for ${targetLabel}.`);
+    lines.push(providerSelectionDetail(targetLabel));
     if (provider) lines.push(`Selected provider: ${provider}`);
   } else if (picker.mode === 'model') {
-    lines.push(`Model selection: choose the model to store for ${targetLabel}. Use filters to narrow large catalogs.`);
+    lines.push(modelSelectionDetail(targetLabel));
     if (selected) {
       const caps = selected.capabilities ?? {};
       const capText = [
         caps.reasoning ? 'reasoning' : '',
         caps.multimodal ? 'vision' : '',
         caps.toolCalling ? 'tools' : '',
-        caps.codeEditing ? 'code' : '',
       ].filter(Boolean).join(', ') || 'standard';
       lines.push(`Selected: ${modelKey(selected)} | ${selected.displayName} | context ${formatContext(selected.contextWindow)} | ${capText}`);
     }
   } else if (picker.mode === 'effort') {
-    lines.push(`Reasoning effort applies to the main chat model. Select the default effort for this model.`);
+    lines.push(MODEL_WORKSPACE_REASONING_EFFORT_DETAIL);
   } else {
-    lines.push(`Context cap overrides the detected local-model context window for this selection.`);
+    lines.push(MODEL_WORKSPACE_CONTEXT_CAP_DETAIL);
   }
-  const filterText = `Search: ${picker.query || '(none)'} | Price: ${picker.categoryFilter} | Capability: ${picker.capabilityFilter} | Group: ${picker.groupBy} | Available only: ${picker.availableOnly ? 'yes' : 'no'}`;
+  const filterText = modelWorkspaceFilterText(picker.query || '(none)', picker.categoryFilter, picker.capabilityFilter, picker.groupBy, picker.availableOnly ? 'yes' : 'no');
   lines.push(filterText);
   return lines.flatMap((line) => wrapText(line, Math.max(1, width)));
 }
@@ -261,7 +344,6 @@ function renderModelRows(picker: ModelPickerModal, lines: Line[], rows: number,
       caps.reasoning ? 'R' : '-',
       caps.multimodal ? 'V' : '-',
       caps.toolCalling ? 'T' : '-',
-      caps.codeEditing ? 'C' : '-',
     ].join('');
     let x = startX + 1;
     writeText(line, x, 2, padDisplay(marker, 2), { fg: PALETTE.text, bg, bold: selected }); x += 2;
@@ -295,7 +377,7 @@ function renderContextCapRows(picker: ModelPickerModal, lines: Line[], rows: num
     `Model: ${model ? modelKey(model) : '(none)'}`,
     `Detected context: ${formatContext(model?.contextWindow)}`,
     `Override: ${input}`,
-    'Type digits to set a cap. Enter confirms; Esc returns to the model list.',
+    MODEL_WORKSPACE_CONTEXT_CAP_INPUT_HELP,
   ];
   for (let row = 0; row < Math.min(rows, copy.length); row += 1) {
     const line = lines[row]!;
@@ -308,15 +390,15 @@ function writeTableHeader(line: Line, picker: ModelPickerModal, startX: number,
   fillRange(line, startX, startX + width - 1, PALETTE.footerBg);
   const style = { fg: PALETTE.muted, bg: PALETTE.footerBg, bold: true };
   if (picker.mode === 'provider') {
-    writeText(line, startX + 1, width - 2, 'Provider                         Configuration       Catalog', style);
+    writeText(line, startX + 1, width - 2, MODEL_WORKSPACE_TABLE_HEADERS.provider, style);
     return;
   }
   if (picker.mode === 'effort') {
-    writeText(line, startX + 1, width - 2, 'Reasoning effort                 Meaning', style);
+    writeText(line, startX + 1, width - 2, MODEL_WORKSPACE_TABLE_HEADERS.effort, style);
     return;
   }
   if (picker.mode === 'contextCap') {
-    writeText(line, startX + 1, width - 2, 'Context cap input', style);
+    writeText(line, startX + 1, width - 2, MODEL_WORKSPACE_TABLE_HEADERS.contextCap, style);
     return;
   }
   const providerW = clamp(Math.floor(width * 0.14), 10, 18);
@@ -326,12 +408,12 @@ function writeTableHeader(line: Line, picker: ModelPickerModal, startX: number,
   const nameW = clamp(Math.floor(width * 0.28), 16, 36);
   const keyW = Math.max(10, width - providerW - ctxW - tierW - capsW - nameW - 10);
   let x = startX + 3;
-  writeText(line, x, keyW, padDisplay('Model key', keyW), style); x += keyW + 1;
-  writeText(line, x, nameW, padDisplay('Display name', nameW), style); x += nameW + 1;
-  writeText(line, x, providerW, padDisplay('Provider', providerW), style); x += providerW + 1;
-  writeText(line, x, ctxW, padDisplay('Context', ctxW), style); x += ctxW + 1;
-  writeText(line, x, tierW, padDisplay('Tier', tierW), style); x += tierW + 1;
-  writeText(line, x, capsW, padDisplay('Caps', capsW), style);
+  writeText(line, x, keyW, padDisplay(MODEL_WORKSPACE_TABLE_HEADERS.modelKey, keyW), style); x += keyW + 1;
+  writeText(line, x, nameW, padDisplay(MODEL_WORKSPACE_TABLE_HEADERS.displayName, nameW), style); x += nameW + 1;
+  writeText(line, x, providerW, padDisplay(MODEL_WORKSPACE_TABLE_HEADERS.providerColumn, providerW), style); x += providerW + 1;
+  writeText(line, x, ctxW, padDisplay(MODEL_WORKSPACE_TABLE_HEADERS.context, ctxW), style); x += ctxW + 1;
+  writeText(line, x, tierW, padDisplay(MODEL_WORKSPACE_TABLE_HEADERS.tier, tierW), style); x += tierW + 1;
+  writeText(line, x, capsW, padDisplay(MODEL_WORKSPACE_TABLE_HEADERS.caps, capsW), style);
 }
 
 export function renderModelWorkspace(picker: ModelPickerModal, width: number, viewportHeight: number): Line[] {
@@ -347,13 +429,13 @@ export function renderModelWorkspace(picker: ModelPickerModal, width: number, vi
   const contentW = Math.max(1, safeWidth - contentX - 1);
 
   const top = borderLine(safeWidth, GLYPHS.frame.topLeft, GLYPHS.frame.horizontal, GLYPHS.frame.topRight);
-  writeText(top, 2, safeWidth - 4, ' Model Workspace / Providers And Models ', { fg: PALETTE.title, bold: true });
+  writeText(top, 2, safeWidth - 4, MODEL_WORKSPACE_TITLE, { fg: PALETTE.title, bold: true });
   lines.push(top);
 
   const header = contentLine(safeWidth, PALETTE.footerBg);
-  writeText(header, 2, targetW - 2, 'Targets', { fg: PALETTE.subtitle, bold: true, bg: PALETTE.footerBg });
+  writeText(header, 2, targetW - 2, MODEL_WORKSPACE_TARGETS_TITLE, { fg: PALETTE.subtitle, bold: true, bg: PALETTE.footerBg });
   drawVertical(header, targetW, PALETTE.footerBg);
-  const modeLabel = picker.mode === 'provider' ? 'Provider list' : picker.mode === 'model' ? 'Model list' : picker.mode === 'effort' ? 'Reasoning effort' : 'Context cap';
+  const modeLabel = MODEL_WORKSPACE_MODE_LABELS[picker.mode];
   writeText(header, contentX + 1, contentW - 2, `${modeLabel}  •  ${picker.getItemCount()} item(s)`, { fg: PALETTE.subtitle, bold: true, bg: PALETTE.footerBg });
   lines.push(header);
 
@@ -402,8 +484,8 @@ export function renderModelWorkspace(picker: ModelPickerModal, width: number, vi
 
   const footer = contentLine(safeWidth, PALETTE.footerBg);
   const targetHint = picker.focusPane === 'targets' ? 'Focus targets' : 'Focus list';
-  const searchHint = picker.searchFocused ? 'Typing filters search; Esc clears search' : '/ search';
-  const hints = `${targetHint} • Up/Down navigate • Left/Right pane • Enter select • ${searchHint} • Tab price • C caps • A available • B benchmark • G group • Esc close`;
+  const searchHint = picker.searchFocused ? MODEL_WORKSPACE_FOOTER_SEARCH_ACTIVE : MODEL_WORKSPACE_FOOTER_SEARCH_INACTIVE;
+  const hints = `${targetHint} • ${modelWorkspaceFooterControls(searchHint)}`;
   writeText(footer, 2, safeWidth - 4, hints, { fg: PALETTE.muted, bg: PALETTE.footerBg });
   lines.push(footer);
   lines.push(borderLine(safeWidth, GLYPHS.frame.bottomLeft, GLYPHS.frame.horizontal, GLYPHS.frame.bottomRight));