evolcore 0.0.28 → 0.0.29

package/dist/agents/claude-runner.js

@@ -13,7 +13,7 @@ import fs from 'fs';
 import os from 'os';
 import crypto from 'crypto';
 import { logger } from '../utils/logger.js';
-import { createClaudeStartupArgumentsTooLongError, isClaudeStartupArgumentsTooLong, } from '../utils/error-utils.js';
+import { createClaudeStartupArgumentsTooLongError, isClaudeStartupArgumentsTooLong, createClaudeCodeStartupError, isClaudeCodeStartupProcessError, } from '../utils/error-utils.js';
 import { requestDangerousCommandPermission } from '../core/permission/approval-gateway.js';
 import { checkDangerousCommand, checkReadonly, evaluateToolPreflight } from '../core/permission/tool-policy.js';
 import { sanitizeShellExecutionEnvironment } from '../core/permission/shell-environment.js';
@@ -34,6 +34,85 @@ import { contextTokensForUsage, usageForContext, isClaudeContextUsageModel, isOn
 import { hasContextWindowSuffix, stripContextWindowSuffix } from '../core/model/context-window-suffix.js';
 const resolveModule = createRequire(import.meta.url);
 const CLAUDE_INTERRUPT_TIMEOUT_MS = 5_000;
+export function summarizeClaudeQueryOptions(options, context) {
+    const sha256 = (value) => crypto.createHash('sha256').update(value).digest('hex');
+    const rawBaseUrl = options.env?.ANTHROPIC_BASE_URL;
+    let baseUrl = { source: 'sdk_default' };
+    let queryParameterNames = [];
+    if (rawBaseUrl) {
+        try {
+            const parsed = new URL(rawBaseUrl);
+            queryParameterNames = [...new Set(parsed.searchParams.keys())].sort();
+            baseUrl = {
+                source: 'env',
+                origin: parsed.origin,
+                pathLength: parsed.pathname.length,
+                pathSha256: sha256(parsed.pathname),
+            };
+        }
+        catch {
+            baseUrl = { source: 'env', invalid: true };
+        }
+    }
+    const headers = (options.env?.ANTHROPIC_CUSTOM_HEADERS ?? '').split(/\r?\n/u).flatMap(line => {
+        const separator = line.indexOf(':');
+        if (separator < 1)
+            return [];
+        const name = line.slice(0, separator).trim();
+        if (!/^[!#$%&'*+.^_`|~0-9a-z-]+$/iu.test(name))
+            return [];
+        const normalizedName = name.toLowerCase();
+        const rawValue = line.slice(separator + 1).trim();
+        const safeValue = ((normalizedName === 'content-type' || normalizedName === 'accept')
+            && ['application/json', 'text/event-stream'].includes(rawValue))
+            || (normalizedName === 'anthropic-version' && /^\d{4}-\d{2}-\d{2}$/u.test(rawValue))
+            || (normalizedName === 'x-evolcore-base-agent' && rawValue === 'claude')
+            || (normalizedName === 'x-evolcore-agent-aid' && rawValue === context.agentAid);
+        return [{ name, value: safeValue ? rawValue : '[REDACTED]' }];
+    });
+    const systemPrompt = options.systemPrompt;
+    const append = typeof systemPrompt === 'string'
+        ? systemPrompt
+        : !Array.isArray(systemPrompt) && systemPrompt?.type === 'preset'
+            ? systemPrompt.append ?? ''
+            : '';
+    const sandbox = options.sandbox
+        ?? (typeof options.settings === 'object' ? options.settings.sandbox : undefined);
+    return {
+        type: 'claude_sdk_query_options',
+        evidence: 'sdk_options',
+        wireRequestCaptured: false,
+        sessionId: context.sessionId,
+        taskId: context.taskId ?? null,
+        inputId: context.inputId,
+        agentAid: context.agentAid ?? null,
+        callModel: context.callModel ?? null,
+        sdkModel: options.model ?? null,
+        effort: options.effort ?? null,
+        resumeId: options.resume ?? null,
+        resumeAt: {
+            present: !!options.resumeSessionAt,
+            sha256: options.resumeSessionAt ? sha256(options.resumeSessionAt) : null,
+        },
+        baseUrl,
+        queryParameterNames,
+        headers,
+        permissionMode: options.permissionMode ?? null,
+        evolcorePermissionMode: context.permissionMode ?? null,
+        sandbox: {
+            source: sandbox ? 'options' : typeof options.settings === 'string' ? 'settings_file' : 'none',
+            executionState: context.executionSandboxState ?? null,
+            enabled: sandbox?.enabled ?? null,
+            allowUnsandboxedCommands: sandbox?.allowUnsandboxedCommands ?? null,
+            denyReadCount: sandbox?.filesystem?.denyRead?.length ?? null,
+            denyWriteCount: sandbox?.filesystem?.denyWrite?.length ?? null,
+        },
+        settingSources: options.settingSources?.slice() ?? [],
+        promptAppend: { length: append.length, sha256: sha256(append) },
+        queryOptionNames: Object.keys(options).sort(),
+        nativeDebugOptionsEnabled: options.debug === true || !!options.debugFile,
+    };
+}
 /**
  * Resolve the platform package explicitly instead of relying on the SDK's
  * internal optional-dependency lookup. The latter is sensitive to the module
@@ -105,15 +184,15 @@ const CLAUDE_BUILTIN_TOOLS = new Set([
     'WebSearch',
     'Write',
 ]);
-function spawnClaudeWithHClassGuard(options, root, onStderr) {
-    const preflight = collectSandboxGuardDiagnostics(root);
+function spawnClaudeWithHClassGuard(options, root, onStderr, selfAid) {
+    const preflight = collectSandboxGuardDiagnostics(root, { selfAid });
     logger.info(`[ClaudeSandbox] H-class guard preflight ${JSON.stringify(summarizeSandboxGuardDiagnostics(preflight))}`);
-    const guarded = buildHClassGuardCommand(options.command, options.args, root);
+    const guarded = buildHClassGuardCommand(options.command, options.args, root, { selfAid });
     if (!guarded) {
         throw new Error('Claude owner bypass 缺少 EvolCore H 类路径隔离运行时，已拒绝启动');
     }
     const launch = summarizeBubblewrapArgsForLog(guarded.args);
-    const postBuild = collectSandboxGuardDiagnostics(root);
+    const postBuild = collectSandboxGuardDiagnostics(root, { selfAid });
     logger.info(`[ClaudeSandbox] H-class guard launch ${JSON.stringify({
         ...launch,
         diagnostics: summarizeSandboxGuardDiagnostics(postBuild),
@@ -482,7 +561,7 @@ class MessageStream {
 }
 export class AgentRunner {
     name = 'claude';
-    capabilities = { taskRecovery: true, fullaccess: true, clear: true, compact: true, fork: true, forkAtTurn: true, askUserQuestion: true, planApproval: true, fileRewind: 'checkpoint' };
+    capabilities = { taskRecovery: true, fullaccess: true, clear: true, compact: true, fork: true, forkAtTurn: true, forkAtMessage: true, askUserQuestion: true, planApproval: true, fileRewind: 'checkpoint' };
     apiKey;
     model;
     effort;
@@ -593,7 +672,8 @@ export class AgentRunner {
         this.onSessionIdUpdate = onSessionIdUpdate;
         this.claudeExecutablePath = resolveBundledClaudeExecutable();
         if (config) {
-            const anthropic = resolveAnthropicConfig(config);
+            const anthropic = resolveAnthropicConfig(this.getRuntimeGatewayConfig(), undefined, this.getRuntimeGatewayScope());
+            this.apiKey = apiKey || anthropic.apiKey;
             this.claudeExecutablePath = anthropic.pathToClaudeCodeExecutable || this.claudeExecutablePath;
             this.customHeaders = buildModelRequestHeaders({
                 baseagent: 'claude',
@@ -604,6 +684,28 @@ export class AgentRunner {
             this.customQueryParams = anthropic.queryParams;
         }
     }
+    getRuntimeGatewayScope(projectPath) {
+        const configuredProjectPath = this.agentConfig?.projects?.defaultPath;
+        return {
+            ...(this.agentAid ? { agentAid: this.agentAid } : {}),
+            ...(typeof projectPath === 'string' && projectPath.trim()
+                ? { projectPath: projectPath.trim() }
+                : typeof configuredProjectPath === 'string' && configuredProjectPath.trim()
+                    ? { projectPath: configuredProjectPath.trim() }
+                    : {}),
+        };
+    }
+    getRuntimeGatewayConfig() {
+        if (!this.agentAid)
+            return this.config;
+        try {
+            const raw = resolveEffective({ self: this.agentAid }, { cache: true, expand: false });
+            return { agents: { claude: raw.baseagents?.claude ?? this.config?.agents?.claude } };
+        }
+        catch {
+            return this.config;
+        }
+    }
     getAgentEnv(runtimeEnv, evolcoreSessionId, permissionMode) {
         const anthropicBaseUrl = appendQueryParams(this.baseUrl, this.customQueryParams);
         const env = sanitizeShellExecutionEnvironment({
@@ -1396,6 +1498,26 @@ export class AgentRunner {
                 const activatedBeforeEvent = await activatePendingSession(false);
                 if (activatedBeforeEvent)
                     yield { type: 'session_id', sessionId: activatedBeforeEvent };
+                const responseMessage = event.type === 'assistant'
+                    ? event.message
+                    : event.type === 'stream_event' && event.event?.type === 'message_start'
+                        ? event.event.message
+                        : undefined;
+                if (responseMessage) {
+                    logger.info('[ClaudeResponseDiagnostic]', JSON.stringify({
+                        type: 'claude_sdk_response',
+                        evidence: 'sdk_response',
+                        wireRequestCaptured: false,
+                        sessionId,
+                        taskId: turn?.taskId ?? this.permissionContexts.get(sessionId)?.taskId ?? null,
+                        inputId,
+                        agentAid: this.agentAid ?? null,
+                        backendSessionId: typeof event.session_id === 'string' ? event.session_id : null,
+                        eventType: event.type,
+                        requestId: typeof event.request_id === 'string' ? event.request_id : null,
+                        responseModel: typeof responseMessage.model === 'string' ? responseMessage.model : null,
+                    }));
+                }
                 // 提取 session_id（任意 SDK 事件都可能携带）
                 if (event.session_id && event.session_id !== lastSessionId) {
                     lastSessionId = event.session_id;
@@ -1681,6 +1803,7 @@ export class AgentRunner {
                                 yield {
                                     type: 'tool_result', name: toolName, result: resultContent, isError: true,
                                     error: detail.message, errorCode: 'CAPABILITY_UNAVAILABLE', callId: block.tool_use_id,
+                                    assistantUuid: event.uuid,
                                     correlationId: block.tool_use_id, decision: 'error', decisionSource: 'infrastructure',
                                     policyCode: SANDBOX_INITIALIZATION_FAILED, executed: false, executionState: 'blocked',
                                 };
@@ -1697,6 +1820,7 @@ export class AgentRunner {
                                 isError: block.is_error === true,
                                 error: block.is_error === true ? resultContent : undefined,
                                 callId: block.tool_use_id,
+                                assistantUuid: event.uuid,
                             };
                         }
                     }
@@ -2287,6 +2411,7 @@ export class AgentRunner {
                     channel: permCtx?.channel,
                     peerId: permCtx?.userId,
                     role: permCtx?.role,
+                    selfAid: permCtx?.selfAid ?? this.agentAid,
                     allowProtectedMetadata: false,
                     allowReadonlySourceDiagnostics: permCtx?.allowReadonlySourceDiagnostics === true,
                 };
@@ -2463,6 +2588,7 @@ export class AgentRunner {
                     channel: permCtx?.channel,
                     peerId: permCtx?.userId,
                     role: permCtx?.role,
+                    selfAid: permCtx?.selfAid ?? this.agentAid,
                     allowProtectedMetadata: false,
                     allowReadonlySourceDiagnostics: permCtx?.allowReadonlySourceDiagnostics === true,
                 };
@@ -2559,6 +2685,7 @@ export class AgentRunner {
                 ensureClaudeGitWorktreeConfig(projectPath);
                 const enableWeakerNestedSandbox = shouldEnableClaudeWeakerNestedSandbox();
                 const sandboxFilesystem = buildClaudeProtectedFilesystem(resolvePaths().root, {
+                    selfAid: runPermissionContext?.selfAid ?? this.agentAid,
                     denyLClassRead: callPermissionMode === 'readonly',
                 });
                 const sandboxUnixSockets = buildClaudeUnixSocketAllowlist(projectPath, {
@@ -2631,7 +2758,7 @@ export class AgentRunner {
             ...(callEffort ? { effort: callEffort } : {}),
             ...(this.claudeExecutablePath ? { pathToClaudeCodeExecutable: this.claudeExecutablePath } : {}),
             ...(executionSandbox.state === 'off' && callPermissionMode !== 'fullaccess' && process.platform === 'linux' ? {
-                spawnClaudeCodeProcess: (options) => spawnClaudeWithHClassGuard(options, resolvePaths().root, handleClaudeStderr),
+                spawnClaudeCodeProcess: (options) => spawnClaudeWithHClassGuard(options, resolvePaths().root, handleClaudeStderr, runPermissionContext?.selfAid ?? this.agentAid),
             } : {}),
             autoCompactWindow: sdkAutoCompactWindowForModel(sdkModel),
             advisorModel: 'haiku',
@@ -2677,6 +2804,17 @@ export class AgentRunner {
                 throw new Error(`[ClaudeSandbox] failed to externalize Windows settings: ${error instanceof Error ? error.message : String(error)}`);
             }
         }
+        const logQueryOptions = (options) => {
+            logger.info('[ClaudeQueryDiagnostic]', JSON.stringify(summarizeClaudeQueryOptions(options, {
+                sessionId,
+                inputId,
+                taskId: modelOverride?.turn?.taskId ?? runPermissionContext?.taskId,
+                agentAid: this.agentAid,
+                callModel,
+                permissionMode: callPermissionMode,
+                executionSandboxState: executionSandbox.state,
+            })));
+        };
         const createQuery = (promptInput, resumeSessionId, resumeAt) => {
             if (useSettingSources) {
                 const queryOptions = {
@@ -2696,6 +2834,7 @@ export class AgentRunner {
                     delete queryOptions.sandbox;
                     queryOptions.settings = sandboxSettingsFile;
                 }
+                logQueryOptions(queryOptions);
                 return query({
                     prompt: promptInput,
                     options: queryOptions
@@ -2746,18 +2885,27 @@ export class AgentRunner {
                     delete queryOptions.sandbox;
                     queryOptions.settings = sandboxSettingsFile;
                 }
+                logQueryOptions(queryOptions);
                 return query({
                     prompt: promptInput,
                     options: queryOptions
                 });
             }
         };
-        // 检查待处理的 resumeAt（由 /rewind N chat 设置）
+        // 检查待处理的 resumeAt（由 /rewind N chat 设置）。话题字段必须
+        // 通过 SessionManager 的专用 CAS 消费，不能落入通用 metadata writer。
         let resumeAt;
         if (sessionManager && agentSessionId) {
             try {
                 const currentSession = await sessionManager.getSessionById?.(sessionId);
-                if (currentSession?.metadata?.resumeAt) {
+                if (currentSession?.threadId && topicBinding && typeof sessionManager.consumeTopicResumeAt === 'function') {
+                    resumeAt = await sessionManager.consumeTopicResumeAt({
+                        sessionId,
+                        expectedThreadId: currentSession.threadId,
+                        expectedAgentSessionId: agentSessionId,
+                    });
+                }
+                else if (currentSession?.metadata?.resumeAt) {
                     resumeAt = currentSession.metadata.resumeAt;
                     if (typeof sessionManager.patchSessionMetadata === 'function') {
                         await sessionManager.patchSessionMetadata(sessionId, { resumeAt: undefined });
@@ -2767,10 +2915,16 @@ export class AgentRunner {
                         delete newMeta.resumeAt;
                         await sessionManager.updateSession(sessionId, { metadata: newMeta });
                     }
-                    logger.info(`[AgentRunner] Consuming resumeAt: ${resumeAt}`);
+                }
+                if (resumeAt) {
+                    logger.info('[AgentRunner] Consuming resumeAt sha256=', crypto.createHash('sha256').update(resumeAt).digest('hex'));
                 }
             }
             catch (err) {
+                if (topicBinding) {
+                    logger.error('[AgentRunner] Failed to consume topic resumeAt:', err);
+                    throw err;
+                }
                 logger.warn('[AgentRunner] Failed to check resumeAt:', err);
             }
         }
@@ -2792,6 +2946,8 @@ export class AgentRunner {
                 const stderr = this.recentStderr.get(sessionId) ?? [];
                 if (isClaudeStartupArgumentsTooLong(error))
                     throw createClaudeStartupArgumentsTooLongError(error);
+                if (isClaudeCodeStartupProcessError(error))
+                    throw createClaudeCodeStartupError(error);
                 if (isSandboxInitializationFailure(error, stderr)) {
                     const { detail } = await this.recordSandboxInfrastructureFailure(sessionId, inputId, callPermissionMode, error, stderr);
                     throw detail;
@@ -2810,6 +2966,8 @@ export class AgentRunner {
                 const stderr = this.recentStderr.get(sessionId) ?? [];
                 if (isClaudeStartupArgumentsTooLong(error))
                     throw createClaudeStartupArgumentsTooLongError(error);
+                if (isClaudeCodeStartupProcessError(error))
+                    throw createClaudeCodeStartupError(error);
                 if (isSandboxInitializationFailure(error, stderr)) {
                     const { detail } = await this.recordSandboxInfrastructureFailure(sessionId, inputId, callPermissionMode, error, stderr);
                     throw detail;
@@ -3341,8 +3499,8 @@ export class ClaudeAgentPlugin {
     }
     createAgent(agent, callbacks) {
         const override = agent.config.baseagents?.claude;
-        const syntheticConfig = { agents: { claude: override } };
-        const anthropic = resolveAnthropicConfig(syntheticConfig, override);
+        const rawConfig = resolveEffective({ self: agent.aid }, { cache: true, expand: false });
+        const anthropic = resolveAnthropicConfig({ agents: { claude: rawConfig.baseagents?.claude } }, undefined, { agentAid: agent.aid, projectPath: agent.projectPath });
         const merged = {
             agents: { claude: { ...(override || {}) } },
         };

package/dist/agents/codex/app-server-client.js

@@ -216,6 +216,9 @@ export class CodexAppServerClient {
     async threadRollback(threadId, numTurns) {
         return this.request('thread/rollback', { threadId, numTurns });
     }
+    async threadRevert(threadId, beforeTurnId) {
+        return this.request('thread/revert', { threadId, beforeTurnId });
+    }
     async threadFork(threadId, projectPath, title, options) {
         const effort = options?.effort ?? this.options.effort;
         const configUsesPermissionProfile = hasPermissionProfile(options?.config);
@@ -492,19 +495,20 @@ export class CodexAppServerClient {
             let commandArgs = launchCommand.args;
             if (process.platform === 'linux') {
                 const guardRoot = resolvePaths().root;
-                const preflightDiagnostics = collectSandboxGuardDiagnostics(guardRoot);
+                const preflightDiagnostics = collectSandboxGuardDiagnostics(guardRoot, { selfAid: this.options.selfAid });
                 logger.info(`[CodexAppServer] H-class guard preflight ${JSON.stringify(summarizeSandboxGuardDiagnostics(preflightDiagnostics))}`);
                 const managedRequirements = this.ensureManagedHookRuntime();
                 const guardedCommand = buildHClassGuardCommand(command, commandArgs, guardRoot, {
                     managedCodexRequirements: managedRequirements,
                     protectEvolcoreFilesystem: this.options.protectEvolcoreFilesystem !== false,
+                    selfAid: this.options.selfAid,
                 });
                 if (!guardedCommand) {
                     throw new Error('Codex 缺少 EvolCore managed-hook 隔离运行时，已拒绝启动 app-server');
                 }
                 command = guardedCommand.command;
                 commandArgs = guardedCommand.args;
-                const launchDiagnostics = collectSandboxGuardDiagnostics(guardRoot);
+                const launchDiagnostics = collectSandboxGuardDiagnostics(guardRoot, { selfAid: this.options.selfAid });
                 logger.info(`[CodexAppServer] H-class guard launch ${JSON.stringify({
                     ...summarizeBubblewrapArgsForLog(commandArgs),
                     diagnostics: summarizeSandboxGuardDiagnostics(launchDiagnostics),

package/dist/agents/codex/diagnostics.js

@@ -17,7 +17,8 @@ export function checkCodexProjectPath(value, options = {}) {
         if (projectPath.startsWith('\\\\')) {
             warnings.push('Windows UNC/network project path may be unavailable to Codex sandboxed processes.');
         }
-        const systemRoot = process.env.SystemRoot ? path.resolve(process.env.SystemRoot).toLowerCase() : '';
+        const configuredSystemRoot = options.systemRoot ?? process.env.SystemRoot;
+        const systemRoot = configuredSystemRoot ? path.resolve(configuredSystemRoot).toLowerCase() : '';
         if (systemRoot && projectPath.toLowerCase().startsWith(`${systemRoot}${path.sep}`)) {
             warnings.push('Project path is under the Windows system directory; use a dedicated workspace when possible.');
         }
@@ -91,8 +92,6 @@ export function runCodexHookLaunchDiagnostic(options = {}) {
         };
     }
     const requirements = path.resolve(options.requirements || paths.requirements);
-    const managedDir = path.resolve(options.managedDir || paths.managedDir);
-    const hookPath = path.join(managedDir, 'pre-tool-use.mjs');
     const output = path.resolve(options.output
         || path.join(process.env.CODEX_HOME || path.join(os.homedir(), '.codex'), 'log', 'evolcore-hook-diagnostic.json'));
     const runtimeLog = output + '.runtime.jsonl';
@@ -101,6 +100,8 @@ export function runCodexHookLaunchDiagnostic(options = {}) {
     const configuredDir = config.hooks?.windows_managed_dir ?? config.hooks?.managed_dir;
     if (typeof configuredDir !== 'string')
         throw new Error('No Windows managed hook directory configured.');
+    const managedDir = path.resolve(options.managedDir || configuredDir);
+    const hookPath = path.join(managedDir, 'pre-tool-use.mjs');
     const expected = expectedWindowsHookCommand(nodePath, hookPath);
     const handlers = Array.isArray(config.hooks?.PreToolUse)
         ? config.hooks.PreToolUse.flatMap((group) => group?.hooks || [])