@agentconnect.md/daemon 1.0.0-rc.280 → 1.0.0-rc.281

package/dist/index.js

@@ -68493,8 +68493,8 @@ const [{ Command }, { fileURLToPath }, { runChat }, { runLogin }, { runForegroun
 	import("./commander-B5QVEFzH.js"),
 	import("node:url"),
 	import("./chat-4Is9zl7L.js"),
-	import("./login-CzDsJwym.js"),
-	import("./run-foreground-CfLjjwW7.js"),
+	import("./login-BPKCyqR_.js"),
+	import("./run-foreground-DA_KUM1q.js"),
 	import("./service-6w0WKhdx.js"),
 	import("./lock-CA9Bm8_s.js"),
 	import("./paths-CcRUjFjy.js")

package/dist/{login-CzDsJwym.js → login-BPKCyqR_.js}

@@ -1,6 +1,6 @@
 import { t as DAEMON_VERSION } from "./version-DGaRXjBK.js";
 import { _ as buildEnvelope, l as ConfigSchema, u as isFrame, v as decodeEnvelope, y as encode } from "./load-agents-Amic2B8b.js";
-import { i as ClientTransport, t as runForeground } from "./run-foreground-1y1IF3Dc.js";
+import { i as ClientTransport, t as runForeground } from "./run-foreground-BBBkQ93M.js";
 import { l as resolveRoot, t as configPath } from "./paths-DEcUO8lC.js";
 import { n as resolveController } from "./service-BQVw7wbz.js";
 import { dirname } from "node:path";
@@ -228,4 +228,4 @@ async function runLogin(opts, partial = {}) {
 //#endregion
 export { buildInstallOpts, persistCredentials, runLogin };
 
-//# sourceMappingURL=login-CzDsJwym.js.map
+//# sourceMappingURL=login-BPKCyqR_.js.map

package/dist/{login-CzDsJwym.js.map → login-BPKCyqR_.js.map}

@@ -1 +1 @@
-{"version":3,"file":"login-CzDsJwym.js","names":["realRunForeground"],"sources":["../src/cp/auth-probe.ts","../src/cli/login.ts"],"sourcesContent":["/**\n * `probeAuth` — a one-shot CP auth check used by `agentconnect login`. It dials\n * the CP, sends ONLY the `auth` frame (no `register`), and resolves with the\n * authoritative daemonId from `auth/ok`, or a human-readable failure reason on\n * a `4401` close, a correlated `error`, a dial failure, or a timeout. It always\n * closes the socket and never leaves a connection open.\n */\nimport { buildEnvelope, decodeEnvelope, encode, isFrame } from '@agentconnect.md/protocol'\nimport { ClientTransport, type Transport } from '@agentconnect.md/connection'\nimport { CP_SUBPROTOCOL, CP_WS_PATH } from './client.js'\n\nexport interface ProbeResult {\n  ok: boolean\n  daemonId?: string\n  reason?: string\n}\n\nexport interface ProbeOpts {\n  url: string\n  token: string\n  daemonId?: string\n  agentVersion?: string\n  timeoutMs?: number\n  /** Injectable for tests; defaults to dialing the real WebSocket. */\n  connect?: () => Promise<Transport>\n}\n\nexport async function probeAuth(opts: ProbeOpts): Promise<ProbeResult> {\n  const timeoutMs = opts.timeoutMs ?? 10_000\n  const dial = opts.connect ?? (() => ClientTransport.dial(opts.url, { subprotocol: CP_SUBPROTOCOL, path: CP_WS_PATH }))\n\n  let transport: Transport\n  try {\n    transport = await dial()\n  } catch (err) {\n    return { ok: false, reason: `cannot reach ${opts.url}: ${(err as Error).message}` }\n  }\n\n  const authPayload: Record<string, unknown> = {\n    apiKey: opts.token,\n    agentVersion: opts.agentVersion ?? 'probe'\n  }\n  if (opts.daemonId) authPayload.daemonId = opts.daemonId\n  const frame = buildEnvelope('auth', authPayload)\n\n  return await new Promise<ProbeResult>((resolve) => {\n    let settled = false\n    const done = (r: ProbeResult): void => {\n      if (settled) return\n      settled = true\n      clearTimeout(timer)\n      try {\n        transport.close(1000, 'probe done')\n      } catch {\n        // socket may already be closed\n      }\n      resolve(r)\n    }\n\n    const timer = setTimeout(\n      () => done({ ok: false, reason: `timed out after ${timeoutMs}ms waiting for auth/ok` }),\n      timeoutMs\n    )\n\n    transport.onMessage((text) => {\n      const decoded = decodeEnvelope(text)\n      if (!decoded.ok) return\n      const f = decoded.frame\n      if (f.corr !== frame.id) return\n      if (f.type === 'error') {\n        const e = f.payload as { code: string; message: string }\n        done({ ok: false, reason: `${e.code}: ${e.message}` })\n        return\n      }\n      if (isFrame('auth/ok')(f)) {\n        const ok = f.payload as { daemonId: string }\n        done({ ok: true, daemonId: ok.daemonId })\n      }\n    })\n\n    transport.onClose((code) => {\n      if (code === 4401) done({ ok: false, reason: 'authentication failed (4401) — check the daemon token' })\n      else done({ ok: false, reason: `connection closed (${code}) before auth/ok` })\n    })\n\n    transport.send(encode(frame))\n  })\n}\n","/**\n * `agentconnect login` — interactive onboarding. It tests the Control Plane auth\n * flow, persists credentials only on success, then offers to install the OS\n * service. If installed it starts the service (`up`) and returns; otherwise it\n * runs the daemon in the foreground (the same path as `agentconnect run`).\n *\n * `persistCredentials` is the pure config-merge half (token-only onboarding:\n * `daemonId` is omitted unless given — the first connect adopts it from the\n * token's `sub`). `runLogin` is the orchestrator, with injectable deps for tests.\n */\nimport { readFileSync, existsSync, writeFileSync, mkdirSync } from 'node:fs'\nimport { dirname } from 'node:path'\nimport { createInterface } from 'node:readline'\nimport { fileURLToPath } from 'node:url'\nimport { ConfigSchema } from '../config/config-schema.js'\nimport { resolveRoot, configPath } from '../paths.js'\nimport { DAEMON_VERSION } from '../version.js'\nimport { probeAuth, type ProbeResult } from '../cp/auth-probe.js'\nimport { resolveController, type InstallOpts } from '../service/index.js'\nimport { runForeground as realRunForeground } from './run-foreground.js'\n\nexport interface PersistCredsOpts {\n  cpUrl: string\n  cpKey: string\n  daemonId?: string\n  root?: string\n  configPath?: string\n}\n\n/** Merge url/token into config.json (validated), returning the written path. */\nexport function persistCredentials(opts: PersistCredsOpts): string {\n  const root = resolveRoot(opts.root)\n  const file = opts.configPath ?? configPath(root)\n  const raw: Record<string, unknown> = existsSync(file) ? JSON.parse(readFileSync(file, 'utf8')) : { version: 1 }\n\n  const cp = (raw.controlPlane as Record<string, unknown> | undefined) ?? {}\n  raw.controlPlane = { ...cp, url: opts.cpUrl, key: opts.cpKey, enabled: true }\n  if (opts.daemonId) raw.daemonId = opts.daemonId\n\n  ConfigSchema.parse(raw) // fail before writing if the merge is invalid\n\n  mkdirSync(dirname(file), { recursive: true })\n  writeFileSync(file, JSON.stringify(raw, null, 2) + '\\n')\n  return file\n}\n\nexport interface RunLoginOpts {\n  cpUrl?: string\n  cpKey?: string\n  daemonId?: string\n  root?: string\n  configPath?: string\n  /** The resolved CLI entry path. Must be supplied by the CLI entry point\n   *  (index.ts) so the correct bundle path is used rather than inferring it\n   *  from login.ts's own import.meta.url (which is the same bundle but the\n   *  `../` path calculation would be wrong). Falls back to import.meta.url\n   *  for the pure test path where login.ts is loaded standalone. */\n  cliEntry?: string\n}\n\n/**\n * Build the InstallOpts for the OS service installer.\n *\n * Exported as a pure helper so it can be unit-tested independently of the\n * full `runLogin` orchestration. The caller (index.ts) passes `cliEntry` so\n * the correct bundle path always flows through; if omitted we fall back to\n * `import.meta.url` (correct only when login.ts is the entry, e.g. in tests).\n */\nexport function buildInstallOpts(opts: { root?: string; cliEntry?: string }): InstallOpts {\n  return {\n    execPath: process.execPath,\n    cliEntry: opts.cliEntry ?? fileURLToPath(import.meta.url),\n    includeRootEnv: resolveRoot(opts.root) !== resolveRoot(undefined)\n  }\n}\n\nexport interface LoginDeps {\n  probe: (o: { url: string; token: string }) => Promise<ProbeResult>\n  installService: () => Promise<void>\n  runForeground: () => Promise<void>\n  out: NodeJS.WritableStream\n  input: NodeJS.ReadableStream\n  isTTY: boolean\n}\n\nfunction realDeps(opts: RunLoginOpts): LoginDeps {\n  return {\n    probe: (o) => probeAuth({ url: o.url, token: o.token, agentVersion: DAEMON_VERSION }),\n    installService: async () => {\n      const controller = resolveController({ root: opts.root })\n      await controller.install(buildInstallOpts(opts))\n      await controller.up()\n    },\n    runForeground: () =>\n      realRunForeground({\n        root: opts.root,\n        overrides: { cpUrl: opts.cpUrl, cpKey: opts.cpKey, daemonId: opts.daemonId }\n      }),\n    out: process.stdout,\n    input: process.stdin,\n    isTTY: Boolean(process.stdin.isTTY)\n  }\n}\n\n/** Read the next line from a readline interface via async iterator. */\nasync function nextLine(\n  iter: AsyncIterableIterator<string>,\n  prompt: string,\n  out: NodeJS.WritableStream\n): Promise<string> {\n  out.write(prompt)\n  const { value, done } = await iter.next()\n  if (done) throw new Error(`unexpected end of input waiting for: ${prompt}`)\n  return (value as string).trim()\n}\n\nexport async function runLogin(opts: RunLoginOpts, partial: Partial<LoginDeps> = {}): Promise<void> {\n  const deps: LoginDeps = { ...realDeps(opts), ...partial }\n  const { out } = deps\n\n  // ── Non-interactive: flags required; probe; persist. No prompts, no handoff. ──\n  if (!deps.isTTY) {\n    if (!opts.cpUrl) throw new Error('login requires --cp-url <url>')\n    if (!opts.cpKey) throw new Error('login requires --cp-key <key>')\n    const r = await deps.probe({ url: opts.cpUrl, token: opts.cpKey })\n    if (!r.ok) throw new Error(`authentication failed: ${r.reason}`)\n    persistCredentials({ ...opts, cpUrl: opts.cpUrl, cpKey: opts.cpKey })\n    out.write(`✓ authenticated${r.daemonId ? ` (daemon ${r.daemonId})` : ''} — credentials saved\\n`)\n    return\n  }\n\n  // Both interactive handoffs read `<root>/config.json`: the installed service\n  // runs `… run` (no `--config`), and the foreground `Daemon` loads by root. A\n  // custom `--config` would persist credentials the daemon never reads, so the\n  // install/run branch would look successful but start without them. Reject it;\n  // `--root` is the knob that keeps persist + service + foreground in sync.\n  if (opts.configPath) {\n    throw new Error(\n      'interactive login does not support --config — use --root <dir> so the daemon and the installed service read the same config'\n    )\n  }\n\n  // ── Interactive ──\n  const rl = createInterface({ input: deps.input, output: out })\n  const iter = rl[Symbol.asyncIterator]()\n  let url = opts.cpUrl\n  let token = opts.cpKey\n  try {\n    if (!url) url = await nextLine(iter, 'Control Plane URL: ', out)\n\n    for (let attempt = 0; ; attempt++) {\n      if (!token) token = await nextLine(iter, 'Daemon API key: ', out)\n      out.write(`Testing connection to ${url}…\\n`)\n      const r = await deps.probe({ url: url!, token: token! })\n      if (r.ok) {\n        out.write(`✓ authenticated${r.daemonId ? ` (daemon ${r.daemonId})` : ''}\\n`)\n        break\n      }\n      out.write(`✗ ${r.reason}\\n`)\n      if (attempt >= 1) throw new Error('authentication failed')\n      token = undefined // re-prompt on retry\n    }\n\n    persistCredentials({ ...opts, cpUrl: url!, cpKey: token! })\n\n    const ans = (await nextLine(iter, 'Install AgentConnect as a background service? (y/N) ', out)).toLowerCase()\n    if (ans === 'y' || ans === 'yes') {\n      await deps.installService()\n      out.write('Service installed and started. Manage it with `agentconnect up` / `down` / `status`.\\n')\n      return\n    }\n    out.write('Starting in the foreground (Ctrl-C to stop)…\\n')\n  } finally {\n    rl.close()\n  }\n\n  await deps.runForeground()\n}\n"],"mappings":"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"}
+{"version":3,"file":"login-BPKCyqR_.js","names":["realRunForeground"],"sources":["../src/cp/auth-probe.ts","../src/cli/login.ts"],"sourcesContent":["/**\n * `probeAuth` — a one-shot CP auth check used by `agentconnect login`. It dials\n * the CP, sends ONLY the `auth` frame (no `register`), and resolves with the\n * authoritative daemonId from `auth/ok`, or a human-readable failure reason on\n * a `4401` close, a correlated `error`, a dial failure, or a timeout. It always\n * closes the socket and never leaves a connection open.\n */\nimport { buildEnvelope, decodeEnvelope, encode, isFrame } from '@agentconnect.md/protocol'\nimport { ClientTransport, type Transport } from '@agentconnect.md/connection'\nimport { CP_SUBPROTOCOL, CP_WS_PATH } from './client.js'\n\nexport interface ProbeResult {\n  ok: boolean\n  daemonId?: string\n  reason?: string\n}\n\nexport interface ProbeOpts {\n  url: string\n  token: string\n  daemonId?: string\n  agentVersion?: string\n  timeoutMs?: number\n  /** Injectable for tests; defaults to dialing the real WebSocket. */\n  connect?: () => Promise<Transport>\n}\n\nexport async function probeAuth(opts: ProbeOpts): Promise<ProbeResult> {\n  const timeoutMs = opts.timeoutMs ?? 10_000\n  const dial = opts.connect ?? (() => ClientTransport.dial(opts.url, { subprotocol: CP_SUBPROTOCOL, path: CP_WS_PATH }))\n\n  let transport: Transport\n  try {\n    transport = await dial()\n  } catch (err) {\n    return { ok: false, reason: `cannot reach ${opts.url}: ${(err as Error).message}` }\n  }\n\n  const authPayload: Record<string, unknown> = {\n    apiKey: opts.token,\n    agentVersion: opts.agentVersion ?? 'probe'\n  }\n  if (opts.daemonId) authPayload.daemonId = opts.daemonId\n  const frame = buildEnvelope('auth', authPayload)\n\n  return await new Promise<ProbeResult>((resolve) => {\n    let settled = false\n    const done = (r: ProbeResult): void => {\n      if (settled) return\n      settled = true\n      clearTimeout(timer)\n      try {\n        transport.close(1000, 'probe done')\n      } catch {\n        // socket may already be closed\n      }\n      resolve(r)\n    }\n\n    const timer = setTimeout(\n      () => done({ ok: false, reason: `timed out after ${timeoutMs}ms waiting for auth/ok` }),\n      timeoutMs\n    )\n\n    transport.onMessage((text) => {\n      const decoded = decodeEnvelope(text)\n      if (!decoded.ok) return\n      const f = decoded.frame\n      if (f.corr !== frame.id) return\n      if (f.type === 'error') {\n        const e = f.payload as { code: string; message: string }\n        done({ ok: false, reason: `${e.code}: ${e.message}` })\n        return\n      }\n      if (isFrame('auth/ok')(f)) {\n        const ok = f.payload as { daemonId: string }\n        done({ ok: true, daemonId: ok.daemonId })\n      }\n    })\n\n    transport.onClose((code) => {\n      if (code === 4401) done({ ok: false, reason: 'authentication failed (4401) — check the daemon token' })\n      else done({ ok: false, reason: `connection closed (${code}) before auth/ok` })\n    })\n\n    transport.send(encode(frame))\n  })\n}\n","/**\n * `agentconnect login` — interactive onboarding. It tests the Control Plane auth\n * flow, persists credentials only on success, then offers to install the OS\n * service. If installed it starts the service (`up`) and returns; otherwise it\n * runs the daemon in the foreground (the same path as `agentconnect run`).\n *\n * `persistCredentials` is the pure config-merge half (token-only onboarding:\n * `daemonId` is omitted unless given — the first connect adopts it from the\n * token's `sub`). `runLogin` is the orchestrator, with injectable deps for tests.\n */\nimport { readFileSync, existsSync, writeFileSync, mkdirSync } from 'node:fs'\nimport { dirname } from 'node:path'\nimport { createInterface } from 'node:readline'\nimport { fileURLToPath } from 'node:url'\nimport { ConfigSchema } from '../config/config-schema.js'\nimport { resolveRoot, configPath } from '../paths.js'\nimport { DAEMON_VERSION } from '../version.js'\nimport { probeAuth, type ProbeResult } from '../cp/auth-probe.js'\nimport { resolveController, type InstallOpts } from '../service/index.js'\nimport { runForeground as realRunForeground } from './run-foreground.js'\n\nexport interface PersistCredsOpts {\n  cpUrl: string\n  cpKey: string\n  daemonId?: string\n  root?: string\n  configPath?: string\n}\n\n/** Merge url/token into config.json (validated), returning the written path. */\nexport function persistCredentials(opts: PersistCredsOpts): string {\n  const root = resolveRoot(opts.root)\n  const file = opts.configPath ?? configPath(root)\n  const raw: Record<string, unknown> = existsSync(file) ? JSON.parse(readFileSync(file, 'utf8')) : { version: 1 }\n\n  const cp = (raw.controlPlane as Record<string, unknown> | undefined) ?? {}\n  raw.controlPlane = { ...cp, url: opts.cpUrl, key: opts.cpKey, enabled: true }\n  if (opts.daemonId) raw.daemonId = opts.daemonId\n\n  ConfigSchema.parse(raw) // fail before writing if the merge is invalid\n\n  mkdirSync(dirname(file), { recursive: true })\n  writeFileSync(file, JSON.stringify(raw, null, 2) + '\\n')\n  return file\n}\n\nexport interface RunLoginOpts {\n  cpUrl?: string\n  cpKey?: string\n  daemonId?: string\n  root?: string\n  configPath?: string\n  /** The resolved CLI entry path. Must be supplied by the CLI entry point\n   *  (index.ts) so the correct bundle path is used rather than inferring it\n   *  from login.ts's own import.meta.url (which is the same bundle but the\n   *  `../` path calculation would be wrong). Falls back to import.meta.url\n   *  for the pure test path where login.ts is loaded standalone. */\n  cliEntry?: string\n}\n\n/**\n * Build the InstallOpts for the OS service installer.\n *\n * Exported as a pure helper so it can be unit-tested independently of the\n * full `runLogin` orchestration. The caller (index.ts) passes `cliEntry` so\n * the correct bundle path always flows through; if omitted we fall back to\n * `import.meta.url` (correct only when login.ts is the entry, e.g. in tests).\n */\nexport function buildInstallOpts(opts: { root?: string; cliEntry?: string }): InstallOpts {\n  return {\n    execPath: process.execPath,\n    cliEntry: opts.cliEntry ?? fileURLToPath(import.meta.url),\n    includeRootEnv: resolveRoot(opts.root) !== resolveRoot(undefined)\n  }\n}\n\nexport interface LoginDeps {\n  probe: (o: { url: string; token: string }) => Promise<ProbeResult>\n  installService: () => Promise<void>\n  runForeground: () => Promise<void>\n  out: NodeJS.WritableStream\n  input: NodeJS.ReadableStream\n  isTTY: boolean\n}\n\nfunction realDeps(opts: RunLoginOpts): LoginDeps {\n  return {\n    probe: (o) => probeAuth({ url: o.url, token: o.token, agentVersion: DAEMON_VERSION }),\n    installService: async () => {\n      const controller = resolveController({ root: opts.root })\n      await controller.install(buildInstallOpts(opts))\n      await controller.up()\n    },\n    runForeground: () =>\n      realRunForeground({\n        root: opts.root,\n        overrides: { cpUrl: opts.cpUrl, cpKey: opts.cpKey, daemonId: opts.daemonId }\n      }),\n    out: process.stdout,\n    input: process.stdin,\n    isTTY: Boolean(process.stdin.isTTY)\n  }\n}\n\n/** Read the next line from a readline interface via async iterator. */\nasync function nextLine(\n  iter: AsyncIterableIterator<string>,\n  prompt: string,\n  out: NodeJS.WritableStream\n): Promise<string> {\n  out.write(prompt)\n  const { value, done } = await iter.next()\n  if (done) throw new Error(`unexpected end of input waiting for: ${prompt}`)\n  return (value as string).trim()\n}\n\nexport async function runLogin(opts: RunLoginOpts, partial: Partial<LoginDeps> = {}): Promise<void> {\n  const deps: LoginDeps = { ...realDeps(opts), ...partial }\n  const { out } = deps\n\n  // ── Non-interactive: flags required; probe; persist. No prompts, no handoff. ──\n  if (!deps.isTTY) {\n    if (!opts.cpUrl) throw new Error('login requires --cp-url <url>')\n    if (!opts.cpKey) throw new Error('login requires --cp-key <key>')\n    const r = await deps.probe({ url: opts.cpUrl, token: opts.cpKey })\n    if (!r.ok) throw new Error(`authentication failed: ${r.reason}`)\n    persistCredentials({ ...opts, cpUrl: opts.cpUrl, cpKey: opts.cpKey })\n    out.write(`✓ authenticated${r.daemonId ? ` (daemon ${r.daemonId})` : ''} — credentials saved\\n`)\n    return\n  }\n\n  // Both interactive handoffs read `<root>/config.json`: the installed service\n  // runs `… run` (no `--config`), and the foreground `Daemon` loads by root. A\n  // custom `--config` would persist credentials the daemon never reads, so the\n  // install/run branch would look successful but start without them. Reject it;\n  // `--root` is the knob that keeps persist + service + foreground in sync.\n  if (opts.configPath) {\n    throw new Error(\n      'interactive login does not support --config — use --root <dir> so the daemon and the installed service read the same config'\n    )\n  }\n\n  // ── Interactive ──\n  const rl = createInterface({ input: deps.input, output: out })\n  const iter = rl[Symbol.asyncIterator]()\n  let url = opts.cpUrl\n  let token = opts.cpKey\n  try {\n    if (!url) url = await nextLine(iter, 'Control Plane URL: ', out)\n\n    for (let attempt = 0; ; attempt++) {\n      if (!token) token = await nextLine(iter, 'Daemon API key: ', out)\n      out.write(`Testing connection to ${url}…\\n`)\n      const r = await deps.probe({ url: url!, token: token! })\n      if (r.ok) {\n        out.write(`✓ authenticated${r.daemonId ? ` (daemon ${r.daemonId})` : ''}\\n`)\n        break\n      }\n      out.write(`✗ ${r.reason}\\n`)\n      if (attempt >= 1) throw new Error('authentication failed')\n      token = undefined // re-prompt on retry\n    }\n\n    persistCredentials({ ...opts, cpUrl: url!, cpKey: token! })\n\n    const ans = (await nextLine(iter, 'Install AgentConnect as a background service? (y/N) ', out)).toLowerCase()\n    if (ans === 'y' || ans === 'yes') {\n      await deps.installService()\n      out.write('Service installed and started. Manage it with `agentconnect up` / `down` / `status`.\\n')\n      return\n    }\n    out.write('Starting in the foreground (Ctrl-C to stop)…\\n')\n  } finally {\n    rl.close()\n  }\n\n  await deps.runForeground()\n}\n"],"mappings":"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"}

package/dist/{run-foreground-1y1IF3Dc.js → run-foreground-BBBkQ93M.js}

@@ -213861,6 +213861,26 @@ function formatErr(err) {
 	return e?.stack ?? String(err);
 }
 const MAX_QUEUED_PER_SESSION = 10;
+/** Thrown to a `dispatch()` caller when the per-session admission queue is at its depth
+*  cap (§4.4 backpressure): the message is fast-failed, not buffered. Carries a stable
+*  `reason` so an agent-call source (P1/P2) can surface a typed `queue_full`. */
+var QueueFullError = class extends Error {
+	reason = "queue_full";
+	constructor(sessionKey) {
+		super(`admission queue full for session ${sessionKey}`);
+		this.name = "QueueFullError";
+	}
+};
+/** Thrown to the `dispatch()` callers of the messages still queued behind a turn that
+*  FAILED (§6.9 #378 fail-stop): the daemon does not auto-run buffered work onto a broken
+*  session, so each follow-up is rejected rather than silently dropped or force-run. */
+var FailStopError = class extends Error {
+	reason = "fail_stop";
+	constructor(sessionKey) {
+		super(`turn failed for session ${sessionKey}; queued messages were not auto-run`);
+		this.name = "FailStopError";
+	}
+};
 const SELECT_KIND_CODE = {
 	model: "m",
 	effort: "e",
@@ -214871,8 +214891,10 @@ var Daemon = class Daemon {
 	*  NO mute) shared by the Slack status-bar Cancel button. No-op if nothing is running. */
 	cancelSessionByKey(key) {
 		const rec = this.store.getSession(key);
-		if (!rec?.acpSessionId || !this.pending.has(rec.acpSessionId)) return;
-		this.interruptTurn(rec.agentId, rec.acpSessionId, key, "cancel");
+		if (!this.inflight.has(key)) return;
+		const agentId = rec?.agentId ?? this.serialQueue.get(key)?.[0]?.agentId;
+		if (!agentId) return;
+		this.interruptTurn(agentId, key, "cancel", rec?.acpSessionId ?? void 0);
 	}
 	/** Switch a session's reasoning effort by its local key — the effort counterpart of
 	*  {@link setModelByKey}. Records the sticky override and, if the ACP session is warm,
@@ -214944,9 +214966,16 @@ var Daemon = class Daemon {
 	*  Resolved by conversationId (the op carries no agentId). No-op when idle. */
 	handleWebchatCancel(conversationId) {
 		for (const [acpSessionId, p] of this.pending) if (p.webchat?.conversationId === conversationId) {
-			this.interruptTurn(p.agentId, acpSessionId, p.sessionKey, "cancel");
+			this.interruptTurn(p.agentId, p.sessionKey, "cancel", acpSessionId);
 			return;
 		}
+		for (const [key, entries] of this.serialQueue) {
+			const hit = entries.find((e) => e.webchat?.conversationId === conversationId);
+			if (hit) {
+				this.interruptTurn(hit.agentId, key, "cancel");
+				return;
+			}
+		}
 		this.log.debug(`webchat cancel: no in-flight turn for conversation ${conversationId}`);
 	}
 	relayMsgAcks = /* @__PURE__ */ new Map();
@@ -215308,7 +215337,8 @@ var Daemon = class Daemon {
 			};
 		});
 	}
-	queued = /* @__PURE__ */ new Map();
+	inflight = /* @__PURE__ */ new Set();
+	serialQueue = /* @__PURE__ */ new Map();
 	/**
 	* Resolve a command's target from the channel's latest session when the routing ladder
 	* couldn't (no mention entity / thread / dm rule matched — e.g. a group `/status@bot`).
@@ -215357,7 +215387,7 @@ var Daemon = class Daemon {
 			}
 		}
 		const acpSessionId = rec?.acpSessionId;
-		const inflight = !!(acpSessionId && this.pending.has(acpSessionId));
+		const inflight = this.inflight.has(key);
 		const tgReplyTo = this.telegramReplyTarget(msg);
 		const reply = (text) => {
 			if (!conn) return;
@@ -215371,7 +215401,7 @@ var Daemon = class Daemon {
 				reply(rec ? `🔇 Nothing is running. ${muteNote}` : "Nothing is running to stop.");
 				return;
 			}
-			this.interruptTurn(target.agentId, acpSessionId, key, "stop");
+			this.interruptTurn(target.agentId, key, "stop", acpSessionId ?? void 0);
 			reply(`🛑 Stopped. ${muteNote}`);
 			return;
 		}
@@ -215380,7 +215410,7 @@ var Daemon = class Daemon {
 				reply("Nothing is running to cancel.");
 				return;
 			}
-			this.interruptTurn(target.agentId, acpSessionId, key, "cancel");
+			this.interruptTurn(target.agentId, key, "cancel", acpSessionId ?? void 0);
 			reply("🛑 Cancelled.");
 			return;
 		}
@@ -215446,21 +215476,23 @@ var Daemon = class Daemon {
 			text: command.text,
 			thread
 		};
-		if (!inflight) {
-			this.log.info(`command: queue → agent "${target.agentId}" idle, dispatching now`);
-			this.dispatch(target.agentId, payload, target.integrationId).catch((err) => this.log.error(`queued dispatch failed for agent "${target.agentId}": ${err.stack ?? err}`));
-			return;
-		}
-		const q = this.queued.get(acpSessionId) ?? [];
-		if (q.length >= MAX_QUEUED_PER_SESSION) {
-			this.log.warn(`command: queue → agent "${target.agentId}" session ${acpSessionId} full (${q.length}), rejected`);
+		if (inflight && (this.serialQueue.get(key)?.length ?? 0) >= MAX_QUEUED_PER_SESSION) {
+			this.log.warn(`command: queue → agent "${target.agentId}" session ${key} full, rejected`);
 			reply(`Queue is full (${MAX_QUEUED_PER_SESSION} pending) — wait for the current turn to finish.`);
 			return;
 		}
-		q.push(payload);
-		this.queued.set(acpSessionId, q);
-		this.log.info(`command: queue → agent "${target.agentId}" session ${acpSessionId} (depth ${q.length})`);
-		reply(`📥 Queued (#${q.length}) — will run when the current turn finishes.`);
+		this.dispatch(target.agentId, payload, target.integrationId, void 0, void 0, { isQueueCmd: true }).catch((err) => {
+			if (err instanceof QueueFullError) return;
+			this.log.error(`queued dispatch failed for agent "${target.agentId}": ${err.stack ?? err}`);
+		});
+		if (!inflight) {
+			this.log.info(`command: queue → agent "${target.agentId}" idle, dispatching now`);
+			reply(`▶️ Running now — the session was idle.`);
+		} else {
+			const depth = this.serialQueue.get(key)?.length ?? 0;
+			this.log.info(`command: queue → agent "${target.agentId}" session ${key} (depth ${depth})`);
+			reply(`📥 Queued (#${depth}) — will run when the current turn finishes.`);
+		}
 	}
 	selectLabel(kind) {
 		return kind === "model" ? "Model" : kind === "effort" ? "Reasoning effort" : "Permission mode";
@@ -215591,15 +215623,6 @@ var Daemon = class Daemon {
 			acpSessionId: latest.acpSessionId ?? void 0
 		};
 	}
-	/** Drain one buffered message for a session whose turn just finished (FIFO). */
-	flushQueued(agentId, sessionId, integrationId) {
-		const q = this.queued.get(sessionId);
-		if (!q || q.length === 0) return;
-		const next = q.shift();
-		if (q.length === 0) this.queued.delete(sessionId);
-		this.log.info(`queue: dispatching buffered message to agent "${agentId}" session ${sessionId} (${q.length} left)`);
-		this.dispatch(agentId, next, integrationId).catch((err) => this.log.error(`queued dispatch failed for agent "${agentId}": ${err.stack ?? err}`));
-	}
 	/** Local layer (agent.json) ∪ resolved CP layer; unservable CP rules are dropped + warn-logged. */
 	mergedRules() {
 		const local = [...this.agents.values()].flatMap((a) => rulesFromAgent(a, this.botUserIds));
@@ -215646,21 +215669,116 @@ var Daemon = class Daemon {
 			ctx.replyConn.postMessage(ctx.channel, `⚠️ Agent failed to respond: ${reason}`, ctx.thread);
 		}
 	}
-	async dispatch(agentId, msg, integrationId, webchat, callMeta) {
-		if (this.draining || this.drainingAgents.has(agentId)) {
-			this.log.debug(`dispatch: skipped for agent "${agentId}" (draining)`);
-			return null;
+	/**
+	* Terminate a QUEUED entry's webchat sink when it is gate-dropped/rejected without ever
+	* entering dispatchOne (drain/pause gate-drop, fail-stop of the queued rest, `!cancel`/`!stop`
+	* queue drop, shutdown). A webchat turn signals its client via the WebchatSink terminal
+	* `done` frame, NOT the dispatch() promise — so settling the promise alone leaves the browser
+	* UI spinning forever. Mirrors surfaceTurnFailure's webchat branch. No-op for non-webchat
+	* entries. Pass an `error` for reject/cancel/shutdown; omit it for a clean gate-drop.
+	*/
+	terminateQueuedSink(entry, error) {
+		if (!entry.webchat) return;
+		entry.webchat.sink.done({
+			conversationId: entry.webchat.conversationId,
+			turnId: entry.webchat.turnId,
+			...error ? { error } : {}
+		});
+	}
+	dispatch(agentId, msg, integrationId, webchat, callMeta, opts) {
+		return new Promise((resolve, reject) => {
+			if (this.draining || this.drainingAgents.has(agentId)) {
+				this.log.debug(`dispatch: skipped for agent "${agentId}" (draining)`);
+				resolve(null);
+				return;
+			}
+			if (this.agents.get(agentId).pause) {
+				this.log.info(`dispatch: skipped for agent "${agentId}" (paused)`);
+				resolve(null);
+				return;
+			}
+			const key = sessionKey(msg.platform, msg.channel, msg.thread ?? msg.msgId, agentId);
+			const entry = {
+				agentId,
+				msg,
+				...integrationId !== void 0 ? { integrationId } : {},
+				...webchat ? { webchat } : {},
+				...callMeta ? { callMeta } : {},
+				...opts?.isQueueCmd ? { isQueueCmd: true } : {},
+				resolve,
+				reject
+			};
+			if (this.inflight.has(key)) {
+				const q = this.serialQueue.get(key) ?? [];
+				if (q.length >= MAX_QUEUED_PER_SESSION) {
+					this.log.warn(`dispatch: queue full for session ${key} (${q.length}) — rejecting (queue_full)`);
+					reject(new QueueFullError(key));
+					return;
+				}
+				q.push(entry);
+				this.serialQueue.set(key, q);
+				this.log.debug(`dispatch: queued behind in-flight turn for session ${key} (depth ${q.length})`);
+				return;
+			}
+			this.inflight.add(key);
+			this.runLoop(key, entry);
+		});
+	}
+	/**
+	* Own a sessionKey's serial gate: run its head turn to completion, settle that entry's
+	* own promise, then drain the queue in FIFO order WITHOUT releasing ownership between
+	* turns (§6.9 #390 — deleting `inflight` then dequeuing would reopen the FIFO race).
+	* Ownership is released only once the queue is confirmed empty in the same synchronous
+	* tick. Fail-stop is the default (§6.9 #378): if a turn throws, the rest of the queue is
+	* NOT auto-run — each remaining entry is rejected with a notice and the queue cleared,
+	* so buffered work never chains onto a broken session.
+	*/
+	paused(agentId) {
+		return this.agents.get(agentId)?.pause === true;
+	}
+	async runLoop(key, firstEntry) {
+		let entry = firstEntry;
+		while (entry) {
+			if (entry !== firstEntry && (this.draining || this.drainingAgents.has(entry.agentId) || this.paused(entry.agentId))) {
+				this.terminateQueuedSink(entry);
+				entry.resolve(null);
+				const rest = this.serialQueue.get(key) ?? [];
+				this.serialQueue.delete(key);
+				for (const e of rest) {
+					this.terminateQueuedSink(e);
+					e.resolve(null);
+				}
+				this.inflight.delete(key);
+				return;
+			}
+			try {
+				const sessionId = await this.dispatchOne(entry, key);
+				entry.resolve(sessionId);
+			} catch (err) {
+				entry.reject(err);
+				const rest = this.serialQueue.get(key) ?? [];
+				this.serialQueue.delete(key);
+				for (const e of rest) {
+					const failStop = new FailStopError(key);
+					this.terminateQueuedSink(e, failStop.message);
+					e.reject(failStop);
+				}
+				this.inflight.delete(key);
+				return;
+			}
+			const q = this.serialQueue.get(key);
+			entry = q?.shift();
+			if (q && q.length === 0) this.serialQueue.delete(key);
 		}
+		this.inflight.delete(key);
+	}
+	async dispatchOne(entry, key) {
+		const { agentId, msg, integrationId, webchat, callMeta } = entry;
 		const agent = this.agents.get(agentId);
-		if (agent.pause) {
-			this.log.info(`dispatch: skipped for agent "${agentId}" (paused)`);
-			return null;
-		}
 		const rec = new TranscriptRecorder();
 		const replyConn = msg.headless || webchat ? void 0 : this.replyConnFor(agentId, integrationId);
 		const wasRunning = this.hostStarts.has(agentId);
 		const statusThread = msg.thread ?? msg.msgId;
-		const key = sessionKey(msg.platform, msg.channel, statusThread, agentId);
 		const mode = this.store.getOutputModeOverride(key) ?? agent.output.mode;
 		const conv = msg.platform === "telegram" ? new TelegramConverger(mode) : msg.platform === "discord" ? new DiscordConverger(mode) : new OutputConverger(mode);
 		this.showActivity(replyConn, msg.channel, statusThread, wasRunning ? "is thinking…" : "is starting up…");
@@ -215799,18 +215917,28 @@ var Daemon = class Daemon {
 			this.clearCancelBackstop(sessionId);
 			p.resolveDone();
 		}
-		this.flushQueued(agentId, sessionId, integrationId);
 		return sessionId;
 	}
-	/** Interrupt an in-flight turn (shared by `!stop`, `!cancel`, and webchat cancel):
-	*  drop anything queued behind it, mark the session `cancelling`, send ACP
-	*  `session/cancel`, and arm the force backstop. Muting is the CALLER's concern —
-	*  `!stop` mutes, `!cancel`/webchat-cancel do not. `reason` is just for the log line. */
-	interruptTurn(agentId, acpSessionId, key, reason) {
-		this.queued.delete(acpSessionId);
+	/** Interrupt a session by its LOGICAL sessionKey (shared by `!stop`, `!cancel`, and
+	*  webchat cancel): reject+drop anything queued behind it in the serial gate, then — if
+	*  a turn is actually in flight (ACP session live) — release any unanswered cards, mark
+	*  it `cancelling`, send ACP `session/cancel`, and arm the force backstop. Works for a
+	*  queued-but-not-yet-started or cold session too (§6.9 #390): draining the queue is
+	*  enough, no ACP id required. Muting is the CALLER's concern — `!stop` mutes,
+	*  `!cancel`/webchat-cancel do not. */
+	interruptTurn(agentId, key, reason, acpSessionId) {
+		const queued = this.serialQueue.get(key);
+		if (queued && queued.length > 0) {
+			this.serialQueue.delete(key);
+			for (const e of queued) {
+				this.terminateQueuedSink(e, reason);
+				e.reject(new FailStopError(key));
+			}
+		}
+		this.log.info(`command: ${reason} → agent "${agentId}" session ${key}${acpSessionId ? ` (${acpSessionId})` : ""}`);
+		if (!acpSessionId || !this.pending.has(acpSessionId)) return;
 		this.releasePermissions(acpSessionId);
 		this.releaseElicits(acpSessionId);
-		this.log.info(`command: ${reason} → agent "${agentId}" session ${acpSessionId}`);
 		this.store.setSessionState(key, "cancelling", this.clock.now());
 		this.hosts.get(agentId)?.cancel(acpSessionId).catch((err) => this.log.error(`command ${reason}: cancel failed: ${err.message}`));
 		this.armCancelBackstop(agentId, acpSessionId, key);
@@ -216723,13 +216851,24 @@ var Daemon = class Daemon {
 	async drainForShutdown() {
 		this.draining = true;
 		const live = [...this.pending.values()];
-		if (live.length === 0) return;
-		const deadlineMs = this.cfg.limits.shutdownDrainMs;
-		this.log.info(`shutdown: draining ${live.length} in-flight turn(s) (deadline ${Math.round(deadlineMs / 1e3)}s)`);
-		if (await this.raceDeadline(Promise.all(live.map((p) => p.done)), deadlineMs) === "timeout") {
-			this.log.warn(`shutdown: deadline hit with ${this.pending.size} turn(s) still in flight — cancelling`);
-			for (const [sid, p] of this.pending) await this.hosts.get(p.agentId)?.cancel(sid).catch(() => {});
+		if (live.length > 0) {
+			const deadlineMs = this.cfg.limits.shutdownDrainMs;
+			this.log.info(`shutdown: draining ${live.length} in-flight turn(s) (deadline ${Math.round(deadlineMs / 1e3)}s)`);
+			if (await this.raceDeadline(Promise.all(live.map((p) => p.done)), deadlineMs) === "timeout") {
+				this.log.warn(`shutdown: deadline hit with ${this.pending.size} turn(s) still in flight — cancelling`);
+				for (const [sid, p] of this.pending) await this.hosts.get(p.agentId)?.cancel(sid).catch(() => {});
+			}
+		}
+		this.settleQueuedForShutdown();
+	}
+	/** Reject and clear every entry still in the serial gate's queues (shutdown/teardown),
+	*  so no admitted-but-unrun message leaves an unsettled dispatch() promise. */
+	settleQueuedForShutdown() {
+		for (const [key, entries] of this.serialQueue) for (const e of entries) {
+			this.terminateQueuedSink(e, "daemon shutting down");
+			e.reject(new FailStopError(key));
 		}
+		this.serialQueue.clear();
 	}
 	/** daemon/restart + daemon/upgrade (§8.3): ack now, then drain + stop + exit so
 	*  the supervisor relaunches (the new binary, for upgrade). */
@@ -217133,4 +217272,4 @@ async function runForeground(opts, deps = {}) {
 //#endregion
 export { ClientTransport as i, CP_SUBPROTOCOL as n, CP_WS_PATH as r, runForeground as t };
 
-//# sourceMappingURL=run-foreground-1y1IF3Dc.js.map
+//# sourceMappingURL=run-foreground-BBBkQ93M.js.map