evolclaw 3.2.0 → 3.3.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,28 @@
+// ── 类型守卫 ──
+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;
+}

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/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 };
 }