@cueloop/client 0.1.0-alpha.33 → 0.1.0-alpha.35

package/src/config.test.ts

@@ -2,9 +2,19 @@ import { describe, expect, test } from "bun:test";
 import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { DEFAULT_KEYS, actionFor, loadConfig, persistAuthorName, persistReviewState, persistReviewWidth } from "./config";
+import {
+  DEFAULT_KEYS,
+  DEFAULT_QUICK_ACTIONS,
+  actionFor,
+  loadConfig,
+  persistAuthorName,
+  persistReviewState,
+  persistReviewWidth,
+  persistTheme,
+} from "./config";
 import { REVIEW_DEFAULT_WIDTH, REVIEW_MAX_WIDTH } from "./review-panel";
 import { DARK } from "./theme";
+import { themeForName } from "./theme-presets";
 
 describe("loadConfig", () => {
   test("defaults when no file exists", () => {
@@ -155,6 +165,115 @@ describe("loadConfig", () => {
     }
   });
 
+  test("[ui] theme defaults to the branded cueloop preset", () => {
+    // Act
+    const config = loadConfig({ userConfigPath: "/nonexistent/config.toml" });
+
+    // Assert
+    expect(config.ui.theme).toBe("cueloop");
+    expect(config.theme.accent).toBe(DARK.accent);
+  });
+
+  test("[ui] theme selects a named preset as the token base", () => {
+    // Arrange
+    const dir = mkdtempSync(join(tmpdir(), "cueloop-cfg-theme-"));
+    const path = join(dir, "config.toml");
+    writeFileSync(path, `[ui]\ntheme = "nord"\n`);
+
+    try {
+      // Act
+      const config = loadConfig({ userConfigPath: path });
+
+      // Assert
+      expect(config.ui.theme).toBe("nord");
+      expect(config.theme).toEqual(themeForName("nord"));
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("[theme] token overrides layer on top of the selected preset", () => {
+    // Arrange
+    const dir = mkdtempSync(join(tmpdir(), "cueloop-cfg-theme2-"));
+    const path = join(dir, "config.toml");
+    writeFileSync(path, `[ui]\ntheme = "nord"\n\n[theme]\naccent = "#ff0000"\n`);
+
+    try {
+      // Act
+      const config = loadConfig({ userConfigPath: path });
+
+      // Assert
+      expect(config.theme.accent).toBe("#ff0000"); // override wins
+      expect(config.theme.background).toBe(themeForName("nord").background); // preset base survives
+      expect(config.themeOverrides).toEqual({ accent: "#ff0000" }); // deltas exposed for live re-compose
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("a later file's preset keeps an earlier file's [theme] override", () => {
+    // Arrange - user overrides accent; repo picks a preset in a separate file
+    const dir = mkdtempSync(join(tmpdir(), "cueloop-cfg-theme-x-"));
+    const user = join(dir, "user.toml");
+    const repoRoot = join(dir, "repo");
+    writeFileSync(user, `[theme]\naccent = "#ff0000"\n`);
+    Bun.spawnSync(["mkdir", "-p", join(repoRoot, ".cueloop")]);
+    writeFileSync(join(repoRoot, ".cueloop", "config.toml"), `[ui]\ntheme = "nord"\n`);
+
+    try {
+      // Act
+      const config = loadConfig({ userConfigPath: user, repoRoot });
+
+      // Assert - the preset is the base, but the earlier override still wins its token
+      expect(config.ui.theme).toBe("nord");
+      expect(config.theme.background).toBe(themeForName("nord").background);
+      expect(config.theme.accent).toBe("#ff0000");
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("[ui] ignores an unknown theme name and keeps the default", () => {
+    // Arrange
+    const dir = mkdtempSync(join(tmpdir(), "cueloop-cfg-theme3-"));
+    const path = join(dir, "config.toml");
+    writeFileSync(path, `[ui]\ntheme = "solarized-galaxy"\n`);
+
+    try {
+      // Act
+      const config = loadConfig({ userConfigPath: path });
+
+      // Assert
+      expect(config.ui.theme).toBe("cueloop");
+      expect(config.theme.accent).toBe(DARK.accent);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("persistTheme round-trips through the config file", () => {
+    // Arrange
+    const dir = mkdtempSync(join(tmpdir(), "cueloop-cfg-theme4-"));
+    const path = join(dir, "config.toml");
+
+    try {
+      // Act
+      persistTheme("tokyo-night", path);
+
+      // Assert
+      expect(loadConfig({ userConfigPath: path }).ui.theme).toBe("tokyo-night");
+
+      // a second write replaces the key in place
+      // Act
+      persistTheme("gruvbox-dark", path);
+
+      // Assert
+      expect(loadConfig({ userConfigPath: path }).ui.theme).toBe("gruvbox-dark");
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
   test("persistReviewWidth and persistReviewState round-trip through the config file", () => {
     // Arrange
     const dir = mkdtempSync(join(tmpdir(), "cueloop-cfg8-"));
@@ -226,7 +345,10 @@ describe("integrations.obsidian config", () => {
     const repoRoot = join(dir, "repo");
     writeFileSync(user, `[integrations.obsidian]\nvault = "/user/vault"\nexportOn = "resolve"\n`);
     Bun.spawnSync(["mkdir", "-p", join(repoRoot, ".cueloop")]);
-    writeFileSync(join(repoRoot, ".cueloop", "config.toml"), `[integrations.obsidian]\nfolder = "repo-plans"\n`);
+    writeFileSync(
+      join(repoRoot, ".cueloop", "config.toml"),
+      `[integrations.obsidian]\nfolder = "repo-plans"\n`,
+    );
 
     try {
       // Act
@@ -242,6 +364,60 @@ describe("integrations.obsidian config", () => {
   });
 });
 
+describe("quick actions ([[actions]])", () => {
+  test("absent config keeps the built-in defaults", () => {
+    // Act
+    const config = loadConfig({ userConfigPath: "/nonexistent/config.toml" });
+
+    // Assert
+    expect(config.actions).toEqual(DEFAULT_QUICK_ACTIONS);
+    expect(config.actions).toHaveLength(7);
+  });
+
+  test("configured actions replace the defaults, with optional metadata", () => {
+    // Arrange
+    const dir = mkdtempSync(join(tmpdir(), "cueloop-actions-"));
+    const path = join(dir, "config.toml");
+    writeFileSync(
+      path,
+      `[[actions]]\nprompt = "Add a benchmark"\n\n[[actions]]\nprompt = "Guard the edge case"\nmetadata = "null and empty input"\n`,
+    );
+
+    try {
+      // Act
+      const config = loadConfig({ userConfigPath: path });
+
+      // Assert
+      expect(config.actions).toEqual([
+        { prompt: "Add a benchmark" },
+        { prompt: "Guard the edge case", metadata: "null and empty input" },
+      ]);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("a table missing prompt is skipped; the rest replace the defaults", () => {
+    // Arrange
+    const dir = mkdtempSync(join(tmpdir(), "cueloop-actions2-"));
+    const path = join(dir, "config.toml");
+    writeFileSync(
+      path,
+      `[[actions]]\nmetadata = "orphan without a prompt"\n\n[[actions]]\nprompt = "Keep this one"\n`,
+    );
+
+    try {
+      // Act
+      const config = loadConfig({ userConfigPath: path });
+
+      // Assert
+      expect(config.actions).toEqual([{ prompt: "Keep this one" }]);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+});
+
 describe("actionFor", () => {
   test("resolves keys and shifted keys to actions", () => {
     // Assert

package/src/config.ts

@@ -1,9 +1,9 @@
 /**
  * Layered TOML config: built-in defaults → user config → trusted repo
  * config → env. Sections: [keys] action = "combo" (every action rebindable),
- * [theme] per-token overrides, [ui] auto_close + editor + the review-panel
- * layout (review_width + review_state), [integrations.obsidian] notes-vault
- * export.
+ * [theme] per-token overrides, [ui] auto_close + editor + theme (a named
+ * preset) + the review-panel layout (review_width + review_state),
+ * [integrations.obsidian] notes-vault export.
  */
 
 import { existsSync, readFileSync } from "node:fs";
@@ -13,6 +13,7 @@ import { OBSIDIAN_DEFAULTS, type ObsidianConfig } from "@cueloop/integration-obs
 import { writeFileSync, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
 import { DARK, type Theme } from "./theme";
+import { DEFAULT_THEME_NAME, isThemeName, themeForName, type ThemeName } from "./theme-presets";
 import { REVIEW_DEFAULT_WIDTH, clampWidth, type ReviewPanelMode } from "./review-panel";
 
 export interface KeymapConfig {
@@ -26,16 +27,44 @@ export interface IntegrationsConfig {
 /** Post-submit behavior: "off" prompts, 0 closes instantly, N counts down. */
 export type AutoClose = "off" | number;
 
+/** 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" },
+  { prompt: "Restate simplified" },
+  { prompt: "Out of scope" },
+  { prompt: "Let's chat about this" },
+  { prompt: "Prototype this" },
+  { prompt: "Ensure 0 regressions" },
+  { prompt: "Consider existing repo patterns" },
+];
+
 export interface CueloopConfig {
   keys: Record<string, string[]>;
   theme: Theme;
+  /** The `[theme]` per-token overrides alone, so a live theme switch can re-compose them onto a new preset. */
+  themeOverrides: Partial<Theme>;
   /**
    * ui.reviewState / ui.reviewWidth are CLIENT VIEW STATE: the review panel's
    * collapse mode and expanded-rail width, persisted so they survive restarts.
    */
-  ui: { autoClose: AutoClose; editor?: string; reviewState: ReviewPanelMode; reviewWidth: number };
+  ui: {
+    autoClose: AutoClose;
+    editor?: string;
+    reviewState: ReviewPanelMode;
+    reviewWidth: number;
+    /** The selected theme preset name; its tokens are the base for `theme`, before any `[theme]` overrides. */
+    theme: ThemeName;
+  };
   /** 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[];
   integrations: IntegrationsConfig;
 }
 
@@ -47,8 +76,9 @@ export const DEFAULT_KEYS: Record<string, string[]> = {
   bottom: ["G"],
   span: ["v"],
   comment: ["c"],
-  suggest: ["s"],
   cut: ["x"],
+  reject_hunk: ["X"],
+  restore_curation: ["u"],
   edit: ["e"],
   next_annotation: ["n"],
   prev_annotation: ["p"],
@@ -68,14 +98,39 @@ function parseToml(text: string): Record<string, unknown> {
   return Bun.TOML.parse(text) as Record<string, unknown>;
 }
 
+/**
+ * Parse a `[[actions]]` array-of-tables. A table without a non-empty `prompt`
+ * is skipped; any valid table REPLACES the defaults (the whole set is the
+ * user's, not merged). Returns undefined when nothing usable is present.
+ */
+function parseActions(raw: unknown): QuickAction[] | undefined {
+  if (!Array.isArray(raw)) return undefined;
+  const actions: QuickAction[] = [];
+  for (const entry of raw) {
+    if (!entry || typeof entry !== "object") continue;
+    const table = entry as Record<string, unknown>;
+    const prompt = table["prompt"];
+    if (typeof prompt !== "string" || !prompt.trim()) continue;
+    const metadata = table["metadata"];
+    actions.push(
+      typeof metadata === "string" && metadata.trim() ? { prompt, metadata } : { prompt },
+    );
+  }
+  return actions.length ? actions : undefined;
+}
+
 function layer(base: CueloopConfig, raw: Record<string, unknown>): CueloopConfig {
   const out: CueloopConfig = {
     keys: { ...base.keys },
     theme: { ...base.theme },
+    themeOverrides: { ...base.themeOverrides },
     ui: { ...base.ui },
     authors: { ...base.authors },
+    actions: [...base.actions],
     integrations: { obsidian: { ...base.integrations.obsidian } },
   };
+  const actions = parseActions(raw["actions"]);
+  if (actions) out.actions = actions;
   const authors = raw["authors"] as Record<string, unknown> | undefined;
   if (authors) {
     for (const [id, value] of Object.entries(authors)) {
@@ -93,60 +148,98 @@ function layer(base: CueloopConfig, raw: Record<string, unknown>): CueloopConfig
     | 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;
+    else if (typeof ui.auto_close === "number" && ui.auto_close >= 0)
+      out.ui.autoClose = ui.auto_close;
   }
   if (ui && typeof ui.editor === "string" && ui.editor.trim()) out.ui.editor = ui.editor.trim();
   if (ui && typeof ui.review_width === "number" && Number.isFinite(ui.review_width)) {
     out.ui.reviewWidth = clampWidth(ui.review_width);
   }
-  if (ui && (ui.review_state === "expanded" || ui.review_state === "compact" || ui.review_state === "hidden")) {
+  if (
+    ui &&
+    (ui.review_state === "expanded" ||
+      ui.review_state === "compact" ||
+      ui.review_state === "hidden")
+  ) {
     out.ui.reviewState = ui.review_state;
   }
-  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;
-      }
-    }
-  }
   const integrations = raw["integrations"] as Record<string, unknown> | undefined;
   const obsidian = integrations?.["obsidian"] as Record<string, unknown> | undefined;
   if (obsidian) {
     const obsidianConfig = out.integrations.obsidian;
     if (typeof obsidian["vault"] === "string") obsidianConfig.vault = obsidian["vault"];
     if (typeof obsidian["folder"] === "string") obsidianConfig.folder = obsidian["folder"];
-    if (typeof obsidian["filenameFormat"] === "string") obsidianConfig.filenameFormat = obsidian["filenameFormat"];
+    if (typeof obsidian["filenameFormat"] === "string")
+      obsidianConfig.filenameFormat = obsidian["filenameFormat"];
     const separator = obsidian["separator"];
-    if (separator === "space" || separator === "dash" || separator === "underscore") obsidianConfig.separator = separator;
+    if (separator === "space" || separator === "dash" || separator === "underscore")
+      obsidianConfig.separator = separator;
     const exportOn = obsidian["exportOn"];
-    if (exportOn === "approve" || exportOn === "resolve" || exportOn === "manual") obsidianConfig.exportOn = exportOn;
+    if (exportOn === "approve" || exportOn === "resolve" || exportOn === "manual")
+      obsidianConfig.exportOn = exportOn;
   }
   return out;
 }
 
-export function loadConfig(options: { 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", reviewState: "expanded", reviewWidth: REVIEW_DEFAULT_WIDTH },
+    themeOverrides: {},
+    ui: {
+      autoClose: "off",
+      reviewState: "expanded",
+      reviewWidth: REVIEW_DEFAULT_WIDTH,
+      theme: DEFAULT_THEME_NAME,
+    },
     authors: {},
+    actions: [...DEFAULT_QUICK_ACTIONS],
     integrations: { obsidian: { ...OBSIDIAN_DEFAULTS } },
   };
+  // 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]) {
+  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 rawTheme = (raw["ui"] as { theme?: unknown } | undefined)?.theme;
+      if (typeof rawTheme === "string" && isThemeName(rawTheme)) themeName = rawTheme;
+      collectThemeOverrides(raw["theme"], themeOverrides);
     } catch {
       // a broken config never blocks a review; defaults win
     }
   }
+  config.ui.theme = themeName;
+  config.themeOverrides = themeOverrides;
+  config.theme = { ...themeForName(themeName), ...themeOverrides };
   return config;
 }
 
+/** Merge a raw `[theme]` table's known string tokens into the accumulated overrides. */
+function collectThemeOverrides(raw: unknown, into: Partial<Record<keyof Theme, string>>): void {
+  if (!raw || typeof raw !== "object") return;
+  for (const [token, value] of Object.entries(raw)) {
+    if (token in DARK && typeof value === "string") into[token as keyof Theme] = value;
+  }
+}
+
 /** 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;
@@ -199,6 +292,11 @@ export function persistReviewState(state: ReviewPanelMode, userConfigPath?: stri
   persistUiSetting("review_state", `"${state}"`, userConfigPath);
 }
 
+/** Persist the selected theme preset (`[ui] theme`) into the user config. */
+export function persistTheme(name: ThemeName, userConfigPath?: string): void {
+  persistUiSetting("theme", `"${name}"`, userConfigPath);
+}
+
 function escapeRegExp(text: string): string {
   return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }