@hasna/assistants 1.1.86 → 1.1.87

package/dist/index.js

@@ -740,7 +740,8 @@ var init_config = __esm(async () => {
       customPath: null
     },
     permissions: {
-      bash: "readonly"
+      bash: "readonly",
+      mode: "normal"
     },
     backgroundModel: "claude-haiku-4-5-20251001"
   };
@@ -54652,10 +54653,143 @@ var init_loader3 = __esm(() => {
   init_src2();
   import_fast_glob = __toESM(require_out4(), 1);
 });
+
+// packages/core/src/extensions/loader.ts
+import { join as join22 } from "path";
+import { homedir as homedir19 } from "os";
+import { stat as stat6, readdir } from "fs/promises";
+
+class ExtensionLoader {
+  extensions = new Map;
+  loadResults = [];
+  async loadAll(cwd, toolRegistry, commandLoader, config) {
+    this.extensions.clear();
+    this.loadResults = [];
+    const envHome = process.env.HOME || process.env.USERPROFILE;
+    const userHome = envHome && envHome.trim().length > 0 ? envHome : homedir19();
+    const globalDir = join22(userHome, ".assistants", "extensions");
+    const projectDir = join22(cwd, ".assistants", "extensions");
+    await this.discoverExtensions(globalDir);
+    await this.discoverExtensions(projectDir);
+    const results = [];
+    for (const extension2 of this.extensions.values()) {
+      const result = await this.setupExtension(extension2, toolRegistry, commandLoader, config, cwd);
+      results.push(result);
+    }
+    this.loadResults = results;
+    return results;
+  }
+  async discoverExtensions(dir) {
+    try {
+      const stats = await stat6(dir);
+      if (!stats.isDirectory())
+        return;
+    } catch {
+      return;
+    }
+    let entries;
+    try {
+      entries = await readdir(dir);
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (entry.startsWith(".") || entry === "node_modules")
+        continue;
+      const extDir = join22(dir, entry);
+      try {
+        const extStats = await stat6(extDir);
+        if (!extStats.isDirectory())
+          continue;
+      } catch {
+        continue;
+      }
+      const extension2 = await this.loadExtensionModule(extDir, entry);
+      if (extension2) {
+        this.extensions.set(extension2.name, extension2);
+      }
+    }
+  }
+  async loadExtensionModule(dir, fallbackName) {
+    const candidates = ["index.ts", "index.js"];
+    for (const filename of candidates) {
+      const filePath = join22(dir, filename);
+      try {
+        const fileStats = await stat6(filePath);
+        if (!fileStats.isFile())
+          continue;
+      } catch {
+        continue;
+      }
+      try {
+        const mod = await import(filePath);
+        const ext = mod.default ?? mod;
+        if (!ext || typeof ext.name !== "string" || typeof ext.version !== "string" || typeof ext.setup !== "function") {
+          this.loadResults.push({
+            name: fallbackName,
+            version: "0.0.0",
+            success: false,
+            error: `Extension at ${filePath} does not export a valid Extension (requires name, version, setup)`
+          });
+          return null;
+        }
+        return ext;
+      } catch (error2) {
+        const message = error2 instanceof Error ? error2.message : String(error2);
+        this.loadResults.push({
+          name: fallbackName,
+          version: "0.0.0",
+          success: false,
+          error: `Failed to import ${filePath}: ${message}`
+        });
+        return null;
+      }
+    }
+    return null;
+  }
+  async setupExtension(extension2, toolRegistry, commandLoader, config, cwd) {
+    const context = {
+      registerTool: (tool, executor2) => {
+        toolRegistry.register(tool, executor2);
+      },
+      registerCommand: (command) => {
+        commandLoader.register(command);
+      },
+      config,
+      cwd
+    };
+    try {
+      await extension2.setup(context);
+      return {
+        name: extension2.name,
+        version: extension2.version,
+        success: true
+      };
+    } catch (error2) {
+      const message = error2 instanceof Error ? error2.message : String(error2);
+      return {
+        name: extension2.name,
+        version: extension2.version,
+        success: false,
+        error: `setup() failed: ${message}`
+      };
+    }
+  }
+  getExtensions() {
+    return Array.from(this.extensions.values());
+  }
+  getExtension(name) {
+    return this.extensions.get(name);
+  }
+  getLoadResults() {
+    return this.loadResults;
+  }
+}
+var init_loader4 = () => {};
 // packages/core/src/commands/loader.ts
 import { existsSync as existsSync15, readdirSync as readdirSync6, statSync as statSync4 } from "fs";
-import { join as join22, basename as basename6, extname as extname3 } from "path";
-import { homedir as homedir19 } from "os";
+import { join as join23, basename as basename6, extname as extname3 } from "path";
+import { homedir as homedir20 } from "os";
 
 class CommandLoader {
   commands = new Map;
@@ -54666,10 +54800,10 @@ class CommandLoader {
   async loadAll() {
     this.commands.clear();
     const envHome = process.env.HOME || process.env.USERPROFILE;
-    const homeDir = envHome && envHome.trim().length > 0 ? envHome : homedir19();
-    const globalDir = join22(homeDir, ".assistants", "commands");
+    const homeDir = envHome && envHome.trim().length > 0 ? envHome : homedir20();
+    const globalDir = join23(homeDir, ".assistants", "commands");
     await this.loadFromDirectory(globalDir, "global");
-    const projectDir = join22(this.cwd, ".assistants", "commands");
+    const projectDir = join23(this.cwd, ".assistants", "commands");
     await this.loadFromDirectory(projectDir, "project");
   }
   async loadFromDirectory(dir, source, prefix = "") {
@@ -54677,12 +54811,12 @@ class CommandLoader {
       return;
     const entries = readdirSync6(dir);
     for (const entry of entries) {
-      const fullPath = join22(dir, entry);
-      const stat6 = statSync4(fullPath);
-      if (stat6.isDirectory()) {
+      const fullPath = join23(dir, entry);
+      const stat7 = statSync4(fullPath);
+      if (stat7.isDirectory()) {
         const newPrefix = prefix ? `${prefix}:${entry}` : entry;
         await this.loadFromDirectory(fullPath, source, newPrefix);
-      } else if (stat6.isFile() && extname3(entry) === ".md") {
+      } else if (stat7.isFile() && extname3(entry) === ".md") {
         const command = await this.loadCommandFile(fullPath, prefix);
         if (command) {
           this.commands.set(command.name, command);
@@ -54800,7 +54934,7 @@ class CommandLoader {
     return this.getCommands().filter((cmd) => cmd.name.toLowerCase().startsWith(lower) || cmd.description.toLowerCase().includes(lower) || cmd.aliases?.some((alias) => alias.toLowerCase().startsWith(lower)));
   }
 }
-var init_loader4 = __esm(async () => {
+var init_loader5 = __esm(async () => {
   await init_runtime();
 });
 
@@ -55745,7 +55879,7 @@ var init_types4 = __esm(() => {
 // node_modules/.pnpm/@hasna+todos@0.9.23_@types+react@19.2.14/node_modules/@hasna/todos/dist/index.js
 import { Database as Database2 } from "bun:sqlite";
 import { existsSync as existsSync16, mkdirSync as mkdirSync8 } from "fs";
-import { dirname as dirname11, join as join23, resolve as resolve10 } from "path";
+import { dirname as dirname11, join as join24, resolve as resolve10 } from "path";
 import { existsSync as existsSync32 } from "fs";
 import { join as join32 } from "path";
 import { existsSync as existsSync22, mkdirSync as mkdirSync22, readFileSync as readFileSync8, readdirSync as readdirSync7, statSync as statSync5, writeFileSync as writeFileSync7 } from "fs";
@@ -55755,7 +55889,7 @@ function isInMemoryDb(path3) {
 function findNearestTodosDb(startDir) {
   let dir = resolve10(startDir);
   while (true) {
-    const candidate = join23(dir, ".todos", "todos.db");
+    const candidate = join24(dir, ".todos", "todos.db");
     if (existsSync16(candidate))
       return candidate;
     const parent = dirname11(dir);
@@ -55768,7 +55902,7 @@ function findNearestTodosDb(startDir) {
 function findGitRoot(startDir) {
   let dir = resolve10(startDir);
   while (true) {
-    if (existsSync16(join23(dir, ".git")))
+    if (existsSync16(join24(dir, ".git")))
       return dir;
     const parent = dirname11(dir);
     if (parent === dir)
@@ -55788,11 +55922,11 @@ function getDbPath() {
   if (process.env["TODOS_DB_SCOPE"] === "project") {
     const gitRoot = findGitRoot(cwd);
     if (gitRoot) {
-      return join23(gitRoot, ".todos", "todos.db");
+      return join24(gitRoot, ".todos", "todos.db");
     }
   }
   const home = process.env["HOME"] || process.env["USERPROFILE"] || "~";
-  return join23(home, ".todos", "todos.db");
+  return join24(home, ".todos", "todos.db");
 }
 function ensureDir(filePath) {
   if (isInMemoryDb(filePath))
@@ -86761,8 +86895,8 @@ var require_core4 = __commonJS((exports) => {
   function many1(p) {
     return ab(p, many(p), (head, tail) => [head, ...tail]);
   }
-  function ab(pa, pb, join24) {
-    return (data, i) => mapOuter(pa(data, i), (ma) => mapInner(pb(data, ma.position), (vb, j) => join24(ma.value, vb, data, i, j)));
+  function ab(pa, pb, join25) {
+    return (data, i) => mapOuter(pa(data, i), (ma) => mapInner(pb(data, ma.position), (vb, j) => join25(ma.value, vb, data, i, j)));
   }
   function left(pa, pb) {
     return ab(pa, pb, (va) => va);
@@ -86770,8 +86904,8 @@ var require_core4 = __commonJS((exports) => {
   function right(pa, pb) {
     return ab(pa, pb, (va, vb) => vb);
   }
-  function abc(pa, pb, pc, join24) {
-    return (data, i) => mapOuter(pa(data, i), (ma) => mapOuter(pb(data, ma.position), (mb) => mapInner(pc(data, mb.position), (vc, j) => join24(ma.value, mb.value, vc, data, i, j))));
+  function abc(pa, pb, pc, join25) {
+    return (data, i) => mapOuter(pa(data, i), (ma) => mapOuter(pb(data, ma.position), (mb) => mapInner(pc(data, mb.position), (vc, j) => join25(ma.value, mb.value, vc, data, i, j))));
   }
   function middle(pa, pb, pc) {
     return abc(pa, pb, pc, (ra, rb) => rb);
@@ -95485,7 +95619,7 @@ var init_email_parser = __esm(() => {
 });
 
 // packages/core/src/workspace/shared.ts
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 import {
   existsSync as existsSync17,
   mkdirSync as mkdirSync9,
@@ -95519,7 +95653,7 @@ class SharedWorkspaceManager {
   basePath;
   db;
   constructor(basePath, db) {
-    this.basePath = basePath || join24(getConfigDir(), "workspaces");
+    this.basePath = basePath || join25(getConfigDir(), "workspaces");
     this.db = db || getDb6();
     this.ensureDir();
     this.migrateAgentsToAssistants();
@@ -95533,9 +95667,9 @@ class SharedWorkspaceManager {
     try {
       const dirs = readdirSync8(this.basePath, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
       for (const dir of dirs) {
-        const wsPath = join24(this.basePath, dir);
-        const oldAgentsDir = join24(wsPath, "agents");
-        const newAssistantsDir = join24(wsPath, "assistants");
+        const wsPath = join25(this.basePath, dir);
+        const oldAgentsDir = join25(wsPath, "agents");
+        const newAssistantsDir = join25(wsPath, "assistants");
         if (existsSync17(oldAgentsDir) && !existsSync17(newAssistantsDir)) {
           renameSync(oldAgentsDir, newAssistantsDir);
         }
@@ -95543,7 +95677,7 @@ class SharedWorkspaceManager {
     } catch {}
   }
   getWorkspacePath(id) {
-    return join24(this.basePath, id);
+    return join25(this.basePath, id);
   }
   create(name, createdBy, participants, description) {
     const id = `ws_${generateId().slice(0, 8)}`;
@@ -95561,9 +95695,9 @@ class SharedWorkspaceManager {
       status: "active"
     };
     const wsPath = this.getWorkspacePath(id);
-    mkdirSync9(join24(wsPath, "shared"), { recursive: true });
+    mkdirSync9(join25(wsPath, "shared"), { recursive: true });
     for (const assistantId of allParticipants) {
-      mkdirSync9(join24(wsPath, "assistants", assistantId), { recursive: true });
+      mkdirSync9(join25(wsPath, "assistants", assistantId), { recursive: true });
     }
     this.db.prepare(`INSERT INTO workspaces (id, name, description, creator_id, creator_name, status, participants, created_at, updated_at)
        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, name, description || null, createdBy, createdBy, "active", JSON.stringify(allParticipants), nowIso, nowIso);
@@ -95579,7 +95713,7 @@ class SharedWorkspaceManager {
       workspace.updatedAt = Date.now();
       this.db.prepare("UPDATE workspaces SET participants = ?, updated_at = ? WHERE id = ?").run(JSON.stringify(workspace.participants), new Date(workspace.updatedAt).toISOString(), workspaceId);
     }
-    const assistantDir = join24(this.getWorkspacePath(workspaceId), "assistants", assistantId);
+    const assistantDir = join25(this.getWorkspacePath(workspaceId), "assistants", assistantId);
     if (!existsSync17(assistantDir)) {
       mkdirSync9(assistantDir, { recursive: true });
     }
@@ -95594,10 +95728,10 @@ class SharedWorkspaceManager {
     return this.getWorkspacePath(workspaceId);
   }
   getSharedPath(workspaceId) {
-    return join24(this.getWorkspacePath(workspaceId), "shared");
+    return join25(this.getWorkspacePath(workspaceId), "shared");
   }
   getAssistantPath(workspaceId, assistantId) {
-    return join24(this.getWorkspacePath(workspaceId), "assistants", assistantId);
+    return join25(this.getWorkspacePath(workspaceId), "assistants", assistantId);
   }
   list(includeArchived = false) {
     const query = includeArchived ? "SELECT * FROM workspaces ORDER BY updated_at DESC" : "SELECT * FROM workspaces WHERE status = 'active' ORDER BY updated_at DESC";
@@ -95630,7 +95764,7 @@ var init_shared2 = __esm(async () => {
 });
 
 // packages/core/src/workspace/active.ts
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 import { existsSync as existsSync18, mkdirSync as mkdirSync10 } from "fs";
 function getDb7() {
   return getDatabase();
@@ -95639,7 +95773,7 @@ function isValidId2(id) {
   return typeof id === "string" && id.length > 0 && SAFE_ID_PATTERN3.test(id);
 }
 function getWorkspaceRoot(baseDir) {
-  return join25(baseDir ?? getConfigDir(), "workspaces");
+  return join26(baseDir ?? getConfigDir(), "workspaces");
 }
 function getActiveWorkspaceId(baseDir, db) {
   try {
@@ -95669,7 +95803,7 @@ function getWorkspaceDataDir(workspaceId, baseDir) {
   if (!isValidId2(workspaceId)) {
     throw new Error(`Invalid workspace id: "${workspaceId}"`);
   }
-  return join25(getWorkspaceRoot(baseDir), workspaceId, ".assistants");
+  return join26(getWorkspaceRoot(baseDir), workspaceId, ".assistants");
 }
 function ensureWorkspaceDataDir(workspaceId, baseDir) {
   const dir = getWorkspaceDataDir(workspaceId, baseDir);
@@ -100021,7 +100155,7 @@ var init_dispatcher = __esm(() => {
     maxQueueSize: 50,
     forbiddenTools: ["swarm_execute", "assistant_spawn"],
     defaultWorkerTools: ["bash", "read", "write", "edit", "glob", "grep"],
-    maxTurnsPerTask: 15
+    maxTurnsPerTask: 25
   };
 });
 
@@ -101506,8 +101640,8 @@ var init_swarm = __esm(() => {
 });
 
 // packages/core/src/commands/builtin.ts
-import { join as join26 } from "path";
-import { homedir as homedir20, platform as platform2, release, arch as arch2 } from "os";
+import { join as join27 } from "path";
+import { homedir as homedir21, platform as platform2, release, arch as arch2 } from "os";
 import { existsSync as existsSync19, mkdirSync as mkdirSync11, writeFileSync as writeFileSync8 } from "fs";
 function resolveAuthTimeout(resolve11) {
   resolve11({ exitCode: 1, stdout: { toString: () => "{}" } });
@@ -101614,11 +101748,14 @@ class BuiltinCommands {
     loader.register(this.callCommand());
     loader.register(this.ordersCommand());
     loader.register(this.tasksCommand());
+    loader.register(this.renameCommand());
     loader.register(this.setupCommand());
     loader.register(this.scriptsCommand());
     loader.register(this.exitCommand());
     loader.register(this.diffCommand());
     loader.register(this.undoCommand());
+    loader.register(this.treeCommand());
+    loader.register(this.modeCommand());
   }
   aboutCommand() {
     return {
@@ -106339,6 +106476,32 @@ Unknown workspace command. Use /workspace help for available commands.
       }
     };
   }
+  renameCommand() {
+    return {
+      name: "rename",
+      description: "Rename the current session (shortcut for /session rename)",
+      builtin: true,
+      selfHandled: true,
+      content: "",
+      handler: async (args, context) => {
+        const label = args.trim();
+        if (!label) {
+          context.emit("text", `
+Usage: /rename <name>
+Example: /rename auth-refactor
+`);
+          context.emit("done");
+          return { handled: true };
+        }
+        context.emit("done");
+        return {
+          handled: true,
+          sessionAction: "rename",
+          sessionLabel: label
+        };
+      }
+    };
+  }
   exitCommand() {
     return {
       name: "exit",
@@ -107885,8 +108048,8 @@ Options for install/uninstall:
 `;
           message += `| --- | --- | --- |
 `;
-          for (const stat6 of errorStats.slice(0, 5)) {
-            message += `| ${stat6.code} | ${stat6.count} | ${stat6.lastOccurrence} |
+          for (const stat7 of errorStats.slice(0, 5)) {
+            message += `| ${stat7.code} | ${stat7.count} | ${stat7.lastOccurrence} |
 `;
           }
         }
@@ -107937,9 +108100,9 @@ Format the summary as a brief bullet-point list. This summary will replace the c
         if (action === "show" || action === "paths") {
           const storageDir = context.getStorageDir?.() || getConfigDir();
           const configPaths = [
-            join26(context.cwd, ".assistants", "config.json"),
-            join26(context.cwd, ".assistants", "config.local.json"),
-            join26(storageDir, "config.json")
+            join27(context.cwd, ".assistants", "config.json"),
+            join27(context.cwd, ".assistants", "config.local.json"),
+            join27(storageDir, "config.json")
           ];
           let message = `
 **Configuration**
@@ -107953,16 +108116,16 @@ Format the summary as a brief bullet-point list. This summary will replace the c
 `;
           }
           const envHome = process.env.HOME || process.env.USERPROFILE;
-          const homeDir = envHome && envHome.trim().length > 0 ? envHome : homedir20();
+          const homeDir = envHome && envHome.trim().length > 0 ? envHome : homedir21();
           message += `
 **Commands Directories:**
 `;
-          message += `  - Project: ${join26(context.cwd, ".assistants", "commands")}
+          message += `  - Project: ${join27(context.cwd, ".assistants", "commands")}
 `;
-          message += `  - User/Workspace: ${join26(storageDir, "commands")}
+          message += `  - User/Workspace: ${join27(storageDir, "commands")}
 `;
-          if (storageDir !== join26(homeDir, ".assistants")) {
-            message += `  - Global fallback: ${join26(homeDir, ".assistants", "commands")}
+          if (storageDir !== join27(homeDir, ".assistants")) {
+            message += `  - Global fallback: ${join27(homeDir, ".assistants", "commands")}
 `;
           }
           context.emit("text", message);
@@ -108878,7 +109041,7 @@ ${error2 instanceof Error ? error2.message : String(error2)}
       selfHandled: true,
       content: "",
       handler: async (args, context) => {
-        const commandsDir = join26(context.cwd, ".assistants", "commands");
+        const commandsDir = join27(context.cwd, ".assistants", "commands");
         mkdirSync11(commandsDir, { recursive: true });
         const exampleCommand = `---
 name: reflect
@@ -108894,7 +109057,7 @@ Please summarize the last interaction and suggest 2-3 next steps.
 - Focus on clarity
 - Ask a follow-up question if needed
 `;
-        const examplePath = join26(commandsDir, "reflect.md");
+        const examplePath = join27(commandsDir, "reflect.md");
         if (!existsSync19(examplePath)) {
           writeFileSync8(examplePath, exampleCommand);
         }
@@ -109625,7 +109788,7 @@ Memory Statistics
           return { handled: true };
         }
         if (action === "export") {
-          const filePath = rest[0] || join26(context.getStorageDir?.() || getConfigDir(), "memories-export.json");
+          const filePath = rest[0] || join27(context.getStorageDir?.() || getConfigDir(), "memories-export.json");
           const memories = await manager.export();
           try {
             const content3 = JSON.stringify(memories, null, 2);
@@ -109843,7 +110006,7 @@ Importing ${validMemories.length} valid entries (skipping ${errors.length} inval
         const heartbeatConfig = context.getHeartbeatConfig?.() ?? null;
         const historyPathTemplate = heartbeatConfig?.historyPath;
         const storageDir = context.getStorageDir?.();
-        const runsDir = storageDir ? join26(storageDir, "heartbeats", "runs") : undefined;
+        const runsDir = storageDir ? join27(storageDir, "heartbeats", "runs") : undefined;
         if (!cleanedArgs || cleanedArgs === "ui") {
           context.emit("done");
           return { handled: true, showPanel: "heartbeat" };
@@ -110455,7 +110618,7 @@ Not a git repository or git not available.
       handler: async (_args, context) => {
         const { getProjectDataDir: getDataDir } = await init_config().then(() => exports_config);
         const { readdirSync: readdirSync9, statSync: statSync6 } = await import("fs");
-        const scriptsRoot = join26(getDataDir(context.cwd), "scripts", context.sessionId);
+        const scriptsRoot = join27(getDataDir(context.cwd), "scripts", context.sessionId);
         let entries = [];
         const walk = (dir, prefix) => {
           let items;
@@ -110465,15 +110628,15 @@ Not a git repository or git not available.
             return;
           }
           for (const item of items) {
-            const fullPath = join26(dir, item);
+            const fullPath = join27(dir, item);
             try {
-              const stat6 = statSync6(fullPath);
-              if (stat6.isDirectory()) {
+              const stat7 = statSync6(fullPath);
+              if (stat7.isDirectory()) {
                 walk(fullPath, prefix ? `${prefix}/${item}` : item);
               } else {
                 entries.push({
                   relativePath: prefix ? `${prefix}/${item}` : item,
-                  size: stat6.size
+                  size: stat7.size
                 });
               }
             } catch {}
@@ -110582,6 +110745,136 @@ Not a git repository or git not available.
       }
     };
   }
+  modeCommand() {
+    return {
+      name: "mode",
+      description: "Show or switch permission mode: normal, plan (read-only), auto (auto-accept)",
+      builtin: true,
+      selfHandled: true,
+      content: "",
+      handler: async (args, context) => {
+        const trimmedArgs = args.trim().toLowerCase();
+        if (!trimmedArgs) {
+          const current = context.getPermissionMode?.() ?? "normal";
+          let message = `
+**Permission Mode:** ${current}
+
+`;
+          message += `**Available modes:**
+`;
+          message += "  `normal`  \u2014 Standard behavior with per-tool permission checks\n";
+          message += "  `plan`    \u2014 Read-only mode. Only analysis tools allowed (read, glob, grep, web_search, etc.)\n";
+          message += "  `auto`    \u2014 Auto-accept all tool calls without confirmation\n\n";
+          message += "Switch with: `/mode plan`, `/mode normal`, or `/mode auto`\n";
+          context.emit("text", message);
+          context.emit("done");
+          return { handled: true };
+        }
+        const modeMap = {
+          normal: "normal",
+          plan: "plan",
+          auto: "auto-accept",
+          "auto-accept": "auto-accept"
+        };
+        const newMode = modeMap[trimmedArgs];
+        if (!newMode) {
+          context.emit("text", `
+Unknown mode "${trimmedArgs}". Valid modes: normal, plan, auto
+`);
+          context.emit("done");
+          return { handled: true };
+        }
+        context.setPermissionMode?.(newMode);
+        const labels = {
+          normal: "normal \u2014 standard tool permissions",
+          plan: "plan \u2014 read-only mode (write tools blocked)",
+          "auto-accept": "auto \u2014 all tool calls auto-accepted"
+        };
+        context.emit("text", `
+Switched to **${labels[newMode]}**
+`);
+        context.emit("done");
+        return { handled: true };
+      }
+    };
+  }
+  treeCommand() {
+    return {
+      name: "tree",
+      description: "Show session message history as a navigable tree",
+      builtin: true,
+      selfHandled: true,
+      content: "",
+      handler: async (_args, context) => {
+        const messages = context.messages;
+        if (!messages || messages.length === 0) {
+          context.emit("text", `
+No messages in the current session.
+`);
+          context.emit("done");
+          return { handled: true };
+        }
+        let output = `
+## Session Tree
+
+`;
+        const formatTimeAgo = (ts) => {
+          const diff = Date.now() - ts;
+          const seconds = Math.floor(diff / 1000);
+          if (seconds < 60)
+            return `${seconds}s ago`;
+          const minutes = Math.floor(seconds / 60);
+          if (minutes < 60)
+            return `${minutes}m ago`;
+          const hours = Math.floor(minutes / 60);
+          if (hours < 24)
+            return `${hours}h ago`;
+          const days = Math.floor(hours / 24);
+          return `${days}d ago`;
+        };
+        const preview = (text5) => {
+          const clean = text5.replace(/\n/g, " ").trim();
+          return clean.length > 50 ? clean.slice(0, 50) + "..." : clean;
+        };
+        for (let i = 0;i < messages.length; i++) {
+          const msg = messages[i];
+          const isLast = i === messages.length - 1;
+          const timeStr = msg.timestamp ? ` (${formatTimeAgo(msg.timestamp)})` : "";
+          if (msg.role === "user") {
+            const connector = isLast ? "\u2514\u2500" : "\u251C\u2500";
+            output += `${connector} [user] "${preview(msg.content)}"${timeStr}
+`;
+            let j = i + 1;
+            while (j < messages.length && messages[j].role === "assistant") {
+              const aMsg = messages[j];
+              const aTimeStr = aMsg.timestamp ? ` (${formatTimeAgo(aMsg.timestamp)})` : "";
+              const isLastAssistant = j + 1 >= messages.length || messages[j + 1].role !== "assistant";
+              const prefix = isLast ? "   " : "\u2502  ";
+              const aConnector = isLastAssistant ? "\u2514\u2500" : "\u251C\u2500";
+              output += `${prefix}${aConnector} [assistant] "${preview(aMsg.content)}"${aTimeStr}
+`;
+              j++;
+            }
+            i = j - 1;
+          } else if (msg.role === "system") {
+            const connector = isLast ? "\u2514\u2500" : "\u251C\u2500";
+            output += `${connector} [system] "${preview(msg.content)}"${timeStr}
+`;
+          } else {
+            const connector = isLast ? "\u2514\u2500" : "\u251C\u2500";
+            output += `${connector} [assistant] "${preview(msg.content)}"${timeStr}
+`;
+          }
+        }
+        output += `
+**Total messages:** ${messages.length}
+`;
+        context.emit("text", output);
+        context.emit("done");
+        return { handled: true };
+      }
+    };
+  }
   async resolveProject(context, target) {
     const byId = await readProject(context.cwd, target);
     if (byId)
@@ -110612,7 +110905,7 @@ Not a git repository or git not available.
     context.setProjectContext(projectContext);
   }
 }
-var VERSION2 = "1.1.86";
+var VERSION2 = "1.1.87";
 var init_builtin = __esm(async () => {
   init_src2();
   init_context3();
@@ -110637,7 +110930,7 @@ var init_builtin = __esm(async () => {
 // packages/core/src/commands/index.ts
 var init_commands = __esm(async () => {
   await __promiseAll([
-    init_loader4(),
+    init_loader5(),
     init_executor4(),
     init_builtin()
   ]);
@@ -116001,12 +116294,12 @@ var init_watchdog = __esm(async () => {
 });
 
 // packages/core/src/heartbeat/install-skills.ts
-import { join as join27 } from "path";
-import { homedir as homedir21 } from "os";
+import { join as join28 } from "path";
+import { homedir as homedir22 } from "os";
 async function writeSkillIfNeeded(dir, skillName, content3) {
   const { mkdir: mkdir7, writeFile: writeFile6, readFile: readFile7 } = await import("fs/promises");
-  const skillDir = join27(dir, `skill-${skillName}`);
-  const skillFile = join27(skillDir, "SKILL.md");
+  const skillDir = join28(dir, `skill-${skillName}`);
+  const skillFile = join28(skillDir, "SKILL.md");
   await mkdir7(skillDir, { recursive: true });
   try {
     const existing = await readFile7(skillFile, "utf-8");
@@ -116025,7 +116318,7 @@ async function writeSkillIfNeeded(dir, skillName, content3) {
   }
 }
 async function installHeartbeatSkills() {
-  const sharedSkillsDir = join27(homedir21(), ".skill");
+  const sharedSkillsDir = join28(homedir22(), ".skill");
   const installed = [];
   const results = await Promise.all([
     writeSkillIfNeeded(sharedSkillsDir, "main-loop", MAIN_LOOP_SKILL),
@@ -116188,7 +116481,7 @@ var init_llm_response = __esm(() => {
 // packages/core/src/voice/tts.ts
 import { spawnSync as spawnSync2 } from "child_process";
 import { tmpdir as tmpdir2 } from "os";
-import { join as join28 } from "path";
+import { join as join29 } from "path";
 import { readFileSync as readFileSync9, unlinkSync as unlinkSync3 } from "fs";
 
 class ElevenLabsTTS {
@@ -116380,7 +116673,7 @@ class SystemTTS {
       if (!say) {
         throw new Error('System TTS not available: missing "say" command.');
       }
-      const output = join28(tmpdir2(), `assistants-tts-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.aiff`);
+      const output = join29(tmpdir2(), `assistants-tts-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.aiff`);
       const args = [];
       if (this.voiceId) {
         args.push("-v", this.voiceId);
@@ -116402,7 +116695,7 @@ class SystemTTS {
     }
     const espeak = findExecutable("espeak") || findExecutable("espeak-ng");
     if (espeak) {
-      const output = join28(tmpdir2(), `assistants-tts-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.wav`);
+      const output = join29(tmpdir2(), `assistants-tts-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.wav`);
       const args = ["-w", output];
       if (this.voiceId) {
         args.push("-v", this.voiceId);
@@ -116432,7 +116725,7 @@ var init_tts = __esm(() => {
 // packages/core/src/voice/player.ts
 import { spawn as spawn2 } from "child_process";
 import { tmpdir as tmpdir3 } from "os";
-import { join as join29 } from "path";
+import { join as join30 } from "path";
 import { unlink as unlink2, writeFileSync as writeFileSync9, appendFileSync as appendFileSync3 } from "fs";
 
 class AudioPlayer {
@@ -116440,7 +116733,7 @@ class AudioPlayer {
   playing = false;
   async play(audio, options2 = {}) {
     const format = options2.format ?? "mp3";
-    const tempFile = join29(tmpdir3(), `assistants-audio-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.${format}`);
+    const tempFile = join30(tmpdir3(), `assistants-audio-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.${format}`);
     writeFileSync9(tempFile, Buffer.from(audio));
     const player = this.resolvePlayer(format);
     if (!player) {
@@ -116468,7 +116761,7 @@ class AudioPlayer {
   }
   async playStream(chunks, options2 = {}) {
     const format = options2.format ?? "mp3";
-    const tempFile = join29(tmpdir3(), `assistants-stream-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.${format}`);
+    const tempFile = join30(tmpdir3(), `assistants-stream-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.${format}`);
     writeFileSync9(tempFile, Buffer.alloc(0));
     for await (const chunk of chunks) {
       appendFileSync3(tempFile, Buffer.from(chunk));
@@ -116537,7 +116830,7 @@ var init_player = __esm(() => {
 // packages/core/src/voice/recorder.ts
 import { spawn as spawn3 } from "child_process";
 import { tmpdir as tmpdir4 } from "os";
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 import { readFileSync as readFileSync10, existsSync as existsSync20, unlink as unlink3 } from "fs";
 
 class AudioRecorder {
@@ -116551,7 +116844,7 @@ class AudioRecorder {
     const duration = options2.durationSeconds ?? 5;
     const sampleRate = options2.sampleRate ?? 16000;
     const channels = options2.channels ?? 1;
-    const output = join30(tmpdir4(), `assistants-record-${Date.now()}.wav`);
+    const output = join31(tmpdir4(), `assistants-record-${Date.now()}.wav`);
     this.currentOutputPath = output;
     this.stoppedIntentionally = false;
     const recorder = this.resolveRecorder(sampleRate, channels, duration, output);
@@ -116589,7 +116882,7 @@ class AudioRecorder {
     const sampleRate = options2.sampleRate ?? 16000;
     const channels = options2.channels ?? 1;
     const maxDuration = options2.durationSeconds ?? 30;
-    const output = join30(tmpdir4(), `assistants-record-${Date.now()}.wav`);
+    const output = join31(tmpdir4(), `assistants-record-${Date.now()}.wav`);
     this.currentOutputPath = output;
     this.stoppedIntentionally = false;
     const recorder = this.resolveVadRecorder(sampleRate, channels, maxDuration, output);
@@ -117009,7 +117302,7 @@ var init_manager3 = __esm(() => {
 // packages/core/src/identity/identity-manager.ts
 import { existsSync as existsSync21 } from "fs";
 import { mkdir as mkdir7, readFile as readFile7, writeFile as writeFile6, rm as rm2 } from "fs/promises";
-import { join as join31 } from "path";
+import { join as join33 } from "path";
 function isValidId3(id) {
   return typeof id === "string" && id.length > 0 && SAFE_ID_PATTERN4.test(id);
 }
@@ -117030,20 +117323,20 @@ class IdentityManager {
     this.basePath = basePath;
   }
   get identitiesRoot() {
-    return join31(this.basePath, "assistants", this.assistantId, "identities");
+    return join33(this.basePath, "assistants", this.assistantId, "identities");
   }
   get indexPath() {
-    return join31(this.identitiesRoot, "index.json");
+    return join33(this.identitiesRoot, "index.json");
   }
   get activePath() {
-    return join31(this.identitiesRoot, "active.json");
+    return join33(this.identitiesRoot, "active.json");
   }
   identityPath(id) {
     validateId(id, "identityId");
-    return join31(this.identitiesRoot, `${id}.json`);
+    return join33(this.identitiesRoot, `${id}.json`);
   }
   assistantConfigPath() {
-    return join31(this.basePath, "assistants", this.assistantId, "config.json");
+    return join33(this.basePath, "assistants", this.assistantId, "config.json");
   }
   async initialize() {
     await mkdir7(this.identitiesRoot, { recursive: true });
@@ -145124,8 +145417,8 @@ var require_signin = __commonJS((exports) => {
 // node_modules/.pnpm/@aws-sdk+credential-provider-login@3.972.8/node_modules/@aws-sdk/credential-provider-login/dist-es/LoginCredentialsFetcher.js
 import { createHash as createHash5, createPrivateKey, createPublicKey, sign } from "crypto";
 import { promises as fs2 } from "fs";
-import { homedir as homedir22 } from "os";
-import { dirname as dirname13, join as join33 } from "path";
+import { homedir as homedir23 } from "os";
+import { dirname as dirname13, join as join35 } from "path";
 var import_property_provider18, import_protocol_http11, import_shared_ini_file_loader6, LoginCredentialsFetcher;
 var init_LoginCredentialsFetcher = __esm(() => {
   import_property_provider18 = __toESM(require_dist_cjs17(), 1);
@@ -145285,10 +145578,10 @@ var init_LoginCredentialsFetcher = __esm(() => {
       await fs2.writeFile(tokenFilePath, JSON.stringify(token, null, 2), "utf8");
     }
     getTokenFilePath() {
-      const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join33(homedir22(), ".aws", "login", "cache");
+      const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join35(homedir23(), ".aws", "login", "cache");
       const loginSessionBytes = Buffer.from(this.loginSession, "utf8");
       const loginSessionSha256 = createHash5("sha256").update(loginSessionBytes).digest("hex");
-      return join33(directory, `${loginSessionSha256}.json`);
+      return join35(directory, `${loginSessionSha256}.json`);
     }
     derToRawSignature(derSignature) {
       let offset = 2;
@@ -149945,8 +150238,8 @@ var init_s3_client = __esm(() => {
 });
 
 // packages/core/src/inbox/storage/local-cache.ts
-import { join as join35, basename as basename7 } from "path";
-import { mkdir as mkdir8, readFile as readFile9, writeFile as writeFile8, rm as rm3, readdir, stat as stat6 } from "fs/promises";
+import { join as join36, basename as basename7 } from "path";
+import { mkdir as mkdir8, readFile as readFile9, writeFile as writeFile8, rm as rm3, readdir as readdir2, stat as stat7 } from "fs/promises";
 import { createHash as createHash6 } from "crypto";
 function isValidAssistantId(id) {
   return typeof id === "string" && id.length > 0 && STRICT_ID_PATTERN.test(id);
@@ -149986,15 +150279,15 @@ class LocalInboxCache {
     validateAssistantId(options2.assistantId);
     this.assistantId = options2.assistantId;
     this.basePath = options2.basePath;
-    this.cacheDir = join35(this.basePath, this.assistantId);
+    this.cacheDir = join36(this.basePath, this.assistantId);
     this.injectedDb = options2.db;
   }
   db() {
     return getDb11(this.injectedDb);
   }
   async ensureDirectories() {
-    await mkdir8(join35(this.cacheDir, "emails"), { recursive: true });
-    await mkdir8(join35(this.cacheDir, "attachments"), { recursive: true });
+    await mkdir8(join36(this.cacheDir, "emails"), { recursive: true });
+    await mkdir8(join36(this.cacheDir, "attachments"), { recursive: true });
   }
   async loadIndex() {
     const rows = this.db().query("SELECT * FROM inbox_cache WHERE assistant_id = ? ORDER BY date DESC").all(this.assistantId);
@@ -150022,7 +150315,7 @@ class LocalInboxCache {
       throw new Error(`Failed to create safe filename for email ID: "${email.id}"`);
     }
     await this.ensureDirectories();
-    const emailPath = join35(this.cacheDir, "emails", `${filename}.json`);
+    const emailPath = join36(this.cacheDir, "emails", `${filename}.json`);
     await writeFile8(emailPath, JSON.stringify(email, null, 2));
     const existing = this.db().query("SELECT * FROM inbox_cache WHERE id = ? AND assistant_id = ?").get(email.id, this.assistantId);
     if (existing) {
@@ -150041,7 +150334,7 @@ class LocalInboxCache {
     if (!isValidMappedFilename(filename))
       return null;
     try {
-      const emailPath = join35(this.cacheDir, "emails", `${filename}.json`);
+      const emailPath = join36(this.cacheDir, "emails", `${filename}.json`);
       const content3 = await readFile9(emailPath, "utf-8");
       return JSON.parse(content3);
     } catch {
@@ -150093,9 +150386,9 @@ class LocalInboxCache {
     if (!safeFilename) {
       throw new Error("Invalid attachment filename");
     }
-    const attachmentDir = join35(this.cacheDir, "attachments", emailFilename);
+    const attachmentDir = join36(this.cacheDir, "attachments", emailFilename);
     await mkdir8(attachmentDir, { recursive: true });
-    const attachmentPath = join35(attachmentDir, safeFilename);
+    const attachmentPath = join36(attachmentDir, safeFilename);
     await writeFile8(attachmentPath, content3);
     return attachmentPath;
   }
@@ -150109,8 +150402,8 @@ class LocalInboxCache {
       return null;
     }
     try {
-      const attachmentPath = join35(this.cacheDir, "attachments", emailFilename, safeFilename);
-      await stat6(attachmentPath);
+      const attachmentPath = join36(this.cacheDir, "attachments", emailFilename, safeFilename);
+      await stat7(attachmentPath);
       return attachmentPath;
     } catch {
       return null;
@@ -150132,10 +150425,10 @@ class LocalInboxCache {
       const filename = row.filename || emailIdToFilename(row.id);
       if (isValidMappedFilename(filename)) {
         try {
-          await rm3(join35(this.cacheDir, "emails", `${filename}.json`));
+          await rm3(join36(this.cacheDir, "emails", `${filename}.json`));
         } catch {}
         try {
-          await rm3(join35(this.cacheDir, "attachments", filename), { recursive: true });
+          await rm3(join36(this.cacheDir, "attachments", filename), { recursive: true });
         } catch {}
       }
     }
@@ -150147,20 +150440,20 @@ class LocalInboxCache {
   async getCacheSize() {
     let totalSize = 0;
     try {
-      const emailsDir = join35(this.cacheDir, "emails");
-      const files = await readdir(emailsDir);
+      const emailsDir = join36(this.cacheDir, "emails");
+      const files = await readdir2(emailsDir);
       for (const file of files) {
-        const fileStat = await stat6(join35(emailsDir, file));
+        const fileStat = await stat7(join36(emailsDir, file));
         totalSize += fileStat.size;
       }
     } catch {}
     try {
-      const attachmentsDir = join35(this.cacheDir, "attachments");
-      const dirs = await readdir(attachmentsDir);
+      const attachmentsDir = join36(this.cacheDir, "attachments");
+      const dirs = await readdir2(attachmentsDir);
       for (const dir of dirs) {
-        const files = await readdir(join35(attachmentsDir, dir));
+        const files = await readdir2(join36(attachmentsDir, dir));
         for (const file of files) {
-          const fileStat = await stat6(join35(attachmentsDir, dir, file));
+          const fileStat = await stat7(join36(attachmentsDir, dir, file));
           totalSize += fileStat.size;
         }
       }
@@ -167751,7 +168044,7 @@ var init_providers = __esm(() => {
 });
 
 // packages/core/src/inbox/inbox-manager.ts
-import { join as join36 } from "path";
+import { join as join37 } from "path";
 
 class InboxManager {
   assistantId;
@@ -167925,7 +168218,7 @@ class InboxManager {
   }
 }
 function createInboxManager(assistantId, assistantName, config, configDir) {
-  const basePath = join36(configDir, "messages");
+  const basePath = join37(configDir, "messages");
   return new InboxManager({
     assistantId,
     assistantName,
@@ -171958,7 +172251,7 @@ var init_local_storage = __esm(async () => {
 
 // packages/core/src/messages/watcher.ts
 import { watch, existsSync as existsSync23, readdirSync as readdirSync9 } from "fs";
-import { join as join37 } from "path";
+import { join as join38 } from "path";
 
 class InboxWatcher {
   assistantId;
@@ -171970,7 +172263,7 @@ class InboxWatcher {
   constructor(assistantId, basePath) {
     this.assistantId = assistantId;
     const base = basePath || getMessagesBasePath();
-    this.inboxPath = join37(base, assistantId, "messages");
+    this.inboxPath = join38(base, assistantId, "messages");
   }
   start() {
     if (this.running)
@@ -172948,7 +173241,7 @@ var init_local_storage2 = __esm(async () => {
 
 // packages/core/src/webhooks/watcher.ts
 import { watch as watch2, existsSync as existsSync25, readdirSync as readdirSync10 } from "fs";
-import { join as join38 } from "path";
+import { join as join39 } from "path";
 
 class WebhookEventWatcher {
   basePath;
@@ -172960,7 +173253,7 @@ class WebhookEventWatcher {
   directoryWatcher = null;
   constructor(basePath) {
     this.basePath = basePath || getWebhooksBasePath();
-    this.eventsPath = join38(this.basePath, "events");
+    this.eventsPath = join39(this.basePath, "events");
   }
   start() {
     if (this.running)
@@ -172999,7 +173292,7 @@ class WebhookEventWatcher {
       this.directoryWatcher = watch2(this.eventsPath, (eventType, filename) => {
         if (!filename || eventType !== "rename")
           return;
-        const dirPath = join38(this.eventsPath, filename);
+        const dirPath = join39(this.eventsPath, filename);
         if (existsSync25(dirPath) && !this.watchers.has(filename)) {
           this.watchWebhookDir(filename);
         }
@@ -173025,7 +173318,7 @@ class WebhookEventWatcher {
   watchWebhookDir(webhookId) {
     if (this.watchers.has(webhookId))
       return;
-    const dirPath = join38(this.eventsPath, webhookId);
+    const dirPath = join39(this.eventsPath, webhookId);
     if (!existsSync25(dirPath))
       return;
     const known = new Set;
@@ -174392,8 +174685,8 @@ import { spawn as spawn4 } from "child_process";
 import { createInterface } from "readline";
 import * as fs3 from "fs";
 import { stat as statPromise, open as open2 } from "fs/promises";
-import { join as join39 } from "path";
-import { homedir as homedir23 } from "os";
+import { join as join40 } from "path";
+import { homedir as homedir24 } from "os";
 import { dirname as dirname14, join as join210 } from "path";
 import { cwd } from "process";
 import { realpathSync as realpathSync2 } from "fs";
@@ -174677,7 +174970,7 @@ function shouldShowDebugMessage(message, filter) {
   return shouldShowDebugCategories(categories, filter);
 }
 function getClaudeConfigHomeDir() {
-  return process.env.CLAUDE_CONFIG_DIR ?? join39(homedir23(), ".claude");
+  return process.env.CLAUDE_CONFIG_DIR ?? join40(homedir24(), ".claude");
 }
 function isEnvTruthy(envVar) {
   if (!envVar)
@@ -202013,6 +202306,14 @@ class SessionStore {
       this.db.prepare("DELETE FROM persisted_sessions WHERE id = ?").run(id);
     } catch {}
   }
+  findByLabel(label) {
+    try {
+      const row = this.db.query("SELECT * FROM persisted_sessions WHERE LOWER(label) = LOWER(?) ORDER BY updated_at DESC LIMIT 1").get(label);
+      return row ? rowToSession2(row) : null;
+    } catch {
+      return null;
+    }
+  }
   listRecoverable() {
     try {
       const rows = this.db.query(`SELECT * FROM persisted_sessions WHERE status != 'closed' ORDER BY updated_at DESC`).all();
@@ -203638,9 +203939,9 @@ function createSelfAwarenessToolExecutors(context) {
       return JSON.stringify(response, null, 2);
     },
     workspace_map: async (input) => {
-      const { readdir: readdir2, stat: stat7, access } = await import("fs/promises");
+      const { readdir: readdir3, stat: stat8, access } = await import("fs/promises");
       const { execSync } = await import("child_process");
-      const { join: join40, basename: basename8 } = await import("path");
+      const { join: join41, basename: basename8 } = await import("path");
       const depth = input.depth ?? 3;
       const includeGitStatus = input.include_git_status !== false;
       const includeRecentFiles = input.include_recent_files !== false;
@@ -203675,7 +203976,7 @@ function createSelfAwarenessToolExecutors(context) {
         if (currentDepth > depth)
           return [];
         try {
-          const entries = await readdir2(dir, { withFileTypes: true });
+          const entries = await readdir3(dir, { withFileTypes: true });
           const nodes = [];
           let fileCount = 0;
           for (const entry of entries) {
@@ -203686,7 +203987,7 @@ function createSelfAwarenessToolExecutors(context) {
               break;
             }
             if (entry.isDirectory()) {
-              const children2 = await buildTree(join40(dir, entry.name), currentDepth + 1);
+              const children2 = await buildTree(join41(dir, entry.name), currentDepth + 1);
               nodes.push({
                 name: entry.name,
                 type: "directory",
@@ -203712,7 +204013,7 @@ function createSelfAwarenessToolExecutors(context) {
       };
       if (includeGitStatus) {
         try {
-          await access(join40(cwd2, ".git"));
+          await access(join41(cwd2, ".git"));
           gitStatus.isRepo = true;
           try {
             const branch = execSync("git branch --show-current", { cwd: cwd2, encoding: "utf-8" }).trim();
@@ -203739,15 +204040,15 @@ function createSelfAwarenessToolExecutors(context) {
           if (recentFiles.length >= 10)
             return;
           try {
-            const entries = await readdir2(dir, { withFileTypes: true });
+            const entries = await readdir3(dir, { withFileTypes: true });
             for (const entry of entries) {
               if (shouldIgnore(entry.name))
                 continue;
-              const fullPath = join40(dir, entry.name);
+              const fullPath = join41(dir, entry.name);
               const relPath = relativePath ? `${relativePath}/${entry.name}` : entry.name;
               if (entry.isFile()) {
                 try {
-                  const stats = await stat7(fullPath);
+                  const stats = await stat8(fullPath);
                   recentFiles.push({
                     path: relPath,
                     mtime: stats.mtime.toISOString()
@@ -203777,12 +204078,12 @@ function createSelfAwarenessToolExecutors(context) {
       let projectName = basename8(cwd2);
       for (const indicator of projectIndicators) {
         try {
-          await access(join40(cwd2, indicator.file));
+          await access(join41(cwd2, indicator.file));
           projectType = indicator.type;
           if (indicator.file === "package.json") {
             try {
               const { readFile: readFile10 } = await import("fs/promises");
-              const pkg = JSON.parse(await readFile10(join40(cwd2, indicator.file), "utf-8"));
+              const pkg = JSON.parse(await readFile10(join41(cwd2, indicator.file), "utf-8"));
               projectName = pkg.name || projectName;
             } catch {}
           }
@@ -204777,12 +205078,16 @@ function createAssistantToolExecutors2(context) {
       const tools = Array.isArray(input.tools) ? input.tools.map(String) : undefined;
       const contextStr = typeof input.context === "string" ? input.context : undefined;
       const maxTurns = typeof input.maxTurns === "number" ? input.maxTurns : undefined;
+      const minTurns = typeof input.minTurns === "number" ? input.minTurns : undefined;
+      const workUntilDone = input.workUntilDone === true;
       const async = input.async === true;
       const config2 = {
         task,
         tools,
         context: contextStr,
         maxTurns,
+        minTurns,
+        workUntilDone,
         async,
         parentSessionId: context.getSessionId(),
         depth: context.getDepth(),
@@ -205070,7 +205375,15 @@ The subassistant has no memory of the parent conversation - provide all needed c
         },
         maxTurns: {
           type: "number",
-          description: "Maximum turns the subassistant can take (default: 10, max: 25)"
+          description: "Maximum turns the subassistant can take (default: 25, max: 50)"
+        },
+        minTurns: {
+          type: "number",
+          description: "Minimum turns the subassistant must take before returning (default: 3). Prevents superficial results."
+        },
+        workUntilDone: {
+          type: "boolean",
+          description: "If true, subassistant keeps working until the task is fully complete instead of returning early (default: false)"
         },
         async: {
           type: "boolean",
@@ -206662,9 +206975,9 @@ var init_types11 = __esm(() => {
 // node_modules/.pnpm/@hasna+mementos@0.3.9_@types+react@19.2.14/node_modules/@hasna/mementos/dist/index.js
 import { Database as Database3 } from "bun:sqlite";
 import { existsSync as existsSync27, mkdirSync as mkdirSync14 } from "fs";
-import { dirname as dirname15, join as join40, resolve as resolve11 } from "path";
+import { dirname as dirname15, join as join41, resolve as resolve11 } from "path";
 import { existsSync as existsSync28, mkdirSync as mkdirSync24, readFileSync as readFileSync13 } from "fs";
-import { homedir as homedir24 } from "os";
+import { homedir as homedir25 } from "os";
 import { dirname as dirname22, join as join212, resolve as resolve22 } from "path";
 function isInMemoryDb2(path5) {
   return path5 === ":memory:" || path5.startsWith("file::memory:");
@@ -206672,7 +206985,7 @@ function isInMemoryDb2(path5) {
 function findNearestMementosDb(startDir) {
   let dir = resolve11(startDir);
   while (true) {
-    const candidate = join40(dir, ".mementos", "mementos.db");
+    const candidate = join41(dir, ".mementos", "mementos.db");
     if (existsSync27(candidate))
       return candidate;
     const parent = dirname15(dir);
@@ -206685,7 +206998,7 @@ function findNearestMementosDb(startDir) {
 function findGitRoot2(startDir) {
   let dir = resolve11(startDir);
   while (true) {
-    if (existsSync27(join40(dir, ".git")))
+    if (existsSync27(join41(dir, ".git")))
       return dir;
     const parent = dirname15(dir);
     if (parent === dir)
@@ -206705,11 +207018,11 @@ function getDbPath2() {
   if (process.env["MEMENTOS_DB_SCOPE"] === "project") {
     const gitRoot = findGitRoot2(cwd2);
     if (gitRoot) {
-      return join40(gitRoot, ".mementos", "mementos.db");
+      return join41(gitRoot, ".mementos", "mementos.db");
     }
   }
   const home = process.env["HOME"] || process.env["USERPROFILE"] || "~";
-  return join40(home, ".mementos", "mementos.db");
+  return join41(home, ".mementos", "mementos.db");
 }
 function ensureDir2(filePath) {
   if (isInMemoryDb2(filePath))
@@ -207017,7 +207330,7 @@ function isValidCategory(value2) {
   return VALID_CATEGORIES2.includes(value2);
 }
 function loadConfig5() {
-  const configPath = join212(homedir24(), ".mementos", "config.json");
+  const configPath = join212(homedir25(), ".mementos", "config.json");
   let fileConfig = {};
   if (existsSync28(configPath)) {
     try {
@@ -208188,6 +208501,7 @@ class SubassistantManager {
       maxDepth: config2.maxDepth ?? DEFAULT_MAX_DEPTH,
       maxConcurrent: config2.maxConcurrent ?? DEFAULT_MAX_CONCURRENT,
       maxTurns: config2.maxTurns ?? DEFAULT_MAX_TURNS,
+      minTurns: config2.minTurns ?? DEFAULT_MIN_TURNS,
       defaultTimeoutMs: config2.defaultTimeoutMs ?? DEFAULT_TIMEOUT_MS3,
       defaultTools: config2.defaultTools ?? DEFAULT_SUBASSISTANT_TOOLS,
       forbiddenTools: config2.forbiddenTools ?? FORBIDDEN_SUBASSISTANT_TOOLS
@@ -208315,11 +208629,15 @@ ${hookResult.additionalContext}` : hookResult.additionalContext
     try {
       const tools = this.filterToolsForSubassistant(config2.tools, config2.depth);
       const maxTurns = Math.min(config2.maxTurns ?? this.config.maxTurns, MAX_ALLOWED_TURNS);
+      const minTurns = Math.min(config2.minTurns ?? this.config.minTurns, maxTurns);
+      const workUntilDone = config2.workUntilDone ?? false;
       const runner = await this.context.createSubassistantLoop({
         task: config2.task,
         tools,
         context: config2.context,
         maxTurns,
+        minTurns,
+        workUntilDone,
         cwd: config2.cwd,
         sessionId: `subassistant-${subassistantId}`,
         depth: config2.depth + 1
@@ -208527,7 +208845,7 @@ ${hookResult.additionalContext}` : hookResult.additionalContext
     return new Promise((resolve12) => setTimeout(resolve12, ms));
   }
 }
-var DEFAULT_MAX_DEPTH = 3, DEFAULT_MAX_CONCURRENT = 5, DEFAULT_MAX_TURNS = 10, MAX_ALLOWED_TURNS = 25, DEFAULT_TIMEOUT_MS3 = 120000, DEFAULT_SUBASSISTANT_TOOLS, FORBIDDEN_SUBASSISTANT_TOOLS;
+var DEFAULT_MAX_DEPTH = 3, DEFAULT_MAX_CONCURRENT = 5, DEFAULT_MAX_TURNS = 25, DEFAULT_MIN_TURNS = 3, MAX_ALLOWED_TURNS = 50, DEFAULT_TIMEOUT_MS3 = 120000, DEFAULT_SUBASSISTANT_TOOLS, FORBIDDEN_SUBASSISTANT_TOOLS;
 var init_subagent_manager = __esm(() => {
   init_src2();
   DEFAULT_SUBASSISTANT_TOOLS = [
@@ -209533,8 +209851,8 @@ __export(exports_dist2, {
   AGENT_TARGETS: () => AGENT_TARGETS
 });
 import { existsSync as existsSync29, cpSync, mkdirSync as mkdirSync15, writeFileSync as writeFileSync10, rmSync as rmSync3, readdirSync as readdirSync12, statSync as statSync7, readFileSync as readFileSync14 } from "fs";
-import { join as join41, dirname as dirname16 } from "path";
-import { homedir as homedir25 } from "os";
+import { join as join43, dirname as dirname16 } from "path";
+import { homedir as homedir26 } from "os";
 import { fileURLToPath as fileURLToPath6 } from "url";
 import { existsSync as existsSync210, readFileSync as readFileSync22, readdirSync as readdirSync22 } from "fs";
 import { join as join213 } from "path";
@@ -209642,17 +209960,17 @@ function normalizeSkillName(name) {
 function findSkillsDir() {
   let dir = __dirname2;
   for (let i6 = 0;i6 < 5; i6++) {
-    const candidate = join41(dir, "skills");
+    const candidate = join43(dir, "skills");
     if (existsSync29(candidate)) {
       return candidate;
     }
     dir = dirname16(dir);
   }
-  return join41(__dirname2, "..", "skills");
+  return join43(__dirname2, "..", "skills");
 }
 function getSkillPath(name) {
   const skillName = normalizeSkillName(name);
-  return join41(SKILLS_DIR, skillName);
+  return join43(SKILLS_DIR, skillName);
 }
 function skillExists(name) {
   return existsSync29(getSkillPath(name));
@@ -209661,8 +209979,8 @@ function installSkill(name, options2 = {}) {
   const { targetDir = process.cwd(), overwrite = false } = options2;
   const skillName = normalizeSkillName(name);
   const sourcePath = getSkillPath(name);
-  const destDir = join41(targetDir, ".skills");
-  const destPath = join41(destDir, skillName);
+  const destDir = join43(targetDir, ".skills");
+  const destPath = join43(destDir, skillName);
   if (!existsSync29(sourcePath)) {
     return {
       skill: name,
@@ -209720,7 +210038,7 @@ function installSkills(names, options2 = {}) {
   return names.map((name) => installSkill(name, options2));
 }
 function updateSkillsIndex(skillsDir) {
-  const indexPath = join41(skillsDir, "index.ts");
+  const indexPath = join43(skillsDir, "index.ts");
   const skills = readdirSync12(skillsDir).filter((f5) => f5.startsWith("skill-") && !f5.includes("."));
   const exports = skills.map((s5) => {
     const name = s5.replace("skill-", "").replace(/-/g, "_");
@@ -209737,19 +210055,19 @@ ${exports}
   writeFileSync10(indexPath, content3);
 }
 function getInstalledSkills(targetDir = process.cwd()) {
-  const skillsDir = join41(targetDir, ".skills");
+  const skillsDir = join43(targetDir, ".skills");
   if (!existsSync29(skillsDir)) {
     return [];
   }
   return readdirSync12(skillsDir).filter((f5) => {
-    const fullPath = join41(skillsDir, f5);
+    const fullPath = join43(skillsDir, f5);
     return f5.startsWith("skill-") && statSync7(fullPath).isDirectory();
   }).map((f5) => f5.replace("skill-", ""));
 }
 function removeSkill(name, targetDir = process.cwd()) {
   const skillName = normalizeSkillName(name);
-  const skillsDir = join41(targetDir, ".skills");
-  const skillPath = join41(skillsDir, skillName);
+  const skillsDir = join43(targetDir, ".skills");
+  const skillPath = join43(skillsDir, skillName);
   if (!existsSync29(skillPath)) {
     return false;
   }
@@ -209760,13 +210078,13 @@ function removeSkill(name, targetDir = process.cwd()) {
 function getAgentSkillsDir(agent, scope = "global", projectDir) {
   const agentDir = `.${agent}`;
   if (scope === "project") {
-    return join41(projectDir || process.cwd(), agentDir, "skills");
+    return join43(projectDir || process.cwd(), agentDir, "skills");
   }
-  return join41(homedir25(), agentDir, "skills");
+  return join43(homedir26(), agentDir, "skills");
 }
 function getAgentSkillPath(name, agent, scope = "global", projectDir) {
   const skillName = normalizeSkillName(name);
-  return join41(getAgentSkillsDir(agent, scope, projectDir), skillName);
+  return join43(getAgentSkillsDir(agent, scope, projectDir), skillName);
 }
 function installSkillForAgent(name, options2, generateSkillMd) {
   const { agent, scope = "global", projectDir } = options2;
@@ -209776,7 +210094,7 @@ function installSkillForAgent(name, options2, generateSkillMd) {
     return { skill: name, success: false, error: `Skill '${name}' not found` };
   }
   let skillMdContent = null;
-  const skillMdPath = join41(sourcePath, "SKILL.md");
+  const skillMdPath = join43(sourcePath, "SKILL.md");
   if (existsSync29(skillMdPath)) {
     skillMdContent = readFileSync14(skillMdPath, "utf-8");
   } else if (generateSkillMd) {
@@ -209788,7 +210106,7 @@ function installSkillForAgent(name, options2, generateSkillMd) {
   const destDir = getAgentSkillPath(name, agent, scope, projectDir);
   try {
     mkdirSync15(destDir, { recursive: true });
-    writeFileSync10(join41(destDir, "SKILL.md"), skillMdContent);
+    writeFileSync10(join43(destDir, "SKILL.md"), skillMdContent);
     return { skill: name, success: true, path: destDir };
   } catch (error4) {
     return {
@@ -211694,7 +212012,7 @@ __export(exports_dist3, {
   CATEGORIES: () => CATEGORIES2
 });
 import { existsSync as existsSync31, readFileSync as readFileSync15 } from "fs";
-import { join as join43, dirname as dirname17 } from "path";
+import { join as join45, dirname as dirname17 } from "path";
 import { fileURLToPath as fileURLToPath7 } from "url";
 import { existsSync as existsSync211, cpSync as cpSync2, mkdirSync as mkdirSync16, readFileSync as readFileSync23, writeFileSync as writeFileSync11, readdirSync as readdirSync13, statSync as statSync8, rmSync as rmSync4 } from "fs";
 import { join as join214, dirname as dirname23 } from "path";
@@ -211715,15 +212033,15 @@ function loadConnectorVersions() {
   versionsLoaded = true;
   const thisDir = dirname17(fileURLToPath7(import.meta.url));
   const candidates = [
-    join43(thisDir, "..", "connectors"),
-    join43(thisDir, "..", "..", "connectors")
+    join45(thisDir, "..", "connectors"),
+    join45(thisDir, "..", "..", "connectors")
   ];
   const connectorsDir = candidates.find((d5) => existsSync31(d5));
   if (!connectorsDir)
     return;
   for (const connector of CONNECTORS) {
     try {
-      const pkgPath = join43(connectorsDir, `connect-${connector.name}`, "package.json");
+      const pkgPath = join45(connectorsDir, `connect-${connector.name}`, "package.json");
       if (existsSync31(pkgPath)) {
         const pkg = JSON.parse(readFileSync15(pkgPath, "utf-8"));
         connector.version = pkg.version || "0.0.0";
@@ -212515,6 +212833,7 @@ var init_loop = __esm(async () => {
   init_wait();
   init_notify();
   init_loader3();
+  init_loader4();
   init_client3();
   init_errors();
   init_limits();
@@ -212599,6 +212918,7 @@ var init_loop = __esm(async () => {
     connectorBridge;
     skillLoader;
     skillExecutor;
+    extensionLoader;
     hookLoader;
     hookExecutor;
     scopeContextManager;
@@ -212678,6 +212998,7 @@ var init_loop = __esm(async () => {
     statsTracker;
     paused = false;
     pauseResolve = null;
+    pendingPermissionMode = null;
     maxTurnsPerRun = 50;
     onChunk;
     onToolStart;
@@ -212699,6 +213020,7 @@ var init_loop = __esm(async () => {
       this.connectorBridge = new ConnectorBridge(this.cwd);
       this.skillLoader = new SkillLoader;
       this.skillExecutor = new SkillExecutor;
+      this.extensionLoader = new ExtensionLoader;
       this.hookLoader = new HookLoader;
       this.hookExecutor = new HookExecutor;
       this.scopeContextManager = new ScopeContextManager;
@@ -213138,6 +213460,9 @@ var init_loop = __esm(async () => {
       }
       this.connectorBridge.registerAll(this.toolRegistry);
       this.builtinCommands.registerAll(this.commandLoader);
+      try {
+        await this.extensionLoader.loadAll(this.cwd, this.toolRegistry, this.commandLoader, this.config);
+      } catch {}
       this.hookLoader.load(hooksConfig);
       const hookCliBridge = new HookCliBridge(this.cwd);
       this.hookExecutor.setCliBridge(hookCliBridge);
@@ -213765,6 +214090,25 @@ You are running in **autonomous mode**. You manage your own wakeup schedule.
           results.push(blockedResult);
           continue;
         }
+        if (this.config?.permissions?.mode === "plan" && !this.isToolAllowedInPlanMode(toolCall.name)) {
+          const blockedResult = {
+            toolCallId: toolCall.id,
+            content: `Blocked in plan mode: "${toolCall.name}" is not available. Only read-only tools are allowed. Switch to normal mode with /mode normal`,
+            isError: true,
+            toolName: toolCall.name
+          };
+          this.emit({ type: "tool_result", toolResult: blockedResult });
+          await this.hookExecutor.execute(this.hookLoader.getHooks("PostToolUseFailure"), {
+            session_id: this.sessionId,
+            hook_event_name: "PostToolUseFailure",
+            cwd: this.cwd,
+            tool_name: toolCall.name,
+            tool_input: toolCall.input,
+            tool_result: blockedResult.content
+          });
+          results.push(blockedResult);
+          continue;
+        }
         if (this.policyEvaluator?.isEnabled()) {
           const policyResult = this.policyEvaluator.evaluateToolUse({
             toolName: toolCall.name,
@@ -214272,7 +214616,9 @@ You are running in **autonomous mode**. You manage your own wakeup schedule.
             this.policyEvaluator.updateConfig({ ...config2, defaultAction: action });
           }
         },
-        getSwarmCoordinator: () => this.getOrCreateSwarmCoordinator()
+        getSwarmCoordinator: () => this.getOrCreateSwarmCoordinator(),
+        getPermissionMode: () => this.getPermissionMode(),
+        setPermissionMode: (mode) => this.setPermissionMode(mode)
       };
       const result = await this.commandExecutor.execute(message, context);
       if (!result.handled && result.prompt) {
@@ -215303,6 +215649,14 @@ Current state: ${voiceState.enabled ? "enabled" : "disabled"}, STT: ${voiceState
       let turns = 0;
       let toolCalls = 0;
       let stopped = false;
+      const thoroughnessInstructions = [
+        "Work thoroughly on this task. Don't return after minimal effort.",
+        "Verify your work before completing.",
+        "If the task requires multiple steps, complete ALL steps.",
+        config2.minTurns > 1 ? `You must take at least ${config2.minTurns} turns before returning \u2014 do not give a superficial answer.` : null,
+        config2.workUntilDone ? "Keep working until the task is fully complete. Do not stop early or return partial results." : null
+      ].filter(Boolean).join(`
+`);
       const subassistant = new AssistantLoop({
         cwd: config2.cwd,
         sessionId: config2.sessionId,
@@ -215317,7 +215671,8 @@ Task: ${config2.task}
 ${config2.context ? `Context:
 ${config2.context}
 
-` : ""}
+` : ""}${thoroughnessInstructions}
+
 Complete this task and provide a clear summary of what you found or accomplished.
 Be concise but thorough. Focus only on this task.`,
         onChunk: (chunk) => {
@@ -215450,12 +215805,42 @@ Be concise but thorough. Focus only on this task.`,
         return true;
       return allowed.has(name.toLowerCase());
     }
+    static PLAN_MODE_ALLOWED_TOOLS = new Set([
+      "read",
+      "glob",
+      "grep",
+      "web_search",
+      "web_fetch",
+      "memory_list",
+      "memory_search",
+      "memory_recall",
+      "memory_context",
+      "memory_stats",
+      "tasks_list",
+      "tasks_get",
+      "ask_user",
+      "diff"
+    ]);
+    isToolAllowedInPlanMode(name) {
+      return AssistantLoop.PLAN_MODE_ALLOWED_TOOLS.has(name.toLowerCase());
+    }
+    setPermissionMode(mode) {
+      if (!this.config)
+        return;
+      if (!this.config.permissions) {
+        this.config.permissions = {};
+      }
+      this.config.permissions.mode = mode;
+    }
+    getPermissionMode() {
+      return this.config?.permissions?.mode ?? "normal";
+    }
   };
 });
 
 // packages/core/src/tools/connector-index.ts
-import { join as join45, dirname as dirname18 } from "path";
-import { homedir as homedir26 } from "os";
+import { join as join46, dirname as dirname18 } from "path";
+import { homedir as homedir27 } from "os";
 import { existsSync as existsSync33, mkdirSync as mkdirSync17, writeFileSync as writeFileSync12, readFileSync as readFileSync16 } from "fs";
 var TAG_KEYWORDS, INDEX_VERSION = 1, INDEX_TTL_MS, ConnectorIndex;
 var init_connector_index = __esm(() => {
@@ -215490,10 +215875,10 @@ var init_connector_index = __esm(() => {
     }
     getHomeDir() {
       const envHome = process.env.HOME || process.env.USERPROFILE;
-      return envHome && envHome.trim().length > 0 ? envHome : homedir26();
+      return envHome && envHome.trim().length > 0 ? envHome : homedir27();
     }
     getCachePath() {
-      return join45(this.getHomeDir(), ".assistants", "cache", "connector-index.json");
+      return join46(this.getHomeDir(), ".assistants", "cache", "connector-index.json");
     }
     loadDiskCache() {
       ConnectorIndex.indexLoaded = true;
@@ -216011,6 +216396,275 @@ var init_search = __esm(() => {
   };
 });
 
+// packages/core/src/extensions/index.ts
+var init_extensions = __esm(() => {
+  init_loader4();
+});
+
+// packages/core/src/packages/installer.ts
+import { join as join47 } from "path";
+import { homedir as homedir28 } from "os";
+import { mkdir as mkdir9, readFile as readFile10, writeFile as writeFile9, readdir as readdir3, rm as rm4, stat as stat8 } from "fs/promises";
+function parseSource(source) {
+  if (source.startsWith("npm:")) {
+    return { source: "npm", identifier: source.slice(4) };
+  }
+  if (source.startsWith("git:")) {
+    let url = source.slice(4);
+    if (!url.startsWith("http") && !url.startsWith("git@")) {
+      url = `https://${url}`;
+    }
+    return { source: "git", identifier: url };
+  }
+  return { source: "npm", identifier: source };
+}
+function resolvePackagesDir(scope, cwd2) {
+  if (scope === "global") {
+    return join47(homedir28(), ".assistants", "packages");
+  }
+  return join47(cwd2 || process.cwd(), ".assistants", "packages");
+}
+async function ensurePackagesDir(dir) {
+  await mkdir9(dir, { recursive: true });
+  const pkgPath = join47(dir, "package.json");
+  try {
+    await stat8(pkgPath);
+  } catch {
+    await writeFile9(pkgPath, JSON.stringify({ name: "assistants-packages", private: true, dependencies: {} }, null, 2) + `
+`);
+  }
+  const gitignorePath = join47(dir, ".gitignore");
+  try {
+    await stat8(gitignorePath);
+  } catch {
+    await writeFile9(gitignorePath, `node_modules/
+`);
+  }
+}
+function deriveName(source, identifier) {
+  if (source === "npm") {
+    return identifier;
+  }
+  const parts = identifier.replace(/\.git$/, "").split("/");
+  return parts[parts.length - 1] || identifier;
+}
+async function installPackage(source, options2) {
+  const { source: srcType, identifier } = parseSource(source);
+  const scope = options2?.local ? "local" : "global";
+  const dir = resolvePackagesDir(scope);
+  if (srcType === "npm") {
+    await ensurePackagesDir(dir);
+    const result2 = Bun.spawnSync(["bun", "add", identifier], {
+      cwd: dir,
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    if (result2.exitCode !== 0) {
+      const stderr = result2.stderr.toString().trim();
+      throw new Error(`Failed to install ${identifier}: ${stderr || "unknown error"}`);
+    }
+    let version4 = "unknown";
+    try {
+      const pkgJsonPath = join47(dir, "node_modules", identifier, "package.json");
+      const pkgJson = JSON.parse(await readFile10(pkgJsonPath, "utf-8"));
+      version4 = pkgJson.version || "unknown";
+    } catch {}
+    return {
+      name: identifier,
+      source: "npm",
+      version: version4,
+      path: join47(dir, "node_modules", identifier)
+    };
+  }
+  const repoName = deriveName("git", identifier);
+  const targetDir = join47(dir, repoName);
+  await mkdir9(dir, { recursive: true });
+  try {
+    const stats = await stat8(targetDir);
+    if (stats.isDirectory()) {
+      throw new Error(`Package "${repoName}" already exists at ${targetDir}. Remove it first or use update.`);
+    }
+  } catch (err) {
+    if (err instanceof Error && err.message.includes("already exists")) {
+      throw err;
+    }
+  }
+  const result = Bun.spawnSync(["git", "clone", identifier, repoName], {
+    cwd: dir,
+    stdout: "pipe",
+    stderr: "pipe"
+  });
+  if (result.exitCode !== 0) {
+    const stderr = result.stderr.toString().trim();
+    throw new Error(`Failed to clone ${identifier}: ${stderr || "unknown error"}`);
+  }
+  let version3 = "unknown";
+  try {
+    const pkgJson = JSON.parse(await readFile10(join47(targetDir, "package.json"), "utf-8"));
+    version3 = pkgJson.version || "unknown";
+  } catch {}
+  return {
+    name: repoName,
+    source: "git",
+    version: version3,
+    path: targetDir
+  };
+}
+async function removePackage(name, options2) {
+  const scope = options2?.local ? "local" : "global";
+  const dir = resolvePackagesDir(scope);
+  const pkgPath = join47(dir, "package.json");
+  let isNpm = false;
+  try {
+    const pkgJson = JSON.parse(await readFile10(pkgPath, "utf-8"));
+    const deps = pkgJson.dependencies || {};
+    if (deps[name]) {
+      isNpm = true;
+    }
+  } catch {}
+  if (isNpm) {
+    const result = Bun.spawnSync(["bun", "remove", name], {
+      cwd: dir,
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    if (result.exitCode !== 0) {
+      const stderr = result.stderr.toString().trim();
+      throw new Error(`Failed to remove ${name}: ${stderr || "unknown error"}`);
+    }
+    return;
+  }
+  const targetDir = join47(dir, name);
+  try {
+    const stats = await stat8(targetDir);
+    if (stats.isDirectory()) {
+      await rm4(targetDir, { recursive: true, force: true });
+      return;
+    }
+  } catch {}
+  throw new Error(`Package "${name}" not found in ${scope} scope.`);
+}
+async function listPackages(options2) {
+  const scope = options2?.local ? "local" : "global";
+  const dir = resolvePackagesDir(scope);
+  const results = [];
+  const pkgPath = join47(dir, "package.json");
+  try {
+    const pkgJson = JSON.parse(await readFile10(pkgPath, "utf-8"));
+    const deps = pkgJson.dependencies || {};
+    for (const [depName, depVersion] of Object.entries(deps)) {
+      results.push({
+        name: depName,
+        source: "npm",
+        version: String(depVersion),
+        path: join47(dir, "node_modules", depName)
+      });
+    }
+  } catch {}
+  try {
+    const entries = await readdir3(dir);
+    for (const entry of entries) {
+      if (entry === "node_modules" || entry.startsWith(".") || entry === "package.json" || entry === "bun.lockb" || entry === "bun.lock") {
+        continue;
+      }
+      const entryPath = join47(dir, entry);
+      try {
+        const stats = await stat8(entryPath);
+        if (!stats.isDirectory())
+          continue;
+      } catch {
+        continue;
+      }
+      try {
+        await stat8(join47(entryPath, ".git"));
+      } catch {
+        continue;
+      }
+      let version3 = "unknown";
+      try {
+        const pkgJson = JSON.parse(await readFile10(join47(entryPath, "package.json"), "utf-8"));
+        version3 = pkgJson.version || "unknown";
+      } catch {}
+      results.push({
+        name: entry,
+        source: "git",
+        version: version3,
+        path: entryPath
+      });
+    }
+  } catch {}
+  return results;
+}
+async function updatePackages(options2) {
+  const scope = options2?.local ? "local" : "global";
+  const dir = resolvePackagesDir(scope);
+  const updated = [];
+  const errors5 = [];
+  const pkgPath = join47(dir, "package.json");
+  try {
+    const pkgJson = JSON.parse(await readFile10(pkgPath, "utf-8"));
+    const deps = pkgJson.dependencies || {};
+    if (Object.keys(deps).length > 0) {
+      const result = Bun.spawnSync(["bun", "update"], {
+        cwd: dir,
+        stdout: "pipe",
+        stderr: "pipe"
+      });
+      if (result.exitCode === 0) {
+        for (const name of Object.keys(deps)) {
+          updated.push(name);
+        }
+      } else {
+        const stderr = result.stderr.toString().trim();
+        errors5.push(`npm update failed: ${stderr || "unknown error"}`);
+      }
+    }
+  } catch {}
+  try {
+    const entries = await readdir3(dir);
+    for (const entry of entries) {
+      if (entry === "node_modules" || entry.startsWith(".") || entry === "package.json" || entry === "bun.lockb" || entry === "bun.lock") {
+        continue;
+      }
+      const entryPath = join47(dir, entry);
+      try {
+        await stat8(join47(entryPath, ".git"));
+      } catch {
+        continue;
+      }
+      const result = Bun.spawnSync(["git", "pull"], {
+        cwd: entryPath,
+        stdout: "pipe",
+        stderr: "pipe"
+      });
+      if (result.exitCode === 0) {
+        updated.push(entry);
+      } else {
+        const stderr = result.stderr.toString().trim();
+        errors5.push(`${entry}: git pull failed: ${stderr || "unknown error"}`);
+      }
+    }
+  } catch {}
+  return { updated, errors: errors5 };
+}
+var PackageInstaller;
+var init_installer2 = __esm(() => {
+  PackageInstaller = {
+    parseSource,
+    resolvePackagesDir,
+    installPackage,
+    removePackage,
+    listPackages,
+    updatePackages
+  };
+});
+
+// packages/core/src/packages/index.ts
+var init_packages = __esm(() => {
+  init_installer2();
+  init_installer2();
+});
+
 // packages/core/src/interviews/store.ts
 class InterviewStore {
   db;
@@ -216096,14 +216750,14 @@ var init_interviews = __esm(async () => {
 });
 
 // packages/core/src/memory/sessions.ts
-import { join as join46, dirname as dirname19 } from "path";
+import { join as join48, dirname as dirname19 } from "path";
 import { existsSync as existsSync35, mkdirSync as mkdirSync18 } from "fs";
 
 class SessionManager {
   db;
   constructor(dbPath, assistantId) {
     const baseDir = getConfigDir();
-    const path5 = dbPath || (assistantId ? join46(baseDir, "assistants", assistantId, "memory.db") : join46(baseDir, "memory.db"));
+    const path5 = dbPath || (assistantId ? join48(baseDir, "assistants", assistantId, "memory.db") : join48(baseDir, "memory.db"));
     const dir = dirname19(path5);
     if (!existsSync35(dir)) {
       mkdirSync18(dir, { recursive: true });
@@ -216761,6 +217415,7 @@ __export(exports_src3, {
   updateTask: () => updateTask2,
   updateSchedule: () => updateSchedule,
   updateProject: () => updateProject,
+  updatePackages: () => updatePackages,
   updateJob: () => updateJob,
   twilioToElevenLabs: () => twilioToElevenLabs,
   toolsSearchTool: () => toolsSearchTool,
@@ -216832,6 +217487,7 @@ __export(exports_src3, {
   resourceLimitsTool: () => resourceLimitsTool,
   resolveWorkspaceBaseDir: () => resolveWorkspaceBaseDir,
   resolveTaskId: () => resolveTaskId,
+  resolvePackagesDir: () => resolvePackagesDir,
   resolveNameToKnown: () => resolveNameToKnown,
   resolveMentions: () => resolveMentions,
   resolveHeartbeatPersistPath: () => resolveHeartbeatPersistPath,
@@ -216841,6 +217497,7 @@ __export(exports_src3, {
   resetGlobalCapabilityStorage: () => resetGlobalCapabilityStorage,
   resetGlobalCapabilityEnforcer: () => resetGlobalCapabilityEnforcer,
   resetDatabaseSingleton: () => resetDatabaseSingleton,
+  removePackage: () => removePackage,
   registryStatsTool: () => registryStatsTool,
   registryQueryTool: () => registryQueryTool,
   registryListTool: () => registryListTool,
@@ -216894,6 +217551,7 @@ __export(exports_src3, {
   peopleDeleteTool: () => peopleDeleteTool,
   peopleCreateTool: () => peopleCreateTool,
   pcmToMulaw: () => pcmToMulaw,
+  parseSource: () => parseSource,
   parseMentions: () => parseMentions,
   parseCronExpression: () => parseCronExpression,
   ordersUpdateTool: () => ordersUpdateTool,
@@ -216937,6 +217595,7 @@ __export(exports_src3, {
   listTemplates: () => listTemplates,
   listSchedules: () => listSchedules,
   listProjects: () => listProjects,
+  listPackages: () => listPackages,
   listJobsForSession: () => listJobsForSession,
   listJobsByStatus: () => listJobsByStatus,
   listJobs: () => listJobs,
@@ -216963,6 +217622,7 @@ __export(exports_src3, {
   isAssistantError: () => isAssistantError,
   isAnyLLMConfigured: () => isAnyLLMConfigured,
   isAWSConfigured: () => isAWSConfigured,
+  installPackage: () => installPackage,
   installHeartbeatSkills: () => installHeartbeatSkills,
   initAssistantsDir: () => initAssistantsDir,
   inboxTools: () => inboxTools,
@@ -217242,6 +217902,7 @@ __export(exports_src3, {
   PolicyEvaluator: () => PolicyEvaluator,
   PeopleStore: () => PeopleStore,
   PeopleManager: () => PeopleManager,
+  PackageInstaller: () => PackageInstaller,
   PRIORITY_ORDER: () => PRIORITY_ORDER,
   POLICY_SCOPE_PRECEDENCE: () => POLICY_SCOPE_PRECEDENCE,
   PERMISSIVE_POLICY: () => PERMISSIVE_POLICY,
@@ -217285,6 +217946,7 @@ __export(exports_src3, {
   GlobalMemoryManager: () => GlobalMemoryManager,
   FilesystemTools: () => FilesystemTools,
   FeedbackTool: () => FeedbackTool,
+  ExtensionLoader: () => ExtensionLoader,
   ErrorCodes: () => ErrorCodes,
   ErrorAggregator: () => ErrorAggregator,
   EmbeddedClient: () => EmbeddedClient,
@@ -217370,6 +218032,9 @@ var init_src3 = __esm(async () => {
   init_agent_registry();
   init_capabilities();
   init_swarm2();
+  init_extensions();
+  init_packages();
+  init_packages();
   init_loader3();
   init_create();
   init_installer();
@@ -236887,7 +237552,7 @@ var require_filesystem = __commonJS((exports, module) => {
     fs7.close(fd, () => {});
     return buffer.subarray(0, bytesRead);
   };
-  var readFile10 = (path5) => new Promise((resolve12, reject) => {
+  var readFile11 = (path5) => new Promise((resolve12, reject) => {
     fs7.open(path5, "r", (err, fd) => {
       if (err) {
         reject(err);
@@ -236904,7 +237569,7 @@ var require_filesystem = __commonJS((exports, module) => {
     LDD_PATH,
     SELF_PATH,
     readFileSync: readFileSync18,
-    readFile: readFile10
+    readFile: readFile11
   };
 });
 
@@ -236946,7 +237611,7 @@ var require_elf = __commonJS((exports, module) => {
 var require_detect_libc = __commonJS((exports, module) => {
   var childProcess = __require("child_process");
   var { isLinux: isLinux2, getReport } = require_process();
-  var { LDD_PATH, SELF_PATH, readFile: readFile10, readFileSync: readFileSync18 } = require_filesystem();
+  var { LDD_PATH, SELF_PATH, readFile: readFile11, readFileSync: readFileSync18 } = require_filesystem();
   var { interpreterPath } = require_elf();
   var cachedFamilyInterpreter;
   var cachedFamilyFilesystem;
@@ -237026,7 +237691,7 @@ var require_detect_libc = __commonJS((exports, module) => {
     }
     cachedFamilyFilesystem = null;
     try {
-      const lddContent = await readFile10(LDD_PATH);
+      const lddContent = await readFile11(LDD_PATH);
       cachedFamilyFilesystem = getFamilyFromLddContent(lddContent);
     } catch (e5) {}
     return cachedFamilyFilesystem;
@@ -237048,7 +237713,7 @@ var require_detect_libc = __commonJS((exports, module) => {
     }
     cachedFamilyInterpreter = null;
     try {
-      const selfContent = await readFile10(SELF_PATH);
+      const selfContent = await readFile11(SELF_PATH);
       const path5 = interpreterPath(selfContent);
       cachedFamilyInterpreter = familyFromInterpreterPath(path5);
     } catch (e5) {}
@@ -237108,7 +237773,7 @@ var require_detect_libc = __commonJS((exports, module) => {
     }
     cachedVersionFilesystem = null;
     try {
-      const lddContent = await readFile10(LDD_PATH);
+      const lddContent = await readFile11(LDD_PATH);
       const versionMatch = lddContent.match(RE_GLIBC_VERSION);
       if (versionMatch) {
         cachedVersionFilesystem = versionMatch[1];
@@ -243474,15 +244139,15 @@ var require_windows = __commonJS((exports, module) => {
     }
     return false;
   }
-  function checkStat(stat7, path5, options2) {
-    if (!stat7.isSymbolicLink() && !stat7.isFile()) {
+  function checkStat(stat9, path5, options2) {
+    if (!stat9.isSymbolicLink() && !stat9.isFile()) {
       return false;
     }
     return checkPathExt(path5, options2);
   }
   function isexe(path5, options2, cb2) {
-    fs7.stat(path5, function(er, stat7) {
-      cb2(er, er ? false : checkStat(stat7, path5, options2));
+    fs7.stat(path5, function(er, stat9) {
+      cb2(er, er ? false : checkStat(stat9, path5, options2));
     });
   }
   function sync(path5, options2) {
@@ -243496,20 +244161,20 @@ var require_mode = __commonJS((exports, module) => {
   isexe.sync = sync;
   var fs7 = __require("fs");
   function isexe(path5, options2, cb2) {
-    fs7.stat(path5, function(er, stat7) {
-      cb2(er, er ? false : checkStat(stat7, options2));
+    fs7.stat(path5, function(er, stat9) {
+      cb2(er, er ? false : checkStat(stat9, options2));
     });
   }
   function sync(path5, options2) {
     return checkStat(fs7.statSync(path5), options2);
   }
-  function checkStat(stat7, options2) {
-    return stat7.isFile() && checkMode(stat7, options2);
+  function checkStat(stat9, options2) {
+    return stat9.isFile() && checkMode(stat9, options2);
   }
-  function checkMode(stat7, options2) {
-    var mod = stat7.mode;
-    var uid = stat7.uid;
-    var gid = stat7.gid;
+  function checkMode(stat9, options2) {
+    var mod = stat9.mode;
+    var uid = stat9.uid;
+    var gid = stat9.gid;
     var myUid = options2.uid !== undefined ? options2.uid : process.getuid && process.getuid();
     var myGid = options2.gid !== undefined ? options2.gid : process.getgid && process.getgid();
     var u5 = parseInt("100", 8);
@@ -258419,8 +259084,8 @@ await __promiseAll([
 ]);
 var import_react86 = __toESM(require_react(), 1);
 import { spawn as spawn6 } from "child_process";
-import { join as join48 } from "path";
-import { homedir as homedir27 } from "os";
+import { join as join50 } from "path";
+import { homedir as homedir29 } from "os";
 
 // packages/terminal/src/components/Input.tsx
 await init_build2();
@@ -289795,7 +290460,7 @@ function handleHistory(query2) {
 ${lines.join(`
 `)}
 
-Resume with: \`assistants --resume <id>\``);
+Resume with: \`assistants --resume <id or name>\``);
 }
 function handleTemplates() {
   const templates = [
@@ -289848,7 +290513,11 @@ function printExitSummary(stats) {
   const lines = [];
   lines.push("");
   lines.push(`\x1B[1mResume this session:\x1B[0m`);
-  lines.push(`  assistants --resume ${stats.sessionId}`);
+  if (stats.sessionLabel) {
+    lines.push(`  assistants --resume ${stats.sessionLabel}`);
+  } else {
+    lines.push(`  assistants --resume ${stats.sessionId}`);
+  }
   lines.push("");
   const durationLabel = "Total duration (wall):";
   const messagesLabel = "Total messages:";
@@ -289888,8 +290557,8 @@ await init_src3();
 // packages/terminal/src/lib/budgets.ts
 init_src2();
 await init_src3();
-import { join as join47 } from "path";
-import { mkdir as mkdir9, readFile as readFile10, writeFile as writeFile9 } from "fs/promises";
+import { join as join49 } from "path";
+import { mkdir as mkdir10, readFile as readFile11, writeFile as writeFile10 } from "fs/promises";
 var PROFILES_FILE = "budgets.json";
 var SESSION_MAP_FILE = "budget-sessions.json";
 var DEFAULT_PROFILE_ID = "default";
@@ -289897,22 +290566,22 @@ function cloneConfig2(config2) {
   return JSON.parse(JSON.stringify(config2 || DEFAULT_BUDGET_CONFIG));
 }
 async function ensureDir3(baseDir) {
-  await mkdir9(baseDir, { recursive: true });
+  await mkdir10(baseDir, { recursive: true });
 }
 async function readJsonFile2(path7) {
   try {
-    const raw = await readFile10(path7, "utf-8");
+    const raw = await readFile11(path7, "utf-8");
     return JSON.parse(raw);
   } catch {
     return null;
   }
 }
 async function writeJsonFile(path7, data) {
-  await writeFile9(path7, JSON.stringify(data, null, 2), "utf-8");
+  await writeFile10(path7, JSON.stringify(data, null, 2), "utf-8");
 }
 async function loadBudgetProfiles(baseDir, seedConfig) {
   await ensureDir3(baseDir);
-  const path7 = join47(baseDir, PROFILES_FILE);
+  const path7 = join49(baseDir, PROFILES_FILE);
   const data = await readJsonFile2(path7);
   const profiles = Array.isArray(data?.profiles) ? data.profiles : [];
   if (profiles.length === 0) {
@@ -289932,7 +290601,7 @@ async function loadBudgetProfiles(baseDir, seedConfig) {
 }
 async function saveBudgetProfiles(baseDir, profiles) {
   await ensureDir3(baseDir);
-  const path7 = join47(baseDir, PROFILES_FILE);
+  const path7 = join49(baseDir, PROFILES_FILE);
   await writeJsonFile(path7, { profiles });
 }
 async function createBudgetProfile(baseDir, name, config2, description) {
@@ -289970,13 +290639,13 @@ async function deleteBudgetProfile(baseDir, id) {
 }
 async function loadSessionBudgetMap(baseDir) {
   await ensureDir3(baseDir);
-  const path7 = join47(baseDir, SESSION_MAP_FILE);
+  const path7 = join49(baseDir, SESSION_MAP_FILE);
   const data = await readJsonFile2(path7);
   return data || {};
 }
 async function saveSessionBudgetMap(baseDir, map3) {
   await ensureDir3(baseDir);
-  const path7 = join47(baseDir, SESSION_MAP_FILE);
+  const path7 = join49(baseDir, SESSION_MAP_FILE);
   await writeJsonFile(path7, map3);
 }
 
@@ -290135,7 +290804,7 @@ function CloseOnAnyKeyPanel({ message, onClose }) {
     ]
   }, undefined, true, undefined, this);
 }
-function App2({ cwd: cwd3, version: version4 }) {
+function App2({ cwd: cwd3, version: version4, permissionMode: initialPermissionMode }) {
   const { exit: exit3 } = use_app_default();
   const { stdout } = use_stdout_default();
   const rows = stdout?.rows ?? 24;
@@ -291008,6 +291677,10 @@ function App2({ cwd: cwd3, version: version4 }) {
     const profiles = budgetProfiles.length > 0 ? budgetProfiles : await loadBudgetData();
     const profileId = getSessionBudgetProfileId(newSession.id, profiles);
     await applyBudgetProfileToSession(newSession, profileId, profiles);
+    if (initialPermissionMode) {
+      const loop = newSession.client.getAssistantLoop?.();
+      loop?.setPermissionMode(initialPermissionMode);
+    }
     return newSession;
   }, [
     registry3,
@@ -291020,7 +291693,8 @@ function App2({ cwd: cwd3, version: version4 }) {
     budgetProfiles,
     loadBudgetData,
     getSessionBudgetProfileId,
-    applyBudgetProfileToSession
+    applyBudgetProfileToSession,
+    initialPermissionMode
   ]);
   const seedSessionState = import_react86.useCallback((sessionId, seededMessages) => {
     sessionUIStates.current.set(sessionId, {
@@ -291324,6 +291998,7 @@ function App2({ cwd: cwd3, version: version4 }) {
       if (active) {
         setExitStats({
           sessionId: active.id,
+          sessionLabel: active.label,
           startedAt: active.startedAt,
           tokenUsage: tokenUsageRef.current,
           messageCount: messagesLengthRef.current,
@@ -291661,12 +292336,12 @@ function App2({ cwd: cwd3, version: version4 }) {
     try {
       const config2 = await loadConfig(cwd3, workspaceBaseDir);
       setCurrentConfig(config2);
-      const { readFile: readFile11, access } = await import("fs/promises");
+      const { readFile: readFile12, access } = await import("fs/promises");
       const configBaseDir = workspaceBaseDir || getConfigDir();
       const userPath = `${configBaseDir}/config.json`;
       try {
         await access(userPath);
-        const content3 = await readFile11(userPath, "utf-8");
+        const content3 = await readFile12(userPath, "utf-8");
         setUserConfig(JSON.parse(content3));
       } catch {
         setUserConfig(null);
@@ -291674,7 +292349,7 @@ function App2({ cwd: cwd3, version: version4 }) {
       const projectPath = `${getProjectConfigDir(cwd3)}/config.json`;
       try {
         await access(projectPath);
-        const content3 = await readFile11(projectPath, "utf-8");
+        const content3 = await readFile12(projectPath, "utf-8");
         setProjectConfig(JSON.parse(content3));
       } catch {
         setProjectConfig(null);
@@ -291682,7 +292357,7 @@ function App2({ cwd: cwd3, version: version4 }) {
       const localPath = `${getProjectConfigDir(cwd3)}/config.local.json`;
       try {
         await access(localPath);
-        const content3 = await readFile11(localPath, "utf-8");
+        const content3 = await readFile12(localPath, "utf-8");
         setLocalConfig(JSON.parse(content3));
       } catch {
         setLocalConfig(null);
@@ -291784,7 +292459,7 @@ function App2({ cwd: cwd3, version: version4 }) {
   }, [recoverableSessions, createSessionFromRecovery, workspaceBaseDir]);
   const handleOnboardingComplete = import_react86.useCallback(async (result) => {
     const { existsSync: existsSync30, mkdirSync: mkdirSync19, readFileSync: readFileSync18, writeFileSync: writeFileSync13, appendFileSync: appendFileSync5 } = await import("fs");
-    const secretsPath = join48(homedir27(), ".secrets");
+    const secretsPath = join50(homedir29(), ".secrets");
     const providerInfo = getProviderInfo(result.provider);
     const envName = providerInfo?.apiKeyEnv || "ANTHROPIC_API_KEY";
     const keyExport = `export ${envName}="${result.apiKey}"`;
@@ -291818,7 +292493,7 @@ function App2({ cwd: cwd3, version: version4 }) {
     if (!existsSync30(configDir)) {
       mkdirSync19(configDir, { recursive: true });
     }
-    const configPath = join48(configDir, "config.json");
+    const configPath = join50(configDir, "config.json");
     let existingConfig = {};
     if (existsSync30(configPath)) {
       try {
@@ -291874,7 +292549,7 @@ function App2({ cwd: cwd3, version: version4 }) {
           if (isOnboardingCompleted()) {
             needsOnboarding = false;
           } else {
-            const configPath = join48(workspaceBaseDir || getConfigDir(), "config.json");
+            const configPath = join50(workspaceBaseDir || getConfigDir(), "config.json");
             const { existsSync: existsSync30, readFileSync: readFileSync18 } = await import("fs");
             if (!existsSync30(configPath)) {
               needsOnboarding = true;
@@ -292148,6 +292823,7 @@ function App2({ cwd: cwd3, version: version4 }) {
     if (active) {
       setExitStats({
         sessionId: active.id,
+        sessionLabel: active.label,
         startedAt: active.startedAt,
         tokenUsage,
         messageCount: messages2.length,
@@ -294146,7 +294822,7 @@ When done, report the result.`);
   }
   if (showConfigPanel && currentConfig) {
     const handleConfigSave = async (location, updates) => {
-      const { writeFile: writeFile10, mkdir: mkdir10 } = await import("fs/promises");
+      const { writeFile: writeFile11, mkdir: mkdir11 } = await import("fs/promises");
       const { dirname: dirname21 } = await import("path");
       let configPath;
       let existingConfig;
@@ -294165,8 +294841,8 @@ When done, report the result.`);
           break;
       }
       const newConfig = deepMerge3(existingConfig || {}, updates);
-      await mkdir10(dirname21(configPath), { recursive: true });
-      await writeFile10(configPath, JSON.stringify(newConfig, null, 2));
+      await mkdir11(dirname21(configPath), { recursive: true });
+      await writeFile11(configPath, JSON.stringify(newConfig, null, 2));
       await loadConfigFiles();
     };
     return /* @__PURE__ */ jsx_dev_runtime51.jsxDEV(Box_default, {
@@ -294658,11 +295334,20 @@ async function runHeadless(options2) {
   } = options2;
   let sessionData = null;
   if (resume) {
-    const data = SessionStorage.loadSession(resume);
+    let resolvedId = resume;
+    let data = SessionStorage.loadSession(resume);
     if (!data) {
-      throw new Error(`Session ${resume} not found`);
+      const store2 = new SessionStore;
+      const match = store2.findByLabel(resume);
+      if (match) {
+        resolvedId = match.id;
+        data = SessionStorage.loadSession(match.id);
+      }
     }
-    sessionData = { id: resume, data };
+    if (!data) {
+      throw new Error(`Session "${resume}" not found (tried ID and label lookup)`);
+    }
+    sessionData = { id: resolvedId, data };
   } else if (shouldContinue) {
     const latest = SessionStorage.getLatestSession();
     if (latest) {
@@ -294680,6 +295365,10 @@ async function runHeadless(options2) {
     allowedTools: options2.allowedTools,
     startedAt: sessionData?.data?.startedAt
   });
+  if (options2.permissionMode) {
+    const loop = client.getAssistantLoop?.();
+    loop?.setPermissionMode(options2.permissionMode);
+  }
   let result = "";
   const toolCalls = [];
   let hadError = false;
@@ -294859,6 +295548,7 @@ function parseArgs(argv) {
     continue: false,
     resume: null,
     cwdProvided: false,
+    permissionMode: null,
     errors: []
   };
   let endOfOptions = false;
@@ -294962,7 +295652,7 @@ function parseArgs(argv) {
     if (arg === "--resume" || arg === "-r") {
       const nextArg = args[i6 + 1];
       if (nextArg === undefined || isFlag(nextArg)) {
-        options2.errors.push(`${arg} requires a session ID`);
+        options2.errors.push(`${arg} requires a session ID or name`);
       } else {
         options2.resume = nextArg;
         i6++;
@@ -294980,6 +295670,27 @@ function parseArgs(argv) {
       }
       continue;
     }
+    if (arg === "--permission-mode" || arg === "--mode") {
+      const nextArg = args[i6 + 1];
+      if (nextArg === undefined || isFlag(nextArg)) {
+        options2.errors.push(`${arg} requires a value (normal, plan, or auto-accept)`);
+      } else {
+        const modeMap = {
+          normal: "normal",
+          plan: "plan",
+          auto: "auto-accept",
+          "auto-accept": "auto-accept"
+        };
+        const mode = modeMap[nextArg.toLowerCase()];
+        if (!mode) {
+          options2.errors.push(`Invalid permission mode "${nextArg}". Valid options: normal, plan, auto-accept`);
+        } else {
+          options2.permissionMode = mode;
+        }
+        i6++;
+      }
+      continue;
+    }
     if (!arg.startsWith("-")) {
       positionalArgs.push(arg);
     }
@@ -295027,8 +295738,9 @@ Headless Mode:
   --json-schema <schema>       JSON Schema for structured output (use with --output-format json)
   --headless-timeout-ms <ms>   Abort headless run after the given timeout (ms)
   -c, --continue               Continue the most recent conversation
-  -r, --resume <session_id>    Resume a specific session by ID
+  -r, --resume <id_or_name>    Resume a session by ID or name
   --cwd <path>                 Set working directory
+  --permission-mode <mode>     Permission mode: normal, plan (read-only), auto-accept
 
 Examples:
   # Ask a question
@@ -295106,7 +295818,7 @@ process.on("unhandledRejection", (reason) => {
   cleanup();
   process.exit(1);
 });
-var VERSION4 = "1.1.86";
+var VERSION4 = "1.1.87";
 var SYNC_START = "\x1B[?2026h";
 var SYNC_END = "\x1B[?2026l";
 function enableSynchronizedOutput() {
@@ -295172,7 +295884,7 @@ Headless Mode:
   --json-schema <schema>       JSON Schema for structured output (use with --output-format json)
   --headless-timeout-ms <ms>   Abort headless run after the given timeout (ms)
   -c, --continue               Continue the most recent conversation
-  -r, --resume <session_id>    Resume a specific session by ID
+  -r, --resume <id_or_name>    Resume a session by ID or name
   --cwd <path>                 Set working directory
 
 Examples:
@@ -295218,7 +295930,8 @@ if (options2.print !== null) {
     continue: options2.continue,
     resume: options2.resume,
     cwdProvided: options2.cwdProvided,
-    timeoutMs: options2.headlessTimeoutMs
+    timeoutMs: options2.headlessTimeoutMs,
+    permissionMode: options2.permissionMode ?? undefined
   }).then((result) => {
     process.exit(result.success ? 0 : 1);
   }).catch((error4) => {
@@ -295230,7 +295943,8 @@ if (options2.print !== null) {
   const disableSyncOutput = useSyncOutput ? enableSynchronizedOutput() : () => {};
   const appElement = /* @__PURE__ */ jsx_dev_runtime52.jsxDEV(App2, {
     cwd: options2.cwd,
-    version: VERSION4
+    version: VERSION4,
+    permissionMode: options2.permissionMode ?? undefined
   }, undefined, false, undefined, this);
   const { waitUntilExit } = render_default(appElement, {
     patchConsole: true,
@@ -295251,4 +295965,4 @@ export {
   main
 };
 
-//# debugId=27FD559CEE6360B064756E2164756E21
+//# debugId=B1DCE952AC4F269164756E2164756E21