@hasna/assistants 0.6.15 → 0.6.16

package/dist/index.js

@@ -27290,14 +27290,14 @@ var exports_anthropic = {};
 __export(exports_anthropic, {
   AnthropicClient: () => AnthropicClient
 });
-import { readFileSync as readFileSync2, existsSync as existsSync5 } from "fs";
+import { readFileSync as readFileSync2, existsSync as existsSync7 } from "fs";
 import { homedir as homedir8 } from "os";
 import { join as join11 } from "path";
 function loadApiKeyFromSecrets() {
   const envHome = process.env.HOME || process.env.USERPROFILE;
   const homeDir = envHome && envHome.trim().length > 0 ? envHome : homedir8();
   const secretsPath = join11(homeDir, ".secrets");
-  if (existsSync5(secretsPath)) {
+  if (existsSync7(secretsPath)) {
     try {
       const content = readFileSync2(secretsPath, "utf-8");
       const match = content.match(/export\s+ANTHROPIC_API_KEY\s*=\s*["']?([^"'\n]+)["']?/);
@@ -36989,6 +36989,34 @@ function validateBashCommand(command) {
 function killProcess(proc) {
   proc.kill();
 }
+function stripQuotedSegments(input) {
+  let result = "";
+  let quote = null;
+  let escaped = false;
+  for (let i = 0;i < input.length; i += 1) {
+    const char = input[i];
+    if (quote) {
+      if (quote === '"' && !escaped && char === "\\") {
+        escaped = true;
+        continue;
+      }
+      if (!escaped && char === quote) {
+        quote = null;
+        result += char;
+        continue;
+      }
+      escaped = false;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      quote = char;
+      result += char;
+      continue;
+    }
+    result += char;
+  }
+  return result;
+}
 
 class BashTool {
   static tool = {
@@ -37109,6 +37137,7 @@ class BashTool {
     const cwd2 = input.cwd || process.cwd();
     const timeout = input.timeout || 30000;
     const commandForChecks = command.replace(/\s*2>&1\s*/g, " ");
+    const commandSansQuotes = stripQuotedSegments(commandForChecks);
     const securityCheck = validateBashCommand(commandForChecks);
     if (!securityCheck.valid) {
       getSecurityLogger().log({
@@ -37131,7 +37160,7 @@ class BashTool {
       });
     }
     for (const pattern of this.BLOCKED_PATTERNS) {
-      if (pattern.test(commandForChecks)) {
+      if (pattern.test(commandSansQuotes)) {
         getSecurityLogger().log({
           eventType: "blocked_command",
           severity: "high",
@@ -37220,6 +37249,7 @@ ${stderr || stdout}`.trim(), {
 
 // packages/core/src/tools/filesystem.ts
 import { join as join4, resolve as resolve3, dirname as dirname2, sep } from "path";
+import { existsSync as existsSync2 } from "fs";
 init_errors();
 var {Glob } = globalThis.Bun;
 
@@ -37308,6 +37338,10 @@ async function isPathSafe(targetPath, operation, options = {}) {
 // packages/core/src/tools/filesystem.ts
 var currentSessionId = "default";
 function getScriptsFolder(cwd2) {
+  const legacyDir = join4(cwd2, ".oldpal");
+  if (existsSync2(legacyDir)) {
+    return join4(legacyDir, "scripts", currentSessionId);
+  }
   return join4(getProjectConfigDir(cwd2), "scripts", currentSessionId);
 }
 function isInScriptsFolder(path2, cwd2) {
@@ -37443,13 +37477,13 @@ class FilesystemTools {
   };
   static writeTool = {
     name: "write",
-    description: "Write content to a file. RESTRICTED: Can only write to .assistants/scripts/{session}/ in the current project. Provide a filename and it will be saved under the scripts folder.",
+    description: "Write content to a file. RESTRICTED: Can only write to the project scripts folder (.oldpal/scripts/{session} or .assistants/scripts/{session}). Provide a filename and it will be saved under the scripts folder.",
     parameters: {
       type: "object",
       properties: {
         filename: {
           type: "string",
-          description: "The filename to write to (will be saved in .assistants/scripts)"
+          description: "The filename to write to (saved in the project scripts folder)"
         },
         content: {
           type: "string",
@@ -37487,7 +37521,7 @@ class FilesystemTools {
         code: ErrorCodes.TOOL_PERMISSION_DENIED,
         recoverable: false,
         retryable: false,
-        suggestion: "Write only within the .assistants/scripts/ folder."
+        suggestion: "Write only within the project scripts folder."
       });
     }
     try {
@@ -38230,7 +38264,7 @@ function isPrivateIPv4(octets) {
 // packages/core/src/tools/feedback.ts
 init_src();
 import { join as join5 } from "path";
-import { mkdirSync, writeFileSync } from "fs";
+import { existsSync as existsSync3, mkdirSync, writeFileSync } from "fs";
 function normalizeTags(value) {
   if (Array.isArray(value)) {
     const tags = value.map((t) => String(t).trim()).filter(Boolean);
@@ -38242,8 +38276,16 @@ function normalizeTags(value) {
   }
   return;
 }
-function saveFeedbackEntry(entry) {
-  const feedbackDir = join5(getConfigDir(), "feedback");
+function resolveFeedbackDir(cwd2) {
+  const baseCwd = cwd2 && cwd2.trim().length > 0 ? cwd2 : process.cwd();
+  const legacyDir = join5(baseCwd, ".oldpal");
+  if (existsSync3(legacyDir)) {
+    return join5(legacyDir, "feedback");
+  }
+  return join5(getConfigDir(), "feedback");
+}
+function saveFeedbackEntry(entry, cwd2) {
+  const feedbackDir = resolveFeedbackDir(cwd2);
   mkdirSync(feedbackDir, { recursive: true });
   const path2 = join5(feedbackDir, `${entry.id}.json`);
   writeFileSync(path2, JSON.stringify(entry, null, 2));
@@ -38330,7 +38372,7 @@ class FeedbackTool {
   static executor = async (input) => {
     try {
       const entry = buildEntry(input, { source: input.source || "tool" });
-      const { path: path2 } = saveFeedbackEntry(entry);
+      const { path: path2 } = saveFeedbackEntry(entry, typeof input.cwd === "string" ? input.cwd : undefined);
       return `Feedback saved locally.
 ID: ${entry.id}
 Path: ${path2}`;
@@ -38802,7 +38844,7 @@ class SchedulerTool {
 
 // packages/core/src/tools/image.ts
 init_src();
-import { existsSync as existsSync2, writeFileSync as writeFileSync2, unlinkSync } from "fs";
+import { existsSync as existsSync4, writeFileSync as writeFileSync2, unlinkSync } from "fs";
 import { tmpdir } from "os";
 import { join as join7 } from "path";
 import { homedir as homedir4 } from "os";
@@ -38889,7 +38931,7 @@ class ImageDisplayTool {
         return `Error: Failed to fetch image: ${error instanceof Error ? error.message : String(error)}`;
       }
     }
-    if (!existsSync2(localPath)) {
+    if (!existsSync4(localPath)) {
       return `Error: Image file not found: ${localPath}`;
     }
     try {
@@ -38914,7 +38956,7 @@ class ImageDisplayTool {
     } catch (error) {
       return `Error: ${error instanceof Error ? error.message : String(error)}`;
     } finally {
-      if (tempFile && existsSync2(tempFile)) {
+      if (tempFile && existsSync4(tempFile)) {
         try {
           unlinkSync(tempFile);
         } catch {}
@@ -39418,7 +39460,7 @@ Respond with JSON only: {"allow": boolean, "reason": string}`;
   }
 }
 // packages/core/src/commands/loader.ts
-import { existsSync as existsSync3, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
+import { existsSync as existsSync5, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
 import { join as join9, basename as basename2, extname } from "path";
 import { homedir as homedir6 } from "os";
 
@@ -39442,7 +39484,7 @@ class CommandLoader {
     await this.loadFromDirectory(legacyProjectDir, "project");
   }
   async loadFromDirectory(dir, source, prefix = "") {
-    if (!existsSync3(dir))
+    if (!existsSync5(dir))
       return;
     const entries = readdirSync2(dir);
     for (const entry of entries) {
@@ -39673,7 +39715,7 @@ ${stderr}`;
 // packages/core/src/commands/builtin.ts
 import { join as join10 } from "path";
 import { homedir as homedir7, platform as platform2, release, arch } from "os";
-import { existsSync as existsSync4, mkdirSync as mkdirSync2, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync2, writeFileSync as writeFileSync3 } from "fs";
 init_src();
 var VERSION = "0.6.14";
 function resolveAuthTimeout(resolve4) {
@@ -40608,7 +40650,7 @@ Format the summary as a brief bullet-point list. This summary will replace the c
         message += `**Config File Locations:**
 `;
         for (const path2 of configPaths) {
-          const exists = existsSync4(path2);
+          const exists = existsSync6(path2);
           message += `  ${exists ? "\u2713" : "\u25CB"} ${path2}
 `;
         }
@@ -40652,7 +40694,7 @@ Please summarize the last interaction and suggest 2-3 next steps.
 - Ask a follow-up question if needed
 `;
         const examplePath = join10(commandsDir, "reflect.md");
-        if (!existsSync4(examplePath)) {
+        if (!existsSync6(examplePath)) {
           writeFileSync3(examplePath, exampleCommand);
         }
         let message = `
@@ -41230,7 +41272,7 @@ No security events recorded.
         };
         let localPath = "";
         try {
-          const saved = saveFeedbackEntry(localEntry);
+          const saved = saveFeedbackEntry(localEntry, context.cwd);
           localPath = saved.path;
         } catch {
           localPath = "";
@@ -41719,7 +41761,7 @@ function validateToolCalls(toolCalls, tools) {
 }
 
 // packages/core/src/voice/utils.ts
-import { existsSync as existsSync6, readFileSync as readFileSync3 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync3 } from "fs";
 import { homedir as homedir9 } from "os";
 import { join as join12 } from "path";
 import { spawnSync } from "child_process";
@@ -41727,7 +41769,7 @@ function loadApiKeyFromSecrets2(key) {
   const envHome = process.env.HOME || process.env.USERPROFILE;
   const homeDir = envHome && envHome.trim().length > 0 ? envHome : homedir9();
   const secretsPath = join12(homeDir, ".secrets");
-  if (!existsSync6(secretsPath))
+  if (!existsSync8(secretsPath))
     return;
   try {
     const content = readFileSync3(secretsPath, "utf-8");
@@ -42231,13 +42273,13 @@ class VoiceManager {
 }
 // packages/core/src/identity/assistant-manager.ts
 init_src();
-import { existsSync as existsSync8 } from "fs";
+import { existsSync as existsSync10 } from "fs";
 import { mkdir as mkdir4, readFile as readFile6, writeFile as writeFile6, rm as rm2 } from "fs/promises";
 import { join as join17 } from "path";
 
 // packages/core/src/identity/identity-manager.ts
 init_src();
-import { existsSync as existsSync7 } from "fs";
+import { existsSync as existsSync9 } from "fs";
 import { mkdir as mkdir3, readFile as readFile5, writeFile as writeFile5, rm } from "fs/promises";
 import { join as join16 } from "path";
 var DEFAULT_PROFILE = {
@@ -42387,7 +42429,7 @@ class IdentityManager {
 `);
   }
   async readIndex() {
-    if (!existsSync7(this.indexPath)) {
+    if (!existsSync9(this.indexPath)) {
       return { identities: [] };
     }
     try {
@@ -42412,7 +42454,7 @@ class IdentityManager {
   }
   async readIdentity(id) {
     const path2 = this.identityPath(id);
-    if (!existsSync7(path2))
+    if (!existsSync9(path2))
       return null;
     try {
       const raw = await readFile5(path2, "utf-8");
@@ -42426,7 +42468,7 @@ class IdentityManager {
     await writeFile5(this.identityPath(identity.id), JSON.stringify(identity, null, 2));
   }
   async readActive() {
-    if (!existsSync7(this.activePath))
+    if (!existsSync9(this.activePath))
       return null;
     try {
       const raw = await readFile5(this.activePath, "utf-8");
@@ -42441,7 +42483,7 @@ class IdentityManager {
     await writeFile5(this.activePath, JSON.stringify({ id }, null, 2));
   }
   async loadAssistant() {
-    if (!existsSync7(this.assistantConfigPath()))
+    if (!existsSync9(this.assistantConfigPath()))
       return null;
     try {
       const raw = await readFile5(this.assistantConfigPath(), "utf-8");
@@ -42559,7 +42601,7 @@ class AssistantManager {
     return new IdentityManager(assistantId, this.basePath);
   }
   async readIndex() {
-    if (!existsSync8(this.indexPath)) {
+    if (!existsSync10(this.indexPath)) {
       return { assistants: [] };
     }
     try {
@@ -42584,7 +42626,7 @@ class AssistantManager {
   }
   async readAssistant(id) {
     const configPath = this.assistantConfigPath(id);
-    if (!existsSync8(configPath))
+    if (!existsSync10(configPath))
       return null;
     try {
       const raw = await readFile6(configPath, "utf-8");
@@ -42599,7 +42641,7 @@ class AssistantManager {
     await writeFile6(this.assistantConfigPath(assistant.id), JSON.stringify(assistant, null, 2));
   }
   async readActive() {
-    if (!existsSync8(this.activePath))
+    if (!existsSync10(this.activePath))
       return null;
     try {
       const raw = await readFile6(this.activePath, "utf-8");
@@ -42700,6 +42742,7 @@ class AgentLoop {
     await this.initializeIdentitySystem();
     const connectorNames = this.config.connectors && this.config.connectors.length > 0 && !this.config.connectors.includes("*") ? this.config.connectors : undefined;
     this.connectorBridge.fastDiscover(connectorNames);
+    this.connectorBridge.registerAll(this.toolRegistry);
     this.connectorDiscovery = this.connectorBridge.discover(connectorNames).then(() => {
       this.connectorBridge.registerAll(this.toolRegistry);
     }).catch(() => {});
@@ -43657,7 +43700,7 @@ function parseErrorCode(message) {
 // packages/core/src/memory/sessions.ts
 init_src();
 // packages/core/src/migration/migrate-to-assistants.ts
-import { existsSync as existsSync9 } from "fs";
+import { existsSync as existsSync11 } from "fs";
 import { mkdir as mkdir5, readFile as readFile7, writeFile as writeFile7, rename, cp } from "fs/promises";
 import { join as join19 } from "path";
 import { homedir as homedir10 } from "os";
@@ -43666,14 +43709,14 @@ async function ensureDir(path2) {
   await mkdir5(path2, { recursive: true });
 }
 async function copyIfExists(source, destination) {
-  if (!existsSync9(source))
+  if (!existsSync11(source))
     return false;
   await ensureDir(join19(destination, ".."));
   await cp(source, destination, { recursive: true });
   return true;
 }
 async function readJson(path2) {
-  if (!existsSync9(path2))
+  if (!existsSync11(path2))
     return null;
   try {
     const raw = await readFile7(path2, "utf-8");
@@ -43691,13 +43734,13 @@ async function migrateFromOldpal() {
   const home = homedir10();
   const oldPath = join19(home, ".oldpal");
   const newPath = join19(home, ".assistants");
-  if (!existsSync9(oldPath)) {
+  if (!existsSync11(oldPath)) {
     result.success = true;
     return result;
   }
-  if (existsSync9(newPath)) {
+  if (existsSync11(newPath)) {
     const marker = join19(newPath, "migration", MIGRATION_MARKER);
-    if (existsSync9(marker)) {
+    if (existsSync11(marker)) {
       result.success = true;
       return result;
     }
@@ -43765,7 +43808,7 @@ init_anthropic();
 init_src();
 
 // packages/core/src/logger.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync6, appendFileSync, readdirSync as readdirSync3, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync6, appendFileSync, readdirSync as readdirSync3, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
 import { join as join20 } from "path";
 class Logger {
   logDir;
@@ -43779,7 +43822,7 @@ class Logger {
     this.logFile = join20(this.logDir, `${date}.log`);
   }
   ensureDir(dir) {
-    if (!existsSync10(dir)) {
+    if (!existsSync12(dir)) {
       mkdirSync6(dir, { recursive: true });
     }
   }
@@ -43825,7 +43868,7 @@ class SessionStorage {
     this.sessionFile = join20(this.sessionsDir, `${sessionId}.json`);
   }
   ensureDir(dir) {
-    if (!existsSync10(dir)) {
+    if (!existsSync12(dir)) {
       mkdirSync6(dir, { recursive: true });
     }
   }
@@ -43839,7 +43882,7 @@ class SessionStorage {
   }
   load() {
     try {
-      if (!existsSync10(this.sessionFile))
+      if (!existsSync12(this.sessionFile))
         return null;
       return JSON.parse(readFileSync6(this.sessionFile, "utf-8"));
     } catch {
@@ -43849,7 +43892,7 @@ class SessionStorage {
   static getActiveAssistantId() {
     try {
       const activePath = join20(getConfigDir(), "active.json");
-      if (!existsSync10(activePath))
+      if (!existsSync12(activePath))
         return null;
       const raw = readFileSync6(activePath, "utf-8");
       const data = JSON.parse(raw);
@@ -43863,7 +43906,7 @@ class SessionStorage {
     const resolvedId = assistantId ?? SessionStorage.getActiveAssistantId();
     if (resolvedId) {
       const assistantDir = join20(root, "assistants", resolvedId, "sessions");
-      if (existsSync10(assistantDir)) {
+      if (existsSync12(assistantDir)) {
         return assistantDir;
       }
     }
@@ -43871,7 +43914,7 @@ class SessionStorage {
   }
   static listSessions(assistantId) {
     const sessionsDir = SessionStorage.resolveSessionsDir(assistantId);
-    if (!existsSync10(sessionsDir))
+    if (!existsSync12(sessionsDir))
       return [];
     const sessions = [];
     const files = readdirSync3(sessionsDir);
@@ -43901,7 +43944,7 @@ class SessionStorage {
     const sessionsDir = SessionStorage.resolveSessionsDir(assistantId);
     const sessionFile = join20(sessionsDir, `${sessionId}.json`);
     try {
-      if (!existsSync10(sessionFile))
+      if (!existsSync12(sessionFile))
         return null;
       return JSON.parse(readFileSync6(sessionFile, "utf-8"));
     } catch {
@@ -43924,7 +43967,7 @@ function initAssistantsDir() {
     join20(baseDir, "migration")
   ];
   for (const dir of dirs) {
-    if (!existsSync10(dir)) {
+    if (!existsSync12(dir)) {
       mkdirSync6(dir, { recursive: true });
     }
   }
@@ -43943,6 +43986,8 @@ class EmbeddedClient {
   startedAt;
   initialMessages = null;
   assistantId = null;
+  messageQueue = [];
+  processingQueue = false;
   constructor(cwd2, options) {
     initAssistantsDir();
     const sessionId = options?.sessionId || generateId();
@@ -44004,6 +44049,15 @@ class EmbeddedClient {
     if (!this.initialized) {
       await this.initialize();
     }
+    if (this.agent.isProcessing()) {
+      this.logger.info("Queuing message (agent busy)", { message, queueLength: this.messageQueue.length + 1 });
+      this.messageQueue.push(message);
+      return;
+    }
+    await this.processMessage(message);
+    await this.drainQueue();
+  }
+  async processMessage(message) {
     this.logger.info("User message", { message });
     try {
       await this.agent.process(message);
@@ -44028,6 +44082,21 @@ class EmbeddedClient {
       }
     }
   }
+  async drainQueue() {
+    if (this.processingQueue)
+      return;
+    this.processingQueue = true;
+    try {
+      while (this.messageQueue.length > 0 && !this.agent.isProcessing()) {
+        const nextMessage = this.messageQueue.shift();
+        if (nextMessage) {
+          await this.processMessage(nextMessage);
+        }
+      }
+    } finally {
+      this.processingQueue = false;
+    }
+  }
   saveSession() {
     this.session.save({
       messages: this.messages,
@@ -44109,6 +44178,13 @@ class EmbeddedClient {
   getMessages() {
     return [...this.messages];
   }
+  getQueueLength() {
+    return this.messageQueue.length;
+  }
+  clearQueue() {
+    this.messageQueue = [];
+    this.logger.info("Message queue cleared");
+  }
 }
 // packages/core/src/sessions/registry.ts
 class SessionRegistry {
@@ -44684,7 +44760,13 @@ function extractBlockSections(text, blocks) {
       const indent = gridMatch[1] ?? "";
       const header = gridMatch[2] ?? "";
       const attrs = parseAttributes(header);
-      const columns = Math.max(1, Math.min(4, Number(attrs.columns || attrs.cols || 2)));
+      const rawColumns = attrs.columns || attrs.cols;
+      let columns = Number(rawColumns ?? 2);
+      if (!Number.isFinite(columns) || columns <= 0) {
+        output.push(createMalformedBlock(blocks, indent, "grid", `Invalid columns value "${rawColumns ?? ""}". Using 2.`));
+        columns = 2;
+      }
+      columns = Math.max(1, Math.min(4, Math.round(columns)));
       const parsed = parseDelimitedBlock(lines, i, indent);
       if (!parsed) {
         output.push(line);
@@ -44750,24 +44832,38 @@ function extractCards(body) {
   let i = 0;
   while (i < lines.length) {
     const line = lines[i];
-    const match = line.match(/^\s*:::card(.*)$/);
+    const match = line.match(/^(\s*):::card(.*)$/);
     if (!match) {
       i += 1;
       continue;
     }
-    const attrs = parseAttributes(match[1] ?? "");
+    const indent = match[1] ?? "";
+    const attrs = parseAttributes(match[2] ?? "");
     const type = String(attrs.type || "note");
     const title = attrs.title ? String(attrs.title) : undefined;
     const bodyLines = [];
+    let closed = false;
     i += 1;
-    while (i < lines.length && lines[i].trim() !== ":::") {
-      bodyLines.push(lines[i]);
+    while (i < lines.length) {
+      const current = lines[i];
+      if (current.trim() === ":::" && current.startsWith(indent)) {
+        closed = true;
+        i += 1;
+        break;
+      }
+      bodyLines.push(current);
       i += 1;
     }
-    if (i < lines.length && lines[i].trim() === ":::") {
-      i += 1;
+    if (!closed) {
+      cards.push({
+        type: "warning",
+        title: "Malformed card",
+        body: "Missing closing ::: for card."
+      });
+      break;
     }
-    cards.push({ type, title, body: bodyLines.join(`
+    const stripped = stripIndent(bodyLines, indent);
+    cards.push({ type, title, body: stripped.join(`
 `) });
   }
   return cards;
@@ -44804,12 +44900,12 @@ function stripIndent(lines, indent) {
     return lines;
   return lines.map((line) => line.startsWith(indent) ? line.slice(indent.length) : line);
 }
-function createMalformedBlock(blocks, indent, kind2) {
+function createMalformedBlock(blocks, indent, kind2, message) {
   blocks.push({
     kind: "block",
     type: "warning",
     title: "Malformed block",
-    body: `Missing closing ::: for ${kind2}.`,
+    body: message || `Missing closing ::: for ${kind2}.`,
     indent
   });
   return `@@BLOCKSECTION${blocks.length - 1}@@`;
@@ -44848,7 +44944,7 @@ function renderBlock(type, title, body, maxWidth, indent = "") {
   const content = parseMarkdown(body, { skipBlocks: true, maxWidth });
   const lines = content ? content.split(`
 `) : [];
-  return renderBox(header, lines, type, maxWidth, indent);
+  return renderBox(header, lines, type, maxWidth, indent, Boolean(maxWidth));
 }
 function renderCard(card, maxWidth, indent = "", forceWidth = false) {
   const header = formatBlockHeader(card.type, card.title);
@@ -44860,11 +44956,17 @@ function renderCard(card, maxWidth, indent = "", forceWidth = false) {
 function renderCardGrid(cards, columns, maxWidth, indent = "") {
   const gap = 2;
   const totalWidth = maxWidth ? Math.max(20, maxWidth) : undefined;
-  const cardTotalWidth = totalWidth ? Math.max(20, Math.floor((totalWidth - gap * (columns - 1)) / columns)) : undefined;
+  let effectiveColumns = columns;
+  if (totalWidth) {
+    const minCardWidth = 18;
+    const maxColumns = Math.max(1, Math.floor((totalWidth + gap) / (minCardWidth + gap)));
+    effectiveColumns = Math.min(columns, maxColumns);
+  }
+  const cardTotalWidth = totalWidth ? Math.max(8, Math.floor((totalWidth - gap * (effectiveColumns - 1)) / effectiveColumns)) : undefined;
   const cardLines = cards.map((card) => renderCard(card, cardTotalWidth, "", true));
   const rows = [];
-  for (let i = 0;i < cardLines.length; i += columns) {
-    rows.push(cardLines.slice(i, i + columns));
+  for (let i = 0;i < cardLines.length; i += effectiveColumns) {
+    rows.push(cardLines.slice(i, i + effectiveColumns));
   }
   const output = [];
   for (const row of rows) {
@@ -44907,8 +45009,8 @@ function getBlockIcon(type) {
       return "\u2139";
   }
 }
-function renderBox(header, lines, type, maxWidth, indent = "") {
-  return renderBoxLines(header, lines, type, maxWidth, indent).join(`
+function renderBox(header, lines, type, maxWidth, indent = "", forceWidth = false) {
+  return renderBoxLines(header, lines, type, maxWidth, indent, forceWidth).join(`
 `);
 }
 function renderBoxLines(header, lines, type, maxWidth, indent = "", forceWidth = false) {
@@ -45227,6 +45329,7 @@ var jsx_dev_runtime3 = __toESM(require_jsx_dev_runtime(), 1);
 function Messages4({
   messages,
   currentResponse,
+  streamingMessages = [],
   currentToolCall,
   lastToolResult,
   activityLog = [],
@@ -45235,9 +45338,14 @@ function Messages4({
   queuedMessageIds
 }) {
   const [now2, setNow] = import_react24.useState(Date.now());
-  const endIndex = messages.length - scrollOffset;
+  const combinedMessages = import_react24.useMemo(() => [...messages, ...streamingMessages], [messages, streamingMessages]);
+  const endIndex = combinedMessages.length - scrollOffset;
   const startIndex = Math.max(0, endIndex - maxVisible);
-  const visibleMessages = messages.slice(startIndex, endIndex);
+  const visibleCombined = combinedMessages.slice(startIndex, endIndex);
+  const historicalCount = messages.length;
+  const splitIndex = Math.max(0, Math.min(visibleCombined.length, historicalCount - startIndex));
+  const visibleMessages = visibleCombined.slice(0, splitIndex);
+  const visibleStreaming = visibleCombined.slice(splitIndex);
   const groupedMessages = groupConsecutiveToolMessages(visibleMessages);
   const historicalItems = groupedMessages.map((group) => {
     if (group.type === "single") {
@@ -45311,19 +45419,30 @@ function Messages4({
           const elapsedText = formatDuration(elapsedMs);
           return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
             marginY: 1,
+            flexDirection: "column",
             children: [
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
-                dimColor: true,
-                children: "\u2699 "
-              }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
-                dimColor: true,
+              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
                 children: [
-                  formatToolCall(entry.toolCall),
-                  " \xB7 ",
-                  elapsedText
+                  /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+                    dimColor: true,
+                    children: "\u2699 "
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+                    dimColor: true,
+                    children: formatToolCall(entry.toolCall)
+                  }, undefined, false, undefined, this)
                 ]
-              }, undefined, true, undefined, this)
+              }, undefined, true, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+                marginLeft: 2,
+                children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+                  dimColor: true,
+                  children: [
+                    elapsedText,
+                    " elapsed"
+                  ]
+                }, undefined, true, undefined, this)
+              }, undefined, false, undefined, this)
             ]
           }, entry.id, true, undefined, this);
         }
@@ -45348,6 +45467,10 @@ function Messages4({
         }
         return null;
       }),
+      visibleStreaming.map((message) => /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(MessageBubble, {
+        message,
+        queuedMessageIds
+      }, message.id, false, undefined, this)),
       currentResponse && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
         marginY: 1,
         children: [
@@ -46472,6 +46595,10 @@ function App2({ cwd: cwd2, version }) {
       setError(chunk.error);
       setIsProcessing(false);
       isProcessingRef.current = false;
+      const active = registryRef.current.getActiveSession();
+      if (active) {
+        registryRef.current.setProcessing(active.id, false);
+      }
     } else if (chunk.type === "exit") {
       registry2.closeAll();
       exit();
@@ -46486,6 +46613,10 @@ function App2({ cwd: cwd2, version }) {
       }
       setIsProcessing(false);
       isProcessingRef.current = false;
+      const active = registryRef.current.getActiveSession();
+      if (active) {
+        registryRef.current.setProcessing(active.id, false);
+      }
       queueMicrotask(() => {
         resetTurnState();
       });
@@ -46511,6 +46642,10 @@ function App2({ cwd: cwd2, version }) {
           setError(err.message);
           setIsProcessing(false);
           isProcessingRef.current = false;
+          const active = registryRef.current.getActiveSession();
+          if (active) {
+            registryRef.current.setProcessing(active.id, false);
+          }
         });
         const session = await registry2.createSession(cwd2);
         setActiveSessionId(session.id);
@@ -46581,6 +46716,18 @@ function App2({ cwd: cwd2, version }) {
   const queuedMessageIds = import_react29.useMemo(() => new Set(activeQueue.map((msg) => msg.id)), [activeQueue]);
   const wrapChars = columns ? Math.max(40, columns - 4) : MESSAGE_WRAP_CHARS;
   const displayMessages = import_react29.useMemo(() => buildDisplayMessages(messages, MESSAGE_CHUNK_LINES, wrapChars), [messages, wrapChars]);
+  const streamingMessages = import_react29.useMemo(() => {
+    if (!isProcessing || !currentResponse.trim())
+      return [];
+    const streamingMessage = {
+      id: "streaming-response",
+      role: "assistant",
+      content: currentResponse,
+      timestamp: now()
+    };
+    return buildDisplayMessages([streamingMessage], MESSAGE_CHUNK_LINES, wrapChars);
+  }, [currentResponse, isProcessing, wrapChars]);
+  const displayCount = displayMessages.length + streamingMessages.length;
   import_react29.useEffect(() => {
     if (!isProcessing && activeQueue.length > 0) {
       processQueue();
@@ -46590,23 +46737,23 @@ function App2({ cwd: cwd2, version }) {
     if (autoScroll) {
       setScrollOffset(0);
     }
-  }, [displayMessages.length, autoScroll]);
+  }, [displayCount, autoScroll]);
   import_react29.useEffect(() => {
     const prevCount = prevDisplayCountRef.current;
-    if (!autoScroll && displayMessages.length > prevCount) {
-      const delta = displayMessages.length - prevCount;
+    if (!autoScroll && displayCount > prevCount) {
+      const delta = displayCount - prevCount;
       setScrollOffset((prev) => prev + delta);
     }
-    prevDisplayCountRef.current = displayMessages.length;
-  }, [displayMessages.length, autoScroll]);
+    prevDisplayCountRef.current = displayCount;
+  }, [displayCount, autoScroll]);
   const reservedLines = 8;
   const baseMaxVisible = rows ? Math.max(3, rows - reservedLines) : 10;
   const toolCallsHeight = isProcessing ? Math.min(toolCallsRef.current.length, 5) : 0;
   const maxVisibleMessages = Math.max(3, baseMaxVisible - toolCallsHeight);
   import_react29.useEffect(() => {
-    const maxOffset = Math.max(0, displayMessages.length - maxVisibleMessages);
+    const maxOffset = Math.max(0, displayCount - maxVisibleMessages);
     setScrollOffset((prev) => Math.min(prev, maxOffset));
-  }, [displayMessages.length, maxVisibleMessages]);
+  }, [displayCount, maxVisibleMessages]);
   const sessions = registry2.listSessions();
   const activeSession = registry2.getActiveSession();
   const sessionIndex = activeSessionId ? registry2.getSessionIndex(activeSessionId) : 0;
@@ -46685,7 +46832,7 @@ function App2({ cwd: cwd2, version }) {
     }
     if (key.pageUp || key.shift && key.upArrow) {
       setScrollOffset((prev) => {
-        const maxOffset = Math.max(0, displayMessages.length - maxVisibleMessages);
+        const maxOffset = Math.max(0, displayCount - maxVisibleMessages);
         const newOffset = Math.min(prev + 3, maxOffset);
         if (newOffset > 0)
           setAutoScroll(false);
@@ -46701,7 +46848,7 @@ function App2({ cwd: cwd2, version }) {
       });
     }
     if (key.ctrl && input === "u") {
-      const maxOffset = Math.max(0, displayMessages.length - maxVisibleMessages);
+      const maxOffset = Math.max(0, displayCount - maxVisibleMessages);
       setScrollOffset(maxOffset);
       setAutoScroll(false);
     }
@@ -46760,6 +46907,7 @@ function App2({ cwd: cwd2, version }) {
       resetTurnState();
       setIsProcessing(false);
       isProcessingRef.current = false;
+      registry2.setProcessing(activeSession.id, false);
       await new Promise((r) => setTimeout(r, 100));
     }
     const userMessage = {
@@ -46861,13 +47009,14 @@ function App2({ cwd: cwd2, version }) {
           children: [
             "\u2191 ",
             scrollOffset,
-            " more messages above (Shift+\u2193 or Ctrl+D to scroll down)"
+            " more messages above (Shift+\u2193 or Page Down to scroll down)"
           ]
         }, undefined, true, undefined, this)
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Messages4, {
         messages: displayMessages,
-        currentResponse: isProcessing ? currentResponse : undefined,
+        currentResponse: undefined,
+        streamingMessages,
         currentToolCall: undefined,
         lastToolResult: undefined,
         activityLog: isProcessing ? activityLog : [],
@@ -47166,7 +47315,7 @@ function formatStreamEvent(chunk) {
 
 // packages/terminal/src/index.tsx
 var jsx_dev_runtime11 = __toESM(require_jsx_dev_runtime(), 1);
-var VERSION3 = "0.6.15";
+var VERSION3 = "0.6.16";
 function parseArgs(argv) {
   const args = argv.slice(2);
   const options = {
@@ -47329,4 +47478,4 @@ if (options.print !== null) {
   });
 }
 
-//# debugId=E5501B17CB0867B264756E2164756E21
+//# debugId=4013F70DB4CACA3C64756E2164756E21