@askexenow/exe-os 0.8.80 → 0.8.82

package/dist/hooks/error-recall.js

@@ -13,7 +13,6 @@ var config_exports = {};
 __export(config_exports, {
   CONFIG_MIGRATIONS: () => CONFIG_MIGRATIONS,
   CONFIG_PATH: () => CONFIG_PATH,
-  COO_AGENT_NAME: () => COO_AGENT_NAME,
   CURRENT_CONFIG_VERSION: () => CURRENT_CONFIG_VERSION,
   DB_PATH: () => DB_PATH,
   EXE_AI_DIR: () => EXE_AI_DIR,
@@ -169,7 +168,7 @@ async function loadConfigFrom(configPath) {
     return { ...DEFAULT_CONFIG };
   }
 }
-var EXE_AI_DIR, DB_PATH, MODELS_DIR, CONFIG_PATH, COO_AGENT_NAME, LEGACY_LANCE_PATH, CURRENT_CONFIG_VERSION, DEFAULT_CONFIG, CONFIG_MIGRATIONS;
+var EXE_AI_DIR, DB_PATH, MODELS_DIR, CONFIG_PATH, LEGACY_LANCE_PATH, CURRENT_CONFIG_VERSION, DEFAULT_CONFIG, CONFIG_MIGRATIONS;
 var init_config = __esm({
   "src/lib/config.ts"() {
     "use strict";
@@ -177,7 +176,6 @@ var init_config = __esm({
     DB_PATH = path.join(EXE_AI_DIR, "memories.db");
     MODELS_DIR = path.join(EXE_AI_DIR, "models");
     CONFIG_PATH = path.join(EXE_AI_DIR, "config.json");
-    COO_AGENT_NAME = "exe";
     LEGACY_LANCE_PATH = path.join(EXE_AI_DIR, "local.lance");
     CURRENT_CONFIG_VERSION = 1;
     DEFAULT_CONFIG = {
@@ -213,13 +211,7 @@ var init_config = __esm({
       wikiUrl: "",
       wikiApiKey: "",
       wikiSyncIntervalMs: 30 * 60 * 1e3,
-      wikiWorkspaceMapping: {
-        exe: "Executive",
-        yoshi: "Engineering",
-        mari: "Marketing",
-        tom: "Engineering",
-        sasha: "Production"
-      },
+      wikiWorkspaceMapping: {},
       wikiAutoUpdate: true,
       wikiAutoUpdateThreshold: 0.5,
       wikiAutoUpdateCreateNew: true,
@@ -304,7 +296,7 @@ function wrapWithRetry(client) {
         return (sql) => retryOnBusy(() => target.execute(sql), "execute");
       }
       if (prop === "batch") {
-        return (stmts) => retryOnBusy(() => target.batch(stmts), "batch");
+        return (stmts, mode) => retryOnBusy(() => target.batch(stmts, mode), "batch");
       }
       return Reflect.get(target, prop, receiver);
     }
@@ -320,6 +312,46 @@ var init_db_retry = __esm({
   }
 });
 
+// src/lib/employees.ts
+import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
+import { existsSync as existsSync2, symlinkSync, readlinkSync, readFileSync as readFileSync2, renameSync as renameSync2, unlinkSync, writeFileSync } from "fs";
+import { execSync } from "child_process";
+import path2 from "path";
+import os2 from "os";
+function normalizeRole(role) {
+  return (role ?? "").trim().toLowerCase();
+}
+function isCoordinatorRole(role) {
+  return normalizeRole(role) === normalizeRole(COORDINATOR_ROLE);
+}
+function getCoordinatorEmployee(employees) {
+  return employees.find((e) => isCoordinatorRole(e.role));
+}
+function getCoordinatorName(employees = loadEmployeesSync()) {
+  return getCoordinatorEmployee(employees)?.name ?? DEFAULT_COORDINATOR_TEMPLATE_NAME;
+}
+function loadEmployeesSync(employeesPath = EMPLOYEES_PATH) {
+  if (!existsSync2(employeesPath)) return [];
+  try {
+    return JSON.parse(readFileSync2(employeesPath, "utf-8"));
+  } catch {
+    return [];
+  }
+}
+function getEmployee(employees, name) {
+  return employees.find((e) => e.name.toLowerCase() === name.toLowerCase());
+}
+var EMPLOYEES_PATH, DEFAULT_COORDINATOR_TEMPLATE_NAME, COORDINATOR_ROLE;
+var init_employees = __esm({
+  "src/lib/employees.ts"() {
+    "use strict";
+    init_config();
+    EMPLOYEES_PATH = path2.join(EXE_AI_DIR, "exe-employees.json");
+    DEFAULT_COORDINATOR_TEMPLATE_NAME = "exe";
+    COORDINATOR_ROLE = "COO";
+  }
+});
+
 // src/lib/database.ts
 import { createClient } from "@libsql/client";
 async function initDatabase(config) {
@@ -453,22 +485,24 @@ async function ensureSchema() {
       ON behaviors(agent_id, active);
   `);
   try {
+    const coordinatorName = getCoordinatorName();
     const existing = await client.execute({
-      sql: "SELECT COUNT(*) as cnt FROM behaviors WHERE agent_id = 'exe'",
-      args: []
+      sql: "SELECT COUNT(*) as cnt FROM behaviors WHERE agent_id = ?",
+      args: [coordinatorName]
     });
     if (Number(existing.rows[0]?.cnt) === 0) {
-      await client.executeMultiple(`
-        INSERT INTO behaviors (id, agent_id, project_name, domain, content, active, created_at, updated_at)
-        VALUES
-          (hex(randomblob(16)), 'exe', NULL, 'workflow', 'Don''t ask "keep going?" \u2014 just keep executing phases/plans autonomously', 1, '2026-03-25T00:00:00Z', '2026-03-25T00:00:00Z');
-        INSERT INTO behaviors (id, agent_id, project_name, domain, content, active, created_at, updated_at)
-        VALUES
-          (hex(randomblob(16)), 'exe', NULL, 'tool-use', 'Always use create_task MCP tool, never write .md files directly for task creation', 1, '2026-03-25T00:00:00Z', '2026-03-25T00:00:00Z');
-        INSERT INTO behaviors (id, agent_id, project_name, domain, content, active, created_at, updated_at)
-        VALUES
-          (hex(randomblob(16)), 'exe', NULL, 'workflow', 'Auto-start reviewing when idle and reviews are pending \u2014 never ask founder for permission', 1, '2026-03-25T00:00:00Z', '2026-03-25T00:00:00Z');
-      `);
+      const seededAt = "2026-03-25T00:00:00Z";
+      for (const [domain, content] of [
+        ["workflow", `Don't ask "keep going?" \u2014 just keep executing phases/plans autonomously`],
+        ["tool-use", "Always use create_task MCP tool, never write .md files directly for task creation"],
+        ["workflow", "Auto-start reviewing when idle and reviews are pending \u2014 never ask founder for permission"]
+      ]) {
+        await client.execute({
+          sql: `INSERT INTO behaviors (id, agent_id, project_name, domain, content, active, created_at, updated_at)
+                VALUES (hex(randomblob(16)), ?, NULL, ?, ?, 1, ?, ?)`,
+          args: [coordinatorName, domain, content, seededAt, seededAt]
+        });
+      }
     }
   } catch {
   }
@@ -1160,6 +1194,39 @@ async function ensureSchema() {
     } catch {
     }
   }
+  try {
+    await client.execute({
+      sql: `ALTER TABLE memories ADD COLUMN draft INTEGER DEFAULT 0`,
+      args: []
+    });
+  } catch {
+  }
+  try {
+    await client.execute(
+      `CREATE INDEX IF NOT EXISTS idx_memories_draft ON memories(draft) WHERE draft = 1`
+    );
+  } catch {
+  }
+  try {
+    await client.execute({
+      sql: `ALTER TABLE memories ADD COLUMN memory_type TEXT DEFAULT 'raw'`,
+      args: []
+    });
+  } catch {
+  }
+  try {
+    await client.execute(
+      `CREATE INDEX IF NOT EXISTS idx_memories_type ON memories(memory_type)`
+    );
+  } catch {
+  }
+  try {
+    await client.execute({
+      sql: `ALTER TABLE memories ADD COLUMN trajectory TEXT`,
+      args: []
+    });
+  } catch {
+  }
 }
 async function disposeDatabase() {
   if (_client) {
@@ -1173,6 +1240,7 @@ var init_database = __esm({
   "src/lib/database.ts"() {
     "use strict";
     init_db_retry();
+    init_employees();
     _client = null;
     _resilientClient = null;
     initTurso = initDatabase;
@@ -1181,15 +1249,15 @@ var init_database = __esm({
 });
 
 // src/lib/keychain.ts
-import { readFile as readFile2, writeFile as writeFile2, unlink, mkdir as mkdir2, chmod as chmod2 } from "fs/promises";
-import { existsSync as existsSync2 } from "fs";
-import path2 from "path";
-import os2 from "os";
+import { readFile as readFile3, writeFile as writeFile3, unlink, mkdir as mkdir3, chmod as chmod2 } from "fs/promises";
+import { existsSync as existsSync3 } from "fs";
+import path3 from "path";
+import os3 from "os";
 function getKeyDir() {
-  return process.env.EXE_OS_DIR ?? process.env.EXE_MEM_DIR ?? path2.join(os2.homedir(), ".exe-os");
+  return process.env.EXE_OS_DIR ?? process.env.EXE_MEM_DIR ?? path3.join(os3.homedir(), ".exe-os");
 }
 function getKeyPath() {
-  return path2.join(getKeyDir(), "master.key");
+  return path3.join(getKeyDir(), "master.key");
 }
 async function tryKeytar() {
   try {
@@ -1210,11 +1278,11 @@ async function getMasterKey() {
     }
   }
   const keyPath = getKeyPath();
-  if (!existsSync2(keyPath)) {
+  if (!existsSync3(keyPath)) {
     return null;
   }
   try {
-    const content = await readFile2(keyPath, "utf-8");
+    const content = await readFile3(keyPath, "utf-8");
     return Buffer.from(content.trim(), "base64");
   } catch {
     return null;
@@ -1297,12 +1365,12 @@ __export(shard_manager_exports, {
   listShards: () => listShards,
   shardExists: () => shardExists
 });
-import path3 from "path";
-import { existsSync as existsSync3, mkdirSync, readdirSync } from "fs";
+import path4 from "path";
+import { existsSync as existsSync4, mkdirSync, readdirSync } from "fs";
 import { createClient as createClient2 } from "@libsql/client";
 function initShardManager(encryptionKey) {
   _encryptionKey = encryptionKey;
-  if (!existsSync3(SHARDS_DIR)) {
+  if (!existsSync4(SHARDS_DIR)) {
     mkdirSync(SHARDS_DIR, { recursive: true });
   }
   _shardingEnabled = true;
@@ -1323,7 +1391,7 @@ function getShardClient(projectName) {
   }
   const cached = _shards.get(safeName);
   if (cached) return cached;
-  const dbPath = path3.join(SHARDS_DIR, `${safeName}.db`);
+  const dbPath = path4.join(SHARDS_DIR, `${safeName}.db`);
   const client = createClient2({
     url: `file:${dbPath}`,
     encryptionKey: _encryptionKey
@@ -1333,10 +1401,10 @@ function getShardClient(projectName) {
 }
 function shardExists(projectName) {
   const safeName = projectName.replace(/[^a-zA-Z0-9_-]/g, "_");
-  return existsSync3(path3.join(SHARDS_DIR, `${safeName}.db`));
+  return existsSync4(path4.join(SHARDS_DIR, `${safeName}.db`));
 }
 function listShards() {
-  if (!existsSync3(SHARDS_DIR)) return [];
+  if (!existsSync4(SHARDS_DIR)) return [];
   return readdirSync(SHARDS_DIR).filter((f) => f.endsWith(".db")).map((f) => f.replace(".db", ""));
 }
 async function ensureShardSchema(client) {
@@ -1406,7 +1474,11 @@ async function ensureShardSchema(client) {
     "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"
+    "ALTER TABLE memories ADD COLUMN supersedes_id TEXT",
+    // MS-11: draft staging, MS-6a: memory_type, MS-7: trajectory
+    "ALTER TABLE memories ADD COLUMN draft INTEGER DEFAULT 0",
+    "ALTER TABLE memories ADD COLUMN memory_type TEXT DEFAULT 'raw'",
+    "ALTER TABLE memories ADD COLUMN trajectory TEXT"
   ]) {
     try {
       await client.execute(col);
@@ -1518,7 +1590,7 @@ var init_shard_manager = __esm({
   "src/lib/shard-manager.ts"() {
     "use strict";
     init_config();
-    SHARDS_DIR = path3.join(EXE_AI_DIR, "shards");
+    SHARDS_DIR = path4.join(EXE_AI_DIR, "shards");
     _shards = /* @__PURE__ */ new Map();
     _encryptionKey = null;
     _shardingEnabled = false;
@@ -1536,26 +1608,26 @@ var init_platform_procedures = __esm({
         title: "What is exe-os \u2014 the operating model every agent must understand",
         domain: "architecture",
         priority: "p0",
-        content: "Exe OS is an AI employee operating system. A founder runs 5-10 AI agents as a real org: COO (exe), CTO (yoshi), CMO (mari), engineers (tom), content (sasha). Each agent has identity, expertise, and experience layers \u2014 persistent memory that makes them better over time. All data is local-first, E2EE, owned by the user. The MCP server is the ONLY data interface \u2014 never access the DB directly."
+        content: "Exe OS is an AI employee operating system. A founder runs 5-10 AI agents as a real org: COO, CTO, CMO, engineers, and content production specialists. Each agent has identity, expertise, and experience layers \u2014 persistent memory that makes them better over time. All data is local-first, E2EE, owned by the user. The MCP server is the ONLY data interface \u2014 never access the DB directly."
       },
       {
         title: "Mode 1 \u2014 how exe-os runs inside Claude Code",
         domain: "architecture",
         priority: "p0",
-        content: "Mode 1: exe-os runs AS hooks + MCP + skills inside Claude Code. The founder opens CC, runs /exe to boot the COO. exe manages employees in tmux sessions. Each exeN is a separate CC window/project. Employees (yoshi, tom, mari) run in their own tmux panes via create_task auto-spawn. The founder talks to exe; exe orchestrates the team. CC is the shell, exe-os is the brain."
+        content: "Mode 1: exe-os runs AS hooks + MCP + skills inside Claude Code. The founder opens CC and boots the COO. The COO manages employees in tmux sessions. Each coordinator session is a separate CC window/project. Employees run in their own tmux panes via create_task auto-spawn. The founder talks to the COO; the COO orchestrates the team. CC is the shell, exe-os is the brain."
       },
       {
-        title: "Sessions explained \u2014 what exeN means and how projects work",
+        title: "Sessions explained \u2014 coordinator session names and projects",
         domain: "architecture",
         priority: "p0",
-        content: "Each exeN (exe1, exe2, exe3) is an isolated project session. exe1 might be exe-os development, exe2 might be exe-wiki. Each session spawns its own employees: exe1\u2192yoshi-exe1\u2192tom-exe1. Sessions share the same memory DB but tasks are scoped to the session that created them. A founder can run multiple projects simultaneously. Sessions never interfere with each other."
+        content: "Each coordinator session is an isolated project session. One might be exe-os development, another might be exe-wiki. Each session spawns its own employees using {employee}-{coordinatorSession}. Sessions share the same memory DB but tasks are scoped to the session that created them. A founder can run multiple projects simultaneously. Sessions never interfere with each other."
       },
       // --- Hierarchy and dispatch ---
       {
         title: "Chain of command \u2014 who talks to whom",
         domain: "workflow",
         priority: "p0",
-        content: "Founder \u2192 exe (COO) \u2192 yoshi (CTO) / mari (CMO). Yoshi \u2192 tom (engineer). Mari \u2192 sasha (content). Never skip levels: exe never assigns directly to tom. Tom never reports directly to exe. If you need cross-team info, use ask_team_memory \u2014 don't read other agents' task folders. Each level owns dispatch downward and review upward."
+        content: "Founder -> COO -> CTO/CMO. CTO -> engineers. CMO -> content production. Never skip levels: the COO does not bypass managers for specialist work. Specialists report to their manager. If you need cross-team info, use ask_team_memory \u2014 don't read other agents' task folders. Each level owns dispatch downward and review upward."
       },
       {
         title: "Single dispatch path \u2014 create_task only",
@@ -1565,30 +1637,30 @@ var init_platform_procedures = __esm({
       },
       // --- Session isolation ---
       {
-        title: "Session scoping \u2014 stay in your exe boundary",
+        title: "Session scoping \u2014 stay in your coordinator boundary",
         domain: "security",
         priority: "p0",
-        content: "Session scoping is mandatory. Managers dispatch to workers within their own exe session ONLY. exe1\u2192yoshi-exe1\u2192tom-exe1. exe2\u2192yoshi-exe2\u2192tom2-exe2. Cross-session dispatch is blocked by the system. Verify session names before dispatch. Tasks are scoped to the creating exe session."
+        content: "Session scoping is mandatory. Managers dispatch to workers within their own coordinator session ONLY. Employee sessions use {employee}-{coordinatorSession}. Cross-session dispatch is blocked by the system. Verify session names before dispatch. Tasks are scoped to the creating coordinator session."
       },
       {
         title: "Session isolation \u2014 never touch another session's work",
         domain: "workflow",
         priority: "p0",
-        content: `Sessions are isolated. exeN owns ONLY tasks it dispatched. (1) Never close/update/cancel tasks from another exe session. (2) Never review work from a different session \u2014 report "belongs to exeN" and skip. (3) Ignore other sessions' items in list_tasks results. (4) Employees inherit session: yoshi-exe1 works ONLY on exe1 tasks. Cross-session work is a system violation.`
+        content: "Sessions are isolated. A coordinator session owns ONLY tasks it dispatched. (1) Never close/update/cancel tasks from another coordinator session. (2) Never review work from a different session \u2014 report that it belongs to another session and skip. (3) Ignore other sessions' items in list_tasks results. (4) Employees inherit session: employee sessions work ONLY on their parent coordinator session's tasks. Cross-session work is a system violation."
       },
       // --- Engineering: session scoping in code ---
       {
         title: "Three-dimensional scoping \u2014 session, project, role \u2014 enforced in every query",
         domain: "architecture",
         priority: "p0",
-        content: "Every DB query, notification, review count, and task operation MUST be scoped on 3 dimensions: (1) Session \u2014 filter by session_scope matching current exeN. (2) Project \u2014 filter by project_name. (3) Role \u2014 agents only see data at their hierarchy level. When writing ANY function that touches tasks, reviews, messages, or notifications: always accept a sessionScope parameter and pass it to the SQL WHERE clause. Unscoped queries are bugs. Test by running 2+ exe sessions simultaneously."
+        content: "Every DB query, notification, review count, and task operation MUST be scoped on 3 dimensions: (1) Session \u2014 filter by session_scope matching the current coordinator session. (2) Project \u2014 filter by project_name. (3) Role \u2014 agents only see data at their hierarchy level. When writing ANY function that touches tasks, reviews, messages, or notifications: always accept a sessionScope parameter and pass it to the SQL WHERE clause. Unscoped queries are bugs. Test by running 2+ coordinator sessions simultaneously."
       },
       // --- Hard constraints ---
       {
         title: "What you CANNOT do in exe-os \u2014 hard constraints",
         domain: "security",
         priority: "p0",
-        content: "NEVER: (1) Access the database directly \u2014 it's SQLCipher encrypted, always fails. Use MCP tools only. (2) Manually spawn tmux sessions \u2014 create_task handles it. (3) Run git checkout main \u2014 agents work in worktrees. (4) Modify another agent's in-progress task. (5) Push to remote \u2014 exe reviews and pushes. (6) Skip update_task(done) \u2014 it's the ONLY way your work gets reviewed. (7) Run git init."
+        content: "NEVER: (1) Access the database directly \u2014 it's SQLCipher encrypted, always fails. Use MCP tools only. (2) Manually spawn tmux sessions \u2014 create_task handles it. (3) Run git checkout main \u2014 agents work in worktrees. (4) Modify another agent's in-progress task. (5) Push to remote \u2014 the COO reviews and pushes. (6) Skip update_task(done) \u2014 it's the ONLY way your work gets reviewed. (7) Run git init."
       },
       // --- Operations ---
       {
@@ -1828,7 +1900,10 @@ async function writeMemory(record) {
     source_path: record.source_path ?? null,
     source_type: record.source_type ?? null,
     tier: record.tier ?? classifyTier(record),
-    supersedes_id: record.supersedes_id ?? null
+    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
   };
   _pendingRecords.push(dbRow);
   orgBus.emit({
@@ -1883,6 +1958,9 @@ async function flushBatch() {
       const sourceType = row.source_type ?? null;
       const tier = row.tier ?? 3;
       const supersedesId = row.supersedes_id ?? null;
+      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,
@@ -1890,15 +1968,15 @@ async function flushBatch() {
                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)
-              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, vector32(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` : `INSERT OR IGNORE INTO memories
+               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)
-              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+               source_path, source_type, tier, supersedes_id, draft, memory_type, trajectory)
+              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
         args: hasVector ? [
           row.id,
           row.agent_id,
@@ -1924,7 +2002,10 @@ async function flushBatch() {
           sourcePath,
           sourceType,
           tier,
-          supersedesId
+          supersedesId,
+          draft,
+          memoryType,
+          trajectory
         ] : [
           row.id,
           row.agent_id,
@@ -1949,7 +2030,10 @@ async function flushBatch() {
           sourcePath,
           sourceType,
           tier,
-          supersedesId
+          supersedesId,
+          draft,
+          memoryType,
+          trajectory
         ]
       };
     };
@@ -2018,6 +2102,8 @@ async function searchMemories(queryVector, agentId, options) {
   const limit = options?.limit ?? 10;
   const statusFilter = options?.includeArchived ? "" : `
                AND COALESCE(status, 'active') = 'active'`;
+  const draftFilter = options?.includeDrafts ? "" : `
+               AND (draft = 0 OR draft IS NULL)`;
   let sql = `SELECT id, agent_id, agent_role, session_id, timestamp,
                     tool_name, project_name,
                     has_error, raw_text, vector, importance, status,
@@ -2027,7 +2113,7 @@ async function searchMemories(queryVector, agentId, options) {
                     source_path, source_type
              FROM memories
              WHERE agent_id = ?
-               AND vector IS NOT NULL${statusFilter}
+               AND vector IS NOT NULL${statusFilter}${draftFilter}
                AND COALESCE(confidence, 0.7) >= 0.3`;
   const args = [agentId];
   const scope = buildWikiScopeFilter(options, "");
@@ -2049,6 +2135,10 @@ async function searchMemories(queryVector, agentId, options) {
     sql += ` AND timestamp >= ?`;
     args.push(options.since);
   }
+  if (options?.memoryType) {
+    sql += ` AND memory_type = ?`;
+    args.push(options.memoryType);
+  }
   sql += ` ORDER BY vector_distance_cos(vector, vector32(?))`;
   args.push(vectorToBlob(queryVector));
   sql += ` LIMIT ?`;
@@ -2274,7 +2364,7 @@ var init_self_query_router = __esm({
           },
           is_broad_query: {
             type: "boolean",
-            description: "True if the query is exploratory/broad (e.g., 'what has yoshi been working on', 'summarize recent activity'). False if targeted (e.g., 'how did we fix the auth bug')."
+            description: "True if the query is exploratory/broad (e.g., 'what has the CTO been working on', 'summarize recent activity'). False if targeted (e.g., 'how did we fix the auth bug')."
           }
         },
         required: ["semantic_query", "project_filter", "role_filter", "time_filter", "is_broad_query"]
@@ -2287,8 +2377,8 @@ var init_self_query_router = __esm({
 import net from "net";
 import { spawn } from "child_process";
 import { randomUUID as randomUUID2 } from "crypto";
-import { existsSync as existsSync4, unlinkSync, readFileSync as readFileSync2, openSync, closeSync, statSync } from "fs";
-import path4 from "path";
+import { existsSync as existsSync5, unlinkSync as unlinkSync2, readFileSync as readFileSync3, openSync, closeSync, statSync } from "fs";
+import path5 from "path";
 import { fileURLToPath } from "url";
 function handleData(chunk) {
   _buffer += chunk.toString();
@@ -2314,9 +2404,9 @@ function handleData(chunk) {
   }
 }
 function cleanupStaleFiles() {
-  if (existsSync4(PID_PATH)) {
+  if (existsSync5(PID_PATH)) {
     try {
-      const pid = parseInt(readFileSync2(PID_PATH, "utf8").trim(), 10);
+      const pid = parseInt(readFileSync3(PID_PATH, "utf8").trim(), 10);
       if (pid > 0) {
         try {
           process.kill(pid, 0);
@@ -2327,21 +2417,21 @@ function cleanupStaleFiles() {
     } catch {
     }
     try {
-      unlinkSync(PID_PATH);
+      unlinkSync2(PID_PATH);
     } catch {
     }
     try {
-      unlinkSync(SOCKET_PATH);
+      unlinkSync2(SOCKET_PATH);
     } catch {
     }
   }
 }
 function findPackageRoot() {
-  let dir = path4.dirname(fileURLToPath(import.meta.url));
-  const { root } = path4.parse(dir);
+  let dir = path5.dirname(fileURLToPath(import.meta.url));
+  const { root } = path5.parse(dir);
   while (dir !== root) {
-    if (existsSync4(path4.join(dir, "package.json"))) return dir;
-    dir = path4.dirname(dir);
+    if (existsSync5(path5.join(dir, "package.json"))) return dir;
+    dir = path5.dirname(dir);
   }
   return null;
 }
@@ -2351,8 +2441,8 @@ function spawnDaemon() {
     process.stderr.write("[exed-client] WARN: cannot find package root\n");
     return;
   }
-  const daemonPath = path4.join(pkgRoot, "dist", "lib", "exe-daemon.js");
-  if (!existsSync4(daemonPath)) {
+  const daemonPath = path5.join(pkgRoot, "dist", "lib", "exe-daemon.js");
+  if (!existsSync5(daemonPath)) {
     process.stderr.write(`[exed-client] WARN: daemon script not found at ${daemonPath}
 `);
     return;
@@ -2360,7 +2450,7 @@ function spawnDaemon() {
   const resolvedPath = daemonPath;
   process.stderr.write(`[exed-client] Spawning daemon: ${resolvedPath}
 `);
-  const logPath = path4.join(path4.dirname(SOCKET_PATH), "exed.log");
+  const logPath = path5.join(path5.dirname(SOCKET_PATH), "exed.log");
   let stderrFd = "ignore";
   try {
     stderrFd = openSync(logPath, "a");
@@ -2371,6 +2461,10 @@ function spawnDaemon() {
     stdio: ["ignore", "ignore", stderrFd],
     env: {
       ...process.env,
+      TMUX: void 0,
+      // Daemon is global — must not inherit session scope
+      TMUX_PANE: void 0,
+      // Prevents resolveExeSession() from scoping to one session
       EXE_DAEMON_SOCK: SOCKET_PATH,
       EXE_DAEMON_PID: PID_PATH
     }
@@ -2393,7 +2487,7 @@ function acquireSpawnLock() {
       const stat = statSync(SPAWN_LOCK_PATH);
       if (Date.now() - stat.mtimeMs > SPAWN_LOCK_STALE_MS) {
         try {
-          unlinkSync(SPAWN_LOCK_PATH);
+          unlinkSync2(SPAWN_LOCK_PATH);
         } catch {
         }
         try {
@@ -2410,7 +2504,7 @@ function acquireSpawnLock() {
 }
 function releaseSpawnLock() {
   try {
-    unlinkSync(SPAWN_LOCK_PATH);
+    unlinkSync2(SPAWN_LOCK_PATH);
   } catch {
   }
 }
@@ -2522,9 +2616,9 @@ async function pingDaemon() {
 }
 function killAndRespawnDaemon() {
   process.stderr.write("[exed-client] Killing daemon for restart...\n");
-  if (existsSync4(PID_PATH)) {
+  if (existsSync5(PID_PATH)) {
     try {
-      const pid = parseInt(readFileSync2(PID_PATH, "utf8").trim(), 10);
+      const pid = parseInt(readFileSync3(PID_PATH, "utf8").trim(), 10);
       if (pid > 0) {
         try {
           process.kill(pid, "SIGKILL");
@@ -2541,11 +2635,11 @@ function killAndRespawnDaemon() {
   _connected = false;
   _buffer = "";
   try {
-    unlinkSync(PID_PATH);
+    unlinkSync2(PID_PATH);
   } catch {
   }
   try {
-    unlinkSync(SOCKET_PATH);
+    unlinkSync2(SOCKET_PATH);
   } catch {
   }
   spawnDaemon();
@@ -2608,9 +2702,9 @@ var init_exe_daemon_client = __esm({
   "src/lib/exe-daemon-client.ts"() {
     "use strict";
     init_config();
-    SOCKET_PATH = process.env.EXE_DAEMON_SOCK ?? process.env.EXE_EMBED_SOCK ?? path4.join(EXE_AI_DIR, "exed.sock");
-    PID_PATH = process.env.EXE_DAEMON_PID ?? process.env.EXE_EMBED_PID ?? path4.join(EXE_AI_DIR, "exed.pid");
-    SPAWN_LOCK_PATH = path4.join(EXE_AI_DIR, "exed-spawn.lock");
+    SOCKET_PATH = process.env.EXE_DAEMON_SOCK ?? process.env.EXE_EMBED_SOCK ?? path5.join(EXE_AI_DIR, "exed.sock");
+    PID_PATH = process.env.EXE_DAEMON_PID ?? process.env.EXE_EMBED_PID ?? path5.join(EXE_AI_DIR, "exed.pid");
+    SPAWN_LOCK_PATH = path5.join(EXE_AI_DIR, "exed-spawn.lock");
     SPAWN_LOCK_STALE_MS = 3e4;
     CONNECT_TIMEOUT_MS = 15e3;
     REQUEST_TIMEOUT_MS = 3e4;
@@ -2661,10 +2755,10 @@ async function disposeEmbedder() {
 async function embedDirect(text) {
   const llamaCpp = await import("node-llama-cpp");
   const { MODELS_DIR: MODELS_DIR2 } = await Promise.resolve().then(() => (init_config(), config_exports));
-  const { existsSync: existsSync7 } = await import("fs");
-  const path9 = await import("path");
-  const modelPath = path9.join(MODELS_DIR2, "jina-embeddings-v5-small-q4_k_m.gguf");
-  if (!existsSync7(modelPath)) {
+  const { existsSync: existsSync8 } = await import("fs");
+  const path10 = await import("path");
+  const modelPath = path10.join(MODELS_DIR2, "jina-embeddings-v5-small-q4_k_m.gguf");
+  if (!existsSync8(modelPath)) {
     throw new Error(`Embedding model not found at ${modelPath}. Run '/exe-setup' to download it.`);
   }
   const llama = await llamaCpp.getLlama();
@@ -2698,34 +2792,34 @@ __export(project_name_exports, {
   _resetCache: () => _resetCache,
   getProjectName: () => getProjectName
 });
-import { execSync } from "child_process";
-import path5 from "path";
+import { execSync as execSync2 } from "child_process";
+import path6 from "path";
 function getProjectName(cwd) {
   const dir = cwd ?? process.cwd();
   if (_cached && _cachedCwd === dir) return _cached;
   try {
     let repoRoot;
     try {
-      const gitCommonDir = execSync("git rev-parse --path-format=absolute --git-common-dir", {
+      const gitCommonDir = execSync2("git rev-parse --path-format=absolute --git-common-dir", {
         cwd: dir,
         encoding: "utf8",
         timeout: 2e3,
         stdio: ["pipe", "pipe", "pipe"]
       }).trim();
-      repoRoot = path5.dirname(gitCommonDir);
+      repoRoot = path6.dirname(gitCommonDir);
     } catch {
-      repoRoot = execSync("git rev-parse --show-toplevel", {
+      repoRoot = execSync2("git rev-parse --show-toplevel", {
         cwd: dir,
         encoding: "utf8",
         timeout: 2e3,
         stdio: ["pipe", "pipe", "pipe"]
       }).trim();
     }
-    _cached = path5.basename(repoRoot);
+    _cached = path6.basename(repoRoot);
     _cachedCwd = dir;
     return _cached;
   } catch {
-    _cached = path5.basename(dir);
+    _cached = path6.basename(dir);
     _cachedCwd = dir;
     return _cached;
   }
@@ -2748,14 +2842,14 @@ var file_grep_exports = {};
 __export(file_grep_exports, {
   grepProjectFiles: () => grepProjectFiles
 });
-import { execSync as execSync2 } from "child_process";
-import { readFileSync as readFileSync3, readdirSync as readdirSync2, statSync as statSync2, existsSync as existsSync5 } from "fs";
-import path6 from "path";
+import { execSync as execSync3 } from "child_process";
+import { readFileSync as readFileSync4, readdirSync as readdirSync2, statSync as statSync2, existsSync as existsSync6 } from "fs";
+import path7 from "path";
 import crypto2 from "crypto";
 function hasRipgrep() {
   if (_hasRg === null) {
     try {
-      execSync2("rg --version", { stdio: "ignore", timeout: 2e3 });
+      execSync3("rg --version", { stdio: "ignore", timeout: 2e3 });
       _hasRg = true;
     } catch {
       _hasRg = false;
@@ -2790,7 +2884,7 @@ async function grepProjectFiles(query, projectRoot, options) {
       session_id: "file-grep",
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       tool_name: "file_grep",
-      project_name: path6.basename(projectRoot),
+      project_name: path7.basename(projectRoot),
       has_error: false,
       raw_text: `${prefix} ${buildSnippet(hit, projectRoot)}`,
       vector: null,
@@ -2802,7 +2896,7 @@ function getChunkContext(filePath, lineNumber) {
   try {
     const ext = filePath.split(".").pop()?.toLowerCase();
     if (ext !== "ts" && ext !== "tsx" && ext !== "js" && ext !== "jsx") return "";
-    const source = readFileSync3(filePath, "utf8");
+    const source = readFileSync4(filePath, "utf8");
     const lines = source.split("\n");
     for (let i = Math.min(lineNumber - 1, lines.length - 1); i >= 0; i--) {
       const line = lines[i];
@@ -2821,7 +2915,7 @@ function grepWithRipgrep(pattern, projectRoot, patterns) {
   const globs = (patterns ?? DEFAULT_PATTERNS).map((p) => `--glob '${p}'`).join(" ");
   const excludes = EXCLUDE_DIRS.map((d) => `--glob '!${d}'`).join(" ");
   const cmd = `rg -i -c --hidden --no-config --no-ignore '${pattern.replace(/'/g, "\\'")}' . ${globs} ${excludes} --max-filesize ${MAX_FILE_SIZE} 2>/dev/null || true`;
-  const output = execSync2(cmd, {
+  const output = execSync3(cmd, {
     cwd: projectRoot,
     encoding: "utf8",
     timeout: 3e3,
@@ -2836,12 +2930,12 @@ function grepWithRipgrep(pattern, projectRoot, patterns) {
     const matchCount = parseInt(line.slice(colonIdx + 1));
     if (isNaN(matchCount) || matchCount === 0) continue;
     try {
-      const firstMatch = execSync2(
+      const firstMatch = execSync3(
         `rg -i -n --hidden '${pattern.replace(/'/g, "\\'")}' '${filePath}' --max-count 1 2>/dev/null | head -1`,
         { cwd: projectRoot, encoding: "utf8", timeout: 1e3 }
       ).trim();
       const lineNum = parseInt(firstMatch.split(":")[0] ?? "1");
-      const totalLines = execSync2(`wc -l < '${filePath}'`, {
+      const totalLines = execSync3(`wc -l < '${filePath}'`, {
         cwd: projectRoot,
         encoding: "utf8",
         timeout: 1e3
@@ -2864,11 +2958,11 @@ function grepWithNodeFs(pattern, projectRoot, patterns) {
   const files = collectFiles(projectRoot, patterns ?? DEFAULT_PATTERNS);
   const hits = [];
   for (const filePath of files.slice(0, MAX_FILES)) {
-    const absPath = path6.join(projectRoot, filePath);
+    const absPath = path7.join(projectRoot, filePath);
     try {
       const stat = statSync2(absPath);
       if (stat.size > MAX_FILE_SIZE) continue;
-      const content = readFileSync3(absPath, "utf8");
+      const content = readFileSync4(absPath, "utf8");
       const lines = content.split("\n");
       const matches = content.match(regex);
       if (!matches || matches.length === 0) continue;
@@ -2891,15 +2985,15 @@ function collectFiles(root, patterns) {
   const files = [];
   function walk(dir, relative) {
     if (files.length >= MAX_FILES) return;
-    const basename = path6.basename(dir);
+    const basename = path7.basename(dir);
     if (EXCLUDE_DIRS.includes(basename)) return;
     try {
       const entries = readdirSync2(dir, { withFileTypes: true });
       for (const entry of entries) {
         if (files.length >= MAX_FILES) return;
-        const rel = path6.join(relative, entry.name);
+        const rel = path7.join(relative, entry.name);
         if (entry.isDirectory()) {
-          walk(path6.join(dir, entry.name), rel);
+          walk(path7.join(dir, entry.name), rel);
         } else if (entry.isFile()) {
           for (const pat of patterns) {
             if (matchGlob(rel, pat)) {
@@ -2931,7 +3025,7 @@ function matchGlob(filePath, pattern) {
   if (slashIdx !== -1) {
     const dir = pattern.slice(0, slashIdx);
     const ext2 = pattern.slice(slashIdx + 1).replace("*", "");
-    const fileDir = path6.dirname(filePath);
+    const fileDir = path7.dirname(filePath);
     return fileDir === dir && filePath.endsWith(ext2);
   }
   const ext = pattern.replace("*", "");
@@ -2939,9 +3033,9 @@ function matchGlob(filePath, pattern) {
 }
 function buildSnippet(hit, projectRoot) {
   try {
-    const absPath = path6.join(projectRoot, hit.filePath);
-    if (!existsSync5(absPath)) return hit.matchLine;
-    const lines = readFileSync3(absPath, "utf8").split("\n");
+    const absPath = path7.join(projectRoot, hit.filePath);
+    if (!existsSync6(absPath)) return hit.matchLine;
+    const lines = readFileSync4(absPath, "utf8").split("\n");
     const start = Math.max(0, hit.lineNumber - 3);
     const end = Math.min(lines.length, hit.lineNumber + 2);
     return lines.slice(start, end).join("\n").slice(0, 500);
@@ -2975,8 +3069,8 @@ __export(reranker_exports, {
   rerank: () => rerank,
   rerankWithScores: () => rerankWithScores
 });
-import path7 from "path";
-import { existsSync as existsSync6 } from "fs";
+import path8 from "path";
+import { existsSync as existsSync7 } from "fs";
 function resetIdleTimer() {
   if (_idleTimer) clearTimeout(_idleTimer);
   _idleTimer = setTimeout(() => {
@@ -2987,18 +3081,18 @@ function resetIdleTimer() {
   }
 }
 function isRerankerAvailable() {
-  return existsSync6(path7.join(MODELS_DIR, RERANKER_MODEL_FILE));
+  return existsSync7(path8.join(MODELS_DIR, RERANKER_MODEL_FILE));
 }
 function getRerankerModelPath() {
-  return path7.join(MODELS_DIR, RERANKER_MODEL_FILE);
+  return path8.join(MODELS_DIR, RERANKER_MODEL_FILE);
 }
 async function ensureLoaded() {
   if (_rerankerContext) {
     resetIdleTimer();
     return;
   }
-  const modelPath = path7.join(MODELS_DIR, RERANKER_MODEL_FILE);
-  if (!existsSync6(modelPath)) {
+  const modelPath = path8.join(MODELS_DIR, RERANKER_MODEL_FILE);
+  if (!existsSync7(modelPath)) {
     throw new Error(
       `Reranker model not found at ${modelPath}. Run /exe-setup to download it.`
     );
@@ -3195,6 +3289,8 @@ async function hybridSearch(queryText, agentId, options) {
     return lightweightSearch(queryText, agentId, options);
   }
   const limit = options?.limit ?? 10;
+  const trajectoryResults = await trajectoryBypass(queryText, agentId, options, limit);
+  if (trajectoryResults !== null) return trajectoryResults;
   let effectiveQuery = queryText;
   let effectiveOptions = { ...options };
   let _isBroadQuery = false;
@@ -3418,6 +3514,8 @@ async function lightweightSearch(queryText, agentId, options) {
 async function ftsQuery(client, matchExpr, agentId, options, limit) {
   const statusFilter = options?.includeArchived ? "" : `
                AND COALESCE(m.status, 'active') = 'active'`;
+  const draftFilter = options?.includeDrafts ? "" : `
+               AND (m.draft = 0 OR m.draft IS NULL)`;
   let sql = `SELECT m.id, m.agent_id, m.agent_role, m.session_id, m.timestamp,
                     m.tool_name, m.project_name,
                     m.has_error, m.raw_text, m.vector, m.task_id,
@@ -3428,7 +3526,7 @@ async function ftsQuery(client, matchExpr, agentId, options, limit) {
              FROM memories m
              JOIN memories_fts fts ON m.rowid = fts.rowid
              WHERE memories_fts MATCH ?
-               AND m.agent_id = ?${statusFilter}
+               AND m.agent_id = ?${statusFilter}${draftFilter}
                AND COALESCE(m.confidence, 0.7) >= 0.3`;
   const args = [matchExpr, agentId];
   const scope = buildWikiScopeFilter(options, "m.");
@@ -3450,6 +3548,10 @@ async function ftsQuery(client, matchExpr, agentId, options, limit) {
     sql += ` AND m.timestamp >= ?`;
     args.push(options.since);
   }
+  if (options?.memoryType) {
+    sql += ` AND m.memory_type = ?`;
+    args.push(options.memoryType);
+  }
   sql += ` ORDER BY rank LIMIT ?`;
   args.push(limit);
   const result = await client.execute({ sql, args });
@@ -3482,6 +3584,8 @@ async function recentRecords(agentId, options, limit) {
   const client = getClient();
   const statusFilter = options?.includeArchived ? "" : `
                AND COALESCE(status, 'active') = 'active'`;
+  const draftFilter = options?.includeDrafts ? "" : `
+               AND (draft = 0 OR draft IS NULL)`;
   let sql = `SELECT id, agent_id, agent_role, session_id, timestamp,
                     tool_name, project_name,
                     has_error, raw_text, vector, task_id,
@@ -3490,7 +3594,7 @@ async function recentRecords(agentId, options, limit) {
                     char_offset, page_number,
                     source_path, source_type
              FROM memories
-             WHERE agent_id = ?${statusFilter}
+             WHERE agent_id = ?${statusFilter}${draftFilter}
                AND COALESCE(confidence, 0.7) >= 0.3`;
   const args = [agentId];
   const scope = buildWikiScopeFilter(options, "");
@@ -3512,6 +3616,10 @@ async function recentRecords(agentId, options, limit) {
     sql += ` AND timestamp >= ?`;
     args.push(options.since);
   }
+  if (options?.memoryType) {
+    sql += ` AND memory_type = ?`;
+    args.push(options.memoryType);
+  }
   sql += ` ORDER BY timestamp DESC LIMIT ?`;
   args.push(limit);
   const result = await client.execute({ sql, args });
@@ -3540,25 +3648,107 @@ async function recentRecords(agentId, options, limit) {
     source_type: row.source_type ?? null
   }));
 }
+var KNOWN_TOOLS = /* @__PURE__ */ new Set([
+  "Bash",
+  "Read",
+  "Write",
+  "Edit",
+  "Grep",
+  "Glob",
+  "Agent",
+  "Skill",
+  "WebSearch",
+  "WebFetch"
+]);
+function detectToolQuery(query) {
+  const lower = query.toLowerCase().trim();
+  for (const tool of KNOWN_TOOLS) {
+    if (lower === tool.toLowerCase()) return tool;
+    if (lower.startsWith(tool.toLowerCase() + " ")) return tool;
+    if (lower.includes(`tool:${tool.toLowerCase()}`)) return tool;
+  }
+  return null;
+}
+async function trajectoryBypass(queryText, agentId, options, limit) {
+  const toolName = detectToolQuery(queryText);
+  if (!toolName) return null;
+  try {
+    const client = getClient();
+    const statusFilter = options?.includeArchived ? "" : `
+               AND COALESCE(status, 'active') = 'active'`;
+    const draftFilter = options?.includeDrafts ? "" : `
+               AND (draft = 0 OR draft IS NULL)`;
+    let sql = `SELECT id, agent_id, agent_role, session_id, timestamp,
+                      tool_name, project_name,
+                      has_error, raw_text, vector, task_id,
+                      importance, status, confidence, last_accessed,
+                      workspace_id, document_id, user_id,
+                      char_offset, page_number,
+                      source_path, source_type
+               FROM memories
+               WHERE trajectory IS NOT NULL
+                 AND json_extract(trajectory, '$.tool') = ?
+                 AND agent_id = ?${statusFilter}${draftFilter}`;
+    const args = [toolName, agentId];
+    if (options?.projectName) {
+      sql += ` AND project_name = ?`;
+      args.push(options.projectName);
+    }
+    if (options?.since) {
+      sql += ` AND timestamp >= ?`;
+      args.push(options.since);
+    }
+    sql += ` ORDER BY timestamp DESC LIMIT ?`;
+    args.push(limit);
+    const result = await client.execute({ sql, args });
+    if (result.rows.length < 3) return null;
+    return result.rows.map((row) => ({
+      id: row.id,
+      agent_id: row.agent_id,
+      agent_role: row.agent_role,
+      session_id: row.session_id,
+      timestamp: row.timestamp,
+      tool_name: row.tool_name,
+      project_name: row.project_name,
+      has_error: row.has_error === 1,
+      raw_text: row.raw_text,
+      vector: row.vector == null ? [] : Array.isArray(row.vector) ? row.vector : Array.from(row.vector),
+      task_id: row.task_id ?? null,
+      importance: row.importance ?? 5,
+      status: row.status ?? "active",
+      confidence: row.confidence ?? 0.7,
+      last_accessed: row.last_accessed ?? row.timestamp,
+      workspace_id: row.workspace_id ?? null,
+      document_id: row.document_id ?? null,
+      user_id: row.user_id ?? null,
+      char_offset: row.char_offset ?? null,
+      page_number: row.page_number ?? null,
+      source_path: row.source_path ?? null,
+      source_type: row.source_type ?? null
+    }));
+  } catch {
+    return null;
+  }
+}
 
 // src/adapters/claude/hooks/error-recall.ts
 init_database();
 
 // src/adapters/claude/active-agent.ts
 init_config();
-import { readFileSync as readFileSync4, writeFileSync, mkdirSync as mkdirSync2, unlinkSync as unlinkSync2, readdirSync as readdirSync3 } from "fs";
-import { execSync as execSync4 } from "child_process";
-import path8 from "path";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2, unlinkSync as unlinkSync3, readdirSync as readdirSync3 } from "fs";
+import { execSync as execSync5 } from "child_process";
+import path9 from "path";
 
 // src/lib/session-key.ts
-import { execSync as execSync3 } from "child_process";
+import { execSync as execSync4 } from "child_process";
 var _cached2 = null;
 function getSessionKey() {
   if (_cached2) return _cached2;
   let pid = process.ppid;
   for (let i = 0; i < 10; i++) {
     try {
-      const info = execSync3(`ps -p ${pid} -o ppid=,comm=`, {
+      const info = execSync4(`ps -p ${pid} -o ppid=,comm=`, {
         encoding: "utf8",
         timeout: 2e3
       }).trim();
@@ -3580,22 +3770,65 @@ function getSessionKey() {
 }
 
 // src/adapters/claude/active-agent.ts
-var CACHE_DIR = path8.join(EXE_AI_DIR, "session-cache");
+init_employees();
+var CACHE_DIR = path9.join(EXE_AI_DIR, "session-cache");
 var STALE_MS = 24 * 60 * 60 * 1e3;
+function isNameWithOptionalInstance(candidate, baseName) {
+  if (candidate === baseName) return true;
+  if (!candidate.startsWith(baseName)) return false;
+  return /^\d+$/.test(candidate.slice(baseName.length));
+}
+function resolveEmployeeFromSessionPrefix(prefix, employees) {
+  const sorted = [...employees].sort((a, b) => b.name.length - a.name.length);
+  for (const employee of sorted) {
+    if (isNameWithOptionalInstance(prefix, employee.name)) {
+      return { agentId: employee.name, agentRole: employee.role };
+    }
+  }
+  return null;
+}
+function resolveActiveAgentFromTmuxSession(sessionName) {
+  const employees = loadEmployeesSync();
+  const coordinator = getCoordinatorEmployee(employees);
+  const coordinatorName = coordinator?.name ?? DEFAULT_COORDINATOR_TEMPLATE_NAME;
+  if (isNameWithOptionalInstance(sessionName, coordinatorName)) {
+    return {
+      agentId: coordinatorName,
+      agentRole: coordinator?.role ?? "COO"
+    };
+  }
+  if (isNameWithOptionalInstance(sessionName, DEFAULT_COORDINATOR_TEMPLATE_NAME)) {
+    return {
+      agentId: coordinator?.name ?? DEFAULT_COORDINATOR_TEMPLATE_NAME,
+      agentRole: coordinator?.role ?? "COO"
+    };
+  }
+  if (sessionName.includes("-")) {
+    const prefix = sessionName.split("-")[0] ?? "";
+    const employee = resolveEmployeeFromSessionPrefix(prefix, employees);
+    if (employee) return employee;
+    const legacy = prefix.match(/^([a-zA-Z]+)\d*$/);
+    if (legacy?.[1] && legacy[1] !== DEFAULT_COORDINATOR_TEMPLATE_NAME) {
+      const emp = getEmployee(employees, legacy[1]);
+      return { agentId: emp?.name ?? legacy[1], agentRole: emp?.role ?? "employee" };
+    }
+  }
+  return null;
+}
 function getMarkerPath() {
-  return path8.join(CACHE_DIR, `active-agent-${getSessionKey()}.json`);
+  return path9.join(CACHE_DIR, `active-agent-${getSessionKey()}.json`);
 }
 function getActiveAgent() {
   try {
     const markerPath = getMarkerPath();
-    const raw = readFileSync4(markerPath, "utf8");
+    const raw = readFileSync5(markerPath, "utf8");
     const data = JSON.parse(raw);
     if (data.agentId) {
       if (data.startedAt) {
         const age = Date.now() - new Date(data.startedAt).getTime();
         if (age > STALE_MS) {
           try {
-            unlinkSync2(markerPath);
+            unlinkSync3(markerPath);
           } catch {
           }
         } else {
@@ -3614,17 +3847,12 @@ function getActiveAgent() {
   } catch {
   }
   try {
-    const sessionName = execSync4(
+    const sessionName = execSync5(
       "tmux display-message -p '#{session_name}' 2>/dev/null",
       { encoding: "utf8", timeout: 2e3 }
     ).trim();
-    const empMatch = sessionName.match(/^([a-zA-Z]+)\d*-exe\d+$/);
-    if (empMatch && empMatch[1] !== "exe") {
-      return { agentId: empMatch[1], agentRole: "employee" };
-    }
-    if (/^exe\d+$/.test(sessionName)) {
-      return { agentId: "exe", agentRole: "COO" };
-    }
+    const resolved = resolveActiveAgentFromTmuxSession(sessionName);
+    if (resolved) return resolved;
   } catch {
   }
   return {