zhitalk 0.0.7 → 0.0.9

package/dist/agent/agent.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] };

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');
@@ -90,7 +92,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/model.js

@@ -2,16 +2,20 @@ import { ChatOpenAI } from '@langchain/openai';
 import { getModelConfig } from './config.js';
 const modelConfig = getModelConfig();
 export function createModel(options) {
+    const modelKwargs = {};
+    if (modelConfig.model.startsWith('kimi')) {
+        modelKwargs.thinking = { type: 'disabled' };
+    }
+    // GLM 模型的流式 function calling 存在兼容性问题，禁用流式输出
+    const isGlm = modelConfig.model.toLowerCase().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/dist/agent/prompt.js

@@ -39,6 +39,20 @@ const memoryPrompt = `## Memory Management Rules
 const dateTimePrompt = `## Current DateTime
 
 ${new Date().toLocaleString('zh-CN', { timeZone: 'Asia/Shanghai' })}`;
-export const systemPrompt = skillsText
-    ? `${basePrompt}\n\n${profilePrompt}\n\n${memoryPrompt}\n\n## Available Skills\n\nYou have access to the following skills. When a user's request matches a skill's description, you MUST call the \`load_skill\` tool to load that skill's full instructions, then follow them.\n\n${skillsText}\n\n${dateTimePrompt}`
-    : `${basePrompt}\n\n${profilePrompt}\n\n${memoryPrompt}\n\n${dateTimePrompt}`;
+const skillList = skillsText
+    ? `You have access to the following skills. When a user's request matches a skill's description, you MUST call the \`load_skill\` tool to load that skill's full instructions, then follow them.
+
+${skillsText}`
+    : 'There are no skills available.';
+const skillPrompt = `## Skills
+
+${skillList}\n\nNote: If you want to add a new skill, it must be placed in the ${path.join(WORKSPACE_DIR, 'skills')} directory.`;
+export const systemPrompt = [
+    basePrompt,
+    profilePrompt,
+    memoryPrompt,
+    skillPrompt,
+    dateTimePrompt,
+]
+    .filter(Boolean)
+    .join('\n\n');

package/dist/agent/skills.js

@@ -1,6 +1,5 @@
 import { readdirSync, readFileSync, statSync } from 'fs';
 import { join } from 'path';
-import { homedir } from 'os';
 import { WORKSPACE_DIR } from './config.js';
 const skills = [];
 const skillContentMap = new Map();
@@ -29,9 +28,8 @@ export function discoverSkills() {
     skills.length = 0;
     skillContentMap.clear();
     const skillDirs = [
-        join(homedir(), '.agents', 'skills'),
-        join(WORKSPACE_DIR, '.agents', 'skills'),
         join(WORKSPACE_DIR, 'skills'),
+        join(process.cwd(), '.agents', 'skills'),
     ];
     for (const skillsDir of skillDirs) {
         let entries;
@@ -73,14 +71,13 @@ export function loadSkill(name) {
     return skillContentMap.get(name) ?? null;
 }
 export function getSkillsListText() {
-    const lines = skills.map((s) => `- **${s.name}**: ${s.description}`);
-    if (skills.length > 0) {
+    const lines = [];
+    for (const s of skills) {
+        lines.push(`**${s.name}**:`);
+        lines.push(`  - description: ${s.description}`);
+        lines.push(`  - dirPath: ${s.dirPath}`);
         lines.push('');
-        lines.push('skills 的目录:');
-        lines.push(join(homedir(), '.agents', 'skills'));
-        lines.push(join(WORKSPACE_DIR, '.agents', 'skills'));
-        lines.push(join(WORKSPACE_DIR, 'skills'));
-        lines.push(`如果增加新 skill，必须放在 ${join(WORKSPACE_DIR, 'skills')} 目录下`);
     }
+    // console.log('skills...\n', lines.join('\n'))
     return lines.join('\n');
 }

package/dist/install.js

@@ -4,7 +4,7 @@ import * as os from 'os';
 import { execSync } from 'child_process';
 import { WORKSPACE_DIR, CONFIG_PATH } from './agent/config.js';
 import { initDb } from './agent/db.js';
-const SKILLS_DIR = path.join(WORKSPACE_DIR, '.agents', 'skills');
+const SKILLS_DIR = path.join(WORKSPACE_DIR, 'skills');
 function run(command, options) {
     execSync(command, { stdio: 'inherit', ...options });
 }
@@ -18,8 +18,8 @@ function installSkill(name, repo, skillPath, targetDir, tempDir) {
     const extractDir = path.join(tempDir, `${name}-extract`);
     fs.mkdirSync(extractDir, { recursive: true });
     try {
-        run(`curl -fsSL -o "${tarPath}" "https://github.com/${repo}/archive/refs/heads/main.tar.gz"`, { timeout: 20000 });
-        run(`tar -xzf "${tarPath}" -C "${extractDir}"`, { timeout: 20000 });
+        run(`curl -fsSL -o "${tarPath}" "https://github.com/${repo}/archive/refs/heads/main.tar.gz"`, { timeout: 30000 });
+        run(`tar -xzf "${tarPath}" -C "${extractDir}"`, { timeout: 30000 });
         const subDir = fs.readdirSync(extractDir)[0];
         fs.cpSync(path.join(extractDir, subDir, skillPath), targetDir, {
             recursive: true,
@@ -27,8 +27,8 @@ function installSkill(name, repo, skillPath, targetDir, tempDir) {
         console.log(`  ✅ ${name} 安装完成`);
     }
     catch (error) {
-        if (error.killed) {
-            console.log(`  ⏱️  ${name} 安装超时（超过 20s），已跳过，继续下一步`);
+        if (error.killed || error.code === 'ETIMEDOUT') {
+            console.log(`  ⏱️  ${name} 安装超时（网络较慢），已跳过，继续下一步`);
             return;
         }
         throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zhitalk",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "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",