jinzd-ai-cli 0.4.33 → 0.4.35

package/dist/{chunk-PHKIBOYX.js → chunk-B4FJ7JTH.js}

@@ -6,7 +6,7 @@ import { platform } from "os";
 import chalk from "chalk";
 
 // src/core/constants.ts
-var VERSION = "0.4.33";
+var VERSION = "0.4.35";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/{chunk-QUHABI3Q.js → chunk-GSPLUO3M.js}

@@ -7,7 +7,7 @@ import {
   ProviderNotFoundError,
   RateLimitError,
   schemaToJsonSchema
-} from "./chunk-HI7WP73P.js";
+} from "./chunk-PTNODLIV.js";
 import {
   APP_NAME,
   CONFIG_DIR_NAME,
@@ -20,7 +20,7 @@ import {
   MCP_TOOL_PREFIX,
   PLUGINS_DIR_NAME,
   VERSION
-} from "./chunk-BIMGUPLT.js";
+} from "./chunk-NHANECAS.js";
 
 // src/config/config-manager.ts
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
@@ -2100,8 +2100,12 @@ var OllamaProvider = class extends OpenAICompatibleProvider {
   defaultBaseUrl = "http://localhost:11434/v1";
   defaultTimeout = 12e4;
   // 本地推理可能较慢，默认 2 分钟
-  /** 动态模型列表，initialize 时从 Ollama 获取 */
+  /** 动态模型列表 */
   dynamicModels = [];
+  /** 是否已成功连接过 Ollama */
+  connected = false;
+  /** 记住 base URL 用于后续重连 */
+  ollamaHost = "http://localhost:11434";
   info = {
     id: "ollama",
     displayName: "Ollama (Local)",
@@ -2114,36 +2118,56 @@ var OllamaProvider = class extends OpenAICompatibleProvider {
   };
   async initialize(apiKey, options) {
     const baseUrl = options?.baseUrl ?? this.defaultBaseUrl;
-    const ollamaHost = baseUrl.replace(/\/v1\/?$/, "");
-    this.dynamicModels = await this.fetchModels(ollamaHost);
-    if (this.dynamicModels.length === 0) {
-      throw new Error("Ollama is running but no models are installed. Run `ollama pull <model>` to install one.");
-    }
-    const preferred = ["llama3.1", "llama3", "qwen2.5", "qwen2", "deepseek-r1", "mistral", "gemma2"];
-    const defaultModel = this.dynamicModels.find(
-      (m) => preferred.some((p) => m.id.startsWith(p))
-    )?.id ?? this.dynamicModels[0].id;
-    Object.assign(this.info, {
-      defaultModel,
-      baseUrl,
-      models: this.dynamicModels
-    });
+    this.ollamaHost = baseUrl.replace(/\/v1\/?$/, "");
     await super.initialize(apiKey || "ollama", { ...options, baseUrl });
+    await this.tryConnect();
   }
   /**
-   * 从 Ollama /api/tags 获取本地模型列表。
-   * 如果 Ollama 未运行则抛出错误。
+   * 尝试连接 Ollama 并刷新模型列表。
+   * 成功返回 true，失败返回 false（不抛异常）。
    */
-  async fetchModels(ollamaHost) {
-    const url = `${ollamaHost}/api/tags`;
-    let response;
+  async tryConnect() {
     try {
-      response = await fetch(url, { signal: AbortSignal.timeout(5e3) });
+      this.dynamicModels = await this.fetchModels(this.ollamaHost);
+      if (this.dynamicModels.length === 0) {
+        this.connected = false;
+        return false;
+      }
+      const preferred = ["llama3.1", "llama3", "qwen2.5", "qwen3", "qwen2", "deepseek-r1", "mistral", "gemma2"];
+      const defaultModel = this.dynamicModels.find(
+        (m) => preferred.some((p) => m.id.startsWith(p))
+      )?.id ?? this.dynamicModels[0].id;
+      Object.assign(this.info, {
+        defaultModel,
+        baseUrl: `${this.ollamaHost}/v1`,
+        models: this.dynamicModels
+      });
+      this.connected = true;
+      return true;
     } catch {
-      throw new Error(
-        `Cannot connect to Ollama at ${ollamaHost}. Make sure Ollama is running (https://ollama.com).`
+      this.connected = false;
+      return false;
+    }
+  }
+  /**
+   * 确保已连接。在 chat/chatStream 前调用，若未连接则尝试重连。
+   */
+  async ensureConnected() {
+    if (this.connected && this.dynamicModels.length > 0) return;
+    const ok = await this.tryConnect();
+    if (!ok) {
+      throw new ProviderError(
+        "ollama",
+        `Cannot connect to Ollama at ${this.ollamaHost}. Make sure Ollama is running (\`ollama serve\`) and has models installed (\`ollama pull <model>\`).`
       );
     }
+  }
+  /**
+   * 从 Ollama /api/tags 获取本地模型列表。
+   */
+  async fetchModels(ollamaHost) {
+    const url = `${ollamaHost}/api/tags`;
+    const response = await fetch(url, { signal: AbortSignal.timeout(5e3) });
     if (!response.ok) {
       throw new Error(`Ollama API error: ${response.status} ${response.statusText}`);
     }
@@ -2163,32 +2187,27 @@ var OllamaProvider = class extends OpenAICompatibleProvider {
       };
     });
   }
-  /** 根据模型名估算上下文窗口（Ollama 模型元数据不含此信息） */
+  /** 根据模型名估算上下文窗口 */
   estimateContextWindow(modelName) {
     const name = modelName.toLowerCase();
     if (name.includes("llama3") || name.includes("llama-3")) return 131072;
     if (name.includes("qwen2.5") || name.includes("qwen3")) return 131072;
     if (name.includes("qwen2") || name.includes("qwen-2")) return 32768;
     if (name.includes("deepseek")) return 65536;
-    if (name.includes("gemma2") || name.includes("gemma-2")) return 8192;
+    if (name.includes("gemma2") || name.includes("gemma-2") || name.includes("gemma3")) return 8192;
     if (name.includes("mistral")) return 32768;
     if (name.includes("phi")) return 16384;
     if (name.includes("codellama") || name.includes("code-llama")) return 16384;
     return 8192;
   }
-  /** 动态返回当前 Ollama 安装的模型 */
+  /** 实时刷新模型列表 */
   async listModels() {
+    await this.tryConnect();
     return this.dynamicModels.length > 0 ? this.dynamicModels : this.info.models;
   }
   /** Ollama 无需验证 API Key，只检查服务是否可达 */
   async validateApiKey() {
-    try {
-      const ollamaHost = this.info.baseUrl.replace(/\/v1\/?$/, "");
-      await fetch(`${ollamaHost}/api/tags`, { signal: AbortSignal.timeout(5e3) });
-      return true;
-    } catch {
-      return false;
-    }
+    return this.tryConnect();
   }
 };
 

package/dist/{chunk-BIMGUPLT.js → chunk-NHANECAS.js}

@@ -8,7 +8,7 @@ import { platform } from "os";
 import chalk from "chalk";
 
 // src/core/constants.ts
-var VERSION = "0.4.33";
+var VERSION = "0.4.35";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/{chunk-HI7WP73P.js → chunk-PTNODLIV.js}

@@ -9,7 +9,7 @@ import {
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT,
   runTestsTool
-} from "./chunk-BIMGUPLT.js";
+} from "./chunk-NHANECAS.js";
 
 // src/tools/builtin/bash.ts
 import { execSync } from "child_process";

package/dist/{hub-H4GR45XE.js → hub-IUMZBNBH.js}

@@ -387,7 +387,7 @@ ${content}`);
   }
 }
 async function runTaskMode(config, providers, configManager, topic) {
-  const { TaskOrchestrator } = await import("./task-orchestrator-PJCFJMMW.js");
+  const { TaskOrchestrator } = await import("./task-orchestrator-GPTGIDZ5.js");
   const orchestrator = new TaskOrchestrator(config, providers, configManager);
   let interrupted = false;
   const onSigint = () => {

package/dist/index.js

@@ -24,7 +24,7 @@ import {
   saveDevState,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-QUHABI3Q.js";
+} from "./chunk-GSPLUO3M.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -37,7 +37,7 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-HI7WP73P.js";
+} from "./chunk-PTNODLIV.js";
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
@@ -61,7 +61,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-BIMGUPLT.js";
+} from "./chunk-NHANECAS.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -978,6 +978,16 @@ function createDefaultCommands() {
           ctx.renderer.renderError(`Provider '${targetId}' is not configured. Run: ai-cli config`);
           return;
         }
+        const targetProvider = ctx.providers.get(targetId);
+        if (targetProvider.info.models.length === 0) {
+          const models = await targetProvider.listModels();
+          if (models.length === 0) {
+            ctx.renderer.renderError(
+              `Provider '${targetId}' has no available models. ` + (targetId === "ollama" ? "Make sure Ollama is running (`ollama serve`) and has models (`ollama pull <model>`)." : "Check provider configuration.")
+            );
+            return;
+          }
+        }
         if (targetId === ctx.getCurrentProvider()) {
           ctx.renderer.printInfo(`Already using provider: ${targetId}`);
           return;
@@ -1003,8 +1013,9 @@ function createDefaultCommands() {
         let targetModel;
         if (!args[0]) {
           const provider = ctx.providers.get(ctx.getCurrentProvider());
+          const models = await provider.listModels();
           const currentModel = ctx.getCurrentModel();
-          const items = provider.info.models.map((m) => ({
+          const items = models.map((m) => ({
             value: m.id,
             label: m.id,
             hint: [
@@ -2087,7 +2098,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-MYDGL7IB.js");
+          const { executeTests } = await import("./run-tests-IND26J25.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -2737,8 +2748,11 @@ var PROVIDERS = [
   { value: "zhipu", name: "Zhipu (GLM)" },
   { value: "kimi", name: "Kimi (Moonshot AI)" },
   { value: "openai", name: "OpenAI" },
-  { value: "openrouter", name: "OpenRouter" }
+  { value: "openrouter", name: "OpenRouter" },
+  { value: "ollama", name: "Ollama (Local)" }
 ];
+var NO_KEY_PROVIDERS = /* @__PURE__ */ new Set(["ollama"]);
+var OLLAMA_DEFAULT_HOST = "http://localhost:11434";
 function maskKey(key) {
   if (key.length <= 10) return "****";
   return key.slice(0, 6) + "****" + key.slice(-4);
@@ -2798,6 +2812,9 @@ ${greeting} Starting ai-cli...
         await this.setupGoogleSearch();
       } else if (action === "apikey") {
         const choicesWithStatus = PROVIDERS.map((p) => {
+          if (NO_KEY_PROVIDERS.has(p.value)) {
+            return { value: p.value, name: `${p.name}  ${theme.dim("[no API key needed]")}` };
+          }
           const existingKey = this.config.getApiKey(p.value);
           const status = existingKey ? theme.success(`[${maskKey(existingKey)}]`) : theme.dim("[not configured]");
           return { value: p.value, name: `${p.name}  ${status}` };
@@ -2822,6 +2839,10 @@ ${greeting} Starting ai-cli...
     }
   }
   async setupProvider(providerId) {
+    if (NO_KEY_PROVIDERS.has(providerId)) {
+      await this.setupOllama();
+      return;
+    }
     const provider = PROVIDERS.find((p) => p.value === providerId);
     const displayName = provider?.name ?? providerId;
     const existingKey = this.config.getApiKey(providerId);
@@ -2864,6 +2885,57 @@ Managing ${displayName} API Key`);
     console.log(theme.success(`API key saved for ${displayName}: ${maskKey(newKey)}
 `));
   }
+  /** Ollama 专用配置：检测连通性、发现本地模型、可选自定义地址 */
+  async setupOllama() {
+    console.log(theme.heading("\n\u{1F999} Ollama (Local) Configuration"));
+    console.log(theme.dim("  Ollama runs AI models locally \u2014 no API key needed."));
+    console.log(theme.dim("  Install: https://ollama.com\n"));
+    const customBaseUrls = this.config.get("customBaseUrls") ?? {};
+    const currentHost = customBaseUrls["ollama"] ? customBaseUrls["ollama"].replace(/\/v1\/?$/, "") : OLLAMA_DEFAULT_HOST;
+    const ollamaHost = await input({
+      message: "Ollama server address:",
+      default: currentHost,
+      validate: (val) => {
+        if (!val) return "Address cannot be empty";
+        if (!val.startsWith("http://") && !val.startsWith("https://")) {
+          return "Must start with http:// or https://";
+        }
+        return true;
+      }
+    });
+    const host = ollamaHost.replace(/\/+$/, "");
+    console.log(theme.dim(`
+  Connecting to ${host}...`));
+    let models = [];
+    try {
+      const res = await fetch(`${host}/api/tags`, { signal: AbortSignal.timeout(5e3) });
+      if (!res.ok) throw new Error(`HTTP ${res.status}`);
+      const data = await res.json();
+      models = data.models ?? [];
+    } catch {
+      console.log(theme.error(`  \u2717 Cannot connect to Ollama at ${host}`));
+      console.log(theme.dim("    Make sure Ollama is running: ollama serve\n"));
+      return;
+    }
+    if (models.length === 0) {
+      console.log(theme.warning("  \u26A0 Ollama is running but no models installed."));
+      console.log(theme.dim("    Install a model: ollama pull llama3.1\n"));
+      return;
+    }
+    console.log(theme.success(`  \u2713 Connected! Found ${models.length} model(s):
+`));
+    for (const m of models) {
+      const size = m.details?.parameter_size ?? `${(m.size / 1e9).toFixed(1)}GB`;
+      console.log(`    \u2022 ${m.name}  ${theme.dim(`(${size})`)}`);
+    }
+    console.log();
+    if (host !== OLLAMA_DEFAULT_HOST) {
+      const urls = { ...customBaseUrls, ollama: `${host}/v1` };
+      this.config.set("customBaseUrls", urls);
+    }
+    this.config.save();
+    console.log(theme.success("  Ollama configured! Use /provider ollama to switch.\n"));
+  }
   async setupProxy() {
     const current = this.config.get("proxy") ?? "";
     console.log("\nHTTP/HTTPS Proxy Configuration");
@@ -5397,7 +5469,7 @@ program.command("web").description("Start Web UI server with browser-based chat
     console.error("Error: Invalid port number. Must be between 1 and 65535.");
     process.exit(1);
   }
-  const { startWebServer } = await import("./server-MHRSLD7P.js");
+  const { startWebServer } = await import("./server-VPTEWZD4.js");
   await startWebServer({ port, host: options.host });
 });
 program.command("user [action] [username]").description("Manage Web UI users (list | create <name> | delete <name> | reset-password <name> | migrate <name>)").action(async (action, username) => {
@@ -5630,7 +5702,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-H4GR45XE.js");
+  const { startHub } = await import("./hub-IUMZBNBH.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-MYDGL7IB.js → run-tests-IND26J25.js}

@@ -2,7 +2,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-BIMGUPLT.js";
+} from "./chunk-NHANECAS.js";
 export {
   executeTests,
   runTestsTool

package/dist/{run-tests-BA6ZL2QS.js → run-tests-UGPKOQ6J.js}

@@ -1,7 +1,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-PHKIBOYX.js";
+} from "./chunk-B4FJ7JTH.js";
 export {
   executeTests,
   runTestsTool

package/dist/{server-MHRSLD7P.js → server-VPTEWZD4.js}

@@ -15,7 +15,7 @@ import {
   hadPreviousWriteToolCalls,
   loadDevState,
   setupProxy
-} from "./chunk-QUHABI3Q.js";
+} from "./chunk-GSPLUO3M.js";
 import {
   AuthManager
 } from "./chunk-BYNY5JPB.js";
@@ -33,7 +33,7 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-HI7WP73P.js";
+} from "./chunk-PTNODLIV.js";
 import "./chunk-4BKXL7SM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -52,7 +52,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-BIMGUPLT.js";
+} from "./chunk-NHANECAS.js";
 
 // src/web/server.ts
 import express from "express";
@@ -1606,7 +1606,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
       case "test": {
         this.send({ type: "info", message: "\u{1F9EA} Running tests..." });
         try {
-          const { executeTests } = await import("./run-tests-MYDGL7IB.js");
+          const { executeTests } = await import("./run-tests-IND26J25.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

package/dist/{task-orchestrator-PJCFJMMW.js → task-orchestrator-GPTGIDZ5.js}

@@ -4,11 +4,11 @@ import {
   getDangerLevel,
   googleSearchContext,
   truncateOutput
-} from "./chunk-HI7WP73P.js";
+} from "./chunk-PTNODLIV.js";
 import "./chunk-4BKXL7SM.js";
 import {
   SUBAGENT_ALLOWED_TOOLS
-} from "./chunk-BIMGUPLT.js";
+} from "./chunk-NHANECAS.js";
 
 // src/hub/task-orchestrator.ts
 import { createInterface } from "readline";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jinzd-ai-cli",
-  "version": "0.4.33",
+  "version": "0.4.35",
   "description": "Cross-platform REPL-style AI CLI with multi-provider support",
   "type": "module",
   "main": "./dist/index.js",