@hopper-agent/cli 0.2.0 → 0.2.1

package/LICENSE

@@ -0,0 +1,179 @@
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      revisions are patently meant to be an adaptation, but does not
+      include a work that is merely a copy of the Work except a Derivative
+      Work.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to the Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding any notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Limitation of Liability. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Governing Law. This License shall be governed by the laws of the
+      State of New York, USA, excluding its choice of law rules.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and You agree to indemnify, defend, and
+      hold each Contributor harmless for any liability incurred by, or
+      claims asserted against, such Contributor by reason of your
+      exercising any rights or permissions given by this License.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2025 hopper-agent contributors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/src/cli.js

@@ -12,7 +12,7 @@ const __filename = fileURLToPath(import.meta.url);
 import { ChatSurface, handleSlashCommand, COLD_START_BANNER } from '@hopper-agent/tui';
 import { getTheme } from '@hopper-agent/render';
 import { TurnLoop, SettingsManager, DEFAULT_SETTINGS, CronManager, TelegramGateway, ChannelRegistry, ChannelRouter, HeartbeatExecutor, HeartbeatDelivery, pickNextSchedule, scheduleLabel } from '@hopper-agent/core';
-import { AnthropicProvider, OpenAIProvider, GoogleGeminiProvider } from '@hopper-agent/providers';
+import { AnthropicProvider, OpenAIProvider, OllamaProvider, GoogleGeminiProvider } from '@hopper-agent/providers';
 import { allTools } from '@hopper-agent/tools';
 import { createMcpTools } from '@hopper-agent/mcp';
 const VERSION = '0.5.1';
@@ -1097,11 +1097,12 @@ CRITICAL: Output ONLY the JSON array. No markdown, no explanation, no code fence
                     '3': { name: 'openai', key: 'OPENAI_API_KEY', url: 'OPENAI_URL' },
                     '4': { name: 'anthropic', key: 'ANTHROPIC_API_KEY', url: 'ANTHROPIC_URL' },
                     '5': { name: 'google', key: 'GOOGLE_API_KEY', url: 'GOOGLE_URL' },
+                    '6': { name: 'ollama', key: 'MODEL_API_KEY', url: 'MODEL_URL' },
                 };
                 const entry = providerMap[choice];
                 if (!entry) {
-                    setChannelMessages((prev) => ({ ...prev, [targetChannel]: [...(prev[targetChannel] || []), { role: 'assistant', content: 'Invalid choice. Please enter 1-5.\n  1) local\n  2) openrouter\n  3) openai\n  4) anthropic\n  5) google' }] }));
-                    setMessages((prev) => [...prev, { role: 'assistant', content: 'Invalid choice. Please enter 1-5.\n  1) local\n  2) openrouter\n  3) openai\n  4) anthropic\n  5) google' }]);
+                    setChannelMessages((prev) => ({ ...prev, [targetChannel]: [...(prev[targetChannel] || []), { role: 'assistant', content: 'Invalid choice. Please enter 1-6.\n  1) local\n  2) openrouter\n  3) openai\n  4) anthropic\n  5) google\n  6) ollama' }] }));
+                    setMessages((prev) => [...prev, { role: 'assistant', content: 'Invalid choice. Please enter 1-6.\n  1) local\n  2) openrouter\n  3) openai\n  4) anthropic\n  5) google\n  6) ollama' }]);
                     return;
                 }
                 const updates = { MODEL_PROVIDER: entry.name };
@@ -1111,9 +1112,10 @@ CRITICAL: Output ONLY the JSON array. No markdown, no explanation, no code fence
                         : entry.name === 'google' ? 'https://generativelanguage.googleapis.com/v1beta'
                             : `https://api.${entry.name}.com/v1`;
                 settingsMgr.current.update(updates);
-                if (entry.name === 'local') {
-                    wizardRef.current = { phase: 'apiKey', provider: entry.name };
-                    pushToChannel(targetChannel, `${entry.name}: Enter your API key:`);
+                if (entry.name === 'ollama') {
+                    // Ollama doesn't need API key — skip to URL
+                    wizardRef.current = { phase: 'url', provider: entry.name };
+                    pushToChannel(targetChannel, `${entry.name}: What is your Ollama API URL?\n  Default: http://localhost:11434/v1\n  (Press Enter for default):`);
                 }
                 else {
                     wizardRef.current = { phase: 'apiKey', provider: entry.name };
@@ -1122,7 +1124,7 @@ CRITICAL: Output ONLY the JSON array. No markdown, no explanation, no code fence
                 return;
             }
             if (wizard.phase === 'apiKey') {
-                const keyName = wizard.provider === 'local' ? 'MODEL_API_KEY'
+                const keyName = wizard.provider === 'local' || wizard.provider === 'ollama' ? 'MODEL_API_KEY'
                     : wizard.provider === 'openrouter' ? 'OPENROUTER_API_KEY'
                         : wizard.provider === 'openai' ? 'OPENAI_API_KEY'
                             : wizard.provider === 'google' ? 'GOOGLE_API_KEY'
@@ -1132,6 +1134,11 @@ CRITICAL: Output ONLY the JSON array. No markdown, no explanation, no code fence
                     wizardRef.current = { phase: 'url', provider: wizard.provider };
                     pushToChannel(targetChannel, `API key configured.\nWhat is your local API URL?\n  Default: http://localhost:8080/v1\n  (Press Enter for default):`);
                 }
+                else if (wizard.provider === 'ollama') {
+                    settingsMgr.current.update({ MODEL_URL: 'http://localhost:11434/v1' });
+                    wizardRef.current = { phase: 'model', provider: wizard.provider };
+                    pushToChannel(targetChannel, `URL configured: http://localhost:11434/v1\nWhich model do you want to use?\n  Examples: llama3.3, mistral, phi3, qwen2.5\n  Enter model name:`);
+                }
                 else if (wizard.provider === 'google') {
                     wizardRef.current = { phase: 'model', provider: wizard.provider };
                     pushToChannel(targetChannel, `API key configured.\nWhich model do you want to use?\n  Examples: gemini-2.5-flash, gemini-2.5-pro, gemini-2.0-flash\n  Enter model name:`);
@@ -1143,10 +1150,14 @@ CRITICAL: Output ONLY the JSON array. No markdown, no explanation, no code fence
                 return;
             }
             if (wizard.phase === 'url') {
-                const url = input || 'http://localhost:8080/v1';
+                const defaultUrl = wizard.provider === 'ollama' ? 'http://localhost:11434/v1' : 'http://localhost:8080/v1';
+                const url = input || defaultUrl;
                 settingsMgr.current.update({ MODEL_URL: url });
+                const modelExamples = wizard.provider === 'ollama'
+                    ? 'llama3.3, mistral, phi3, qwen2.5'
+                    : 'claude-sonnet-4-6, gpt-4o, o1, llama-3.1-405b';
                 wizardRef.current = { phase: 'model', provider: wizard.provider };
-                pushToChannel(targetChannel, `URL configured: ${url}\nWhich model do you want to use?\n  Examples: claude-sonnet-4-6, gpt-4o, o1, llama-3.1-405b\n  Enter model name:`);
+                pushToChannel(targetChannel, `URL configured: ${url}\nWhich model do you want to use?\n  Examples: ${modelExamples}\n  Enter model name:`);
                 return;
             }
             if (wizard.phase === 'model') {
@@ -1249,6 +1260,7 @@ CRITICAL: Output ONLY the JSON array. No markdown, no explanation, no code fence
             });
             channelTurnLoops.set(targetChannel, loop);
         }
+        loopRef.current = loop;
         const channelMsgs = channelMessages[targetChannel] || [];
         setChannelMessages((prev) => ({
             ...prev,
@@ -1416,6 +1428,7 @@ CRITICAL: Output ONLY the JSON array. No markdown, no explanation, no code fence
             unsubs.forEach(u => u());
             toolGroupIndexRef.current = null;
             busyRef.current = false;
+            loopRef.current = null;
             setStatus('idle');
             // Route response back to Telegram if this is a Telegram channel
             const telegramChatId = channelRouter.getTelegramChatId(targetChannel);
@@ -1654,20 +1667,21 @@ function createProvider(settings) {
         const p = new AnthropicProvider(orKey, orUrl);
         return { name: 'openrouter', stream: p.stream.bind(p), check: p.check.bind(p) };
     }
-    if (providerName === 'local') {
-        const localKey = (typeof settings.MODEL_API_KEY === 'string' ? settings.MODEL_API_KEY.trim() : '') ||
+    if (providerName === 'ollama' || providerName === 'local') {
+        const key = (typeof settings.MODEL_API_KEY === 'string' ? settings.MODEL_API_KEY.trim() : '') ||
             process.env.MODEL_API_KEY ||
             '';
-        const localUrl = (typeof settings.MODEL_URL === 'string' ? settings.MODEL_URL.trim() : '') ||
+        const url = (typeof settings.MODEL_URL === 'string' ? settings.MODEL_URL.trim() : '') ||
             process.env.MODEL_URL ||
             '';
-        if (!localKey && !localUrl) {
-            console.error('hopper-agent: no local provider config.\n' +
-                '  Run `hopper-agent` and use `/init` to configure, or set "MODEL_API_KEY" and "MODEL_URL" in ~/.hopper-agent/settings.json.');
+        if (!url) {
+            console.error('hopper-agent: no local provider URL configured.\n' +
+                '  Run `hopper-agent` and use `/init` to configure, or set "MODEL_URL" in ~/.hopper-agent/settings.json.');
             return null;
         }
-        const p = new AnthropicProvider(localKey || undefined, localUrl || undefined, { local: true });
-        return { name: 'local', stream: p.stream.bind(p), check: p.check.bind(p) };
+        const p = new OllamaProvider(key || undefined, url || undefined);
+        const displayName = providerName === 'ollama' ? 'ollama' : 'local';
+        return { name: displayName, stream: p.stream.bind(p), check: p.check.bind(p) };
     }
     if (providerName === 'google') {
         const googleKey = (typeof settings.GOOGLE_API_KEY === 'string' ? settings.GOOGLE_API_KEY.trim() : '') ||