@wrongstack/core 0.313.1 → 0.316.2

package/dist/{chunk-GFJOMSHG.js → chunk-LA7CLDRW.js}

@@ -2,7 +2,11 @@
 import * as dns from "node:dns/promises";
 import * as net from "node:net";
 function isPrivateIPv4(addr) {
-  const parts = addr.split(".").map((p) => Number.parseInt(p, 10));
+  const parts = addr.split(".").map((p) => {
+    if (!/^\d+$/.test(p)) return Number.NaN;
+    if (p.length > 1 && p.startsWith("0")) return Number.NaN;
+    return Number.parseInt(p, 10);
+  });
   if (parts.length !== 4 || parts.some((n) => Number.isNaN(n) || n < 0 || n > 255)) {
     return true;
   }
@@ -122,4 +126,4 @@ export {
   expandIPv6,
   assertNotPrivateHost
 };
-//# sourceMappingURL=chunk-GFJOMSHG.js.map
+//# sourceMappingURL=chunk-LA7CLDRW.js.map

package/dist/{chunk-M2WF6AXG.js → chunk-LSMMOS2Z.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-PFZO3C6H.js";
 
 // src/utils/message-invariants.ts
-function repairToolUseAdjacency(messages) {
+function repairToolUseAdjacency(messages, opts = {}) {
   const removedToolUses = [];
   const removedToolResults = [];
   let removedMessages = 0;
@@ -17,7 +17,8 @@ function repairToolUseAdjacency(messages) {
       const filtered = mapContent(msg, (blocks) => {
         const next = [];
         for (const block of blocks) {
-          if (block.type === "tool_use" && !nextIds.has(block.id)) {
+          const preserveTrailing = opts.preserveTrailingToolUse === true && i === messages.length - 1 && block.type === "tool_use";
+          if (block.type === "tool_use" && !nextIds.has(block.id) && !preserveTrailing) {
             removedToolUses.push(block.id);
             changed = true;
             continue;
@@ -90,8 +91,11 @@ function mapContent(msg, fn) {
   return { ...msg, content: next };
 }
 function hasMeaningfulContent(content) {
+  if (!content) return false;
   if (typeof content === "string") return content.trim().length > 0;
+  if (!Array.isArray(content)) return false;
   for (const block of content) {
+    if (!block || typeof block !== "object") continue;
     if (block.type === "text") {
       if (block.text.trim().length > 0) return true;
       continue;
@@ -112,4 +116,4 @@ export {
   repairToolUseAdjacency,
   hasMeaningfulContent
 };
-//# sourceMappingURL=chunk-M2WF6AXG.js.map
+//# sourceMappingURL=chunk-LSMMOS2Z.js.map

package/dist/{chunk-ASX6AW36.js → chunk-LXWCMQNJ.js}

@@ -11,10 +11,10 @@ import {
   encodeChronicleProjectServerMessage,
   importLegacyChronicleJournal,
   resolveChronicleRuntimeLocation
-} from "./chunk-AT4V4XGI.js";
+} from "./chunk-4BMVPOHO.js";
 import {
   resolveWstackPaths
-} from "./chunk-YNCVSFGF.js";
+} from "./chunk-SAFHACFA.js";
 
 // src/chronicle/project-server-client.ts
 import { spawn } from "node:child_process";
@@ -786,4 +786,4 @@ export {
   createChronicleProjectAccess,
   createChronicleEventJournal
 };
-//# sourceMappingURL=chunk-ASX6AW36.js.map
+//# sourceMappingURL=chunk-LXWCMQNJ.js.map

package/dist/{chunk-WZO23AWO.js → chunk-M27LIEKV.js}

@@ -3,11 +3,11 @@ import {
 } from "./chunk-XEBHSJLT.js";
 import {
   buildChildEnv
-} from "./chunk-VB3H5WWB.js";
+} from "./chunk-6NWEVFEL.js";
 import {
   hasMeaningfulContent,
   repairToolUseAdjacency
-} from "./chunk-M2WF6AXG.js";
+} from "./chunk-LSMMOS2Z.js";
 import {
   color
 } from "./chunk-4VWO3ZXL.js";
@@ -17,19 +17,19 @@ import {
   buildConversationContinuityBlock,
   markAssistantReferencedEvidence,
   resolveEventSessionId
-} from "./chunk-EFEHDQGY.js";
+} from "./chunk-ZHZ2Y2DH.js";
+import {
+  stripFrontmatter
+} from "./chunk-FC2ZGRF3.js";
 import {
   RUNTIME_CAPABILITY_MANIFEST,
   missingRequiredRuntimeTools,
   missingRuntimeCapabilities,
   runtimeToolReferencesFromText
-} from "./chunk-AWNQ6ED6.js";
-import {
-  stripFrontmatter
-} from "./chunk-WEBMSQP2.js";
+} from "./chunk-THEGTRAG.js";
 import {
   flattenSystemPromptRegions
-} from "./chunk-CB2HFKTP.js";
+} from "./chunk-VVBP6KGT.js";
 import {
   resolveTokenSavingTier
 } from "./chunk-KJ2ZTQSL.js";
@@ -1256,7 +1256,8 @@ var DefaultSystemPromptBuilder = class {
    * join, leave, or change status.
    */
   _toolsUsageCache;
-  _instructionBundle;
+  /** Instruction bundle per identity variant — see `instructions()`. */
+  _instructionBundles = /* @__PURE__ */ new Map();
   /**
    * Cached rendered identity layer. Keyed the same way as `_toolsUsageCache`:
    * the ToolRegistry snapshot keeps the array reference stable until a registry
@@ -1344,7 +1345,7 @@ var DefaultSystemPromptBuilder = class {
     } else {
       this.skillCache = "";
     }
-    const instructions = await this.instructions();
+    const instructions = await this.instructions(ctx.systemVariant);
     const tplCtx = this.templateContext(ctx);
     const layer1 = this.buildIdentity(instructions, tplCtx, ctx);
     const layer2 = await this.buildToolUsage(ctx.tools, ctx, tplCtx);
@@ -1497,13 +1498,27 @@ ${peers}
     };
     return text;
   }
-  async instructions() {
-    if (!this._instructionBundle) {
-      this._instructionBundle = loadInstructionBundle(this.opts.instructionPaths).then(
-        (bundle) => this.opts.instructionBundle ? mergeInstructionBundle(bundle, this.opts.instructionBundle) : bundle
-      );
-    }
-    return this._instructionBundle;
+  /**
+   * The instruction bundle for one identity variant.
+   *
+   * Cached per variant rather than once for the builder: four conversations
+   * share this instance and each picks its own identity, so a single memoised
+   * bundle handed whichever variant loaded first to all of them. At most three
+   * entries exist ('default' | 'lite' | 'pro').
+   */
+  async instructions(variant) {
+    const paths = this.opts.instructionPaths;
+    const effective = variant ?? paths?.systemVariant;
+    const key = effective ?? "default";
+    const cached = this._instructionBundles.get(key);
+    if (cached) return cached;
+    const loading = loadInstructionBundle(
+      paths ? { ...paths, ...effective ? { systemVariant: effective } : {} } : paths
+    ).then(
+      (bundle) => this.opts.instructionBundle ? mergeInstructionBundle(bundle, this.opts.instructionBundle) : bundle
+    );
+    this._instructionBundles.set(key, loading);
+    return loading;
   }
   /**
    * Cached plan content keyed by (planPath, mtimeMs). The plan is read
@@ -1530,7 +1545,7 @@ ${peers}
   }
   async buildToolUsage(tools, ctx, tplCtx) {
     if (tools.length === 0) return "## Tool usage\n\nNo tools registered.";
-    const instructions = await this.instructions();
+    const instructions = await this.instructions(ctx.systemVariant);
     const tpl = tplCtx ?? this.templateContext(ctx);
     const section = (key, vars = {}) => instructionSection(instructions, key, vars, tpl);
     const tier = this.tier;
@@ -1633,6 +1648,12 @@ ${hint.trim()}`);
         if (mailbox) lines.push(mailbox);
       }
     }
+    if (tools.some((t) => t.name === "session_note")) {
+      const sessionNote = section(
+        this.tier === "off" ? "tool.session.note.full" : "tool.session.note.compact"
+      );
+      if (sessionNote) lines.push(sessionNote);
+    }
     const hasGitTool = tools.some((t) => t.name === "git");
     if (hasGitTool && this.tier !== "minimal" && this.tier !== "light" && this.tier !== "aggressive") {
       const commitHygiene = section("tool.commit.hygiene");
@@ -2425,12 +2446,27 @@ function sizeSignals(toolName, content) {
   return { outputBytes, outputTokens, outputLines };
 }
 
+// src/core/request-conversation-binding.ts
+var requestConversations = /* @__PURE__ */ new WeakMap();
+function bindRequestConversation(request, conversation) {
+  requestConversations.set(request, conversation);
+}
+function conversationBoundToRequest(request) {
+  return requestConversations.get(request);
+}
+function inheritRequestConversation(from, to) {
+  if (from === to) return;
+  const conversation = requestConversations.get(from);
+  if (conversation) requestConversations.set(to, conversation);
+}
+
 // src/core/agent-response.ts
 var MAX_TODO_SNAPSHOT_ITEMS = 10;
 var MAX_TODO_SNAPSHOT_CONTENT = 180;
 function buildLiveNextStepsGateBlock(ctx) {
   if (ctx.agentId !== "leader") return void 0;
-  const openTodos = ctx.todos.filter(
+  const todos = Array.isArray(ctx.todos) ? ctx.todos : [];
+  const openTodos = todos.filter(
     (todo) => todo.status === "pending" || todo.status === "in_progress"
   );
   if (openTodos.length === 0) {
@@ -2615,7 +2651,10 @@ function createAgentResponseHandler(a) {
           ...repaired.report
         });
         a.logger.warn(
-          `Repaired context tool adjacency: removed ${repaired.report.removedToolUses.length} tool_use block(s), ${repaired.report.removedToolResults.length} tool_result block(s), ${repaired.report.removedMessages} empty message(s)` + formatAdjacencyRepairIds(repaired.report.removedToolUses, repaired.report.removedToolResults)
+          `Repaired context tool adjacency: removed ${repaired.report.removedToolUses.length} tool_use block(s), ${repaired.report.removedToolResults.length} tool_result block(s), ${repaired.report.removedMessages} empty message(s)` + formatAdjacencyRepairIds(
+            repaired.report.removedToolUses,
+            repaired.report.removedToolResults
+          )
         );
       }
     }
@@ -2662,7 +2701,10 @@ function createAgentResponseHandler(a) {
       // partition when the actual prefix bytes did not change.
       cache: { key: deriveCachePrefixKey(stableSystem) }
     };
+    bindRequestConversation(baseReq, a.ctx);
+    bindRequestProvider(baseReq, provider);
     const request = await a.pipelines.request.run(baseReq);
+    bindRequestConversation(request, a.ctx);
     bindRequestProvider(request, provider);
     return { request, provider };
   }
@@ -2685,7 +2727,13 @@ function createAgentResponseHandler(a) {
         ts: (/* @__PURE__ */ new Date()).toISOString(),
         content: res.content,
         stopReason: res.stopReason,
-        usage: res.usage
+        usage: res.usage,
+        // Stamp the routed identity alongside the usage it produced. Both are
+        // already resolved here (they are what tokenCounter.account was just
+        // handed), and without them the journal's only token record is
+        // unattributable — see the `model`/`provider` docs on SessionEvent.
+        model: req.model,
+        provider: requestProvider.id
       });
       a.ctx.state.appendMessage({ role: "assistant", content: res.content });
       if (!a.ctx.toolAdjacencyDirty) {
@@ -2761,6 +2809,8 @@ export {
   hasNextStepsTag,
   renderNextStepsBlock,
   maybeAppendPendingNextSteps,
+  conversationBoundToRequest,
+  inheritRequestConversation,
   renderInstructionLayer,
   SYSTEM_BLOCK_SOURCE,
   buildLiveNextStepsGateBlock,
@@ -2776,4 +2826,4 @@ export {
   truncateForEvent,
   sizeSignals
 };
-//# sourceMappingURL=chunk-WZO23AWO.js.map
+//# sourceMappingURL=chunk-M27LIEKV.js.map

package/dist/{chunk-JTHKOYWU.js → chunk-MJPHJRAL.js}

@@ -1,39 +1,39 @@
 import {
   DefaultConfigLoader
-} from "./chunk-IQ35HMQL.js";
+} from "./chunk-5YPSXQXM.js";
 import {
   DefaultSecretVault,
   migratePlaintextSecrets
-} from "./chunk-6AKOTGLM.js";
+} from "./chunk-CU546ESW.js";
 import {
   DefaultLogger,
   noOpLogger
 } from "./chunk-WBPVKEEE.js";
-import {
-  promptCacheHitRatio
-} from "./chunk-NFAYHPRH.js";
 import {
   activateProjectStateGuard
-} from "./chunk-CQQL4ZOQ.js";
+} from "./chunk-ZT7JNIGX.js";
 import {
   safeParse
-} from "./chunk-RPOA7IAE.js";
+} from "./chunk-W5VITDM2.js";
+import {
+  writeErr
+} from "./chunk-4VWO3ZXL.js";
 import {
   ensureProjectGitignore,
   ensureProjectIdentity,
   readProjectIdentity
-} from "./chunk-4XV6IR37.js";
-import {
-  writeErr
-} from "./chunk-4VWO3ZXL.js";
+} from "./chunk-HI3JGZR2.js";
 import {
   atomicWrite
-} from "./chunk-7ZHZE5EO.js";
+} from "./chunk-OSGLYW5J.js";
 import {
   canonicalProjectRoot,
   resolveWstackPaths,
   safeProfileName
-} from "./chunk-YNCVSFGF.js";
+} from "./chunk-SAFHACFA.js";
+import {
+  promptCacheHitRatio
+} from "./chunk-3ECENVHL.js";
 import {
   normalizeTokenSavingTier
 } from "./chunk-KJ2ZTQSL.js";
@@ -242,7 +242,7 @@ async function bootConfig(options = {}) {
   }
   const logger = new DefaultLogger({ level: config.log?.level ?? "info", file: wpaths.logFile });
   try {
-    const { getProjectSessionRegistry } = await import("./registry-R23UBE7H.js");
+    const { getProjectSessionRegistry } = await import("./registry-7N4O3E7W.js");
     getProjectSessionRegistry(wpaths.globalRoot);
   } catch {
   }
@@ -660,4 +660,4 @@ export {
   assertProjectRootOutsideStateDir,
   ProviderCacheLedger
 };
-//# sourceMappingURL=chunk-JTHKOYWU.js.map
+//# sourceMappingURL=chunk-MJPHJRAL.js.map

package/dist/{chunk-G5AAKEEZ.js → chunk-MTL4O5YR.js}

@@ -1,10 +1,10 @@
-import {
-  ERROR_CODES,
-  WrongStackError
-} from "./chunk-WOEZV3Q4.js";
 import {
   expectDefined
 } from "./chunk-PFZO3C6H.js";
+import {
+  ERROR_CODES,
+  WrongStackError
+} from "./chunk-25LSLC3G.js";
 
 // src/extension/registry.ts
 var ExtensionRegistry = class {
@@ -225,4 +225,4 @@ var ExtensionRegistry = class {
 export {
   ExtensionRegistry
 };
-//# sourceMappingURL=chunk-G5AAKEEZ.js.map
+//# sourceMappingURL=chunk-MTL4O5YR.js.map

package/dist/chunk-NHJ75HXY.js

@@ -0,0 +1 @@
+//# sourceMappingURL=chunk-NHJ75HXY.js.map

package/dist/{chunk-ZYU2YOJ6.js → chunk-NIOAGFPB.js}

@@ -6,26 +6,26 @@ import {
 } from "./chunk-Z2IJUO45.js";
 import {
   SESSION_RECIPIENT_PREFIX
-} from "./chunk-W4A6QA3D.js";
+} from "./chunk-FWNLEZYG.js";
+import {
+  DefaultSecretScrubber
+} from "./chunk-QSTSJOCK.js";
 import {
   SECRET_FILE_MODE,
   restrictFilePermissions
-} from "./chunk-H5E77KUJ.js";
-import {
-  DefaultSecretScrubber
-} from "./chunk-3E244UDA.js";
+} from "./chunk-6FHWXLPT.js";
 import {
   readProjectIdentitySync
-} from "./chunk-4XV6IR37.js";
+} from "./chunk-HI3JGZR2.js";
 import {
   isPidAlive
 } from "./chunk-TRT2HRWZ.js";
 import {
   atomicWrite
-} from "./chunk-7ZHZE5EO.js";
+} from "./chunk-OSGLYW5J.js";
 import {
   wstackGlobalRoot
-} from "./chunk-YNCVSFGF.js";
+} from "./chunk-SAFHACFA.js";
 
 // src/hq/auth-audit.ts
 import { appendFileSync, readFileSync, mkdirSync } from "node:fs";
@@ -774,7 +774,10 @@ var DEFAULT_MAX_QUEUED_BYTES = Math.min(
 var DEFAULT_COMMAND_POLL_INTERVAL_MS = 500;
 var DEFAULT_COMMAND_POLL_LIMIT = 25;
 var DEFAULT_HEARTBEAT_INTERVAL_MS = 25e3;
-var lastConnectWarningAtMs = 0;
+var warnedEndpoints = /* @__PURE__ */ new Set();
+function resetHqPublisherWarningStateForTests() {
+  warnedEndpoints.clear();
+}
 function queuedFrameCoalesceKey(frame) {
   if (frame.type !== "client.event" || !frame.event.type.endsWith(".snapshot")) {
     return void 0;
@@ -901,6 +904,13 @@ var HqPublisher = class {
     this.socket = socket;
     const onOpen = () => {
       this.reconnectAttempt = 0;
+      this.connectWarningEmitted = false;
+      if (this.lastAttempt?.url) {
+        warnedEndpoints.delete(this.lastAttempt.url);
+      }
+      if (this.options.url) {
+        warnedEndpoints.delete(this.options.url);
+      }
       this.sendHelloNow();
       this.flushQueue();
       this.startHeartbeat();
@@ -1261,7 +1271,8 @@ var HqPublisher = class {
     const delay = Math.min(this.reconnectMaxMs, this.reconnectBaseMs * 2 ** this.reconnectAttempt);
     this.reconnectAttempt += 1;
     if (!this.connectWarningEmitted && this.reconnectAttempt >= this.connectWarnAfterFailures) {
-      if (this.emitConnectWarning()) this.connectWarningEmitted = true;
+      this.connectWarningEmitted = true;
+      this.emitConnectWarning();
     }
     this.reconnectTimer = setTimeout(() => {
       this.reconnectTimer = null;
@@ -1270,11 +1281,13 @@ var HqPublisher = class {
     this.reconnectTimer.unref?.();
   }
   emitConnectWarning() {
-    const nowMs = Date.now();
-    if (nowMs - lastConnectWarningAtMs < this.connectWarnCooldownMs) {
-      return false;
+    const targetUrl = this.lastAttempt?.url ?? this.options.url;
+    if (this.connectWarnCooldownMs > 0) {
+      if (warnedEndpoints.has(targetUrl)) {
+        return false;
+      }
+      warnedEndpoints.add(targetUrl);
     }
-    lastConnectWarningAtMs = nowMs;
     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.`;
     if (this.logger) {
@@ -1486,6 +1499,7 @@ export {
   createMailboxSnapshotPayload,
   createMailboxSnapshotPayloadFromMailbox,
   createMailboxEventPayload,
+  resetHqPublisherWarningStateForTests,
   HqPublisher,
   discoverLocalHqEndpoint,
   resolveHqConfigFromEnv,
@@ -1493,4 +1507,4 @@ export {
   deriveHqProjectId,
   createHqPublisherFromEnv
 };
-//# sourceMappingURL=chunk-ZYU2YOJ6.js.map
+//# sourceMappingURL=chunk-NIOAGFPB.js.map

package/dist/{chunk-Y2GE5TSI.js → chunk-NS52ISWS.js}

@@ -1,7 +1,7 @@
 import {
   ERROR_CODES,
   WrongStackError
-} from "./chunk-WOEZV3Q4.js";
+} from "./chunk-25LSLC3G.js";
 import {
   toErrorMessage
 } from "./chunk-TBRL2RCC.js";
@@ -352,4 +352,4 @@ export {
   TOKENS,
   Pipeline
 };
-//# sourceMappingURL=chunk-Y2GE5TSI.js.map
+//# sourceMappingURL=chunk-NS52ISWS.js.map