@pikaa-ai/pikaa 0.3.24 → 0.3.26

package/dist/cli.js

@@ -1636,13 +1636,13 @@ class Session {
       type: "StatusChanged",
       status: "waiting_approval"
     });
-    return new Promise((resolve5) => {
+    return new Promise((resolve) => {
       this.pendingApprovals.set(params.approvalId, (approved) => {
         this.emitEvent({
           type: "StatusChanged",
           status: "running"
         });
-        resolve5(approved);
+        resolve(approved);
       });
     });
   }
@@ -1665,13 +1665,13 @@ class Session {
       type: "StatusChanged",
       status: "waiting_user_input"
     });
-    return new Promise((resolve5) => {
+    return new Promise((resolve) => {
       this.pendingUserQuestions.set(params.questionId, (answer) => {
         this.emitEvent({
           type: "StatusChanged",
           status: "running"
         });
-        resolve5(answer);
+        resolve(answer);
       });
     });
   }
@@ -1701,7 +1701,7 @@ class Session {
     return handleTurnInput(this, { text, images });
   }
   async promptAndWait(text, images, timeoutMs = 30000) {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
         unsub();
         reject(new Error(`Turn timed out after ${timeoutMs}ms`));
@@ -1710,7 +1710,7 @@ class Session {
         if (event.msg.type === "TurnCompleted") {
           clearTimeout(timer);
           unsub();
-          resolve5();
+          resolve();
         } else if (event.msg.type === "Error") {
           clearTimeout(timer);
           unsub();
@@ -1729,8 +1729,8 @@ class Session {
       if (this.submissionQueue.length > 0) {
         yield this.submissionQueue.shift();
       } else {
-        const nextSub = await new Promise((resolve5) => {
-          this.submissionResolvers.push(resolve5);
+        const nextSub = await new Promise((resolve) => {
+          this.submissionResolvers.push(resolve);
         });
         yield nextSub;
       }
@@ -1910,6 +1910,12 @@ class WindowsSandbox {
       return null;
     }
     try {
+      if (this.jobObjectHandle) {
+        try {
+          this.kernel32.symbols.CloseHandle(this.jobObjectHandle);
+        } catch {}
+        this.jobObjectHandle = null;
+      }
       const jobHandle = this.kernel32.symbols.CreateJobObjectW(null, null);
       if (!jobHandle || jobHandle === 0) {
         return null;
@@ -2338,7 +2344,7 @@ function createShellTool(policy = new ExecPolicy) {
             } catch {}
           });
         }
-        const timeoutPromise = new Promise((resolve8) => setTimeout(() => resolve8({ isTimeout: true }), timeoutMs));
+        const timeoutPromise = new Promise((resolve) => setTimeout(() => resolve({ isTimeout: true }), timeoutMs));
         const result = await Promise.race([
           proc.exited.then(async (code) => {
             const stdout = await new Response(proc.stdout).text();
@@ -3756,8 +3762,8 @@ Your nickname is ${nickname}. Your assigned task is: '${params.taskName}'. Focus
     });
     let resolvePromise;
     let rejectPromise;
-    const taskPromise = new Promise((resolve12, reject) => {
-      resolvePromise = resolve12;
+    const taskPromise = new Promise((resolve, reject) => {
+      resolvePromise = resolve;
       rejectPromise = reject;
     });
     const handle = {
@@ -4050,9 +4056,9 @@ function createMultiAgentTools(spawner) {
   };
   return [spawnAgentTool, waitAgentTool, sendInputTool, closeAgentTool, listAgentsTool];
 }
-function registerMultiAgentTools(router2, spawner) {
+function registerMultiAgentTools(router, spawner) {
   for (const tool of createMultiAgentTools(spawner)) {
-    router2.register(tool);
+    router.register(tool);
   }
 }
 
@@ -4452,13 +4458,13 @@ class StdioTransport {
     if (this.isClosed || !this.proc || !this.proc.stdin) {
       throw new GroupyError("MCP Stdio transport is closed");
     }
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve, reject) => {
       const timeoutMs = 30000;
       const timer = setTimeout(() => {
         this.pendingRequests.delete(request.id);
         reject(new GroupyError(`MCP request timed out after ${timeoutMs}ms (method: ${request.method})`));
       }, timeoutMs);
-      this.pendingRequests.set(request.id, { resolve: resolve12, reject, timer });
+      this.pendingRequests.set(request.id, { resolve, reject, timer });
       try {
         const payload = JSON.stringify(request) + `
 `;
@@ -4591,12 +4597,12 @@ class SseTransport {
     if (!this.messageUrl) {
       this.messageUrl = this.endpointUrl;
     }
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
         this.pendingRequests.delete(request.id);
         reject(new GroupyError(`MCP SSE request timed out (method: ${request.method})`));
       }, 30000);
-      this.pendingRequests.set(request.id, { resolve: resolve12, reject, timer });
+      this.pendingRequests.set(request.id, { resolve, reject, timer });
       fetch(this.messageUrl, {
         method: "POST",
         headers: {
@@ -4725,7 +4731,7 @@ class McpManager {
     }
     return client.ping();
   }
-  async removeServer(name, router2) {
+  async removeServer(name, router) {
     const client = this.clients.get(name);
     if (!client)
       return false;
@@ -4734,12 +4740,12 @@ class McpManager {
     } catch {}
     this.clients.delete(name);
     this.serverConfigs.delete(name);
-    if (router2) {
-      router2.unregisterPrefix(`mcp__${name}__`);
+    if (router) {
+      router.unregisterPrefix(`mcp__${name}__`);
     }
     return true;
   }
-  registerToolsIntoRouter(router2) {
+  registerToolsIntoRouter(router) {
     if (this.clients.size === 0)
       return;
     let hasAnyLazyServer = false;
@@ -4763,7 +4769,7 @@ class McpManager {
               return client.callTool(mcpTool.name, args);
             }
           };
-          router2.register(tool);
+          router.register(tool);
         }
       }
       if (client.getResources().length > 0) {
@@ -4813,7 +4819,7 @@ class McpManager {
         }
       }
     };
-    router2.register(callMcpTool);
+    router.register(callMcpTool);
     const getToolSchemaTool = {
       name: "get_mcp_tool_schema",
       description: "Retrieve parameter specification and JSONSchema for a lazy-loaded MCP tool.",
@@ -4842,7 +4848,7 @@ class McpManager {
         return { output: JSON.stringify(tool, null, 2) };
       }
     };
-    router2.register(getToolSchemaTool);
+    router.register(getToolSchemaTool);
     const listResourcesTool = {
       name: "list_mcp_resources",
       description: "List available data resources exposed by a connected MCP server.",
@@ -4862,7 +4868,7 @@ class McpManager {
         return { output: JSON.stringify(client.getResources(), null, 2) };
       }
     };
-    router2.register(listResourcesTool);
+    router.register(listResourcesTool);
     const readResourceTool = {
       name: "read_mcp_resource",
       description: "Read the contents of an MCP resource by URI across connected MCP servers.",
@@ -4892,7 +4898,7 @@ class McpManager {
         }
       }
     };
-    router2.register(readResourceTool);
+    router.register(readResourceTool);
   }
   formatMcpPrompt() {
     if (this.clients.size === 0)
@@ -4961,20 +4967,20 @@ class McpManager {
     } catch {}
     return false;
   }
-  async reload(router2) {
+  async reload(router) {
     await this.closeAll();
-    if (router2) {
-      router2.unregisterPrefix("mcp__");
-      router2.unregister("call_mcp_tool");
-      router2.unregister("get_mcp_tool_schema");
-      router2.unregister("list_mcp_resources");
-      router2.unregister("read_mcp_resource");
+    if (router) {
+      router.unregisterPrefix("mcp__");
+      router.unregister("call_mcp_tool");
+      router.unregister("get_mcp_tool_schema");
+      router.unregister("list_mcp_resources");
+      router.unregister("read_mcp_resource");
     }
     for (const filePath of this.loadedConfigFiles) {
       await this.loadConfigFile(filePath);
     }
-    if (router2) {
-      this.registerToolsIntoRouter(router2);
+    if (router) {
+      this.registerToolsIntoRouter(router);
     }
   }
   getDefaultConfigFile(cwd = process.cwd()) {
@@ -5391,9 +5397,9 @@ class SkillsLoader {
     }
     const all = this.listSkills(cwd, { includeDisabled: false });
     const target = skillName.trim().toLowerCase();
-    const normalize2 = (str) => str.toLowerCase().replace(/[-_\s]/g, "");
-    const targetNorm = normalize2(skillName);
-    const meta = all.find((s) => s.name.toLowerCase() === target) || all.find((s) => normalize2(s.name) === targetNorm);
+    const normalize = (str) => str.toLowerCase().replace(/[-_\s]/g, "");
+    const targetNorm = normalize(skillName);
+    const meta = all.find((s) => s.name.toLowerCase() === target) || all.find((s) => normalize(s.name) === targetNorm);
     if (!meta)
       return null;
     try {
@@ -5590,13 +5596,13 @@ class MemoryStore {
   }
   getProjectMemoryDir(cwd) {
     if (this.customWorkspacePath) {
-      const dir2 = resolve15(this.customWorkspacePath);
-      if (!existsSync18(dir2)) {
+      const dir = resolve15(this.customWorkspacePath);
+      if (!existsSync18(dir)) {
         try {
-          mkdirSync11(dir2, { recursive: true });
+          mkdirSync11(dir, { recursive: true });
         } catch {}
       }
-      return dir2;
+      return dir;
     }
     const slug = this.getProjectSlug(cwd);
     const dir = join10(getProjectsDir(), slug, "memory");
@@ -6126,8 +6132,8 @@ class AuthClient {
     if (!res.ok) {
       let errDetail = `HTTP ${res.status}`;
       try {
-        const data2 = await res.json();
-        errDetail = data2.detail || JSON.stringify(data2);
+        const data = await res.json();
+        errDetail = data.detail || JSON.stringify(data);
       } catch {}
       throw new Error(`Login failed: ${errDetail}`);
     }
@@ -6153,8 +6159,8 @@ class AuthClient {
     const authUrl = `${backendUrl}/api/auth/authorize?response_type=code&client_id=groupy-cli&redirect_uri=${encodeURIComponent(redirectUri)}&code_challenge=${encodeURIComponent(codeChallenge)}&code_challenge_method=S256&state=${state}&direct=1`;
     let serverResolve;
     let serverReject;
-    const codePromise = new Promise((resolve18, reject) => {
-      serverResolve = resolve18;
+    const codePromise = new Promise((resolve, reject) => {
+      serverResolve = resolve;
       serverReject = reject;
     });
     if (options.openBrowser !== false) {
@@ -6539,9 +6545,9 @@ function lcsTokenDiff(oldTokens, newTokens) {
   const m = oldTokens.length;
   const n = newTokens.length;
   const dp = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
-  for (let i2 = 1;i2 <= m; i2++) {
-    for (let j2 = 1;j2 <= n; j2++) {
-      dp[i2][j2] = oldTokens[i2 - 1] === newTokens[j2 - 1] ? dp[i2 - 1][j2 - 1] + 1 : Math.max(dp[i2 - 1][j2], dp[i2][j2 - 1]);
+  for (let i = 1;i <= m; i++) {
+    for (let j = 1;j <= n; j++) {
+      dp[i][j] = oldTokens[i - 1] === newTokens[j - 1] ? dp[i - 1][j - 1] + 1 : Math.max(dp[i - 1][j], dp[i][j - 1]);
     }
   }
   const ops = [];
@@ -6723,7 +6729,7 @@ function parsePatch(oldSrc, newSrc, contextLines = 3) {
 // package.json
 var package_default = {
   name: "@pikaa-ai/pikaa",
-  version: "0.3.24",
+  version: "0.3.26",
   description: "PIKAA CLI - AI coding agent that runs locally in your terminal.",
   main: "./dist/index.js",
   module: "./dist/index.js",
@@ -6749,10 +6755,21 @@ var package_default = {
     "build:js": "bun build ./src/index.ts --outdir ./dist --target=bun && bun build ./src/cli/index.ts --outfile ./dist/cli.js --target=bun",
     "build:exe": "bun build ./src/cli/index.ts --compile --outfile pikaa.exe",
     "build:binaries": "bun run scripts/build-binaries.ts",
+    "publish:packages": "bun run scripts/publish-packages.ts",
     "release:prepare": "bun run scripts/prepare-release.ts",
     build: "bun run build:js && bun run build:exe",
     prepublishOnly: "bun run build:js"
   },
+  optionalDependencies: {
+    "@pikaa-ai/pikaa-linux-x64": "0.3.26",
+    "@pikaa-ai/pikaa-linux-x64-musl": "0.3.26",
+    "@pikaa-ai/pikaa-linux-arm64": "0.3.26",
+    "@pikaa-ai/pikaa-linux-arm64-musl": "0.3.26",
+    "@pikaa-ai/pikaa-darwin-x64": "0.3.26",
+    "@pikaa-ai/pikaa-darwin-arm64": "0.3.26",
+    "@pikaa-ai/pikaa-windows-x64": "0.3.26",
+    "@pikaa-ai/pikaa-windows-arm64": "0.3.26"
+  },
   keywords: [
     "ai",
     "coding-agent",
@@ -6947,8 +6964,8 @@ class BannerAnimator {
 async function renderAnimatedGroupyBanner(info, options) {
   await BannerAnimator.play(info, options);
 }
-function formatTaskProgressPlan(plan2, explanation) {
-  CliFormatter.formatTaskProgressPlan(plan2, explanation);
+function formatTaskProgressPlan(plan, explanation) {
+  CliFormatter.formatTaskProgressPlan(plan, explanation);
 }
 function formatTurnSummary(metrics) {
   CliFormatter.formatTurnSummary(metrics);
@@ -7000,9 +7017,9 @@ class CliFormatter {
     const lat = update.latestVersion.startsWith("v") ? update.latestVersion : `v${update.latestVersion}`;
     const innerWidth = 54;
     const padLine = (content) => {
-      const visibleLen2 = style.stripAnsi(content).length;
-      const padRight2 = Math.max(0, innerWidth - visibleLen2);
-      return `  ${style.yellow("\u2502")}  ${content}${" ".repeat(padRight2)}${style.yellow("\u2502")}`;
+      const visibleLen = style.stripAnsi(content).length;
+      const padRight = Math.max(0, innerWidth - visibleLen);
+      return `  ${style.yellow("\u2502")}  ${content}${" ".repeat(padRight)}${style.yellow("\u2502")}`;
     };
     const topBorder = `  ${style.yellow("\u256D")}${style.yellow("\u2500".repeat(innerWidth + 2))}${style.yellow("\u256E")}`;
     const bottomBorder = `  ${style.yellow("\u2570")}${style.yellow("\u2500".repeat(innerWidth + 2))}${style.yellow("\u256F")}`;
@@ -7149,7 +7166,7 @@ ${preview}${more}`);
     formatted = formatted.replace(/^(#{1,3})\s+(.*)$/gm, `${c.bold}${c.brand}$1 $2${c.reset}`);
     return formatted;
   }
-  static formatTaskProgressPlan(plan2, explanation) {
+  static formatTaskProgressPlan(plan, explanation) {
     console.log();
     if (explanation) {
       console.log(`  ${style.bold(explanation)}`);
@@ -7158,18 +7175,18 @@ ${preview}${more}`);
     const ACTIVE = "\x1B[38;5;174m\u25FC\x1B[0m";
     const PENDING = "\x1B[38;5;246m\u25FB\x1B[0m";
     const DIM = "\x1B[38;5;246m";
-    const RESET2 = "\x1B[0m";
-    for (let i = 0;i < plan2.length; i++) {
-      const item = plan2[i];
+    const RESET = "\x1B[0m";
+    for (let i = 0;i < plan.length; i++) {
+      const item = plan[i];
       if (!item)
         continue;
       const prefix = i === 0 ? "  \u23BF " : "    ";
       if (item.status === "completed") {
-        console.log(`  ${DIM}${prefix}${RESET2}${DONE} \x1B[9m\x1B[38;5;246m${item.step}\x1B[0m`);
+        console.log(`  ${DIM}${prefix}${RESET}${DONE} \x1B[9m\x1B[38;5;246m${item.step}\x1B[0m`);
       } else if (item.status === "in_progress") {
-        console.log(`  ${DIM}${prefix}${RESET2}${ACTIVE} \x1B[1m\x1B[38;5;174m${item.step}\x1B[0m`);
+        console.log(`  ${DIM}${prefix}${RESET}${ACTIVE} \x1B[1m\x1B[38;5;174m${item.step}\x1B[0m`);
       } else {
-        console.log(`  ${DIM}${prefix}${RESET2}${PENDING} \x1B[38;5;246m${item.step}\x1B[0m`);
+        console.log(`  ${DIM}${prefix}${RESET}${PENDING} \x1B[38;5;246m${item.step}\x1B[0m`);
       }
     }
     console.log();
@@ -7242,7 +7259,7 @@ ${preview}${more}`);
     const BG = "\x1B[48;2;43;43;45m";
     const CHEVRON = "\x1B[38;2;128;128;133m";
     const TEXT = "\x1B[38;2;240;240;242m";
-    const RESET2 = "\x1B[0m";
+    const RESET = "\x1B[0m";
     const rawLines = text.split(`
 `);
     const wrappedLines = [];
@@ -7267,7 +7284,7 @@ ${preview}${more}`);
     const formatted = wrappedLines.map((line, idx) => {
       const prefix = idx === 0 ? `${CHEVRON} \u276F ` : `${CHEVRON}   `;
       const padLen = Math.max(0, contentWidth - line.length);
-      return `  ${BG}${prefix}${TEXT}${line}${" ".repeat(padLen)}${RESET2}`;
+      return `  ${BG}${prefix}${TEXT}${line}${" ".repeat(padLen)}${RESET}`;
     });
     return formatted.join(`
 `);
@@ -7290,8 +7307,25 @@ import readline2 from "readline";
 import readline from "readline";
 var keypressEventsInitialized = false;
 var listeners = new Set;
+var rawModeState = null;
+function ensureRawMode(active) {
+  if (!process.stdin.isTTY)
+    return;
+  if (rawModeState === active)
+    return;
+  try {
+    process.stdin.setRawMode(active);
+    rawModeState = active;
+    if (active) {
+      process.stdin.resume();
+    }
+  } catch {}
+}
 function initGlobalKeypress() {
   if (!keypressEventsInitialized && process.stdin.isTTY) {
+    try {
+      process.stdin.on("error", () => {});
+    } catch {}
     readline.emitKeypressEvents(process.stdin);
     keypressEventsInitialized = true;
     process.stdin.on("keypress", (str, key) => {
@@ -7368,15 +7402,15 @@ class InteractiveLineEditor {
   }
   async readLine() {
     if (!process.stdin.isTTY) {
-      return new Promise((resolve18) => {
+      return new Promise((resolve) => {
         const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
         rl.question(this.promptSymbol, (answer) => {
           rl.close();
-          resolve18(answer);
+          resolve(answer);
         });
       });
     }
-    return new Promise((resolve18) => {
+    return new Promise((resolve) => {
       let buffer = "";
       let cursor = 0;
       let selectedIndex = 0;
@@ -7384,12 +7418,7 @@ class InteractiveLineEditor {
       let popupDismissed = false;
       let lastCursorRowFromTop = 0;
       let unsubscribeKeypress = null;
-      if (process.stdin.isTTY) {
-        try {
-          process.stdin.setRawMode(true);
-        } catch {}
-      }
-      process.stdin.resume();
+      ensureRawMode(true);
       const getMatchingCommands = () => {
         if (!buffer.startsWith("/") || popupDismissed)
           return [];
@@ -7423,7 +7452,7 @@ class InteractiveLineEditor {
       };
       const getRule = () => {
         const cols = getTerminalCols();
-        const ruleLen = Math.max(10, cols - 4);
+        const ruleLen = Math.max(10, cols - 6);
         return "\u2500".repeat(ruleLen);
       };
       const ensureVisible = (totalItems, visibleRows) => {
@@ -7449,11 +7478,12 @@ class InteractiveLineEditor {
       const redraw = () => {
         const termCols = getTerminalCols();
         const visiblePromptWidth = this.promptSymbol.replace(/\x1b\[[0-9;]*m/g, "").length;
+        let frame = "";
         if (lastCursorRowFromTop > 0) {
-          process.stdout.write(`\x1B[${lastCursorRowFromTop}A`);
+          frame += `\x1B[${lastCursorRowFromTop}A`;
         }
-        process.stdout.write("\r\x1B[J");
-        process.stdout.write(`${this.promptSymbol}${buffer}`);
+        frame += "\r\x1B[J";
+        frame += `${this.promptSymbol}${buffer}`;
         const totalPromptChars = visiblePromptWidth + buffer.length;
         const promptRows = Math.max(1, Math.floor(totalPromptChars / termCols) + 1);
         const slashMatches = getMatchingCommands();
@@ -7461,39 +7491,39 @@ class InteractiveLineEditor {
         const fileMatches = activeFile ? getMatchingFiles(activeFile.query) : [];
         let menuRows = 0;
         if (buffer.startsWith("/") && !popupDismissed && slashMatches.length > 0) {
-          const BOX_WIDTH = Math.max(20, Math.min(termCols - 4, 120));
+          const BOX_WIDTH = Math.max(20, Math.min(termCols - 6, 120));
           const maxVisible = Math.min(slashMatches.length, 7);
           ensureVisible(slashMatches.length, maxVisible);
           const visibleMatches = slashMatches.slice(scrollTop, scrollTop + maxVisible);
           const menuLines = [];
           const rule = "\u2500".repeat(BOX_WIDTH);
-          const RULE_COLOR2 = "\x1B[38;2;80;80;88m";
+          const RULE_COLOR = "\x1B[38;2;80;80;88m";
           const ACTIVE_COLOR = "\x1B[38;2;225;225;225m";
           const INACTIVE_COLOR = "\x1B[38;2;139;139;144m";
-          const RESET2 = "\x1B[0m";
-          menuLines.push(`  ${RULE_COLOR2}${rule}${RESET2}`);
+          const RESET = "\x1B[0m";
+          menuLines.push(`  ${RULE_COLOR}${rule}${RESET}`);
           const maxDescLen = Math.max(10, BOX_WIDTH - 22);
           for (let i = 0;i < visibleMatches.length; i++) {
             const cmd = visibleMatches[i];
             const actualIdx = scrollTop + i;
             const isSelected = actualIdx === selectedIndex;
-            const marker = isSelected ? `${ACTIVE_COLOR}\u276F${RESET2}` : " ";
+            const marker = isSelected ? `${ACTIVE_COLOR}\u276F${RESET}` : " ";
             const rawName = cmd.name.padEnd(16).slice(0, 16);
             const rawDesc = cmd.description.length > maxDescLen ? cmd.description.slice(0, maxDescLen - 3) + "..." : cmd.description;
             if (isSelected) {
-              menuLines.push(`  ${marker} \x1B[1m${ACTIVE_COLOR}${rawName}${RESET2}  \x1B[1m${ACTIVE_COLOR}${rawDesc}${RESET2}`);
+              menuLines.push(`  ${marker} \x1B[1m${ACTIVE_COLOR}${rawName}${RESET}  \x1B[1m${ACTIVE_COLOR}${rawDesc}${RESET}`);
             } else {
-              menuLines.push(`  ${marker} ${INACTIVE_COLOR}${rawName}${RESET2}  ${INACTIVE_COLOR}${rawDesc}${RESET2}`);
+              menuLines.push(`  ${marker} ${INACTIVE_COLOR}${rawName}${RESET}  ${INACTIVE_COLOR}${rawDesc}${RESET}`);
             }
           }
-          menuLines.push(`  ${RULE_COLOR2}${rule}${RESET2}`);
+          menuLines.push(`  ${RULE_COLOR}${rule}${RESET}`);
           for (const line of menuLines) {
-            process.stdout.write(`
-\x1B[2K${line}`);
+            frame += `
+\x1B[2K${line}`;
           }
           menuRows = menuLines.length;
         } else if (activeFile && !popupDismissed && fileMatches.length > 0) {
-          const BOX_WIDTH = Math.max(20, Math.min(termCols - 4, 120));
+          const BOX_WIDTH = Math.max(20, Math.min(termCols - 6, 120));
           const maxVisible = Math.min(fileMatches.length, 7);
           ensureVisible(fileMatches.length, maxVisible);
           const visibleMatches = fileMatches.slice(scrollTop, scrollTop + maxVisible);
@@ -7525,31 +7555,34 @@ class InteractiveLineEditor {
           menuLines.push(`  ${style.dim("\u2502")}${style.dim(footerPadded)}${style.dim("\u2502")}`);
           menuLines.push(`  ${style.dim("\u2514" + "\u2500".repeat(BOX_WIDTH) + "\u2518")}`);
           for (const line of menuLines) {
-            process.stdout.write(`
-\x1B[2K${line}`);
+            frame += `
+\x1B[2K${line}`;
           }
           menuRows = menuLines.length;
         } else {
-          const RULE_COLOR2 = "\x1B[38;2;60;60;68m";
-          const bottomRule = `  ${RULE_COLOR2}${getRule()}\x1B[0m`;
+          const RULE_COLOR = "\x1B[38;2;60;60;68m";
+          const bottomRule = `  ${RULE_COLOR}${getRule()}\x1B[0m`;
           const modeLine = this.getModeLine();
-          process.stdout.write(`
+          frame += `
 \x1B[2K${bottomRule}
-\x1B[2K${modeLine}`);
+\x1B[2K${modeLine}`;
           menuRows = 2;
         }
         const cursorCharsFromTop = visiblePromptWidth + cursor;
         const cursorRow = Math.floor(cursorCharsFromTop / termCols);
         const cursorCol = cursorCharsFromTop % termCols;
-        const moveUpRows = promptRows - 1 - cursorRow + menuRows;
+        const moveUpRows = Math.max(0, promptRows - 1 - cursorRow + menuRows);
         if (moveUpRows > 0) {
-          process.stdout.write(`\x1B[${moveUpRows}A`);
+          frame += `\x1B[${moveUpRows}A`;
         }
-        process.stdout.write("\r");
+        frame += "\r";
         if (cursorCol > 0) {
-          process.stdout.write(`\x1B[${cursorCol}C`);
+          frame += `\x1B[${cursorCol}C`;
         }
         lastCursorRowFromTop = cursorRow;
+        try {
+          process.stdout.write(frame);
+        } catch {}
       };
       const onResize = () => {
         redraw();
@@ -7565,24 +7598,24 @@ class InteractiveLineEditor {
           unsubscribeKeypress();
           unsubscribeKeypress = null;
         }
-        if (process.stdin.isTTY) {
-          try {
-            process.stdin.setRawMode(false);
-          } catch {}
-        }
+        ensureRawMode(false);
+        let cleanupFrame = "";
         if (lastCursorRowFromTop > 0) {
-          process.stdout.write(`\x1B[${lastCursorRowFromTop}A`);
+          cleanupFrame += `\x1B[${lastCursorRowFromTop}A`;
         }
-        process.stdout.write("\r\x1B[J");
+        cleanupFrame += "\r\x1B[J";
         if (result.trim().length > 0 && !result.startsWith("/")) {
-          process.stdout.write(`${CliFormatter.formatClaudeUserPrompt(result)}
+          cleanupFrame += `${CliFormatter.formatClaudeUserPrompt(result)}
 
-`);
+`;
         } else {
-          process.stdout.write(`
-`);
+          cleanupFrame += `
+`;
         }
-        resolve18(result);
+        try {
+          process.stdout.write(cleanupFrame);
+        } catch {}
+        resolve(result);
       };
       const onKeypress = (_str, key) => {
         if (!key)
@@ -7770,31 +7803,28 @@ async function promptChoice(config) {
       const def = choices[defaultIndex] || choices[0];
       return def ? def.value : "";
     }
-    return new Promise((resolve18) => {
+    return new Promise((resolve) => {
       const rl = readline3.createInterface({ input: process.stdin, output: process.stdout });
-      const promptText = `  ${message} (${choices.map((c3) => `[${c3.key}] ${c3.label}`).join(", ")}): `;
+      const promptText = `  ${message} (${choices.map((c2) => `[${c2.key}] ${c2.label}`).join(", ")}): `;
       rl.question(promptText, (answer) => {
         rl.close();
         const trimmed = answer.trim().toLowerCase();
-        const match = choices.find((c3) => c3.key.toLowerCase() === trimmed);
+        const match = choices.find((c2) => c2.key.toLowerCase() === trimmed);
         if (match) {
-          resolve18(match.value);
+          resolve(match.value);
         } else {
           const def = choices[defaultIndex] || choices[0];
-          resolve18(def ? def.value : "");
+          resolve(def ? def.value : "");
         }
       });
     });
   }
-  return new Promise((resolve18) => {
+  return new Promise((resolve) => {
     let selectedIndex = defaultIndex;
     if (selectedIndex < 0 || selectedIndex >= choices.length)
       selectedIndex = 0;
-    const wasRaw = process.stdin.isRaw;
-    try {
-      process.stdin.setRawMode(true);
-    } catch {}
-    process.stdin.resume();
+    const wasRaw = process.stdin.isRaw ?? false;
+    ensureRawMode(true);
     const render = () => {
       const parts = choices.map((choice, idx) => {
         const isSelected = idx === selectedIndex;
@@ -7813,12 +7843,10 @@ async function promptChoice(config) {
         unsubscribe();
         unsubscribe = null;
       }
-      try {
-        process.stdin.setRawMode(wasRaw ?? false);
-      } catch {}
+      ensureRawMode(wasRaw);
       process.stdout.write(`\r\x1B[1A\r\x1B[2K  ${style.bold(message)} ${style.cyan(`[${confirmedChoice.key}] ${confirmedChoice.label}`)}
 \r\x1B[2K`);
-      resolve18(confirmedChoice.value);
+      resolve(confirmedChoice.value);
     };
     const onKeypress = (_str, key) => {
       if (!key)
@@ -7840,7 +7868,7 @@ async function promptChoice(config) {
       }
       const char = _str ? _str.toLowerCase() : key.name ? key.name.toLowerCase() : "";
       if (char) {
-        const directMatch = choices.find((c3) => c3.key.toLowerCase() === char);
+        const directMatch = choices.find((c2) => c2.key.toLowerCase() === char);
         if (directMatch) {
           cleanup(directMatch);
           return;
@@ -7863,34 +7891,31 @@ async function promptToolApproval(params) {
   const FG = "\x1B[38;2;225;225;225m";
   const MUTED = "\x1B[38;2;139;139;144m";
   const DIM = "\x1B[38;2;108;108;108m";
-  const RESET2 = "\x1B[0m";
+  const RESET = "\x1B[0m";
   console.log();
-  console.log(`  ${BORDER} ${FG}${title}${RESET2}`);
-  console.log(`  ${BORDER} ${MUTED}${command}${RESET2}`);
+  console.log(`  ${BORDER} ${FG}${title}${RESET}`);
+  console.log(`  ${BORDER} ${MUTED}${command}${RESET}`);
   console.log(`  ${BORDER}`);
   const renderCard = (selected) => {
     for (let i = 0;i < options.length; i++) {
       const opt = options[i];
       const active = i === selected;
-      const radio = active ? `${FG}(\u25CF)${RESET2}` : `${DIM}(\u25CB)${RESET2}`;
-      const num = `${FG}${i + 1}${RESET2}`;
-      const label = active ? `\x1B[1m${FG}${opt.label}${RESET2}` : `${MUTED}${opt.label}${RESET2}`;
+      const radio = active ? `${FG}(\u25CF)${RESET}` : `${DIM}(\u25CB)${RESET}`;
+      const num = `${FG}${i + 1}${RESET}`;
+      const label = active ? `\x1B[1m${FG}${opt.label}${RESET}` : `${MUTED}${opt.label}${RESET}`;
       console.log(`  ${BORDER} ${num} ${radio} ${label}`);
     }
     console.log(`  ${BORDER}`);
-    console.log(`  ${FG}${selected + 1}/${options.length}${RESET2}${DIM}:select \u2502 ${FG}Ctrl+o${RESET2}${DIM}:yolo \u2502 ${FG}Ctrl+c${RESET2}${DIM}:cancel${RESET2}`);
+    console.log(`  ${FG}${selected + 1}/${options.length}${RESET}${DIM}:select \u2502 ${FG}Ctrl+o${RESET}${DIM}:yolo \u2502 ${FG}Ctrl+c${RESET}${DIM}:cancel${RESET}`);
   };
   if (!process.stdin.isTTY || false || !process.stdin.readable) {
     renderCard(1);
     return "yes";
   }
-  return new Promise((resolve18) => {
+  return new Promise((resolve) => {
     let selectedIndex = 1;
-    const wasRaw = process.stdin.isRaw;
-    try {
-      process.stdin.setRawMode(true);
-    } catch {}
-    process.stdin.resume();
+    const wasRaw = process.stdin.isRaw ?? false;
+    ensureRawMode(true);
     const render = () => {
       renderCard(selectedIndex);
     };
@@ -7900,11 +7925,9 @@ async function promptToolApproval(params) {
         unsubscribe();
         unsubscribe = null;
       }
-      try {
-        process.stdin.setRawMode(wasRaw ?? false);
-      } catch {}
+      ensureRawMode(wasRaw);
       console.log();
-      resolve18(val);
+      resolve(val);
     };
     const onKeypress = (_str, key) => {
       if (!key)
@@ -7987,7 +8010,7 @@ async function promptUserQuestion(params) {
   if (!process.stdin.isTTY || false || !process.stdin.readable) {
     return options[0] || "yes";
   }
-  return new Promise((resolve18) => {
+  return new Promise((resolve) => {
     const rl = readline3.createInterface({ input: process.stdin, output: process.stdout });
     const promptLabel = options.length > 0 ? `Select [1-${options.length}] or type custom response: ` : `Your response: `;
     rl.question(`  ${style.bold(promptLabel)}`, (answer) => {
@@ -7997,7 +8020,7 @@ async function promptUserQuestion(params) {
         const fallback = options[0] || "";
         console.log(style.dim(`  \u21B3 Default: ${fallback || "(empty)"}
 `));
-        resolve18(fallback);
+        resolve(fallback);
         return;
       }
       const num = parseInt(trimmed, 10);
@@ -8005,26 +8028,26 @@ async function promptUserQuestion(params) {
         const picked = options[num - 1];
         console.log(style.green(`  \u2714 Selected: ${picked}
 `));
-        resolve18(picked);
+        resolve(picked);
         return;
       }
       if (options.length === 2) {
         if (/^(y|yes)$/i.test(trimmed)) {
           console.log(style.green(`  \u2714 Selected: ${options[0]}
 `));
-          resolve18(options[0]);
+          resolve(options[0]);
           return;
         }
         if (/^(n|no)$/i.test(trimmed)) {
           console.log(style.green(`  \u2714 Selected: ${options[1]}
 `));
-          resolve18(options[1]);
+          resolve(options[1]);
           return;
         }
       }
       console.log(style.green(`  \u2714 Answer: ${trimmed}
 `));
-      resolve18(trimmed);
+      resolve(trimmed);
     });
   });
 }
@@ -8053,15 +8076,12 @@ async function promptInteractiveList(config) {
 `);
     return { selectedIndex: -1, action: "close" };
   }
-  return new Promise((resolve18) => {
+  return new Promise((resolve) => {
     let selectedIndex = Math.max(0, Math.min(defaultIndex, items.length - 1));
     let scrollTop = 0;
     let renderedLines = 0;
-    const wasRaw = process.stdin.isRaw;
-    try {
-      process.stdin.setRawMode(true);
-    } catch {}
-    process.stdin.resume();
+    const wasRaw = process.stdin.isRaw ?? false;
+    ensureRawMode(true);
     process.stdout.write("\x1B[?25l");
     const BOX_WIDTH = Math.min(process.stdout.columns ?? 80, 76);
     const ensureVisible = () => {
@@ -8145,10 +8165,8 @@ async function promptInteractiveList(config) {
         unsubscribe();
         unsubscribe = null;
       }
-      try {
-        process.stdin.setRawMode(wasRaw ?? false);
-      } catch {}
-      resolve18(res);
+      ensureRawMode(wasRaw);
+      resolve(res);
     };
     const onKeypress = async (_str, key) => {
       if (!key)
@@ -8859,52 +8877,52 @@ function runProjectInit(options = {}) {
   };
 }
 function printInitSummary(result) {
-  const BOLD2 = "\x1B[1m";
+  const BOLD = "\x1B[1m";
   const GREEN = "\x1B[38;2;120;220;140m";
   const BRAND = "\x1B[38;2;217;119;87m";
   const CYAN = "\x1B[38;2;125;207;255m";
-  const GRAY2 = "\x1B[38;2;148;148;148m";
-  const WHITE2 = "\x1B[38;2;240;240;245m";
-  const RESET2 = "\x1B[0m";
+  const GRAY = "\x1B[38;2;148;148;148m";
+  const WHITE = "\x1B[38;2;240;240;245m";
+  const RESET = "\x1B[0m";
   const { analysis, filePath, overwritten } = result;
   console.log("");
-  console.log(`  ${GREEN}\u2713${RESET2} ${BOLD2}${WHITE2}${overwritten ? "Updated" : "Created"} Project Instructions Document${RESET2}`);
-  console.log(`  ${GRAY2}Path: ${CYAN}${filePath}${RESET2}`);
+  console.log(`  ${GREEN}\u2713${RESET} ${BOLD}${WHITE}${overwritten ? "Updated" : "Created"} Project Instructions Document${RESET}`);
+  console.log(`  ${GRAY}Path: ${CYAN}${filePath}${RESET}`);
   console.log("");
-  console.log(`  ${BRAND}\u250C\u2500 ${BOLD2}Project Overview${RESET2} ${BRAND}\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510${RESET2}`);
-  console.log(`  ${BRAND}\u2502${RESET2}  ${BOLD2}Project:${RESET2} ${WHITE2}${analysis.projectName}${RESET2}`);
+  console.log(`  ${BRAND}\u250C\u2500 ${BOLD}Project Overview${RESET} ${BRAND}\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510${RESET}`);
+  console.log(`  ${BRAND}\u2502${RESET}  ${BOLD}Project:${RESET} ${WHITE}${analysis.projectName}${RESET}`);
   if (analysis.languages.length > 0) {
-    console.log(`  ${BRAND}\u2502${RESET2}  ${BOLD2}Languages:${RESET2} ${analysis.languages.join(", ")}`);
+    console.log(`  ${BRAND}\u2502${RESET}  ${BOLD}Languages:${RESET} ${analysis.languages.join(", ")}`);
   }
   if (analysis.packageManager) {
-    console.log(`  ${BRAND}\u2502${RESET2}  ${BOLD2}Package Manager:${RESET2} ${analysis.packageManager}`);
+    console.log(`  ${BRAND}\u2502${RESET}  ${BOLD}Package Manager:${RESET} ${analysis.packageManager}`);
   }
   if (analysis.frameworks.length > 0) {
-    console.log(`  ${BRAND}\u2502${RESET2}  ${BOLD2}Frameworks:${RESET2} ${analysis.frameworks.join(", ")}`);
+    console.log(`  ${BRAND}\u2502${RESET}  ${BOLD}Frameworks:${RESET} ${analysis.frameworks.join(", ")}`);
   }
-  console.log(`  ${BRAND}\u2502${RESET2}`);
-  console.log(`  ${BRAND}\u2502${RESET2}  ${BOLD2}Detected Commands:${RESET2}`);
+  console.log(`  ${BRAND}\u2502${RESET}`);
+  console.log(`  ${BRAND}\u2502${RESET}  ${BOLD}Detected Commands:${RESET}`);
   if (analysis.commands.build) {
-    console.log(`  ${BRAND}\u2502${RESET2}    \u2022 Build:     ${CYAN}${analysis.commands.build}${RESET2}`);
+    console.log(`  ${BRAND}\u2502${RESET}    \u2022 Build:     ${CYAN}${analysis.commands.build}${RESET}`);
   }
   if (analysis.commands.test) {
-    console.log(`  ${BRAND}\u2502${RESET2}    \u2022 Test:      ${GREEN}${analysis.commands.test}${RESET2}`);
+    console.log(`  ${BRAND}\u2502${RESET}    \u2022 Test:      ${GREEN}${analysis.commands.test}${RESET}`);
   }
   if (analysis.commands.typecheck) {
-    console.log(`  ${BRAND}\u2502${RESET2}    \u2022 Typecheck: ${CYAN}${analysis.commands.typecheck}${RESET2}`);
+    console.log(`  ${BRAND}\u2502${RESET}    \u2022 Typecheck: ${CYAN}${analysis.commands.typecheck}${RESET}`);
   }
   if (analysis.commands.lint) {
-    console.log(`  ${BRAND}\u2502${RESET2}    \u2022 Lint:      ${CYAN}${analysis.commands.lint}${RESET2}`);
+    console.log(`  ${BRAND}\u2502${RESET}    \u2022 Lint:      ${CYAN}${analysis.commands.lint}${RESET}`);
   }
   if (analysis.commands.dev) {
-    console.log(`  ${BRAND}\u2502${RESET2}    \u2022 Dev:       ${CYAN}${analysis.commands.dev}${RESET2}`);
+    console.log(`  ${BRAND}\u2502${RESET}    \u2022 Dev:       ${CYAN}${analysis.commands.dev}${RESET}`);
   }
   if (Object.keys(analysis.commands).length === 0) {
-    console.log(`  ${BRAND}\u2502${RESET2}    \u2022 ${GRAY2}(No standard commands detected)${RESET2}`);
+    console.log(`  ${BRAND}\u2502${RESET}    \u2022 ${GRAY}(No standard commands detected)${RESET}`);
   }
-  console.log(`  ${BRAND}\u2502${RESET2}`);
-  console.log(`  ${BRAND}\u2502${RESET2}  ${GRAY2}AI agents will now automatically load AGENTS.md on every session.${RESET2}`);
-  console.log(`  ${BRAND}\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518${RESET2}`);
+  console.log(`  ${BRAND}\u2502${RESET}`);
+  console.log(`  ${BRAND}\u2502${RESET}  ${GRAY}AI agents will now automatically load AGENTS.md on every session.${RESET}`);
+  console.log(`  ${BRAND}\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518${RESET}`);
   console.log("");
 }
 // src/cli/commands.ts
@@ -9090,10 +9108,10 @@ async function printHelp(ctx) {
     console.log();
     return;
   }
-  const items = AVAILABLE_SLASH_COMMANDS.map((c4) => ({
-    id: c4.name,
-    label: c4.name,
-    description: c4.description
+  const items = AVAILABLE_SLASH_COMMANDS.map((c) => ({
+    id: c.name,
+    label: c.name,
+    description: c.description
   }));
   const res = await promptInteractiveList({
     title: "\u26A1 Slash Commands Palette",
@@ -9125,9 +9143,9 @@ async function handleReasoningCommand(ctx, arg) {
     } else {
       ctx.repl.showReasoning = !ctx.repl.showReasoning;
     }
-    const stateStr2 = ctx.repl.showReasoning ? style.green("Visible") : style.yellow("Hidden (default)");
+    const stateStr = ctx.repl.showReasoning ? style.green("Visible") : style.yellow("Hidden (default)");
     console.log(`
-  Reasoning display: [${stateStr2}]
+  Reasoning display: [${stateStr}]
 `);
     return;
   }
@@ -9166,14 +9184,14 @@ async function handleModelSelection(ctx, modelArg) {
     const headers = {};
     if (apiKey)
       headers["Authorization"] = `Bearer ${apiKey}`;
-    const controller2 = new AbortController;
-    const timeout = setTimeout(() => controller2.abort(), 1500);
-    const res2 = await fetch(`${baseUrl}/models`, {
+    const controller = new AbortController;
+    const timeout = setTimeout(() => controller.abort(), 1500);
+    const res = await fetch(`${baseUrl}/models`, {
       headers,
-      signal: controller2.signal
+      signal: controller.signal
     }).finally(() => clearTimeout(timeout));
-    if (res2.ok) {
-      const data = await res2.json();
+    if (res.ok) {
+      const data = await res.json();
       if (Array.isArray(data.data) && data.data.length > 0) {
         models = data.data;
       }
@@ -9262,8 +9280,8 @@ Direct login failed: ${directErr instanceof Error ? directErr.message : String(d
   }
 }
 function printWhoami() {
-  const store2 = new CredentialsStore;
-  const creds = store2.load();
+  const store = new CredentialsStore;
+  const creds = store.load();
   console.log();
   if (!creds || !creds.accessToken) {
     console.log(style.yellow("  Not logged in."));
@@ -9336,11 +9354,11 @@ async function handleRolesCommand(ctx, roleArg) {
     return;
   }
   const items = roles.map((r) => {
-    const tools4 = r.allowedToolNames ? r.allowedToolNames.join(", ") : "all tools";
+    const tools = r.allowedToolNames ? r.allowedToolNames.join(", ") : "all tools";
     return {
       id: r.name,
       label: r.name,
-      description: `${r.description} \xB7 [${tools4}]`,
+      description: `${r.description} \xB7 [${tools}]`,
       badge: r.name === "default" ? "primary" : undefined
     };
   });
@@ -9360,12 +9378,12 @@ async function handleRolesCommand(ctx, roleArg) {
 function displayRoleDetails(role) {
   const boxWidth = Math.min(process.stdout.columns ?? 80, 75);
   const border = "\u2500".repeat(Math.max(10, boxWidth - role.name.length - 16));
-  const tools4 = role.allowedToolNames ? role.allowedToolNames.join(", ") : "all tools";
+  const tools = role.allowedToolNames ? role.allowedToolNames.join(", ") : "all tools";
   const nicks = role.nicknameCandidates ? role.nicknameCandidates.join(", ") : "none";
   console.log();
   console.log(`  ${style.cyan("\u250C\u2500\u2500")} ${style.bold(`Role: ${role.name}`)} ${style.cyan(border)}`);
   console.log(`  ${style.cyan("\u2502")}  ${style.bold("Description:")} ${role.description}`);
-  console.log(`  ${style.cyan("\u2502")}  ${style.bold("Allowed Tools:")} ${style.dim(`[${tools4}]`)}`);
+  console.log(`  ${style.cyan("\u2502")}  ${style.bold("Allowed Tools:")} ${style.dim(`[${tools}]`)}`);
   console.log(`  ${style.cyan("\u2502")}  ${style.bold("Nicknames:")} ${style.dim(`[${nicks}]`)}`);
   console.log(`  ${style.cyan("\u2502")}`);
   console.log(`  ${style.cyan("\u2502")}  ${style.bold("System Prompt:")}`);
@@ -9383,9 +9401,9 @@ function printRoles(ctx) {
   console.log();
   console.log(style.bold("  Configured Agent Roles:"));
   for (const r of roles) {
-    const tools4 = r.allowedToolNames ? r.allowedToolNames.join(", ") : "all tools";
+    const tools = r.allowedToolNames ? r.allowedToolNames.join(", ") : "all tools";
     console.log(`    \u2022 ${style.cyan(r.name)}: ${r.description}`);
-    console.log(`      ${style.dim(`Tools: [${tools4}]`)}`);
+    console.log(`      ${style.dim(`Tools: [${tools}]`)}`);
     if (r.nicknameCandidates) {
       console.log(`      ${style.dim(`Nicknames: [${r.nicknameCandidates.join(", ")}]`)}`);
     }
@@ -9560,19 +9578,19 @@ async function handleSkillsCommand(ctx, args) {
 `);
 }
 function printMemories(ctx) {
-  const store2 = ctx.memoryStore;
-  if (!store2) {
+  const store = ctx.memoryStore;
+  if (!store) {
     console.log(style.yellow(`
   Memory store not active.
 `));
     return;
   }
   const cwd = ctx.session.cwd;
-  const memoryDir = store2.getProjectMemoryDir(cwd);
-  const topics = store2.listProjectMemories(cwd);
-  const indexContent = store2.loadMemoryIndex(cwd);
-  const BOLD2 = "\x1B[1m";
-  const RESET2 = "\x1B[0m";
+  const memoryDir = store.getProjectMemoryDir(cwd);
+  const topics = store.listProjectMemories(cwd);
+  const indexContent = store.loadMemoryIndex(cwd);
+  const BOLD = "\x1B[1m";
+  const RESET = "\x1B[0m";
   const DIM = "\x1B[2m";
   const CYAN = "\x1B[38;2;120;190;255m";
   const GREEN = "\x1B[38;2;140;220;140m";
@@ -9594,19 +9612,19 @@ function printMemories(ctx) {
     }
   };
   console.log();
-  console.log(`  ${BOLD2}\uD83E\uDDE0 Project Auto-Memory Bank${RESET2}`);
-  console.log(`  ${DIM}Directory: ${memoryDir}${RESET2}`);
-  console.log(`  ${DIM}Status: ${GREEN}Active (Loaded into turn context \u2264200 lines)${RESET2}`);
+  console.log(`  ${BOLD}\uD83E\uDDE0 Project Auto-Memory Bank${RESET}`);
+  console.log(`  ${DIM}Directory: ${memoryDir}${RESET}`);
+  console.log(`  ${DIM}Status: ${GREEN}Active (Loaded into turn context \u2264200 lines)${RESET}`);
   console.log();
   if (topics.length === 0) {
-    console.log(`  ${DIM}No persistent topic memories saved for this project yet.${RESET2}`);
-    console.log(`  ${DIM}As you work, Pikaa automatically records user preferences, feedback, and project context.${RESET2}`);
+    console.log(`  ${DIM}No persistent topic memories saved for this project yet.${RESET}`);
+    console.log(`  ${DIM}As you work, Pikaa automatically records user preferences, feedback, and project context.${RESET}`);
   } else {
-    console.log(`  ${BOLD2}Learned Memory Topics (${topics.length}):${RESET2}`);
+    console.log(`  ${BOLD}Learned Memory Topics (${topics.length}):${RESET}`);
     for (const t of topics) {
       const color = getCategoryColor(t.type);
-      console.log(`    \u2022 ${color}[${t.type}]${RESET2} ${BOLD2}${t.name}${RESET2}: ${DIM}${t.description || t.content.split(`
-`)[0]}${RESET2}`);
+      console.log(`    \u2022 ${color}[${t.type}]${RESET} ${BOLD}${t.name}${RESET}: ${DIM}${t.description || t.content.split(`
+`)[0]}${RESET}`);
     }
   }
   console.log();
@@ -10038,51 +10056,51 @@ async function handleMcpCommand(ctx, args) {
 }
 function printReleaseNotes() {
   const version = getCliVersion({ prefix: true });
-  const ROSE2 = "\x1B[38;2;205;105;74m";
-  const WHITE2 = "\x1B[38;2;255;255;255m";
-  const GRAY2 = "\x1B[38;2;148;148;148m";
-  const BOLD2 = "\x1B[1m";
-  const RESET2 = "\x1B[0m";
-  function stripAnsi2(str) {
+  const ROSE = "\x1B[38;2;205;105;74m";
+  const WHITE = "\x1B[38;2;255;255;255m";
+  const GRAY = "\x1B[38;2;148;148;148m";
+  const BOLD = "\x1B[1m";
+  const RESET = "\x1B[0m";
+  function stripAnsi(str) {
     return str.replace(/\x1b\[[0-9;]*m/g, "");
   }
   function padLine(str, width) {
-    const vis = stripAnsi2(str);
+    const vis = stripAnsi(str);
     return str + " ".repeat(Math.max(0, width - vis.length));
   }
   const totalInnerWidth = 74;
   const contentLines = [
     "",
-    "  " + BOLD2 + WHITE2 + "\uD83D\uDE80 What's New in " + version + " (Latest)" + RESET2,
-    "  " + ROSE2 + "\u2022" + RESET2 + " " + WHITE2 + BOLD2 + "Persistent Default AI Model" + RESET2 + ": Switch via " + ROSE2 + "/model" + RESET2 + " and save",
+    "  " + BOLD + WHITE + "\uD83D\uDE80 What's New in " + version + " (Latest)" + RESET,
+    "  " + ROSE + "\u2022" + RESET + " " + WHITE + BOLD + "Persistent Default AI Model" + RESET + ": Switch via " + ROSE + "/model" + RESET + " and save",
     "    preference across sessions in ~/.pikaa/credentials.json.",
-    "  " + ROSE2 + "\u2022" + RESET2 + " " + WHITE2 + BOLD2 + "Real-time Git Branch Detection" + RESET2 + ": Header displays active branch",
+    "  " + ROSE + "\u2022" + RESET + " " + WHITE + BOLD + "Real-time Git Branch Detection" + RESET + ": Header displays active branch",
     "    (\uE0A0 main) alongside user subscription tier (Groupy Pro / Max).",
-    "  " + ROSE2 + "\u2022" + RESET2 + " " + WHITE2 + BOLD2 + "Claude Code Terminal UI Parity" + RESET2 + ": Authentic pixel emblem, fieldset",
+    "  " + ROSE + "\u2022" + RESET + " " + WHITE + BOLD + "Claude Code Terminal UI Parity" + RESET + ": Authentic pixel emblem, fieldset",
     "    header box, user prompt badge pills, and streaming responses.",
-    "  " + ROSE2 + "\u2022" + RESET2 + " " + WHITE2 + BOLD2 + "Autonomous Sub-Agents & Roles" + RESET2 + ": Multi-agent spawner with roles",
+    "  " + ROSE + "\u2022" + RESET + " " + WHITE + BOLD + "Autonomous Sub-Agents & Roles" + RESET + ": Multi-agent spawner with roles",
     "    (Pikaa, Heca, Bankli, Moli) and cryptographic action provenance.",
-    "  " + ROSE2 + "\u2022" + RESET2 + " " + WHITE2 + BOLD2 + "Model Context Protocol (MCP)" + RESET2 + ": Connect stdio & SSE servers with",
+    "  " + ROSE + "\u2022" + RESET + " " + WHITE + BOLD + "Model Context Protocol (MCP)" + RESET + ": Connect stdio & SSE servers with",
     "    multi-config auto-discovery, tool hot-reloads, and ping tests.",
-    "  " + ROSE2 + "\u2022" + RESET2 + " " + WHITE2 + BOLD2 + "Isolated Git Worktrees" + RESET2 + ": Run risky tasks in isolated worktree",
+    "  " + ROSE + "\u2022" + RESET + " " + WHITE + BOLD + "Isolated Git Worktrees" + RESET + ": Run risky tasks in isolated worktree",
     "    branches without dirtying your main workspace (/worktrees).",
-    "  " + ROSE2 + "\u2022" + RESET2 + " " + WHITE2 + BOLD2 + "Strix-Inspired Security Auditor" + RESET2 + ": Automated scanner for exposed",
+    "  " + ROSE + "\u2022" + RESET + " " + WHITE + BOLD + "Strix-Inspired Security Auditor" + RESET + ": Automated scanner for exposed",
     "    secrets, eval(), and SQL injection vulnerabilities (/security).",
     "",
-    "  " + BOLD2 + WHITE2 + "\uD83D\uDCE6 Previous Highlights (v0.3.0 - v0.3.1)" + RESET2,
-    "  " + ROSE2 + "\u2022" + RESET2 + " " + WHITE2 + "Unified CI/CD Pipeline" + RESET2 + ": Single automated release packager on merge.",
-    "  " + ROSE2 + "\u2022" + RESET2 + " " + WHITE2 + "Interactive Question Flow" + RESET2 + ": Selectable multiple-choice dialogs.",
-    "  " + ROSE2 + "\u2022" + RESET2 + " " + WHITE2 + "Persistent Memory Store" + RESET2 + ": Learned user preferences in markdown.",
+    "  " + BOLD + WHITE + "\uD83D\uDCE6 Previous Highlights (v0.3.0 - v0.3.1)" + RESET,
+    "  " + ROSE + "\u2022" + RESET + " " + WHITE + "Unified CI/CD Pipeline" + RESET + ": Single automated release packager on merge.",
+    "  " + ROSE + "\u2022" + RESET + " " + WHITE + "Interactive Question Flow" + RESET + ": Selectable multiple-choice dialogs.",
+    "  " + ROSE + "\u2022" + RESET + " " + WHITE + "Persistent Memory Store" + RESET + ": Learned user preferences in markdown.",
     "",
-    "  " + GRAY2 + "Tip: Type " + ROSE2 + "/help" + GRAY2 + " to view all available commands." + RESET2
+    "  " + GRAY + "Tip: Type " + ROSE + "/help" + GRAY + " to view all available commands." + RESET
   ];
   const topDashes = Math.max(2, totalInnerWidth - (15 + version.length + 14));
   console.log("");
-  console.log("  " + ROSE2 + "\u250C\u2500 " + ROSE2 + BOLD2 + "Groupy Code Release Notes" + RESET2 + " " + GRAY2 + version + RESET2 + " " + ROSE2 + "\u2500".repeat(topDashes) + "\u2510" + RESET2);
+  console.log("  " + ROSE + "\u250C\u2500 " + ROSE + BOLD + "Groupy Code Release Notes" + RESET + " " + GRAY + version + RESET + " " + ROSE + "\u2500".repeat(topDashes) + "\u2510" + RESET);
   for (const line of contentLines) {
-    console.log("  " + ROSE2 + "\u2502" + RESET2 + padLine(line, totalInnerWidth) + ROSE2 + "\u2502" + RESET2);
+    console.log("  " + ROSE + "\u2502" + RESET + padLine(line, totalInnerWidth) + ROSE + "\u2502" + RESET);
   }
-  console.log("  " + ROSE2 + "\u2514" + "\u2500".repeat(totalInnerWidth) + "\u2518" + RESET2);
+  console.log("  " + ROSE + "\u2514" + "\u2500".repeat(totalInnerWidth) + "\u2518" + RESET);
   console.log("");
 }
 async function handleModeCommand(ctx, arg) {
@@ -10463,10 +10481,10 @@ function getUpdateCachePath() {
 async function fetchLatestNpmVersion(packageName, timeoutMs = 1500) {
   const url = `https://registry.npmjs.org/${encodeURIComponent(packageName)}/latest`;
   try {
-    const controller2 = new AbortController;
-    const timeout = setTimeout(() => controller2.abort(), timeoutMs);
+    const controller = new AbortController;
+    const timeout = setTimeout(() => controller.abort(), timeoutMs);
     const response = await fetch(url, {
-      signal: controller2.signal,
+      signal: controller.signal,
       headers: {
         Accept: "application/json",
         "User-Agent": "pikaa-update-checker"
@@ -10696,9 +10714,9 @@ class CliRepl {
             filesModified: Array.from(this.turnFilesModified)
           });
           if (this.turnDoneResolver) {
-            const resolve22 = this.turnDoneResolver;
+            const resolve = this.turnDoneResolver;
             this.turnDoneResolver = undefined;
-            resolve22();
+            resolve();
           }
           break;
         case "Error":
@@ -10714,9 +10732,9 @@ class CliRepl {
           console.error(style.red(`Error: ${msg.message}
 `));
           if (this.turnDoneResolver) {
-            const resolve22 = this.turnDoneResolver;
+            const resolve = this.turnDoneResolver;
             this.turnDoneResolver = undefined;
-            resolve22();
+            resolve();
           }
           break;
       }
@@ -10786,15 +10804,21 @@ class CliRepl {
 `));
             this.isProcessing = false;
             if (this.turnDoneResolver) {
-              const resolve22 = this.turnDoneResolver;
+              const resolve = this.turnDoneResolver;
               this.turnDoneResolver = undefined;
-              resolve22();
+              resolve();
             }
           }
         }
       }
     });
     while (!this.isClosed) {
+      await new Promise((resolve) => setTimeout(resolve, 20));
+      if (typeof Bun !== "undefined" && typeof Bun.gc === "function") {
+        try {
+          Bun.gc(false);
+        } catch {}
+      }
       let rawLine;
       try {
         rawLine = await editor.readLine();
@@ -10825,8 +10849,8 @@ class CliRepl {
   }
   async submitTurn(text) {
     try {
-      const turnPromise = new Promise((resolve22) => {
-        this.turnDoneResolver = resolve22;
+      const turnPromise = new Promise((resolve) => {
+        this.turnDoneResolver = resolve;
       });
       await this.session.submit({
         type: "TurnInput",
@@ -10951,7 +10975,7 @@ async function main() {
     apiKey: explicitApiKey,
     defaultModel: model
   });
-  const tools4 = createDefaultTools({ skillsLoader, memoryStore, worktreeManager });
+  const tools = createDefaultTools({ skillsLoader, memoryStore, worktreeManager });
   const mcpManager = new McpManager;
   const candidateConfigs = [
     mcpConfigFile,
@@ -10962,7 +10986,7 @@ async function main() {
     if (existsSync24(cfg)) {
       try {
         await mcpManager.loadConfigFile(cfg);
-        mcpManager.registerToolsIntoRouter(tools4);
+        mcpManager.registerToolsIntoRouter(tools);
         break;
       } catch {}
     }
@@ -10973,7 +10997,7 @@ async function main() {
       session = storageManager.resumeSession(resumeThreadId, {
         model,
         cwd,
-        tools: tools4,
+        tools,
         skillsLoader,
         memoryStore,
         mcpManager,
@@ -10988,7 +11012,7 @@ async function main() {
     session = new Session({
       model,
       cwd,
-      tools: tools4,
+      tools,
       skillsLoader,
       memoryStore,
       mcpManager,
@@ -10997,7 +11021,7 @@ async function main() {
     storageManager.bindSession(session, role);
   }
   const spawner = new AgentSpawner(session);
-  registerMultiAgentTools(tools4, spawner);
+  registerMultiAgentTools(tools, spawner);
   if (singlePrompt) {
     if (singlePrompt.startsWith("/") || singlePrompt.startsWith("security") || singlePrompt.startsWith("scan") || singlePrompt.startsWith("audit") || singlePrompt.startsWith("skills") || singlePrompt.startsWith("whoami") || singlePrompt.startsWith("roles") || singlePrompt.startsWith("mcp")) {
       const slashInput = singlePrompt.startsWith("/") ? singlePrompt : `/${singlePrompt}`;
@@ -11102,8 +11126,8 @@ Direct login failed: ${directErr instanceof Error ? directErr.message : String(d
     }
   }
 }
-function printWhoami2(store2) {
-  const creds = store2.load();
+function printWhoami2(store) {
+  const creds = store.load();
   console.log();
   if (!creds || !creds.accessToken) {
     console.log(style.yellow("Not logged in."));
@@ -11231,8 +11255,8 @@ function printSkillsList(loader, cwd) {
   }
   console.log();
 }
-function printMemoriesList(store2, cwd) {
-  const memories = store2.getAllMemories(cwd);
+function printMemoriesList(store, cwd) {
+  const memories = store.getAllMemories(cwd);
   console.log();
   if (memories.length === 0) {
     console.log(style.dim("No memories recorded yet."));