wave-agent-sdk 0.18.7 → 0.19.1

package/dist/services/session.d.ts

@@ -17,8 +17,6 @@
 import type { Message } from "../types/index.js";
 export interface SessionData {
     id: string;
-    rootSessionId?: string;
-    parentSessionId?: string;
     messages: Message[];
     metadata: {
         workdir: string;
@@ -28,8 +26,6 @@ export interface SessionData {
 }
 export interface SessionMetadata {
     id: string;
-    rootSessionId?: string;
-    parentSessionId?: string;
     sessionType: "main" | "subagent";
     subagentType?: string;
     workdir: string;
@@ -38,13 +34,6 @@ export interface SessionMetadata {
     latestTotalTokens: number;
     firstMessage?: string;
 }
-export interface SessionIndex {
-    sessions: Record<string, Omit<SessionMetadata, "id" | "lastActiveAt" | "createdAt"> & {
-        lastActiveAt: string;
-        createdAt: string;
-    }>;
-    lastUpdated: string;
-}
 /**
  * Generate a new session ID using Node.js native crypto.randomUUID()
  * @returns UUID string for session identification
@@ -92,7 +81,7 @@ export declare function createSession(sessionId: string, workdir: string, sessio
  * @param workdir - Working directory for the session
  * @param sessionType - Type of session ("main" or "subagent", defaults to "main")
  */
-export declare function appendMessages(sessionId: string, newMessages: Message[], workdir: string, sessionType?: "main" | "subagent", rootSessionId?: string, parentSessionId?: string): Promise<void>;
+export declare function appendMessages(sessionId: string, newMessages: Message[], workdir: string, sessionType?: "main" | "subagent"): Promise<void>;
 /**
  * Load session data from JSONL file (new approach)
  *
@@ -193,7 +182,9 @@ export declare function truncateContent(content: string, maxLength?: number): st
  */
 export declare function handleSessionRestoration(restoreSessionId?: string, continueLastSession?: boolean, workdir?: string): Promise<SessionData | undefined>;
 /**
- * Load the full message thread by following parentSessionId links
+ * Load the full message thread for a session.
+ * With append-only compaction, all messages are in a single file.
+ * Returns the active messages (post-compact boundary).
  * @param currentSessionId - The ID of the current session
  * @param workdir - Working directory for the session
  * @returns Promise that resolves to an array of all messages in the thread

package/dist/services/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/services/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/services/session.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAMH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAOjD,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,QAAQ,EAAE;QACR,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,GAAG,UAAU,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,YAAY,EAAE,IAAI,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAElE;AAGD,eAAO,MAAM,WAAW,QAAuC,CAAC;AAGhE;;GAEG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAMtD;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,MAAM,GAAG,UAAmB,GACxC,OAAO,CAAC,MAAM,CAAC,CASjB;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,MAAM,GAAG,UAAmB,GACxC,OAAO,CAAC,MAAM,CAAC,CASjB;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,MAAM,GAAG,UAAmB,GACxC,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,OAAO,EAAE,EACtB,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,MAAM,GAAG,UAAmB,GACxC,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,MAAM,GAAG,UAAmB,GACxC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CA0E7B;AAED;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAU7B;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,eAAe,EAAE,CAAC,CAE5B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,eAAe,EAAE,CAAC,CAsG5B;AAED;;;;GAIG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC,CAgFlE;AAED;;;;;GAKG;AACH,wBAAsB,+BAA+B,CACnD,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAmDjB;AAED;;GAEG;AACH,wBAAsB,8BAA8B,IAAI,OAAO,CAAC,IAAI,CAAC,CA+BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,MAAM,GAAG,UAAU,GAChC,OAAO,CAAC,OAAO,CAAC,CAsClB;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsCxB;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,MAAM,GAAG,UAAmB,GACxC,OAAO,CAAC,IAAI,CAAC,CAcf;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,SAAS,GAAE,MAAY,GACtB,MAAM,CAQR;AAED;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAC5C,gBAAgB,CAAC,EAAE,MAAM,EACzB,mBAAmB,CAAC,EAAE,OAAO,EAC7B,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CA+ClC;AAED;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAIxD"}

package/dist/services/session.js

@@ -41,34 +41,6 @@ export function generateSubagentFilename(sessionId) {
 // Constants
 export const SESSION_DIR = join(homedir(), ".wave", "projects");
 const MAX_SESSION_AGE_DAYS = 14;
-const SESSION_INDEX_FILENAME = "sessions-index.json";
-/**
- * Update the session index for a project directory
- */
-async function updateSessionIndex(projectDirPath, metadata) {
-    const indexPath = join(projectDirPath, SESSION_INDEX_FILENAME);
-    let index = {
-        sessions: {},
-        lastUpdated: new Date().toISOString(),
-    };
-    try {
-        const content = await fs.readFile(indexPath, "utf8");
-        index = JSON.parse(content);
-    }
-    catch {
-        // Index doesn't exist or is invalid, start fresh
-    }
-    const { id, ...rest } = metadata;
-    index.sessions[id] = {
-        ...rest,
-        createdAt: metadata.createdAt.toISOString(),
-        lastActiveAt: metadata.lastActiveAt.toISOString(),
-        firstMessage: metadata.firstMessage || index.sessions[id]?.firstMessage,
-        parentSessionId: metadata.parentSessionId,
-    };
-    index.lastUpdated = new Date().toISOString();
-    await fs.writeFile(indexPath, JSON.stringify(index, null, 2), "utf8");
-}
 /**
  * Ensure session directory exists
  */
@@ -129,7 +101,7 @@ export async function createSession(sessionId, workdir, sessionType = "main") {
  * @param workdir - Working directory for the session
  * @param sessionType - Type of session ("main" or "subagent", defaults to "main")
  */
-export async function appendMessages(sessionId, newMessages, workdir, sessionType = "main", rootSessionId, parentSessionId) {
+export async function appendMessages(sessionId, newMessages, workdir, sessionType = "main") {
     // Do not save session files in test environment
     if (process.env.NODE_ENV === "test") {
         return;
@@ -151,47 +123,6 @@ export async function appendMessages(sessionId, newMessages, workdir, sessionTyp
     await jsonlHandler.append(filePath, newMessages, {
         atomic: false,
     });
-    // Update index
-    const encoder = new PathEncoder();
-    const projectDir = await encoder.getProjectDirectory(workdir, SESSION_DIR);
-    const lastMessage = newMessages[newMessages.length - 1];
-    // Get first message content and createdAt from existing index
-    let firstMessage;
-    let createdAt;
-    try {
-        const indexPath = join(projectDir.encodedPath, SESSION_INDEX_FILENAME);
-        const content = await fs.readFile(indexPath, "utf8");
-        const index = JSON.parse(content);
-        if (!index.sessions[sessionId]?.firstMessage) {
-            firstMessage =
-                (await getFirstMessageContent(sessionId, workdir)) || undefined;
-        }
-        if (index.sessions[sessionId]?.createdAt) {
-            createdAt = new Date(index.sessions[sessionId].createdAt);
-        }
-    }
-    catch {
-        // If index doesn't exist, this might be the first message
-        firstMessage =
-            (await getFirstMessageContent(sessionId, workdir)) || undefined;
-    }
-    // Derive createdAt from session ID if not in index
-    if (!createdAt) {
-        createdAt = new Date();
-    }
-    await updateSessionIndex(projectDir.encodedPath, {
-        id: sessionId,
-        rootSessionId,
-        parentSessionId,
-        sessionType,
-        workdir,
-        createdAt,
-        lastActiveAt: new Date(lastMessage.timestamp),
-        latestTotalTokens: lastMessage.usage
-            ? extractLatestTotalTokens([lastMessage])
-            : 0,
-        firstMessage,
-    });
 }
 /**
  * Load session data from JSONL file (new approach)
@@ -216,28 +147,20 @@ export async function loadSessionFromJsonl(sessionId, workdir, sessionType = "ma
             }
             throw error;
         }
-        const messages = await jsonlHandler.read(filePath);
+        const allMessages = await jsonlHandler.read(filePath);
+        // Find the last compact boundary — only return messages from there forward
+        let lastCompactIndex = -1;
+        for (let i = allMessages.length - 1; i >= 0; i--) {
+            if (allMessages[i].blocks?.some((b) => b.type === "compact")) {
+                lastCompactIndex = i;
+                break;
+            }
+        }
+        const messages = lastCompactIndex >= 0 ? allMessages.slice(lastCompactIndex) : allMessages;
         // Extract metadata from messages
         const lastMessage = messages.length > 0 ? messages[messages.length - 1] : null;
-        // Try to get rootSessionId and parentSessionId from index
-        let rootSessionId;
-        let parentSessionId;
-        try {
-            const encoder = new PathEncoder();
-            const projectDir = await encoder.getProjectDirectory(workdir, SESSION_DIR);
-            const indexPath = join(projectDir.encodedPath, SESSION_INDEX_FILENAME);
-            const indexContent = await fs.readFile(indexPath, "utf8");
-            const index = JSON.parse(indexContent);
-            rootSessionId = index.sessions[sessionId]?.rootSessionId;
-            parentSessionId = index.sessions[sessionId]?.parentSessionId;
-        }
-        catch {
-            // Ignore index errors
-        }
         const sessionData = {
             id: sessionId,
-            rootSessionId: rootSessionId || sessionId,
-            parentSessionId,
             messages,
             metadata: {
                 workdir,
@@ -311,29 +234,8 @@ export async function listSessionsFromJsonl(workdir) {
         const encoder = new PathEncoder();
         const baseDir = SESSION_DIR;
         const projectDir = await encoder.getProjectDirectory(workdir, baseDir);
-        // Try to read from index first
-        const indexPath = join(projectDir.encodedPath, SESSION_INDEX_FILENAME);
         const sevenDaysAgo = new Date();
         sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
-        try {
-            const indexContent = await fs.readFile(indexPath, "utf8");
-            const index = JSON.parse(indexContent);
-            const sessions = Object.entries(index.sessions)
-                .filter(([, meta]) => {
-                const lastActiveAt = new Date(meta.lastActiveAt);
-                return meta.sessionType === "main" && lastActiveAt >= sevenDaysAgo;
-            })
-                .map(([id, meta]) => ({
-                id,
-                ...meta,
-                createdAt: new Date(meta.createdAt),
-                lastActiveAt: new Date(meta.lastActiveAt),
-            }));
-            return sessions.sort((a, b) => b.lastActiveAt.getTime() - a.lastActiveAt.getTime());
-        }
-        catch {
-            // Fallback to manual listing if index fails
-        }
         let files;
         try {
             files = await fs.readdir(projectDir.encodedPath);
@@ -382,7 +284,7 @@ export async function listSessionsFromJsonl(workdir) {
                 const sessionMeta = {
                     id: sessionId,
                     sessionType: "main",
-                    subagentType: undefined, // No longer stored in metadata
+                    subagentType: undefined,
                     workdir: projectDir.originalPath,
                     createdAt: new Date(),
                     lastActiveAt,
@@ -390,7 +292,7 @@ export async function listSessionsFromJsonl(workdir) {
                         ? extractLatestTotalTokens([lastMessage])
                         : 0,
                 };
-                // Try to get first message content for the fallback/rebuild case
+                // Try to get first message content for display
                 try {
                     const firstContent = await getFirstMessageContent(sessionId, workdir);
                     if (firstContent) {
@@ -408,27 +310,7 @@ export async function listSessionsFromJsonl(workdir) {
             }
         }
         // Sort by last active time (most recently active first)
-        const sortedSessions = sessions.sort((a, b) => b.lastActiveAt.getTime() - a.lastActiveAt.getTime());
-        // Rebuild index if we had to fall back
-        try {
-            const index = {
-                sessions: {},
-                lastUpdated: new Date().toISOString(),
-            };
-            for (const session of sessions) {
-                const { id, ...rest } = session;
-                index.sessions[id] = {
-                    ...rest,
-                    createdAt: session.createdAt.toISOString(),
-                    lastActiveAt: session.lastActiveAt.toISOString(),
-                };
-            }
-            await fs.writeFile(indexPath, JSON.stringify(index, null, 2), "utf8");
-        }
-        catch (error) {
-            logger.warn(`Failed to rebuild session index for ${workdir}:`, error);
-        }
-        return sortedSessions;
+        return sessions.sort((a, b) => b.lastActiveAt.getTime() - a.lastActiveAt.getTime());
     }
     catch (error) {
         throw new Error(`Failed to list sessions: ${error}`);
@@ -462,30 +344,49 @@ export async function listAllSessions() {
                 if (!stat.isDirectory()) {
                     continue;
                 }
-                // Try to read from index first
-                const indexPath = join(projectPath, SESSION_INDEX_FILENAME);
-                try {
-                    const indexContent = await fs.readFile(indexPath, "utf8");
-                    const index = JSON.parse(indexContent);
-                    for (const [id, meta] of Object.entries(index.sessions)) {
-                        const lastActiveAt = new Date(meta.lastActiveAt);
-                        if (meta.sessionType === "main" && lastActiveAt >= sevenDaysAgo) {
-                            allSessions.push({
-                                id,
-                                ...meta,
-                                createdAt: new Date(meta.createdAt),
-                                lastActiveAt,
-                            });
+                // Scan .jsonl files in the project directory
+                const files = await fs.readdir(projectPath);
+                for (const file of files) {
+                    if (!file.endsWith(".jsonl") || file.startsWith("subagent-")) {
+                        continue;
+                    }
+                    try {
+                        const filePath = join(projectPath, file);
+                        const uuidMatch = file.match(/^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/);
+                        if (!uuidMatch)
+                            continue;
+                        const sessionId = uuidMatch[1];
+                        const jsonlHandler = new JsonlHandler();
+                        const lastMessage = await jsonlHandler.getLastMessage(filePath);
+                        let lastActiveAt;
+                        if (lastMessage) {
+                            lastActiveAt = new Date(lastMessage.timestamp);
+                        }
+                        else {
+                            const stats = await fs.stat(filePath);
+                            lastActiveAt = stats.mtime;
                         }
+                        if (lastActiveAt < sevenDaysAgo)
+                            continue;
+                        allSessions.push({
+                            id: sessionId,
+                            sessionType: "main",
+                            subagentType: undefined,
+                            workdir: projectDirName,
+                            createdAt: new Date(),
+                            lastActiveAt,
+                            latestTotalTokens: lastMessage?.usage
+                                ? extractLatestTotalTokens([lastMessage])
+                                : 0,
+                        });
+                    }
+                    catch {
+                        continue;
                     }
-                }
-                catch {
-                    // If index fails, we skip this project directory
-                    // In the future, we could scan for .jsonl files here
                 }
             }
             catch {
-                // Skip if stat fails
+                // Skip if stat/readdir fails
             }
         }
         return allSessions.sort((a, b) => b.lastActiveAt.getTime() - a.lastActiveAt.getTime());
@@ -523,26 +424,6 @@ export async function cleanupExpiredSessionsFromJsonl(workdir) {
                 if (fileAge > maxAge) {
                     await fs.unlink(filePath);
                     deletedCount++;
-                    // Remove from index if it exists
-                    try {
-                        const indexPath = join(projectDir.encodedPath, SESSION_INDEX_FILENAME);
-                        const indexContent = await fs.readFile(indexPath, "utf8");
-                        const index = JSON.parse(indexContent);
-                        const uuidMatch = file.match(/^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/);
-                        const subagentMatch = file.match(/^subagent-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/);
-                        const sessionId = uuidMatch
-                            ? uuidMatch[1]
-                            : subagentMatch
-                                ? subagentMatch[1]
-                                : null;
-                        if (sessionId && index.sessions[sessionId]) {
-                            delete index.sessions[sessionId];
-                            await fs.writeFile(indexPath, JSON.stringify(index, null, 2), "utf8");
-                        }
-                    }
-                    catch {
-                        // Ignore index update errors during cleanup
-                    }
                 }
             }
             catch {
@@ -697,21 +578,6 @@ export async function deleteSession(sessionId, workdir, sessionType = "main") {
             throw error;
         }
     }
-    // Also remove from index
-    try {
-        const encoder = new PathEncoder();
-        const projectDir = await encoder.getProjectDirectory(workdir, SESSION_DIR);
-        const indexPath = join(projectDir.encodedPath, SESSION_INDEX_FILENAME);
-        const indexContent = await fs.readFile(indexPath, "utf8");
-        const index = JSON.parse(indexContent);
-        if (index.sessions[sessionId]) {
-            delete index.sessions[sessionId];
-            await fs.writeFile(indexPath, JSON.stringify(index, null, 2), "utf8");
-        }
-    }
-    catch {
-        // Ignore index errors
-    }
 }
 /**
  * Truncate content to a maximum length, adding ellipsis if truncated.
@@ -778,38 +644,16 @@ export async function handleSessionRestoration(restoreSessionId, continueLastSes
     }
 }
 /**
- * Load the full message thread by following parentSessionId links
+ * Load the full message thread for a session.
+ * With append-only compaction, all messages are in a single file.
+ * Returns the active messages (post-compact boundary).
  * @param currentSessionId - The ID of the current session
  * @param workdir - Working directory for the session
  * @returns Promise that resolves to an array of all messages in the thread
  */
 export async function loadFullMessageThread(currentSessionId, workdir) {
-    const sessionIds = [];
-    let currentId = currentSessionId;
-    const allMessages = [];
-    while (currentId) {
-        const sessionData = await loadSessionFromJsonl(currentId, workdir);
-        if (!sessionData)
-            break;
-        sessionIds.unshift(currentId);
-        // Add messages from this session to the beginning of the list
-        // But skip the "compact" block if it's not the first session in our traversal (which is the latest)
-        // Actually, we should probably keep all messages and let the UI/logic handle it.
-        // But wait, if we are concatenating, the "compact" block in session N summarizes session N-1.
-        // So if we have session N-1 and session N, we should probably skip the compact block in session N.
-        const messages = sessionData.messages;
-        if (allMessages.length > 0) {
-            // If we already have messages (from "later" sessions),
-            // we are now adding messages from an "earlier" session.
-            // The later session's first message might be a "compact" block.
-            if (allMessages[0].blocks.some((b) => b.type === "compact")) {
-                // Remove the compact block from the later session's messages
-                // because we are now providing the actual messages it summarized.
-                allMessages.shift();
-            }
-        }
-        allMessages.unshift(...messages);
-        currentId = sessionData.parentSessionId;
-    }
-    return { messages: allMessages, sessionIds };
+    const sessionData = await loadSessionFromJsonl(currentSessionId, workdir);
+    if (!sessionData)
+        return { messages: [], sessionIds: [] };
+    return { messages: sessionData.messages, sessionIds: [currentSessionId] };
 }

package/dist/telemetry/sessionTracing.d.ts

@@ -10,7 +10,7 @@
  * endLLMRequestSpan, aligning with Claude Code's approach.
  */
 import type { Span } from "@opentelemetry/api";
-import type { LLMRequestMetadata, ToolMetadata } from "../types/telemetry.js";
+import type { LLMRequestMetadata, LLMRequestInput, ToolMetadata } from "../types/telemetry.js";
 /**
  * Creates an interaction span for a user turn.
  * The span is stored in interactionContext for the duration of the turn.
@@ -20,16 +20,26 @@ export declare function startInteractionSpan(userPrompt: string, sequence: numbe
  * Ends the current interaction span and clears the context.
  */
 export declare function endInteractionSpan(): void;
+/**
+ * Resets incremental tracing state. Should be called after compaction to
+ * prevent incorrect delta calculations.
+ */
+export declare function resetTracingState(): void;
 /**
  * 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.
+ *
+ * When logToolContent is enabled, captures:
+ * - system_prompt_hash / system_prompt_preview / system_prompt_length
+ * - new_context (incremental messages delta)
+ * - tools (JSON array of {name, hash}) / tools_count
  */
-export declare function startLLMRequestSpan(model: string, options?: {
-    context?: string;
-}): Span | undefined;
+export declare function startLLMRequestSpan(model: string, options?: LLMRequestInput): Span | undefined;
 /**
  * Ends an LLM request span with response metadata.
  * The span is passed explicitly — no ALS is read or modified.
+ *
+ * When logToolContent is enabled, captures response.model_output.
  */
 export declare function endLLMRequestSpan(span: Span | undefined, metadata: LLMRequestMetadata): void;
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"sessionTracing.d.ts","sourceRoot":"","sources":["../../src/telemetry/sessionTracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAM/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAkB9E;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,IAAI,GAAG,SAAS,CAiBlB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAKzC;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAC7B,IAAI,GAAG,SAAS,CAsBlB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,IAAI,GAAG,SAAS,EACtB,QAAQ,EAAE,kBAAkB,GAC3B,IAAI,CAmBN;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,OAAO,GACd,IAAI,GAAG,SAAS,CA4BlB;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAmBxD"}
+{"version":3,"file":"sessionTracing.d.ts","sourceRoot":"","sources":["../../src/telemetry/sessionTracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAO/C,OAAO,KAAK,EACV,kBAAkB,EAClB,eAAe,EACf,YAAY,EACb,MAAM,uBAAuB,CAAC;AAgD/B;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,IAAI,GAAG,SAAS,CAiBlB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAKzC;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAIxC;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,eAAe,GACxB,IAAI,GAAG,SAAS,CA2GlB;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,IAAI,GAAG,SAAS,EACtB,QAAQ,EAAE,kBAAkB,GAC3B,IAAI,CAiCN;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,OAAO,GACd,IAAI,GAAG,SAAS,CA8BlB;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAoBxD"}