opencode-queue 0.6.6 → 0.7.1

package/README.md

@@ -32,7 +32,10 @@ continue after this task /queue
 /queue !ls
 
 /queue list
+/queue flush
 /queue clear
+/queue clear 1
+/queue clear 2 3
 ```
 
 ## Syntax
@@ -46,7 +49,10 @@ continue after this task /queue
 | `/queue !ls` | Queue an OpenCode shell block. |
 | `/queue` | Show the current queue. |
 | `/queue list` | Show the current queue. |
+| `/queue flush` | Send all queued entries immediately. |
 | `/queue clear` | Clear the current queue. |
+| `/queue clear 1` | Clear item 1 from the current queue. |
+| `/queue clear 2 3` | Clear items 2 and 3 from the current queue. |
 
 ## Behavior
 
@@ -56,6 +62,7 @@ When the session is busy:
 - The current agent run keeps using its original agent, model, and thinking variant.
 - Queued entries replay in order after the session becomes idle.
 - Only one queued entry is sent per idle transition, so queued work runs one item at a time.
+- `/queue flush` sends all queued entries immediately, even before the session is idle.
 
 When the session is idle:
 
@@ -65,14 +72,18 @@ When the session is idle:
 - `/review /queue` runs `/review` immediately.
 - `/queue !ls` runs `ls` immediately as an OpenCode shell block.
 - `/queue` and `/queue list` show the current queue.
-- `/queue clear` clears the current queue.
+- `/queue flush` sends all queued entries immediately.
+- `/queue clear` clears the current queue, and `/queue clear 1` clears a specific queued item.
 
 ## Queue Management
 
 ```text
 /queue
 /queue list
+/queue flush
 /queue clear
+/queue clear 1
+/queue clear 2 3
 ```
 
 The queue is in-memory and scoped to the current session.

package/index.ts

@@ -4,6 +4,7 @@ import type { AgentPartInput, FilePart, FilePartInput, SubtaskPartInput, TextPar
 const QUEUE = /^\/queue(?:\s+([\s\S]*))?$/
 const SUFFIX = /^([\s\S]*?)\s+\/queue\s*$/
 const CMD = /^\/(\S+)(?:\s+([\s\S]*))?$/
+const ITEM_NUMBER = /^[1-9]\d*$/
 const HANDLED = "__QUEUE_HANDLED__"
 
 type InputPart = TextPartInput | FilePartInput | AgentPartInput | SubtaskPartInput
@@ -16,19 +17,22 @@ type Ask = { type: string; properties: { id: string; sessionID: string; question
 type Post = (input: { url: string; path?: Record<string, string>; body?: unknown; headers?: Record<string, string> }) => Promise<{ response?: Response; error?: unknown } | undefined>
 
 type Item =
-  | { kind: "prompt"; info: Info; text: string; parts: InputPart[] }
-  | { kind: "command"; info: Info; text: string; cmd: string; args: string; files: FilePartInput[] }
-  | { kind: "shell"; info: Info; text: string; shell: string }
+  | { kind: "prompt"; info: Info; label: string; body: string; parts: InputPart[] }
+  | { kind: "command"; info: Info; source: string; cmd: string; args: string; files: FilePartInput[] }
+  | { kind: "shell"; info: Info; source: string; shell: string }
 
 type Op =
   | { kind: "list" }
-  | { kind: "clear" }
-  | { kind: "invalid"; text: string }
-  | { kind: "prompt"; text: string; body: string }
-  | { kind: "command"; text: string; cmd: string; args: string }
-  | { kind: "shell"; text: string; shell: string }
+  | { kind: "clear"; indices: number[] }
+  | { kind: "flush" }
+  | { kind: "invalid"; message: string }
+  | { kind: "prompt"; label: string; body: string }
+  | { kind: "command"; source: string; cmd: string; args: string }
+  | { kind: "shell"; source: string; shell: string }
 
-const label = (body: string, files: number) => {
+type ControlOp = Extract<Op, { kind: "list" | "clear" | "flush" }>
+
+const brief = (body: string, files: number) => {
   const text = body.trim() || `${files} attachment${files === 1 ? "" : "s"}`
   return text.length > 72 ? `${text.slice(0, 69)}...` : text
 }
@@ -37,24 +41,32 @@ const parse = (body: string, files = 0): Op => {
   const text = body.trim()
   if (!files) {
     if (!text || text === "list") return { kind: "list" }
-    if (text === "clear") return { kind: "clear" }
+    if (text === "flush") return { kind: "flush" }
+    const clear = text.match(/^clear(?:\s+([\s\S]+))?$/)
+    if (clear) {
+      const values = clear[1]?.trim().split(/\s+/) ?? []
+      const indices = values.map(Number)
+      if (values.some((value) => !ITEM_NUMBER.test(value)) || indices.some((index) => !Number.isSafeInteger(index))) return { kind: "invalid", message: "Queue clear expects one or more positive item numbers" }
+      return { kind: "clear", indices }
+    }
   }
 
   if (text.startsWith("!")) {
     const shell = text.slice(1).trim()
-    if (!shell) return { kind: "invalid", text: "Queue shell command is empty" }
-    if (files) return { kind: "invalid", text: "Queued shell commands do not support attachments" }
-    return { kind: "shell", text, shell }
+    if (!shell) return { kind: "invalid", message: "Queue shell command is empty" }
+    if (files) return { kind: "invalid", message: "Queued shell commands do not support attachments" }
+    return { kind: "shell", source: text, shell }
   }
 
   const match = text.match(CMD)
-  if (match) return { kind: "command", text, cmd: match[1], args: match[2] ?? "" }
-  return { kind: "prompt", text: label(body, files), body }
+  if (match) return { kind: "command", source: text, cmd: match[1], args: match[2] ?? "" }
+  return { kind: "prompt", label: brief(body, files), body }
 }
 
 const trailing = (text: string) => (text.trim() === "/queue" ? "" : text.match(SUFFIX)?.[1])
 const strip = (text: string) => trailing(text) ?? text
 const queued = (text: string) => text.match(QUEUE)?.[1] ?? trailing(text)
+const control = (op: Op): op is ControlOp => op.kind === "list" || op.kind === "clear" || op.kind === "flush"
 const plan = (event: unknown): event is Ask => {
   if (typeof event !== "object" || !event || !("type" in event) || event.type !== "question.asked") return false
   const question = (event as Ask).properties?.questions?.[0]
@@ -96,12 +108,36 @@ export const QueuePlugin: Plugin = async ({ client }) => {
 
   const files = (parts: { type: string }[]) => parts.filter((part): part is FilePart => part.type === "file").map((part) => ({ ...part }))
 
-  const manage = (sid: string, op: Extract<Op, { kind: "list" | "clear" }>) => {
-    if (op.kind === "list") return (queue.get(sid) ?? []).map((item, i) => `${i + 1}. ${item.text}`).join("\n") || "Queue is empty"
+  const take = (sid: string, count = Infinity) => {
+    const list = queue.get(sid)
+    if (!list?.length) return []
 
-    const count = queue.get(sid)?.length ?? 0
-    queue.delete(sid)
-    return count ? `Cleared ${count} queued item${count === 1 ? "" : "s"}` : "Queue is empty"
+    const items = list.splice(0, count)
+    if (!list.length) queue.delete(sid)
+    return items
+  }
+
+  const requeue = (sid: string, items: Item[]) => {
+    if (items.length) queue.set(sid, [...items, ...(queue.get(sid) ?? [])])
+  }
+
+  const clear = (sid: string, indices: number[]) => {
+    const list = queue.get(sid)
+    if (!list?.length) return "Queue is empty"
+
+    if (!indices.length) {
+      const count = list.length
+      queue.delete(sid)
+      return `Cleared ${count} queued item${count === 1 ? "" : "s"}`
+    }
+
+    const targets = [...new Set(indices)].sort((a, b) => a - b)
+    const missing = targets.filter((index) => index > list.length)
+    if (missing.length) return `Queue item${missing.length === 1 ? "" : "s"} ${missing.join(", ")} ${missing.length === 1 ? "does" : "do"} not exist`
+
+    for (const index of targets.toReversed()) list.splice(index - 1, 1)
+    if (!list.length) queue.delete(sid)
+    return `Cleared queued item${targets.length === 1 ? "" : "s"} ${targets.join(", ")}`
   }
 
   const latest = async (sid: string): Promise<Info | undefined> => {
@@ -154,20 +190,44 @@ export const QueuePlugin: Plugin = async ({ client }) => {
     console.warn("QueuePlugin skipped queued item without replayable content")
   }
 
-  const flush = (sid: string) => {
-    const list = queue.get(sid)
-    if (!list?.length) return
-    const item = list.shift()
-    if (!item) return
-    if (!list.length) queue.delete(sid)
+  const flush = async (sid: string, count = Infinity) => {
+    const items = take(sid, count)
+    if (!items.length) return { sent: 0, failed: 0 }
 
     active.add(sid)
-    void replay(sid, item).catch(async (error) => {
-      console.error("QueuePlugin failed to flush queued input", error)
-      await toast(`Queue failed: ${error instanceof Error ? error.message : String(error)}`, "error")
-    }).finally(() => {
+    let failed = 0
+    const retry: Item[] = []
+    try {
+      for (const item of items) {
+        try {
+          await replay(sid, item)
+        } catch (error) {
+          failed++
+          retry.push(item)
+          console.error("QueuePlugin failed to flush queued input", error)
+          await toast(`Queue failed: ${error instanceof Error ? error.message : String(error)}`, "error")
+        }
+      }
+    } finally {
+      requeue(sid, retry)
       active.delete(sid)
-    })
+    }
+    return { sent: items.length - failed, failed }
+  }
+
+  const manage = async (sid: string, op: ControlOp) => {
+    if (op.kind === "list") {
+      return (queue.get(sid) ?? [])
+        .map((item, i) => `${i + 1}. ${item.kind === "prompt" ? (item.body.trim() ? item.body : item.label) : item.source}`)
+        .join("\n") || "Queue is empty"
+    }
+    if (op.kind === "clear") return clear(sid, op.indices)
+
+    const result = await flush(sid)
+    if (!result.sent && !result.failed) return "Queue is empty"
+
+    const message = `Flushed ${result.sent} queued item${result.sent === 1 ? "" : "s"}`
+    return result.failed ? `${message}; ${result.failed} failed` : message
   }
 
   return {
@@ -193,7 +253,7 @@ export const QueuePlugin: Plugin = async ({ client }) => {
       }
 
       busy.delete(sid)
-      flush(sid)
+      void flush(sid, 1)
     },
     "command.execute.before": async (input, output) => {
       const sid = input.sessionID
@@ -215,8 +275,8 @@ export const QueuePlugin: Plugin = async ({ client }) => {
 
       const op = parse(body, parts.length)
 
-      if (op.kind === "list" || op.kind === "clear") return stop(manage(sid, op))
-      if (op.kind === "invalid") return stop(op.text, "error")
+      if (control(op)) return stop(await manage(sid, op))
+      if (op.kind === "invalid") return stop(op.message, "error")
 
       if (!busy.has(sid)) {
         if (op.kind === "shell") {
@@ -246,15 +306,15 @@ export const QueuePlugin: Plugin = async ({ client }) => {
       const parts = files(output.parts)
       const op = parse(body, parts.length)
 
-      if (op.kind === "list" || op.kind === "clear") {
+      if (control(op)) {
         hide(output.message.id, text)
-        await toast(manage(sid, op), "info", 5000)
+        await toast(await manage(sid, op), "info", 5000)
         return
       }
 
       if (op.kind === "invalid") {
         hide(output.message.id, text)
-        await toast(op.text, "error", 5000)
+        await toast(op.message, "error", 5000)
         return
       }
 
@@ -290,7 +350,7 @@ export const QueuePlugin: Plugin = async ({ client }) => {
 
       queue.set(sid, [...(queue.get(sid) ?? []), item])
       hide(output.message.id, text)
-      await toast(`Queued: ${item.text}`, "info")
+      await toast(`Queued: ${item.kind === "prompt" ? item.label : item.source}`, "info")
     },
     "experimental.chat.messages.transform": async (_, output) => {
       output.messages = output.messages.filter((msg) => !hidden.has(msg.info.id))

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode-queue",
-  "version": "0.6.6",
+  "version": "0.7.1",
   "type": "module",
   "description": "Queue OpenCode prompts and slash commands until the agent is idle",
   "main": "./index.ts",
@@ -28,6 +28,9 @@
   "exports": {
     ".": "./index.ts"
   },
+  "engines": {
+    "node": ">=20"
+  },
   "publishConfig": {
     "access": "public"
   },