@evomap/evolver-proxy 2.0.0-beta.2 → 2.0.0-beta.22

package/dist/daemon/atpConsent.js

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { events } from '@evomap/evolver-core';
 export class AtpProxySpendConsentError extends Error {
     source;
     constructor(source) {
@@ -10,7 +10,10 @@ export class AtpProxySpendConsentError extends Error {
     }
 }
 function atpProxyConsentPath(env = process.env) {
-    const home = env['EVOMAP_DIR'] ?? env['EVOLVER_HOME'] ?? env['EVOMAP_HOME'] ?? events.evomapHome();
+    const home = [env['EVOMAP_DIR'], env['EVOLVER_HOME'], env['EVOMAP_HOME']]
+        .map((value) => value?.trim())
+        .find((value) => Boolean(value))
+        ?? join(homedir(), '.evomap');
     return join(home, 'evolution', 'atp-autobuy-ack.json');
 }
 export function getAtpProxyConsent(env = process.env, ackPath = atpProxyConsentPath(env)) {

package/dist/daemon/collaborationFacade.js

@@ -353,16 +353,19 @@ export class CollaborationFacade {
     async mailboxPoll(ctx) {
         const body = asRecord(await ctx.readJson());
         const type = optionalString(body['type']);
-        const direction = optionalDirection(body['direction']);
+        const channel = optionalString(body['channel']);
+        const direction = optionalDirection(body['direction']) ?? 'inbound';
         const limit = boundedMailboxPollLimit(body['limit']);
-        const messages = this.deps.store.list({
-            status: 'pending',
-            runtimeNamespace: this.deps.runtimeNamespace ?? 'default',
-            ...(type ? { type } : {}),
-            ...(direction ? { direction } : {}),
-            limit,
-        })
-            .map((message) => TASK_RESULT_TYPES.has(message.type) ? v1Message(message) : message);
+        const runtimeNamespace = legacyMailboxRuntimeNamespace(channel, this.deps.runtimeNamespace ?? 'default');
+        const messages = runtimeNamespace === undefined
+            ? []
+            : this.deps.store.list({
+                status: 'pending',
+                runtimeNamespace,
+                ...(type ? { type } : {}),
+                direction,
+                limit,
+            }).map(v1Message);
         ctx.json(200, { messages, count: messages.length });
         return true;
     }
@@ -671,18 +674,19 @@ function v1Message(message) {
     return {
         id: message.id,
         message_id: message.id,
-        channel: 'evomap-hub',
+        channel: message.runtimeNamespace === 'default' ? 'evomap-hub' : message.runtimeNamespace,
         direction: message.direction,
         type: message.type === 'dm_outbound' || isDirectDialogMessage(message) ? 'dm' : message.type,
         status: message.status === 'done' ? (message.direction === 'inbound' ? 'delivered' : 'synced') : message.status,
         payload: message.payload,
-        priority: 'normal',
-        ref_id: message.replyTo,
+        priority: message.priority,
+        ref_id: message.replyTo ?? message.correlationId,
         created_at: message.createdAt,
         synced_at: message.status === 'done' ? message.updatedAt : null,
         expires_at: message.ttlAt,
         retry_count: message.attempts,
-        error: null,
+        next_retry_at: message.nextRetryAt,
+        error: message.lastError,
     };
 }
 function writeOperationError(ctx, error) {
@@ -721,10 +725,10 @@ function classifyOperationError(error) {
     const candidate = error;
     const status = numberValue(candidate?.statusCode) ?? numberValue(candidate?.status);
     const signature = `${String(candidate?.name ?? '')} ${String(candidate?.code ?? '')}`;
-    if (status === 401 || /auth/i.test(signature))
-        return { status: 401, code: 'unauthorized', message: 'Hub authentication failed', retryable: false };
     if (status === 403 || /forbidden|permission/i.test(signature))
         return { status: 403, code: 'forbidden', message: 'Hub permission denied', retryable: false };
+    if (status === 401 || /auth/i.test(signature))
+        return { status: 401, code: 'unauthorized', message: 'Hub authentication failed', retryable: false };
     if (status === 404)
         return { status: 404, code: 'not_found', message: 'Task or claim not found', retryable: false };
     if (status === 409 || /conflict|already_claimed/i.test(signature))
@@ -741,7 +745,7 @@ function classifyOperationError(error) {
 function isDurablyRecoverableAuthError(error) {
     const candidate = error;
     const status = numberValue(candidate?.statusCode) ?? numberValue(candidate?.status);
-    return candidate?.name === 'AuthError' || status === 401;
+    return status === 401;
 }
 class FacadeTimeoutError extends Error {
 }
@@ -794,6 +798,12 @@ function optionalString(value) {
 function optionalDirection(value) {
     return value === 'inbound' || value === 'outbound' || value === 'local' ? value : undefined;
 }
+function legacyMailboxRuntimeNamespace(requestedChannel, runtimeNamespace) {
+    if (requestedChannel === undefined || requestedChannel === 'evomap-hub' || requestedChannel === runtimeNamespace) {
+        return runtimeNamespace;
+    }
+    return undefined;
+}
 function requiredValue(record, ...keys) {
     for (const key of keys) {
         const value = optionalString(record[key]);

package/dist/daemon/proxyDaemon.d.ts

@@ -3,11 +3,15 @@ import { SyncEngine, type OutboundResult, type InboundResult } from '../sync/eng
 import { LifecycleManager, type HelloLifecycleMode, type HelloResult, type HeartbeatOptions, type HeartbeatResult, type HeartbeatTickResult } from '../lifecycle/manager.js';
 import { type SelfUpdateDeps } from '../selfUpdate/executor.js';
 import type { AtpOrderConsentGate } from './atpConsent.js';
+import { type PublishRecallVerifierPort } from './publishRecallVerifier.js';
 type HubCapability = hubNs.HubCapability;
 type AssetStoreProvider = assetstore.AssetStoreProvider;
+type ConversationDistillExecutionVerifier = (input: hubNs.ConversationDistillInput, signal: AbortSignal) => Promise<hubNs.ConversationDistillVerifiedExecution | null>;
 export declare const DEFAULT_IPC_PORT = 19820;
 export interface ProxyDaemonDeps {
     hub: HubCapability;
+    /** Immutable Hub selection for IPC callers that must fail closed across public/private runtimes. */
+    hubMode?: 'public' | 'private';
     /** 二选一: 传 storePath 让 ProxyDaemon 建 store, 或传已建 store(供 hub senderId 共享同一 node_id). */
     storePath?: string;
     store?: mailbox.MailboxStore;
@@ -16,6 +20,16 @@ export interface ProxyDaemonDeps {
     ipcHost?: string;
     runtimeNamespace?: string;
     now?: () => number;
+    /** Hub lifecycle heartbeat cadence. LifecycleManager applies its 30s safety floor and backoff policy. */
+    heartbeatIntervalMs?: number;
+    /** Remote asset-search cache TTL. Local asset-store reads are never cached. */
+    assetSearchCacheTtlMs?: number;
+    /** Maximum number of remote asset-search results cached by this daemon. */
+    assetSearchCacheMax?: number;
+    /** Time after cache expiry during which a rate-limited search may serve stale remote results. */
+    assetSearchStaleGraceMs?: number;
+    /** Maximum time the compatibility HTTP request waits before returning a durable pending receipt. */
+    assetSubmitResponseTimeoutMs?: number;
     /** Random source for heartbeat force_update staggering. Defaults to Math.random; tests inject a deterministic value. */
     random?: () => number;
     /** 注入 adapter 的 /a2a/hello + heartbeat wire 调用(M6-6 提供; M6-4 测试用 fake). evolverVersion 随报供 hub 观测. */
@@ -58,6 +72,16 @@ export interface ProxyDaemonDeps {
     };
     /** V1 collaboration task operations are synchronous; tests may shorten the Hub timeout. */
     collaborationOperationTimeoutMs?: number;
+    /** Optional test/composition seam. Production defaults to the restart-safe verifier backed by this daemon's store. */
+    publishRecallVerifier?: PublishRecallVerifierPort;
+    /** Optional deterministic sanitizer environment for composition tests. Production omits this to scan process.env. */
+    publishSanitizeEnv?: Record<string, string | undefined>;
+    /**
+     * 宿主专属的真实执行验证器。缺失时，conversation distill 只能返回草稿，绝不持久化或排队发布。
+     */
+    publishExecutionVerifier?: ConversationDistillExecutionVerifier;
+    /** 验证器响应的硬超时，防止发布请求因宿主执行器挂起而永久占用连接。 */
+    publishExecutionVerifierTimeoutMs?: number;
 }
 export interface ProxyTickReport {
     outbound: OutboundResult;
@@ -75,8 +99,12 @@ export interface ProxyTickError {
 export interface ProxyHealth {
     running: boolean;
     ipcListening: boolean;
+    lifecycleArmed: boolean;
     nodeId?: string;
     lastWriteAt: number;
+    lastTickAt?: number;
+    nextTickDueAt?: number;
+    consecutiveFailures: number;
 }
 export interface AtpProxyClient {
     placeOrder(opts: {
@@ -121,9 +149,23 @@ export declare class ProxyDaemon {
     private readonly validator;
     private readonly atp;
     private readonly collaborationFacade;
+    private readonly publishRecallVerifier;
+    private readonly proxyHandler;
+    private readonly hub;
+    private readonly recipeComposeStarted;
     private ipc;
     private readonly now;
     private readonly random;
+    private readonly assetSearchCacheTtlMs;
+    private readonly assetSearchCacheMax;
+    private readonly assetSearchStaleGraceMs;
+    private readonly assetSubmitResponseTimeoutMs;
+    private readonly synchronousAssetSubmitScope;
+    private readonly shadowMode;
+    private readonly assetSearchCache;
+    private readonly assetSearchInflight;
+    private readonly synchronousAssetSubmitInflight;
+    private assetSearchCooldownUntil;
     private nextHeartbeatAt;
     private heartbeatFailures;
     private heartbeatGeneration;
@@ -132,6 +174,10 @@ export declare class ProxyDaemon {
     /** A poke that arrived between ticks (no sleep in flight) parks the wake here so it is not lost. */
     private wakeRunnerPending;
     private started;
+    private lifecycleArmed;
+    private lastTickAt;
+    private nextTickDueAt;
+    private consecutiveTickFailures;
     private storeClosed;
     private forceUpdateTriggerInFlight;
     private forceUpdateLastTriggeredAt;
@@ -141,6 +187,8 @@ export declare class ProxyDaemon {
     private scheduledForceUpdateKey;
     private traceBackfillDraining;
     private loopWakeHandler;
+    /** 守护进程停止时取消宿主验证。 */
+    private publishAbortController;
     constructor(deps: ProxyDaemonDeps);
     /**
      * core handler(确定性, 不经 agent): 目前只接 force_update(#108). 其他 core 类型(asset_publish_result/
@@ -151,11 +199,13 @@ export declare class ProxyDaemon {
     private recordTickError;
     /** 启动: 锁 + IPC 监听 + 初次 hello. 返回 IPC 端口. */
     start(): Promise<number>;
+    private listenIpc;
     /** 单轮: core pump/TTL/wake + proxy 出站 + hub 入站 + 到点心跳. */
     tick(): Promise<ProxyTickReport>;
     /** 下一轮建议延时: inbound 背压/idle 与 outbound pending cadence 取更快者. */
     nextDelay(last: InboundResult): number;
     setWakeHandler(wake: (() => void) | undefined): void;
+    setExpectedNextTick(delayMs: number | undefined): void;
     notifyNewOutbound(): void;
     /**
      * Expedite the next heartbeat: clear the failure backoff, mark the heartbeat due now, and wake an
@@ -188,6 +238,21 @@ export declare class ProxyDaemon {
     private stateNumber;
     private handleProxyRoute;
     private searchAssets;
+    private searchRemoteAssets;
+    private cacheRemoteAssetSearch;
+    private publishAssetSubmitSynchronously;
+    private createSynchronousAssetSubmitEnvelope;
+    private composeRecipeAfterAcceptedSubmit;
+    private currentHubMode;
+    private handleHubModeBoundOutbound;
+    private publishSynchronousBundle;
+    private waitForSynchronousAssetSubmit;
+    private executeSynchronousAssetSubmit;
+    private handleSynchronousProxyOutbound;
+    private readSynchronousAssetSubmitOutcome;
+    private cacheSynchronousAssetSubmitSuccess;
+    private cacheSynchronousAssetSubmitTerminal;
+    private writeSynchronousAssetSubmitOutcome;
     private handleAtpRoute;
     private writeAtpJson;
 }