evolcore 0.0.25 → 0.0.27

package/dist/ipc.js

@@ -5,13 +5,14 @@ import fs from 'fs';
 import crypto from 'crypto';
 import os from 'os';
 import path from 'path';
+import { execFile } from 'node:child_process';
 import { logger } from './utils/logger.js';
 import { withMenuProcessingTime, logMenuRequestCompleted, logMenuRequestReceived } from './core/command/menu-protocol.js';
 import { fileCache } from './core/daemon-file-cache.js';
 import { DAEMON_RUNTIME_EPOCH_ENV } from './cli/task-context.js';
 import { HANDOFF_QUERY_MAX_LIMIT, HANDOFF_STATES } from './core/handoff/types.js';
 import { AgentReloadBusyError } from './core/agent-reload-coordinator.js';
-import { getWindowsInstanceSocketPathCandidates, normalizeIpcEndpoint, resolvePaths } from './paths.js';
+import { getPackageRoot, getWindowsInstanceSocketPathCandidates, normalizeIpcEndpoint, resolvePaths } from './paths.js';
 import { getProcessStartTime, isSameOrOlderProcess } from './utils/process-introspect.js';
 import { classifyProcessTree, ProcessTreeSampler, readProcessMetrics } from './utils/process-tree-stats.js';
 import { readSystemMemoryUsage } from './utils/system-memory.js';
@@ -73,10 +74,42 @@ function nextIpcQueryId(cmd) {
     return `ipc-${ipcQuerySequence}`;
 }
 function requiresLocalControlToken(cmd) {
-    // Managed bootstrap completion is authenticated by the session delegation
-    // ticket. A standalone CLI invocation still needs the daemon control token.
-    return LOCAL_CONTROL_COMMANDS.has(String(cmd.type ?? ''))
-        || (cmd.type === 'evolagent.bootstrapComplete' && typeof cmd.sessionId !== 'string');
+    // Managed calls use task delegation. Standalone queries must not gain
+    // management scope merely by omitting (or emptying) sessionId.
+    return cmd.type === 'evolagent.initialize' || LOCAL_CONTROL_COMMANDS.has(String(cmd.type ?? ''))
+        || (['evolagent.bootstrapComplete', 'diag', 'handoff-status', 'handoff-list', 'handoff-trace', 'task.resume'].includes(String(cmd.type))
+            && !(typeof cmd.sessionId === 'string' && cmd.sessionId.trim()));
+}
+/** Preserve the pipe DACL and grant only the provisioned Codex users data I/O. */
+function grantWindowsSandboxPipeAccess(endpoint) {
+    const powershell = path.join(process.env.SystemRoot || 'C:\\Windows', 'System32', 'WindowsPowerShell', 'v1.0', 'powershell.exe');
+    const request = Buffer.from(JSON.stringify({ action: 'pipe', path: endpoint })).toString('base64');
+    return new Promise((resolve, reject) => {
+        // Asynchronous: the ACL helper connects as a client, so Node must keep
+        // accepting pipe instances while it runs. Never interpolate shell source.
+        execFile(powershell, ['-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass',
+            '-File', path.join(getPackageRoot(), 'bin', 'codex-managed-acl.ps1'), '-Request', request], { windowsHide: true, timeout: 15_000, maxBuffer: 64 * 1024 }, (error, stdout, stderr) => {
+            if (error) {
+                reject(new Error(`Windows IPC sandbox ACL setup failed: ${stderr.trim() || error.message}`));
+                return;
+            }
+            try {
+                const result = JSON.parse(stdout.replace(/^\uFEFF/, '').trim());
+                if (!Array.isArray(result.granted))
+                    throw new Error('invalid ACL helper response');
+                if (result.granted.length) {
+                    logger.info(`[IPC] Sandbox pipe access granted to ${result.granted.join(', ')}`);
+                }
+                else {
+                    logger.info('[IPC] Codex sandbox accounts are not provisioned; restart daemon after Windows sandbox setup');
+                }
+                resolve();
+            }
+            catch (parseError) {
+                reject(parseError);
+            }
+        });
+    });
 }
 export function summarizeMonitorAgents(agents, aids) {
     const connectedAgents = new Set(aids.filter(aid => aid.status === 'connected').map(aid => aid.agentName || aid.aid));
@@ -102,21 +135,28 @@ export class IpcServer {
     aunAidStatsRecorder;
     menuExecutor;
     agentOperationExecutor;
+    initializationExecutor;
     statsProvider;
     agentStatsProvider;
     queueSnapshotProvider;
     queueActionExecutor;
     queueOperationExecutor;
     statusAuthorizationExecutor;
+    taskResumeExecutor;
     storageAuthorizationExecutor;
+    storageUploadExecutor;
     triggerExecutor;
     bootstrapCompleteExecutor;
     agentReloadExecutor;
     shutdownExecutor;
     taskRuntimeContextProvider;
+    taskRuntimeContextAuthorizer;
     codexPreToolUseExecutor;
     aunMsgSender;
+    diagExecutor;
+    menuClientExecutor;
     handoffReturnExecutor;
+    handoffRecoverReturnExecutor;
     handoffStatusExecutor;
     handoffListExecutor;
     handoffTraceExecutor;
@@ -135,6 +175,8 @@ export class IpcServer {
     controlToken;
     daemonRuntimeEpoch;
     remoteAccessService = remoteAccessService;
+    /** Current daemon owner used to bind locally issued ECWeb pairing codes. */
+    remoteAccessOwnerProvider;
     // CPU 占用追踪：IPC handler 是一次性同步调用，无法在响应里做 200ms 异步采样，
     // 故用后台 1s interval 累积 process.cpuUsage() 增量，handler 直接读最近值。
     // procCpuPercent = 本 daemon 进程占单核的百分比（可 >100% 仅当多核，已 clamp 到 100）；
@@ -189,6 +231,15 @@ export class IpcServer {
     setRemoteAccessService(service) {
         this.remoteAccessService = service;
     }
+    /**
+     * Supply the live process-level owner for pairing requests that do not carry
+     * an explicit owner (for example `ec watch web` and the ECWeb supervisor).
+     * The provider is evaluated for every request so owner updates take effect
+     * without restarting ECWeb.
+     */
+    setRemoteAccessOwnerProvider(provider) {
+        this.remoteAccessOwnerProvider = provider;
+    }
     /** Set the process-lifetime marker used to reject stale managed children. */
     setDaemonRuntimeEpoch(epoch) {
         this.daemonRuntimeEpoch = epoch;
@@ -197,6 +248,9 @@ export class IpcServer {
     setMenuExecutor(executor) {
         this.menuExecutor = executor;
     }
+    setInitializationExecutor(executor) {
+        this.initializationExecutor = executor;
+    }
     setAgentOperationExecutor(executor) {
         this.agentOperationExecutor = executor;
     }
@@ -340,9 +394,15 @@ export class IpcServer {
     setStatusAuthorizationExecutor(executor) {
         this.statusAuthorizationExecutor = executor;
     }
+    setTaskResumeExecutor(executor) {
+        this.taskResumeExecutor = executor;
+    }
     setStorageAuthorizationExecutor(executor) {
         this.storageAuthorizationExecutor = executor;
     }
+    setStorageUploadExecutor(executor) {
+        this.storageUploadExecutor = executor;
+    }
     /** Inject daemon-level trigger executor for ec trigger. */
     setTriggerExecutor(executor) {
         this.triggerExecutor = executor;
@@ -355,6 +415,9 @@ export class IpcServer {
     setTaskRuntimeContextProvider(provider) {
         this.taskRuntimeContextProvider = provider;
     }
+    setTaskRuntimeContextAuthorizer(authorizer) {
+        this.taskRuntimeContextAuthorizer = authorizer;
+    }
     setCodexPreToolUseExecutor(executor) {
         this.codexPreToolUseExecutor = executor;
     }
@@ -362,10 +425,15 @@ export class IpcServer {
     setAunMsgSender(sender) {
         this.aunMsgSender = sender;
     }
+    setDiagExecutor(executor) { this.diagExecutor = executor; }
+    setMenuClientExecutor(executor) { this.menuClientExecutor = executor; }
     /** Inject internal handoff result return executor for `ec handoff return`. */
     setHandoffReturnExecutor(executor) {
         this.handoffReturnExecutor = executor;
     }
+    setHandoffRecoverReturnExecutor(executor) {
+        this.handoffRecoverReturnExecutor = executor;
+    }
     setHandoffStatusExecutor(executor) {
         this.handoffStatusExecutor = executor;
     }
@@ -773,8 +841,17 @@ export class IpcServer {
                     }
                     catch { }
                 }
-                logger.info(`[IPC] Listening on ${this.socketPath}`);
-                resolve();
+                const permissionsReady = isNamedPipe(this.socketPath)
+                    ? grantWindowsSandboxPipeAccess(this.socketPath)
+                    : Promise.resolve();
+                void permissionsReady.then(() => {
+                    logger.info(`[IPC] Listening on ${this.socketPath}`);
+                    resolve();
+                }, error => {
+                    this.stop();
+                    logger.error('[IPC] Unable to configure pipe permissions:', error);
+                    reject(error);
+                });
             });
         });
     }
@@ -795,11 +872,10 @@ export class IpcServer {
         if (requiresLocalControlToken(cmd) && !this.hasValidControlToken(cmd.controlToken)) {
             return { ok: false, code: 'INVALID_CONTROL_TOKEN', error: 'valid local control token is required' };
         }
-        if (typeof cmd.sessionId === 'string' && cmd.sessionId
-            && typeof cmd.delegationToken === 'string' && cmd.delegationToken
+        if (typeof cmd.delegationToken === 'string' && cmd.delegationToken
             && this.daemonRuntimeEpoch
             && cmd.daemonRuntimeEpoch !== this.daemonRuntimeEpoch) {
-            logger.warn(`[IPC] stale delegation rejected: session=${ipcLogToken(cmd.sessionId)} type=${ipcLogToken(cmd.type)} cause=daemon_runtime_epoch_mismatch`);
+            logger.warn(`[IPC] stale delegation rejected: session=${ipcLogToken(cmd.sessionId ?? cmd.originSessionId ?? cmd.actorSessionId)} type=${ipcLogToken(cmd.type)} cause=daemon_runtime_epoch_mismatch`);
             return {
                 ok: false,
                 code: 'DAEMON_RESTARTED',
@@ -807,6 +883,10 @@ export class IpcServer {
             };
         }
         switch (cmd.type) {
+            case 'diag':
+                return this.diagExecutor ? this.diagExecutor(cmd) : { ok: false, code: 'NOT_CONFIGURED', message: '诊断入口未配置' };
+            case 'menu-client.request':
+                return this.menuClientExecutor ? this.menuClientExecutor(cmd) : { ok: false, code: 'NOT_CONFIGURED', error: 'Managed Menu client is not configured' };
             case 'model.catalog': {
                 if ((cmd.self !== undefined && typeof cmd.self !== 'string')
                     || (cmd.baseagent !== undefined && !['claude', 'codex', 'ecagent', 'gemini'].includes(cmd.baseagent))) {
@@ -887,14 +967,21 @@ export class IpcServer {
                 });
             }
             case 'remote-auth.pair-code': {
-                const pair = this.remoteAccessService.getPairingCode(typeof cmd.authorizedBy === 'string' ? cmd.authorizedBy : undefined);
+                // IPC issues local codes. Owner-authenticated /pair and Menu paths
+                // supply provenance in-process, never from a caller-supplied source.
+                if (cmd.source !== undefined && cmd.source !== 'host-cli' && cmd.source !== 'ecweb-local') {
+                    return { ok: false, code: 'INVALID_ARGUMENT', error: 'invalid local pairing source' };
+                }
+                const requestedOwner = typeof cmd.authorizedBy === 'string' ? cmd.authorizedBy.trim() : undefined;
+                const authorizedBy = requestedOwner || this.remoteAccessOwnerProvider?.();
+                const pair = this.remoteAccessService.getPairingCode(authorizedBy, Date.now(), cmd.source ?? 'host-cli');
                 return { ok: true, ...pair };
             }
             case 'remote-auth.issue-local': {
                 return this.remoteAccessService.issueLocalToken(cmd.label);
             }
             case 'remote-auth.redeem': {
-                return this.remoteAccessService.redeemPairingCode(cmd.code, cmd.label, cmd.authorizedBy);
+                return this.remoteAccessService.redeemPairingCode(cmd.code, cmd.label);
             }
             case 'remote-auth.validate': {
                 return { ok: true, ...this.remoteAccessService.validateToken(cmd.token) };
@@ -1068,6 +1155,25 @@ export class IpcServer {
                     delegationCommandHash: typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined,
                 });
             }
+            case 'storage.upload': {
+                if (!this.storageUploadExecutor)
+                    return { ok: false, code: 'NOT_CONFIGURED', error: 'storage upload not configured' };
+                if (typeof cmd.sessionId !== 'string' || !cmd.sessionId
+                    || typeof cmd.aid !== 'string' || !cmd.aid
+                    || typeof cmd.localFile !== 'string' || !cmd.localFile
+                    || typeof cmd.remotePath !== 'string' || !cmd.remotePath) {
+                    return { ok: false, code: 'INVALID_REQUEST', error: 'missing sessionId, aid, localFile, or remotePath' };
+                }
+                return await this.storageUploadExecutor({
+                    sessionId: cmd.sessionId,
+                    aid: cmd.aid,
+                    localFile: cmd.localFile,
+                    remotePath: cmd.remotePath,
+                    isPublic: cmd.isPublic === true,
+                    delegationToken: typeof cmd.delegationToken === 'string' ? cmd.delegationToken : undefined,
+                    delegationCommandHash: typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined,
+                });
+            }
             case 'aun-aid-stats-record-outbound': {
                 if (!this.aunAidStatsRecorder)
                     return { ok: false, error: 'recorder not configured' };
@@ -1085,15 +1191,55 @@ export class IpcServer {
                     return { ok: false, error: String(e?.message || e) };
                 }
             }
+            case 'task.resume': {
+                const allowed = new Set(['type', 'targetSessionId', 'sessionId', 'delegationToken',
+                    'delegationCommandHash', 'controlToken', 'daemonRuntimeEpoch', 'requestId', 'id']);
+                if (Object.keys(cmd).some(key => !allowed.has(key))
+                    || typeof cmd.targetSessionId !== 'string' || !cmd.targetSessionId.trim()
+                    || (cmd.sessionId !== undefined && (typeof cmd.sessionId !== 'string' || !cmd.sessionId.trim()))) {
+                    return { ok: false, code: 'INVALID_REQUEST', error: 'task.resume accepts only a target session and caller credentials' };
+                }
+                if (cmd.sessionId && (typeof cmd.delegationToken !== 'string' || !cmd.delegationToken)) {
+                    return { ok: false, code: 'DELEGATION_REQUIRED', error: 'managed task resume requires a delegation token' };
+                }
+                if (!this.taskResumeExecutor)
+                    return { ok: false, code: 'NOT_CONFIGURED', error: 'task.resume not configured' };
+                try {
+                    return await this.taskResumeExecutor({
+                        targetSessionId: cmd.targetSessionId,
+                        sessionId: cmd.sessionId,
+                        delegationToken: typeof cmd.delegationToken === 'string' ? cmd.delegationToken : undefined,
+                        delegationCommandHash: typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined,
+                        localControl: !cmd.sessionId && this.hasValidControlToken(cmd.controlToken),
+                    });
+                }
+                catch (error) {
+                    return { ok: false, code: 'TASK_RESUME_FAILED', error: error instanceof Error ? error.message : String(error) };
+                }
+            }
             case 'task-runtime-context': {
                 if (!this.taskRuntimeContextProvider)
                     return { ok: false, error: 'task runtime context not configured' };
                 if (!cmd.sessionId || typeof cmd.sessionId !== 'string')
                     return { ok: false, error: 'missing sessionId' };
+                if (!this.taskRuntimeContextAuthorizer) {
+                    return { ok: false, code: 'DELEGATION_REQUIRED', error: 'task runtime context authorization is not configured' };
+                }
+                const authorization = this.taskRuntimeContextAuthorizer({
+                    sessionId: cmd.sessionId,
+                    delegationToken: typeof cmd.delegationToken === 'string' ? cmd.delegationToken : undefined,
+                    delegationCommandHash: typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined,
+                });
+                if (!authorization.ok)
+                    return authorization;
                 const context = this.taskRuntimeContextProvider({ sessionId: cmd.sessionId }) ?? null;
                 return { ok: true, context };
             }
             case 'aun-msg-send': {
+                if (cmd.handoffContext !== undefined && (typeof cmd.handoffContext !== 'string'
+                    || !cmd.handoffContext.trim() || cmd.handoffContext.length > 64 * 1024 || cmd.scope === 'group')) {
+                    return { ok: false, code: 'INVALID_HANDOFF_CONTEXT', error: 'Private handoff context must contain 1–65536 characters' };
+                }
                 if (!this.aunMsgSender)
                     return { ok: false, error: 'aun msg sender not configured' };
                 if (!cmd.aid || typeof cmd.aid !== 'string')
@@ -1148,6 +1294,7 @@ export class IpcServer {
                         encrypt: typeof cmd.encrypt === 'boolean' ? cmd.encrypt : undefined,
                         thread: typeof cmd.thread === 'string' ? cmd.thread : undefined,
                         returnPolicy: cmd.returnPolicy === 'required' || cmd.returnPolicy === 'none' ? cmd.returnPolicy : undefined,
+                        handoffContext: cmd.handoffContext,
                         originSessionId: typeof cmd.originSessionId === 'string' ? cmd.originSessionId : undefined,
                         originMessageId: typeof cmd.originMessageId === 'string' ? cmd.originMessageId : undefined,
                         delegationToken: typeof cmd.delegationToken === 'string' ? cmd.delegationToken : undefined,
@@ -1177,6 +1324,28 @@ export class IpcServer {
                     return { ok: false, error: e?.message || String(e) };
                 }
             }
+            case 'handoff-recover-return': {
+                if (!this.handoffRecoverReturnExecutor)
+                    return { ok: false, error: 'handoff recovery not configured' };
+                if (typeof cmd.sessionId !== 'string' || !cmd.sessionId)
+                    return { ok: false, code: 'HANDOFF_CALL_SESSION_INVALID', error: 'missing sessionId' };
+                if (typeof cmd.handoffId !== 'string' || !cmd.handoffId)
+                    return { ok: false, code: 'INVALID_HANDOFF_ID', error: 'missing handoff_id' };
+                if (typeof cmd.content !== 'string')
+                    return { ok: false, code: 'HANDOFF_RETURN_CONTENT_REQUIRED', error: 'missing content' };
+                try {
+                    return await this.handoffRecoverReturnExecutor({
+                        sessionId: cmd.sessionId,
+                        handoffId: cmd.handoffId,
+                        content: cmd.content,
+                        delegationToken: typeof cmd.delegationToken === 'string' ? cmd.delegationToken : undefined,
+                        delegationCommandHash: typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined,
+                    });
+                }
+                catch (e) {
+                    return { ok: false, error: e?.message || String(e) };
+                }
+            }
             case 'handoff-status': {
                 if (!this.handoffStatusExecutor)
                     return { ok: false, code: 'HANDOFF_STATUS_UNAVAILABLE', error: 'handoff status not configured' };
@@ -1309,6 +1478,13 @@ export class IpcServer {
                 }
                 return await this.fsOperationExecutor(argv, sessionId, delegationToken, typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined);
             }
+            case 'evolagent.initialize': {
+                if (cmd.sessionId || cmd.delegationToken)
+                    return { ok: false, code: 'NOT_ALLOWED', error: 'Managed callers must use agent.op' };
+                if (!this.initializationExecutor)
+                    return { ok: false, code: 'NOT_CONFIGURED', error: 'Initialization service unavailable' };
+                return this.initializationExecutor(cmd);
+            }
             case 'agent.op': {
                 if (!this.agentOperationExecutor)
                     return { ok: false, code: 'NOT_CONFIGURED', error: 'agent.op not configured' };
@@ -1376,12 +1552,13 @@ export class IpcServer {
                 if (!this.bootstrapCompleteExecutor)
                     return { ok: false, error: 'bootstrap complete executor not configured' };
                 try {
-                    return await this.bootstrapCompleteExecutor(aid, {
+                    const auth = {
                         sessionId: typeof cmd.sessionId === 'string' ? cmd.sessionId : undefined,
                         delegationToken: typeof cmd.delegationToken === 'string' ? cmd.delegationToken : undefined,
                         delegationCommandHash: typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined,
                         controlToken: typeof cmd.controlToken === 'string' ? cmd.controlToken : undefined,
-                    });
+                    };
+                    return await this.bootstrapCompleteExecutor(aid, auth);
                 }
                 catch (e) {
                     return { ok: false, error: e?.message || String(e) };
@@ -1548,7 +1725,7 @@ export class IpcTransportError extends Error {
     endpoint;
     constructor(code, endpoint) {
         const hint = code === 'EPERM' || code === 'EACCES'
-            ? '权限被拒绝；Windows 下请检查 daemon 与 CLI 是否使用相同用户和提升权限级别。'
+            ? '权限被拒绝；请检查 IPC 端点权限及沙箱隔离。Windows 下同用户进程也可能因受限令牌无法连接命名管道。'
             : code === 'ETIMEDOUT'
                 ? '等待 daemon 响应超时；请求可能已执行，请先检查状态再重试。'
                 : code === 'ENOENT' || code === 'ECONNREFUSED'
@@ -1619,6 +1796,7 @@ function ipcQueryOnce(socketPath, cmd, timeoutMs = 3000) {
     const request = {
         ...(delegationCommandHash ? { ...authenticatedCmd, delegationCommandHash } : authenticatedCmd),
         ...(process.env[DAEMON_RUNTIME_EPOCH_ENV]
+            && authenticatedCmd.daemonRuntimeEpoch === undefined
             && typeof authenticatedCmd.delegationToken === 'string'
             ? { daemonRuntimeEpoch: process.env[DAEMON_RUNTIME_EPOCH_ENV] }
             : {}),

package/dist/paths.js

@@ -72,11 +72,11 @@ export function aunPath() {
 export function aidsDir() {
     return path.join(resolveRoot(), 'AIDs');
 }
-export function aidLocalDir(aid) {
-    return path.join(resolveRoot(), 'AIDs', aid);
+export function aidLocalDir(aid, root = resolveRoot()) {
+    return path.join(root, 'AIDs', aid);
 }
-export function agentMdPath(aid) {
-    return path.join(resolveRoot(), 'AIDs', aid, 'agent.md');
+export function agentMdPath(aid, root = resolveRoot()) {
+    return path.join(root, 'AIDs', aid, 'agent.md');
 }
 // ── per-agent 路径（参数化，不进 resolvePaths() 的固定 map）──
 export function agentDir(aid) {
@@ -94,6 +94,10 @@ export function agentContactOperations(aid) {
 export function agentPersonalDir(aid) {
     return path.join(agentDir(aid), 'personal');
 }
+/** Agent-owned Bootstrap completion welcome template. */
+export function agentWelcomePath(aid) {
+    return path.join(agentPersonalDir(aid), 'welcome.md');
+}
 export function agentRolesDir(aid) {
     return path.join(agentDir(aid), 'roles');
 }
@@ -106,6 +110,12 @@ export function agentRoleConfig(aid, roleId) {
 export function agentRelationsDir(aid) {
     return path.join(agentDir(aid), 'relations');
 }
+export function agentRelationDir(aid, peerKey) {
+    return path.join(agentRelationsDir(aid), peerKey);
+}
+export function agentRelationSharedDir(aid, peerKey) {
+    return path.join(agentRelationDir(aid, peerKey), 'shared');
+}
 /** @deprecated Use agentRelationsDir instead */
 export function agentIdentitiesDir(aid) {
     return agentRelationsDir(aid);
@@ -128,6 +138,9 @@ export function agentDataCacheDir(aid) {
 export function agentHandoffDir(aid) {
     return path.join(agentDataDir(aid), 'handoff');
 }
+export function agentGroupInviteReviewsPath(aid) {
+    return path.join(agentDataDir(aid), 'aun', 'group-invite-reviews.json');
+}
 export function agentOutboxPath(aid) {
     return path.join(resolvePaths().outboxDir, encodeURIComponent(aid), 'outbox.jsonl');
 }

package/dist/product.js

@@ -14,6 +14,8 @@ export const MIN_ECWEB_VERSION = '0.0.8';
 export const DAEMON_CONFIG_FILENAME = 'daemon.json';
 export const DAEMON_SCHEMA_NAME = 'daemon';
 export const RUNTIME_HOME_ENV = 'EVOLCORE_HOME';
+export const SESSION_ID_ENV = 'EVOLCORE_SESSION_ID';
+export const SELF_AID_ENV = 'EVOLCORE_SELF_AID';
 export const DEFAULT_RUNTIME_HOME_DIRNAME = '.evolcore';
 export const INSTANCE_SOCKET_FILENAME = 'daemon.sock';
 export const WINDOWS_PIPE_PREFIX = 'daemon';

package/dist/response-system/engines/v1/proactive-flow.js

@@ -12,7 +12,18 @@ const STATE_KEY = 'proactive';
 const TOOL_REPORT_INTERVAL = 10;
 const SEND_RECEIPT_RE = /["']?(?:message[_ -]?id|handoff[_ -]?id)["']?\s*[:=]\s*["']?([A-Za-z0-9][A-Za-z0-9._:-]*)/gi;
 const HANDOFF_TEXT_RECEIPT_RE = /\bhandoff\s+(h-[A-Za-z0-9._-]+)/i;
-function hasSuccessfulSendReceipt(result, isError) {
+const RETURN_CONTENT_RE = /["']?(?:return[_ -]?content|returnContent)["']?\s*[:=]\s*["']?([^}\n,]*)/i;
+function hasRequiredReturnFlag(toolInput) {
+    if (!toolInput || typeof toolInput !== 'object')
+        return false;
+    const input = toolInput;
+    const commandValues = ['command', 'cmd', 'script'].flatMap(key => {
+        const value = input[key];
+        return typeof value === 'string' ? [value] : [];
+    });
+    return commandValues.some(command => /(?:^|\s)--return(?:=|\s+)['"]?required(?:['"]?)(?=\s|$)/i.test(command));
+}
+function hasSuccessfulSendReceipt(result, isError, requiresBusinessReturn = false) {
     if (isError === true)
         return false;
     const hasReceiptValue = (value) => {
@@ -40,6 +51,41 @@ function hasSuccessfulSendReceipt(result, isError) {
     };
     if (hasExplicitFailure(result, new Set()))
         return false;
+    const isBusinessReturn = (value) => {
+        if (typeof value !== 'string')
+            return false;
+        const normalized = value.trim();
+        if (!normalized || /^(?:null|undefined|-)$/.test(normalized))
+            return false;
+        // Contact admission/refusal is a real reply, but it is not task completion.
+        if (/(?:当前不接受陌生人消息|可发送\s*\/request|contact\s+(?:required|request)|stranger message)/i.test(normalized))
+            return false;
+        return true;
+    };
+    const inspectBusinessReturn = (value, seen) => {
+        if (!value || typeof value !== 'object')
+            return false;
+        if (seen.has(value))
+            return false;
+        seen.add(value);
+        if (Array.isArray(value))
+            return value.some(item => inspectBusinessReturn(item, seen));
+        for (const [key, item] of Object.entries(value)) {
+            if ((key === 'return_content' || key === 'returnContent') && isBusinessReturn(item))
+                return true;
+            if (inspectBusinessReturn(item, seen))
+                return true;
+        }
+        return false;
+    };
+    if (requiresBusinessReturn) {
+        if (inspectBusinessReturn(result, new Set()))
+            return true;
+        const returnText = typeof result === 'string'
+            ? result.match(RETURN_CONTENT_RE)?.[1]
+            : undefined;
+        return isBusinessReturn(returnText);
+    }
     const inspect = (value, seen) => {
         if (!value || typeof value !== 'object')
             return false;
@@ -153,6 +199,11 @@ export const proactiveFlow = {
                 // Codex only invokes this hook for local tool paths. Hosted tools stay
                 // enabled and do not satisfy or clear the pending first-send gate.
                 const isSendCommand = ctx.isSendCommand(toolName, toolInput);
+                if (!isSendCommand && ((state.firstSendRequired && !state.firstToolDone) || state.toolReportPending)) {
+                    const sendFailure = ctx.describeSendCommandFailure?.(toolName, toolInput);
+                    if (sendFailure)
+                        return { block: true, policyCode: 'proactive_send_invalid', reason: sendFailure };
+                }
                 if (state.firstSendRequired && !state.firstToolDone) {
                     if (!isSendCommand) {
                         const cmdHint = state.chatType === 'group' ? 'ec group send' : 'ec msg send';
@@ -221,7 +272,13 @@ export const proactiveFlow = {
             return;
         if (!ctx.isSendCommand(ctx.toolName, ctx.toolInput))
             return;
-        if (!hasSuccessfulSendReceipt(ctx.result, ctx.isError || !!ctx.error))
+        const requiresBusinessReturn = hasRequiredReturnFlag(ctx.toolInput)
+            && (typeof ctx.result === 'string'
+                ? HANDOFF_TEXT_RECEIPT_RE.test(ctx.result)
+                : !!ctx.result && typeof ctx.result === 'object'
+                    && ('handoff_id' in ctx.result || 'handoffId' in ctx.result));
+        HANDOFF_TEXT_RECEIPT_RE.lastIndex = 0;
+        if (!hasSuccessfulSendReceipt(ctx.result, ctx.isError || !!ctx.error, requiresBusinessReturn))
             return;
         if (state.firstSendRequired && !state.firstToolDone)
             state.firstToolDone = true;

package/dist/stats/billing.js

@@ -5,6 +5,7 @@
 import fs from 'fs';
 import path from 'path';
 import { getPackageRoot } from '../paths.js';
+import { parseModelId, stripContextWindowSuffix } from '../core/model/context-window-suffix.js';
 // 模型参数缓存（进程内，5 分钟 TTL）
 let _parameterCache = null;
 let _parameterCacheTs = 0;
@@ -79,21 +80,36 @@ function loadPrices(evolcoreHome) {
     _priceCacheTs = now;
     return _priceCache;
 }
+/**
+ * 按优先级列出一个模型 ID 的查表候选键。
+ *
+ * 上下文窗口变体（`claude-opus-5[1m]`）与基础模型同价，价表只需一条基础条目；
+ * 但仍先试精确匹配，好让用户能给某个变体单独定价。
+ */
+export function modelLookupKeys(evolcoreHome, model) {
+    const keys = [];
+    const push = (key) => { if (key && !keys.includes(key))
+        keys.push(key); };
+    push(model);
+    push(resolveCanonicalModel(evolcoreHome, model));
+    const base = stripContextWindowSuffix(model);
+    if (base !== model) {
+        push(base);
+        push(resolveCanonicalModel(evolcoreHome, base));
+    }
+    return keys;
+}
 /** 取 model 在 ts 时刻生效的价格行（effective_from <= ts 中最新的一条）。
- *  精确匹配失败时，通过 model-aliases.jsonl 映射到规范 ID 再查一次。 */
+ *  精确匹配失败时，依次回落到 alias 规范 ID 和去掉窗口后缀的基础 ID。 */
 export function resolvePriceRow(evolcoreHome, model, ts) {
     const prices = loadPrices(evolcoreHome);
-    let candidates = prices.filter(p => p.model === model && p.effective_from <= ts);
-    if (!candidates.length) {
-        // fallback: alias → canonical
-        const canonical = resolveCanonicalModel(evolcoreHome, model);
-        if (canonical !== model) {
-            candidates = prices.filter(p => p.model === canonical && p.effective_from <= ts);
+    for (const key of modelLookupKeys(evolcoreHome, model)) {
+        const candidates = prices.filter(p => p.model === key && p.effective_from <= ts);
+        if (candidates.length) {
+            return candidates.reduce((a, b) => a.effective_from >= b.effective_from ? a : b);
         }
     }
-    if (!candidates.length)
-        return null;
-    return candidates.reduce((a, b) => a.effective_from >= b.effective_from ? a : b);
+    return null;
 }
 export const BILLING_FNS = {
     // 通用 per-token（Claude / OpenAI 兼容 / Kimi / MiniMax）
@@ -164,14 +180,24 @@ function loadSpecs(evolcoreHome) {
     _specCacheTs = now;
     return _specCache;
 }
-/** 取模型在 ts 时刻的能力参数。找不到时返回默认值。 */
+/** 取模型在 ts 时刻的能力参数。找不到时返回默认值。
+ *  带窗口后缀的 ID 复用基础模型的参数行，但窗口由后缀决定（网关的权威声明）。 */
 export function resolveModelSpec(evolcoreHome, model, ts) {
     const specs = loadSpecs(evolcoreHome);
     const t = ts ?? Date.now();
-    const candidates = specs.filter(s => s.model === model && s.effective_from <= t);
-    if (candidates.length) {
-        return candidates.reduce((a, b) => a.effective_from >= b.effective_from ? a : b);
+    const suffixWindow = parseModelId(model).contextWindow;
+    for (const key of modelLookupKeys(evolcoreHome, model)) {
+        const candidates = specs.filter(s => s.model === key && s.effective_from <= t);
+        if (!candidates.length)
+            continue;
+        const row = candidates.reduce((a, b) => a.effective_from >= b.effective_from ? a : b);
+        if (suffixWindow === undefined || suffixWindow === row.context_window)
+            return row;
+        // 后缀声明的窗口覆盖基础行，输入上限按原行的预留比例等比缩放。
+        const ratio = row.context_window > 0 ? row.max_input_tokens / row.context_window : 0.9;
+        return { ...row, model, context_window: suffixWindow, max_input_tokens: Math.floor(suffixWindow * ratio) };
     }
     // 默认值
-    return { model, effective_from: 0, context_window: 200000, max_input_tokens: 180000, max_output_tokens: 8192 };
+    const contextWindow = suffixWindow ?? 200000;
+    return { model, effective_from: 0, context_window: contextWindow, max_input_tokens: Math.floor(contextWindow * 0.9), max_output_tokens: 8192 };
 }