zhitalk 0.0.6 → 0.0.8

package/dist/agent/agent.js

@@ -66,6 +66,32 @@ function simplifyToolMessages(messages) {
         });
     });
 }
+/**
+ * 确保每个带有 tool_calls 的 AIMessage 后面都有对应的 ToolMessage。
+ * 当中断（如 ESC 取消）导致 tool 未执行时，消息历史会留下未完成的
+ * tool_calls，LLM API 会因此报错。此函数为缺失的 tool_calls 插入
+ * 占位 ToolMessage，使消息历史重新合法。
+ */
+function ensureCompleteToolCalls(messages) {
+    const toolMessageIds = new Set(messages
+        .filter((msg) => msg.type === 'tool')
+        .map((msg) => msg.tool_call_id));
+    const result = [];
+    for (const msg of messages) {
+        result.push(msg);
+        if (AIMessage.isInstance(msg) && msg.tool_calls?.length) {
+            const missing = msg.tool_calls.filter((call) => call.id && !toolMessageIds.has(call.id));
+            for (const call of missing) {
+                result.push(new ToolMessage({
+                    content: 'Tool execution was interrupted or failed to complete.',
+                    tool_call_id: call.id ?? '',
+                    name: call.name ?? '',
+                }));
+            }
+        }
+    }
+    return result;
+}
 // ── 记忆 ──────────────────────────────────────────────────
 const checkpointer = SqliteSaver.fromConnString(DB_PATH);
 // ── Agent Graph 工厂 ──────────────────────────────────────
@@ -85,6 +111,8 @@ function createAgentGraph(toolList) {
         modelMessages = simplifyToolMessages(modelMessages);
         // keep recent 300 items
         modelMessages = modelMessages.slice(0, 300);
+        // 修复因中断/截断导致的未完成 tool_calls
+        modelMessages = ensureCompleteToolCalls(modelMessages);
         const messages = [new SystemMessage(systemPrompt), ...modelMessages];
         const response = await modelWithTheseTools.invoke(messages, config);
         return { messages: [response] };
@@ -264,6 +292,7 @@ async function _runAgent(compiledAgent, userMessage, onToken, onToolConfirmation
             ...config,
             streamMode: 'messages',
             signal,
+            recursionLimit: 50,
         });
         for await (const chunk of stream) {
             if (signal?.aborted) {

package/dist/agent/cli.js

@@ -125,7 +125,7 @@ export async function interactiveChat() {
         if (!userInput.trim())
             continue;
         if (userInput.toLowerCase() === 'exit') {
-            console.log(color.goodbye('再见！'));
+            console.log('Bye Bye~ Have a nice day~\n');
             break;
         }
         if (userInput.startsWith('/')) {

package/dist/agent/context.js

@@ -13,6 +13,8 @@ const MODEL_CONTEXT_LIMITS = {
     'deepseek-v3': 65536,
     'deepseek-v3.1': 131072,
     'deepseek-v4': 1048576,
+    'deepseek-v4-pro': 1048576,
+    'deepseek-v4-flash': 1048576,
     'deepseek-r1': 65536,
     // MiniMax
     'minimax-text-01': 1048576,
@@ -24,6 +26,10 @@ const MODEL_CONTEXT_LIMITS = {
     'glm-4-air': 131072,
     'glm-4-flash': 131072,
     'glm-4v': 131072,
+    'glm-5-turbo': 200000,
+    'glm-5': 200000,
+    'glm-5.1': 200000,
+    'glm-5.2': 1000000,
     // Qwen (Alibaba)
     'qwen-max': 32768,
     'qwen-plus': 131072,

package/dist/agent/permission/exec.js

@@ -2,7 +2,7 @@ import { isSafeCommand, isChangingDirectory, isScriptExecution, isDangerousOpera
 export function checkExecPermission(toolCall) {
     const command = toolCall.args?.command;
     if (typeof command !== 'string') {
-        return { action: 'confirm' };
+        return { action: 'allow' };
     }
     if (isSafeCommand(command)) {
         return { action: 'allow' };
@@ -27,5 +27,5 @@ export function checkExecPermission(toolCall) {
             reason: dangerCheck.reason,
         };
     }
-    return { action: 'confirm' };
+    return { action: 'allow' };
 }

package/dist/agent/permission/is-dangerous-path.js

@@ -1,6 +1,120 @@
 import path from 'path';
 import os from 'os';
-import dangerousPaths from './dangerous-path.json' with { type: 'json' };
+const dangerousPaths = {
+    macos: [
+        '~/.ssh',
+        '~/.gnupg',
+        '~/.aws',
+        '~/.azure',
+        '~/.config/gcloud',
+        '~/.kube',
+        '~/.docker',
+        '~/.netrc',
+        '~/Library/Keychains',
+        '~/Library/Application Support/Google/Chrome',
+        '~/Library/Application Support/Chromium',
+        '~/Library/Application Support/Firefox',
+        '~/Library/Application Support/Slack',
+        '~/Library/Application Support/Discord',
+        '~/Library/Application Support/Telegram',
+        '~/Library/Application Support/Signal',
+        '~/.zshrc',
+        '~/.bashrc',
+        '~/.bash_profile',
+        '~/.profile',
+        '~/.env',
+        '~/.env.*',
+        '~/.gitconfig',
+        '~/.git-credentials',
+        '~/.npmrc',
+        '~/.pnpmrc',
+        '~/.yarnrc',
+        '~/.pypirc',
+        '~/.m2',
+        '~/.gradle',
+        '~/.terraform',
+        '~/.config/gh',
+        '~/.config/gitlab',
+        '~/.circleci',
+        '~/.vercel',
+        '~/.netlify',
+        '~/Library/Containers',
+        '/private',
+        '/etc',
+        '/var',
+    ],
+    linux: [
+        '~/.ssh',
+        '~/.gnupg',
+        '~/.pki',
+        '~/.aws',
+        '~/.azure',
+        '~/.config/gcloud',
+        '~/.kube',
+        '~/.docker',
+        '~/.netrc',
+        '~/.local/share/keyrings',
+        '~/.config/google-chrome',
+        '~/.config/chromium',
+        '~/.mozilla/firefox',
+        '~/.config/Slack',
+        '~/.config/discord',
+        '~/.local/share/TelegramDesktop',
+        '~/.zshrc',
+        '~/.bashrc',
+        '~/.bash_profile',
+        '~/.profile',
+        '~/.env',
+        '~/.env.*',
+        '~/.gitconfig',
+        '~/.git-credentials',
+        '~/.npmrc',
+        '~/.pnpmrc',
+        '~/.yarnrc',
+        '~/.pypirc',
+        '~/.m2',
+        '~/.gradle',
+        '~/.terraform',
+        '~/.config/gh',
+        '~/.config/gitlab',
+        '~/.circleci',
+        '~/.vercel',
+        '~/.netlify',
+        '/etc/shadow',
+        '/etc/sudoers',
+        '/proc',
+        '/sys',
+        '/var/lib',
+        '/root',
+    ],
+    windows: [
+        '%USERPROFILE%\\.ssh',
+        '%USERPROFILE%\\.gnupg',
+        '%USERPROFILE%\\.aws',
+        '%USERPROFILE%\\.azure',
+        '%USERPROFILE%\\.kube',
+        '%USERPROFILE%\\.docker',
+        '%LOCALAPPDATA%\\Google\\Chrome\\User Data',
+        '%LOCALAPPDATA%\\Chromium\\User Data',
+        '%APPDATA%\\Mozilla\\Firefox',
+        '%APPDATA%\\Slack',
+        '%APPDATA%\\Discord',
+        '%APPDATA%\\Telegram Desktop',
+        '%USERPROFILE%\\.gitconfig',
+        '%USERPROFILE%\\.git-credentials',
+        '%USERPROFILE%\\.npmrc',
+        '%USERPROFILE%\\.pnpmrc',
+        '%USERPROFILE%\\.yarnrc',
+        '%USERPROFILE%\\.m2',
+        '%USERPROFILE%\\.gradle',
+        '%APPDATA%',
+        '%LOCALAPPDATA%',
+        'C:\\Windows\\System32',
+        'C:\\Windows\\System32\\config\\SAM',
+        'C:\\Windows\\System32\\config\\SECURITY',
+        'C:\\Windows\\System32\\config\\SYSTEM',
+    ],
+};
 function expandPath(filepath) {
     let expanded = filepath;
     if (expanded.startsWith('~')) {

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/agent/tools/read_file_tool.js

@@ -1,7 +1,8 @@
 import { readFile } from 'fs/promises';
+import { resolvePath } from '../utils.js';
 export async function readFileTool({ filepath }) {
     try {
-        const content = await readFile(filepath, 'utf-8');
+        const content = await readFile(resolvePath(filepath), 'utf-8');
         return content;
     }
     catch (err) {

package/dist/agent/tools/write_file_tool.js

@@ -1,10 +1,12 @@
 import { writeFile, mkdir } from 'fs/promises';
 import { dirname } from 'path';
+import { resolvePath } from '../utils.js';
 export async function writeFileTool({ filepath, content }) {
     try {
-        await mkdir(dirname(filepath), { recursive: true });
-        await writeFile(filepath, content, 'utf-8');
-        return `File "${filepath}" written successfully.`;
+        const absolutePath = resolvePath(filepath);
+        await mkdir(dirname(absolutePath), { recursive: true });
+        await writeFile(absolutePath, content, 'utf-8');
+        return `File "${absolutePath}" written successfully.`;
     }
     catch (err) {
         return `Error: ${err.message}`;

package/dist/agent/utils.d.ts

@@ -1,2 +1,3 @@
+export declare function resolvePath(filepath: string): string;
 export declare function formatRelativeTime(ts: string): string;
 export declare function truncate(str: string | null, maxLen: number): string;

package/dist/agent/utils.js

@@ -1,3 +1,14 @@
+import { resolve, join } from 'path';
+import { homedir } from 'os';
+export function resolvePath(filepath) {
+    if (filepath.startsWith('~/')) {
+        filepath = join(homedir(), filepath.slice(2));
+    }
+    else if (filepath === '~') {
+        filepath = homedir();
+    }
+    return resolve(filepath);
+}
 export function formatRelativeTime(ts) {
     const diffMs = Date.now() - new Date(ts).getTime();
     const diffMin = Math.floor(diffMs / 60000);

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.6",
+  "version": "0.0.8",
   "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",

package/dist/agent/permission/dangerous-path.json

@@ -1,115 +0,0 @@
-{
-    "macos": [
-        "~/.ssh",
-        "~/.gnupg",
-        "~/.aws",
-        "~/.azure",
-        "~/.config/gcloud",
-        "~/.kube",
-        "~/.docker",
-        "~/.netrc",
-        "~/Library/Keychains",
-        "~/Library/Application Support/Google/Chrome",
-        "~/Library/Application Support/Chromium",
-        "~/Library/Application Support/Firefox",
-        "~/Library/Application Support/Slack",
-        "~/Library/Application Support/Discord",
-        "~/Library/Application Support/Telegram",
-        "~/Library/Application Support/Signal",
-        "~/.zshrc",
-        "~/.bashrc",
-        "~/.bash_profile",
-        "~/.profile",
-        "~/.env",
-        "~/.env.*",
-        "~/.gitconfig",
-        "~/.git-credentials",
-        "~/.npmrc",
-        "~/.pnpmrc",
-        "~/.yarnrc",
-        "~/.pypirc",
-        "~/.m2",
-        "~/.gradle",
-        "~/.terraform",
-        "~/.config/gh",
-        "~/.config/gitlab",
-        "~/.circleci",
-        "~/.vercel",
-        "~/.netlify",
-        "~/Library/Containers",
-        "/private",
-        "/etc",
-        "/var"
-    ],
-    "linux": [
-        "~/.ssh",
-        "~/.gnupg",
-        "~/.pki",
-        "~/.aws",
-        "~/.azure",
-        "~/.config/gcloud",
-        "~/.kube",
-        "~/.docker",
-        "~/.netrc",
-        "~/.local/share/keyrings",
-        "~/.config/google-chrome",
-        "~/.config/chromium",
-        "~/.mozilla/firefox",
-        "~/.config/Slack",
-        "~/.config/discord",
-        "~/.local/share/TelegramDesktop",
-        "~/.zshrc",
-        "~/.bashrc",
-        "~/.bash_profile",
-        "~/.profile",
-        "~/.env",
-        "~/.env.*",
-        "~/.gitconfig",
-        "~/.git-credentials",
-        "~/.npmrc",
-        "~/.pnpmrc",
-        "~/.yarnrc",
-        "~/.pypirc",
-        "~/.m2",
-        "~/.gradle",
-        "~/.terraform",
-        "~/.config/gh",
-        "~/.config/gitlab",
-        "~/.circleci",
-        "~/.vercel",
-        "~/.netlify",
-        "/etc/shadow",
-        "/etc/sudoers",
-        "/proc",
-        "/sys",
-        "/var/lib",
-        "/root"
-    ],
-    "windows": [
-        "%USERPROFILE%\\.ssh",
-        "%USERPROFILE%\\.gnupg",
-        "%USERPROFILE%\\.aws",
-        "%USERPROFILE%\\.azure",
-        "%USERPROFILE%\\.kube",
-        "%USERPROFILE%\\.docker",
-        "%LOCALAPPDATA%\\Google\\Chrome\\User Data",
-        "%LOCALAPPDATA%\\Chromium\\User Data",
-        "%APPDATA%\\Mozilla\\Firefox",
-        "%APPDATA%\\Slack",
-        "%APPDATA%\\Discord",
-        "%APPDATA%\\Telegram Desktop",
-        "%USERPROFILE%\\.gitconfig",
-        "%USERPROFILE%\\.git-credentials",
-        "%USERPROFILE%\\.npmrc",
-        "%USERPROFILE%\\.pnpmrc",
-        "%USERPROFILE%\\.yarnrc",
-        "%USERPROFILE%\\.m2",
-        "%USERPROFILE%\\.gradle",
-        "%APPDATA%",
-        "%LOCALAPPDATA%",
-        "C:\\Windows\\System32",
-        "C:\\Windows\\System32\\config\\SAM",
-        "C:\\Windows\\System32\\config\\SECURITY",
-        "C:\\Windows\\System32\\config\\SYSTEM"
-    ]
-}