@buildautomaton/cli 0.1.19 → 0.1.20

package/dist/cli.js

@@ -974,7 +974,7 @@ var require_command = __commonJS({
     var EventEmitter2 = __require("node:events").EventEmitter;
     var childProcess2 = __require("node:child_process");
     var path36 = __require("node:path");
-    var fs32 = __require("node:fs");
+    var fs34 = __require("node:fs");
     var process8 = __require("node:process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
     var { CommanderError: CommanderError2 } = require_error();
@@ -1907,10 +1907,10 @@ Expecting one of '${allowedValues.join("', '")}'`);
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
           const localBin = path36.resolve(baseDir, baseName);
-          if (fs32.existsSync(localBin)) return localBin;
+          if (fs34.existsSync(localBin)) return localBin;
           if (sourceExt.includes(path36.extname(baseName))) return void 0;
           const foundExt = sourceExt.find(
-            (ext) => fs32.existsSync(`${localBin}${ext}`)
+            (ext) => fs34.existsSync(`${localBin}${ext}`)
           );
           if (foundExt) return `${localBin}${foundExt}`;
           return void 0;
@@ -1922,7 +1922,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         if (this._scriptPath) {
           let resolvedScriptPath;
           try {
-            resolvedScriptPath = fs32.realpathSync(this._scriptPath);
+            resolvedScriptPath = fs34.realpathSync(this._scriptPath);
           } catch (err) {
             resolvedScriptPath = this._scriptPath;
           }
@@ -5236,7 +5236,7 @@ var require_websocket = __commonJS({
     var http = __require("http");
     var net = __require("net");
     var tls = __require("tls");
-    var { randomBytes: randomBytes3, createHash: createHash3 } = __require("crypto");
+    var { randomBytes: randomBytes3, createHash: createHash2 } = __require("crypto");
     var { Duplex, Readable: Readable2 } = __require("stream");
     var { URL: URL2 } = __require("url");
     var PerMessageDeflate = require_permessage_deflate();
@@ -5896,7 +5896,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash3("sha1").update(key + GUID).digest("base64");
+        const digest = createHash2("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -6263,7 +6263,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter2 = __require("events");
     var http = __require("http");
     var { Duplex } = __require("stream");
-    var { createHash: createHash3 } = __require("crypto");
+    var { createHash: createHash2 } = __require("crypto");
     var extension = require_extension();
     var PerMessageDeflate = require_permessage_deflate();
     var subprotocol = require_subprotocol();
@@ -6564,7 +6564,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash3("sha1").update(key + GUID).digest("base64");
+        const digest = createHash2("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -7129,7 +7129,7 @@ var require_has_flag = __commonJS({
 var require_supports_color = __commonJS({
   "../../node_modules/.pnpm/supports-color@7.2.0/node_modules/supports-color/index.js"(exports, module) {
     "use strict";
-    var os6 = __require("os");
+    var os7 = __require("os");
     var tty = __require("tty");
     var hasFlag = require_has_flag();
     var { env } = process;
@@ -7177,7 +7177,7 @@ var require_supports_color = __commonJS({
         return min;
       }
       if (process.platform === "win32") {
-        const osRelease = os6.release().split(".");
+        const osRelease = os7.release().split(".");
         if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
@@ -24800,8 +24800,8 @@ var init_acp = __esm({
         this.#requestHandler = requestHandler;
         this.#notificationHandler = notificationHandler;
         this.#stream = stream;
-        this.#closedPromise = new Promise((resolve19) => {
-          this.#abortController.signal.addEventListener("abort", () => resolve19());
+        this.#closedPromise = new Promise((resolve18) => {
+          this.#abortController.signal.addEventListener("abort", () => resolve18());
         });
         this.#receive();
       }
@@ -24950,8 +24950,8 @@ var init_acp = __esm({
       }
       async sendRequest(method, params) {
         const id = this.#nextRequestId++;
-        const responsePromise = new Promise((resolve19, reject) => {
-          this.#pendingResponses.set(id, { resolve: resolve19, reject });
+        const responsePromise = new Promise((resolve18, reject) => {
+          this.#pendingResponses.set(id, { resolve: resolve18, reject });
         });
         await this.#sendMessage({ jsonrpc: "2.0", id, method, params });
         return responsePromise;
@@ -25064,14 +25064,14 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.19".length > 0 ? "0.1.19" : "0.0.0-dev";
+var CLI_VERSION = "0.1.20".length > 0 ? "0.1.20" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
 var DEFAULT_FIREHOSE_URL = "https://buildautomaton-firehose.fly.dev";
 
 // src/cli/run-cli-action.ts
-import * as fs31 from "node:fs";
+import * as fs33 from "node:fs";
 import * as path35 from "node:path";
 
 // src/config.ts
@@ -26037,14 +26037,14 @@ var baseOpen = async (options) => {
   }
   const subprocess = childProcess.spawn(command, cliArguments, childProcessOptions);
   if (options.wait) {
-    return new Promise((resolve19, reject) => {
+    return new Promise((resolve18, reject) => {
       subprocess.once("error", reject);
       subprocess.once("close", (exitCode) => {
         if (!options.allowNonzeroExitCode && exitCode > 0) {
           reject(new Error(`Exited with code ${exitCode}`));
           return;
         }
-        resolve19(subprocess);
+        resolve18(subprocess);
       });
     });
   }
@@ -26340,8 +26340,8 @@ function runPendingAuth(options) {
   let hasOpenedBrowser = false;
   let resolved = false;
   let resolveAuth;
-  const authPromise = new Promise((resolve19) => {
-    resolveAuth = resolve19;
+  const authPromise = new Promise((resolve18) => {
+    resolveAuth = resolve18;
   });
   let reconnectAttempt = 0;
   const signInQuiet = createEmptyReconnectQuietSlot();
@@ -26463,7 +26463,7 @@ function runPendingAuth(options) {
 async function closeBridgeConnection(state, acpManager, devServerManager, log2) {
   const say = log2 ?? logImmediate;
   say("Cleaning up connections\u2026");
-  await new Promise((resolve19) => setImmediate(resolve19));
+  await new Promise((resolve18) => setImmediate(resolve18));
   state.closedByUser = true;
   clearReconnectQuietTimer(state.mainQuiet);
   clearReconnectQuietTimer(state.firehoseQuiet);
@@ -31367,18 +31367,7 @@ async function collectTurnGitDiffFromPreTurnSnapshot(options) {
   }
 }
 
-// ../types/dist/index.js
-init_zod();
-init_zod();
-init_zod();
-init_zod();
-init_zod();
-init_zod();
-init_zod();
-init_zod();
-init_zod();
-init_zod();
-init_zod();
+// ../types/src/work-items.ts
 init_zod();
 var WorkItemStatusSchema = external_exports.enum(["backlog", "in-progress", "completed"]);
 var WorkItemProgressSchema = external_exports.object({
@@ -31419,6 +31408,9 @@ var WorkItemSchema = external_exports.object({
   dependencies: external_exports.array(WorkItemDependencySchema).default([]),
   assignedToUserId: external_exports.string().optional()
 });
+
+// ../types/src/user-profiles.ts
+init_zod();
 var UserWorkspaceProfileSchema = external_exports.object({
   id: external_exports.string(),
   workspaceId: external_exports.string(),
@@ -31428,6 +31420,9 @@ var UserWorkspaceProfileSchema = external_exports.object({
   preferences: external_exports.record(external_exports.unknown()).optional(),
   learnings: external_exports.array(external_exports.string())
 });
+
+// ../types/src/runtime.ts
+init_zod();
 var WorkspaceOwnerInfoSchema = external_exports.object({
   ownerId: external_exports.string(),
   ownerName: external_exports.string().optional(),
@@ -31441,6 +31436,9 @@ var WorkspaceRuntimeEntrySchema = external_exports.object({
   owner: WorkspaceOwnerInfoSchema.optional(),
   isOwner: external_exports.boolean().optional()
 });
+
+// ../types/src/agent.ts
+init_zod();
 var ProjectContextSchema = external_exports.object({
   projectId: external_exports.string(),
   context: external_exports.record(external_exports.unknown()).default({}),
@@ -31465,6 +31463,9 @@ var WebSocketMessageSchema = external_exports.object({
   data: external_exports.any().optional(),
   error: external_exports.string().optional()
 });
+
+// ../types/src/checkpoints.ts
+init_zod();
 var CheckpointKindSchema = external_exports.enum(["daily", "weekly", "overall"]);
 var CheckpointSummarySchema = external_exports.object({
   id: external_exports.string(),
@@ -31475,6 +31476,9 @@ var CheckpointSummarySchema = external_exports.object({
   createdAt: external_exports.string(),
   updatedAt: external_exports.string()
 });
+
+// ../types/src/threads.ts
+init_zod();
 var ThreadMetaSchema = external_exports.object({
   threadId: external_exports.string(),
   workspaceId: external_exports.string(),
@@ -31502,6 +31506,9 @@ var ThreadMessageSchema = external_exports.object({
 var ThreadCheckpointSummarySchema = CheckpointSummarySchema.extend({
   threadId: external_exports.string()
 });
+
+// ../types/src/content-items.ts
+init_zod();
 var ContentSourceSchema = external_exports.enum(["notion", "doc", "slack_thread", "other"]);
 var ContentItemMetaSchema = external_exports.object({
   contentId: external_exports.string(),
@@ -31523,6 +31530,9 @@ var ContentStorageRefSchema = external_exports.object({
 var ContentCheckpointSummarySchema = CheckpointSummarySchema.extend({
   contentId: external_exports.string()
 });
+
+// ../types/src/stories.ts
+init_zod();
 var StoryMetaSchema = external_exports.object({
   storyId: external_exports.string(),
   workspaceId: external_exports.string(),
@@ -31545,6 +31555,9 @@ var StoryContentItemRefSchema = external_exports.object({
 var StoryCheckpointSummarySchema = CheckpointSummarySchema.extend({
   storyId: external_exports.string()
 });
+
+// ../types/src/sessions.ts
+init_zod();
 var BUILTIN_SESSION_CHANGE_SUMMARY_FOLLOW_UP_CATALOG_PROMPT_ID = "__builtin_change_summary__";
 var SessionMetaSchema = external_exports.object({
   sessionId: external_exports.string(),
@@ -31587,6 +31600,8 @@ var SessionThreadRefSchema = external_exports.object({
   threadId: external_exports.string(),
   addedAt: external_exports.string()
 });
+
+// ../types/src/change-summary-path.ts
 function normalizeRepoRelativePath(p) {
   let t = p.trim().replace(/\\/g, "/");
   while (t.startsWith("./")) t = t.slice(2);
@@ -31603,6 +31618,8 @@ function resolveChangeSummaryPathAgainstAllowed(rawPath, allowed) {
   }
   return null;
 }
+
+// ../types/src/parse-change-summary-json.ts
 function clampSummaryToAtMostTwoLines(summary) {
   const lines = summary.split(/\r?\n/).map((l) => l.trim()).filter((l) => l.length > 0);
   return lines.slice(0, 2).join("\n");
@@ -31645,6 +31662,8 @@ function parseChangeSummaryJson(raw, allowedPaths, options) {
   }
   return rows;
 }
+
+// ../types/src/build-change-summary-prompt.ts
 var PATCH_PREVIEW_MAX = 12e3;
 function clip(s, max) {
   if (s.length <= max) return s;
@@ -31702,6 +31721,8 @@ function buildSessionChangeSummaryPrompt(files) {
   }
   return lines.join("\n");
 }
+
+// ../types/src/dedupe-session-file-changes-by-path.ts
 function defaultRichness(c) {
   const patch = typeof c.patchContent === "string" ? c.patchContent.length : 0;
   const nt = typeof c.newText === "string" ? c.newText.length : 0;
@@ -31719,6 +31740,9 @@ function dedupeSessionFileChangesByPath(items, richness = (item) => defaultRichn
   }
   return Array.from(byPath.entries()).sort(([a], [b]) => a.localeCompare(b)).map(([, v]) => v);
 }
+
+// ../types/src/artifacts.ts
+init_zod();
 var ArtifactMetaSchema = external_exports.object({
   artifactId: external_exports.string(),
   workspaceId: external_exports.string(),
@@ -31732,6 +31756,9 @@ var ArtifactMetaSchema = external_exports.object({
   createdAt: external_exports.string(),
   updatedAt: external_exports.string()
 });
+
+// ../types/src/templates.ts
+init_zod();
 var TemplateMetaSchema = external_exports.object({
   templateId: external_exports.string(),
   workspaceId: external_exports.string(),
@@ -31741,6 +31768,9 @@ var TemplateMetaSchema = external_exports.object({
   createdAt: external_exports.string(),
   updatedAt: external_exports.string()
 });
+
+// ../types/src/git-repos.ts
+init_zod();
 var GitRepoMetaSchema = external_exports.object({
   /** Stable id for the repo (e.g. hash of normalized canonical URL). Used for DO idFromName. */
   repoId: external_exports.string(),
@@ -32157,7 +32187,7 @@ async function createSdkStdioAcpClient(options) {
   child.once("close", (code, signal) => {
     onAgentSubprocessExit?.({ code, signal });
   });
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve18, reject) => {
     let initSettled = false;
     const settleReject = (err) => {
       if (initSettled) return;
@@ -32171,7 +32201,7 @@ async function createSdkStdioAcpClient(options) {
     const settleResolve = (handle) => {
       if (initSettled) return;
       initSettled = true;
-      resolve19(handle);
+      resolve18(handle);
     };
     child.on("error", (err) => {
       settleReject(new Error(formatSpawnError(err, command[0])));
@@ -32207,8 +32237,8 @@ async function createSdkStdioAcpClient(options) {
               });
             } catch {
             }
-            return await new Promise((resolve20) => {
-              pendingPermissionResolvers.set(requestId, resolve20);
+            return await new Promise((resolve19) => {
+              pendingPermissionResolvers.set(requestId, resolve19);
             });
           },
           async readTextFile(params) {
@@ -32316,9 +32346,9 @@ async function createSdkStdioAcpClient(options) {
             }
           },
           async cancel() {
-            for (const [id, resolve20] of [...pendingPermissionResolvers.entries()]) {
+            for (const [id, resolve19] of [...pendingPermissionResolvers.entries()]) {
               pendingPermissionResolvers.delete(id);
-              resolve20({ outcome: { outcome: "cancelled" } });
+              resolve19({ outcome: { outcome: "cancelled" } });
             }
             try {
               await connection.cancel({ sessionId });
@@ -32334,10 +32364,10 @@ async function createSdkStdioAcpClient(options) {
             }
           },
           resolveRequest(requestId, result) {
-            const resolve20 = pendingPermissionResolvers.get(requestId);
-            if (!resolve20) return;
+            const resolve19 = pendingPermissionResolvers.get(requestId);
+            if (!resolve19) return;
             pendingPermissionResolvers.delete(requestId);
-            resolve20(result);
+            resolve19(result);
           },
           disconnect() {
             child.kill();
@@ -32488,7 +32518,7 @@ async function createCursorAcpClient(options) {
   });
   const stderrCapture = createStderrCapture(child);
   child.stderr?.on("data", (chunk) => stderrCapture.append(chunk));
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve18, reject) => {
     child.on("error", (err) => {
       child.kill();
       reject(new Error(formatSpawnError2(err, command[0])));
@@ -32675,7 +32705,7 @@ async function createCursorAcpClient(options) {
         const newResult = await send("session/new", { cwd, mcpServers: [] });
         const sessionId = newResult?.sessionId ?? "";
         if (!sessionId) throw new Error("Cursor ACP session/new did not return sessionId");
-        resolve19({
+        resolve18({
           sessionId,
           async sendPrompt(prompt, _options) {
             promptOutputBuffer = "";
@@ -34827,7 +34857,7 @@ import path22 from "node:path";
 
 // src/runtime/yield-to-event-loop.ts
 function yieldToEventLoop() {
-  return new Promise((resolve19) => setImmediate(resolve19));
+  return new Promise((resolve18) => setImmediate(resolve18));
 }
 
 // src/files/index/walk-workspace-tree.ts
@@ -35189,15 +35219,15 @@ function sendDevServerStatus(getWs, serverId, status, options) {
 
 // src/dev-servers/process/terminate-child-process.ts
 async function sigtermAndWaitForExit(proc, graceMs, log2, shortId) {
-  const exited = new Promise((resolve19) => {
-    proc.once("exit", () => resolve19());
+  const exited = new Promise((resolve18) => {
+    proc.once("exit", () => resolve18());
   });
   log2(`[dev-server] Sending SIGTERM to ${shortId} (pid=${proc.pid ?? "?"}).`);
   try {
     proc.kill("SIGTERM");
   } catch {
   }
-  await Promise.race([exited, new Promise((resolve19) => setTimeout(resolve19, graceMs))]);
+  await Promise.race([exited, new Promise((resolve18) => setTimeout(resolve18, graceMs))]);
 }
 function forceKillChild(proc, log2, shortId, graceMs) {
   log2(
@@ -36080,7 +36110,7 @@ async function proxyToLocal(request) {
   };
   const maxAttempts = isIdempotentProxyMethod(request.method) ? LOCAL_PREVIEW_FETCH_RETRY_DELAYS_MS.length + 1 : 1;
   for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
-    const once = await new Promise((resolve19) => {
+    const once = await new Promise((resolve18) => {
       const req = mod.request(opts, (res) => {
         const chunks = [];
         res.on("data", (c) => chunks.push(c));
@@ -36091,7 +36121,7 @@ async function proxyToLocal(request) {
             if (typeof v === "string") headers[k] = v;
             else if (Array.isArray(v) && v[0]) headers[k] = v[0];
           }
-          resolve19({
+          resolve18({
             id: request.id,
             statusCode: res.statusCode ?? 0,
             headers,
@@ -36100,7 +36130,7 @@ async function proxyToLocal(request) {
         });
       });
       req.on("error", (err) => {
-        resolve19({
+        resolve18({
           id: request.id,
           statusCode: 0,
           headers: {},
@@ -36616,6 +36646,7 @@ var API_TO_BRIDGE_MESSAGE_TYPES = [
   "dev_servers_config",
   "server_control",
   "agent_config",
+  "prompt_queue_state",
   "prompt",
   "session_git_request",
   "rename_session_branch",
@@ -36695,6 +36726,173 @@ var handleAgentConfigMessage = (msg, deps) => {
 // src/agents/acp/from-bridge/handle-bridge-prompt.ts
 import * as path30 from "node:path";
 
+// src/prompt-turn-queue/client-report.ts
+function sendPromptQueueClientReport(ws, queues) {
+  if (!ws) return false;
+  sendWsMessage(ws, { type: "prompt_queue_client_report", queues });
+  return true;
+}
+
+// src/prompt-turn-queue/disk-store.ts
+import fs28 from "node:fs";
+
+// src/prompt-turn-queue/paths.ts
+import crypto3 from "node:crypto";
+import fs27 from "node:fs";
+import path29 from "node:path";
+import os6 from "node:os";
+var QUEUE_KEY_HEX_64 = /^[a-f0-9]{64}$/i;
+function queueStateFileSlug(queueKey) {
+  if (QUEUE_KEY_HEX_64.test(queueKey)) return queueKey.toLowerCase();
+  return crypto3.createHash("sha256").update(queueKey, "utf8").digest("hex");
+}
+function getPromptQueuesDirectory() {
+  const override = process.env.BUILDAMATON_PROMPT_QUEUES_DIR?.trim();
+  if (override) return path29.resolve(override);
+  return path29.join(os6.homedir(), ".buildautomaton", "queues");
+}
+function ensurePromptQueuesDirectory() {
+  const dir = getPromptQueuesDirectory();
+  if (!fs27.existsSync(dir)) fs27.mkdirSync(dir, { recursive: true });
+}
+function queueStateFilePath(queueKey) {
+  return path29.join(getPromptQueuesDirectory(), `${queueStateFileSlug(queueKey)}.json`);
+}
+
+// src/prompt-turn-queue/disk-store.ts
+function parsePersistedQueueFile(raw) {
+  try {
+    const o = JSON.parse(raw);
+    const queueKey = typeof o.queueKey === "string" ? o.queueKey : typeof o.queueKeyHash === "string" ? o.queueKeyHash : null;
+    if (!queueKey || typeof o.updatedAt !== "string" || !Array.isArray(o.turns)) return null;
+    return { queueKey, updatedAt: o.updatedAt, turns: o.turns };
+  } catch {
+    return null;
+  }
+}
+function readPersistedQueue(queueKey) {
+  const p = queueStateFilePath(queueKey);
+  try {
+    return parsePersistedQueueFile(fs28.readFileSync(p, "utf8"));
+  } catch {
+    return null;
+  }
+}
+function writePersistedQueue(file2) {
+  ensurePromptQueuesDirectory();
+  const p = queueStateFilePath(file2.queueKey);
+  fs28.writeFileSync(p, JSON.stringify(file2, null, 2), "utf8");
+}
+function mergeServerQueueSnapshot(queueKey, serverTurns) {
+  const prev = readPersistedQueue(queueKey);
+  const turns = [];
+  for (const raw of serverTurns) {
+    if (!raw || typeof raw !== "object") continue;
+    const o = raw;
+    const turnId = typeof o.turnId === "string" ? o.turnId : "";
+    const sessionId = typeof o.sessionId === "string" ? o.sessionId : "";
+    const turnOrd = typeof o.turnOrd === "number" ? o.turnOrd : Number(o.turnOrd) || 0;
+    const serverState = o.serverState;
+    const lastClientState = o.lastClientState ?? null;
+    const payload = o.payload && typeof o.payload === "object" ? o.payload : {};
+    if (!turnId || !sessionId) continue;
+    if (serverState !== "queued" && serverState !== "stopping" && serverState !== "discarded") continue;
+    const old = prev?.turns.find((t) => t.turnId === turnId);
+    const mergedClient = old?.lastClientState === "running" && lastClientState == null ? "running" : lastClientState;
+    turns.push({
+      turnId,
+      sessionId,
+      turnOrd,
+      serverState,
+      lastClientState: mergedClient,
+      payload
+    });
+  }
+  turns.sort((a, b) => a.turnOrd - b.turnOrd);
+  return { queueKey, updatedAt: (/* @__PURE__ */ new Date()).toISOString(), turns };
+}
+
+// src/prompt-turn-queue/runner.ts
+var runIdToQueueKey = /* @__PURE__ */ new Map();
+function pickNextRunnableTurn(turns) {
+  for (const t of turns) {
+    if (t.serverState === "discarded" || t.serverState === "stopping") continue;
+    if (t.serverState !== "queued") continue;
+    if (t.lastClientState === "running" || t.lastClientState === "stopped" || t.lastClientState === "failed") continue;
+    return t;
+  }
+  return null;
+}
+function hasRunningTurn(turns) {
+  return turns.some((t) => t.lastClientState === "running");
+}
+function dispatchLocalPrompt(next, deps) {
+  const pl = next.payload;
+  const msg = {
+    type: "prompt",
+    sessionId: next.sessionId,
+    runId: next.turnId,
+    prompt: pl.prompt,
+    mode: typeof pl.mode === "string" ? pl.mode : "agent",
+    isNewSession: pl.isNewSession === true,
+    ...typeof pl.followUpCatalogPromptId === "string" ? { followUpCatalogPromptId: pl.followUpCatalogPromptId } : {},
+    ...Array.isArray(pl.sessionChangeSummaryFilePaths) ? { sessionChangeSummaryFilePaths: pl.sessionChangeSummaryFilePaths } : {},
+    ...Array.isArray(pl.sessionChangeSummaryFileSnapshots) ? { sessionChangeSummaryFileSnapshots: pl.sessionChangeSummaryFileSnapshots } : {},
+    ...typeof pl.agentType === "string" && pl.agentType.trim() ? { agentType: pl.agentType.trim() } : {}
+  };
+  handleBridgePrompt(msg, deps);
+}
+function applyPromptQueueStateFromServer(msg, deps) {
+  const raw = msg.queues;
+  if (!raw || typeof raw !== "object") return;
+  const getWs = deps.getWs;
+  for (const [queueKey, serverTurns] of Object.entries(raw)) {
+    if (!Array.isArray(serverTurns)) continue;
+    const file2 = mergeServerQueueSnapshot(queueKey, serverTurns);
+    writePersistedQueue(file2);
+  }
+  const report = {};
+  const startedThisTick = /* @__PURE__ */ new Set();
+  for (const [queueKey, serverTurns] of Object.entries(raw)) {
+    if (!Array.isArray(serverTurns)) continue;
+    const file2 = readPersistedQueue(queueKey);
+    if (!file2) continue;
+    if (hasRunningTurn(file2.turns)) continue;
+    const next = pickNextRunnableTurn(file2.turns);
+    if (!next) continue;
+    next.lastClientState = "running";
+    writePersistedQueue(file2);
+    runIdToQueueKey.set(next.turnId, queueKey);
+    startedThisTick.add(next.turnId);
+    report[queueKey] = [{ turnId: next.turnId, clientState: "running" }];
+  }
+  if (Object.keys(report).length > 0) {
+    sendPromptQueueClientReport(getWs(), report);
+  }
+  for (const [queueKey, serverTurns] of Object.entries(raw)) {
+    if (!Array.isArray(serverTurns)) continue;
+    const file2 = readPersistedQueue(queueKey);
+    if (!file2) continue;
+    const running = file2.turns.find((t) => t.lastClientState === "running");
+    if (!running || !startedThisTick.has(running.turnId)) continue;
+    if (runIdToQueueKey.get(running.turnId) !== queueKey) continue;
+    dispatchLocalPrompt(running, deps);
+  }
+}
+function finalizePromptTurnOnBridge(getWs, runId, success2) {
+  if (!runId) return;
+  const queueKey = runIdToQueueKey.get(runId);
+  runIdToQueueKey.delete(runId);
+  if (!queueKey) return;
+  const f = readPersistedQueue(queueKey);
+  if (!f) return;
+  const t = f.turns.find((x) => x.turnId === runId);
+  if (!t) return;
+  t.lastClientState = success2 ? "stopped" : "failed";
+  writePersistedQueue(f);
+  sendPromptQueueClientReport(getWs(), { [queueKey]: [{ turnId: runId, clientState: t.lastClientState }] });
+}
+
 // src/agents/acp/from-bridge/bridge-prompt-wiring.ts
 function createBridgePromptSenders(deps, getWs) {
   const sendBridgeMessage = (message, encryptedFields = []) => {
@@ -36708,6 +36906,9 @@ function createBridgePromptSenders(deps, getWs) {
     const skipEncryptForChangeSummaryFollowUp = result.type === "prompt_result" && result.followUpCatalogPromptId === BUILTIN_SESSION_CHANGE_SUMMARY_FOLLOW_UP_CATALOG_PROMPT_ID;
     const encryptedFields = result.type === "prompt_result" && !skipEncryptForChangeSummaryFollowUp ? ["output", "error"] : [];
     sendBridgeMessage(result, encryptedFields);
+    if (result.type === "prompt_result") {
+      finalizePromptTurnOnBridge(getWs, typeof result.runId === "string" ? result.runId : void 0, result.success === true);
+    }
   };
   const sendSessionUpdate = (payload) => {
     const s = getWs();
@@ -36732,63 +36933,6 @@ function createBridgePromptSenders(deps, getWs) {
 // src/agents/acp/from-bridge/bridge-prompt-preamble.ts
 import { execFile as execFile10 } from "node:child_process";
 import { promisify as promisify10 } from "node:util";
-
-// src/git/bridge-queue-key.ts
-import * as path29 from "node:path";
-import { createHash as createHash2 } from "node:crypto";
-function normalizeCanonicalGitUrl(url2) {
-  let s = url2.trim();
-  if (!s) return s;
-  if (s.toLowerCase().endsWith(".git")) {
-    s = s.slice(0, -4);
-  }
-  s = s.replace(/\/+$/, "");
-  const httpsMatch = /^(https?):\/\/([^/]+)(\/.*)?$/i.exec(s);
-  if (httpsMatch) {
-    const host = httpsMatch[2].toLowerCase();
-    const p = httpsMatch[3] ?? "";
-    s = `${httpsMatch[1].toLowerCase()}://${host}${p}`;
-  } else {
-    const sshMatch = /^git@([^:]+):(.+)$/i.exec(s);
-    if (sshMatch) {
-      const host = sshMatch[1].toLowerCase();
-      s = `git@${host}:${sshMatch[2]}`;
-    }
-  }
-  return s;
-}
-function canonicalUrlToRepoIdSync(url2) {
-  const normalized = normalizeCanonicalGitUrl(url2);
-  return createHash2("sha256").update(normalized).digest("hex").slice(0, 32);
-}
-function fallbackRepoIdFromPath(absPath) {
-  return createHash2("sha256").update(path29.resolve(absPath)).digest("hex").slice(0, 32);
-}
-async function resolveBridgeQueueBindFields(options) {
-  const { effectiveCwd, worktreePaths, primaryRepoRoots, log: log2 } = options;
-  const cwdAbs = worktreePaths.length > 0 ? path29.resolve(worktreePaths[0]) : path29.resolve(effectiveCwd);
-  if (!primaryRepoRoots.length) {
-    log2("[Bridge service] Prompt queue bind skipped: no Git repository roots under the working directory.");
-    return null;
-  }
-  let primaryRoot = primaryRepoRoots[0];
-  let remote = await getRemoteOriginUrl(primaryRoot);
-  if (!remote) {
-    for (const r of primaryRepoRoots.slice(1)) {
-      const u = await getRemoteOriginUrl(r);
-      if (u) {
-        primaryRoot = r;
-        remote = u;
-        break;
-      }
-    }
-  }
-  const repoId = remote ? canonicalUrlToRepoIdSync(remote) : fallbackRepoIdFromPath(primaryRoot);
-  const canonicalQueueKey = `repo:${repoId}::cwd:${cwdAbs}`;
-  return { canonicalQueueKey, repoId, cwdAbs };
-}
-
-// src/agents/acp/from-bridge/bridge-prompt-preamble.ts
 var execFileAsync9 = promisify10(execFile10);
 async function readGitBranch(cwd) {
   try {
@@ -36808,23 +36952,6 @@ async function runBridgePromptPreamble(params) {
     fallbackCwd: effectiveCwd,
     log: log2
   });
-  if (s && sessionId) {
-    const bind = await resolveBridgeQueueBindFields({
-      effectiveCwd,
-      worktreePaths,
-      primaryRepoRoots: repoRoots,
-      log: log2
-    });
-    if (bind) {
-      sendWsMessage(s, {
-        type: "bridge_queue_bind",
-        sessionId,
-        canonicalQueueKey: bind.canonicalQueueKey,
-        repoId: bind.repoId,
-        cwdAbs: bind.cwdAbs
-      });
-    }
-  }
   if (s && sessionId) {
     const cliGitBranch = await readGitBranch(effectiveCwd);
     const usesWt = sessionWorktreeManager.usesWorktreeSession(sessionId);
@@ -37016,6 +37143,11 @@ var handlePromptMessage = (msg, deps) => {
   handleBridgePrompt(msg, deps);
 };
 
+// src/bridge/routing/handlers/prompt-queue-state.ts
+var handlePromptQueueStateMessage = (msg, deps) => {
+  applyPromptQueueStateFromServer(msg, deps);
+};
+
 // src/agents/acp/from-bridge/handle-bridge-cancel-run.ts
 async function handleBridgeCancelRun(msg, { log: log2, acpManager, getWs }) {
   const runId = msg.runId;
@@ -37035,6 +37167,7 @@ async function handleBridgeCancelRun(msg, { log: log2, acpManager, getWs }) {
     error: "Stopped by user",
     stopReason: "no_local_run"
   });
+  finalizePromptTurnOnBridge(getWs, runId, false);
 }
 
 // src/bridge/routing/handlers/cancel-run.ts
@@ -37252,7 +37385,7 @@ var handleSkillCallMessage = (msg, { getWs, log: log2 }) => {
 };
 
 // src/files/list-dir.ts
-import fs27 from "node:fs";
+import fs29 from "node:fs";
 import path32 from "node:path";
 
 // src/files/ensure-under-cwd.ts
@@ -37274,7 +37407,7 @@ async function listDirAsync(relativePath) {
     return { error: "Path is outside working directory" };
   }
   try {
-    const names = await fs27.promises.readdir(resolved, { withFileTypes: true });
+    const names = await fs29.promises.readdir(resolved, { withFileTypes: true });
     const visible = names.filter((d) => !d.name.startsWith("."));
     const entries = [];
     for (let i = 0; i < visible.length; i++) {
@@ -37287,7 +37420,7 @@ async function listDirAsync(relativePath) {
       let isDir = d.isDirectory();
       if (d.isSymbolicLink()) {
         try {
-          const targetStat = await fs27.promises.stat(fullPath);
+          const targetStat = await fs29.promises.stat(fullPath);
           isDir = targetStat.isDirectory();
         } catch {
           isDir = false;
@@ -37312,25 +37445,25 @@ async function listDirAsync(relativePath) {
 }
 
 // src/files/read-file.ts
-import fs28 from "node:fs";
+import fs30 from "node:fs";
 import { StringDecoder } from "node:string_decoder";
 function resolveFilePath(relativePath) {
   const resolved = ensureUnderCwd(relativePath, getBridgeWorkspaceDirectory());
   if (!resolved) return { error: "Path is outside working directory" };
   let real;
   try {
-    real = fs28.realpathSync(resolved);
+    real = fs30.realpathSync(resolved);
   } catch {
     real = resolved;
   }
-  const stat3 = fs28.statSync(real);
+  const stat3 = fs30.statSync(real);
   if (!stat3.isFile()) return { error: "Not a file" };
   return real;
 }
 var LINE_CHUNK_SIZE = 64 * 1024;
 function readFileRange(filePath, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE) {
-  const fileSize = fs28.statSync(filePath).size;
-  const fd = fs28.openSync(filePath, "r");
+  const fileSize = fs30.statSync(filePath).size;
+  const fd = fs30.openSync(filePath, "r");
   const bufSize = 64 * 1024;
   const buf = Buffer.alloc(bufSize);
   const decoder = new StringDecoder("utf8");
@@ -37343,7 +37476,7 @@ function readFileRange(filePath, startLine, endLine, lineOffsetIn, lineChunkSize
   let line0Accum = "";
   try {
     let bytesRead;
-    while (!done && (bytesRead = fs28.readSync(fd, buf, 0, bufSize, null)) > 0) {
+    while (!done && (bytesRead = fs30.readSync(fd, buf, 0, bufSize, null)) > 0) {
       const text = partial2 + decoder.write(buf.subarray(0, bytesRead));
       partial2 = "";
       let lineStart = 0;
@@ -37478,7 +37611,7 @@ function readFileRange(filePath, startLine, endLine, lineOffsetIn, lineChunkSize
     }
     return { content: resultLines.join("\n"), size: fileSize };
   } finally {
-    fs28.closeSync(fd);
+    fs30.closeSync(fd);
   }
 }
 function readFile3(relativePath, startLine, endLine, lineOffset, lineChunkSize = LINE_CHUNK_SIZE) {
@@ -37489,8 +37622,8 @@ function readFile3(relativePath, startLine, endLine, lineOffset, lineChunkSize =
     if (hasRange) {
       return readFileRange(result, startLine, endLine, lineOffset, lineChunkSize);
     }
-    const stat3 = fs28.statSync(result);
-    const raw = fs28.readFileSync(result, "utf8");
+    const stat3 = fs30.statSync(result);
+    const raw = fs30.readFileSync(result, "utf8");
     const lines = raw.split(/\r?\n/);
     return { content: raw, totalLines: lines.length, size: stat3.size };
   } catch (err) {
@@ -37608,7 +37741,7 @@ function handleSkillLayoutRequest(msg, deps) {
 }
 
 // src/skills/install-remote-skills.ts
-import fs29 from "node:fs";
+import fs31 from "node:fs";
 import path33 from "node:path";
 function installRemoteSkills(cwd, targetDir, items) {
   const installed2 = [];
@@ -37624,11 +37757,11 @@ function installRemoteSkills(cwd, targetDir, items) {
       for (const f of item.files) {
         if (typeof f.path !== "string" || !f.text && !f.base64) continue;
         const dest = path33.join(skillDir, f.path);
-        fs29.mkdirSync(path33.dirname(dest), { recursive: true });
+        fs31.mkdirSync(path33.dirname(dest), { recursive: true });
         if (f.text !== void 0) {
-          fs29.writeFileSync(dest, f.text, "utf8");
+          fs31.writeFileSync(dest, f.text, "utf8");
         } else if (f.base64) {
-          fs29.writeFileSync(dest, Buffer.from(f.base64, "base64"));
+          fs31.writeFileSync(dest, Buffer.from(f.base64, "base64"));
         }
       }
       installed2.push({
@@ -37778,7 +37911,7 @@ var handleSessionDiscardedMessage = (msg, deps) => {
 };
 
 // src/bridge/routing/handlers/revert-turn-snapshot.ts
-import * as fs30 from "node:fs";
+import * as fs32 from "node:fs";
 var handleRevertTurnSnapshotMessage = (msg, deps) => {
   const id = typeof msg.id === "string" ? msg.id : "";
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
@@ -37790,7 +37923,7 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
     if (!s) return;
     const agentBase = sessionWorktreeManager.getAgentCwdForSession(sessionId) ?? getBridgeWorkspaceDirectory();
     const file2 = snapshotFilePath(agentBase, turnId);
-    if (!fs30.existsSync(file2)) {
+    if (!fs32.existsSync(file2)) {
       sendWsMessage(s, {
         type: "revert_turn_snapshot_result",
         id,
@@ -37848,6 +37981,9 @@ function dispatchBridgeMessage(msg, deps) {
     case "agent_config":
       handleAgentConfigMessage(msg, deps);
       break;
+    case "prompt_queue_state":
+      handlePromptQueueStateMessage(msg, deps);
+      break;
     case "prompt":
       handlePromptMessage(msg, deps);
       break;
@@ -38347,7 +38483,7 @@ async function runCliAction(program2, opts) {
   if (opts.cwd && typeof opts.cwd === "string" && opts.cwd.trim()) {
     const resolvedCwd = path35.resolve(process.cwd(), opts.cwd.trim());
     try {
-      const st = fs31.statSync(resolvedCwd);
+      const st = fs33.statSync(resolvedCwd);
       if (!st.isDirectory()) {
         console.error(`--cwd is not a directory: ${resolvedCwd}`);
         process.exit(1);