@cueloop/client 0.1.0-alpha.7 → 0.1.0-alpha.70

package/src/config.ts

@@ -1,7 +1,8 @@
 /**
- * Layered TOML config (#20): built-in defaults → user config → trusted repo
+ * Layered TOML config: built-in defaults → user config → trusted repo
  * config → env. Sections: [keys] action = "combo" (every action rebindable),
- * [theme] per-token overrides, [integrations.obsidian] notes-vault export.
+ * [theme] per-token overrides, [ui] auto_close + editor + theme (a named
+ * preset) + pins, [integrations.obsidian] notes-vault export.
  */
 
 import { existsSync, readFileSync } from "node:fs";
@@ -10,7 +11,9 @@ import { join } from "node:path";
 import { OBSIDIAN_DEFAULTS, type ObsidianConfig } from "@cueloop/integration-obsidian";
 import { writeFileSync, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
+import * as v from "valibot";
 import { DARK, type Theme } from "./theme";
+import { DEFAULT_THEME_NAME, isThemeName, themeForName, type ThemeName } from "./theme-presets";
 
 export interface KeymapConfig {
   [action: string]: string | string[];
@@ -23,127 +26,456 @@ export interface IntegrationsConfig {
 /** Post-submit behavior: "off" prompts, 0 closes instantly, N counts down. */
 export type AutoClose = "off" | number;
 
+/** How the Changes diff renders when wide: old|new side by side, or one stacked column. A narrow
+ *  (unzoomed) pane has no room for two columns, so it is always stacked regardless of this choice. */
+export type DiffViewMode = "split" | "stacked";
+
+/** One marker-popover quick action: a preset comment body, plus optional extra lines. */
+export interface QuickAction {
+  prompt: string;
+  metadata?: string;
+}
+
+/** The built-in quick-actions for the marker popover when no `[[actions]]` are configured. */
+export const DEFAULT_QUICK_ACTIONS: QuickAction[] = [
+  {
+    prompt: "Zoom out, research in depth",
+    metadata: "Research the broader problem, prior art, and alternatives before changing anything.",
+  },
+  {
+    prompt: "Restate simplified",
+    metadata: "Restate this as the simplest thing that works and cut the incidental complexity.",
+  },
+  {
+    prompt: "Out of scope",
+    metadata:
+      "This is out of scope for the task, so capture it as a follow-up instead of doing it now.",
+  },
+  {
+    prompt: "Let's chat about this",
+    metadata:
+      "Do not implement yet, and surface the open questions and trade-offs so we decide together.",
+  },
+  {
+    prompt: "Prototype this",
+    metadata: "Build a throwaway prototype to answer the question, skipping tests and polish.",
+  },
+  {
+    prompt: "Ensure 0 regressions",
+    metadata:
+      "Characterize the current behavior with tests first, then keep them green through the change.",
+  },
+  {
+    prompt: "Consider existing repo patterns",
+    metadata:
+      "Follow the nearest existing pattern in this codebase rather than introducing a new one.",
+  },
+  {
+    prompt: "LGTM",
+    metadata: "This looks good to me.",
+  },
+];
+
+/** The comment body a quick action expands to: the prompt, then its system prompt when set. */
+export function quickActionBody(action: QuickAction): string {
+  return action.metadata ? `${action.prompt}\n\n${action.metadata}` : action.prompt;
+}
+
+/** Resolve a quick action by 1-based index or case-insensitive prompt; undefined when no match. */
+export function resolveQuickAction(
+  actions: QuickAction[],
+  actionRef: string,
+): QuickAction | undefined {
+  const index = Number(actionRef);
+
+  if (Number.isInteger(index) && index >= 1 && index <= actions.length) return actions[index - 1];
+  const wanted = actionRef.trim().toLowerCase();
+
+  return actions.find((action) => action.prompt.toLowerCase() === wanted);
+}
+
 export interface CueloopConfig {
   keys: Record<string, string[]>;
   theme: Theme;
-  ui: { autoClose: AutoClose };
+  /** The `[theme]` per-token overrides alone, so a live theme switch can re-compose them onto a new preset. */
+  themeOverrides: Partial<Theme>;
+  ui: {
+    autoClose: AutoClose;
+    editor?: string;
+    /** The selected theme preset name; its tokens are the base for `theme`, before any `[theme]` overrides. */
+    theme: ThemeName;
+    /** How the Changes diff renders when wide: old|new side by side or one stacked column. */
+    diffView: DiffViewMode;
+    /** Session ids the user has pinned to the top of the sidebar; client-local view state. */
+    pins: string[];
+  };
+  /** Planner-local author renames: identity id → display name ([authors] table). */
+  authors: Record<string, string>;
+  /** Marker-popover quick actions ([[actions]] tables); the 5 defaults when unset. */
+  actions: QuickAction[];
+  /** Directory of user-level skills surfaced in the "/" palette ([skills] path); ~/.agents/skills default. */
+  skillsPath: string;
   integrations: IntegrationsConfig;
+  /** Opt-in experimental features ([experimental] table); all default off. */
+  experimental: ExperimentalConfig;
+}
+
+export interface ExperimentalConfig {
+  /** Render a prototype as a pixel mockup (kitty graphics) instead of the default markdown design doc. */
+  prototypePixels: boolean;
 }
 
 /** Every action in the grammar, with its default binding(s). */
-export const DEFAULT_KEYS: Record<string, string[]> = {
+export const DEFAULT_KEYS: CueloopConfig["keys"] = {
   down: ["j", "down"],
   up: ["k", "up"],
   top: ["g"],
   bottom: ["G"],
   span: ["v"],
   comment: ["c"],
-  suggest: ["s"],
   cut: ["x"],
+  reject_hunk: ["X"],
+  restore_curation: ["u"],
+  collapse_file: ["right"],
+  expand_file: ["left"],
+  split_diff: ["s"],
   edit: ["e"],
   next_annotation: ["n"],
   prev_annotation: ["p"],
   delete_annotation: ["backspace"],
+  rename: ["r"],
   submit: ["return", "enter"],
+  share: ["S"],
   quit: ["q"],
+  walk: ["w"],
 };
 
-function parseToml(text: string): Record<string, unknown> {
-  // Bun ships a native TOML parser
-  return Bun.TOML.parse(text) as Record<string, unknown>;
+const SkillsSectionSchema = v.object({ path: v.optional(v.string()) });
+
+function skillsPathFrom(
+  raw: v.InferOutput<typeof SkillsSectionSchema> | undefined,
+  fallback: string,
+): string {
+  return raw?.path?.trim() ? raw.path.trim() : fallback;
+}
+
+const ConfigDocumentSchema = v.object({
+  actions: v.optional(v.array(v.unknown())),
+  authors: v.optional(v.unknown()),
+  integrations: v.optional(v.unknown()),
+  keys: v.optional(v.unknown()),
+  theme: v.optional(v.unknown()),
+  ui: v.optional(v.unknown()),
+  experimental: v.optional(v.unknown()),
+  skills: v.fallback(v.optional(SkillsSectionSchema), undefined),
+});
+
+const QuickActionSchema = v.object({
+  prompt: v.pipe(
+    v.string(),
+    v.check((prompt) => Boolean(prompt.trim())),
+  ),
+  metadata: v.optional(v.string()),
+});
+
+const AuthorsSchema = v.record(v.string(), v.unknown());
+const KeysSchema = v.record(v.string(), v.unknown());
+const KeyComboSchema = v.union([v.string(), v.array(v.string())]);
+// Every field falls back to undefined on its own, so one bad value in a
+// section never discards the section's other settings.
+const UiSchema = v.object({
+  auto_close: v.fallback(
+    v.optional(v.union([v.literal("off"), v.pipe(v.number(), v.minValue(0))])),
+    undefined,
+  ),
+  editor: v.fallback(v.optional(v.string()), undefined),
+  theme: v.fallback(v.optional(v.string()), undefined),
+  diff_view: v.fallback(v.optional(v.picklist(["split", "stacked", "unified"])), undefined),
+  pins: v.fallback(v.optional(v.array(v.string())), undefined),
+});
+const ObsidianSchema = v.object({
+  vault: v.fallback(v.optional(v.string()), undefined),
+  folder: v.fallback(v.optional(v.string()), undefined),
+  filenameFormat: v.fallback(v.optional(v.string()), undefined),
+  separator: v.fallback(v.optional(v.picklist(["space", "dash", "underscore"])), undefined),
+  exportOn: v.fallback(v.optional(v.picklist(["approve", "resolve", "manual"])), undefined),
+});
+const IntegrationsSchema = v.object({ obsidian: v.optional(ObsidianSchema) });
+const ExperimentalSchema = v.object({
+  prototype_pixels: v.fallback(v.optional(v.boolean()), undefined),
+});
+const ThemeOverridesSchema = v.record(v.string(), v.unknown());
+
+function isThemeToken(token: string): token is keyof Theme {
+  return token in DARK;
+}
+
+function parseToml(text: string) {
+  return v.parse(ConfigDocumentSchema, Bun.TOML.parse(text));
+}
+
+function parseActions(entries: readonly unknown[] | undefined): QuickAction[] | undefined {
+  if (!entries) return undefined;
+  const actions: QuickAction[] = [];
+
+  for (const entry of entries) {
+    const result = v.safeParse(QuickActionSchema, entry);
+
+    if (!result.success) continue;
+    const { prompt, metadata } = result.output;
+
+    actions.push(metadata?.trim() ? { prompt, metadata } : { prompt });
+  }
+
+  return actions.length ? actions : undefined;
 }
 
-function layer(base: CueloopConfig, raw: Record<string, unknown>): CueloopConfig {
+function mergeObsidian(
+  target: ObsidianConfig,
+  obsidian: v.InferOutput<typeof ObsidianSchema>,
+): void {
+  if (obsidian.vault !== undefined) target.vault = obsidian.vault;
+  if (obsidian.folder !== undefined) target.folder = obsidian.folder;
+  if (obsidian.filenameFormat !== undefined) target.filenameFormat = obsidian.filenameFormat;
+  if (obsidian.separator !== undefined) target.separator = obsidian.separator;
+  if (obsidian.exportOn !== undefined) target.exportOn = obsidian.exportOn;
+}
+
+function layer(
+  base: CueloopConfig,
+  raw: v.InferOutput<typeof ConfigDocumentSchema>,
+): CueloopConfig {
   const out: CueloopConfig = {
     keys: { ...base.keys },
     theme: { ...base.theme },
+    themeOverrides: { ...base.themeOverrides },
     ui: { ...base.ui },
+    authors: { ...base.authors },
+    actions: [...base.actions],
+    skillsPath: base.skillsPath,
     integrations: { obsidian: { ...base.integrations.obsidian } },
+    experimental: { ...base.experimental },
   };
-  const keys = raw["keys"] as KeymapConfig | undefined;
-  if (keys) {
-    for (const [action, combo] of Object.entries(keys)) {
-      out.keys[action] = Array.isArray(combo) ? combo : [combo];
+  const actions = parseActions(raw.actions);
+  const authors = v.safeParse(AuthorsSchema, raw.authors);
+  const keys = v.safeParse(KeysSchema, raw.keys);
+  const ui = v.safeParse(UiSchema, raw.ui);
+  const integrations = v.safeParse(IntegrationsSchema, raw.integrations);
+  const experimental = v.safeParse(ExperimentalSchema, raw.experimental);
+
+  if (actions) out.actions = actions;
+  out.skillsPath = skillsPathFrom(raw.skills, base.skillsPath);
+  if (authors.success) {
+    for (const [id, value] of Object.entries(authors.output)) {
+      const name = v.safeParse(v.string(), value);
+
+      if (name.success) out.authors[id] = name.output;
     }
   }
-  const ui = raw["ui"] as { auto_close?: unknown } | undefined;
-  if (ui && ui.auto_close !== undefined) {
-    if (ui.auto_close === "off") out.ui.autoClose = "off";
-    else if (typeof ui.auto_close === "number" && ui.auto_close >= 0) out.ui.autoClose = ui.auto_close;
-  }
-  const theme = raw["theme"] as Partial<Record<keyof Theme, string>> | undefined;
-  if (theme) {
-    for (const [token, value] of Object.entries(theme)) {
-      if (token in out.theme && typeof value === "string") {
-        (out.theme as unknown as Record<string, string>)[token] = value;
-      }
+  if (keys.success) {
+    for (const [action, value] of Object.entries(keys.output)) {
+      const combo = v.safeParse(KeyComboSchema, value);
+
+      if (combo.success)
+        out.keys[action] = Array.isArray(combo.output) ? combo.output : [combo.output];
     }
   }
-  const integrations = raw["integrations"] as Record<string, unknown> | undefined;
-  const obsidian = integrations?.["obsidian"] as Record<string, unknown> | undefined;
-  if (obsidian) {
-    const o = out.integrations.obsidian;
-    if (typeof obsidian["vault"] === "string") o.vault = obsidian["vault"];
-    if (typeof obsidian["folder"] === "string") o.folder = obsidian["folder"];
-    if (typeof obsidian["filenameFormat"] === "string") o.filenameFormat = obsidian["filenameFormat"];
-    const sep = obsidian["separator"];
-    if (sep === "space" || sep === "dash" || sep === "underscore") o.separator = sep;
-    const on = obsidian["exportOn"];
-    if (on === "approve" || on === "resolve" || on === "manual") o.exportOn = on;
+  if (ui.success) {
+    if (ui.output.auto_close !== undefined) out.ui.autoClose = ui.output.auto_close;
+    if (ui.output.editor?.trim()) out.ui.editor = ui.output.editor.trim();
+    // "unified" is the pre-rename spelling of "stacked"; keep loading it so an upgrade never flips the layout
+    if (ui.output.diff_view !== undefined)
+      out.ui.diffView = ui.output.diff_view === "unified" ? "stacked" : ui.output.diff_view;
+    if (ui.output.pins !== undefined) out.ui.pins = ui.output.pins;
+  }
+  if (integrations.success && integrations.output.obsidian) {
+    mergeObsidian(out.integrations.obsidian, integrations.output.obsidian);
   }
+  if (experimental.success && experimental.output.prototype_pixels !== undefined) {
+    out.experimental.prototypePixels = experimental.output.prototype_pixels;
+  }
+
   return out;
 }
 
-export function loadConfig(opts: { repoRoot?: string; userConfigPath?: string } = {}): CueloopConfig {
+export function loadConfig(
+  options: { repoRoot?: string; userConfigPath?: string } = {},
+): CueloopConfig {
   let config: CueloopConfig = {
     keys: { ...DEFAULT_KEYS },
     theme: { ...DARK },
-    ui: { autoClose: "off" },
+    themeOverrides: {},
+    ui: {
+      autoClose: "off",
+      theme: DEFAULT_THEME_NAME,
+      diffView: "split",
+      pins: [],
+    },
+    authors: {},
+    actions: [...DEFAULT_QUICK_ACTIONS],
+    skillsPath: join(homedir(), ".agents", "skills"),
     integrations: { obsidian: { ...OBSIDIAN_DEFAULTS } },
+    experimental: { prototypePixels: false },
   };
-  const userPath =
-    opts.userConfigPath ??
-    process.env.CUELOOP_CONFIG ??
-    join(process.env.XDG_CONFIG_HOME ?? join(homedir(), ".config"), "cueloop", "config.toml");
-  for (const path of [userPath, opts.repoRoot ? join(opts.repoRoot, ".cueloop", "config.toml") : undefined]) {
+  // Theme name and per-token overrides are separate concerns, composed once
+  // after all layers: the last file to set [ui] theme wins, and every [theme]
+  // override from every file lands on top - so a later preset never discards an
+  // earlier file's token overrides.
+  let themeName = DEFAULT_THEME_NAME;
+  const themeOverrides: Partial<Record<keyof Theme, string>> = {};
+  const userPath = userConfigPathFrom(options.userConfigPath);
+
+  for (const path of [
+    userPath,
+    options.repoRoot ? join(options.repoRoot, ".cueloop", "config.toml") : undefined,
+  ]) {
     if (!path || !existsSync(path)) continue;
     try {
-      config = layer(config, parseToml(readFileSync(path, "utf8")));
+      const raw = parseToml(readFileSync(path, "utf8"));
+
+      config = layer(config, raw);
+      const ui = v.safeParse(UiSchema, raw.ui);
+      const rawTheme = ui.success ? ui.output.theme : undefined;
+      const parsedThemeOverrides = v.safeParse(ThemeOverridesSchema, raw.theme);
+
+      if (rawTheme && isThemeName(rawTheme)) themeName = rawTheme;
+      if (parsedThemeOverrides.success) {
+        for (const [token, value] of Object.entries(parsedThemeOverrides.output)) {
+          const override = v.safeParse(v.string(), value);
+
+          if (override.success && isThemeToken(token)) themeOverrides[token] = override.output;
+        }
+      }
     } catch {
       // a broken config never blocks a review; defaults win
     }
   }
+  config.ui.theme = themeName;
+  config.themeOverrides = themeOverrides;
+  config.theme = { ...themeForName(themeName), ...themeOverrides };
+
   return config;
 }
 
 /** Reverse lookup: key name (+shift) → action, per the loaded keymap. */
-export function actionFor(keys: Record<string, string[]>, name: string, shift: boolean): string | undefined {
+export function actionFor(
+  keys: Record<string, string[]>,
+  name: string,
+  shift: boolean,
+): string | undefined {
   const wanted = shift && name.length === 1 ? name.toUpperCase() : name;
+
   for (const [action, combos] of Object.entries(keys)) {
     if (combos.includes(wanted)) return action;
   }
+
   return undefined;
 }
 
-/**
- * Persist the auto-close choice into the user config file. Line-level TOML
- * surgery on the one key we own: replace an existing `auto_close`, or append
- * an `[ui]` section - a full TOML writer is not worth its weight here.
- */
-export function persistAutoClose(value: AutoClose, userConfigPath?: string): void {
-  const path =
+function userConfigPathFrom(userConfigPath?: string): string {
+  return (
     userConfigPath ??
     process.env.CUELOOP_CONFIG ??
-    join(process.env.XDG_CONFIG_HOME ?? join(homedir(), ".config"), "cueloop", "config.toml");
-  const rendered = value === "off" ? '"off"' : String(value);
+    join(process.env.XDG_CONFIG_HOME ?? join(homedir(), ".config"), "cueloop", "config.toml")
+  );
+}
+
+/**
+ * Persist one `[ui]` key into the user config file. Line-level TOML surgery on
+ * the keys we own: replace the existing assignment, or drop it under an `[ui]`
+ * section (appending the section when absent) - a full TOML writer is not worth
+ * its weight here.
+ */
+function persistUiSetting(key: string, rendered: string, userConfigPath?: string): void {
+  const path = userConfigPathFrom(userConfigPath);
   let text = "";
+
   if (existsSync(path)) text = readFileSync(path, "utf8");
-  if (/^\s*auto_close\s*=/m.test(text)) {
-    text = text.replace(/^(\s*)auto_close\s*=.*$/m, `$1auto_close = ${rendered}`);
+  const assignment = new RegExp(`^(\\s*)${key}\\s*=.*$`, "m");
+
+  if (assignment.test(text)) {
+    text = text.replace(assignment, `$1${key} = ${rendered}`);
   } else if (/^\[ui\]/m.test(text)) {
-    text = text.replace(/^\[ui\]\s*$/m, `[ui]\nauto_close = ${rendered}`);
+    text = text.replace(/^\[ui\]\s*$/m, `[ui]\n${key} = ${rendered}`);
+  } else {
+    text = text.trimEnd() + (text.trim() ? "\n\n" : "") + `[ui]\n${key} = ${rendered}\n`;
+  }
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, text);
+}
+
+/** A double-quoted TOML basic string with the quote-breaking characters escaped. */
+function tomlString(value: string): string {
+  return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n")}"`;
+}
+
+/**
+ * Persist the whole quick-action set as `[[actions]]` tables, replacing any
+ * existing ones. The set is the user's entire vocabulary (not merged), so the
+ * old blocks are stripped and the new ones appended. An empty set clears them.
+ */
+export function persistActions(actions: QuickAction[], userConfigPath?: string): void {
+  const path = userConfigPathFrom(userConfigPath);
+  let text = existsSync(path) ? readFileSync(path, "utf8") : "";
+
+  // strip every existing [[actions]] block (header through its key lines)
+  text = text.replace(/^\[\[actions\]\][^[]*/gm, "").trimEnd();
+  const blocks = actions
+    .map((action) => {
+      const lines = [`[[actions]]`, `prompt = ${tomlString(action.prompt)}`];
+
+      if (action.metadata) lines.push(`metadata = ${tomlString(action.metadata)}`);
+
+      return lines.join("\n");
+    })
+    .join("\n\n");
+
+  text = blocks ? `${text ? `${text}\n\n` : ""}${blocks}\n` : `${text}\n`;
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, text);
+}
+
+/** Persist the auto-close choice (`[ui] auto_close`) into the user config. */
+export function persistAutoClose(value: AutoClose, userConfigPath?: string): void {
+  persistUiSetting("auto_close", value === "off" ? '"off"' : String(value), userConfigPath);
+}
+
+/** Persist the selected theme preset (`[ui] theme`) into the user config. */
+export function persistTheme(name: ThemeName, userConfigPath?: string): void {
+  persistUiSetting("theme", `"${name}"`, userConfigPath);
+}
+
+/** Persist the diff-view choice (`[ui] diff_view`) into the user config. */
+export function persistDiffView(mode: DiffViewMode, userConfigPath?: string): void {
+  persistUiSetting("diff_view", `"${mode}"`, userConfigPath);
+}
+
+/** Persist the pinned-thread ids (`[ui] pins`) into the user config. */
+export function persistPins(ids: readonly string[], userConfigPath?: string): void {
+  persistUiSetting("pins", `[${ids.map(tomlString).join(", ")}]`, userConfigPath);
+}
+
+function escapeRegExp(text: string): string {
+  return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+/**
+ * Persist an author rename into the `[authors]` table. The identity id (an SSH
+ * fingerprint) is not a bare TOML key, so it is written quoted.
+ */
+export function persistAuthorName(id: string, name: string, userConfigPath?: string): void {
+  const path = userConfigPathFrom(userConfigPath);
+  let text = existsSync(path) ? readFileSync(path, "utf8") : "";
+  const key = `"${id.replace(/"/g, '\\"')}"`;
+  const value = `"${name.replace(/"/g, '\\"')}"`;
+  const assignment = new RegExp(`^(\\s*)${escapeRegExp(key)}\\s*=.*$`, "m");
+
+  if (assignment.test(text)) {
+    text = text.replace(assignment, `$1${key} = ${value}`);
+  } else if (/^\[authors\]/m.test(text)) {
+    text = text.replace(/^\[authors\]\s*$/m, `[authors]\n${key} = ${value}`);
   } else {
-    text = text.trimEnd() + (text.trim() ? "\n\n" : "") + `[ui]\nauto_close = ${rendered}\n`;
+    text = text.trimEnd() + (text.trim() ? "\n\n" : "") + `[authors]\n${key} = ${value}\n`;
   }
   mkdirSync(dirname(path), { recursive: true });
   writeFileSync(path, text);

package/src/diff-fold.test.ts

@@ -0,0 +1,78 @@
+/** Per-file collapse and full-file weave over the flat diff rows. */
+
+import { describe, expect, test } from "bun:test";
+import type { DiffRow } from "./view-diff";
+import { applyFold, weaveFullFileRows } from "./diff-fold";
+
+function row(kind: DiffRow["kind"], text: string, extra: Partial<DiffRow> = {}): DiffRow {
+  return { kind, text, file: "a.ts", ...extra };
+}
+
+// a two-line change in a four-line file: line 2 swapped, lines 1/3/4 unchanged
+const base: DiffRow[] = [
+  row("file", "a.ts"),
+  row("hunk", "@@ -1,3 +1,3 @@"),
+  row("ctx", "line one", { oldLine: 1, newLine: 1 }),
+  row("del", "old two", { oldLine: 2 }),
+  row("add", "new two", { newLine: 2 }),
+  row("ctx", "line three", { oldLine: 3, newLine: 3 }),
+];
+
+const contents = {
+  path: "a.ts",
+  oldContents: "line one\nold two\nline three\nline four\n",
+  newContents: "line one\nnew two\nline three\nline four\n",
+};
+
+describe("applyFold", () => {
+  test("with no fold state it returns the base rows unchanged", () => {
+    expect(applyFold(base, new Set(), new Set(), [contents])).toBe(base);
+  });
+
+  test("a collapsed file keeps only its file band", () => {
+    // Act
+    const folded = applyFold(base, new Set(["a.ts"]), new Set(), [contents]);
+
+    // Assert
+    expect(folded).toHaveLength(1);
+    expect(folded[0]).toEqual(row("file", "a.ts"));
+  });
+
+  test("an expanded file weaves the unchanged tail line the hunk never showed", () => {
+    // Act
+    const folded = applyFold(base, new Set(), new Set(["a.ts"]), [contents]);
+
+    // Assert - the hunk header is gone and "line four" (outside the hunk) now shows
+    expect(folded.some((r) => r.kind === "hunk")).toBe(false);
+    const four = folded.find((r) => r.text === "line four");
+
+    expect(four).toEqual(row("ctx", "line four", { oldLine: 4, newLine: 4 }));
+  });
+
+  test("expand is a no-op without the file's full contents", () => {
+    // Act - no contents entry, so the file keeps its hunks
+    const folded = applyFold(base, new Set(), new Set(["a.ts"]), undefined);
+
+    // Assert
+    expect(folded).toEqual(base);
+  });
+});
+
+describe("weaveFullFileRows", () => {
+  test("keeps the change rows and fills every unchanged line as context in order", () => {
+    // Arrange - the file's code rows (no headers)
+    const codeRows = base.slice(2);
+
+    // Act
+    const woven = weaveFullFileRows("a.ts", codeRows, contents.newContents);
+
+    // Assert - full file: ctx1, del, add, ctx3, ctx4
+    expect(woven.map((r) => `${r.kind}:${r.text}`)).toEqual([
+      "ctx:line one",
+      "del:old two",
+      "add:new two",
+      "ctx:line three",
+      "ctx:line four",
+    ]);
+  });
+});