@wrongstack/cli 1.1.5 → 1.1.6

package/dist/{acp-NKUEYJDZ.js → acp-CZBSFQB7.js}

@@ -4,13 +4,13 @@ import {
   loadCachedAcpRegistry,
   refreshAcpRegistry,
   setupProvider
-} from "./chunk-M7FNHCE3.js";
+} from "./chunk-EAATL6FL.js";
 import {
   createHqCommandDispatcher,
   wrongstackBridgeSetup
-} from "./chunk-5SGMUDP5.js";
+} from "./chunk-QRWXHGLB.js";
 import "./chunk-3LEIFO5D.js";
-import "./chunk-VEESMPTX.js";
+import "./chunk-PGC44T7N.js";
 import {
   startCliHqConnection
 } from "./chunk-76JE54WD.js";
@@ -18,7 +18,7 @@ import {
   WebSocketServer
 } from "./chunk-OZCYZYN2.js";
 import "./chunk-UFRVTBV6.js";
-import "./chunk-LUEO5HLZ.js";
+import "./chunk-X4DEQLAZ.js";
 import "./chunk-HKMOIIPQ.js";
 import "./chunk-W23PY4IJ.js";
 
@@ -1205,4 +1205,4 @@ parallel:
 export {
   acpCmd
 };
-//# sourceMappingURL=acp-NKUEYJDZ.js.map
+//# sourceMappingURL=acp-CZBSFQB7.js.map

package/dist/acp-leader/acp-leader-host.d.ts

@@ -40,6 +40,13 @@ export interface AcpLeaderHost {
     runTool(name: string, input: Record<string, unknown>, run?: {
         sessionId?: string | undefined;
         approve?: ((tool: Tool, input: Record<string, unknown>) => Promise<boolean>) | undefined;
+        /**
+         * Settle the call's tool card here: no tool_result reaches the
+         * conversation, and the caller's own stream does not draw one (the
+         * WrongForge leader's `wstack_*` calls). An ACP agent reports its fleet
+         * calls itself, so its cards come from its stream instead.
+         */
+        announce?: boolean | undefined;
     }): Promise<{
         content: string;
         isError: boolean;

package/dist/acp-leader/acp-leader-provider.d.ts

@@ -1,6 +1,15 @@
 import type { AgentContextUsage, Capabilities, Config, Provider, ProviderFactory, Request, Response, StreamEvent } from '@wrongstack/core/types';
 import { ACP_LEADER_PROVIDER_ID } from './acp-leader-host.js';
 export { ACP_LEADER_PROVIDER_ID };
+/**
+ * The side model the user set for an agent leader (`acp.leader.sideModel`),
+ * without falling back to the fallback chain: a leader that can answer side
+ * requests itself (WrongForge) must not hand them to `fallbackModels[0]`.
+ */
+export declare function explicitLeaderSideModel(config: Config): {
+    provider: string;
+    model: string;
+} | undefined;
 export declare function leaderSideModel(config: Config): {
     provider: string;
     model: string;
@@ -58,6 +67,7 @@ export declare class AcpLeaderProvider implements Provider {
     private observeContext;
     private publishContext;
     private loadAcp;
+    private dropFleetGrants;
     private drop;
     /** The persistent agent session for this conversation, started on first use. */
     private sessionFor;

package/dist/acp-leader/acp-leader-skills.d.ts

@@ -0,0 +1,5 @@
+/** The WrongStack `skill` tool as an agent sees it on this route, if offered. */
+export declare function externalSkillLoader(offered: readonly string[] | undefined, prefix: string): string | undefined;
+/** `text` with its required-skills marker rewritten for an agent leader. */
+export declare function externalSkillDirective(text: string, loader: string | undefined): string;
+//# sourceMappingURL=acp-leader-skills.d.ts.map

package/dist/acp-leader/acp-leader-stream.d.ts

@@ -34,6 +34,13 @@ export declare class TextBlocks {
     text(chunk: string): void;
     close(): void;
 }
+interface CardOutput {
+    output: string;
+    fullOutput?: string | undefined;
+    outputBytes: number;
+}
+/** A card's output fields for a result text that no tool_result will carry. */
+export declare function cardOutputForText(text: string): CardOutput;
 /**
  * The agent's own tool calls as the host's tool cards: `tool.started` once a
  * call is announced, `tool.executed` once it settles. Named by the agent's
@@ -80,4 +87,5 @@ export declare function agentTurnError(err: unknown, agentId: string, classify:
     error: ProviderError;
     dead: boolean;
 };
+export {};
 //# sourceMappingURL=acp-leader-stream.d.ts.map

package/dist/{chunk-M7FNHCE3.js → chunk-EAATL6FL.js}

@@ -3,7 +3,7 @@ import {
   reportWrongForgeQuota,
   writeWrongForgeInfoCache,
   wrongstackBridgeSetup
-} from "./chunk-5SGMUDP5.js";
+} from "./chunk-QRWXHGLB.js";
 import {
   isRestrictedMode
 } from "./chunk-3LEIFO5D.js";
@@ -21,7 +21,7 @@ import {
   toProgress,
   wfTokens,
   wrongForgeCall
-} from "./chunk-VEESMPTX.js";
+} from "./chunk-PGC44T7N.js";
 import {
   buildProviderForId,
   resolveProviderCfgWithProxy
@@ -30,7 +30,7 @@ import {
   ACP_LEADER_PROVIDER_ID,
   acpLeaderHost,
   trackAcpLeader
-} from "./chunk-LUEO5HLZ.js";
+} from "./chunk-X4DEQLAZ.js";
 
 // src/acp-agent-list.ts
 import { REGISTRY_ID_ALIASES } from "@wrongstack/acp";
@@ -569,6 +569,7 @@ function publishLeaderContext(events, sessionId, reading, fallbackMaxContext) {
 
 // src/acp-leader/acp-leader-fleet.ts
 import { randomBytes } from "node:crypto";
+import { toErrorMessage as toErrorMessage2 } from "@wrongstack/core/utils";
 import { MCPServer, serveHttp } from "@wrongstack/mcp";
 var FLEET_SERVER_NAME = "wrongstack-fleet";
 var FLEET_TOOLS = [
@@ -579,7 +580,10 @@ var FLEET_TOOLS = [
   "roll_up",
   "fleet_status",
   "session_note",
-  "terminate_subagent"
+  "terminate_subagent",
+  // Not a fleet tool, but it too must run in this process: WrongStack's
+  // skills (a /bughunt playbook) reach the agent only through it.
+  "skill"
 ];
 var MCP_PREFIX = `mcp__${FLEET_SERVER_NAME}__`;
 function fleetToolName(mcpName) {
@@ -605,7 +609,11 @@ async function startFleetEndpoint(host, run) {
         if (!offered.has(name)) {
           return { content: `Tool "${name}" is not offered here`, isError: true };
         }
-        return run ? host.runTool(name, args, run) : host.runTool(name, args);
+        try {
+          return await (run ? host.runTool(name, args, run) : host.runTool(name, args));
+        } catch (err) {
+          return { content: `Failed to execute ${name}: ${toErrorMessage2(err)}`, isError: true };
+        }
       }
     }
   });
@@ -631,7 +639,11 @@ function fleetNote(tools) {
     ...has("fleet_status") ? ["- fleet_status: what is running and its progress."] : [],
     ...has("roll_up") ? ["- roll_up: the full result of finished tasks."] : [],
     ...has("session_note") ? ["- session_note: steer a running worker."] : [],
-    ...has("terminate_subagent") ? ["- terminate_subagent: stop a worker."] : []
+    ...has("terminate_subagent") ? ["- terminate_subagent: stop a worker."] : [],
+    ...has("skill") ? [
+      "- skill: load one of WrongStack's skills by name (follow nextOffset to the last page);",
+      "  a task that names WrongStack skills means these."
+    ] : []
   ].join("\n");
 }
 
@@ -674,9 +686,28 @@ function writeLeaderSession(stateDir, sessionId, record) {
   return writing.catch(() => void 0);
 }
 
+// src/acp-leader/acp-leader-skills.ts
+import { parseRequiredSkillsMarker } from "@wrongstack/core/skills";
+var MARKERS = /<!--\s*wrongstack:required-skills\s+[\s\S]*?-->/g;
+function externalSkillLoader(offered, prefix) {
+  return offered?.includes("skill") ? `${prefix}skill` : void 0;
+}
+function externalSkillDirective(text, loader) {
+  const skills = parseRequiredSkillsMarker(text);
+  if (!skills) return text;
+  const list = skills.join(", ");
+  const line = loader ? `[WrongStack] This task's playbook skills: ${list}. They are WrongStack skills: load each with the \`${loader}\` tool, following nextOffset to the last page, before changing code. Where the text below names the \`skill\` tool or a $name, it means that tool and these skills.` : `[WrongStack] This task's playbook skills: ${list}. This route offers no WrongStack skill tool: load them with your own skill tool if you have them, otherwise follow the protocol below without them.`;
+  let first = true;
+  return text.replace(MARKERS, () => {
+    if (!first) return "";
+    first = false;
+    return line;
+  });
+}
+
 // src/acp-leader/acp-leader-stream.ts
 import { ProviderError } from "@wrongstack/core/types";
-import { toErrorMessage as toErrorMessage2 } from "@wrongstack/core/utils";
+import { toErrorMessage as toErrorMessage3 } from "@wrongstack/core/utils";
 var StreamQueue = class {
   items = [];
   wake;
@@ -742,10 +773,7 @@ function clip(text, max) {
   if (last >= 55296 && last <= 56319) end -= 1;
   return `${text.slice(0, end)}\u2026`;
 }
-function cardOutput(call) {
-  const raw = call.rawOutput;
-  const text = call.output ?? (raw ? typeof raw.output === "string" ? raw.output : JSON.stringify(raw) : void 0);
-  if (text === void 0) return void 0;
+function cardOutputForText(text) {
   const output = clip(text, OUTPUT_PREVIEW_CHARS);
   return {
     output,
@@ -754,6 +782,12 @@ function cardOutput(call) {
     outputBytes: Buffer.byteLength(text)
   };
 }
+function cardOutput(call) {
+  const raw = call.rawOutput;
+  const text = call.output ?? (raw ? typeof raw.output === "string" ? raw.output : JSON.stringify(raw) : void 0);
+  if (text === void 0) return void 0;
+  return cardOutputForText(text);
+}
 var ToolCardRelay = class {
   constructor(events, meta) {
     this.events = events;
@@ -886,7 +920,7 @@ function agentTurnError(err, agentId, classify) {
     };
   }
   const kind = err?.kind;
-  const message = `${agentId}: ${toErrorMessage2(err)}`;
+  const message = `${agentId}: ${toErrorMessage3(err)}`;
   if (kind === "stalled") {
     return {
       error: new ProviderError(message, 408, false, "acp", { kind: "timeout", cause: err }),
@@ -941,8 +975,11 @@ function parseSideModel(ref) {
   if (provider === ACP_LEADER_PROVIDER_ID) return void 0;
   return { provider, model: ref.slice(slash + 1) };
 }
+function explicitLeaderSideModel(config) {
+  return parseSideModel(config.acp?.leader?.sideModel);
+}
 function leaderSideModel(config) {
-  return parseSideModel(config.acp?.leader?.sideModel) ?? parseSideModel(config.fallbackBridge) ?? parseSideModel(config.fallbackModels?.[0]);
+  return explicitLeaderSideModel(config) ?? parseSideModel(config.fallbackBridge) ?? parseSideModel(config.fallbackModels?.[0]);
 }
 function isLeaderTurn(req) {
   const { sessionId, threadId } = req.cache ?? {};
@@ -1060,7 +1097,10 @@ var AcpLeaderProvider = class {
   }
   /** The turn's prompt; an agent joining a conversation under way gets the turns before it. */
   promptText(leader, req) {
-    const latest = latestUserText(req.messages);
+    const latest = externalSkillDirective(
+      latestUserText(req.messages),
+      externalSkillLoader(leader.fleet?.tools, `mcp__${FLEET_SERVER_NAME}__`)
+    );
     const earlier = leader.joined ? void 0 : earlierConversation(req.messages);
     leader.joined = true;
     const prompt = earlier ? `${earlier}
@@ -1136,8 +1176,20 @@ ${withNotes}` : withNotes;
     this.acp ??= await import("@wrongstack/acp");
     return this.acp;
   }
+  dropFleetGrants(sessionId) {
+    for (const grantKey of this.fleetGrants.keys()) {
+      try {
+        const parsed = JSON.parse(grantKey);
+        if (Array.isArray(parsed) && parsed[0] === sessionId) {
+          this.fleetGrants.delete(grantKey);
+        }
+      } catch {
+      }
+    }
+  }
   drop(key, leader) {
     this.sessions.delete(key);
+    this.dropFleetGrants(key);
     void leader.session.close().catch(() => {
     });
     void leader.fleet?.close().catch(() => {
@@ -1312,6 +1364,7 @@ ${fleetNote(fleet.tools)}` : "")
   async closeAll() {
     const all = [...this.sessions.values()];
     this.sessions.clear();
+    this.fleetGrants.clear();
     await Promise.all(
       all.map(
         (p) => p.then((leader) => {
@@ -1371,7 +1424,7 @@ import { registerBuiltinProviderAuthStrategies } from "@wrongstack/providers/oau
 // src/wrongforge-leader/wrongforge-leader-provider.ts
 import { consumeBtwNotes as consumeBtwNotes3 } from "@wrongstack/core/agent";
 import { ProviderError as ProviderError3 } from "@wrongstack/core/types";
-import { toErrorMessage as toErrorMessage4 } from "@wrongstack/core/utils";
+import { toErrorMessage as toErrorMessage5 } from "@wrongstack/core/utils";
 
 // src/wrongforge-leader/wrongforge-leader-gateway.ts
 import { randomBytes as randomBytes2 } from "node:crypto";
@@ -1379,7 +1432,7 @@ import http from "node:http";
 import {
   compactToolDefinitionForWire,
   subjectForToolInput as subjectForToolInput2,
-  toErrorMessage as toErrorMessage3
+  toErrorMessage as toErrorMessage4
 } from "@wrongstack/core/utils";
 import { timingSafeTokenEqual } from "@wrongstack/primitives";
 var NOT_OFFERED = /* @__PURE__ */ new Set([
@@ -1475,14 +1528,17 @@ async function startLeaderGateway(host, sessionId) {
       }
       host.runTool(name, input, {
         sessionId,
-        approve: (t, i) => askUser(host, sessionId, t, i)
+        approve: (t, i) => askUser(host, sessionId, t, i),
+        // The provider draws no card for a `wstack_*` call (its events are
+        // marked external), so the session's card is settled here.
+        announce: true
       }).then(
         (r) => send(res, 200, { ok: !r.isError, tool: name, content: r.content }),
         (err) => send(res, 200, {
           ok: false,
           tool: name,
           error: "tool_failed",
-          message: toErrorMessage3(err)
+          message: toErrorMessage4(err)
         })
       );
     });
@@ -1582,7 +1638,7 @@ function providerError(err, id) {
     if (err.status >= 500) return make(err.message, err.status, true, "server");
     return make(`${err.code}: ${err.message}`, err.status, false, "invalid_request");
   }
-  return make(toErrorMessage4(err), 0, false, "unknown");
+  return make(toErrorMessage5(err), 0, false, "unknown");
 }
 function taskError(record, id) {
   const make = (message, status, retryable, kind) => new ProviderError3(`WrongForge: ${message}`, status, retryable, id, { kind });
@@ -1657,19 +1713,27 @@ var WrongForgeLeaderProvider = class {
     }
     return choice.id;
   }
-  /** A configured side model, when the user named one. */
-  sideProvider() {
-    const ref = leaderSideModel(this.config());
+  /**
+   * A side model for a turn WrongForge does not lead. `explicitOnly` (a side
+   * request through `complete()`) takes only the model the user named in
+   * `acp.leader.sideModel`: WrongForge answers those itself (`oneShot`), and
+   * handing them to `fallbackModels[0]` let that model take over the session.
+   * A worker's turn may still fall back to the fallback chain, since `oneShot`
+   * would leave it without tools.
+   */
+  sideProvider(explicitOnly = false) {
+    const config = this.config();
+    const ref = explicitOnly ? explicitLeaderSideModel(config) : leaderSideModel(config);
     if (!ref || ref.provider === this.id) return void 0;
     let provider = this.sideProviders.get(ref.provider);
     if (!provider) {
-      provider = this.opts.buildProvider(ref.provider, this.config());
+      provider = this.opts.buildProvider(ref.provider, config);
       if (provider) this.sideProviders.set(ref.provider, provider);
     }
     return provider ? { provider, model: ref.model } : void 0;
   }
   async complete(req, opts) {
-    const side = this.sideProvider();
+    const side = this.sideProvider(true);
     if (side) return side.provider.complete({ ...req, model: side.model }, opts);
     return this.oneShot(req, opts.signal);
   }
@@ -1739,8 +1803,16 @@ var WrongForgeLeaderProvider = class {
     try {
       info = await this.info(call, opts.signal);
       model = this.model(req.model, info);
-      if (host) leader.gateway ??= startLeaderGateway(host, key).catch(() => void 0);
+      if (host && !leader.gateway) {
+        leader.gateway = startLeaderGateway(host, key).catch(() => {
+          leader.gateway = void 0;
+          return void 0;
+        });
+      }
       gateway = await leader.gateway;
+      if (!gateway) {
+        leader.gateway = void 0;
+      }
       joinedBefore = leader.joined ?? await this.wfSessionExists(call, leader, opts.signal);
     } catch (err) {
       throw providerError(err, this.id);
@@ -1764,7 +1836,7 @@ var WrongForgeLeaderProvider = class {
         "POST",
         "/v1/tasks",
         {
-          prompt: this.promptText(req, joinedBefore),
+          prompt: this.promptText(req, joinedBefore, gateway),
           session_id: leader.wfSessionId,
           workdir: host?.projectRoot ?? process.cwd(),
           ...model ? { model } : {},
@@ -1780,6 +1852,10 @@ var WrongForgeLeaderProvider = class {
       );
       taskId = task.id;
       leader.joined = true;
+      if (opts.signal.aborted) {
+        cancelTask(call, taskId, "interrupted in WrongStack");
+        throw new WfAborted();
+      }
       for await (const ev of followTask(call, task.id, opts.signal)) {
         if (ev.type === "task.heartbeat" || ev.type === "step.finished") {
           void reportWrongForgeQuota({ providerId: this.id, fetchImpl: this.opts.fetchImpl });
@@ -1831,8 +1907,11 @@ var WrongForgeLeaderProvider = class {
     }
   }
   /** The turn's prompt; WrongForge joining a conversation under way gets the turns before it. */
-  promptText(req, joined) {
-    const latest = latestUserText(req.messages);
+  promptText(req, joined, gateway) {
+    const latest = externalSkillDirective(
+      latestUserText(req.messages),
+      gateway ? externalSkillLoader(gateway.tools, gateway.spec.name_prefix ?? "") : void 0
+    );
     const earlier = joined ? void 0 : earlierConversation(req.messages);
     const prompt = earlier ? `${earlier}
 
@@ -2043,7 +2122,7 @@ Try \`wstack models refresh\` once you have network access.`,
       cause: err
     });
   }
-  if (config.features.modelsRegistry && !acpLeader) {
+  if (config.features.modelsRegistry && !acpLeader && !wrongForgeLeader) {
     provider = await withCatalogCapabilities(
       modelsRegistry,
       config.provider,
@@ -2062,9 +2141,10 @@ export {
   wrongstackAcpPermissionPolicy,
   recordAcpRateLimit,
   startAcpTurnReminders,
+  cardOutputForText,
   WRONGFORGE_REASONING,
   wrongForgeRuntime,
   setupProvider,
   createGracefulShutdown
 };
-//# sourceMappingURL=chunk-M7FNHCE3.js.map
+//# sourceMappingURL=chunk-EAATL6FL.js.map

package/dist/{chunk-JFYQGMMM.js → chunk-FWUIKCCO.js}

@@ -201,6 +201,7 @@ var LoginAttemptStore = class _LoginAttemptStore {
   store = /* @__PURE__ */ new Map();
   writeTimer;
   dirty = false;
+  writeTail = Promise.resolve();
   filePath;
   debounceMs;
   retentionMs;
@@ -339,9 +340,7 @@ var LoginAttemptStore = class _LoginAttemptStore {
       clearTimeout(this.writeTimer);
       this.writeTimer = void 0;
     }
-    if (this.dirty) {
-      await this.writeToDisk();
-    }
+    await this.writeToDisk();
   }
   scheduleWrite() {
     this.dirty = true;
@@ -352,7 +351,14 @@ var LoginAttemptStore = class _LoginAttemptStore {
     }, this.debounceMs);
     this.writeTimer.unref?.();
   }
-  async writeToDisk() {
+  writeToDisk() {
+    const pending = this.writeTail.then(() => {
+      return this.dirty ? this.writeSnapshotToDisk() : void 0;
+    });
+    this.writeTail = pending.catch(() => void 0);
+    return pending;
+  }
+  async writeSnapshotToDisk() {
     this.dirty = false;
     const now = Date.now();
     const cutoff = now - this.retentionMs;
@@ -3733,52 +3739,51 @@ ${terminalText("Reachable from other machines on your network:", "blue", { bold:
 
 // src/hq-server/server-lifecycle.ts
 function createHqServerShutdown(params) {
-  let closed = false;
-  return () => new Promise((res) => {
-    if (closed) {
-      res();
-      return;
-    }
-    closed = true;
-    clearInterval(params.cleanupTimer);
-    clearInterval(params.browserHeartbeatTimer);
-    clearInterval(params.timeseriesFlushTimer);
-    clearInterval(params.sessionCleanupTimer);
-    params.stopAlertEngine();
-    params.authWatcher.close();
-    params.snapshotBroadcaster.close();
-    params.bootstrapStore.clear();
-    params.persistence.timeseries.flush();
-    for (const ws of [...params.browsers, ...params.clients.keys()]) {
-      try {
-        ws.close(1001, "HQ shutting down");
-        ws.terminate();
-      } catch {
+  let closing;
+  return () => {
+    if (closing) return closing;
+    closing = new Promise((res) => {
+      clearInterval(params.cleanupTimer);
+      clearInterval(params.browserHeartbeatTimer);
+      clearInterval(params.timeseriesFlushTimer);
+      clearInterval(params.sessionCleanupTimer);
+      params.stopAlertEngine();
+      params.authWatcher.close();
+      params.snapshotBroadcaster.close();
+      params.bootstrapStore.clear();
+      params.persistence.timeseries.flush();
+      for (const ws of [...params.browsers, ...params.clients.keys()]) {
+        try {
+          ws.close(1001, "HQ shutting down");
+          ws.terminate();
+        } catch {
+        }
       }
-    }
-    params.wss.close();
-    params.mailboxManager.close();
-    params.httpServer.close(() => {
-      const mailboxCloses = [...params.mailboxManager.mailboxGateways.values()].map(
-        ({ mailbox }) => mailbox.close().catch(() => void 0)
-      );
-      params.mailboxManager.mailboxGateways.clear();
-      params.mailboxManager.mailboxGatewayLastUsed.clear();
-      void Promise.all([
-        ...mailboxCloses,
-        // Chimera/race: flush the login-attempt store INSIDE the awaited
-        // shutdown set — the old fire-and-forget `void flush()` let close()
-        // resolve before the debounced write landed, so persistence tests
-        // had to sleep past it (and restarts could miss lockout state).
-        params.loginAttempts.flush(),
-        params.persistence.eventLog.drain(),
-        params.persistence.snapshotStore.drain(),
-        params.persistence.timeseries.drain(),
-        params.persistence.kanban.drain(),
-        params.persistence.sage?.drain()
-      ]).then(() => clearHqRuntimeMarker(params.dataDir, params.hqUrl)).catch(() => void 0).finally(() => res());
+      params.wss.close();
+      params.mailboxManager.close();
+      params.httpServer.close(() => {
+        const mailboxCloses = [...params.mailboxManager.mailboxGateways.values()].map(
+          ({ mailbox }) => mailbox.close().catch(() => void 0)
+        );
+        params.mailboxManager.mailboxGateways.clear();
+        params.mailboxManager.mailboxGatewayLastUsed.clear();
+        void Promise.allSettled([
+          ...mailboxCloses,
+          // Chimera/race: flush the login-attempt store INSIDE the awaited
+          // shutdown set — the old fire-and-forget `void flush()` let close()
+          // resolve before the debounced write landed, so persistence tests
+          // had to sleep past it (and restarts could miss lockout state).
+          params.loginAttempts.flush(),
+          params.persistence.eventLog.drain(),
+          params.persistence.snapshotStore.drain(),
+          params.persistence.timeseries.drain(),
+          params.persistence.kanban.drain(),
+          params.persistence.sage?.drain()
+        ]).then(() => clearHqRuntimeMarker(params.dataDir, params.hqUrl)).catch(() => void 0).finally(() => res());
+      });
     });
-  });
+    return closing;
+  };
 }
 
 // src/hq-server/socket-credentials.ts
@@ -5385,4 +5390,4 @@ export {
   startHqServer,
   HqInsecureExposureError2 as HqInsecureExposureError
 };
-//# sourceMappingURL=chunk-JFYQGMMM.js.map
+//# sourceMappingURL=chunk-FWUIKCCO.js.map

package/dist/{chunk-MEBXWI7U.js → chunk-H5DCQFUI.js}

@@ -22,7 +22,7 @@ async function handleHelpVersionShortCircuit(argv) {
   }
   if (earlyFlags["help"] === true) {
     if (positional.length > 0) {
-      const { subcommandNames } = await import("./subcommands-OCJNO57E.js");
+      const { subcommandNames } = await import("./subcommands-SKJPUJ7N.js");
       if (subcommandNames.includes(positional[0])) {
         const first = positional[0];
         const deep = positional[1];
@@ -43,4 +43,4 @@ async function handleHelpVersionShortCircuit(argv) {
 export {
   handleHelpVersionShortCircuit
 };
-//# sourceMappingURL=chunk-MEBXWI7U.js.map
+//# sourceMappingURL=chunk-H5DCQFUI.js.map

package/dist/{chunk-VEESMPTX.js → chunk-PGC44T7N.js}

@@ -225,6 +225,7 @@ function wfTokens(usage) {
   };
 }
 function sleep(ms, signal) {
+  if (signal.aborted) return Promise.resolve();
   return new Promise((resolve) => {
     const t = setTimeout(done, ms);
     function done() {
@@ -251,4 +252,4 @@ export {
   toProgress,
   wfTokens
 };
-//# sourceMappingURL=chunk-VEESMPTX.js.map
+//# sourceMappingURL=chunk-PGC44T7N.js.map

package/dist/{chunk-5SGMUDP5.js → chunk-QRWXHGLB.js}

@@ -1,7 +1,7 @@
 import {
   resolveWrongForgeEndpoint,
   wrongForgeCall
-} from "./chunk-VEESMPTX.js";
+} from "./chunk-PGC44T7N.js";
 
 // src/fleet/acp-wrongstack-bridge.ts
 import { statSync } from "node:fs";
@@ -749,4 +749,4 @@ export {
   refreshWrongForgeInfoCache,
   reportWrongForgeQuota
 };
-//# sourceMappingURL=chunk-5SGMUDP5.js.map
+//# sourceMappingURL=chunk-QRWXHGLB.js.map

package/dist/{chunk-7BM4LGKQ.js → chunk-W7X23HI6.js}

@@ -3,7 +3,7 @@
 var loaders = {
   automation: async () => (await import("./automation-O7ZRZSFS.js")).automationCmd,
   sandbox: async () => (await import("./sandbox-EZQ76MNY.js")).sandboxCmd,
-  acp: async () => (await import("./acp-NKUEYJDZ.js")).acpCmd,
+  acp: async () => (await import("./acp-CZBSFQB7.js")).acpCmd,
   init: async () => (await import("./init-5PLABNLR.js")).initCmd,
   auth: async () => (await import("./auth-2ZG5DBHS.js")).authCmd,
   update: async () => (await import("./update-54W7GUS5.js")).updateCmd,
@@ -36,7 +36,7 @@ var loaders = {
   quick: async () => (await import("./quick-NPC3N3ZX.js")).quickCmd,
   bench: async () => (await import("./bench-NDYES33Y.js")).benchCmd,
   chronicle: async () => (await import("./chronicle-WBK3TJRB.js")).chronicleCmd,
-  hq: async () => (await import("./hq-54PQYR5O.js")).hqCmd,
+  hq: async () => (await import("./hq-V2M4IYCI.js")).hqCmd,
   mailbox: async () => (await import("./mailbox-serve-MMQCHOHI.js")).mailboxServeCmd,
   permissions: async () => (await import("./permissions-6YJ64W65.js")).permissionsCmd,
   project: async () => (await import("./project-V5KNTLV4.js")).projectCmd,
@@ -58,4 +58,4 @@ export {
   subcommands,
   subcommandNames
 };
-//# sourceMappingURL=chunk-7BM4LGKQ.js.map
+//# sourceMappingURL=chunk-W7X23HI6.js.map

package/dist/{chunk-LUEO5HLZ.js → chunk-X4DEQLAZ.js}

@@ -47,4 +47,4 @@ export {
   trackAcpLeader,
   closeAcpLeaderSessions
 };
-//# sourceMappingURL=chunk-LUEO5HLZ.js.map
+//# sourceMappingURL=chunk-X4DEQLAZ.js.map

package/dist/{cli-context-CQYGIWOU.js → cli-context-6KS3HV5R.js}

@@ -22,7 +22,7 @@ import {
 } from "./chunk-FUJHWQV4.js";
 import {
   handleHelpVersionShortCircuit
-} from "./chunk-MEBXWI7U.js";
+} from "./chunk-H5DCQFUI.js";
 import {
   fmtTok,
   patchConfig
@@ -32,14 +32,14 @@ import {
 } from "./chunk-NL2ABOAS.js";
 import {
   subcommands
-} from "./chunk-7BM4LGKQ.js";
+} from "./chunk-W7X23HI6.js";
 import {
   renderDeepHelp,
   renderFocusedHelp
 } from "./chunk-P7MEEUGT.js";
 import {
   DEFAULT_PORT
-} from "./chunk-JFYQGMMM.js";
+} from "./chunk-FWUIKCCO.js";
 import "./chunk-QVITQ425.js";
 import {
   resolveHqPasswordInput
@@ -86,7 +86,7 @@ import {
 } from "./chunk-3LEIFO5D.js";
 import {
   WRONGFORGE_AGENT_ID
-} from "./chunk-VEESMPTX.js";
+} from "./chunk-PGC44T7N.js";
 import "./chunk-OZCYZYN2.js";
 import {
   runUpdateCommand
@@ -103,7 +103,7 @@ import {
 } from "./chunk-M7PSENGF.js";
 import {
   ACP_LEADER_PROVIDER_ID
-} from "./chunk-LUEO5HLZ.js";
+} from "./chunk-X4DEQLAZ.js";
 import "./chunk-H53EXXAU.js";
 import {
   applyAsciiMode
@@ -948,7 +948,7 @@ async function isPortInUse(host, port) {
 }
 async function handleHqShortCircuit(flags) {
   if (flags["hq"] !== true) return null;
-  const { startHqServer } = await import("./hq-server-YK7FBLL6.js");
+  const { startHqServer } = await import("./hq-server-QM7EIVGJ.js");
   const tunnelRequested = flags["tunnel"] === true;
   const rawPublicUrl = typeof flags["hq-public-url"] === "string" ? flags["hq-public-url"] : process.env.WRONGSTACK_HQ_PUBLIC_URL;
   let publicOrigin;
@@ -3639,4 +3639,4 @@ async function initializeCli(argv, options = {}) {
 export {
   initializeCli
 };
-//# sourceMappingURL=cli-context-CQYGIWOU.js.map
+//# sourceMappingURL=cli-context-6KS3HV5R.js.map

package/dist/{cli-main-VRUJNUBX.js → cli-main-NF3YGDME.js}

@@ -132,6 +132,7 @@ import {
 } from "./chunk-KNYIEQAY.js";
 import {
   WRONGFORGE_REASONING,
+  cardOutputForText,
   createGracefulShutdown,
   formatAcpAgentList,
   loadCachedAcpRegistry,
@@ -141,7 +142,7 @@ import {
   startAcpTurnReminders,
   wrongForgeRuntime,
   wrongstackAcpPermissionPolicy
-} from "./chunk-M7FNHCE3.js";
+} from "./chunk-EAATL6FL.js";
 import {
   DEFAULT_BRIDGE_SERVERS,
   createHqCommandDispatcher,
@@ -154,7 +155,7 @@ import {
   reportWrongForgeQuota,
   writeWrongForgeInfoCache,
   wrongstackBridgeSetup
-} from "./chunk-5SGMUDP5.js";
+} from "./chunk-QRWXHGLB.js";
 import {
   isRestrictedMode,
   withRestrictedTools
@@ -173,7 +174,7 @@ import {
   toProgress,
   wfTokens,
   wrongForgeCall
-} from "./chunk-VEESMPTX.js";
+} from "./chunk-PGC44T7N.js";
 import {
   startCliHqConnection
 } from "./chunk-76JE54WD.js";
@@ -196,7 +197,7 @@ import {
   ACP_LEADER_PROVIDER_ID,
   acpLeaderSessionAgent,
   bindAcpLeaderHost
-} from "./chunk-LUEO5HLZ.js";
+} from "./chunk-X4DEQLAZ.js";
 import {
   checkForUpdate
 } from "./chunk-H53EXXAU.js";
@@ -1028,6 +1029,7 @@ function makeWrongForgeRunner(options) {
     }
     const cancel = () => cancelTask(call, record.id, "cancelled by WrongStack");
     ctx.signal.addEventListener("abort", cancel, { once: true });
+    if (ctx.signal.aborted) cancel();
     const publish = (event) => {
       try {
         options.publishLive?.(ctx, task, event);
@@ -1040,6 +1042,7 @@ function makeWrongForgeRunner(options) {
       } catch {
       }
     };
+    const stepTexts = [""];
     try {
       for await (const ev of followTask(call, record.id, ctx.signal, {
         retryDelayMs: options.retryDelayMs,
@@ -1055,6 +1058,11 @@ function makeWrongForgeRunner(options) {
           void reportWrongForgeQuota({ endpoint: ep, fetchImpl: options.fetchImpl });
         }
         for (const progress of toProgress(ev)) publish(progress);
+        if (ev.type === "agent.text" && typeof ev.data["text"] === "string") {
+          stepTexts[stepTexts.length - 1] += ev.data["text"];
+        } else if (ev.type === "tool.started" && stepTexts[stepTexts.length - 1]?.trim()) {
+          stepTexts.push("");
+        }
       }
       record = await terminalTaskRecord(call, record.id, ctx.signal, {
         retryDelayMs: options.retryDelayMs
@@ -1080,7 +1088,8 @@ function makeWrongForgeRunner(options) {
     if (!result || !result.text.trim() && result.tool_calls === 0) {
       throw subagentError("empty_response", "WrongForge finished with no text and no tool calls");
     }
-    return { result: result.text, iterations: result.steps, toolCalls: result.tool_calls };
+    const text = stepTexts.map((t) => t.trim()).filter(Boolean).join("\n\n") || result.text;
+    return { result: text, iterations: result.steps, toolCalls: result.tool_calls };
   };
 }
 function taskFailure(record, signal) {
@@ -3243,13 +3252,31 @@ function createAcpLeaderHost(opts) {
     runTool: async (name, input, run = {}) => {
       const agent = agentFor(run.sessionId);
       const use = { type: "tool_use", id: `acp_fleet_${randomUUID()}`, name, input };
+      const startedAt = Date.now();
+      const settle = (content2, ok, settlement) => {
+        if (!run.announce) return;
+        opts.events.emit("tool.executed", {
+          sessionId: agent.ctx.activeRunSessionId ?? agent.ctx.session?.id,
+          agentId: "leader",
+          id: use.id,
+          name,
+          durationMs: Date.now() - startedAt,
+          ok,
+          settlement,
+          input: use.input,
+          outsideConversation: true,
+          ...cardOutputForText(content2)
+        });
+      };
       const batch = await agent.toolExecutor.executeBatch([use], agent.ctx, "sequential");
       let result = batch.outputs[0]?.result;
       if (result?.type === "tool_confirm_pending") {
         const tool = opts.getTool(name);
         const approved = { ...use, input: result.input };
         if (!tool || !await run.approve?.(tool, approved.input)) {
-          return { content: `${name} was not approved by the user.`, isError: true };
+          const content2 = `${name} was not approved by the user.`;
+          settle(content2, false, "declined");
+          return { content: content2, isError: true };
         }
         result = (await agent.toolExecutor.executeTool(
           tool,
@@ -3258,8 +3285,13 @@ function createAcpLeaderHost(opts) {
           agent.perIterationOutputCapBytes
         )).block;
       }
-      if (!result) return { content: `${name} returned no result.`, isError: true };
+      if (!result) {
+        const content2 = `${name} returned no result.`;
+        settle(content2, false, "failed");
+        return { content: content2, isError: true };
+      }
       const content = typeof result.content === "string" ? result.content : JSON.stringify(result.content);
+      settle(content, !result.is_error, result.is_error ? "failed" : "completed");
       return { content, isError: Boolean(result.is_error) };
     },
     confirmAwaiter: opts.confirmAwaiter
@@ -8977,6 +9009,7 @@ ${JSON.stringify({
 
 // src/fleet/host-skill-companion.ts
 import { createHash as createHash2, randomUUID as randomUUID6 } from "node:crypto";
+import { keepsOwnContext } from "@wrongstack/core/agent";
 import {
   extractSkillMentions,
   isSkillRecommendable,
@@ -9127,7 +9160,7 @@ var HostSkillCompanion = class {
       input.events.on("agent.run.started", (event) => {
         const sessionId = event.sessionId;
         if (!sessionId || event.ctx.meta?.["agentRole"]) return;
-        if (isProofDrivenBugHuntRequest(event.inputText ?? "")) {
+        if (keepsOwnContext(event.ctx.provider) || isProofDrivenBugHuntRequest(event.inputText ?? "")) {
           this.release(sessionId);
           if (event.ctx.meta) delete event.ctx.meta[SKILL_COMPANION_META_KEY];
           return;
@@ -43411,7 +43444,7 @@ async function runCliExecution(params) {
     governanceHandle,
     setConfig
   } = params;
-  const { execute } = await import("./execution-IV72RUSM.js");
+  const { execute } = await import("./execution-RVDUXLNT.js");
   return execute(
     toExecuteDeps({
       core: {
@@ -43832,4 +43865,4 @@ export {
   CLI_VERSION,
   runInteractive
 };
-//# sourceMappingURL=cli-main-VRUJNUBX.js.map
+//# sourceMappingURL=cli-main-NF3YGDME.js.map

package/dist/{execution-IV72RUSM.js → execution-RVDUXLNT.js}

@@ -63,7 +63,7 @@ import {
 import "./chunk-OZCYZYN2.js";
 import {
   confirmAcpLeaderThroughEvents
-} from "./chunk-LUEO5HLZ.js";
+} from "./chunk-X4DEQLAZ.js";
 import {
   CLI_VERSION
 } from "./chunk-HKMOIIPQ.js";
@@ -6181,6 +6181,11 @@ async function resumeSession(ctx, sessionId) {
         );
         warn(`could not restore ${targetProviderId}/${targetModel}`, err);
       }
+    } else if (targetProviderId && targetProviderId !== currentProviderId) {
+      warn(
+        "could not restore saved route without a provider switch",
+        `${targetProviderId}/${targetModel}`
+      );
     } else if (targetModel !== agent.ctx.model) {
       agent.ctx.model = targetModel;
     }
@@ -6834,7 +6839,7 @@ async function runWebUIDispatch(ctx) {
   agent.disableInteractiveConfirmation();
   confirmAcpLeaderThroughEvents();
   renderer.setSilent(true);
-  const { runWebUI } = await import("./webui-server-V2R5WQUK.js");
+  const { runWebUI } = await import("./webui-server-6I6QOECV.js");
   const flagValue = (names) => {
     for (const name of names) {
       if (!Object.hasOwn(flags, name)) continue;
@@ -7675,4 +7680,4 @@ export {
   execute,
   resolveReviewerFallbackModels
 };
-//# sourceMappingURL=execution-IV72RUSM.js.map
+//# sourceMappingURL=execution-RVDUXLNT.js.map

package/dist/{hq-54PQYR5O.js → hq-V2M4IYCI.js}

@@ -552,18 +552,21 @@ async function tokenRevoke(args, deps) {
   const dataDir = resolveDataDir(deps);
   const tokenField = scope === "client" ? "clientTokens" : "browserTokens";
   let revoked;
+  let ambiguous = [];
   try {
     await mutateHqAuthFile(
       dataDir,
       (current) => {
         const tokens = current[tokenField] ?? [];
         const matches = tokens.filter((t) => t.id.startsWith(idPrefix));
+        ambiguous = [];
         if (matches.length === 0) {
           revoked = void 0;
           return current;
         }
         if (matches.length > 1) {
-          revoked = matches[0];
+          revoked = void 0;
+          ambiguous = matches;
           return current;
         }
         revoked = matches[0];
@@ -580,6 +583,13 @@ async function tokenRevoke(args, deps) {
 `);
     return 1;
   }
+  if (ambiguous.length > 0) {
+    deps.renderer.writeError(
+      `Id-prefix "${idPrefix}" matches ${ambiguous.length} ${scope} tokens (${ambiguous.map((t) => t.id).join(", ")}); nothing revoked. Use a longer prefix.
+`
+    );
+    return 1;
+  }
   if (!revoked) {
     deps.renderer.writeError(`No ${scope} token found matching id-prefix "${idPrefix}".
 `);
@@ -704,7 +714,7 @@ var hqCmd = async (args, deps) => {
   return 1;
 };
 async function startServer(deps) {
-  const { startHqServer } = await import("./hq-server-YK7FBLL6.js");
+  const { startHqServer } = await import("./hq-server-QM7EIVGJ.js");
   const dataDir = resolveDataDir(deps);
   const flags = deps.flags ?? {};
   const rawPublicUrl = typeof flags["hq-public-url"] === "string" ? flags["hq-public-url"] : process.env.WRONGSTACK_HQ_PUBLIC_URL;
@@ -1014,4 +1024,4 @@ function printHelp(deps) {
 export {
   hqCmd
 };
-//# sourceMappingURL=hq-54PQYR5O.js.map
+//# sourceMappingURL=hq-V2M4IYCI.js.map

package/dist/hq-server/login-attempt-store.d.ts

@@ -22,6 +22,7 @@ export declare class LoginAttemptStore {
     private store;
     private writeTimer;
     private dirty;
+    private writeTail;
     private readonly filePath;
     private readonly debounceMs;
     private readonly retentionMs;
@@ -92,6 +93,7 @@ export declare class LoginAttemptStore {
     flush(): Promise<void>;
     private scheduleWrite;
     private writeToDisk;
+    private writeSnapshotToDisk;
     /** Iterate entries (for cleanup timers). */
     entries(): IterableIterator<[string, LoginAttemptEntry]>;
 }

package/dist/{hq-server-YK7FBLL6.js → hq-server-QM7EIVGJ.js}

@@ -10,7 +10,7 @@ import {
   readLocalSubagentTranscript,
   sanitizeApiError,
   startHqServer
-} from "./chunk-JFYQGMMM.js";
+} from "./chunk-FWUIKCCO.js";
 import "./chunk-QVITQ425.js";
 import "./chunk-5TQ65PXQ.js";
 import "./chunk-OGVSKS4Q.js";
@@ -29,4 +29,4 @@ export {
   sanitizeApiError,
   startHqServer
 };
-//# sourceMappingURL=hq-server-YK7FBLL6.js.map
+//# sourceMappingURL=hq-server-QM7EIVGJ.js.map

package/dist/index.js

@@ -8,7 +8,7 @@ import {
 } from "./chunk-M7PSENGF.js";
 import {
   closeAcpLeaderSessions
-} from "./chunk-LUEO5HLZ.js";
+} from "./chunk-X4DEQLAZ.js";
 import {
   CLI_VERSION
 } from "./chunk-HKMOIIPQ.js";
@@ -125,7 +125,7 @@ async function main(argv) {
     applyAsciiMode(earlyFlags);
   }
   if (earlyFlags["help"] === true || earlyFlags["version"] === true) {
-    const { handleHelpVersionShortCircuit } = await import("./short-circuit-flags-AGHURHMQ.js");
+    const { handleHelpVersionShortCircuit } = await import("./short-circuit-flags-276OLPIN.js");
     const earlyExit = await handleHelpVersionShortCircuit(argv);
     if (earlyExit !== null) return earlyExit;
   }
@@ -134,7 +134,7 @@ async function main(argv) {
     shouldCaptureTuiStartup(parsed.flags, parsed.positional)
   );
   try {
-    const { initializeCli } = await import("./cli-context-CQYGIWOU.js");
+    const { initializeCli } = await import("./cli-context-6KS3HV5R.js");
     const cliCtx = await initializeCli(argv, {
       onNonTuiLaunch: () => startupOutput.stop()
     });
@@ -144,7 +144,7 @@ async function main(argv) {
     } else {
       startupOutput.stop();
     }
-    const { runInteractive } = await import("./cli-main-VRUJNUBX.js");
+    const { runInteractive } = await import("./cli-main-NF3YGDME.js");
     return await runInteractive(cliCtx);
   } finally {
     startupOutput.stop();

package/dist/{short-circuit-flags-AGHURHMQ.js → short-circuit-flags-276OLPIN.js}

@@ -1,6 +1,6 @@
 import {
   handleHelpVersionShortCircuit
-} from "./chunk-MEBXWI7U.js";
+} from "./chunk-H5DCQFUI.js";
 import "./chunk-M7PSENGF.js";
 import "./chunk-UROB7MK5.js";
 import "./chunk-HKMOIIPQ.js";
@@ -8,4 +8,4 @@ import "./chunk-W23PY4IJ.js";
 export {
   handleHelpVersionShortCircuit
 };
-//# sourceMappingURL=short-circuit-flags-AGHURHMQ.js.map
+//# sourceMappingURL=short-circuit-flags-276OLPIN.js.map

package/dist/{subcommands-OCJNO57E.js → subcommands-SKJPUJ7N.js}

@@ -1,10 +1,10 @@
 import {
   subcommandNames,
   subcommands
-} from "./chunk-7BM4LGKQ.js";
+} from "./chunk-W7X23HI6.js";
 import "./chunk-W23PY4IJ.js";
 export {
   subcommandNames,
   subcommands
 };
-//# sourceMappingURL=subcommands-OCJNO57E.js.map
+//# sourceMappingURL=subcommands-SKJPUJ7N.js.map

package/dist/{webui-server-V2R5WQUK.js → webui-server-6I6QOECV.js}

@@ -19,11 +19,11 @@ import {
   readCachedWrongForgeInfo,
   refreshWrongForgeInfoCache,
   reportWrongForgeQuota
-} from "./chunk-5SGMUDP5.js";
+} from "./chunk-QRWXHGLB.js";
 import {
   WRONGFORGE_AGENT_ID,
   resolveWrongForgeEndpoint
-} from "./chunk-VEESMPTX.js";
+} from "./chunk-PGC44T7N.js";
 import {
   startCliHqConnection
 } from "./chunk-76JE54WD.js";
@@ -33,7 +33,7 @@ import {
 import {
   ACP_LEADER_PROVIDER_ID,
   setAcpLeaderSessionAgents
-} from "./chunk-LUEO5HLZ.js";
+} from "./chunk-X4DEQLAZ.js";
 import {
   CLI_VERSION
 } from "./chunk-HKMOIIPQ.js";
@@ -2534,4 +2534,4 @@ async function runWebUI(opts) {
 export {
   runWebUI
 };
-//# sourceMappingURL=webui-server-V2R5WQUK.js.map
+//# sourceMappingURL=webui-server-6I6QOECV.js.map

package/dist/wrongforge-leader/wrongforge-leader-provider.d.ts

@@ -18,7 +18,14 @@ export declare class WrongForgeLeaderProvider implements Provider {
     private client;
     private info;
     private model;
-    /** A configured side model, when the user named one. */
+    /**
+     * A side model for a turn WrongForge does not lead. `explicitOnly` (a side
+     * request through `complete()`) takes only the model the user named in
+     * `acp.leader.sideModel`: WrongForge answers those itself (`oneShot`), and
+     * handing them to `fallbackModels[0]` let that model take over the session.
+     * A worker's turn may still fall back to the fallback chain, since `oneShot`
+     * would leave it without tools.
+     */
     private sideProvider;
     complete(req: Request, opts: {
         signal: AbortSignal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/cli",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "license": "MIT",
   "description": "WrongStack CLI — terminal AI coding agent with provider catalog from models.dev. Provides `wrongstack` and `wstack` binaries.",
   "keywords": [