@travisennis/acai 0.0.7 → 0.0.8

package/README.md

@@ -26,15 +26,15 @@ Acai is a powerful **AI-driven command-line interface (CLI) tool** designed to a
 *   **File & Directory Mentions:** Include file contents and entire directories in prompts using `@filename` and `@dirname` syntax.
 *   **Code Navigation & Analysis:** Advanced file searching and code analysis capabilities.
 *   **Git Workflow Automation:** Streamline commit messages and code reviews.
-*   **Web Integration:** Perform web searches and fetch content from URLs.
-*   **Extensible Commands:** A rich set of built-in commands (`/help`, `/model`, `/usage`, `/list-tools`, etc.).
-*   **Token Usage Tracking:** Monitor AI token consumption.
+*   **Extensible Commands:** A rich set of built-in commands (`/help`, `/model`, `/session`, `/list-tools`, etc.).
+*   **Token Usage Tracking:** Monitor AI token consumption with comprehensive session overview.
 *   **Configurable AI Models:** Easily switch between different LLM providers and models.
 *   **Shell Integration:** Execute shell commands inline using `!`command`` syntax or via `/shell` command.
 *   **Dynamic Tools:** Create and load custom tools from JavaScript files in your project or user directory.
 *   **Multi-workspace Support:** Work across multiple project directories simultaneously.
 *   **Skills System:** Discover and load specialized instruction files for specific tasks (PDF extraction, database migrations, etc.).
 
+
 ## 🛠️ Technologies Used
 
 Acai is built primarily with **TypeScript** and runs on **Node.js**. Key technologies and dependencies include:
@@ -132,17 +132,9 @@ X_AI_API_KEY=your_xai_api_key_here
 
 # OpenRouter (Access to multiple models)
 OPENROUTER_API_KEY=your_openrouter_api_key_here
-```
-
-### Web Service API Keys (Optional)
 
-```bash
-# Exa (for enhanced web search functionality)
-# Optional: Falls back to DuckDuckGo search if not provided
-EXA_API_KEY=your_exa_api_key_here
-
-# Jina Reader (for enhanced web content extraction)
-JINA_READER_API_KEY=your_jina_api_key_here
+# OpenCode Zen
+OPENCODE_ZEN_API_TOKEN=your_opencode_zen_api_token_here
 ```
 
 ### Application Configuration
@@ -165,16 +157,12 @@ GOOGLE_GENERATIVE_AI_API_KEY=...
 GROQ_API_KEY=...
 OPENROUTER_API_KEY=sk-or-...
 
-# Optional: Web services (fallbacks available if not provided)
-EXA_API_KEY=...  # Falls back to DuckDuckGo search
-
 # Optional: Application settings
 LOG_LEVEL=info
 ```
 
 **Note:** You need at least one AI provider API key to use Acai. The tool will work with any combination of the supported providers.
 
-**Web Search:** The web search functionality works without any API keys by using DuckDuckGo as a fallback. Providing an EXA_API_KEY enables enhanced search capabilities with more detailed content extraction.
 
 ### Usage
 
@@ -196,14 +184,27 @@ acai --no-skills
 
 # Add additional working directories
 acai --add-dir /path/to/project1 --add-dir /path/to/project2
+
+# Resume a previous session by selecting from a list
+acai --continue
+
+# Resume the most recent session
+acai --resume
+
+# Resume a specific session by ID
+acai --resume a1b2c3d4-e5f6-7890-1234-567890abcdef
+```
+
+**Note:** When exiting a session with messages, Acai will display a resume command with the session ID:
+```
+To resume this session call acai --resume <session-id>
 ```
 
 Once in the REPL, you can type your prompts or use commands:
 
 ```
 > How do I read a file in Node.js?
-> /files add source/index.ts
-> /edit source/cli.ts "Change this function name"
+> @source/index.ts
 > /help
 ```
 
@@ -287,7 +288,7 @@ For a list of available commands, type `/help` within the REPL.
 - `/paste` - Add clipboard contents to the next prompt
 - `/prompt <name> [arguments...]` - Load saved prompts with optional arguments. Project prompts override user prompts. Supports argument placeholders (`$ARGUMENTS`, `$1`, `$2`, etc.) in prompt files.
 - `/model [provider:model|category|provider]` - List or switch models
-- `/usage` - Show token usage breakdown
+- `/session` - Show comprehensive session information including usage and costs
 - `/clear` - Clears the terminal screen for the current session
 - `/generateRules` - Analyze the current conversation and suggest project rules
 - `/copy` - Copy the last assistant response to the system clipboard
@@ -295,14 +296,13 @@ For a list of available commands, type `/help` within the REPL.
 - `/add-dir <path>` - Add additional working directory
 - `/list-dirs` - List all working directories
 - `/remove-dir <path>` - Remove a working directory
-- `/context` - Manage context selections
 - `/health` - Check system health and dependencies
 - `/history` - View and manage conversation history
 - `/pickup` - Resume a previous conversation
 - `/handoff` - Hand off conversation to another agent
 - `/shell` - Execute shell commands
 
-**Note**: Some commands mentioned in older documentation (like `/files`, `/edit`, `/compact`, `/rules`, `/lastLog`, `/appLog`) are currently disabled in the codebase.
+**Note**: Some commands mentioned in older documentation may no longer be available. Use `/help` to see current commands.
 
 Clipboard notes:
 - macOS: uses `pbcopy`
@@ -642,7 +642,10 @@ Acai supports project-specific configuration through a `.acai/acai.json` file in
   },
   "skills": {
     "enabled": true  // Optional: Enable/disable skills discovery (default: true)
-  }
+  },
+
+
+
 }
 ```
 
@@ -650,7 +653,8 @@ Acai supports project-specific configuration through a `.acai/acai.json` file in
 
 - **Rules/Guidelines**: Add project-specific AI behavior rules in `AGENTS.md`
 - **Custom Prompts**: Store reusable prompts in `.acai/prompts/`. Supports argument placeholders (`$ARGUMENTS`, `$1`, `$2`, etc.) for dynamic content.
-- **Context Selections**: Save file/directory selections in `.acai/context/`
+
+- **File Selections**: Save file/directory selections in `.acai/selections/`
 - **Memory/Rules**: Persistent project rules stored in `.acai/rules/`
 
 ### Global Configuration
@@ -675,6 +679,19 @@ acai
 LOG_LEVEL=warn acai
 ```
 
+## Web Skills
+
+Acai's web functionality has been moved to standalone skills that operate independently of the core codebase. These skills provide web-related capabilities while keeping the main acai-ts project lightweight and focused.
+
+### Skill Locations
+
+Web skills are located in:
+- `~/.acai/skills/web-fetch/` - User-level web fetch skill
+- `~/.acai/skills/web-search/` - User-level web search skill
+- `<project>/.acai/skills/web-fetch/` - Project-level web fetch skill
+- `<project>/.acai/skills/web-search/` - Project-level web search skill
+
+
 ## ⚙️ Development
 
 ### Development Environment Setup
@@ -733,7 +750,7 @@ The project is organized as follows:
 
 ```
 .
-├── .acai/             # Internal configuration, context, and temporary files
+├── .acai/             # Internal configuration and temporary files
 ├── source/            # Main application source code
 │   ├── agent/         # Agent loop and manual execution
 │   ├── api/           # External API integrations (e.g., Exa)

package/dist/agent/index.d.ts

@@ -1,24 +1,20 @@
-import type { LanguageModelUsage, ToolExecuteFunction } from "ai";
-import { type ToolCallRepairFunction } from "ai";
-import type { MessageHistory } from "../messages.ts";
 import type { ModelManager } from "../models/manager.ts";
 import type { ModelMetadata } from "../models/providers.ts";
+import type { SessionManager } from "../sessions/manager.ts";
 import type { TokenTracker } from "../tokens/tracker.ts";
 import type { CompleteToolNames, CompleteToolSet } from "../tools/index.ts";
 type AgentOptions = {
     modelManager: ModelManager;
     tokenTracker: TokenTracker;
-    messageHistory: MessageHistory;
+    sessionManager: SessionManager;
     maxIterations?: number;
     maxRetries?: number;
-    toolCallRepair?: ToolCallRepairFunction<CompleteToolSet>;
 };
 type RunOptions = {
     systemPrompt: string;
     input: string;
-    toolDefs: CompleteToolSet;
+    tools: CompleteToolSet;
     activeTools?: CompleteToolNames[];
-    executors: Map<keyof CompleteToolSet, ToolExecuteFunction<unknown, string>>;
     abortSignal?: AbortSignal;
 };
 export type ToolEvent = {
@@ -27,18 +23,6 @@ export type ToolEvent = {
     toolCallId: string;
     msg: string;
     args: unknown;
-} | {
-    type: "tool-call-init";
-    name: string;
-    toolCallId: string;
-    msg: string;
-    args: unknown;
-} | {
-    type: "tool-call-update";
-    name: string;
-    toolCallId: string;
-    msg: string;
-    args: unknown;
 } | {
     type: "tool-call-end";
     name: string;
@@ -94,6 +78,22 @@ export type AgentEvent = {
     role: "assistant";
     content: string;
 } | ToolCallLifeCycle;
+type ModelUsage = {
+    inputTokens: number;
+    outputTokens: number;
+    totalTokens: number;
+    cachedInputTokens: number;
+    reasoningTokens: number;
+    inputTokenDetails: {
+        noCacheTokens: number;
+        cacheReadTokens: number;
+        cacheWriteTokens: number;
+    };
+    outputTokenDetails: {
+        textTokens: number;
+        reasoningTokens: number;
+    };
+};
 export type AgentState = {
     modelId: string;
     modelConfig: ModelMetadata;
@@ -105,12 +105,8 @@ export type AgentState = {
             toolName: string;
         }>;
     }[];
-    usage: {
-        [K in keyof LanguageModelUsage]-?: number;
-    };
-    totalUsage: {
-        [K in keyof LanguageModelUsage]-?: number;
-    };
+    usage: ModelUsage;
+    totalUsage: ModelUsage;
     timestamps: {
         start: number;
         stop: number;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/agent/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/agent/index.ts"],"names":[],"mappings":"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"}

package/dist/agent/index.js

@@ -1,9 +1,7 @@
-import { NoOutputGeneratedError, streamText, } from "ai";
+import { generateText, InvalidToolInputError, NoOutputGeneratedError, NoSuchToolError, Output, streamText, tool, } from "ai";
 import { config } from "../config.js";
 import { logger } from "../logger.js";
 import { AiConfig } from "../models/ai-config.js";
-import { isToolMessage } from "../tools/types.js";
-import { isAsyncIterable } from "../utils/iterables.js";
 export class Agent {
     opts;
     _state;
@@ -20,10 +18,10 @@ export class Agent {
         return this.abortController.signal;
     }
     async *run(args) {
-        const { modelManager, messageHistory, tokenTracker, maxIterations = (await config.getConfig()).loop.maxIterations, maxRetries = 2, toolCallRepair, } = this.opts;
+        const { modelManager, sessionManager, tokenTracker, maxIterations = (await config.getConfig()).loop.maxIterations, maxRetries = 2, } = this.opts;
         this.resetState();
         this._state.timestamps.start = performance.now();
-        const { systemPrompt, input, toolDefs, activeTools = undefined, executors, abortSignal, } = args;
+        const { systemPrompt, input, tools, activeTools, abortSignal } = args;
         const langModel = modelManager.getModel("repl");
         const modelConfig = modelManager.getModelMetadata("repl");
         const aiConfig = new AiConfig({
@@ -63,22 +61,34 @@ export class Agent {
                     model: langModel,
                     maxOutputTokens: aiConfig.maxOutputTokens(),
                     system: systemPrompt,
-                    messages: messageHistory.get(),
+                    messages: sessionManager.get(),
                     temperature: aiConfig.temperature(),
                     topP: aiConfig.topP(),
                     maxRetries: 2,
                     providerOptions: aiConfig.providerOptions(),
-                    tools: toolDefs,
+                    tools: Object.fromEntries(
+                    // biome-ignore lint/suspicious/noExplicitAny: temporary
+                    Object.entries(tools).map((t) => [t[0], tool(t[1].toolDef)])),
                     activeTools,
-                    // biome-ignore lint/style/useNamingConvention: third-party code
-                    experimental_repairToolCall: toolCallRepair,
+                    // biome-ignore lint/style/useNamingConvention: third-party controlled
+                    experimental_repairToolCall: toolCallRepair(modelManager),
                     abortSignal,
                     onAbort: ({ steps }) => {
                         logger.debug(`Aborting and processing ${steps.length} steps`);
                         steps.forEach((step) => {
-                            messageHistory.appendResponseMessages(step.response.messages);
+                            sessionManager.appendResponseMessages(step.response.messages);
                         });
                     },
+                    onError({ error }) {
+                        if (typeof error === "object" &&
+                            error != null &&
+                            "message" in error) {
+                            logger.error(error.message);
+                        }
+                        else {
+                            logger.error(error);
+                        }
+                    },
                 });
                 let accumulatedText = "";
                 let accumulatedReasoning = "";
@@ -134,11 +144,13 @@ export class Agent {
                     else if (chunk.type === "tool-call") {
                         const call = chunk;
                         const toolName = call.toolName;
+                        const iTool = tools[toolName];
                         yield this.processToolEvent(toolsCalled, {
                             type: "tool-call-start",
                             name: toolName,
                             toolCallId: call.toolCallId,
-                            msg: "",
+                            // biome-ignore lint/suspicious/noExplicitAny: unknown
+                            msg: iTool ? iTool.display(call.input) : "",
                             args: call.input,
                         });
                         if (call.invalid) {
@@ -155,87 +167,26 @@ export class Agent {
                         try {
                             thisStepToolCalls.push({ toolName });
                             thisStepToolResults.push({ toolName });
-                            const toolExec = executors.get(toolName);
-                            if (!toolExec) {
+                            const iTool = tools[toolName];
+                            if (!iTool) {
                                 resultOutput = `No executor for tool ${toolName}`;
                             }
                             else {
+                                const toolExec = iTool.execute;
                                 try {
                                     const output = await toolExec(call.input, {
                                         toolCallId: call.toolCallId,
-                                        messages: messageHistory.get(),
+                                        messages: sessionManager.get(),
                                         abortSignal,
                                     });
-                                    if (isAsyncIterable(output)) {
-                                        const toolResultValues = [];
-                                        for await (const value of output) {
-                                            if (isToolMessage(value)) {
-                                                if (call.toolCallId !== value.id) {
-                                                    logger.debug(`Tool ${call.toolName} ids don't match: ${call.toolCallId} != ${value.id}`);
-                                                }
-                                                const event = value.event;
-                                                switch (event) {
-                                                    case "tool-completion":
-                                                        yield this.processToolEvent(toolsCalled, {
-                                                            type: "tool-call-end",
-                                                            name: value.name,
-                                                            toolCallId: call.toolCallId,
-                                                            msg: value.data,
-                                                            args: call.input,
-                                                        });
-                                                        break;
-                                                    case "tool-error":
-                                                        yield this.processToolEvent(toolsCalled, {
-                                                            type: "tool-call-error",
-                                                            name: value.name,
-                                                            toolCallId: call.toolCallId,
-                                                            msg: value.data,
-                                                            args: call.input,
-                                                        });
-                                                        break;
-                                                    case "tool-update":
-                                                        yield this.processToolEvent(toolsCalled, {
-                                                            type: "tool-call-update",
-                                                            name: value.name,
-                                                            toolCallId: call.toolCallId,
-                                                            msg: value.data,
-                                                            args: call.input,
-                                                        });
-                                                        break;
-                                                    case "tool-init":
-                                                        yield this.processToolEvent(toolsCalled, {
-                                                            type: "tool-call-init",
-                                                            name: value.name,
-                                                            toolCallId: call.toolCallId,
-                                                            msg: value.data,
-                                                            args: call.input,
-                                                        });
-                                                        break;
-                                                    default:
-                                                        event;
-                                                        logger.debug(`Unhandled tool message event: ${event}`);
-                                                        break;
-                                                }
-                                            }
-                                            else {
-                                                toolResultValues.push(value);
-                                            }
-                                        }
-                                        const finalValue = toolResultValues.length > 0
-                                            ? toolResultValues.at(-1)
-                                            : undefined;
-                                        resultOutput = formatToolResult(finalValue);
-                                    }
-                                    else {
-                                        resultOutput = formatToolResult(output);
-                                        yield this.processToolEvent(toolsCalled, {
-                                            type: "tool-call-end",
-                                            name: call.toolName,
-                                            toolCallId: call.toolCallId,
-                                            msg: "success",
-                                            args: null,
-                                        });
-                                    }
+                                    resultOutput = formatToolResult(output);
+                                    yield this.processToolEvent(toolsCalled, {
+                                        type: "tool-call-end",
+                                        name: call.toolName,
+                                        toolCallId: call.toolCallId,
+                                        msg: resultOutput,
+                                        args: call.input,
+                                    });
                                 }
                                 catch (err) {
                                     resultOutput = `Tool error: ${err instanceof Error ? err.message : String(err)}`;
@@ -278,21 +229,23 @@ export class Agent {
                 // Get response and tool calls
                 const response = await result.response;
                 const responseMessages = response.messages;
-                messageHistory.appendResponseMessages(responseMessages);
+                sessionManager.appendResponseMessages(responseMessages);
                 const stepUsage = await result.usage;
                 this._state.usage.inputTokens = stepUsage.inputTokens ?? 0;
                 this._state.usage.outputTokens = stepUsage.outputTokens ?? 0;
                 this._state.usage.totalTokens = stepUsage.totalTokens ?? 0;
-                this._state.usage.cachedInputTokens = stepUsage.cachedInputTokens ?? 0;
-                this._state.usage.reasoningTokens = stepUsage.reasoningTokens ?? 0;
-                messageHistory.setContextWindow(stepUsage.totalTokens ?? 0);
+                this._state.usage.cachedInputTokens =
+                    stepUsage.inputTokenDetails.cacheReadTokens ?? 0;
+                this._state.usage.reasoningTokens =
+                    stepUsage.outputTokenDetails.reasoningTokens ?? 0;
+                sessionManager.setContextWindow(stepUsage.totalTokens ?? 0);
                 this._state.totalUsage.inputTokens += stepUsage.inputTokens ?? 0;
                 this._state.totalUsage.outputTokens += stepUsage.outputTokens ?? 0;
                 this._state.totalUsage.totalTokens += stepUsage.totalTokens ?? 0;
                 this._state.totalUsage.cachedInputTokens +=
-                    stepUsage.cachedInputTokens ?? 0;
+                    stepUsage.inputTokenDetails.cacheReadTokens ?? 0;
                 this._state.totalUsage.reasoningTokens +=
-                    stepUsage.reasoningTokens ?? 0;
+                    stepUsage.outputTokenDetails.reasoningTokens ?? 0;
                 // If finishReason is not tool-calls, break
                 const finishReason = await result.finishReason;
                 if (finishReason !== "tool-calls") {
@@ -302,7 +255,7 @@ export class Agent {
                     hasEmittedTerminalEvent = true;
                     break;
                 }
-                messageHistory.appendToolMessages(toolMessages);
+                sessionManager.appendToolMessages(toolMessages);
                 // Consume the rest of the team if necessary
                 // await result.consumeStream();
                 yield {
@@ -313,18 +266,29 @@ export class Agent {
             }
             catch (error) {
                 consecutiveErrors += 1;
-                logger.error(error, // Log the full error object
-                `Error on manual agent loop streamText (attempt ${consecutiveErrors}/${maxRetries + 1})`);
-                const errorMsg = error.message.length > 100
-                    ? `${error.message.slice(0, 100)}...`
-                    : error.message;
-                yield {
-                    type: "agent-error",
-                    message: errorMsg,
-                };
-                if (NoOutputGeneratedError.isInstance(error)) {
-                    hasEmittedTerminalEvent = true;
-                    break;
+                // Handle AI SDK invalid tool input errors gracefully
+                if (InvalidToolInputError.isInstance(error)) {
+                    logger.warn(error, `Invalid tool input detected - returning error to allow recovery (attempt ${consecutiveErrors}/${maxRetries + 1})`);
+                    yield {
+                        type: "agent-error",
+                        message: `Tool input validation failed: ${error.message}. Try again with valid arguments.`,
+                    };
+                    // Continue loop to allow user to provide corrected input
+                }
+                else {
+                    logger.error(error, // Log the full error object
+                    `Error on manual agent loop streamText (attempt ${consecutiveErrors}/${maxRetries + 1})`);
+                    const errorMsg = error.message.length > 100
+                        ? `${error.message.slice(0, 100)}...`
+                        : error.message;
+                    yield {
+                        type: "agent-error",
+                        message: errorMsg,
+                    };
+                    if (NoOutputGeneratedError.isInstance(error)) {
+                        hasEmittedTerminalEvent = true;
+                        break;
+                    }
                 }
                 // Break loop if we exceed max retries
                 if (consecutiveErrors > maxRetries) {
@@ -356,7 +320,7 @@ export class Agent {
     }
     resetState() {
         const { modelManager,
-        // messageHistory,
+        // sessionManager,
          } = this.opts;
         this._state = {
             modelId: modelManager.getModel("repl").modelId,
@@ -367,6 +331,15 @@ export class Agent {
                 totalTokens: 0,
                 reasoningTokens: 0,
                 cachedInputTokens: 0,
+                inputTokenDetails: {
+                    noCacheTokens: 0,
+                    cacheReadTokens: 0,
+                    cacheWriteTokens: 0,
+                },
+                outputTokenDetails: {
+                    textTokens: 0,
+                    reasoningTokens: 0,
+                },
             },
             totalUsage: {
                 inputTokens: 0,
@@ -374,6 +347,15 @@ export class Agent {
                 totalTokens: 0,
                 reasoningTokens: 0,
                 cachedInputTokens: 0,
+                inputTokenDetails: {
+                    noCacheTokens: 0,
+                    cacheReadTokens: 0,
+                    cacheWriteTokens: 0,
+                },
+                outputTokenDetails: {
+                    textTokens: 0,
+                    reasoningTokens: 0,
+                },
             },
             steps: [],
             timestamps: {
@@ -432,3 +414,32 @@ function formatToolResult(value) {
     }
     return String(value);
 }
+const toolCallRepair = (modelManager) => {
+    const fn = async ({ toolCall, tools, inputSchema, error, }) => {
+        if (NoSuchToolError.isInstance(error)) {
+            return null; // do not attempt to fix invalid tool names
+        }
+        const tool = tools[toolCall.toolName];
+        try {
+            const { output: repairedArgs } = await generateText({
+                model: modelManager.getModel("tool-repair"),
+                output: Output.object({
+                    schema: tool.inputSchema,
+                }),
+                prompt: [
+                    `The model tried to call the tool "${toolCall.toolName}" with the following arguments:`,
+                    JSON.stringify(toolCall.input),
+                    "The tool accepts the following schema:",
+                    JSON.stringify(inputSchema(toolCall)),
+                    "Please fix the arguments.",
+                ].join("\n"),
+            });
+            return { ...toolCall, args: JSON.stringify(repairedArgs) };
+        }
+        catch (err) {
+            logger.error(err, `Failed to repair tool call: ${toolCall.toolName}.`);
+            return null;
+        }
+    };
+    return fn;
+};

package/dist/cli.d.ts

@@ -1,11 +1,11 @@
 import type { WorkspaceContext } from "./index.ts";
-import type { MessageHistory } from "./messages.ts";
 import type { ModelManager } from "./models/manager.js";
 import type { PromptManager } from "./prompts/manager.ts";
+import type { SessionManager } from "./sessions/manager.ts";
 import type { TokenCounter } from "./tokens/counter.ts";
 import type { TokenTracker } from "./tokens/tracker.ts";
 interface CliOptions {
-    messageHistory: MessageHistory;
+    messageHistory: SessionManager;
     promptManager: PromptManager;
     modelManager: ModelManager;
     tokenTracker: TokenTracker;

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../source/cli.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AASxD,UAAU,UAAU;IAClB,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAWD,qBAAa,GAAG;IACd,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,aAAa,CAAU;gBACnB,OAAO,EAAE,UAAU;IAKzB,GAAG;CAiHV"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../source/cli.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAGnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAQxD,UAAU,UAAU;IAClB,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAUD,qBAAa,GAAG;IACd,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,aAAa,CAAU;gBACnB,OAAO,EAAE,UAAU;IAKzB,GAAG;CAsHV"}