@askexenow/exe-os 0.8.0 → 0.8.1

package/dist/lib/tasks.js

@@ -101,6 +101,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 });
@@ -123,6 +128,7 @@ async function loadConfig() {
     }
     normalizeScalingRoadmap(migratedCfg);
     normalizeSessionLifecycle(migratedCfg);
+    normalizeAutoUpdate(migratedCfg);
     const config = { ...DEFAULT_CONFIG, dbPath: path.join(dir, "memories.db"), ...migratedCfg };
     if (config.dbPath.startsWith("~")) {
       config.dbPath = config.dbPath.replace(/^~/, os.homedir());
@@ -198,6 +204,11 @@ var init_config = __esm({
         idleKillTicksRequired: 3,
         idleKillIntercomAckWindowMs: 1e4,
         maxAutoInstances: 10
+      },
+      autoUpdate: {
+        checkOnBoot: true,
+        autoInstall: false,
+        checkIntervalMs: 24 * 60 * 60 * 1e3
       }
     };
     CONFIG_MIGRATIONS = [
@@ -271,6 +282,36 @@ import path3 from "path";
 import { execSync } from "child_process";
 import { mkdir as mkdir2, writeFile as writeFile2, appendFile } from "fs/promises";
 import { existsSync as existsSync3, readFileSync as readFileSync3 } 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(
@@ -377,9 +418,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,
@@ -393,6 +435,11 @@ async function createTaskCore(input) {
       parentTaskId,
       input.reviewer ?? null,
       input.context,
+      input.budgetTokens ?? null,
+      input.budgetFallbackModel ?? null,
+      0,
+      null,
+      complexity,
       now,
       now
     ]
@@ -408,7 +455,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) {
@@ -448,7 +499,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) {
@@ -456,8 +512,13 @@ function checkStaleCompletion(taskContext, taskCreatedAt) {
   if (!DELEGATION_KEYWORDS.test(taskContext)) return null;
   try {
     const since = new Date(taskCreatedAt).toISOString();
+    const branch = execSync(
+      "git rev-parse --abbrev-ref HEAD 2>/dev/null",
+      { encoding: "utf8", timeout: 3e3 }
+    ).trim();
+    const branchArg = branch && branch !== "HEAD" ? branch : "";
     const commitCount = execSync(
-      `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);
@@ -516,6 +577,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) {
@@ -529,6 +598,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) {
@@ -902,11 +979,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 = path6.join(os4.homedir(), ".exe-os", "intercom-queue.json");
+    TTL_MS = 60 * 60 * 1e3;
     INTERCOM_LOG = path6.join(os4.homedir(), ".exe-os", "intercom.log");
   }
 });
@@ -1029,6 +1107,17 @@ function getGitRoot(dir) {
     return null;
   }
 }
+function getMainRepoRoot(dir) {
+  try {
+    const commonDir = execSync5(
+      "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(path9.dirname(commonDir));
+  } catch {
+    return null;
+  }
+}
 function worktreePath(repoRoot, employeeName, instance) {
   const label = instanceLabel(employeeName, instance);
   return path9.join(repoRoot, ".worktrees", label);
@@ -1265,6 +1354,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";
@@ -1272,10 +1366,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);
 }
@@ -1295,7 +1385,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)`);
@@ -1307,18 +1404,7 @@ function sendIntercom(targetSession) {
     }
     transport.sendKeys(targetSession, "/exe-intercom");
     recordDebounce(targetSession);
-    for (let i = 0; i < INTERCOM_POLL_MAX_ATTEMPTS; i++) {
-      try {
-        execSync6(`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}`);
@@ -1335,7 +1421,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") {
@@ -1384,7 +1480,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;
   }
@@ -1565,7 +1662,7 @@ function spawnEmployee(employeeName, exeSession, projectDir, opts) {
   let booted = false;
   for (let i = 0; i < 30; i++) {
     try {
-      execSync6("sleep 1");
+      execSync6("sleep 0.5");
     } catch {
     }
     try {
@@ -1585,7 +1682,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 {
@@ -1603,7 +1700,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";
@@ -1623,8 +1720,6 @@ var init_tmux_routing = __esm({
     DEBOUNCE_FILE = path10.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;
   }
 });
 
@@ -1710,23 +1805,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(
@@ -1847,12 +1957,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 = path13.dirname(gitCommonDir);
+    } catch {
+      repoRoot = execSync7("git rev-parse --show-toplevel", {
+        cwd: dir,
+        encoding: "utf8",
+        timeout: 2e3,
+        stdio: ["pipe", "pipe", "pipe"]
+      }).trim();
+    }
     _cached2 = path13.basename(repoRoot);
     _cachedCwd = dir;
     return _cached2;
@@ -1958,7 +2079,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}
@@ -2346,10 +2469,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 {
     }
@@ -2407,6 +2531,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
   };
 }
@@ -2452,5 +2580,6 @@ export {
   resolveTask,
   slugify,
   updateTask,
-  updateTaskStatus
+  updateTaskStatus,
+  writeCheckpoint
 };