@timurproko/a1 0.2.5 → 0.2.6-dev.727

package/dist/integrations/pi/components/upstream/theme/theme.js

@@ -1,15 +1,15 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.0.4 (MIT), commit 7c10bd4337495ee613f2224843ecdf349b80d1df,
+ * Provenance: @earendil-works/pi-coding-agent 1.1.0 (MIT), commit abe508e1b89912adde45528136c3221eb69acdd7,
  * packages/coding-agent/src/modes/interactive/theme/theme.ts.
  * Modifications: Source-synchronized theme port: retain pinned theme schema, variable/color
  * resolution, built-in and custom loading, terminal detection, and layout defaults while constructing
- * the public package-root Theme class.
- * Deviations: theme-public-api-boundary, theme-owned-watcher-boundary.
+ * the public package-root Theme class and projecting A1's optional semantic accent.
+ * Deviations: theme-public-api-boundary, theme-owned-watcher-boundary, semantic-accent-projection.
  */
 import { existsSync, readFileSync, readdirSync, watch } from "node:fs";
 import { join } from "node:path";
 import { getAgentDir, initTheme, Theme, } from "../../../startup-public.js";
-import { getCapabilities } from "@earendil-works/pi-tui";
+import { backgroundAnsi, colorToOkhsl, foregroundAnsi, getCapabilities, okhslColor, } from "@earendil-works/pi-tui";
 import { BUILTIN_THEME_RESOURCES, isBuiltinThemeName } from "../../resources/builtin-themes.js";
 export const PINNED_PI_LAYOUT = Object.freeze({
     editorPaddingX: 0,
@@ -31,12 +31,53 @@ const FOREGROUND_COLORS = [
 const BACKGROUND_COLORS = [
     "selectedBg", "searchMatchBg", "userMessageBg", "customMessageBg", "toolPendingBg", "toolSuccessBg", "toolErrorBg",
 ];
+const ACCENT_PALETTE = Object.freeze({
+    purple: Object.freeze({
+        dark: Object.freeze({ kind: "rgb", r: 167, g: 152, b: 215 }),
+        light: Object.freeze({ kind: "rgb", r: 116, g: 89, b: 180 }),
+    }),
+    blue: Object.freeze({ dark: okhslColor(232, 0.54, 0.67), light: okhslColor(231, 0.68, 0.47) }),
+    cyan: Object.freeze({ dark: okhslColor(202, 0.58, 0.67), light: okhslColor(203, 0.73, 0.46) }),
+    green: Object.freeze({ dark: okhslColor(159, 0.59, 0.67), light: okhslColor(159, 0.75, 0.46) }),
+    orange: Object.freeze({ dark: okhslColor(48, 0.75, 0.67), light: okhslColor(48, 0.90, 0.47) }),
+    pink: Object.freeze({ dark: okhslColor(337, 0.72, 0.67), light: okhslColor(337, 0.75, 0.48) }),
+});
+function clamp(value, minimum, maximum) {
+    return Math.max(minimum, Math.min(maximum, value));
+}
+function wrapHue(hue) {
+    return ((hue % 360) + 360) % 360;
+}
+/** Derive the complete semantic family from any primary accent, including future custom colors. */
+export function derivePiAccentProjection(accent, appearance) {
+    const { h, s, l } = colorToOkhsl(accent);
+    const warm = h < 90 || h >= 270;
+    const magenta = h >= 270 && h < 325;
+    const blue = h >= 210 && h < 270;
+    const borderHue = wrapHue(h + (warm ? -20 : 20));
+    const secondaryHue = wrapHue(h + (magenta ? 55 : blue ? -50 : warm ? 35 : -35));
+    const dark = appearance === "dark";
+    const selectedSaturation = clamp(s * (dark ? 0.25 : 0.16), dark ? 0.10 : 0.08, dark ? 0.16 : 0.11);
+    const selectedLightness = dark ? l * 0.37 : 1 - (1 - l) * 0.075;
+    return Object.freeze({
+        accent,
+        border: okhslColor(borderHue, clamp(s * 0.78, 0.30, 0.64), clamp(l - (dark ? 0.17 : 0.11), 0, 1)),
+        secondaryHeading: okhslColor(secondaryHue, clamp(s + 0.20, 0.62, 0.82), clamp(l + (dark ? 0.09 : -0.09), 0, 1)),
+        selectedBg: okhslColor(h, selectedSaturation, selectedLightness),
+        userMessageBg: okhslColor(h, selectedSaturation * 2 / 3, dark ? l * 0.34 : 1 - (1 - l) * 0.055),
+    });
+}
+let activeBaseTheme;
 let activeTheme;
 let activeThemeName;
 let activeThemeMode;
+let activeAccentColor = "purple";
+let packageBorderProjectionEnabled = true;
 let themeWatcher;
 let themeReloadTimer;
 const themeChangeListeners = new Set();
+const accentProjectionBases = new WeakMap();
+const accentProjectionCache = new WeakMap();
 export function ensurePiTheme() {
     if (activeTheme)
         return activeTheme;
@@ -51,13 +92,48 @@ export function currentPiThemeName() {
     ensurePiTheme();
     return activeThemeName;
 }
+export function currentPiAccentColor() {
+    return activeAccentColor;
+}
+/** Paints one menu swatch from a named A1 palette entry. */
+export function renderPiAccentPreview(color, text) {
+    ensurePiTheme();
+    const base = activeBaseTheme;
+    if (!isAccentColor(color))
+        return null;
+    const accent = ACCENT_PALETTE[color][base.appearance];
+    return `${foregroundAnsi(accent, base.getColorMode())}${text}\u001b[39m`;
+}
+/** Keeps the complete comparison theme unmodified while bare A1 projects its semantic accent family. */
+export function setPiPackageBorderProjectionEnabled(enabled) {
+    if (packageBorderProjectionEnabled === enabled)
+        return;
+    packageBorderProjectionEnabled = enabled;
+    if (activeBaseTheme !== undefined)
+        activeTheme = resolvePiAccentTheme(activeBaseTheme);
+    syncPiPackageBorderProjection();
+    notifyThemeChanged();
+}
+/** Reprojects the active base theme; repeated changes never derive from an earlier projection. */
+export function setPiAccentColor(color) {
+    if (activeAccentColor === color)
+        return;
+    activeAccentColor = color;
+    if (activeBaseTheme === undefined)
+        return;
+    activeTheme = resolvePiAccentTheme(activeBaseTheme);
+    syncPiPackageBorderProjection();
+    notifyThemeChanged();
+}
 export function applyPiTheme(name, enableWatcher = false, mode) {
     try {
         const loaded = loadPiTheme(name, mode);
         initTheme(name, false);
-        activeTheme = loaded;
+        activeBaseTheme = loaded;
+        activeTheme = resolvePiAccentTheme(loaded);
         activeThemeName = name;
         activeThemeMode = mode;
+        syncPiPackageBorderProjection();
         if (enableWatcher)
             startPiThemeWatcher(name);
         notifyThemeChanged();
@@ -65,18 +141,23 @@ export function applyPiTheme(name, enableWatcher = false, mode) {
     }
     catch (error) {
         initTheme("dark", false);
-        activeTheme = loadPiTheme("dark", mode);
+        activeBaseTheme = loadPiTheme("dark", mode);
+        activeTheme = resolvePiAccentTheme(activeBaseTheme);
         activeThemeName = "dark";
         activeThemeMode = mode;
+        syncPiPackageBorderProjection();
         notifyThemeChanged();
         return { success: false, name: "dark", error: error instanceof Error ? error.message : String(error) };
     }
 }
 export function applyPiThemeInstance(theme) {
     stopPiThemeWatcher();
-    activeTheme = theme;
-    activeThemeName = theme.name ?? "<in-memory>";
-    activeThemeMode = theme.getColorMode();
+    const base = accentProjectionBases.get(theme) ?? theme;
+    activeBaseTheme = base;
+    activeTheme = resolvePiAccentTheme(base);
+    activeThemeName = base.name ?? "<in-memory>";
+    activeThemeMode = base.getColorMode();
+    syncPiPackageBorderProjection();
     notifyThemeChanged();
     return { success: true, name: activeThemeName };
 }
@@ -236,7 +317,9 @@ function startPiThemeWatcher(name) {
             if (activeThemeName !== name || !existsSync(path))
                 return;
             try {
-                activeTheme = loadPiTheme(name, activeThemeMode);
+                activeBaseTheme = loadPiTheme(name, activeThemeMode);
+                activeTheme = resolvePiAccentTheme(activeBaseTheme);
+                syncPiPackageBorderProjection();
                 notifyThemeChanged();
             }
             catch { }
@@ -248,6 +331,120 @@ function notifyThemeChanged() {
     for (const listener of themeChangeListeners)
         listener();
 }
+function resolvePiAccentTheme(base) {
+    const rootBase = accentProjectionBases.get(base) ?? base;
+    return packageBorderProjectionEnabled ? projectPiAccent(rootBase, activeAccentColor) : rootBase;
+}
+function syncPiPackageBorderProjection() {
+    if (activeBaseTheme === undefined || activeTheme === undefined)
+        return;
+    if (!packageBorderProjectionEnabled) {
+        setPiPackageThemeInstance(activeBaseTheme);
+        return;
+    }
+    const base = activeBaseTheme;
+    const projected = activeTheme;
+    setPiPackageThemeInstance(new Proxy(base, {
+        get(target, property) {
+            if (property === "colors")
+                return Object.freeze({ ...target.colors, border: projected.colors.border });
+            if (property === "fg") {
+                return (token, text) => token === "border"
+                    ? projected.fg(token, text)
+                    : target.fg(token, text);
+            }
+            if (property === "getFgAnsi") {
+                return (token) => token === "border"
+                    ? projected.getFgAnsi(token)
+                    : target.getFgAnsi(token);
+            }
+            if (property === "style") {
+                return (text, options) => target.style(text, {
+                    ...options,
+                    ...(options.fg === "border" ? { fg: projected.colors.border } : {}),
+                });
+            }
+            const value = Reflect.get(target, property, target);
+            return typeof value === "function" ? value.bind(target) : value;
+        },
+    }));
+}
+function setPiPackageThemeInstance(theme) {
+    Reflect.set(globalThis, Symbol.for("@earendil-works/pi-coding-agent:theme"), theme);
+    Reflect.set(globalThis, Symbol.for("@mariozechner/pi-coding-agent:theme"), theme);
+}
+function isAccentColor(value) {
+    return Object.hasOwn(ACCENT_PALETTE, value);
+}
+/** A transparent Theme projection keeps every role outside the selected accent family on the base. */
+function projectPiAccent(base, color) {
+    const rootBase = accentProjectionBases.get(base) ?? base;
+    const cached = accentProjectionCache.get(rootBase)?.get(color);
+    if (cached !== undefined)
+        return cached;
+    const tone = derivePiAccentProjection(ACCENT_PALETTE[color][rootBase.appearance], rootBase.appearance);
+    const accentAnsi = foregroundAnsi(tone.accent, rootBase.getColorMode());
+    const foregrounds = Object.freeze({
+        accent: tone.accent,
+        border: tone.border,
+        mdHeading: tone.secondaryHeading,
+        mdListBullet: tone.secondaryHeading,
+    });
+    const foregroundSequences = Object.freeze({
+        accent: accentAnsi,
+        border: foregroundAnsi(tone.border, rootBase.getColorMode()),
+        mdHeading: foregroundAnsi(tone.secondaryHeading, rootBase.getColorMode()),
+        mdListBullet: foregroundAnsi(tone.secondaryHeading, rootBase.getColorMode()),
+    });
+    const backgrounds = Object.freeze({
+        selectedBg: tone.selectedBg,
+        userMessageBg: tone.userMessageBg,
+    });
+    const backgroundSequences = Object.freeze({
+        selectedBg: backgroundAnsi(tone.selectedBg, rootBase.getColorMode()),
+        userMessageBg: backgroundAnsi(tone.userMessageBg, rootBase.getColorMode()),
+    });
+    const projection = new Proxy(rootBase, {
+        get(target, property) {
+            if (property === "colors")
+                return Object.freeze({
+                    ...target.colors,
+                    ...foregrounds,
+                    ...backgrounds,
+                });
+            if (property === "fg") {
+                return (token, text) => foregroundSequences[token] === undefined
+                    ? target.fg(token, text)
+                    : `${foregroundSequences[token]}${text}\u001b[39m`;
+            }
+            if (property === "bg") {
+                return (token, text) => backgroundSequences[token] === undefined
+                    ? target.bg(token, text)
+                    : `${backgroundSequences[token]}${text}\u001b[49m`;
+            }
+            if (property === "getFgAnsi") {
+                return (token) => foregroundSequences[token] ?? target.getFgAnsi(token);
+            }
+            if (property === "getBgAnsi") {
+                return (token) => backgroundSequences[token] ?? target.getBgAnsi(token);
+            }
+            if (property === "style") {
+                return (text, options) => target.style(text, {
+                    ...options,
+                    ...(typeof options.fg === "string" && foregrounds[options.fg] !== undefined ? { fg: foregrounds[options.fg] } : {}),
+                    ...(typeof options.bg === "string" && backgrounds[options.bg] !== undefined ? { bg: backgrounds[options.bg] } : {}),
+                });
+            }
+            const value = Reflect.get(target, property, target);
+            return typeof value === "function" ? value.bind(target) : value;
+        },
+    });
+    accentProjectionBases.set(projection, rootBase);
+    const projections = accentProjectionCache.get(rootBase) ?? new Map();
+    projections.set(color, projection);
+    accentProjectionCache.set(rootBase, projections);
+    return projection;
+}
 function customThemePath(name) {
     return join(getAgentDir(), "themes", `${name}.json`);
 }

package/dist/integrations/pi/engine/pi-settings-metadata.json

@@ -149,7 +149,7 @@
     },
     "outputPad": {
       "label": "Output padding",
-      "description": "Horizontal padding for user messages, assistant messages, and thinking",
+      "description": "Horizontal padding for messages, tool output, and command output",
       "opensDialog": false,
       "values": [
         "0",