@bahulam/code 0.1.6 → 0.1.8

package/src/terminal/repl-model-form.mjs

@@ -8,8 +8,15 @@
  * mode on, redraw in place with cursor-up + erase-down, restore on exit.
  */
 
-import { c } from './ansi.mjs';
+import { c, stripAnsi } from './ansi.mjs';
 import { fitAnsiLine, writeOverlayFrame, eraseOverlayFrame } from './repl-format.mjs';
+import {
+  cacheProfileLabel,
+  formatCategoryBadge,
+  isImageGenerationModel,
+  modelCategory,
+  modelDisplayCategory,
+} from './model-catalog-display.mjs';
 
 const DEFAULT_SENTINEL = '__default__';
 
@@ -20,10 +27,33 @@ function creditBadge(row) {
   return `~${credits < 10 ? credits.toFixed(1) : String(Math.round(credits))} cr/M`;
 }
 
+function formatTokenLimit(value, label) {
+  const n = Number(value);
+  if (!Number.isFinite(n) || n <= 0) return '';
+  if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1).replace(/\.0$/, '')}M ${label}`;
+  if (n >= 1_000) return `${Math.round(n / 1_000)}K ${label}`;
+  return `${Math.round(n)} ${label}`;
+}
+
+function optionRowsForRole(catalog, row) {
+  const curated = (catalog || []).filter(m => m?.harness_validated && m?.id);
+  const group = String(row?.optionGroup || 'text').toLowerCase();
+  if (group === 'image_analysis') {
+    return curated.filter(m => (
+      ['image', 'multimodal'].includes(modelCategory(m))
+      && !isImageGenerationModel(m)
+    ));
+  }
+  if (group === 'image_generation') {
+    return curated.filter(m => modelCategory(m) === 'image' && isImageGenerationModel(m));
+  }
+  return curated.filter(m => ['text', 'chat'].includes(modelCategory(m)));
+}
+
 /**
  * @param {object} opts
  * @param {object|null} opts.rl        readline instance to pause/resume
- * @param {Array}  opts.roles          [{ role, label, current, defaultLabel }]
+ * @param {Array}  opts.roles          [{ role, label, description, current, defaultLabel, optionGroup }]
  * @param {Array}  opts.catalog        raw /api/models rows (may be empty)
  * @param {Array}  [opts.fallbackIds]  model ids to cycle when no curated catalog
  * @param {string} [opts.unavailableNote] why the catalog is missing (shown in header)
@@ -33,25 +63,24 @@ export async function pickModelOverridesForm({ rl, roles, catalog, fallbackIds,
   if (!process.stdin.isTTY) return null;
   if (rl) rl.pause();
 
-  const curated = (catalog || []).filter(m => m?.harness_validated && m?.id);
-  const usingFallback = curated.length === 0;
-  const optionIds = usingFallback
-    ? [...new Set((fallbackIds || []).filter(Boolean))]
-    : curated.map(m => m.id);
-  const baseOptions = [DEFAULT_SENTINEL, ...optionIds];
-  const byId = new Map(curated.map(m => [m.id, m]));
+  const catalogRows = (catalog || []).filter(m => m?.harness_validated && m?.id);
+  const usingFallback = catalogRows.length === 0;
+  const byId = new Map(catalogRows.map(m => [m.id, m]));
 
   // Per-row option list; a current override that isn't in the curated list
   // is appended so it stays visible and selectable.
   const rows = roles.map(r => {
-    let opts = baseOptions;
+    const optionIds = usingFallback
+      ? [...new Set((fallbackIds || []).filter(Boolean))]
+      : optionRowsForRole(catalogRows, r).map(m => m.id);
+    let opts = [DEFAULT_SENTINEL, ...optionIds];
     let idx = 0;
     if (r.current) {
-      const found = baseOptions.indexOf(r.current);
+      const found = opts.indexOf(r.current);
       if (found >= 0) {
         idx = found;
       } else {
-        opts = [...baseOptions, r.current];
+        opts = [...opts, r.current];
         idx = opts.length - 1;
       }
     }
@@ -76,8 +105,38 @@ export async function pickModelOverridesForm({ rl, roles, catalog, fallbackIds,
       return `${c.brand(value)}${badge ? ` ${c.dim(badge)}` : ''}${flag}`;
     };
 
+    const valueDescription = (row) => {
+      const value = row.opts[row.idx];
+      if (value === DEFAULT_SENTINEL) {
+        return row.description || 'backend default for this role';
+      }
+      const meta = byId.get(value);
+      if (!meta) {
+        return usingFallback ? 'backend configured model' : 'custom override outside curated catalog';
+      }
+      const label = String(meta.label || '').trim();
+      const parts = [];
+      if (label && label !== value) parts.push(c.white(label));
+      if (meta.provider) parts.push(c.dim(String(meta.provider)));
+      const category = modelDisplayCategory(meta);
+      if (category) parts.push(formatCategoryBadge(category));
+      const context = formatTokenLimit(meta.context_length, 'ctx');
+      if (context) parts.push(c.dim(context));
+      const output = formatTokenLimit(meta.max_output, 'out');
+      if (output) parts.push(c.dim(output));
+      if (meta.supports_tools) parts.push(c.green('tools'));
+      if (meta.supports_reasoning) parts.push(c.yellow('reasoning'));
+      const cache = cacheProfileLabel(meta.cache_profile);
+      if (cache) parts.push(c.cyan(cache));
+      return parts.join(c.dim(' · '));
+    };
+
     const render = () => {
       const cols = Math.max(60, process.stderr.columns || 120);
+      const labelWidth = Math.min(
+        18,
+        Math.max(14, ...rows.map(row => stripAnsi(String(row.label || row.role)).length)),
+      );
       const lines = [];
       lines.push(`  ${c.bold('Models')} ${c.dim('· session overrides · curated platform catalog')}`);
       if (usingFallback) {
@@ -87,9 +146,17 @@ export async function pickModelOverridesForm({ rl, roles, catalog, fallbackIds,
       lines.push('');
       rows.forEach((row, i) => {
         const marker = i === cursor ? c.brand('▸') : ' ';
-        const rawLabel = String(row.label || row.role).padEnd(14, ' ');
+        const rawLabel = String(row.label || row.role).padEnd(labelWidth, ' ');
         const label = i === cursor ? c.brand(rawLabel) : rawLabel;
-        lines.push(fitAnsiLine(`  ${marker} ${label} ${c.dim('‹')} ${valueLabel(row)} ${c.dim('›')}`, cols - 1));
+        const prefix = `  ${marker} ${label} ${c.dim('‹')} `;
+        const suffix = ` ${c.dim('›')}`;
+        const descText = valueDescription(row);
+        const descMaxCols = Math.max(0, Math.min(72, cols - stripAnsi(prefix + suffix).length - 24));
+        const desc = descText && descMaxCols > 12
+          ? `  ${fitAnsiLine(descText, descMaxCols)}`
+          : '';
+        const maxValueCols = Math.max(18, cols - stripAnsi(prefix + suffix + desc).length - 1);
+        lines.push(fitAnsiLine(`${prefix}${fitAnsiLine(valueLabel(row), maxValueCols)}${suffix}${desc}`, cols - 1));
       });
       lines.push('');
       lines.push(fitAnsiLine(`  ${c.dim('↑↓ role · ←→ model · Enter apply · c defaults · Esc cancel')}`, cols - 1));

package/src/terminal/repl-render.mjs

@@ -21,6 +21,7 @@ import { paint } from '../ui/palette.mjs';
 import { runtime, session } from './repl-state.mjs';
 import { fitAnsiLine } from './repl-format.mjs';
 import { exploreCategory, isExploreTool } from './repl-explore.mjs';
+import { watchState } from './watch-state.mjs';
 import {
   clearPinnedStatus,
   drawPinnedStatus,
@@ -36,21 +37,50 @@ import * as queue from '../ui/render-queue.mjs';
 // Max inner-tool lines shown under the spinner during a sub-agent run.
 const SUB_AGENT_WINDOW_ROWS = 7;
 
+function statusWidth() {
+  return Math.max(8, (process.stderr.columns || process.stdout.columns || 120) - 1);
+}
+
+function fitStatusLine(line) {
+  return fitAnsiLine(String(line ?? '').replace(/[\r\n]+/g, ' '), statusWidth());
+}
+
+function fitStatusLines(lines) {
+  return (Array.isArray(lines) ? lines : [lines]).map(fitStatusLine);
+}
+
 function presentStatus(rendered) {
+  // Watch panel override: when active, render the watch panel entries as a
+  // multi-line status block instead of the normal spinner/status line.
+  if (watchState.active) {
+    const lines = watchState.visible();
+    if (lines.length) {
+      const fitted = fitStatusLines(lines);
+      if (queue.isActive()) {
+        queue.statusBlock(fitted);
+      } else if (isInputDockMounted()) {
+        drawPinnedStatus(fitted.join('\n'));
+      } else {
+        inPlace(fitted.join('\n'));
+      }
+      return;
+    }
+  }
+  const fitted = fitStatusLine(rendered);
   if (queue.isActive()) {
     const win = runtime.subAgentWindow;
     if (win?.active && win.lines.length) {
       queue.statusBlock([
-        rendered,
-        ...win.lines.slice(-SUB_AGENT_WINDOW_ROWS).map(l => `    ${c.dim(l)}`),
+        fitted,
+        ...fitStatusLines(win.lines.slice(-SUB_AGENT_WINDOW_ROWS).map(l => `    ${c.dim(l)}`)),
       ]);
       return;
     }
-    queue.status(rendered);
+    queue.status(fitted);
     return;
   }
-  if (isInputDockMounted()) { drawPinnedStatus(rendered); return; }
-  inPlace(rendered);
+  if (isInputDockMounted()) { drawPinnedStatus(fitted); return; }
+  inPlace(fitted);
 }
 
 /** Push a line into the live sub-agent tool window (dedup consecutive). */
@@ -103,7 +133,7 @@ import { safeCwd } from './repl-utils.mjs';
 import { transcriptHeader, transcriptLine } from '../ui/transcript-block.mjs';
 
 export function blockSeparatorMode() {
-  return String(process.env.KEPLER_BLOCK_SEPARATOR || 'space').toLowerCase();
+  return String(process.env.BAHULAM_BLOCK_SEPARATOR || 'space').toLowerCase();
 }
 
 export function renderBlockBoundary(nextBlock, { compactSame = false } = {}) {
@@ -361,7 +391,7 @@ export function renderToolResult(data, eventType = 'tool_result') {
 
   if (data._blocked) session.blockedOps++;
 
-  const { text, tone: t } = summarizeResult(tool, data);
+  const { text, tone: t } = summarizeResult(tool, data, data.args || {});
   // Em dash reads more like prose than a system arrow.
   const arrow = shellResultTool(tool)
     ? `${paint.text.dim('result')} ${paint.text.dim('—')}`

package/src/terminal/repl-resume.mjs

@@ -33,7 +33,7 @@ import {
   writeOverlayFrame,
   eraseOverlayFrame,
 } from './repl-format.mjs';
-import { TarangStreamClient } from '../core/stream-client.mjs';
+import { BahulamStreamClient } from '../core/stream-client.mjs';
 import { getRecentSessions, getSessionDetail, buildResumeHistory, combineResumeSummaries } from '../core/local-store.mjs';
 import { decideResumeMode, projectedTokensForChoice, formatTokens as formatCtxTokens } from '../core/resume-mode.mjs';
 import { applyCompactSummary, localCompactSummary, parseCompactTailCount, prepareCompactHistory } from '../core/compact-history.mjs';
@@ -504,7 +504,7 @@ export async function summarizeResumeTranscript({
     };
   }
   try {
-    const client = new TarangStreamClient({
+    const client = new BahulamStreamClient({
       baseUrl: creds.backendUrl,
       token: creds.token,
       toolExecutor,

package/src/terminal/repl-state.mjs

@@ -62,6 +62,10 @@ export const runtime = {
   // N lines under the spinner) instead of appending to the transcript.
   // Full detail stays on the recorded cards (/expand, /last, `d`).
   subAgentWindow: { active: false, lines: [] },
+
+  // PRD-092: Watch panel — toggled by /watch. When active, the spinner
+  // area renders a compact agent-activity summary instead of the spinner.
+  watchPanelActive: false,
 };
 
 // Full session state for the current CLI process. Set by the REPL loop
@@ -73,6 +77,13 @@ export const session = {
   startTime: Date.now(),
   inputTokens: 0,
   outputTokens: 0,
+  // Per-turn context indicator for the dock strip. Updated at each
+  // AGENT_COMPLETE from the backend's usage.total_input_tokens (the
+  // cumulative input the primary agent sent this turn across all its
+  // internal inferences). Rough proxy for "how big is the prompt right
+  // now" — approximates what the NEXT user turn will pay before any
+  // growth. Reset by /new.
+  lastTurnInputTokens: 0,
   toolCalls: 0,        // primary-agent tool calls in the current turn
   subAgentToolCalls: 0,// forwarded internal sub-agent tool calls in the current turn
   totalToolCalls: 0,   // across all turns
@@ -85,6 +96,7 @@ export const session = {
   user: null,          // { github_username, email, role }
   model: null,         // from backend user profile
   modelLimits: {},     // role -> {model, context_length, max_output, source}
+  subAgentModels: {},  // role -> model from backend session_info
   blockedOps: 0,       // safety guardrail blocks
   delegations: [],     // agent delegation events: { from, to, time }
   phases: [],          // phase history: { name, time }