@hasna/assistants 1.1.25 → 1.1.26

package/dist/index.js

@@ -21563,9 +21563,10 @@ class NativeHookRegistry {
   config = {};
   register(hook) {
     const eventHooks = this.hooks.get(hook.event) || [];
-    eventHooks.push(hook);
-    eventHooks.sort((a, b) => a.priority - b.priority);
-    this.hooks.set(hook.event, eventHooks);
+    const deduped = eventHooks.filter((existing) => existing.id !== hook.id);
+    deduped.push(hook);
+    deduped.sort((a, b) => a.priority - b.priority);
+    this.hooks.set(hook.event, deduped);
   }
   getHooks(event) {
     return this.hooks.get(event) || [];
@@ -72917,16 +72918,28 @@ class BudgetTracker {
       case "assistant":
         if (idOrAssistant) {
           this.assistantUsages.set(idOrAssistant, newUsage);
+        } else {
+          this.assistantUsages.clear();
         }
         break;
       case "swarm":
         this.swarmUsage = newUsage;
         break;
       case "project":
-        const projectId = idOrAssistant || this.activeProjectId;
-        if (projectId) {
-          this.projectUsages.set(projectId, newUsage);
-          this.saveProjectState(projectId, newUsage);
+        if (idOrAssistant) {
+          this.projectUsages.set(idOrAssistant, newUsage);
+          this.saveProjectState(idOrAssistant, newUsage);
+          break;
+        }
+        if (this.activeProjectId) {
+          this.projectUsages.set(this.activeProjectId, newUsage);
+          this.saveProjectState(this.activeProjectId, newUsage);
+          break;
+        }
+        for (const projectId of this.projectUsages.keys()) {
+          const resetProjectUsage = createEmptyUsage();
+          this.projectUsages.set(projectId, resetProjectUsage);
+          this.saveProjectState(projectId, resetProjectUsage);
         }
         break;
     }
@@ -72936,6 +72949,9 @@ class BudgetTracker {
     this.sessionUsage = createEmptyUsage();
     this.assistantUsages.clear();
     this.swarmUsage = createEmptyUsage();
+    for (const projectId of this.projectUsages.keys()) {
+      this.saveProjectState(projectId, createEmptyUsage());
+    }
     this.projectUsages.clear();
     this.saveState();
   }
@@ -73034,6 +73050,22 @@ var init_tracker = __esm(() => {
 });
 
 // packages/core/src/budget/tools.ts
+function normalizeScope2(value) {
+  return String(value ?? "").trim().toLowerCase();
+}
+function isBudgetToolScope(value) {
+  return BUDGET_TOOL_SCOPES.includes(value);
+}
+function isBudgetResetScope(value) {
+  return value === "all" || isBudgetToolScope(value);
+}
+function parseLimitValue(value) {
+  const numeric = Number(value);
+  if (!Number.isFinite(numeric) || numeric < 0) {
+    return null;
+  }
+  return numeric === 0 ? undefined : numeric;
+}
 function createBudgetToolExecutors(getBudgetTracker) {
   return {
     budget_status: async (input) => {
@@ -73041,7 +73073,11 @@ function createBudgetToolExecutors(getBudgetTracker) {
       if (!tracker) {
         return "Budget tracking is not enabled.";
       }
-      const scope = String(input.scope || "session");
+      const scopeInput = normalizeScope2(input.scope || "session");
+      if (!isBudgetToolScope(scopeInput)) {
+        return `Invalid scope: ${scopeInput || "(empty)"}. Use "session", "swarm", or "project".`;
+      }
+      const scope = scopeInput;
       const status = tracker.checkBudget(scope);
       const lines = [];
       lines.push(`## Budget Status (${scope})`);
@@ -73096,53 +73132,51 @@ function createBudgetToolExecutors(getBudgetTracker) {
       if (!tracker) {
         return "Budget tracking is not enabled.";
       }
-      const scope = String(input.scope || "session");
-      const config = tracker.getConfig();
-      let limitsKey;
-      switch (scope) {
-        case "session":
-          limitsKey = "sessionLimits";
-          break;
-        case "swarm":
-          limitsKey = "swarmLimits";
-          break;
-        case "project":
-          limitsKey = "projectLimits";
-          break;
-        default:
-          return `Invalid scope: ${scope}. Use "session", "swarm", or "project".`;
+      const scopeInput = normalizeScope2(input.scope || "session");
+      if (!isBudgetToolScope(scopeInput)) {
+        return `Invalid scope: ${scopeInput || "(empty)"}. Use "session", "swarm", or "project".`;
       }
+      const scope = scopeInput;
+      const config = tracker.getConfig();
       const updates = {};
-      if (input.maxInputTokens !== undefined)
-        updates.maxInputTokens = Number(input.maxInputTokens);
-      if (input.maxOutputTokens !== undefined)
-        updates.maxOutputTokens = Number(input.maxOutputTokens);
-      if (input.maxTotalTokens !== undefined)
-        updates.maxTotalTokens = Number(input.maxTotalTokens);
-      if (input.maxLlmCalls !== undefined)
-        updates.maxLlmCalls = Number(input.maxLlmCalls);
-      if (input.maxToolCalls !== undefined)
-        updates.maxToolCalls = Number(input.maxToolCalls);
-      if (input.maxDurationMs !== undefined)
-        updates.maxDurationMs = Number(input.maxDurationMs);
-      if (Object.keys(updates).length === 0) {
+      const providedFields = [];
+      const invalidFields = [];
+      for (const field of LIMIT_FIELDS) {
+        if (input[field] === undefined)
+          continue;
+        providedFields.push(field);
+        const parsed = parseLimitValue(input[field]);
+        if (parsed === null) {
+          invalidFields.push(field);
+          continue;
+        }
+        updates[field] = parsed;
+      }
+      if (providedFields.length === 0) {
         return "No limits specified. Provide at least one limit to update.";
       }
+      if (invalidFields.length > 0) {
+        return `Invalid limit values for: ${invalidFields.join(", ")}. Values must be numbers >= 0 (0 = unlimited).`;
+      }
       tracker.updateConfig({
-        [limitsKey]: {
-          ...config[limitsKey],
+        [scope]: {
+          ...config[scope] || {},
           ...updates
         }
       });
+      const applied = Object.fromEntries(providedFields.map((field) => [field, updates[field] ?? "unlimited"]));
       return `Budget limits updated for ${scope} scope:
-${JSON.stringify(updates, null, 2)}`;
+${JSON.stringify(applied, null, 2)}`;
     },
     budget_reset: async (input) => {
       const tracker = getBudgetTracker();
       if (!tracker) {
         return "Budget tracking is not enabled.";
       }
-      const scope = String(input.scope || "session");
+      const scope = normalizeScope2(input.scope || "session");
+      if (!isBudgetResetScope(scope)) {
+        return `Invalid scope: ${scope || "(empty)"}. Use "session", "swarm", "project", or "all".`;
+      }
       if (scope === "all") {
         tracker.resetAll();
         return "All budget counters have been reset.";
@@ -73158,8 +73192,17 @@ function registerBudgetTools(registry, getBudgetTracker) {
     registry.register(tool, executors[tool.name]);
   }
 }
-var budgetStatusTool, budgetGetTool, budgetSetTool, budgetResetTool, budgetTools;
+var BUDGET_TOOL_SCOPES, LIMIT_FIELDS, budgetStatusTool, budgetGetTool, budgetSetTool, budgetResetTool, budgetTools;
 var init_tools4 = __esm(() => {
+  BUDGET_TOOL_SCOPES = ["session", "swarm", "project"];
+  LIMIT_FIELDS = [
+    "maxInputTokens",
+    "maxOutputTokens",
+    "maxTotalTokens",
+    "maxLlmCalls",
+    "maxToolCalls",
+    "maxDurationMs"
+  ];
   budgetStatusTool = {
     name: "budget_status",
     description: "Get current budget status showing usage vs limits for the specified scope (session, swarm, or project).",
@@ -73231,8 +73274,8 @@ var init_tools4 = __esm(() => {
       properties: {
         scope: {
           type: "string",
-          description: 'Budget scope to reset: "session", "swarm", or "all"',
-          enum: ["session", "swarm", "all"]
+          description: 'Budget scope to reset: "session", "swarm", "project", or "all"',
+          enum: ["session", "swarm", "project", "all"]
         }
       },
       required: ["scope"]
@@ -78300,6 +78343,7 @@ class BuiltinCommands {
   registerAll(loader) {
     loader.register(this.helpCommand(loader));
     loader.register(this.aboutCommand());
+    loader.register(this.docsCommand());
     loader.register(this.clearCommand());
     loader.register(this.newCommand());
     loader.register(this.sessionCommand());
@@ -78347,6 +78391,8 @@ class BuiltinCommands {
     loader.register(this.tasksCommand());
     loader.register(this.setupCommand());
     loader.register(this.exitCommand());
+    loader.register(this.diffCommand());
+    loader.register(this.undoCommand());
   }
   aboutCommand() {
     return {
@@ -78369,6 +78415,62 @@ class BuiltinCommands {
 
 `;
         message += `assistants is a terminal-first AI environment for connecting tools, running tasks, and collaborating with agents.
+`;
+        context.emit("text", message);
+        context.emit("done");
+        return { handled: true };
+      }
+    };
+  }
+  docsCommand() {
+    return {
+      name: "docs",
+      description: "Open docs panel in terminal or print full usage guide",
+      builtin: true,
+      selfHandled: true,
+      content: "",
+      handler: async (_args, context) => {
+        let message = `
+**assistants Documentation**
+
+`;
+        message += "In the terminal app, `/docs` opens an interactive documentation panel with keyboard navigation.\n\n";
+        message += `**Quick Start**
+`;
+        message += "  1. Run `/init` in a project.\n";
+        message += "  2. Run `/onboarding` to select provider, model, and API key setup.\n";
+        message += "  3. Start work with `/new` and inspect status via `/status`, `/tokens`, and `/cost`.\n\n";
+        message += `**Core Workflow**
+`;
+        message += `  - Sessions keep history, tool calls, context, and model state.
+`;
+        message += "  - `/sessions` switches sessions.\n";
+        message += "  - `/compact` summarizes long context.\n";
+        message += "  - `/resume` recovers interrupted work.\n\n";
+        message += `**Configuration and Models**
+`;
+        message += "  - `/model` opens interactive model selection.\n";
+        message += "  - `/config` manages user/project/local config.\n";
+        message += "  - `/memory`, `/context`, `/hooks`, and `/guardrails` control behavior and safety.\n\n";
+        message += `**Workspaces and Projects**
+`;
+        message += "  - `/workspace` switches isolated workspace state.\n";
+        message += "  - `/projects` and `/plans` manage project scope and plan execution.\n\n";
+        message += `**Resources and Operations**
+`;
+        message += "  - `/wallet`, `/secrets`, and `/budgets` manage cards, secrets, and limits.\n";
+        message += "  - `/tasks`, `/schedules`, `/jobs`, `/orders`, `/heartbeat`, and `/logs` manage operations.\n\n";
+        message += `**Collaboration**
+`;
+        message += "  - `/assistants`, `/identity`, `/messages`, `/channels`, `/people`, `/telephony`.\n\n";
+        message += `**Voice**
+`;
+        message += "  - `/voice`, `/listen`, `/talk`, `/say`.\n\n";
+        message += `**Storage**
+`;
+        message += "  - Project data: `.assistants/`\n";
+        message += "  - User/global data: `~/.assistants/`\n";
+        message += `  - Workspace switching isolates sessions, assistants, settings, and resource state.
 `;
         context.emit("text", message);
         context.emit("done");
@@ -86888,6 +86990,140 @@ ${repoUrl}/issues/new
       }
     };
   }
+  diffCommand() {
+    return {
+      name: "diff",
+      description: "Show git diff of current changes (supports --staged, <file>)",
+      builtin: true,
+      selfHandled: true,
+      content: "",
+      handler: async (args, context) => {
+        const { exec } = await import("child_process");
+        const { promisify } = await import("util");
+        const execAsync = promisify(exec);
+        const parts = splitArgs(args);
+        try {
+          let diffCmd = "git diff";
+          let statCmd = "git diff --stat";
+          if (parts.includes("--staged") || parts.includes("--cached")) {
+            diffCmd += " --staged";
+            statCmd += " --staged";
+            const fileArgs = parts.filter((p) => p !== "--staged" && p !== "--cached");
+            if (fileArgs.length > 0) {
+              const files = fileArgs.map((f) => `'${f.replace(/'/g, "'\\''")}'`).join(" ");
+              diffCmd += ` -- ${files}`;
+              statCmd += ` -- ${files}`;
+            }
+          } else if (parts.length > 0) {
+            const files = parts.map((f) => `'${f.replace(/'/g, "'\\''")}'`).join(" ");
+            diffCmd += ` -- ${files}`;
+            statCmd += ` -- ${files}`;
+          }
+          const opts = { cwd: context.cwd, maxBuffer: 1048576 };
+          const [statResult, diffResult] = await Promise.all([
+            execAsync(statCmd, opts).catch(() => ({ stdout: "" })),
+            execAsync(diffCmd, opts).catch(() => ({ stdout: "" }))
+          ]);
+          const statOutput = (statResult.stdout || "").trim();
+          const diffOutput = (diffResult.stdout || "").trim();
+          if (!statOutput && !diffOutput) {
+            context.emit("text", `
+No changes detected.
+`);
+            context.emit("done");
+            return { handled: true };
+          }
+          let message = `
+**Git Diff**
+
+`;
+          if (statOutput) {
+            message += "**Summary:**\n```\n" + statOutput + "\n```\n\n";
+          }
+          if (diffOutput) {
+            message += "**Changes:**\n```diff\n" + diffOutput + "\n```\n";
+          }
+          context.emit("text", message);
+        } catch {
+          context.emit("text", `
+Not a git repository or git not available.
+`);
+        }
+        context.emit("done");
+        return { handled: true };
+      }
+    };
+  }
+  undoCommand() {
+    return {
+      name: "undo",
+      description: "Revert uncommitted changes (file, all, or show preview)",
+      builtin: true,
+      selfHandled: true,
+      content: "",
+      handler: async (args, context) => {
+        const { exec } = await import("child_process");
+        const { promisify } = await import("util");
+        const execAsync = promisify(exec);
+        const parts = splitArgs(args);
+        const opts = { cwd: context.cwd };
+        try {
+          if (parts.length === 0) {
+            const { stdout: stdout2 } = await execAsync("git diff --stat", opts);
+            const statOutput = stdout2.trim();
+            if (!statOutput) {
+              context.emit("text", `
+No uncommitted changes to undo.
+`);
+              context.emit("done");
+              return { handled: true };
+            }
+            let message = "\n**Uncommitted Changes:**\n```\n" + statOutput + "\n```\n\n";
+            message += "Use `/undo <file>` to revert a specific file\n";
+            message += "Use `/undo all` to revert all changes\n";
+            context.emit("text", message);
+            context.emit("done");
+            return { handled: true };
+          }
+          if (parts[0] === "all") {
+            const { stdout: stdout2 } = await execAsync("git diff --stat", opts);
+            const statOutput = stdout2.trim();
+            if (!statOutput) {
+              context.emit("text", `
+No uncommitted changes to undo.
+`);
+              context.emit("done");
+              return { handled: true };
+            }
+            await execAsync("git checkout -- .", opts);
+            context.emit("text", "\n**Reverted all uncommitted changes:**\n```\n" + statOutput + "\n```\n");
+            context.emit("done");
+            return { handled: true };
+          }
+          const escaped = parts.map((f) => `'${f.replace(/'/g, "'\\''")}'`).join(" ");
+          const { stdout } = await execAsync(`git diff --stat -- ${escaped}`, opts);
+          const checkOutput = stdout.trim();
+          if (!checkOutput) {
+            context.emit("text", `
+No changes found for: ${parts.join(" ")}
+`);
+            context.emit("done");
+            return { handled: true };
+          }
+          await execAsync(`git checkout -- ${escaped}`, opts);
+          context.emit("text", `
+**Reverted:** ${parts.join(" ")}
+`);
+        } catch {
+          context.emit("text", `
+Not a git repository or git not available.
+`);
+        }
+        context.emit("done");
+        return { handled: true };
+      }
+    };
+  }
   async resolveProject(context, target) {
     const byId = await readProject(context.cwd, target);
     if (byId)
@@ -86918,7 +87154,7 @@ ${repoUrl}/issues/new
     context.setProjectContext(projectContext);
   }
 }
-var VERSION2 = "1.1.25";
+var VERSION2 = "1.1.26";
 var init_builtin = __esm(async () => {
   init_src2();
   init_store();
@@ -92083,14 +92319,22 @@ var init_conventions = __esm(() => {
 });
 
 // packages/core/src/heartbeat/auto-schedule-hook.ts
-async function autoScheduleHeartbeatHandler(_input, context) {
-  const heartbeatCfg = context.config?.heartbeat;
+function resolveHeartbeatConfig(input, context) {
+  const inputHeartbeat = input.heartbeat;
+  if (inputHeartbeat && typeof inputHeartbeat === "object") {
+    return inputHeartbeat;
+  }
+  return context.config?.heartbeat;
+}
+async function autoScheduleHeartbeatHandler(input, context) {
+  const heartbeatCfg = resolveHeartbeatConfig(input, context);
   if (!heartbeatCfg?.autonomous)
     return null;
   const scheduleId = heartbeatScheduleId(context.sessionId);
   try {
     const existing = await getSchedule(context.cwd, scheduleId);
-    if (existing && existing.status === "active") {
+    const hasValidNextRunAt = Number.isFinite(existing?.nextRunAt);
+    if (existing && existing.status === "active" && hasValidNextRunAt) {
       return null;
     }
     const maxSleep = heartbeatCfg.maxSleepMs ?? DEFAULT_MAX_SLEEP_MS;
@@ -92135,11 +92379,13 @@ var init_auto_schedule_hook = __esm(async () => {
 async function ensureWatchdogSchedule(cwd, sessionId, intervalMs = DEFAULT_WATCHDOG_INTERVAL_MS) {
   const scheduleId = watchdogScheduleId(sessionId);
   const existing = await getSchedule(cwd, scheduleId);
-  if (existing && existing.status === "active") {
+  const existingHasValidNextRunAt = Number.isFinite(existing?.nextRunAt);
+  if (existing && existing.status === "active" && existingHasValidNextRunAt) {
     return;
   }
   const legacy = await getSchedule(cwd, WATCHDOG_SCHEDULE_ID);
-  if (legacy && legacy.status === "active" && legacy.sessionId === sessionId) {
+  const legacyHasValidNextRunAt = Number.isFinite(legacy?.nextRunAt);
+  if (legacy && legacy.status === "active" && legacy.sessionId === sessionId && legacyHasValidNextRunAt) {
     return;
   }
   const intervalSeconds = Math.max(60, Math.round(intervalMs / 1000));
@@ -92170,24 +92416,33 @@ var init_watchdog = __esm(async () => {
 
 // packages/core/src/heartbeat/install-skills.ts
 import { join as join30 } from "path";
-async function writeSkillIfMissing(dir, skillName, content) {
-  const { mkdir: mkdir10, writeFile: writeFile8, access } = await import("fs/promises");
+async function writeSkillIfNeeded(dir, skillName, content) {
+  const { mkdir: mkdir10, writeFile: writeFile8, readFile: readFile11 } = await import("fs/promises");
   const skillDir = join30(dir, `skill-${skillName}`);
   const skillFile = join30(skillDir, "SKILL.md");
-  try {
-    await access(skillFile);
-    return false;
-  } catch {}
   await mkdir10(skillDir, { recursive: true });
-  await writeFile8(skillFile, content, "utf-8");
-  return true;
+  try {
+    const existing = await readFile11(skillFile, "utf-8");
+    if (existing === content) {
+      return false;
+    }
+    const hasLegacyPatterns = LEGACY_SKILL_PATTERNS.some((pattern) => pattern.test(existing));
+    if (!hasLegacyPatterns) {
+      return false;
+    }
+    await writeFile8(skillFile, content, "utf-8");
+    return true;
+  } catch {
+    await writeFile8(skillFile, content, "utf-8");
+    return true;
+  }
 }
 async function installHeartbeatSkills() {
   const sharedSkillsDir = join30(getConfigDir(), "shared", "skills");
   const installed = [];
   const results = await Promise.all([
-    writeSkillIfMissing(sharedSkillsDir, "main-loop", MAIN_LOOP_SKILL),
-    writeSkillIfMissing(sharedSkillsDir, "watchdog", WATCHDOG_SKILL)
+    writeSkillIfNeeded(sharedSkillsDir, "main-loop", MAIN_LOOP_SKILL),
+    writeSkillIfNeeded(sharedSkillsDir, "watchdog", WATCHDOG_SKILL)
   ]);
   if (results[0])
     installed.push("main-loop");
@@ -92216,8 +92471,8 @@ You are running as an autonomous heartbeat turn. This is a scheduled wakeup \u20
    - \`memory_save agent.state.lastActions "..."\` with a brief summary of what you did this turn.
    - \`memory_save agent.state.pending "..."\` with any items still pending.
 7. **Schedule next heartbeat** \u2014 choose when you should wake up next based on urgency:
-   - Delete the old heartbeat schedule: \`schedule_delete heartbeat-{SESSION_ID}\`
-   - Create a new schedule: \`schedule_create\` with \`actionType: "message"\`, \`message: "/main-loop"\`, and either \`at\` (one-shot) or \`cron\` + \`startImmediately: true\` (recurring).
+   - Delete the old heartbeat schedule: call \`schedule\` with \`{ action: "delete", id: "heartbeat-{SESSION_ID}" }\`
+   - Create a new schedule: call \`schedule\` with \`action: "create"\`, \`actionType: "message"\`, \`message: "/main-loop"\`, and either \`at\` (one-shot) or \`cron\` + \`startImmediately: true\` (recurring).
    - Save your reasoning: \`memory_save agent.heartbeat.intention "..."\`
 8. **Record timestamp** \u2014 \`memory_save agent.heartbeat.last\` with the current ISO timestamp.
 
@@ -92237,7 +92492,7 @@ You are running as an autonomous heartbeat turn. This is a scheduled wakeup \u20
 name: watchdog
 description: Safety-net watchdog \u2014 checks if the heartbeat is healthy and forces a wakeup if overdue.
 user-invocable: false
-allowed-tools: memory_recall, memory_save, schedule_create, schedule_delete, schedules_list
+allowed-tools: memory_recall, memory_save, schedule
 ---
 
 ## Watchdog Check
@@ -92249,14 +92504,20 @@ You are the watchdog. Your only job is to verify the heartbeat is running and fo
 1. Read \`memory_recall agent.heartbeat.last\` to get the last heartbeat timestamp.
 2. Read \`memory_recall agent.heartbeat.next\` to get the expected next heartbeat time.
 3. If the last heartbeat is more than **double** the expected interval overdue:
-   - Call \`schedules_list\` to check if a heartbeat schedule exists.
+   - Call \`schedule\` with \`{ action: "list" }\` to check if a heartbeat schedule exists.
    - If no active heartbeat schedule exists, create one that fires immediately:
-     \`schedule_create\` with \`actionType: "message"\`, \`message: "/main-loop"\`, and \`cron: "* * * * *"\` + \`startImmediately: true\`.
+     call \`schedule\` with \`action: "create"\`, \`actionType: "message"\`, \`message: "/main-loop"\`, and \`cron: "* * * * *"\` + \`startImmediately: true\`.
    - Save \`memory_save agent.heartbeat.intention "Watchdog forced wakeup \u2014 heartbeat was overdue."\`
 4. If the heartbeat is healthy, do nothing.
-`;
+`, LEGACY_SKILL_PATTERNS;
 var init_install_skills = __esm(async () => {
   await init_config();
+  LEGACY_SKILL_PATTERNS = [
+    /`schedule_create`/,
+    /`schedule_delete`/,
+    /`schedules_list`/,
+    /allowed-tools:\s*.*schedule_create/i
+  ];
 });
 
 // packages/core/src/heartbeat/index.ts
@@ -186336,15 +186597,6 @@ var init_loop = __esm(async () => {
       if (heartbeatCfg?.autonomous) {
         nativeHookRegistry.register(createAutoScheduleHeartbeatHook());
         installHeartbeatSkills().catch(() => {});
-        nativeHookRegistry.setConfig({
-          ...nativeHookRegistry.getConfig(),
-          heartbeat: {
-            autonomous: heartbeatCfg.autonomous,
-            maxSleepMs: heartbeatCfg.maxSleepMs,
-            watchdogEnabled: heartbeatCfg.watchdogEnabled,
-            watchdogIntervalMs: heartbeatCfg.watchdogIntervalMs
-          }
-        });
         if (heartbeatCfg.watchdogEnabled) {
           ensureWatchdogSchedule(this.cwd, this.sessionId, heartbeatCfg.watchdogIntervalMs).catch(() => {});
         }
@@ -186380,8 +186632,8 @@ You are running in **autonomous mode**. You manage your own wakeup schedule.
    - \`memory_save agent.state.pending "items waiting for follow-up"\`
    - \`memory_save agent.state.lastActions "what you just did"\`
 2. **Schedule your next heartbeat**:
-   - Delete old: \`schedule_delete heartbeat-${this.sessionId}\`
-   - Create new: \`schedule_create\` with \`actionType: "message"\`, \`message: "/main-loop"\`, and either \`at\` (one-shot) or \`cron\` + \`startImmediately: true\` (recurring)
+   - Delete old: call \`schedule\` with \`{ action: "delete", id: "heartbeat-${this.sessionId}" }\`
+   - Create new: call \`schedule\` with \`action: "create"\`, \`actionType: "message"\`, \`message: "/main-loop"\`, and either \`at\` (one-shot) or \`cron\` + \`startImmediately: true\` (recurring)
 3. **Save goals** when they change: \`memory_save agent.goals "..."\`
 
 ### Timing guidelines
@@ -186635,9 +186887,9 @@ You are running in **autonomous mode**. You manage your own wakeup schedule.
           turn++;
           this.cumulativeTurns++;
           if (this.paused) {
-            this.onBudgetWarning?.("Budget exceeded - agent paused. Use /budget resume to continue.");
+            this.onBudgetWarning?.("Budget exceeded - agent paused. Use /budgets resume to continue.");
             this.emit({ type: "text", content: `
-[Agent paused - budget exceeded. Use /budget resume to continue.]
+[Agent paused - budget exceeded. Use /budgets resume to continue.]
 ` });
             await new Promise((resolve5) => {
               this.pauseResolve = resolve5;
@@ -186714,11 +186966,7 @@ You are running in **autonomous mode**. You manage your own wakeup schedule.
           });
         } catch {}
         try {
-          await nativeHookRegistry.execute("Stop", {
-            session_id: this.sessionId,
-            hook_event_name: "Stop",
-            cwd: this.cwd
-          }, {
+          await nativeHookRegistry.execute("Stop", this.buildNativeStopHookInput(), {
             sessionId: this.sessionId,
             cwd: this.cwd,
             messages: this.context.getMessages()
@@ -186840,11 +187088,7 @@ You are running in **autonomous mode**. You manage your own wakeup schedule.
       if (!scopeContext) {
         return null;
       }
-      const result = await nativeHookRegistry.execute("Stop", {
-        session_id: this.sessionId,
-        hook_event_name: "Stop",
-        cwd: this.cwd
-      }, {
+      const result = await nativeHookRegistry.execute("Stop", this.buildNativeStopHookInput(), {
         sessionId: this.sessionId,
         cwd: this.cwd,
         messages: this.context.getMessages(),
@@ -186859,6 +187103,20 @@ You are running in **autonomous mode**. You manage your own wakeup schedule.
         systemMessage: result.systemMessage
       };
     }
+    buildNativeStopHookInput() {
+      const heartbeatCfg = this.config?.heartbeat;
+      return {
+        session_id: this.sessionId,
+        hook_event_name: "Stop",
+        cwd: this.cwd,
+        heartbeat: heartbeatCfg ? {
+          autonomous: heartbeatCfg.autonomous,
+          maxSleepMs: heartbeatCfg.maxSleepMs,
+          watchdogEnabled: heartbeatCfg.watchdogEnabled,
+          watchdogIntervalMs: heartbeatCfg.watchdogIntervalMs
+        } : undefined
+      };
+    }
     async firePostToolUseFailure(toolCall, resultContent) {
       await this.hookExecutor.execute(this.hookLoader.getHooks("PostToolUseFailure"), {
         session_id: this.sessionId,
@@ -187323,9 +187581,32 @@ You are running in **autonomous mode**. You manage your own wakeup schedule.
         setBudgetEnabled: (enabled) => {
           if (this.budgetTracker) {
             this.budgetTracker.setEnabled(enabled);
-          } else if (enabled && this.budgetConfig) {
-            this.budgetTracker = new BudgetTracker(this.sessionId, this.budgetConfig);
-            this.budgetTracker.setEnabled(true);
+            this.budgetConfig = this.budgetTracker.getConfig();
+            return;
+          }
+          if (!enabled) {
+            if (this.budgetConfig) {
+              this.budgetConfig = {
+                ...this.budgetConfig,
+                enabled: false
+              };
+            }
+            return;
+          }
+          const seed = this.budgetConfig || DEFAULT_BUDGET_CONFIG;
+          this.budgetConfig = {
+            ...DEFAULT_BUDGET_CONFIG,
+            ...seed,
+            session: { ...DEFAULT_BUDGET_CONFIG.session || {}, ...seed.session || {} },
+            assistant: { ...DEFAULT_BUDGET_CONFIG.assistant || {}, ...seed.assistant || {} },
+            swarm: { ...DEFAULT_BUDGET_CONFIG.swarm || {}, ...seed.swarm || {} },
+            project: { ...DEFAULT_BUDGET_CONFIG.project || {}, ...seed.project || {} },
+            enabled: true
+          };
+          this.budgetTracker = new BudgetTracker(this.sessionId, this.budgetConfig);
+          this.budgetTracker.setEnabled(true);
+          if (this.activeProjectId) {
+            this.budgetTracker.setActiveProject(this.activeProjectId);
           }
         },
         resetBudget: (scope) => {
@@ -187751,7 +188032,7 @@ You are running in **autonomous mode**. You manage your own wakeup schedule.
           this.onBudgetWarning?.("Budget exceeded - stopping assistant");
           this.stop();
         } else if (onExceeded === "pause") {
-          this.onBudgetWarning?.("Budget exceeded - pausing (requires /budget resume to continue)");
+          this.onBudgetWarning?.("Budget exceeded - pausing (requires /budgets resume to continue)");
           this.paused = true;
         }
       }
@@ -210481,6 +210762,12 @@ function useSafeInput(handler, options = {}) {
 ` : "\x1B\r";
         }
         const key2 = { ...inkKey };
+        if ((input2 === "m" || input2 === "j") && key2.ctrl && !key2.return) {
+          input2 = input2 === "j" ? `
+` : "\r";
+          key2.return = true;
+          key2.ctrl = false;
+        }
         const isReturnInput = input2 === "\r" || input2 === `
 ` || input2 === `\r
 ` || input2 === `
@@ -210610,6 +210897,8 @@ var COMMANDS = [
   { name: "/secrets", description: "manage assistant secrets" },
   { name: "/jobs", description: "manage background jobs" },
   { name: "/docs", description: "interactive app documentation" },
+  { name: "/diff", description: "show git diff of changes" },
+  { name: "/undo", description: "revert uncommitted changes" },
   { name: "/rest", description: "enter rest mode" },
   { name: "/logs", description: "view security event logs" },
   { name: "/verification", description: "scope verification status" },
@@ -210644,6 +210933,7 @@ function isLargePaste(text, thresholds = DEFAULT_PASTE_THRESHOLDS) {
 }
 var Input = import_react28.default.forwardRef(function Input2({
   onSubmit,
+  onStopProcessing,
   isProcessing,
   queueLength = 0,
   commands: commands9,
@@ -210657,7 +210947,8 @@ var Input = import_react28.default.forwardRef(function Input2({
   pasteConfig,
   isRecording = false,
   recordingStatus,
-  onStopRecording
+  onStopRecording,
+  onFileSearch
 }, ref) {
   const pasteEnabled = pasteConfig?.enabled !== false;
   const pasteThresholds = pasteConfig?.thresholds ?? DEFAULT_PASTE_THRESHOLDS;
@@ -210712,8 +211003,14 @@ var Input = import_react28.default.forwardRef(function Input2({
     if (value.startsWith("/") && !value.includes(" ")) {
       return "command";
     }
+    if (onFileSearch) {
+      const atMatch = value.match(/(?:^|.*\s)@([^\s]*)$/);
+      if (atMatch) {
+        return "file";
+      }
+    }
     return null;
-  }, [value, isAskingUser]);
+  }, [value, isAskingUser, onFileSearch]);
   const filteredCommands = import_react28.useMemo(() => {
     if (autocompleteMode !== "command")
       return [];
@@ -210726,7 +211023,18 @@ var Input = import_react28.default.forwardRef(function Input2({
     const search = value.slice(1).toLowerCase();
     return skills.filter((skill) => skill.name.toLowerCase().startsWith(search));
   }, [value, autocompleteMode, skills]);
-  const autocompleteItems = autocompleteMode === "skill" ? filteredSkills : filteredCommands;
+  const fileSearchQuery = import_react28.useMemo(() => {
+    if (autocompleteMode !== "file")
+      return "";
+    const atMatch = value.match(/(?:^|.*\s)@([^\s]*)$/);
+    return atMatch ? atMatch[1] : "";
+  }, [value, autocompleteMode]);
+  const filteredFiles = import_react28.useMemo(() => {
+    if (autocompleteMode !== "file" || !onFileSearch)
+      return [];
+    return onFileSearch(fileSearchQuery);
+  }, [autocompleteMode, fileSearchQuery, onFileSearch]);
+  const autocompleteItems = autocompleteMode === "skill" ? filteredSkills : autocompleteMode === "file" ? filteredFiles.map((f6) => ({ name: f6 })) : filteredCommands;
   import_react28.useEffect(() => {
     if (autocompleteItems.length === 0) {
       setSelectedIndex(0);
@@ -210907,6 +211215,10 @@ var Input = import_react28.default.forwardRef(function Input2({
       return;
     }
     if (key.escape && !isAskingUser) {
+      if (isProcessing && onStopProcessing) {
+        onStopProcessing();
+        return;
+      }
       if (largePaste) {
         setLargePaste(null);
         setShowPastePreview(false);
@@ -210932,8 +211244,15 @@ var Input = import_react28.default.forwardRef(function Input2({
       if (key.tab) {
         if (autocompleteItems.length > 0) {
           const selected = autocompleteItems[selectedIndex] || autocompleteItems[0];
-          const nextValue = autocompleteMode === "skill" ? `$${selected.name} ` : `${selected.name} `;
-          setValueAndCursor(nextValue);
+          if (autocompleteMode === "file") {
+            const atMatch = value.match(/^(.*(?:^|\s))@[^\s]*$/);
+            const prefix2 = atMatch ? atMatch[1] : "";
+            const nextValue = prefix2 + selected.name + " ";
+            setValueAndCursor(nextValue);
+          } else {
+            const nextValue = autocompleteMode === "skill" ? `$${selected.name} ` : `${selected.name} `;
+            setValueAndCursor(nextValue);
+          }
           return;
         }
         if (isProcessing && value.trim()) {
@@ -211013,12 +211332,6 @@ var Input = import_react28.default.forwardRef(function Input2({
       deleteForward();
       return;
     }
-    if (input === "\x1B\r" || input === `\x1B
-`) {
-      insertText(`
-`);
-      return;
-    }
     if (key.return) {
       if (isRecording && onStopRecording) {
         onStopRecording();
@@ -211029,7 +211342,8 @@ var Input = import_react28.default.forwardRef(function Input2({
         setValueAndCursor("");
         return;
       }
-      if (key.meta && value.trim()) {
+      if (key.meta && value.trim() && input !== "\x1B\r" && input !== `\x1B
+`) {
         onSubmit(value, "queue");
         setValueAndCursor("");
         return;
@@ -211068,6 +211382,8 @@ var Input = import_react28.default.forwardRef(function Input2({
   };
   const visibleSkills = getVisibleItems(filteredSkills);
   const visibleCommands = getVisibleItems(filteredCommands);
+  const fileItems = import_react28.useMemo(() => filteredFiles.map((f6) => ({ name: f6 })), [filteredFiles]);
+  const visibleFiles = getVisibleItems(fileItems);
   const layout = buildLayout(value, cursor, textWidth);
   const lines = layout.displayLines;
   const lineCount = value.split(`
@@ -211340,6 +211656,41 @@ var Input = import_react28.default.forwardRef(function Input2({
             ]
           }, undefined, true, undefined, this)
         ]
+      }, undefined, true, undefined, this),
+      autocompleteMode === "file" && filteredFiles.length > 0 && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+        flexDirection: "column",
+        marginTop: 1,
+        marginLeft: 2,
+        children: [
+          visibleFiles.startIndex > 0 && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text3, {
+            dimColor: true,
+            children: [
+              "  \u2191 ",
+              visibleFiles.startIndex,
+              " more above"
+            ]
+          }, undefined, true, undefined, this),
+          visibleFiles.items.map((file, i5) => {
+            const actualIndex = visibleFiles.startIndex + i5;
+            return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+              children: /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text3, {
+                color: actualIndex === selectedIndex ? "cyan" : "#5fb3a1",
+                children: [
+                  actualIndex === selectedIndex ? "\u25B8 " : "  ",
+                  file.name
+                ]
+              }, undefined, true, undefined, this)
+            }, file.name, false, undefined, this);
+          }),
+          visibleFiles.startIndex + maxVisible < filteredFiles.length && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text3, {
+            dimColor: true,
+            children: [
+              "  \u2193 ",
+              filteredFiles.length - visibleFiles.startIndex - maxVisible,
+              " more below"
+            ]
+          }, undefined, true, undefined, this)
+        ]
       }, undefined, true, undefined, this)
     ]
   }, undefined, true, undefined, this);
@@ -213778,7 +214129,8 @@ function Status({
   backgroundProcessingCount = 0,
   processingStartTime,
   verboseTools = false,
-  recentTools = []
+  recentTools = [],
+  gitBranch
 }) {
   const [elapsed, setElapsed] = import_react30.useState(0);
   const [heartbeatCountdown, setHeartbeatCountdown] = import_react30.useState("");
@@ -213879,7 +214231,8 @@ function Status({
         dimColor: true,
         children: [
           "/help",
-          sessionCount && sessionCount > 1 ? " \xB7 Ctrl+]" : ""
+          sessionCount && sessionCount > 1 ? " \xB7 Ctrl+]" : "",
+          gitBranch ? ` \xB7 \u2387 ${gitBranch}` : ""
         ]
       }, undefined, true, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
@@ -214851,6 +215204,7 @@ function ConnectorsPanel({
   const [loadedConnectors, setLoadedConnectors] = import_react36.useState(new Map);
   const [autoRefreshEntries, setAutoRefreshEntries] = import_react36.useState(new Map);
   const [autoRefreshError, setAutoRefreshError] = import_react36.useState(null);
+  const pendingAuthChecksRef = import_react36.useRef(new Set);
   const filteredConnectors = import_react36.useMemo(() => {
     if (!searchQuery.trim()) {
       return connectors;
@@ -214874,24 +215228,6 @@ function ConnectorsPanel({
       }
     }
   }, [initialConnector, filteredConnectors]);
-  import_react36.useEffect(() => {
-    const loadStatuses = async () => {
-      const results = await Promise.all(connectors.map(async (connector) => {
-        try {
-          const status = await onCheckAuth(connector);
-          return { name: connector.name, status };
-        } catch {
-          return { name: connector.name, status: { authenticated: false, error: "Failed to check" } };
-        }
-      }));
-      const statusMap = new Map;
-      for (const { name: name2, status } of results) {
-        statusMap.set(name2, status);
-      }
-      setAuthStatuses(statusMap);
-    };
-    loadStatuses();
-  }, [connectors, onCheckAuth]);
   const loadAutoRefreshEntries = import_react36.useCallback(async () => {
     try {
       const manager = ConnectorAutoRefreshManager.getInstance();
@@ -214991,6 +215327,10 @@ function ConnectorsPanel({
   }, [mode, loadCommandHelp]);
   useSafeInput((input, key) => {
     if (isSearching) {
+      if (input === "q" || input === "Q") {
+        onClose();
+        return;
+      }
       if (key.escape) {
         if (searchQuery) {
           setSearchQuery("");
@@ -215049,7 +215389,7 @@ function ConnectorsPanel({
     if (key.upArrow) {
       if (mode === "list" && filteredConnectors.length > 0) {
         setConnectorIndex((prev) => prev === 0 ? filteredConnectors.length - 1 : prev - 1);
-      } else if (mode === "detail") {
+      } else if (mode === "detail" && currentCommands.length > 0) {
         setCommandIndex((prev) => prev === 0 ? currentCommands.length - 1 : prev - 1);
       }
       return;
@@ -215057,7 +215397,7 @@ function ConnectorsPanel({
     if (key.downArrow) {
       if (mode === "list" && filteredConnectors.length > 0) {
         setConnectorIndex((prev) => prev === filteredConnectors.length - 1 ? 0 : prev + 1);
-      } else if (mode === "detail") {
+      } else if (mode === "detail" && currentCommands.length > 0) {
         setCommandIndex((prev) => prev === currentCommands.length - 1 ? 0 : prev + 1);
       }
       return;
@@ -215071,10 +215411,6 @@ function ConnectorsPanel({
       }
       return;
     }
-    if (mode === "list" && input && /^[a-zA-Z]$/.test(input)) {
-      setIsSearching(true);
-      setSearchQuery(input);
-    }
   });
   const getStatusIcon = (status) => {
     if (!status)
@@ -215088,6 +215424,45 @@ function ConnectorsPanel({
   const connectorRange = import_react36.useMemo(() => getVisibleRange(safeConnectorIndex, filteredConnectors.length), [safeConnectorIndex, filteredConnectors.length]);
   const commandRange = import_react36.useMemo(() => getVisibleRange(commandIndex, currentCommands.length), [commandIndex, currentCommands.length]);
   const visibleConnectors = filteredConnectors.slice(connectorRange.start, connectorRange.end);
+  import_react36.useEffect(() => {
+    const targets = mode === "list" ? visibleConnectors : currentConnector ? [currentConnector] : [];
+    if (targets.length === 0) {
+      return;
+    }
+    let cancelled = false;
+    const loadStatuses = async () => {
+      for (const connector of targets) {
+        const name2 = connector.name;
+        if (authStatuses.has(name2) || pendingAuthChecksRef.current.has(name2)) {
+          continue;
+        }
+        pendingAuthChecksRef.current.add(name2);
+        try {
+          let status;
+          try {
+            status = await onCheckAuth(connector);
+          } catch {
+            status = { authenticated: false, error: "Failed to check" };
+          }
+          if (cancelled)
+            continue;
+          setAuthStatuses((prev) => {
+            if (prev.has(name2))
+              return prev;
+            const next = new Map(prev);
+            next.set(name2, status);
+            return next;
+          });
+        } finally {
+          pendingAuthChecksRef.current.delete(name2);
+        }
+      }
+    };
+    loadStatuses();
+    return () => {
+      cancelled = true;
+    };
+  }, [authStatuses, currentConnector, mode, onCheckAuth, visibleConnectors]);
   if (connectors.length === 0) {
     return /* @__PURE__ */ jsx_dev_runtime13.jsxDEV(Box_default, {
       flexDirection: "column",
@@ -226654,16 +227029,16 @@ function JobsPanel({ manager, onClose }) {
     if (!job || isWorking)
       return;
     if (!isActiveStatus(job.status)) {
-      setStatusMessage(`Job ${job.id} is ${job.status}. Only pending/running jobs can be cancelled.`);
+      setStatusMessage(`Job ${job.id} is ${job.status}. Only pending/running jobs can be killed.`);
       return;
     }
     setIsWorking(true);
     try {
       const cancelled = await manager.cancelJob(job.id);
       if (cancelled) {
-        setStatusMessage(`Cancelled ${job.id}.`);
+        setStatusMessage(`Killed ${job.id}.`);
       } else {
-        setStatusMessage(`Could not cancel ${job.id}.`);
+        setStatusMessage(`Could not kill ${job.id}.`);
       }
       await refreshJobs(false);
     } catch (err) {
@@ -226672,6 +227047,38 @@ function JobsPanel({ manager, onClose }) {
       setIsWorking(false);
     }
   }, [isWorking, manager, refreshJobs]);
+  const killAllActiveJobs = import_react50.useCallback(async () => {
+    if (isWorking)
+      return;
+    const activeJobs = jobs2.filter((job) => isActiveStatus(job.status));
+    if (activeJobs.length === 0) {
+      setStatusMessage("No active jobs to kill.");
+      return;
+    }
+    setIsWorking(true);
+    try {
+      let killed = 0;
+      for (const job of activeJobs) {
+        try {
+          const cancelled = await manager.cancelJob(job.id);
+          if (cancelled)
+            killed += 1;
+        } catch {}
+      }
+      if (killed === 0) {
+        setStatusMessage("Could not kill any active jobs.");
+      } else if (killed === activeJobs.length) {
+        setStatusMessage(`Killed ${killed} active job${killed === 1 ? "" : "s"}.`);
+      } else {
+        setStatusMessage(`Killed ${killed}/${activeJobs.length} active jobs.`);
+      }
+      await refreshJobs(false);
+    } catch (err) {
+      setError(err instanceof Error ? err.message : String(err));
+    } finally {
+      setIsWorking(false);
+    }
+  }, [isWorking, jobs2, manager, refreshJobs]);
   const openDetail = import_react50.useCallback(() => {
     const selected = filteredJobs[selectedIndex];
     if (!selected)
@@ -226694,7 +227101,11 @@ function JobsPanel({ manager, onClose }) {
         refreshJobs(true);
         return;
       }
-      if (input === "x" || input === "c") {
+      if (input === "K") {
+        killAllActiveJobs();
+        return;
+      }
+      if (input === "x" || input === "c" || input === "d") {
         cancelJob(detailJob);
       }
       return;
@@ -226748,7 +227159,11 @@ function JobsPanel({ manager, onClose }) {
       refreshJobs(true);
       return;
     }
-    if (input === "x" || input === "c") {
+    if (input === "K") {
+      killAllActiveJobs();
+      return;
+    }
+    if (input === "x" || input === "c" || input === "d") {
       cancelJob(filteredJobs[selectedIndex] || null);
     }
   });
@@ -226786,7 +227201,9 @@ function JobsPanel({ manager, onClose }) {
         children: [
           "(",
           jobs2.length,
-          " total)"
+          " total, ",
+          jobs2.filter((job) => isActiveStatus(job.status)).length,
+          " active)"
         ]
       }, undefined, true, undefined, this)
     ]
@@ -226907,7 +227324,7 @@ function JobsPanel({ manager, onClose }) {
           marginTop: 1,
           children: /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text3, {
             color: "gray",
-            children: "x/c cancel  r refresh  esc back  q close"
+            children: "d/x/c kill selected  K kill all active  r refresh  esc back  q close"
           }, undefined, false, undefined, this)
         }, undefined, false, undefined, this)
       ]
@@ -227027,7 +227444,7 @@ function JobsPanel({ manager, onClose }) {
         marginTop: 1,
         children: /* @__PURE__ */ jsx_dev_runtime27.jsxDEV(Text3, {
           color: "gray",
-          children: "j/k or arrows move  enter view  x/c cancel  r refresh  1/2/3 filter  q close"
+          children: "j/k or arrows move  enter view  d/x/c kill selected  K kill all active  r refresh  1/2/3 filter  q close"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this)
     ]
@@ -227116,7 +227533,7 @@ var DOCS_SECTIONS = [
     content: [
       "Use /tasks for queued local tasks with priority and pause/resume controls.",
       "Use /schedules for recurring command execution with next-run visibility.",
-      "Use /jobs for background connector/tool jobs. Cancel jobs directly in the panel.",
+      "Use /jobs for background connector/tool jobs. Kill jobs directly in the panel.",
       "Use /orders for interactive order/store workflows (tabs, table navigation, detail views).",
       "Use /logs for security events and /heartbeat for recurring assistant runs."
     ]
@@ -236360,7 +236777,7 @@ function SecretsPanel({
       setIsProcessing(false);
     }
   };
-  const normalizeScope2 = (rawScope) => {
+  const normalizeScope3 = (rawScope) => {
     const scope = rawScope.trim().toLowerCase();
     if (!scope)
       return "assistant";
@@ -236369,7 +236786,7 @@ function SecretsPanel({
     return null;
   };
   const normalizeAddInput = (form) => {
-    const scope = normalizeScope2(String(form.scope));
+    const scope = normalizeScope3(String(form.scope));
     if (!scope) {
       return null;
     }
@@ -236390,7 +236807,7 @@ function SecretsPanel({
       return;
     }
     if (currentAddField.key === "scope") {
-      const normalizedScope = normalizeScope2(currentValue);
+      const normalizedScope = normalizeScope3(currentValue);
       if (!normalizedScope) {
         setStatusMessage('Scope must be "assistant" or "global".');
         return;
@@ -238870,6 +239287,18 @@ function ResumePanel({
   }, undefined, true, undefined, this);
 }
 
+// packages/terminal/src/components/queueUtils.ts
+function takeNextQueuedMessage(queue, sessionId) {
+  const next = queue.find((msg) => msg.sessionId === sessionId);
+  if (!next) {
+    return { next: null, remaining: queue };
+  }
+  return {
+    next,
+    remaining: queue.filter((msg) => msg.id !== next.id)
+  };
+}
+
 // packages/terminal/src/output/sanitize.ts
 var CLEAR_SCREEN_SEQUENCE = "\x1B[2J\x1B[3J\x1B[H";
 var CLEAR_SCREEN_TOKEN = "__ASSISTANTS_CLEAR_SCREEN__";
@@ -239256,6 +239685,7 @@ function App2({ cwd: cwd2, version: version3 }) {
   const [heartbeatState, setHeartbeatState] = import_react72.useState();
   const [identityInfo, setIdentityInfo] = import_react72.useState();
   const [verboseTools, setVerboseTools] = import_react72.useState(false);
+  const [gitBranch, setGitBranch] = import_react72.useState();
   const [askUserState, setAskUserState] = import_react72.useState(null);
   const [processingStartTime, setProcessingStartTime] = import_react72.useState();
   const [currentTurnTokens, setCurrentTurnTokens] = import_react72.useState(0);
@@ -239269,6 +239699,42 @@ function App2({ cwd: cwd2, version: version3 }) {
   const pttRecorderRef = import_react72.useRef(null);
   const [skills, setSkills] = import_react72.useState([]);
   const [commands9, setCommands] = import_react72.useState([]);
+  const fileListCacheRef = import_react72.useRef({ files: [], timestamp: 0 });
+  const searchFiles = import_react72.useCallback((query) => {
+    const cache7 = fileListCacheRef.current;
+    const now2 = Date.now();
+    if (now2 - cache7.timestamp > 30000 || cache7.files.length === 0) {
+      try {
+        const { execSync } = __require("child_process");
+        let output;
+        try {
+          output = execSync("git ls-files --cached --others --exclude-standard 2>/dev/null", {
+            cwd: cwd2,
+            encoding: "utf-8",
+            maxBuffer: 1024 * 1024,
+            timeout: 3000
+          });
+        } catch {
+          output = execSync('find . -type f -not -path "*/node_modules/*" -not -path "*/.git/*" -maxdepth 5 2>/dev/null | head -1000', {
+            cwd: cwd2,
+            encoding: "utf-8",
+            maxBuffer: 1024 * 1024,
+            timeout: 3000
+          });
+        }
+        cache7.files = output.trim().split(`
+`).filter(Boolean).slice(0, 2000);
+        cache7.timestamp = now2;
+      } catch {
+        return [];
+      }
+    }
+    if (!query)
+      return cache7.files.slice(0, 20);
+    const lower = query.toLowerCase();
+    const matches = cache7.files.filter((f6) => f6.toLowerCase().includes(lower));
+    return matches.slice(0, 20);
+  }, [cwd2]);
   const lastCtrlCRef = import_react72.useRef(0);
   const [showExitHint, setShowExitHint] = import_react72.useState(false);
   const responseRef = import_react72.useRef("");
@@ -239277,6 +239743,8 @@ function App2({ cwd: cwd2, version: version3 }) {
   const activityLogRef = import_react72.useRef([]);
   const skipNextDoneRef = import_react72.useRef(false);
   const isProcessingRef = import_react72.useRef(isProcessing);
+  const currentToolCallRef = import_react72.useRef(currentToolCall);
+  const hasPendingToolsRef = import_react72.useRef(false);
   const inputRef = import_react72.useRef(null);
   const isListeningRef = import_react72.useRef(isListening);
   const listenLoopRef = import_react72.useRef({
@@ -239357,6 +239825,9 @@ function App2({ cwd: cwd2, version: version3 }) {
   import_react72.useEffect(() => {
     isProcessingRef.current = isProcessing;
   }, [isProcessing]);
+  import_react72.useEffect(() => {
+    currentToolCallRef.current = currentToolCall;
+  }, [currentToolCall]);
   import_react72.useEffect(() => {
     isListeningRef.current = isListening;
   }, [isListening]);
@@ -239370,6 +239841,14 @@ function App2({ cwd: cwd2, version: version3 }) {
       processingStartTimeRef.current = now2;
     }
   }, [isProcessing, processingStartTime]);
+  import_react72.useEffect(() => {
+    const { exec: exec3 } = __require("child_process");
+    exec3("git branch --show-current 2>/dev/null", { cwd: cwd2 }, (err, stdout2) => {
+      if (!err && stdout2?.trim()) {
+        setGitBranch(stdout2.trim());
+      }
+    });
+  }, [cwd2]);
   const buildFullResponse = import_react72.useCallback(() => {
     const parts = activityLogRef.current.filter((entry) => entry.type === "text" && entry.content).map((entry) => entry.content);
     if (responseRef.current.trim()) {
@@ -240048,7 +240527,7 @@ function App2({ cwd: cwd2, version: version3 }) {
         const pendingIndex = pendingSendsRef.current.findIndex((entry) => entry.sessionId === active.id);
         if (pendingIndex !== -1) {
           const [started] = pendingSendsRef.current.splice(pendingIndex, 1);
-          if (started?.mode === "inline") {
+          if (started) {
             setInlinePending((prev) => prev.filter((msg) => msg.id !== started.id));
           }
         }
@@ -240702,17 +241181,10 @@ function App2({ cwd: cwd2, version: version3 }) {
     const activeSession2 = registryRef.current.getActiveSession();
     if (!activeSession2 || !activeSessionId)
       return;
-    let nextMessage;
-    setMessageQueue((prev) => {
-      const idx = prev.findIndex((msg) => msg.sessionId === activeSessionId);
-      if (idx === -1) {
-        return prev;
-      }
-      nextMessage = prev[idx];
-      return [...prev.slice(0, idx), ...prev.slice(idx + 1)];
-    });
+    const { next: nextMessage, remaining } = takeNextQueuedMessage(messageQueue, activeSessionId);
     if (!nextMessage)
       return;
+    setMessageQueue(remaining);
     const userMessage = {
       id: nextMessage.id,
       role: "user",
@@ -240741,7 +241213,6 @@ function App2({ cwd: cwd2, version: version3 }) {
     setIsProcessing(true);
     isProcessingRef.current = true;
     registryRef.current.setProcessing(activeSession2.id, true);
-    pendingSendsRef.current.push({ id: nextMessage.id, sessionId: activeSessionId, mode: "queued" });
     try {
       await activeSession2.client.send(nextMessage.content);
     } catch (err) {
@@ -240750,8 +241221,9 @@ function App2({ cwd: cwd2, version: version3 }) {
       setIsProcessing(false);
       isProcessingRef.current = false;
       registryRef.current.setProcessing(activeSession2.id, false);
+      setQueueFlushTrigger((prev) => prev + 1);
     }
-  }, [activeSessionId, clearPendingSend]);
+  }, [activeSessionId, clearPendingSend, messageQueue]);
   const activeQueue = activeSessionId ? messageQueue.filter((msg) => msg.sessionId === activeSessionId) : [];
   const activeInline = activeSessionId ? inlinePending.filter((msg) => msg.sessionId === activeSessionId) : [];
   const queuedMessageIds = import_react72.useMemo(() => new Set(activeQueue.filter((msg) => msg.mode === "queued").map((msg) => msg.id)), [activeQueue]);
@@ -240811,6 +241283,9 @@ function App2({ cwd: cwd2, version: version3 }) {
     }
     return false;
   }, [activityLog]);
+  import_react72.useEffect(() => {
+    hasPendingToolsRef.current = hasPendingTools;
+  }, [hasPendingTools]);
   const isBusy = isProcessing || hasPendingTools;
   const listenHints = import_react72.useMemo(() => {
     if (!isListening)
@@ -240890,6 +241365,26 @@ function App2({ cwd: cwd2, version: version3 }) {
       setError(err instanceof Error ? err.message : "Failed to create session");
     }
   }, [cwd2, createAndActivateSession]);
+  const stopActiveProcessing = import_react72.useCallback((status = "stopped") => {
+    const active = registryRef.current.getActiveSession();
+    if (!active)
+      return false;
+    const sessionProcessing = active.isProcessing;
+    const shouldStopNow = isProcessingRef.current || hasPendingToolsRef.current || sessionProcessing || Boolean(currentToolCallRef.current);
+    if (!shouldStopNow)
+      return false;
+    active.client.stop();
+    const finalized = finalizeResponse2(status);
+    if (finalized) {
+      skipNextDoneRef.current = true;
+    }
+    resetTurnState();
+    registryRef.current.setProcessing(active.id, false);
+    setIsProcessing(false);
+    isProcessingRef.current = false;
+    setQueueFlushTrigger((prev) => prev + 1);
+    return true;
+  }, [finalizeResponse2, resetTurnState]);
   useSafeInput((input, key) => {
     if (isListeningRef.current && key.ctrl && input === "l") {
       stopListening();
@@ -240910,18 +241405,7 @@ function App2({ cwd: cwd2, version: version3 }) {
       if (hasAsk) {
         cancelAskUser("Cancelled by user", activeSessionId);
       }
-      const sessionProcessing = activeSession?.isProcessing ?? false;
-      if ((isProcessing || hasPendingTools || sessionProcessing || currentToolCall) && activeSession) {
-        activeSession.client.stop();
-        const finalized = finalizeResponse2("stopped");
-        if (finalized) {
-          skipNextDoneRef.current = true;
-        }
-        resetTurnState();
-        registryRef.current.setProcessing(activeSession.id, false);
-        setIsProcessing(false);
-        isProcessingRef.current = false;
-        setQueueFlushTrigger((prev) => prev + 1);
+      if (stopActiveProcessing("stopped")) {
         lastCtrlCRef.current = 0;
         setShowExitHint(false);
         return;
@@ -240950,18 +241434,8 @@ function App2({ cwd: cwd2, version: version3 }) {
       if (activeSessionId && askUserStateRef.current.has(activeSessionId)) {
         cancelAskUser("Cancelled by user", activeSessionId);
       }
-      const sessionProcessing = activeSession?.isProcessing ?? false;
-      if ((isProcessing || hasPendingTools || sessionProcessing || currentToolCall) && activeSession) {
-        activeSession.client.stop();
-        const finalized = finalizeResponse2("stopped");
-        if (finalized) {
-          skipNextDoneRef.current = true;
-        }
-        resetTurnState();
-        registryRef.current.setProcessing(activeSession.id, false);
-        setIsProcessing(false);
-        isProcessingRef.current = false;
-        setQueueFlushTrigger((prev) => prev + 1);
+      if (stopActiveProcessing("stopped")) {
+        return;
       }
     }
     if (key.ctrl && input === "a") {
@@ -240972,7 +241446,7 @@ function App2({ cwd: cwd2, version: version3 }) {
       openBudgetsPanel();
       return;
     }
-    if (key.ctrl && input === "m") {
+    if (key.ctrl && input === "m" && !key.return) {
       const messagesManager = registry2.getActiveSession()?.client.getMessagesManager?.();
       if (messagesManager) {
         messagesManager.list({ limit: 50 }).then((msgs) => {
@@ -241455,7 +241929,7 @@ function App2({ cwd: cwd2, version: version3 }) {
           timestamp: now()
         }
       ]);
-      pendingSendsRef.current.push({ id: inlineId, sessionId: activeSessionId, mode: "inline" });
+      pendingSendsRef.current.push({ id: inlineId, sessionId: activeSessionId });
       try {
         await activeSession.client.send(trimmedInput);
       } catch (err) {
@@ -241464,17 +241938,8 @@ function App2({ cwd: cwd2, version: version3 }) {
       }
       return;
     }
-    if (mode === "interrupt" && isProcessing) {
-      activeSession.client.stop();
-      const finalized = finalizeResponse2("interrupted");
-      if (finalized) {
-        skipNextDoneRef.current = true;
-      }
-      resetTurnState();
-      setIsProcessing(false);
-      isProcessingRef.current = false;
-      registry2.setProcessing(activeSession.id, false);
-      setQueueFlushTrigger((prev) => prev + 1);
+    if (mode === "interrupt" && isBusy) {
+      stopActiveProcessing("interrupted");
       await new Promise((r6) => setTimeout(r6, 100));
     }
     const userMessage = {
@@ -241516,6 +241981,7 @@ function App2({ cwd: cwd2, version: version3 }) {
   }, [
     activeSession,
     isProcessing,
+    isBusy,
     registry2,
     sessions,
     handleNewSession,
@@ -241527,7 +241993,8 @@ function App2({ cwd: cwd2, version: version3 }) {
     submitAskAnswer,
     clearPendingSend,
     startListening,
-    stopListening
+    stopListening,
+    stopActiveProcessing
   ]);
   import_react72.useEffect(() => {
     sendListenMessageRef.current = (text) => {
@@ -243292,6 +243759,9 @@ ${msg.body || msg.preview}`);
       /* @__PURE__ */ jsx_dev_runtime48.jsxDEV(Input, {
         ref: inputRef,
         onSubmit: handleSubmit,
+        onStopProcessing: () => {
+          stopActiveProcessing("stopped");
+        },
         isProcessing: isBusy,
         queueLength: activeQueue.length + inlineCount,
         commands: commands9,
@@ -243303,7 +243773,8 @@ ${msg.body || msg.preview}`);
         assistantName: identityInfo?.assistant?.name || undefined,
         isRecording: pttRecording,
         recordingStatus: pttStatus,
-        onStopRecording: togglePushToTalk
+        onStopRecording: togglePushToTalk,
+        onFileSearch: searchFiles
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime48.jsxDEV(Status, {
         isProcessing: isBusy,
@@ -243318,7 +243789,8 @@ ${msg.body || msg.preview}`);
         sessionCount,
         backgroundProcessingCount,
         processingStartTime,
-        verboseTools
+        verboseTools,
+        gitBranch
       }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
@@ -243766,7 +244238,7 @@ Interactive Mode:
 // packages/terminal/src/index.tsx
 var jsx_dev_runtime49 = __toESM(require_jsx_dev_runtime(), 1);
 setRuntime(bunRuntime);
-var VERSION4 = "1.1.25";
+var VERSION4 = "1.1.26";
 var SYNC_START = "\x1B[?2026h";
 var SYNC_END = "\x1B[?2026l";
 function enableSynchronizedOutput() {
@@ -243906,4 +244378,4 @@ export {
   main
 };
 
-//# debugId=57A038F79EFFC02464756E2164756E21
+//# debugId=6204ABF8948FEE3864756E2164756E21