neko-harness 0.4.3 → 0.4.4

package/dist/neko.js

@@ -80,7 +80,7 @@ function updateAction(input) {
     return "install";
   return "none";
 }
-var RUNNING_VERSION = "0.4.3", APPLICATION_PROTOCOL = 6, ApplicationProtocolError;
+var RUNNING_VERSION = "0.4.4", APPLICATION_PROTOCOL = 6, ApplicationProtocolError;
 var init_application_version = __esm(() => {
   ApplicationProtocolError = class ApplicationProtocolError extends Error {
     constructor() {
@@ -1060,6 +1060,52 @@ var init_input = __esm(() => {
   NekoInput = defineEntry("app.neko.input");
 });
 
+// packages/core/src/queued.ts
+function queuedUserInput(raw) {
+  const item = raw;
+  if (item.mode !== "steer" && item.mode !== "followUp")
+    return;
+  if (item.entry?.kind !== NekoInput.kind)
+    return;
+  const data = item.entry.data;
+  if (!data || data.jobReport || data.subagentRoundId)
+    return;
+  const defaultPrompt = Array.isArray(item.content) ? savedDefaultImagePrompt(item.content, data.defaultImagePrompt) : undefined;
+  const content = defaultPrompt && Array.isArray(item.content) ? item.content.slice(1) : item.content;
+  const skill = data.skill ? { name: data.skill.name, args: data.skill.args } : undefined;
+  return {
+    id: item.id,
+    mode: item.mode,
+    text: skill ? `/skill:${skill.name}${skill.args ? ` ${skill.args}` : ""}` : textOf(content),
+    images: data.images?.length ?? 0,
+    ...skill ? { skill } : {}
+  };
+}
+function projectQueued(view) {
+  const items = view.docs["pi.inbox"]?.items ?? [];
+  return items.flatMap((raw) => {
+    const input = queuedUserInput(raw);
+    if (!input)
+      return [];
+    const { text, ...rest } = input;
+    return [{ ...rest, preview: clip(text) }];
+  });
+}
+var QUEUED_PREVIEW_CHARS = 300, textOf = (content) => {
+  if (typeof content === "string")
+    return content;
+  if (!Array.isArray(content))
+    return "";
+  return content.flatMap((b) => b && b.type === "text" && typeof b.text === "string" ? [b.text] : []).join("");
+}, clip = (text) => {
+  const chars = [...text.replace(/\s+/g, " ").trim()];
+  return chars.length > QUEUED_PREVIEW_CHARS ? `${chars.slice(0, QUEUED_PREVIEW_CHARS - 1).join("")}\u2026` : chars.join("");
+};
+var init_queued = __esm(() => {
+  init_image_prompt();
+  init_input();
+});
+
 // packages/core/src/workspace.ts
 import { accessSync, constants, realpathSync, statSync } from "fs";
 import { isAbsolute, resolve as resolve2 } from "path";
@@ -1379,6 +1425,7 @@ function projectChatView(view, modelLabel, options = {}) {
     },
     cwd: savedWorkspace(agent?.cwd),
     busy: live.run !== undefined,
+    queued: projectQueued(view),
     status,
     usage: {
       input: usage.input,
@@ -1491,6 +1538,7 @@ var WRITE_DIFF_MAX_LINES = 2000, WRITE_DIFF_MAX_BYTES;
 var init_projection = __esm(() => {
   init_image_prompt();
   init_input();
+  init_queued();
   init_workspace();
   WRITE_DIFF_MAX_BYTES = 64 * 1024;
 });
@@ -3207,6 +3255,14 @@ var createResourceSnapshots = (load, submission) => {
     discard(id, requestId) {
       conversations.get(id)?.pending.delete(requestId);
     },
+    move(id, from, to) {
+      const pending = conversations.get(id)?.pending;
+      const snapshot = pending?.get(from);
+      if (!pending || !snapshot)
+        return;
+      pending.delete(from);
+      pending.set(to, snapshot);
+    },
     forget(id) {
       conversations.delete(id);
     }
@@ -4495,6 +4551,7 @@ import {
   createRegistry,
   defineDoc as defineDoc5,
   Harness,
+  InboxDoc as InboxDoc2,
   LiveDoc as importLiveDoc,
   MemoryStorage,
   UsageDoc as UsageDoc2,
@@ -4843,6 +4900,57 @@ async function createNekoRuntime(options = {}) {
     },
     abort() {
       return target.abort(context);
+    },
+    async withdraw(submissionId) {
+      const id = submissionId;
+      const inbox = await harness.snapshot(InboxDoc2, target.id, context);
+      const item = inbox?.items.find((i) => i.id === id);
+      const input = item ? queuedUserInput(item) : undefined;
+      if (item && !input)
+        return { result: "unknown" };
+      const requestId = (await (await harness.submission(id, context))?.status(context))?.requestId;
+      const outcome = await harness.abortSubmission(id, context, target.id);
+      if (outcome !== "aborted") {
+        return { result: outcome === "already_placed" ? "placed" : outcome === "settled" ? "settled" : "unknown" };
+      }
+      if (requestId !== undefined)
+        resourceSnapshots.discard(target.id, requestId);
+      await metadata.reconcile(target.id);
+      return { result: "withdrawn", ...input ? { text: input.text, images: input.images } : {} };
+    },
+    async steer(submissionId) {
+      const id = submissionId;
+      const inbox = await harness.snapshot(InboxDoc2, target.id, context);
+      const item = inbox?.items.find((i) => i.id === id);
+      const input = item ? queuedUserInput(item) : undefined;
+      if (item && (!input || item.mode === "write"))
+        return { result: "unknown" };
+      if (item && input?.mode === "steer")
+        return { result: "steered", id: submissionId };
+      const requestId = (await (await harness.submission(id, context))?.status(context))?.requestId;
+      const outcome = await harness.abortSubmission(id, context, target.id);
+      if (outcome !== "aborted" || !item || !input) {
+        return { result: outcome === "already_placed" ? "placed" : outcome === "settled" ? "settled" : "unknown" };
+      }
+      const steerRequestId = requestId !== undefined ? `steer:${requestId}` : crypto.randomUUID();
+      try {
+        const next = await target.submit({
+          type: "input",
+          content: item.content,
+          ...item.entry ? { entry: item.entry } : {},
+          requestId: steerRequestId,
+          whenBusy: "steer"
+        }, context);
+        if (requestId !== undefined)
+          resourceSnapshots.move(target.id, requestId, steerRequestId);
+        await metadata.reconcile(target.id);
+        return { result: "steered", id: next.id };
+      } catch {
+        if (requestId !== undefined)
+          resourceSnapshots.discard(target.id, requestId);
+        await metadata.reconcile(target.id);
+        return { result: "withdrawn", text: input.text, images: input.images };
+      }
     }
   });
   const rootSession = makeSession(conversation);
@@ -5163,6 +5271,7 @@ var init_runtime = __esm(() => {
   init_invoke();
   init_prompt();
   init_resources();
+  init_queued();
   init_search_providers();
   init_session_metadata();
   init_subagent_usage();
@@ -5238,6 +5347,7 @@ var init_src = __esm(() => {
   init_jobs();
   init_projection();
   init_frontmatter();
+  init_queued();
   init_runtime();
   init_search_providers();
   init_session_metadata();
@@ -5368,7 +5478,7 @@ function contract(name, def) {
   ]));
   return remote(name, { ...def, host: hostNamed(GATEWAY_HOST), variants });
 }
-var GATEWAY_HOST = "neko", rpc = (args, result) => [args, result], str, num, bool, nil, integer, nullableString, phase, level, thinking, model, change, usage, image, skill, call, DelegationSchema, SubagentSummarySchema, jobStatus, JobSummarySchema, JobOutputSchema, ChatViewSchema, SessionSummarySchema, DirectoryStateSchema, WorkspaceSummarySchema, WorkspaceStateSchema, credentialStatus, CredentialStateSchema, AttachmentSchema, chatInput, NekoSessionDirectory, NekoSessionManagement, resize, inputLimits, modelInfo, NekoModels, imageChunk, NekoSubagent, NekoChat, browse, page, NekoWorkspaces, provider, NekoCredentials, SearchSettingsStateSchema, NekoSearchSettings, contextSource, ContextSettingsStateSchema, nullable = (schema) => Type5.Union([schema, nil]), ContextSettingsPatchSchema, NekoContextSettings, FileCandidatesSchema, NekoWorkspaceFiles, marketSkill, preview, scope, installResult, NekoSkillMarket, ApplicationInfoSchema, NekoApplicationInfo;
+var GATEWAY_HOST = "neko", rpc = (args, result) => [args, result], str, num, bool, nil, integer, nullableString, phase, level, thinking, model, change, usage, image, skill, call, DelegationSchema, SubagentSummarySchema, jobStatus, JobSummarySchema, JobOutputSchema, QueuedInputSchema, WithdrawResultSchema, SteerResultSchema, ChatViewSchema, SessionSummarySchema, DirectoryStateSchema, WorkspaceSummarySchema, WorkspaceStateSchema, credentialStatus, CredentialStateSchema, AttachmentSchema, chatInput, NekoSessionDirectory, NekoSessionManagement, resize, inputLimits, modelInfo, NekoModels, imageChunk, NekoSubagent, NekoChat, browse, page, NekoWorkspaces, provider, NekoCredentials, SearchSettingsStateSchema, NekoSearchSettings, contextSource, ContextSettingsStateSchema, nullable = (schema) => Type5.Union([schema, nil]), ContextSettingsPatchSchema, NekoContextSettings, FileCandidatesSchema, NekoWorkspaceFiles, marketSkill, preview, scope, installResult, NekoSkillMarket, ApplicationInfoSchema, NekoApplicationInfo;
 var init_contract = __esm(() => {
   str = Type5.String();
   num = Type5.Number();
@@ -5464,10 +5574,29 @@ var init_contract = __esm(() => {
     truncated: bool,
     dropped: integer
   });
+  QueuedInputSchema = Type5.Object({
+    id: integer,
+    mode: Type5.Enum(["steer", "followUp"]),
+    preview: str,
+    images: integer,
+    skill: Type5.Optional(Type5.Object({ name: str, args: str }))
+  });
+  WithdrawResultSchema = Type5.Object({
+    result: Type5.Enum(["withdrawn", "placed", "settled", "unknown"]),
+    text: Type5.Optional(str),
+    images: Type5.Optional(integer)
+  });
+  SteerResultSchema = Type5.Object({
+    result: Type5.Enum(["steered", "withdrawn", "placed", "settled", "unknown"]),
+    id: Type5.Optional(integer),
+    text: Type5.Optional(str),
+    images: Type5.Optional(integer)
+  });
   ChatViewSchema = Type5.Object({
     historyBefore: Type5.Optional(Type5.Union([integer, nil])),
     agents: Type5.Optional(Type5.Array(SubagentSummarySchema)),
     jobs: Type5.Optional(Type5.Array(JobSummarySchema)),
+    queued: Type5.Optional(Type5.Array(QueuedInputSchema)),
     rounds: Type5.Optional(Type5.Array(DelegationSchema)),
     subagents: Type5.Optional(Type5.Array(DelegationSchema)),
     taskUsage: Type5.Optional(usage),
@@ -5672,6 +5801,8 @@ var init_contract = __esm(() => {
             whenBusy: Type5.Optional(Type5.Enum(["steer", "followUp"]))
           }, { additionalProperties: false }), nil),
           abort: rpc(nil, nil),
+          withdraw: rpc(Type5.Object({ id: integer }, { additionalProperties: false }), WithdrawResultSchema),
+          steer: rpc(Type5.Object({ id: integer }, { additionalProperties: false }), SteerResultSchema),
           usage: rpc(nil, usage),
           skills: rpc(nil, Type5.Array(Type5.Object({ name: str, description: str, location: str, level }))),
           jobOutput: rpc(Type5.Object({ jobId: str, since: Type5.Optional(integer) }, { additionalProperties: false }), JobOutputSchema),
@@ -6168,6 +6299,25 @@ function jobsClient(chat) {
     }
   };
 }
+function queueClient(chat) {
+  const supported = () => chat.view.value?.queued !== undefined;
+  return {
+    get supported() {
+      return supported();
+    },
+    list: () => chat.view.value?.queued ?? [],
+    async steer(id) {
+      if (!supported())
+        throw new Error(QUEUE_UNSUPPORTED);
+      return chat.steer({ id });
+    },
+    async withdraw(id) {
+      if (!supported())
+        throw new Error(QUEUE_UNSUPPORTED);
+      return chat.withdraw({ id });
+    }
+  };
+}
 function createGatewayConnection(link, serverId) {
   let protocolMismatch = false;
   const linkClosed = new AbortController;
@@ -6364,7 +6514,7 @@ function deadline(work, signal) {
     signal?.removeEventListener("abort", abort);
   });
 }
-var GatewayIdentityError, JOBS_UNSUPPORTED = "This gateway does not support background jobs. Restart the gateway to enable them.";
+var GatewayIdentityError, JOBS_UNSUPPORTED = "This gateway does not support background jobs. Restart the gateway to enable them.", QUEUE_UNSUPPORTED = "This gateway does not support queued message controls. Restart the gateway to enable them.";
 var init_client_session = __esm(() => {
   init_application_version();
   init_contract();
@@ -18578,9 +18728,9 @@ var init_labels = __esm(() => {
       return shortcutHints(["\u2191\u2193", "Select"], ["Enter", "Open"], ["Esc", "Close"]);
     },
     idleHints: "Enter Send \xB7 /help Keys",
-    busyHints: "Enter Steer \xB7 Esc Stop",
+    busyHints: "Enter Queue \xB7 Esc Stop",
     idleCompact: "Enter Send \xB7 /help Keys",
-    busyCompact: "Enter Steer \xB7 Esc Stop"
+    busyCompact: "Enter Queue \xB7 Esc Stop"
   };
 });
 
@@ -21294,7 +21444,7 @@ function buildHelloResultSchema() {
     })
   });
 }
-var MOBILE_LIMITS, MOBILE_API_VERSIONS, MOBILE_CAPABILITIES, MOBILE_CLOSE_REVOKED = 4401, MOBILE_CLOSE_INCOMPATIBLE = 4402, MOBILE_CLOSE_SLOW_CONSUMER = 4408, MobileHelloParams, opt, str2, int, nullable2 = (schema) => Type7.Union([schema, Type7.Null()]), MobileContentRefSchema, MobileImageRefSchema, MobileToolItemSchema, MobileChatItemSchema, MobileStreamingSchema, MobileUsageSchema, MobileSubagentRoundSchema, MobileAgentSchema, MobileChatStatusSchema, MobileChatSnapshotSchema, MobileWorkspaceSchema, MobileSessionSummarySchema, MobileApprovalSchema, sessionListParams, sessionListResult, subscription, pageResult, pageParams, chunkResult, MOBILE_API_V1_METHODS, patchBody, MOBILE_API_V1_NOTIFICATIONS;
+var MOBILE_LIMITS, MOBILE_API_VERSIONS, MOBILE_CAPABILITIES, MOBILE_CLOSE_REVOKED = 4401, MOBILE_CLOSE_INCOMPATIBLE = 4402, MOBILE_CLOSE_SLOW_CONSUMER = 4408, MobileHelloParams, opt, str2, int, nullable2 = (schema) => Type7.Union([schema, Type7.Null()]), MobileContentRefSchema, MobileImageRefSchema, MobileToolItemSchema, MobileChatItemSchema, MobileStreamingSchema, MobileUsageSchema, MobileSubagentRoundSchema, MobileAgentSchema, MobileQueuedSchema, MobileChatStatusSchema, MobileChatSnapshotSchema, MobileWorkspaceSchema, MobileSessionSummarySchema, MobileApprovalSchema, sessionListParams, sessionListResult, subscription, pageResult, pageParams, chunkResult, MOBILE_API_V1_METHODS, patchBody, MOBILE_API_V1_NOTIFICATIONS;
 var init_protocol = __esm(() => {
   init_application_version();
   MOBILE_LIMITS = {
@@ -21426,8 +21576,15 @@ var init_protocol = __esm(() => {
     roundCount: int,
     approvalCount: int
   });
+  MobileQueuedSchema = Type7.Object({
+    id: int,
+    mode: Type7.Union([Type7.Literal("steer"), Type7.Literal("followUp")]),
+    preview: Type7.String(),
+    images: int
+  });
   MobileChatStatusSchema = Type7.Object({
     busy: Type7.Boolean(),
+    queued: opt(Type7.Array(MobileQueuedSchema)),
     status: nullable2(str2),
     usage: MobileUsageSchema,
     taskUsage: opt(MobileUsageSchema),
@@ -21511,6 +21668,34 @@ var init_protocol = __esm(() => {
       params: Type7.Object({ ...subscription, requestId: Type7.String({ minLength: 1, maxLength: 128 }) }),
       result: Type7.Object({ status: Type7.Union([Type7.Literal("accepted"), Type7.Literal("unknown")]) })
     },
+    "chat.steer": {
+      params: Type7.Object({ ...subscription, id: int }),
+      result: Type7.Object({
+        result: Type7.Union([
+          Type7.Literal("steered"),
+          Type7.Literal("withdrawn"),
+          Type7.Literal("placed"),
+          Type7.Literal("settled"),
+          Type7.Literal("unknown")
+        ]),
+        id: opt(int),
+        text: opt(Type7.String()),
+        images: opt(int)
+      })
+    },
+    "chat.withdraw": {
+      params: Type7.Object({ ...subscription, id: int }),
+      result: Type7.Object({
+        result: Type7.Union([
+          Type7.Literal("withdrawn"),
+          Type7.Literal("placed"),
+          Type7.Literal("settled"),
+          Type7.Literal("unknown")
+        ]),
+        text: opt(Type7.String()),
+        images: opt(int)
+      })
+    },
     "chat.abort": { params: Type7.Object(subscription), result: Type7.Object({ accepted: Type7.Boolean() }) },
     "subagents.open": {
       params: Type7.Object({ ...subscription, agentId: opt(Type7.String({ minLength: 1 })), taskId: opt(int) }),
@@ -21770,6 +21955,9 @@ function mapStatus(view, options = {}) {
   const latest = view.compaction?.latest;
   return {
     busy: view.busy,
+    ...view.queued === undefined ? {} : {
+      queued: view.queued.map(({ id, mode, preview, images }) => ({ id, mode, preview, images }))
+    },
     status: view.status,
     usage: mapUsage(view.usage),
     ...view.taskUsage === undefined ? {} : { taskUsage: mapUsage(view.taskUsage) },
@@ -22258,6 +22446,10 @@ class MobileAdapter {
         return this.chatSubmit(params);
       case "chat.submissionStatus":
         return this.chatSubmissionStatus(params);
+      case "chat.steer":
+        return this.chatSteer(params);
+      case "chat.withdraw":
+        return this.chatWithdraw(params);
       case "chat.abort":
         return this.chatAbort(params);
       case "subagents.open":
@@ -22487,6 +22679,16 @@ class MobileAdapter {
     const accepted = await this.runtime.submissionAccepted(state.sessionId, params.requestId);
     return { status: accepted ? "accepted" : "unknown" };
   }
+  async chatSteer(params) {
+    const state = this.requireChat(params);
+    this.assertAuthorized();
+    return remote2(() => state.chat.steer({ id: params.id }), "rejected");
+  }
+  async chatWithdraw(params) {
+    const state = this.requireChat(params);
+    this.assertAuthorized();
+    return remote2(() => state.chat.withdraw({ id: params.id }), "rejected");
+  }
   async chatAbort(params) {
     const state = this.requireChat(params);
     this.assertAuthorized();
@@ -41339,6 +41541,8 @@ function serveSessions(host, runtime, context) {
         await projection.value.session.abort();
         return null;
       },
+      withdraw: ({ id }) => projection.value.session.withdraw(id),
+      steer: ({ id }) => projection.value.session.steer(id),
       skills: () => runtime.listSkills(projection.value.session.id),
       jobOutput: async ({ jobId, since }) => {
         try {
@@ -41416,6 +41620,7 @@ var init_session_host = __esm(() => {
     agent: { model: null, thinkingLevel: null },
     cwd: "",
     busy: false,
+    queued: [],
     status: null,
     usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 },
     items: [],
@@ -42939,8 +43144,7 @@ function helpLines(platform = process.platform) {
     rows.push(theme.accent(title), ...hints.map(([key, description]) => shortcutHints([key, description])), "");
   };
   section("Chat", [
-    ["Enter", "Send; steer while running"],
-    ["Alt+Enter", "Queue while running"],
+    ["Enter", "Send; queue while running"],
     ["Esc", "Stop a running task or blocking compaction"],
     ["Esc Esc", "Clear draft when idle (press twice quickly)"],
     ["Up / Down", "Browse previous inputs in this session"],
@@ -42977,6 +43181,12 @@ function helpLines(platform = process.platform) {
     ["End", "Jump to the newest output"],
     ["\u2190", "Back"]
   ]);
+  section("Queue", [
+    ["Alt+\u2191", "Select queued messages above the editor"],
+    ["\u2191 / \u2193", "Move between queued messages"],
+    ["Enter", "Steer the selected message (joins the run after the current tool round)"],
+    ["Esc", "Withdraw the selected message into the editor; the run keeps going"]
+  ]);
   section("Web search", [
     ["/search", "Choose the web search provider"],
     ["Enter", "Apply the highlighted provider"]
@@ -43180,7 +43390,7 @@ function createAppLayout(parts) {
       parts.approval.height = Math.min(10, Math.max(7, Math.floor(v.height / 2)));
     parts.footer.panelOpen = parts.panelOpen();
     parts.editor.maxRows = parts.panelOpen() ? 3 : v.height >= 24 ? 7 : 5;
-    parts.panel.height = Math.max(1, v.height - (parts.approvalVisible?.() ? parts.approval?.height ?? 0 : 0) - Math.min(7, Math.max(3, parts.editor.render(v.width).length)) - 2 - Math.min(1, parts.notices.render(v.width).length) - (parts.busyVisible?.() ? Math.min(2, parts.busy?.render(v.width).length ?? 0) : 0));
+    parts.panel.height = Math.max(1, v.height - (parts.approvalVisible?.() ? parts.approval?.height ?? 0 : 0) - Math.min(7, Math.max(3, parts.editor.render(v.width).length)) - 2 - Math.min(1, parts.notices.render(v.width).length) - (parts.busyVisible?.() ? Math.min(2, parts.busy?.render(v.width).length ?? 0) : 0) - (parts.queueVisible?.() ? Math.min(3, parts.queue?.render(v.width).length ?? 0) : 0));
     return usableSize(v.width, v.height);
   };
   return new VStack([
@@ -43198,6 +43408,12 @@ function createAppLayout(parts) {
       shrink: 0,
       visible: (v) => normal(v) && (parts.busyVisible?.() ?? false)
     },
+    {
+      component: parts.queue ?? new Text8("", 0, 0),
+      maxSize: 3,
+      shrink: 0,
+      visible: (v) => normal(v) && (parts.queueVisible?.() ?? false)
+    },
     {
       component: parts.approval ?? new Text8("", 0, 0),
       shrink: 0,
@@ -43210,6 +43426,105 @@ function createAppLayout(parts) {
 var usableSize = (width, height) => width >= 40 && height >= 10;
 var init_layout = () => {};
 
+// packages/tui/src/queue-ui.ts
+import { matchesKey as matchesKey10, truncateToWidth as truncateToWidth6 } from "@earendil-works/pi-tui";
+
+class QueueRow {
+  #items = [];
+  #selected;
+  setItems(items) {
+    this.#items = items;
+    if (items.length === 0)
+      this.#selected = undefined;
+    else if (this.#selected !== undefined)
+      this.#selected = Math.min(this.#selected, items.length - 1);
+  }
+  get visible() {
+    return this.#items.length > 0;
+  }
+  get selecting() {
+    return this.#selected !== undefined;
+  }
+  get current() {
+    return this.#selected === undefined ? undefined : this.#items[this.#selected];
+  }
+  select() {
+    if (this.#items.length === 0)
+      return false;
+    this.#selected = this.#items.length - 1;
+    return true;
+  }
+  clear() {
+    this.#selected = undefined;
+  }
+  move(delta) {
+    if (this.#selected === undefined)
+      return;
+    const next = this.#selected + delta;
+    if (next >= this.#items.length)
+      this.#selected = undefined;
+    else
+      this.#selected = Math.max(0, next);
+  }
+  render(width) {
+    const total = this.#items.length;
+    if (total === 0)
+      return [];
+    const end = this.#selected === undefined ? total : Math.max(this.#selected + 1, Math.min(total, QUEUE_ROWS));
+    const start = Math.max(0, end - QUEUE_ROWS);
+    const rows = this.#items.slice(start, end).map((item, offset) => {
+      const picked = start + offset === this.#selected;
+      const text = `${modeLabel(item.mode)} \xB7 ${content2(item)}`;
+      return truncateToWidth6(picked ? ` ${theme.accent(`\u203A ${text}`)}` : `   ${theme.muted(text)}`, width);
+    });
+    const earlier = start > 0 ? `${start} earlier \xB7 ` : "";
+    const later = end < total ? `${total - end} newer \xB7 ` : "";
+    const hint = this.#selected === undefined ? shortcutHints(["Alt+\u2191", "Select queued"]) : shortcutHints(["Enter", "Steer"], ["Esc", "Withdraw"], ["\u2191/\u2193", "Move"]);
+    rows.push(truncateToWidth6(theme.dim(` ${earlier}${later}${hint}`), width));
+    return rows;
+  }
+  invalidate() {}
+}
+function queueKeyAction(row, data, autocompleteOpen) {
+  if (!row.selecting)
+    return matchesKey10(data, "alt+up") && row.visible && !autocompleteOpen ? "select" : undefined;
+  if (matchesKey10(data, "up"))
+    return "up";
+  if (matchesKey10(data, "down"))
+    return "down";
+  if (matchesKey10(data, "enter"))
+    return "steer";
+  if (matchesKey10(data, "escape"))
+    return "withdraw";
+  return "leave";
+}
+function restoreText(existing, text) {
+  return existing.trim() ? `${existing}
+${text}` : text;
+}
+function steerNotice(outcome) {
+  if (outcome.result === "steered")
+    return { message: "Message will steer the current run.", level: "info" };
+  if (outcome.result === "withdrawn")
+    return { message: "Could not steer; the message was withdrawn into the editor.", level: "warning" };
+  if (outcome.result === "unknown")
+    return { message: "That message is no longer queued.", level: "warning" };
+  return { message: "That message was already sent and cannot be steered.", level: "warning" };
+}
+function withdrawNotice(outcome) {
+  if (outcome.result === "withdrawn")
+    return outcome.images ? { message: "Message withdrawn into the editor. Images are not restored; attach them again.", level: "warning" } : { message: "Message withdrawn into the editor.", level: "info" };
+  if (outcome.result === "unknown")
+    return { message: "That message is no longer queued.", level: "warning" };
+  return { message: "That message was already sent and cannot be withdrawn.", level: "warning" };
+}
+var QUEUE_ROWS = 2, QUEUE_BLOCK_LINES, modeLabel = (mode) => mode === "steer" ? "Steer" : "Queued", oneLine3 = (text) => text.replace(/\s+/g, " ").trim(), content2 = (item) => oneLine3(item.preview) || (item.images > 0 ? `[${item.images} image${item.images > 1 ? "s" : ""}]` : "");
+var init_queue_ui = __esm(() => {
+  init_shortcut_hints();
+  init_theme();
+  QUEUE_BLOCK_LINES = QUEUE_ROWS + 1;
+});
+
 // packages/tui/src/search-ui.ts
 function searchItems(settings, credentials) {
   if (!settings)
@@ -43258,7 +43573,7 @@ var init_search_ui = __esm(() => {
 
 // packages/tui/src/skill-market-ui.ts
 import { ChordError as ChordError6 } from "@earendil-works/chord";
-import { Markdown as Markdown3, matchesKey as matchesKey10, wrapTextWithAnsi as wrapTextWithAnsi5 } from "@earendil-works/pi-tui";
+import { Markdown as Markdown3, matchesKey as matchesKey11, wrapTextWithAnsi as wrapTextWithAnsi5 } from "@earendil-works/pi-tui";
 
 class SkillDetailView {
   #skill = null;
@@ -43297,11 +43612,11 @@ class SkillDetailView {
   }
   handleKey(data) {
     if (this.#confirm) {
-      if (matchesKey10(data, "y")) {
+      if (matchesKey11(data, "y")) {
         const pending = this.#confirm;
         this.#confirm = null;
         this.run(pending.run);
-      } else if (matchesKey10(data, "n")) {
+      } else if (matchesKey11(data, "n")) {
         this.#confirm = null;
       }
       return true;
@@ -43310,17 +43625,17 @@ class SkillDetailView {
       return true;
     const skill = this.#skill;
     const builtinOnly = skill.installed.builtin && !skill.installed.user && !skill.installed.project;
-    if (matchesKey10(data, "v")) {
+    if (matchesKey11(data, "v")) {
       this.#openPreview(this.#name);
       return true;
     }
     if (builtinOnly)
       return true;
-    if (matchesKey10(data, "u"))
+    if (matchesKey11(data, "u"))
       this.askInstall("user", skill);
-    else if (matchesKey10(data, "p"))
+    else if (matchesKey11(data, "p"))
       this.askInstall("project", skill);
-    else if (matchesKey10(data, "d"))
+    else if (matchesKey11(data, "d"))
       this.askUninstall(skill);
     else
       return false;
@@ -43445,13 +43760,13 @@ class SkillPreviewView {
     this.#offset = Math.max(0, Math.min(this.#maxOffset, this.#offset + delta));
   }
   handleKey(data) {
-    if (matchesKey10(data, "up"))
+    if (matchesKey11(data, "up"))
       this.scroll(-1);
-    else if (matchesKey10(data, "down"))
+    else if (matchesKey11(data, "down"))
       this.scroll(1);
-    else if (matchesKey10(data, "pageUp"))
+    else if (matchesKey11(data, "pageUp"))
       this.scroll(-this.#pageSize);
-    else if (matchesKey10(data, "pageDown"))
+    else if (matchesKey11(data, "pageDown"))
       this.scroll(this.#pageSize);
     else
       return false;
@@ -43503,7 +43818,7 @@ var init_skill_market_ui = __esm(() => {
 });
 
 // packages/tui/src/subagents-ui.ts
-import { matchesKey as matchesKey11 } from "@earendil-works/pi-tui";
+import { matchesKey as matchesKey12 } from "@earendil-works/pi-tui";
 
 class SubagentDetail {
   get help() {
@@ -43623,13 +43938,13 @@ class SubagentDetail {
       this.history();
   }
   handleKey(data) {
-    if (matchesKey11(data, "up")) {
+    if (matchesKey12(data, "up")) {
       this.scroll(-1);
-    } else if (matchesKey11(data, "down")) {
+    } else if (matchesKey12(data, "down")) {
       this.scroll(1);
-    } else if (matchesKey11(data, "pageUp")) {
+    } else if (matchesKey12(data, "pageUp")) {
       this.scroll(-this.#pageSize);
-    } else if (matchesKey11(data, "pageDown")) {
+    } else if (matchesKey12(data, "pageDown")) {
       this.scroll(this.#pageSize);
     } else if (data.toLowerCase() === "e") {
       this.#expanded = !this.#expanded;
@@ -43645,7 +43960,7 @@ class SubagentDetail {
         help: shortcutHints(["Enter", "Stop"], ["Esc", "Back"]),
         lines: () => [theme.warning("Stop this task? Existing changes will be kept.")],
         handleKey: (key) => {
-          if (!matchesKey11(key, "enter"))
+          if (!matchesKey12(key, "enter"))
             return false;
           this.#service.stop(stopTaskId === undefined ? null : { taskId: stopTaskId }).catch((e) => {
             this.#error = String(e);
@@ -43776,7 +44091,7 @@ var init_subagents_ui = __esm(() => {
 });
 
 // packages/tui/src/version-ui.ts
-import { matchesKey as matchesKey12, Text as Text9 } from "@earendil-works/pi-tui";
+import { matchesKey as matchesKey13, Text as Text9 } from "@earendil-works/pi-tui";
 function actionFor(state, installed, runningVersion) {
   const action = updateAction({ gateway: state, frontend: runningVersion, installed });
   return action === "install" && !newer(state?.latestVersion, runningVersion) ? "none" : action;
@@ -43854,9 +44169,9 @@ class VersionDetail {
     return lines.slice(this.#offset, this.#offset + height);
   }
   handleKey(data) {
-    if (matchesKey12(data, "up"))
+    if (matchesKey13(data, "up"))
       this.#offset = Math.max(0, this.#offset - 1);
-    else if (matchesKey12(data, "down"))
+    else if (matchesKey13(data, "down"))
       this.#offset++;
     else
       return false;
@@ -43921,7 +44236,7 @@ import {
   Container as Container6,
   isKeyRelease as isKeyRelease5,
   Loader,
-  matchesKey as matchesKey13,
+  matchesKey as matchesKey14,
   ProcessTerminal,
   ScrollView,
   TuiAltScreen
@@ -43957,6 +44272,8 @@ class NekoTuiApp {
   #chat;
   #agentsPanel = false;
   #jobsPanel = false;
+  #queueBusy = false;
+  #queueRow = new QueueRow;
   #searchStop;
   #contextStop;
   #agentDetails = new Map;
@@ -44064,10 +44381,10 @@ class NekoTuiApp {
     this.#ui.addInputListener((data) => {
       if (isKeyRelease5(data))
         return { consume: true };
-      if (!matchesKey13(data, "escape") || this.#panel.open || this.#login.open || this.#busyText !== undefined || this.#lastView?.compaction?.active.length)
+      if (!matchesKey14(data, "escape") || this.#panel.open || this.#login.open || this.#busyText !== undefined || this.#lastView?.compaction?.active.length)
         this.#editor.resetEscapeSequence();
       if (!usableSize(this.#terminal.columns, this.#terminal.rows)) {
-        if (matchesKey13(data, "ctrl+c"))
+        if (matchesKey14(data, "ctrl+c"))
           this.exit();
         return { consume: true };
       }
@@ -44078,11 +44395,14 @@ class NekoTuiApp {
       }
       if (this.#sessionOperation)
         return { consume: true };
-      if (matchesKey13(data, "right") && this.#lastView?.subagents?.length && this.#editor.getText() === "" && !this.#editor.isShowingAutocomplete()) {
+      const queueKey = this.#queueKey(data);
+      if (queueKey)
+        return queueKey;
+      if (matchesKey14(data, "right") && this.#lastView?.subagents?.length && this.#editor.getText() === "" && !this.#editor.isShowingAutocomplete()) {
         this.#showAgents();
         return { consume: true };
       }
-      if (matchesKey13(data, process.platform === "win32" ? "alt+v" : "ctrl+v")) {
+      if (matchesKey14(data, process.platform === "win32" ? "alt+v" : "ctrl+v")) {
         if (isClipboardShortcut(data))
           this.pasteClipboard();
         return { consume: true };
@@ -44099,29 +44419,25 @@ class NekoTuiApp {
           return { consume: true };
         }
       }
-      if (matchesKey13(data, "escape") && this.#editor.isShowingAutocomplete()) {
+      if (matchesKey14(data, "escape") && this.#editor.isShowingAutocomplete()) {
         this.#editor.resetEscapeSequence();
         return;
       }
-      if (matchesKey13(data, "ctrl+c")) {
+      if (matchesKey14(data, "ctrl+c")) {
         if (this.#busyText !== undefined)
           this.abort();
         else
           this.exit();
         return { consume: true };
       }
-      if (matchesKey13(data, "escape") && (this.#busyText !== undefined || this.#lastView?.compaction?.active.some((c) => c.reason === "manual" || c.blocking))) {
+      if (matchesKey14(data, "escape") && (this.#busyText !== undefined || this.#lastView?.compaction?.active.some((c) => c.reason === "manual" || c.blocking))) {
         this.abort();
         return { consume: true };
       }
-      if (matchesKey13(data, "ctrl+s")) {
+      if (matchesKey14(data, "ctrl+s")) {
         this.openSessionsOverlay();
         return { consume: true };
       }
-      if (this.#busyText !== undefined && matchesKey13(data, "alt+enter")) {
-        this.submitFollowUp();
-        return { consume: true };
-      }
       return;
     });
   }
@@ -44165,6 +44481,8 @@ class NekoTuiApp {
       notices,
       busy: this.#busyLoader,
       busyVisible: () => this.#busyText !== undefined,
+      queue: this.#queueRow,
+      queueVisible: () => this.#queueRow.visible,
       panelOpen: () => this.#panel.open || this.#login.open
     }));
     this.#ui.setFocus(this.#editor);
@@ -44323,12 +44641,7 @@ class NekoTuiApp {
       this.addNotice("Configure DeepSeek with /login before sending.", "warning");
       return;
     }
-    this.sendImages(text, this.#busyText !== undefined ? "steer" : undefined);
-  }
-  submitFollowUp() {
-    const text = this.#editor.getText();
-    if (text.trim())
-      this.sendImages(text, "followUp");
+    this.sendImages(text);
   }
   async addImagePaths(paths) {
     return paths.map((path) => this.addImage(readImageFile(path, this.#options.cwd ?? process.cwd()), path.split(/[\\/]/).at(-1) ?? "Image")).join(" ");
@@ -44363,7 +44676,7 @@ class NekoTuiApp {
       this.#clipboardPending = false;
     }
   }
-  async sendImages(text, whenBusy) {
+  async sendImages(text) {
     const chat = this.#chat;
     const session = this.#sessionId;
     if (!chat || this.#sending.has(session))
@@ -44395,7 +44708,7 @@ class NekoTuiApp {
         }));
         content = content.replaceAll(ref, "");
       }
-      await chat.submit({ content: content.trim(), images: ids, requestId, ...whenBusy ? { whenBusy } : {} });
+      await chat.submit({ content: content.trim(), images: ids, requestId });
       if (session === this.#sessionId && this.#editor.getText() === before)
         this.#editor.setText("");
       if (this.#texts.get(session) === before)
@@ -44471,6 +44784,7 @@ class NekoTuiApp {
   async switchSession(id) {
     this.#approval.close();
     this.#chat = undefined;
+    this.#queueRow.setItems([]);
     if (this.#jobsPanel && this.#panel.open)
       this.#panel.close();
     if (this.#sessionId)
@@ -44675,7 +44989,7 @@ class NekoTuiApp {
     this.#panel.pointerSelection = true;
     this.#panel.emptyText = JOBS_EMPTY;
     this.#panel.listKey = (data, value) => {
-      if (matchesKey13(data, "left")) {
+      if (matchesKey14(data, "left")) {
         this.#panel.close();
         return true;
       }
@@ -44689,6 +45003,64 @@ class NekoTuiApp {
     this.#panel.show("Jobs", async () => jobItems(jobs.list()), async (value) => new JobDetail(jobs, value, this.#panel, changed).open());
     this.#ui.setFocus(this.#panel);
   }
+  #queueKey(data) {
+    const row = this.#queueRow;
+    if (this.#queueBusy && row.selecting)
+      return { consume: true };
+    const action = queueKeyAction(row, data, this.#editor.isShowingAutocomplete());
+    if (action === undefined)
+      return;
+    if (action === "steer" || action === "withdraw")
+      return this.#queueAct(action);
+    if (action === "select")
+      row.select();
+    else if (action === "up")
+      row.move(-1);
+    else if (action === "down")
+      row.move(1);
+    else {
+      row.clear();
+      this.#ui.requestRender();
+      return;
+    }
+    this.#ui.requestRender();
+    return { consume: true };
+  }
+  #queueAct(action) {
+    const chat = this.#chat;
+    const item = this.#queueRow.current;
+    if (!chat || !item)
+      return { consume: true };
+    if (action === "steer" && item.mode === "steer") {
+      this.addNotice("That message already steers the current run.", "info");
+      return { consume: true };
+    }
+    const queue = queueClient(chat);
+    const session = this.#sessionId;
+    this.#queueBusy = true;
+    const restore = (outcome) => {
+      if (outcome.result === "withdrawn")
+        this.#editor.setText(restoreText(this.#editor.getText(), outcome.text ?? ""));
+    };
+    const run = action === "steer" ? queue.steer(item.id).then((outcome) => {
+      if (session !== this.#sessionId)
+        return;
+      restore(outcome);
+      const notice = steerNotice(outcome);
+      this.addNotice(notice.message, notice.level);
+    }) : queue.withdraw(item.id).then((outcome) => {
+      if (session !== this.#sessionId)
+        return;
+      restore(outcome);
+      const notice = withdrawNotice(outcome);
+      this.addNotice(notice.message, notice.level);
+    });
+    run.catch((error) => this.addNotice(messageOf(error), "error")).finally(() => {
+      this.#queueBusy = false;
+      this.#ui.requestRender();
+    });
+    return { consume: true };
+  }
   #showSearch() {
     if (this.#exitStarted || this.#panel.open || this.#login.open)
       return;
@@ -44767,6 +45139,7 @@ class NekoTuiApp {
       this.#panel.update(subagentItems(view.subagents ?? [], view.agents));
     if (this.#jobsPanel)
       this.#panel.update(jobItems(view.jobs ?? []));
+    this.#queueRow.setItems(view.queued ?? []);
     for (const identity of view.agents ?? []) {
       const detail = this.#agentDetails.get(identity.agentId);
       if (detail) {
@@ -45122,6 +45495,7 @@ var init_tui = __esm(() => {
   init_jobs_ui();
   init_labels();
   init_layout();
+  init_queue_ui();
   init_search_ui();
   init_skill_market_ui();
   init_subagents_ui();