@travisennis/acai 0.0.9 → 0.0.11

package/dist/repl/project-status.d.ts

@@ -3,6 +3,7 @@ export interface ProjectStatusData {
     isGitRepository: boolean;
     branch?: string;
     hasChanges: boolean;
+    unpushedCommits: number;
     fileChanges: {
         added: number;
         modified: number;

package/dist/repl/project-status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-status.d.ts","sourceRoot":"","sources":["../../source/repl/project-status.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE;QACX,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,SAAS,EAAE;QACT,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAqFD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAEnE;AAID,wBAAgB,uBAAuB,IAAI,IAAI,CAE9C"}
+{"version":3,"file":"project-status.d.ts","sourceRoot":"","sources":["../../source/repl/project-status.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE;QACX,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,SAAS,EAAE;QACT,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAwFD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAEnE;AAID,wBAAgB,uBAAuB,IAAI,IAAI,CAE9C"}

package/dist/repl/project-status.js

@@ -1,4 +1,4 @@
-import { getCurrentBranch, getDiffStat, getGitStatus, inGitDirectory, } from "../utils/git.js";
+import { getCurrentBranch, getDiffStat, getGitStatus, getUnpushedCommitsCount, inGitDirectory, } from "../utils/git.js";
 // Cache for project status to prevent excessive Git operations
 class ProjectStatus {
     cachedStatus = null;
@@ -31,6 +31,7 @@ class ProjectStatus {
                 deletions: 0,
             },
             hasChanges: false,
+            unpushedCommits: 0,
         };
         if (await inGitDirectory()) {
             // Generate fresh status
@@ -40,11 +41,13 @@ class ProjectStatus {
                 fileChanges.deleted > 0 ||
                 fileChanges.modified > 0;
             const stats = await getDiffStat();
+            const unpushedCommits = await getUnpushedCommitsCount();
             status = {
                 path: currentDir,
                 isGitRepository: true,
                 branch: branch ?? undefined,
                 hasChanges,
+                unpushedCommits,
                 fileChanges: {
                     added: fileChanges.added,
                     modified: fileChanges.modified,

package/dist/sessions/manager.d.ts

@@ -5,11 +5,60 @@ import type { ModelManager } from "../models/manager.ts";
 import type { TokenTracker } from "../tokens/tracker.ts";
 export type UserMessageContentItem = string | ImagePart;
 export declare function createUserMessage(contentItems: UserMessageContentItem[], prompt?: string): UserModelMessage;
+export declare function sanitizeResponseMessages(messages: ResponseMessage[]): ResponseMessage[];
 /**
 A message that was generated during the generation process.
 It can be either an assistant message or a tool message.
  */
 type ResponseMessage = AssistantModelMessage | ToolModelMessage;
+/**
+ * Compact token usage stored in session files.
+ * Only stores total aggregated usage and last turn's usage
+ * to minimize session file size while maintaining necessary information.
+ */
+type SessionTokenUsage = {
+    /** Aggregated total for entire session */
+    total: {
+        inputTokens: number;
+        outputTokens: number;
+        totalTokens: number;
+        cachedInputTokens: number;
+        reasoningTokens: number;
+        estimatedCost: number;
+    };
+    /** Last turn's usage (for context window display) */
+    lastTurn: {
+        inputTokens: number;
+        outputTokens: number;
+        totalTokens: number;
+        cachedInputTokens: number;
+        reasoningTokens: number;
+        estimatedCost: number;
+    };
+};
+/**
+ * @deprecated Use SessionTokenUsage instead. Kept for backward compatibility
+ * with older session files that may have the old format.
+ */
+type TokenUsageTurn = {
+    stepIndex: number;
+    inputTokens: number;
+    outputTokens: number;
+    totalTokens: number;
+    cachedInputTokens: number;
+    reasoningTokens: number;
+    inputTokenDetails: {
+        noCacheTokens: number;
+        cacheReadTokens: number;
+        cacheWriteTokens: number;
+    };
+    outputTokenDetails: {
+        textTokens: number;
+        reasoningTokens: number;
+    };
+    timestamp: number;
+    estimatedCost: number;
+};
 type SavedMessageHistory = {
     project: string;
     sessionId: string;
@@ -18,6 +67,8 @@ type SavedMessageHistory = {
     createdAt: Date;
     updatedAt: Date;
     messages: ModelMessage[];
+    tokenUsage?: SessionTokenUsage | TokenUsageTurn[];
+    metadata?: Record<string, unknown>;
 };
 interface MessageHistoryEvents {
     "update-title": [string];
@@ -34,15 +85,23 @@ export declare class SessionManager extends EventEmitter<MessageHistoryEvents> {
     private contextWindow;
     private modelManager;
     private tokenTracker;
+    private tokenUsage;
+    private transientMessages;
+    private metadata;
     constructor({ stateDir, modelManager, tokenTracker, }: {
         stateDir: string;
         modelManager: ModelManager;
         tokenTracker: TokenTracker;
     });
+    private createEmptyTokenUsage;
     create(modelId: string): void;
     setModelId(modelId: string): void;
     private validMessage;
     get(): ModelMessage[];
+    setTransientMessages(messages: UserModelMessage[]): void;
+    clearTransientMessages(): void;
+    setMetadata(key: string, value: unknown): void;
+    getMetadata(key: string): unknown;
     clear(): void;
     setContextWindow(contextWindow: number): void;
     getContextWindow(): number;
@@ -67,8 +126,41 @@ export declare class SessionManager extends EventEmitter<MessageHistoryEvents> {
     getTitle(): string;
     getCreatedAt(): Date;
     getUpdatedAt(): Date;
+    getSessionFileName(): string;
+    getSessionFilePath(): string;
     static load(stateDir: string, count?: number): Promise<SavedMessageHistory[]>;
     restore(savedHistory: SavedMessageHistory): void;
+    recordTurnUsage(usage: {
+        inputTokens: number;
+        outputTokens: number;
+        totalTokens: number;
+        cachedInputTokens: number;
+        reasoningTokens: number;
+        inputTokenDetails: {
+            noCacheTokens: number;
+            cacheReadTokens: number;
+            cacheWriteTokens: number;
+        };
+        outputTokenDetails: {
+            textTokens: number;
+            reasoningTokens: number;
+        };
+    }): void;
+    /**
+     * @deprecated This method returns an empty array since we no longer store
+     * per-turn usage data. Use getTotalTokenUsage() or getLastTurnContextWindow() instead.
+     */
+    getTokenUsage(): TokenUsageTurn[];
+    getTotalTokenUsage(): {
+        inputTokens: number;
+        outputTokens: number;
+        totalTokens: number;
+        cachedInputTokens: number;
+        reasoningTokens: number;
+        estimatedCost: number;
+    };
+    getLastTurnContextWindow(): number;
+    clearTokenUsage(): void;
 }
 export {};
 //# sourceMappingURL=manager.d.ts.map

package/dist/sessions/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../source/sessions/manager.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,aAAa,CAAC;AAYvC,OAAO,EACL,KAAK,qBAAqB,EAE1B,KAAK,SAAS,EAAE,kBAAkB;AAClC,KAAK,YAAY,EAEjB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACtB,MAAM,IAAI,CAAC;AAGZ,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGzD,MAAM,MAAM,sBAAsB,GAAG,MAAM,GAAG,SAAS,CAAC;AAExD,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,sBAAsB,EAAE,EACtC,MAAM,CAAC,EAAE,MAAM,GACd,gBAAgB,CAuBlB;AAcD;;;GAGG;AACH,KAAK,eAAe,GAAG,qBAAqB,GAAG,gBAAgB,CAAC;AAEhE,KAAK,mBAAmB,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,QAAQ,EAAE,YAAY,EAAE,CAAC;CAC1B,CAAC;AAUF,UAAU,oBAAoB;IAC5B,cAAc,EAAE,CAAC,MAAM,CAAC,CAAC;IACzB,eAAe,EAAE,EAAE,CAAC;CACrB;AAED,qBAAa,cAAe,SAAQ,YAAY,CAAC,oBAAoB,CAAC;IACpE,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,YAAY,CAAe;gBAEvB,EACV,QAAQ,EACR,YAAY,EACZ,YAAY,GACb,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,YAAY,CAAC;QAC3B,YAAY,EAAE,YAAY,CAAC;KAC5B;IAcD,MAAM,CAAC,OAAO,EAAE,MAAM;IAStB,UAAU,CAAC,OAAO,EAAE,MAAM;IAI1B,OAAO,CAAC,YAAY;IAoBpB,GAAG;IAIH,KAAK;IAML,gBAAgB,CAAC,aAAa,EAAE,MAAM;IAOtC,gBAAgB;IAIhB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IACpC,iBAAiB,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI;IAmB9C,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IACzC,sBAAsB,CAAC,GAAG,EAAE,qBAAqB,GAAG,IAAI;IAOxD,kBAAkB,CAAC,kBAAkB,EAAE,gBAAgB,EAAE;IAKzD,sBAAsB,CAAC,gBAAgB,EAAE,eAAe,EAAE;IAO1D,OAAO;IAID,IAAI;YA+DI,aAAa;IA6D3B,mBAAmB,IAAI,gBAAgB,GAAG,SAAS;IAOnD,kBAAkB,IAAI,gBAAgB,GAAG,SAAS;IAOlD;;;OAGG;IACH,cAAc,IAAI,MAAM,GAAG,IAAI;IA4C/B,YAAY,IAAI,MAAM;IAItB,UAAU,IAAI,MAAM;IAIpB,QAAQ,IAAI,MAAM;IAIlB,YAAY,IAAI,IAAI;IAIpB,YAAY,IAAI,IAAI;WAIP,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,KAAK,SAAK,GACT,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAiGjC,OAAO,CAAC,YAAY,EAAE,mBAAmB,GAAG,IAAI;CAejD"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../source/sessions/manager.ts"],"names":[],"mappings":"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"}

package/dist/sessions/manager.js

@@ -4,8 +4,8 @@ import { mkdir, readdir, readFile, rename, stat, unlink, writeFile, } from "node
 import { basename, join } from "node:path";
 import { isString } from "@travisennis/stdlib/typeguards";
 import { generateText, } from "ai";
-import { dedent } from "../dedent.js";
-import { logger } from "../logger.js";
+import { dedent } from "../utils/dedent.js";
+import { logger } from "../utils/logger.js";
 export function createUserMessage(contentItems, prompt) {
     const messageParts = [];
     // Process content items (images and pre-defined texts)
@@ -39,6 +39,68 @@ function createAssistantMessage(content) {
         ],
     };
 }
+function isPlainObject(x) {
+    return typeof x === "object" && x !== null && !Array.isArray(x);
+}
+function sanitizeToolCallInput(input) {
+    // If it's already a valid plain object, return as-is
+    if (isPlainObject(input)) {
+        return { sanitized: input, isValid: true };
+    }
+    // If it's a string, try to parse it as JSON
+    if (typeof input === "string") {
+        try {
+            const parsed = JSON.parse(input);
+            if (isPlainObject(parsed)) {
+                return { sanitized: parsed, isValid: true };
+            }
+        }
+        catch {
+            // JSON parsing failed - this is malformed JSON
+            logger.warn({ originalInput: input.slice(0, 100) }, "Filtered tool call with malformed JSON input");
+            return { sanitized: {}, isValid: false };
+        }
+    }
+    // For any other case (undefined, null, array, etc.)
+    logger.warn({ originalInput: typeof input === "string" ? input.slice(0, 100) : input }, "Filtered tool call with invalid input type");
+    return { sanitized: {}, isValid: false };
+}
+/**
+ * Check if a tool call input is valid and return sanitized version.
+ * This helper reduces complexity by extracting validation logic.
+ */
+function sanitizeToolCallPart(part) {
+    if (part.type !== "tool-call") {
+        return null; // Not a tool call, keep as-is
+    }
+    const { sanitized, isValid } = sanitizeToolCallInput(part.input);
+    if (!isValid) {
+        logger.debug({ toolName: part.toolName }, "Sanitized invalid tool call input");
+    }
+    // Always keep tool calls so the model can see the corresponding tool-result
+    return { ...part, input: sanitized };
+}
+export function sanitizeResponseMessages(messages) {
+    return messages.map((msg) => {
+        if (msg.role !== "assistant" || !Array.isArray(msg.content)) {
+            return msg;
+        }
+        // Sanitize tool call inputs while always preserving the tool-call itself.
+        // The model needs to see every tool-call to match it with its tool-result.
+        const sanitizedContent = [];
+        for (const part of msg.content) {
+            const sanitized = sanitizeToolCallPart(part);
+            if (sanitized === null) {
+                // Not a tool call, keep as-is
+                sanitizedContent.push(part);
+            }
+            else {
+                sanitizedContent.push(sanitized);
+            }
+        }
+        return { ...msg, content: sanitizedContent };
+    });
+}
 export class SessionManager extends EventEmitter {
     history;
     sessionId;
@@ -50,6 +112,9 @@ export class SessionManager extends EventEmitter {
     contextWindow;
     modelManager;
     tokenTracker;
+    tokenUsage;
+    transientMessages = [];
+    metadata = {};
     constructor({ stateDir, modelManager, tokenTracker, }) {
         super();
         this.history = [];
@@ -62,6 +127,27 @@ export class SessionManager extends EventEmitter {
         this.contextWindow = 0;
         this.modelManager = modelManager;
         this.tokenTracker = tokenTracker;
+        this.tokenUsage = null;
+    }
+    createEmptyTokenUsage() {
+        return {
+            total: {
+                inputTokens: 0,
+                outputTokens: 0,
+                totalTokens: 0,
+                cachedInputTokens: 0,
+                reasoningTokens: 0,
+                estimatedCost: 0,
+            },
+            lastTurn: {
+                inputTokens: 0,
+                outputTokens: 0,
+                totalTokens: 0,
+                cachedInputTokens: 0,
+                reasoningTokens: 0,
+                estimatedCost: 0,
+            },
+        };
     }
     create(modelId) {
         this.clear();
@@ -90,11 +176,35 @@ export class SessionManager extends EventEmitter {
         return true;
     }
     get() {
-        return [...this.history].filter(this.validMessage);
+        const history = [...this.history].filter(this.validMessage);
+        if (this.transientMessages.length > 0 && history.length > 0) {
+            const lastIndex = history.length - 1;
+            return [
+                ...history.slice(0, lastIndex),
+                ...this.transientMessages,
+                history[lastIndex],
+            ];
+        }
+        return history;
+    }
+    setTransientMessages(messages) {
+        this.transientMessages = messages;
+    }
+    clearTransientMessages() {
+        this.transientMessages = [];
+    }
+    setMetadata(key, value) {
+        this.metadata[key] = value;
+    }
+    getMetadata(key) {
+        return this.metadata[key];
     }
     clear() {
         this.history.length = 0;
+        this.transientMessages = [];
+        this.metadata = {};
         this.contextWindow = 0;
+        this.tokenUsage = null;
         this.emit("clear-history");
     }
     setContextWindow(contextWindow) {
@@ -128,12 +238,31 @@ export class SessionManager extends EventEmitter {
     }
     appendToolMessages(toolResultMessages) {
         this.updatedAt = new Date();
-        this.history.push(...toolResultMessages);
+        // Collect existing tool-result IDs to prevent duplicates
+        // (the AI SDK may include tool-results that acai also creates)
+        const existingIds = new Set();
+        for (const msg of this.history) {
+            if (msg.role === "tool" && Array.isArray(msg.content)) {
+                for (const part of msg.content) {
+                    if (part.type === "tool-result") {
+                        existingIds.add(part.toolCallId);
+                    }
+                }
+            }
+        }
+        const deduplicated = toolResultMessages.filter((msg) => {
+            if (!Array.isArray(msg.content))
+                return true;
+            return !msg.content.some((part) => part.type === "tool-result" && existingIds.has(part.toolCallId));
+        });
+        this.history.push(...deduplicated);
     }
     appendResponseMessages(responseMessages) {
         this.updatedAt = new Date();
+        // Sanitize tool call inputs to prevent malformed JSON from poisoning history
+        const sanitizedMessages = sanitizeResponseMessages(responseMessages);
         // Filter out messages with empty content arrays
-        const validMessages = responseMessages.filter(this.validMessage);
+        const validMessages = sanitizedMessages.filter(this.validMessage);
         this.history.push(...validMessages);
     }
     isEmpty() {
@@ -141,7 +270,7 @@ export class SessionManager extends EventEmitter {
     }
     async save() {
         const msgHistoryDir = this.stateDir;
-        const fileName = `message-history-${this.sessionId}.json`;
+        const fileName = this.getSessionFileName();
         const filePath = join(msgHistoryDir, fileName);
         const tempFilePath = `${filePath}.tmp`;
         // Validate data before writing
@@ -160,6 +289,8 @@ export class SessionManager extends EventEmitter {
             createdAt: this.createdAt,
             updatedAt: this.updatedAt,
             messages: this.history,
+            ...(this.tokenUsage !== null ? { tokenUsage: this.tokenUsage } : {}),
+            metadata: Object.keys(this.metadata).length > 0 ? this.metadata : undefined,
         };
         try {
             // Ensure directory exists
@@ -297,12 +428,18 @@ React Component Rendering Debug";
     getUpdatedAt() {
         return this.updatedAt;
     }
+    getSessionFileName() {
+        return `session-${this.sessionId}.json`;
+    }
+    getSessionFilePath() {
+        return join(this.stateDir, this.getSessionFileName());
+    }
     static async load(stateDir, count = 10) {
         try {
             const files = await readdir(stateDir);
-            const messageHistoryFiles = files.filter((file) => file.startsWith("message-history-") && file.endsWith(".json"));
+            const sessionFiles = files.filter((file) => file.startsWith("session-") && file.endsWith(".json"));
             // Get file stats and sort by modification time (newest first)
-            const fileStatsPromises = messageHistoryFiles.map(async (fileName) => {
+            const fileStatsPromises = sessionFiles.map(async (fileName) => {
                 const filePath = join(stateDir, fileName);
                 try {
                     const fileStat = await stat(filePath);
@@ -385,6 +522,122 @@ React Component Rendering Debug";
             typeof savedHistory.updatedAt === "string"
                 ? new Date(savedHistory.updatedAt)
                 : savedHistory.updatedAt;
-        this.history = [...savedHistory.messages]; // Use the correct internal property name and create a copy
+        // Sanitize messages while preserving original order
+        // Only sanitize assistant and tool messages (not user or system messages)
+        const sanitizedMessages = savedHistory.messages.map((msg) => {
+            if (msg.role === "assistant" || msg.role === "tool") {
+                const [sanitized] = sanitizeResponseMessages([msg]);
+                return sanitized;
+            }
+            return msg;
+        });
+        // Filter out messages with empty content arrays
+        const validMessages = sanitizedMessages.filter(this.validMessage);
+        this.history = [...validMessages];
+        // Handle tokenUsage restoration with backward compatibility
+        // Old format: TokenUsageTurn[] (array)
+        // New format: SessionTokenUsage (object with total and lastTurn)
+        if (savedHistory.tokenUsage) {
+            if (Array.isArray(savedHistory.tokenUsage)) {
+                // Old format: convert array to new format
+                const oldUsage = savedHistory.tokenUsage;
+                if (oldUsage.length > 0) {
+                    const total = oldUsage.reduce((acc, turn) => {
+                        acc.inputTokens += turn.inputTokens;
+                        acc.outputTokens += turn.outputTokens;
+                        acc.totalTokens += turn.totalTokens;
+                        acc.cachedInputTokens += turn.cachedInputTokens;
+                        acc.reasoningTokens += turn.reasoningTokens;
+                        acc.estimatedCost += turn.estimatedCost;
+                        return acc;
+                    }, {
+                        inputTokens: 0,
+                        outputTokens: 0,
+                        totalTokens: 0,
+                        cachedInputTokens: 0,
+                        reasoningTokens: 0,
+                        estimatedCost: 0,
+                    });
+                    const lastTurn = oldUsage[oldUsage.length - 1];
+                    this.tokenUsage = {
+                        total,
+                        lastTurn: {
+                            inputTokens: lastTurn.inputTokens,
+                            outputTokens: lastTurn.outputTokens,
+                            totalTokens: lastTurn.totalTokens,
+                            cachedInputTokens: lastTurn.cachedInputTokens,
+                            reasoningTokens: lastTurn.reasoningTokens,
+                            estimatedCost: lastTurn.estimatedCost,
+                        },
+                    };
+                }
+                else {
+                    this.tokenUsage = null;
+                }
+            }
+            else {
+                // New format: already SessionTokenUsage
+                this.tokenUsage = savedHistory.tokenUsage;
+            }
+        }
+        else {
+            this.tokenUsage = null;
+        }
+        this.metadata = savedHistory.metadata ?? {};
+    }
+    // Token usage tracking methods
+    recordTurnUsage(usage) {
+        const modelConfig = this.modelManager.getModelMetadata("repl");
+        const estimatedCost = usage.inputTokens * modelConfig.costPerInputToken +
+            usage.outputTokens * modelConfig.costPerOutputToken;
+        // Initialize tokenUsage if null
+        if (this.tokenUsage === null) {
+            this.tokenUsage = this.createEmptyTokenUsage();
+        }
+        // Update total
+        this.tokenUsage.total.inputTokens += usage.inputTokens;
+        this.tokenUsage.total.outputTokens += usage.outputTokens;
+        this.tokenUsage.total.totalTokens += usage.totalTokens;
+        this.tokenUsage.total.cachedInputTokens += usage.cachedInputTokens;
+        this.tokenUsage.total.reasoningTokens += usage.reasoningTokens;
+        this.tokenUsage.total.estimatedCost += estimatedCost;
+        // Update lastTurn
+        this.tokenUsage.lastTurn.inputTokens = usage.inputTokens;
+        this.tokenUsage.lastTurn.outputTokens = usage.outputTokens;
+        this.tokenUsage.lastTurn.totalTokens = usage.totalTokens;
+        this.tokenUsage.lastTurn.cachedInputTokens = usage.cachedInputTokens;
+        this.tokenUsage.lastTurn.reasoningTokens = usage.reasoningTokens;
+        this.tokenUsage.lastTurn.estimatedCost = estimatedCost;
+    }
+    /**
+     * @deprecated This method returns an empty array since we no longer store
+     * per-turn usage data. Use getTotalTokenUsage() or getLastTurnContextWindow() instead.
+     */
+    getTokenUsage() {
+        // Return empty array for backward compatibility
+        // The actual data is now stored in compact format in this.tokenUsage
+        return [];
+    }
+    getTotalTokenUsage() {
+        if (this.tokenUsage === null) {
+            return {
+                inputTokens: 0,
+                outputTokens: 0,
+                totalTokens: 0,
+                cachedInputTokens: 0,
+                reasoningTokens: 0,
+                estimatedCost: 0,
+            };
+        }
+        return { ...this.tokenUsage.total };
+    }
+    getLastTurnContextWindow() {
+        if (this.tokenUsage === null) {
+            return 0;
+        }
+        return this.tokenUsage.lastTurn.totalTokens;
+    }
+    clearTokenUsage() {
+        this.tokenUsage = null;
     }
 }

package/dist/sessions/summary.d.ts

@@ -0,0 +1,4 @@
+import type { SessionManager } from "./manager.ts";
+export declare function writeExitSummary(sessionManager: SessionManager, noSession?: boolean): void;
+export declare function printExitSummary(sessionManager: SessionManager, noSession?: boolean): void;
+//# sourceMappingURL=summary.d.ts.map

package/dist/sessions/summary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"summary.d.ts","sourceRoot":"","sources":["../../source/sessions/summary.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AA4BnD,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,SAAS,CAAC,EAAE,OAAO,GAClB,IAAI,CAIN;AAED,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,SAAS,CAAC,EAAE,OAAO,GAClB,IAAI,CAGN"}

package/dist/sessions/summary.js

@@ -0,0 +1,30 @@
+import { writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+function formatSummary(sessionManager, noSession) {
+    const sessionId = sessionManager.getSessionId();
+    const title = sessionManager.getTitle();
+    const lines = [
+        "",
+        "Session Summary",
+        `  ID:      ${sessionId}`,
+        ...(title ? [`  Title:   ${title}`] : []),
+    ];
+    // Only show file path and resume command if session is being saved
+    if (!noSession) {
+        const filePath = sessionManager.getSessionFilePath();
+        lines.push(`  File:    ${filePath}`);
+        lines.push(`  Resume:  acai --resume ${sessionId}`);
+    }
+    lines.push("");
+    return lines.join("\n");
+}
+export function writeExitSummary(sessionManager, noSession) {
+    const summary = formatSummary(sessionManager, noSession);
+    const summaryPath = join(tmpdir(), "acai-exit-summary.txt");
+    writeFileSync(summaryPath, summary, "utf-8");
+}
+export function printExitSummary(sessionManager, noSession) {
+    const summary = formatSummary(sessionManager, noSession);
+    process.stderr.write(summary);
+}

package/dist/skills/index.d.ts

@@ -0,0 +1,29 @@
+export interface Skill {
+    name: string;
+    description: string;
+    filePath: string;
+    baseDir: string;
+    source: string;
+    userInvocable: boolean;
+    disableModelInvocation: boolean;
+    allowedTools?: string;
+    arguments?: string;
+    examples?: string[];
+}
+interface LoadSkillsFromDirOptions {
+    dir: string;
+    source: string;
+    useColonPath?: boolean;
+}
+export declare function loadSkillsFromDir(options: LoadSkillsFromDirOptions, subdir?: string): Promise<Skill[]>;
+export declare class Skills {
+    private skills;
+    constructor(skills: Skill[]);
+    getAll(): Skill[];
+    getUserInvocable(): Skill[];
+    getModelInvocable(): Skill[];
+}
+export declare function loadSkills(): Promise<Skills>;
+export declare function formatSkillsForPrompt(skills: Skill[]): string;
+export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/skills/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/skills/index.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,OAAO,CAAC;IACvB,sBAAsB,EAAE,OAAO,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,UAAU,wBAAwB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAqRD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,EACjC,MAAM,SAAK,GACV,OAAO,CAAC,KAAK,EAAE,CAAC,CASlB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAU;gBAEZ,MAAM,EAAE,KAAK,EAAE;IAI3B,MAAM,IAAI,KAAK,EAAE;IAIjB,gBAAgB,IAAI,KAAK,EAAE;IAI3B,iBAAiB,IAAI,KAAK,EAAE;CAG7B;AAED,wBAAsB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAsFlD;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAgC7D"}