min-agent 0.5.0 → 0.5.1

package/dist/config.js

@@ -1,7 +1,6 @@
 import { readFileSync, mkdirSync, existsSync, statSync } from "fs";
 import path from "path";
 import os from "os";
-import readline from "readline";
 import { atomicWriteFileSync } from "./tools/atomic-file.js";
 import { getEffectiveSandboxPolicy, mergeSandboxConfig, parseSandboxConfig, sandboxLaunchSource, sandboxStatusLabel, } from "./sandbox.js";
 const DEFAULT_CONFIG_DIR = path.join(os.homedir(), ".min-agent");
@@ -287,184 +286,78 @@ async function fetchModelsFromURL(url, apiKey) {
         signal: AbortSignal.timeout(10000),
     });
     if (!response.ok)
-        return [];
-    const data = (await response.json());
-    const models = (data.data ?? data ?? []);
-    return models.map((m) => m.id).sort();
-}
-function ask(rl, question, defaultValue) {
-    const suffix = defaultValue ? ` (${defaultValue})` : "";
-    return new Promise((resolve) => {
-        rl.question(`${question}${suffix}: `, (answer) => {
-            resolve(answer.trim() || defaultValue || "");
-        });
-    });
+        return { models: [], ok: false, status: response.status };
+    const data = await response.json();
+    return { models: parseModelIds(data), ok: true, status: response.status };
+}
+function parseModelIds(data) {
+    const list = Array.isArray(data)
+        ? data
+        : data !== null && typeof data === "object" && "data" in data && Array.isArray(data.data)
+            ? data.data
+            : [];
+    return list
+        .map((item) => item !== null && typeof item === "object" && "id" in item && typeof item.id === "string" ? item.id : null)
+        .filter((id) => id != null)
+        .sort();
 }
 const MODELS_CACHE_FILE = "models-cache.json";
 function modelsCachePath() {
     return path.join(getConfigDir(), MODELS_CACHE_FILE);
 }
-function loadModelsCache() {
+function modelsCacheKey(baseURL) {
+    return baseURL.replace(/\/$/, "");
+}
+function loadModelsCacheMap() {
     const file = modelsCachePath();
     if (!existsSync(file))
-        return [];
+        return {};
     try {
-        return JSON.parse(readFileSync(file, "utf-8"));
+        const parsed = JSON.parse(readFileSync(file, "utf-8"));
+        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+            return {};
+        return Object.fromEntries(Object.entries(parsed).filter((entry) => Array.isArray(entry[1]) && entry[1].every((item) => typeof item === "string")));
     }
     catch {
-        return [];
+        return {};
     }
 }
-function saveModelsCache(models) {
+function loadModelsCacheBucket(baseURL) {
+    return loadModelsCacheMap()[modelsCacheKey(baseURL)] ?? [];
+}
+function saveModelsCacheBucket(baseURL, models) {
+    const map = loadModelsCacheMap();
+    map[modelsCacheKey(baseURL)] = models;
     mkdirSync(getConfigDir(), { recursive: true });
-    atomicWriteFileSync(modelsCachePath(), JSON.stringify(models));
+    atomicWriteFileSync(modelsCachePath(), JSON.stringify(map));
 }
-export async function fetchModels(baseURL, apiKey) {
+export async function fetchModelsLive(baseURL, apiKey) {
     try {
-        const trimmed = baseURL.replace(/\/$/, "");
-        let models = await fetchModelsFromURL(`${trimmed}/models`, apiKey);
-        // Ollama users often provide host without /v1; auto-retry that variant.
-        if (models.length === 0 && !trimmed.endsWith("/v1")) {
-            models = await fetchModelsFromURL(`${trimmed}/v1/models`, apiKey);
+        const trimmed = modelsCacheKey(baseURL);
+        let result = await fetchModelsFromURL(`${trimmed}/models`, apiKey);
+        if (result.models.length === 0 && !trimmed.endsWith("/v1")) {
+            result = await fetchModelsFromURL(`${trimmed}/v1/models`, apiKey);
         }
-        if (models.length > 0) {
-            saveModelsCache(models);
-            return models;
+        if (result.ok && result.models.length > 0) {
+            saveModelsCacheBucket(trimmed, result.models);
+            return { models: result.models, ok: true, status: result.status };
         }
-        // Fallback to cache if live fetch returned nothing
-        const cached = loadModelsCache();
-        if (cached.length > 0) {
-            console.log("\x1b[90m  (using cached model list)\x1b[0m");
-        }
-        return cached;
+        if (!result.ok)
+            return { models: [], ok: false, status: result.status };
+        return { models: [], ok: true, status: result.status };
     }
     catch {
-        // Network error — fallback to cache
-        const cached = loadModelsCache();
-        if (cached.length > 0) {
-            console.log("\x1b[90m  (using cached model list — network unavailable)\x1b[0m");
-        }
-        return cached;
+        return { models: [], ok: false };
     }
 }
-export async function runSetup() {
-    const config = loadConfig();
-    const providers = config.providers ?? [];
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    console.log("\n🔧 min-agent 配置\n");
-    if (providers.length > 0) {
-        console.log("已配置的 Provider:");
-        providers.forEach((p, i) => {
-            const marker = p.name === config.activeProvider ? " ← 当前" : "";
-            console.log(`  ${i + 1}. ${p.name ?? "(未命名)"}  ${p.baseURL}  (${p.defaultModel ?? "未设置模型"})${marker}`);
-        });
-        console.log();
-        console.log("选项:");
-        console.log("  1. 添加新 Provider");
-        console.log("  2. 切换当前 Provider");
-        console.log("  3. 修改当前 Provider");
-        console.log("  4. 完成");
-        const choice = await ask(rl, "选择 (1/2/3/4)", "4");
-        if (choice === "1") {
-            const provider = await collectProvider(rl, undefined);
-            provider.name =
-                (await ask(rl, "Provider 名称", `provider-${providers.length + 1}`)).trim() ||
-                    `provider-${providers.length + 1}`;
-            providers.push(provider);
-            config.activeProvider = provider.name;
-            config.providers = providers;
-            saveConfig(config);
-            console.log(`\n✓ Provider "${provider.name}" 已添加并设为当前`);
-        }
-        else if (choice === "2") {
-            const sel = await ask(rl, "输入序号选择当前 Provider");
-            const idx = parseInt(sel, 10) - 1;
-            const target = providers[idx];
-            if (!target?.name) {
-                console.error("无效序号");
-            }
-            else {
-                config.activeProvider = target.name;
-                saveConfig(config);
-                console.log(`\n✓ 当前 Provider 已切换为: ${target.name}`);
-            }
-        }
-        else if (choice === "3") {
-            const name = getActiveProvider(config)?.name ?? providers[0]?.name;
-            if (!name) {
-                console.error("无可用 Provider");
-                rl.close();
-                return;
-            }
-            const idx = providers.findIndex((p) => p.name === name);
-            providers[idx] = { ...(await collectProvider(rl, providers[idx])), name };
-            config.providers = providers;
-            saveConfig(config);
-            console.log(`\n✓ Provider "${name}" 已更新`);
-        }
-        else {
-            console.log("\n配置未变更");
-        }
-        rl.close();
-        return;
-    }
-    // 首次配置
-    const provider = await collectProvider(rl, undefined);
-    provider.name = "default";
-    config.providers = [provider];
-    config.activeProvider = "default";
-    saveConfig(config);
-    rl.close();
-    console.log(`\n✓ 配置已保存到 ${path.join(getConfigDir(), CONFIG_FILE_NAME)}`);
-}
-async function collectProvider(rl, existing) {
-    console.log("Provider 类型:");
-    console.log("  1. openai-compatible (默认，兼容 OpenAI API 的任意服务)");
-    console.log("  2. openai (OpenAI 官方)");
-    console.log("  3. ollama (本地 Ollama)");
-    console.log();
-    const typeChoice = await ask(rl, "选择 Provider (1/2/3)", existing?.type === "ollama" ? "3" : existing?.type === "openai" ? "2" : "1");
-    const providerType = typeChoice === "3" ? "ollama" : typeChoice === "2" ? "openai" : "openai-compatible";
-    let baseURL;
-    let apiKey;
-    if (providerType === "ollama") {
-        baseURL = await ask(rl, "Ollama API URL", existing?.baseURL || "http://localhost:11434/v1");
-        baseURL = normalizeOllamaBaseURL(baseURL);
-        apiKey = "ollama";
-    }
-    else if (providerType === "openai") {
-        baseURL = "https://api.openai.com/v1";
-        apiKey = await ask(rl, "OpenAI API Key", existing?.apiKey);
-    }
-    else {
-        baseURL = await ask(rl, "API Base URL", existing?.baseURL || "https://api.openai.com/v1");
-        apiKey = await ask(rl, "API Key", existing?.apiKey);
-    }
-    if (!baseURL || (!apiKey && providerType !== "ollama")) {
-        console.error("URL 和 Key 不能为空");
-        process.exit(1);
-    }
-    console.log("\n正在获取模型列表...");
-    const models = await fetchModels(baseURL, apiKey);
-    let defaultModel = existing?.defaultModel ?? "";
-    if (models.length > 0) {
-        console.log(`\n可用模型 (${models.length}):`);
-        models.forEach((m, i) => {
-            const marker = m === defaultModel ? " ← 当前默认" : "";
-            console.log(`  ${i + 1}. ${m}${marker}`);
-        });
-        console.log();
-        const choice = await ask(rl, "选择默认模型 (输入序号或模型名)", defaultModel);
-        const idx = parseInt(choice, 10) - 1;
-        if (idx >= 0 && idx < models.length)
-            defaultModel = models[idx];
-        else if (choice)
-            defaultModel = choice;
-    }
-    else {
-        console.log("  ⚠ 无法获取模型列表，请手动输入模型名");
-        const hint = providerType === "ollama" ? "llama3" : providerType === "openai" ? "gpt-4o" : "";
-        defaultModel = await ask(rl, "默认模型", defaultModel || hint);
+export async function fetchModels(baseURL, apiKey) {
+    const live = await fetchModelsLive(baseURL, apiKey);
+    if (live.models.length > 0)
+        return live.models;
+    const cached = loadModelsCacheBucket(baseURL);
+    if (cached.length > 0) {
+        const suffix = live.status == null && !live.ok ? " — network unavailable" : "";
+        console.log(`\x1b[90m  (using cached model list${suffix})\x1b[0m`);
     }
-    return { type: providerType, baseURL, apiKey, defaultModel };
+    return cached;
 }

package/dist/context-window.js

@@ -3,14 +3,17 @@ import path from "path";
 import { atomicWriteFileSync } from "./tools/atomic-file.js";
 import { getConfigDir, getEffectiveConfig, getActiveProvider } from "./config.js";
 import { getCachedModelCatalog, getModelCatalog } from "./model-catalog.js";
+import { getCachedOllamaModel, getOllamaModel, OLLAMA_AGENT_CONTEXT_CAP, OLLAMA_DEFAULT_CONTEXT_WINDOW, } from "./ollama-model.js";
 /**
  * Auto-detect context window size for the current model.
  *
  * Resolution order:
  * 1. User config: provider.contextWindow (explicit override)
- * 2. Provider-specific API (OpenRouter, vLLM, Ollama, OpenAI-compatible /models)
- * 3. Lonae model catalog (context + thinking options)
- * 4. Fallback: 512000 (memory only — never persisted as a detected value)
+ * 2. Ollama providers (`type: "ollama"`): native POST /api/show operational window
+ *    (Modelfile num_ctx, else architecture length capped at 32k) — never Lonae
+ * 3. Provider-specific API (OpenRouter, vLLM, hostname-based Ollama, OpenAI-compatible /models)
+ * 4. Lonae model catalog (context + thinking options)
+ * 5. Fallback: 512000 (memory only — never persisted as a detected value)
  */
 export const DEFAULT_CONTEXT_WINDOW = 512000;
 const CACHE_TTL = 7 * 24 * 60 * 60 * 1000;
@@ -164,25 +167,23 @@ async function tryProviderModels(baseURL, apiKey, modelId) {
 async function tryOllama(baseURL, modelId) {
     if (!baseURL.includes("localhost") && !baseURL.includes("127.0.0.1") && !baseURL.includes("ollama"))
         return null;
-    try {
-        // Ollama's /api/show endpoint
-        const ollamaBase = baseURL.replace(/\/v1\/?$/, "");
-        const response = await fetch(`${ollamaBase}/api/show`, {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ name: modelId }),
-            signal: AbortSignal.timeout(5000),
-        });
-        if (!response.ok)
-            return null;
-        const data = (await response.json());
-        // Ollama returns model_info with context length
-        const ctxLength = data.model_info?.["general.context_length"] ?? data.model_info?.context_length ?? data.parameters?.num_ctx;
-        return typeof ctxLength === "number" ? ctxLength : null;
+    const info = await getOllamaModel(modelId, baseURL);
+    return info?.contextWindow ?? null;
+}
+async function detectOllamaWindow(baseURL, id) {
+    const shown = await getOllamaModel(id, baseURL);
+    if (shown?.contextWindow) {
+        setCache(id, shown.contextWindow, "detected");
+        return { tokens: shown.contextWindow, source: "detected" };
     }
-    catch {
-        return null;
+    const listed = await tryProviderModels(baseURL, "ollama", id);
+    if (listed) {
+        const tokens = Math.min(listed, OLLAMA_AGENT_CONTEXT_CAP);
+        setCache(id, tokens, "detected");
+        return { tokens, source: "detected" };
     }
+    setCache(id, OLLAMA_DEFAULT_CONTEXT_WINDOW, "fallback");
+    return { tokens: OLLAMA_DEFAULT_CONTEXT_WINDOW, source: "fallback" };
 }
 /**
  * Detect context window size for a model by probing all sources in parallel.
@@ -192,6 +193,8 @@ async function detectContextWindow(config, id) {
     const provider = getActiveProvider(config);
     const baseURL = provider?.baseURL ?? "";
     const apiKey = provider?.apiKey ?? "";
+    if (provider?.type === "ollama")
+        return detectOllamaWindow(baseURL, id);
     const catalog = await getModelCatalog(id, baseURL);
     if (catalog?.contextWindow)
         return { tokens: catalog.contextWindow, source: "detected" };
@@ -221,9 +224,16 @@ export async function getContextWindowInfo(modelId) {
     const id = modelId ?? provider?.defaultModel;
     if (!id)
         return { tokens: DEFAULT_CONTEXT_WINDOW, source: "fallback" };
-    const cached = getCached(id);
-    if (cached)
-        return cached;
+    if (provider?.type === "ollama") {
+        const shown = getCachedOllamaModel(id, provider.baseURL);
+        if (shown?.contextWindow)
+            return { tokens: shown.contextWindow, source: "detected" };
+    }
+    else {
+        const cached = getCached(id);
+        if (cached)
+            return cached;
+    }
     const pending = inFlight.get(id);
     if (pending)
         return pending;

package/dist/ctx-cli.js

@@ -0,0 +1,30 @@
+import { activeProviderIsOllama, configuredCtxChoice, ctxChoiceLabel, parseCtxChoice, setOllamaContextChoice, } from "./ctx.js";
+export const CTX_CLI_USAGE = [
+    "Usage: min-agent ctx [2k|4k|8k|12k|16k|32k|64k|128k|256k|auto]",
+    "       Context levels are only available for an Ollama provider.",
+].join("\n");
+export function runCtxCli(input) {
+    if (input.positionals[0] === "--help" || input.positionals[0] === "-h") {
+        return { ok: true, lines: [CTX_CLI_USAGE] };
+    }
+    if (!activeProviderIsOllama()) {
+        return { ok: false, lines: ["Context levels are only available for an Ollama provider.", CTX_CLI_USAGE] };
+    }
+    if (input.positionals.length === 0) {
+        const current = configuredCtxChoice();
+        const label = current.choice === "auto" && current.tokens != null ? `${current.tokens}` : current.choice;
+        return { ok: true, lines: [`Current context window: ${label}`, CTX_CLI_USAGE] };
+    }
+    if (input.positionals.length > 1)
+        return { ok: false, lines: [CTX_CLI_USAGE] };
+    const parsed = parseCtxChoice(input.positionals[0]);
+    if (!parsed)
+        return { ok: false, lines: [CTX_CLI_USAGE] };
+    const result = setOllamaContextChoice(parsed);
+    if (!result.ok)
+        return { ok: false, lines: ["Context levels are only available for an Ollama provider.", CTX_CLI_USAGE] };
+    return {
+        ok: true,
+        lines: [`✓ Context window set to ${result.choice === "auto" ? "auto" : ctxChoiceLabel(result.choice)}`],
+    };
+}

package/dist/ctx.js

@@ -0,0 +1,80 @@
+import { getActiveProvider, loadConfig, saveConfig } from "./config.js";
+export const CTX_LEVELS = ["2k", "4k", "8k", "12k", "16k", "32k", "64k", "128k", "256k"];
+export const CTX_AUTO = "auto";
+export const CTX_CHOICES = [...CTX_LEVELS, CTX_AUTO];
+const CTX_TOKENS = {
+    "2k": 2048,
+    "4k": 4096,
+    "8k": 8192,
+    "12k": 12288,
+    "16k": 16384,
+    "32k": 32768,
+    "64k": 65536,
+    "128k": 131072,
+    "256k": 262144,
+};
+const TOKEN_TO_LEVEL = new Map(CTX_LEVELS.map((level) => [CTX_TOKENS[level], level]));
+export function isCtxLevel(value) {
+    return CTX_LEVELS.includes(value);
+}
+export function isCtxChoice(value) {
+    return value === CTX_AUTO || isCtxLevel(value);
+}
+export function tokensForCtxLevel(level) {
+    return CTX_TOKENS[level];
+}
+export function matchCtxLevel(tokens) {
+    return TOKEN_TO_LEVEL.get(Math.floor(tokens)) ?? null;
+}
+export function parseCtxChoice(raw) {
+    if (raw == null)
+        return null;
+    const text = raw.trim().toLowerCase();
+    if (!text)
+        return null;
+    if (text === "auto" || text === "default")
+        return CTX_AUTO;
+    if (isCtxLevel(text))
+        return text;
+    if (!/^\d+$/.test(text))
+        return null;
+    return matchCtxLevel(Number(text));
+}
+export function ctxChoiceLabel(choice) {
+    return choice === CTX_AUTO ? "自动" : choice;
+}
+export function activeProviderIsOllama() {
+    return getActiveProvider(loadConfig())?.type === "ollama";
+}
+export function configuredCtxChoice() {
+    const tokens = getActiveProvider(loadConfig())?.contextWindow;
+    if (typeof tokens !== "number" || !Number.isFinite(tokens) || tokens <= 0)
+        return { choice: CTX_AUTO };
+    const level = matchCtxLevel(tokens);
+    if (level)
+        return { choice: level, tokens: tokensForCtxLevel(level) };
+    return { choice: CTX_AUTO, tokens: Math.floor(tokens) };
+}
+export function setOllamaContextChoice(choice) {
+    const cfg = loadConfig();
+    const provider = getActiveProvider(cfg);
+    if (!provider)
+        return { ok: false, reason: "no-provider" };
+    if (provider.type !== "ollama")
+        return { ok: false, reason: "not-ollama" };
+    if (choice === CTX_AUTO)
+        delete provider.contextWindow;
+    else
+        provider.contextWindow = tokensForCtxLevel(choice);
+    saveConfig(cfg);
+    return choice === CTX_AUTO ? { ok: true, choice } : { ok: true, choice, tokens: tokensForCtxLevel(choice) };
+}
+export function ctxPayload() {
+    const provider = getActiveProvider(loadConfig());
+    if (provider?.type !== "ollama")
+        return { configurable: false, level: null };
+    const tokens = provider.contextWindow;
+    if (typeof tokens !== "number" || !Number.isFinite(tokens) || tokens <= 0)
+        return { configurable: true, level: CTX_AUTO };
+    return { configurable: true, level: matchCtxLevel(tokens) };
+}