@travisennis/acai 0.0.6 → 0.0.8

package/dist/cli.js

@@ -1,13 +1,12 @@
-import { generateObject, generateText, NoSuchToolError, stepCountIs, } from "ai";
+import { generateText, NoSuchToolError, Output, stepCountIs, tool, } from "ai";
 import { logger } from "./logger.js";
 import { AiConfig } from "./models/ai-config.js";
-import { minSystemPrompt } from "./prompts.js";
+import { systemPrompt } from "./prompts.js";
 import { BashTool } from "./tools/bash.js";
-import { CodeInterpreterTool } from "./tools/code-interpreter.js";
 import { EditFileTool } from "./tools/edit-file.js";
 import { GlobTool } from "./tools/glob.js";
 import { GrepTool } from "./tools/grep.js";
-import { initCliTools } from "./tools/index.js";
+import { initTools } from "./tools/index.js";
 import { ReadFileTool } from "./tools/read-file.js";
 const activeTools = [
     EditFileTool.name,
@@ -15,16 +14,16 @@ const activeTools = [
     BashTool.name,
     GrepTool.name,
     GlobTool.name,
-    CodeInterpreterTool.name,
 ];
 export class Cli {
     options;
+    skillsEnabled;
     constructor(options) {
         this.options = options;
+        this.skillsEnabled = options.skillsEnabled ?? true;
     }
     async run() {
-        const { config, promptManager, modelManager, tokenTracker, messageHistory, tokenCounter, } = this.options;
-        logger.info(config, "Config:");
+        const { promptManager, modelManager, tokenTracker, messageHistory } = this.options;
         const abortController = new AbortController();
         const { signal } = abortController;
         const cb = () => {
@@ -37,15 +36,22 @@ export class Cli {
         const userPrompt = promptManager.get();
         const userMsg = promptManager.getUserMessage();
         messageHistory.appendUserMessage(userMsg);
-        const finalSystemPrompt = await minSystemPrompt();
+        const finalSystemPrompt = await systemPrompt({
+            activeTools,
+            allowedDirs: this.options.workspace.allowedDirs,
+            skillsEnabled: this.skillsEnabled,
+        });
         const aiConfig = new AiConfig({
             modelMetadata: modelConfig,
             prompt: userPrompt,
         });
-        const tools = await initCliTools({
-            tokenCounter,
+        const tools = await initTools({
             workspace: this.options.workspace,
         });
+        // Cleanup function to remove signal handler
+        const cleanup = () => {
+            process.removeListener("SIGINT", cb);
+        };
         try {
             const result = await generateText({
                 model: langModel,
@@ -54,10 +60,16 @@ export class Cli {
                 messages: messageHistory.get(),
                 temperature: aiConfig.temperature(),
                 topP: aiConfig.topP(),
-                stopWhen: stepCountIs(60),
+                stopWhen: stepCountIs(200),
                 maxRetries: 2,
                 providerOptions: aiConfig.providerOptions(),
-                tools: tools.toolDefs,
+                tools: Object.fromEntries(Object.entries(tools).map((t) => [
+                    t[0],
+                    tool({
+                        ...t[1]["toolDef"],
+                        execute: t[1]["execute"],
+                    }),
+                ])),
                 activeTools,
                 // biome-ignore lint/style/useNamingConvention: third-party controlled
                 experimental_repairToolCall: toolCallRepair(modelManager),
@@ -68,15 +80,39 @@ export class Cli {
             }
             // this tracks the usage of every step in the call to streamText. it's a cumulative usage.
             tokenTracker.trackUsage("cli", result.usage);
-            messageHistory.save();
+            await messageHistory.save();
             process.stdout.end(result.text.endsWith("\n") ? result.text : `${result.text}\n`);
+            cleanup();
         }
         catch (e) {
-            if (e instanceof Error) {
-                logger.error(e);
+            // Always cleanup signal handler
+            cleanup();
+            // Check if it's an abort error or if the signal was aborted
+            const isAbortError = (e instanceof Error &&
+                (e.name === "AbortError" ||
+                    e.message.includes("aborted") ||
+                    e.message.includes("No output generated"))) ||
+                signal.aborted;
+            if (isAbortError) {
+                logger.info("CLI execution interrupted by user");
+                // Try to save message history before exiting
+                try {
+                    await messageHistory.save();
+                }
+                catch (_saveError) {
+                    // Ignore save errors on abort
+                    logger.warn("Failed to save message history on interrupt");
+                }
+                process.exit(0); // Exit gracefully
             }
             else {
-                logger.error(JSON.stringify(e, null, 2));
+                if (e instanceof Error) {
+                    logger.error(e);
+                }
+                else {
+                    logger.error(JSON.stringify(e, null, 2));
+                }
+                process.exit(1);
             }
         }
     }
@@ -88,9 +124,11 @@ const toolCallRepair = (modelManager) => {
         }
         const tool = tools[toolCall.toolName];
         try {
-            const { object: repairedArgs } = await generateObject({
+            const { output: repairedArgs } = await generateText({
                 model: modelManager.getModel("tool-repair"),
-                schema: tool.inputSchema,
+                output: Output.object({
+                    schema: tool.inputSchema,
+                }),
                 prompt: [
                     `The model tried to call the tool "${toolCall.toolName}" with the following arguments:`,
                     JSON.stringify(toolCall.input),

package/dist/commands/add-directory/index.d.ts

@@ -0,0 +1,3 @@
+import type { CommandOptions, ReplCommand } from "../types.ts";
+export declare const addDirectoryCommand: ({ workspace, }: CommandOptions) => ReplCommand;
+//# sourceMappingURL=index.d.ts.map

package/dist/commands/add-directory/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/commands/add-directory/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/D,eAAO,MAAM,mBAAmB,GAAI,gBAEjC,cAAc,KAAG,WAwFnB,CAAC"}

package/dist/commands/add-directory/index.js

@@ -0,0 +1,50 @@
+import style from "../../terminal/style.js";
+import { Text } from "../../tui/index.js";
+import { resolveDirectoryPath, validateDirectory } from "./utils.js";
+export const addDirectoryCommand = ({ workspace, }) => {
+    return {
+        command: "/add-directory",
+        description: "Add a directory to the list of allowed working directories",
+        getSubCommands: async () => {
+            return [];
+        },
+        async handle(args, { tui, container, editor, }) {
+            const directoryPath = args?.[0];
+            if (!directoryPath) {
+                container.addChild(new Text(style.red("Usage: /add-directory <path>"), 0, 1));
+                tui.requestRender();
+                editor.setText("");
+                return "continue";
+            }
+            try {
+                const resolvedPath = resolveDirectoryPath(directoryPath);
+                const isValid = await validateDirectory(resolvedPath);
+                if (!isValid) {
+                    container.addChild(new Text(style.red(`Path is not a directory: ${resolvedPath}`), 1, 0));
+                    tui.requestRender();
+                    editor.setText("");
+                    return "continue";
+                }
+                if (workspace.allowedDirs.includes(resolvedPath)) {
+                    container.addChild(new Text(style.yellow(`Directory already in allowed list: ${resolvedPath}`), 1, 0));
+                    tui.requestRender();
+                    editor.setText("");
+                    return "continue";
+                }
+                workspace.allowedDirs.push(resolvedPath);
+                container.addChild(new Text(`Added directory to allowed list: ${style.blue(resolvedPath)}`, 1, 0));
+                container.addChild(new Text(`Current allowed directories: ${style.blue(workspace.allowedDirs.join(", "))}`, 2, 0));
+                tui.requestRender();
+                editor.setText("");
+                return "continue";
+            }
+            catch (error) {
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                container.addChild(new Text(style.red(`Failed to add directory: ${errorMessage}`), 0, 1));
+                tui.requestRender();
+                editor.setText("");
+                return "continue";
+            }
+        },
+    };
+};

package/dist/commands/add-directory/types.d.ts

@@ -0,0 +1,6 @@
+import type { WorkspaceContext } from "../../index.ts";
+export interface AddDirectoryOptions {
+    workspace: WorkspaceContext;
+}
+export type { WorkspaceContext };
+//# sourceMappingURL=types.d.ts.map

package/dist/commands/add-directory/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../source/commands/add-directory/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,gBAAgB,CAAC;CAC7B;AAED,YAAY,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/commands/add-directory/utils.d.ts

@@ -0,0 +1,3 @@
+export declare function validateDirectory(dirPath: string): Promise<boolean>;
+export declare function resolveDirectoryPath(dirPath: string): string;
+//# sourceMappingURL=utils.d.ts.map

package/dist/commands/add-directory/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../source/commands/add-directory/utils.ts"],"names":[],"mappings":"AAGA,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAQzE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE5D"}

package/dist/commands/add-directory/utils.js

@@ -0,0 +1,15 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+export async function validateDirectory(dirPath) {
+    try {
+        const resolvedPath = path.resolve(dirPath);
+        const stats = await fs.stat(resolvedPath);
+        return stats.isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
+export function resolveDirectoryPath(dirPath) {
+    return path.resolve(dirPath);
+}

package/dist/commands/clear/index.d.ts

@@ -0,0 +1,3 @@
+import type { CommandOptions, ReplCommand } from "../types.ts";
+export declare const clearCommand: (_options: CommandOptions) => ReplCommand;
+//# sourceMappingURL=index.d.ts.map

package/dist/commands/clear/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/commands/clear/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/D,eAAO,MAAM,YAAY,GAAI,UAAU,cAAc,KAAG,WAmBvD,CAAC"}

package/dist/commands/{clear-command.js → clear/index.js}

@@ -1,15 +1,9 @@
-export const clearCommand = ({ terminal }) => {
+export const clearCommand = (_options) => {
     return {
         command: "/clear",
         description: "Clears the terminal screen.",
         getSubCommands: () => Promise.resolve([]),
-        execute: async () => {
-            terminal.clear();
-            return "continue";
-        },
         async handle(_args, { tui, container, editor, }) {
-            // In TUI mode, we can't clear the screen like terminal.clear()
-            // Instead, we'll just clear the input and show a message
             container.clear();
             tui.requestRender();
             editor.setText("");

package/dist/commands/copy/index.d.ts

@@ -0,0 +1,3 @@
+import type { CommandOptions, ReplCommand } from "../types.ts";
+export declare function copyCommand(options: CommandOptions): ReplCommand;
+//# sourceMappingURL=index.d.ts.map

package/dist/commands/copy/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/commands/copy/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/D,wBAAgB,WAAW,CAAC,OAAO,EAAE,cAAc,GAAG,WAAW,CAmDhE"}

package/dist/commands/copy/index.js

@@ -0,0 +1,39 @@
+import Clipboard from "@crosscopy/clipboard";
+import style from "../../terminal/style.js";
+import { Spacer, Text } from "../../tui/index.js";
+import { extractLastAssistantText } from "./utils.js";
+export function copyCommand(options) {
+    return {
+        command: "/copy",
+        description: "Copy the last assistant response to the clipboard",
+        async getSubCommands() {
+            return [];
+        },
+        async handle(_args, { tui, container, editor, }) {
+            const { sessionManager: messageHistory } = options;
+            const history = messageHistory.get();
+            container.addChild(new Spacer(1));
+            const lastText = extractLastAssistantText(history);
+            if (!lastText) {
+                container.addChild(new Text(style.dim("No assistant response to copy."), 0, 1));
+                tui.requestRender();
+                editor.setText("");
+                return "continue";
+            }
+            try {
+                await Clipboard.setText(lastText);
+                container.addChild(new Text(style.dim("Copied last response to clipboard."), 0, 1));
+                tui.requestRender();
+                editor.setText("");
+                return "continue";
+            }
+            catch (err) {
+                const message = err instanceof Error ? err.message : String(err);
+                container.addChild(new Text(style.dim(`Could not copy to clipboard: ${message}`), 0, 1));
+                tui.requestRender();
+                editor.setText("");
+                return "continue";
+            }
+        },
+    };
+}

package/dist/commands/copy/types.d.ts

@@ -0,0 +1,3 @@
+import type { ModelMessage, TextPart } from "ai";
+export type { ModelMessage, TextPart };
+//# sourceMappingURL=types.d.ts.map

package/dist/commands/copy/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../source/commands/copy/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEjD,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC"}

package/dist/commands/copy/types.js

@@ -0,0 +1 @@
+export {};

package/dist/commands/copy/utils.d.ts

@@ -0,0 +1,3 @@
+import type { ModelMessage } from "ai";
+export declare function extractLastAssistantText(messages: ModelMessage[]): string | null;
+//# sourceMappingURL=utils.d.ts.map

package/dist/commands/copy/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../source/commands/copy/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAY,MAAM,IAAI,CAAC;AAEjD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,YAAY,EAAE,GACvB,MAAM,GAAG,IAAI,CAoBf"}

package/dist/commands/copy/utils.js

@@ -0,0 +1,22 @@
+export function extractLastAssistantText(messages) {
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const msg = messages[i];
+        if (!msg)
+            continue;
+        if (msg.role !== "assistant")
+            continue;
+        if (!("content" in msg) || !Array.isArray(msg.content))
+            continue;
+        for (let j = msg.content.length - 1; j >= 0; j--) {
+            const part = msg.content[j];
+            if (part != null &&
+                part.type === "text" &&
+                typeof part.text === "string") {
+                const text = part.text;
+                if (text.trim().length > 0)
+                    return text;
+            }
+        }
+    }
+    return null;
+}

package/dist/commands/exit/index.d.ts

@@ -0,0 +1,10 @@
+import type { ReplCommand } from "../types.ts";
+export interface ExitCommandOptions {
+    sessionManager: {
+        isEmpty: () => boolean;
+        save: () => Promise<void>;
+    };
+    baseDir?: string | null;
+}
+export declare const exitCommand: ({ sessionManager, baseDir, }: ExitCommandOptions) => ReplCommand;
+//# sourceMappingURL=index.d.ts.map

package/dist/commands/exit/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/commands/exit/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/C,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE;QACd,OAAO,EAAE,MAAM,OAAO,CAAC;QACvB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,eAAO,MAAM,WAAW,GAAI,8BAGzB,kBAAkB,KAAG,WA2BvB,CAAC"}

package/dist/commands/exit/index.js

@@ -0,0 +1,21 @@
+import { Text } from "../../tui/index.js";
+import { clearTmpDirectory } from "./utils.js";
+export const exitCommand = ({ sessionManager, baseDir, }) => {
+    return {
+        command: "/exit",
+        aliases: ["/bye", "/quit"],
+        description: "Exits and saves the chat history.",
+        getSubCommands: () => Promise.resolve([]),
+        async handle(_args, { tui, container, editor, }) {
+            if (!sessionManager.isEmpty()) {
+                await sessionManager.save();
+            }
+            // Clear the .tmp directory on exit
+            await clearTmpDirectory(baseDir);
+            container.addChild(new Text("Exiting...", 0, 1));
+            tui.requestRender();
+            editor.setText("");
+            return "break";
+        },
+    };
+};

package/dist/commands/exit/types.d.ts

@@ -0,0 +1,8 @@
+export interface ExitCommandOptions {
+    sessionManager: {
+        isEmpty: () => boolean;
+        save: () => Promise<void>;
+    };
+    baseDir?: string | null;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/commands/exit/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../source/commands/exit/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE;QACd,OAAO,EAAE,MAAM,OAAO,CAAC;QACvB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB"}

package/dist/commands/exit/types.js

@@ -0,0 +1 @@
+export {};

package/dist/commands/exit/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function clearTmpDirectory(baseDir?: string | null): Promise<void>;
+//# sourceMappingURL=utils.d.ts.map

package/dist/commands/exit/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../source/commands/exit/utils.ts"],"names":[],"mappings":"AAIA,wBAAsB,iBAAiB,CACrC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GACtB,OAAO,CAAC,IAAI,CAAC,CAQf"}

package/dist/commands/exit/utils.js

@@ -0,0 +1,13 @@
+import path from "node:path";
+import { logger } from "../../logger.js";
+import { clearDirectory } from "../../utils/filesystem/operations.js";
+export async function clearTmpDirectory(baseDir) {
+    try {
+        const tmpDirPath = path.join(baseDir ?? process.cwd(), ".tmp");
+        await clearDirectory(tmpDirPath);
+    }
+    catch (error) {
+        // Log error but don't block exit
+        logger.error(error, "Failed to clear .tmp directory:");
+    }
+}

package/dist/commands/generate-rules/index.d.ts

@@ -0,0 +1,3 @@
+import type { CommandOptions, ReplCommand } from "../types.ts";
+export declare const generateRulesCommand: ({ sessionManager: messageHistory, modelManager, tokenTracker, config, workspace, }: CommandOptions) => ReplCommand;
+//# sourceMappingURL=index.d.ts.map

package/dist/commands/generate-rules/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/commands/generate-rules/index.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG/D,eAAO,MAAM,oBAAoB,GAAI,oFAMlC,cAAc,KAAG,WA+HnB,CAAC"}