@travisennis/acai 0.0.5 → 0.0.6

package/dist/index.js

@@ -3,6 +3,7 @@ import { text } from "node:stream/consumers";
 import { parseArgs } from "node:util";
 import { asyncTry } 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";
@@ -11,40 +12,53 @@ import { MessageHistory } from "./messages.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 { Repl } from "./repl.js";
+import { NewRepl } from "./repl-new.js";
 import { initTerminal } from "./terminal/index.js";
 import { select } from "./terminal/select-prompt.js";
 import { TokenCounter } from "./tokens/counter.js";
 import { TokenTracker } from "./tokens/tracker.js";
-import { ToolExecutor } from "./tool-executor.js";
+import { initAgents, initTools } from "./tools/index.js";
 import { getPackageVersion } from "./version.js";
+// Create workspace context from CLI arguments
+export function createWorkspaceContext(addDirArgs = []) {
+    const primaryDir = process.cwd();
+    const allowedDirs = [primaryDir, ...addDirArgs];
+    // Remove duplicates while preserving order
+    const uniqueDirs = allowedDirs.filter((dir, index, array) => array.indexOf(dir) === index);
+    return {
+        primaryDir,
+        allowedDirs: uniqueDirs,
+    };
+}
 const helpText = `
 Usage
   $ acai <input>
 
 Options
   --model, -m        Sets the model to use
-  --prompt, -p       Sets the prompt
-  --oneshot, -o      Run once and exit
+  --prompt, -p       Sets the prompt (runs in CLI mode)
   --continue         Load the most recent conversation
   --resume           Select a recent conversation to resume
-  --autoAcceptAll    Accept all commands and edits without prompting
+  --add-dir          Add additional working directory (can be used multiple times)
+  --new-repl
   --help, -h         Show help
   --version, -v      Show version
 
 Examples
   $ acai --model anthopric:sonnet
   $ acai -p "initial prompt"
-  $ acai -p "one-shot prompt" -o
+  $ acai --add-dir /path/to/project1 --add-dir /path/to/project2
 `;
 const parsed = parseArgs({
     options: {
         model: { type: "string", short: "m" },
         prompt: { type: "string", short: "p" },
-        oneshot: { type: "boolean", short: "o", default: false },
         continue: { type: "boolean", default: false },
         resume: { type: "boolean", default: false },
-        autoAcceptAll: { type: "boolean", default: false },
+        "add-dir": { type: "string", multiple: true },
+        "new-repl": { type: "boolean" },
         help: { type: "boolean", short: "h" },
         version: { type: "boolean", short: "v" },
     },
@@ -52,6 +66,8 @@ const parsed = parseArgs({
 });
 const flags = parsed.values;
 const input = parsed.positionals;
+// Create workspace context from CLI arguments
+const workspace = createWorkspaceContext(flags["add-dir"]);
 /**
  * Global error handler function.
  * @param {Error} error - The error to be handled.
@@ -78,10 +94,6 @@ async function main() {
         process.exit(1);
     }
     const hasContinueOrResume = flags.continue === true || flags.resume === true;
-    if (hasContinueOrResume && flags.oneshot === true) {
-        console.error("Cannot use --continue or --resume with --oneshot.");
-        process.exit(1);
-    }
     // --- Determine Initial Prompt (potential conflict) ---
     const positionalPrompt = input.at(0);
     let stdInPrompt;
@@ -105,10 +117,10 @@ async function main() {
         process.exit(1);
     }
     const terminal = initTerminal();
-    terminal.setTitle(`acai: ${process.cwd()}`);
+    terminal.setTitle(`acai: ${workspace.primaryDir}`);
     const chosenModel = isSupportedModel(flags.model)
         ? flags.model
-        : "openrouter:glm-4.5";
+        : "openrouter:glm-4.6";
     const modelManager = new ModelManager({
         stateDir: await appDir.ensurePath("audit"),
     });
@@ -119,7 +131,9 @@ async function main() {
     modelManager.setModel("tool-repair", "openai:gpt-4.1");
     modelManager.setModel("conversation-analyzer", "openrouter:gemini-flash25");
     modelManager.setModel("init-project", chosenModel);
-    modelManager.setModel("task-agent", "openrouter:gemini-flash25");
+    modelManager.setModel("task-agent", "openrouter:gpt-5-mini");
+    modelManager.setModel("handoff-agent", chosenModel);
+    modelManager.setModel("edit-fix", "openrouter:gemini-flash25");
     const tokenTracker = new TokenTracker();
     const tokenCounter = new TokenCounter();
     const messageHistory = new MessageHistory({
@@ -144,31 +158,44 @@ async function main() {
     else if (flags.resume === true) {
         const histories = await MessageHistory.load(messageHistoryDir, 10);
         if (histories.length > 0) {
-            const choice = await select({
-                message: "Select a conversation to resume:",
-                choices: histories.map((h, index) => ({
-                    name: `${index + 1}: ${h.title} (${h.updatedAt.toLocaleString()})`,
-                    value: index,
-                    description: `${h.messages.length} messages`,
-                })),
-            });
-            const selectedHistory = histories.at(choice);
-            if (selectedHistory) {
-                messageHistory.restore(selectedHistory);
-                logger.info(`Resuming conversation: ${selectedHistory.title}`);
-                // Set terminal title after restoring
-                terminal.setTitle(selectedHistory.title || `acai: ${process.cwd()}`);
+            try {
+                const choice = await select({
+                    message: "Select a conversation to resume:",
+                    choices: histories.map((h, index) => ({
+                        name: `${index + 1}: ${h.title} (${h.updatedAt.toLocaleString()})`,
+                        value: index,
+                        description: `${h.messages.length} messages`,
+                    })),
+                });
+                const selectedHistory = histories.at(choice);
+                if (selectedHistory) {
+                    messageHistory.restore(selectedHistory);
+                    logger.info(`Resuming conversation: ${selectedHistory.title}`);
+                    // Set terminal title after restoring
+                    terminal.setTitle(selectedHistory.title || `acai: ${process.cwd()}`);
+                }
+                else {
+                    // This case should theoretically not happen if choice is valid
+                    logger.error("Selected history index out of bounds.");
+                }
             }
-            else {
-                // This case should theoretically not happen if choice is valid
-                logger.error("Selected history index out of bounds.");
+            catch (error) {
+                // Handle Ctrl-C cancellation
+                if (error instanceof Error &&
+                    "isCanceled" in error &&
+                    error.isCanceled === true) {
+                    logger.info("Resume selection cancelled.");
+                }
+                else {
+                    // Re-throw other errors
+                    throw error;
+                }
             }
         }
         else {
             logger.info("No previous conversations found to resume.");
         }
     }
-    const toolExecutor = new ToolExecutor(flags.autoAcceptAll === true);
     // --- Setup Prompt Manager (only if not continuing/resuming) ---
     const promptManager = new PromptManager(tokenCounter);
     if (!hasContinueOrResume && isDefined(initialPromptInput)) {
@@ -177,7 +204,6 @@ async function main() {
     if (stdInPrompt) {
         promptManager.addContext(stdInPrompt);
     }
-    const toolEvents = new Map();
     const promptHistory = [];
     const commands = new CommandManager({
         promptManager,
@@ -187,12 +213,11 @@ async function main() {
         tokenTracker,
         config,
         tokenCounter,
-        toolExecutor,
-        toolEvents,
         promptHistory,
+        workspace,
     });
     await commands.initializeCommmands();
-    if (flags.oneshot === true) {
+    if (isDefined(initialPromptInput)) {
         const cliProcess = new Cli({
             promptManager,
             config: appConfig,
@@ -200,9 +225,87 @@ async function main() {
             modelManager,
             tokenTracker,
             tokenCounter,
+            workspace,
         });
         return (await asyncTry(cliProcess.run())).recover(handleError);
     }
+    const agent = new Agent({
+        messageHistory,
+        modelManager,
+        tokenTracker,
+    });
+    if (flags["new-repl"]) {
+        const repl = new NewRepl({
+            agent,
+            promptManager,
+            terminal,
+            config: appConfig,
+            messageHistory,
+            modelManager,
+            tokenTracker,
+            commands,
+            tokenCounter,
+            promptHistory,
+            workspace,
+        });
+        // Initialize TUI
+        await repl.init();
+        messageHistory.on("clear-history", () => {
+            logger.info("Resetting agent state.");
+            agent.resetState();
+            repl.rerender();
+        });
+        // Set interrupt callback
+        repl.setInterruptCallback(() => {
+            agent.abort();
+        });
+        // Render any existing messages (from --continue mode)
+        // repl.renderInitialMessages(agent.state);
+        // Initialize tools once outside the loop - all models support tool calling
+        const coreTools = await initTools({
+            tokenCounter,
+            workspace,
+            modelManager,
+            tokenTracker,
+        });
+        const agentTools = await initAgents({
+            terminal,
+            modelManager,
+            tokenTracker,
+            tokenCounter,
+            workspace,
+        });
+        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();
+            // Process the message - agent.prompt will add user message and trigger state updates
+            try {
+                const results = agent.run({
+                    systemPrompt: await systemPrompt(),
+                    input: userInput,
+                    toolDefs: tools.toolDefs,
+                    executors: tools.executors,
+                    abortSignal: agent.abortSignal,
+                });
+                for await (const result of results) {
+                    repl.handle(result, agent.state);
+                }
+                messageHistory.save();
+            }
+            catch (_error) {
+                // Display error in the TUI by adding an error message to the chat
+                // repl.showError((error as Error).message || "Unknown error occurred");
+            }
+        }
+    }
     const repl = new Repl({
         promptManager,
         terminal,
@@ -212,9 +315,8 @@ async function main() {
         tokenTracker,
         commands,
         tokenCounter,
-        toolEvents,
-        toolExecutor,
         promptHistory,
+        workspace,
         showLastMessage: hasContinueOrResume
             ? !!(messageHistory.get() && messageHistory.get().length > 0)
             : false,

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;AAgBxB,eAAO,MAAM,MAAM,6BAWlB,CAAC"}
+{"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"}

package/dist/logger.js

@@ -1,24 +1,53 @@
 import { join } from "node:path";
 import pino from "pino";
 import { config } from "./config.js";
-const transport = pino.transport({
-    target: "pino-roll",
-    options: {
-        file: join(config.app.ensurePathSync("logs"), "acai.log"),
-        size: "10m",
-        symlink: true,
-        limit: {
-            count: 3,
+// 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
+        return pino({
+            level: "silent", // Completely disable logging
+            enabled: false, // Disable the logger entirely
+        });
+    }
+    // Normal file-based logging
+    return pino({
+        level: process.env["LOG_LEVEL"] ?? "debug",
+        formatters: {
+            level: (label) => {
+                return { level: label.toUpperCase() };
+            },
         },
-        mkdir: true,
-    },
-});
-export const logger = pino({
-    level: process.env["LOG_LEVEL"] ?? "debug",
-    formatters: {
-        level: (label) => {
-            return { level: label.toUpperCase() };
+        timestamp: pino.stdTimeFunctions.isoTime,
+    }, pino.transport({
+        target: "pino-roll",
+        options: {
+            file: join(config.app.ensurePathSync("logs"), "acai.log"),
+            size: "10m",
+            symlink: true,
+            limit: {
+                count: 3,
+            },
+            mkdir: true,
         },
+    }));
+}
+function getLogger() {
+    if (!loggerInstance) {
+        loggerInstance = createLogger();
+    }
+    return loggerInstance;
+}
+export const logger = new Proxy({}, {
+    get(_target, prop) {
+        return getLogger()[prop];
     },
-    timestamp: pino.stdTimeFunctions.isoTime,
-}, transport);
+});

package/dist/mentions.d.ts

@@ -3,9 +3,10 @@ import type { ContextItem } from "./prompts/manager.ts";
 export declare class PromptError extends Error {
     constructor(message: string, cause?: Error);
 }
-export declare function processPrompt(message: string, { baseDir, model }: {
+export declare function processPrompt(message: string, { baseDir, model, pasteStore, }: {
     baseDir: string;
     model: ModelMetadata;
+    pasteStore?: Map<number, string>;
 }): Promise<{
     message: string;
     context: ContextItem[];

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,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE,GAC5D,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CA0FtD"}
+{"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"}

package/dist/mentions.js

@@ -137,7 +137,7 @@ async function processUrlCommand(context) {
         };
     }
 }
-export async function processPrompt(message, { baseDir, model }) {
+export async function processPrompt(message, { baseDir, model, pasteStore, }) {
     const fileRegex = /@([^\s@]+(?:\.[\w\d]+))/g;
     const urlRegex = /@(https?:\/\/[^\s]+)/g;
     const shellRegex = /!`([^`]+)`/g;
@@ -171,6 +171,21 @@ export async function processPrompt(message, { baseDir, model }) {
         }
     }
     let processedMessage = message;
+    // Process paste placeholders
+    if (pasteStore && pasteStore.size > 0) {
+        const pasteRegex = /\[Paste #(\d+), (\d+) characters\]/g;
+        let match = pasteRegex.exec(processedMessage);
+        while (match !== null) {
+            const pasteId = Number.parseInt(match[1], 10);
+            const pasteContent = pasteStore.get(pasteId);
+            if (pasteContent) {
+                processedMessage = processedMessage.replace(match[0], pasteContent);
+                // Reset regex lastIndex since we modified the string
+                pasteRegex.lastIndex = 0;
+            }
+            match = pasteRegex.exec(processedMessage);
+        }
+    }
     // Process shell commands
     for (const match of shellMatches) {
         const command = match[1];

package/dist/messages.d.ts

@@ -11,6 +11,9 @@ It can be either an assistant message or a tool message.
  */
 type ResponseMessage = AssistantModelMessage | ToolModelMessage;
 type SavedMessageHistory = {
+    project: string;
+    sessionId: string;
+    modelId: string;
     title: string;
     createdAt: Date;
     updatedAt: Date;
@@ -22,6 +25,8 @@ interface MessageHistoryEvents {
 }
 export declare class MessageHistory extends EventEmitter<MessageHistoryEvents> {
     private history;
+    private sessionId;
+    private modelId;
     private title;
     private createdAt;
     private updatedAt;
@@ -33,6 +38,7 @@ export declare class MessageHistory extends EventEmitter<MessageHistoryEvents> {
         modelManager: ModelManager;
         tokenTracker: TokenTracker;
     });
+    create(modelId: string): void;
     private validMessage;
     get(): ModelMessage[];
     clear(): void;
@@ -40,11 +46,13 @@ export declare class MessageHistory extends EventEmitter<MessageHistoryEvents> {
     appendUserMessage(msg: UserModelMessage): void;
     appendAssistantMessage(msg: string): void;
     appendAssistantMessage(msg: AssistantModelMessage): void;
+    appendToolMessages(toolResultMessages: ToolModelMessage[]): void;
     appendResponseMessages(responseMessages: ResponseMessage[]): void;
     isEmpty(): boolean;
     save(): Promise<void>;
     private generateTitle;
     getFirstUserMessage(): UserModelMessage | undefined;
+    getLastUserMessage(): UserModelMessage | undefined;
     /**
      * Extracts the last message from the conversation history for display purposes.
      * Prioritizes assistant messages, falls back to user messages if no assistant messages exist.

package/dist/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../source/messages.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,aAAa,CAAC;AAIvC,OAAO,EACL,KAAK,qBAAqB,EAE1B,KAAK,SAAS,EAAE,kBAAkB;AAClC,KAAK,YAAY,EAEjB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACtB,MAAM,IAAI,CAAC;AACZ,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGxD,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,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,KAAK,CAAS;IACtB,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,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;IAWD,OAAO,CAAC,YAAY;IAoBpB,GAAG;IAIH,KAAK;IAKL,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,sBAAsB,CAAC,gBAAgB,EAAE,eAAe,EAAE;IAO1D,OAAO;IAID,IAAI;YAgBI,aAAa;IA4B3B,mBAAmB,IAAI,gBAAgB,GAAG,SAAS;IAOnD;;;OAGG;IACH,cAAc,IAAI,MAAM,GAAG,IAAI;WA2ClB,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,KAAK,SAAK,GACT,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAqDjC,OAAO,CAAC,YAAY,EAAE,mBAAmB,GAAG,IAAI;CAajD"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../source/messages.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,aAAa,CAAC;AAIvC,OAAO,EACL,KAAK,qBAAqB,EAE1B,KAAK,SAAS,EAAE,kBAAkB;AAClC,KAAK,YAAY,EAEjB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACtB,MAAM,IAAI,CAAC;AACZ,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGxD,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,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;IAaD,MAAM,CAAC,OAAO,EAAE,MAAM;IAStB,OAAO,CAAC,YAAY;IAoBpB,GAAG;IAIH,KAAK;IAKL,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;YAoBI,aAAa;IA6B3B,mBAAmB,IAAI,gBAAgB,GAAG,SAAS;IAOnD,kBAAkB,IAAI,gBAAgB,GAAG,SAAS;IAOlD;;;OAGG;IACH,cAAc,IAAI,MAAM,GAAG,IAAI;WA2ClB,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,KAAK,SAAK,GACT,OAAO,CAAC,mBAAmB,EAAE,CAAC;IA6EjC,OAAO,CAAC,YAAY,EAAE,mBAAmB,GAAG,IAAI;CAajD"}

package/dist/messages.js

@@ -1,6 +1,7 @@
+import { randomUUID } from "node:crypto";
 import EventEmitter from "node:events";
-import { readdir, readFile, writeFile } from "node:fs/promises";
-import { join } from "node:path";
+import { readdir, readFile, stat, writeFile } from "node:fs/promises";
+import { basename, join } from "node:path";
 import { isString } from "@travisennis/stdlib/typeguards";
 import { generateText, } from "ai";
 export function createUserMessage(contentItems, prompt) {
@@ -38,6 +39,8 @@ function createAssistantMessage(content) {
 }
 export class MessageHistory extends EventEmitter {
     history;
+    sessionId;
+    modelId;
     title;
     createdAt;
     updatedAt;
@@ -47,6 +50,8 @@ export class MessageHistory extends EventEmitter {
     constructor({ stateDir, modelManager, tokenTracker, }) {
         super();
         this.history = [];
+        this.sessionId = randomUUID();
+        this.modelId = "";
         this.title = "";
         this.createdAt = new Date();
         this.updatedAt = new Date();
@@ -54,6 +59,14 @@ export class MessageHistory extends EventEmitter {
         this.modelManager = modelManager;
         this.tokenTracker = tokenTracker;
     }
+    create(modelId) {
+        this.clear();
+        this.modelId = modelId;
+        this.sessionId = randomUUID();
+        this.title = "";
+        this.createdAt = new Date();
+        this.updatedAt = new Date();
+    }
     validMessage(msg) {
         // Filter out messages with empty content arrays
         if (Array.isArray(msg.content) && msg.content.length === 0) {
@@ -96,6 +109,10 @@ export class MessageHistory extends EventEmitter {
         const msgObj = isString(msg) ? createAssistantMessage(msg) : msg;
         this.history.push(msgObj);
     }
+    appendToolMessages(toolResultMessages) {
+        this.updatedAt = new Date();
+        this.history.push(...toolResultMessages);
+    }
     appendResponseMessages(responseMessages) {
         this.updatedAt = new Date();
         // Filter out messages with empty content arrays
@@ -107,10 +124,13 @@ export class MessageHistory extends EventEmitter {
     }
     async save() {
         const msgHistoryDir = this.stateDir;
-        const timestamp = new Date().toISOString().replace(/:/g, "-");
-        const fileName = `message-history-${timestamp}.json`;
+        const fileName = `message-history-${this.sessionId}.json`;
         const filePath = join(msgHistoryDir, fileName);
+        const project = basename(process.cwd());
         const output = {
+            project,
+            sessionId: this.sessionId,
+            modelId: this.modelId,
             title: this.title,
             createdAt: this.createdAt,
             updatedAt: this.updatedAt,
@@ -129,6 +149,7 @@ export class MessageHistory extends EventEmitter {
             const { text, usage } = await generateText({
                 model: this.modelManager.getModel(app),
                 system: systemPrompt,
+                maxOutputTokens: 100,
                 prompt: `Request:\n${message}\nTitle:`,
             });
             this.tokenTracker.trackUsage(app, usage);
@@ -145,6 +166,10 @@ export class MessageHistory extends EventEmitter {
         const firstUser = this.get().find((msg) => msg.role === "user");
         return firstUser;
     }
+    getLastUserMessage() {
+        const userMsg = this.history.findLast((value) => value.role === "user");
+        return userMsg;
+    }
     /**
      * Extracts the last message from the conversation history for display purposes.
      * Prioritizes assistant messages, falls back to user messages if no assistant messages exist.
@@ -180,16 +205,31 @@ export class MessageHistory extends EventEmitter {
     static async load(stateDir, count = 10) {
         try {
             const files = await readdir(stateDir);
-            const messageHistoryFiles = files
-                .filter((file) => file.startsWith("message-history-") && file.endsWith(".json"))
-                .sort((a, b) => {
-                // Extract timestamps and compare in reverse order (newest first)
-                const timeA = a.replace("message-history-", "").replace(".json", "");
-                const timeB = b.replace("message-history-", "").replace(".json", "");
-                return timeB.localeCompare(timeA); // Newest first
-            })
-                .slice(0, count); // Use the count parameter here
-            const fileReadPromises = messageHistoryFiles.map(async (fileName) => {
+            const messageHistoryFiles = files.filter((file) => file.startsWith("message-history-") && file.endsWith(".json"));
+            // Get file stats and sort by modification time (newest first)
+            const fileStatsPromises = messageHistoryFiles.map(async (fileName) => {
+                const filePath = join(stateDir, fileName);
+                try {
+                    const fileStat = await stat(filePath);
+                    return {
+                        fileName,
+                        filePath,
+                        modifiedTime: fileStat.mtime,
+                    };
+                }
+                catch (error) {
+                    console.error(`Error getting stats for file ${filePath}:`, error);
+                    return null;
+                }
+            });
+            const fileStats = await Promise.all(fileStatsPromises);
+            // Filter out null results and sort by modification time (newest first)
+            const sortedFiles = fileStats
+                .filter((stat) => stat !== null)
+                .sort((a, b) => b.modifiedTime.getTime() - a.modifiedTime.getTime())
+                .slice(0, count)
+                .map((stat) => stat.fileName);
+            const fileReadPromises = sortedFiles.map(async (fileName) => {
                 const filePath = join(stateDir, fileName);
                 try {
                     const content = await readFile(filePath, "utf-8");
@@ -209,11 +249,8 @@ export class MessageHistory extends EventEmitter {
                 return null; // Return null for failed reads/parses
             });
             const results = await Promise.all(fileReadPromises);
-            // Filter out null results (failed reads/parses)
-            //sort results by result.updatedAt which is a Date
-            return results
-                .filter((result) => result !== null)
-                .sort((a, b) => b.updatedAt.getTime() - a.updatedAt.getTime());
+            // Filter out null results and return them (already sorted by file modification time)
+            return results.filter((result) => result !== null);
         }
         catch (error) {
             // Handle cases where the directory might not exist or other readdir errors

package/dist/middleware/cache.d.ts

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

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

@@ -0,0 +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"}