evolcore 0.0.20 → 0.0.22

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

@@ -1,7 +1,7 @@
 import { spawn } from 'child_process';
 import readline from 'readline';
 import { logger } from '../utils/logger.js';
-import { buildHClassGuardCommand } from '../core/permission/sandbox-runtime.js';
+import { buildHClassGuardCommand, collectSandboxGuardDiagnostics, summarizeBubblewrapArgsForLog, summarizeSandboxGuardDiagnostics, } from '../core/permission/sandbox-runtime.js';
 import { resolveCodexLaunchCommand } from '../utils/codex-cli.js';
 import { createHash } from 'crypto';
 import { sanitizeShellExecutionEnvironment } from '../core/permission/shell-environment.js';
@@ -9,6 +9,7 @@ import fs from 'fs';
 import path from 'path';
 import { ensureProcessManagedTempDir } from '../cli/task-context.js';
 import { getPackageRoot, resolvePaths } from '../paths.js';
+import { killProcess } from '../utils/cross-platform.js';
 import { registerCodexAppServerProcess, unregisterCodexAppServerProcess, } from '../utils/codex-app-server-registry.js';
 const BUILT_IN_CODEX_PROVIDER_IDS = new Set(['openai']);
 function tomlProviderKey(value) {
@@ -126,6 +127,14 @@ export class CodexAppServerClient {
             ...(options?.effort ? { effort: options.effort } : {}),
         });
     }
+    async turnSteer(threadId, expectedTurnId, input, additionalContext) {
+        return this.request('turn/steer', {
+            threadId,
+            expectedTurnId,
+            input,
+            ...(additionalContext ? { additionalContext } : {}),
+        });
+    }
     toTurnSandboxPolicy(sandbox) {
         if (!sandbox)
             return undefined;
@@ -332,7 +341,10 @@ export class CodexAppServerClient {
         }
         // 优雅关闭：先关闭 stdin，然后发送 SIGTERM，等待进程退出
         proc.stdin.end();
-        proc.kill('SIGTERM');
+        if (process.platform === 'win32' && proc.pid)
+            killProcess(proc.pid, false);
+        else
+            proc.kill('SIGTERM');
         // 等待进程退出，最多等待 5 秒
         await new Promise((resolve) => {
             let exited = false;
@@ -341,7 +353,10 @@ export class CodexAppServerClient {
                     return;
                 logger.warn('[CodexAppServer] Process did not exit after SIGTERM, sending SIGKILL');
                 try {
-                    proc.kill('SIGKILL');
+                    if (process.platform === 'win32' && proc.pid)
+                        killProcess(proc.pid, true);
+                    else
+                        proc.kill('SIGKILL');
                 }
                 catch { }
                 resolve();
@@ -410,8 +425,11 @@ export class CodexAppServerClient {
             let command = launchCommand.command;
             let commandArgs = launchCommand.args;
             if (process.platform === 'linux') {
+                const guardRoot = resolvePaths().root;
+                const preflightDiagnostics = collectSandboxGuardDiagnostics(guardRoot);
+                logger.info(`[CodexAppServer] H-class guard preflight ${JSON.stringify(summarizeSandboxGuardDiagnostics(preflightDiagnostics))}`);
                 const managedRequirements = this.ensureManagedHookRuntime();
-                const guardedCommand = buildHClassGuardCommand(command, commandArgs, undefined, {
+                const guardedCommand = buildHClassGuardCommand(command, commandArgs, guardRoot, {
                     managedCodexRequirements: managedRequirements,
                 });
                 if (!guardedCommand) {
@@ -419,6 +437,11 @@ export class CodexAppServerClient {
                 }
                 command = guardedCommand.command;
                 commandArgs = guardedCommand.args;
+                const launchDiagnostics = collectSandboxGuardDiagnostics(guardRoot);
+                logger.info(`[CodexAppServer] H-class guard launch ${JSON.stringify({
+                    ...summarizeBubblewrapArgsForLog(commandArgs),
+                    diagnostics: summarizeSandboxGuardDiagnostics(launchDiagnostics),
+                })}`);
             }
             this.proc = spawn(command, commandArgs, {
                 cwd: this.options.cwd,
@@ -605,7 +628,10 @@ export class CodexAppServerClient {
             // second command or changing the hook's behavior.
             if (!command || !hook || /[\r\n;&|<>]/.test(command))
                 return false;
-            return command.replace(/["']+$/, '').endsWith(hook);
+            const commandWithoutSocket = command
+                .replace(/\s+%EVOLCORE_INSTANCE_SOCKET%\s*$/i, '')
+                .trim();
+            return commandWithoutSocket.replace(/["']+$/, '').endsWith(hook);
         };
         const managedHookLoaded = Array.isArray(preToolUse)
             && preToolUse.some(group => {
@@ -757,8 +783,16 @@ export class CodexAppServerClient {
         this.pending.delete(messageId);
         if (message.error) {
             const detail = typeof message.error?.message === 'string' ? message.error.message : JSON.stringify(message.error);
-            const stderr = this.stderrBuffer.length ? `\n${this.stderrBuffer.join('\n')}` : '';
-            pending.reject(new Error(`${pending.method} failed: ${detail}${stderr}`));
+            // The CLI's one-time bubblewrap configuration warning is process-wide
+            // startup noise, not evidence about this RPC. Do not append it to an
+            // unrelated request failure such as thread/resume.
+            const stderrLines = this.stderrBuffer.filter(line => !/could not find bubblewrap on PATH/i.test(line));
+            const stderr = stderrLines.length ? `\n${stderrLines.join('\n')}` : '';
+            const error = new Error(`${pending.method} failed: ${detail}${stderr}`);
+            if (/no rollout found for thread id/i.test(detail)) {
+                error.code = 'CODEX_ROLLOUT_NOT_FOUND';
+            }
+            pending.reject(error);
             return;
         }
         pending.resolve(message.result ?? null);