@wrongstack/core 0.283.0 → 0.284.0

package/dist/execution/prompt-enhancer.d.ts

@@ -1,4 +1,4 @@
-import { P as Provider, R as ReasoningRequest, a as ReasoningConfig, M as Message } from '../tool-LVSLiE1s.js';
+import { P as Provider, R as ReasoningRequest, a as ReasoningConfig, M as Message } from '../tool-BNlnIJvo.js';
 
 /**
  * Prompt refinement ("did you mean this?").

package/dist/extension/index.d.ts

@@ -1,10 +1,10 @@
-export { j as AfterIterationHook, k as AfterRunHook, l as AfterToolExecutionHook, i as AgentExtension, B as BeforeIterationHook, m as BeforeRunHook, n as BeforeToolExecutionHook, E as ExtensionRegistry, O as OnErrorHook, v as ProviderRunnerFn, t as ProviderRunnerWrapper } from '../index-BhCteHAF.js';
-import '../tool-LVSLiE1s.js';
+export { k as AfterIterationHook, l as AfterRunHook, m as AfterToolExecutionHook, j as AgentExtension, B as BeforeIterationHook, n as BeforeRunHook, o as BeforeToolExecutionHook, E as ExtensionRegistry, O as OnErrorHook, w as ProviderRunnerFn, u as ProviderRunnerWrapper } from '../index--Gm41aBJ.js';
+import '../tool-BNlnIJvo.js';
 import '../logger-B63L5bTg.js';
-import '../pipeline-ixSFe5jg.js';
+import '../pipeline-DGDyIohT.js';
 import '../mailbox-types-BGZWrYTJ.js';
-import '../config-DkCbA3Bw.js';
-import '../permission-B6YAtNFz.js';
+import '../config-MRqn1V-u.js';
+import '../permission-ByDKXEcG.js';
 import '../observability-D-HZN_mF.js';
-import '../events-KmxSmvho.js';
+import '../events-Bgnh43r9.js';
 import '../secret-scrubber-3MHDDAtm.js';

package/dist/{global-mailbox-rWVt8YlO.d.ts → global-mailbox-sZwyI6CS.d.ts}

@@ -1,5 +1,5 @@
 import { M as MailboxMessage, a as MailboxAgentStatus, b as Mailbox, c as MailboxSendInput, d as MailboxQuery, e as MailboxAckInput, f as MailboxAckBatchInput, A as AgentRegistrationInput, g as AgentHeartbeatInput, C as ClientRegistrationInput, h as ClientHeartbeatInput, i as ClientStatus, P as PurgeOptions, j as PurgeResult } from './mailbox-types-BGZWrYTJ.js';
-import { E as EventBus } from './events-KmxSmvho.js';
+import { E as EventBus } from './events-Bgnh43r9.js';
 
 declare const HQ_PROTOCOL_VERSION: 1;
 type HqProtocolVersion = typeof HQ_PROTOCOL_VERSION;
@@ -230,7 +230,7 @@ interface HqSessionSnapshotPayload {
     agentCount: number;
     agents: readonly HqSessionAgentSummary[];
 }
-type HqTranscriptRole = 'user' | 'assistant' | 'tool' | 'system' | 'error';
+type HqTranscriptRole = 'user' | 'assistant' | 'thinking' | 'tool' | 'system' | 'error';
 /** One rendered conversation turn. Canonical shape shared by client streaming
  * and server-side JSONL replay so both planes agree. */
 interface HqTranscriptEntry {
@@ -622,6 +622,14 @@ interface HqPublisherOptions {
     } | undefined;
     /** Dormant re-check interval while `resolveEndpoint` yields nothing. Default 5s. */
     discoveryPollMs?: number;
+    /**
+     * Diagnostic sink for the one-time consecutive-connect-failure warning.
+     * The publisher is otherwise deliberately silent (dormant queueing), which
+     * made auth failures invisible: a token the server rejects — e.g. a wrong
+     * `WRONGSTACK_HQ_TOKEN` against a remote HQ — looked exactly like "HQ not
+     * running". Defaults to a single structured `console.warn` line.
+     */
+    warn?: (message: string) => void;
 }
 interface HqPublishEventOptions {
     type: HqEventType | (string & {});
@@ -645,6 +653,8 @@ declare class HqPublisher {
     private queue;
     private stopped;
     private reconnectAttempt;
+    private connectWarningEmitted;
+    private lastAttempt;
     private reconnectTimer;
     private commandPollTimer;
     private lastCommandId;
@@ -705,6 +715,7 @@ declare class HqPublisher {
     private extractMessageData;
     private handleCommandBatch;
     private scheduleReconnect;
+    private emitConnectWarning;
     /**
      * Dormant re-check while no HQ endpoint is discoverable. Uses a FIXED
      * interval (not the exponential reconnect backoff): the check is a cheap

package/dist/{goal-store-8owBXJT2.d.ts → goal-store-Datpp-ar.d.ts}

@@ -1,4 +1,4 @@
-import { E as EventBus } from './events-KmxSmvho.js';
+import { E as EventBus } from './events-Bgnh43r9.js';
 
 /**
  * Long-running autonomous mission. A goal survives across sessions and

package/dist/hq/index.d.ts

@@ -1,10 +1,10 @@
-import { $ as HqRedactionPolicy, t as HqEventEnvelope, W as HqPublisher, p as HqClientIdentity, ac as HqSocketFactory, i as HqClientCapability, X as HqPublisherCommandHandler, G as GlobalMailbox, ab as HqSnapshot, _ as HqQueuedCommand, c as HqAlertMessage, aj as HqTranscriptEntry } from '../global-mailbox-rWVt8YlO.js';
-export { D as DEFAULT_HQ_REDACTION_POLICY, H as HQ_PROTOCOL_VERSION, a as HqAgentMessagePayload, b as HqAgentStatusPayload, d as HqBrainEventKind, e as HqBrainEventPayload, f as HqBrowserEventMessage, g as HqBrowserMessage, h as HqBrowserSnapshotMessage, j as HqClientCommandAckMessage, k as HqClientCommandPollMessage, l as HqClientEventMessage, m as HqClientHeartbeatPayload, n as HqClientHelloMessage, o as HqClientHelloPayload, q as HqClientKind, r as HqClientMessage, s as HqClientRecord, u as HqEventPayloadResult, v as HqEventType, w as HqFleetEventPayload, x as HqFleetSnapshotPayload, y as HqFleetSummary, z as HqGitSnapshotPayload, A as HqMachineRecord, B as HqMailboxAgentStatus, C as HqMailboxAgentSummary, E as HqMailboxEventAction, F as HqMailboxEventPayload, I as HqMailboxMappingOptions, J as HqMailboxMessageSummary, K as HqMailboxMessageType, L as HqMailboxPriority, M as HqMailboxSnapshotOptions, N as HqMailboxSnapshotPayload, O as HqMailboxSummary, P as HqParseResult, Q as HqPathPolicy, R as HqProjectIdentity, S as HqProjectRecord, T as HqProjectStatus, U as HqProtocolVersion, V as HqPublishEventOptions, Y as HqPublisherCommandResult, Z as HqPublisherOptions, a0 as HqServerCommandBatchMessage, a1 as HqServerMessage, a2 as HqSessionAgentLiveStatus, a3 as HqSessionAgentSummary, a4 as HqSessionEndedPayload, a5 as HqSessionLiveStatus, a6 as HqSessionSnapshotPayload, a7 as HqSessionStartedPayload, a8 as HqSessionStatus, a9 as HqSessionStatusPayload, aa as HqSessionSummary, ad as HqSocketLike, ae as HqSubagentSummary, af as HqToolArgsPolicy, ag as HqToolCompletedPayload, ah as HqToolStartedPayload, ai as HqTranscriptAppendPayload, ak as HqTranscriptRole, al as HqUsagePayload, am as HqWelcomePayload, an as HqWorklistCounts, ao as HqWorklistSnapshotPayload, ap as HqWorkspaceKind, aq as HqWorktreeEventKind, ar as HqWorktreeEventPayload, as as createHqEventEnvelope, at as createMailboxEventPayload, au as createMailboxSnapshotPayload, av as createMailboxSnapshotPayloadFromMailbox, aw as mapMailboxAgentToHqSummary, ax as mapMailboxMessageToHqSummary, ay as parseHqEventPayload, az as parseHqFrame } from '../global-mailbox-rWVt8YlO.js';
-import { E as EventBus, T as TrackedAgentSnapshot } from '../events-KmxSmvho.js';
-import { K as HqClientConfig } from '../config-DkCbA3Bw.js';
+import { $ as HqRedactionPolicy, t as HqEventEnvelope, W as HqPublisher, p as HqClientIdentity, ac as HqSocketFactory, i as HqClientCapability, X as HqPublisherCommandHandler, G as GlobalMailbox, ab as HqSnapshot, _ as HqQueuedCommand, c as HqAlertMessage, aj as HqTranscriptEntry } from '../global-mailbox-sZwyI6CS.js';
+export { D as DEFAULT_HQ_REDACTION_POLICY, H as HQ_PROTOCOL_VERSION, a as HqAgentMessagePayload, b as HqAgentStatusPayload, d as HqBrainEventKind, e as HqBrainEventPayload, f as HqBrowserEventMessage, g as HqBrowserMessage, h as HqBrowserSnapshotMessage, j as HqClientCommandAckMessage, k as HqClientCommandPollMessage, l as HqClientEventMessage, m as HqClientHeartbeatPayload, n as HqClientHelloMessage, o as HqClientHelloPayload, q as HqClientKind, r as HqClientMessage, s as HqClientRecord, u as HqEventPayloadResult, v as HqEventType, w as HqFleetEventPayload, x as HqFleetSnapshotPayload, y as HqFleetSummary, z as HqGitSnapshotPayload, A as HqMachineRecord, B as HqMailboxAgentStatus, C as HqMailboxAgentSummary, E as HqMailboxEventAction, F as HqMailboxEventPayload, I as HqMailboxMappingOptions, J as HqMailboxMessageSummary, K as HqMailboxMessageType, L as HqMailboxPriority, M as HqMailboxSnapshotOptions, N as HqMailboxSnapshotPayload, O as HqMailboxSummary, P as HqParseResult, Q as HqPathPolicy, R as HqProjectIdentity, S as HqProjectRecord, T as HqProjectStatus, U as HqProtocolVersion, V as HqPublishEventOptions, Y as HqPublisherCommandResult, Z as HqPublisherOptions, a0 as HqServerCommandBatchMessage, a1 as HqServerMessage, a2 as HqSessionAgentLiveStatus, a3 as HqSessionAgentSummary, a4 as HqSessionEndedPayload, a5 as HqSessionLiveStatus, a6 as HqSessionSnapshotPayload, a7 as HqSessionStartedPayload, a8 as HqSessionStatus, a9 as HqSessionStatusPayload, aa as HqSessionSummary, ad as HqSocketLike, ae as HqSubagentSummary, af as HqToolArgsPolicy, ag as HqToolCompletedPayload, ah as HqToolStartedPayload, ai as HqTranscriptAppendPayload, ak as HqTranscriptRole, al as HqUsagePayload, am as HqWelcomePayload, an as HqWorklistCounts, ao as HqWorklistSnapshotPayload, ap as HqWorkspaceKind, aq as HqWorktreeEventKind, ar as HqWorktreeEventPayload, as as createHqEventEnvelope, at as createMailboxEventPayload, au as createMailboxSnapshotPayload, av as createMailboxSnapshotPayloadFromMailbox, aw as mapMailboxAgentToHqSummary, ax as mapMailboxMessageToHqSummary, ay as parseHqEventPayload, az as parseHqFrame } from '../global-mailbox-sZwyI6CS.js';
+import { E as EventBus, T as TrackedAgentSnapshot } from '../events-Bgnh43r9.js';
+import { V as HqClientConfig } from '../config-MRqn1V-u.js';
 import '../mailbox-types-BGZWrYTJ.js';
-import '../tool-LVSLiE1s.js';
-import '../permission-B6YAtNFz.js';
+import '../tool-BNlnIJvo.js';
+import '../permission-ByDKXEcG.js';
 
 interface HqRedactOptions {
     policy?: Partial<HqRedactionPolicy>;
@@ -607,7 +607,7 @@ declare function createHqPersistence(dataDir: string): HqPersistence;
  */
 
 /** HQ_COMMAND_TYPES — the full set of recognized command `type` strings. */
-declare const HQ_COMMAND_TYPES: readonly ["steer", "abort", "spawn", "broadcast", "run-command"];
+declare const HQ_COMMAND_TYPES: readonly ["steer", "btw", "queue", "abort", "spawn", "broadcast", "run-command"];
 type HqCommandType = (typeof HQ_COMMAND_TYPES)[number];
 /** Inject a steer text into a target agent's conversation. */
 interface HqSteerCommand {
@@ -618,6 +618,32 @@ interface HqSteerCommand {
     body: string;
     priority?: 'low' | 'normal' | 'high';
 }
+/**
+ * Post a non-urgent FYI (`btw`) into a target agent's mailbox. Unlike a steer,
+ * a btw is absorbed as context — it does not demand the agent change course.
+ * Same wire shape as steer; only the emitted mailbox `type` differs.
+ */
+interface HqBtwCommand {
+    type: 'btw';
+    /** Target agent address: a unique id (`leader@<tag>`), an alias (`leader`), or `*` for all. */
+    to: string;
+    subject: string;
+    body: string;
+    priority?: 'low' | 'normal' | 'high';
+}
+/**
+ * Queue a prompt/note (`queue`) for a target agent. Delivered as a plain
+ * `note` mailbox message the agent picks up before its next step — used when
+ * the prompt should wait its turn rather than steer the current operation.
+ */
+interface HqQueueCommand {
+    type: 'queue';
+    /** Target agent address: a unique id (`leader@<tag>`), an alias (`leader`), or `*` for all. */
+    to: string;
+    subject: string;
+    body: string;
+    priority?: 'low' | 'normal' | 'high';
+}
 /** Abort a running agent run or fleet. */
 interface HqAbortCommand {
     type: 'abort';
@@ -646,7 +672,7 @@ interface HqRunCommandCommand {
     /** Optional working directory (defaults to the agent's project root). */
     cwd?: string;
 }
-type HqCommand = HqSteerCommand | HqAbortCommand | HqSpawnCommand | HqBroadcastCommand | HqRunCommandCommand;
+type HqCommand = HqSteerCommand | HqBtwCommand | HqQueueCommand | HqAbortCommand | HqSpawnCommand | HqBroadcastCommand | HqRunCommandCommand;
 /**
  * Validate that an inbound `HqQueuedCommand` has a recognized `type` and a
  * minimally well-formed payload. Returns the narrowed command on success, or
@@ -787,4 +813,4 @@ declare function mergeToolResults(flat: readonly HqTranscriptEntry[]): HqTranscr
  */
 declare function buildTranscriptFromEvents(events: Iterable<Record<string, unknown>>): HqTranscriptEntry[];
 
-export { type AgentMonitorEventBridgeOptions, type BrainTelemetryBridgeOptions, type CostTelemetryBridgeOptions, type CreateGlobalMailboxOptions, type CreateHqPublisherOptions, type EnsureHqFirstRunAuthResult, type FleetTelemetryBridgeOptions, HQ_AUTH_FILE_VERSION, HQ_COMMAND_TYPES, type HqAbortCommand, type HqAgentEventPublisher, type HqAlert, HqAlertEngine, HqAlertMessage, type HqAlertRuleConfig, type HqAlertSeverity, type HqAuthFile, type HqBroadcastCommand, type HqBrowserToken, HqClientCapability, HqClientIdentity, type HqCommand, type HqCommandAuditEntry, HqCommandAuditLog, type HqCommandType, HqEventEnvelope, HqEventLog, type HqEventLogOptions, type HqPersistence, HqPublisher, HqPublisherCommandHandler, type HqPublisherEnvConfig, HqQueuedCommand, type HqRedactOptions, HqRedactionPolicy, type HqRedactionResult, type HqRunCommandCommand, type HqRuntimeFile, HqSnapshot, HqSnapshotStore, type HqSnapshotStoreOptions, HqSocketFactory, type HqSpawnCommand, type HqSteerCommand, type HqTimeseriesSample, HqTimeseriesStore, type HqTimeseriesStoreOptions, type HqToken, HqTranscriptEntry, type SessionTelemetryBridgeOptions, type ToolTelemetryBridgeOptions, type WorktreeTelemetryBridgeOptions, buildTranscriptFromEvents, createGlobalMailbox, createHqPersistence, createHqPublisherFromEnv, defaultHqDataDir, discoverLocalHqEndpoint, emptyHqAuthFile, ensureHqFirstRunAuthFile, hqAuthFilePath, hqRuntimeFilePath, mapSessionEventToEntries, mergeToolResults, mintHqBrowserToken, mintHqToken, mutateHqAuthFile, readHqAuthFile, readHqRuntimeFileSync, redactHqEvent, redactHqValue, resolveHqConfig, resolveHqConfigFromEnv, resolveHqDataDir, scrubAndTruncateHqPreview, startAgentMonitorEventBridge, startBrainTelemetryBridge, startCostTelemetryBridge, startFleetTelemetryBridge, startSessionTelemetryBridge, startToolTelemetryBridge, startWorktreeTelemetryBridge, summarizeHqToolArgs, toAlertMessage, tokenHasCapability, validateHqCommand, watchHqAuthFile, writeHqAuthFile, writeHqRuntimeFile };
+export { type AgentMonitorEventBridgeOptions, type BrainTelemetryBridgeOptions, type CostTelemetryBridgeOptions, type CreateGlobalMailboxOptions, type CreateHqPublisherOptions, type EnsureHqFirstRunAuthResult, type FleetTelemetryBridgeOptions, HQ_AUTH_FILE_VERSION, HQ_COMMAND_TYPES, type HqAbortCommand, type HqAgentEventPublisher, type HqAlert, HqAlertEngine, HqAlertMessage, type HqAlertRuleConfig, type HqAlertSeverity, type HqAuthFile, type HqBroadcastCommand, type HqBrowserToken, type HqBtwCommand, HqClientCapability, HqClientIdentity, type HqCommand, type HqCommandAuditEntry, HqCommandAuditLog, type HqCommandType, HqEventEnvelope, HqEventLog, type HqEventLogOptions, type HqPersistence, HqPublisher, HqPublisherCommandHandler, type HqPublisherEnvConfig, type HqQueueCommand, HqQueuedCommand, type HqRedactOptions, HqRedactionPolicy, type HqRedactionResult, type HqRunCommandCommand, type HqRuntimeFile, HqSnapshot, HqSnapshotStore, type HqSnapshotStoreOptions, HqSocketFactory, type HqSpawnCommand, type HqSteerCommand, type HqTimeseriesSample, HqTimeseriesStore, type HqTimeseriesStoreOptions, type HqToken, HqTranscriptEntry, type SessionTelemetryBridgeOptions, type ToolTelemetryBridgeOptions, type WorktreeTelemetryBridgeOptions, buildTranscriptFromEvents, createGlobalMailbox, createHqPersistence, createHqPublisherFromEnv, defaultHqDataDir, discoverLocalHqEndpoint, emptyHqAuthFile, ensureHqFirstRunAuthFile, hqAuthFilePath, hqRuntimeFilePath, mapSessionEventToEntries, mergeToolResults, mintHqBrowserToken, mintHqToken, mutateHqAuthFile, readHqAuthFile, readHqRuntimeFileSync, redactHqEvent, redactHqValue, resolveHqConfig, resolveHqConfigFromEnv, resolveHqDataDir, scrubAndTruncateHqPreview, startAgentMonitorEventBridge, startBrainTelemetryBridge, startCostTelemetryBridge, startFleetTelemetryBridge, startSessionTelemetryBridge, startToolTelemetryBridge, startWorktreeTelemetryBridge, summarizeHqToolArgs, toAlertMessage, tokenHasCapability, validateHqCommand, watchHqAuthFile, writeHqAuthFile, writeHqRuntimeFile };

package/dist/hq/index.js

@@ -191,7 +191,14 @@ function isHqSessionSnapshotPayload(x) {
   }
   return true;
 }
-var HQ_TRANSCRIPT_ROLES = /* @__PURE__ */ new Set(["user", "assistant", "tool", "system", "error"]);
+var HQ_TRANSCRIPT_ROLES = /* @__PURE__ */ new Set([
+  "user",
+  "assistant",
+  "thinking",
+  "tool",
+  "system",
+  "error"
+]);
 function isHqTranscriptEntry(x) {
   if (typeof x !== "object" || x === null) return false;
   const v = x;
@@ -817,6 +824,7 @@ function createMailboxEventPayload(input) {
   };
 }
 var OPEN_STATE = 1;
+var CONNECT_WARN_AFTER_FAILURES = 5;
 var DEFAULT_RECONNECT_BASE_MS = 1e3;
 var DEFAULT_RECONNECT_MAX_MS = 3e4;
 var DEFAULT_DISCOVERY_POLL_MS = 5e3;
@@ -884,6 +892,8 @@ var HqPublisher = class {
   queue = [];
   stopped = false;
   reconnectAttempt = 0;
+  connectWarningEmitted = false;
+  lastAttempt = null;
   reconnectTimer = null;
   commandPollTimer = null;
   lastCommandId;
@@ -901,6 +911,7 @@ var HqPublisher = class {
       url = endpoint.url;
       token = endpoint.token ?? token;
     }
+    this.lastAttempt = { url, hadToken: token !== void 0 };
     let socket;
     try {
       socket = this.socketFactory(toClientUrl(url, token), {
@@ -1162,12 +1173,32 @@ var HqPublisher = class {
     if (this.stopped || !this.reconnect || this.reconnectTimer !== null) return;
     const delay = Math.min(this.reconnectMaxMs, this.reconnectBaseMs * 2 ** this.reconnectAttempt);
     this.reconnectAttempt += 1;
+    if (!this.connectWarningEmitted && this.reconnectAttempt >= CONNECT_WARN_AFTER_FAILURES) {
+      this.connectWarningEmitted = true;
+      this.emitConnectWarning();
+    }
     this.reconnectTimer = setTimeout(() => {
       this.reconnectTimer = null;
       this.connect();
     }, delay);
     this.reconnectTimer.unref?.();
   }
+  emitConnectWarning() {
+    const attempt = this.lastAttempt;
+    const message = `WrongStack HQ publisher: ${this.reconnectAttempt} consecutive connection failures${attempt !== null ? ` to ${attempt.url} (client token ${attempt.hadToken ? "present" : "absent"})` : ""}. Either the HQ server is unreachable or it rejected the token (401). If HQ runs in client-token mode, verify WRONGSTACK_HQ_TOKEN / auth.json. Retries continue with backoff.`;
+    const warn = this.options.warn ?? ((msg) => console.warn(
+      JSON.stringify({
+        level: "warn",
+        event: "hq.publisher.connect_failed",
+        message: msg,
+        timestamp: this.now()
+      })
+    ));
+    try {
+      warn(message);
+    } catch {
+    }
+  }
   /**
    * Dormant re-check while no HQ endpoint is discoverable. Uses a FIXED
    * interval (not the exponential reconnect backoff): the check is a cheap
@@ -2521,6 +2552,14 @@ function readFirstClientTokenFromAuthFile(dataDir) {
     return void 0;
   }
 }
+function isLoopbackHqUrl(url) {
+  try {
+    const host = new URL(url).hostname.toLowerCase();
+    return host === "127.0.0.1" || host === "localhost" || host === "::1" || host === "[::1]" || host === "0.0.0.0";
+  } catch {
+    return false;
+  }
+}
 function resolveHqConfigFromEnv(env = process.env) {
   return resolveHqConfig({ env });
 }
@@ -2534,9 +2573,11 @@ function resolveHqConfig(options = {}) {
   const envEnabledRaw = env["WRONGSTACK_HQ_ENABLED"]?.trim();
   const enabled = envEnabledRaw !== void 0 && envEnabledRaw.length > 0 ? envEnabledRaw !== "0" : fileConfig?.enabled;
   const dataDir = resolveHqDataDir(fileConfig?.dataDir, env);
-  const token = envToken || configToken || readFirstClientTokenFromAuthFile(dataDir);
+  const explicitToken = envToken || configToken;
   const runtimeUrl = readHqRuntimeFileSync(dataDir)?.url.trim();
   const url = envUrl || configUrl;
+  const localFallbackToken = !url || isLoopbackHqUrl(url) ? readFirstClientTokenFromAuthFile(dataDir) : void 0;
+  const token = explicitToken || localFallbackToken;
   if (!url) {
     if (enabled === false) return void 0;
     return {
@@ -2616,7 +2657,7 @@ function startAgentMonitorEventBridge(opts) {
     seq.current += 1;
     return seq.current;
   }
-  function buildEnvelope(type, payload) {
+  function buildEnvelope(type, payload, sessionId) {
     return createHqEventEnvelope({
       id: `${Date.now().toString(36)}-${nextSeq()}`,
       type,
@@ -2624,7 +2665,11 @@ function startAgentMonitorEventBridge(opts) {
       clientId,
       projectId,
       seq: nextSeq(),
-      payload
+      payload,
+      // Carry the parent session id so HQ can scope per-agent transcripts by
+      // (sessionId, subagentId) — without it, two sessions whose leaders both
+      // use the default id 'leader' would collide into one shared ring.
+      ...sessionId !== void 0 ? { sessionId } : {}
     });
   }
   const offMessage = events.on("agent.timeline.message", (payload) => {
@@ -2639,7 +2684,7 @@ function startAgentMonitorEventBridge(opts) {
     };
     if (payload.toolName !== void 0) msgPayload.toolName = payload.toolName;
     if (payload.costUsd !== void 0) msgPayload.costUsd = payload.costUsd;
-    publish(buildEnvelope("agent.message", msgPayload));
+    publish(buildEnvelope("agent.message", msgPayload, payload.sessionId));
   });
   const offStatus = events.on("agent.status_changed", (payload) => {
     if (!publish) return;
@@ -2702,9 +2747,15 @@ function mapSessionEventToEntries(ev) {
     }
     case "llm_response": {
       const out = [];
-      const t = blocksToText(ev["content"]);
-      if (t.trim()) out.push(make("assistant", t));
       const content = ev["content"];
+      if (Array.isArray(content)) {
+        const thinking = content.filter(
+          (b) => !!b && typeof b === "object" && b.type === "thinking" && typeof b.thinking === "string"
+        ).map((b) => b.thinking).join("\n");
+        if (thinking.trim()) out.push(make("thinking", thinking));
+      }
+      const t = blocksToText(content);
+      if (t.trim()) out.push(make("assistant", t));
       if (Array.isArray(content)) {
         for (const b of content) {
           if (b && typeof b === "object" && b.type === "tool_use") {
@@ -3542,6 +3593,8 @@ function createHqPersistence(dataDir) {
 // src/hq/commands.ts
 var HQ_COMMAND_TYPES = [
   "steer",
+  "btw",
+  "queue",
   "abort",
   "spawn",
   "broadcast",
@@ -3563,6 +3616,26 @@ function validateHqCommand(queued) {
       }
       return result;
     }
+    case "btw": {
+      if (typeof p["to"] !== "string" || typeof p["subject"] !== "string" || typeof p["body"] !== "string") {
+        return null;
+      }
+      const result = { type: "btw", to: p["to"], subject: p["subject"], body: p["body"] };
+      if (p["priority"] === "low" || p["priority"] === "normal" || p["priority"] === "high") {
+        result.priority = p["priority"];
+      }
+      return result;
+    }
+    case "queue": {
+      if (typeof p["to"] !== "string" || typeof p["subject"] !== "string" || typeof p["body"] !== "string") {
+        return null;
+      }
+      const result = { type: "queue", to: p["to"], subject: p["subject"], body: p["body"] };
+      if (p["priority"] === "low" || p["priority"] === "normal" || p["priority"] === "high") {
+        result.priority = p["priority"];
+      }
+      return result;
+    }
     case "abort":
       if (typeof p["target"] !== "string") return null;
       return { type: "abort", target: p["target"] };