@hasna/assistants 0.6.27 → 0.6.29

package/dist/index.js

@@ -17773,434 +17773,6 @@ var init_src = __esm(() => {
   init_utils();
 });
 
-// node_modules/.pnpm/tiktoken@1.0.22/node_modules/tiktoken/tiktoken_bg.cjs
-var require_tiktoken_bg = __commonJS((exports, module) => {
-  var wasm;
-  exports.__wbg_set_wasm = function(val) {
-    wasm = val;
-  };
-  var lTextDecoder = typeof TextDecoder === "undefined" ? (0, module.require)("util").TextDecoder : TextDecoder;
-  var cachedTextDecoder = new lTextDecoder("utf-8", { ignoreBOM: true, fatal: true });
-  cachedTextDecoder.decode();
-  var cachedUint8ArrayMemory0 = null;
-  function getUint8ArrayMemory0() {
-    if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
-      cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
-    }
-    return cachedUint8ArrayMemory0;
-  }
-  function getStringFromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
-  }
-  var heap = new Array(128).fill(undefined);
-  heap.push(undefined, null, true, false);
-  var heap_next = heap.length;
-  function addHeapObject(obj) {
-    if (heap_next === heap.length)
-      heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
-    heap[idx] = obj;
-    return idx;
-  }
-  function handleError(f, args) {
-    try {
-      return f.apply(this, args);
-    } catch (e) {
-      wasm.__wbindgen_export_0(addHeapObject(e));
-    }
-  }
-  function getObject(idx) {
-    return heap[idx];
-  }
-  function dropObject(idx) {
-    if (idx < 132)
-      return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-  }
-  function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-  }
-  var WASM_VECTOR_LEN = 0;
-  var lTextEncoder = typeof TextEncoder === "undefined" ? (0, module.require)("util").TextEncoder : TextEncoder;
-  var cachedTextEncoder = new lTextEncoder("utf-8");
-  var encodeString = typeof cachedTextEncoder.encodeInto === "function" ? function(arg, view) {
-    return cachedTextEncoder.encodeInto(arg, view);
-  } : function(arg, view) {
-    const buf = cachedTextEncoder.encode(arg);
-    view.set(buf);
-    return {
-      read: arg.length,
-      written: buf.length
-    };
-  };
-  function passStringToWasm0(arg, malloc, realloc) {
-    if (realloc === undefined) {
-      const buf = cachedTextEncoder.encode(arg);
-      const ptr2 = malloc(buf.length, 1) >>> 0;
-      getUint8ArrayMemory0().subarray(ptr2, ptr2 + buf.length).set(buf);
-      WASM_VECTOR_LEN = buf.length;
-      return ptr2;
-    }
-    let len = arg.length;
-    let ptr = malloc(len, 1) >>> 0;
-    const mem = getUint8ArrayMemory0();
-    let offset = 0;
-    for (;offset < len; offset++) {
-      const code = arg.charCodeAt(offset);
-      if (code > 127)
-        break;
-      mem[ptr + offset] = code;
-    }
-    if (offset !== len) {
-      if (offset !== 0) {
-        arg = arg.slice(offset);
-      }
-      ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0;
-      const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len);
-      const ret = encodeString(arg, view);
-      offset += ret.written;
-      ptr = realloc(ptr, len, offset, 1) >>> 0;
-    }
-    WASM_VECTOR_LEN = offset;
-    return ptr;
-  }
-  function isLikeNone(x) {
-    return x === undefined || x === null;
-  }
-  var cachedDataViewMemory0 = null;
-  function getDataViewMemory0() {
-    if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer) {
-      cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
-    }
-    return cachedDataViewMemory0;
-  }
-  var cachedUint32ArrayMemory0 = null;
-  function getUint32ArrayMemory0() {
-    if (cachedUint32ArrayMemory0 === null || cachedUint32ArrayMemory0.byteLength === 0) {
-      cachedUint32ArrayMemory0 = new Uint32Array(wasm.memory.buffer);
-    }
-    return cachedUint32ArrayMemory0;
-  }
-  function getArrayU32FromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return getUint32ArrayMemory0().subarray(ptr / 4, ptr / 4 + len);
-  }
-  function passArray8ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 1, 1) >>> 0;
-    getUint8ArrayMemory0().set(arg, ptr / 1);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-  }
-  function passArray32ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 4, 4) >>> 0;
-    getUint32ArrayMemory0().set(arg, ptr / 4);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-  }
-  function getArrayU8FromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
-  }
-  exports.get_encoding = function(encoding, extend_special_tokens) {
-    if (wasm == null)
-      throw new Error("tiktoken: WASM binary has not been propery initialized.");
-    try {
-      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-      const ptr0 = passStringToWasm0(encoding, wasm.__wbindgen_export_1, wasm.__wbindgen_export_2);
-      const len0 = WASM_VECTOR_LEN;
-      wasm.get_encoding(retptr, ptr0, len0, addHeapObject(extend_special_tokens));
-      var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-      var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-      var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-      if (r2) {
-        throw takeObject(r1);
-      }
-      return Tiktoken.__wrap(r0);
-    } finally {
-      wasm.__wbindgen_add_to_stack_pointer(16);
-    }
-  };
-  exports.encoding_for_model = function(model, extend_special_tokens) {
-    if (wasm == null)
-      throw new Error("tiktoken: WASM binary has not been propery initialized.");
-    try {
-      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-      const ptr0 = passStringToWasm0(model, wasm.__wbindgen_export_1, wasm.__wbindgen_export_2);
-      const len0 = WASM_VECTOR_LEN;
-      wasm.encoding_for_model(retptr, ptr0, len0, addHeapObject(extend_special_tokens));
-      var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-      var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-      var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-      if (r2) {
-        throw takeObject(r1);
-      }
-      return Tiktoken.__wrap(r0);
-    } finally {
-      wasm.__wbindgen_add_to_stack_pointer(16);
-    }
-  };
-  exports.get_encoding_name_for_model = function(model) {
-    if (wasm == null)
-      throw new Error("tiktoken: WASM binary has not been propery initialized.");
-    let deferred3_0;
-    let deferred3_1;
-    try {
-      const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-      const ptr0 = passStringToWasm0(model, wasm.__wbindgen_export_1, wasm.__wbindgen_export_2);
-      const len0 = WASM_VECTOR_LEN;
-      wasm.get_encoding_name_for_model(retptr, ptr0, len0);
-      var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-      var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-      var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-      var r3 = getDataViewMemory0().getInt32(retptr + 4 * 3, true);
-      var ptr2 = r0;
-      var len2 = r1;
-      if (r3) {
-        ptr2 = 0;
-        len2 = 0;
-        throw takeObject(r2);
-      }
-      deferred3_0 = ptr2;
-      deferred3_1 = len2;
-      return getStringFromWasm0(ptr2, len2);
-    } finally {
-      wasm.__wbindgen_add_to_stack_pointer(16);
-      wasm.__wbindgen_export_3(deferred3_0, deferred3_1, 1);
-    }
-  };
-  var TiktokenFinalization = typeof FinalizationRegistry === "undefined" ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((ptr) => wasm.__wbg_tiktoken_free(ptr >>> 0, 1));
-
-  class Tiktoken {
-    constructor(tiktoken_bfe, special_tokens, pat_str) {
-      if (wasm == null)
-        throw new Error("tiktoken: WASM binary has not been propery initialized.");
-      const ptr0 = passStringToWasm0(tiktoken_bfe, wasm.__wbindgen_export_1, wasm.__wbindgen_export_2);
-      const len0 = WASM_VECTOR_LEN;
-      const ptr1 = passStringToWasm0(pat_str, wasm.__wbindgen_export_1, wasm.__wbindgen_export_2);
-      const len1 = WASM_VECTOR_LEN;
-      const ret = wasm.tiktoken_new(ptr0, len0, addHeapObject(special_tokens), ptr1, len1);
-      this.__wbg_ptr = ret >>> 0;
-      TiktokenFinalization.register(this, this.__wbg_ptr, this);
-      return this;
-    }
-    get name() {
-      try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.tiktoken_name(retptr, this.__wbg_ptr);
-        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        let v1;
-        if (r0 !== 0) {
-          v1 = getStringFromWasm0(r0, r1).slice();
-          wasm.__wbindgen_export_3(r0, r1 * 1, 1);
-        }
-        return v1;
-      } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-      }
-    }
-    static __wrap(ptr) {
-      ptr = ptr >>> 0;
-      const obj = Object.create(Tiktoken.prototype);
-      obj.__wbg_ptr = ptr;
-      TiktokenFinalization.register(obj, obj.__wbg_ptr, obj);
-      return obj;
-    }
-    __destroy_into_raw() {
-      const ptr = this.__wbg_ptr;
-      this.__wbg_ptr = 0;
-      TiktokenFinalization.unregister(this);
-      return ptr;
-    }
-    free() {
-      if (wasm == null)
-        throw new Error("tiktoken: WASM binary has not been propery initialized.");
-      const ptr = this.__destroy_into_raw();
-      wasm.__wbg_tiktoken_free(ptr, 0);
-    }
-    encode(text, allowed_special, disallowed_special) {
-      if (wasm == null)
-        throw new Error("tiktoken: WASM binary has not been propery initialized.");
-      try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passStringToWasm0(text, wasm.__wbindgen_export_1, wasm.__wbindgen_export_2);
-        const len0 = WASM_VECTOR_LEN;
-        wasm.tiktoken_encode(retptr, this.__wbg_ptr, ptr0, len0, addHeapObject(allowed_special), addHeapObject(disallowed_special));
-        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-        var r3 = getDataViewMemory0().getInt32(retptr + 4 * 3, true);
-        if (r3) {
-          throw takeObject(r2);
-        }
-        var v2 = getArrayU32FromWasm0(r0, r1).slice();
-        wasm.__wbindgen_export_3(r0, r1 * 4, 4);
-        return v2;
-      } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-      }
-    }
-    encode_ordinary(text) {
-      if (wasm == null)
-        throw new Error("tiktoken: WASM binary has not been propery initialized.");
-      try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passStringToWasm0(text, wasm.__wbindgen_export_1, wasm.__wbindgen_export_2);
-        const len0 = WASM_VECTOR_LEN;
-        wasm.tiktoken_encode_ordinary(retptr, this.__wbg_ptr, ptr0, len0);
-        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        var v2 = getArrayU32FromWasm0(r0, r1).slice();
-        wasm.__wbindgen_export_3(r0, r1 * 4, 4);
-        return v2;
-      } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-      }
-    }
-    encode_with_unstable(text, allowed_special, disallowed_special) {
-      if (wasm == null)
-        throw new Error("tiktoken: WASM binary has not been propery initialized.");
-      try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passStringToWasm0(text, wasm.__wbindgen_export_1, wasm.__wbindgen_export_2);
-        const len0 = WASM_VECTOR_LEN;
-        wasm.tiktoken_encode_with_unstable(retptr, this.__wbg_ptr, ptr0, len0, addHeapObject(allowed_special), addHeapObject(disallowed_special));
-        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-        if (r2) {
-          throw takeObject(r1);
-        }
-        return takeObject(r0);
-      } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-      }
-    }
-    encode_single_token(bytes) {
-      if (wasm == null)
-        throw new Error("tiktoken: WASM binary has not been propery initialized.");
-      const ptr0 = passArray8ToWasm0(bytes, wasm.__wbindgen_export_1);
-      const len0 = WASM_VECTOR_LEN;
-      const ret = wasm.tiktoken_encode_single_token(this.__wbg_ptr, ptr0, len0);
-      return ret >>> 0;
-    }
-    decode(tokens) {
-      if (wasm == null)
-        throw new Error("tiktoken: WASM binary has not been propery initialized.");
-      try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passArray32ToWasm0(tokens, wasm.__wbindgen_export_1);
-        const len0 = WASM_VECTOR_LEN;
-        wasm.tiktoken_decode(retptr, this.__wbg_ptr, ptr0, len0);
-        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        var v2 = getArrayU8FromWasm0(r0, r1).slice();
-        wasm.__wbindgen_export_3(r0, r1 * 1, 1);
-        return v2;
-      } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-      }
-    }
-    decode_single_token_bytes(token) {
-      if (wasm == null)
-        throw new Error("tiktoken: WASM binary has not been propery initialized.");
-      try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.tiktoken_decode_single_token_bytes(retptr, this.__wbg_ptr, token);
-        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        var v1 = getArrayU8FromWasm0(r0, r1).slice();
-        wasm.__wbindgen_export_3(r0, r1 * 1, 1);
-        return v1;
-      } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-      }
-    }
-    token_byte_values() {
-      if (wasm == null)
-        throw new Error("tiktoken: WASM binary has not been propery initialized.");
-      const ret = wasm.tiktoken_token_byte_values(this.__wbg_ptr);
-      return takeObject(ret);
-    }
-  }
-  exports.Tiktoken = Tiktoken;
-  exports.__wbg_parse_def2e24ef1252aff = function() {
-    return handleError(function(arg0, arg1) {
-      const ret = JSON.parse(getStringFromWasm0(arg0, arg1));
-      return addHeapObject(ret);
-    }, arguments);
-  };
-  exports.__wbg_stringify_f7ed6987935b4a24 = function() {
-    return handleError(function(arg0) {
-      const ret = JSON.stringify(getObject(arg0));
-      return addHeapObject(ret);
-    }, arguments);
-  };
-  exports.__wbindgen_error_new = function(arg0, arg1) {
-    const ret = new Error(getStringFromWasm0(arg0, arg1));
-    return addHeapObject(ret);
-  };
-  exports.__wbindgen_is_undefined = function(arg0) {
-    const ret = getObject(arg0) === undefined;
-    return ret;
-  };
-  exports.__wbindgen_object_drop_ref = function(arg0) {
-    takeObject(arg0);
-  };
-  exports.__wbindgen_string_get = function(arg0, arg1) {
-    if (wasm == null)
-      throw new Error("tiktoken: WASM binary has not been propery initialized.");
-    const obj = getObject(arg1);
-    const ret = typeof obj === "string" ? obj : undefined;
-    var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_export_1, wasm.__wbindgen_export_2);
-    var len1 = WASM_VECTOR_LEN;
-    getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
-    getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
-  };
-  exports.__wbindgen_throw = function(arg0, arg1) {
-    throw new Error(getStringFromWasm0(arg0, arg1));
-  };
-});
-
-// node_modules/.pnpm/tiktoken@1.0.22/node_modules/tiktoken/tiktoken.cjs
-var require_tiktoken = __commonJS((exports) => {
-  var __dirname = "/Users/hasna/Workspace/dev/hasna/opensource/opensourcedev/opensource-oldpal/node_modules/.pnpm/tiktoken@1.0.22/node_modules/tiktoken";
-  var wasm = require_tiktoken_bg();
-  var imports = {};
-  imports["./tiktoken_bg.js"] = wasm;
-  var path = __require("path");
-  var fs2 = __require("fs");
-  var candidates = __dirname.split(path.sep).reduce((memo, _, index, array) => {
-    const prefix = array.slice(0, index + 1).join(path.sep) + path.sep;
-    if (!prefix.includes("node_modules" + path.sep)) {
-      memo.unshift(path.join(prefix, "node_modules", "tiktoken", "", "./tiktoken_bg.wasm"));
-    }
-    return memo;
-  }, []);
-  candidates.unshift(path.join(__dirname, "./tiktoken_bg.wasm"));
-  var bytes = null;
-  for (const candidate of candidates) {
-    try {
-      bytes = fs2.readFileSync(candidate);
-      break;
-    } catch {}
-  }
-  if (bytes == null)
-    throw new Error("Missing tiktoken_bg.wasm");
-  var wasmModule = new WebAssembly.Module(bytes);
-  var wasmInstance = new WebAssembly.Instance(wasmModule, imports);
-  wasm.__wbg_set_wasm(wasmInstance.exports);
-  exports.get_encoding = wasm["get_encoding"];
-  exports.encoding_for_model = wasm["encoding_for_model"];
-  exports.get_encoding_name_for_model = wasm["get_encoding_name_for_model"];
-  exports.Tiktoken = wasm["Tiktoken"];
-});
-
 // packages/core/src/errors/codes.ts
 var ErrorCodes;
 var init_codes = __esm(() => {
@@ -37166,45 +36738,18 @@ init_src();
 // packages/core/src/context/token-counter.ts
 var MESSAGE_OVERHEAD_TOKENS = 4;
 var CHARS_PER_TOKEN = 4;
-var tiktokenEncoder = null;
-var tiktokenLoadAttempted = false;
-function loadTiktoken() {
-  if (tiktokenLoadAttempted)
-    return tiktokenEncoder;
-  tiktokenLoadAttempted = true;
-  try {
-    const tiktoken = require_tiktoken();
-    try {
-      tiktokenEncoder = tiktoken.encoding_for_model("gpt-4");
-    } catch {
-      tiktokenEncoder = tiktoken.get_encoding("cl100k_base");
-    }
-  } catch (error) {
-    console.warn("Token counting using estimation (tiktoken unavailable)");
-    tiktokenEncoder = null;
-  }
-  return tiktokenEncoder;
-}
 
 class TokenCounter {
   cache = new Map;
   maxCacheEntries = 1e4;
-  constructor(_model) {
-    loadTiktoken();
-  }
+  constructor(_model) {}
   count(text) {
     if (!text)
       return 0;
     const cached = this.cache.get(text);
     if (cached !== undefined)
       return cached;
-    let tokens;
-    const encoder = loadTiktoken();
-    if (encoder) {
-      tokens = encoder.encode(text).length;
-    } else {
-      tokens = Math.ceil(text.length / CHARS_PER_TOKEN);
-    }
+    const tokens = Math.ceil(text.length / CHARS_PER_TOKEN);
     if (text.length < 1e4) {
       this.cache.set(text, tokens);
       if (this.cache.size > this.maxCacheEntries) {
@@ -38163,7 +37708,7 @@ function isErrorResult(result) {
 // packages/core/src/tools/connector.ts
 init_errors();
 import { homedir as homedir2 } from "os";
-import { join as join3, delimiter } from "path";
+import { join as join3, delimiter, dirname as dirname2 } from "path";
 import { readdirSync, statSync, existsSync as existsSync2, mkdirSync, writeFileSync, readFileSync as readFileSync2 } from "fs";
 function resolveTimeout(resolve) {
   resolve({ exitCode: 1 });
@@ -38210,7 +37755,7 @@ class ConnectorBridge {
   static saveDiskCache() {
     try {
       const cachePath = ConnectorBridge.getCachePath();
-      const cacheDir = join3(cachePath, "..");
+      const cacheDir = dirname2(cachePath);
       if (!existsSync2(cacheDir)) {
         mkdirSync(cacheDir, { recursive: true });
       }
@@ -38261,6 +37806,7 @@ class ConnectorBridge {
     return Array.from(connectorNames);
   }
   fastDiscover(connectorNames) {
+    this.connectors.clear();
     if (ConnectorBridge.cache.size > 0) {
       const connectors2 = [];
       const allowList2 = connectorNames && connectorNames.length > 0 ? new Set(connectorNames) : null;
@@ -38321,13 +37867,15 @@ class ConnectorBridge {
       ConnectorBridge.saveDiskCache();
     }
     const discovered = [];
+    const nextConnectors = new Map;
     for (const name of names) {
       const connector = ConnectorBridge.cache.get(name);
       if (connector) {
         discovered.push(connector);
-        this.connectors.set(connector.name, connector);
+        nextConnectors.set(connector.name, connector);
       }
     }
+    this.connectors = nextConnectors;
     return discovered;
   }
   createMinimalConnector(name, cli) {
@@ -38906,7 +38454,7 @@ ${stderr || stdout}`.trim(), {
 }
 
 // packages/core/src/tools/filesystem.ts
-import { join as join4, resolve as resolve3, dirname as dirname2, sep } from "path";
+import { join as join4, resolve as resolve3, dirname as dirname3, sep } from "path";
 init_errors();
 var {Glob } = globalThis.Bun;
 
@@ -39211,7 +38759,7 @@ class FilesystemTools {
           retryable: false
         });
       }
-      const dir = dirname2(validated.resolved);
+      const dir = dirname3(validated.resolved);
       await Bun.$`mkdir -p ${dir}`.quiet();
       await Bun.write(validated.resolved, content);
       return `Successfully wrote ${content.length} characters to ${validated.resolved}`;
@@ -40795,7 +40343,7 @@ Respond with ALLOW or DENY on the first line, followed by a short reason.`,
 
 // packages/core/src/skills/loader.ts
 init_src();
-import { join as join8, basename, dirname as dirname3 } from "path";
+import { join as join8, basename, dirname as dirname4 } from "path";
 import { homedir as homedir5 } from "os";
 var {Glob: Glob2 } = globalThis.Bun;
 
@@ -40846,7 +40394,7 @@ class SkillLoader {
     try {
       const content = await Bun.file(filePath).text();
       const { frontmatter, content: markdownContent } = parseFrontmatter(content);
-      const dirName = basename(dirname3(filePath));
+      const dirName = basename(dirname4(filePath));
       const name = frontmatter.name || dirName;
       let description = frontmatter.description || "";
       if (!description && markdownContent) {
@@ -40933,7 +40481,7 @@ class SkillLoader {
 
 // packages/core/src/skills/executor.ts
 init_src();
-import { dirname as dirname4 } from "path";
+import { dirname as dirname5 } from "path";
 
 class SkillExecutor {
   constructor() {}
@@ -40954,7 +40502,7 @@ ARGUMENTS: ${args.join(" ")}`;
     if (matches.length === 0) {
       return content;
     }
-    const skillDir = dirname4(skillFilePath);
+    const skillDir = dirname5(skillFilePath);
     let result = content;
     for (const match of matches) {
       const fullMatch = match[0];
@@ -42227,14 +41775,24 @@ function splitArgs(input) {
   const args = [];
   let current = "";
   let quote = null;
+  let escaped = false;
   for (let i = 0;i < input.length; i += 1) {
     const char = input[i];
     if (quote) {
+      if (escaped) {
+        current += char;
+        escaped = false;
+        continue;
+      }
+      if (char === "\\") {
+        escaped = true;
+        continue;
+      }
       if (char === quote) {
         quote = null;
-      } else {
-        current += char;
+        continue;
       }
+      current += char;
       continue;
     }
     if (char === '"' || char === "'") {
@@ -42254,6 +41812,9 @@ function splitArgs(input) {
     args.push(current);
   return args;
 }
+function singleLine(value) {
+  return value.replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim();
+}
 
 class BuiltinCommands {
   tokenUsage = {
@@ -42976,7 +42537,8 @@ Suggestions:
       content: "",
       handler: async (args, context) => {
         const usage = this.tokenUsage;
-        const usedPercent = Math.round(usage.totalTokens / usage.maxContextTokens * 100);
+        const rawPercent = usage.maxContextTokens > 0 ? Math.round(usage.totalTokens / usage.maxContextTokens * 100) : 0;
+        const usedPercent = Math.max(0, Math.min(100, rawPercent));
         let message = `
 **Token Usage**
 
@@ -42988,8 +42550,8 @@ Suggestions:
         message += `Total: ${usage.totalTokens.toLocaleString()} / ${usage.maxContextTokens.toLocaleString()} (${usedPercent}%)
 `;
         const barLength = 30;
-        const filledLength = Math.round(usedPercent / 100 * barLength);
-        const bar = "\u2588".repeat(filledLength) + "\u2591".repeat(barLength - filledLength);
+        const filledLength = Math.max(0, Math.min(barLength, Math.round(usedPercent / 100 * barLength)));
+        const bar = "\u2588".repeat(filledLength) + "\u2591".repeat(Math.max(0, barLength - filledLength));
         message += `
 [${bar}] ${usedPercent}%
 `;
@@ -43039,7 +42601,8 @@ Context summarization is not available.
             return { handled: true };
           }
           const { config, state } = info;
-          const usedPercent = Math.round(state.totalTokens / config.maxContextTokens * 100);
+          const rawPercent = config.maxContextTokens > 0 ? Math.round(state.totalTokens / config.maxContextTokens * 100) : 0;
+          const usedPercent = Math.max(0, Math.min(100, rawPercent));
           let message = `
 **Context Status**
 
@@ -43063,8 +42626,8 @@ Context summarization is not available.
             }
           }
           const barLength = 30;
-          const filledLength = Math.round(usedPercent / 100 * barLength);
-          const bar = "\u2588".repeat(filledLength) + "\u2591".repeat(barLength - filledLength);
+          const filledLength = Math.max(0, Math.min(barLength, Math.round(usedPercent / 100 * barLength)));
+          const bar = "\u2588".repeat(filledLength) + "\u2591".repeat(Math.max(0, barLength - filledLength));
           message += `
 [${bar}] ${usedPercent}%
 `;
@@ -43088,12 +42651,12 @@ No context entries for project "${project.name}".
             return { handled: true };
           }
           let output = `
-**Context Entries (${project.name})**
+**Context Entries (${singleLine(project.name)})**
 
 `;
           for (const entry of project.context) {
-            const label = entry.label ? ` (${entry.label})` : "";
-            output += `- ${entry.id} [${entry.type}] ${entry.value}${label}
+            const label = entry.label ? ` (${singleLine(entry.label)})` : "";
+            output += `- ${entry.id} [${entry.type}] ${singleLine(entry.value)}${label}
 `;
           }
           context.emit("text", output);
@@ -43240,7 +42803,7 @@ No projects found. Use /projects new <name>.
 `;
           for (const project of projects) {
             const marker = project.id === activeId ? "*" : " ";
-            output += `${marker} ${project.name} (${project.id})
+            output += `${marker} ${singleLine(project.name)} (${project.id})
 `;
           }
           context.emit("text", output);
@@ -43302,13 +42865,13 @@ No projects found. Use /projects new <name>.
             return { handled: true };
           }
           let output = `
-**Project: ${project.name}**
+**Project: ${singleLine(project.name)}**
 
 `;
           output += `ID: ${project.id}
 `;
           if (project.description) {
-            output += `Description: ${project.description}
+            output += `Description: ${singleLine(project.description)}
 `;
           }
           output += `Context entries: ${project.context.length}
@@ -43434,11 +42997,11 @@ No plans for project "${project.name}".
             return { handled: true };
           }
           let output = `
-**Plans (${project.name})**
+**Plans (${singleLine(project.name)})**
 
 `;
           for (const plan of project.plans) {
-            output += `- ${plan.id} ${plan.title} (${plan.steps.length} steps)
+            output += `- ${plan.id} ${singleLine(plan.title)} (${plan.steps.length} steps)
 `;
           }
           context.emit("text", output);
@@ -43473,6 +43036,10 @@ No plans for project "${project.name}".
             context.emit("done");
             return { handled: true };
           }
+          context.emit("text", `Failed to create plan "${plan.title}".
+`);
+          context.emit("done");
+          return { handled: true };
         }
         if (sub === "show") {
           const id = parts[1];
@@ -43490,7 +43057,7 @@ No plans for project "${project.name}".
             return { handled: true };
           }
           let output = `
-**Plan: ${plan.title}**
+**Plan: ${singleLine(plan.title)}**
 
 `;
           output += `ID: ${plan.id}
@@ -43500,7 +43067,7 @@ No plans for project "${project.name}".
 `;
           } else {
             for (const step of plan.steps) {
-              output += `- ${step.id} [${step.status}] ${step.text}
+              output += `- ${step.id} [${step.status}] ${singleLine(step.text)}
 `;
             }
           }
@@ -43543,6 +43110,10 @@ No plans for project "${project.name}".
             context.emit("done");
             return { handled: true };
           }
+          context.emit("text", `Failed to add step to plan ${planId}.
+`);
+          context.emit("done");
+          return { handled: true };
         }
         if (sub === "set") {
           const planId = parts[1];
@@ -43591,6 +43162,10 @@ No plans for project "${project.name}".
             context.emit("done");
             return { handled: true };
           }
+          context.emit("text", `Failed to update step ${stepId}.
+`);
+          context.emit("done");
+          return { handled: true };
         }
         if (sub === "remove") {
           const planId = parts[1];
@@ -43627,6 +43202,10 @@ No plans for project "${project.name}".
             context.emit("done");
             return { handled: true };
           }
+          context.emit("text", `Failed to remove step ${stepId} from plan ${planId}.
+`);
+          context.emit("done");
+          return { handled: true };
         }
         if (sub === "delete" || sub === "rm") {
           const planId = parts[1];
@@ -43655,6 +43234,10 @@ No plans for project "${project.name}".
             context.emit("done");
             return { handled: true };
           }
+          context.emit("text", `Failed to delete plan ${planId}.
+`);
+          context.emit("done");
+          return { handled: true };
         }
         context.emit("text", `Unknown /plans command. Use /plans help.
 `);
@@ -43758,7 +43341,7 @@ Energy restored.
           message += `No skills loaded.
 `;
           message += `
-Add skills to ~/.assistants/assistants-shared/skills/ or .assistants/skills/
+Add skills to ~/.assistants/shared/skills/ or .assistants/skills/
 `;
         } else {
           for (const skill of context.skills) {
@@ -43785,7 +43368,8 @@ ${context.skills.length} skill(s) available.
       content: "",
       handler: async (args, context) => {
         const usage = this.tokenUsage;
-        const usedPercent = Math.round(usage.totalTokens / usage.maxContextTokens * 100);
+        const rawPercent = usage.maxContextTokens > 0 ? Math.round(usage.totalTokens / usage.maxContextTokens * 100) : 0;
+        const usedPercent = Math.max(0, Math.min(100, rawPercent));
         let message = `
 **Session Status**
 
@@ -43849,14 +43433,15 @@ ${context.skills.length} skill(s) available.
 `;
         }
         const barLength = 30;
-        const filledLength = Math.round(usedPercent / 100 * barLength);
-        const bar = "\u2588".repeat(filledLength) + "\u2591".repeat(barLength - filledLength);
+        const filledLength = Math.max(0, Math.min(barLength, Math.round(usedPercent / 100 * barLength)));
+        const bar = "\u2588".repeat(filledLength) + "\u2591".repeat(Math.max(0, barLength - filledLength));
         message += `
   [${bar}] ${usedPercent}%
 `;
         const contextInfo = context.getContextInfo?.();
         if (contextInfo) {
-          const contextUsedPercent = Math.round(contextInfo.state.totalTokens / contextInfo.config.maxContextTokens * 100);
+          const contextRawPercent = contextInfo.config.maxContextTokens > 0 ? Math.round(contextInfo.state.totalTokens / contextInfo.config.maxContextTokens * 100) : 0;
+          const contextUsedPercent = Math.max(0, Math.min(100, contextRawPercent));
           message += `
 **Context Summary:**
 `;
@@ -44108,6 +43693,13 @@ Keep it concise but comprehensive.`
         } else {
           at = parts[0];
         }
+        if (kind === "cron" && !cron) {
+          context.emit("text", `Usage:
+  /schedule cron "<expr>" <command>
+`);
+          context.emit("done");
+          return { handled: true };
+        }
         const command = parts.slice(commandStart).join(" ").trim();
         if (!command) {
           context.emit("text", `Error: command is required.
@@ -44132,6 +43724,12 @@ Keep it concise but comprehensive.`
         schedule.nextRunAt = computeNextRun(schedule, now2);
         if (!schedule.nextRunAt) {
           context.emit("text", `Error: unable to compute next run time.
+`);
+          context.emit("done");
+          return { handled: true };
+        }
+        if (schedule.nextRunAt <= now2) {
+          context.emit("text", `Error: scheduled time must be in the future.
 `);
           context.emit("done");
           return { handled: true };
@@ -44161,6 +43759,7 @@ Keep it concise but comprehensive.`
           context.emit("done");
           return { handled: true };
         }
+        const escapeCell = (value) => value.replace(/\|/g, "\\|").replace(/\s+/g, " ").trim();
         let output = `
 | ID | Status | Next Run | Command |
 `;
@@ -44168,7 +43767,7 @@ Keep it concise but comprehensive.`
 `;
         for (const schedule of schedules.sort((a, b) => (a.nextRunAt || 0) - (b.nextRunAt || 0))) {
           const next = schedule.nextRunAt ? new Date(schedule.nextRunAt).toISOString() : "n/a";
-          output += `| ${schedule.id} | ${schedule.status} | ${next} | ${schedule.command} |
+          output += `| ${schedule.id} | ${schedule.status} | ${next} | ${escapeCell(schedule.command)} |
 `;
         }
         context.emit("text", output);
@@ -44266,14 +43865,32 @@ ${lines.join(`
           context.emit("done");
           return { handled: true };
         }
-        const updated = await updateSchedule(context.cwd, id, (schedule) => ({
-          ...schedule,
-          status: "active",
-          updatedAt: Date.now(),
-          nextRunAt: computeNextRun(schedule, Date.now())
-        }));
-        context.emit("text", updated ? `Resumed schedule ${id}.
-` : `Schedule ${id} not found.
+        let computedNext;
+        const updated = await updateSchedule(context.cwd, id, (schedule) => {
+          computedNext = computeNextRun(schedule, Date.now());
+          if (!computedNext) {
+            return schedule;
+          }
+          return {
+            ...schedule,
+            status: "active",
+            updatedAt: Date.now(),
+            nextRunAt: computedNext
+          };
+        });
+        if (!updated) {
+          context.emit("text", `Schedule ${id} not found.
+`);
+          context.emit("done");
+          return { handled: true };
+        }
+        if (!computedNext) {
+          context.emit("text", `Failed to compute next run for schedule ${id}.
+`);
+          context.emit("done");
+          return { handled: true };
+        }
+        context.emit("text", `Resumed schedule ${id}.
 `);
         context.emit("done");
         return { handled: true };
@@ -44306,13 +43923,15 @@ Connector "${connectorName}" not found.
             context.emit("done");
             return { handled: true };
           }
+          const cli = connector.cli || `connect-${connector.name}`;
+          const description = connector.description?.trim() || "No description provided.";
           let message2 = `
 **${connector.name}** Connector
 
 `;
-          message2 += `CLI: \`${connector.cli}\`
+          message2 += `CLI: \`${cli}\`
 `;
-          message2 += `Description: ${connector.description}
+          message2 += `Description: ${description}
 
 `;
           try {
@@ -44346,9 +43965,15 @@ Connector "${connectorName}" not found.
           message2 += `
 **Available Commands:**
 `;
-          for (const cmd of connector.commands) {
-            message2 += `  ${cmd.name} - ${cmd.description}
+          const commands = connector.commands || [];
+          if (commands.length === 0) {
+            message2 += `  (no commands discovered)
+`;
+          } else {
+            for (const cmd of commands) {
+              message2 += `  ${cmd.name} - ${cmd.description}
 `;
+            }
           }
           message2 += `
 **Usage:**
@@ -44375,21 +44000,18 @@ Connector "${connectorName}" not found.
           message += "  `bun add -g connect-<name>`\n\n";
           message += "Then run `/connectors` again to verify it is detected.\n";
         } else {
-          const statuses = [];
-          for (const connector of context.connectors) {
+          const checkAuth = async (connector) => {
             let status = "\u25CB";
             let timeoutId = null;
             try {
+              const cli = connector.cli || `connect-${connector.name}`;
               const timeoutPromise = new Promise((resolve5) => {
                 timeoutId = setTimeout(resolveAuthTimeout, 1000, resolve5);
               });
               const result = await Promise.race([
-                Bun.$`${connector.cli} auth status --format json`.quiet().nothrow(),
+                Bun.$`${cli} auth status --format json`.quiet().nothrow(),
                 timeoutPromise
               ]);
-              if (timeoutId) {
-                clearTimeout(timeoutId);
-              }
               if (result.exitCode === 0) {
                 try {
                   const parsed = JSON.parse(result.stdout.toString());
@@ -44405,8 +44027,10 @@ Connector "${connectorName}" not found.
                 clearTimeout(timeoutId);
               }
             }
-            statuses.push(status);
-          }
+            return status;
+          };
+          const statuses = await Promise.all(context.connectors.map((connector) => checkAuth(connector)));
+          const escapeCell = (value) => value.replace(/\|/g, "\\|").replace(/\s+/g, " ").trim();
           message += `| Status | Connector | Commands |
 `;
           message += `|--------|-----------|----------|
@@ -44414,8 +44038,8 @@ Connector "${connectorName}" not found.
           for (let i = 0;i < context.connectors.length; i++) {
             const connector = context.connectors[i];
             const status = statuses[i];
-            const cmdCount = connector.commands.length;
-            message += `| ${status} | ${connector.name.padEnd(12)} | ${cmdCount} commands |
+            const cmdCount = connector.commands?.length ?? 0;
+            message += `| ${status} | ${escapeCell(connector.name)} | ${cmdCount} commands |
 `;
           }
           message += `
@@ -44482,7 +44106,8 @@ No security events recorded.
         message += `| --- | --- | --- | --- |
 `;
         for (const event of events) {
-          const detail = event.details.reason.replace(/\n/g, " ");
+          const rawDetail = event.details?.reason || event.details?.path || event.details?.command || event.details?.tool || "n/a";
+          const detail = String(rawDetail).replace(/\|/g, "\\|").replace(/\s+/g, " ").trim();
           message += `| ${event.timestamp} | ${event.severity} | ${event.eventType} | ${detail} |
 `;
         }
@@ -44696,7 +44321,7 @@ async function createLLMClient(config) {
 }
 
 // packages/core/src/heartbeat/manager.ts
-import { dirname as dirname5 } from "path";
+import { dirname as dirname6 } from "path";
 import { mkdirSync as mkdirSync5 } from "fs";
 import { readFile as readFile4, writeFile as writeFile3 } from "fs/promises";
 
@@ -44718,7 +44343,7 @@ class HeartbeatManager {
       errorsEncountered: 0,
       uptimeSeconds: 0
     };
-    const dir = dirname5(config.persistPath);
+    const dir = dirname6(config.persistPath);
     mkdirSync5(dir, { recursive: true });
   }
   start(sessionId) {
@@ -44792,7 +44417,7 @@ class HeartbeatManager {
   }
 }
 // packages/core/src/heartbeat/persistence.ts
-import { dirname as dirname6 } from "path";
+import { dirname as dirname7 } from "path";
 import { mkdirSync as mkdirSync6 } from "fs";
 import { readFile as readFile5, writeFile as writeFile4, unlink as unlink3 } from "fs/promises";
 
@@ -44800,7 +44425,7 @@ class StatePersistence {
   path;
   constructor(path2) {
     this.path = path2;
-    mkdirSync6(dirname6(path2), { recursive: true });
+    mkdirSync6(dirname7(path2), { recursive: true });
   }
   async save(state) {
     try {
@@ -45019,7 +44644,7 @@ class EnergyManager {
   }
 }
 // packages/core/src/energy/storage.ts
-import { dirname as dirname7 } from "path";
+import { dirname as dirname8 } from "path";
 import { mkdirSync as mkdirSync7 } from "fs";
 import { readFile as readFile6, writeFile as writeFile5 } from "fs/promises";
 
@@ -45027,7 +44652,7 @@ class EnergyStorage {
   path;
   constructor(path2) {
     this.path = path2;
-    mkdirSync7(dirname7(path2), { recursive: true });
+    mkdirSync7(dirname8(path2), { recursive: true });
   }
   async save(state) {
     try {
@@ -46231,7 +45856,7 @@ class AgentLoop {
       this.currentAllowedTools = null;
       this.isRunning = false;
       this.setHeartbeatState("idle");
-      this.drainScheduledQueue();
+      await this.drainScheduledQueue();
     }
   }
   async handleExplicitToolCommand(userMessage) {
@@ -48297,6 +47922,15 @@ function extractBlockSections(text, blocks) {
       i = parsed.nextIndex;
       continue;
     }
+    const cardMatch = line.match(/^(\s*):::card(.*)$/);
+    if (cardMatch) {
+      const indent = cardMatch[1] ?? "";
+      const parsed = parseDelimitedBlock(lines, i, indent);
+      const warning = parsed?.warning || "Card blocks must be inside :::grid.";
+      output.push(createMalformedBlock(blocks, indent, "block", warning));
+      i = parsed ? parsed.nextIndex : i + 1;
+      continue;
+    }
     output.push(line);
     i += 1;
   }
@@ -48317,7 +47951,18 @@ function extractCards(body) {
     }
     const indent = match[1] ?? "";
     const attrs = parseAttributes(match[2] ?? "");
-    const type = String(attrs.type || "note");
+    let type = String(attrs.type || "note");
+    const normalizedType = type.toLowerCase();
+    if (!ALLOWED_BLOCK_TYPES.has(normalizedType)) {
+      cards.push({
+        type: "warning",
+        title: "Malformed card",
+        body: `Unknown card type "${type}". Using note.`
+      });
+      type = "note";
+    } else {
+      type = normalizedType;
+    }
     const title = attrs.title ? String(attrs.title) : undefined;
     const bodyLines = [];
     let closed = false;
@@ -48450,7 +48095,7 @@ 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 totalWidth = maxWidth;
   let effectiveColumns = columns;
   if (totalWidth) {
     const minCardWidth = 18;
@@ -48510,7 +48155,7 @@ function renderBox(header, lines, type, maxWidth, indent = "", forceWidth = fals
 }
 function renderBoxLines(header, lines, type, maxWidth, indent = "", forceWidth = false) {
   const headerStyled = styleHeader(header, type);
-  const maxInnerWidth = maxWidth ? Math.max(10, maxWidth - 4) : undefined;
+  const maxInnerWidth = maxWidth ? Math.max(1, maxWidth - 4) : undefined;
   const headerLine = maxInnerWidth ? truncateAnsi(headerStyled, maxInnerWidth) : headerStyled;
   const wrappedLines = maxInnerWidth ? wrapAnsiLines(lines, maxInnerWidth) : lines;
   const contentWidth = Math.max(stripAnsi2(headerLine).length, ...wrappedLines.map((line) => stripAnsi2(line).length), 0);
@@ -48595,8 +48240,7 @@ function renderTable(header, rows, maxWidth) {
         widths[i] = len;
     }
   }
-  const minCellWidth = 4;
-  const availableCellWidth = maxWidth ? Math.max(colCount * minCellWidth, maxWidth - (colCount - 1) * 3 - 4) : undefined;
+  const availableCellWidth = maxWidth ? Math.max(colCount, maxWidth - (colCount - 1) * 3 - 4) : undefined;
   if (availableCellWidth) {
     const total = widths.reduce((sum, width) => sum + width, 0);
     if (total > availableCellWidth) {
@@ -48685,8 +48329,9 @@ function renderReport(body, maxWidth, indent = "") {
     output.push(indent + source_default.bold("Progress Overview"));
     const parsed = progressLines.map((line) => line.trim().replace(/^-/, "").trim()).map((line) => line.match(/^(.+?):\s*(\d{1,3})%?$/)).filter((match) => Boolean(match)).map((match) => ({ label: match[1].trim(), value: Math.max(0, Math.min(100, Number(match[2]))) }));
     if (parsed.length > 0) {
-      const labelWidth = Math.min(24, Math.max(...parsed.map((p) => p.label.length), 10));
-      const barWidth = maxWidth ? Math.max(10, Math.min(30, maxWidth - labelWidth - 10)) : 24;
+      const maxLabelWidth = maxWidth ? Math.max(4, maxWidth - 14) : 24;
+      const labelWidth = Math.min(maxLabelWidth, Math.max(...parsed.map((p) => p.label.length), 10));
+      const barWidth = maxWidth ? Math.max(4, Math.min(30, maxWidth - labelWidth - 8)) : 24;
       for (const entry of parsed) {
         output.push(indent + renderProgressLine(entry.label, entry.value, labelWidth, barWidth));
       }
@@ -48855,6 +48500,156 @@ function truncateAnsi(line, width) {
   return current + suffix;
 }
 
+// packages/terminal/src/components/toolDisplay.ts
+function truncateToolResult(toolResult, maxLines = 15, maxChars = 3000) {
+  const toolName = toolResult.toolName || "tool";
+  let content = String(toolResult.content || "");
+  const formatted = formatToolResultNicely(toolName, content, toolResult.isError);
+  if (formatted) {
+    return formatted;
+  }
+  const prefix = toolResult.isError ? `Error: ` : "";
+  content = stripAnsi3(content);
+  content = content.replace(/\t/g, "  ");
+  const lines = content.split(`
+`);
+  if (lines.length > maxLines) {
+    content = lines.slice(0, maxLines).join(`
+`) + `
+... (${lines.length - maxLines} more lines)`;
+  }
+  if (content.length > maxChars) {
+    content = content.slice(0, maxChars) + "...";
+  }
+  return prefix + content.trim();
+}
+function formatToolResultNicely(toolName, content, isError) {
+  if (isError) {
+    if (content.includes("ENOENT") || content.includes("no such file")) {
+      return "\u26A0 File not found";
+    }
+    if (content.includes("EACCES") || content.includes("permission denied")) {
+      return "\u26A0 Permission denied";
+    }
+    if (content.includes("ETIMEDOUT") || content.includes("timeout")) {
+      return "\u26A0 Request timed out";
+    }
+    return null;
+  }
+  switch (toolName) {
+    case "schedule":
+      return formatScheduleResult(content);
+    case "submit_feedback":
+      return formatFeedbackResult(content);
+    case "read":
+      return formatReadResult(content);
+    case "write":
+      return formatWriteResult(content);
+    case "glob":
+      return formatGlobResult(content);
+    case "grep":
+      return formatGrepResult(content);
+    case "bash":
+      return formatBashResult(content);
+    case "web_search":
+      return formatSearchResult(content);
+    default:
+      return null;
+  }
+}
+function formatScheduleResult(content) {
+  const trimmed = content.trim().toLowerCase();
+  if (trimmed === "no schedules found." || trimmed.includes("no schedules")) {
+    return "\uD83D\uDCC5 No scheduled tasks";
+  }
+  if (trimmed.includes("created") || trimmed.includes("scheduled")) {
+    return "\u2713 Schedule created";
+  }
+  if (trimmed.includes("deleted") || trimmed.includes("removed")) {
+    return "\u2713 Schedule deleted";
+  }
+  if (trimmed.includes("paused")) {
+    return "\u23F8 Schedule paused";
+  }
+  if (trimmed.includes("resumed")) {
+    return "\u25B6 Schedule resumed";
+  }
+  if (content.includes("id:") || content.includes("command:")) {
+    const lines = content.split(`
+`).filter((line) => line.trim());
+    return `\uD83D\uDCC5 ${lines.length} scheduled task${lines.length !== 1 ? "s" : ""}`;
+  }
+  return null;
+}
+function formatFeedbackResult(content) {
+  if (content.includes("submitted") || content.includes("created")) {
+    return "\u2713 Feedback submitted";
+  }
+  return null;
+}
+function formatReadResult(content) {
+  const lines = content.split(`
+`).length;
+  if (lines > 20) {
+    return `\uD83D\uDCC4 Read ${lines} lines`;
+  }
+  return null;
+}
+function formatWriteResult(content) {
+  if (content.includes("written") || content.includes("saved") || content.includes("created")) {
+    return "\u2713 File saved";
+  }
+  return null;
+}
+function formatGlobResult(content) {
+  const lines = content.split(`
+`).filter((line) => line.trim());
+  if (lines.length === 0) {
+    return "\uD83D\uDD0D No files found";
+  }
+  if (lines.length > 10) {
+    return `\uD83D\uDD0D Found ${lines.length} files`;
+  }
+  return null;
+}
+function formatGrepResult(content) {
+  const lines = content.split(`
+`).filter((line) => line.trim());
+  if (lines.length === 0) {
+    return "\uD83D\uDD0D No matches found";
+  }
+  if (lines.length > 10) {
+    return `\uD83D\uDD0D Found ${lines.length} matches`;
+  }
+  return null;
+}
+function formatBashResult(content) {
+  const trimmed = content.trim();
+  if (!trimmed) {
+    return "\u2713 Command completed";
+  }
+  if (trimmed.length < 100 && !trimmed.includes(`
+`)) {
+    return null;
+  }
+  const lines = trimmed.split(`
+`).length;
+  if (lines > 20) {
+    return `\u2713 Output: ${lines} lines`;
+  }
+  return null;
+}
+function formatSearchResult(content) {
+  const resultCount = (content.match(/https?:\/\//g) || []).length;
+  if (resultCount > 0) {
+    return `\uD83D\uDD0D Found ${resultCount} result${resultCount !== 1 ? "s" : ""}`;
+  }
+  return null;
+}
+function stripAnsi3(text) {
+  return text.replace(/\x1B\[[0-9;]*m/g, "");
+}
+
 // packages/terminal/src/components/messageLines.ts
 function estimateToolPanelLines(toolCalls, toolResults, hasContent) {
   if (!toolCalls || toolCalls.length === 0) {
@@ -48878,14 +48673,12 @@ function estimateToolPanelLines(toolCalls, toolResults, hasContent) {
   return lines;
 }
 function estimateToolResultLines(result, maxLines = 4) {
-  const content = String(result.content || "");
+  const content = truncateToolResult(result, maxLines, 400);
   if (!content)
     return 1;
-  const lines = content.replace(/\x1B\[[0-9;]*m/g, "").split(`
+  const lines = stripAnsi4(content).split(`
 `);
-  if (lines.length <= maxLines)
-    return Math.max(1, lines.length);
-  return maxLines + 1;
+  return Math.max(1, lines.length);
 }
 function estimateMessageLines(message, maxWidth) {
   if (message.role === "system") {
@@ -48900,6 +48693,11 @@ function estimateMessageLines(message, maxWidth) {
   if (message.role === "assistant" && message.toolCalls?.length) {
     lines += estimateToolPanelLines(message.toolCalls, message.toolResults, hasContent);
   }
+  if (message.role === "user" || message.role === "assistant") {
+    if (!isContinuationChunk(message.id)) {
+      lines += 2;
+    }
+  }
   return lines;
 }
 function countWrappedLines(lines, maxWidth) {
@@ -48908,15 +48706,48 @@ function countWrappedLines(lines, maxWidth) {
   }
   let total = 0;
   for (const line of lines) {
-    const visible = stripAnsi3(line).length;
+    const visible = stripAnsi4(line).length;
     const wrapped = Math.max(1, Math.ceil(visible / maxWidth));
     total += wrapped;
   }
   return total;
 }
-function stripAnsi3(text) {
+function stripAnsi4(text) {
   return text.replace(/\x1B\[[0-9;]*m/g, "");
 }
+function estimateActivityEntryLines(entry, wrapWidth, renderWidth) {
+  if (entry.type === "text") {
+    const content = entry.content ?? "";
+    if (!content.trim())
+      return 0;
+    const rendered = renderMarkdown(content, { maxWidth: renderWidth });
+    const lines = stripAnsi4(rendered).split(`
+`);
+    const wrapped = countWrappedLines(lines, wrapWidth);
+    return Math.max(1, wrapped) + 2;
+  }
+  if (entry.type === "tool_call") {
+    return 4;
+  }
+  if (entry.type === "tool_result") {
+    const content = entry.toolResult ? truncateToolResult(entry.toolResult) : "";
+    const lines = content.split(`
+`);
+    const wrapped = countWrappedLines(lines, wrapWidth);
+    return Math.max(1, wrapped) + 2;
+  }
+  return 0;
+}
+function estimateActivityLogLines(entries, wrapWidth, renderWidth) {
+  return entries.reduce((sum, entry) => sum + estimateActivityEntryLines(entry, wrapWidth, renderWidth), 0);
+}
+function isContinuationChunk(id) {
+  const match = id.match(/::chunk-(\d+)$/);
+  if (!match)
+    return false;
+  const idx = Number(match[1]);
+  return Number.isFinite(idx) && idx > 0;
+}
 
 // packages/terminal/src/components/Messages.tsx
 var jsx_dev_runtime3 = __toESM(require_jsx_dev_runtime(), 1);
@@ -48934,24 +48765,37 @@ function Messages3({
   const [now2, setNow] = import_react24.useState(Date.now());
   const { stdout } = use_stdout_default();
   const columns = stdout?.columns ?? 80;
-  const messageWidth = Math.max(10, columns - 2);
-  const combinedMessages = import_react24.useMemo(() => [...messages, ...streamingMessages], [messages, streamingMessages]);
+  const messageWidth = Math.max(1, columns - 2);
+  const wrapWidth = messageWidth;
+  const items = import_react24.useMemo(() => {
+    const output = [];
+    for (const message of messages) {
+      output.push({ kind: "message", message });
+    }
+    for (const entry of activityLog) {
+      output.push({ kind: "activity", entry });
+    }
+    for (const message of streamingMessages) {
+      output.push({ kind: "streaming", message });
+    }
+    return output;
+  }, [messages, activityLog, streamingMessages]);
   const lineSpans = import_react24.useMemo(() => {
     let cursor = 0;
-    return combinedMessages.map((message, index) => {
-      const lines = estimateMessageLines(message, messageWidth);
+    return items.map((item, index) => {
+      const lines = item.kind === "activity" ? estimateActivityEntryLines(item.entry, wrapWidth, messageWidth) : estimateMessageLines(item.message, messageWidth);
       const start = cursor;
       cursor += lines;
-      return { message, index, start, end: cursor, lines };
+      return { item, index, start, end: cursor, lines };
     });
-  }, [combinedMessages, messageWidth]);
+  }, [items, wrapWidth, messageWidth]);
   const totalLines = lineSpans.length > 0 ? lineSpans[lineSpans.length - 1].end : 0;
   const endLine = Math.max(0, totalLines - scrollOffsetLines);
   const startLine = Math.max(0, endLine - maxVisibleLines);
   const visibleSpans = lineSpans.filter((span) => span.end > startLine && span.start < endLine);
-  const historicalCount = messages.length;
-  const visibleMessages = visibleSpans.filter((span) => span.index < historicalCount).map((span) => span.message);
-  const visibleStreaming = visibleSpans.filter((span) => span.index >= historicalCount).map((span) => span.message);
+  const visibleMessages = visibleSpans.filter((span) => span.item.kind === "message").map((span) => span.item.message);
+  const visibleActivity = visibleSpans.filter((span) => span.item.kind === "activity").map((span) => span.item.entry);
+  const visibleStreaming = visibleSpans.filter((span) => span.item.kind === "streaming").map((span) => span.item.message);
   const showCurrentResponse = Boolean(currentResponse) && streamingMessages.length === 0;
   const groupedMessages = groupConsecutiveToolMessages(visibleMessages);
   const historicalItems = groupedMessages.map((group) => {
@@ -49002,7 +48846,7 @@ function Messages3({
           messages: item.group.messages
         }, item.id, false, undefined, this);
       }),
-      activityLog.map((entry) => {
+      visibleActivity.map((entry) => {
         if (entry.type === "text" && entry.content) {
           return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
             marginY: 1,
@@ -49175,10 +49019,10 @@ function MessageBubble({ message, queuedMessageIds }) {
           dimColor: true,
           children: [
             "\u23F3 ",
-            message.content
+            message.content ?? ""
           ]
         }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
-          children: message.content
+          children: message.content ?? ""
         }, undefined, false, undefined, this)
       ]
     }, undefined, true, undefined, this);
@@ -49222,7 +49066,7 @@ function startsWithListOrTable(content) {
   const lines = content.split(`
 `);
   for (const line of lines) {
-    const trimmed = line.trimStart();
+    const trimmed = stripAnsi5(line).trimStart();
     if (!trimmed)
       continue;
     if (/^[-*\u2022]\s+/.test(trimmed))
@@ -49231,10 +49075,21 @@ function startsWithListOrTable(content) {
       return true;
     if (trimmed.startsWith("|"))
       return true;
+    if (trimmed.startsWith("```"))
+      return true;
+    if (trimmed.startsWith(":::"))
+      return true;
+    if (/^[\u250C\u2510\u2514\u2518\u251C\u2524\u252C\u2534\u253C\u2502]/.test(trimmed))
+      return true;
+    if (/^[\u256D\u256E\u2570\u256F\u2502]/.test(trimmed))
+      return true;
     return false;
   }
   return false;
 }
+function stripAnsi5(text) {
+  return text.replace(/\x1B\[[0-9;]*m/g, "");
+}
 function ToolCallPanel({
   toolCalls,
   toolResults
@@ -49243,7 +49098,8 @@ function ToolCallPanel({
     return null;
   const { stdout } = use_stdout_default();
   const columns = stdout?.columns ?? 80;
-  const panelWidth = Math.max(24, columns - 4);
+  const panelWidth = Math.max(1, columns - 2);
+  const innerWidth = Math.max(1, panelWidth - 4);
   const resultMap = new Map;
   for (const result of toolResults || []) {
     resultMap.set(result.toolCallId, result);
@@ -49256,7 +49112,7 @@ function ToolCallPanel({
     borderStyle: "round",
     borderColor,
     paddingX: 1,
-    width: "100%",
+    width: panelWidth,
     children: [
       /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
         justifyContent: "space-between",
@@ -49282,8 +49138,9 @@ function ToolCallPanel({
         const statusColor = result ? result.isError ? "red" : "green" : "yellow";
         const displayName = getToolDisplayName(toolCall);
         const context2 = getToolContext(toolCall);
-        const maxLine = panelWidth ? Math.max(20, panelWidth - 8) : 80;
+        const maxLine = Math.max(16, innerWidth - 2);
         const summaryLine = truncate(formatToolCall(toolCall), maxLine);
+        const resultText = result ? indentMultiline(truncateToolResult(result, 4, 400), "  ") : "";
         return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
           flexDirection: "column",
           marginTop: 1,
@@ -49321,7 +49178,7 @@ function ToolCallPanel({
                 dimColor: true,
                 children: [
                   "\u21B3 ",
-                  truncateToolResult(result, 4, 400)
+                  resultText
                 ]
               }, undefined, true, undefined, this)
             }, undefined, false, undefined, this)
@@ -49481,150 +49338,13 @@ function truncate(text, maxLength) {
     return text;
   return text.slice(0, maxLength - 3) + "...";
 }
-function truncateToolResult(toolResult, maxLines = 15, maxChars = 3000) {
-  const toolName = toolResult.toolName || "tool";
-  let content = String(toolResult.content || "");
-  const formatted = formatToolResultNicely(toolName, content, toolResult.isError);
-  if (formatted) {
-    return formatted;
-  }
-  const prefix = toolResult.isError ? `Error: ` : "";
-  content = content.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "");
-  content = content.replace(/\t/g, "  ");
-  const lines = content.split(`
+function indentMultiline(text, padding) {
+  const parts = text.split(`
+`);
+  if (parts.length <= 1)
+    return text;
+  return [parts[0], ...parts.slice(1).map((line) => `${padding}${line}`)].join(`
 `);
-  if (lines.length > maxLines) {
-    content = lines.slice(0, maxLines).join(`
-`) + `
-... (${lines.length - maxLines} more lines)`;
-  }
-  if (content.length > maxChars) {
-    content = content.slice(0, maxChars) + "...";
-  }
-  return prefix + content.trim();
-}
-function formatToolResultNicely(toolName, content, isError) {
-  if (isError) {
-    if (content.includes("ENOENT") || content.includes("no such file")) {
-      return "\u26A0 File not found";
-    }
-    if (content.includes("EACCES") || content.includes("permission denied")) {
-      return "\u26A0 Permission denied";
-    }
-    if (content.includes("ETIMEDOUT") || content.includes("timeout")) {
-      return "\u26A0 Request timed out";
-    }
-    return null;
-  }
-  switch (toolName) {
-    case "schedule":
-      return formatScheduleResult(content);
-    case "submit_feedback":
-      return formatFeedbackResult(content);
-    case "read":
-      return formatReadResult(content);
-    case "write":
-      return formatWriteResult(content);
-    case "glob":
-      return formatGlobResult(content);
-    case "grep":
-      return formatGrepResult(content);
-    case "bash":
-      return formatBashResult(content);
-    case "web_search":
-      return formatSearchResult(content);
-    default:
-      return null;
-  }
-}
-function formatScheduleResult(content) {
-  const trimmed = content.trim().toLowerCase();
-  if (trimmed === "no schedules found." || trimmed.includes("no schedules")) {
-    return "\uD83D\uDCC5 No scheduled tasks";
-  }
-  if (trimmed.includes("created") || trimmed.includes("scheduled")) {
-    return "\u2713 Schedule created";
-  }
-  if (trimmed.includes("deleted") || trimmed.includes("removed")) {
-    return "\u2713 Schedule deleted";
-  }
-  if (trimmed.includes("paused")) {
-    return "\u23F8 Schedule paused";
-  }
-  if (trimmed.includes("resumed")) {
-    return "\u25B6 Schedule resumed";
-  }
-  if (content.includes("id:") || content.includes("command:")) {
-    const lines = content.split(`
-`).filter((l) => l.trim());
-    return `\uD83D\uDCC5 ${lines.length} scheduled task${lines.length !== 1 ? "s" : ""}`;
-  }
-  return null;
-}
-function formatFeedbackResult(content) {
-  if (content.includes("submitted") || content.includes("created")) {
-    return "\u2713 Feedback submitted";
-  }
-  return null;
-}
-function formatReadResult(content) {
-  const lines = content.split(`
-`).length;
-  if (lines > 20) {
-    return `\uD83D\uDCC4 Read ${lines} lines`;
-  }
-  return null;
-}
-function formatWriteResult(content) {
-  if (content.includes("written") || content.includes("saved") || content.includes("created")) {
-    return "\u2713 File saved";
-  }
-  return null;
-}
-function formatGlobResult(content) {
-  const lines = content.split(`
-`).filter((l) => l.trim());
-  if (lines.length === 0) {
-    return "\uD83D\uDD0D No files found";
-  }
-  if (lines.length > 10) {
-    return `\uD83D\uDD0D Found ${lines.length} files`;
-  }
-  return null;
-}
-function formatGrepResult(content) {
-  const lines = content.split(`
-`).filter((l) => l.trim());
-  if (lines.length === 0) {
-    return "\uD83D\uDD0D No matches found";
-  }
-  if (lines.length > 10) {
-    return `\uD83D\uDD0D Found ${lines.length} matches`;
-  }
-  return null;
-}
-function formatBashResult(content) {
-  const trimmed = content.trim();
-  if (!trimmed) {
-    return "\u2713 Command completed";
-  }
-  if (trimmed.length < 100 && !trimmed.includes(`
-`)) {
-    return null;
-  }
-  const lines = trimmed.split(`
-`).length;
-  if (lines > 20) {
-    return `\u2713 Output: ${lines} lines`;
-  }
-  return null;
-}
-function formatSearchResult(content) {
-  const resultCount = (content.match(/https?:\/\//g) || []).length;
-  if (resultCount > 0) {
-    return `\uD83D\uDD0D Found ${resultCount} result${resultCount !== 1 ? "s" : ""}`;
-  }
-  return null;
 }
 
 // packages/terminal/src/components/Status.tsx
@@ -49666,7 +49386,8 @@ function Status({
   };
   let contextInfo = "";
   if (tokenUsage && tokenUsage.maxContextTokens > 0) {
-    const percent = Math.round(tokenUsage.totalTokens / tokenUsage.maxContextTokens * 100);
+    const rawPercent = Math.round(tokenUsage.totalTokens / tokenUsage.maxContextTokens * 100);
+    const percent = Math.max(0, Math.min(100, rawPercent));
     contextInfo = `${percent}%`;
   }
   const sessionInfo = sessionIndex && sessionCount && sessionCount > 1 ? `${sessionIndex}/${sessionCount}` : "";
@@ -49948,6 +49669,9 @@ function SessionSelector({
   onCancel
 }) {
   const [selectedIndex, setSelectedIndex] = import_react28.useState(0);
+  import_react28.useEffect(() => {
+    setSelectedIndex((prev) => Math.min(prev, sessions.length));
+  }, [sessions.length]);
   use_input_default((input, key) => {
     if (input === "n" || input === "N") {
       onNew();
@@ -50085,30 +49809,15 @@ function wrapTextLines(text, wrapChars) {
   }
   return lines;
 }
-function stripAnsi4(text) {
+function stripAnsi6(text) {
   return text.replace(/\x1B\[[0-9;]*m/g, "");
 }
-function truncateActivityContent(content, maxLines = 15, maxChars = 3000) {
-  let output = content.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "");
-  output = output.replace(/\t/g, "  ");
-  const lines = output.split(`
-`);
-  if (lines.length > maxLines) {
-    output = lines.slice(0, maxLines).join(`
-`) + `
-... (${lines.length - maxLines} more lines)`;
-  }
-  if (output.length > maxChars) {
-    output = output.slice(0, maxChars) + "...";
-  }
-  return output;
-}
 function chunkRenderedLines(lines, chunkLines) {
   const chunks = [];
   let current = [];
   let i = 0;
-  const isBoxStart = (line) => stripAnsi4(line).trimStart().startsWith("\u250C");
-  const isBoxEnd = (line) => stripAnsi4(line).trimStart().startsWith("\u2514");
+  const isBoxStart = (line) => stripAnsi6(line).trimStart().startsWith("\u250C");
+  const isBoxEnd = (line) => stripAnsi6(line).trimStart().startsWith("\u2514");
   while (i < lines.length) {
     const line = lines[i];
     if (isBoxStart(line)) {
@@ -50589,36 +50298,17 @@ function App2({ cwd: cwd2, version }) {
   const queuedCount = activeQueue.filter((msg) => msg.mode === "queued").length;
   const inlineCount = activeInline.length;
   const showWelcome = messages.length === 0 && !isProcessing;
-  const wrapChars = columns ? Math.max(40, columns - 4) : MESSAGE_WRAP_CHARS;
-  const renderWidth = columns ? Math.max(20, columns - 2) : undefined;
+  const renderWidth = columns ? Math.max(1, columns - 2) : undefined;
+  const wrapChars = renderWidth ?? MESSAGE_WRAP_CHARS;
   const activityLogLineCount = import_react29.useMemo(() => {
     if (activityLog.length === 0)
       return 0;
-    let lines = 0;
-    for (const entry of activityLog) {
-      if (entry.type === "text" && entry.content) {
-        const rendered = renderMarkdown(entry.content, { maxWidth: renderWidth });
-        const entryLines = wrapTextLines(stripAnsi4(rendered), wrapChars).length;
-        lines += entryLines + 2;
-        continue;
-      }
-      if (entry.type === "tool_call" && entry.toolCall) {
-        lines += 4;
-        continue;
-      }
-      if (entry.type === "tool_result" && entry.toolResult) {
-        const truncated = truncateActivityContent(String(entry.toolResult.content ?? ""));
-        const entryLines = wrapTextLines(truncated, wrapChars).length;
-        lines += entryLines + 2;
-        continue;
-      }
-    }
-    return lines;
+    return estimateActivityLogLines(activityLog, wrapChars, renderWidth);
   }, [activityLog, renderWidth, wrapChars]);
   const reservedLines = import_react29.useMemo(() => {
     let lines = 0;
     if (showWelcome) {
-      lines += 5;
+      lines += 4;
     }
     if (backgroundProcessingCount > 0) {
       lines += 1;
@@ -50698,7 +50388,7 @@ function App2({ cwd: cwd2, version }) {
     }
     prevDisplayLineCountRef.current = totalLineCount;
   }, [totalLineCount, autoScroll]);
-  const maxVisibleLines = rows ? Math.max(4, rows - reservedLines) : 20;
+  const maxVisibleLines = rows ? Math.max(1, rows - reservedLines) : 20;
   import_react29.useEffect(() => {
     const maxOffset = Math.max(0, totalLineCount - maxVisibleLines);
     setScrollOffset((prev) => Math.min(prev, maxOffset));
@@ -51415,4 +51105,4 @@ if (options.print !== null) {
   });
 }
 
-//# debugId=29930EA4036DA53D64756E2164756E21
+//# debugId=635A1CBC05837E5664756E2164756E21