canopy-ui 0.15.2 → 0.15.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canopy-ui",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "type": "module",
   "repository": {
     "type": "git",

package/src/chat/protocol.ts

@@ -186,7 +186,7 @@ export interface SessionMenu {
  * any of it and simply showed an empty panel.
  */
 export interface TurnStatus {
-  /** `picking_up` | `waiting_runner` | `unrouted` | `working` | `blocked`
+  /** `picking_up` | `queued_behind` | `waiting_runner` | `unrouted` | `working` | `blocked`
    *  | `paused` | `done` | `cancelled` | `missed` | `failed` | `lost`.
    *
    *  Deliberately a string rather than a union: an older client meeting a
@@ -212,6 +212,10 @@ export interface TurnStatus {
   menu_pending: boolean;
   /** Why a `failed` turn failed, in the runner's words. Null for every other
    *  state. Absent on an older server. */
+  /** For `queued_behind`: what it waits behind — `session` (the previous
+   *  message in this conversation) or `agent` (another turn of the same
+   *  agent). Absent on an older server. */
+  behind?: "session" | "agent" | null;
   detail?: string | null;
   /** When a settled turn finished — lets the kit drop a failure the
    *  conversation has since moved past. Absent on an older server. */

package/src/chat/turnStatus.test.ts

@@ -72,6 +72,16 @@ describe("pendingLabel", () => {
     expect(pendingLabel({ status: status({ state: "working" }) })).toBe("Thinking on jj-mbp…");
   });
 
+  it("says a follow-up is queued behind the turn ahead, not being picked up (#1147)", () => {
+    const s = status({ state: "queued_behind", behind: "session", claimed_by: null });
+    expect(agentHasFloor({ status: s })).toBe(true);
+    expect(pendingLabel({ status: s })).toBe("Queued behind the previous message on jj-mbp…");
+    expect(pendingLabel({ status: { ...s, behind: "agent" } })).toBe(
+      "Queued behind the agent's current turn on jj-mbp…",
+    );
+    expect(turnNotice(s)).toBeNull();
+  });
+
   it("names a pinned runner as a decision, not a queue position", () => {
     const s = status({ state: "picking_up", pinned: true, runners: ["cloud-1"] });
     expect(pendingLabel({ status: s })).toBe("Sent to cloud-1…");

package/src/chat/turnStatus.ts

@@ -41,8 +41,8 @@ export function agentHasFloor({
   if (activity === "blocked") return false;
   if (status) {
     if (status.settled || status.stuck) return false;
-    // `picking_up` and `working` are the two live states, and both mean a
-    // reply is genuinely coming.
+    // `picking_up`, `queued_behind` and `working` are the live states, and
+    // each means a reply is genuinely coming.
     return true;
   }
   return Boolean(awaitingReply) || activity === "working";
@@ -65,6 +65,13 @@ export function pendingLabel({
   if (status?.state === "working") {
     return status.claimed_by ? `Thinking on ${status.claimed_by}…` : "Thinking…";
   }
+  if (status?.state === "queued_behind") {
+    // A live runner will take it, but only once the turn ahead ends — saying
+    // "picking this up" made a follow-up sent mid-turn look lost (#1147).
+    const [first] = status.runners;
+    const ahead = status.behind === "session" ? "the previous message" : "the agent's current turn";
+    return first ? `Queued behind ${ahead} on ${first}…` : `Queued behind ${ahead}…`;
+  }
   if (status?.state === "picking_up") {
     const [first] = status.runners;
     if (status.pinned && first) return `Sent to ${first}…`;