@tecet/ollm 0.1.3

package/dist/nonInteractive.js

@@ -0,0 +1,313 @@
+/**
+ * Non-Interactive Runner
+ * Handles single-prompt execution without the TUI.
+ */
+import { ProviderRegistry, ChatClient, ToolRegistry } from '@ollm/core';
+import { NonInteractiveError } from '@ollm/ollm-cli-core/errors/index.js';
+/**
+ * Error codes for non-interactive mode.
+ */
+export var NonInteractiveErrorCode;
+(function (NonInteractiveErrorCode) {
+    NonInteractiveErrorCode[NonInteractiveErrorCode["PROVIDER_CONNECTION_FAILURE"] = 1] = "PROVIDER_CONNECTION_FAILURE";
+    NonInteractiveErrorCode[NonInteractiveErrorCode["MODEL_NOT_FOUND"] = 2] = "MODEL_NOT_FOUND";
+    NonInteractiveErrorCode[NonInteractiveErrorCode["TIMEOUT"] = 3] = "TIMEOUT";
+    NonInteractiveErrorCode[NonInteractiveErrorCode["INVALID_OUTPUT_FORMAT"] = 4] = "INVALID_OUTPUT_FORMAT";
+    NonInteractiveErrorCode[NonInteractiveErrorCode["GENERAL_ERROR"] = 5] = "GENERAL_ERROR";
+})(NonInteractiveErrorCode || (NonInteractiveErrorCode = {}));
+// Re-export NonInteractiveError from centralized errors
+export { NonInteractiveError };
+/**
+ * Non-interactive runner for single-prompt execution.
+ */
+export class NonInteractiveRunner {
+    /**
+     * Run a single prompt and return the result.
+     * @param options Execution options
+     * @returns Promise resolving to the result
+     * @throws NonInteractiveError with specific exit codes
+     */
+    async run(options) {
+        // Validate output format
+        const validFormats = ['text', 'json', 'stream-json'];
+        if (!validFormats.includes(options.output)) {
+            throw new NonInteractiveError(`Invalid output format: ${options.output}. Must be one of: ${validFormats.join(', ')}`, NonInteractiveErrorCode.INVALID_OUTPUT_FORMAT);
+        }
+        const startTime = Date.now();
+        // Initialize provider registry
+        const providerRegistry = new ProviderRegistry();
+        // Register providers based on config
+        const providerName = options.provider || options.config.provider.default;
+        try {
+            if (providerName === 'ollama' || providerName === 'local') {
+                const ollamaConfig = options.config.provider.ollama || {
+                    host: 'http://localhost:11434',
+                    timeout: 30000,
+                };
+                // Dynamically import LocalProvider to avoid requiring compiled declarations
+                // TS: this import targets source in another workspace package; silence project-reference build check
+                // @ts-expect-error: dynamic import from sibling package source
+                const { LocalProvider } = await import('../../ollm-bridge/src/provider/localProvider.js');
+                const localProvider = new LocalProvider({
+                    baseUrl: ollamaConfig.host,
+                    timeout: ollamaConfig.timeout,
+                });
+                providerRegistry.register(localProvider);
+                providerRegistry.setDefault('local');
+            }
+            // TODO: Add vLLM and OpenAI-compatible providers when implemented
+            else {
+                throw new NonInteractiveError(`Provider "${providerName}" not supported. Available providers: ollama`, NonInteractiveErrorCode.PROVIDER_CONNECTION_FAILURE);
+            }
+        }
+        catch (error) {
+            if (error instanceof NonInteractiveError) {
+                throw error;
+            }
+            // Enhance error message with connection details
+            let enhancedMessage = `Failed to initialize provider: ${error instanceof Error ? error.message : String(error)}`;
+            if (providerName === 'ollama' || providerName === 'local') {
+                const host = options.config.provider.ollama?.host || 'http://localhost:11434';
+                enhancedMessage += `\n  Provider: ${providerName}\n  Host: ${host}`;
+            }
+            throw new NonInteractiveError(enhancedMessage, NonInteractiveErrorCode.PROVIDER_CONNECTION_FAILURE);
+        }
+        // Initialize tool registry (empty for now)
+        const toolRegistry = new ToolRegistry();
+        // Initialize chat client
+        // Cast toolRegistry to unknown to bypass type mismatch with Turn's ToolRegistry interface
+        const chatClient = new ChatClient(providerRegistry, toolRegistry);
+        // Determine model
+        const model = options.model || options.config.model.default;
+        // Set up timeout if configured
+        const timeout = options.config.provider.ollama?.timeout || 30000;
+        const abortController = new AbortController();
+        const timeoutId = setTimeout(() => {
+            abortController.abort();
+        }, timeout);
+        // Execute chat
+        let response = '';
+        let hasError = false;
+        let errorMessage = '';
+        let errorCode = NonInteractiveErrorCode.GENERAL_ERROR;
+        try {
+            for await (const event of chatClient.chat(options.prompt, {
+                model,
+                provider: providerName === 'ollama' ? 'local' : providerName,
+                abortSignal: options.abortSignal || abortController.signal,
+            })) {
+                if (event.type === 'text') {
+                    response += event.value;
+                    // For stream-json output, emit each text chunk
+                    if (options.output === 'stream-json') {
+                        this.emitStreamEvent({ type: 'text', data: event.value });
+                    }
+                }
+                else if (event.type === 'tool_call_start') {
+                    if (options.output === 'stream-json') {
+                        this.emitStreamEvent({ type: 'tool_call_start', data: event.toolCall });
+                    }
+                }
+                else if (event.type === 'tool_call_result') {
+                    if (options.output === 'stream-json') {
+                        this.emitStreamEvent({
+                            type: 'tool_call_result',
+                            data: { toolCall: event.toolCall, result: event.result },
+                        });
+                    }
+                }
+                else if (event.type === 'turn_complete') {
+                    if (options.output === 'stream-json') {
+                        this.emitStreamEvent({ type: 'turn_complete', data: { turnNumber: event.turnNumber } });
+                    }
+                }
+                else if (event.type === 'finish') {
+                    if (options.output === 'stream-json') {
+                        this.emitStreamEvent({ type: 'finish', data: { reason: event.reason } });
+                    }
+                }
+                else if (event.type === 'error') {
+                    hasError = true;
+                    errorMessage = event.error.message;
+                    // Determine error code based on message
+                    if (errorMessage.includes('Provider') || errorMessage.includes('connection')) {
+                        errorCode = NonInteractiveErrorCode.PROVIDER_CONNECTION_FAILURE;
+                    }
+                    else if (errorMessage.includes('model') || errorMessage.includes('not found')) {
+                        errorCode = NonInteractiveErrorCode.MODEL_NOT_FOUND;
+                    }
+                    else if (errorMessage.includes('timeout') || errorMessage.includes('aborted')) {
+                        errorCode = NonInteractiveErrorCode.TIMEOUT;
+                    }
+                    if (options.output === 'stream-json') {
+                        this.emitStreamEvent({ type: 'error', data: { message: event.error.message } });
+                    }
+                }
+            }
+        }
+        catch (error) {
+            hasError = true;
+            if (error instanceof Error) {
+                errorMessage = error.message;
+                // Check for timeout/abort
+                if (error.name === 'AbortError' || errorMessage.includes('aborted')) {
+                    errorCode = NonInteractiveErrorCode.TIMEOUT;
+                    errorMessage = `Request timed out after ${timeout}ms`;
+                }
+                else if (errorMessage.includes('ECONNREFUSED') || errorMessage.includes('ENOTFOUND')) {
+                    errorCode = NonInteractiveErrorCode.PROVIDER_CONNECTION_FAILURE;
+                    const host = options.config.provider.ollama?.host || 'http://localhost:11434';
+                    errorMessage = `Cannot connect to provider at ${host}: ${errorMessage}`;
+                }
+                else if (errorMessage.includes('Provider') || errorMessage.includes('connection')) {
+                    errorCode = NonInteractiveErrorCode.PROVIDER_CONNECTION_FAILURE;
+                }
+                else if (errorMessage.includes('model') ||
+                    errorMessage.includes('not found') ||
+                    errorMessage.includes('404')) {
+                    errorCode = NonInteractiveErrorCode.MODEL_NOT_FOUND;
+                    errorMessage = `Model "${model}" not found. ${errorMessage}`;
+                }
+            }
+            else {
+                errorMessage = String(error);
+            }
+        }
+        finally {
+            clearTimeout(timeoutId);
+        }
+        const duration = Date.now() - startTime;
+        // If there was an error, throw it with the appropriate exit code
+        if (hasError) {
+            throw new NonInteractiveError(errorMessage, errorCode);
+        }
+        // Build result
+        const result = {
+            response,
+            metadata: {
+                model,
+                provider: providerName,
+                duration,
+            },
+        };
+        return result;
+    }
+    /**
+     * Format output according to the specified format.
+     * @param result The execution result
+     * @param format The output format
+     * @returns Formatted output string
+     */
+    formatOutput(result, format) {
+        switch (format) {
+            case 'text':
+                return result.response;
+            case 'json':
+                return JSON.stringify(result, null, 2);
+            case 'stream-json':
+                // For stream-json, events are emitted during execution
+                // This is just for the final result
+                return '';
+            default:
+                return result.response;
+        }
+    }
+    /**
+     * Emit a stream event for stream-json output.
+     * @param event The event to emit
+     */
+    emitStreamEvent(event) {
+        console.log(JSON.stringify(event));
+    }
+    /**
+     * Handle errors and write to stderr with detailed information.
+     * @param error The error to handle
+     */
+    handleError(error) {
+        // Write error to stderr
+        console.error(`\nError: ${error.message}`);
+        // Determine exit code
+        let exitCode = NonInteractiveErrorCode.GENERAL_ERROR;
+        if (error instanceof NonInteractiveError) {
+            exitCode = error.exitCode;
+            // Provide helpful suggestions based on error type
+            switch (exitCode) {
+                case NonInteractiveErrorCode.PROVIDER_CONNECTION_FAILURE:
+                    console.error('\n❌ Connection Status: Failed');
+                    console.error('\nRetry Options:');
+                    console.error('  1. Check that the provider service is running');
+                    console.error('  2. Verify the host URL in your configuration');
+                    console.error('  3. Try using --host to specify a different endpoint');
+                    console.error('  4. Check firewall settings');
+                    console.error('\nFor Ollama:');
+                    console.error('  - Start Ollama: ollama serve');
+                    console.error('  - Default host: http://localhost:11434');
+                    break;
+                case NonInteractiveErrorCode.MODEL_NOT_FOUND:
+                    console.error('\n❌ Model Status: Not Found');
+                    console.error('\nRetry Options:');
+                    console.error('  1. Use --list-models to see available models');
+                    console.error('  2. Pull the model with --pull-model <name>');
+                    console.error('  3. Check the model name spelling');
+                    console.error('\nExample:');
+                    console.error('  ollm --pull-model llama3.2:3b');
+                    console.error('  ollm --list-models');
+                    break;
+                case NonInteractiveErrorCode.TIMEOUT:
+                    console.error('\n⏱️  Connection Status: Timeout');
+                    console.error('\nRetry Options:');
+                    console.error('  1. Increase the timeout in your configuration');
+                    console.error('  2. Check provider connectivity and performance');
+                    console.error('  3. Try a smaller model or simpler prompt');
+                    console.error('  4. Retry the request');
+                    console.error('\nConfiguration:');
+                    console.error('  Add to ~/.ollm/config.yaml:');
+                    console.error('  provider:');
+                    console.error('    ollama:');
+                    console.error('      timeout: 60000  # 60 seconds');
+                    break;
+                case NonInteractiveErrorCode.INVALID_OUTPUT_FORMAT:
+                    console.error('\n❌ Invalid Output Format');
+                    console.error('\nValid output formats:');
+                    console.error('  - text        Plain text response only');
+                    console.error('  - json        JSON object with response and metadata');
+                    console.error('  - stream-json NDJSON stream of events');
+                    console.error('\nExample:');
+                    console.error('  ollm --prompt "Hello" --output json');
+                    break;
+                default:
+                    console.error('\nFor more help, run: ollm --help');
+                    break;
+            }
+        }
+        else {
+            console.error('\nFor more help, run: ollm --help');
+        }
+        console.error(''); // Empty line before exit
+        process.exit(exitCode);
+    }
+}
+/**
+ * Read prompt from stdin if available.
+ * @returns Promise resolving to stdin content or null
+ */
+export async function readStdin() {
+    // Check if stdin is a TTY (interactive terminal)
+    if (process.stdin.isTTY) {
+        return null;
+    }
+    return new Promise((resolve, reject) => {
+        let data = '';
+        process.stdin.setEncoding('utf8');
+        process.stdin.on('data', (chunk) => {
+            data += chunk;
+        });
+        process.stdin.on('end', () => {
+            resolve(data.trim());
+        });
+        process.stdin.on('error', (error) => {
+            reject(error);
+        });
+    });
+}
+//# sourceMappingURL=nonInteractive.js.map

package/dist/nonInteractive.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nonInteractive.js","sourceRoot":"","sources":["../src/nonInteractive.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAM1E;;GAEG;AACH,MAAM,CAAN,IAAY,uBAMX;AAND,WAAY,uBAAuB;IACjC,mHAA+B,CAAA;IAC/B,2FAAmB,CAAA;IACnB,2EAAW,CAAA;IACX,uGAAyB,CAAA;IACzB,uFAAiB,CAAA;AACnB,CAAC,EANW,uBAAuB,KAAvB,uBAAuB,QAMlC;AAED,wDAAwD;AACxD,OAAO,EAAE,mBAAmB,EAAE,CAAC;AAwC/B;;GAEG;AACH,MAAM,OAAO,oBAAoB;IAC/B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,CAAC,OAA8B;QACtC,yBAAyB;QACzB,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QACrD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,mBAAmB,CAC3B,0BAA0B,OAAO,CAAC,MAAM,qBAAqB,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EACtF,uBAAuB,CAAC,qBAAqB,CAC9C,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE7B,+BAA+B;QAC/B,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC;QAEhD,qCAAqC;QACrC,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;QAEzE,IAAI,CAAC;YACH,IAAI,YAAY,KAAK,QAAQ,IAAI,YAAY,KAAK,OAAO,EAAE,CAAC;gBAC1D,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI;oBACrD,IAAI,EAAE,wBAAwB;oBAC9B,OAAO,EAAE,KAAK;iBACf,CAAC;gBAEF,4EAA4E;gBAC5E,qGAAqG;gBACrG,+DAA+D;gBAC/D,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,iDAAiD,CAAC,CAAC;gBAE1F,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC;oBACtC,OAAO,EAAE,YAAY,CAAC,IAAI;oBAC1B,OAAO,EAAE,YAAY,CAAC,OAAO;iBAC9B,CAAC,CAAC;gBAEH,gBAAgB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;gBACzC,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACvC,CAAC;YACD,kEAAkE;iBAC7D,CAAC;gBACJ,MAAM,IAAI,mBAAmB,CAC3B,aAAa,YAAY,8CAA8C,EACvE,uBAAuB,CAAC,2BAA2B,CACpD,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,mBAAmB,EAAE,CAAC;gBACzC,MAAM,KAAK,CAAC;YACd,CAAC;YAED,gDAAgD;YAChD,IAAI,eAAe,GAAG,kCAAkC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAEjH,IAAI,YAAY,KAAK,QAAQ,IAAI,YAAY,KAAK,OAAO,EAAE,CAAC;gBAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,IAAI,wBAAwB,CAAC;gBAC9E,eAAe,IAAI,iBAAiB,YAAY,aAAa,IAAI,EAAE,CAAC;YACtE,CAAC;YAED,MAAM,IAAI,mBAAmB,CAC3B,eAAe,EACf,uBAAuB,CAAC,2BAA2B,CACpD,CAAC;QACJ,CAAC;QAED,2CAA2C;QAC3C,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;QAExC,yBAAyB;QACzB,0FAA0F;QAC1F,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,gBAAgB,EAAE,YAA8B,CAAC,CAAC;QAEpF,kBAAkB;QAClB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;QAE5D,+BAA+B;QAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,IAAI,KAAK,CAAC;QACjE,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YAChC,eAAe,CAAC,KAAK,EAAE,CAAC;QAC1B,CAAC,EAAE,OAAO,CAAC,CAAC;QAEZ,eAAe;QACf,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,SAAS,GAAG,uBAAuB,CAAC,aAAa,CAAC;QAEtD,IAAI,CAAC;YACH,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBACxD,KAAK;gBACL,QAAQ,EAAE,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY;gBAC5D,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,eAAe,CAAC,MAAM;aAC3D,CAAC,EAAE,CAAC;gBACH,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC1B,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC;oBAExB,+CAA+C;oBAC/C,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;wBACrC,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;oBAC5D,CAAC;gBACH,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;oBAC5C,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;wBACrC,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAC1E,CAAC;gBACH,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;oBAC7C,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;wBACrC,IAAI,CAAC,eAAe,CAAC;4BACnB,IAAI,EAAE,kBAAkB;4BACxB,IAAI,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE;yBACzD,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;oBAC1C,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;wBACrC,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;oBAC1F,CAAC;gBACH,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACnC,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;wBACrC,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;oBAC3E,CAAC;gBACH,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;oBAClC,QAAQ,GAAG,IAAI,CAAC;oBAChB,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;oBAEnC,wCAAwC;oBACxC,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;wBAC7E,SAAS,GAAG,uBAAuB,CAAC,2BAA2B,CAAC;oBAClE,CAAC;yBAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;wBAChF,SAAS,GAAG,uBAAuB,CAAC,eAAe,CAAC;oBACtD,CAAC;yBAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;wBAChF,SAAS,GAAG,uBAAuB,CAAC,OAAO,CAAC;oBAC9C,CAAC;oBAED,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;wBACrC,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;oBAClF,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,QAAQ,GAAG,IAAI,CAAC;YAEhB,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC;gBAE7B,0BAA0B;gBAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;oBACpE,SAAS,GAAG,uBAAuB,CAAC,OAAO,CAAC;oBAC5C,YAAY,GAAG,2BAA2B,OAAO,IAAI,CAAC;gBACxD,CAAC;qBAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBACvF,SAAS,GAAG,uBAAuB,CAAC,2BAA2B,CAAC;oBAChE,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,IAAI,wBAAwB,CAAC;oBAC9E,YAAY,GAAG,iCAAiC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC1E,CAAC;qBAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;oBACpF,SAAS,GAAG,uBAAuB,CAAC,2BAA2B,CAAC;gBAClE,CAAC;qBAAM,IACL,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC;oBAC9B,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC;oBAClC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC5B,CAAC;oBACD,SAAS,GAAG,uBAAuB,CAAC,eAAe,CAAC;oBACpD,YAAY,GAAG,UAAU,KAAK,gBAAgB,YAAY,EAAE,CAAC;gBAC/D,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAExC,iEAAiE;QACjE,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,mBAAmB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QACzD,CAAC;QAED,eAAe;QACf,MAAM,MAAM,GAAyB;YACnC,QAAQ;YACR,QAAQ,EAAE;gBACR,KAAK;gBACL,QAAQ,EAAE,YAAY;gBACtB,QAAQ;aACT;SACF,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,MAA4B,EAAE,MAAuC;QAChF,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,MAAM;gBACT,OAAO,MAAM,CAAC,QAAQ,CAAC;YAEzB,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAEzC,KAAK,aAAa;gBAChB,uDAAuD;gBACvD,oCAAoC;gBACpC,OAAO,EAAE,CAAC;YAEZ;gBACE,OAAO,MAAM,CAAC,QAAQ,CAAC;QAC3B,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,eAAe,CAAC,KAAkB;QACxC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,WAAW,CAAC,KAAkC;QAC5C,wBAAwB;QACxB,OAAO,CAAC,KAAK,CAAC,YAAY,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAE3C,sBAAsB;QACtB,IAAI,QAAQ,GAAG,uBAAuB,CAAC,aAAa,CAAC;QAErD,IAAI,KAAK,YAAY,mBAAmB,EAAE,CAAC;YACzC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;YAE1B,kDAAkD;YAClD,QAAQ,QAAQ,EAAE,CAAC;gBACjB,KAAK,uBAAuB,CAAC,2BAA2B;oBACtD,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;oBAC/C,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;oBAClC,OAAO,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;oBACjE,OAAO,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;oBAChE,OAAO,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;oBACvE,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;oBAC9C,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;oBAC/B,OAAO,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;oBAChD,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;oBAC1D,MAAM;gBAER,KAAK,uBAAuB,CAAC,eAAe;oBAC1C,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;oBAC7C,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;oBAClC,OAAO,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;oBAChE,OAAO,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;oBAC9D,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;oBACpD,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;oBAC5B,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;oBACjD,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;oBACtC,MAAM;gBAER,KAAK,uBAAuB,CAAC,OAAO;oBAClC,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;oBAClD,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;oBAClC,OAAO,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;oBACjE,OAAO,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;oBAClE,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;oBAC5D,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;oBACxC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;oBAClC,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;oBAC/C,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;oBAC7B,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;oBAC7B,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;oBACpD,MAAM;gBAER,KAAK,uBAAuB,CAAC,qBAAqB;oBAChD,OAAO,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;oBAC3C,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;oBACzC,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;oBAC1D,OAAO,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;oBACxE,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;oBACzD,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;oBAC5B,OAAO,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;oBACvD,MAAM;gBAER;oBACE,OAAO,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;oBACnD,MAAM;YACV,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAyB;QAC5C,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS;IAC7B,iDAAiD;IACjD,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,IAAI,GAAG,EAAE,CAAC;QAEd,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAElC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YACjC,IAAI,IAAI,KAAK,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YAC3B,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAClC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/services/KeybindsService.d.ts

@@ -0,0 +1,13 @@
+import { keybindsData } from '../config/keybinds.js';
+export declare class KeybindsService {
+    private static instance;
+    private configPath;
+    private constructor();
+    static getInstance(): KeybindsService;
+    load(): typeof keybindsData;
+    save(keybinds: typeof keybindsData): void;
+    resetAll(): typeof keybindsData;
+    private deepMerge;
+    private isObject;
+}
+//# sourceMappingURL=KeybindsService.d.ts.map

package/dist/services/KeybindsService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"KeybindsService.d.ts","sourceRoot":"","sources":["../../src/services/KeybindsService.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAkB;IACzC,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO;WAWO,WAAW,IAAI,eAAe;IAOrC,IAAI,IAAI,OAAO,YAAY;IAqB3B,IAAI,CAAC,QAAQ,EAAE,OAAO,YAAY,GAAG,IAAI;IAQzC,QAAQ,IAAI,OAAO,YAAY;IAKtC,OAAO,CAAC,SAAS;IAejB,OAAO,CAAC,QAAQ;CAGjB"}

package/dist/services/KeybindsService.js

@@ -0,0 +1,75 @@
+import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
+import { homedir } from 'os';
+import { join } from 'path';
+import { keybindsData } from '../config/keybinds.js';
+export class KeybindsService {
+    static instance;
+    configPath;
+    constructor() {
+        const homeDir = homedir();
+        const configDir = join(homeDir, '.ollm');
+        this.configPath = join(configDir, 'user_keybinds.json');
+        // Ensure directory exists
+        if (!existsSync(configDir)) {
+            mkdirSync(configDir, { recursive: true });
+        }
+    }
+    static getInstance() {
+        if (!KeybindsService.instance) {
+            KeybindsService.instance = new KeybindsService();
+        }
+        return KeybindsService.instance;
+    }
+    load() {
+        try {
+            if (!existsSync(this.configPath)) {
+                // First run: Create file with defaults
+                this.save(keybindsData);
+                return keybindsData;
+            }
+            const content = readFileSync(this.configPath, 'utf-8');
+            const userKeybinds = JSON.parse(content);
+            // Merge with defaults to ensure new keys are present
+            // We do a deep merge strategy here: Default keys that are missing in user config are added.
+            // User keys that are present override defaults.
+            return this.deepMerge(keybindsData, userKeybinds);
+        }
+        catch (error) {
+            console.error('Failed to load user keybinds:', error);
+            return keybindsData;
+        }
+    }
+    save(keybinds) {
+        try {
+            writeFileSync(this.configPath, JSON.stringify(keybinds, null, 2), 'utf-8');
+        }
+        catch (error) {
+            console.error('Failed to save user keybinds:', error);
+        }
+    }
+    resetAll() {
+        this.save(keybindsData);
+        return keybindsData;
+    }
+    deepMerge(target, source) {
+        const output = Object.assign({}, target);
+        if (this.isObject(target) && this.isObject(source)) {
+            Object.keys(source).forEach((key) => {
+                if (this.isObject(source[key])) {
+                    if (!(key in target))
+                        Object.assign(output, { [key]: source[key] });
+                    else
+                        output[key] = this.deepMerge(target[key], source[key]);
+                }
+                else {
+                    Object.assign(output, { [key]: source[key] });
+                }
+            });
+        }
+        return output;
+    }
+    isObject(item) {
+        return item && typeof item === 'object' && !Array.isArray(item);
+    }
+}
+//# sourceMappingURL=KeybindsService.js.map

package/dist/services/KeybindsService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"KeybindsService.js","sourceRoot":"","sources":["../../src/services/KeybindsService.ts"],"names":[],"mappings":"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"}

package/dist/services/__tests__/mcpConfigService.test.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Tests for MCP Configuration Service
+ */
+export {};
+//# sourceMappingURL=mcpConfigService.test.d.ts.map

package/dist/services/__tests__/mcpConfigService.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcpConfigService.test.d.ts","sourceRoot":"","sources":["../../../src/services/__tests__/mcpConfigService.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}