@wrongstack/core 0.109.1 → 0.141.0

package/dist/utils/index.d.ts

@@ -1,9 +1,8 @@
-import { s as TodoItem, M as Message, J as JSONSchema } from '../context-CNRYfhUv.js';
+import { s as TodoItem, M as Message, J as JSONSchema } from '../context-C7G_MtLV.js';
 export { T as TaskItem, c as computeTaskItemProgress, f as formatTaskList, a as formatTaskProgress } from '../task-format-vGOIftmK.js';
-export { a as WstackPathOptions, W as WstackPaths, p as projectHash, b as projectSlug, r as resolveWstackPaths } from '../wstack-paths-_lqjzErq.js';
+export { a as WstackPathOptions, W as WstackPaths, p as projectHash, b as projectSlug, r as resolveWstackPaths } from '../wstack-paths-DD50Omgn.js';
 export { expectDefined } from './expect-defined.js';
-import { a as ModelsDevPayload } from '../models-registry-B6_KfS65.js';
-import { q as CustomModelDefinition } from '../config-BSU-6vah.js';
+import { a as ModelsDevPayload, t as CustomModelDefinition } from '../config-BaVThgnT.js';
 export { a as TaskPriority, b as TaskStatus, T as TaskType } from '../task-graph-u1q9Jkyk.js';
 
 interface AtomicWriteOptions {
@@ -262,6 +261,20 @@ declare function buildChildEnv(optsOrSessionId?: BuildChildEnvOptions | string):
  *  and an abortable variant can be introduced without a codebase-wide hunt. */
 declare function sleep(ms: number): Promise<void>;
 
+/**
+ * Exhaustiveness check for discriminated union switches.
+ * Place in the `default` branch of a switch over a union type
+ * to get a compile-time error when a new variant is added.
+ *
+ * @example
+ * switch (block.type) {
+ *   case 'text': return renderText(block);
+ *   case 'tool_use': return renderToolUse(block);
+ *   default: return assertNever(block);
+ * }
+ */
+declare function assertNever(x: never, message?: string): never;
+
 /**
  * Tool output serialization utilities.
  * Extracted from Agent.executeTools to allow reuse and consistent output handling.
@@ -293,6 +306,13 @@ declare function estimateToolResultTokens(content: string | unknown): number;
  * Estimate tokens for a text block.
  */
 declare function estimateTextTokens(text: string): number;
+/**
+ * Estimate tokens for an array of messages (text + tool I/O), using the shared
+ * 3.5 chars/token basis. This is the single canonical message-array estimator —
+ * compactors, the context_manager tool, and the `/context` display all route
+ * through it so the number a user sees matches the number compaction decides on.
+ */
+declare function estimateMessageTokens(messages: readonly Message[]): number;
 /**
  * Rough estimate of tokens in a tool definition (name + description + schema).
  * Accounts for the JSON-serialized inputSchema which is sent to the API
@@ -325,7 +345,7 @@ declare function estimateRequestTokens(messages: unknown, systemPrompt: unknown,
     name: string;
     description?: string | undefined;
     inputSchema: unknown;
-}[]): RequestTokenBreakdown;
+}[], calibrationKey?: string): RequestTokenBreakdown;
 /**
  * Record the actual API input token count after a provider call so
  * `estimateRequestTokensCalibrated` can self-correct on subsequent calls.
@@ -335,15 +355,17 @@ declare function estimateRequestTokens(messages: unknown, systemPrompt: unknown,
  * also calls `estimateRequestTokens` between the pre-flight and this call
  * (e.g. audit logging in agent.ts).
  *
- * When `estimatedInputTokens` is omitted, falls back to `_cal.prevEst`
- * for backward compatibility with callers that don't have the pre-flight value.
+ * When `estimatedInputTokens` is omitted, falls back to the keyed bucket's
+ * `prevEst` for backward compatibility with callers that don't have the
+ * pre-flight value. `calibrationKey` selects the per-(provider,model) bucket
+ * (defaults to the shared global bucket).
  */
-declare function recordActualUsage(actualInputTokens: number, estimatedInputTokens?: number): void;
+declare function recordActualUsage(actualInputTokens: number, estimatedInputTokens?: number, calibrationKey?: string): void;
 /**
- * Returns the current calibration state. Exposed for debugging and
- * tests — not needed by normal callers.
+ * Returns the current calibration state for a bucket. Exposed for debugging
+ * and tests — not needed by normal callers.
  */
-declare function getCalibrationState(): {
+declare function getCalibrationState(calibrationKey?: string): {
     ratio: number;
     count: number;
     calibrated: boolean;
@@ -361,12 +383,13 @@ declare function estimateRequestTokensCalibrated(messages: unknown, systemPrompt
     name: string;
     description?: string | undefined;
     inputSchema: unknown;
-}[]): RequestTokenBreakdown;
+}[], calibrationKey?: string): RequestTokenBreakdown;
 /**
  * Resets calibration state. Primarily for tests that run in the same
- * process and need a clean slate between suites.
+ * process and need a clean slate between suites. With no argument it clears
+ * every bucket (including the global one); pass a key to reset just that bucket.
  */
-declare function resetCalibration(): void;
+declare function resetCalibration(calibrationKey?: string): void;
 
 interface MessageRepairReport {
     changed: boolean;
@@ -494,4 +517,4 @@ declare function mergeModelsPayload(base: ModelsDevPayload, overlay: ModelsDevPa
  */
 declare function mergeCustomModelDefs(providerCustomModels: Record<string, CustomModelDefinition> | undefined, configModels: Record<string, CustomModelDefinition> | undefined): Record<string, CustomModelDefinition> | undefined;
 
-export { type AtomicWriteOptions, type BuildChildEnvOptions, type CompileFail, type CompileResult, type FileLockOptions, type MessageRepairReport, type MessageRepairResult, type NewlineStyle, type OutputLineGuard, type RequestTokenBreakdown, type SafeParseResult, type ToolOutputSerializerOptions, type UnifiedDiffOptions, type ValidationError, type ValidationResult, atomicWrite, buildChildEnv, color, compileGlob, compileUserRegex, completePartialObject, createToolOutputSerializer, detectNewlineStyle, ensureDir, estimateRequestTokens, estimateRequestTokensCalibrated, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, expandGlob, formatTodosList, getCalibrationState, getTermSize, isInteractive, isStdinTTY, isStdoutTTY, matchAny, matchGlob, mergeCustomModelDefs, mergeModelsPayload, normalizeToLf, onResize, recordActualUsage, repairToolUseAdjacency, resetCalibration, safeParse, safeStringify, sanitizeJsonString, setOutputLineGuard, setRawMode, sleep, stripAnsi, toStyle, unifiedDiff, validateAgainstSchema, withFileLock, writeErr, writeOut };
+export { type AtomicWriteOptions, type BuildChildEnvOptions, type CompileFail, type CompileResult, type FileLockOptions, type MessageRepairReport, type MessageRepairResult, type NewlineStyle, type OutputLineGuard, type RequestTokenBreakdown, type SafeParseResult, type ToolOutputSerializerOptions, type UnifiedDiffOptions, type ValidationError, type ValidationResult, assertNever, atomicWrite, buildChildEnv, color, compileGlob, compileUserRegex, completePartialObject, createToolOutputSerializer, detectNewlineStyle, ensureDir, estimateMessageTokens, estimateRequestTokens, estimateRequestTokensCalibrated, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, expandGlob, formatTodosList, getCalibrationState, getTermSize, isInteractive, isStdinTTY, isStdoutTTY, matchAny, matchGlob, mergeCustomModelDefs, mergeModelsPayload, normalizeToLf, onResize, recordActualUsage, repairToolUseAdjacency, resetCalibration, safeParse, safeStringify, sanitizeJsonString, setOutputLineGuard, setRawMode, sleep, stripAnsi, toStyle, unifiedDiff, validateAgainstSchema, withFileLock, writeErr, writeOut };

package/dist/utils/index.js

@@ -373,7 +373,7 @@ function computeTaskItemProgress(tasks) {
   let failed = 0;
   let review = 0;
   let estimatedHours = 0;
-  let actualHours = 0;
+  const actualHours = 0;
   for (const t of tasks) {
     switch (t.status) {
       case "completed":
@@ -745,6 +745,7 @@ function resolveWstackPaths(opts) {
     projectTrust: path2.join(projectDir, "trust.json"),
     projectMeta: path2.join(projectDir, "meta.json"),
     projectLocalConfig: path2.join(projectDir, "config.local.json"),
+    inProjectConfig: path2.join(opts.projectRoot, ".wrongstack", "config.json"),
     inProjectAgentsFile: path2.join(opts.projectRoot, ".wrongstack", "AGENTS.md"),
     inProjectSkills: path2.join(opts.projectRoot, ".wrongstack", "skills"),
     inProjectWorktrees: path2.join(opts.projectRoot, ".wrongstack", "worktrees"),
@@ -854,6 +855,13 @@ function sleep(ms) {
   return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
 
+// src/utils/assert-never.ts
+function assertNever(x, message) {
+  throw new Error(
+    message ?? `Unhandled case: ${JSON.stringify(x)}`
+  );
+}
+
 // src/utils/tool-output-serializer.ts
 function createToolOutputSerializer(opts = {}) {
   const capBytes = opts.perIterationOutputCapBytes ?? 1e5;
@@ -900,16 +908,17 @@ function createToolOutputSerializer(opts = {}) {
 
 // src/utils/token-estimate.ts
 var RoughTokenEstimate = (text, charsPerToken = 3.5) => Math.max(1, Math.ceil(text.length / charsPerToken));
-var _cal = {
-  ratio: 1,
-  // current calibration multiplier (actual / estimated)
-  count: 0,
-  // number of samples recorded
-  prevEst: 0,
-  // estimated tokens from the most recent estimateRequestTokens call
-  /** EWM α — higher = faster adaptation, more volatile */
-  alpha: 0.3
-};
+var CAL_ALPHA = 0.3;
+var CALIBRATION_GLOBAL_KEY = "__global__";
+var _cals = /* @__PURE__ */ new Map();
+function calState(key) {
+  let state = _cals.get(key);
+  if (!state) {
+    state = { ratio: 1, count: 0, prevEst: 0 };
+    _cals.set(key, state);
+  }
+  return state;
+}
 var MIN_SAMPLES_FOR_CALIBRATION = 3;
 var ESTIMATE_CACHE = /* @__PURE__ */ new Map();
 var ESTIMATE_CACHE_MAX_SIZE = 1e4;
@@ -942,10 +951,25 @@ function estimateToolResultTokens(content) {
 function estimateTextTokens(text) {
   return RoughTokenEstimate(text);
 }
+function estimateMessageTokens(messages) {
+  let total = 0;
+  for (const m of messages) {
+    if (typeof m.content === "string") {
+      total += estimateTextTokens(m.content);
+    } else {
+      for (const b of m.content) {
+        if (b.type === "text") total += estimateTextTokens(b.text);
+        else if (b.type === "tool_use") total += estimateToolInputTokens(b.input);
+        else if (b.type === "tool_result") total += estimateToolResultTokens(b.content);
+      }
+    }
+  }
+  return total;
+}
 function estimateToolDefTokens(tool) {
   return RoughTokenEstimate(tool.name) + RoughTokenEstimate(tool.description ?? "") + RoughTokenEstimate(JSON.stringify(tool.inputSchema));
 }
-function estimateRequestTokens(messages, systemPrompt, tools) {
+function estimateRequestTokens(messages, systemPrompt, tools, calibrationKey = CALIBRATION_GLOBAL_KEY) {
   let messagesTokens = 0;
   if (typeof messages === "string") {
     messagesTokens = RoughTokenEstimate(messages);
@@ -984,7 +1008,7 @@ function estimateRequestTokens(messages, systemPrompt, tools) {
     toolsTokens += estimateToolDefTokens(t);
   }
   const total = messagesTokens + systemTokens + toolsTokens;
-  _cal.prevEst = total;
+  calState(calibrationKey).prevEst = total;
   return {
     messages: messagesTokens,
     systemPrompt: systemTokens,
@@ -992,30 +1016,33 @@ function estimateRequestTokens(messages, systemPrompt, tools) {
     total
   };
 }
-function recordActualUsage(actualInputTokens, estimatedInputTokens) {
+function recordActualUsage(actualInputTokens, estimatedInputTokens, calibrationKey = CALIBRATION_GLOBAL_KEY) {
   if (actualInputTokens <= 0) return;
-  const est = estimatedInputTokens ?? _cal.prevEst;
+  const cal = calState(calibrationKey);
+  const est = estimatedInputTokens ?? cal.prevEst;
   if (est <= 0) return;
   const sampleRatio = actualInputTokens / est;
-  if (_cal.count === 0) {
-    _cal.ratio = sampleRatio;
+  if (cal.count === 0) {
+    cal.ratio = sampleRatio;
   } else {
-    _cal.ratio = _cal.alpha * sampleRatio + (1 - _cal.alpha) * _cal.ratio;
+    cal.ratio = CAL_ALPHA * sampleRatio + (1 - CAL_ALPHA) * cal.ratio;
   }
-  _cal.ratio = Math.min(1.5, Math.max(0.5, _cal.ratio));
-  _cal.count++;
+  cal.ratio = Math.min(1.5, Math.max(0.5, cal.ratio));
+  cal.count++;
 }
-function getCalibrationState() {
+function getCalibrationState(calibrationKey = CALIBRATION_GLOBAL_KEY) {
+  const cal = calState(calibrationKey);
   return {
-    ratio: _cal.ratio,
-    count: _cal.count,
-    calibrated: _cal.count >= MIN_SAMPLES_FOR_CALIBRATION
+    ratio: cal.ratio,
+    count: cal.count,
+    calibrated: cal.count >= MIN_SAMPLES_FOR_CALIBRATION
   };
 }
-function estimateRequestTokensCalibrated(messages, systemPrompt, tools) {
-  const result = estimateRequestTokens(messages, systemPrompt, tools);
-  if (_cal.count >= MIN_SAMPLES_FOR_CALIBRATION) {
-    const safeRatio = Math.min(1.5, Math.max(0.5, _cal.ratio));
+function estimateRequestTokensCalibrated(messages, systemPrompt, tools, calibrationKey = CALIBRATION_GLOBAL_KEY) {
+  const result = estimateRequestTokens(messages, systemPrompt, tools, calibrationKey);
+  const cal = calState(calibrationKey);
+  if (cal.count >= MIN_SAMPLES_FOR_CALIBRATION) {
+    const safeRatio = Math.min(1.5, Math.max(0.5, cal.ratio));
     return {
       messages: Math.round(result.messages * safeRatio),
       systemPrompt: Math.round(result.systemPrompt * safeRatio),
@@ -1025,10 +1052,12 @@ function estimateRequestTokensCalibrated(messages, systemPrompt, tools) {
   }
   return result;
 }
-function resetCalibration() {
-  _cal.ratio = 1;
-  _cal.count = 0;
-  _cal.prevEst = 0;
+function resetCalibration(calibrationKey) {
+  if (calibrationKey === void 0) {
+    _cals.clear();
+    return;
+  }
+  _cals.delete(calibrationKey);
 }
 
 // src/utils/message-invariants.ts
@@ -1537,6 +1566,6 @@ function mergeCustomModelDefs(providerCustomModels, configModels) {
   return out;
 }
 
-export { atomicWrite, buildChildEnv, color, compileGlob, compileUserRegex, completePartialObject, computeTaskItemProgress, createToolOutputSerializer, detectNewlineStyle, ensureDir, estimateRequestTokens, estimateRequestTokensCalibrated, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, expandGlob, expectDefined, formatTaskList, formatTaskProgress, formatTodosList, getCalibrationState, getTermSize, isInteractive, isStdinTTY, isStdoutTTY, matchAny, matchGlob, mergeCustomModelDefs, mergeModelsPayload, normalizeToLf, onResize, projectHash, projectSlug, recordActualUsage, repairToolUseAdjacency, resetCalibration, resolveWstackPaths, safeParse, safeStringify, sanitizeJsonString, setOutputLineGuard, setRawMode, sleep, stripAnsi, toStyle, unifiedDiff, validateAgainstSchema, withFileLock, writeErr, writeOut };
+export { assertNever, atomicWrite, buildChildEnv, color, compileGlob, compileUserRegex, completePartialObject, computeTaskItemProgress, createToolOutputSerializer, detectNewlineStyle, ensureDir, estimateMessageTokens, estimateRequestTokens, estimateRequestTokensCalibrated, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, expandGlob, expectDefined, formatTaskList, formatTaskProgress, formatTodosList, getCalibrationState, getTermSize, isInteractive, isStdinTTY, isStdoutTTY, matchAny, matchGlob, mergeCustomModelDefs, mergeModelsPayload, normalizeToLf, onResize, projectHash, projectSlug, recordActualUsage, repairToolUseAdjacency, resetCalibration, resolveWstackPaths, safeParse, safeStringify, sanitizeJsonString, setOutputLineGuard, setRawMode, sleep, stripAnsi, toStyle, unifiedDiff, validateAgainstSchema, withFileLock, writeErr, writeOut };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map