@askexenow/exe-os 0.8.83 → 0.8.85

package/dist/bin/exe-gateway.js

@@ -639,6 +639,7 @@ __export(employees_exports, {
   DEFAULT_COORDINATOR_TEMPLATE_NAME: () => DEFAULT_COORDINATOR_TEMPLATE_NAME,
   EMPLOYEES_PATH: () => EMPLOYEES_PATH,
   addEmployee: () => addEmployee,
+  baseAgentName: () => baseAgentName,
   canCoordinate: () => canCoordinate,
   getCoordinatorEmployee: () => getCoordinatorEmployee,
   getCoordinatorName: () => getCoordinatorName,
@@ -735,6 +736,14 @@ function hasRole(agentName, role) {
   const emp = getEmployee(employees, agentName);
   return emp ? emp.role.toLowerCase() === role.toLowerCase() : false;
 }
+function baseAgentName(name, employees) {
+  const match = name.match(/^([a-zA-Z]+)\d+$/);
+  if (!match) return name;
+  const base = match[1];
+  const roster = employees ?? loadEmployeesSync();
+  if (getEmployee(roster, base)) return base;
+  return name;
+}
 function isMultiInstance(agentName, employees) {
   const roster = employees ?? loadEmployeesSync();
   const emp = getEmployee(roster, agentName);
@@ -851,6 +860,12 @@ function getClient() {
   if (!_resilientClient) {
     throw new Error("Database client not initialized. Call initDatabase() first.");
   }
+  if (process.env.EXE_IS_DAEMON === "1") {
+    return _resilientClient;
+  }
+  if (_daemonClient && _daemonClient._isDaemonActive()) {
+    return _daemonClient;
+  }
   return _resilientClient;
 }
 function getRawClient() {
@@ -1339,6 +1354,12 @@ async function ensureSchema() {
     } catch {
     }
   }
+  try {
+    await client.execute(
+      `CREATE INDEX IF NOT EXISTS idx_memories_content_hash ON memories(content_hash, agent_id)`
+    );
+  } catch {
+  }
   await client.executeMultiple(`
     CREATE TABLE IF NOT EXISTS entities (
       id TEXT PRIMARY KEY,
@@ -1391,7 +1412,30 @@ async function ensureSchema() {
       entity_id TEXT NOT NULL,
       PRIMARY KEY (hyperedge_id, entity_id)
     );
+
+    CREATE VIRTUAL TABLE IF NOT EXISTS entities_fts USING fts5(
+      name,
+      content=entities,
+      content_rowid=rowid
+    );
+
+    CREATE TRIGGER IF NOT EXISTS entities_fts_ai AFTER INSERT ON entities BEGIN
+      INSERT INTO entities_fts(rowid, name) VALUES (new.rowid, new.name);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS entities_fts_ad AFTER DELETE ON entities BEGIN
+      INSERT INTO entities_fts(entities_fts, rowid, name) VALUES('delete', old.rowid, old.name);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS entities_fts_au AFTER UPDATE ON entities BEGIN
+      INSERT INTO entities_fts(entities_fts, rowid, name) VALUES('delete', old.rowid, old.name);
+      INSERT INTO entities_fts(rowid, name) VALUES (new.rowid, new.name);
+    END;
   `);
+  try {
+    await client.execute("INSERT INTO entities_fts(entities_fts) VALUES('rebuild')");
+  } catch {
+  }
   await client.executeMultiple(`
     CREATE TABLE IF NOT EXISTS entity_aliases (
       alias TEXT NOT NULL PRIMARY KEY,
@@ -1572,6 +1616,33 @@ async function ensureSchema() {
     CREATE INDEX IF NOT EXISTS idx_conversations_channel
       ON conversations(channel_id);
   `);
+  await client.executeMultiple(`
+    CREATE TABLE IF NOT EXISTS session_agent_map (
+      session_uuid TEXT PRIMARY KEY,
+      agent_id TEXT NOT NULL,
+      session_name TEXT,
+      task_id TEXT,
+      project_name TEXT,
+      started_at TEXT NOT NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_session_agent_map_agent
+      ON session_agent_map(agent_id);
+  `);
+  try {
+    const mapCount = await client.execute({ sql: `SELECT COUNT(*) as cnt FROM session_agent_map`, args: [] });
+    if (Number(mapCount.rows[0]?.cnt ?? 0) === 0) {
+      await client.execute({
+        sql: `INSERT OR IGNORE INTO session_agent_map (session_uuid, agent_id, session_name, started_at)
+              SELECT session_id, agent_id, '', MIN(timestamp)
+              FROM memories
+              WHERE session_id IS NOT NULL AND session_id != '' AND agent_id IS NOT NULL AND agent_id != ''
+              GROUP BY session_id, agent_id`,
+        args: []
+      });
+    }
+  } catch {
+  }
   try {
     await client.execute({
       sql: `ALTER TABLE tasks ADD COLUMN budget_tokens INTEGER`,
@@ -1705,15 +1776,41 @@ async function ensureSchema() {
     });
   } catch {
   }
+  for (const col of [
+    "ALTER TABLE memories ADD COLUMN intent TEXT",
+    "ALTER TABLE memories ADD COLUMN outcome TEXT",
+    "ALTER TABLE memories ADD COLUMN domain TEXT",
+    "ALTER TABLE memories ADD COLUMN referenced_entities TEXT",
+    "ALTER TABLE memories ADD COLUMN retrieval_count INTEGER DEFAULT 0",
+    "ALTER TABLE memories ADD COLUMN chain_position TEXT",
+    "ALTER TABLE memories ADD COLUMN review_status TEXT",
+    "ALTER TABLE memories ADD COLUMN context_window_pct INTEGER",
+    "ALTER TABLE memories ADD COLUMN file_paths TEXT",
+    "ALTER TABLE memories ADD COLUMN commit_hash TEXT",
+    "ALTER TABLE memories ADD COLUMN duration_ms INTEGER",
+    "ALTER TABLE memories ADD COLUMN token_cost REAL",
+    "ALTER TABLE memories ADD COLUMN audience TEXT",
+    "ALTER TABLE memories ADD COLUMN language_type TEXT",
+    "ALTER TABLE memories ADD COLUMN parent_memory_id TEXT"
+  ]) {
+    try {
+      await client.execute(col);
+    } catch {
+    }
+  }
 }
 async function disposeDatabase() {
+  if (_daemonClient) {
+    _daemonClient.close();
+    _daemonClient = null;
+  }
   if (_client) {
     _client.close();
     _client = null;
     _resilientClient = null;
   }
 }
-var _client, _resilientClient, initTurso, disposeTurso;
+var _client, _resilientClient, _daemonClient, initTurso, disposeTurso;
 var init_database = __esm({
   "src/lib/database.ts"() {
     "use strict";
@@ -1721,6 +1818,7 @@ var init_database = __esm({
     init_employees();
     _client = null;
     _resilientClient = null;
+    _daemonClient = null;
     initTurso = initDatabase;
     disposeTurso = disposeDatabase;
   }
@@ -1755,10 +1853,12 @@ function handleData(chunk) {
     if (!line) continue;
     try {
       const response = JSON.parse(line);
-      const entry = _pending.get(response.id);
+      const id = response.id;
+      if (!id) continue;
+      const entry = _pending.get(id);
       if (entry) {
         clearTimeout(entry.timer);
-        _pending.delete(response.id);
+        _pending.delete(id);
         entry.resolve(response);
       }
     } catch {
@@ -1929,6 +2029,9 @@ async function connectEmbedDaemon() {
   return false;
 }
 function sendRequest(texts, priority) {
+  return sendDaemonRequest({ texts, priority });
+}
+function sendDaemonRequest(payload, timeoutMs = REQUEST_TIMEOUT_MS) {
   return new Promise((resolve) => {
     if (!_socket || !_connected) {
       resolve({ error: "Not connected" });
@@ -1938,10 +2041,10 @@ function sendRequest(texts, priority) {
     const timer = setTimeout(() => {
       _pending.delete(id);
       resolve({ error: "Request timeout" });
-    }, REQUEST_TIMEOUT_MS);
+    }, timeoutMs);
     _pending.set(id, { resolve, timer });
     try {
-      _socket.write(JSON.stringify({ id, texts, priority }) + "\n");
+      _socket.write(JSON.stringify({ id, ...payload }) + "\n");
     } catch {
       clearTimeout(timer);
       _pending.delete(id);
@@ -1951,30 +2054,11 @@ function sendRequest(texts, priority) {
 }
 async function pingDaemon() {
   if (!_socket || !_connected) return null;
-  return new Promise((resolve) => {
-    const id = randomUUID();
-    const timer = setTimeout(() => {
-      _pending.delete(id);
-      resolve(null);
-    }, 5e3);
-    _pending.set(id, {
-      resolve: (data) => {
-        if (data.health) {
-          resolve(data.health);
-        } else {
-          resolve(null);
-        }
-      },
-      timer
-    });
-    try {
-      _socket.write(JSON.stringify({ id, type: "health" }) + "\n");
-    } catch {
-      clearTimeout(timer);
-      _pending.delete(id);
-      resolve(null);
-    }
-  });
+  const response = await sendDaemonRequest({ type: "health" }, 5e3);
+  if (response.health) {
+    return response.health;
+  }
+  return null;
 }
 function killAndRespawnDaemon() {
   process.stderr.write("[exed-client] Killing daemon for restart...\n");
@@ -2179,12 +2263,20 @@ async function getMasterKey() {
   }
   const keyPath = getKeyPath();
   if (!existsSync4(keyPath)) {
+    process.stderr.write(
+      `[keychain] Key not found at ${keyPath} (HOME=${os3.homedir()}, EXE_OS_DIR=${process.env.EXE_OS_DIR ?? "unset"})
+`
+    );
     return null;
   }
   try {
     const content = await readFile3(keyPath, "utf-8");
     return Buffer.from(content.trim(), "base64");
-  } catch {
+  } catch (err) {
+    process.stderr.write(
+      `[keychain] Key read failed at ${keyPath}: ${err instanceof Error ? err.message : String(err)}
+`
+    );
     return null;
   }
 }
@@ -2640,6 +2732,7 @@ __export(store_exports, {
   vectorToBlob: () => vectorToBlob,
   writeMemory: () => writeMemory
 });
+import { createHash } from "crypto";
 function isBusyError2(err) {
   if (err instanceof Error) {
     const msg = err.message.toLowerCase();
@@ -2713,12 +2806,52 @@ function classifyTier(record) {
   if (["store_memory", "manual"].includes(record.tool_name ?? "") && (record.importance ?? 0) >= 5) return 2;
   return 3;
 }
+function inferFilePaths(record) {
+  if (!["Read", "Write", "Edit"].includes(record.tool_name)) return null;
+  const firstLine = record.raw_text.split("\n")[0] ?? "";
+  const match = firstLine.match(/(\/[\w./-]+\.\w+)/);
+  return match ? JSON.stringify([match[1]]) : null;
+}
+function inferCommitHash(record) {
+  if (record.tool_name !== "Bash") return null;
+  const match = record.raw_text.match(/\b([a-f0-9]{7,40})\b/);
+  return match ? match[1] : null;
+}
+function inferLanguageType(record) {
+  const text = record.raw_text;
+  if (!text || text.length < 10) return null;
+  const trimmed = text.trimStart();
+  if (trimmed.startsWith("{") || trimmed.startsWith("[")) return "json";
+  if (/\b(SELECT|INSERT|UPDATE|DELETE|CREATE TABLE|ALTER TABLE)\b/i.test(text)) return "sql";
+  if (/\b(function |const |import |export |class |def |async |=>)\b/.test(text)) return "code";
+  if (trimmed.startsWith("#") || trimmed.startsWith("*")) return "prose";
+  return "mixed";
+}
+function inferDomain(record) {
+  const proj = (record.project_name ?? "").toLowerCase();
+  if (proj.includes("marketing") || proj.includes("content")) return "marketing";
+  if (proj.includes("crm") || proj.includes("customer")) return "customer";
+  return null;
+}
 async function writeMemory(record) {
   if (record.vector !== null && record.vector.length !== EMBEDDING_DIM) {
     throw new Error(
       `Expected ${EMBEDDING_DIM}-dim vector, got ${record.vector.length}`
     );
   }
+  const contentHash = createHash("md5").update(record.raw_text).digest("hex");
+  if (_pendingRecords.some((r) => r.content_hash === contentHash && r.agent_id === record.agent_id)) {
+    return;
+  }
+  try {
+    const client = getClient();
+    const existing = await client.execute({
+      sql: "SELECT id FROM memories WHERE content_hash = ? AND agent_id = ? LIMIT 1",
+      args: [contentHash, record.agent_id]
+    });
+    if (existing.rows.length > 0) return;
+  } catch {
+  }
   const dbRow = {
     id: record.id,
     agent_id: record.agent_id,
@@ -2748,7 +2881,23 @@ async function writeMemory(record) {
     supersedes_id: record.supersedes_id ?? null,
     draft: record.draft ? 1 : 0,
     memory_type: record.memory_type ?? "raw",
-    trajectory: record.trajectory ? JSON.stringify(record.trajectory) : null
+    trajectory: record.trajectory ? JSON.stringify(record.trajectory) : null,
+    content_hash: contentHash,
+    intent: record.intent ?? null,
+    outcome: record.outcome ?? null,
+    domain: record.domain ?? inferDomain(record),
+    referenced_entities: record.referenced_entities ?? null,
+    retrieval_count: record.retrieval_count ?? 0,
+    chain_position: record.chain_position ?? null,
+    review_status: record.review_status ?? null,
+    context_window_pct: record.context_window_pct ?? null,
+    file_paths: record.file_paths ?? inferFilePaths(record),
+    commit_hash: record.commit_hash ?? inferCommitHash(record),
+    duration_ms: record.duration_ms ?? null,
+    token_cost: record.token_cost ?? null,
+    audience: record.audience ?? null,
+    language_type: record.language_type ?? inferLanguageType(record),
+    parent_memory_id: record.parent_memory_id ?? null
   };
   _pendingRecords.push(dbRow);
   orgBus.emit({
@@ -2806,80 +2955,85 @@ async function flushBatch() {
       const draft = row.draft ? 1 : 0;
       const memoryType = row.memory_type ?? "raw";
       const trajectory = row.trajectory ?? null;
-      return {
-        sql: hasVector ? `INSERT OR IGNORE INTO memories
-              (id, agent_id, agent_role, session_id, timestamp,
+      const contentHash = row.content_hash ?? null;
+      const intent = row.intent ?? null;
+      const outcome = row.outcome ?? null;
+      const domain = row.domain ?? null;
+      const referencedEntities = row.referenced_entities ?? null;
+      const retrievalCount = row.retrieval_count ?? 0;
+      const chainPosition = row.chain_position ?? null;
+      const reviewStatus = row.review_status ?? null;
+      const contextWindowPct = row.context_window_pct ?? null;
+      const filePaths = row.file_paths ?? null;
+      const commitHash = row.commit_hash ?? null;
+      const durationMs = row.duration_ms ?? null;
+      const tokenCost = row.token_cost ?? null;
+      const audience = row.audience ?? null;
+      const languageType = row.language_type ?? null;
+      const parentMemoryId = row.parent_memory_id ?? null;
+      const cols = `id, agent_id, agent_role, session_id, timestamp,
                tool_name, project_name,
                has_error, raw_text, vector, version, task_id, importance, status,
                confidence, last_accessed,
                workspace_id, document_id, user_id, char_offset, page_number,
-               source_path, source_type, tier, supersedes_id, draft, memory_type, trajectory)
-              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, vector32(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` : `INSERT OR IGNORE INTO memories
-              (id, agent_id, agent_role, session_id, timestamp,
-               tool_name, project_name,
-               has_error, raw_text, vector, version, task_id, importance, status,
-               confidence, last_accessed,
-               workspace_id, document_id, user_id, char_offset, page_number,
-               source_path, source_type, tier, supersedes_id, draft, memory_type, trajectory)
-              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-        args: hasVector ? [
-          row.id,
-          row.agent_id,
-          row.agent_role,
-          row.session_id,
-          row.timestamp,
-          row.tool_name,
-          row.project_name,
-          row.has_error,
-          row.raw_text,
-          vectorToBlob(row.vector),
-          row.version,
-          taskId,
-          importance,
-          status,
-          confidence,
-          lastAccessed,
-          workspaceId,
-          documentId,
-          userId,
-          charOffset,
-          pageNumber,
-          sourcePath,
-          sourceType,
-          tier,
-          supersedesId,
-          draft,
-          memoryType,
-          trajectory
-        ] : [
-          row.id,
-          row.agent_id,
-          row.agent_role,
-          row.session_id,
-          row.timestamp,
-          row.tool_name,
-          row.project_name,
-          row.has_error,
-          row.raw_text,
-          row.version,
-          taskId,
-          importance,
-          status,
-          confidence,
-          lastAccessed,
-          workspaceId,
-          documentId,
-          userId,
-          charOffset,
-          pageNumber,
-          sourcePath,
-          sourceType,
-          tier,
-          supersedesId,
-          draft,
-          memoryType,
-          trajectory
-        ]
+               source_path, source_type, tier, supersedes_id, draft, memory_type, trajectory, content_hash,
+               intent, outcome, domain, referenced_entities, retrieval_count,
+               chain_position, review_status, context_window_pct, file_paths, commit_hash,
+               duration_ms, token_cost, audience, language_type, parent_memory_id`;
+      const metaArgs = [
+        intent,
+        outcome,
+        domain,
+        referencedEntities,
+        retrievalCount,
+        chainPosition,
+        reviewStatus,
+        contextWindowPct,
+        filePaths,
+        commitHash,
+        durationMs,
+        tokenCost,
+        audience,
+        languageType,
+        parentMemoryId
+      ];
+      const baseArgs = [
+        row.id,
+        row.agent_id,
+        row.agent_role,
+        row.session_id,
+        row.timestamp,
+        row.tool_name,
+        row.project_name,
+        row.has_error,
+        row.raw_text
+      ];
+      const sharedArgs = [
+        row.version,
+        taskId,
+        importance,
+        status,
+        confidence,
+        lastAccessed,
+        workspaceId,
+        documentId,
+        userId,
+        charOffset,
+        pageNumber,
+        sourcePath,
+        sourceType,
+        tier,
+        supersedesId,
+        draft,
+        memoryType,
+        trajectory,
+        contentHash
+      ];
+      return {
+        sql: hasVector ? `INSERT OR IGNORE INTO memories (${cols})
+              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, vector32(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` : `INSERT OR IGNORE INTO memories (${cols})
+              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        args: hasVector ? [...baseArgs, vectorToBlob(row.vector), ...sharedArgs, ...metaArgs] : [...baseArgs, ...sharedArgs, ...metaArgs]
       };
     };
     const globalClient = getClient();
@@ -3266,7 +3420,7 @@ var LOCAL_WIKI_URL, REQUEST_TIMEOUT_MS2;
 var init_wiki_client = __esm({
   "src/lib/wiki-client.ts"() {
     "use strict";
-    LOCAL_WIKI_URL = "http://localhost:3001";
+    LOCAL_WIKI_URL = process.env.EXE_WIKI_URL || "http://localhost:3001";
     REQUEST_TIMEOUT_MS2 = 8e3;
   }
 });
@@ -4574,17 +4728,29 @@ MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEeHztAMOpR/ZMh+rWuOASjEZ54CGY
 // src/gateway/adapters/whatsapp.ts
 var whatsapp_exports = {};
 __export(whatsapp_exports, {
-  WhatsAppAdapter: () => WhatsAppAdapter
+  WhatsAppAdapter: () => WhatsAppAdapter,
+  calculateBackoff: () => calculateBackoff
 });
 import { randomUUID as randomUUID4 } from "crypto";
 import { homedir } from "os";
 import { join } from "path";
 import { mkdirSync as mkdirSync3 } from "fs";
-var RECONNECT_DELAY_MS, AUTH_DIR, WhatsAppAdapter;
+function calculateBackoff(retryCount) {
+  const base = Math.min(
+    INITIAL_BACKOFF_MS * BACKOFF_MULTIPLIER ** retryCount,
+    MAX_BACKOFF_MS
+  );
+  const jitter = base * JITTER_FACTOR * (2 * Math.random() - 1);
+  return Math.max(INITIAL_BACKOFF_MS, Math.round(base + jitter));
+}
+var INITIAL_BACKOFF_MS, MAX_BACKOFF_MS, BACKOFF_MULTIPLIER, JITTER_FACTOR, AUTH_DIR, WhatsAppAdapter;
 var init_whatsapp = __esm({
   "src/gateway/adapters/whatsapp.ts"() {
     "use strict";
-    RECONNECT_DELAY_MS = 5e3;
+    INITIAL_BACKOFF_MS = 1e3;
+    MAX_BACKOFF_MS = 3e5;
+    BACKOFF_MULTIPLIER = 2;
+    JITTER_FACTOR = 0.25;
     AUTH_DIR = join(homedir(), ".exe-os", "whatsapp-auth");
     WhatsAppAdapter = class {
       platform = "whatsapp";
@@ -4593,6 +4759,9 @@ var init_whatsapp = __esm({
       connected = false;
       abortController = null;
       authDir = AUTH_DIR;
+      // Resilience state
+      retryCount = 0;
+      disconnectedAt = 0;
       async connect(config2) {
         this.authDir = config2.credentials.authDir ?? AUTH_DIR;
         mkdirSync3(this.authDir, { recursive: true });
@@ -4601,6 +4770,20 @@ var init_whatsapp = __esm({
         const { state, saveCreds } = await useMultiFileAuthState(this.authDir);
         const { version } = await fetchLatestBaileysVersion();
         this.abortController = new AbortController();
+        let agent;
+        const socksProxy = config2.credentials.socksProxy;
+        if (socksProxy) {
+          try {
+            const modName = "socks-proxy-agent";
+            const mod = await import(modName);
+            const SocksProxyAgent = mod.SocksProxyAgent ?? mod.default;
+            agent = new SocksProxyAgent(socksProxy);
+            console.log(`[whatsapp] Using SOCKS proxy: ${socksProxy.replace(/\/\/.*@/, "//***@")}`);
+          } catch {
+            console.error("[whatsapp] socks-proxy-agent not installed \u2014 run: npm i socks-proxy-agent");
+            throw new Error("SOCKS proxy configured but socks-proxy-agent package not installed");
+          }
+        }
         const sock = makeWASocket({
           auth: {
             creds: state.creds,
@@ -4610,7 +4793,8 @@ var init_whatsapp = __esm({
           printQRInTerminal: true,
           browser: ["exe-os", "cli", "1.0"],
           syncFullHistory: false,
-          markOnlineOnConnect: false
+          markOnlineOnConnect: false,
+          ...agent ? { agent } : {}
         });
         this.sock = sock;
         sock.ev.on("creds.update", saveCreds);
@@ -4618,18 +4802,32 @@ var init_whatsapp = __esm({
           const { connection, lastDisconnect } = update;
           if (connection === "close") {
             this.connected = false;
+            if (this.disconnectedAt === 0) this.disconnectedAt = Date.now();
             const statusCode = lastDisconnect?.error?.output?.statusCode;
             const shouldReconnect = statusCode !== DisconnectReason.loggedOut;
             if (shouldReconnect && !this.abortController?.signal.aborted) {
-              console.log(`[whatsapp] Connection closed (${statusCode}), reconnecting...`);
-              setTimeout(() => void this.connect(config2), RECONNECT_DELAY_MS);
+              const delay2 = calculateBackoff(this.retryCount);
+              this.retryCount++;
+              console.log(
+                `[whatsapp] Connection closed (code=${statusCode}), retry #${this.retryCount} in ${(delay2 / 1e3).toFixed(1)}s` + (socksProxy ? ` (proxy: ${socksProxy.replace(/\/\/.*@/, "//***@")})` : "")
+              );
+              setTimeout(() => void this.connect(config2), delay2);
             } else {
               console.log("[whatsapp] Logged out \u2014 clear auth and re-scan QR");
             }
           }
           if (connection === "open") {
+            if (this.retryCount > 0) {
+              const downtimeSec = this.disconnectedAt > 0 ? ((Date.now() - this.disconnectedAt) / 1e3).toFixed(1) : "?";
+              console.log(
+                `[whatsapp] Reconnected after ${this.retryCount} retries (${downtimeSec}s downtime)`
+              );
+            } else {
+              console.log("[whatsapp] Connected via Baileys (linked device)");
+            }
             this.connected = true;
-            console.log("[whatsapp] Connected via Baileys (linked device)");
+            this.retryCount = 0;
+            this.disconnectedAt = 0;
           }
         });
         sock.ev.on("messages.upsert", (upsert) => {
@@ -6357,6 +6555,7 @@ var init_task_scope = __esm({
 // src/lib/tasks-crud.ts
 import crypto5 from "crypto";
 import path12 from "path";
+import os8 from "os";
 import { execSync as execSync4 } from "child_process";
 import { mkdir as mkdir4, writeFile as writeFile4, appendFile } from "fs/promises";
 import { existsSync as existsSync11, readFileSync as readFileSync10 } from "fs";
@@ -6400,6 +6599,35 @@ function extractParentFromContext(contextBody) {
 function slugify(title) {
   return title.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
 }
+function buildKeywordIndex() {
+  const idx = /* @__PURE__ */ new Map();
+  for (const [role, keywords] of Object.entries(LANE_KEYWORDS)) {
+    for (const kw of keywords) {
+      const existing = idx.get(kw) ?? [];
+      existing.push(role);
+      idx.set(kw, existing);
+    }
+  }
+  return idx;
+}
+function checkLaneAffinity(title, context, assigneeName) {
+  const employees = loadEmployeesSync();
+  const employee = employees.find((e) => e.name === assigneeName);
+  if (!employee) return void 0;
+  const assigneeRole = employee.role;
+  const text = `${title} ${context}`.toLowerCase();
+  const matchedRoles = /* @__PURE__ */ new Set();
+  for (const [keyword, roles] of KEYWORD_INDEX) {
+    if (text.includes(keyword)) {
+      for (const role of roles) matchedRoles.add(role);
+    }
+  }
+  if (matchedRoles.size === 0) return void 0;
+  if (matchedRoles.has(assigneeRole)) return void 0;
+  if (assigneeRole === "COO") return void 0;
+  const expectedRoles = Array.from(matchedRoles).join(" or ");
+  return `\u26A0\uFE0F Lane mismatch: task content suggests ${expectedRoles}, but assigned to ${assigneeName} (${assigneeRole}).`;
+}
 async function resolveTask(client, identifier, scopeSession) {
   const scope = sessionScopeFilter(scopeSession);
   let result = await client.execute({
@@ -6449,7 +6677,14 @@ async function createTaskCore(input) {
   const id = crypto5.randomUUID();
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const slug = slugify(input.title);
-  const taskFile = input.taskFile ?? `exe/${input.assignedTo}/${slug}.md`;
+  let earlySessionScope = null;
+  try {
+    const { resolveExeSession: resolveExeSession2 } = await Promise.resolve().then(() => (init_tmux_routing(), tmux_routing_exports));
+    earlySessionScope = resolveExeSession2();
+  } catch {
+  }
+  const scope = earlySessionScope ?? "default";
+  const taskFile = input.taskFile ?? `tasks/${scope}/${input.assignedTo}/${slug}.md`;
   let blockedById = null;
   const initialStatus = input.blockedBy ? "blocked" : "open";
   if (input.blockedBy) {
@@ -6489,6 +6724,13 @@ async function createTaskCore(input) {
   if (dupCheck.rows.length > 0) {
     warning = `similar active task already exists (${String(dupCheck.rows[0].id)}). Created new task anyway.`;
   }
+  if (!process.env.DISABLE_LANE_AFFINITY) {
+    const laneWarning = checkLaneAffinity(input.title, input.context, input.assignedTo);
+    if (laneWarning) {
+      warning = warning ? `${warning}
+${laneWarning}` : laneWarning;
+    }
+  }
   if (input.baseDir) {
     try {
       await mkdir4(path12.join(input.baseDir, "exe", "output"), { recursive: true });
@@ -6499,12 +6741,7 @@ async function createTaskCore(input) {
     }
   }
   const complexity = input.complexity ?? "standard";
-  let sessionScope = null;
-  try {
-    const { resolveExeSession: resolveExeSession2 } = await Promise.resolve().then(() => (init_tmux_routing(), tmux_routing_exports));
-    sessionScope = resolveExeSession2();
-  } catch {
-  }
+  const sessionScope = earlySessionScope;
   await client.execute({
     sql: `INSERT INTO tasks (id, title, assigned_to, assigned_by, project_name, priority, status, task_file, blocked_by, parent_task_id, reviewer, context, complexity, budget_tokens, budget_fallback_model, tokens_used, tokens_warned_at, session_scope, created_at, updated_at)
           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
@@ -6531,6 +6768,39 @@ async function createTaskCore(input) {
       now
     ]
   });
+  if (input.baseDir) {
+    try {
+      const EXE_OS_DIR = path12.join(os8.homedir(), ".exe-os");
+      const mdPath = path12.join(EXE_OS_DIR, taskFile);
+      const mdDir = path12.dirname(mdPath);
+      if (!existsSync11(mdDir)) await mkdir4(mdDir, { recursive: true });
+      const reviewer = input.reviewer ?? input.assignedBy;
+      const mdContent = `# ${input.title}
+
+**ID:** ${id}
+**Status:** ${initialStatus}
+**Priority:** ${input.priority}
+**Assigned by:** ${input.assignedBy}
+**Assigned to:** ${input.assignedTo}
+**Project:** ${input.projectName}
+**Created:** ${now.split("T")[0]}${parentTaskId ? `
+**Parent task:** ${parentTaskId}` : ""}
+**Reviewer:** ${reviewer}
+
+## Context
+
+${input.context}
+
+## MANDATORY: When done
+
+You MUST call update_task with status "done" and a result summary when finished.
+If you skip this, your reviewer will not know you're done and your work won't be reviewed.
+Do NOT let a failed commit or any error prevent you from calling update_task(done).
+`;
+      await writeFile4(mdPath, mdContent, "utf-8");
+    } catch {
+    }
+  }
   return {
     id,
     title: input.title,
@@ -6723,7 +6993,7 @@ ${input.result}` : `\u26A0\uFE0F ${warning}`;
           return { row, taskFile, now, taskId };
         }
       }
-      if (curStatus === "in_progress" && input.callerAgentId && (input.callerAgentId === assignedBy || input.callerAgentId === "exe")) {
+      if (curStatus === "in_progress" && input.callerAgentId && (input.callerAgentId === assignedBy || isCoordinatorName(input.callerAgentId))) {
         process.stderr.write(
           `[tasks] Assigner override: ${input.callerAgentId} reclaiming ${taskId}
 `
@@ -6835,12 +7105,22 @@ async function ensureGitignoreExe(baseDir) {
   } catch {
   }
 }
-var DELEGATION_KEYWORDS, TASK_ALREADY_CLAIMED_PREFIX;
+var LANE_KEYWORDS, KEYWORD_INDEX, DELEGATION_KEYWORDS, TASK_ALREADY_CLAIMED_PREFIX;
 var init_tasks_crud = __esm({
   "src/lib/tasks-crud.ts"() {
     "use strict";
     init_database();
     init_task_scope();
+    init_employees();
+    LANE_KEYWORDS = {
+      CMO: ["sales", "script", "pitch", "offer", "copy", "objection", "brand", "content", "seo", "marketing", "newsletter", "carousel", "social", "campaign"],
+      CTO: ["spec", "architecture", "migration", "schema", "database", "design doc", "adr", "security audit", "tech stack"],
+      "Principal Engineer": ["implement", "build", "fix", "commit", "refactor", "bug", "feature", "wire", "integration"],
+      "Staff Code Reviewer": ["critique", "verdict", "review", "audit", "code quality"],
+      "Content Production Specialist": ["render", "video", "image", "b-roll", "remotion", "animation", "thumbnail"],
+      "AI Product Lead": ["competitive", "analysis", "benchmark", "compare", "scout", "evaluate", "poc"]
+    };
+    KEYWORD_INDEX = buildKeywordIndex();
     DELEGATION_KEYWORDS = /parallel|delegate|wave|worktree|multi-instance/i;
     TASK_ALREADY_CLAIMED_PREFIX = "TASK_ALREADY_CLAIMED";
   }
@@ -6870,7 +7150,7 @@ async function countNewPendingReviewsSince(sinceIso, sessionScope) {
     const result2 = await client.execute({
       sql: `SELECT COUNT(*) as cnt FROM tasks
             WHERE status = 'needs_review' AND updated_at > ?
-              AND (session_scope = ? OR session_scope IS NULL)`,
+              AND session_scope = ?`,
       args: [sinceIso, sessionScope]
     });
     return Number(result2.rows[0]?.cnt) || 0;
@@ -6888,7 +7168,7 @@ async function listPendingReviews(limit, sessionScope) {
     const result2 = await client.execute({
       sql: `SELECT title, assigned_to, project_name FROM tasks
             WHERE status = 'needs_review'
-              AND (session_scope = ? OR session_scope IS NULL)
+              AND session_scope = ?
             ORDER BY priority ASC, created_at DESC LIMIT ?`,
       args: [sessionScope, limit]
     });
@@ -7009,14 +7289,14 @@ async function cleanupReviewFile(row, taskFile, _baseDir) {
       if (parts.length >= 3 && parts[0] === "review") {
         const agent = parts[1];
         const slug = parts.slice(2).join("-");
-        const originalTaskFile = `exe/${agent}/${slug}.md`;
+        const legacyTaskFile = `exe/${agent}/${slug}.md`;
         const result = await client.execute({
-          sql: "UPDATE tasks SET status = 'done', updated_at = ? WHERE task_file = ? AND status = 'needs_review'",
-          args: [now, originalTaskFile]
+          sql: "UPDATE tasks SET status = 'done', updated_at = ? WHERE (task_file = ? OR task_file LIKE ?) AND status = 'needs_review'",
+          args: [now, legacyTaskFile, `tasks/%/${agent}/${slug}.md`]
         });
         if (result.rowsAffected > 0) {
           process.stderr.write(
-            `[review-cleanup] Cascaded original task to done (legacy path): ${originalTaskFile}
+            `[review-cleanup] Cascaded original task to done: ${agent}/${slug}.md
 `
           );
         }
@@ -7198,7 +7478,7 @@ function findSessionForProject(projectName) {
   const sessions = listSessions();
   for (const s of sessions) {
     const proj = s.projectDir.split("/").filter(Boolean).pop();
-    if (proj === projectName && (s.agentId === "exe" || isCoordinatorName(s.agentId))) return s;
+    if (proj === projectName && isCoordinatorName(s.agentId)) return s;
   }
   return null;
 }
@@ -7244,7 +7524,7 @@ var init_session_scope = __esm({
 
 // src/lib/tasks-notify.ts
 async function dispatchTaskToEmployee(input) {
-  if (input.assignedTo === "exe" || isCoordinatorName(input.assignedTo)) return { dispatched: "skipped" };
+  if (isCoordinatorName(input.assignedTo)) return { dispatched: "skipped" };
   let crossProject = false;
   if (input.projectName) {
     try {
@@ -7723,7 +8003,7 @@ async function updateTask(input) {
   }
   const isTerminal = input.status === "done" || input.status === "needs_review";
   if (isTerminal) {
-    const isCoordinator = String(row.assigned_to) === "exe" || isCoordinatorName(String(row.assigned_to));
+    const isCoordinator = isCoordinatorName(String(row.assigned_to));
     if (!isCoordinator) {
       notifyTaskDone();
     }
@@ -7748,7 +8028,7 @@ async function updateTask(input) {
       }
     }
   }
-  if (input.status === "done" && String(row.assigned_to) !== "exe" && !isCoordinatorName(String(row.assigned_to)) && !process.env.VITEST) {
+  if (input.status === "done" && !isCoordinatorName(String(row.assigned_to)) && !process.env.VITEST) {
     Promise.resolve().then(() => (init_skill_learning(), skill_learning_exports)).then(
       ({ captureAndLearn: captureAndLearn2 }) => captureAndLearn2({
         taskId,
@@ -7764,7 +8044,7 @@ async function updateTask(input) {
     });
   }
   let nextTask;
-  if (isTerminal && String(row.assigned_to) !== "exe" && !isCoordinatorName(String(row.assigned_to))) {
+  if (isTerminal && !isCoordinatorName(String(row.assigned_to))) {
     try {
       nextTask = await findNextTask(String(row.assigned_to));
     } catch {
@@ -8132,7 +8412,7 @@ __export(tmux_routing_exports, {
 import { execFileSync as execFileSync2, execSync as execSync6 } from "child_process";
 import { readFileSync as readFileSync11, writeFileSync as writeFileSync6, mkdirSync as mkdirSync7, existsSync as existsSync13, appendFileSync } from "fs";
 import path17 from "path";
-import os8 from "os";
+import os9 from "os";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { unlinkSync as unlinkSync6 } from "fs";
 function spawnLockPath(sessionName) {
@@ -8456,7 +8736,7 @@ function notifyParentExe(sessionKey) {
   return true;
 }
 function ensureEmployee(employeeName, exeSession, projectDir, opts) {
-  if (employeeName === "exe" || isCoordinatorName(employeeName)) {
+  if (isCoordinatorName(employeeName)) {
     return { status: "failed", sessionName: "", error: "The COO is not a dispatchable employee" };
   }
   try {
@@ -8528,7 +8808,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
   const transport = getTransport();
   const sessionName = employeeSessionName(employeeName, exeSession, opts?.instance);
   const instanceLabel = opts?.instance != null && opts.instance > 0 ? `${employeeName}${opts.instance}` : employeeName;
-  const logDir = path17.join(os8.homedir(), ".exe-os", "session-logs");
+  const logDir = path17.join(os9.homedir(), ".exe-os", "session-logs");
   const logFile = path17.join(logDir, `${instanceLabel}-${Date.now()}.log`);
   if (!existsSync13(logDir)) {
     mkdirSync7(logDir, { recursive: true });
@@ -8544,7 +8824,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
   } catch {
   }
   try {
-    const claudeJsonPath = path17.join(os8.homedir(), ".claude.json");
+    const claudeJsonPath = path17.join(os9.homedir(), ".claude.json");
     let claudeJson = {};
     try {
       claudeJson = JSON.parse(readFileSync11(claudeJsonPath, "utf8"));
@@ -8559,7 +8839,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
   } catch {
   }
   try {
-    const settingsDir = path17.join(os8.homedir(), ".claude", "projects");
+    const settingsDir = path17.join(os9.homedir(), ".claude", "projects");
     const normalizedKey = (opts?.cwd ?? projectDir).replace(/\//g, "-").replace(/^-/, "");
     const projSettingsDir = path17.join(settingsDir, normalizedKey);
     const settingsPath = path17.join(projSettingsDir, "settings.json");
@@ -8607,7 +8887,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
   let legacyFallbackWarned = false;
   if (!useExeAgent && !useBinSymlink) {
     const identityPath = path17.join(
-      os8.homedir(),
+      os9.homedir(),
       ".exe-os",
       "identity",
       `${employeeName}.md`
@@ -8637,7 +8917,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
   }
   let sessionContextFlag = "";
   try {
-    const ctxDir = path17.join(os8.homedir(), ".exe-os", "session-cache");
+    const ctxDir = path17.join(os9.homedir(), ".exe-os", "session-cache");
     mkdirSync7(ctxDir, { recursive: true });
     const ctxFile = path17.join(ctxDir, `session-context-${sessionName}.md`);
     const ctxContent = [
@@ -8749,13 +9029,13 @@ var init_tmux_routing = __esm({
     init_intercom_queue();
     init_plan_limits();
     init_employees();
-    SPAWN_LOCK_DIR = path17.join(os8.homedir(), ".exe-os", "spawn-locks");
-    SESSION_CACHE = path17.join(os8.homedir(), ".exe-os", "session-cache");
+    SPAWN_LOCK_DIR = path17.join(os9.homedir(), ".exe-os", "spawn-locks");
+    SESSION_CACHE = path17.join(os9.homedir(), ".exe-os", "session-cache");
     BEHAVIORS_EXPORT_TIMEOUT_MS = 1e4;
     VALID_SESSION_NAME = /^[a-z]+\d*-[a-zA-Z0-9_]+$/;
     VERIFY_PANE_LINES = 200;
     INTERCOM_DEBOUNCE_MS = 3e4;
-    INTERCOM_LOG2 = path17.join(os8.homedir(), ".exe-os", "intercom.log");
+    INTERCOM_LOG2 = path17.join(os9.homedir(), ".exe-os", "intercom.log");
     DEBOUNCE_FILE = path17.join(SESSION_CACHE, "intercom-debounce.json");
     DEBOUNCE_CLEANUP_AGE_MS = 5 * 60 * 1e3;
     BUSY_PATTERN = /[✻✽✶✳·].*…|Running…/;
@@ -9017,7 +9297,7 @@ var init_messaging = __esm({
 import { readFileSync as readFileSync12, writeFileSync as writeFileSync7, existsSync as existsSync14, mkdirSync as mkdirSync8 } from "fs";
 import { randomUUID as randomUUID8 } from "crypto";
 import path18 from "path";
-import os9 from "os";
+import os10 from "os";
 function substituteTemplate(template, record) {
   return template.replace(
     /\{\{(\w+(?:\.\w+)*)\}\}/g,
@@ -9312,7 +9592,7 @@ var TRIGGERS_PATH, GRAPH_API_VERSION;
 var init_trigger_engine = __esm({
   "src/automation/trigger-engine.ts"() {
     "use strict";
-    TRIGGERS_PATH = path18.join(os9.homedir(), ".exe-os", "triggers.json");
+    TRIGGERS_PATH = path18.join(os10.homedir(), ".exe-os", "triggers.json");
     GRAPH_API_VERSION = "v21.0";
   }
 });
@@ -9377,13 +9657,13 @@ var init_crm_webhook = __esm({
 // src/bin/exe-gateway.ts
 import { existsSync as existsSync15, readFileSync as readFileSync13 } from "fs";
 import path19 from "path";
-import os10 from "os";
+import os11 from "os";
 
 // src/gateway/webhook-server.ts
 import {
   createServer
 } from "http";
-var DEFAULT_HOST = "127.0.0.1";
+var DEFAULT_HOST = process.env.EXE_WEBHOOK_HOST || "127.0.0.1";
 var BODY_SIZE_LIMIT = 1048576;
 var WebhookServer = class {
   constructor(config2) {
@@ -10069,10 +10349,49 @@ function buildPermissionContext(platform, permissions) {
   return `[${platform.toUpperCase()} \u2014 allowed: ${parts.join(", ")}]`;
 }
 
+// src/gateway/bot-errors.ts
+var FatalBotError = class extends Error {
+  constructor(message, cause) {
+    super(message);
+    this.cause = cause;
+    this.name = "FatalBotError";
+  }
+  fatal = true;
+};
+var RecoverableBotError = class extends Error {
+  constructor(message, toolName, cause) {
+    super(message);
+    this.toolName = toolName;
+    this.cause = cause;
+    this.name = "RecoverableBotError";
+  }
+  recoverable = true;
+};
+var MaxStepsError = class extends Error {
+  constructor(stepsTaken, maxSteps) {
+    super(
+      `Reached maximum steps (${stepsTaken}/${maxSteps}). Returning partial result.`
+    );
+    this.stepsTaken = stepsTaken;
+    this.maxSteps = maxSteps;
+    this.name = "MaxStepsError";
+  }
+};
+function classifyError(err, toolName) {
+  if (err instanceof FatalBotError) return err;
+  if (err instanceof RecoverableBotError) return err;
+  const message = err instanceof Error ? err.message : String(err);
+  if (message.includes("401") || message.includes("403") || message.includes("authentication") || message.includes("rate_limit")) {
+    return new FatalBotError(message, err);
+  }
+  return new RecoverableBotError(message, toolName, err);
+}
+
 // src/gateway/bot-runtime.ts
 var DEFAULT_MODEL = "claude-sonnet-4-20250514";
 var MAX_TURNS = 10;
 var MAX_HISTORY = 50;
+var DEFAULT_PLANNING_INTERVAL = 3;
 function filterToolsForPermissions(tools, permissions) {
   const allAllowed = /* @__PURE__ */ new Set();
   if (permissions.canRead) {
@@ -10101,7 +10420,7 @@ var BotRuntime = class {
   async processMessage(msg, permissions) {
     const sessionKey = msg.chatType === "group" ? msg.channelId : msg.senderId;
     const history = this.getHistory(sessionKey);
-    history.push({ role: "user", content: msg.text });
+    history.push({ role: "user", content: msg.text, frameType: "task" });
     const systemPrompt = this.config.systemPrompt + "\n\n" + buildPermissionContext(msg.platform, permissions);
     const allowedTools = filterToolsForPermissions(
       this.config.tools,
@@ -10109,29 +10428,54 @@ var BotRuntime = class {
     );
     const model = this.config.model ?? DEFAULT_MODEL;
     const maxTurns = this.config.maxTurns ?? MAX_TURNS;
+    const planningInterval = this.config.planningInterval ?? DEFAULT_PLANNING_INTERVAL;
     let turns = 0;
     while (turns < maxTurns) {
       turns++;
-      const response = await this.client.messages.create({
-        model,
-        max_tokens: 4096,
-        system: systemPrompt,
-        messages: history.map((m) => ({
-          role: m.role,
-          content: m.content
-        })),
-        tools: allowedTools.map((t) => ({
-          name: t.name,
-          description: t.description,
-          input_schema: t.input_schema
-        }))
-      });
+      if (planningInterval > 0 && turns > 1 && turns % planningInterval === 1 && maxTurns - turns >= 2) {
+        history.push({
+          role: "user",
+          content: "[Planning checkpoint] Review what you know so far. What facts have you gathered? What is your plan for the remaining steps? Be concise.",
+          frameType: "planning"
+        });
+      }
+      let response;
+      try {
+        response = await this.client.messages.create({
+          model,
+          max_tokens: 4096,
+          system: systemPrompt,
+          messages: history.map((m) => ({
+            role: m.role,
+            content: m.content
+          })),
+          tools: allowedTools.map((t) => ({
+            name: t.name,
+            description: t.description,
+            input_schema: t.input_schema
+          }))
+        });
+      } catch (err) {
+        const classified = classifyError(err);
+        if (classified instanceof FatalBotError) {
+          const errorMsg = `Bot error: ${classified.message}`;
+          history.push({ role: "assistant", content: errorMsg, frameType: "error" });
+          this.trimHistory(sessionKey);
+          return errorMsg;
+        }
+        history.push({
+          role: "assistant",
+          content: `[API error \u2014 retrying] ${classified.message}`,
+          frameType: "error"
+        });
+        continue;
+      }
       const toolUseBlocks = response.content.filter(
         (b) => b.type === "tool_use"
       );
       if (toolUseBlocks.length === 0) {
         const textContent = response.content.filter((b) => b.type === "text").map((b) => b.text).join("\n");
-        history.push({ role: "assistant", content: textContent });
+        history.push({ role: "assistant", content: textContent, frameType: "assistant" });
         this.trimHistory(sessionKey);
         return textContent;
       }
@@ -10141,9 +10485,11 @@ var BotRuntime = class {
       );
       history.push({
         role: "assistant",
-        content: response.content
+        content: response.content,
+        frameType: "assistant"
       });
       const toolResults = [];
+      let hadFatalError = false;
       for (const block of allowed) {
         try {
           const result = await this.config.toolExecutor(
@@ -10156,12 +10502,23 @@ var BotRuntime = class {
             content: result
           });
         } catch (err) {
-          toolResults.push({
-            type: "tool_result",
-            tool_use_id: block.id,
-            content: `Error: ${err instanceof Error ? err.message : String(err)}`,
-            is_error: true
-          });
+          const classified = classifyError(err, block.name);
+          if (classified instanceof FatalBotError) {
+            toolResults.push({
+              type: "tool_result",
+              tool_use_id: block.id,
+              content: `Fatal error: ${classified.message}`,
+              is_error: true
+            });
+            hadFatalError = true;
+          } else {
+            toolResults.push({
+              type: "tool_result",
+              tool_use_id: block.id,
+              content: `Error (recoverable): ${classified.message}`,
+              is_error: true
+            });
+          }
         }
       }
       for (const { block, check } of blocked) {
@@ -10174,10 +10531,22 @@ var BotRuntime = class {
       }
       history.push({
         role: "user",
-        content: toolResults
+        content: toolResults,
+        frameType: hadFatalError ? "error" : "tool_result"
       });
+      if (hadFatalError) {
+        this.trimHistory(sessionKey);
+        return `A fatal error occurred during tool execution. The bot loop has been stopped.`;
+      }
     }
-    return "I reached the maximum number of tool calls for this request. Please try again with a more specific question.";
+    const maxErr = new MaxStepsError(turns, maxTurns);
+    history.push({
+      role: "assistant",
+      content: maxErr.message,
+      frameType: "error"
+    });
+    this.trimHistory(sessionKey);
+    return maxErr.message;
   }
   getHistory(sessionKey) {
     if (!this.conversations.has(sessionKey)) {
@@ -10187,9 +10556,19 @@ var BotRuntime = class {
   }
   trimHistory(sessionKey) {
     const history = this.conversations.get(sessionKey);
-    if (history && history.length > MAX_HISTORY) {
-      this.conversations.set(sessionKey, history.slice(-MAX_HISTORY));
+    if (!history || history.length <= MAX_HISTORY) return;
+    const firstTaskIdx = history.findIndex((m) => m.frameType === "task");
+    let trimmed = history.filter(
+      (m, i) => m.frameType !== "planning" || i >= history.length - MAX_HISTORY
+    );
+    if (trimmed.length > MAX_HISTORY) {
+      const tail = trimmed.slice(-MAX_HISTORY);
+      if (firstTaskIdx >= 0 && !tail.includes(history[firstTaskIdx])) {
+        tail[0] = history[firstTaskIdx];
+      }
+      trimmed = tail;
     }
+    this.conversations.set(sessionKey, trimmed);
   }
   /** Clear conversation history for a session */
   clearHistory(sessionKey) {
@@ -10244,7 +10623,7 @@ var BotRegistry = class {
 
 // src/bin/exe-gateway.ts
 init_employees();
-var CONFIG_DIR = path19.join(os10.homedir(), ".exe-os");
+var CONFIG_DIR = path19.join(os11.homedir(), ".exe-os");
 var CONFIG_PATH3 = path19.join(CONFIG_DIR, "gateway.json");
 var DEFAULT_PORT = 3100;
 function loadConfig2() {