@mindstudio-ai/remy 0.1.200 → 0.1.201

package/README.md

@@ -308,14 +308,24 @@ Return the full conversation history.
 
 Messages with `hidden: true` were generated by `runCommand` actions and should not be displayed in the UI.
 
+The response also includes `queuedMessages` — the current pending-queue snapshot (possibly empty) — so a client can render the queue immediately on connect/reconnect. Live changes after that arrive via `queue_changed`.
+
 #### `cancel`
 
-Cancel the current turn. The cancel command gets `completed(success:true)`. The in-flight message command (if any) gets its own `completed(success:false, error:"cancelled")`.
+Cancel the current turn. The cancel command gets `completed(success:true)`; any queued messages are flushed and returned on it as `cancelledMessages`. The in-flight message command (if any) gets its own `completed(success:false, error:"cancelled")`.
 
 ```json
 {"action": "cancel", "requestId": "r3"}
 ```
 
+#### `cancelQueued`
+
+Cancel pending **queued** messages without touching the in-flight turn. Omit `id` to cancel all queued user messages, or pass `id` (the `requestId` of a queued message) to cancel just that one. Only user messages are cancellable — chained and background messages are part of a system chain and are never removed. Responds with `completed(success:true, cancelledQueued:[...])` listing what was removed; a `queue_changed` event also fires with the updated queue.
+
+```json
+{"action": "cancelQueued", "requestId": "r6", "id": "r2"}
+```
+
 #### `clear`
 
 Clear conversation history and delete the session file.
@@ -342,6 +352,7 @@ Events are emitted as newline-delimited JSON. Command responses include `request
 |-------|--------|-------------|
 | `ready` | | Headless mode initialized, ready for input |
 | `session_restored` | `messageCount` | Previous session loaded |
+| `queue_changed` | `queuedMessages` | Queue contents changed (any push/shift/drain/cancel). Carries the full current snapshot — an empty array when the queue drains. The live queue-state signal; for the initial snapshot on connect/reconnect, read `queuedMessages` from `get_history`. |
 | `stopping` | | Shutdown initiated |
 | `stopped` | | Shutdown complete |
 

package/dist/headless.d.ts

@@ -68,14 +68,9 @@ declare class HeadlessSession {
     start(): Promise<void>;
     private shutdown;
     private emit;
-    /**
-     * Emit a `completed` event and mark completedEmitted. Includes
-     * `queuedMessages` if the queue has items (sandbox uses this to know the
-     * agent is still busy with pipeline work).
-     */
+    /** Emit a `completed` event and mark completedEmitted. Queue state is
+     * surfaced separately via the `queue_changed` event, not on `completed`. */
     private emitCompleted;
-    /** Returns `{ queuedMessages }` when the queue is non-empty, else empty object. */
-    private queueFields;
     /** Dispatch a simple (non-streaming) command: call handler, emit response + completed. */
     private dispatchSimple;
     /** Persist sessionStats + queue snapshot to .remy-stats.json. */
@@ -138,6 +133,13 @@ declare class HeadlessSession {
     private handleChangeModels;
     /** Cancel the running turn and drain the queue. Returns the drained items. */
     private handleCancel;
+    /**
+     * Remove pending queued messages — all user messages, or one by id.
+     * Only `source: 'user'` items are removable; chained and background
+     * messages are part of a system chain and are never cancellable. Does
+     * not affect the in-flight turn (use `cancel` for that).
+     */
+    private handleCancelQueued;
     private handleStdinLine;
 }
 

package/dist/headless.js

@@ -7248,6 +7248,24 @@ var MessageQueue = class {
     this.onChange?.();
     return all;
   }
+  /**
+   * Remove all items matching `predicate`. Fires onChange only if something
+   * was removed. Returns the removed items.
+   */
+  removeWhere(predicate) {
+    const removed = [];
+    this.items = this.items.filter((item) => {
+      if (predicate(item)) {
+        removed.push(item);
+        return false;
+      }
+      return true;
+    });
+    if (removed.length > 0) {
+      this.onChange?.();
+    }
+    return removed;
+  }
   /** Copy of current queue contents (for surfacing on events). */
   snapshot() {
     return [...this.items];
@@ -7298,6 +7316,24 @@ function resolveAction(text) {
     next
   };
 }
+function getActionChain(startName) {
+  const chain = [];
+  const seen = /* @__PURE__ */ new Set();
+  let name = startName;
+  while (name && !seen.has(name)) {
+    seen.add(name);
+    chain.push(name);
+    let body;
+    try {
+      body = readAsset("automatedActions", `${name}.md`);
+    } catch {
+      break;
+    }
+    const fm = body.match(/^---\s*\n([\s\S]*?)\n---/);
+    name = fm?.[1].match(/^\s*next:\s*(\w+)\s*$/m)?.[1];
+  }
+  return chain;
+}
 
 // src/headless/index.ts
 var log14 = createLogger("headless");
@@ -7368,14 +7404,16 @@ var HeadlessSession = class {
       baseUrl: this.opts.baseUrl
     });
     const resumed = loadSession(this.state);
-    this.queue = new MessageQueue(loadQueue(), () => this.persistStats());
+    this.queue = new MessageQueue(loadQueue(), () => {
+      this.persistStats();
+      this.emit("queue_changed", { queuedMessages: this.queue.snapshot() });
+    });
     if (resumed) {
       this.emit("session_restored", {
         messageCount: this.state.messages.length,
         ...this.state.models && { models: this.state.models },
         modelSurfaces: MODEL_SURFACES,
-        allowedModelsByType: ALLOWED_MODELS_BY_TYPE,
-        ...this.queueFields()
+        allowedModelsByType: ALLOWED_MODELS_BY_TYPE
       });
     }
     triggerBrandExtraction(
@@ -7425,7 +7463,7 @@ var HeadlessSession = class {
     });
     process.on("SIGTERM", this.shutdown);
     process.on("SIGINT", this.shutdown);
-    this.emit("ready", this.queueFields());
+    this.emit("ready");
   }
   shutdown = () => {
     this.emit("stopping");
@@ -7449,19 +7487,12 @@ var HeadlessSession = class {
     }
     process.stdout.write(line);
   }
-  /**
-   * Emit a `completed` event and mark completedEmitted. Includes
-   * `queuedMessages` if the queue has items (sandbox uses this to know the
-   * agent is still busy with pipeline work).
-   */
+  /** Emit a `completed` event and mark completedEmitted. Queue state is
+   * surfaced separately via the `queue_changed` event, not on `completed`. */
   emitCompleted(rid, data) {
-    this.emit("completed", { ...data, ...this.queueFields() }, rid);
+    this.emit("completed", { ...data }, rid);
     this.completedEmitted = true;
   }
-  /** Returns `{ queuedMessages }` when the queue is non-empty, else empty object. */
-  queueFields() {
-    return this.queue.length > 0 ? { queuedMessages: this.queue.snapshot() } : {};
-  }
   /** Dispatch a simple (non-streaming) command: call handler, emit response + completed. */
   dispatchSimple(requestId, eventName, handler) {
     try {
@@ -7639,11 +7670,7 @@ var HeadlessSession = class {
         });
         return;
       case "turn_cancelled": {
-        this.emit(
-          "completed",
-          { success: false, error: "cancelled", ...this.queueFields() },
-          rid
-        );
+        this.emit("completed", { success: false, error: "cancelled" }, rid);
         this.completedEmitted = true;
         return;
       }
@@ -7767,7 +7794,7 @@ var HeadlessSession = class {
    * message — `running` stays held across the queue drain so no user
    * message can slip in mid-pipeline.
    */
-  async runSingleTurn(parsed, requestId) {
+  async runSingleTurn(parsed, requestId, fromChain = false) {
     this.currentRequestId = requestId;
     this.currentAbort = new AbortController();
     this.completedEmitted = false;
@@ -7815,16 +7842,18 @@ var HeadlessSession = class {
       onboardingState,
       parsed.viewContext
     );
-    if (resolved?.next) {
-      this.queue.push({
-        command: {
-          action: "message",
-          text: sentinel(resolved.next),
-          onboardingState
-        },
-        source: "chain",
-        enqueuedAt: Date.now()
-      });
+    if (resolved?.next && !fromChain) {
+      for (const step of getActionChain(resolved.next)) {
+        this.queue.push({
+          command: {
+            action: "message",
+            text: sentinel(step),
+            onboardingState
+          },
+          source: "chain",
+          enqueuedAt: Date.now()
+        });
+      }
     }
     try {
       await runTurn({
@@ -7882,11 +7911,6 @@ var HeadlessSession = class {
         source: "user",
         enqueuedAt: Date.now()
       });
-      this.emit(
-        "queued",
-        { position: this.queue.length, ...this.queueFields() },
-        requestId
-      );
       return;
     }
     this.running = true;
@@ -7934,7 +7958,7 @@ var HeadlessSession = class {
         continue;
       }
       const nextRid = next.command.requestId ?? `${next.source}-${Date.now()}`;
-      await this.runSingleTurn(next.command, nextRid);
+      await this.runSingleTurn(next.command, nextRid, next.source === "chain");
     }
   }
   /**
@@ -7998,6 +8022,17 @@ var HeadlessSession = class {
     }
     return this.queue.drain();
   }
+  /**
+   * Remove pending queued messages — all user messages, or one by id.
+   * Only `source: 'user'` items are removable; chained and background
+   * messages are part of a system chain and are never cancellable. Does
+   * not affect the in-flight turn (use `cancel` for that).
+   */
+  handleCancelQueued(id) {
+    return this.queue.removeWhere(
+      (item) => item.source === "user" && (id === void 0 || item.command.requestId === id)
+    );
+  }
   //////////////////////////////////////////////////////////////////////////////
   // Stdin router
   //////////////////////////////////////////////////////////////////////////////
@@ -8062,7 +8097,11 @@ var HeadlessSession = class {
         ...this.state.models && { models: this.state.models },
         modelSurfaces: MODEL_SURFACES,
         allowedModelsByType: ALLOWED_MODELS_BY_TYPE,
-        ...this.queueFields()
+        // Current queue snapshot for connect/reconnect — get_history is the
+        // on-demand "current state" query. Always an array (possibly empty),
+        // matching the queue_changed convention so the client reconciles the
+        // same way from both; live mutations are pushed via queue_changed.
+        queuedMessages: this.queue.snapshot()
       }));
       return;
     }
@@ -8106,6 +8145,16 @@ var HeadlessSession = class {
       );
       return;
     }
+    if (action === "cancelQueued") {
+      const id = parsed.id;
+      const removed = this.handleCancelQueued(id);
+      this.emit(
+        "completed",
+        { success: true, cancelledQueued: removed },
+        requestId
+      );
+      return;
+    }
     if (action === "stop_tool") {
       const id = parsed.id;
       const mode = parsed.mode ?? "hard";

package/dist/index.js

@@ -8013,6 +8013,24 @@ var init_messageQueue = __esm({
         this.onChange?.();
         return all;
       }
+      /**
+       * Remove all items matching `predicate`. Fires onChange only if something
+       * was removed. Returns the removed items.
+       */
+      removeWhere(predicate) {
+        const removed = [];
+        this.items = this.items.filter((item) => {
+          if (predicate(item)) {
+            removed.push(item);
+            return false;
+          }
+          return true;
+        });
+        if (removed.length > 0) {
+          this.onChange?.();
+        }
+        return removed;
+      }
       /** Copy of current queue contents (for surfacing on events). */
       snapshot() {
         return [...this.items];
@@ -8064,6 +8082,24 @@ function resolveAction(text) {
     next
   };
 }
+function getActionChain(startName) {
+  const chain = [];
+  const seen = /* @__PURE__ */ new Set();
+  let name = startName;
+  while (name && !seen.has(name)) {
+    seen.add(name);
+    chain.push(name);
+    let body;
+    try {
+      body = readAsset("automatedActions", `${name}.md`);
+    } catch {
+      break;
+    }
+    const fm = body.match(/^---\s*\n([\s\S]*?)\n---/);
+    name = fm?.[1].match(/^\s*next:\s*(\w+)\s*$/m)?.[1];
+  }
+  return chain;
+}
 var NON_ACTION_SENTINELS;
 var init_resolve = __esm({
   "src/automatedActions/resolve.ts"() {
@@ -8168,14 +8204,16 @@ var init_headless = __esm({
           baseUrl: this.opts.baseUrl
         });
         const resumed = loadSession(this.state);
-        this.queue = new MessageQueue(loadQueue(), () => this.persistStats());
+        this.queue = new MessageQueue(loadQueue(), () => {
+          this.persistStats();
+          this.emit("queue_changed", { queuedMessages: this.queue.snapshot() });
+        });
         if (resumed) {
           this.emit("session_restored", {
             messageCount: this.state.messages.length,
             ...this.state.models && { models: this.state.models },
             modelSurfaces: MODEL_SURFACES,
-            allowedModelsByType: ALLOWED_MODELS_BY_TYPE,
-            ...this.queueFields()
+            allowedModelsByType: ALLOWED_MODELS_BY_TYPE
           });
         }
         triggerBrandExtraction(
@@ -8225,7 +8263,7 @@ var init_headless = __esm({
         });
         process.on("SIGTERM", this.shutdown);
         process.on("SIGINT", this.shutdown);
-        this.emit("ready", this.queueFields());
+        this.emit("ready");
       }
       shutdown = () => {
         this.emit("stopping");
@@ -8249,19 +8287,12 @@ var init_headless = __esm({
         }
         process.stdout.write(line);
       }
-      /**
-       * Emit a `completed` event and mark completedEmitted. Includes
-       * `queuedMessages` if the queue has items (sandbox uses this to know the
-       * agent is still busy with pipeline work).
-       */
+      /** Emit a `completed` event and mark completedEmitted. Queue state is
+       * surfaced separately via the `queue_changed` event, not on `completed`. */
       emitCompleted(rid, data) {
-        this.emit("completed", { ...data, ...this.queueFields() }, rid);
+        this.emit("completed", { ...data }, rid);
         this.completedEmitted = true;
       }
-      /** Returns `{ queuedMessages }` when the queue is non-empty, else empty object. */
-      queueFields() {
-        return this.queue.length > 0 ? { queuedMessages: this.queue.snapshot() } : {};
-      }
       /** Dispatch a simple (non-streaming) command: call handler, emit response + completed. */
       dispatchSimple(requestId, eventName, handler) {
         try {
@@ -8439,11 +8470,7 @@ var init_headless = __esm({
             });
             return;
           case "turn_cancelled": {
-            this.emit(
-              "completed",
-              { success: false, error: "cancelled", ...this.queueFields() },
-              rid
-            );
+            this.emit("completed", { success: false, error: "cancelled" }, rid);
             this.completedEmitted = true;
             return;
           }
@@ -8567,7 +8594,7 @@ var init_headless = __esm({
        * message — `running` stays held across the queue drain so no user
        * message can slip in mid-pipeline.
        */
-      async runSingleTurn(parsed, requestId) {
+      async runSingleTurn(parsed, requestId, fromChain = false) {
         this.currentRequestId = requestId;
         this.currentAbort = new AbortController();
         this.completedEmitted = false;
@@ -8615,16 +8642,18 @@ var init_headless = __esm({
           onboardingState,
           parsed.viewContext
         );
-        if (resolved?.next) {
-          this.queue.push({
-            command: {
-              action: "message",
-              text: sentinel(resolved.next),
-              onboardingState
-            },
-            source: "chain",
-            enqueuedAt: Date.now()
-          });
+        if (resolved?.next && !fromChain) {
+          for (const step of getActionChain(resolved.next)) {
+            this.queue.push({
+              command: {
+                action: "message",
+                text: sentinel(step),
+                onboardingState
+              },
+              source: "chain",
+              enqueuedAt: Date.now()
+            });
+          }
         }
         try {
           await runTurn({
@@ -8682,11 +8711,6 @@ var init_headless = __esm({
             source: "user",
             enqueuedAt: Date.now()
           });
-          this.emit(
-            "queued",
-            { position: this.queue.length, ...this.queueFields() },
-            requestId
-          );
           return;
         }
         this.running = true;
@@ -8734,7 +8758,7 @@ var init_headless = __esm({
             continue;
           }
           const nextRid = next.command.requestId ?? `${next.source}-${Date.now()}`;
-          await this.runSingleTurn(next.command, nextRid);
+          await this.runSingleTurn(next.command, nextRid, next.source === "chain");
         }
       }
       /**
@@ -8798,6 +8822,17 @@ var init_headless = __esm({
         }
         return this.queue.drain();
       }
+      /**
+       * Remove pending queued messages — all user messages, or one by id.
+       * Only `source: 'user'` items are removable; chained and background
+       * messages are part of a system chain and are never cancellable. Does
+       * not affect the in-flight turn (use `cancel` for that).
+       */
+      handleCancelQueued(id) {
+        return this.queue.removeWhere(
+          (item) => item.source === "user" && (id === void 0 || item.command.requestId === id)
+        );
+      }
       //////////////////////////////////////////////////////////////////////////////
       // Stdin router
       //////////////////////////////////////////////////////////////////////////////
@@ -8862,7 +8897,11 @@ var init_headless = __esm({
             ...this.state.models && { models: this.state.models },
             modelSurfaces: MODEL_SURFACES,
             allowedModelsByType: ALLOWED_MODELS_BY_TYPE,
-            ...this.queueFields()
+            // Current queue snapshot for connect/reconnect — get_history is the
+            // on-demand "current state" query. Always an array (possibly empty),
+            // matching the queue_changed convention so the client reconciles the
+            // same way from both; live mutations are pushed via queue_changed.
+            queuedMessages: this.queue.snapshot()
           }));
           return;
         }
@@ -8906,6 +8945,16 @@ var init_headless = __esm({
           );
           return;
         }
+        if (action === "cancelQueued") {
+          const id = parsed.id;
+          const removed = this.handleCancelQueued(id);
+          this.emit(
+            "completed",
+            { success: true, cancelledQueued: removed },
+            requestId
+          );
+          return;
+        }
         if (action === "stop_tool") {
           const id = parsed.id;
           const mode = parsed.mode ?? "hard";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindstudio-ai/remy",
-  "version": "0.1.200",
+  "version": "0.1.201",
   "description": "Remy coding agent",
   "repository": {
     "type": "git",