@travisennis/acai 0.0.7 → 0.0.8

package/dist/index.js

@@ -1,34 +1,36 @@
 #!/usr/bin/env node
+import { mkdirSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { text } from "node:stream/consumers";
 import { parseArgs } from "node:util";
-import { asyncTry } from "@travisennis/stdlib/try";
+import { asyncTry, isFailure, syncTry } from "@travisennis/stdlib/try";
 import { isDefined } from "@travisennis/stdlib/typeguards";
 import { Agent } from "./agent/index.js";
 import { Cli } from "./cli.js";
 import { CommandManager } from "./commands/manager.js";
 import { config, } from "./config.js";
 import { logger } from "./logger.js";
-import { MessageHistory } from "./messages.js";
+import { PromptError, processPrompt } from "./mentions.js";
 import { ModelManager } from "./models/manager.js";
 import { isSupportedModel } from "./models/providers.js";
 import { PromptManager } from "./prompts/manager.js";
 import { systemPrompt } from "./prompts.js";
 import { NewRepl } from "./repl-new.js";
-import { setTerminalTitle } from "./terminal/formatting.js";
+import { SessionManager } from "./sessions/manager.js";
+import { setTerminalTitle } from "./terminal/control.js";
 import { select } from "./terminal/select-prompt.js";
 import { TokenCounter } from "./tokens/counter.js";
 import { TokenTracker } from "./tokens/tracker.js";
-import { initAgents, initTools, } from "./tools/index.js";
+import { initTools } from "./tools/index.js";
 import { getPackageVersion } from "./version.js";
 // Create workspace context from CLI arguments
 export function createWorkspaceContext(addDirArgs = []) {
     const primaryDir = process.cwd();
+    mkdirSync("/tmp/acai", { recursive: true });
     const allowedDirs = [
         primaryDir,
-        "/tmp",
-        config.getAccessibleLogDir(),
+        "/tmp/acai",
         path.join(os.homedir(), ".acai"),
         ...addDirArgs,
     ];
@@ -46,20 +48,24 @@ Usage
 Options
   --model, -m        Sets the model to use
   --prompt, -p       Sets the prompt (runs in CLI mode)
-  --continue         Load the most recent conversation
-  --resume           Select a recent conversation to resume
+  --continue         Select a conversation to resume from a list
+  --resume           Resume a specific session by ID, or most recent if no ID given
   --add-dir          Add additional working directory (can be used multiple times)
   --no-skills        Disable skills discovery and loading
 
+
   --help, -h         Show help
   --version, -v      Show version
 
 Examples
-  $ acai --model anthopric:sonnet
+  $ acai --model anthropic:sonnet
   $ acai -p "initial prompt"
   $ acai --add-dir /path/to/project1 --add-dir /path/to/project2
+  $ acai --continue
+  $ acai --resume
+  $ acai --resume a1b2c3d4-e5f6-7890-1234-567890abcdef
 `;
-const parsed = parseArgs({
+const parsed = syncTry(() => parseArgs({
     options: {
         model: { type: "string", short: "m" },
         prompt: { type: "string", short: "p" },
@@ -71,9 +77,14 @@ const parsed = parseArgs({
         version: { type: "boolean", short: "v" },
     },
     allowPositionals: true,
-});
-const flags = parsed.values;
-const input = parsed.positionals;
+}));
+if (isFailure(parsed)) {
+    console.error(parsed.error.message);
+    console.info(helpText);
+    process.exit(0);
+}
+const flags = parsed.unwrap().values;
+const input = parsed.unwrap().positionals;
 // Create workspace context from CLI arguments
 const workspace = createWorkspaceContext(flags["add-dir"]);
 /**
@@ -88,7 +99,7 @@ export function handleError(error) {
 const DEFAULT_HISTORY_LIMIT = 10;
 const CONTINUE_HISTORY_LIMIT = 1;
 // Helper functions for main()
-async function initializeAppState(appConfig, initialPromptInput, stdInPrompt, hasContinueOrResume) {
+async function initializeAppState(appConfig, initialPromptInput, stdInPrompt, hasContinueOrResume, resumeSessionId) {
     const appDir = config.app;
     // Parallelize independent async operations
     const [messageHistoryDir, modelManager] = await Promise.all([
@@ -99,13 +110,32 @@ async function initializeAppState(appConfig, initialPromptInput, stdInPrompt, ha
     const tokenTracker = new TokenTracker();
     const tokenCounter = new TokenCounter();
     // Initialize dependent components
-    const messageHistory = await initializeMessageHistory(messageHistoryDir, modelManager, tokenTracker);
+    const sessionManager = await initializeSessionManager(messageHistoryDir, modelManager, tokenTracker);
     // Handle conversation history loading
-    await handleConversationHistory(messageHistory, messageHistoryDir, hasContinueOrResume);
+    await handleConversationHistory(sessionManager, messageHistoryDir, hasContinueOrResume, resumeSessionId);
     // Setup prompt manager
     const promptManager = new PromptManager(tokenCounter);
     if (!hasContinueOrResume && isDefined(initialPromptInput)) {
-        promptManager.set(initialPromptInput);
+        try {
+            const modelConfig = modelManager.getModelMetadata("repl");
+            const processedPrompt = await processPrompt(initialPromptInput, {
+                baseDir: process.cwd(),
+                model: modelConfig,
+            });
+            for (const context of processedPrompt.context) {
+                promptManager.addContext(context);
+            }
+            promptManager.set(processedPrompt.message);
+        }
+        catch (error) {
+            if (error instanceof PromptError) {
+                logger.error(`Prompt mention error: ${error.message}`);
+                promptManager.set(initialPromptInput);
+            }
+            else {
+                throw new Error("Failed to process prompt.", { cause: error });
+            }
+        }
     }
     if (stdInPrompt) {
         promptManager.addContext(stdInPrompt);
@@ -114,7 +144,7 @@ async function initializeAppState(appConfig, initialPromptInput, stdInPrompt, ha
     const commands = new CommandManager({
         promptManager,
         modelManager,
-        messageHistory,
+        sessionManager,
         tokenTracker,
         config,
         tokenCounter,
@@ -127,7 +157,7 @@ async function initializeAppState(appConfig, initialPromptInput, stdInPrompt, ha
         modelManager,
         tokenTracker,
         tokenCounter,
-        messageHistory,
+        sessionManager,
         promptManager,
         promptHistory,
         commands,
@@ -144,11 +174,23 @@ async function handleEarlyExits() {
     }
     return false;
 }
+function validateSessionId(id) {
+    const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    return id.length === 36 && uuidRegex.test(id);
+}
 function validateCliArguments() {
     if (flags.continue === true && flags.resume === true) {
         console.error("Cannot use --continue and --resume flags together.");
         process.exit(1);
     }
+    if (flags.resume === true && input.length > 0) {
+        const sessionId = input[0];
+        if (!validateSessionId(sessionId)) {
+            console.error(`Invalid session ID: ${sessionId}`);
+            console.error("Session ID must be a valid UUID (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx)");
+            process.exit(1);
+        }
+    }
 }
 async function determineInitialPrompt() {
     const hasContinueOrResume = flags.continue === true || flags.resume === true;
@@ -163,21 +205,28 @@ async function determineInitialPrompt() {
             console.error(`Error reading stdin: ${error.message}`);
         }
     }
+    // Check for session ID with --resume
+    const resumeSessionId = flags.resume === true && input.length > 0 ? input[0] : undefined;
     const initialPromptInput = typeof flags.prompt === "string" && flags.prompt.length > 0
         ? flags.prompt
-        : positionalPrompt && positionalPrompt.length > 0
+        : positionalPrompt && positionalPrompt.length > 0 && !resumeSessionId
             ? positionalPrompt
             : undefined;
     if (hasContinueOrResume && isDefined(initialPromptInput)) {
         console.error("Cannot use --continue or --resume with an initial prompt.");
         process.exit(1);
     }
-    return { initialPromptInput, stdInPrompt, hasContinueOrResume };
+    return {
+        initialPromptInput,
+        stdInPrompt,
+        hasContinueOrResume,
+        resumeSessionId,
+    };
 }
 async function initializeModelManager(appDir) {
     const chosenModel = isSupportedModel(flags.model)
         ? flags.model
-        : "openrouter:glm-4.6";
+        : "opencode:minimax-m2-1";
     const modelManager = new ModelManager({
         stateDir: await appDir.ensurePath("audit"),
     });
@@ -193,36 +242,31 @@ async function initializeModelManager(appDir) {
     modelManager.setModel("edit-fix", chosenModel);
     return modelManager;
 }
-async function initializeMessageHistory(messageHistoryDir, modelManager, tokenTracker) {
-    const messageHistory = new MessageHistory({
+async function initializeSessionManager(messageHistoryDir, modelManager, tokenTracker) {
+    const messageHistory = new SessionManager({
         stateDir: messageHistoryDir,
         modelManager,
         tokenTracker,
     });
     messageHistory.on("update-title", (title) => setTerminalTitle(title));
+    // Listen for model changes and update session manager when repl model changes
+    modelManager.on("set-model", (app, _model) => {
+        if (app === "repl") {
+            const modelId = modelManager.getModel("repl").modelId;
+            messageHistory.setModelId(modelId);
+        }
+    });
     return messageHistory;
 }
-async function handleConversationHistory(messageHistory, messageHistoryDir, _hasContinueOrResume) {
+async function handleConversationHistory(messageHistory, messageHistoryDir, _hasContinueOrResume, resumeSessionId) {
     if (flags.continue === true) {
-        const histories = await MessageHistory.load(messageHistoryDir, CONTINUE_HISTORY_LIMIT);
-        const latestHistory = histories.at(0);
-        if (latestHistory) {
-            messageHistory.restore(latestHistory);
-            console.info(`Resuming conversation: ${latestHistory.title}`);
-            setTerminalTitle(latestHistory.title || `acai: ${process.cwd()}`);
-        }
-        else {
-            logger.info("No previous conversation found to continue.");
-        }
-    }
-    else if (flags.resume === true) {
-        const histories = await MessageHistory.load(messageHistoryDir, DEFAULT_HISTORY_LIMIT);
+        const histories = await SessionManager.load(messageHistoryDir, DEFAULT_HISTORY_LIMIT);
         if (histories.length > 0) {
             try {
                 const choice = await select({
                     message: "Select a conversation to resume:",
                     choices: histories.map((h, index) => ({
-                        name: `${index + 1}: ${h.title} (${h.updatedAt.toLocaleString()})`,
+                        name: `${index + 1}: ${h.title} [${h.sessionId}] (${h.updatedAt.toLocaleString()})`,
                         value: index,
                         description: `${h.messages.length} messages`,
                     })),
@@ -249,7 +293,34 @@ async function handleConversationHistory(messageHistory, messageHistoryDir, _has
             }
         }
         else {
-            logger.info("No previous conversations found to resume.");
+            logger.info("No previous conversations found to continue.");
+        }
+    }
+    else if (flags.resume === true) {
+        if (resumeSessionId) {
+            const histories = await SessionManager.load(messageHistoryDir, DEFAULT_HISTORY_LIMIT);
+            const targetHistory = histories.find((h) => h.sessionId === resumeSessionId);
+            if (targetHistory) {
+                messageHistory.restore(targetHistory);
+                logger.info(`Resuming conversation: ${targetHistory.title}`);
+                setTerminalTitle(targetHistory.title || `acai: ${process.cwd()}`);
+            }
+            else {
+                console.error(`Session not found: ${resumeSessionId}`);
+                process.exit(1);
+            }
+        }
+        else {
+            const histories = await SessionManager.load(messageHistoryDir, CONTINUE_HISTORY_LIMIT);
+            const latestHistory = histories.at(0);
+            if (latestHistory) {
+                messageHistory.restore(latestHistory);
+                console.info(`Resuming conversation: ${latestHistory.title}`);
+                setTerminalTitle(latestHistory.title || `acai: ${process.cwd()}`);
+            }
+            else {
+                logger.info("No previous conversation found to resume.");
+            }
         }
     }
 }
@@ -257,7 +328,7 @@ async function runCliMode(state) {
     const skillsEnabled = !flags["no-skills"] && (await config.getSkillsEnabled());
     const cliProcess = new Cli({
         promptManager: state.promptManager,
-        messageHistory: state.messageHistory,
+        messageHistory: state.sessionManager,
         modelManager: state.modelManager,
         tokenTracker: state.tokenTracker,
         tokenCounter: state.tokenCounter,
@@ -267,8 +338,12 @@ async function runCliMode(state) {
     (await asyncTry(cliProcess.run())).recover(handleError);
 }
 async function runReplMode(state) {
+    // Initialize tools before creating REPL (needed for session reload reconstruction)
+    const tools = await initTools({
+        workspace,
+    });
     const agent = new Agent({
-        messageHistory: state.messageHistory,
+        sessionManager: state.sessionManager,
         modelManager: state.modelManager,
         tokenTracker: state.tokenTracker,
     });
@@ -276,25 +351,30 @@ async function runReplMode(state) {
         agent,
         promptManager: state.promptManager,
         config: state.appConfig,
-        messageHistory: state.messageHistory,
+        messageHistory: state.sessionManager,
         modelManager: state.modelManager,
         tokenTracker: state.tokenTracker,
         commands: state.commands,
         tokenCounter: state.tokenCounter,
         promptHistory: state.promptHistory,
         workspace,
+        tools,
     });
     // Initialize TUI
     await repl.init();
-    state.messageHistory.on("clear-history", () => {
+    // Reconstruct session display if there are existing messages
+    if (!state.sessionManager.isEmpty()) {
+        await repl.rerender();
+    }
+    state.sessionManager.on("clear-history", () => {
         logger.info("Resetting agent state.");
         agent.resetState();
-        repl.rerender();
+        void repl.rerender();
     });
     // Set interrupt callback
-    repl.setInterruptCallback(() => {
+    repl.setInterruptCallback(async () => {
         try {
-            state.messageHistory.save();
+            await state.sessionManager.save();
         }
         catch (error) {
             // Log but don't throw - we still want to abort the agent
@@ -302,27 +382,12 @@ async function runReplMode(state) {
         }
         agent.abort();
     });
-    // Initialize tools
-    const coreTools = await initTools({
-        tokenCounter: state.tokenCounter,
-        workspace,
-        modelManager: state.modelManager,
-        tokenTracker: state.tokenTracker,
-    });
-    const agentTools = await initAgents({
-        modelManager: state.modelManager,
-        tokenTracker: state.tokenTracker,
-        tokenCounter: state.tokenCounter,
-        workspace,
+    // Set exit callback
+    repl.setExitCallback((sessionId) => {
+        if (!state.sessionManager.isEmpty()) {
+            console.info(`\nTo resume this session call acai --resume ${sessionId}`);
+        }
     });
-    const completeToolDefs = {
-        ...coreTools.toolDefs,
-        ...agentTools.toolDefs,
-    };
-    const tools = {
-        toolDefs: completeToolDefs,
-        executors: new Map([...coreTools.executors, ...agentTools.executors]),
-    };
     // Interactive loop
     while (true) {
         const userInput = await repl.getUserInput();
@@ -332,21 +397,19 @@ async function runReplMode(state) {
         try {
             const results = agent.run({
                 systemPrompt: await systemPrompt({
-                    type: projectConfig.systemPromptType,
                     activeTools,
                     allowedDirs: workspace.allowedDirs,
                     skillsEnabled,
                 }),
                 input: userInput,
-                toolDefs: tools.toolDefs,
+                tools,
                 activeTools,
-                executors: tools.executors,
                 abortSignal: agent.abortSignal,
             });
             for await (const result of results) {
-                repl.handle(result, agent.state);
+                await repl.handle(result, agent.state);
             }
-            state.messageHistory.save();
+            await state.sessionManager.save();
         }
         catch (_error) {
             // Display error in the TUI by adding an error message to the chat
@@ -365,9 +428,9 @@ async function main() {
         // Validate CLI arguments
         validateCliArguments();
         // Determine initial prompt
-        const { initialPromptInput, stdInPrompt, hasContinueOrResume } = await determineInitialPrompt();
+        const { initialPromptInput, stdInPrompt, hasContinueOrResume, resumeSessionId, } = await determineInitialPrompt();
         // Initialize application state
-        const state = await initializeAppState(appConfig, initialPromptInput, stdInPrompt, hasContinueOrResume);
+        const state = await initializeAppState(appConfig, initialPromptInput, stdInPrompt, hasContinueOrResume, resumeSessionId);
         // Set terminal title after all validation is complete
         setTerminalTitle(`acai: ${workspace.primaryDir}`);
         // Handle CLI mode if initial prompt provided
@@ -382,4 +445,4 @@ async function main() {
         process.exit(1);
     }
 }
-main();
+void main();

package/dist/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../source/logger.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAwDxB,eAAO,MAAM,MAAM,6BAIjB,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../source/logger.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAgDxB,eAAO,MAAM,MAAM,6BAIjB,CAAC"}

package/dist/logger.js

@@ -4,18 +4,11 @@ import { config } from "./config.js";
 // Create a lazy logger factory that only initializes when first used
 let loggerInstance = null;
 function createLogger() {
-    // Check if we're running in code interpreter context
-    // Try multiple detection methods:
-    // 1. Environment variable (primary method)
-    // 2. Check if we're running with Node.js permissions (fallback)
-    const isCodeInterpreter = process.env["ACAI_CODE_INTERPRETER"] === "true" ||
-        (typeof process.permission !== "undefined" &&
-            process.permission.has !== undefined);
-    if (isCodeInterpreter) {
-        // In code interpreter context, use a no-op logger to avoid noise in script output
+    const isTest = process.env["NODE_ENV"] === "test";
+    if (isTest) {
         return pino({
-            level: "silent", // Completely disable logging
-            enabled: false, // Disable the logger entirely
+            level: "silent",
+            enabled: false,
         });
     }
     // Normal file-based logging

package/dist/mentions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentions.d.ts","sourceRoot":"","sources":["../source/mentions.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAsBxD,qBAAa,WAAY,SAAQ,KAAK;gBACxB,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAI3C;AA+JD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,EACE,OAAO,EACP,KAAK,EACL,UAAU,GACX,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,aAAa,CAAC;IACrB,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC,GACA,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CA8GtD"}
+{"version":3,"file":"mentions.d.ts","sourceRoot":"","sources":["../source/mentions.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAqBxD,qBAAa,WAAY,SAAQ,KAAK;gBACxB,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAI3C;AAwID,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,EACE,OAAO,EACP,KAAK,EACL,UAAU,GACX,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,aAAa,CAAC;IACrB,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC,GACA,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CAkFtD"}

package/dist/mentions.js

@@ -1,9 +1,7 @@
 import fs from "node:fs/promises";
 import path from "node:path";
-import { isString } from "@travisennis/stdlib/typeguards";
 import { initExecutionEnvironment } from "./execution/index.js";
-import { formatFile, formatUrl } from "./formatting.js";
-import { readUrl } from "./tools/web-fetch.js";
+import { formatFile } from "./formatting.js";
 class ShellCommandError extends Error {
     command;
     exitCode;
@@ -115,35 +113,11 @@ async function processShellCommand(command) {
     }
 }
 // Returns the formatted string or an error message string
-async function processUrlCommand(context) {
-    const { match } = context;
-    const urlPath = match;
-    try {
-        return Object.assign(await readUrl(urlPath), { source: urlPath });
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            return {
-                contentType: "text/plain",
-                data: `Url: ${urlPath} Status: Error fetching URL: ${error.message}`,
-                source: urlPath,
-            };
-        }
-        // Fallback for unknown error types
-        return {
-            contentType: "text/plain",
-            data: `Url: ${urlPath} Status: Error fetching URL: An unknown error occurred.`,
-            source: urlPath,
-        };
-    }
-}
 export async function processPrompt(message, { baseDir, model, pasteStore, }) {
     const fileRegex = /@([^\s@]+(?:\.[\w\d]+))/g;
-    const urlRegex = /@(https?:\/\/[^\s]+)/g;
     const shellRegex = /!`([^`]+)`/g;
-    // Collect all matches for files and urls
+    // Collect all matches for files
     const fileMatches = Array.from(message.matchAll(fileRegex));
-    const urlMatches = Array.from(message.matchAll(urlRegex));
     const shellMatches = Array.from(message.matchAll(shellRegex));
     const mentionProcessingPromises = [];
     // Process file references - collect promises
@@ -158,18 +132,6 @@ export async function processPrompt(message, { baseDir, model, pasteStore, }) {
             mentionProcessingPromises.push(processFileCommand(context));
         }
     }
-    // Process url references - collect promises
-    for (const match of urlMatches) {
-        const firstMatch = match[1];
-        if (firstMatch) {
-            const context = {
-                model,
-                baseDir, // baseDir is not used by processUrlCommand but kept for consistency
-                match: firstMatch,
-            };
-            mentionProcessingPromises.push(processUrlCommand(context));
-        }
-    }
     let processedMessage = message;
     // Process paste placeholders
     if (pasteStore && pasteStore.size > 0) {
@@ -208,19 +170,7 @@ export async function processPrompt(message, { baseDir, model, pasteStore, }) {
     const mentionResults = await Promise.all(mentionProcessingPromises);
     const context = [];
     for (const mention of mentionResults) {
-        if (isString(mention)) {
-            context.push(mention);
-        }
-        else if (mention.data.startsWith("data")) {
-            context.push({
-                type: "image",
-                mediaType: mention.contentType,
-                image: mention.data,
-            });
-        }
-        else {
-            context.push(formatUrl(mention.source, mention.data.trim(), model.promptFormat));
-        }
+        context.push(mention);
     }
     return {
         message: processedMessage,

package/dist/middleware/audit-message.d.ts

@@ -1,6 +1,6 @@
-import type { LanguageModelV2Middleware } from "@ai-sdk/provider";
+import type { LanguageModelV3Middleware } from "@ai-sdk/provider";
 export declare const auditMessage: ({ filePath, app, }: {
     filePath: string;
     app: string;
-}) => LanguageModelV2Middleware;
+}) => LanguageModelV3Middleware;
 //# sourceMappingURL=audit-message.d.ts.map

package/dist/middleware/audit-message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audit-message.d.ts","sourceRoot":"","sources":["../../source/middleware/audit-message.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,yBAAyB,EAI1B,MAAM,kBAAkB,CAAC;AAmC1B,eAAO,MAAM,YAAY,GAAI,oBAG1B;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb,8BAoFA,CAAC"}
+{"version":3,"file":"audit-message.d.ts","sourceRoot":"","sources":["../../source/middleware/audit-message.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,yBAAyB,EAI1B,MAAM,kBAAkB,CAAC;AAmC1B,eAAO,MAAM,YAAY,GAAI,oBAG1B;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb,8BA4HA,CAAC"}

package/dist/middleware/audit-message.js

@@ -22,6 +22,7 @@ const writeAuditRecord = async (app, filePath, content) => {
 };
 export const auditMessage = ({ filePath = "messages", app = "default", }) => {
     const middleware = {
+        specificationVersion: "v3",
         wrapGenerate: async ({ doGenerate, params, model }) => {
             const result = await doGenerate();
             const msg = {
@@ -37,7 +38,21 @@ export const auditMessage = ({ filePath = "messages", app = "default", }) => {
                         },
                     ],
                 }),
-                usage: result.usage,
+                usage: {
+                    inputTokens: result.usage.inputTokens.total,
+                    outputTokens: result.usage.outputTokens.total,
+                    totalTokens: (result.usage.inputTokens.total ?? 0) +
+                        (result.usage.outputTokens.total ?? 0),
+                    inputTokenDetails: {
+                        noCacheTokens: result.usage.inputTokens.noCache,
+                        cacheReadTokens: result.usage.inputTokens.cacheRead,
+                        cacheWriteTokens: result.usage.inputTokens.cacheWrite,
+                    },
+                    outputTokenDetails: {
+                        textTokens: result.usage.outputTokens.text,
+                        reasoningTokens: result.usage.outputTokens.reasoning,
+                    },
+                },
                 timestamp: Date.now(),
             };
             await writeAuditRecord(app, filePath, msg);
@@ -50,6 +65,15 @@ export const auditMessage = ({ filePath = "messages", app = "default", }) => {
                 inputTokens: 0,
                 outputTokens: 0,
                 totalTokens: 0,
+                inputTokenDetails: {
+                    noCacheTokens: 0,
+                    cacheReadTokens: 0,
+                    cacheWriteTokens: 0,
+                },
+                outputTokenDetails: {
+                    textTokens: 0,
+                    reasoningTokens: 0,
+                },
             };
             const transformStream = new TransformStream({
                 transform(chunk, controller) {
@@ -57,7 +81,21 @@ export const auditMessage = ({ filePath = "messages", app = "default", }) => {
                         generatedText += chunk.delta;
                     }
                     if (chunk.type === "finish") {
-                        usage = chunk.usage;
+                        usage = {
+                            inputTokens: chunk.usage.inputTokens.total,
+                            outputTokens: chunk.usage.outputTokens.total,
+                            totalTokens: (chunk.usage.inputTokens.total ?? 0) +
+                                (chunk.usage.outputTokens.total ?? 0),
+                            inputTokenDetails: {
+                                noCacheTokens: chunk.usage.inputTokens.noCache,
+                                cacheReadTokens: chunk.usage.inputTokens.cacheRead,
+                                cacheWriteTokens: chunk.usage.inputTokens.cacheWrite,
+                            },
+                            outputTokenDetails: {
+                                textTokens: chunk.usage.outputTokens.text,
+                                reasoningTokens: chunk.usage.outputTokens.reasoning,
+                            },
+                        };
                     }
                     controller.enqueue(chunk);
                 },

package/dist/middleware/cache.d.ts

@@ -1,3 +1,3 @@
-import type { LanguageModelV2Middleware } from "@ai-sdk/provider";
-export declare const cacheMiddleware: LanguageModelV2Middleware;
+import type { LanguageModelV3Middleware } from "@ai-sdk/provider";
+export declare const cacheMiddleware: LanguageModelV3Middleware;
 //# sourceMappingURL=cache.d.ts.map

package/dist/middleware/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../source/middleware/cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EAE1B,MAAM,kBAAkB,CAAC;AAsB1B,eAAO,MAAM,eAAe,EAAE,yBAyC7B,CAAC"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../source/middleware/cache.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,yBAAyB,EAE1B,MAAM,kBAAkB,CAAC;AA+F1B,eAAO,MAAM,eAAe,EAAE,yBAqF7B,CAAC"}