pikiclaw 0.2.53 → 0.2.55

package/README.md

@@ -2,7 +2,7 @@
 
 # pikiclaw
 
-**Put the world's smartest AI agents in your pocket. Command local Claude & Gemini via best IM.**
+**Put the world's smartest AI agents in your pocket. Command local Claude, Codex & Gemini via best IM.**
 
 *让最好用的 IM 变成你电脑上的顶级 Agent 控制台*
 

package/dist/bot-feishu-render.js

@@ -199,8 +199,10 @@ export function buildHumanLoopPromptMarkdown(prompt) {
 // ---------------------------------------------------------------------------
 // LivePreview renderer — produces Markdown for Feishu card elements
 // ---------------------------------------------------------------------------
-export function buildInitialPreviewMarkdown(agent, model, effort) {
+export function buildInitialPreviewMarkdown(agent, model, effort, waiting = false) {
     const parts = [];
+    if (waiting)
+        parts.push('Waiting in queue...');
     if (model)
         parts.push(model);
     else

package/dist/bot-feishu.js

@@ -28,6 +28,7 @@ const SHUTDOWN_EXIT_CODE = {
     SIGINT: 130,
     SIGTERM: 143,
 };
+const FEISHU_FILE_STAGE_REACTION = 'Get';
 function describeError(err) {
     if (!(err instanceof Error))
         return String(err ?? 'unknown error');
@@ -464,6 +465,17 @@ export class FeishuBot extends Bot {
             return active.result;
         };
     }
+    async safeSetMessageReaction(chatId, messageId, reactions) {
+        if (!supportsChannelCapability(this.channel, 'messageReactions'))
+            return;
+        const setReaction = this.channel?.setMessageReaction;
+        if (typeof setReaction !== 'function')
+            return;
+        try {
+            await setReaction.call(this.channel, chatId, messageId, reactions);
+        }
+        catch { }
+    }
     // ---- streaming bridge -----------------------------------------------------
     async handleMessage(msg, ctx) {
         const text = msg.text.trim();
@@ -507,6 +519,7 @@ export class FeishuBot extends Bot {
                         throw new Error('no files persisted');
                     this.log(`[handleMessage] staged files chat=${ctx.chatId} session=${staged.sessionId} files=${staged.importedFiles.length}`);
                     this.registerSessionMessage(ctx.chatId, ctx.messageId, session);
+                    await this.safeSetMessageReaction(ctx.chatId, ctx.messageId, [FEISHU_FILE_STAGE_REACTION]);
                 }
                 catch (e) {
                     this.log(`[handleMessage] stage files failed: ${e?.message || e}`);
@@ -525,6 +538,7 @@ export class FeishuBot extends Bot {
         const start = Date.now();
         this.log(`[handleMessage] start chat=${ctx.chatId} agent=${session.agent} session=${session.sessionId || '(new)'} ` +
             `files=${files.length} prompt="${prompt.slice(0, 100)}"`);
+        const waiting = this.sessionHasPendingWork(session);
         const taskId = this.createTaskId(session);
         this.beginTask({
             taskId,
@@ -538,7 +552,7 @@ export class FeishuBot extends Bot {
         const stopKeyboard = this.buildStopKeyboard(this.actionIdForTask(taskId));
         const model = session.modelId || this.modelForAgent(session.agent);
         const effort = this.effortForAgent(session.agent);
-        const placeholderId = await this.channel.sendStreamingCard(ctx.chatId, buildInitialPreviewMarkdown(session.agent, model, effort), {
+        const placeholderId = await this.channel.sendStreamingCard(ctx.chatId, buildInitialPreviewMarkdown(session.agent, model, effort, waiting), {
             replyTo: ctx.messageId || undefined,
             keyboard: stopKeyboard,
         });

package/dist/bot-telegram-render.js

@@ -327,8 +327,10 @@ function trimActivityForPreview(text, maxChars = 900) {
         return text.slice(0, Math.max(0, maxChars - 3)).trimEnd() + '...';
     return [...head, '...', ...tail].join('\n');
 }
-export function buildInitialPreviewHtml(agent) {
-    return formatPreviewFooterHtml(agent, 0);
+export function buildInitialPreviewHtml(agent, waiting = false) {
+    return waiting
+        ? `<i>Waiting in queue...</i>\n\n${formatPreviewFooterHtml(agent, 0)}`
+        : formatPreviewFooterHtml(agent, 0);
 }
 export function buildStreamPreviewHtml(input) {
     const maxBody = 2400;

package/dist/bot-telegram.js

@@ -502,9 +502,10 @@ export class TelegramBot extends Bot {
             sourceMessageId: ctx.messageId,
         });
         const stopKeyboard = this.buildStopKeyboard(this.actionIdForTask(taskId));
+        const waiting = this.sessionHasPendingWork(session);
         let phId = null;
         if (canEditMessages) {
-            const placeholderId = await ctx.reply(buildInitialPreviewHtml(session.agent), { parseMode: 'HTML', messageThreadId, keyboard: stopKeyboard });
+            const placeholderId = await ctx.reply(buildInitialPreviewHtml(session.agent, waiting), { parseMode: 'HTML', messageThreadId, keyboard: stopKeyboard });
             phId = typeof placeholderId === 'number' ? placeholderId : null;
             if (phId != null) {
                 this.registerSessionMessage(ctx.chatId, phId, session);

package/dist/channel-feishu.js

@@ -217,7 +217,7 @@ class FeishuChannel extends Channel {
         typingIndicators: false,
         commandMenu: true,
         callbackActions: true,
-        messageReactions: false,
+        messageReactions: true,
         fileUpload: true,
         fileDownload: true,
         threads: false,
@@ -710,6 +710,19 @@ class FeishuChannel extends Channel {
     async sendTyping(_chatId) {
         // Feishu has no typing indicator API — no-op
     }
+    async setMessageReaction(_chatId, msgId, reactions) {
+        const messageId = String(msgId || '').trim();
+        const emojiTypes = [...new Set(reactions.map(reaction => String(reaction || '').trim()).filter(Boolean))];
+        if (!messageId || !emojiTypes.length)
+            return;
+        this._logOutgoing('setReaction', `msg_id=${messageId} reactions=${emojiTypes.join(',')}`);
+        for (const emojiType of emojiTypes) {
+            await this.client.im.messageReaction.create({
+                path: { message_id: messageId },
+                data: { reaction_type: { emoji_type: emojiType } },
+            }).catch(() => { });
+        }
+    }
     // ========================================================================
     // Streaming cards (CardKit v1) — typewriter effect
     // ========================================================================

package/dist/code-agent.js

@@ -97,6 +97,36 @@ export function shortValue(value, max = 90) {
         return text;
     return `${text.slice(0, Math.max(0, max - 3)).trimEnd()}...`;
 }
+export function normalizeErrorMessage(value) {
+    if (typeof value === 'string')
+        return value.trim();
+    if (value instanceof Error)
+        return value.message.trim();
+    if (Array.isArray(value)) {
+        return value.map(item => normalizeErrorMessage(item)).filter(Boolean).join('; ').trim();
+    }
+    if (value && typeof value === 'object') {
+        const record = value;
+        const preferred = normalizeErrorMessage(record.message)
+            || normalizeErrorMessage(record.error)
+            || normalizeErrorMessage(record.detail)
+            || normalizeErrorMessage(record.type)
+            || normalizeErrorMessage(record.code)
+            || normalizeErrorMessage(record.status);
+        if (preferred)
+            return preferred;
+        try {
+            return JSON.stringify(value).trim();
+        }
+        catch { }
+    }
+    return value == null ? '' : String(value).trim();
+}
+export function joinErrorMessages(errors) {
+    if (!errors?.length)
+        return '';
+    return errors.map(error => normalizeErrorMessage(error)).filter(Boolean).join('; ').trim();
+}
 export function appendSystemPrompt(base, extra) {
     const lhs = String(base || '').trim();
     const rhs = String(extra || '').trim();
@@ -655,6 +685,7 @@ export async function run(cmd, opts, parseLine) {
         recentActivity: [],
         claudeToolsById: new Map(),
         seenClaudeToolIds: new Set(),
+        geminiToolsById: new Map(),
     };
     const shellCmd = cmd.map(Q).join(' ');
     agentLog(`[spawn] full command: cd ${Q(opts.workdir)} && ${shellCmd}`);
@@ -729,16 +760,17 @@ export async function run(cmd, opts, parseLine) {
         s.text = s.msgs.join('\n\n');
     if (!s.thinking.trim() && s.thinkParts.length)
         s.thinking = s.thinkParts.join('\n\n');
+    const errorText = joinErrorMessages(s.errors);
     const ok = procOk && !s.errors && !timedOut && !interrupted;
-    const error = s.errors?.map(e => e.trim()).filter(Boolean).join('; ').trim()
+    const error = errorText
         || (interrupted ? 'Interrupted by user.' : null)
         || (timedOut ? `Timed out after ${opts.timeout}s before the agent reported completion.` : null)
         || (!procOk ? (stderr.trim() || `Failed (exit=${code}).`) : null);
     const incomplete = !ok || s.stopReason === 'max_tokens' || s.stopReason === 'timeout';
     const elapsed = ((Date.now() - start) / 1000).toFixed(1);
     agentLog(`[result] ok=${ok && !s.errors} elapsed=${elapsed}s text=${s.text.length}chars thinking=${s.thinking.length}chars session=${s.sessionId || '?'}`);
-    if (s.errors)
-        agentLog(`[result] errors: ${s.errors.join('; ')}`);
+    if (errorText)
+        agentLog(`[result] errors: ${errorText}`);
     if (s.stopReason)
         agentLog(`[result] stop_reason=${s.stopReason}`);
     if (stderr.trim() && !procOk)
@@ -746,7 +778,7 @@ export async function run(cmd, opts, parseLine) {
     return {
         ok, sessionId: s.sessionId, workspacePath: null,
         model: s.model, thinkingEffort: s.thinkingEffort,
-        message: s.text.trim() || s.errors?.join('; ') || (procOk ? '(no textual response)' : `Failed (exit=${code}).\n\n${stderr.trim() || '(no output)'}`),
+        message: s.text.trim() || errorText || (procOk ? '(no textual response)' : `Failed (exit=${code}).\n\n${stderr.trim() || '(no output)'}`),
         thinking: s.thinking.trim() || null,
         elapsedS: (Date.now() - start) / 1000,
         inputTokens: s.inputTokens, outputTokens: s.outputTokens, cachedInputTokens: s.cachedInputTokens,

package/dist/driver-codex.js

@@ -320,6 +320,20 @@ function buildCodexCumulativeUsage(raw) {
         return null;
     return { input: input ?? 0, output: output ?? 0, cached: cached ?? 0 };
 }
+function buildCodexContextUsage(raw) {
+    if (!raw || typeof raw !== 'object')
+        return null;
+    const total = numberOrNull(raw.totalTokens, raw.total_tokens);
+    if (total != null && total >= 0)
+        return total;
+    const input = numberOrNull(raw.inputTokens, raw.input_tokens);
+    const output = numberOrNull(raw.outputTokens, raw.output_tokens);
+    if (input != null && output != null)
+        return input + output;
+    if (input != null)
+        return input;
+    return null;
+}
 function applyCodexTokenUsage(s, rawUsage, prev) {
     if (!rawUsage || typeof rawUsage !== 'object')
         return;
@@ -337,6 +351,9 @@ function applyCodexTokenUsage(s, rawUsage, prev) {
         s.cachedInputTokens = lastCached;
     if (lastCacheCreation != null)
         s.cacheCreationInputTokens = lastCacheCreation;
+    const lastContextUsage = buildCodexContextUsage(last);
+    if (lastContextUsage != null)
+        s.contextUsedTokens = lastContextUsage;
     const totalUsage = info.total ?? info.totalTokenUsage ?? info.total_token_usage ?? rawUsage.total ?? rawUsage;
     const total = buildCodexCumulativeUsage(totalUsage);
     if (total) {
@@ -349,9 +366,9 @@ function applyCodexTokenUsage(s, rawUsage, prev) {
             s.cachedInputTokens = prev ? Math.max(0, total.cached - prev.cached) : total.cached;
     }
     // NOTE: do NOT set s.contextUsedTokens from cumulative totals —
-    // codexUsageTotalTokens sums input+output+cached+reasoning across all turns,
-    // which is NOT the current context-window occupancy. Let computeContext()
-    // fall back to the per-turn input/cached/cacheCreation tokens instead.
+    // those counters span the full thread, not the current turn. Use the per-turn
+    // `last` usage only. `cached_input_tokens` is already a subset of
+    // `input_tokens`, so adding it again inflates the context percentage.
     const contextWindow = numberOrNull(info.modelContextWindow, info.model_context_window, rawUsage.modelContextWindow, rawUsage.model_context_window);
     if (contextWindow != null && contextWindow > 0)
         s.contextWindow = contextWindow;

package/dist/driver-gemini.js

@@ -7,7 +7,7 @@
 import { registerDriver } from './agent-driver.js';
 import fs from 'node:fs';
 import path from 'node:path';
-import { run, agentLog, detectAgentBin, pushRecentActivity, listPikiclawSessions, isPendingSessionId, emptyUsage, } from './code-agent.js';
+import { run, agentLog, detectAgentBin, pushRecentActivity, firstNonEmptyLine, shortValue, normalizeErrorMessage, listPikiclawSessions, isPendingSessionId, emptyUsage, } from './code-agent.js';
 // ---------------------------------------------------------------------------
 // Command & parser
 // ---------------------------------------------------------------------------
@@ -49,6 +49,101 @@ function geminiContextWindowFromModel(model) {
         return 1_048_576;
     return null;
 }
+function geminiToolName(value) {
+    const name = typeof value === 'string' ? value.trim() : '';
+    return name || 'tool';
+}
+function geminiToolLabel(name) {
+    return name
+        .replace(/^mcp_/, '')
+        .replace(/^discovered_tool_/, '')
+        .replace(/_/g, ' ')
+        .replace(/\s+/g, ' ')
+        .trim() || 'tool';
+}
+function geminiToolSummary(name, parameters) {
+    const tool = geminiToolName(name);
+    const params = parameters && typeof parameters === 'object' ? parameters : {};
+    switch (tool) {
+        case 'read_file': {
+            const target = shortValue(params.file_path || params.path, 140);
+            return target ? `Read ${target}` : 'Read file';
+        }
+        case 'read_many_files': {
+            const include = shortValue(params.include || params.pattern, 120);
+            return include ? `Read files: ${include}` : 'Read files';
+        }
+        case 'write_file': {
+            const target = shortValue(params.file_path || params.path, 140);
+            return target ? `Write ${target}` : 'Write file';
+        }
+        case 'replace': {
+            const target = shortValue(params.file_path || params.path, 140);
+            return target ? `Edit ${target}` : 'Edit file';
+        }
+        case 'list_directory': {
+            const dir = shortValue(params.dir_path || params.path, 120);
+            return dir ? `List files: ${dir}` : 'List files';
+        }
+        case 'glob': {
+            const pattern = shortValue(params.pattern || params.glob, 120);
+            return pattern ? `Find files: ${pattern}` : 'Find files';
+        }
+        case 'grep_search':
+        case 'search_file_content': {
+            const pattern = shortValue(params.pattern || params.query, 120);
+            return pattern ? `Search text: ${pattern}` : 'Search text';
+        }
+        case 'run_shell_command': {
+            const command = shortValue(params.command, 120);
+            return command ? `Run shell: ${command}` : 'Run shell';
+        }
+        case 'web_fetch': {
+            const target = shortValue(params.url || params.prompt, 120);
+            return target ? `Fetch ${target}` : 'Fetch web page';
+        }
+        case 'google_web_search': {
+            const query = shortValue(params.query, 120);
+            return query ? `Search web: ${query}` : 'Search web';
+        }
+        case 'write_todos': return 'Update todo list';
+        case 'save_memory': return 'Save memory';
+        case 'ask_user': return 'Request user input';
+        case 'activate_skill': {
+            const skill = shortValue(params.name, 80);
+            return skill ? `Activate skill: ${skill}` : 'Activate skill';
+        }
+        case 'get_internal_docs': {
+            const target = shortValue(params.path, 120);
+            return target ? `Read docs: ${target}` : 'Read docs';
+        }
+        case 'enter_plan_mode': return 'Enter plan mode';
+        case 'exit_plan_mode': return 'Exit plan mode';
+        default: {
+            const detail = shortValue(params.file_path
+                || params.path
+                || params.dir_path
+                || params.pattern
+                || params.query
+                || params.command
+                || params.url
+                || params.name, 120);
+            const label = shortValue(geminiToolLabel(tool), 80);
+            return detail ? `Use ${label}: ${detail}` : `Use ${label}`;
+        }
+    }
+}
+function geminiToolResultSummary(tool, ev) {
+    const fallbackSummary = geminiToolSummary(tool?.name || ev.tool_name || ev.name || ev.tool, ev.parameters || ev.args || ev.input || {});
+    const summary = tool?.summary || fallbackSummary;
+    const detail = shortValue(firstNonEmptyLine(normalizeErrorMessage(ev.error)
+        || ev.output
+        || ev.message
+        || ''), 120);
+    if (ev.status === 'error')
+        return detail ? `${summary} failed: ${detail}` : `${summary} failed`;
+    return detail ? `${summary} -> ${detail}` : `${summary} done`;
+}
 function geminiParse(ev, s) {
     const t = ev.type || '';
     // init event: {"type":"init","session_id":"...","model":"..."}
@@ -58,26 +153,46 @@ function geminiParse(ev, s) {
         s.contextWindow = geminiContextWindowFromModel(s.model) ?? s.contextWindow;
     }
     // message delta: {"type":"message","role":"assistant","content":"...","delta":true}
-    if (t === 'message' && ev.role === 'assistant' && ev.delta) {
-        s.text += ev.content || '';
+    if (t === 'message' && ev.role === 'assistant') {
+        if (ev.delta)
+            s.text += ev.content || '';
+        else if (!s.text.trim())
+            s.text = ev.content || '';
     }
-    // tool_call event (if gemini uses tools)
-    if (t === 'tool_call') {
-        const name = ev.name || ev.tool || 'tool';
-        pushRecentActivity(s.recentActivity, `Using ${name}...`);
+    if (t === 'tool_use' || t === 'tool_call') {
+        const name = geminiToolName(ev.tool_name || ev.name || ev.tool);
+        const summary = geminiToolSummary(name, ev.parameters || ev.args || ev.input || {});
+        const toolId = String(ev.tool_id || ev.id || '').trim();
+        if (toolId)
+            s.geminiToolsById.set(toolId, { name, summary });
+        pushRecentActivity(s.recentActivity, summary);
         s.activity = s.recentActivity.join('\n');
     }
-    // tool_result event
     if (t === 'tool_result') {
-        const name = ev.name || ev.tool || 'tool';
-        pushRecentActivity(s.recentActivity, `${name} done`);
+        const toolId = String(ev.tool_id || ev.id || '').trim();
+        const tool = toolId ? s.geminiToolsById.get(toolId) : undefined;
+        pushRecentActivity(s.recentActivity, geminiToolResultSummary(tool, ev));
         s.activity = s.recentActivity.join('\n');
     }
+    if (t === 'error') {
+        const message = normalizeErrorMessage(ev.message || ev.error) || 'Gemini reported an error';
+        if (ev.severity === 'error') {
+            s.errors = [...(s.errors || []), message];
+        }
+        else {
+            pushRecentActivity(s.recentActivity, message);
+            s.activity = s.recentActivity.join('\n');
+        }
+    }
     // result event: {"type":"result","status":"success","stats":{...}}
     if (t === 'result') {
         s.sessionId = ev.session_id ?? s.sessionId;
         if (ev.status === 'error' || ev.status === 'failure') {
-            s.errors = [ev.error || ev.message || `Gemini returned status: ${ev.status}`];
+            const message = normalizeErrorMessage(ev.error)
+                || normalizeErrorMessage(ev.errors)
+                || normalizeErrorMessage(ev.message)
+                || `Gemini returned status: ${ev.status}`;
+            s.errors = [message];
         }
         s.stopReason = ev.status === 'success' ? 'end_turn' : ev.status;
         const u = ev.stats;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pikiclaw",
-  "version": "0.2.53",
+  "version": "0.2.55",
   "description": "Put the world's smartest AI agents in your pocket. Command local Claude & Gemini via IM. | 让最好用的 IM 变成你电脑上的顶级 Agent 控制台",
   "type": "module",
   "bin": {
@@ -31,7 +31,7 @@
     "command": "set -ae && . ./.env && set +a && tsx src/run.ts",
     "build:dashboard": "tsx scripts/build-dashboard.ts",
     "build": "npm run build:dashboard && tsc",
-    "prepublishOnly": "npm run build",
+    "prepack": "npm run build",
     "test": "vitest run",
     "test:e2e": "set -ae && . ./.env && set +a && vitest run --config vitest.e2e.config.ts test/e2e/",
     "test:watch": "vitest"