@bahulam/code 2.6.14 → 2.6.16

package/src/terminal/tool-display.mjs

@@ -1,5 +1,7 @@
 // Present-progressive verbs — read more conversationally than "Read file":
 // "Reading auth.py  — 47 lines" reads like the agent narrating, not a log.
+import { isSensitiveConfigPath } from '../core/safety.mjs';
+
 const TOOL_LABELS = Object.freeze({
   shell: 'Running',
   read_file: 'Reading',
@@ -129,6 +131,7 @@ export function toolDisplaySummary(tool, args = {}, { cwd } = {}) {
         .join(', ') || 'Project files';
     case 'edit_file': {
       const filePath = shortPath(args.file_path || args.path, cwd);
+      if (isSensitiveConfigPath(filePath)) return `${filePath} · match [redacted]`;
       const search = String(args.search || '').trim();
       return search ? `${filePath} · match "${search.slice(0, 40)}${search.length > 40 ? '...' : ''}"` : filePath;
     }
@@ -229,8 +232,12 @@ export function shellCommandProfile(command, {
     || commandLineCount >= compactLines
     || commandByteCount > compactChars;
   const kind = script?.kind || (lineCount > 1 ? 'shell script' : 'shell command');
+  const preview = script?.body ? scriptBodyPreview(script.body) : '';
   const summary = compact
-    ? `${kind} · ${lineCount} line${lineCount === 1 ? '' : 's'} · ${formatBytes(byteCount)}`
+    ? [
+        `${kind} · ${lineCount} line${lineCount === 1 ? '' : 's'} · ${formatBytes(byteCount)}`,
+        preview ? `preview: ${preview}` : '',
+      ].filter(Boolean).join(' · ')
     : body;
 
   return {
@@ -244,6 +251,7 @@ export function shellCommandProfile(command, {
     compact,
     kind,
     summary,
+    preview,
     script,
     detailHint: compact ? 'details: F2 or /last' : '',
   };
@@ -297,6 +305,17 @@ function interpreterKind(value) {
   return 'shell script';
 }
 
+function scriptBodyPreview(body, maxChars = 20) {
+  const line = String(body || '')
+    .replace(/\r\n?/g, '\n')
+    .split('\n')
+    .map(value => value.trim())
+    .find(Boolean) || '';
+  const compact = line.replace(/\s+/g, ' ');
+  if (compact.length <= maxChars) return compact;
+  return `${compact.slice(0, Math.max(0, maxChars - 1))}…`;
+}
+
 function byteLength(value) {
   try {
     return Buffer.byteLength(String(value || ''), 'utf8');

package/src/ui/approval.mjs

@@ -19,6 +19,7 @@ import { paint, width as visibleWidth } from './palette.mjs';
 import { icon } from './icons.mjs';
 import { shellCommandDisplay, shellCommandProfile, toolDisplayLabel, toolDisplaySummary } from '../terminal/tool-display.mjs';
 import { label as tierLabel, requiresExplicitApproval, TIERS } from '../core/risk-tier.mjs';
+import { isSensitiveConfigPath } from '../core/safety.mjs';
 
 /**
  * Default option set per tier. Caller can override via `opts.options`.
@@ -100,7 +101,14 @@ export function renderApprovalDockPrompt({
 } = {}) {
   const cols = Math.max(60, Math.min(width || process.stderr.columns || 96, 120));
   const opts = options || defaultOptions(tier, { tool, args });
-  const subject = approvalDockSubject(tool, args, cols, showDetails);
+  // Multi-line shell/python scripts auto-expand: the user cannot approve
+  // what they cannot see. "shell script · 5 lines · 309 B" as the only
+  // subject made blind approval the default. After execution the script
+  // collapses back to the one-line tool card (details stay on /last).
+  const isScriptCommand = tool === 'shell'
+    && /\n/.test(String(args.command || args.cmd || ''));
+  const detailView = showDetails || isScriptCommand;
+  const subject = approvalDockSubject(tool, args, cols, detailView);
   const risks = riskTerms(tool, args, tier);
   const reason = compactReason(tool, args, why);
   const lines = [
@@ -111,14 +119,22 @@ export function renderApprovalDockPrompt({
     ...opts.map((option, index) => optionToken(option, index === selected, explicitAccent(tier))),
   ];
 
+  // Show the WHOLE script when it fits — a partial script (…lines cut at
+  // the top) makes blind approval the default. Cap at half the terminal
+  // so the dock never eats the whole screen. Non-detail approvals keep
+  // the tight 8-row cap.
+  const termRows = Math.max(12, Number(process.stderr.rows) || 24);
+  const detailCap = Math.max(12, Math.floor(termRows / 2));
+  const maxRows = detailView ? Math.min(detailCap, Math.max(12, lines.length + 1)) : 8;
+
   return {
     prefix: '? approve › ',
-    value: truncateForDock(subject, showDetails ? 1200 : 220),
+    value: truncateForDock(subject, detailView ? 1200 : 220),
     context: `${approvalTitle(tier)} · ${tierLabel(tier)} · ${tool || 'tool'}`,
     meta: '',
-    tips: approvalFooter(tool, showDetails),
+    tips: approvalFooter(tool, detailView),
     lines,
-    maxRows: showDetails ? 12 : 8,
+    maxRows,
   };
 }
 
@@ -158,6 +174,7 @@ export { TIERS };
 function tierTitle(tier) {
   switch (tier) {
     case TIERS.SENSITIVE_READ: return 'SENSITIVE';
+    case TIERS.PROTECTED_EDIT: return 'PROTECTED';
     case TIERS.SHELL_DANGEROUS: return 'DANGEROUS';
     case TIERS.DESTRUCTIVE: return 'DESTRUCTIVE';
     case TIERS.SHELL_MEDIUM: return 'MEDIUM';
@@ -172,6 +189,7 @@ function tierTitle(tier) {
 function approvalTitle(tier) {
   switch (tier) {
     case TIERS.SENSITIVE_READ:
+    case TIERS.PROTECTED_EDIT:
     case TIERS.SHELL_DANGEROUS:
     case TIERS.DESTRUCTIVE:
       return tierTitle(tier);
@@ -286,6 +304,7 @@ function riskTerms(tool, args = {}, tier) {
     }
   }
   if (tier === TIERS.SENSITIVE_READ) terms.push('sensitive read');
+  if (tier === TIERS.PROTECTED_EDIT) terms.push('protected edit');
   if (tier === TIERS.DESTRUCTIVE) terms.push('destructive');
   return [...new Set(terms)].slice(0, 3);
 }
@@ -315,11 +334,18 @@ function subjectDetails(tool, args = {}, summary = '', available = 72) {
   }
   if (tool === 'write_file') {
     const file = args.file_path || args.path || summary || '';
+    if (isSensitiveConfigPath(file)) return [`${file} · content redacted`];
     const lineCount = typeof args.content === 'string' ? args.content.split('\n').length : null;
     return [`${file}${lineCount ? ` · ${lineCount} lines` : ''}`];
   }
   if (tool === 'edit_file') {
     const file = args.file_path || args.path || '';
+    if (isSensitiveConfigPath(file)) {
+      const details = [`${file || summary}`];
+      if (args.search || args.old_string) details.push('match: [redacted]');
+      if (args.replace || args.new_string) details.push('replace: [redacted]');
+      return details;
+    }
     const search = String(args.search || args.old_string || '').trim();
     const replacement = String(args.replace || args.new_string || '').trim();
     const details = [`${file || summary}`];
@@ -397,9 +423,11 @@ function approvalDockSubject(tool, args = {}, cols = 96, showDetails = false) {
 function approvalDockSubjectRows(subject) {
   const lines = String(subject || '').split('\n');
   const first = lines.shift() || '';
+  // 12 continuation rows matches approvalDockDetails' script cap — a
+  // 12-line script renders fully in the approval prompt.
   return [
     `${paint.text.dim('? approve ›')} ${paint.text.primary(truncate(first, 160))}`,
-    ...lines.slice(0, 6).map(line => `${paint.text.dim('           ')}${paint.text.primary(truncate(line, 160))}`),
+    ...lines.slice(0, 12).map(line => `${paint.text.dim('           ')}${paint.text.primary(truncate(line, 160))}`),
   ];
 }
 

package/src/ui/input-dock.mjs

@@ -37,6 +37,7 @@
 import { paint, width as visibleWidth } from './palette.mjs';
 import { term, onResize } from './term.mjs';
 import { wrapToLines, tailWithEllipsis, cursorPositionInLines } from './text-layout.mjs';
+import * as queue from './render-queue.mjs';
 
 const ESC = '\x1b[';
 const OUT = process.stderr;
@@ -52,6 +53,7 @@ const INPUT_RIGHT_PAD = 2;
 const META_INDENT = 4;
 
 const DEFAULT_MAX_INPUT_ROWS = 6;
+const DEFAULT_OVERLAY_MAX_ROWS = 8;
 const MIN_INPUT_ROWS = 1;
 const MAX_INPUT_ROWS_CAP = 12;
 
@@ -74,10 +76,40 @@ let unsubResize = null;
 let lastFrame = { context: '', meta: '', tips: '', prefix: '', value: '', cursor: null, overlayLines: null };
 let resetting = false;
 let lastGeometry = null;
-
-function write(s) { try { OUT.write(s); } catch {} }
-function setScrollRegion(top, bottom) { write(`${ESC}${top};${bottom}r`); }
-function clearScrollRegion() { write(`${ESC}r`); }
+let contentCursorRow = 1;
+let contentCursorCol = 1;
+let contentTrackingActive = false;
+let suppressWriteTracking = 0;
+let originalStdoutWrite = null;
+let originalStderrWrite = null;
+
+function write(s) {
+  // All dock frame bytes flow through the render queue's serialized raw
+  // channel when it is active — bypassing the content redirect so frame
+  // paints never land in the transcript. Legacy fallback writes straight
+  // to stderr with the old suppress-tracking guard.
+  if (queue.isActive()) {
+    queue.raw(s);
+    return;
+  }
+  try {
+    suppressWriteTracking++;
+    OUT.write(s);
+  } catch {
+  } finally {
+    suppressWriteTracking = Math.max(0, suppressWriteTracking - 1);
+  }
+}
+function setScrollRegion(top, bottom) {
+  // Keep the queue's notion of the content region in sync — its content
+  // cursor clamps to this bottom.
+  if (queue.isActive()) { queue.setRegion(top, bottom); return; }
+  write(`${ESC}${top};${bottom}r`);
+}
+function clearScrollRegion() {
+  if (queue.isActive()) { queue.clearRegion(); return; }
+  write(`${ESC}r`);
+}
 function saveCursor() { write(`${ESC}s`); }
 function restoreCursor() { write(`${ESC}u`); }
 function moveTo(row, col) { write(`${ESC}${row};${col}H`); }
@@ -102,6 +134,69 @@ function contentBottomRow() {
   return Math.max(1, rows() - reservedRows);
 }
 
+function clampContentCursor() {
+  const bottom = contentBottomRow();
+  contentCursorRow = Math.max(1, Math.min(bottom, contentCursorRow || 1));
+  contentCursorCol = Math.max(1, Math.min(cols(), contentCursorCol || 1));
+}
+
+function resetContentCursor(row = 1, col = 1) {
+  contentCursorRow = Math.max(1, Math.min(contentBottomRow(), Math.floor(row || 1)));
+  contentCursorCol = Math.max(1, Math.min(cols(), Math.floor(col || 1)));
+}
+
+function trackContentWrite(chunk) {
+  if (!mounted || !contentTrackingActive || suppressWriteTracking > 0) return;
+  const text = Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk ?? '');
+  if (!text) return;
+  const clean = text
+    .replace(/\x1b\[[0-9;?]*[ -/]*[@-~]/g, '')
+    .replace(/\x1b[()][A-Za-z0-9]/g, '');
+  const bottom = contentBottomRow();
+  const width = Math.max(1, drawableColumns());
+  for (const ch of clean) {
+    if (ch === '\r') {
+      contentCursorCol = 1;
+      continue;
+    }
+    if (ch === '\n') {
+      contentCursorRow = Math.min(bottom, contentCursorRow + 1);
+      contentCursorCol = 1;
+      continue;
+    }
+    contentCursorCol++;
+    if (contentCursorCol > width) {
+      contentCursorRow = Math.min(bottom, contentCursorRow + 1);
+      contentCursorCol = 1;
+    }
+  }
+}
+
+function patchOutputTracking() {
+  if (originalStdoutWrite || originalStderrWrite) return;
+  originalStdoutWrite = process.stdout.write.bind(process.stdout);
+  originalStderrWrite = process.stderr.write.bind(process.stderr);
+  process.stdout.write = function trackedStdoutWrite(chunk, ...args) {
+    trackContentWrite(chunk);
+    return originalStdoutWrite(chunk, ...args);
+  };
+  process.stderr.write = function trackedStderrWrite(chunk, ...args) {
+    trackContentWrite(chunk);
+    return originalStderrWrite(chunk, ...args);
+  };
+}
+
+function unpatchOutputTracking() {
+  if (originalStdoutWrite) {
+    process.stdout.write = originalStdoutWrite;
+    originalStdoutWrite = null;
+  }
+  if (originalStderrWrite) {
+    process.stderr.write = originalStderrWrite;
+    originalStderrWrite = null;
+  }
+}
+
 // Row map (top → bottom of the reserved region).
 function topRuleRow()       { return contentBottomRow() + 1; }
 function spacerAboveRow()   { return topRuleRow() + 1; }
@@ -125,6 +220,23 @@ function resolveMaxInputRows(requested) {
   return Math.max(MIN_INPUT_ROWS, Math.min(MAX_INPUT_ROWS_CAP, n));
 }
 
+function resolveOverlayRowCap(requested = DEFAULT_OVERLAY_MAX_ROWS) {
+  const n = Number.parseInt(String(requested), 10);
+  if (!Number.isFinite(n)) return DEFAULT_OVERLAY_MAX_ROWS;
+  // Overlays (approval scripts) may need more rows than the typing cap —
+  // the user cannot approve what they cannot see. Allow up to half the
+  // terminal so the transcript stays visible; typing input keeps the
+  // tight MAX_INPUT_ROWS_CAP via normalizeInputRows above.
+  const dynamicCap = Math.max(MAX_INPUT_ROWS_CAP, Math.floor((rows() || 24) / 2));
+  return Math.max(MIN_INPUT_ROWS, Math.min(dynamicCap, n));
+}
+
+function overlayRowsForWrapped(wrappedLength, requestedMaxRows = DEFAULT_OVERLAY_MAX_ROWS) {
+  const rowCap = resolveOverlayRowCap(requestedMaxRows);
+  const wanted = Math.max(MIN_INPUT_ROWS, Math.floor(Number(wrappedLength) || 0));
+  return Math.min(rowCap, wanted);
+}
+
 // How many input rows does this (prefix + value) buffer need? Wrapped line
 // count clamped to [1, inputRowsMax]. Beyond the cap, tail-with-ellipsis
 // takes over inside drawInputLines so at most inputRowsMax rows render.
@@ -236,6 +348,10 @@ function parkCursorAtInput() {
   const prefix = lastFrame.prefix || '';
   const value = lastFrame.value || '';
   if (!prefix && !value) {
+    if (queue.isActive()) {
+      queue.park(inputRowStart(), INPUT_INDENT + 1);
+      return;
+    }
     moveTo(inputRowStart(), INPUT_INDENT + 1);
     return;
   }
@@ -250,6 +366,7 @@ function applyLayout({ clearPrevious = false } = {}) {
   const bottom = contentBottomRow();
   setScrollRegion(1, bottom);
   renderFrame(lastFrame);
+  clampContentCursor();
   // On (re)mount and resize, park at input if we have one; otherwise sit at
   // the bottom of the content region so any pending content writes flush
   // above the dock rather than into a stale mid-frame position.
@@ -385,7 +502,11 @@ export function isInputDockMounted() {
   return mounted;
 }
 
-export function mountInputDock({ inputRowsMax: requestedMax } = {}) {
+export function mountInputDock({
+  inputRowsMax: requestedMax,
+  initialContentRow = 1,
+  initialContentCol = 1,
+} = {}) {
   const t = term();
   if (!t.isTTY || t.plain) return false;
   if (t.ttyMode !== 'rich' || t.fixedInput === false) return false;
@@ -395,10 +516,29 @@ export function mountInputDock({ inputRowsMax: requestedMax } = {}) {
   inputRowsMax = resolveMaxInputRows(requestedMax);
   inputRows = MIN_INPUT_ROWS;
   reservedRows = FIXED_ROWS + inputRows;
+  resetContentCursor(initialContentRow, initialContentCol);
+  contentTrackingActive = false;
   mounted = true;
+  // Render queue becomes the sole writer + exact cursor tracker. The
+  // legacy simulate-by-parsing patch only engages if activation is
+  // refused (shouldn't happen — mount gating matches activate gating).
+  const queued = queue.activate({
+    initialRow: contentCursorRow,
+    initialCol: contentCursorCol,
+    bottom: contentBottomRow(),
+  });
+  if (!queued) patchOutputTracking();
   applyLayout();
 
-  unsubResize = onResize(() => applyLayout({ clearPrevious: true }));
+  unsubResize = onResize(() => {
+    if (queue.isActive()) {
+      // Terminal reflow makes any tracked position fiction — hard
+      // re-anchor to the new content-region bottom before repainting.
+      queue.reanchor({ row: contentBottomRow(), col: 1, bottom: contentBottomRow() });
+      resetContentCursor(contentBottomRow(), 1);
+    }
+    applyLayout({ clearPrevious: true });
+  });
   process.once('exit', safeUnmount);
   process.once('SIGTERM', () => { safeUnmount(); process.exit(143); });
   return true;
@@ -415,6 +555,9 @@ export function unmountInputDock() {
     if (unsubResize) { unsubResize(); unsubResize = null; }
   } finally {
     mounted = false;
+    contentTrackingActive = false;
+    queue.deactivate();
+    unpatchOutputTracking();
     resetting = false;
     lastGeometry = null;
   }
@@ -424,21 +567,32 @@ function safeUnmount() { try { unmountInputDock(); } catch {} }
 
 export function moveToContent() {
   if (!mounted) return false;
-  moveTo(contentBottomRow(), 1);
+  if (queue.isActive()) {
+    // Content self-positions through queue.content(); nothing to do.
+    return true;
+  }
+  clampContentCursor();
+  contentTrackingActive = true;
+  moveTo(contentCursorRow, contentCursorCol);
   return true;
 }
 
-// One row above the bottom of the scroll region. Writes here won't trigger
-// the scroll-on-LF that happens when writing '\n' at the region's bottom row —
-// exactly what the persistent explore/spinner line needs to overwrite in place
-// without piling copies of itself into scrollback.
+// The next transcript row. Spinner/status overlays live next to the latest
+// content instead of near the scroll-region bottom; otherwise sparse agent
+// events leave large blank holes between visible lines.
 export function pinnedStatusRow() {
   if (!mounted) return null;
-  return Math.max(1, contentBottomRow() - 1);
+  clampContentCursor();
+  return Math.max(1, Math.min(contentBottomRow(), contentCursorRow));
 }
 
 export function drawPinnedStatus(line) {
   if (!mounted) return false;
+  if (queue.isActive()) {
+    // Coalesced, serialized, no VT100 save-slot involvement.
+    queue.status(String(line || ''));
+    return true;
+  }
   const row = pinnedStatusRow();
   if (row == null) return false;
   saveCursor();
@@ -451,6 +605,10 @@ export function drawPinnedStatus(line) {
 
 export function clearPinnedStatus() {
   if (!mounted) return false;
+  if (queue.isActive()) {
+    queue.clearStatus();
+    return true;
+  }
   const row = pinnedStatusRow();
   if (row == null) return false;
   saveCursor();
@@ -466,6 +624,7 @@ export function clearPinnedStatus() {
 // clearing their overlay.
 export function redrawDockFrame() {
   if (!mounted) return false;
+  contentTrackingActive = false;
   renderFrame(lastFrame);
   parkCursorAtInput();
   return true;
@@ -473,6 +632,7 @@ export function redrawDockFrame() {
 
 export function prepareInputPrompt({ context = '', tips = '', meta = '' } = {}) {
   if (!mounted) return false;
+  contentTrackingActive = false;
   setInputRowsTo(MIN_INPUT_ROWS);
   clearInputRows();
   renderFrame({ context, tips, meta, prefix: '', value: '', overlayLines: null });
@@ -482,9 +642,11 @@ export function prepareInputPrompt({ context = '', tips = '', meta = '' } = {})
 
 export function clearInputPrompt() {
   if (!mounted) return false;
-  clearInputRows();
+  contentTrackingActive = false;
   lastFrame.value = '';
   lastFrame.overlayLines = null;
+  setInputRowsTo(MIN_INPUT_ROWS);
+  clearInputRows();
   renderFrame(lastFrame);
   parkCursorAtInput();
   return true;
@@ -492,6 +654,7 @@ export function clearInputPrompt() {
 
 export function renderDockInput(prefix, value, { context = '', tips = '', meta = '', cursor = null } = {}) {
   if (!mounted) return false;
+  contentTrackingActive = false;
   setInputRowsTo(computeInputRowsForBuffer(prefix, value));
   renderFrame({ context, tips, meta, prefix, value, cursor, overlayLines: null });
   const layout = layoutInput(prefix, value);
@@ -505,13 +668,14 @@ export function renderDockOverlay({
   lines = [],
   meta = '',
   tips = '',
-  maxRows = 8,
+  maxRows = DEFAULT_OVERLAY_MAX_ROWS,
 } = {}) {
   if (!mounted) return false;
+  contentTrackingActive = false;
   const sourceLines = Array.isArray(lines) ? lines : String(lines || '').split('\n');
   const wrapped = layoutOverlayLines(sourceLines);
-  const rowCap = Math.max(MIN_INPUT_ROWS, Math.min(MAX_INPUT_ROWS_CAP, Math.max(inputRowsMax, maxRows)));
-  setInputRowsTo(Math.min(rowCap, Math.max(MIN_INPUT_ROWS, wrapped.length)), { maxRows: rowCap });
+  const rowCap = resolveOverlayRowCap(maxRows);
+  setInputRowsTo(overlayRowsForWrapped(wrapped.length, rowCap), { maxRows: rowCap });
   const tail = tailWithEllipsis(wrapped, inputRows);
   renderFrame({
     context,
@@ -537,6 +701,7 @@ export function renderDockOverlay({
  */
 export function focusDockInput(prefix, value = '', cursorInValue = null) {
   if (!mounted) return false;
+  contentTrackingActive = false;
   const layout = layoutInput(prefix, value);
   const valueStr = String(value || '');
   const rawCursor = cursorInValue == null
@@ -551,6 +716,12 @@ export function focusDockInput(prefix, value = '', cursorInValue = null) {
   );
   const row = inputRowStart() + visibleRowIdx;
   const col = Math.min(cols(), INPUT_INDENT + 1 + Math.max(0, pos.col));
+  if (queue.isActive()) {
+    // Record the park position — every queue op re-parks here so readline
+    // echoes always land in the input row, even mid-stream.
+    queue.park(row, col);
+    return true;
+  }
   moveTo(row, col);
   return true;
 }
@@ -570,7 +741,12 @@ export function _internals() {
     bottomRuleLine,
     padLine,
     drawableColumns,
+    resetContentCursor,
+    contentCursor: () => ({ row: contentCursorRow, col: contentCursorCol, active: contentTrackingActive }),
+    overlayRowsForWrapped,
     FIXED_ROWS,
+    MAX_INPUT_ROWS_CAP,
+    DEFAULT_OVERLAY_MAX_ROWS,
     BRAND_LABEL,
   };
 }