wave-agent-sdk 0.18.6 → 0.18.7

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/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.6",
+  "version": "0.18.7",
   "description": "SDK for building AI-powered development tools and agents",
   "keywords": [
     "ai",

package/src/managers/aiManager.ts

@@ -3,6 +3,7 @@ import * as aiService from "../services/aiService.js";
 import { convertMessagesForAPI } from "../utils/convertMessagesForAPI.js";
 import { parseTaskNotificationXml } from "../utils/notificationXml.js";
 import { calculateComprehensiveTotalTokens } from "../utils/tokenCalculation.js";
+import { estimateTokens } from "../utils/tokenEstimate.js";
 import {
   getTaskReminderTurnCounts,
   maybeInjectTaskReminder,
@@ -606,7 +607,7 @@ export class AIManager {
     );
     let usedTokens = 0;
     for (const file of recentFiles) {
-      const fileTokens = Math.ceil(file.content.length / 4);
+      const fileTokens = estimateTokens(file.content);
       if (usedTokens + fileTokens > POST_COMPACT_MAX_TOKENS_PER_FILE) continue;
       if (fileTokens > 0) usedTokens += fileTokens;
       contextParts.push(`\n\n## ${file.path}\n\`\`\`\n${file.content}\n\`\`\``);
@@ -639,7 +640,7 @@ export class AIManager {
               skillContent.slice(0, maxSkillChars) + "\n\n...[truncated]...";
           }
 
-          const skillTokens = Math.ceil(skillContent.length / 4);
+          const skillTokens = estimateTokens(skillContent);
           if (skillsUsedTokens + skillTokens > POST_COMPACT_SKILLS_TOKEN_BUDGET)
             break;
           skillsUsedTokens += skillTokens;
@@ -813,6 +814,7 @@ export class AIManager {
       let turnDepth = turnOffset;
 
       inner: while (true) {
+        let llmSpan: import("@opentelemetry/api").Span | undefined;
         try {
           // Save session in each iteration to ensure message persistence
           await this.messageManager.saveSession();
@@ -949,15 +951,21 @@ export class AIManager {
             };
           }
 
-          startLLMRequestSpan(model || this.getModelConfig().model || "");
+          llmSpan = startLLMRequestSpan(
+            model || this.getModelConfig().model || "",
+          );
 
           const result = await aiService.callAgent(callAgentOptions);
 
           // End LLM span with usage data
-          endLLMRequestSpan({
+          endLLMRequestSpan(llmSpan, {
             model: model || this.getModelConfig().model || "",
             success: true,
             hasToolCall: !!(result.tool_calls && result.tool_calls.length > 0),
+            inputTokens: result.usage?.prompt_tokens,
+            outputTokens: result.usage?.completion_tokens,
+            cacheReadTokens: result.usage?.cache_read_input_tokens,
+            cacheCreationTokens: result.usage?.cache_creation_input_tokens,
           });
 
           const createdByStreaming = assistantMessageCreated;
@@ -1238,7 +1246,7 @@ export class AIManager {
           break inner;
         } catch (error) {
           // End LLM span with error
-          endLLMRequestSpan({
+          endLLMRequestSpan(llmSpan, {
             model: model || this.getModelConfig().model || "",
             success: false,
             error: error instanceof Error ? error.message : String(error),
@@ -1653,6 +1661,7 @@ export class AIManager {
         shortResult: toolResult.shortResult,
         isManuallyBackgrounded: toolResult.isManuallyBackgrounded,
         startLineNumber: toolResult.startLineNumber,
+        images: toolResult.images,
         timestamp: Date.now(),
       });
 

package/src/managers/cronManager.ts

@@ -15,6 +15,7 @@ import {
   releaseSchedulerLock,
   registerSchedulerLockCleanup,
 } from "../utils/cronTasksLock.js";
+import { ensureWaveRuntimeFilesExcluded } from "../utils/gitUtils.js";
 
 export class CronManager {
   private jobs = new Map<string, CronJob>();
@@ -100,6 +101,7 @@ export class CronManager {
   }
 
   private tryLock(workdir: string): void {
+    ensureWaveRuntimeFilesExcluded(workdir);
     tryAcquireSchedulerLock({ dir: workdir, sessionId: this.sessionId })
       .then((acquired) => {
         if (acquired) {

package/src/managers/liveConfigManager.ts

@@ -17,7 +17,6 @@ import type { HookManager } from "./hookManager.js";
 import type { PermissionManager } from "./permissionManager.js";
 import { isValidHookEvent } from "../types/hooks.js";
 import { ConfigurationService } from "../services/configurationService.js";
-import { ensureGlobalGitIgnore } from "../utils/fileUtils.js";
 import { Container } from "../utils/container.js";
 
 import type {
@@ -97,9 +96,6 @@ export class LiveConfigManager {
       if (projectPaths) {
         for (const projectPath of projectPaths) {
           if (existsSync(projectPath)) {
-            if (projectPath.endsWith("settings.local.json")) {
-              await ensureGlobalGitIgnore("**/.wave/settings.local.json");
-            }
             await this.fileWatcher.watchFile(projectPath, (event) =>
               this.handleFileChange(event, "project"),
             );
@@ -364,14 +360,6 @@ export class LiveConfigManager {
 
       // Handle file creation or modification
       if (event.type === "change" || event.type === "create") {
-        if (
-          source === "project" &&
-          event.path.endsWith("settings.local.json") &&
-          event.type === "create"
-        ) {
-          await ensureGlobalGitIgnore("**/.wave/settings.local.json");
-        }
-
         // Add small delay to ensure file write is complete
         await new Promise((resolve) => setTimeout(resolve, 50));
 

package/src/managers/mcpManager.ts

@@ -848,9 +848,16 @@ export class McpManager {
         textContent.push(String(result.content));
       }
 
+      const textContentStr =
+        textContent.length > 0
+          ? textContent.join("\n")
+          : images.length > 0
+            ? `Tool returned ${images.length} image(s).`
+            : "No content";
+
       return {
         success: true,
-        content: textContent.length > 0 ? textContent.join("\n") : "No content",
+        content: textContentStr,
         images: images.length > 0 ? images : undefined,
         serverName,
       };

package/src/managers/messageManager.ts

@@ -31,6 +31,7 @@ import type { MemoryRuleManager } from "./MemoryRuleManager.js";
 import type { MemoryRule } from "../types/memoryRule.js";
 import type { MemoryService } from "../services/memory.js";
 import { pathEncoder } from "../utils/pathEncoder.js";
+import { estimateTokens } from "../utils/tokenEstimate.js";
 import { READ_TOOL_NAME } from "../constants/tools.js";
 
 import { Container } from "../utils/container.js";
@@ -1063,7 +1064,7 @@ export class MessageManager {
   /**
    * Get recent file read contents, sorted by timestamp (newest first).
    * @param maxFiles - Maximum number of files to return
-   * @param maxTokensPerFile - Maximum tokens per file (~4 chars/token)
+   * @param maxTokensPerFile - Maximum tokens per file (CJK-aware estimation)
    * @returns Array of { path, content } sorted by recency
    */
   public getRecentFileReads(
@@ -1076,10 +1077,14 @@ export class MessageManager {
 
     const result: Array<{ path: string; content: string }> = [];
     for (const [path, { content }] of sorted) {
-      const truncated =
-        content.length > maxTokensPerFile * 4
-          ? content.slice(0, maxTokensPerFile * 4)
-          : content;
+      const tokenCount = estimateTokens(content);
+      let truncated = content;
+      if (tokenCount > maxTokensPerFile) {
+        // Truncate proportionally to fit within the token budget
+        const ratio = maxTokensPerFile / tokenCount;
+        const cutIndex = Math.floor(content.length * ratio);
+        truncated = content.slice(0, cutIndex);
+      }
       result.push({ path, content: truncated });
     }
     return result;

package/src/managers/toolManager.ts

@@ -279,6 +279,7 @@ class ToolManager {
         endToolSpan({
           success: result.success,
           durationMs: Date.now() - toolStartTime,
+          output: result.content,
         });
         return result;
       } catch (error) {
@@ -303,6 +304,7 @@ class ToolManager {
         endToolSpan({
           success: result.success,
           durationMs: Date.now() - toolStartTime,
+          output: result.content,
         });
         return result;
       } catch (error) {

package/src/services/configurationService.ts

@@ -47,6 +47,7 @@ import {
   mergeRemoteSettings,
 } from "./remoteSettingsService.js";
 import { createAuthAwareFetch } from "./authService.js";
+import { ensureWaveRuntimeFilesExcluded } from "../utils/gitUtils.js";
 
 /**
  * Default ConfigurationService implementation
@@ -791,6 +792,7 @@ export class ConfigurationService {
 
     // Ensure .wave directory exists
     const waveDir = path.join(workdir, ".wave");
+    ensureWaveRuntimeFilesExcluded(workdir);
     if (!existsSync(waveDir)) {
       await fs.mkdir(waveDir, { recursive: true });
     }