pi-hashline-edit-pro 6.1.2 → 6.3.0

package/src/batch.ts

@@ -41,6 +41,8 @@ export interface PlannedMember {
   order: number;
   size: number;
   last: boolean;
+  plan?: BatchMemberPlan;
+  demoted?: Error;
 }
 
 export type BatchKind = "replace" | "insert" | "replace_match" | "copy" | "move";
@@ -64,6 +66,36 @@ export interface BatchSourceMove {
   pipe: PipelineResult;
 }
 
+export interface BatchMemberPlan {
+  hedit: HEdit;
+  warnings: string[];
+  planned?: PlannedEdit;
+  foldedLines: number;
+  direction?: "before" | "after";
+  stripWarning?: StripWarningLocation;
+  contentSeparators?: (LineEnding | undefined)[];
+  carryIndex?: number;
+  servedOverride?: ReadonlyMap<string, string>;
+  sourceMove?: BatchSourceMove;
+}
+
+export interface BatchPlannerInput {
+  member: PlannedMember;
+  base: BatchBase;
+  displayPath: string;
+  served?: ReadonlyMap<string, string>;
+  cwd: string;
+  signal?: AbortSignal;
+}
+
+export type BatchMemberPlanner = (input: BatchPlannerInput) => BatchMemberPlan | undefined | Promise<BatchMemberPlan | undefined>;
+
+const batchPlanners = new Map<BatchKind, BatchMemberPlanner>();
+
+export function registerBatchPlanner(kind: BatchKind, planner: BatchMemberPlanner): void {
+  batchPlanners.set(kind, planner);
+}
+
 interface SourcePreparation {
   move: BatchSourceMove;
   separators?: LineEnding[];
@@ -88,21 +120,12 @@ export interface BatchPiece {
 }
 
 export interface BatchMemberInput {
-  kind: BatchKind;
-  direction?: "before" | "after";
   member: PlannedMember;
   targetPath: string;
   mutationTargetPath: string;
   cwd: string;
   signal?: AbortSignal;
-  hedit: HEdit;
-  extraWarnings: string[];
-  foldedLines?: number;
-  stripWarning?: StripWarningLocation;
-  contentSeparators?: (LineEnding | undefined)[];
-  carryIndex?: number;
-  servedOverride?: ReadonlyMap<string, string>;
-  sourceMove?: BatchSourceMove;
+  plan?: BatchMemberPlan;
 }
 
 interface BatchFailure {
@@ -115,7 +138,9 @@ interface BatchState {
   display: number;
   target: string;
   memberIds: string[];
+  allMemberIds: string[];
   stale: boolean;
+  preflighted?: boolean;
   base?: BatchBase;
   paths?: { absolutePath: string; mutationTargetPath: string; displayPath: string };
   served?: ReadonlyMap<string, string>;
@@ -335,7 +360,7 @@ function enforceCap(): void {
     const state = batches.get(oldest);
     batches.delete(oldest);
     if (state) {
-      for (const id of state.memberIds) {
+      for (const id of state.allMemberIds) {
         plan.delete(id);
         placeholderResults.delete(id);
       }
@@ -397,6 +422,7 @@ export async function planAssistantMessage(message: unknown, cwd: string): Promi
       display,
       target: group[0]!.target,
       memberIds: group.map((item) => item.id),
+      allMemberIds: group.map((item) => item.id),
       stale: false,
       pieces: [],
       sources: [],
@@ -565,6 +591,49 @@ function batchAbortedError(runtime: BatchState): Error {
   discardBatchState(runtime);
   return new Error(abortedBatchMessage(runtime));
 }
+
+const ATTRIBUTABLE_BATCH_CODES = new Set(["E_BAD_SHAPE", "E_BAD_REF", "E_STALE_ANCHOR", "E_RANGE_STALE", "E_SUBSTRING_NOT_FOUND"]);
+
+function isAttributableBatchError(error: unknown): boolean {
+  const code = errorCodeOf(error);
+  return code !== undefined && ATTRIBUTABLE_BATCH_CODES.has(code);
+}
+
+async function preflightBatch(runtime: BatchState, base: BatchBase, cwd: string, signal?: AbortSignal): Promise<void> {
+  if (runtime.preflighted) return;
+  runtime.preflighted = true;
+  if (runtime.failed) return;
+  const displayPath = runtime.paths?.displayPath ?? runtime.target;
+  for (const id of [...runtime.memberIds]) {
+    const member = plan.get(id);
+    if (!member || member.demoted) continue;
+    const planner = batchPlanners.get(member.kind);
+    if (!planner) continue;
+    try {
+      const memberPlan = await planner({ member, base, displayPath, served: runtime.served, cwd, signal });
+      if (memberPlan === undefined) continue;
+      await throwIfStrictInput([...memberPlan.warnings, ...(memberPlan.planned?.warnings ?? [])]);
+      member.plan = memberPlan;
+    } catch (error) {
+      if (!isAttributableBatchError(error)) {
+        noteBatchFailure(member, error);
+        throw error;
+      }
+      if (error instanceof RangeStaleError) adoptAnchors(base.absolutePath, error.rangeServedMap);
+      else if (error instanceof AnchorMismatchError) adoptAnchors(base.absolutePath, error.feedbackMap);
+      member.demoted = error instanceof Error ? error : new Error(String(error));
+      runtime.memberIds = runtime.memberIds.filter((candidate) => candidate !== id);
+    }
+  }
+  const survivors = runtime.memberIds
+    .map((id) => plan.get(id))
+    .filter((member): member is PlannedMember => member !== undefined);
+  survivors.forEach((member, index) => {
+    member.size = survivors.length;
+    member.last = index === survivors.length - 1;
+  });
+}
+
 function discardBatchState(runtime: BatchState): void {
   markBatchMembersAborted(runtime);
 }
@@ -578,7 +647,10 @@ export async function ensureBatchBase(input: {
 }): Promise<BatchBase> {
   const runtime = batches.get(input.member.batchKey);
   if (!runtime) throw new Error(`[E_STALE_ANCHOR] Batch ${input.member.display} is no longer tracked. Call read for fresh anchors.`);
-  if (runtime.base) return runtime.base;
+  if (runtime.base) {
+    await preflightBatch(runtime, runtime.base, input.cwd, input.signal);
+    return runtime.base;
+  }
   abortIf(input.signal);
   const file = await readNormFile(input.targetPath, input.cwd, {
     signal: input.signal,
@@ -606,6 +678,7 @@ export async function ensureBatchBase(input: {
     mutationTargetPath: input.mutationTargetPath,
     displayPath: toDisplayPath(input.cwd, file.absolutePath, input.targetPath),
   };
+  await preflightBatch(runtime, base, input.cwd, input.signal);
   return base;
 }
 
@@ -627,29 +700,42 @@ export async function executeBatchMember(input: BatchMemberInput): Promise<TResu
     discardBatchState(runtime);
     throw error;
   }
+  if (runtime.failed) throw batchAbortedError(runtime);
+  if (input.member.demoted) throw input.member.demoted;
+  const memberPlan = input.plan ?? input.member.plan;
+  if (memberPlan === undefined) {
+    const error = new Error(`[E_OP_ABORTED] Batch ${runtime.display} aborted: no plan for [${input.member.kind}] Call Nr ${input.member.order}. ${BATCH_DISCARDED_NOTE}`);
+    noteBatchFailure(input.member, error);
+    throw batchAbortedError(runtime);
+  }
   if (input.mutationTargetPath !== input.member.target) {
-    const error = new Error(`[E_STALE_ANCHOR] "${input.hedit.hash_bounds[0].hash}" is no longer owned by ${input.member.target}. Call read for fresh anchors.`);
+    const error = new Error(`[E_STALE_ANCHOR] "${memberPlan.hedit.hash_bounds[0].hash}" is no longer owned by ${input.member.target}. Call read for fresh anchors.`);
     noteBatchFailure(input.member, error);
     discardBatchState(runtime);
     throw error;
   }
+  const kind = input.member.kind;
   const displayPath = runtime.paths?.displayPath ?? input.targetPath;
-  const effectiveHedit = preserveDeletionSeparators(input.hedit, base.baseLines, base.hashes);
+  const effectiveHedit = preserveDeletionSeparators(memberPlan.hedit, base.baseLines, base.hashes);
   let planned: PlannedEdit;
-  try {
-    planned = planEdit(base.content, effectiveHedit, base.hashes, {
-      filePath: displayPath,
-      servedHashes: input.servedOverride ?? runtime.served,
-      signal: input.signal,
-      baseFileLines: base.baseLines,
-      stripWarning: input.stripWarning,
-    });
-  } catch (error) {
-    if (error instanceof RangeStaleError) adoptAnchors(base.absolutePath, error.rangeServedMap);
-    else if (error instanceof AnchorMismatchError) adoptAnchors(base.absolutePath, error.feedbackMap);
-    noteBatchFailure(input.member, error);
-    discardBatchState(runtime);
-    throw error;
+  if (memberPlan.planned !== undefined) {
+    planned = memberPlan.planned;
+  } else {
+    try {
+      planned = planEdit(base.content, effectiveHedit, base.hashes, {
+        filePath: displayPath,
+        servedHashes: memberPlan.servedOverride ?? runtime.served,
+        signal: input.signal,
+        baseFileLines: base.baseLines,
+        stripWarning: memberPlan.stripWarning,
+      });
+    } catch (error) {
+      if (error instanceof RangeStaleError) adoptAnchors(base.absolutePath, error.rangeServedMap);
+      else if (error instanceof AnchorMismatchError) adoptAnchors(base.absolutePath, error.feedbackMap);
+      noteBatchFailure(input.member, error);
+      discardBatchState(runtime);
+      throw error;
+    }
   }
   const start = planned.resolved.hash_bounds[0].line;
   const end = planned.resolved.hash_bounds[1].line;
@@ -657,20 +743,20 @@ export async function executeBatchMember(input: BatchMemberInput): Promise<TResu
   const baseLines = base.baseLines;
   const originalSlice = baseLines.slice(start - 1, end);
   const noop = originalSlice.length === newLines.length && originalSlice.every((line, index) => line === newLines[index]);
-  const foldedLines = input.foldedLines ?? 0;
-  const separators = input.contentSeparators ?? input.hedit.content_separators;
+  const foldedLines = memberPlan.foldedLines;
+  const separators = memberPlan.contentSeparators ?? memberPlan.hedit.content_separators;
   const carryIndex =
-    input.carryIndex !== undefined
-      ? input.carryIndex
-      : input.kind === "insert" && foldedLines > 0
-        ? input.direction === "after"
+    memberPlan.carryIndex !== undefined
+      ? memberPlan.carryIndex
+      : kind === "insert" && foldedLines > 0
+        ? memberPlan.direction === "after"
           ? 0
           : newLines.length - 1
         : undefined;
   const piece: BatchPiece = {
     order: input.member.order,
-    kind: input.kind,
-    ...(input.direction !== undefined ? { direction: input.direction } : {}),
+    kind,
+    ...(memberPlan.direction !== undefined ? { direction: memberPlan.direction } : {}),
     ...(carryIndex !== undefined ? { carryIndex } : {}),
     start,
     end,
@@ -678,7 +764,7 @@ export async function executeBatchMember(input: BatchMemberInput): Promise<TResu
     toHash: planned.resolved.hash_bounds[1].hash,
     newLines: [...newLines],
     ...(separators !== undefined ? { separators } : {}),
-    warnings: [...input.extraWarnings, ...planned.warnings],
+    warnings: [...memberPlan.warnings, ...planned.warnings],
     noop,
     foldedLines,
   };
@@ -686,7 +772,7 @@ export async function executeBatchMember(input: BatchMemberInput): Promise<TResu
   if (noop) runtime.noops += 1;
   else runtime.applied += 1;
   runtime.warnings.push(...piece.warnings);
-  if (input.sourceMove !== undefined) runtime.sources.push(input.sourceMove);
+  if (memberPlan.sourceMove !== undefined) runtime.sources.push(memberPlan.sourceMove);
   if (!input.member.last) {
     const placeholder = batchPlaceholder(input.member, piece, base.snapshotId);
     placeholderResults.set(input.member.id, placeholder);
@@ -817,7 +903,7 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
   const spans = composed.length === 0
     ? [{ start: 0, end: base.hashes.length - 1, replacementCount: 1 }]
     : pieceMappingSpans(effectivePieces);
-  const resultSeparators = separatorsForSpans(base.separators, base.hashes.length, spans, composed, base.ending);
+  const resultSeparators = separatorsForSpans(base.separators, base.hashes.length, spans, composed, base.ending, base.baseLines);
   applySpanEndings(resultSeparators, effectivePieces.map((piece) => ({
     start: piece.start - 1,
     end: piece.end - 1,
@@ -883,7 +969,7 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
     }
     const sourceSpan = source.pipe.spans?.[0];
     const sourceSeparators = sourceSpan
-      ? separatorsForSpans(source.pipe.originalSeparators, source.pipe.originalHashes.length, [sourceSpan], source.pipe.result, source.pipe.originalEnding)
+      ? separatorsForSpans(source.pipe.originalSeparators, source.pipe.originalHashes.length, [sourceSpan], source.pipe.result, source.pipe.originalEnding, splitLines(source.pipe.originalNormalized))
       : undefined;
     const sourceBytes = source.pipe.bom + (sourceSeparators !== undefined
       ? joinSeparators(source.pipe.result, sourceSeparators)
@@ -1102,7 +1188,7 @@ export async function finalizeTurn(toolCallIds: string[]): Promise<void> {
   for (const key of keys) {
     const runtime = batches.get(key);
     if (!runtime) continue;
-    for (const id of runtime.memberIds) {
+    for (const id of runtime.allMemberIds) {
       plan.delete(id);
       placeholderResults.delete(id);
     }

package/src/commit.ts

@@ -37,7 +37,7 @@ export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promis
   const span = pipe.spans?.[0] ?? (meta.editAnchors ? spanForEdit(pipe.originalHashes, meta.editAnchors[0], meta.editAnchors[1], pipe.result) : undefined);
   if (span && meta.anchorCarry !== undefined) span.carry = meta.anchorCarry;
   const resultSeparators = span
-    ? separatorsForSpans(pipe.originalSeparators, pipe.originalHashes.length, [span], pipe.result, pipe.originalEnding)
+    ? separatorsForSpans(pipe.originalSeparators, pipe.originalHashes.length, [span], pipe.result, pipe.originalEnding, splitLines(pipe.originalNormalized))
     : undefined;
   if (resultSeparators !== undefined && span !== undefined) {
     applyEndingOverrides(resultSeparators, span.start, pipe.contentSeparators);

package/src/config-ui.ts

@@ -1,14 +1,18 @@
-import { Key, matchesKey, visibleWidth } from "@earendil-works/pi-tui";
+import { Key, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { readConfig, type Config } from "./config";
 
-export type ConfigToggleKey = "autoRead" | "autoReadAll" | "autoReadAllIgnore" | "anchorGrepEnabled" | "copyMoveEnabled" | "replaceMatchEnabled" | "requirePath" | "strictInput" | "diffContextLines" | "disableOnModels" | "readOnDisabledModels";
+export type ConfigToggleKey = "autoRead" | "autoReadAll" | "autoReadAllRequireGit" | "autoReadAllIgnore" | "anchorGrepEnabled" | "copyMoveEnabled" | "replaceMatchEnabled" | "requirePath" | "strictInput" | "diffContextLines" | "disableOnModels" | "readOnDisabledModels";
 
 export interface ConfigRow {
   key: ConfigToggleKey;
   label: string;
   hint: string;
+  group: string;
+  depth: number;
   enabled: boolean;
+  dependsOn?: ConfigToggleKey;
+  gated?: boolean;
   mode?: string;
   cycle?: string[];
   value?: number;
@@ -16,53 +20,79 @@ export interface ConfigRow {
   disabled?: boolean;
 }
 
+function rowActive(row: ConfigRow): boolean {
+  if (row.entries !== undefined) return row.entries.length > 0;
+  if (row.mode !== undefined) return row.mode !== "off";
+  return row.enabled;
+}
+
 export function configRows(config: Config): ConfigRow[] {
-  return [
-    { key: "autoRead", label: "Auto-read", hint: "Anchors after write + post-edit diffs", enabled: config.autoRead !== false },
-    { key: "autoReadAll", label: "Auto-read all", hint: "Attach files on the first turn: off, on, git (git repos only)", enabled: (config.autoReadAll ?? "off") !== "off", mode: config.autoReadAll ?? "off", cycle: ["off", "on", "git"] },
-    { key: "autoReadAllIgnore", label: "Ignore folders/files", hint: "Extra folders, files, or globs skipped by auto-read all (comma-separated)", enabled: (config.autoReadAllIgnore ?? []).length > 0, entries: config.autoReadAllIgnore ?? [] },
-    { key: "diffContextLines", label: "Diff context", hint: "Surrounding lines in post-edit diffs (needs Auto-read)", enabled: config.autoRead !== false, value: config.diffContextLines ?? 1, disabled: config.autoRead === false },
-    { key: "anchorGrepEnabled", label: "Anchor grep", hint: "anchor_grep tool (builtin grep off while on)", enabled: config.anchorGrepEnabled === true },
-    { key: "copyMoveEnabled", label: "Copy/move", hint: "copy and move tools (both off while disabled)", enabled: config.copyMoveEnabled !== false },
-    { key: "requirePath", label: "Require path", hint: "replace, insert, copy, move need path (RPC visibility)", enabled: config.requirePath === true },
-    { key: "strictInput", label: "Strict input", hint: "Reject auto-fixable slips instead of warnings", enabled: config.strictInput === true },
-    { key: "replaceMatchEnabled", label: "Replace match", hint: "replace_match tool (off while disabled)", enabled: config.replaceMatchEnabled !== false },
-    { key: "disableOnModels", label: "Disable on models", hint: "Model globs (provider/id, model id, or api) that turn off the anchored edit tools (comma-separated)", enabled: (config.disableOnModels ?? []).length > 0, entries: config.disableOnModels ?? [] },
-    { key: "readOnDisabledModels", label: "Read on disabled models", hint: "Read for models matched by Disable on models: vanilla (plain pi read), or remove it", enabled: (config.readOnDisabledModels ?? "vanilla") !== "remove", mode: config.readOnDisabledModels ?? "vanilla", cycle: ["remove", "vanilla"] },
+  const rows: ConfigRow[] = [
+    { key: "autoRead", group: "Auto-read", depth: 0, label: "Auto-read", hint: "Show fresh anchors after write and post-edit diffs", enabled: config.autoRead !== false },
+    { key: "diffContextLines", group: "Auto-read", depth: 1, dependsOn: "autoRead", gated: true, label: "Diff context", hint: "Context lines around each change in post-edit diffs", enabled: config.autoRead !== false, value: config.diffContextLines ?? 1 },
+    { key: "autoReadAll", group: "Auto-read all", depth: 0, label: "Auto-read all", hint: "Attach project files when a session starts", enabled: (config.autoReadAll ?? "off") !== "off", mode: config.autoReadAll ?? "off", cycle: ["off", "outline", "full"] },
+    { key: "autoReadAllRequireGit", group: "Auto-read all", depth: 1, dependsOn: "autoReadAll", gated: true, label: "Git repos only", hint: "Attach only inside a git repository", enabled: config.autoReadAllRequireGit !== false },
+    { key: "autoReadAllIgnore", group: "Auto-read all", depth: 1, dependsOn: "autoReadAll", label: "Ignore folders/files", hint: "Folders, files, or globs that auto-read all skips (comma-separated)", enabled: (config.autoReadAllIgnore ?? []).length > 0, entries: config.autoReadAllIgnore ?? [] },
+    { key: "anchorGrepEnabled", group: "Tools", depth: 0, label: "Anchor grep", hint: "Use anchor_grep instead of the built-in grep", enabled: config.anchorGrepEnabled === true },
+    { key: "copyMoveEnabled", group: "Tools", depth: 0, label: "Copy/move", hint: "Enable the copy and move tools", enabled: config.copyMoveEnabled !== false },
+    { key: "replaceMatchEnabled", group: "Tools", depth: 0, label: "Replace match", hint: "Enable the replace_match tool", enabled: config.replaceMatchEnabled !== false },
+    { key: "requirePath", group: "Edit behavior", depth: 0, label: "Require path", hint: "Edit tools must also send a matching path", enabled: config.requirePath === true },
+    { key: "strictInput", group: "Edit behavior", depth: 0, label: "Strict input", hint: "Reject auto-fixable slips instead of warnings", enabled: config.strictInput === true },
+    { key: "disableOnModels", group: "Model gating", depth: 0, label: "Disable on models", hint: "Model globs that turn off anchored tools (comma-separated)", enabled: (config.disableOnModels ?? []).length > 0, entries: config.disableOnModels ?? [] },
+    { key: "readOnDisabledModels", group: "Model gating", depth: 1, dependsOn: "disableOnModels", gated: true, label: "Read on disabled models", hint: "Keep read available for models disabled above", enabled: (config.readOnDisabledModels ?? "vanilla") !== "remove", mode: config.readOnDisabledModels ?? "vanilla", cycle: ["remove", "vanilla"] },
   ];
+  for (const row of rows) {
+    if (row.gated !== true || row.dependsOn === undefined) continue;
+    const parent = rows.find((candidate) => candidate.key === row.dependsOn);
+    row.disabled = parent !== undefined && !rowActive(parent);
+  }
+  return rows;
 }
 
 function padRow(theme: Theme, innerWidth: number, content: string): string {
-  const padded = content + " ".repeat(Math.max(0, innerWidth - visibleWidth(content)));
+  const clipped = visibleWidth(content) > innerWidth ? truncateToWidth(content, innerWidth) : content;
+  const padded = clipped + " ".repeat(Math.max(0, innerWidth - visibleWidth(clipped)));
   return theme.fg("border", "│") + padded + theme.fg("border", "│");
 }
 
-function modeBox(theme: Theme, mode: string): string {
-  if (mode === "off") return theme.fg("dim", `[${mode}]`);
+function modeBox(theme: Theme, mode: string, disabled?: boolean): string {
+  if (disabled === true || mode === "off") return theme.fg("dim", `[${mode}]`);
   if (mode === "strict") return theme.fg("accent", `[${mode}]`);
   return theme.fg("success", `[${mode}]`);
 }
 
 function numberBox(theme: Theme, value: number, disabled?: boolean): string {
-  if (disabled) return theme.fg("dim", `[${value}]`);
+  if (disabled === true) return theme.fg("dim", `[${value}]`);
   return theme.fg("accent", `[${value}]`);
 }
-function listBox(theme: Theme, entries: string[]): string {
+
+function listBox(theme: Theme, entries: string[], disabled?: boolean): string {
+  if (disabled === true) return theme.fg("dim", `[${entries.length}]`);
   return theme.fg("accent", `[${entries.length}]`);
 }
-function formatList(entries: string[]): string {
-  if (entries.length === 0) return "(empty)";
-  const joined = entries.join(", ");
-  return joined.length > 40 ? `${joined.slice(0, 37)}...` : joined;
+
+function rowBox(theme: Theme, row: ConfigRow): string {
+  if (row.entries !== undefined) return listBox(theme, row.entries, row.disabled);
+  if (row.value !== undefined) return numberBox(theme, row.value, row.disabled);
+  if (row.mode !== undefined) return modeBox(theme, row.mode, row.disabled);
+  if (row.disabled === true) return theme.fg("dim", row.enabled ? "[x]" : "[ ]");
+  return row.enabled ? theme.fg("success", "[x]") : theme.fg("dim", "[ ]");
+}
+
+function rowDetail(row: ConfigRow): string {
+  if (row.entries === undefined) return row.hint;
+  const joined = row.entries.length > 0 ? row.entries.join(", ") : "(empty)";
+  return `${row.hint}: ${joined}`;
 }
 
 export class HashlineConfigOverlay {
   private rows: ConfigRow[];
   private selected = 0;
+  private scrollTop = 0;
   private editingList = false;
   private editBuffer = "";
 
-  constructor(private readonly opts: { tui: { requestRender(force?: boolean): void }; theme: Theme; done: () => void; onToggle: (key: ConfigToggleKey, delta?: number, value?: string) => Promise<void> }) {
+  constructor(private readonly opts: { tui: { requestRender(force?: boolean): void }; theme: Theme; done: () => void; maxHeight?: () => number | undefined; onToggle: (key: ConfigToggleKey, delta?: number, value?: string) => Promise<void> }) {
     this.rows = [];
   }
 
@@ -100,6 +130,16 @@ export class HashlineConfigOverlay {
     this.opts.tui.requestRender(true);
   }
 
+  private applyCycle(row: ConfigRow, step: number): void {
+    if (row.cycle === undefined || row.mode === undefined) return;
+    const index = row.cycle.indexOf(row.mode);
+    const next = row.cycle[(index + step + row.cycle.length) % row.cycle.length];
+    if (next === undefined) return;
+    row.mode = next;
+    row.enabled = next !== "off";
+    this.runToggle(row, step);
+  }
+
   private toggleSelected(): void {
     const row = this.rows[this.selected];
     if (!row || row.disabled) return;
@@ -112,22 +152,31 @@ export class HashlineConfigOverlay {
       this.runToggle(row, 1);
       return;
     }
-    if (row.cycle && row.mode !== undefined) {
-      const next = row.cycle[(row.cycle.indexOf(row.mode) + 1) % row.cycle.length] ?? row.cycle[0];
-      if (next === undefined) return;
-      row.mode = next;
-      row.enabled = next !== "off";
-    } else {
-      row.enabled = !row.enabled;
+    if (row.cycle !== undefined && row.mode !== undefined) {
+      this.applyCycle(row, 1);
+      return;
     }
+    row.enabled = !row.enabled;
     this.runToggle(row);
   }
 
   private adjustSelected(delta: number): void {
     const row = this.rows[this.selected];
-    if (!row || row.disabled || row.value === undefined) return;
-    row.value += delta;
-    this.runToggle(row, delta);
+    if (!row || row.disabled) return;
+    if (row.value !== undefined) {
+      row.value += delta;
+      this.runToggle(row, delta);
+      return;
+    }
+    if (row.cycle !== undefined && row.mode !== undefined) {
+      this.applyCycle(row, delta > 0 ? 1 : -1);
+      return;
+    }
+    if (row.entries !== undefined) return;
+    const wanted = delta > 0;
+    if (row.enabled === wanted) return;
+    row.enabled = wanted;
+    this.runToggle(row);
   }
 
   handleInput(data: string): void {
@@ -177,11 +226,6 @@ export class HashlineConfigOverlay {
       this.toggleSelected();
       return;
     }
-    const row = this.rows[this.selected];
-    if ((data === "e" || data === "E") && row && row.entries !== undefined && !row.disabled) {
-      this.startListEdit(row);
-      return;
-    }
     if (matchesKey(data, Key.escape) || data === "q") {
       this.opts.done();
     }
@@ -193,24 +237,60 @@ export class HashlineConfigOverlay {
   render(width: number): string[] {
     const theme = this.opts.theme;
     const innerWidth = width - 2;
-    const lines: string[] = [];
-    lines.push(theme.fg("border", `╭${"─".repeat(innerWidth)}╮`));
-    lines.push(padRow(theme, innerWidth, ` ${theme.fg("accent", theme.bold("Hashline Config"))}`));
-    lines.push(theme.fg("border", `├${"─".repeat(innerWidth)}┤`));
+    const body: string[] = [];
+    const spans: Array<{ start: number; end: number }> = [];
+    let group = "";
     this.rows.forEach((row, index) => {
-      const cursor = index === this.selected ? theme.fg("accent", "> ") : "  ";
-      const box = row.entries !== undefined ? listBox(theme, row.entries) : row.value !== undefined ? numberBox(theme, row.value, row.disabled) : row.mode !== undefined ? modeBox(theme, row.mode) : row.enabled ? theme.fg("success", "[x]") : theme.fg("dim", "[ ]");
-      const label = row.disabled ? theme.fg("dim", row.label) : index === this.selected ? theme.fg("accent", theme.bold(row.label)) : row.label;
-      const suffix = row.entries !== undefined ? ` — ${row.hint}: ${formatList(row.entries)}` : ` — ${row.hint}`;
-      lines.push(padRow(theme, innerWidth, `${cursor}${box} ${label} ${theme.fg("dim", suffix)}`));
-      if (row.entries !== undefined && index === this.selected && this.editingList) {
-        lines.push(padRow(theme, innerWidth, `  ${theme.fg("accent", "edit:")} ${this.editBuffer}█ ${theme.fg("dim", "(Enter save · Esc cancel · Ctrl-U clear)")}`));
+      if (row.group !== group) {
+        group = row.group;
+        body.push(padRow(theme, innerWidth, theme.fg("dim", theme.bold(` ${group}`))));
       }
+      const start = body.length;
+      const selected = index === this.selected;
+      const indent = "  ".repeat(row.depth);
+      const cursor = selected ? theme.fg("accent", "> ") : "  ";
+      const box = rowBox(theme, row);
+      const label = row.disabled === true ? theme.fg("dim", row.label) : selected ? theme.fg("accent", theme.bold(row.label)) : row.label;
+      const headWidth = 2 + indent.length + visibleWidth(box) + 1;
+      const contentWidth = Math.max(1, innerWidth - headWidth);
+      wrapTextWithAnsi(label, contentWidth).forEach((segment, part) => {
+        body.push(padRow(theme, innerWidth, (part === 0 ? `${cursor}${indent}${box} ` : " ".repeat(headWidth)) + segment));
+      });
+      for (const segment of wrapTextWithAnsi(theme.fg("dim", rowDetail(row)), contentWidth)) {
+        body.push(padRow(theme, innerWidth, " ".repeat(headWidth) + segment));
+      }
+      if (row.entries !== undefined && selected && this.editingList) {
+        const edit = `${theme.fg("accent", "edit:")} ${this.editBuffer}█ ${theme.fg("dim", "(Enter save · Esc cancel · Ctrl-U clear)")}`;
+        for (const segment of wrapTextWithAnsi(edit, Math.max(1, innerWidth - 2))) {
+          body.push(padRow(theme, innerWidth, `  ${segment}`));
+        }
+      }
+      spans.push({ start, end: body.length - 1 });
     });
-    lines.push(theme.fg("border", `├${"─".repeat(innerWidth)}┤`));
-    const footer = this.editingList ? " type to edit · Enter save · Esc cancel" : " ↑↓ navigate · space toggle · ←/→ or -/+ adjust · e edit list · q close";
-    lines.push(padRow(theme, innerWidth, theme.fg("dim", footer)));
-    lines.push(theme.fg("border", `╰${"─".repeat(innerWidth)}╯`));
-    return lines;
+    const head = [
+      theme.fg("border", `╭${"─".repeat(innerWidth)}╮`),
+      padRow(theme, innerWidth, ` ${theme.fg("accent", theme.bold("Hashline Config"))}`),
+      theme.fg("border", `├${"─".repeat(innerWidth)}┤`),
+    ];
+    const footer = this.editingList ? " type to edit · Enter save · Esc cancel" : " ↑↓ navigate · space toggle/edit · ←/→ or -/+ adjust · q close";
+    const tail = [
+      theme.fg("border", `├${"─".repeat(innerWidth)}┤`),
+      padRow(theme, innerWidth, theme.fg("dim", footer)),
+      theme.fg("border", `╰${"─".repeat(innerWidth)}╯`),
+    ];
+    const limit = this.opts.maxHeight?.();
+    if (limit === undefined || body.length + head.length + tail.length <= limit) {
+      this.scrollTop = 0;
+      return [...head, ...body, ...tail];
+    }
+    const viewport = Math.max(1, limit - head.length - tail.length);
+    const span = spans[this.selected] ?? { start: 0, end: 0 };
+    let top = this.scrollTop;
+    if (span.end - span.start + 1 > viewport) top = span.start;
+    else if (span.start < top) top = span.start;
+    else if (span.end >= top + viewport) top = span.end - viewport + 1;
+    top = Math.max(0, Math.min(top, Math.max(0, body.length - viewport)));
+    this.scrollTop = top;
+    return [...head, ...body.slice(top, top + viewport), ...tail];
   }
 }