autopilot-ai 1.11.0 → 1.12.1

package/dist/index.js

@@ -20836,6 +20836,39 @@ var init_help_menu = __esm({
   }
 });
 
+// src/agent/queue-batch.ts
+function createQueueBatch(items) {
+  if (items.length < 2) return null;
+  if (items.some((item) => isCommand(item.full))) return null;
+  const prompts = items.flatMap((item) => item.batchPrompts ?? [item.full.trim()]);
+  const sourceKeys = items.flatMap((item) => item.sourceKeys ?? [item.key]);
+  const numberedPrompts = prompts.map((prompt, index) => `${index + 1}. ${prompt}`).join("\n\n");
+  const full = [
+    `The user chose to group ${prompts.length} queued follow-ups into one coordinated task.`,
+    "First identify dependencies and an efficient order. Treat every follow-up as a requirement. Delegate bounded, independent research to subagents when it materially helps; worker calls still require the normal user permission. Keep dependent changes coordinated in this session, and do not have multiple workers edit overlapping files.",
+    "",
+    "Queued follow-ups:",
+    numberedPrompts
+  ].join("\n");
+  const display = `Coordinate ${prompts.length} queued follow-ups as one task. Use subagents to research independent parts where useful; keep dependent changes coordinated.`;
+  return {
+    full,
+    display,
+    key: sourceKeys[0],
+    batchPrompts: prompts,
+    sourceKeys
+  };
+}
+function isCommand(prompt) {
+  const trimmed = prompt.trimStart();
+  return trimmed.startsWith("/") || trimmed.startsWith("!");
+}
+var init_queue_batch = __esm({
+  "src/agent/queue-batch.ts"() {
+    "use strict";
+  }
+});
+
 // src/ui/app-helpers.ts
 var app_helpers_exports = {};
 __export(app_helpers_exports, {
@@ -20858,12 +20891,50 @@ __export(app_helpers_exports, {
   mkKey: () => mkKey,
   openBrowser: () => openBrowser,
   rebuildSystemPromptForMode: () => rebuildSystemPromptForMode,
+  replaceQueuedPrompt: () => replaceQueuedPrompt,
+  replaceUserPromptEvent: () => replaceUserPromptEvent,
   trackRecentFile: () => trackRecentFile
 });
 import { execSync as execSync3, spawn as spawn6 } from "child_process";
 import { existsSync as existsSync5, readFileSync as readFileSync5, statSync as statSync5 } from "fs";
 import { join as join32 } from "path";
 import { platform as platform3 } from "os";
+function replaceQueuedPrompt(queue2, key, full, display) {
+  const index = queue2.findIndex((item) => item.key === key);
+  if (index >= 0) {
+    const next2 = [...queue2];
+    next2[index] = { ...next2[index], full, display };
+    return next2;
+  }
+  const groupedIndex = queue2.findIndex((item) => item.sourceKeys?.includes(key));
+  if (groupedIndex < 0) return null;
+  const grouped = queue2[groupedIndex];
+  if (!grouped.sourceKeys || !grouped.batchPrompts) return null;
+  const promptIndex = grouped.sourceKeys.indexOf(key);
+  const replacement = createQueueBatch(
+    grouped.batchPrompts.map((prompt, index2) => ({
+      key: grouped.sourceKeys[index2],
+      full: index2 === promptIndex ? full : prompt,
+      display: index2 === promptIndex ? display : prompt
+    }))
+  );
+  if (!replacement) return null;
+  const next = [...queue2];
+  next[groupedIndex] = replacement;
+  return next;
+}
+function replaceUserPromptEvent(events, key, text, discardTurnOutput = false) {
+  const index = events.findIndex((event2) => event2.kind === "user" && event2.key === key);
+  if (index < 0) return events;
+  const event = events[index];
+  if (event.kind !== "user") return events;
+  const replacement = { ...event, text, images: void 0 };
+  if (!discardTurnOutput) {
+    return events.map((item, i) => i === index ? replacement : item);
+  }
+  const queuedFollowUps = events.slice(index + 1).filter((item) => item.kind === "user" && item.queued);
+  return [...events.slice(0, index), replacement, ...queuedFollowUps];
+}
 function buildFilePickerIgnoreList(cwd) {
   const hardcoded = [
     // Dependencies
@@ -21095,6 +21166,7 @@ var init_app_helpers = __esm({
     init_custom_endpoint();
     init_system_prompt();
     init_image();
+    init_queue_batch();
     MAX_GITIGNORE_SIZE = 1 * 1024 * 1024;
     CONTEXT_LIMIT = 262e3;
     AUTO_COMPACT_THRESHOLD = 0.8;
@@ -23944,6 +24016,67 @@ var init_hooks_wizard = __esm({
   }
 });
 
+// src/ui/activity.ts
+function activityFromJob(job) {
+  const active = job.status === "starting" || job.status === "running" || job.status === "cancelling";
+  const status = active ? "running" : job.status === "completed" ? "done" : job.status === "cancelled" ? "stopped" : "failed";
+  const summary = job.status === "cancelling" ? "Stopping\u2026" : job.status === "timed_out" ? "Timed out" : job.status === "unknown" ? "Process state could not be verified" : job.exitCode !== null && job.exitCode !== 0 ? `Exited with code ${job.exitCode}` : void 0;
+  return {
+    id: job.id,
+    kind: "job",
+    title: job.command,
+    status,
+    stoppable: job.status === "starting" || job.status === "running",
+    ...summary ? { summary } : {},
+    started_at_ms: job.createdAt,
+    ...job.finishedAt !== null ? { updated_at_ms: job.finishedAt } : {}
+  };
+}
+function activityFromWorker(worker) {
+  const status = worker.status === "pending" ? "waiting" : worker.status === "running" ? "running" : worker.status === "completed" ? "done" : worker.status === "budget_exhausted" ? "needs_attention" : "failed";
+  const steps = worker.steps?.map((step) => ({
+    title: step.label,
+    status: step.status === "active" ? "running" : step.status === "completed" ? "done" : step.status === "failed" ? "failed" : "pending"
+  }));
+  const doneCount = steps?.filter((step) => step.status === "done" || step.status === "failed").length ?? 0;
+  const summary = worker.error ?? worker.steps?.find((step) => step.status === "active")?.label ?? (worker.status === "budget_exhausted" ? "Budget exhausted; inspect partial results" : void 0);
+  return {
+    id: `agent:${worker.id}`,
+    kind: "agent",
+    title: `${worker.mode}: ${worker.task}`,
+    status,
+    // A single worker cannot currently be cancelled independently; the only
+    // available AbortSignal cancels the entire multi-agent batch.
+    stoppable: false,
+    ...summary ? { summary } : {},
+    ...steps && steps.length > 0 ? {
+      progress: worker.status === "completed" ? 1 : doneCount / steps.length,
+      steps
+    } : {},
+    started_at_ms: worker.startedAt
+  };
+}
+function diffActivityItems(previous, current, snapshotSent) {
+  if (!snapshotSent) return [{ type: "ActivitySnapshot", payload: { items: [...current] } }];
+  const next = new Map(current.map((item) => [item.id, item]));
+  const events = [];
+  for (const [id, item] of next) {
+    if (previous.get(id) !== JSON.stringify(item)) events.push({ type: "ActivityUpdate", payload: item });
+  }
+  for (const id of previous.keys()) {
+    if (!next.has(id)) events.push({ type: "ActivityRemoved", payload: { id } });
+  }
+  return events;
+}
+function isActiveJob(job) {
+  return job.status === "starting" || job.status === "running" || job.status === "cancelling";
+}
+var init_activity = __esm({
+  "src/ui/activity.ts"() {
+    "use strict";
+  }
+});
+
 // src/camouflage-view.ts
 var camouflage_view_exports = {};
 __export(camouflage_view_exports, {
@@ -23952,6 +24085,9 @@ __export(camouflage_view_exports, {
   listMentionDir: () => listMentionDir,
   modelOptions: () => modelOptions,
   runCamouflageView: () => runCamouflageView,
+  shouldSendSubagentPolicyNotice: () => shouldSendSubagentPolicyNotice,
+  splitBangResult: () => splitBangResult,
+  syncSlashCommands: () => syncSlashCommands,
   toolRow: () => toolRow,
   toolSummary: () => toolSummary,
   validateCommandName: () => validateCommandName
@@ -24005,6 +24141,7 @@ async function runCamouflageView(opts2) {
     resume: () => sdk.resumeTerminal?.(cam)
   });
   cam.on("userInput", (text) => {
+    if (view.routeActivityCommand(text)) return;
     view.echoed.push(text.trim());
     view.actions?.submit(text);
   });
@@ -24020,10 +24157,15 @@ async function runCamouflageView(opts2) {
     });
   });
   cam.on("modeChangeRequested", () => view.actions?.cycleMode());
+  cam.on("activityStopRequested", ({ id }) => view.stopActivity(id));
+  cam.on("activityViewChanged", (change) => {
+    view.activityViewChanged(change);
+  });
   let closing = false;
   const finish = async () => {
     if (closing) return;
     closing = true;
+    view.dispose();
     registerTerminalHandoff(null);
     await cam.close().catch(() => void 0);
     restoreConsole();
@@ -24052,6 +24194,38 @@ function runShell(command) {
     child.on("error", (err) => resolve15({ ok: false, output: err.message }));
   });
 }
+function syncSlashCommands(custom, lastKey, send) {
+  const builtin = [
+    ...BUILTIN_COMMANDS.map((c) => ({ name: c.name, description: c.description, args_hint: c.argHint })),
+    { name: "jobs", description: "Browse background jobs and agents" },
+    { name: "agents", description: "Browse background agents and jobs" }
+  ];
+  const names = new Set(builtin.map((c) => c.name));
+  const commands = [
+    ...builtin,
+    ...custom.filter((c) => !names.has(c.name)).map((c) => ({ name: c.name, description: c.description ? `${c.description} (custom)` : "Custom command" }))
+  ];
+  const key = JSON.stringify(commands);
+  if (key !== lastKey) send(commands);
+  return key;
+}
+function shouldSendSubagentPolicyNotice(message2, sent) {
+  if (!message2.startsWith("Subagent policy:") || message2.startsWith("Subagent policy: respecting your ")) return true;
+  if (sent.has(message2)) return false;
+  sent.add(message2);
+  return true;
+}
+function splitBangResult(title, content) {
+  if (!title?.startsWith("! ")) return { output: content };
+  const match = /^(exit=\d+|signal=[^\r\n]+|exit=\?)(?:\r?\n)/.exec(content);
+  if (!match) return { output: content };
+  const exit = /^exit=(\d+)$/.exec(match[1]);
+  return {
+    output: content.slice(match[0].length),
+    status: match[1],
+    ...exit ? { exitCode: Number(exit[1]) } : {}
+  };
+}
 function validateCommandName(name, existing) {
   if (!name) return "a name is required";
   if (!/^[a-zA-Z][a-zA-Z0-9_\-/]*$/.test(name)) return "use letters, numbers, _ - / and start with a letter";
@@ -24243,6 +24417,8 @@ var init_camouflage_view = __esm({
     init_hooks_wizard();
     init_mode();
     init_logger();
+    init_manager();
+    init_activity();
     CamouflageUnavailable = class extends Error {
     };
     View = class {
@@ -24267,7 +24443,19 @@ var init_camouflage_view = __esm({
       todos = "";
       permission = null;
       openPrompt = null;
-      commandsKey = "";
+      commandsKey;
+      sentSubagentPolicyNotices = /* @__PURE__ */ new Set();
+      jobs = new JobManager();
+      sentActivities = /* @__PURE__ */ new Map();
+      workerActivities = /* @__PURE__ */ new Map();
+      jobLogOffsets = /* @__PURE__ */ new Map();
+      workerLogOffsets = /* @__PURE__ */ new Map();
+      latestJobs = [];
+      latestWorkers = [];
+      activitySnapshotSent = false;
+      activityDetailId = null;
+      activityPoll = null;
+      disposed = false;
       connect(actions) {
         this.actions = actions;
       }
@@ -24282,16 +24470,136 @@ var init_camouflage_view = __esm({
         }
         this.syncPermission(s);
         this.syncPrompts(s);
+        this.syncActivity(s.workers);
       }
       /** Built-in plus the user's custom commands, re-sent when they change. */
+      routeActivityCommand(text) {
+        if (!/^\/(?:jobs|agents)$/i.test(text.trim())) return false;
+        this.cam.send("ActivityBrowserOpen", {});
+        return true;
+      }
+      activityViewChanged(change) {
+        this.activityDetailId = change.view === "detail" ? change.id ?? null : null;
+        this.jobLogOffsets.clear();
+        this.workerLogOffsets.clear();
+        if (this.activityDetailId) {
+          if (this.activityDetailId.startsWith("agent:")) this.streamWorkerLogs(this.activityDetailId, true);
+          else this.streamJobLogs(this.activityDetailId, true);
+        }
+        this.ensureActivityPolling();
+      }
+      stopActivity(id) {
+        try {
+          const job = this.jobs.get(id);
+          if (!job || !isActiveJob(job)) return;
+          this.jobs.cancel(id);
+          this.refreshActivities();
+        } catch (error) {
+          logger.warn("camouflage.activity_stop_failed", { id, error: String(error) });
+          this.cam.send("RuntimeError", { message: `Unable to stop background job: ${error.message}`, severity: "error" });
+        }
+      }
+      dispose() {
+        this.disposed = true;
+        if (this.activityPoll) clearInterval(this.activityPoll);
+        this.activityPoll = null;
+        this.jobs.close();
+      }
+      syncActivity(workers) {
+        this.latestWorkers = workers;
+        try {
+          const records = this.jobs.list({ limit: 100 });
+          this.latestJobs = [
+            ...records.filter(isActiveJob),
+            ...records.filter((job) => !isActiveJob(job)).slice(0, 5)
+          ];
+        } catch (error) {
+          logger.warn("camouflage.activity_jobs_read_failed", { error: String(error) });
+        }
+        const now2 = Date.now();
+        const currentWorkers = /* @__PURE__ */ new Set();
+        for (const worker of workers) {
+          const id = `agent:${worker.id}`;
+          currentWorkers.add(id);
+          this.workerActivities.set(id, {
+            item: activityFromWorker(worker),
+            logs: [...worker.logs],
+            active: true,
+            expiresAt: Number.POSITIVE_INFINITY
+          });
+        }
+        for (const [id, activity] of this.workerActivities) {
+          if (currentWorkers.has(id) || !activity.active) continue;
+          activity.active = false;
+          activity.expiresAt = now2 + 10 * 6e4;
+          if (activity.item.status === "running" || activity.item.status === "waiting") {
+            const cancelled = activity.logs.some((line) => /cancelled by user|cancelling worker/i.test(line));
+            const failed = activity.logs.some((line) => line.includes("[coordinator] Fetch failed:"));
+            activity.item = {
+              ...activity.item,
+              status: cancelled ? "stopped" : failed ? "failed" : "done",
+              summary: cancelled ? "Stopped" : failed ? activity.item.summary ?? "Worker failed" : "Worker finished",
+              updated_at_ms: now2
+            };
+          }
+        }
+        for (const [id, activity] of this.workerActivities) {
+          if (!activity.active && activity.expiresAt <= now2) this.workerActivities.delete(id);
+        }
+        const finishedWorkers = [...this.workerActivities.entries()].filter(([, activity]) => !activity.active).sort((a, b) => (b[1].item.updated_at_ms ?? b[1].item.started_at_ms ?? 0) - (a[1].item.updated_at_ms ?? a[1].item.started_at_ms ?? 0));
+        for (const [id] of finishedWorkers.slice(20)) this.workerActivities.delete(id);
+        const next = /* @__PURE__ */ new Map();
+        for (const job of this.latestJobs) next.set(job.id, activityFromJob(job));
+        for (const [id, activity] of this.workerActivities) next.set(id, activity.item);
+        for (const event of diffActivityItems(this.sentActivities, [...next.values()], this.activitySnapshotSent)) {
+          this.cam.send(event.type, event.payload);
+        }
+        this.activitySnapshotSent = true;
+        this.sentActivities.clear();
+        for (const [id, item] of next) this.sentActivities.set(id, JSON.stringify(item));
+        if (this.activityDetailId?.startsWith("agent:")) this.streamWorkerLogs(this.activityDetailId, false);
+        this.ensureActivityPolling();
+      }
+      ensureActivityPolling() {
+        const needsPolling = this.latestJobs.some(isActiveJob);
+        if (needsPolling && !this.activityPoll && !this.disposed) {
+          this.activityPoll = setInterval(() => this.refreshActivities(), 1e3);
+          this.activityPoll.unref?.();
+        } else if (!needsPolling && this.activityPoll) {
+          clearInterval(this.activityPoll);
+          this.activityPoll = null;
+        }
+      }
+      refreshActivities() {
+        if (this.disposed) return;
+        this.syncActivity(this.latestWorkers);
+        const id = this.activityDetailId;
+        if (id && !id.startsWith("agent:")) this.streamJobLogs(id, false);
+      }
+      streamWorkerLogs(id, reset2) {
+        const activity = this.workerActivities.get(id);
+        if (!activity) return;
+        const offset = reset2 ? 0 : this.workerLogOffsets.get(id) ?? 0;
+        const chunk = activity.logs.slice(offset).join("\n");
+        if (chunk) this.cam.send("ActivityLog", { id, chunk: `${chunk}
+`, stream: "stdout" });
+        this.workerLogOffsets.set(id, activity.logs.length);
+      }
+      streamJobLogs(id, initial) {
+        for (const stream of ["stdout", "stderr"]) {
+          const key = `${id}:${stream}`;
+          try {
+            const result2 = initial ? this.jobs.logs(id, stream, { tail: 1e3 }) : this.jobs.logs(id, stream, { offset: this.jobLogOffsets.get(key) ?? 0 });
+            this.jobLogOffsets.set(key, result2.offset);
+            if (result2.content) this.cam.send("ActivityLog", { id, chunk: result2.content, stream });
+          } catch {
+          }
+        }
+      }
       syncCommands(custom) {
-        const key = custom.map((c) => `${c.name}:${c.description ?? ""}`).join("|");
-        if (key === this.commandsKey && this.commandsKey !== "") return;
-        this.commandsKey = key || "(none)";
-        const builtin = BUILTIN_COMMANDS.map((c) => ({ name: c.name, description: c.description, args_hint: c.argHint }));
-        const names = new Set(builtin.map((c) => c.name));
-        const mine = custom.filter((c) => !names.has(c.name)).map((c) => ({ name: c.name, description: c.description ? `${c.description} (custom)` : "Custom command" }));
-        this.cam.send("SlashCommandsRegistered", { commands: [...builtin, ...mine] });
+        this.commandsKey = syncSlashCommands(custom, this.commandsKey, (commands) => {
+          this.cam.send("SlashCommandsRegistered", { commands });
+        });
       }
       syncEvents(events) {
         if (events.length < this.settled || this.firstKey !== void 0 && events[0]?.key !== this.firstKey) {
@@ -24342,6 +24650,9 @@ var init_camouflage_view = __esm({
             return this.syncTool(e, prev);
           case "info":
           case "memory":
+            if (e.kind === "info" && !shouldSendSubagentPolicyNotice(e.text, this.sentSubagentPolicyNotices)) {
+              return this.mark(e.key, 0, true);
+            }
             return this.notice(e.key, e.text, "info");
           case "error":
             return this.notice(e.key, e.text, "error");
@@ -24364,12 +24675,14 @@ var init_camouflage_view = __esm({
         if (e.status === "queued" || e.status === "running") return this.mark(e.key, 0, false);
         const ok = e.status === "done";
         const content = e.result ?? "";
+        const bang = splitBangResult(e.render?.title, content);
+        const output = e.status === "rejected" ? "" : bang.output;
         this.cam.send("ToolExecutionFinished", {
           tool_id: e.key,
-          exit_code: ok ? 0 : 1,
+          exit_code: bang.exitCode ?? (ok ? 0 : 1),
           status: e.status === "rejected" ? "rejected" : e.status === "cancelled" ? "cancelled" : ok ? "done" : "error",
-          summary: toolSummary(e.name, ok, e.status === "rejected", content),
-          output: e.status === "rejected" ? "" : content,
+          summary: bang.status ?? toolSummary(e.name, ok, e.status === "rejected", output),
+          output,
           ...ok && e.render?.diff ? { diff: e.render.diff } : {}
         });
         return this.mark(e.key, 0, true);
@@ -26601,10 +26914,18 @@ var init_chat = __esm({
         return /* @__PURE__ */ jsx13(ToolView, { evt, verbose, isRepeated, intentTier });
       }
       if (evt.kind === "info") {
-        return /* @__PURE__ */ jsxs10(Text12, { color: theme.info.color, children: [
-          "\xB7 ",
-          humanizeInfo(evt.text, intentTier)
-        ] });
+        const isSubagentHint = /^(Subagent policy|Subagent suggestion):/.test(evt.text);
+        return /* @__PURE__ */ jsxs10(
+          Text12,
+          {
+            color: isSubagentHint ? theme.muted?.color ?? theme.info.color : theme.info.color,
+            dimColor: isSubagentHint || void 0,
+            children: [
+              "\xB7 ",
+              humanizeInfo(evt.text, intentTier)
+            ]
+          }
+        );
       }
       if (evt.kind === "jev") {
         const resultColor = evt.tone === "yes" ? theme.palette.success : evt.tone === "no" ? theme.warn : theme.accent;
@@ -27359,39 +27680,6 @@ var init_queue_plan_picker = __esm({
   }
 });
 
-// src/agent/queue-batch.ts
-function createQueueBatch(items) {
-  if (items.length < 2) return null;
-  if (items.some((item) => isCommand(item.full))) return null;
-  const prompts = items.flatMap((item) => item.batchPrompts ?? [item.full.trim()]);
-  const sourceKeys = items.flatMap((item) => item.sourceKeys ?? [item.key]);
-  const numberedPrompts = prompts.map((prompt, index) => `${index + 1}. ${prompt}`).join("\n\n");
-  const full = [
-    `The user chose to group ${prompts.length} queued follow-ups into one coordinated task.`,
-    "First identify dependencies and an efficient order. Treat every follow-up as a requirement. Delegate bounded, independent research to subagents when it materially helps; worker calls still require the normal user permission. Keep dependent changes coordinated in this session, and do not have multiple workers edit overlapping files.",
-    "",
-    "Queued follow-ups:",
-    numberedPrompts
-  ].join("\n");
-  const display = `Coordinate ${prompts.length} queued follow-ups as one task. Use subagents to research independent parts where useful; keep dependent changes coordinated.`;
-  return {
-    full,
-    display,
-    key: sourceKeys[0],
-    batchPrompts: prompts,
-    sourceKeys
-  };
-}
-function isCommand(prompt) {
-  const trimmed = prompt.trimStart();
-  return trimmed.startsWith("/") || trimmed.startsWith("!");
-}
-var init_queue_batch = __esm({
-  "src/agent/queue-batch.ts"() {
-    "use strict";
-  }
-});
-
 // src/ui/task-list.tsx
 import { useEffect as useEffect6, useRef as useRef4, useState as useState14 } from "react";
 import { Box as Box18, Text as Text19 } from "ink";
@@ -36595,6 +36883,8 @@ function App({
   const [history, setHistory] = useState28([]);
   const [historyIndex, setHistoryIndex] = useState28(-1);
   const [draftInput, setDraftInput] = useState28("");
+  const latestPromptRef = useRef9(null);
+  const pendingPromptEditRef = useRef9(null);
   const modesEnabled = cfg?.modesEnabled === true;
   const [mode, setMode] = useState28(initialCfg?.modesEnabled ? "edit" : "auto");
   useEffect11(() => {
@@ -37624,10 +37914,21 @@ ${result2.output ?? "(output not captured)"}`,
       if (!cfg) return;
       let trimmed = text.trim();
       if (!trimmed) return;
+      let display = displayText?.trim() || trimmed;
+      const promptKey = opts2?.eventKey ?? opts2?.queuedKeys?.[0];
+      if (promptKey && !trimmed.startsWith("/") && parseBangCommand(trimmed) === null) {
+        const previousTarget = latestPromptRef.current;
+        if (opts2?.eventKey || previousTarget?.key === promptKey) {
+          latestPromptRef.current = {
+            key: promptKey,
+            historyText: opts2?.historyText ?? previousTarget?.historyText ?? display,
+            messagesBefore: [...messagesRef.current]
+          };
+        }
+      }
       beginTurn();
       let overrideModel;
       let overrideEffort;
-      let display = displayText?.trim() || trimmed;
       const bangCommand = parseBangCommand(trimmed);
       if (bangCommand !== null) {
         await runUserShellCommand(bangCommand, display, opts2?.queuedKeys?.[0]);
@@ -37714,7 +38015,7 @@ ${result2.output ?? "(output not captured)"}`,
           )
         );
       } else {
-        setEvents((e) => [...e, { kind: "user", key: mkKey(), text: display, images: images.length > 0 ? images : void 0 }]);
+        setEvents((e) => [...e, { kind: "user", key: opts2?.eventKey ?? mkKey(), text: display, images: images.length > 0 ? images : void 0 }]);
       }
       const nudge = maybeLspNudge(display, cfg?.lspEnabled ?? false, cfg?.lspServers ?? {});
       if (nudge) {
@@ -38420,13 +38721,26 @@ ${conflicts.join("\n")}` }
     [cfg, handleSlash, updateAssistant, updateTool, saveSessionSafe, updateResponseMeta, setShowPlanCompletePicker, runUserShellCommand]
   );
   useEffect11(() => {
-    if (!busy && queuePlanDraft === null && queue2.length > 0 && supervisorRef.current.phase === "idle") {
-      const next = queue2[0];
-      setQueue((q) => q.slice(1));
-      processMessage(next.full, next.display, {
-        queuedKeys: next.sourceKeys ?? [next.key],
-        ...next.batchPrompts ? { userPromptForHooks: next.batchPrompts.join("\n\n") } : {}
-      });
+    if (!busy && queuePlanDraft === null && supervisorRef.current.phase === "idle") {
+      const pendingEdit = pendingPromptEditRef.current;
+      if (pendingEdit) {
+        pendingPromptEditRef.current = null;
+        messagesRef.current = [...pendingEdit.messagesBefore];
+        setEvents((events2) => replaceUserPromptEvent(events2, pendingEdit.key, pendingEdit.display, true));
+        processMessage(pendingEdit.full, pendingEdit.display, {
+          queuedKeys: [pendingEdit.key],
+          historyText: pendingEdit.display
+        });
+        return;
+      }
+      if (queue2.length > 0) {
+        const next = queue2[0];
+        setQueue((q) => q.slice(1));
+        processMessage(next.full, next.display, {
+          queuedKeys: next.sourceKeys ?? [next.key],
+          ...next.batchPrompts ? { userPromptForHooks: next.batchPrompts.join("\n\n") } : {}
+        });
+      }
     }
   }, [busy, queue2, queuePlanDraft, processMessage]);
   const handleQueuePlanPick = useCallback9(
@@ -38465,10 +38779,55 @@ ${conflicts.join("\n")}` }
         return;
       }
       const historyEntry = trimmedDisplay;
+      const editTarget = latestPromptRef.current;
+      const selectedHistoryEntry = history[historyIndex];
+      const isEditedLatestPrompt = historyIndex === history.length - 1 && editTarget !== null && events.some((event) => event.kind === "user" && event.key === editTarget.key) && selectedHistoryEntry === editTarget.historyText;
+      if (isEditedLatestPrompt && editTarget) {
+        if (trimmedDisplay === selectedHistoryEntry) {
+          setInput("");
+          setHistoryIndex(-1);
+          return;
+        }
+        const updatedQueue = replaceQueuedPrompt(queue2, editTarget.key, trimmedFull, trimmedDisplay);
+        if (updatedQueue || editTarget.messagesBefore) {
+          setHistory(
+            (items) => items.length > 0 && items[items.length - 1] === editTarget.historyText ? [...items.slice(0, -1), trimmedDisplay] : items
+          );
+          setInput("");
+          setHistoryIndex(-1);
+          latestPromptRef.current = { ...editTarget, historyText: trimmedDisplay };
+          setEvents((events2) => replaceUserPromptEvent(events2, editTarget.key, trimmedDisplay));
+          if (updatedQueue) {
+            setQueue(updatedQueue);
+            return;
+          }
+          const edit = {
+            key: editTarget.key,
+            full: trimmedFull,
+            display: trimmedDisplay,
+            messagesBefore: editTarget.messagesBefore
+          };
+          if (busyRef.current || supervisorRef.current.isRunning) {
+            pendingPromptEditRef.current = edit;
+            interruptTurn(interruptDepsRef.current);
+          } else {
+            messagesRef.current = [...edit.messagesBefore];
+            setEvents((events2) => replaceUserPromptEvent(events2, edit.key, edit.display, true));
+            processMessage(edit.full, edit.display, {
+              queuedKeys: [edit.key],
+              historyText: edit.display
+            });
+          }
+          return;
+        }
+      }
       if (busyRef.current || supervisorRef.current.isRunning) {
-        const key = mkKey();
-        setEvents((e) => [...e, { kind: "user", key, text: trimmedDisplay, queued: true }]);
-        setQueue((q) => [...q, { full: trimmedFull, display: trimmedDisplay, key }]);
+        const key2 = mkKey();
+        setEvents((e) => [...e, { kind: "user", key: key2, text: trimmedDisplay, queued: true }]);
+        setQueue((q) => [...q, { full: trimmedFull, display: trimmedDisplay, key: key2 }]);
+        if (!trimmedFull.startsWith("/") && parseBangCommand(trimmedFull) === null) {
+          latestPromptRef.current = { key: key2, historyText: historyEntry, messagesBefore: null };
+        }
         setHistory((h) => h.length > 0 && h[h.length - 1] === historyEntry ? h : [...h, historyEntry]);
         setInput("");
         setHistoryIndex(-1);
@@ -38477,9 +38836,13 @@ ${conflicts.join("\n")}` }
       setHistory((h) => h.length > 0 && h[h.length - 1] === historyEntry ? h : [...h, historyEntry]);
       setInput("");
       setHistoryIndex(-1);
-      processMessage(trimmedFull, trimmedDisplay !== trimmedFull ? trimmedDisplay : void 0);
+      const key = mkKey();
+      processMessage(trimmedFull, trimmedDisplay !== trimmedFull ? trimmedDisplay : void 0, {
+        eventKey: key,
+        historyText: historyEntry
+      });
     },
-    [processMessage, queue2]
+    [processMessage, queue2, history, historyIndex, events]
   );
   submitRef.current = submit;
   useEffect11(() => {
@@ -38719,6 +39082,7 @@ ${conflicts.join("\n")}` }
     bridge.sync({
       events,
       busy,
+      workers: activeWorkers,
       mode,
       model: cfg?.model ?? "",
       usage,
@@ -38954,6 +39318,7 @@ ${conflicts.join("\n")}` }
         }
       ),
       parseBangCommand(input) !== null && /* @__PURE__ */ jsx43(Box41, { marginTop: 1, children: /* @__PURE__ */ jsx43(Text42, { dimColor: true, children: "! shell command \u2014 runs in your terminal (logins and prompts work); output is shared with the agent" }) }),
+      historyIndex === history.length - 1 && latestPromptRef.current?.historyText === history[history.length - 1] && /* @__PURE__ */ jsx43(Box41, { marginTop: 1, children: /* @__PURE__ */ jsx43(Text42, { dimColor: true, children: "editing last message \u2014 Enter replaces it" }) }),
       /* @__PURE__ */ jsxs40(Box41, { marginTop: parseBangCommand(input) !== null ? 0 : 1, children: [
         /* @__PURE__ */ jsx43(Text42, { color: theme.prompt ?? theme.accent, children: "\u203A " }),
         /* @__PURE__ */ jsx43(