@hasna/assistants 0.6.32 → 0.6.34

package/dist/index.js

@@ -28328,12 +28328,12 @@ __export(exports_anthropic, {
   AnthropicClient: () => AnthropicClient
 });
 import { readFileSync as readFileSync4, existsSync as existsSync8 } from "fs";
-import { homedir as homedir8 } from "os";
-import { join as join13 } from "path";
+import { homedir as homedir9 } from "os";
+import { join as join14 } from "path";
 function loadApiKeyFromSecrets() {
   const envHome = process.env.HOME || process.env.USERPROFILE;
-  const homeDir = envHome && envHome.trim().length > 0 ? envHome : homedir8();
-  const secretsPath = join13(homeDir, ".secrets");
+  const homeDir = envHome && envHome.trim().length > 0 ? envHome : homedir9();
+  const secretsPath = join14(homeDir, ".secrets");
   if (existsSync8(secretsPath)) {
     try {
       const content = readFileSync4(secretsPath, "utf-8");
@@ -36578,7 +36578,7 @@ var import_react29 = __toESM(require_react(), 1);
 
 // packages/core/src/agent/loop.ts
 init_src();
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 
 // packages/core/src/agent/context.ts
 init_src();
@@ -36650,6 +36650,9 @@ class AgentContext {
     try {
       const parsed = JSON.parse(content);
       if (parsed && parsed.__pdf_attachment__ === true) {
+        if (!parsed.data || typeof parsed.data !== "string") {
+          return null;
+        }
         return {
           type: "pdf",
           source: {
@@ -36701,8 +36704,11 @@ class AgentContext {
     if (this.messages.length <= this.maxMessages) {
       return;
     }
-    const systemMessages = this.messages.filter((m) => m.role === "system");
+    let systemMessages = this.messages.filter((m) => m.role === "system");
     const nonSystemMessages = this.messages.filter((m) => m.role !== "system");
+    if (systemMessages.length > this.maxMessages) {
+      systemMessages = systemMessages.slice(-this.maxMessages);
+    }
     const targetCount = Math.max(0, this.maxMessages - systemMessages.length);
     let recentMessages = targetCount > 0 ? nonSystemMessages.slice(-targetCount) : [];
     while (recentMessages.length > 0 && recentMessages[0].toolResults) {
@@ -36871,7 +36877,33 @@ class ContextManager {
         summarizedCount: 0
       };
     }
-    const summary = await this.summarizer.summarize(toSummarize);
+    let summary = "";
+    try {
+      summary = await this.summarizer.summarize(toSummarize);
+    } catch {
+      const tokens = this.tokenCounter.countMessages(messages);
+      this.state.totalTokens = tokens;
+      this.state.messageCount = messages.length;
+      return {
+        messages,
+        summarized: false,
+        tokensBefore: tokens,
+        tokensAfter: tokens,
+        summarizedCount: 0
+      };
+    }
+    if (!summary.trim()) {
+      const tokens = this.tokenCounter.countMessages(messages);
+      this.state.totalTokens = tokens;
+      this.state.messageCount = messages.length;
+      return {
+        messages,
+        summarized: false,
+        tokensBefore: tokens,
+        tokensAfter: tokens,
+        summarizedCount: 0
+      };
+    }
     const summaryMessage = {
       id: generateId(),
       role: "system",
@@ -38523,12 +38555,10 @@ async function isPathSafe(targetPath, operation, options = {}) {
   for (const protectedPath of PROTECTED_PATHS) {
     const expanded = protectedPath.replace("~", home);
     if (resolved.startsWith(expanded)) {
-      if (operation === "write" || operation === "delete") {
-        return {
-          safe: false,
-          reason: `Cannot ${operation} protected path: ${protectedPath}`
-        };
-      }
+      return {
+        safe: false,
+        reason: `Cannot ${operation} protected path: ${protectedPath}`
+      };
     }
   }
   try {
@@ -38603,9 +38633,21 @@ class FilesystemTools {
   };
   static readExecutor = async (input) => {
     const baseCwd = input.cwd || process.cwd();
-    const path = resolve3(baseCwd, input.path);
+    const rawPath = String(input.path || "").trim();
+    if (!rawPath) {
+      throw new ToolExecutionError("File path is required", {
+        toolName: "read",
+        toolInput: input,
+        code: ErrorCodes.VALIDATION_OUT_OF_RANGE,
+        recoverable: false,
+        retryable: false,
+        suggestion: "Provide a valid file path."
+      });
+    }
+    const path = resolve3(baseCwd, rawPath);
     const offset = (input.offset || 1) - 1;
-    const limit = input.limit;
+    const limitRaw = input.limit;
+    const limit = typeof limitRaw === "number" && limitRaw > 0 ? Math.floor(limitRaw) : undefined;
     try {
       const safety = await isPathSafe(path, "read", { cwd: baseCwd });
       if (!safety.safe) {
@@ -38711,6 +38753,16 @@ class FilesystemTools {
     const filename = input.filename || input.path;
     const content = input.content;
     const baseCwd = input.cwd || process.cwd();
+    if (typeof content !== "string") {
+      throw new ToolExecutionError("Content must be a string", {
+        toolName: "write",
+        toolInput: input,
+        code: ErrorCodes.VALIDATION_OUT_OF_RANGE,
+        recoverable: false,
+        retryable: false,
+        suggestion: "Provide string content to write."
+      });
+    }
     const scriptsFolder = getScriptsFolder(baseCwd, input.sessionId);
     if (!filename || !filename.trim()) {
       throw new ToolExecutionError("Filename is required", {
@@ -38805,13 +38857,55 @@ class FilesystemTools {
     }
   };
   static globExecutor = async (input) => {
-    const pattern = input.pattern;
+    const pattern = String(input.pattern || "").trim();
     const baseCwd = input.cwd || process.cwd();
     const searchPath = resolve3(baseCwd, input.path || ".");
     try {
+      if (!pattern) {
+        throw new ToolExecutionError("Pattern is required", {
+          toolName: "glob",
+          toolInput: input,
+          code: ErrorCodes.VALIDATION_OUT_OF_RANGE,
+          recoverable: false,
+          retryable: false
+        });
+      }
+      const safety = await isPathSafe(searchPath, "read", { cwd: baseCwd });
+      if (!safety.safe) {
+        getSecurityLogger().log({
+          eventType: "path_violation",
+          severity: "high",
+          details: {
+            tool: "glob",
+            path: searchPath,
+            reason: safety.reason || "Blocked path"
+          },
+          sessionId: input.sessionId || "unknown"
+        });
+        throw new ToolExecutionError(safety.reason || "Blocked path", {
+          toolName: "glob",
+          toolInput: input,
+          code: ErrorCodes.TOOL_PERMISSION_DENIED,
+          recoverable: false,
+          retryable: false
+        });
+      }
+      const validated = await validatePath(searchPath, {
+        allowSymlinks: true,
+        allowedPaths: [baseCwd, searchPath]
+      });
+      if (!validated.valid) {
+        throw new ToolExecutionError(validated.error || "Invalid path", {
+          toolName: "glob",
+          toolInput: input,
+          code: ErrorCodes.VALIDATION_OUT_OF_RANGE,
+          recoverable: false,
+          retryable: false
+        });
+      }
       const glob = new Glob(pattern);
       const matches = [];
-      for await (const file of glob.scan({ cwd: searchPath })) {
+      for await (const file of glob.scan({ cwd: validated.resolved })) {
         matches.push(file);
         if (matches.length >= 1000)
           break;
@@ -38864,18 +38958,60 @@ class FilesystemTools {
     }
   };
   static grepExecutor = async (input) => {
-    const pattern = input.pattern;
+    const pattern = String(input.pattern || "").trim();
     const baseCwd = input.cwd || process.cwd();
     const searchPath = resolve3(baseCwd, input.path || ".");
     const globPattern = input.glob || "**/*";
     const caseSensitive = input.caseSensitive || false;
     try {
+      if (!pattern) {
+        throw new ToolExecutionError("Pattern is required", {
+          toolName: "grep",
+          toolInput: input,
+          code: ErrorCodes.VALIDATION_OUT_OF_RANGE,
+          recoverable: false,
+          retryable: false
+        });
+      }
+      const safety = await isPathSafe(searchPath, "read", { cwd: baseCwd });
+      if (!safety.safe) {
+        getSecurityLogger().log({
+          eventType: "path_violation",
+          severity: "high",
+          details: {
+            tool: "grep",
+            path: searchPath,
+            reason: safety.reason || "Blocked path"
+          },
+          sessionId: input.sessionId || "unknown"
+        });
+        throw new ToolExecutionError(safety.reason || "Blocked path", {
+          toolName: "grep",
+          toolInput: input,
+          code: ErrorCodes.TOOL_PERMISSION_DENIED,
+          recoverable: false,
+          retryable: false
+        });
+      }
+      const validated = await validatePath(searchPath, {
+        allowSymlinks: true,
+        allowedPaths: [baseCwd, searchPath]
+      });
+      if (!validated.valid) {
+        throw new ToolExecutionError(validated.error || "Invalid path", {
+          toolName: "grep",
+          toolInput: input,
+          code: ErrorCodes.VALIDATION_OUT_OF_RANGE,
+          recoverable: false,
+          retryable: false
+        });
+      }
       const flags = caseSensitive ? "" : "i";
       const regex2 = new RegExp(pattern, flags);
       const results = [];
       const glob = new Glob(globPattern);
-      for await (const file of glob.scan({ cwd: searchPath })) {
-        const filePath = join4(searchPath, file);
+      for await (const file of glob.scan({ cwd: validated.resolved })) {
+        const filePath = join4(validated.resolved, file);
         try {
           const content = await Bun.file(filePath).text();
           const lines = content.split(`
@@ -39902,7 +40038,10 @@ function computeNextRun(schedule, fromTime) {
   if (schedule.schedule.kind === "once") {
     if (!schedule.schedule.at)
       return;
-    return parseScheduledTime(schedule.schedule.at, validTimezone);
+    const next = parseScheduledTime(schedule.schedule.at, validTimezone);
+    if (!next || next <= fromTime)
+      return;
+    return next;
   }
   if (schedule.schedule.kind === "cron") {
     if (!schedule.schedule.cron)
@@ -39918,6 +40057,8 @@ async function getDueSchedules(cwd2, nowTime) {
       return false;
     if (!schedule.nextRunAt)
       return false;
+    if (!Number.isFinite(schedule.nextRunAt))
+      return false;
     return schedule.nextRunAt <= nowTime;
   });
 }
@@ -40033,6 +40174,9 @@ function parseDateTime(value) {
   if (!Number.isFinite(year) || !Number.isFinite(month) || !Number.isFinite(day) || !Number.isFinite(hour) || !Number.isFinite(minute) || !Number.isFinite(second)) {
     return null;
   }
+  if (month < 1 || month > 12 || day < 1 || day > 31 || hour < 0 || hour > 23 || minute < 0 || minute > 59 || second < 0 || second > 59) {
+    return null;
+  }
   return { year, month, day, hour, minute, second };
 }
 function hasTimeZoneOffset(value) {
@@ -40171,11 +40315,21 @@ class SchedulerTool {
       const id = String(input.id || "").trim();
       if (!id)
         return "Error: id is required.";
+      let nextRunAt;
+      if (action === "resume") {
+        const schedule = await readSchedule(cwd2, id);
+        if (!schedule)
+          return `Schedule ${id} not found.`;
+        nextRunAt = computeNextRun(schedule, Date.now());
+        if (!nextRunAt) {
+          return `Error: unable to compute next run for schedule ${id}.`;
+        }
+      }
       const updated = await updateSchedule(cwd2, id, (s) => ({
         ...s,
         status: action === "pause" ? "paused" : "active",
         updatedAt: Date.now(),
-        nextRunAt: action === "resume" ? computeNextRun(s, Date.now()) : s.nextRunAt
+        nextRunAt: action === "resume" ? nextRunAt : s.nextRunAt
       }));
       if (!updated)
         return `Schedule ${id} not found.`;
@@ -40660,6 +40814,7 @@ class HookExecutor {
       return null;
     try {
       const proc = Bun.spawn(["bash", "-c", hook.command], {
+        cwd: input.cwd || process.cwd(),
         stdin: "pipe",
         stdout: "pipe",
         stderr: "pipe"
@@ -41567,8 +41722,8 @@ ${stderr}`;
   }
 }
 // packages/core/src/commands/builtin.ts
-import { join as join12 } from "path";
-import { homedir as homedir7, platform as platform2, release, arch } from "os";
+import { join as join13 } from "path";
+import { homedir as homedir8, platform as platform2, release, arch } from "os";
 import { existsSync as existsSync7, mkdirSync as mkdirSync4, writeFileSync as writeFileSync5 } from "fs";
 init_src();
 
@@ -41672,23 +41827,28 @@ function hasProjectNameConflict(projects, name) {
 
 // packages/core/src/projects/context.ts
 import { readFile as readFile3 } from "fs/promises";
-import { resolve as resolve4 } from "path";
+import { homedir as homedir7 } from "os";
+import { resolve as resolve4, join as join12 } from "path";
 var DEFAULT_MAX_FILE_BYTES = 12000;
+function singleLine(value) {
+  return value.replace(/[\r\n]+/g, " ").trim();
+}
 function formatPlan(plan) {
   const lines = [];
-  lines.push(`- ${plan.title} (${plan.steps.length} steps)`);
+  lines.push(`- ${singleLine(plan.title)} (${plan.steps.length} steps)`);
   for (const step of plan.steps) {
-    lines.push(`  - [${step.status}] ${step.text}`);
+    lines.push(`  - [${step.status}] ${singleLine(step.text)}`);
   }
   return lines.join(`
 `);
 }
 function normalizeEntryLabel(entry) {
-  return entry.label ? entry.label.trim() : entry.value.trim();
+  return entry.label ? singleLine(entry.label) : singleLine(entry.value);
 }
 async function renderFileEntry(entry, options) {
   const rawPath = entry.value.trim();
-  const resolved = resolve4(options.cwd, rawPath);
+  const expandedPath = rawPath === "~" ? homedir7() : rawPath.startsWith("~/") ? join12(homedir7(), rawPath.slice(2)) : rawPath;
+  const resolved = resolve4(options.cwd, expandedPath);
   const validation = await validatePath(resolved, { allowedPaths: [options.cwd] });
   if (!validation.valid) {
     return `- File: ${rawPath} (unavailable: ${validation.error || "invalid path"})`;
@@ -41820,7 +41980,7 @@ function splitArgs(input) {
     args.push(current);
   return args;
 }
-function singleLine(value) {
+function singleLine2(value) {
   return value.replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim();
 }
 
@@ -42659,12 +42819,12 @@ No context entries for project "${project.name}".
             return { handled: true };
           }
           let output = `
-**Context Entries (${singleLine(project.name)})**
+**Context Entries (${singleLine2(project.name)})**
 
 `;
           for (const entry of project.context) {
-            const label = entry.label ? ` (${singleLine(entry.label)})` : "";
-            output += `- ${entry.id} [${entry.type}] ${singleLine(entry.value)}${label}
+            const label = entry.label ? ` (${singleLine2(entry.label)})` : "";
+            output += `- ${entry.id} [${entry.type}] ${singleLine2(entry.value)}${label}
 `;
           }
           context.emit("text", output);
@@ -42811,7 +42971,7 @@ No projects found. Use /projects new <name>.
 `;
           for (const project of projects) {
             const marker = project.id === activeId ? "*" : " ";
-            output += `${marker} ${singleLine(project.name)} (${project.id})
+            output += `${marker} ${singleLine2(project.name)} (${project.id})
 `;
           }
           context.emit("text", output);
@@ -42873,13 +43033,13 @@ No projects found. Use /projects new <name>.
             return { handled: true };
           }
           let output = `
-**Project: ${singleLine(project.name)}**
+**Project: ${singleLine2(project.name)}**
 
 `;
           output += `ID: ${project.id}
 `;
           if (project.description) {
-            output += `Description: ${singleLine(project.description)}
+            output += `Description: ${singleLine2(project.description)}
 `;
           }
           output += `Context entries: ${project.context.length}
@@ -43005,11 +43165,11 @@ No plans for project "${project.name}".
             return { handled: true };
           }
           let output = `
-**Plans (${singleLine(project.name)})**
+**Plans (${singleLine2(project.name)})**
 
 `;
           for (const plan of project.plans) {
-            output += `- ${plan.id} ${singleLine(plan.title)} (${plan.steps.length} steps)
+            output += `- ${plan.id} ${singleLine2(plan.title)} (${plan.steps.length} steps)
 `;
           }
           context.emit("text", output);
@@ -43065,7 +43225,7 @@ No plans for project "${project.name}".
             return { handled: true };
           }
           let output = `
-**Plan: ${singleLine(plan.title)}**
+**Plan: ${singleLine2(plan.title)}**
 
 `;
           output += `ID: ${plan.id}
@@ -43075,7 +43235,7 @@ No plans for project "${project.name}".
 `;
           } else {
             for (const step of plan.steps) {
-              output += `- ${step.id} [${step.status}] ${singleLine(step.text)}
+              output += `- ${step.id} [${step.status}] ${singleLine2(step.text)}
 `;
             }
           }
@@ -43508,9 +43668,9 @@ Format the summary as a brief bullet-point list. This summary will replace the c
       content: "",
       handler: async (args, context) => {
         const configPaths = [
-          join12(context.cwd, ".assistants", "config.json"),
-          join12(context.cwd, ".assistants", "config.local.json"),
-          join12(getConfigDir(), "config.json")
+          join13(context.cwd, ".assistants", "config.json"),
+          join13(context.cwd, ".assistants", "config.local.json"),
+          join13(getConfigDir(), "config.json")
         ];
         let message = `
 **Configuration**
@@ -43524,13 +43684,13 @@ Format the summary as a brief bullet-point list. This summary will replace the c
 `;
         }
         const envHome = process.env.HOME || process.env.USERPROFILE;
-        const homeDir = envHome && envHome.trim().length > 0 ? envHome : homedir7();
+        const homeDir = envHome && envHome.trim().length > 0 ? envHome : homedir8();
         message += `
 **Commands Directories:**
 `;
-        message += `  - Project: ${join12(context.cwd, ".assistants", "commands")}
+        message += `  - Project: ${join13(context.cwd, ".assistants", "commands")}
 `;
-        message += `  - Global: ${join12(homeDir, ".assistants", "commands")}
+        message += `  - Global: ${join13(homeDir, ".assistants", "commands")}
 `;
         context.emit("text", message);
         context.emit("done");
@@ -43546,7 +43706,7 @@ Format the summary as a brief bullet-point list. This summary will replace the c
       selfHandled: true,
       content: "",
       handler: async (args, context) => {
-        const commandsDir = join12(context.cwd, ".assistants", "commands");
+        const commandsDir = join13(context.cwd, ".assistants", "commands");
         mkdirSync4(commandsDir, { recursive: true });
         const exampleCommand = `---
 name: reflect
@@ -43562,7 +43722,7 @@ Please summarize the last interaction and suggest 2-3 next steps.
 - Focus on clarity
 - Ask a follow-up question if needed
 `;
-        const examplePath = join12(commandsDir, "reflect.md");
+        const examplePath = join13(commandsDir, "reflect.md");
         if (!existsSync7(examplePath)) {
           writeFileSync5(examplePath, exampleCommand);
         }
@@ -44728,13 +44888,13 @@ function validateToolCalls(toolCalls, tools) {
 
 // packages/core/src/voice/utils.ts
 import { existsSync as existsSync9, readFileSync as readFileSync5 } from "fs";
-import { homedir as homedir9 } from "os";
-import { join as join14 } from "path";
+import { homedir as homedir10 } from "os";
+import { join as join15 } from "path";
 import { spawnSync } from "child_process";
 function loadApiKeyFromSecrets2(key) {
   const envHome = process.env.HOME || process.env.USERPROFILE;
-  const homeDir = envHome && envHome.trim().length > 0 ? envHome : homedir9();
-  const secretsPath = join14(homeDir, ".secrets");
+  const homeDir = envHome && envHome.trim().length > 0 ? envHome : homedir10();
+  const secretsPath = join15(homeDir, ".secrets");
   if (!existsSync9(secretsPath))
     return;
   try {
@@ -44808,7 +44968,7 @@ class SystemSTT {
 // packages/core/src/voice/tts.ts
 import { spawnSync as spawnSync2 } from "child_process";
 import { tmpdir as tmpdir2 } from "os";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 import { readFileSync as readFileSync6, unlinkSync as unlinkSync2 } from "fs";
 class ElevenLabsTTS {
   apiKey;
@@ -44912,7 +45072,7 @@ class SystemTTS {
       if (!say) {
         throw new Error('System TTS not available: missing "say" command.');
       }
-      const output = join15(tmpdir2(), `assistants-tts-${Date.now()}.aiff`);
+      const output = join16(tmpdir2(), `assistants-tts-${Date.now()}.aiff`);
       const args = [];
       if (this.voiceId) {
         args.push("-v", this.voiceId);
@@ -44934,7 +45094,7 @@ class SystemTTS {
     }
     const espeak = findExecutable("espeak") || findExecutable("espeak-ng");
     if (espeak) {
-      const output = join15(tmpdir2(), `assistants-tts-${Date.now()}.wav`);
+      const output = join16(tmpdir2(), `assistants-tts-${Date.now()}.wav`);
       const args = ["-w", output];
       if (this.voiceId) {
         args.push("-v", this.voiceId);
@@ -44961,14 +45121,14 @@ class SystemTTS {
 // packages/core/src/voice/player.ts
 import { spawn } from "child_process";
 import { tmpdir as tmpdir3 } from "os";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 import { unlink as unlink4, writeFileSync as writeFileSync6 } from "fs";
 class AudioPlayer {
   currentProcess = null;
   playing = false;
   async play(audio, options = {}) {
     const format = options.format ?? "mp3";
-    const tempFile = join16(tmpdir3(), `assistants-audio-${Date.now()}.${format}`);
+    const tempFile = join17(tmpdir3(), `assistants-audio-${Date.now()}.${format}`);
     writeFileSync6(tempFile, Buffer.from(audio));
     const player = this.resolvePlayer(format);
     if (!player) {
@@ -45036,7 +45196,7 @@ class AudioPlayer {
 // packages/core/src/voice/recorder.ts
 import { spawn as spawn2 } from "child_process";
 import { tmpdir as tmpdir4 } from "os";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 import { readFileSync as readFileSync7, unlink as unlink5 } from "fs";
 class AudioRecorder {
   currentProcess = null;
@@ -45047,7 +45207,7 @@ class AudioRecorder {
     const duration = options.durationSeconds ?? 5;
     const sampleRate = options.sampleRate ?? 16000;
     const channels = options.channels ?? 1;
-    const output = join17(tmpdir4(), `assistants-record-${Date.now()}.wav`);
+    const output = join18(tmpdir4(), `assistants-record-${Date.now()}.wav`);
     const recorder = this.resolveRecorder(sampleRate, channels, duration, output);
     if (!recorder) {
       throw new Error("No supported audio recorder found. Install sox or ffmpeg.");
@@ -45241,13 +45401,13 @@ class VoiceManager {
 init_src();
 import { existsSync as existsSync11 } from "fs";
 import { mkdir as mkdir5, readFile as readFile8, writeFile as writeFile7, rm as rm2 } from "fs/promises";
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 
 // packages/core/src/identity/identity-manager.ts
 init_src();
 import { existsSync as existsSync10 } from "fs";
 import { mkdir as mkdir4, readFile as readFile7, writeFile as writeFile6, rm } from "fs/promises";
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 var DEFAULT_PROFILE = {
   displayName: "Assistant",
   timezone: "UTC",
@@ -45277,19 +45437,19 @@ class IdentityManager {
     this.basePath = basePath;
   }
   get identitiesRoot() {
-    return join18(this.basePath, "assistants", this.assistantId, "identities");
+    return join19(this.basePath, "assistants", this.assistantId, "identities");
   }
   get indexPath() {
-    return join18(this.identitiesRoot, "index.json");
+    return join19(this.identitiesRoot, "index.json");
   }
   get activePath() {
-    return join18(this.identitiesRoot, "active.json");
+    return join19(this.identitiesRoot, "active.json");
   }
   identityPath(id) {
-    return join18(this.identitiesRoot, `${id}.json`);
+    return join19(this.identitiesRoot, `${id}.json`);
   }
   assistantConfigPath() {
-    return join18(this.basePath, "assistants", this.assistantId, "config.json");
+    return join19(this.basePath, "assistants", this.assistantId, "config.json");
   }
   async initialize() {
     await mkdir4(this.identitiesRoot, { recursive: true });
@@ -45473,16 +45633,16 @@ class AssistantManager {
     this.basePath = basePath;
   }
   get assistantsRoot() {
-    return join19(this.basePath, "assistants");
+    return join20(this.basePath, "assistants");
   }
   get indexPath() {
-    return join19(this.assistantsRoot, "index.json");
+    return join20(this.assistantsRoot, "index.json");
   }
   get activePath() {
-    return join19(this.basePath, "active.json");
+    return join20(this.basePath, "active.json");
   }
   assistantConfigPath(id) {
-    return join19(this.assistantsRoot, id, "config.json");
+    return join20(this.assistantsRoot, id, "config.json");
   }
   async initialize() {
     await mkdir5(this.assistantsRoot, { recursive: true });
@@ -45536,7 +45696,7 @@ class AssistantManager {
     if (!this.assistants.has(id)) {
       throw new Error(`Assistant ${id} not found`);
     }
-    await rm2(join19(this.assistantsRoot, id), { recursive: true, force: true });
+    await rm2(join20(this.assistantsRoot, id), { recursive: true, force: true });
     this.assistants.delete(id);
     await this.removeFromIndex(id);
     if (this.activeId === id) {
@@ -45602,7 +45762,7 @@ class AssistantManager {
     }
   }
   async persistAssistant(assistant) {
-    const dir = join19(this.assistantsRoot, assistant.id);
+    const dir = join20(this.assistantsRoot, assistant.id);
     await mkdir5(dir, { recursive: true });
     await writeFile7(this.assistantConfigPath(assistant.id), JSON.stringify(assistant, null, 2));
   }
@@ -46444,7 +46604,7 @@ ${content.trim()}`);
     const heartbeatConfig = this.buildHeartbeatConfig(this.config);
     if (!heartbeatConfig)
       return;
-    const statePath = join20(getConfigDir(), "state", `${this.sessionId}.json`);
+    const statePath = join21(getConfigDir(), "state", `${this.sessionId}.json`);
     this.heartbeatManager = new HeartbeatManager(heartbeatConfig);
     this.heartbeatPersistence = new StatePersistence(statePath);
     this.heartbeatRecovery = new RecoveryManager(this.heartbeatPersistence, heartbeatConfig.persistPath, heartbeatConfig.staleThresholdMs, {
@@ -46493,7 +46653,7 @@ ${content.trim()}`);
   async startEnergySystem() {
     if (!this.config || this.config.energy?.enabled === false)
       return;
-    const statePath = join20(getConfigDir(), "energy", "state.json");
+    const statePath = join21(getConfigDir(), "energy", "state.json");
     this.energyManager = new EnergyManager(this.config.energy, new EnergyStorage(statePath));
     await this.energyManager.initialize();
     this.refreshEnergyEffects();
@@ -46739,7 +46899,7 @@ ${this.identityContext}`);
       return null;
     const intervalMs = Math.max(1000, config.heartbeat?.intervalMs ?? 15000);
     const staleThresholdMs = Math.max(intervalMs * 2, config.heartbeat?.staleThresholdMs ?? 120000);
-    const persistPath = config.heartbeat?.persistPath ?? join20(getConfigDir(), "heartbeats", `${this.sessionId}.json`);
+    const persistPath = config.heartbeat?.persistPath ?? join21(getConfigDir(), "heartbeats", `${this.sessionId}.json`);
     return {
       intervalMs,
       staleThresholdMs,
@@ -46836,17 +46996,17 @@ init_src();
 
 // packages/core/src/logger.ts
 import { existsSync as existsSync12, mkdirSync as mkdirSync8, appendFileSync, readdirSync as readdirSync4, readFileSync as readFileSync8, writeFileSync as writeFileSync7 } from "fs";
-import { join as join21 } from "path";
+import { join as join22 } from "path";
 class Logger {
   logDir;
   logFile;
   sessionId;
   constructor(sessionId, basePath) {
     this.sessionId = sessionId;
-    this.logDir = join21(basePath || getConfigDir(), "logs");
+    this.logDir = join22(basePath || getConfigDir(), "logs");
     this.ensureDir(this.logDir);
     const date = new Date().toISOString().split("T")[0];
-    this.logFile = join21(this.logDir, `${date}.log`);
+    this.logFile = join22(this.logDir, `${date}.log`);
   }
   ensureDir(dir) {
     if (!existsSync12(dir)) {
@@ -46890,9 +47050,9 @@ class SessionStorage {
   constructor(sessionId, basePath, assistantId) {
     this.sessionId = sessionId;
     const root = basePath || getConfigDir();
-    this.sessionsDir = assistantId ? join21(root, "assistants", assistantId, "sessions") : join21(root, "sessions");
+    this.sessionsDir = assistantId ? join22(root, "assistants", assistantId, "sessions") : join22(root, "sessions");
     this.ensureDir(this.sessionsDir);
-    this.sessionFile = join21(this.sessionsDir, `${sessionId}.json`);
+    this.sessionFile = join22(this.sessionsDir, `${sessionId}.json`);
   }
   ensureDir(dir) {
     if (!existsSync12(dir)) {
@@ -46918,7 +47078,7 @@ class SessionStorage {
   }
   static getActiveAssistantId() {
     try {
-      const activePath = join21(getConfigDir(), "active.json");
+      const activePath = join22(getConfigDir(), "active.json");
       if (!existsSync12(activePath))
         return null;
       const raw = readFileSync8(activePath, "utf-8");
@@ -46932,12 +47092,12 @@ class SessionStorage {
     const root = getConfigDir();
     const resolvedId = assistantId ?? SessionStorage.getActiveAssistantId();
     if (resolvedId) {
-      const assistantDir = join21(root, "assistants", resolvedId, "sessions");
+      const assistantDir = join22(root, "assistants", resolvedId, "sessions");
       if (existsSync12(assistantDir)) {
         return assistantDir;
       }
     }
-    return join21(root, "sessions");
+    return join22(root, "sessions");
   }
   static listSessions(assistantId) {
     const sessionsDir = SessionStorage.resolveSessionsDir(assistantId);
@@ -46949,7 +47109,7 @@ class SessionStorage {
       if (!file.endsWith(".json"))
         continue;
       try {
-        const filePath = join21(sessionsDir, file);
+        const filePath = join22(sessionsDir, file);
         const stat = Bun.file(filePath);
         const content = JSON.parse(readFileSync8(filePath, "utf-8"));
         sessions.push({
@@ -46969,7 +47129,7 @@ class SessionStorage {
   }
   static loadSession(sessionId, assistantId) {
     const sessionsDir = SessionStorage.resolveSessionsDir(assistantId);
-    const sessionFile = join21(sessionsDir, `${sessionId}.json`);
+    const sessionFile = join22(sessionsDir, `${sessionId}.json`);
     try {
       if (!existsSync12(sessionFile))
         return null;
@@ -46983,15 +47143,15 @@ function initAssistantsDir() {
   const baseDir = getConfigDir();
   const dirs = [
     baseDir,
-    join21(baseDir, "logs"),
-    join21(baseDir, "assistants"),
-    join21(baseDir, "shared", "skills"),
-    join21(baseDir, "commands"),
-    join21(baseDir, "temp"),
-    join21(baseDir, "heartbeats"),
-    join21(baseDir, "state"),
-    join21(baseDir, "energy"),
-    join21(baseDir, "migration")
+    join22(baseDir, "logs"),
+    join22(baseDir, "assistants"),
+    join22(baseDir, "shared", "skills"),
+    join22(baseDir, "commands"),
+    join22(baseDir, "temp"),
+    join22(baseDir, "heartbeats"),
+    join22(baseDir, "state"),
+    join22(baseDir, "energy"),
+    join22(baseDir, "migration")
   ];
   for (const dir of dirs) {
     if (!existsSync12(dir)) {
@@ -47647,7 +47807,7 @@ function Input({ onSubmit, isProcessing, queueLength = 0, commands, skills = []
   const visibleSkills = getVisibleItems(filteredSkills);
   const visibleCommands = getVisibleItems(filteredCommands);
   const { stdout } = use_stdout_default();
-  const terminalWidth = stdout?.columns ?? 80;
+  const terminalWidth = Math.max(10, (stdout?.columns ?? 80) - 2);
   const lines = value.split(`
 `);
   const lineCount = lines.length;
@@ -47657,8 +47817,8 @@ function Input({ onSubmit, isProcessing, queueLength = 0, commands, skills = []
     children: [
       /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-          color: "gray",
-          children: "\u2500".repeat(terminalWidth)
+          color: "#666666",
+          children: "-".repeat(terminalWidth)
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
@@ -47692,8 +47852,8 @@ function Input({ onSubmit, isProcessing, queueLength = 0, commands, skills = []
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-          color: "gray",
-          children: "\u2500".repeat(terminalWidth)
+          color: "#666666",
+          children: "-".repeat(terminalWidth)
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
       isProcessing && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
@@ -48242,7 +48402,7 @@ function formatMarkdownTables(text, maxWidth) {
 function parseTableRow(line) {
   const trimmed = line.trim();
   const withoutEdges = trimmed.replace(/^\|/, "").replace(/\|$/, "");
-  return withoutEdges.split("|").map((cell) => cell.trim());
+  return withoutEdges.split("|").map((cell) => cell.replace(/[\r\n]+/g, " ").trim());
 }
 function renderTable(header, rows, maxWidth) {
   const colCount = Math.max(header.length, ...rows.map((r) => r.length));
@@ -48537,7 +48697,7 @@ function truncateToolResult(toolResult, maxLines = 15, maxChars = 3000) {
   if (content.length > maxChars) {
     content = content.slice(0, maxChars) + "...";
   }
-  return prefix + content.trim();
+  return prefix + content.trimEnd();
 }
 function formatToolResultNicely(toolName, content, isError) {
   if (isError) {
@@ -49589,7 +49749,7 @@ function ProcessingIndicator({
 var jsx_dev_runtime7 = __toESM(require_jsx_dev_runtime(), 1);
 function WelcomeBanner({ version, model, directory }) {
   const homeDir = process.env.HOME || "";
-  const displayDir = directory.startsWith(homeDir) ? "~" + directory.slice(homeDir.length) : directory;
+  const displayDir = homeDir && directory.startsWith(homeDir) ? "~" + directory.slice(homeDir.length) : directory;
   return /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Box_default, {
     flexDirection: "column",
     marginBottom: 1,
@@ -49675,7 +49835,7 @@ function formatSessionTime(timestamp) {
 }
 function formatPath(cwd2) {
   const home = process.env.HOME || "";
-  if (cwd2.startsWith(home)) {
+  if (home && cwd2.startsWith(home)) {
     return "~" + cwd2.slice(home.length);
   }
   return cwd2;
@@ -49881,7 +50041,8 @@ function buildDisplayMessages(messages, chunkLines, wrapChars, options) {
       continue;
     }
     if (msg.role === "assistant") {
-      const rendered = renderMarkdown(content, { maxWidth: options?.maxWidth });
+      const assistantWidth = options?.maxWidth ? Math.max(1, options.maxWidth - 2) : undefined;
+      const rendered = renderMarkdown(content, { maxWidth: assistantWidth });
       const renderedLines = rendered.split(`
 `);
       if (renderedLines.length <= chunkLines) {
@@ -49903,7 +50064,8 @@ function buildDisplayMessages(messages, chunkLines, wrapChars, options) {
       }
       continue;
     }
-    const lines = wrapTextLines(content, wrapChars);
+    const effectiveWrap = msg.role === "user" ? Math.max(1, wrapChars - 2) : wrapChars;
+    const lines = wrapTextLines(content, effectiveWrap);
     if (lines.length <= chunkLines) {
       display.push(msg);
       continue;
@@ -50978,7 +51140,7 @@ function formatStreamEvent(chunk) {
 
 // packages/terminal/src/index.tsx
 var jsx_dev_runtime10 = __toESM(require_jsx_dev_runtime(), 1);
-var VERSION3 = "0.6.32";
+var VERSION3 = "0.6.34";
 process.env.ASSISTANTS_VERSION ??= VERSION3;
 function parseArgs(argv) {
   const args = argv.slice(2);
@@ -51134,4 +51296,4 @@ if (options.print !== null) {
   });
 }
 
-//# debugId=E7E53BFBEA38084764756E2164756E21
+//# debugId=83E7550093AA9F2D64756E2164756E21