pikiclaw 0.3.31 → 0.3.32

package/dist/agent/drivers/claude.js

@@ -8,7 +8,7 @@ import { createInterface } from 'node:readline';
 import { registerDriver } from '../driver.js';
 import { 
 // shared helpers
-Q, run, agentError, agentLog, agentWarn, buildStreamPreviewMeta, pushRecentActivity, summarizeClaudeToolUse, summarizeClaudeToolResult, joinErrorMessages, parseTodoWriteAsPlan, IMAGE_EXTS, mimeForExt, listPikiclawSessions, mergeManagedAndNativeSessions, readTailLines, stripInjectedPrompts, sanitizeSessionUserPreviewText, SESSION_PREVIEW_IMAGE_PLACEHOLDER_RE, applyTurnWindow, shortValue, roundPercent, modelFamily, normalizeClaudeModelId, emptyUsage, normalizeUsageStatus, } from '../index.js';
+Q, run, agentError, agentLog, agentWarn, buildStreamPreviewMeta, computeContext, pushRecentActivity, summarizeClaudeToolUse, summarizeClaudeToolResult, joinErrorMessages, parseTodoWriteAsPlan, IMAGE_EXTS, mimeForExt, listPikiclawSessions, mergeManagedAndNativeSessions, readTailLines, stripInjectedPrompts, sanitizeSessionUserPreviewText, SESSION_PREVIEW_IMAGE_PLACEHOLDER_RE, applyTurnWindow, shortValue, roundPercent, modelFamily, normalizeClaudeModelId, emptyUsage, normalizeUsageStatus, } from '../index.js';
 import { AGENT_STREAM_HARD_KILL_GRACE_MS, AGENT_GRACEFUL_ABORT_GRACE_MS, SESSION_RUNNING_THRESHOLD_MS } from '../../core/constants.js';
 import { terminateProcessTree } from '../../core/process-control.js';
 import { getHome, IS_MAC, encodePathAsDirName } from '../../core/platform.js';
@@ -714,7 +714,11 @@ async function doClaudeInteractiveStream(opts) {
         cacheCreationInputTokens: s.cacheCreationInputTokens,
         contextWindow: s.contextWindow,
         contextUsedTokens: s.contextUsedTokens,
-        contextPercent: roundPercent((s.contextUsedTokens || 0) / (s.contextWindow || 0)),
+        // Reuse the same calc as the live preview (computeContext) so the final
+        // footer % matches the running %. Previously this passed a fraction
+        // (used/window) into roundPercent, which expects a percent — divide-by-100
+        // bug that made the final read ~12% as ~0.1%.
+        contextPercent: computeContext(s).contextPercent,
         codexCumulative: null,
         error,
         plan: s.plan,

package/dist/agent/drivers/gemini.js

@@ -451,11 +451,13 @@ function findGeminiSessionFile(workdir, sessionId) {
         return null;
     }
     for (const entry of entries) {
-        if (!entry.isFile() || !entry.name.startsWith('session-') || !entry.name.endsWith('.json'))
+        if (!entry.isFile() || !entry.name.startsWith('session-'))
+            continue;
+        if (!entry.name.endsWith('.json') && !entry.name.endsWith('.jsonl'))
             continue;
         const filePath = path.join(chatsDir, entry.name);
         try {
-            const data = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+            const data = loadGeminiSessionData(filePath);
             if (data?.sessionId === sessionId)
                 return filePath;
         }
@@ -463,12 +465,46 @@ function findGeminiSessionFile(workdir, sessionId) {
     }
     return null;
 }
+function loadGeminiSessionData(filePath) {
+    try {
+        const content = fs.readFileSync(filePath, 'utf8');
+        if (filePath.endsWith('.json'))
+            return JSON.parse(content);
+        // JSONL format: first line is metadata, subsequent lines are messages or $set updates
+        const lines = content.split('\n');
+        let data = {};
+        const messages = [];
+        for (const line of lines) {
+            if (!line.trim() || line[0] !== '{')
+                continue;
+            try {
+                const obj = JSON.parse(line);
+                if (obj.sessionId && !data.sessionId) {
+                    data = { ...obj };
+                }
+                else if (obj.$set) {
+                    if (obj.$set.lastUpdated)
+                        data.lastUpdated = obj.$set.lastUpdated;
+                }
+                else if (obj.type === 'user' || obj.type === 'gemini' || obj.type === 'model' || obj.type === 'assistant') {
+                    messages.push(obj);
+                }
+            }
+            catch { /* skip */ }
+        }
+        data.messages = messages;
+        return data;
+    }
+    catch {
+        return null;
+    }
+}
 /** Read native Gemini CLI sessions from ~/.gemini/tmp/{projectName}/chats/ */
 function getNativeGeminiSessionsFromFiles(workdir) {
     const chatsDir = geminiChatsDir(workdir);
     if (!chatsDir || !fs.existsSync(chatsDir))
         return [];
-    const sessions = [];
+    const sessionsById = new Map();
     let entries;
     try {
         entries = fs.readdirSync(chatsDir, { withFileTypes: true });
@@ -477,13 +513,22 @@ function getNativeGeminiSessionsFromFiles(workdir) {
         return [];
     }
     for (const entry of entries) {
-        if (!entry.isFile() || !entry.name.startsWith('session-') || !entry.name.endsWith('.json'))
+        if (!entry.isFile() || !entry.name.startsWith('session-'))
+            continue;
+        if (!entry.name.endsWith('.json') && !entry.name.endsWith('.jsonl'))
             continue;
         const filePath = path.join(chatsDir, entry.name);
         try {
-            const data = JSON.parse(fs.readFileSync(filePath, 'utf8'));
-            if (!data.sessionId)
+            const data = loadGeminiSessionData(filePath);
+            if (!data?.sessionId)
                 continue;
+            const sessionId = String(data.sessionId);
+            const updatedAt = data.lastUpdated || data.startTime || data.createdAt || null;
+            // If we already saw this sessionId, only replace it if this file is newer
+            const existing = sessionsById.get(sessionId);
+            if (existing && updatedAt && existing.runUpdatedAt && Date.parse(updatedAt) <= Date.parse(existing.runUpdatedAt)) {
+                continue;
+            }
             // Extract title from first user message + last Q&A from tail
             let title = null;
             let lastQuestion = null;
@@ -500,7 +545,7 @@ function getNativeGeminiSessionsFromFiles(workdir) {
                         lastMessageText = shortValue(text, 500);
                     }
                 }
-                else if (msg.type === 'model' || msg.type === 'assistant') {
+                else if (msg.type === 'model' || msg.type === 'assistant' || msg.type === 'gemini') {
                     const text = extractGeminiText(msg.content);
                     if (text) {
                         lastAnswer = shortValue(text, 500);
@@ -509,18 +554,18 @@ function getNativeGeminiSessionsFromFiles(workdir) {
                 }
             }
             const numTurns = messages.filter((m) => m.type === 'user' && extractGeminiText(m.content)).length;
-            sessions.push({
-                sessionId: data.sessionId,
+            sessionsById.set(sessionId, {
+                sessionId,
                 agent: 'gemini',
                 workdir,
                 workspacePath: null,
                 model: null,
-                createdAt: data.startTime || null,
+                createdAt: data.startTime || data.createdAt || null,
                 title,
                 running: data.lastUpdated ? Date.now() - Date.parse(data.lastUpdated) < SESSION_RUNNING_THRESHOLD_MS : false,
                 runState: data.lastUpdated && Date.now() - Date.parse(data.lastUpdated) < SESSION_RUNNING_THRESHOLD_MS ? 'running' : 'completed',
                 runDetail: null,
-                runUpdatedAt: data.lastUpdated || data.startTime || null,
+                runUpdatedAt: updatedAt || null,
                 classification: null,
                 userStatus: null,
                 userNote: null,
@@ -535,7 +580,7 @@ function getNativeGeminiSessionsFromFiles(workdir) {
         }
         catch { /* skip */ }
     }
-    return sessions;
+    return [...sessionsById.values()];
 }
 function getNativeGeminiSessions(workdir) {
     return getNativeGeminiSessionsFromFiles(workdir);
@@ -583,12 +628,12 @@ function getGeminiSessionTail(opts) {
     if (!filePath)
         return { ok: false, messages: [], error: 'Session file not found' };
     try {
-        const data = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+        const data = loadGeminiSessionData(filePath);
         const messages = Array.isArray(data?.messages) ? data.messages : [];
         const allMsgs = [];
         for (const msg of messages) {
             const type = typeof msg?.type === 'string' ? msg.type.trim().toLowerCase() : '';
-            const role = type === 'user' ? 'user' : type === 'gemini' ? 'assistant' : null;
+            const role = type === 'user' ? 'user' : (type === 'gemini' || type === 'model' || type === 'assistant') ? 'assistant' : null;
             if (!role)
                 continue;
             const text = extractGeminiText(msg?.content);
@@ -609,12 +654,12 @@ function getGeminiSessionMessages(opts) {
     if (!filePath)
         return { ok: false, messages: [], totalTurns: 0, error: 'Session file not found' };
     try {
-        const data = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+        const data = loadGeminiSessionData(filePath);
         const messages = Array.isArray(data?.messages) ? data.messages : [];
         const allMsgs = [];
         for (const msg of messages) {
             const type = typeof msg?.type === 'string' ? msg.type.trim().toLowerCase() : '';
-            const role = type === 'user' ? 'user' : type === 'gemini' ? 'assistant' : null;
+            const role = type === 'user' ? 'user' : (type === 'gemini' || type === 'model' || type === 'assistant') ? 'assistant' : null;
             if (!role)
                 continue;
             const text = extractGeminiText(msg?.content);

package/dist/bot/render-shared.js

@@ -62,17 +62,27 @@ function compactModelLabel(model) {
     const slashIdx = trimmed.indexOf('/');
     return slashIdx > 0 ? trimmed.slice(slashIdx + 1) : trimmed;
 }
-export function formatFooterSummary(agent, elapsedMs, meta, contextPercent, decorations) {
-    const parts = [agent];
+/**
+ * Split footer fields into a primary identity line (agent + model) and a
+ * secondary runtime line (effort, context%, elapsed). Channel renderers
+ * compose the two lines with their own visual styling so narrow IM clients
+ * never have to soft-wrap a single dense line.
+ */
+export function formatFooterParts(agent, elapsedMs, meta, contextPercent, decorations) {
+    const identityParts = [agent];
     if (decorations?.model)
-        parts.push(compactModelLabel(decorations.model));
+        identityParts.push(compactModelLabel(decorations.model));
+    const runtimeParts = [];
     if (decorations?.effort)
-        parts.push(decorations.effort);
+        runtimeParts.push(decorations.effort);
     const ctx = contextPercent ?? meta?.contextPercent ?? null;
     if (ctx != null)
-        parts.push(`${ctx}%`);
-    parts.push(fmtCompactUptime(Math.max(0, Math.round(elapsedMs))));
-    return parts.join(' · ');
+        runtimeParts.push(`${ctx}%`);
+    runtimeParts.push(fmtCompactUptime(Math.max(0, Math.round(elapsedMs))));
+    return {
+        identity: identityParts.join(' · '),
+        runtime: runtimeParts.join(' · '),
+    };
 }
 // ---------------------------------------------------------------------------
 // Activity trimming
@@ -139,10 +149,6 @@ export function buildProviderUsageLines(usage) {
 export function extractFinalReplyData(agent, result) {
     const footerStatus = result.incomplete || !result.ok ? 'failed' : 'done';
     const elapsedMs = result.elapsedS * 1000;
-    const footerSummary = formatFooterSummary(agent, elapsedMs, null, result.contextPercent ?? null, {
-        model: result.model,
-        effort: result.thinkingEffort,
-    });
     let activityNarrative = null;
     let activityCommandSummary = null;
     if (result.activity) {
@@ -177,7 +183,6 @@ export function extractFinalReplyData(agent, result) {
     }
     return {
         footerStatus,
-        footerSummary,
         activityNarrative,
         activityCommandSummary,
         thinkingDisplay,

package/dist/channels/feishu/render.js

@@ -7,7 +7,7 @@
 import { encodeCommandAction } from '../../bot/command-ui.js';
 import { fmtUptime, fmtTokens, fmtBytes } from '../../bot/bot.js';
 import { summarizePromptForStatus } from '../../bot/commands.js';
-import { footerStatusSymbol, formatFooterSummary, trimActivityForPreview, buildProviderUsageLines, extractFinalReplyData, extractStreamPreviewData, } from '../../bot/render-shared.js';
+import { footerStatusSymbol, formatFooterParts, trimActivityForPreview, buildProviderUsageLines, extractFinalReplyData, extractStreamPreviewData, } from '../../bot/render-shared.js';
 import { currentHumanLoopQuestion, humanLoopAnsweredCount, isHumanLoopAwaitingText, isHumanLoopQuestionAnswered, summarizeHumanLoopAnswer, } from '../../bot/human-loop.js';
 import path from 'node:path';
 import { listSubdirs } from '../../bot/bot.js';
@@ -15,10 +15,12 @@ import { listSubdirs } from '../../bot/bot.js';
 // Helpers
 // ---------------------------------------------------------------------------
 function formatPreviewFooter(agent, elapsedMs, meta, decorations) {
-    return `${footerStatusSymbol('running')} ${formatFooterSummary(agent, elapsedMs, meta, null, decorations)}`;
+    const parts = formatFooterParts(agent, elapsedMs, meta, null, decorations);
+    return `${footerStatusSymbol('running')} ${parts.identity}\n*${parts.runtime}*`;
 }
 function formatFinalFooter(status, agent, elapsedMs, contextPercent, decorations) {
-    return `${footerStatusSymbol(status)} ${formatFooterSummary(agent, elapsedMs, null, contextPercent ?? null, decorations)}`;
+    const parts = formatFooterParts(agent, elapsedMs, null, contextPercent ?? null, decorations);
+    return `${footerStatusSymbol(status)} ${parts.identity}\n*${parts.runtime}*`;
 }
 function truncateLabel(label, maxChars = 24) {
     return label.length > maxChars ? `${label.slice(0, Math.max(1, maxChars - 1))}…` : label;

package/dist/channels/telegram/render.js

@@ -3,7 +3,7 @@
  */
 import { encodeCommandAction } from '../../bot/command-ui.js';
 import { currentHumanLoopQuestion, humanLoopAnsweredCount, isHumanLoopAwaitingText, isHumanLoopQuestionAnswered, summarizeHumanLoopAnswer, } from '../../bot/human-loop.js';
-import { footerStatusSymbol, formatFooterSummary, trimActivityForPreview, buildProviderUsageLines, extractFinalReplyData, extractStreamPreviewData, parseGfmTable, } from '../../bot/render-shared.js';
+import { footerStatusSymbol, formatFooterParts, trimActivityForPreview, buildProviderUsageLines, extractFinalReplyData, extractStreamPreviewData, parseGfmTable, } from '../../bot/render-shared.js';
 export function escapeHtml(t) {
     return t.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 }
@@ -256,10 +256,14 @@ export function renderSkillsListHtml(d) {
     return lines.join('\n');
 }
 export function formatPreviewFooterHtml(agent, elapsedMs, meta, decorations) {
-    return escapeHtml(`${footerStatusSymbol('running')} ${formatFooterSummary(agent, elapsedMs, meta, null, decorations)}`);
+    const parts = formatFooterParts(agent, elapsedMs, meta, null, decorations);
+    const primary = escapeHtml(`${footerStatusSymbol('running')} ${parts.identity}`);
+    return `${primary}\n<i>${escapeHtml(parts.runtime)}</i>`;
 }
 function formatFinalFooterHtml(status, agent, elapsedMs, contextPercent, decorations) {
-    return escapeHtml(`${footerStatusSymbol(status)} ${formatFooterSummary(agent, elapsedMs, null, contextPercent ?? null, decorations)}`);
+    const parts = formatFooterParts(agent, elapsedMs, null, contextPercent ?? null, decorations);
+    const primary = escapeHtml(`${footerStatusSymbol(status)} ${parts.identity}`);
+    return `${primary}\n<i>${escapeHtml(parts.runtime)}</i>`;
 }
 export function formatProviderUsageLines(usage) {
     return buildProviderUsageLines(usage).map(line => line.bold ? `<b>${escapeHtml(line.text)}</b>` : escapeHtml(line.text));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pikiclaw",
-  "version": "0.3.31",
+  "version": "0.3.32",
   "description": "Put the world's smartest AI agents in your pocket. Command local Claude & Gemini via IM. | 让最好用的 IM 变成你电脑上的顶级 Agent 控制台",
   "type": "module",
   "bin": {