@selesai/code 0.2.1 → 0.3.1

package/dist/extensions/pi-powerline-footer/index.ts

@@ -1,14 +1,16 @@
 import {
   copyToClipboard,
+  CONFIG_DIR_NAME,
+  getAgentDir,
+  getSettingsPath,
   type ExtensionAPI,
   type ReadonlyFooterDataProvider,
   type Theme,
-} from "@earendil-works/pi-coding-agent";
+} from "@selesai/code";
 import type { AssistantMessage } from "@earendil-works/pi-ai";
 import { isKeyRelease, matchesKey, type AutocompleteProvider, type SelectItem, SelectList, truncateToWidth, TUI_KEYBINDINGS, visibleWidth } from "@earendil-works/pi-tui";
 import { readFileSync, writeFileSync, existsSync, mkdirSync, readdirSync } from "node:fs";
 import { join, dirname } from "node:path";
-import { homedir } from "node:os";
 
 import type { ColorScheme, SegmentContext, StatusLinePreset, StatusLineSegmentId } from "./types.ts";
 import type { PowerlineConfig } from "./powerline-config.ts";
@@ -44,9 +46,9 @@ import {
   shortcutUsesSuper,
 } from "./shortcuts.ts";
 import {
-  initVibeManager, 
-  onVibeBeforeAgentStart, 
-  onVibeAgentStart, 
+  initVibeManager,
+  onVibeBeforeAgentStart,
+  onVibeAgentStart,
   onVibeAgentEnd,
   onVibeToolCall,
   getVibeTheme,
@@ -324,23 +326,16 @@ function trackPromptHistory(editor: any): void {
   snapshotPromptHistory(editor);
 }
 
-function getSettingsPath(): string {
-  const homeDir = process.env.HOME || process.env.USERPROFILE || homedir();
-  return join(homeDir, ".pi", "agent", "settings.json");
-}
-
 function getProjectSettingsPath(cwd: string): string {
-  return join(cwd, ".pi", "settings.json");
+  return join(cwd, CONFIG_DIR_NAME, "settings.json");
 }
 
 function getGlobalCompactionPolicyPath(): string {
-  const homeDir = process.env.HOME || process.env.USERPROFILE || homedir();
-  return join(homeDir, ".pi", "agent", "compaction-policy.json");
+  return join(getAgentDir(), "compaction-policy.json");
 }
 
 function getCustomCompactionExtensionPath(): string {
-  const homeDir = process.env.HOME || process.env.USERPROFILE || homedir();
-  return join(homeDir, ".pi", "agent", "extensions", "pi-custom-compaction");
+  return join(getAgentDir(), "extensions", "pi-custom-compaction");
 }
 
 function mergeSettings(base: Record<string, unknown>, override: Record<string, unknown>): Record<string, unknown> {
@@ -413,7 +408,7 @@ function readCompactionPolicyEnabled(configPath: string): boolean | undefined {
 function detectCustomCompactionEnabled(cwd: string): boolean {
   if (!existsSync(getCustomCompactionExtensionPath())) return false;
 
-  const projectSetting = readCompactionPolicyEnabled(join(cwd, ".pi", "compaction-policy.json"));
+  const projectSetting = readCompactionPolicyEnabled(join(cwd, CONFIG_DIR_NAME, "compaction-policy.json"));
   if (projectSetting !== undefined) return projectSetting;
 
   return readCompactionPolicyEnabled(getGlobalCompactionPolicyPath()) ?? false;
@@ -424,13 +419,11 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 }
 
 function getStashHistoryPath(): string {
-  const homeDir = process.env.HOME || process.env.USERPROFILE || homedir();
-  return join(homeDir, ".pi", "agent", "powerline-footer", "stash-history.json");
+  return join(getAgentDir(), "powerline-footer", "stash-history.json");
 }
 
 function getSessionsPath(): string {
-  const homeDir = process.env.HOME || process.env.USERPROFILE || homedir();
-  return join(homeDir, ".pi", "agent", "sessions");
+  return join(getAgentDir(), "sessions");
 }
 
 function getProjectSessionsPath(cwd: string): string {
@@ -885,7 +878,7 @@ function computeResponsiveLayout(
 ): { topContent: string; secondaryContent: string } {
   const separatorDef = getSeparator(presetDef.separator);
   const sepWidth = visibleWidth(separatorDef.left); // separator, no surrounding spaces
-  
+
   const mergedSegments = mergeSegmentsWithCustomItems(presetDef, config.customItems);
   const renderIds = (ids: StatusLineSegmentId[]): string[] => {
     const parts: string[] = [];
@@ -956,7 +949,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
   let bashTranscript = new BashTranscriptStore(bashModeSettings);
   let bashCompletionEngine = new BashCompletionEngine();
   let shellSession: ManagedShellSession | null = null;
-  
+
   // Cache for the top and secondary powerline widgets.
   let lastLayoutWidth = 0;
   let lastLayoutResult: { topContent: string; secondaryContent: string } | null = null;
@@ -1208,10 +1201,10 @@ export default function powerlineFooter(pi: ExtensionAPI) {
     if (ctx.hasUI) {
       ctx.ui.setStatus("stash", undefined);
     }
-    
+
     // Initialize vibe manager (needs modelRegistry from ctx)
     initVibeManager(ctx);
-    
+
     if (enabled && ctx.hasUI) {
       setupCustomEditor(ctx);
       if (event.reason === "startup") {
@@ -1369,18 +1362,18 @@ export default function powerlineFooter(pi: ExtensionAPI) {
       onVibeToolCall(event.toolName, event.input, ctx.ui.setWorkingMessage, agentContext);
     }
   });
-  
+
   // Helper to extract recent agent response text (skipping thinking blocks)
   function getRecentAgentContext(ctx: any): string | undefined {
     const sessionEvents = ctx.sessionManager?.getBranch?.() ?? [];
-    
+
     // Find the most recent assistant message
     for (let i = sessionEvents.length - 1; i >= 0; i--) {
       const e = sessionEvents[i];
       if (e.type === "message" && e.message?.role === "assistant") {
         const content = e.message.content;
         if (!Array.isArray(content)) continue;
-        
+
         // Extract text content, skip thinking blocks
         for (const block of content) {
           if (block.type === "text" && block.text) {
@@ -1690,7 +1683,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
     handler: async (args, ctx) => {
       // Update context reference (command ctx may have more methods)
       currentCtx = ctx;
-      
+
       if (!args?.trim()) {
         // Toggle
         enabled = !enabled;
@@ -1910,7 +1903,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
     handler: async (args, ctx) => {
       const parts = args?.trim().split(/\s+/) || [];
       const subcommand = parts[0]?.toLowerCase();
-      
+
       // No args: show current status
       if (!args || !args.trim()) {
         const theme = getVibeTheme();
@@ -1924,7 +1917,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
         ctx.ui.notify(status, "info");
         return;
       }
-      
+
       // /vibe model [spec] - show or set model
       if (subcommand === "model") {
         const modelSpec = parts.slice(1).join(" ");
@@ -1945,7 +1938,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
         }
         return;
       }
-      
+
       // /vibe mode [generate|file] - show or set mode
       if (subcommand === "mode") {
         const newMode = parts[1]?.toLowerCase();
@@ -1971,7 +1964,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
         }
         return;
       }
-      
+
       // /vibe generate <theme> [count] - generate vibes and save to file
       if (subcommand === "generate") {
         const theme = parts[1];
@@ -1988,7 +1981,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
         ctx.ui.notify(`Generating ${count} vibes for "${theme}"...`, "info");
 
         const result = await generateVibesBatch(theme, count);
-        
+
         if (result.success) {
           ctx.ui.notify(`Generated ${result.count} vibes for "${theme}" → ${result.filePath}`, "info");
         } else {
@@ -1996,7 +1989,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
         }
         return;
       }
-      
+
       // /vibe off - disable
       if (subcommand === "off") {
         const persisted = setVibeTheme(null);
@@ -2007,7 +2000,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
         }
         return;
       }
-      
+
       // /vibe <theme> - set theme (preserve original casing)
       const theme = args.trim();
       const persisted = setVibeTheme(theme);
@@ -2046,7 +2039,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
     let input = 0, output = 0, cacheRead = 0, cacheWrite = 0, cost = 0;
     let lastAssistant: AssistantMessage | undefined;
     let thinkingLevelFromSession: string | null = null;
-    
+
     const sessionEvents = ctx.sessionManager?.getBranch?.() ?? [];
     for (const e of sessionEvents) {
       if (!isRecord(e)) {
@@ -2145,17 +2138,17 @@ export default function powerlineFooter(pi: ExtensionAPI) {
         return lastLayoutResult;
       }
     }
-    
+
     const presetDef = getPreset(config.preset);
     const segmentCtx = buildSegmentContext(currentCtx, theme);
-    
+
     lastLayoutWidth = width;
     lastLayoutResult = computeResponsiveLayout(segmentCtx, presetDef, width);
     lastLayoutSessionName = currentSessionName;
     lastLayoutTimestamp = now;
     layoutDirty = false;
     forceNextLayoutRecompute = false;
-    
+
     return lastLayoutResult;
   }
 
@@ -2717,10 +2710,10 @@ export default function powerlineFooter(pi: ExtensionAPI) {
     const providerName = ctx.model?.provider || "Unknown";
     const loadedCounts = discoverLoadedCounts();
     const recentSessions = getRecentSessions(3);
-    
+
     const header = new WelcomeHeader(modelName, providerName, recentSessions, loadedCounts);
     welcomeHeaderActive = true;
-    
+
     ctx.ui.setHeader(() => {
       return {
         render(width: number): string[] {
@@ -2738,7 +2731,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
     const providerName = ctx.model?.provider || "Unknown";
     const loadedCounts = discoverLoadedCounts();
     const recentSessions = getRecentSessions(3);
-    
+
     const overlaySessionGeneration = sessionGeneration;
 
     // Small delay to let pi-mono finish initialization
@@ -2747,7 +2740,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
         welcomeOverlayShouldDismiss = false;
         return;
       }
-      
+
       const sessionEvents = ctx.sessionManager?.getBranch?.() ?? [];
       const hasActivity = sessionEvents.some((entry: unknown) => {
         if (!isRecord(entry)) return false;
@@ -2757,7 +2750,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
       if (hasActivity) {
         return;
       }
-      
+
       ctx.ui.custom(
         (tui: any, _theme: any, _keybindings: any, done: (result: void) => void) => {
           const welcome = new WelcomeComponent(
@@ -2766,11 +2759,11 @@ export default function powerlineFooter(pi: ExtensionAPI) {
             recentSessions,
             loadedCounts,
           );
-          
+
           let countdown = 30;
           let dismissed = false;
           let interval: ReturnType<typeof setInterval> | null = null;
-          
+
           const dismiss = () => {
             if (dismissed) return;
             dismissed = true;
@@ -2778,7 +2771,7 @@ export default function powerlineFooter(pi: ExtensionAPI) {
             dismissWelcomeOverlay = null;
             done();
           };
-          
+
           interval = setInterval(() => {
             if (dismissed) return;
             countdown--;

package/dist/extensions/pi-powerline-footer/package.json

@@ -30,12 +30,12 @@
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "^0.75.0",
-    "@earendil-works/pi-coding-agent": "^0.75.0",
+    "@selesai/code": "*",
     "@earendil-works/pi-tui": "^0.75.0"
   },
   "devDependencies": {
     "@earendil-works/pi-ai": "^0.75.0",
-    "@earendil-works/pi-coding-agent": "^0.75.0",
+    "@selesai/code": "^0.1.0",
     "@earendil-works/pi-tui": "^0.75.0"
   },
   "pi": {

package/dist/extensions/pi-powerline-footer/tests/bash-mode.test.ts

@@ -29,11 +29,11 @@ function ensureEditorModuleLinks(): { cleanup: () => void } {
   const links = [
     {
       link: join(nodeModulesDir, "pi-coding-agent"),
-      target: "/opt/homebrew/lib/node_modules/@earendil-works/pi-coding-agent",
+      target: "/opt/homebrew/lib/node_modules/@selesai/code",
     },
     {
       link: join(nodeModulesDir, "pi-tui"),
-      target: "/opt/homebrew/lib/node_modules/@earendil-works/pi-coding-agent/node_modules/@earendil-works/pi-tui",
+      target: "/opt/homebrew/lib/node_modules/@selesai/code/node_modules/@earendil-works/pi-tui",
     },
   ];
 
@@ -559,7 +559,7 @@ test("bash editor does not submit pasted multiline input while bracketed paste i
 
   try {
     const { BashModeEditor } = await import("../bash-mode/editor.ts");
-    const { CustomEditor } = await import(new URL("../node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/components/custom-editor.js", import.meta.url).href);
+    const { CustomEditor } = await import(new URL("../node_modules/@selesai/code/dist/modes/interactive/components/custom-editor.js", import.meta.url).href);
 
     let delegated = 0;
     let submitted = 0;
@@ -607,7 +607,7 @@ test("bash editor refreshes shell ghost state after a bracketed paste completes"
 
   try {
     const { BashModeEditor } = await import("../bash-mode/editor.ts");
-    const { CustomEditor } = await import(new URL("../node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/components/custom-editor.js", import.meta.url).href);
+    const { CustomEditor } = await import(new URL("../node_modules/@selesai/code/dist/modes/interactive/components/custom-editor.js", import.meta.url).href);
 
     let delegated = 0;
     let scheduled = 0;
@@ -666,7 +666,7 @@ test("bash editor inserts Finder file drops as path strings", async () => {
 
   try {
     const { BashModeEditor } = await import("../bash-mode/editor.ts");
-    const { KeybindingsManager } = await import(new URL("../node_modules/@earendil-works/pi-coding-agent/dist/core/keybindings.js", import.meta.url).href);
+    const { KeybindingsManager } = await import(new URL("../node_modules/@selesai/code/dist/core/keybindings.js", import.meta.url).href);
     const keybindings = KeybindingsManager.create();
     let scheduled = 0;
     const editor = new BashModeEditor(
@@ -988,7 +988,7 @@ test("bash editor runs copied Pi app action handlers for alt-enter", async () =>
 
   try {
     const { BashModeEditor } = await import("../bash-mode/editor.ts");
-    const { KeybindingsManager } = await import(new URL("../node_modules/@earendil-works/pi-coding-agent/dist/core/keybindings.js", import.meta.url).href);
+    const { KeybindingsManager } = await import(new URL("../node_modules/@selesai/code/dist/core/keybindings.js", import.meta.url).href);
     const { setKittyProtocolActive } = await import(new URL("../node_modules/@earendil-works/pi-tui/dist/keys.js", import.meta.url).href);
     const keybindings = KeybindingsManager.create();
     const editor = new BashModeEditor(
@@ -1034,7 +1034,7 @@ test("bash editor command-z undoes deleted text for supported encodings only", a
 
   try {
     const { BashModeEditor } = await import("../bash-mode/editor.ts");
-    const { KeybindingsManager } = await import(new URL("../node_modules/@earendil-works/pi-coding-agent/dist/core/keybindings.js", import.meta.url).href);
+    const { KeybindingsManager } = await import(new URL("../node_modules/@selesai/code/dist/core/keybindings.js", import.meta.url).href);
     const keybindings = KeybindingsManager.create();
     const createEditor = (options: {
       keybindings?: typeof keybindings;
@@ -1124,7 +1124,7 @@ test("bash editor command-z resets shell history and updates ghost state", async
 
   try {
     const { BashModeEditor } = await import("../bash-mode/editor.ts");
-    const { KeybindingsManager } = await import(new URL("../node_modules/@earendil-works/pi-coding-agent/dist/core/keybindings.js", import.meta.url).href);
+    const { KeybindingsManager } = await import(new URL("../node_modules/@selesai/code/dist/core/keybindings.js", import.meta.url).href);
     const keybindings = KeybindingsManager.create();
     const createEditor = (options: {
       isBashModeActive?: () => boolean;
@@ -1183,7 +1183,7 @@ test("bash editor command arrows jump to editor boundaries", async () => {
 
   try {
     const { BashModeEditor } = await import("../bash-mode/editor.ts");
-    const { KeybindingsManager } = await import(new URL("../node_modules/@earendil-works/pi-coding-agent/dist/core/keybindings.js", import.meta.url).href);
+    const { KeybindingsManager } = await import(new URL("../node_modules/@selesai/code/dist/core/keybindings.js", import.meta.url).href);
     const keybindings = KeybindingsManager.create();
     let renderRequests = 0;
     const editor = new BashModeEditor(
@@ -1381,7 +1381,7 @@ test("one-off bang submit does not accept ghost text before submitting", async (
 
   try {
     const { BashModeEditor } = await import("../bash-mode/editor.ts");
-    const { CustomEditor } = await import(new URL("../node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/components/custom-editor.js", import.meta.url).href);
+    const { CustomEditor } = await import(new URL("../node_modules/@selesai/code/dist/modes/interactive/components/custom-editor.js", import.meta.url).href);
 
     let delegated = 0;
     const superHandleInput = CustomEditor.prototype.handleInput;

package/dist/extensions/pi-powerline-footer/tests/jump-shortcuts.test.ts

@@ -1,7 +1,7 @@
 import test from "node:test";
 import assert from "node:assert/strict";
 import { readFileSync } from "node:fs";
-import { KEYBINDINGS } from "../node_modules/@earendil-works/pi-coding-agent/dist/core/keybindings.js";
+import { KEYBINDINGS } from "../node_modules/@selesai/code/dist/core/keybindings.js";
 import {
   isSupportedSuperShortcut,
   matchesConfiguredShortcut,

package/dist/extensions/pi-powerline-footer/tests/working-vibes.test.ts

@@ -12,11 +12,11 @@ function ensurePiModuleLinks(): { cleanup: () => void } {
   const links = [
     {
       link: join(nodeModulesDir, "pi-coding-agent"),
-      target: "/opt/homebrew/lib/node_modules/@earendil-works/pi-coding-agent",
+      target: "/opt/homebrew/lib/node_modules/@selesai/code",
     },
     {
       link: join(nodeModulesDir, "pi-ai"),
-      target: "/opt/homebrew/lib/node_modules/@earendil-works/pi-coding-agent/node_modules/@earendil-works/pi-ai",
+      target: "/opt/homebrew/lib/node_modules/@selesai/code/node_modules/@earendil-works/pi-ai",
     },
   ];
 

package/dist/extensions/pi-powerline-footer/theme.ts

@@ -1,13 +1,13 @@
 /**
  * Theme system for powerline-footer
- * 
+ *
  * Colors are resolved in order:
  * 1. User overrides from theme.json (if exists)
  * 2. Preset colors
  * 3. Default colors
  */
 
-import type { Theme, ThemeColor } from "@earendil-works/pi-coding-agent";
+import type { Theme, ThemeColor } from "@selesai/code";
 import { existsSync, readFileSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -40,7 +40,7 @@ const DEFAULT_COLORS: Required<ColorScheme> = {
 
 // Rainbow colors for high thinking levels
 const RAINBOW_COLORS = [
-  "#b281d6", "#d787af", "#febc38", "#e4c00f", 
+  "#b281d6", "#d787af", "#febc38", "#e4c00f",
   "#89d281", "#00afaf", "#178fb9", "#b281d6",
 ];
 
@@ -137,10 +137,10 @@ export function resolveColor(
   presetColors?: ColorScheme
 ): ColorValue {
   const userTheme = loadUserTheme();
-  
+
   // Priority: user overrides > preset colors > defaults
-  return userTheme[semantic] 
-    ?? presetColors?.[semantic] 
+  return userTheme[semantic]
+    ?? presetColors?.[semantic]
     ?? DEFAULT_COLORS[semantic];
 }
 

package/dist/extensions/pi-powerline-footer/tps.ts

@@ -12,7 +12,7 @@
  *    into a combined "main + subagents" TPS at agent_end.
  */
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI } from "@selesai/code";
 
 export function setupTpsTracker(pi: ExtensionAPI): void {
 	/** Timestamp when the current assistant message event started. Used as a fallback. */

package/dist/extensions/pi-powerline-footer/types.ts

@@ -1,4 +1,4 @@
-import type { Theme, ThemeColor } from "@earendil-works/pi-coding-agent";
+import type { Theme, ThemeColor } from "@selesai/code";
 
 // Theme color - either a pi theme color name or a custom hex color
 export type ColorValue = ThemeColor | `#${string}`;
@@ -80,7 +80,7 @@ export type StatusLinePreset =
 // Per-segment options
 export interface StatusLineSegmentOptions {
   model?: { showThinkingLevel?: boolean };
-  path?: { 
+  path?: {
     mode?: "basename" | "abbreviated" | "full";
     maxLength?: number;
   };
@@ -148,7 +148,7 @@ export interface SegmentContext {
   sessionId: string | undefined;
   sessionName: string | undefined;
   cwd?: string;
-  
+
   // Computed
   usageStats: UsageStats;
   contextPercent: number;
@@ -161,18 +161,18 @@ export interface SegmentContext {
   shellRunning: boolean;
   shellName: string | null;
   shellCwd: string | null;
-  
+
   // Git
   git: GitStatus;
-  
+
   // Extension statuses
   extensionStatuses: ReadonlyMap<string, string>;
   hiddenExtensionStatusKeys: ReadonlySet<string>;
   customItemsById: ReadonlyMap<string, CustomStatusItem>;
-  
+
   // Options
   options: StatusLineSegmentOptions;
-  
+
   // Theming
   theme: ThemeLike;
   colors: ColorScheme;

package/dist/extensions/pi-powerline-footer/welcome.ts

@@ -1,6 +1,7 @@
 import { readdirSync, existsSync, statSync, readFileSync } from "node:fs";
 import { join, basename } from "node:path";
 import { homedir as osHomedir } from "node:os";
+import { CONFIG_DIR_NAME, getAgentDir, getSettingsPath } from "@selesai/code";
 import type { Component } from "@earendil-works/pi-tui";
 import { truncateToWidth as tuiTruncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { ansi, fgOnly, getFgAnsiCode } from "./colors.ts";
@@ -330,11 +331,16 @@ function logDiscoveryError(scope: string, error: unknown): void {
   console.debug(`[powerline-welcome] ${scope}:`, error);
 }
 
+// ponytail: only .claude paths still need raw home; everything else routes via getAgentDir.
+function homedirSafe(): string {
+  return process.env.HOME || process.env.USERPROFILE || osHomedir();
+}
+
 /**
  * Discover loaded counts by scanning filesystem.
  */
 export function discoverLoadedCounts(): LoadedCounts {
-  const homeDir = process.env.HOME || process.env.USERPROFILE || osHomedir();
+  const homeDir = getAgentDir();
   const cwd = process.cwd();
 
   let contextFiles = 0;
@@ -343,10 +349,10 @@ export function discoverLoadedCounts(): LoadedCounts {
   let promptTemplates = 0;
 
   const agentsMdPaths = [
-    join(homeDir, ".pi", "agent", "AGENTS.md"),
-    join(homeDir, ".claude", "AGENTS.md"),
+    join(homeDir, "AGENTS.md"),
+    join(homedirSafe(), ".claude", "AGENTS.md"),
     join(cwd, "AGENTS.md"),
-    join(cwd, ".pi", "AGENTS.md"),
+    join(cwd, CONFIG_DIR_NAME, "AGENTS.md"),
     join(cwd, ".claude", "AGENTS.md"),
   ];
 
@@ -355,16 +361,16 @@ export function discoverLoadedCounts(): LoadedCounts {
   }
 
   const extensionDirs = [
-    join(homeDir, ".pi", "agent", "extensions"),
+    join(homeDir, "extensions"),
     join(cwd, "extensions"),
-    join(cwd, ".pi", "extensions"),
+    join(cwd, CONFIG_DIR_NAME, "extensions"),
   ];
 
   const countedExtensions = new Set<string>();
 
   const settingsPaths = [
-    join(homeDir, ".pi", "agent", "settings.json"),
-    join(cwd, ".pi", "settings.json"),
+    getSettingsPath(),
+    join(cwd, CONFIG_DIR_NAME, "settings.json"),
   ];
 
   for (const settingsPath of settingsPaths) {
@@ -460,8 +466,8 @@ export function discoverLoadedCounts(): LoadedCounts {
   }
 
   const skillDirs = [
-    join(homeDir, ".pi", "agent", "skills"),
-    join(cwd, ".pi", "skills"),
+    join(homeDir, "skills"),
+    join(cwd, CONFIG_DIR_NAME, "skills"),
     join(cwd, "skills"),
   ];
 
@@ -493,9 +499,9 @@ export function discoverLoadedCounts(): LoadedCounts {
   }
 
   const templateDirs = [
-    join(homeDir, ".pi", "agent", "commands"),
-    join(homeDir, ".claude", "commands"),
-    join(cwd, ".pi", "commands"),
+    join(homeDir, "commands"),
+    join(homedirSafe(), ".claude", "commands"),
+    join(cwd, CONFIG_DIR_NAME, "commands"),
     join(cwd, ".claude", "commands"),
   ];
 
@@ -538,11 +544,12 @@ export function discoverLoadedCounts(): LoadedCounts {
  * Get recent sessions from the sessions directory.
  */
 export function getRecentSessions(maxCount: number = 3): RecentSession[] {
-  const homeDir = process.env.HOME || process.env.USERPROFILE || osHomedir();
+  const homeDir = getAgentDir();
+  const home = homedirSafe();
 
   const sessionsDirs = [
-    join(homeDir, ".pi", "agent", "sessions"),
-    join(homeDir, ".pi", "sessions"),
+    join(homeDir, "sessions"),
+    join(home, CONFIG_DIR_NAME, "sessions"),
   ];
 
   const sessions: { name: string; mtime: number }[] = [];