evolclaw 3.1.11 → 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/control-aid.js

@@ -0,0 +1,67 @@
+import crypto from 'crypto';
+import { aidCreate } from './index.js';
+import { getAidStore, SLOT } from './store.js';
+import { logger } from '../../utils/logger.js';
+const MAX_ATTEMPTS = 5;
+/** 生成候选控制 AID：ec + 5位随机数字 + .agentid.pub */
+export function candidateAid() {
+    const n = crypto.randomInt(10000, 100000); // 5 位：10000-99999
+    return `ec${n}.agentid.pub`;
+}
+/**
+ * 候选 AID 是否已在 PKI 注册。
+ *
+ * 不用 store.exists（它走 HTTP HEAD /pki/cert/<aid>）——部分 Gateway 实现
+ * （Python websockets HTTP 处理）对 HEAD 直接空响应断连（curl 52 / socket hang up），
+ * 导致 exists 误报"网关不可达"。改用 store.resolve（走 GET），语义等价且 GET 正常返回：
+ *   - resolve ok            → 证书存在（HTTP 200）→ 已注册
+ *   - CERT_NOT_FOUND        → 404 → 未注册
+ *   - 其它 error            → 真·网络错误，向上抛出供 fail-fast
+ * skipAgentMd:true 避免多拉一次 agent.md（控制 AID 本就不传 agent.md）。
+ */
+async function candidateExists(store, candidate) {
+    const r = await store.resolve(candidate, { skipAgentMd: true });
+    if (r.ok)
+        return true;
+    if (r.error?.code === 'CERT_NOT_FOUND')
+        return false;
+    throw new Error(`Gateway 不可达，无法查重控制 AID：${r.error?.message ?? 'unknown'}`);
+}
+/**
+ * 生成控制 AID：循环候选 → candidateExists 查重（权威 PKI 判据）→ 不冲突则 aidCreate。
+ * - 查重走 GET 证书（见 candidateExists；不拉 agent.md，控制 AID 本就不传 agent.md）
+ * - fail-fast：查重探测失败（网关不可达）立即抛错，不掩盖成"均冲突"
+ * - agent.md 不上传：aidCreate 仅注册身份 + 写私钥，不调 agentmdPut
+ */
+export async function generateControlAid() {
+    const store = await getAidStore({ slotId: SLOT.cli });
+    try {
+        for (let i = 0; i < MAX_ATTEMPTS; i++) {
+            const candidate = candidateAid();
+            if (await candidateExists(store, candidate)) {
+                logger.info(`[control-aid] ${candidate} 已注册，重试 (${i + 1}/${MAX_ATTEMPTS})`);
+                continue;
+            }
+            const created = await aidCreate(candidate);
+            // 清理 aidCreate 内部另开的 client/store——关闭失败不可丢弃已注册的 AID（否则下次 init
+            // 会把它当冲突，白白消耗一次重试）。close 异常降级为 warn。
+            try {
+                await created.client?.close?.();
+            }
+            catch (e) {
+                logger.warn(`[control-aid] client.close() 失败（非致命）: ${e}`);
+            }
+            try {
+                await created.store?.close?.();
+            }
+            catch (e) {
+                logger.warn(`[control-aid] store.close() 失败（非致命）: ${e}`);
+            }
+            return { aid: created.aid, gateway: created.gateway };
+        }
+        throw new Error(`无法生成控制 AID：连续 ${MAX_ATTEMPTS} 次候选均冲突`);
+    }
+    finally {
+        store.close();
+    }
+}

package/dist/aun/aid/identity.js

@@ -443,6 +443,7 @@ export async function probePkiRecoverability(aid, opts) {
 }
 // ==================== Lookup ====================
 export async function aidLookup(aid) {
+    // gateway：well-known 探测（保留，供 aid lookup 命令展示）
     let gateway = '';
     try {
         const gwResp = await fetch(`https://${aid}/.well-known/aun-gateway`, { redirect: 'follow' });
@@ -464,16 +465,28 @@ export async function aidLookup(aid) {
         }
     }
     catch { /* ignore */ }
+    const { agentmdGet } = await import('./agentmd.js');
+    const store = await getAidStore({ slotId: SLOT.cli });
     try {
-        const resp = await fetch(`https://${aid}/agent.md`, { redirect: 'follow' });
-        if (resp.ok) {
-            const content = await resp.text();
-            return { exists: true, aid, gateway, content };
+        // 权威注册判据：PKI 证书 HEAD（与 agent.md 无关）
+        const existsResult = await store.exists(aid);
+        if (!existsResult.ok) {
+            return { exists: false, aid, gateway, error: existsResult.error?.message ?? 'exists check failed' };
         }
-        return { exists: false, aid, gateway, error: `agent_md_not_found` };
+        const exists = existsResult.data.exists;
+        if (!exists) {
+            return { exists: false, aid, gateway };
+        }
+        // 已注册：尽力拉 agent.md content（无 agent.md 不影响 exists）
+        let content;
+        try {
+            content = await agentmdGet(aid, { store });
+        }
+        catch { /* registered but no agent.md — content stays undefined */ }
+        return { exists, aid, gateway, content };
     }
-    catch (e) {
-        return { exists: false, aid, gateway, error: String(e.message || e) };
+    finally {
+        store.close();
     }
 }
 function lifecycleLogPath(aid) {

package/dist/aun/aid/store.js

@@ -39,10 +39,10 @@ export class AidLoadError extends Error {
  */
 export async function getAidStore(opts) {
     const { aunPath: defaultAunPath } = await import('../../paths.js');
-    const { loadProcessConfig } = await import('../../config-store.js');
+    const { loadEvolclawConfig } = await import('../../config-store.js');
     const { AIDStore } = await import('@agentunion/fastaun');
     const aunPath = opts.aunPath ?? defaultAunPath();
-    const encryptionSeed = loadProcessConfig().aun?.encryptionSeed
+    const encryptionSeed = loadEvolclawConfig().aun?.encryptionSeed
         ?? process.env.AUN_ENCRYPTION_SEED
         ?? 'evol';
     const caCertPath = path.join(aunPath, 'CA', 'root', 'root.crt');

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