zhitalk 0.0.8 → 0.0.10

package/README.md

@@ -2,22 +2,30 @@
 
 [智语 Zhitalk](https://zhitalk.chat/) 是一个 AI Agent 个人助手，像 OpenClaw 小龙虾一样。 包含 tools skills memory hook subagent MCP-server 等 Agent 功能。你可以和它聊天，给它分配任务，让它操作文件...
 
-## Usage
+📖 你可以免费围观项目进展，也可以加入学习 [跟双越老师从 0 开发一个 AI Agent 智能体](https://www.huashuiai.com/pub/ai-agent-camp-new)
 
-Docs https://zhitalk.chat/
+## Usage
 
-Install
+使用 npm 全局安装。注意，Windows 用户使用管理员打开 cmd 再执行。
 
 ```
 npm install zhitalk -g
 ```
 
-Run in terminal
+查看版本
+
+```
+zhitalk --version
+```
+
+启动项目
 
 ```
 zhitalk
 ```
 
+第一次执行时，需要你修改配置文件，参考 https://zhitalk.chat/#config
+
 ## Dev
 
 ### Tech

package/dist/agent/agent.js

@@ -1,6 +1,6 @@
 import { SqliteSaver } from '@langchain/langgraph-checkpoint-sqlite';
 import { SystemMessage, AIMessage, HumanMessage, ToolMessage, } from '@langchain/core/messages';
-import { StateGraph, Annotation, START, END, interrupt, Command, } from '@langchain/langgraph';
+import { StateGraph, Annotation, START, END, interrupt, Command, GraphRecursionError, } from '@langchain/langgraph';
 import { messagesStateReducer } from '@langchain/langgraph';
 import { DB_PATH } from './db.js';
 import { tools, maybePersistedOutput, initTools } from './tools.js';
@@ -113,6 +113,14 @@ function createAgentGraph(toolList) {
         modelMessages = modelMessages.slice(0, 300);
         // 修复因中断/截断导致的未完成 tool_calls
         modelMessages = ensureCompleteToolCalls(modelMessages);
+        // 清理异常消息：某些 API（如 GLM）可能在流式响应中产生 role 为 undefined 的 ChatMessage
+        modelMessages = modelMessages.filter((msg) => {
+            const msgType = msg._getType?.();
+            if (msgType === 'generic' && msg.role === undefined) {
+                return false;
+            }
+            return true;
+        });
         const messages = [new SystemMessage(systemPrompt), ...modelMessages];
         const response = await modelWithTheseTools.invoke(messages, config);
         return { messages: [response] };
@@ -287,32 +295,43 @@ async function _runAgent(compiledAgent, userMessage, onToken, onToolConfirmation
     let fullResponse = '';
     let usageMetadata;
     let input = { messages: [new HumanMessage(userMessage)] };
+    const recursionLimit = 50;
     while (true) {
-        const stream = await compiledAgent.stream(input, {
-            ...config,
-            streamMode: 'messages',
-            signal,
-            recursionLimit: 50,
-        });
-        for await (const chunk of stream) {
-            if (signal?.aborted) {
-                throw new Error('abort');
+        try {
+            const stream = await compiledAgent.stream(input, {
+                ...config,
+                streamMode: 'messages',
+                signal,
+                recursionLimit,
+            });
+            for await (const chunk of stream) {
+                if (signal?.aborted) {
+                    throw new Error('abort');
+                }
+                const message = chunk[0];
+                const metadata = chunk[1];
+                if (metadata?.langgraph_node !== 'model_request')
+                    continue;
+                const msgUsage = message.usage_metadata;
+                if (msgUsage) {
+                    usageMetadata = msgUsage;
+                }
+                // AIMessageChunk 的 content 在 message.content 属性上，不在 kwargs.content
+                const content = message.content ?? message.kwargs?.content ?? '';
+                const toolCallChunks = message.tool_call_chunks ?? [];
+                if (!content || toolCallChunks.length > 0)
+                    continue;
+                onToken(content);
+                fullResponse += content;
             }
-            const message = chunk[0];
-            const metadata = chunk[1];
-            if (metadata?.langgraph_node !== 'model_request')
-                continue;
-            const msgUsage = message.usage_metadata;
-            if (msgUsage) {
-                usageMetadata = msgUsage;
+        }
+        catch (err) {
+            if (err instanceof GraphRecursionError) {
+                const hint = `我已经思考了 ${recursionLimit} 个步骤，仍未得到最终结果，我暂停歇会儿～ 你可以随时让我“继续”`;
+                onToken('\n\n' + hint);
+                return { response: fullResponse + '\n\n' + hint, usageMetadata };
             }
-            // AIMessageChunk 的 content 在 message.content 属性上，不在 kwargs.content
-            const content = message.content ?? message.kwargs?.content ?? '';
-            const toolCallChunks = message.tool_call_chunks ?? [];
-            if (!content || toolCallChunks.length > 0)
-                continue;
-            onToken(content);
-            fullResponse += content;
+            throw err;
         }
         const state = await compiledAgent.getState(config);
         const interruptedTask = state.tasks?.find((t) => t.interrupts?.length > 0);

package/dist/agent/cli.js

@@ -7,6 +7,7 @@ import { getModelContextLimit } from './context.js';
 import { color, formatToolLog } from './colors.js';
 import { threadId, commands } from './commands.js';
 import { runSessionStartHooks } from './hooks.js';
+import { getModelConfig } from './config.js';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(join(__dirname, '../../package.json'), 'utf-8'));
 function createInterface() {
@@ -22,6 +23,7 @@ async function printBanner() {
     const info = [
         `${color.gray('Description')}: ${pkg.description}`,
         `${color.gray('Version')}:     ${pkg.version}`,
+        `${color.gray('Model')}:       ${getModelConfig().model}`,
         `${color.gray('Author')}:      ${pkg.author}`,
         `${color.gray('Docs')}:        ${pkg.docs}`,
     ].join('\n');
@@ -47,9 +49,43 @@ function prompt(question) {
         });
     });
 }
+function createSpinner(text) {
+    const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+    let i = 0;
+    let timer = null;
+    let running = false;
+    const tick = () => {
+        i = (i + 1) % frames.length;
+        readline.cursorTo(process.stdout, 0);
+        process.stdout.write(color.gray(`${text} ${frames[i]}`));
+    };
+    return {
+        start() {
+            if (running)
+                return;
+            running = true;
+            i = 0;
+            readline.cursorTo(process.stdout, 0);
+            process.stdout.write(color.gray(`${text} ${frames[0]}`));
+            timer = setInterval(tick, 80);
+        },
+        stop() {
+            if (!running)
+                return;
+            running = false;
+            if (timer) {
+                clearInterval(timer);
+                timer = null;
+            }
+            readline.cursorTo(process.stdout, 0);
+            readline.clearLine(process.stdout, 0);
+        },
+    };
+}
 async function chat(userInput) {
     const rl = createInterface();
-    process.stdout.write('\n' + color.aiPrefix());
+    // AI: 前缀延迟到第一个 token 输出，此前显示 spinner
+    // process.stdout.write('\n' + color.aiPrefix())
     const controller = new AbortController();
     // 监听 ESC 键，中断 AI 请求
     const escListener = (_str, key) => {
@@ -62,18 +98,31 @@ async function chat(userInput) {
     readline.emitKeypressEvents(process.stdin);
     process.stdin.on('keypress', escListener);
     let usageMetadata;
+    let isFirstToken = true;
+    const spinner = createSpinner('AI 思考中');
     try {
+        spinner.start();
         const result = await runAgentStream(userInput, (token) => {
+            if (isFirstToken) {
+                isFirstToken = false;
+                spinner.stop();
+                process.stdout.write('\n' + color.aiPrefix());
+            }
             process.stdout.write(token);
         }, async (toolCalls) => {
+            spinner.stop();
             for (const call of toolCalls) {
                 console.log(formatToolLog(call.name, JSON.stringify(call.args)));
             }
             const answer = await new Promise((resolve) => {
                 rl.question('确认执行以上工具? (y/n): ', resolve);
             });
-            return (answer.trim().toLowerCase() === 'y' ||
-                answer.trim().toLowerCase() === 'yes');
+            const confirmed = answer.trim().toLowerCase() === 'y' ||
+                answer.trim().toLowerCase() === 'yes';
+            if (confirmed && isFirstToken) {
+                spinner.start();
+            }
+            return confirmed;
         }, threadId, controller.signal);
         usageMetadata = result.usageMetadata;
     }
@@ -83,6 +132,9 @@ async function chat(userInput) {
         }
     }
     finally {
+        if (isFirstToken) {
+            spinner.stop();
+        }
         process.stdin.removeListener('keypress', escListener);
         rl.close();
     }
@@ -90,7 +142,7 @@ async function chat(userInput) {
         const limit = getModelContextLimit();
         const percentage = (usageMetadata.total_tokens / limit) * 100;
         const percentageStr = percentage.toFixed(1);
-        const tokenText = `Tokens: ${usageMetadata.total_tokens.toLocaleString()} / ${limit.toLocaleString()} (${percentageStr}%)`;
+        const tokenText = `${getModelConfig().model}, Tokens: ${usageMetadata.total_tokens.toLocaleString()} / ${limit.toLocaleString()} (${percentageStr}%)`;
         if (percentage >= 80) {
             process.stdout.write('\n' +
                 color.error(tokenText) +

package/dist/agent/config.js

@@ -36,7 +36,10 @@ export function getModelConfig() {
     if (!config.model.baseURL) {
         throw new Error(`配置文件 ${CONFIG_PATH} 中缺少 model.baseURL 字段，请参考 https://zhitalk.chat/#config 修改配置`);
     }
-    return config.model;
+    return {
+        ...config.model,
+        model: config.model.model.toLowerCase(),
+    };
 }
 export function getEnv(key) {
     const config = loadConfig();

package/dist/agent/model.js

@@ -2,16 +2,21 @@ import { ChatOpenAI } from '@langchain/openai';
 import { getModelConfig } from './config.js';
 const modelConfig = getModelConfig();
 export function createModel(options) {
+    const modelKwargs = {};
+    if (modelConfig.model.startsWith('kimi') ||
+        modelConfig.model.startsWith('minimax')) {
+        modelKwargs.thinking = { type: 'disabled' };
+    }
+    // GLM 模型的流式 function calling 存在兼容性问题，禁用流式输出
+    const isGlm = modelConfig.model.startsWith('glm');
     return new ChatOpenAI({
         model: modelConfig.model,
         apiKey: modelConfig.apiKey,
         configuration: {
             baseURL: modelConfig.baseURL,
         },
-        streaming: options?.streaming ?? true,
-        modelKwargs: {
-            thinking: { type: 'disabled' },
-        },
+        streaming: isGlm ? false : (options?.streaming ?? true),
+        modelKwargs,
     });
 }
 export async function checkModel() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zhitalk",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "A personal AI Agent like OpenClaw, including tools, skills, memory, hook, sub-agent, MCP server, etc. Run in the terminal.",
   "type": "module",
   "main": "dist/index.js",