@nickyzj2023/ai 1.6.1 → 1.6.3

package/dist/cli.mjs

@@ -1,7 +1,7 @@
-import { i as runAgent, n as get_weather_default, r as get_time_default } from "./src-BzQy5h8z.mjs";
-import { t as defineModel } from "./helper-juLVGxlQ.mjs";
-import { n as loadMCPTools } from "./mcp-DcntQg-a.mjs";
-import { compactStr, extractErrorMessage, isObject } from "@nickyzj2023/utils";
+import { i as runAgent, n as get_weather_default, r as get_time_default } from "./src-Bh2ZFPb4.mjs";
+import { a as listModels, t as defineModel } from "./helper-DJw58Gmz.mjs";
+import { n as loadMCPTools } from "./mcp-BBjcb8es.mjs";
+import { compactStr, extractErrorMessage, isObject, to } from "@nickyzj2023/utils";
 import readline from "node:readline";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
@@ -110,12 +110,12 @@ const askMcpServer = async (current) => {
 	};
 };
 /**
-* 把菜单输入的数字解析成对应的服务器名称
+* 把菜单输入的数字解析成对应的名称
 * @param input 用户输入的数字串
-* @param names 当前菜单的服务器名称列表
+* @param names 当前菜单的名称列表
 * @returns 对应名称；非整数或越界返回undefined
 */
-const pickServerName = (input, names) => {
+const pickByIndex = (input, names) => {
 	const index = Number(input) - 1;
 	return Number.isInteger(index) ? names[index] : void 0;
 };
@@ -141,7 +141,7 @@ const configMcp = async (mcpServers) => {
 			}
 			case "d": {
 				const target = (await ask("输入要删除的服务器编号: ")).trim();
-				const oldName = pickServerName(target, names);
+				const oldName = pickByIndex(target, names);
 				if (!oldName) {
 					console.log("无效编号，请输入列表中的数字");
 					break;
@@ -153,7 +153,7 @@ const configMcp = async (mcpServers) => {
 				break;
 			}
 			default: {
-				const oldName = pickServerName(choice, names);
+				const oldName = pickByIndex(choice, names);
 				if (oldName) {
 					const server = mcpServers[oldName];
 					if (!server) console.log("该服务器配置缺失，将重新录入");
@@ -173,17 +173,33 @@ const configMcp = async (mcpServers) => {
 	}
 };
 /**
+* 询问MODEL：能连上服务时先列出GET /models的模型，输入序号即可选中，同时也支持直接手输模型名
+* @param baseUrl 刚录入的BASE_URL
+* @param apiKey 刚录入的APIKEY
+* @param fallback 直接回车时沿用的模型
+*/
+const askModel = async (baseUrl, apiKey, fallback) => {
+	const [error, models] = await to(baseUrl ? listModels(baseUrl, apiKey) : Promise.resolve([]));
+	const names = models ?? [];
+	if (error) console.log(`获取模型列表失败：${extractErrorMessage(error)}`);
+	else if (names.length === 0) console.log("服务端未返回任何模型，请手动输入模型名");
+	else {
+		console.log("可用模型（输入序号快速选择，也可直接输入模型名）：");
+		names.forEach((name, i) => {
+			console.log(`  ${i + 1}. ${name}`);
+		});
+	}
+	const input = (await ask(`MODEL [当前为${fallback}]: `)).trim();
+	return pickByIndex(input, names) || input || fallback;
+};
+/**
 * setup入口：依次询问BASE_URL / MODEL / APIKEY，确认后写入全局配置
 */
 async function runSetup() {
 	const config = loadConfig();
-	if (config) {
-		console.log(`当前配置：BASE_URL ${config.baseUrl}，APIKEY ${config.apiKey}，MODEL ${config.model}`);
-		console.log("直接回车可沿用当前值。\n");
-	}
 	const baseUrl = await ask(`BASE_URL [当前为${config?.baseUrl}]: `) || config?.baseUrl;
 	const apiKey = await ask(`APIKEY [当前为${config?.apiKey}]: `) || config?.apiKey;
-	const model = await ask(`MODEL [当前为${config?.model}]: `) || config?.model;
+	const model = await askModel(baseUrl, apiKey, config?.model);
 	const mcpServers = { ...config?.mcpServers };
 	if ((await ask("是否配置MCP服务器？(y/n): ")).trim().toLowerCase() === "y") await configMcp(mcpServers);
 	try {
@@ -462,7 +478,7 @@ var TUI = class {
 	printToolResult(name, result, options) {
 		const { ellipsis = true } = options ?? {};
 		const _result = ellipsis ? compactStr(result, {
-			maxLength: 200,
+			maxLength: 100,
 			truncateMiddle: true
 		}) : result;
 		this.preparePrint("tool_result");

package/dist/{helper-juLVGxlQ.mjs → helper-DJw58Gmz.mjs}

@@ -1,3 +1,4 @@
+import { fetcher } from "@nickyzj2023/utils";
 //#region src/utils/helper.ts
 /**
 * 辅助定义一个POST /chat/completions支持的model参数
@@ -44,6 +45,17 @@ const estimateTextTokens = (text) => {
 	return Math.ceil(words * 1.5 + others / 4);
 };
 /**
+* 列出GET /models返回的模型id
+* @param baseUrl 接口前缀，如http://127.0.0.1:11434/v1
+* @param apiKey 本地llama.cpp等不校验鉴权的服务可以不传，不传就不带Authorization头
+* @returns 模型的id列表
+* @remarks 请求失败（服务没起、鉴权不过等）会抛异常，由调用方自行兜底
+*/
+const listModels = async (baseUrl, apiKey) => {
+	const { data } = await fetcher(baseUrl, { headers: apiKey ? { Authorization: `Bearer ${apiKey}` } : void 0 }).get("/models");
+	return (data ?? []).map((model) => model.id).filter((id) => typeof id === "string");
+};
+/**
 * 根据上下文里的中/英文/多模态消息，估算出可能消耗的token
 * - 单词 ≈ 1.5token
 * - 标点/空白等非词字符每4个 ≈ 1token
@@ -62,4 +74,4 @@ const estimateTokens = (messages) => {
 	}, 0);
 };
 //#endregion
-export { estimateTokens as i, defineTool as n, estimateTextTokens as r, defineModel as t };
+export { listModels as a, estimateTokens as i, defineTool as n, estimateTextTokens as r, defineModel as t };

package/dist/index.d.mts

@@ -137,6 +137,14 @@ declare const defineModel: (config: Model) => Model;
  */
 declare const defineTool: (name: ToolDefinition["function"]["name"], description: ToolDefinition["function"]["description"], properties: ToolDefinition["function"]["parameters"]["properties"], execute: ToolDefinition["execute"]) => ToolDefinition;
 declare const estimateTextTokens: (text: string) => number;
+/**
+ * 列出GET /models返回的模型id
+ * @param baseUrl 接口前缀，如http://127.0.0.1:11434/v1
+ * @param apiKey 本地llama.cpp等不校验鉴权的服务可以不传，不传就不带Authorization头
+ * @returns 模型的id列表
+ * @remarks 请求失败（服务没起、鉴权不过等）会抛异常，由调用方自行兜底
+ */
+declare const listModels: (baseUrl: string, apiKey?: string) => Promise<string[]>;
 /**
  * 根据上下文里的中/英文/多模态消息，估算出可能消耗的token
  * - 单词 ≈ 1.5token
@@ -145,4 +153,4 @@ declare const estimateTextTokens: (text: string) => number;
  */
 declare const estimateTokens: (messages?: Message[]) => number;
 //#endregion
-export { type AgentEvent, type AudioContent, type ChatCompletionsChunk, type ContentPart, type FinishReason, type ImageContent, type LLMEvent, type Message, type Modality, type Model, type TextContent, type ToolCall, type ToolDefinition, type Usage, type VideoContent, compact, defineModel, defineTool, estimateTextTokens, estimateTokens, _default as getTime, _default$1 as getWeather, runAgent, stream };
+export { type AgentEvent, type AudioContent, type ChatCompletionsChunk, type ContentPart, type FinishReason, type ImageContent, type LLMEvent, type Message, type Modality, type Model, type TextContent, type ToolCall, type ToolDefinition, type Usage, type VideoContent, compact, defineModel, defineTool, estimateTextTokens, estimateTokens, _default as getTime, _default$1 as getWeather, listModels, runAgent, stream };

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { a as stream, i as runAgent, n as get_weather_default, r as get_time_default, t as compact } from "./src-BzQy5h8z.mjs";
-import { i as estimateTokens, n as defineTool, r as estimateTextTokens, t as defineModel } from "./helper-juLVGxlQ.mjs";
-export { compact, defineModel, defineTool, estimateTextTokens, estimateTokens, get_time_default as getTime, get_weather_default as getWeather, runAgent, stream };
+import { a as stream, i as runAgent, n as get_weather_default, r as get_time_default, t as compact } from "./src-Bh2ZFPb4.mjs";
+import { a as listModels, i as estimateTokens, n as defineTool, r as estimateTextTokens, t as defineModel } from "./helper-DJw58Gmz.mjs";
+export { compact, defineModel, defineTool, estimateTextTokens, estimateTokens, get_time_default as getTime, get_weather_default as getWeather, listModels, runAgent, stream };

package/dist/{mcp-DcntQg-a.mjs → mcp-BBjcb8es.mjs}

@@ -1,4 +1,4 @@
-import { n as defineTool } from "./helper-juLVGxlQ.mjs";
+import { n as defineTool } from "./helper-DJw58Gmz.mjs";
 import { extractErrorMessage, isObject, logger, omit } from "@nickyzj2023/utils";
 //#region src/tools/mcp.ts
 /** 全局单例MCP加载器 */

package/dist/{src-BzQy5h8z.mjs → src-Bh2ZFPb4.mjs}

@@ -1,4 +1,4 @@
-import { i as estimateTokens, n as defineTool, r as estimateTextTokens } from "./helper-juLVGxlQ.mjs";
+import { i as estimateTokens, n as defineTool, r as estimateTextTokens } from "./helper-DJw58Gmz.mjs";
 import { createXMLText, extractErrorMessage, fetcher, logger, parseSSE, pick, to } from "@nickyzj2023/utils";
 //#region src/llm.ts
 /**
@@ -190,12 +190,64 @@ var get_time_default = defineTool("get_time", "查询指定时区的当前时间
 });
 //#endregion
 //#region src/tools/get-weather.ts
+/**
+* 把wttr.in的时间转成好读的"HH:mm"
+* @param rawTime - wttr.in hourly里的time字段，3小时粒度不带冒号，比如"0"、"300"、"1200"
+* @returns 补零后的时间字符串，比如"00:00"、"03:00"、"12:00"
+* @example toHHmm("930") // "09:30"
+*/
+const toHHmm = (rawTime) => {
+	const padded = String(rawTime ?? "").padStart(4, "0");
+	return `${padded.slice(0, 2)}:${padded.slice(2)}`;
+};
+/**
+* 精简wttr.in返回的天气数据
+* @param rawData - wttr.in API返回的原始JSON
+* @returns 精简后的天气数据
+*/
+const pickValuableFields = (rawData) => {
+	if (!rawData) return null;
+	const area = rawData.nearest_area?.[0] || {};
+	return {
+		location: {
+			city: area.areaName?.[0]?.value || "",
+			region: area.region?.[0]?.value || "",
+			country: area.country?.[0]?.value || "",
+			latitude: area.latitude,
+			longitude: area.longitude
+		},
+		forecast: (rawData.weather || []).map((day) => ({
+			date: day.date,
+			maxTempC: day.maxtempC,
+			minTempC: day.mintempC,
+			astro: {
+				sunrise: day.astronomy?.[0]?.sunrise || "",
+				sunset: day.astronomy?.[0]?.sunset || "",
+				moonPhase: day.astronomy?.[0]?.moon_phase || ""
+			},
+			hourly: (day.hourly || []).map((h) => ({
+				time: toHHmm(h.time),
+				tempC: h.tempC,
+				feelsLikeC: h.FeelsLikeC,
+				weatherDesc: h.weatherDesc?.[0]?.value || "",
+				chanceOfRain: h.chanceofrain,
+				precipMM: h.precipMM,
+				humidity: h.humidity,
+				windSpeedKmph: h.windspeedKmph,
+				windDir: h.winddir16Point
+			}))
+		}))
+	};
+};
 var get_weather_default = defineTool("get_weather", "查询指定城市的天气情况", { city: {
 	type: "string",
 	description: "城市名，如shanghai、tokyo",
 	required: true
 } }, async ({ city }) => {
-	return fetcher("https://wttr.in", { params: { format: "j1" } }).get(`/${city}`);
+	const api = fetcher("https://wttr.in", { params: { format: "j1" } });
+	const [error, response] = await to(api.get(`/${city}`));
+	if (error) return error.message;
+	return pickValuableFields(response);
 });
 //#endregion
 //#region src/utils/compact/helper.ts

package/dist/tools/mcp.mjs

@@ -1,2 +1,2 @@
-import { n as loadMCPTools, t as MCPRouter } from "../mcp-DcntQg-a.mjs";
+import { n as loadMCPTools, t as MCPRouter } from "../mcp-BBjcb8es.mjs";
 export { MCPRouter, loadMCPTools };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nickyzj2023/ai",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "我的“pi”，参考了pi-from-scratch",
   "type": "module",
   "main": "./dist/index.mjs",