@askexenow/exe-os 0.8.0 → 0.8.1

package/dist/gateway/index.js

@@ -488,6 +488,27 @@ async function ensureSchema() {
     });
   } catch {
   }
+  try {
+    await client.execute({
+      sql: `ALTER TABLE tasks ADD COLUMN checkpoint TEXT`,
+      args: []
+    });
+  } catch {
+  }
+  try {
+    await client.execute({
+      sql: `ALTER TABLE tasks ADD COLUMN checkpoint_count INTEGER NOT NULL DEFAULT 0`,
+      args: []
+    });
+  } catch {
+  }
+  try {
+    await client.execute({
+      sql: `ALTER TABLE tasks ADD COLUMN complexity TEXT NOT NULL DEFAULT 'standard'`,
+      args: []
+    });
+  } catch {
+  }
   try {
     await client.execute({
       sql: `ALTER TABLE memories ADD COLUMN task_id TEXT`,
@@ -898,6 +919,15 @@ async function ensureSchema() {
     } catch {
     }
   }
+  for (const col of [
+    "ALTER TABLE memories ADD COLUMN source_path TEXT",
+    "ALTER TABLE memories ADD COLUMN source_type TEXT DEFAULT 'text'"
+  ]) {
+    try {
+      await client.execute(col);
+    } catch {
+    }
+  }
   await client.executeMultiple(`
     CREATE INDEX IF NOT EXISTS idx_memories_workspace
       ON memories(workspace_id);
@@ -962,6 +992,34 @@ async function ensureSchema() {
     CREATE INDEX IF NOT EXISTS idx_conversations_channel
       ON conversations(channel_id);
   `);
+  try {
+    await client.execute({
+      sql: `ALTER TABLE tasks ADD COLUMN budget_tokens INTEGER`,
+      args: []
+    });
+  } catch {
+  }
+  try {
+    await client.execute({
+      sql: `ALTER TABLE tasks ADD COLUMN budget_fallback_model TEXT`,
+      args: []
+    });
+  } catch {
+  }
+  try {
+    await client.execute({
+      sql: `ALTER TABLE tasks ADD COLUMN tokens_used INTEGER DEFAULT 0`,
+      args: []
+    });
+  } catch {
+  }
+  try {
+    await client.execute({
+      sql: `ALTER TABLE tasks ADD COLUMN tokens_warned_at INTEGER`,
+      args: []
+    });
+  } catch {
+  }
   await client.executeMultiple(`
     CREATE VIRTUAL TABLE IF NOT EXISTS conversations_fts USING fts5(
       content_text,
@@ -988,6 +1046,52 @@ async function ensureSchema() {
       VALUES (new.rowid, new.content_text, new.sender_name, new.agent_response);
     END;
   `);
+  try {
+    await client.execute({
+      sql: `ALTER TABLE memories ADD COLUMN tier INTEGER DEFAULT 3`,
+      args: []
+    });
+  } catch {
+  }
+  try {
+    await client.execute(
+      `CREATE INDEX IF NOT EXISTS idx_memories_tier ON memories(tier)`
+    );
+  } catch {
+  }
+  try {
+    await client.execute({
+      sql: `UPDATE memories SET tier = 1 WHERE tool_name = 'commit_to_long_term_memory' AND importance >= 8 AND tier = 3`,
+      args: []
+    });
+    await client.execute({
+      sql: `UPDATE memories SET tier = 2 WHERE tool_name IN ('store_memory', 'manual') AND importance >= 5 AND tier = 3`,
+      args: []
+    });
+  } catch {
+  }
+  try {
+    await client.execute({
+      sql: `ALTER TABLE memories ADD COLUMN supersedes_id TEXT`,
+      args: []
+    });
+  } catch {
+  }
+  try {
+    await client.execute(
+      `CREATE INDEX IF NOT EXISTS idx_memories_supersedes ON memories(supersedes_id) WHERE supersedes_id IS NOT NULL`
+    );
+  } catch {
+  }
+  for (const col of [
+    "ALTER TABLE tasks ADD COLUMN checkpoint TEXT",
+    "ALTER TABLE tasks ADD COLUMN checkpoint_count INTEGER DEFAULT 0"
+  ]) {
+    try {
+      await client.execute(col);
+    } catch {
+    }
+  }
 }
 async function disposeDatabase() {
   if (_client) {
@@ -1095,6 +1199,11 @@ function normalizeSessionLifecycle(raw) {
   const userSL = raw.sessionLifecycle ?? {};
   raw.sessionLifecycle = { ...defaultSL, ...userSL };
 }
+function normalizeAutoUpdate(raw) {
+  const defaultAU = DEFAULT_CONFIG.autoUpdate;
+  const userAU = raw.autoUpdate ?? {};
+  raw.autoUpdate = { ...defaultAU, ...userAU };
+}
 async function loadConfig() {
   const dir = process.env.EXE_OS_DIR ?? process.env.EXE_MEM_DIR ?? EXE_AI_DIR;
   await mkdir(dir, { recursive: true });
@@ -1117,6 +1226,7 @@ async function loadConfig() {
     }
     normalizeScalingRoadmap(migratedCfg);
     normalizeSessionLifecycle(migratedCfg);
+    normalizeAutoUpdate(migratedCfg);
     const config2 = { ...DEFAULT_CONFIG, dbPath: path.join(dir, "memories.db"), ...migratedCfg };
     if (config2.dbPath.startsWith("~")) {
       config2.dbPath = config2.dbPath.replace(/^~/, os.homedir());
@@ -1139,6 +1249,7 @@ function loadConfigSync() {
     const { config: migratedCfg } = migrateConfig(parsed);
     normalizeScalingRoadmap(migratedCfg);
     normalizeSessionLifecycle(migratedCfg);
+    normalizeAutoUpdate(migratedCfg);
     return { ...DEFAULT_CONFIG, dbPath: path.join(dir, "memories.db"), ...migratedCfg };
   } catch {
     return { ...DEFAULT_CONFIG, dbPath: path.join(dir, "memories.db") };
@@ -1158,6 +1269,7 @@ async function loadConfigFrom(configPath) {
     const { config: migratedCfg } = migrateConfig(parsed);
     normalizeScalingRoadmap(migratedCfg);
     normalizeSessionLifecycle(migratedCfg);
+    normalizeAutoUpdate(migratedCfg);
     return { ...DEFAULT_CONFIG, ...migratedCfg };
   } catch {
     return { ...DEFAULT_CONFIG };
@@ -1229,6 +1341,11 @@ var init_config = __esm({
         idleKillTicksRequired: 3,
         idleKillIntercomAckWindowMs: 1e4,
         maxAutoInstances: 10
+      },
+      autoUpdate: {
+        checkOnBoot: true,
+        autoInstall: false,
+        checkIntervalMs: 24 * 60 * 60 * 1e3
       }
     };
     CONFIG_MIGRATIONS = [
@@ -1815,13 +1932,27 @@ async function ensureShardSchema(client) {
     "ALTER TABLE memories ADD COLUMN document_id TEXT",
     "ALTER TABLE memories ADD COLUMN user_id TEXT",
     "ALTER TABLE memories ADD COLUMN char_offset INTEGER",
-    "ALTER TABLE memories ADD COLUMN page_number INTEGER"
+    "ALTER TABLE memories ADD COLUMN page_number INTEGER",
+    // Source provenance columns (must match database.ts)
+    "ALTER TABLE memories ADD COLUMN source_path TEXT",
+    "ALTER TABLE memories ADD COLUMN source_type TEXT DEFAULT 'text'",
+    "ALTER TABLE memories ADD COLUMN tier INTEGER DEFAULT 3",
+    "ALTER TABLE memories ADD COLUMN supersedes_id TEXT"
   ]) {
     try {
       await client.execute(col);
     } catch {
     }
   }
+  for (const idx of [
+    "CREATE INDEX IF NOT EXISTS idx_memories_tier ON memories(tier)",
+    "CREATE INDEX IF NOT EXISTS idx_memories_supersedes ON memories(supersedes_id) WHERE supersedes_id IS NOT NULL"
+  ]) {
+    try {
+      await client.execute(idx);
+    } catch {
+    }
+  }
   try {
     await client.execute("CREATE INDEX IF NOT EXISTS idx_memories_status ON memories(status)");
   } catch {
@@ -1930,8 +2061,11 @@ var store_exports = {};
 __export(store_exports, {
   attachDocumentMetadata: () => attachDocumentMetadata,
   buildWikiScopeFilter: () => buildWikiScopeFilter,
+  classifyTier: () => classifyTier,
   disposeStore: () => disposeStore,
   flushBatch: () => flushBatch,
+  flushTier3: () => flushTier3,
+  getMemoryCardinality: () => getMemoryCardinality,
   initStore: () => initStore,
   reserveVersions: () => reserveVersions,
   searchMemories: () => searchMemories,
@@ -1977,6 +2111,11 @@ async function initStore(options) {
   const vResult = await client.execute("SELECT MAX(version) as max_v FROM memories");
   _nextVersion = (Number(vResult.rows[0]?.max_v) || 0) + 1;
 }
+function classifyTier(record) {
+  if (record.tool_name === "commit_to_long_term_memory" && (record.importance ?? 0) >= 8) return 1;
+  if (["store_memory", "manual"].includes(record.tool_name ?? "") && (record.importance ?? 0) >= 5) return 2;
+  return 3;
+}
 async function writeMemory(record) {
   if (record.vector !== null && record.vector.length !== EMBEDDING_DIM) {
     throw new Error(
@@ -2004,7 +2143,11 @@ async function writeMemory(record) {
     document_id: record.document_id ?? null,
     user_id: record.user_id ?? null,
     char_offset: record.char_offset ?? null,
-    page_number: record.page_number ?? null
+    page_number: record.page_number ?? null,
+    source_path: record.source_path ?? null,
+    source_type: record.source_type ?? null,
+    tier: record.tier ?? classifyTier(record),
+    supersedes_id: record.supersedes_id ?? null
   };
   _pendingRecords.push(dbRow);
   if (_flushTimer === null) {
@@ -2036,20 +2179,26 @@ async function flushBatch() {
       const userId = row.user_id ?? null;
       const charOffset = row.char_offset ?? null;
       const pageNumber = row.page_number ?? null;
+      const sourcePath = row.source_path ?? null;
+      const sourceType = row.source_type ?? null;
+      const tier = row.tier ?? 3;
+      const supersedesId = row.supersedes_id ?? null;
       return {
         sql: hasVector ? `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)
-              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, vector32(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` : `INSERT OR IGNORE INTO memories
+               workspace_id, document_id, user_id, char_offset, page_number,
+               source_path, source_type, tier, supersedes_id)
+              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)
-              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+               workspace_id, document_id, user_id, char_offset, page_number,
+               source_path, source_type, tier, supersedes_id)
+              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
         args: hasVector ? [
           row.id,
           row.agent_id,
@@ -2071,7 +2220,11 @@ async function flushBatch() {
           documentId,
           userId,
           charOffset,
-          pageNumber
+          pageNumber,
+          sourcePath,
+          sourceType,
+          tier,
+          supersedesId
         ] : [
           row.id,
           row.agent_id,
@@ -2092,7 +2245,11 @@ async function flushBatch() {
           documentId,
           userId,
           charOffset,
-          pageNumber
+          pageNumber,
+          sourcePath,
+          sourceType,
+          tier,
+          supersedesId
         ]
       };
     };
@@ -2166,7 +2323,8 @@ async function searchMemories(queryVector, agentId, options) {
                     has_error, raw_text, vector, importance, status,
                     confidence, last_accessed,
                     workspace_id, document_id, user_id,
-                    char_offset, page_number
+                    char_offset, page_number,
+                    source_path, source_type
              FROM memories
              WHERE agent_id = ?
                AND vector IS NOT NULL${statusFilter}
@@ -2215,7 +2373,9 @@ async function searchMemories(queryVector, agentId, options) {
     document_id: row.document_id ?? null,
     user_id: row.user_id ?? null,
     char_offset: row.char_offset ?? null,
-    page_number: row.page_number ?? null
+    page_number: row.page_number ?? null,
+    source_path: row.source_path ?? null,
+    source_type: row.source_type ?? null
   }));
 }
 async function attachDocumentMetadata(records) {
@@ -2253,6 +2413,25 @@ async function attachDocumentMetadata(records) {
   }
   return records;
 }
+async function flushTier3(agentId, options) {
+  const client = getClient();
+  const maxAge = options?.maxAgeHours ?? 72;
+  const cutoff = new Date(Date.now() - maxAge * 36e5).toISOString();
+  if (options?.dryRun) {
+    const result2 = await client.execute({
+      sql: `SELECT COUNT(*) as cnt FROM memories
+            WHERE agent_id = ? AND tier = 3 AND status = 'active' AND timestamp < ?`,
+      args: [agentId, cutoff]
+    });
+    return { archived: Number(result2.rows[0]?.cnt ?? 0) };
+  }
+  const result = await client.execute({
+    sql: `UPDATE memories SET status = 'archived'
+          WHERE agent_id = ? AND tier = 3 AND status = 'active' AND timestamp < ?`,
+    args: [agentId, cutoff]
+  });
+  return { archived: result.rowsAffected };
+}
 async function disposeStore() {
   if (_flushTimer !== null) {
     clearInterval(_flushTimer);
@@ -2283,6 +2462,18 @@ function reserveVersions(count) {
   }
   return reserved;
 }
+async function getMemoryCardinality(agentId) {
+  try {
+    const client = getClient();
+    const result = await client.execute({
+      sql: `SELECT COUNT(*) as cnt FROM memories WHERE agent_id = ? AND COALESCE(status, 'active') = 'active'`,
+      args: [agentId]
+    });
+    return Number(result.rows[0]?.cnt) || 0;
+  } catch {
+    return 0;
+  }
+}
 var _pendingRecords, _batchSize, _flushIntervalMs, _flushTimer, _flushing, _nextVersion;
 var init_store = __esm({
   "src/lib/store.ts"() {
@@ -2766,11 +2957,12 @@ function queueIntercom(targetSession, reason) {
   }
   writeQueue(queue);
 }
-var QUEUE_PATH, INTERCOM_LOG;
+var QUEUE_PATH, TTL_MS, INTERCOM_LOG;
 var init_intercom_queue = __esm({
   "src/lib/intercom-queue.ts"() {
     "use strict";
     QUEUE_PATH = path7.join(os3.homedir(), ".exe-os", "intercom-queue.json");
+    TTL_MS = 60 * 60 * 1e3;
     INTERCOM_LOG = path7.join(os3.homedir(), ".exe-os", "intercom.log");
   }
 });
@@ -2907,6 +3099,17 @@ function getGitRoot(dir) {
     return null;
   }
 }
+function getMainRepoRoot(dir) {
+  try {
+    const commonDir = execSync4(
+      "git rev-parse --path-format=absolute --git-common-dir",
+      { cwd: dir, encoding: "utf-8", timeout: GIT_TIMEOUT_MS, stdio: ["pipe", "pipe", "pipe"] }
+    ).trim();
+    return realpath(path11.dirname(commonDir));
+  } catch {
+    return null;
+  }
+}
 function worktreePath(repoRoot, employeeName, instance) {
   const label = instanceLabel(employeeName, instance);
   return path11.join(repoRoot, ".worktrees", label);
@@ -3143,6 +3346,11 @@ function getSessionState(sessionName) {
   if (!transport.isAlive(sessionName)) return "offline";
   try {
     const pane = transport.capturePane(sessionName, 5);
+    if (!pane.includes("\u276F") && !pane.includes("Claude Code") && !BUSY_PATTERN.test(pane) && !/Running…/.test(pane)) {
+      if (/\$\s*$/.test(pane) || /% $/.test(pane.trimEnd())) {
+        return "no_claude";
+      }
+    }
     if (/Running…/.test(pane)) return "tool";
     if (BUSY_PATTERN.test(pane)) return "thinking";
     return "idle";
@@ -3150,10 +3358,6 @@ function getSessionState(sessionName) {
     return "offline";
   }
 }
-function isSessionBusy(sessionName) {
-  const state = getSessionState(sessionName);
-  return state === "thinking" || state === "tool";
-}
 function isExeSession(sessionName) {
   return /^exe\d*$/.test(sessionName);
 }
@@ -3173,7 +3377,14 @@ function sendIntercom(targetSession) {
       logIntercom(`SKIP \u2192 ${targetSession} (session not found)`);
       return "failed";
     }
-    if (isSessionBusy(targetSession)) {
+    const sessionState = getSessionState(targetSession);
+    if (sessionState === "no_claude") {
+      queueIntercom(targetSession, "claude not running in session");
+      recordDebounce(targetSession);
+      logIntercom(`QUEUED \u2192 ${targetSession} (no claude process \u2014 raw shell detected)`);
+      return "queued";
+    }
+    if (sessionState === "thinking" || sessionState === "tool") {
       queueIntercom(targetSession, "session busy at send time");
       recordDebounce(targetSession);
       logIntercom(`QUEUED \u2192 ${targetSession} (session busy, will retry from queue)`);
@@ -3185,18 +3396,7 @@ function sendIntercom(targetSession) {
     }
     transport.sendKeys(targetSession, "/exe-intercom");
     recordDebounce(targetSession);
-    for (let i = 0; i < INTERCOM_POLL_MAX_ATTEMPTS; i++) {
-      try {
-        execSync5(`sleep ${INTERCOM_POLL_INTERVAL_S}`);
-      } catch {
-      }
-      const state = getSessionState(targetSession);
-      if (state === "thinking" || state === "tool") {
-        logIntercom(`ACKNOWLEDGED \u2192 ${targetSession} (state=${state}, poll=${i + 1})`);
-        return "acknowledged";
-      }
-    }
-    logIntercom(`DELIVERED \u2192 ${targetSession} (no state transition after ${INTERCOM_POLL_MAX_ATTEMPTS}s)`);
+    logIntercom(`DELIVERED \u2192 ${targetSession} (fire-and-forget)`);
     return "delivered";
   } catch {
     logIntercom(`FAIL \u2192 ${targetSession}`);
@@ -3213,7 +3413,17 @@ function notifyParentExe(sessionKey) {
   process.stderr.write(`[intercom] notifyParentExe \u2192 ${target}
 `);
   const result = sendIntercom(target);
-  return result !== "failed";
+  if (result === "failed") {
+    const rootExe = resolveExeSession();
+    if (rootExe && rootExe !== target) {
+      process.stderr.write(`[intercom] notifyParentExe: dispatcher ${target} dead, falling back to root exe ${rootExe}
+`);
+      const fallback = sendIntercom(rootExe);
+      return fallback !== "failed";
+    }
+    return false;
+  }
+  return true;
 }
 function ensureEmployee(employeeName, exeSession, projectDir, opts) {
   if (employeeName === "exe") {
@@ -3262,7 +3472,8 @@ function ensureEmployee(employeeName, exeSession, projectDir, opts) {
     return { status: "failed", sessionName, error: "intercom delivery failed" };
   }
   const spawnOpts = { ...opts, instance: effectiveInstance };
-  const wtPath = ensureWorktree(projectDir, employeeName, effectiveInstance);
+  const mainRoot = getMainRepoRoot(projectDir) ?? projectDir;
+  const wtPath = ensureWorktree(mainRoot, employeeName, effectiveInstance);
   if (wtPath) {
     spawnOpts.cwd = wtPath;
   }
@@ -3443,7 +3654,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
   let booted = false;
   for (let i = 0; i < 30; i++) {
     try {
-      execSync5("sleep 1");
+      execSync5("sleep 0.5");
     } catch {
     }
     try {
@@ -3463,7 +3674,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
     }
   }
   if (!booted) {
-    return { sessionName, error: `${useExeAgent ? "exe-agent" : "claude"} did not boot within 30s` };
+    return { sessionName, error: `${useExeAgent ? "exe-agent" : "claude"} did not boot within 15s` };
   }
   if (!useExeAgent) {
     try {
@@ -3481,7 +3692,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
   });
   return { sessionName };
 }
-var SESSION_CACHE, BEHAVIORS_EXPORT_TIMEOUT_MS, INTERCOM_DEBOUNCE_MS, INTERCOM_LOG2, DEBOUNCE_FILE, DEBOUNCE_CLEANUP_AGE_MS, BUSY_PATTERN, INTERCOM_POLL_INTERVAL_S, INTERCOM_POLL_MAX_ATTEMPTS;
+var SESSION_CACHE, BEHAVIORS_EXPORT_TIMEOUT_MS, INTERCOM_DEBOUNCE_MS, INTERCOM_LOG2, DEBOUNCE_FILE, DEBOUNCE_CLEANUP_AGE_MS, BUSY_PATTERN;
 var init_tmux_routing = __esm({
   "src/lib/tmux-routing.ts"() {
     "use strict";
@@ -3501,8 +3712,6 @@ var init_tmux_routing = __esm({
     DEBOUNCE_FILE = path12.join(SESSION_CACHE, "intercom-debounce.json");
     DEBOUNCE_CLEANUP_AGE_MS = 5 * 60 * 1e3;
     BUSY_PATTERN = /[✻✽✶✳·].*…|Running…/;
-    INTERCOM_POLL_INTERVAL_S = 1;
-    INTERCOM_POLL_MAX_ATTEMPTS = 8;
   }
 });
 
@@ -3814,6 +4023,36 @@ import path14 from "path";
 import { execSync as execSync6 } from "child_process";
 import { mkdir as mkdir4, writeFile as writeFile4, appendFile } from "fs/promises";
 import { existsSync as existsSync13, readFileSync as readFileSync11 } from "fs";
+async function writeCheckpoint(input) {
+  const client = getClient();
+  const row = await resolveTask(client, input.taskId);
+  const taskId = String(row.id);
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  const blockedByIds = [];
+  if (row.blocked_by) {
+    blockedByIds.push(String(row.blocked_by));
+  }
+  const checkpoint = {
+    step: input.step,
+    context_summary: input.contextSummary,
+    files_touched: input.filesTouched ?? [],
+    blocked_by_ids: blockedByIds,
+    last_checkpoint_at: now
+  };
+  const result = await client.execute({
+    sql: `UPDATE tasks SET checkpoint = ?, checkpoint_count = checkpoint_count + 1, updated_at = ? WHERE id = ?`,
+    args: [JSON.stringify(checkpoint), now, taskId]
+  });
+  if (result.rowsAffected === 0) {
+    throw new Error(`Checkpoint write failed: task ${taskId} not found`);
+  }
+  const countResult = await client.execute({
+    sql: "SELECT checkpoint_count FROM tasks WHERE id = ?",
+    args: [taskId]
+  });
+  const checkpointCount = Number(countResult.rows[0]?.checkpoint_count ?? 1);
+  return { checkpointCount };
+}
 function extractParentFromContext(contextBody) {
   if (!contextBody) return null;
   const match = contextBody.match(
@@ -3920,9 +4159,10 @@ async function createTaskCore(input) {
     } catch {
     }
   }
+  const complexity = input.complexity ?? "standard";
   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, created_at, updated_at)
-          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+    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, created_at, updated_at)
+          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
     args: [
       id,
       input.title,
@@ -3936,6 +4176,11 @@ async function createTaskCore(input) {
       parentTaskId,
       input.reviewer ?? null,
       input.context,
+      input.budgetTokens ?? null,
+      input.budgetFallbackModel ?? null,
+      0,
+      null,
+      complexity,
       now,
       now
     ]
@@ -3951,7 +4196,11 @@ async function createTaskCore(input) {
     taskFile,
     createdAt: now,
     updatedAt: now,
-    warning
+    warning,
+    budgetTokens: input.budgetTokens ?? null,
+    budgetFallbackModel: input.budgetFallbackModel ?? null,
+    tokensUsed: 0,
+    tokensWarnedAt: null
   };
 }
 async function listTasks(input) {
@@ -3991,7 +4240,12 @@ async function listTasks(input) {
     status: String(r.status),
     taskFile: String(r.task_file),
     createdAt: String(r.created_at),
-    updatedAt: String(r.updated_at)
+    updatedAt: String(r.updated_at),
+    checkpointCount: Number(r.checkpoint_count ?? 0),
+    budgetTokens: r.budget_tokens !== null ? Number(r.budget_tokens) : null,
+    budgetFallbackModel: r.budget_fallback_model !== null ? String(r.budget_fallback_model) : null,
+    tokensUsed: Number(r.tokens_used ?? 0),
+    tokensWarnedAt: r.tokens_warned_at !== null ? Number(r.tokens_warned_at) : null
   }));
 }
 function checkStaleCompletion(taskContext, taskCreatedAt) {
@@ -3999,8 +4253,13 @@ function checkStaleCompletion(taskContext, taskCreatedAt) {
   if (!DELEGATION_KEYWORDS.test(taskContext)) return null;
   try {
     const since = new Date(taskCreatedAt).toISOString();
+    const branch = execSync6(
+      "git rev-parse --abbrev-ref HEAD 2>/dev/null",
+      { encoding: "utf8", timeout: 3e3 }
+    ).trim();
+    const branchArg = branch && branch !== "HEAD" ? branch : "";
     const commitCount = execSync6(
-      `git log --oneline --since="${since}" 2>/dev/null | wc -l`,
+      `git log --oneline --since="${since}" ${branchArg} 2>/dev/null | wc -l`,
       { encoding: "utf8", timeout: 5e3 }
     ).trim();
     const count = parseInt(commitCount, 10);
@@ -4059,6 +4318,14 @@ ${input.result}` : `\u26A0\uFE0F ${warning}`;
       const claimedBy = cur?.assigned_tmux ? ` (claimed by ${cur.assigned_tmux})` : "";
       throw new Error(`${TASK_ALREADY_CLAIMED_PREFIX}: task ${taskId} is ${status}${claimedBy}`);
     }
+    try {
+      await writeCheckpoint({
+        taskId,
+        step: "claimed",
+        contextSummary: `Task claimed by session. Transitioning open \u2192 in_progress.`
+      });
+    } catch {
+    }
     return { row, taskFile, now, taskId };
   }
   if (input.result) {
@@ -4072,6 +4339,14 @@ ${input.result}` : `\u26A0\uFE0F ${warning}`;
       args: [input.status, now, taskId]
     });
   }
+  try {
+    await writeCheckpoint({
+      taskId,
+      step: `status_transition:${input.status}`,
+      contextSummary: input.result ? `Transitioned to ${input.status}. Result: ${input.result.slice(0, 500)}` : `Transitioned to ${input.status}.`
+    });
+  } catch {
+  }
   return { row, taskFile, now, taskId };
 }
 async function deleteTaskCore(taskId, _baseDir) {
@@ -4225,23 +4500,38 @@ async function cleanupReviewFile(row, taskFile, _baseDir) {
   if (String(row.assigned_by) !== "system" || !taskFile.includes("review-")) return;
   try {
     const client = getClient();
-    const fileName = taskFile.split("/").pop() ?? "";
-    const reviewPrefix = fileName.replace(".md", "");
-    const parts = reviewPrefix.split("-");
-    if (parts.length >= 3 && parts[0] === "review") {
-      const agent = parts[1];
-      const slug = parts.slice(2).join("-");
-      const originalTaskFile = `exe/${agent}/${slug}.md`;
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    const parentId = row.parent_task_id ? String(row.parent_task_id) : null;
+    if (parentId) {
       const result = await client.execute({
-        sql: "UPDATE tasks SET status = 'done', updated_at = ? WHERE task_file = ? AND status = 'needs_review'",
-        args: [(/* @__PURE__ */ new Date()).toISOString(), originalTaskFile]
+        sql: "UPDATE tasks SET status = 'done', updated_at = ? WHERE id = ? AND status = 'needs_review'",
+        args: [now, parentId]
       });
       if (result.rowsAffected > 0) {
         process.stderr.write(
-          `[review-cleanup] Cascaded original task to done: ${originalTaskFile}
+          `[review-cleanup] Cascaded original task to done via parent_task_id: ${parentId}
 `
         );
       }
+    } else {
+      const fileName = taskFile.split("/").pop() ?? "";
+      const reviewPrefix = fileName.replace(".md", "");
+      const parts = reviewPrefix.split("-");
+      if (parts.length >= 3 && parts[0] === "review") {
+        const agent = parts[1];
+        const slug = parts.slice(2).join("-");
+        const originalTaskFile = `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]
+        });
+        if (result.rowsAffected > 0) {
+          process.stderr.write(
+            `[review-cleanup] Cascaded original task to done (legacy path): ${originalTaskFile}
+`
+          );
+        }
+      }
     }
   } catch (err) {
     process.stderr.write(
@@ -4362,12 +4652,23 @@ function getProjectName(cwd) {
   const dir = cwd ?? process.cwd();
   if (_cached2 && _cachedCwd === dir) return _cached2;
   try {
-    const repoRoot = execSync7("git rev-parse --show-toplevel", {
-      cwd: dir,
-      encoding: "utf8",
-      timeout: 2e3,
-      stdio: ["pipe", "pipe", "pipe"]
-    }).trim();
+    let repoRoot;
+    try {
+      const gitCommonDir = execSync7("git rev-parse --path-format=absolute --git-common-dir", {
+        cwd: dir,
+        encoding: "utf8",
+        timeout: 2e3,
+        stdio: ["pipe", "pipe", "pipe"]
+      }).trim();
+      repoRoot = path17.dirname(gitCommonDir);
+    } catch {
+      repoRoot = execSync7("git rev-parse --show-toplevel", {
+        cwd: dir,
+        encoding: "utf8",
+        timeout: 2e3,
+        stdio: ["pipe", "pipe", "pipe"]
+      }).trim();
+    }
     _cached2 = path17.basename(repoRoot);
     _cachedCwd = dir;
     return _cached2;
@@ -4473,7 +4774,9 @@ async function dispatchTaskToEmployee(input) {
       return { dispatched, session: sessionName, crossProject };
     } else {
       const projectDir = input.projectDir ?? process.cwd();
-      const result = ensureEmployee(input.assignedTo, exeSession, projectDir);
+      const result = ensureEmployee(input.assignedTo, exeSession, projectDir, {
+        autoInstance: input.assignedTo === "tom" || input.assignedTo === "sasha"
+      });
       if (result.status === "failed") {
         process.stderr.write(
           `[dispatch] Failed to spawn ${input.assignedTo}: ${result.error}
@@ -4837,7 +5140,8 @@ __export(tasks_exports, {
   resolveTask: () => resolveTask,
   slugify: () => slugify,
   updateTask: () => updateTask,
-  updateTaskStatus: () => updateTaskStatus
+  updateTaskStatus: () => updateTaskStatus,
+  writeCheckpoint: () => writeCheckpoint
 });
 import path18 from "path";
 import { writeFileSync as writeFileSync5, mkdirSync as mkdirSync8, unlinkSync as unlinkSync4 } from "fs";
@@ -4879,10 +5183,11 @@ async function updateTask(input) {
     try {
       const client = getClient();
       const taskTitle = String(row.title);
+      const escaped = taskTitle.replace(/%/g, "\\%").replace(/_/g, "\\_");
       await client.execute({
         sql: `UPDATE tasks SET status = 'cancelled', updated_at = ?
-              WHERE title LIKE ? AND status IN ('open', 'in_progress')`,
-        args: [now, `%left%${taskTitle}%in_progress`]
+              WHERE title LIKE ? ESCAPE '\\' AND status IN ('open', 'in_progress')`,
+        args: [now, `%left '${escaped}' as in\\_progress%`]
       });
     } catch {
     }
@@ -4940,6 +5245,10 @@ async function updateTask(input) {
     taskFile,
     createdAt: String(row.created_at),
     updatedAt: now,
+    budgetTokens: row.budget_tokens !== void 0 && row.budget_tokens !== null ? Number(row.budget_tokens) : null,
+    budgetFallbackModel: row.budget_fallback_model !== void 0 && row.budget_fallback_model !== null ? String(row.budget_fallback_model) : null,
+    tokensUsed: Number(row.tokens_used ?? 0),
+    tokensWarnedAt: row.tokens_warned_at !== void 0 && row.tokens_warned_at !== null ? Number(row.tokens_warned_at) : null,
     nextTask
   };
 }
@@ -8680,7 +8989,92 @@ async function executeCreateTask(params) {
     baseDir: process.cwd()
   });
 }
-async function executeAction(action, record, executor) {
+async function executeUpdateWiki(params) {
+  const apiUrl = process.env.EXE_WIKI_API_URL;
+  const apiKey = process.env.EXE_WIKI_API_KEY;
+  if (!apiUrl || !apiKey) {
+    throw new Error("Wiki not configured: EXE_WIKI_API_URL / EXE_WIKI_API_KEY not set");
+  }
+  const workspace = params.workspace;
+  const content = params.content ?? params.text;
+  const mode = params.mode ?? "append";
+  const section = params.section;
+  if (!workspace || !content) {
+    throw new Error("update_wiki requires 'workspace' and 'content' params");
+  }
+  const documentId = params.document_id;
+  if (documentId && mode === "append") {
+    const readRes = await fetch(`${apiUrl}/v1/document/${documentId}`, {
+      headers: { Authorization: `Bearer ${apiKey}` },
+      signal: AbortSignal.timeout(15e3)
+    });
+    if (!readRes.ok) {
+      throw new Error(`Wiki read failed (${readRes.status})`);
+    }
+    const doc = await readRes.json();
+    const existingContent = String(doc.content ?? "");
+    const title = String(doc.title ?? "Untitled");
+    await fetch(`${apiUrl}/v1/document/${documentId}`, {
+      method: "DELETE",
+      headers: { Authorization: `Bearer ${apiKey}` },
+      signal: AbortSignal.timeout(15e3)
+    }).catch(() => {
+    });
+    const uploadRes = await fetch(`${apiUrl}/v1/document/raw-text`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${apiKey}`
+      },
+      body: JSON.stringify({
+        textContent: section ? existingContent + `
+
+## ${section}
+${content}` : existingContent + "\n\n" + content,
+        metadata: { title },
+        workspaceSlugs: [workspace]
+      }),
+      signal: AbortSignal.timeout(15e3)
+    });
+    if (!uploadRes.ok) throw new Error(`Wiki upload failed (${uploadRes.status})`);
+  } else {
+    const title = params.title ?? "Auto-generated";
+    const res = await fetch(`${apiUrl}/v1/document/raw-text`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${apiKey}`
+      },
+      body: JSON.stringify({
+        textContent: content,
+        metadata: { title },
+        workspaceSlugs: [workspace]
+      }),
+      signal: AbortSignal.timeout(15e3)
+    });
+    if (!res.ok) throw new Error(`Wiki create failed (${res.status})`);
+  }
+}
+async function routeToApproval(action, resolvedParams, triggerName) {
+  const { createTask: createTask2 } = await Promise.resolve().then(() => (init_tasks(), tasks_exports));
+  const actionSummary = action.type === "send_whatsapp" ? `Send WhatsApp to ${resolvedParams.to ?? resolvedParams.recipient ?? "unknown"}: "${(resolvedParams.message ?? resolvedParams.text ?? "").slice(0, 100)}"` : `${action.type}: ${JSON.stringify(resolvedParams).slice(0, 200)}`;
+  await createTask2({
+    title: `[Approval Required] ${triggerName}: ${action.type}`,
+    assignedTo: "exe",
+    assignedBy: "trigger-engine",
+    projectName: resolvedParams.project ?? "exe-os",
+    priority: "p1",
+    context: `Trigger "${triggerName}" wants to execute this action but requires approval.
+
+**Action:** ${action.type}
+**Summary:** ${actionSummary}
+**Full params:** ${JSON.stringify(resolvedParams, null, 2)}
+
+To approve, manually run the action via MCP tools.`,
+    baseDir: process.cwd()
+  });
+}
+async function executeAction(action, record, executor, triggerName) {
   if (executor) {
     return executor(action, record);
   }
@@ -8688,6 +9082,17 @@ async function executeAction(action, record, executor) {
   for (const [key, val] of Object.entries(action.params)) {
     resolvedParams[key] = substituteTemplate(val, record);
   }
+  if (action.requires_approval) {
+    try {
+      await routeToApproval(action, resolvedParams, triggerName ?? "Unknown trigger");
+      return { success: true };
+    } catch (err) {
+      return {
+        success: false,
+        error: `Approval routing failed: ${err instanceof Error ? err.message : String(err)}`
+      };
+    }
+  }
   try {
     switch (action.type) {
       case "send_whatsapp":
@@ -8699,6 +9104,9 @@ async function executeAction(action, record, executor) {
       case "create_task":
         await executeCreateTask(resolvedParams);
         break;
+      case "update_wiki":
+        await executeUpdateWiki(resolvedParams);
+        break;
       case "mcp_tool":
         console.log(
           `[trigger-engine] mcp_tool action: ${JSON.stringify(resolvedParams)}`
@@ -8723,7 +9131,7 @@ async function processCRMEvent(event, executor, triggersOverride) {
     if (!evaluateConditions(trigger.conditions, event.record)) continue;
     const actionResults = [];
     for (const action of trigger.actions) {
-      const result = await executeAction(action, event.record, executor);
+      const result = await executeAction(action, event.record, executor, trigger.name);
       actionResults.push({
         type: action.type,
         success: result.success,