@pi-unipi/utility 2.6.1 → 2.9.0

package/src/{diff/settings.ts → settings.ts}

@@ -1,68 +1,46 @@
 /**
- * @pi-unipi/utility — Unified Settings Manager
+ * @pi-unipi/utility — Settings Manager
  *
- * Manages both badge and diff settings in a single `.unipi/config/util-settings.json` file.
+ * Manages badge settings in `.unipi/config/util-settings.json`.
  * Migrates from legacy `badge.json` on first read.
  */
 
 import * as fs from "node:fs";
 import * as path from "node:path";
 
-/** Diff rendering settings */
-export interface DiffSettings {
-  /** Enable Shiki-powered diff rendering for write/edit tools */
-  enabled: boolean;
-  /** Diff theme preset: "default" | "midnight" | "subtle" | "neon" */
-  theme: string;
-  /** Shiki syntax theme name */
-  shikiTheme: string;
-  /** Minimum terminal columns for split view */
-  splitMinWidth: number;
-}
-
-/** Badge settings (matches existing BadgeSettings interface) */
+/** Badge settings */
 export interface BadgeSettingsSection {
   autoGen: boolean;
   badgeEnabled: boolean;
   agentTool: boolean;
   generationModel: string;
+  /** Sync session name to herdr pane title + tab label (when running inside herdr). */
+  herdrSync: boolean;
 }
 
 /** Unified utility settings */
 export interface UtilSettings {
   badge: BadgeSettingsSection;
-  diff: DiffSettings;
 }
 
-/** Default diff settings */
-const DEFAULT_DIFF_SETTINGS: DiffSettings = {
-  enabled: true,
-  theme: "default",
-  shikiTheme: "github-dark",
-  splitMinWidth: 150,
-};
-
 /** Default badge settings */
 const DEFAULT_BADGE_SETTINGS: BadgeSettingsSection = {
   autoGen: true,
   badgeEnabled: true,
   agentTool: true,
   generationModel: "inherit",
+  herdrSync: true,
 };
 
 /** Default unified settings */
 const DEFAULT_SETTINGS: UtilSettings = {
   badge: { ...DEFAULT_BADGE_SETTINGS },
-  diff: { ...DEFAULT_DIFF_SETTINGS },
 };
 
 /** Config file paths */
 const UTIL_SETTINGS_FILE = ".unipi/config/util-settings.json";
 const BADGE_CONFIG_FILE = ".unipi/config/badge.json";
 
-/**
- * Get absolute path for a config file relative to cwd.
- */
 function getConfigPath(file: string): string {
   return path.resolve(process.cwd(), file);
 }
@@ -81,58 +59,41 @@ function readLegacyBadgeSettings(): BadgeSettingsSection | null {
       badgeEnabled: typeof parsed.badgeEnabled === "boolean" ? parsed.badgeEnabled : DEFAULT_BADGE_SETTINGS.badgeEnabled,
       agentTool: typeof parsed.agentTool === "boolean" ? parsed.agentTool : DEFAULT_BADGE_SETTINGS.agentTool,
       generationModel: typeof parsed.generationModel === "string" ? parsed.generationModel : DEFAULT_BADGE_SETTINGS.generationModel,
+      herdrSync: typeof parsed.herdrSync === "boolean" ? parsed.herdrSync : DEFAULT_BADGE_SETTINGS.herdrSync,
     };
   } catch {
     return null;
   }
 }
 
-/**
- * Atomic write: write to temp file then rename.
- * Prevents corruption if two instances write simultaneously.
- */
 function atomicWrite(filePath: string, data: string): void {
   const tmpPath = filePath + ".tmp";
   fs.writeFileSync(tmpPath, data, "utf-8");
   fs.renameSync(tmpPath, filePath);
 }
 
-/**
- * Read the unified util-settings.json.
- * On first read, migrates from badge.json if it exists.
- * Returns defaults if no config exists.
- */
 export function readUtilSettings(): UtilSettings {
   try {
     const configPath = getConfigPath(UTIL_SETTINGS_FILE);
 
-    // Check if unified config exists
     if (fs.existsSync(configPath)) {
       const parsed = JSON.parse(fs.readFileSync(configPath, "utf-8"));
       return normalizeSettings(parsed);
     }
 
-    // Migration: import from badge.json if it exists
     const legacyBadge = readLegacyBadgeSettings();
     if (legacyBadge) {
-      const migrated: UtilSettings = {
-        badge: legacyBadge,
-        diff: { ...DEFAULT_DIFF_SETTINGS },
-      };
+      const migrated: UtilSettings = { badge: legacyBadge };
       writeUtilSettings(migrated);
       return migrated;
     }
 
-    // No config at all — return defaults (don't write yet)
-    return { ...DEFAULT_SETTINGS, badge: { ...DEFAULT_BADGE_SETTINGS }, diff: { ...DEFAULT_DIFF_SETTINGS } };
+    return { ...DEFAULT_SETTINGS, badge: { ...DEFAULT_BADGE_SETTINGS } };
   } catch {
-    return { ...DEFAULT_SETTINGS, badge: { ...DEFAULT_BADGE_SETTINGS }, diff: { ...DEFAULT_DIFF_SETTINGS } };
+    return { ...DEFAULT_SETTINGS, badge: { ...DEFAULT_BADGE_SETTINGS } };
   }
 }
 
-/**
- * Write the full unified settings to disk.
- */
 export function writeUtilSettings(settings: UtilSettings): void {
   try {
     const configPath = getConfigPath(UTIL_SETTINGS_FILE);
@@ -146,9 +107,6 @@ export function writeUtilSettings(settings: UtilSettings): void {
   }
 }
 
-/**
- * Normalize a parsed JSON object into valid UtilSettings.
- */
 function normalizeSettings(parsed: any): UtilSettings {
   return {
     badge: {
@@ -156,44 +114,48 @@ function normalizeSettings(parsed: any): UtilSettings {
       badgeEnabled: typeof parsed?.badge?.badgeEnabled === "boolean" ? parsed.badge.badgeEnabled : DEFAULT_BADGE_SETTINGS.badgeEnabled,
       agentTool: typeof parsed?.badge?.agentTool === "boolean" ? parsed.badge.agentTool : DEFAULT_BADGE_SETTINGS.agentTool,
       generationModel: typeof parsed?.badge?.generationModel === "string" ? parsed.badge.generationModel : DEFAULT_BADGE_SETTINGS.generationModel,
-    },
-    diff: {
-      enabled: typeof parsed?.diff?.enabled === "boolean" ? parsed.diff.enabled : DEFAULT_DIFF_SETTINGS.enabled,
-      theme: typeof parsed?.diff?.theme === "string" ? parsed.diff.theme : DEFAULT_DIFF_SETTINGS.theme,
-      shikiTheme: typeof parsed?.diff?.shikiTheme === "string" ? parsed.diff.shikiTheme : DEFAULT_DIFF_SETTINGS.shikiTheme,
-      splitMinWidth: typeof parsed?.diff?.splitMinWidth === "number" ? parsed.diff.splitMinWidth : DEFAULT_DIFF_SETTINGS.splitMinWidth,
+      herdrSync: typeof parsed?.badge?.herdrSync === "boolean" ? parsed.badge.herdrSync : DEFAULT_BADGE_SETTINGS.herdrSync,
     },
   };
 }
 
-/**
- * Read only the diff settings section.
- */
-export function readDiffSettings(): DiffSettings {
-  return readUtilSettings().diff;
+/** Read only the badge settings section. */
+export function readBadgeSettings(): BadgeSettingsSection {
+  return readUtilSettings().badge;
 }
 
-/**
- * Write partial diff settings (merged with existing).
- */
-export function writeDiffSettings(partial: Partial<DiffSettings>): void {
+/** Write partial badge settings (merged with existing). */
+export function writeBadgeSettings(partial: Partial<BadgeSettingsSection>): void {
   const settings = readUtilSettings();
-  settings.diff = { ...settings.diff, ...partial };
+  settings.badge = { ...settings.badge, ...partial };
   writeUtilSettings(settings);
 }
 
-/**
- * Read only the badge settings section.
- */
-export function readBadgeSettingsFromUtil(): BadgeSettingsSection {
-  return readUtilSettings().badge;
+/** Update a single badge setting. */
+export function updateBadgeSetting<K extends keyof BadgeSettingsSection>(
+  key: K,
+  value: BadgeSettingsSection[K],
+): BadgeSettingsSection {
+  const settings = readBadgeSettings();
+  settings[key] = value;
+  writeBadgeSettings(settings);
+  return settings;
 }
 
-/**
- * Write partial badge settings (merged with existing).
- */
-export function writeBadgeSettingsToUtil(partial: Partial<BadgeSettingsSection>): void {
-  const settings = readUtilSettings();
-  settings.badge = { ...settings.badge, ...partial };
-  writeUtilSettings(settings);
+/** Format badge settings for display. */
+export function formatBadgeSettings(settings: BadgeSettingsSection): string {
+  const toggle = (v: boolean) => (v ? "✓ enabled" : "✗ disabled");
+  return [
+    "## Badge Settings",
+    "",
+    `| Setting | Status | Description |`,
+    `|---------|--------|-------------|`,
+    `| Auto Generate | ${toggle(settings.autoGen)} | Generate name on first message |`,
+    `| Badge Enabled | ${toggle(settings.badgeEnabled)} | Show badge overlay |`,
+    `| Agent Tool | ${toggle(settings.agentTool)} | Allow agents to call set_session_name |`,
+    `| Herdr Sync | ${toggle(settings.herdrSync)} | Sync session name to herdr tab/pane title |`,
+    `| Generation Model | ${settings.generationModel} | Model for badge name generation |`,
+    "",
+    `Config: .unipi/config/util-settings.json`,
+  ].join("\n");
 }

package/src/tui/name-badge-state.ts

@@ -11,7 +11,8 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { UNIPI_EVENTS, emitEvent } from "@pi-unipi/core";
 import { NameBadgeComponent } from "./name-badge.js";
-import { readBadgeSettings } from "./badge-settings.js";
+import { readBadgeSettings } from "../settings.js";
+import { detectHerdr, syncPaneTitle, type HerdrEnv } from "../herdr-sync.js";
 
 /** Overlay handle from ctx.ui.custom() */
 interface OverlayHandle {
@@ -54,6 +55,7 @@ export class NameBadgeState {
   private pollTimer: ReturnType<typeof setInterval> | null = null;
   private component: NameBadgeComponent | null = null;
   private genTimeout: ReturnType<typeof setTimeout> | null = null;
+  private herdr: HerdrEnv = { enabled: false };
 
   /** Whether the badge is currently visible */
   isVisible(): boolean {
@@ -89,6 +91,13 @@ export class NameBadgeState {
   ): Promise<void> {
     if (this.overlayHandle) return; // Already showing
 
+    // Detect Herdr once per session; sync the current name to its pane title.
+    this.herdr = detectHerdr();
+    if (this.herdr.enabled && readBadgeSettings().herdrSync) {
+      const name = this.safeGetName(pi);
+      void syncPaneTitle(this.herdr, name);
+    }
+
     const name = this.safeGetName(pi);
     this.currentName = name;
     this.visible = true;
@@ -169,7 +178,6 @@ export class NameBadgeState {
       const badgeEntry = entries.findLast(
         (e: any) => e.type === "custom" && e.customType === BADGE_ENTRY_TYPE,
       );
-
       if (badgeEntry?.data?.visible) {
         await this.show(pi, ctx);
       }
@@ -224,6 +232,10 @@ export class NameBadgeState {
       this.currentName = name;
       this.component?.setName(name);
       this.overlayHandle?.requestRender?.();
+      // Sync to Herdr pane title (scroll-proof display)
+      if (readBadgeSettings().herdrSync) {
+        void syncPaneTitle(this.herdr, name);
+      }
       // Clear generation timeout if active
       this.clearGenTimeout();
     } catch {
@@ -251,6 +263,10 @@ export class NameBadgeState {
         this.currentName = name;
         this.component?.setName(name);
         this.overlayHandle?.requestRender?.();
+        // Sync to Herdr pane title (scroll-proof display)
+        if (readBadgeSettings().herdrSync) {
+          void syncPaneTitle(this.herdr, name);
+        }
       }
     }, POLL_INTERVAL_MS);
   }

package/src/tui/name-badge.ts

@@ -96,13 +96,14 @@ export class NameBadgeComponent implements Component {
       ? this.theme.fg(fgColor as any, displayText)
       : displayText;
 
-    // Build lines with opaque background spanning full width
-    const topLine = bgFn(border("╭" + "─".repeat(innerWidth) + "╮"));
+    // Build single line with opaque background (no top/bottom borders to
+    // minimize vertical blocking — the badge stays at the top of the screen
+    // and a single line blocks far less content than a 3-line box when
+    // scrolling up to read history).
     const contentLine = bgFn(
       border("│") + " ".repeat(leftPad) + nameStyled + " ".repeat(rightPad) + border("│"),
     );
-    const bottomLine = bgFn(border("╰" + "─".repeat(innerWidth) + "╯"));
 
-    return [topLine, contentLine, bottomLine];
+    return [contentLine];
   }
 }