evolclaw 3.2.0 → 3.4.0

package/dist/agents/gemini-runner.js

@@ -13,7 +13,7 @@ import { createInterface } from 'readline';
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
-import { resolveGoogleConfig } from './resolve.js';
+import { resolveGoogleConfig } from './baseagent.js';
 import { commandExists } from '../utils/cross-platform.js';
 import { GeminiSessionFileAdapter } from '../core/session/adapters/gemini-session-file-adapter.js';
 import { logger } from '../utils/logger.js';
@@ -41,7 +41,7 @@ const GEMINI_MODELS = [
 // ── Gemini Runner ──
 export class GeminiRunner {
     name = 'gemini';
-    capabilities = { clear: true, compact: false, fork: false };
+    capabilities = { clear: true, compact: false, fork: false, askUserQuestion: false, planApproval: false, fileRewind: 'unsupported' };
     resolved;
     model;
     activeProcesses = new Map();

package/dist/agents/runner-types.js

@@ -0,0 +1,58 @@
+// ── 类型守卫 ──
+export function hasModelSwitcher(agent) {
+    return typeof agent.setModel === 'function' && typeof agent.listModels === 'function';
+}
+export function hasPermissionController(agent) {
+    return typeof agent.setMode === 'function' && typeof agent.listModes === 'function';
+}
+export function hasCompact(agent) {
+    return typeof agent.compact === 'function';
+}
+// ── Token usage helper functions ──
+export function numericToken(value) {
+    return typeof value === 'number' && Number.isFinite(value) ? value : 0;
+}
+export function contextTokensForUsage(usage, isClaudeModel) {
+    if (!usage)
+        return 0;
+    if (!isClaudeModel)
+        return numericToken(usage.input_tokens);
+    return numericToken(usage.input_tokens)
+        + numericToken(usage.cache_creation_input_tokens)
+        + numericToken(usage.cache_read_input_tokens);
+}
+export function usageForContext(usage) {
+    const iterations = Array.isArray(usage?.iterations) ? usage.iterations : undefined;
+    const lastIteration = iterations?.slice().reverse().find(it => contextTokensForUsage(it, true) > 0);
+    return lastIteration ?? usage;
+}
+/** Models whose base ID uses a 1M context window when sent to the SDK with [1m]. */
+export const ONE_M_CONTEXT_MODEL_PREFIXES = ['claude-opus-4-8', 'claude-sonnet-4-6'];
+const ONE_M_CONTEXT_MODEL_ALIASES = ['opus', 'sonnet'];
+const CLAUDE_CONTEXT_MODEL_ALIASES = ['opus', 'sonnet', 'haiku'];
+export function isClaudeContextUsageModel(model) {
+    if (!model)
+        return false;
+    const baseModel = model.replace(/\[1m\]$/i, '');
+    return /^claude-/i.test(baseModel) || CLAUDE_CONTEXT_MODEL_ALIASES.includes(baseModel);
+}
+export function isOneMillionContextModel(model) {
+    if (!model)
+        return false;
+    if (ONE_M_CONTEXT_MODEL_ALIASES.includes(model))
+        return true;
+    if (/\[1m\]$/i.test(model))
+        return true;
+    if (/deepseek-v4/i.test(model))
+        return true;
+    const baseModel = model.replace(/\[1m\]$/i, '');
+    return ONE_M_CONTEXT_MODEL_PREFIXES.some(prefix => baseModel === prefix || baseModel.startsWith(`${prefix}-`));
+}
+/** Real context window size: 1M models = 1000000, otherwise 200000. */
+export function realContextWindowForModel(model) {
+    return isOneMillionContextModel(model) ? 1000000 : 200000;
+}
+/** autoCompact trigger threshold: 1M models = 900000, otherwise 200000. */
+export function autoCompactWindowForModel(model) {
+    return isOneMillionContextModel(model) ? 900000 : 200000;
+}

package/dist/aun/aid/store.js

@@ -39,7 +39,7 @@ export class AidLoadError extends Error {
  */
 export async function getAidStore(opts) {
     const { aunPath: defaultAunPath } = await import('../../paths.js');
-    const { loadEvolclawConfig } = await import('../../evolclaw-config.js');
+    const { loadEvolclawConfig } = await import('../../config-store.js');
     const { AIDStore } = await import('@agentunion/fastaun');
     const aunPath = opts.aunPath ?? defaultAunPath();
     const encryptionSeed = loadEvolclawConfig().aun?.encryptionSeed

package/dist/aun/outbox.js

@@ -59,10 +59,14 @@ export function enqueue(aid, opts) {
         aid,
         channelId: opts.channelId,
         type: opts.type,
+        contentKind: opts.contentKind,
+        payload: opts.payload,
         text: opts.text,
         filePath: opts.filePath,
+        logText: opts.logText,
         context: opts.context,
         ttl: opts.ttl ?? DEFAULT_TTL,
+        postSend: opts.postSend,
     };
     const dir = outboxDir();
     fs.mkdirSync(dir, { recursive: true });
@@ -97,6 +101,7 @@ export async function drain(aid, sender) {
     const entries = readEntries(aid);
     if (entries.length === 0)
         return { sent: 0, expired: 0, failed: 0 };
+    const drainedIds = new Set(entries.map(e => e.id));
     let sent = 0;
     let expired = 0;
     let failed = 0;
@@ -107,21 +112,28 @@ export async function drain(aid, sender) {
             continue;
         }
         try {
+            entry.attempts = (entry.attempts ?? 0) + 1;
             const ok = await sender(entry);
             if (ok) {
                 sent++;
             }
             else {
                 failed++;
+                entry.lastError = 'sender returned false';
                 remaining.push(entry);
             }
         }
-        catch {
+        catch (e) {
             failed++;
+            entry.lastError = e instanceof Error ? e.message : String(e);
             remaining.push(entry);
         }
     }
-    writeEntries(aid, remaining);
+    const current = readEntries(aid);
+    const currentIds = new Set(current.map(e => e.id));
+    const retainedNewEntries = current.filter(e => !drainedIds.has(e.id));
+    const retainedFailedEntries = remaining.filter(e => currentIds.has(e.id));
+    writeEntries(aid, [...retainedFailedEntries, ...retainedNewEntries]);
     return { sent, expired, failed };
 }
 export function hasPending(aid) {

package/dist/aun/storage/download.js

@@ -11,7 +11,7 @@ export async function storageDownload(aid, url, localPath, opts) {
     const ownerAid = cleaned.slice(0, slashIdx);
     const objectKey = cleaned.slice(slashIdx + 1);
     const ticketResult = await rpcCall(aid, 'storage.create_download_ticket', {
-        owner: ownerAid,
+        owner_aid: ownerAid,
         object_key: objectKey,
     }, { aunPath: opts?.aunPath });
     if (!ticketResult.ok) {

package/dist/aun/storage/upload.js

@@ -27,9 +27,21 @@ export async function storageUpload(aid, localFile, remotePath, opts) {
     const completeResult = await rpcCall(aid, 'storage.complete_upload', {
         object_key: remotePath,
         sha256,
+        is_private: !(opts?.isPublic),
     }, { aunPath: opts?.aunPath });
     if (!completeResult.ok) {
         return { ok: false, objectKey: remotePath, error: JSON.stringify(completeResult.error) };
     }
-    return { ok: true, objectKey: remotePath };
+    // 公开上传时获取可访问的 URL
+    let publicUrl;
+    if (opts?.isPublic) {
+        const ticketResult = await rpcCall(aid, 'storage.create_download_ticket', {
+            object_key: remotePath,
+            expire_in_seconds: 86400 * 30, // 30天
+        }, { aunPath: opts?.aunPath });
+        if (ticketResult.ok) {
+            publicUrl = `https://${aid}/storage/${remotePath}`;
+        }
+    }
+    return { ok: true, objectKey: remotePath, publicUrl };
 }