wave-agent-sdk 0.18.5 → 0.18.7

package/dist/telemetry/sessionTracing.js

@@ -2,15 +2,18 @@
  * Session Tracing -- OpenTelemetry Span Management
  *
  * Provides span creation/ending APIs for interactions, LLM requests, and tool
- * executions with AsyncLocalStorage context propagation and stale span cleanup.
+ * executions. Uses two independent AsyncLocalStorage contexts:
+ * - interactionContext: holds the interaction span for the entire turn
+ * - toolContext: holds the current tool span (cleared on end)
+ *
+ * LLM request spans do not enter any ALS; they are passed explicitly to
+ * endLLMRequestSpan, aligning with Claude Code's approach.
  */
 import { AsyncLocalStorage } from "node:async_hooks";
 import { getOTELApi, isInitialized, getCurrentConfig, } from "./instrumentation.js";
 // -- AsyncLocalStorage for context propagation --
-const spanContext = new AsyncLocalStorage();
-// -- LIFO stacks for nested span tracking --
-const llmSpans = [];
-const toolSpans = [];
+const interactionContext = new AsyncLocalStorage();
+const toolContext = new AsyncLocalStorage();
 // -- Tracer accessor --
 function getTracer() {
     if (!isInitialized())
@@ -20,29 +23,15 @@ function getTracer() {
         return undefined;
     return otelApi.trace.getTracer("wave");
 }
-// -- Helper: create child span with parent context --
-function startChildSpan(name, attributes) {
-    const tracer = getTracer();
-    if (!tracer)
-        return undefined;
-    const parent = spanContext.getStore();
-    let span;
-    if (parent) {
-        const otelApi = getOTELApi();
-        const ctx = otelApi.trace.setSpan(otelApi.context.active(), parent);
-        span = tracer.startSpan(name, { attributes }, ctx);
-    }
-    else {
-        span = tracer.startSpan(name, { attributes });
-    }
-    spanContext.enterWith(span);
-    return span;
-}
 // -- Public API --
 /**
  * Creates an interaction span for a user turn.
+ * The span is stored in interactionContext for the duration of the turn.
  */
 export function startInteractionSpan(userPrompt, sequence) {
+    const tracer = getTracer();
+    if (!tracer)
+        return undefined;
     const config = getCurrentConfig();
     const attributes = {
         "span.type": "interaction",
@@ -52,21 +41,28 @@ export function startInteractionSpan(userPrompt, sequence) {
     if (config?.logUserPrompts) {
         attributes.user_prompt = userPrompt;
     }
-    return startChildSpan("interaction", attributes);
+    const span = tracer.startSpan("interaction", { attributes });
+    interactionContext.enterWith(span);
+    return span;
 }
 /**
- * Ends the current active interaction span.
+ * Ends the current interaction span and clears the context.
  */
 export function endInteractionSpan() {
-    const span = spanContext.getStore();
+    const span = interactionContext.getStore();
     if (!span)
         return;
     span.end();
+    interactionContext.enterWith(undefined);
 }
 /**
- * Creates an LLM request span as a child of the current active span.
+ * Creates an LLM request span as a child of the interaction span.
+ * Does NOT enter any ALS — the span must be passed explicitly to endLLMRequestSpan.
  */
 export function startLLMRequestSpan(model, options) {
+    const tracer = getTracer();
+    if (!tracer)
+        return undefined;
     const attributes = {
         "span.type": "llm_request",
         model,
@@ -74,17 +70,23 @@ export function startLLMRequestSpan(model, options) {
     if (options?.context) {
         attributes["llm_request.context"] = options.context;
     }
-    const span = startChildSpan("llm.request", attributes);
-    if (span) {
-        llmSpans.push(span);
+    const parent = interactionContext.getStore();
+    let span;
+    if (parent) {
+        const otelApi = getOTELApi();
+        const ctx = otelApi.trace.setSpan(otelApi.context.active(), parent);
+        span = tracer.startSpan("llm.request", { attributes }, ctx);
+    }
+    else {
+        span = tracer.startSpan("llm.request", { attributes });
     }
     return span;
 }
 /**
- * Ends the most recent LLM request span with response metadata.
+ * Ends an LLM request span with response metadata.
+ * The span is passed explicitly — no ALS is read or modified.
  */
-export function endLLMRequestSpan(metadata) {
-    const span = llmSpans.pop();
+export function endLLMRequestSpan(span, metadata) {
     if (!span)
         return;
     if (metadata.inputTokens != null)
@@ -105,14 +107,15 @@ export function endLLMRequestSpan(metadata) {
     if (metadata.hasToolCall != null)
         span.setAttribute("has_tool_call", metadata.hasToolCall);
     span.end();
-    if (llmSpans.length > 0) {
-        spanContext.enterWith(llmSpans[llmSpans.length - 1]);
-    }
 }
 /**
- * Creates a tool execution span as a child of the current active span.
+ * Creates a tool execution span as a child of the interaction span.
+ * Enters toolContext with the new span.
  */
 export function startToolSpan(toolName, input) {
+    const tracer = getTracer();
+    if (!tracer)
+        return undefined;
     const config = getCurrentConfig();
     const attributes = {
         "span.type": "tool",
@@ -125,38 +128,39 @@ export function startToolSpan(toolName, input) {
         }
         attributes.tool_input = inputStr;
     }
-    const span = startChildSpan(`tool.${toolName}`, attributes);
-    if (span) {
-        toolSpans.push(span);
+    const parent = interactionContext.getStore();
+    let span;
+    if (parent) {
+        const otelApi = getOTELApi();
+        const ctx = otelApi.trace.setSpan(otelApi.context.active(), parent);
+        span = tracer.startSpan(`tool.${toolName}`, { attributes }, ctx);
     }
+    else {
+        span = tracer.startSpan(`tool.${toolName}`, { attributes });
+    }
+    toolContext.enterWith(span);
     return span;
 }
 /**
- * Ends a tool span with execution metadata.
+ * Ends the current tool span with execution metadata.
+ * Reads the span from toolContext, then clears it.
  */
 export function endToolSpan(metadata) {
-    const span = toolSpans.pop();
+    const span = toolContext.getStore();
     if (!span)
         return;
     span.setAttribute("success", metadata.success);
     if (metadata.error)
         span.setAttribute("error", metadata.error);
     span.setAttribute("duration_ms", metadata.durationMs);
-    span.end();
-    if (toolSpans.length > 0) {
-        spanContext.enterWith(toolSpans[toolSpans.length - 1]);
+    const config = getCurrentConfig();
+    if (config?.logToolContent && metadata.output) {
+        let outputStr = metadata.output;
+        if (outputStr.length > 1000) {
+            outputStr = outputStr.substring(0, 1000);
+        }
+        span.setAttribute("tool_output", outputStr);
     }
-}
-/**
- * Returns the current active span from ALS context.
- */
-export function getActiveInteractionSpan() {
-    return spanContext.getStore();
-}
-/**
- * Executes `fn` with `span` as the active context via ALS.
- * Useful for parallel tool calls that each need their own span context.
- */
-export function withSpanContext(span, fn) {
-    return spanContext.run(span, fn);
+    span.end();
+    toolContext.enterWith(undefined);
 }

package/dist/tools/readTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"readTool.d.ts","sourceRoot":"","sources":["../../src/tools/readTool.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AAkItE;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAE,UAsStB,CAAC"}
+{"version":3,"file":"readTool.d.ts","sourceRoot":"","sources":["../../src/tools/readTool.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAA2B,MAAM,YAAY,CAAC;AAmItE;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAE,UA+RtB,CAAC"}

package/dist/tools/readTool.js

@@ -4,6 +4,7 @@ import { createHash } from "crypto";
 import { logger } from "../utils/globalLogger.js";
 import { resolvePath, getDisplayPath } from "../utils/path.js";
 import { formatLineNumberPrefix } from "../utils/stringUtils.js";
+import { estimateTokens } from "../utils/tokenEstimate.js";
 import { isBinaryDocument, getBinaryDocumentError, } from "../utils/fileFormat.js";
 import { convertImageToBase64 } from "../utils/messageOperations.js";
 import { READ_TOOL_NAME } from "../constants/tools.js";
@@ -226,11 +227,10 @@ Usage:
                     }
                 }
             }
-            // Resource Limits
-            const maxSizeBytes = context.fileReadingLimits?.maxSizeBytes ?? 1024 * 1024; // Default 1MB
-            if (stats.size > maxSizeBytes &&
-                typeof offset !== "number" &&
-                typeof limit !== "number") {
+            // Resource Limits — align with Claude Code: 256KB default, bypassed only
+            // when the caller provides an explicit line limit (not offset alone).
+            const maxSizeBytes = context.fileReadingLimits?.maxSizeBytes ?? 0.25 * 1024 * 1024; // Default 256KB
+            if (stats.size > maxSizeBytes && typeof limit !== "number") {
                 return {
                     success: false,
                     content: "",
@@ -299,8 +299,7 @@ Usage:
             // Token-level validation: estimate tokens and reject if over limit
             const maxTokens = context.fileReadingLimits?.maxTokens ?? 25000; // Default 25000 tokens
             const ext = extname(actualFilePath).toLowerCase().slice(1);
-            const bytesPerToken = ext === "json" || ext === "jsonl" || ext === "jsonc" ? 2 : 4;
-            const estimatedTokens = Math.ceil(formattedContent.length / bytesPerToken);
+            const estimatedTokens = estimateTokens(formattedContent, ext);
             if (estimatedTokens > maxTokens) {
                 return {
                     success: false,

package/dist/types/telemetry.d.ts

@@ -63,6 +63,8 @@ export interface ToolMetadata {
     error?: string;
     /** Execution time (ms) */
     durationMs: number;
+    /** Tool output content (recorded when logToolContent is true) */
+    output?: string;
 }
 /** Event names for OTel structured logging */
 export type OTelEventName = "session_start" | "session_end" | "user_prompt" | "tool_decision" | "compaction" | "error";

package/dist/types/telemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/types/telemetry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,4CAA4C;AAC5C,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,MAAM,CAAC;AAE9C,8BAA8B;AAC9B,MAAM,MAAM,YAAY,GAAG,eAAe,GAAG,WAAW,GAAG,MAAM,CAAC;AAElE,uCAAuC;AACvC,MAAM,WAAW,eAAe;IAC9B,kCAAkC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,0BAA0B;IAC1B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,wBAAwB;IACxB,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,yBAAyB;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8BAA8B;IAC9B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,0BAA0B;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,oCAAoC;IACpC,cAAc,EAAE,OAAO,CAAC;IACxB,iCAAiC;IACjC,cAAc,EAAE,OAAO,CAAC;IACxB,4CAA4C;IAC5C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qCAAqC;AACrC,MAAM,WAAW,kBAAkB;IACjC,uBAAuB;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,oBAAoB;IACpB,OAAO,CAAC,EAAE,aAAa,GAAG,YAAY,CAAC;IACvC,6BAA6B;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kCAAkC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uBAAuB;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yBAAyB;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,+BAA+B;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+CAA+C;IAC/C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wBAAwB;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,8BAA8B;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mCAAmC;IACnC,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wCAAwC;AACxC,MAAM,WAAW,YAAY;IAC3B,+BAA+B;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,8BAA8B;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0BAA0B;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,8CAA8C;AAC9C,MAAM,MAAM,aAAa,GACrB,eAAe,GACf,aAAa,GACb,aAAa,GACb,eAAe,GACf,YAAY,GACZ,OAAO,CAAC"}
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/types/telemetry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,4CAA4C;AAC5C,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,MAAM,CAAC;AAE9C,8BAA8B;AAC9B,MAAM,MAAM,YAAY,GAAG,eAAe,GAAG,WAAW,GAAG,MAAM,CAAC;AAElE,uCAAuC;AACvC,MAAM,WAAW,eAAe;IAC9B,kCAAkC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,0BAA0B;IAC1B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,wBAAwB;IACxB,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,yBAAyB;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8BAA8B;IAC9B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,0BAA0B;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,oCAAoC;IACpC,cAAc,EAAE,OAAO,CAAC;IACxB,iCAAiC;IACjC,cAAc,EAAE,OAAO,CAAC;IACxB,4CAA4C;IAC5C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qCAAqC;AACrC,MAAM,WAAW,kBAAkB;IACjC,uBAAuB;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,oBAAoB;IACpB,OAAO,CAAC,EAAE,aAAa,GAAG,YAAY,CAAC;IACvC,6BAA6B;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kCAAkC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uBAAuB;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yBAAyB;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,+BAA+B;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+CAA+C;IAC/C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wBAAwB;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,8BAA8B;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mCAAmC;IACnC,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wCAAwC;AACxC,MAAM,WAAW,YAAY;IAC3B,+BAA+B;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,8BAA8B;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0BAA0B;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,8CAA8C;AAC9C,MAAM,MAAM,aAAa,GACrB,eAAe,GACf,aAAa,GACb,aAAa,GACb,eAAe,GACf,YAAY,GACZ,OAAO,CAAC"}

package/dist/utils/fileUtils.d.ts

@@ -26,12 +26,6 @@ export declare function readFirstNLines(filePath: string, maxLines: number): Pro
  * @return {Promise<string>} - The last non-empty line of the file, or an empty string if no non-empty lines found.
  */
 export declare function getLastLine(filePath: string, minLength?: number): Promise<string>;
-/**
- * Ensures that a pattern is present in the global git ignore file.
- *
- * @param {string} pattern - The pattern to add to global git ignore.
- */
-export declare function ensureGlobalGitIgnore(pattern: string): Promise<void>;
 /**
  * Suggests similar paths if a file is not found.
  */

package/dist/utils/fileUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/fileUtils.ts"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAwBrE;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CA4BnB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,SAAS,SAAI,GACZ,OAAO,CAAC,MAAM,CAAC,CA8DjB;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqC1E;AA2BD;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,EAAE,CAAC,CAwBnB;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAGxB"}
+{"version":3,"file":"fileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/fileUtils.ts"],"names":[],"mappings":"AAKA;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAwBrE;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CA4BnB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,SAAS,SAAI,GACZ,OAAO,CAAC,MAAM,CAAC,CA8DjB;AA2BD;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,EAAE,CAAC,CAwBnB;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAGxB"}

package/dist/utils/fileUtils.js

@@ -1,8 +1,6 @@
 import fs from "node:fs/promises";
 import { createReadStream } from "node:fs";
 import path from "node:path";
-import { execSync } from "node:child_process";
-import { homedir } from "node:os";
 import { glob } from "glob";
 /**
  * Reads the first line of a file efficiently using Node.js readline.
@@ -138,47 +136,6 @@ export async function getLastLine(filePath, minLength = 1) {
         }
     }
 }
-/**
- * Ensures that a pattern is present in the global git ignore file.
- *
- * @param {string} pattern - The pattern to add to global git ignore.
- */
-export async function ensureGlobalGitIgnore(pattern) {
-    try {
-        let globalIgnorePath;
-        try {
-            globalIgnorePath = execSync("git config --get core.excludesfile", {
-                encoding: "utf8",
-            }).trim();
-        }
-        catch {
-            // If not set, use default paths
-            const xdgConfigHome = process.env.XDG_CONFIG_HOME || path.join(homedir(), ".config");
-            globalIgnorePath = path.join(xdgConfigHome, "git", "ignore");
-        }
-        if (!globalIgnorePath)
-            return;
-        // Ensure directory exists
-        await fs.mkdir(path.dirname(globalIgnorePath), { recursive: true });
-        let content = "";
-        try {
-            content = await fs.readFile(globalIgnorePath, "utf8");
-        }
-        catch {
-            // File doesn't exist
-        }
-        const lines = content.split("\n").map((line) => line.trim());
-        if (!lines.includes(pattern)) {
-            const newContent = content.endsWith("\n") || content === ""
-                ? `${content}${pattern}\n`
-                : `${content}\n${pattern}\n`;
-            await fs.writeFile(globalIgnorePath, newContent, "utf8");
-        }
-    }
-    catch {
-        // Ignore errors
-    }
-}
 /**
  * Simple Levenshtein distance implementation
  */

package/dist/utils/gitUtils.d.ts

@@ -45,6 +45,17 @@ export declare function resolveGitDir(cwd: string): string | null;
  * @returns Default remote branch name
  */
 export declare function getDefaultRemoteBranch(cwd: string): string;
+/**
+ * Ensure that Wave runtime files are excluded from git status by writing
+ * patterns to `.git/info/exclude` (per-repo, not global).
+ *
+ * Idempotent: if the marker `# wave-runtime` is already present in the
+ * exclude file, it skips writing. A module-level Set provides additional
+ * per-process dedup to avoid redundant file reads.
+ *
+ * @param cwd Working directory to start searching from
+ */
+export declare function ensureWaveRuntimeFilesExcluded(cwd: string): void;
 /**
  * Check if there are uncommitted changes in the working directory
  * @param cwd Working directory

package/dist/utils/gitUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gitUtils.d.ts","sourceRoot":"","sources":["../../src/utils/gitUtils.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAevD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAUlD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAWnD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAetD;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCxD;AAwDD;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CA4B1D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAW1D;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAYvE"}
+{"version":3,"file":"gitUtils.d.ts","sourceRoot":"","sources":["../../src/utils/gitUtils.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAevD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAUlD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAWnD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAetD;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkCxD;AAwDD;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CA4B1D;AAQD;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAoChE;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAW1D;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAYvE"}

package/dist/utils/gitUtils.js

@@ -216,6 +216,57 @@ export function getDefaultRemoteBranch(cwd) {
     // 4. Hardcoded fallback
     return "main";
 }
+/**
+ * Module-level set tracking git dirs already processed in this process,
+ * to avoid redundant I/O.
+ */
+const excludedGitDirs = new Set();
+/**
+ * Ensure that Wave runtime files are excluded from git status by writing
+ * patterns to `.git/info/exclude` (per-repo, not global).
+ *
+ * Idempotent: if the marker `# wave-runtime` is already present in the
+ * exclude file, it skips writing. A module-level Set provides additional
+ * per-process dedup to avoid redundant file reads.
+ *
+ * @param cwd Working directory to start searching from
+ */
+export function ensureWaveRuntimeFilesExcluded(cwd) {
+    try {
+        const gitDir = resolveGitDir(cwd);
+        if (!gitDir)
+            return;
+        if (excludedGitDirs.has(gitDir))
+            return;
+        const excludePath = path.join(gitDir, "info", "exclude");
+        let content = "";
+        try {
+            content = fsSync.readFileSync(excludePath, "utf8");
+        }
+        catch {
+            // File doesn't exist yet
+        }
+        const marker = "# wave-runtime";
+        if (content.includes(marker)) {
+            excludedGitDirs.add(gitDir);
+            return;
+        }
+        const block = [
+            marker,
+            "**/.wave/scheduled_tasks.lock",
+            "**/.wave/scheduled_tasks.json",
+            "**/.wave/worktrees/",
+            "**/.wave/settings.local.json",
+            "",
+        ].join("\n");
+        fsSync.mkdirSync(path.join(gitDir, "info"), { recursive: true });
+        fsSync.appendFileSync(excludePath, block);
+        excludedGitDirs.add(gitDir);
+    }
+    catch {
+        // Best-effort: ignore all errors
+    }
+}
 /**
  * Check if there are uncommitted changes in the working directory
  * @param cwd Working directory

package/dist/utils/groupMessagesByApiRound.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"groupMessagesByApiRound.d.ts","sourceRoot":"","sources":["../../src/utils/groupMessagesByApiRound.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,CA8DvE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,OAAO,EAAE,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,EAAE,CAIX"}
+{"version":3,"file":"groupMessagesByApiRound.d.ts","sourceRoot":"","sources":["../../src/utils/groupMessagesByApiRound.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAGjD,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,CA8DvE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,OAAO,EAAE,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,EAAE,CAIX"}

package/dist/utils/groupMessagesByApiRound.js

@@ -1,3 +1,4 @@
+import { estimateTokens as estimateStrTokens } from "./tokenEstimate.js";
 /**
  * Groups messages into "API rounds" — each round corresponds to one API
  * call-response cycle. This is critical because in agentic sessions with a
@@ -74,24 +75,24 @@ export function getLastApiRounds(messages, roundCount) {
     return lastRounds.flatMap((r) => r.messages);
 }
 /**
- * Roughly estimate token count from character count (~4 chars per token).
+ * Estimate token count from message blocks using CJK-aware estimation.
  */
 function estimateTokens(messages) {
-    let chars = 0;
+    let combined = "";
     for (const msg of messages) {
         for (const block of msg.blocks) {
             if ("content" in block && typeof block.content === "string") {
-                chars += block.content.length;
+                combined += block.content;
             }
             if (block.type === "tool" &&
                 block.parameters &&
                 typeof block.parameters === "string") {
-                chars += block.parameters.length;
+                combined += block.parameters;
             }
             if (block.type === "tool" && block.result) {
-                chars += block.result.length;
+                combined += block.result;
             }
         }
     }
-    return Math.ceil(chars / 4);
+    return estimateStrTokens(combined);
 }

package/dist/utils/openaiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openaiClient.d.ts","sourceRoot":"","sources":["../../src/utils/openaiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sCAAsC,EACtC,mCAAmC,EACnC,mBAAmB,EACnB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAyBnD,KAAK,YAAY,GACb,sCAAsC,GACtC,mCAAmC,CAAC;AAExC,UAAU,WAAW,CAAC,CAAC;IACrB,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,UAAU,UAAU,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IACxC,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;CACzC;AAED,qBAAa,YAAY;IACX,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAEzC,IAAI,IAAI;;qBAGO,CAAC,SAAS,YAAY,UACrB,CAAC,YACC;gBAAE,MAAM,CAAC,EAAE,WAAW,CAAA;aAAE,KACjC,UAAU,CACX,CAAC,SAAS,mCAAmC,GACzC,aAAa,CAAC,mBAAmB,CAAC,GAClC,cAAc,CACnB;;MA2BN;YAEa,OAAO;YAuHN,oBAAoB;CAyCpC"}
+{"version":3,"file":"openaiClient.d.ts","sourceRoot":"","sources":["../../src/utils/openaiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sCAAsC,EACtC,mCAAmC,EACnC,mBAAmB,EACnB,cAAc,EACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAyBnD,KAAK,YAAY,GACb,sCAAsC,GACtC,mCAAmC,CAAC;AAExC,UAAU,WAAW,CAAC,CAAC;IACrB,IAAI,EAAE,CAAC,CAAC;IACR,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,UAAU,UAAU,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IACxC,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;CACzC;AAED,qBAAa,YAAY;IACX,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAEzC,IAAI,IAAI;;qBAGO,CAAC,SAAS,YAAY,UACrB,CAAC,YACC;gBAAE,MAAM,CAAC,EAAE,WAAW,CAAA;aAAE,KACjC,UAAU,CACX,CAAC,SAAS,mCAAmC,GACzC,aAAa,CAAC,mBAAmB,CAAC,GAClC,cAAc,CACnB;;MA2BN;YAEa,OAAO;YAyHN,oBAAoB;CAyCpC"}

package/dist/utils/openaiClient.js

@@ -67,6 +67,7 @@ export class OpenAIClient {
                 }
                 if (attempt < MAX_RETRIES) {
                     logger.warn("OpenAI API network error, retrying...", {
+                        model: params.model,
                         attempt: attempt + 1,
                         error: e,
                     });
@@ -106,6 +107,7 @@ export class OpenAIClient {
             if (retryableStatus && attempt < MAX_RETRIES) {
                 lastRetryAfter = response.headers.get("retry-after");
                 logger.warn("OpenAI API error, retrying...", {
+                    model: params.model,
                     attempt: attempt + 1,
                     status: response.status,
                     retryAfter: lastRetryAfter,

package/dist/utils/tokenEstimate.d.ts

@@ -0,0 +1,24 @@
+/**
+ * CJK-aware token estimation without external dependencies.
+ *
+ * The naive `length / 4` heuristic under-estimates CJK text by ~4x because
+ * each Chinese/Japanese/Korean character is typically 1-2 tokens, not 0.25.
+ * This function separates CJK characters from other text and applies
+ * different ratios:
+ *
+ * - CJK characters: 1 char ≈ 1 token
+ * - Other characters: 4 chars ≈ 1 token (2 for JSON/JSONL/JSONC)
+ *
+ * The estimate intentionally leans high for CJK (safe direction for limit
+ * checks — better to reject than to let oversized content through).
+ */
+/**
+ * Estimate token count for a string, with CJK-awareness.
+ *
+ * @param content - The text content to estimate
+ * @param ext - File extension (without dot), e.g. "ts", "json". JSON/JSONL/JSONC
+ *              files use a tighter ratio (2 chars/token) for non-CJK text.
+ * @returns Estimated token count
+ */
+export declare function estimateTokens(content: string, ext?: string): number;
+//# sourceMappingURL=tokenEstimate.d.ts.map

package/dist/utils/tokenEstimate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokenEstimate.d.ts","sourceRoot":"","sources":["../../src/utils/tokenEstimate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAMH;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAMpE"}

package/dist/utils/tokenEstimate.js

@@ -0,0 +1,30 @@
+/**
+ * CJK-aware token estimation without external dependencies.
+ *
+ * The naive `length / 4` heuristic under-estimates CJK text by ~4x because
+ * each Chinese/Japanese/Korean character is typically 1-2 tokens, not 0.25.
+ * This function separates CJK characters from other text and applies
+ * different ratios:
+ *
+ * - CJK characters: 1 char ≈ 1 token
+ * - Other characters: 4 chars ≈ 1 token (2 for JSON/JSONL/JSONC)
+ *
+ * The estimate intentionally leans high for CJK (safe direction for limit
+ * checks — better to reject than to let oversized content through).
+ */
+// CJK Unified Ideographs + Extension A + Hiragana + Katakana + Hangul Syllables
+const CJK_REGEX = /[\u4e00-\u9fff\u3400-\u4dbf\u3040-\u309f\u30a0-\u30ff\uac00-\ud7af]/g;
+/**
+ * Estimate token count for a string, with CJK-awareness.
+ *
+ * @param content - The text content to estimate
+ * @param ext - File extension (without dot), e.g. "ts", "json". JSON/JSONL/JSONC
+ *              files use a tighter ratio (2 chars/token) for non-CJK text.
+ * @returns Estimated token count
+ */
+export function estimateTokens(content, ext) {
+    const cjkCount = (content.match(CJK_REGEX) || []).length;
+    const otherCount = content.length - cjkCount;
+    const bytesPerToken = ext === "json" || ext === "jsonl" || ext === "jsonc" ? 2 : 4;
+    return Math.ceil(cjkCount + otherCount / bytesPerToken);
+}

package/dist/utils/worktreeUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktreeUtils.d.ts","sourceRoot":"","sources":["../../src/utils/worktreeUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,mFAAmF;IACnF,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAmBvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CA6B7C;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKjD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,YAAY,CA6JtE;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAmEvD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,GAAG,SAAS,GACrC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAsClD"}
+{"version":3,"file":"worktreeUtils.d.ts","sourceRoot":"","sources":["../../src/utils/worktreeUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAYH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,mFAAmF;IACnF,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAmBvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CA6B7C;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKjD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,YAAY,CAgKtE;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAmEvD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,GAAG,SAAS,GACrC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAsClD"}

package/dist/utils/worktreeUtils.js

@@ -5,7 +5,7 @@
 import { execFileSync } from "node:child_process";
 import * as path from "node:path";
 import * as fs from "node:fs";
-import { getGitMainRepoRoot, getDefaultRemoteBranch } from "./gitUtils.js";
+import { getGitMainRepoRoot, getDefaultRemoteBranch, ensureWaveRuntimeFilesExcluded, } from "./gitUtils.js";
 import { logger } from "./globalLogger.js";
 /**
  * Validate a worktree name to prevent path traversal and invalid characters.
@@ -79,6 +79,8 @@ export function createWorktree(name, cwd) {
     const worktreePath = path.join(repoRoot, ".wave", "worktrees", name);
     const branchName = `worktree-${name}`;
     const baseBranch = getDefaultRemoteBranch(cwd);
+    // Ensure Wave runtime files are git-excluded in this repo
+    ensureWaveRuntimeFilesExcluded(cwd);
     // Ensure parent directory exists
     const parentDir = path.dirname(worktreePath);
     if (!fs.existsSync(parentDir)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-agent-sdk",
-  "version": "0.18.5",
+  "version": "0.18.7",
   "description": "SDK for building AI-powered development tools and agents",
   "keywords": [
     "ai",

package/scripts/install_ripgrep.js

@@ -9,18 +9,6 @@ const __dirname = path.dirname(__filename);
 const MANIFEST_PATH = path.resolve(__dirname, "../bin/rg");
 const VENDOR_DIR = path.resolve(__dirname, "../vendor/ripgrep");
 
-function getCurrentPlatform() {
-  const platform = process.platform;
-  const arch = process.arch;
-  if (platform === "darwin")
-    return `macos-${arch === "arm64" ? "aarch64" : "x86_64"}`;
-  if (platform === "linux")
-    return `linux-${arch === "arm64" ? "aarch64" : "x86_64"}`;
-  if (platform === "win32")
-    return `windows-${arch === "arm64" ? "aarch64" : "x86_64"}`;
-  return null;
-}
-
 async function main() {
   if (!fs.existsSync(MANIFEST_PATH)) {
     console.error(`Manifest not found: ${MANIFEST_PATH}`);
@@ -30,15 +18,7 @@ async function main() {
   const manifestContent = fs.readFileSync(MANIFEST_PATH, "utf-8");
   const jsonContent = manifestContent.replace(/^#!.*\n/, "");
   const manifest = JSON.parse(jsonContent);
-  const allPlatforms = manifest.platforms;
-
-  // In CI, only download for the current platform
-  const isCI = process.env.CI === "true";
-  const currentPlatform = isCI ? getCurrentPlatform() : null;
-  const platforms =
-    currentPlatform && currentPlatform in allPlatforms
-      ? { [currentPlatform]: allPlatforms[currentPlatform] }
-      : allPlatforms;
+  const platforms = manifest.platforms;
 
   if (!fs.existsSync(VENDOR_DIR)) {
     fs.mkdirSync(VENDOR_DIR, { recursive: true });