@hasna/assistants 1.1.21 → 1.1.22

package/dist/index.js

@@ -18677,11 +18677,28 @@ async function getDueSchedules(cwd, nowTime) {
     return schedule.nextRunAt <= nowTime;
   });
 }
-async function updateSchedule(cwd, id, updater) {
-  try {
-    const path = schedulePath(cwd, id);
-    if (!path)
+async function updateSchedule(cwd, id, updater, options) {
+  const path = schedulePath(cwd, id);
+  if (!path)
+    return null;
+  const ownerId = options?.ownerId;
+  let locked = false;
+  let lockOwner = ownerId;
+  if (!lockOwner) {
+    lockOwner = generateId();
+    locked = await acquireScheduleLock(cwd, id, lockOwner);
+    if (!locked)
       return null;
+  } else {
+    try {
+      const raw = await readFile5(lockPath(cwd, id), "utf-8");
+      const lock = JSON.parse(raw);
+      if (lock?.ownerId && lock.ownerId !== lockOwner) {
+        return null;
+      }
+    } catch {}
+  }
+  try {
     const raw = await readFile5(path, "utf-8");
     const schedule = JSON.parse(raw);
     const updated = updater(schedule);
@@ -18689,6 +18706,10 @@ async function updateSchedule(cwd, id, updater) {
     return updated;
   } catch {
     return null;
+  } finally {
+    if (locked && lockOwner) {
+      await releaseScheduleLock(cwd, id, lockOwner);
+    }
   }
 }
 async function acquireScheduleLock(cwd, id, ownerId, ttlMs = DEFAULT_LOCK_TTL_MS, retryDepth = 0) {
@@ -18835,6 +18856,7 @@ function getTimeZoneOffsetMs(date, timeZone) {
 }
 var DEFAULT_LOCK_TTL_MS, SAFE_ID_PATTERN4, MAX_LOCK_RETRIES = 2;
 var init_store3 = __esm(async () => {
+  init_src2();
   init_atomic_write();
   init_cron();
   await init_config();
@@ -26541,16 +26563,78 @@ var init_types3 = __esm(() => {
 
 // packages/core/src/tasks/store.ts
 import { join as join21 } from "path";
-import { mkdir as mkdir9, readFile as readFile8, writeFile as writeFile6 } from "fs/promises";
+import { mkdir as mkdir9, readFile as readFile8, open as open3, unlink as unlink6 } from "fs/promises";
 function tasksDir(cwd) {
   return join21(cwd, TASKS_DIR);
 }
 function tasksPath(cwd) {
   return join21(tasksDir(cwd), TASKS_FILE);
 }
+function taskLockPath(cwd) {
+  return join21(tasksDir(cwd), TASKS_LOCK_FILE);
+}
 async function ensureTasksDir(cwd) {
   await mkdir9(tasksDir(cwd), { recursive: true });
 }
+async function acquireTaskLock(cwd, ownerId, ttlMs = DEFAULT_TASK_LOCK_TTL_MS, retryDepth = 0) {
+  if (retryDepth >= MAX_TASK_LOCK_RETRIES)
+    return false;
+  await ensureTasksDir(cwd);
+  const path = taskLockPath(cwd);
+  const now2 = Date.now();
+  try {
+    const handle = await open3(path, "wx");
+    await handle.writeFile(JSON.stringify({ ownerId, createdAt: now2, updatedAt: now2, ttlMs }, null, 2), "utf-8");
+    await handle.close();
+    return true;
+  } catch {
+    try {
+      const raw = await readFile8(path, "utf-8");
+      const lock = JSON.parse(raw);
+      const updatedAt = lock?.updatedAt || lock?.createdAt || 0;
+      const ttl = lock?.ttlMs ?? ttlMs;
+      if (now2 - updatedAt > ttl) {
+        await unlink6(path);
+        return acquireTaskLock(cwd, ownerId, ttlMs, retryDepth + 1);
+      }
+    } catch {
+      if (retryDepth < MAX_TASK_LOCK_RETRIES) {
+        try {
+          await unlink6(path);
+          return acquireTaskLock(cwd, ownerId, ttlMs, retryDepth + 1);
+        } catch {
+          return false;
+        }
+      }
+    }
+  }
+  return false;
+}
+async function releaseTaskLock(cwd, ownerId) {
+  const path = taskLockPath(cwd);
+  try {
+    const raw = await readFile8(path, "utf-8");
+    const lock = JSON.parse(raw);
+    if (lock?.ownerId === ownerId) {
+      await unlink6(path);
+    }
+  } catch {}
+}
+async function withTaskStoreLock(cwd, fn) {
+  const ownerId = generateId();
+  const locked = await acquireTaskLock(cwd, ownerId);
+  if (!locked) {
+    throw new Error("Task store is locked");
+  }
+  try {
+    const data = await loadTaskStore(cwd);
+    const result = await fn(data);
+    await saveTaskStore(cwd, data);
+    return result;
+  } finally {
+    await releaseTaskLock(cwd, ownerId);
+  }
+}
 function defaultStoreData() {
   return {
     tasks: [],
@@ -26576,7 +26660,7 @@ async function loadTaskStore(cwd) {
 }
 async function saveTaskStore(cwd, data) {
   await ensureTasksDir(cwd);
-  await writeFile6(tasksPath(cwd), JSON.stringify(data, null, 2), "utf-8");
+  await atomicWriteFile(tasksPath(cwd), JSON.stringify(data, null, 2));
 }
 async function getTasks(cwd) {
   const data = await loadTaskStore(cwd);
@@ -26612,109 +26696,107 @@ function calculateNextRunAt(recurrence, fromTime) {
   return;
 }
 async function addTask(cwd, options, priority = "normal", projectId) {
-  const data = await loadTaskStore(cwd);
-  const now2 = Date.now();
-  const opts = typeof options === "string" ? { description: options, priority, projectId } : options;
-  let recurrence;
-  let nextRunAt;
-  let isRecurringTemplate = false;
-  if (opts.recurrence) {
-    recurrence = {
-      kind: opts.recurrence.kind,
-      cron: opts.recurrence.cron,
-      intervalMs: opts.recurrence.intervalMs,
-      timezone: opts.recurrence.timezone,
-      maxOccurrences: opts.recurrence.maxOccurrences,
-      endAt: opts.recurrence.endAt,
-      occurrenceCount: 0
-    };
-    nextRunAt = calculateNextRunAt(recurrence, now2);
-    isRecurringTemplate = true;
-  }
-  const task = {
-    id: generateId(),
-    description: opts.description.trim(),
-    status: "pending",
-    priority: opts.priority ?? "normal",
-    createdAt: now2,
-    projectId: opts.projectId,
-    blockedBy: opts.blockedBy?.length ? opts.blockedBy : undefined,
-    blocks: opts.blocks?.length ? opts.blocks : undefined,
-    assignee: opts.assignee || undefined,
-    recurrence,
-    isRecurringTemplate,
-    nextRunAt
-  };
-  if (opts.blocks?.length) {
-    for (const blockedId of opts.blocks) {
-      const blockedTask = data.tasks.find((t) => t.id === blockedId);
-      if (blockedTask) {
-        blockedTask.blockedBy = blockedTask.blockedBy || [];
-        if (!blockedTask.blockedBy.includes(task.id)) {
-          blockedTask.blockedBy.push(task.id);
+  return withTaskStoreLock(cwd, async (data) => {
+    const now2 = Date.now();
+    const opts = typeof options === "string" ? { description: options, priority, projectId } : options;
+    let recurrence;
+    let nextRunAt;
+    let isRecurringTemplate = false;
+    if (opts.recurrence) {
+      recurrence = {
+        kind: opts.recurrence.kind,
+        cron: opts.recurrence.cron,
+        intervalMs: opts.recurrence.intervalMs,
+        timezone: opts.recurrence.timezone,
+        maxOccurrences: opts.recurrence.maxOccurrences,
+        endAt: opts.recurrence.endAt,
+        occurrenceCount: 0
+      };
+      nextRunAt = calculateNextRunAt(recurrence, now2);
+      isRecurringTemplate = true;
+    }
+    const task = {
+      id: generateId(),
+      description: opts.description.trim(),
+      status: "pending",
+      priority: opts.priority ?? "normal",
+      createdAt: now2,
+      projectId: opts.projectId,
+      blockedBy: opts.blockedBy?.length ? opts.blockedBy : undefined,
+      blocks: opts.blocks?.length ? opts.blocks : undefined,
+      assignee: opts.assignee || undefined,
+      recurrence,
+      isRecurringTemplate,
+      nextRunAt
+    };
+    if (opts.blocks?.length) {
+      for (const blockedId of opts.blocks) {
+        const blockedTask = data.tasks.find((t) => t.id === blockedId);
+        if (blockedTask) {
+          blockedTask.blockedBy = blockedTask.blockedBy || [];
+          if (!blockedTask.blockedBy.includes(task.id)) {
+            blockedTask.blockedBy.push(task.id);
+          }
         }
       }
     }
-  }
-  if (opts.blockedBy?.length) {
-    for (const blockingId of opts.blockedBy) {
-      const blockingTask = data.tasks.find((t) => t.id === blockingId);
-      if (blockingTask) {
-        blockingTask.blocks = blockingTask.blocks || [];
-        if (!blockingTask.blocks.includes(task.id)) {
-          blockingTask.blocks.push(task.id);
+    if (opts.blockedBy?.length) {
+      for (const blockingId of opts.blockedBy) {
+        const blockingTask = data.tasks.find((t) => t.id === blockingId);
+        if (blockingTask) {
+          blockingTask.blocks = blockingTask.blocks || [];
+          if (!blockingTask.blocks.includes(task.id)) {
+            blockingTask.blocks.push(task.id);
+          }
         }
       }
     }
-  }
-  data.tasks.push(task);
-  await saveTaskStore(cwd, data);
-  return task;
+    data.tasks.push(task);
+    return task;
+  });
 }
 async function updateTask(cwd, id, updates) {
-  const data = await loadTaskStore(cwd);
-  const task = data.tasks.find((t) => t.id === id);
-  if (!task)
-    return null;
-  if (updates.status !== undefined)
-    task.status = updates.status;
-  if (updates.priority !== undefined)
-    task.priority = updates.priority;
-  if (updates.result !== undefined)
-    task.result = updates.result;
-  if (updates.error !== undefined)
-    task.error = updates.error;
-  if (updates.startedAt !== undefined)
-    task.startedAt = updates.startedAt;
-  if (updates.completedAt !== undefined)
-    task.completedAt = updates.completedAt;
-  await saveTaskStore(cwd, data);
-  return task;
+  return withTaskStoreLock(cwd, async (data) => {
+    const task = data.tasks.find((t) => t.id === id);
+    if (!task)
+      return null;
+    if (updates.status !== undefined)
+      task.status = updates.status;
+    if (updates.priority !== undefined)
+      task.priority = updates.priority;
+    if (updates.result !== undefined)
+      task.result = updates.result;
+    if (updates.error !== undefined)
+      task.error = updates.error;
+    if (updates.startedAt !== undefined)
+      task.startedAt = updates.startedAt;
+    if (updates.completedAt !== undefined)
+      task.completedAt = updates.completedAt;
+    return task;
+  });
 }
 async function deleteTask(cwd, id) {
-  const data = await loadTaskStore(cwd);
-  const index = data.tasks.findIndex((t) => t.id === id);
-  if (index === -1)
-    return false;
-  data.tasks.splice(index, 1);
-  await saveTaskStore(cwd, data);
-  return true;
+  return withTaskStoreLock(cwd, async (data) => {
+    const index = data.tasks.findIndex((t) => t.id === id);
+    if (index === -1)
+      return false;
+    data.tasks.splice(index, 1);
+    return true;
+  });
 }
 async function clearPendingTasks(cwd) {
-  const data = await loadTaskStore(cwd);
-  const before = data.tasks.length;
-  data.tasks = data.tasks.filter((t) => t.status !== "pending");
-  const cleared = before - data.tasks.length;
-  await saveTaskStore(cwd, data);
-  return cleared;
+  return withTaskStoreLock(cwd, async (data) => {
+    const before = data.tasks.length;
+    data.tasks = data.tasks.filter((t) => t.status !== "pending");
+    return before - data.tasks.length;
+  });
 }
 async function clearCompletedTasks(cwd) {
-  const data = await loadTaskStore(cwd);
-  const before = data.tasks.length;
-  data.tasks = data.tasks.filter((t) => t.status !== "completed" && t.status !== "failed");
-  const cleared = before - data.tasks.length;
-  await saveTaskStore(cwd, data);
-  return cleared;
+  return withTaskStoreLock(cwd, async (data) => {
+    const before = data.tasks.length;
+    data.tasks = data.tasks.filter((t) => t.status !== "completed" && t.status !== "failed");
+    return before - data.tasks.length;
+  });
 }
 async function getNextTask(cwd) {
   const data = await loadTaskStore(cwd);
@@ -26742,18 +26824,18 @@ async function isPaused(cwd) {
   return data.paused;
 }
 async function setPaused(cwd, paused) {
-  const data = await loadTaskStore(cwd);
-  data.paused = paused;
-  await saveTaskStore(cwd, data);
+  await withTaskStoreLock(cwd, async (data) => {
+    data.paused = paused;
+  });
 }
 async function isAutoRun(cwd) {
   const data = await loadTaskStore(cwd);
   return data.autoRun;
 }
 async function setAutoRun(cwd, autoRun) {
-  const data = await loadTaskStore(cwd);
-  data.autoRun = autoRun;
-  await saveTaskStore(cwd, data);
+  await withTaskStoreLock(cwd, async (data) => {
+    data.autoRun = autoRun;
+  });
 }
 async function startTask(cwd, id) {
   return updateTask(cwd, id, {
@@ -26798,34 +26880,34 @@ async function getDueRecurringTasks(cwd) {
   return data.tasks.filter((t) => t.isRecurringTemplate && t.nextRunAt && t.nextRunAt <= now2);
 }
 async function createRecurringInstance(cwd, templateId) {
-  const data = await loadTaskStore(cwd);
-  const template = data.tasks.find((t) => t.id === templateId && t.isRecurringTemplate);
-  if (!template || !template.recurrence)
-    return null;
-  const now2 = Date.now();
-  const instance = {
-    id: generateId(),
-    description: template.description,
-    status: "pending",
-    priority: template.priority,
-    createdAt: now2,
-    projectId: template.projectId,
-    assignee: template.assignee,
-    recurrence: {
-      ...template.recurrence,
-      parentId: template.id
-    }
-  };
-  template.recurrence.occurrenceCount = (template.recurrence.occurrenceCount ?? 0) + 1;
-  template.nextRunAt = calculateNextRunAt(template.recurrence, now2);
-  if (!template.nextRunAt) {
-    template.status = "completed";
-    template.completedAt = now2;
-    template.result = `Recurring task completed after ${template.recurrence.occurrenceCount} occurrence(s)`;
-  }
-  data.tasks.push(instance);
-  await saveTaskStore(cwd, data);
-  return instance;
+  return withTaskStoreLock(cwd, async (data) => {
+    const template = data.tasks.find((t) => t.id === templateId && t.isRecurringTemplate);
+    if (!template || !template.recurrence)
+      return null;
+    const now2 = Date.now();
+    const instance = {
+      id: generateId(),
+      description: template.description,
+      status: "pending",
+      priority: template.priority,
+      createdAt: now2,
+      projectId: template.projectId,
+      assignee: template.assignee,
+      recurrence: {
+        ...template.recurrence,
+        parentId: template.id
+      }
+    };
+    template.recurrence.occurrenceCount = (template.recurrence.occurrenceCount ?? 0) + 1;
+    template.nextRunAt = calculateNextRunAt(template.recurrence, now2);
+    if (!template.nextRunAt) {
+      template.status = "completed";
+      template.completedAt = now2;
+      template.result = `Recurring task completed after ${template.recurrence.occurrenceCount} occurrence(s)`;
+    }
+    data.tasks.push(instance);
+    return instance;
+  });
 }
 async function processDueRecurringTasks(cwd) {
   const dueTasks = await getDueRecurringTasks(cwd);
@@ -26839,22 +26921,24 @@ async function processDueRecurringTasks(cwd) {
   return createdInstances;
 }
 async function cancelRecurringTask(cwd, id) {
-  const data = await loadTaskStore(cwd);
-  const task = data.tasks.find((t) => t.id === id && t.isRecurringTemplate);
-  if (!task)
-    return null;
-  task.status = "completed";
-  task.completedAt = Date.now();
-  task.nextRunAt = undefined;
-  task.result = "Recurring task cancelled";
-  await saveTaskStore(cwd, data);
-  return task;
+  return withTaskStoreLock(cwd, async (data) => {
+    const task = data.tasks.find((t) => t.id === id && t.isRecurringTemplate);
+    if (!task)
+      return null;
+    task.status = "completed";
+    task.completedAt = Date.now();
+    task.nextRunAt = undefined;
+    task.result = "Recurring task cancelled";
+    return task;
+  });
 }
-var TASKS_DIR = ".assistants/tasks", TASKS_FILE = "tasks.json";
+var TASKS_DIR = ".assistants/tasks", TASKS_FILE = "tasks.json", TASKS_LOCK_FILE = "tasks.lock.json", DEFAULT_TASK_LOCK_TTL_MS, MAX_TASK_LOCK_RETRIES = 2;
 var init_store4 = __esm(() => {
   init_src2();
   init_types3();
   init_cron();
+  init_atomic_write();
+  DEFAULT_TASK_LOCK_TTL_MS = 10 * 1000;
 });
 
 // packages/core/src/tasks/index.ts
@@ -67635,12 +67719,14 @@ Maximum ${this.config.maxTasks} tasks.`;
   async executeTaskGraph(plan) {
     const completed = new Set;
     const failed = new Set;
+    const blocked = new Set;
     const running = new Map;
     while (!this.stopped) {
       const readyTasks = plan.tasks.filter((task) => task.status === "pending" && task.dependsOn.every((dep) => completed.has(dep)));
       plan.tasks.forEach((task) => {
-        if (task.status === "pending" && task.dependsOn.some((dep) => failed.has(dep))) {
+        if (task.status === "pending" && task.dependsOn.some((dep) => failed.has(dep) || blocked.has(dep))) {
           task.status = "blocked";
+          blocked.add(task.id);
         }
       });
       const pendingCount = plan.tasks.filter((t) => t.status === "pending" || t.status === "running").length;
@@ -67680,9 +67766,14 @@ Maximum ${this.config.maxTasks} tasks.`;
       if (running.size > 0) {
         await Promise.race(Array.from(running.values()));
       } else if (readyTasks.length === 0 && pendingCount > 0) {
-        const blockedTasks = plan.tasks.filter((t) => t.status === "pending" || t.status === "blocked");
+        const stillPending = plan.tasks.filter((t) => t.status === "pending");
+        for (const task of stillPending) {
+          task.status = "blocked";
+          blocked.add(task.id);
+        }
+        const blockedTasks = plan.tasks.filter((t) => t.status === "blocked");
         const blockedIds = blockedTasks.map((t) => t.id).join(", ");
-        const error = `Deadlock detected: ${blockedTasks.length} task(s) cannot proceed due to failed dependencies (${blockedIds})`;
+        const error = `Deadlock detected: ${blockedTasks.length} task(s) cannot proceed due to failed or blocked dependencies (${blockedIds})`;
         this.state.errors.push(error);
         this.streamText(`
 \u26A0\uFE0F ${error}
@@ -67690,6 +67781,16 @@ Maximum ${this.config.maxTasks} tasks.`;
         break;
       }
     }
+    if (running.size > 0) {
+      await Promise.allSettled(Array.from(running.values()));
+    }
+    if (this.stopped) {
+      for (const task of plan.tasks) {
+        if (task.status === "pending" || task.status === "running") {
+          task.status = "cancelled";
+        }
+      }
+    }
   }
   async executeTask(task) {
     if (this.stopped || this.budgetExceeded || this.timeoutExceeded) {
@@ -67962,6 +68063,15 @@ ${blockedSummaries}
   }
   async spawnAssistant(params) {
     const { role, task, tools, trackInternal } = params;
+    const targetDepth = this.context.depth + 1;
+    if (this.config.maxDepth > 0 && targetDepth > this.config.maxDepth) {
+      return {
+        success: false,
+        error: `Swarm maxDepth (${this.config.maxDepth}) exceeded`,
+        turns: 0,
+        toolCalls: 0
+      };
+    }
     const systemPrompt = ROLE_SYSTEM_PROMPTS[role];
     const fullTask = `${systemPrompt}
 
@@ -68131,7 +68241,10 @@ class TaskGraph {
       return false;
     for (const depId of deps) {
       const depTask = this.tasks.get(depId);
-      if (depTask && depTask.status === "failed") {
+      if (!depTask) {
+        return true;
+      }
+      if (depTask.status === "failed" || depTask.status === "blocked" || depTask.status === "cancelled") {
         return true;
       }
     }
@@ -79402,7 +79515,7 @@ ${repoUrl}/issues/new
     context.setProjectContext(projectContext);
   }
 }
-var VERSION = "1.1.21";
+var VERSION = "1.1.22";
 var init_builtin = __esm(async () => {
   init_src2();
   init_store();
@@ -90402,7 +90515,7 @@ var init_client3 = __esm(() => {
 // packages/core/src/heartbeat/manager.ts
 import { dirname as dirname13 } from "path";
 import { mkdirSync as mkdirSync13 } from "fs";
-import { readFile as readFile9, writeFile as writeFile7 } from "fs/promises";
+import { readFile as readFile9, writeFile as writeFile6 } from "fs/promises";
 
 class HeartbeatManager {
   config;
@@ -90504,7 +90617,7 @@ class HeartbeatManager {
   }
   async persist(heartbeat) {
     try {
-      await writeFile7(this.config.persistPath, JSON.stringify(heartbeat, null, 2));
+      await writeFile6(this.config.persistPath, JSON.stringify(heartbeat, null, 2));
       if (this.config.historyPath) {
         await appendHeartbeatHistory(this.config.historyPath, heartbeat);
       }
@@ -90528,7 +90641,7 @@ var init_manager2 = __esm(async () => {
 // packages/core/src/heartbeat/persistence.ts
 import { dirname as dirname14 } from "path";
 import { mkdirSync as mkdirSync14 } from "fs";
-import { readFile as readFile10, writeFile as writeFile8, unlink as unlink6 } from "fs/promises";
+import { readFile as readFile10, writeFile as writeFile7, unlink as unlink7 } from "fs/promises";
 
 class StatePersistence {
   path;
@@ -90538,7 +90651,7 @@ class StatePersistence {
   }
   async save(state) {
     try {
-      await writeFile8(this.path, JSON.stringify(state, null, 2));
+      await writeFile7(this.path, JSON.stringify(state, null, 2));
     } catch {}
   }
   async load() {
@@ -90551,7 +90664,7 @@ class StatePersistence {
   }
   async clear() {
     try {
-      await unlink6(this.path);
+      await unlink7(this.path);
     } catch {}
   }
 }
@@ -90792,7 +90905,7 @@ var init_watchdog = __esm(async () => {
 // packages/core/src/heartbeat/install-skills.ts
 import { join as join30 } from "path";
 async function writeSkillIfMissing(dir, skillName, content) {
-  const { mkdir: mkdir10, writeFile: writeFile9, access } = await import("fs/promises");
+  const { mkdir: mkdir10, writeFile: writeFile8, access } = await import("fs/promises");
   const skillDir = join30(dir, `skill-${skillName}`);
   const skillFile = join30(skillDir, "SKILL.md");
   try {
@@ -90800,7 +90913,7 @@ async function writeSkillIfMissing(dir, skillName, content) {
     return false;
   } catch {}
   await mkdir10(skillDir, { recursive: true });
-  await writeFile9(skillFile, content, "utf-8");
+  await writeFile8(skillFile, content, "utf-8");
   return true;
 }
 async function installHeartbeatSkills() {
@@ -91070,7 +91183,7 @@ var init_manager3 = __esm(() => {
 // packages/core/src/energy/storage.ts
 import { dirname as dirname15 } from "path";
 import { mkdirSync as mkdirSync15 } from "fs";
-import { readFile as readFile11, writeFile as writeFile9 } from "fs/promises";
+import { readFile as readFile11, writeFile as writeFile8 } from "fs/promises";
 
 class EnergyStorage {
   path;
@@ -91080,7 +91193,7 @@ class EnergyStorage {
   }
   async save(state) {
     try {
-      await writeFile9(this.path, JSON.stringify(state, null, 2));
+      await writeFile8(this.path, JSON.stringify(state, null, 2));
     } catch {}
   }
   async load() {
@@ -91435,7 +91548,7 @@ var init_tts = __esm(() => {
 import { spawn } from "child_process";
 import { tmpdir as tmpdir3 } from "os";
 import { join as join33 } from "path";
-import { unlink as unlink7, writeFileSync as writeFileSync13, appendFileSync as appendFileSync3 } from "fs";
+import { unlink as unlink8, writeFileSync as writeFileSync13, appendFileSync as appendFileSync3 } from "fs";
 
 class AudioPlayer {
   currentProcess = null;
@@ -91454,7 +91567,7 @@ class AudioPlayer {
       this.currentProcess.on("close", () => {
         this.playing = false;
         this.currentProcess = null;
-        unlink7(tempFile, () => {});
+        unlink8(tempFile, () => {});
         resolve5();
       });
       this.currentProcess.on("error", (error3) => {
@@ -91463,7 +91576,7 @@ class AudioPlayer {
           this.currentProcess.kill();
           this.currentProcess = null;
         }
-        unlink7(tempFile, () => {});
+        unlink8(tempFile, () => {});
         reject(error3);
       });
     });
@@ -91477,7 +91590,7 @@ class AudioPlayer {
     }
     const player = this.resolvePlayer(format);
     if (!player) {
-      unlink7(tempFile, () => {});
+      unlink8(tempFile, () => {});
       throw new Error("No supported audio player found.");
     }
     return new Promise((resolve5, reject) => {
@@ -91486,7 +91599,7 @@ class AudioPlayer {
       this.currentProcess.on("close", () => {
         this.playing = false;
         this.currentProcess = null;
-        unlink7(tempFile, () => {});
+        unlink8(tempFile, () => {});
         resolve5();
       });
       this.currentProcess.on("error", (error3) => {
@@ -91495,7 +91608,7 @@ class AudioPlayer {
           this.currentProcess.kill();
           this.currentProcess = null;
         }
-        unlink7(tempFile, () => {});
+        unlink8(tempFile, () => {});
         reject(error3);
       });
     });
@@ -91540,7 +91653,7 @@ var init_player = __esm(() => {
 import { spawn as spawn2 } from "child_process";
 import { tmpdir as tmpdir4 } from "os";
 import { join as join34 } from "path";
-import { readFileSync as readFileSync16, unlink as unlink8 } from "fs";
+import { readFileSync as readFileSync16, unlink as unlink9 } from "fs";
 
 class AudioRecorder {
   currentProcess = null;
@@ -91576,7 +91689,7 @@ class AudioRecorder {
       });
     });
     const data = readFileSync16(output);
-    unlink8(output, () => {});
+    unlink9(output, () => {});
     this.currentOutputPath = null;
     return data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
   }
@@ -91763,7 +91876,7 @@ var init_manager4 = __esm(() => {
 });
 // packages/core/src/identity/identity-manager.ts
 import { existsSync as existsSync23 } from "fs";
-import { mkdir as mkdir10, readFile as readFile12, writeFile as writeFile10, rm as rm2 } from "fs/promises";
+import { mkdir as mkdir10, readFile as readFile12, writeFile as writeFile9, rm as rm2 } from "fs/promises";
 import { join as join35 } from "path";
 function isValidId2(id) {
   return typeof id === "string" && id.length > 0 && SAFE_ID_PATTERN6.test(id);
@@ -91941,12 +92054,12 @@ class IdentityManager {
     if (!index.identities.includes(id)) {
       index.identities.push(id);
     }
-    await writeFile10(this.indexPath, JSON.stringify(index, null, 2));
+    await writeFile9(this.indexPath, JSON.stringify(index, null, 2));
   }
   async removeFromIndex(id) {
     const index = await this.readIndex();
     index.identities = index.identities.filter((identityId) => identityId !== id);
-    await writeFile10(this.indexPath, JSON.stringify(index, null, 2));
+    await writeFile9(this.indexPath, JSON.stringify(index, null, 2));
   }
   async readIdentity(id) {
     const path3 = this.identityPath(id);
@@ -91961,7 +92074,7 @@ class IdentityManager {
   }
   async persistIdentity(identity) {
     await mkdir10(this.identitiesRoot, { recursive: true });
-    await writeFile10(this.identityPath(identity.id), JSON.stringify(identity, null, 2));
+    await writeFile9(this.identityPath(identity.id), JSON.stringify(identity, null, 2));
   }
   async readActive() {
     if (!existsSync23(this.activePath))
@@ -91980,7 +92093,7 @@ class IdentityManager {
   }
   async setActive(id) {
     this.activeId = id;
-    await writeFile10(this.activePath, JSON.stringify({ id }, null, 2));
+    await writeFile9(this.activePath, JSON.stringify({ id }, null, 2));
   }
   async loadAssistant() {
     if (!existsSync23(this.assistantConfigPath()))
@@ -92020,7 +92133,7 @@ var init_identity_manager = __esm(() => {
 
 // packages/core/src/identity/assistant-manager.ts
 import { existsSync as existsSync24 } from "fs";
-import { mkdir as mkdir11, readFile as readFile13, writeFile as writeFile11, rm as rm3 } from "fs/promises";
+import { mkdir as mkdir11, readFile as readFile13, writeFile as writeFile10, rm as rm3 } from "fs/promises";
 import { join as join36 } from "path";
 function isValidId3(id) {
   return typeof id === "string" && id.length > 0 && SAFE_ID_PATTERN7.test(id);
@@ -92152,12 +92265,12 @@ class AssistantManager {
     if (!index.assistants.includes(id)) {
       index.assistants.push(id);
     }
-    await writeFile11(this.indexPath, JSON.stringify(index, null, 2));
+    await writeFile10(this.indexPath, JSON.stringify(index, null, 2));
   }
   async removeFromIndex(id) {
     const index = await this.readIndex();
     index.assistants = index.assistants.filter((assistantId) => assistantId !== id);
-    await writeFile11(this.indexPath, JSON.stringify(index, null, 2));
+    await writeFile10(this.indexPath, JSON.stringify(index, null, 2));
   }
   async readAssistant(id) {
     const configPath = this.assistantConfigPath(id);
@@ -92174,7 +92287,7 @@ class AssistantManager {
     validateId2(assistant.id, "assistantId");
     const dir = join36(this.assistantsRoot, assistant.id);
     await mkdir11(dir, { recursive: true });
-    await writeFile11(this.assistantConfigPath(assistant.id), JSON.stringify(assistant, null, 2));
+    await writeFile10(this.assistantConfigPath(assistant.id), JSON.stringify(assistant, null, 2));
   }
   async readActive() {
     if (!existsSync24(this.activePath))
@@ -92193,7 +92306,7 @@ class AssistantManager {
   }
   async setActive(id) {
     this.activeId = id;
-    await writeFile11(this.activePath, JSON.stringify({ id }, null, 2));
+    await writeFile10(this.activePath, JSON.stringify({ id }, null, 2));
   }
 }
 var SAFE_ID_PATTERN7, DEFAULT_SETTINGS;
@@ -117043,14 +117156,14 @@ var init_validateTokenKey = __esm(() => {
 
 // node_modules/.bun/@aws-sdk+token-providers@3.985.0/node_modules/@aws-sdk/token-providers/dist-es/writeSSOTokenToFile.js
 import { promises as fsPromises } from "fs";
-var import_shared_ini_file_loader, writeFile12, writeSSOTokenToFile = (id, ssoToken) => {
+var import_shared_ini_file_loader, writeFile11, writeSSOTokenToFile = (id, ssoToken) => {
   const tokenFilepath = import_shared_ini_file_loader.getSSOTokenFilepath(id);
   const tokenString = JSON.stringify(ssoToken, null, 2);
-  return writeFile12(tokenFilepath, tokenString);
+  return writeFile11(tokenFilepath, tokenString);
 };
 var init_writeSSOTokenToFile = __esm(() => {
   import_shared_ini_file_loader = __toESM(require_dist_cjs35(), 1);
-  ({ writeFile: writeFile12 } = fsPromises);
+  ({ writeFile: writeFile11 } = fsPromises);
 });
 
 // node_modules/.bun/@aws-sdk+token-providers@3.985.0/node_modules/@aws-sdk/token-providers/dist-es/fromSso.js
@@ -124506,7 +124619,7 @@ var init_s3_client = __esm(() => {
 
 // packages/core/src/inbox/storage/local-cache.ts
 import { join as join38, basename as basename5 } from "path";
-import { mkdir as mkdir12, readFile as readFile15, writeFile as writeFile13, rm as rm4, readdir as readdir4, stat as stat3 } from "fs/promises";
+import { mkdir as mkdir12, readFile as readFile15, writeFile as writeFile12, rm as rm4, readdir as readdir4, stat as stat3 } from "fs/promises";
 import { createHash as createHash5 } from "crypto";
 function isValidAssistantId(id) {
   return typeof id === "string" && id.length > 0 && STRICT_ID_PATTERN.test(id);
@@ -124565,7 +124678,7 @@ class LocalInboxCache {
       return;
     await this.ensureDirectories();
     const indexPath = join38(this.cacheDir, "index.json");
-    await writeFile13(indexPath, JSON.stringify(this.index, null, 2));
+    await writeFile12(indexPath, JSON.stringify(this.index, null, 2));
   }
   async saveEmail(email) {
     const filename = emailIdToFilename(email.id);
@@ -124574,7 +124687,7 @@ class LocalInboxCache {
     }
     await this.ensureDirectories();
     const emailPath = join38(this.cacheDir, "emails", `${filename}.json`);
-    await writeFile13(emailPath, JSON.stringify(email, null, 2));
+    await writeFile12(emailPath, JSON.stringify(email, null, 2));
     const index = await this.loadIndex();
     const existingIdx = index.emails.findIndex((e3) => e3.id === email.id);
     const entry = {
@@ -124671,7 +124784,7 @@ class LocalInboxCache {
     const attachmentDir = join38(this.cacheDir, "attachments", emailFilename);
     await mkdir12(attachmentDir, { recursive: true });
     const attachmentPath = join38(attachmentDir, safeFilename);
-    await writeFile13(attachmentPath, content);
+    await writeFile12(attachmentPath, content);
     return attachmentPath;
   }
   async getAttachmentPath(emailId, filename) {
@@ -170416,9 +170529,8 @@ class LocalMessagesStorage {
     }
   }
   async saveIndex(assistantId, index) {
-    const runtime = getRuntime();
     await this.ensureDirectories(assistantId);
-    await runtime.write(this.getIndexPath(assistantId), JSON.stringify(index, null, 2));
+    await atomicWriteFile(this.getIndexPath(assistantId), JSON.stringify(index, null, 2));
   }
   async rebuildIndexStats(assistantId, index) {
     const threadIds = new Set;
@@ -170437,10 +170549,9 @@ class LocalMessagesStorage {
     index.lastCheck = new Date().toISOString();
   }
   async saveMessage(message) {
-    const runtime = getRuntime();
     await this.ensureDirectories(message.toAssistantId);
     const messagePath = this.getMessagePath(message.toAssistantId, message.id);
-    await runtime.write(messagePath, JSON.stringify(message, null, 2));
+    await atomicWriteFile(messagePath, JSON.stringify(message, null, 2));
     const index = await this.loadIndex(message.toAssistantId);
     const listItem = {
       id: message.id,
@@ -170457,10 +170568,9 @@ class LocalMessagesStorage {
     };
     index.messages.unshift(listItem);
     if (message.parentId) {
-      for (const msg of index.messages) {
-        if (msg.threadId === message.threadId && msg.id !== message.id) {
-          msg.replyCount = (msg.replyCount || 0) + 1;
-        }
+      const parent = index.messages.find((m5) => m5.id === message.parentId);
+      if (parent) {
+        parent.replyCount = (parent.replyCount || 0) + 1;
       }
     }
     await this.rebuildIndexStats(message.toAssistantId, index);
@@ -170480,17 +170590,17 @@ class LocalMessagesStorage {
     }
   }
   async updateMessageStatus(assistantId, messageId, status, timestamp) {
-    const runtime = getRuntime();
     const message = await this.loadMessage(assistantId, messageId);
     if (!message)
       return;
+    const previousStatus = message.status;
     message.status = status;
     if (status === "read" && timestamp) {
       message.readAt = timestamp;
     } else if (status === "injected" && timestamp) {
       message.injectedAt = timestamp;
     }
-    await runtime.write(this.getMessagePath(assistantId, messageId), JSON.stringify(message, null, 2));
+    await atomicWriteFile(this.getMessagePath(assistantId, messageId), JSON.stringify(message, null, 2));
     const index = await this.loadIndex(assistantId);
     const indexItem = index.messages.find((m5) => m5.id === messageId);
     if (indexItem) {
@@ -170498,22 +170608,32 @@ class LocalMessagesStorage {
     }
     await this.rebuildIndexStats(assistantId, index);
     await this.saveIndex(assistantId, index);
+    if (previousStatus !== status && message.threadId) {
+      await this.updateThreadFromIndex(assistantId, message.threadId, index);
+    }
   }
   async deleteMessage(assistantId, messageId) {
-    const runtime = getRuntime();
     const messagePath = this.getMessagePath(assistantId, messageId);
     try {
-      const file = runtime.file(messagePath);
-      if (!await file.exists()) {
+      const message = await this.loadMessage(assistantId, messageId);
+      if (!message)
         return false;
-      }
       await rm5(messagePath);
       const index = await this.loadIndex(assistantId);
+      if (message.parentId) {
+        const parent = index.messages.find((m5) => m5.id === message.parentId);
+        if (parent && parent.replyCount) {
+          parent.replyCount = Math.max(0, parent.replyCount - 1);
+        }
+      }
       const msgIndex = index.messages.findIndex((m5) => m5.id === messageId);
       if (msgIndex >= 0) {
         index.messages.splice(msgIndex, 1);
         await this.rebuildIndexStats(assistantId, index);
         await this.saveIndex(assistantId, index);
+        if (message.threadId) {
+          await this.updateThreadFromIndex(assistantId, message.threadId, index);
+        }
       }
       return true;
     } catch {
@@ -170538,11 +170658,10 @@ class LocalMessagesStorage {
     return messages;
   }
   async updateThread(assistantId, message) {
-    const runtime = getRuntime();
     const threadPath = this.getThreadPath(assistantId, message.threadId);
     let thread;
     try {
-      const file = runtime.file(threadPath);
+      const file = getRuntime().file(threadPath);
       if (await file.exists()) {
         thread = await file.json();
       } else {
@@ -170601,7 +170720,44 @@ class LocalMessagesStorage {
       replyCount: 0
     };
     thread.updatedAt = message.createdAt;
-    await runtime.write(threadPath, JSON.stringify(thread, null, 2));
+    await atomicWriteFile(threadPath, JSON.stringify(thread, null, 2));
+  }
+  async updateThreadFromIndex(assistantId, threadId, index) {
+    const threadPath = this.getThreadPath(assistantId, threadId);
+    let thread = null;
+    try {
+      const file = getRuntime().file(threadPath);
+      if (await file.exists()) {
+        thread = await file.json();
+      }
+    } catch {
+      thread = null;
+    }
+    const threadMessages = index.messages.filter((m5) => m5.threadId === threadId);
+    if (threadMessages.length === 0) {
+      try {
+        await rm5(threadPath);
+      } catch {}
+      return;
+    }
+    if (!thread) {
+      thread = {
+        threadId,
+        subject: threadMessages[0].subject,
+        participants: [],
+        messageCount: 0,
+        unreadCount: 0,
+        lastMessage: threadMessages[0],
+        createdAt: threadMessages[threadMessages.length - 1].createdAt,
+        updatedAt: threadMessages[0].createdAt
+      };
+    }
+    thread.messageCount = threadMessages.length;
+    thread.unreadCount = threadMessages.filter((m5) => m5.status === "unread" || m5.status === "injected").length;
+    thread.lastMessage = threadMessages[0];
+    thread.subject = thread.lastMessage.subject ?? thread.subject;
+    thread.updatedAt = thread.lastMessage.createdAt;
+    await atomicWriteFile(threadPath, JSON.stringify(thread, null, 2));
   }
   async loadThread(assistantId, threadId) {
     try {
@@ -170680,9 +170836,11 @@ class LocalMessagesStorage {
     return toDelete.length;
   }
 }
-var SAFE_ID_PATTERN8;
+var INDEX_LOCK_TTL_MS, SAFE_ID_PATTERN8;
 var init_local_storage = __esm(async () => {
+  init_atomic_write();
   await init_runtime();
+  INDEX_LOCK_TTL_MS = 10 * 1000;
   SAFE_ID_PATTERN8 = /^[a-zA-Z0-9_-]+$/;
 });
 
@@ -174027,7 +174185,7 @@ var init_channels = __esm(async () => {
 
 // packages/core/src/people/store.ts
 import { existsSync as existsSync28 } from "fs";
-import { mkdir as mkdir15, readFile as readFile16, writeFile as writeFile14, rm as rm7 } from "fs/promises";
+import { mkdir as mkdir15, readFile as readFile16, writeFile as writeFile13, rm as rm7 } from "fs/promises";
 import { join as join45 } from "path";
 function isValidId4(id) {
   return typeof id === "string" && id.length > 0 && SAFE_ID_PATTERN10.test(id);
@@ -174152,7 +174310,7 @@ class PeopleStore {
     }
     this.activeId = id;
     try {
-      await writeFile14(this.activePath, JSON.stringify({ personId: id }, null, 2));
+      await writeFile13(this.activePath, JSON.stringify({ personId: id }, null, 2));
     } catch {}
   }
   async readIndex() {
@@ -174165,7 +174323,7 @@ class PeopleStore {
     return { people: [] };
   }
   async writeIndex(index) {
-    await writeFile14(this.indexPath, JSON.stringify(index, null, 2));
+    await writeFile13(this.indexPath, JSON.stringify(index, null, 2));
   }
   async appendToIndex(id) {
     const index = await this.readIndex();
@@ -174203,7 +174361,7 @@ class PeopleStore {
   async persist(person) {
     const dir = join45(this.basePath, person.id);
     await mkdir15(dir, { recursive: true });
-    await writeFile14(this.personConfigPath(person.id), JSON.stringify(person, null, 2));
+    await writeFile13(this.personConfigPath(person.id), JSON.stringify(person, null, 2));
   }
 }
 var SAFE_ID_PATTERN10;
@@ -181626,6 +181784,14 @@ class SubassistantManager {
         subassistantId
       };
     }
+    const info = {
+      id: subassistantId,
+      task: config.task,
+      status: "running",
+      startedAt: Date.now(),
+      depth: config.depth
+    };
+    this.activeSubassistants.set(subassistantId, info);
     if (this.context.fireHook) {
       const hookInput = {
         session_id: config.parentSessionId,
@@ -181640,6 +181806,7 @@ class SubassistantManager {
       };
       const hookResult = await this.context.fireHook(hookInput);
       if (hookResult && hookResult.continue === false) {
+        this.activeSubassistants.delete(subassistantId);
         return {
           success: false,
           error: hookResult.stopReason || "Blocked by SubassistantStart hook",
@@ -181663,14 +181830,7 @@ ${hookResult.additionalContext}` : hookResult.additionalContext
         };
       }
     }
-    const info = {
-      id: subassistantId,
-      task: config.task,
-      status: "running",
-      startedAt: Date.now(),
-      depth: config.depth
-    };
-    this.activeSubassistants.set(subassistantId, info);
+    info.task = config.task;
     try {
       const tools = this.filterToolsForSubassistant(config.tools, config.depth);
       const maxTurns = Math.min(config.maxTurns ?? this.config.maxTurns, MAX_ALLOWED_TURNS);
@@ -184988,7 +185148,7 @@ ${effects.message}
               sessionId: this.sessionId,
               updatedAt: Date.now()
             };
-          });
+          }, { ownerId: this.sessionId });
           if (!claimed || claimed.sessionId && claimed.sessionId !== this.sessionId) {
             await releaseScheduleLock(this.cwd, schedule.id, this.sessionId);
             continue;
@@ -185050,7 +185210,7 @@ ${effects.message}
               updated.nextRunAt = computeNextRun2(updated, now2);
             }
             return updated;
-          });
+          }, { ownerId: this.sessionId });
         } finally {
           clearInterval(leaseTimer);
           await releaseScheduleLock(this.cwd, schedule.id, this.sessionId);
@@ -186368,12 +186528,12 @@ async function loadHistory() {
 }
 async function saveHistory(history) {
   try {
-    const { writeFile: writeFile15, mkdir: mkdir16 } = await import("fs/promises");
+    const { writeFile: writeFile14, mkdir: mkdir16 } = await import("fs/promises");
     const { dirname: dirname25 } = await import("path");
     const historyPath = getHistoryPath();
     await mkdir16(dirname25(historyPath), { recursive: true });
     const trimmedHistory = history.slice(-MAX_HISTORY_SIZE);
-    await writeFile15(historyPath, trimmedHistory.join(`
+    await writeFile14(historyPath, trimmedHistory.join(`
 `) + `
 `, "utf-8");
   } catch (error3) {
@@ -186384,7 +186544,7 @@ async function appendToHistory(command) {
   if (!command.trim())
     return;
   try {
-    const { appendFile: appendFile3, mkdir: mkdir16, stat: stat5, readFile: readFile17, writeFile: writeFile15 } = await import("fs/promises");
+    const { appendFile: appendFile3, mkdir: mkdir16, stat: stat5, readFile: readFile17, writeFile: writeFile14 } = await import("fs/promises");
     const { dirname: dirname25 } = await import("path");
     const historyPath = getHistoryPath();
     await mkdir16(dirname25(historyPath), { recursive: true });
@@ -186396,7 +186556,7 @@ async function appendToHistory(command) {
 `).filter((line) => line.trim().length > 0);
         const trimmedLines = lines.slice(-MAX_HISTORY_SIZE + 1);
         trimmedLines.push(command);
-        await writeFile15(historyPath, trimmedLines.join(`
+        await writeFile14(historyPath, trimmedLines.join(`
 `) + `
 `, "utf-8");
         return;
@@ -204344,18 +204504,18 @@ var proto = Object.defineProperties(() => {}, {
     }
   }
 });
-var createStyler = (open3, close, parent) => {
+var createStyler = (open4, close, parent) => {
   let openAll;
   let closeAll;
   if (parent === undefined) {
-    openAll = open3;
+    openAll = open4;
     closeAll = close;
   } else {
-    openAll = parent.openAll + open3;
+    openAll = parent.openAll + open4;
     closeAll = close + parent.closeAll;
   }
   return {
-    open: open3,
+    open: open4,
     close,
     openAll,
     closeAll,
@@ -206437,6 +206597,8 @@ function useSafeInput(handler, options = {}) {
       return;
     const handleData = (data) => {
       const keypress = parseKeypress2(data);
+      const isReturn = keypress.name === "return" || keypress.sequence === "\x1B\r" || keypress.sequence === `\x1B
+`;
       const key = {
         upArrow: keypress.name === "up",
         downArrow: keypress.name === "down",
@@ -206446,7 +206608,7 @@ function useSafeInput(handler, options = {}) {
         pageUp: keypress.name === "pageup",
         home: keypress.name === "home",
         end: keypress.name === "end",
-        return: keypress.name === "return",
+        return: isReturn,
         escape: keypress.name === "escape",
         ctrl: keypress.ctrl,
         shift: keypress.shift,
@@ -206459,9 +206621,6 @@ function useSafeInput(handler, options = {}) {
       if (NON_ALPHA_KEYS.includes(keypress.name)) {
         input = "";
       }
-      if (input.startsWith("\x1B")) {
-        input = input.slice(1);
-      }
       if (input.length === 1 && typeof input[0] === "string" && /[A-Z]/.test(input[0])) {
         key.shift = true;
       }
@@ -206478,6 +206637,25 @@ function useSafeInput(handler, options = {}) {
 
 // packages/terminal/src/components/Input.tsx
 var jsx_dev_runtime = __toESM(require_jsx_dev_runtime(), 1);
+var ASSISTANT_COLORS = [
+  "#6B4C9A",
+  "#2E86AB",
+  "#A23B72",
+  "#1B813E",
+  "#C1440E",
+  "#5B5EA6",
+  "#9B2335",
+  "#2D6A4F",
+  "#7C4DFF",
+  "#D4621B"
+];
+function getAssistantColor(name2) {
+  let hash = 0;
+  for (let i5 = 0;i5 < name2.length; i5++) {
+    hash = (hash << 5) - hash + name2.charCodeAt(i5) | 0;
+  }
+  return ASSISTANT_COLORS[Math.abs(hash) % ASSISTANT_COLORS.length];
+}
 var COMMANDS = [
   { name: "/help", description: "show available commands" },
   { name: "/clear", description: "clear the conversation" },
@@ -206994,7 +207172,7 @@ var Input = import_react28.default.forwardRef(function Input2({
               children: " "
             }, undefined, false, undefined, this),
             /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text3, {
-              backgroundColor: "#4a8ba4",
+              backgroundColor: getAssistantColor(assistantName),
               color: "white",
               bold: true,
               children: [
@@ -219258,6 +219436,26 @@ function WebhooksPanel({ manager, onClose }) {
 // packages/terminal/src/components/ChannelsPanel.tsx
 var import_react46 = __toESM(require_react(), 1);
 var jsx_dev_runtime23 = __toESM(require_jsx_dev_runtime(), 1);
+var SLACK_COLOR = "#4A154B";
+var ASSISTANT_COLORS2 = [
+  "#6B4C9A",
+  "#2E86AB",
+  "#A23B72",
+  "#1B813E",
+  "#C1440E",
+  "#5B5EA6",
+  "#9B2335",
+  "#2D6A4F",
+  "#7C4DFF",
+  "#D4621B"
+];
+function getAssistantColor2(name2) {
+  let hash = 0;
+  for (let i5 = 0;i5 < name2.length; i5++) {
+    hash = (hash << 5) - hash + name2.charCodeAt(i5) | 0;
+  }
+  return ASSISTANT_COLORS2[Math.abs(hash) % ASSISTANT_COLORS2.length];
+}
 function formatRelativeTime5(isoDate) {
   if (!isoDate)
     return "never";
@@ -219469,9 +219667,10 @@ function ChannelsPanel({ manager, onClose, activePersonId, activePersonName, onP
     marginBottom: 1,
     children: [
       /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text3, {
+        backgroundColor: SLACK_COLOR,
+        color: "white",
         bold: true,
-        color: "blue",
-        children: "Channels"
+        children: " Channels "
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text3, {
         color: "gray",
@@ -219565,11 +219764,13 @@ function ChannelsPanel({ manager, onClose, activePersonId, activePersonName, onP
           marginBottom: 1,
           children: [
             /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text3, {
+              backgroundColor: SLACK_COLOR,
+              color: "white",
               bold: true,
-              color: "blue",
               children: [
-                "#",
-                selectedChannel.name
+                " #",
+                selectedChannel.name,
+                " "
               ]
             }, undefined, true, undefined, this),
             selectedChannel.description && /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text3, {
@@ -219592,16 +219793,21 @@ function ChannelsPanel({ manager, onClose, activePersonId, activePersonName, onP
             marginBottom: 0,
             children: [
               /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text3, {
-                color: "cyan",
+                backgroundColor: getAssistantColor2(msg.senderName),
+                color: "white",
                 bold: true,
-                children: msg.senderName
-              }, undefined, false, undefined, this),
+                children: [
+                  " ",
+                  msg.senderName,
+                  " "
+                ]
+              }, undefined, true, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text3, {
                 color: "gray",
                 children: [
-                  " (",
+                  " ",
                   formatRelativeTime5(msg.createdAt),
-                  "): "
+                  ": "
                 ]
               }, undefined, true, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text3, {
@@ -219708,17 +219914,27 @@ function ChannelsPanel({ manager, onClose, activePersonId, activePersonName, onP
         /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Box_default, {
           paddingX: 1,
           marginBottom: 1,
-          children: /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text3, {
-            bold: true,
-            children: [
-              "#",
-              selectedChannel.name,
-              " \u2014 Members (",
-              members.length,
-              ")"
-            ]
-          }, undefined, true, undefined, this)
-        }, undefined, false, undefined, this),
+          children: [
+            /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text3, {
+              backgroundColor: SLACK_COLOR,
+              color: "white",
+              bold: true,
+              children: [
+                " #",
+                selectedChannel.name,
+                " "
+              ]
+            }, undefined, true, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text3, {
+              bold: true,
+              children: [
+                " Members (",
+                members.length,
+                ")"
+              ]
+            }, undefined, true, undefined, this)
+          ]
+        }, undefined, true, undefined, this),
         /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Box_default, {
           flexDirection: "column",
           paddingX: 1,
@@ -219728,9 +219944,15 @@ function ChannelsPanel({ manager, onClose, activePersonId, activePersonName, onP
                 children: "  "
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text3, {
+                backgroundColor: getAssistantColor2(m5.assistantName),
+                color: "white",
                 bold: true,
-                children: m5.assistantName
-              }, undefined, false, undefined, this),
+                children: [
+                  " ",
+                  m5.assistantName,
+                  " "
+                ]
+              }, undefined, true, undefined, this),
               m5.role === "owner" && /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(Text3, {
                 color: "yellow",
                 children: " (owner)"
@@ -221128,6 +221350,9 @@ function OnboardingPanel({
     process.stdin.on("data", handleData);
     return () => {
       process.stdin.removeListener("data", handleData);
+      if (isRawModeSupported && setRawMode) {
+        setRawMode(false);
+      }
     };
   }, [onCancel, isRawModeSupported, setRawMode]);
   const [connectorKeys, setConnectorKeys] = import_react51.useState({});
@@ -232060,6 +232285,7 @@ function App2({ cwd: cwd2, version: version3 }) {
     setIsProcessing(true);
     isProcessingRef.current = true;
     registryRef.current.setProcessing(activeSession2.id, true);
+    pendingSendsRef.current.push({ id: nextMessage.id, sessionId: activeSessionId, mode: "queued" });
     try {
       await activeSession2.client.send(nextMessage.content);
     } catch (err) {
@@ -233835,7 +234061,7 @@ When done, report the result.`);
   }
   if (showConfigPanel && currentConfig) {
     const handleConfigSave = async (location, updates) => {
-      const { writeFile: writeFile15, mkdir: mkdir16 } = await import("fs/promises");
+      const { writeFile: writeFile14, mkdir: mkdir16 } = await import("fs/promises");
       const { dirname: dirname25 } = await import("path");
       let configPath;
       let existingConfig;
@@ -233855,7 +234081,7 @@ When done, report the result.`);
       }
       const newConfig = deepMerge(existingConfig || {}, updates);
       await mkdir16(dirname25(configPath), { recursive: true });
-      await writeFile15(configPath, JSON.stringify(newConfig, null, 2));
+      await writeFile14(configPath, JSON.stringify(newConfig, null, 2));
       await loadConfigFiles();
     };
     return /* @__PURE__ */ jsx_dev_runtime43.jsxDEV(Box_default, {
@@ -234714,7 +234940,7 @@ Interactive Mode:
 // packages/terminal/src/index.tsx
 var jsx_dev_runtime44 = __toESM(require_jsx_dev_runtime(), 1);
 setRuntime(bunRuntime);
-var VERSION4 = "1.1.21";
+var VERSION4 = "1.1.22";
 var SYNC_START = "\x1B[?2026h";
 var SYNC_END = "\x1B[?2026l";
 function enableSynchronizedOutput() {
@@ -234854,4 +235080,4 @@ export {
   main
 };
 
-//# debugId=2ACD58D0B6B9265864756E2164756E21
+//# debugId=94E39B1F6C1DFA4D64756E2164756E21