@zhin.js/agent 1.1.2 → 1.1.5

package/lib/security/turn-network-client.js

@@ -0,0 +1,111 @@
+import { lookup } from 'node:dns/promises';
+import * as http from 'node:http';
+import * as https from 'node:https';
+import { isIP } from 'node:net';
+import { checkUrlNetworkAccess, isBlockedSsrfHostname, NetworkAccessDeniedError, } from './network-policy.js';
+/** Turn-scoped network module: policy, DNS pinning, redirects, timeout, and body limits. */
+export class TurnNetworkClient {
+    policy;
+    signal;
+    transport;
+    constructor(policy, signal, transport = new NodeNetworkTransport()) {
+        this.policy = policy;
+        this.signal = signal;
+        this.transport = transport;
+    }
+    async getText(url, options = {}) {
+        const maxRedirects = options.maxRedirects ?? 5;
+        const maxBytes = options.maxBytes ?? 2 * 1024 * 1024;
+        const timeoutMs = options.timeoutMs ?? 15_000;
+        const signal = AbortSignal.any([this.signal, AbortSignal.timeout(timeoutMs)]);
+        let current = url;
+        for (let redirect = 0; redirect <= maxRedirects; redirect += 1) {
+            signal.throwIfAborted();
+            const parsed = authorizeNetworkUrl(current, this.policy);
+            const response = await this.transport.request(parsed, options.headers ?? {}, signal, maxBytes);
+            if (response.status < 300 || response.status >= 400) {
+                return Object.freeze({ url: parsed.href, ...response });
+            }
+            const location = response.headers.location;
+            if (!location)
+                return Object.freeze({ url: parsed.href, ...response });
+            if (redirect === maxRedirects) {
+                throw new NetworkAccessDeniedError(`Network redirect limit exceeded (${maxRedirects})`);
+            }
+            current = new URL(location, parsed).href;
+        }
+        throw new NetworkAccessDeniedError('Network redirect state is invalid');
+    }
+}
+export class NodeNetworkTransport {
+    async request(url, headers, signal, maxBytes) {
+        const addresses = isIP(url.hostname)
+            ? [{ address: url.hostname, family: isIP(url.hostname) }]
+            : await lookup(url.hostname, { all: true, verbatim: true });
+        if (addresses.length === 0)
+            throw new Error(`DNS returned no address for ${url.hostname}`);
+        for (const entry of addresses) {
+            if (isBlockedSsrfHostname(entry.address)) {
+                throw new NetworkAccessDeniedError(`DNS target ${entry.address} for ${url.hostname} is private or dangerous`);
+            }
+        }
+        const selected = addresses[0];
+        return requestPinnedAddress(url, selected.address, headers, signal, maxBytes);
+    }
+}
+export function authorizeNetworkUrl(url, policy) {
+    if (!policy.network.enabled) {
+        throw new NetworkAccessDeniedError('Turn has no network authority');
+    }
+    const decision = checkUrlNetworkAccess(url, {
+        httpsOnly: policy.network.httpsOnly,
+        allowedDomains: [...(policy.network.allowedDomains ?? [])],
+    });
+    if (!decision.allowed)
+        throw new NetworkAccessDeniedError(decision.reason ?? 'Network target denied');
+    return new URL(url);
+}
+function requestPinnedAddress(url, address, headers, signal, maxBytes) {
+    const requester = url.protocol === 'https:' ? https : http;
+    return new Promise((resolve, reject) => {
+        const request = requester.request({
+            protocol: url.protocol,
+            hostname: address,
+            port: url.port || undefined,
+            path: `${url.pathname}${url.search}`,
+            method: 'GET',
+            headers: { ...headers, Host: url.host, 'Accept-Encoding': 'identity' },
+            signal,
+            ...(url.protocol === 'https:' && !isIP(url.hostname) ? { servername: url.hostname } : {}),
+        }, (response) => {
+            const chunks = [];
+            let size = 0;
+            response.on('data', (chunk) => {
+                const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+                size += buffer.length;
+                if (size > maxBytes) {
+                    response.destroy(new Error(`Network response exceeds ${maxBytes} bytes`));
+                    return;
+                }
+                chunks.push(buffer);
+            });
+            response.once('error', reject);
+            response.once('end', () => resolve(Object.freeze({
+                status: response.statusCode ?? 0,
+                statusText: response.statusMessage ?? '',
+                headers: Object.freeze(normalizeHeaders(response.headers)),
+                body: Buffer.concat(chunks).toString('utf8'),
+            })));
+        });
+        request.once('error', reject);
+        request.end();
+    });
+}
+function normalizeHeaders(headers) {
+    return Object.fromEntries(Object.entries(headers).flatMap(([name, value]) => {
+        if (value === undefined)
+            return [];
+        return [[name.toLowerCase(), Array.isArray(value) ? value.join(', ') : value]];
+    }));
+}
+//# sourceMappingURL=turn-network-client.js.map

package/lib/security/turn-network-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-network-client.js","sourceRoot":"","sources":["../../src/security/turn-network-client.ts"],"names":[],"mappings":"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"}

package/lib/service.d.ts

@@ -2,8 +2,8 @@
  * AIService — AI 服务核心类
  * 统一管理多个模型提供商，提供会话和 Agent 能力
  */
-import { type Plugin, type AITriggerConfig, type AIAccessConfig, type Tool } from '@zhin.js/core';
-import { type AIProvider, type AIConfig, type ChatCompletionRequest, type ChatCompletionResponse, type ChatCompletionChunk, type AgentTool, type Usage, type ImageGenerationDefaults, type ModelRegistry, type ContextConfig } from '@zhin.js/ai';
+import { type AITriggerConfig, type AIAccessConfig, type Tool } from '@zhin.js/core';
+import { type AIProvider, type AIConfig, type AgentTool, type Usage, type ImageGenerationDefaults, type ModelRegistry, type ContextConfig } from '@zhin.js/ai';
 import type { AgentRunInput } from './media/media-types.js';
 import { type NormalizedAiRoutingConfig } from './config/normalize-ai-config.js';
 import { AgentBindingRegistry } from './config/agent-binding-registry.js';
@@ -42,7 +42,6 @@ export declare class AIService {
     private accessConfig;
     private agentConfig;
     private imageGenerationGlobal?;
-    private plugin?;
     private customTools;
     private _modelRegistry;
     readonly loopHooks: PluginAILoopHookRegistry;
@@ -52,7 +51,6 @@ export declare class AIService {
     /** 运行时合并 *.agent.md 发现结果 */
     setDiscoveredAgents(fileMetas: import('./discovery/agents.js').AgentMeta[]): void;
     isReady(): boolean;
-    setPlugin(plugin: Plugin): void;
     setModelRegistry(registry: ModelRegistry): void;
     getModelRegistry(): ModelRegistry | null;
     registerTool(tool: AgentTool): () => void;
@@ -66,7 +64,7 @@ export declare class AIService {
      * IM / ZhinAgent 流水线用的常驻 Tool 实例（未经 normalize；与 ToolFeature 工具合并后由 collectRelevantTools 绑定 context）。
      */
     getResidentToolsAsTools(): Tool[];
-    /** `web_search` 始终挂载；`ask_user` 在 {@link setPlugin} 之后挂载（依赖 Prompt / 中间件）。 */
+    /** Standalone service tools only; turn-owned interaction is projected by AgentRuntime. */
     private refreshBuiltinAgentTools;
     getContextConfig(): ContextConfig;
     getTriggerConfig(): AITriggerConfig;
@@ -90,14 +88,6 @@ export declare class AIService {
         provider: string;
         models: string[];
     }[]>;
-    chat(request: ChatCompletionRequest, providerName?: string): Promise<ChatCompletionResponse>;
-    chatStream(request: ChatCompletionRequest, providerName?: string): AsyncIterable<ChatCompletionChunk>;
-    ask(question: string, options?: {
-        provider?: string;
-        model?: string;
-        systemPrompt?: string;
-        temperature?: number;
-    }): Promise<string>;
     private resolveServiceAgentTools;
     createAgent(options?: CreateServiceAgentOptions): ServiceAgent;
     runAgent(task: AgentRunInput, options?: CreateServiceAgentOptions): Promise<ServiceAgentResult>;

package/lib/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}

package/lib/service.js

@@ -7,7 +7,6 @@ import { registerLlmApiFromProviders } from '@zhin.js/ai';
 import { DEFAULT_CONFIG } from './config/index.js';
 import { normalizeTool } from './orchestrator/tool-selection.js';
 import { createWebSearchTool } from './builtin/web-search-tool.js';
-import { createAskUserTool } from './builtin/ask-user-tool.js';
 import { registerProviderInstances } from './config/provider-instance.js';
 import { normalizeAiRoutingConfig } from './config/normalize-ai-config.js';
 import { validateAiRoutingConfig } from './config/validate-ai-config.js';
@@ -26,7 +25,6 @@ export class AIService {
     accessConfig;
     agentConfig;
     imageGenerationGlobal;
-    plugin;
     customTools = new Map();
     _modelRegistry = null;
     loopHooks = new PluginAILoopHookRegistry();
@@ -64,10 +62,6 @@ export class AIService {
     isReady() {
         return this.providers.size > 0;
     }
-    setPlugin(plugin) {
-        this.plugin = plugin;
-        this.refreshBuiltinAgentTools();
-    }
     setModelRegistry(registry) { this._modelRegistry = registry; }
     getModelRegistry() { return this._modelRegistry; }
     registerTool(tool) { this.customTools.set(tool.name, tool); return () => { this.customTools.delete(tool.name); }; }
@@ -90,17 +84,11 @@ export class AIService {
      * IM / ZhinAgent 流水线用的常驻 Tool 实例（未经 normalize；与 ToolFeature 工具合并后由 collectRelevantTools 绑定 context）。
      */
     getResidentToolsAsTools() {
-        const tools = [createWebSearchTool()];
-        if (this.plugin)
-            tools.push(createAskUserTool(this.plugin));
-        return tools;
+        return [createWebSearchTool()];
     }
-    /** `web_search` 始终挂载；`ask_user` 在 {@link setPlugin} 之后挂载（依赖 Prompt / 中间件）。 */
+    /** Standalone service tools only; turn-owned interaction is projected by AgentRuntime. */
     refreshBuiltinAgentTools() {
-        const next = [normalizeTool(createWebSearchTool())];
-        if (this.plugin)
-            next.push(normalizeTool(createAskUserTool(this.plugin)));
-        this.builtinTools = next;
+        this.builtinTools = [normalizeTool(createWebSearchTool())];
     }
     getContextConfig() { return this.contextConfig; }
     getTriggerConfig() { return this.triggerConfig; }
@@ -155,26 +143,6 @@ export class AIService {
         }
         return result;
     }
-    async chat(request, providerName) {
-        return this.getProvider(providerName).chat(request);
-    }
-    async *chatStream(request, providerName) {
-        yield* this.getProvider(providerName).chatStream(request);
-    }
-    async ask(question, options = {}) {
-        const messages = [];
-        if (options.systemPrompt)
-            messages.push({ role: 'system', content: options.systemPrompt });
-        messages.push({ role: 'user', content: question });
-        const provider = this.getProvider(options.provider);
-        const response = await provider.chat({
-            model: options.model || provider.models[0],
-            messages,
-            temperature: options.temperature,
-        });
-        const content = response.choices[0]?.message?.content;
-        return typeof content === 'string' ? content : '';
-    }
     resolveServiceAgentTools(options) {
         const tools = [];
         if (options.useBuiltinTools !== false)

package/lib/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}

package/lib/session/{session-interaction-port.d.ts → approval-port.d.ts}

@@ -1,12 +1,11 @@
-/**
- * ApprovalPort — blocking HITL only (ADR 0041).
- * Stream events publish via AgentStreamBus separately.
- */
+/** Blocking human-in-the-loop security authority. */
 export interface ApprovalRequestInput {
     requestId: string;
     toolName: string;
     question: string;
     timeoutMs?: number;
+    /** The adapter must settle promptly and deny when the owning Turn is cancelled. */
+    signal: AbortSignal;
 }
 export interface ApprovalPort {
     /** False means this transport cannot make an approval decision for this turn. */
@@ -14,7 +13,5 @@ export interface ApprovalPort {
     requestApproval(input: ApprovalRequestInput): Promise<boolean>;
     resolveApproval?(requestId: string, approved: boolean): boolean;
 }
-/** @deprecated Use ApprovalPort. Kept for existing IM/HTTP adapters. */
-export type SessionInteractionPort = ApprovalPort;
 export declare function isApprovalPortAvailable(port: ApprovalPort | undefined): port is ApprovalPort;
-//# sourceMappingURL=session-interaction-port.d.ts.map
+//# sourceMappingURL=approval-port.d.ts.map

package/lib/session/approval-port.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-port.d.ts","sourceRoot":"","sources":["../../src/session/approval-port.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mFAAmF;IACnF,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,iFAAiF;IACjF,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/D,eAAe,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC;CACjE;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,GAAG,IAAI,IAAI,YAAY,CAE5F"}

package/lib/session/{session-interaction-port.js → approval-port.js}

@@ -1,4 +1,4 @@
 export function isApprovalPortAvailable(port) {
     return Boolean(port && port.available !== false);
 }
-//# sourceMappingURL=session-interaction-port.js.map
+//# sourceMappingURL=approval-port.js.map

package/lib/session/approval-port.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-port.js","sourceRoot":"","sources":["../../src/session/approval-port.ts"],"names":[],"mappings":"AAiBA,MAAM,UAAU,uBAAuB,CAAC,IAA8B;IACpE,OAAO,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC;AACnD,CAAC"}

package/lib/session/http-approval-adapter.d.ts

@@ -2,8 +2,8 @@
  * HTTP approval park adapter — instance-scoped waiter (ADR 0041).
  */
 import { HttpApprovalWaiter } from './http-approval-waiter.js';
-import type { ApprovalRequestInput, SessionInteractionPort } from './session-interaction-port.js';
-export declare class HttpApprovalAdapter implements SessionInteractionPort {
+import type { ApprovalPort, ApprovalRequestInput } from './approval-port.js';
+export declare class HttpApprovalAdapter implements ApprovalPort {
     readonly waiter: HttpApprovalWaiter;
     requestApproval(input: ApprovalRequestInput): Promise<boolean>;
     resolveApproval(requestId: string, approved: boolean): boolean;

package/lib/session/http-approval-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-approval-adapter.d.ts","sourceRoot":"","sources":["../../src/session/http-approval-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAElG,qBAAa,mBAAoB,YAAW,sBAAsB;IAChE,QAAQ,CAAC,MAAM,qBAA4B;IAErC,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAQpE,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO;CAG/D"}
+{"version":3,"file":"http-approval-adapter.d.ts","sourceRoot":"","sources":["../../src/session/http-approval-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE7E,qBAAa,mBAAoB,YAAW,YAAY;IACtD,QAAQ,CAAC,MAAM,qBAA4B;IAErC,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAQpE,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO;CAG/D"}

package/lib/session/http-approval-adapter.js

@@ -6,7 +6,7 @@ export class HttpApprovalAdapter {
     waiter = new HttpApprovalWaiter();
     async requestApproval(input) {
         try {
-            return await this.waiter.wait(input.requestId, input.timeoutMs ?? 300_000);
+            return await this.waiter.wait(input.requestId, input.timeoutMs ?? 300_000, input.signal);
         }
         catch {
             return false;

package/lib/session/http-approval-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-approval-adapter.js","sourceRoot":"","sources":["../../src/session/http-approval-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG/D,MAAM,OAAO,mBAAmB;IACrB,MAAM,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAE3C,KAAK,CAAC,eAAe,CAAC,KAA2B;QAC/C,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,OAAO,CAAC,CAAC;QAC7E,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,eAAe,CAAC,SAAiB,EAAE,QAAiB;QAClD,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAClD,CAAC;CACF"}
+{"version":3,"file":"http-approval-adapter.js","sourceRoot":"","sources":["../../src/session/http-approval-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG/D,MAAM,OAAO,mBAAmB;IACrB,MAAM,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAE3C,KAAK,CAAC,eAAe,CAAC,KAA2B;QAC/C,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3F,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,eAAe,CAAC,SAAiB,EAAE,QAAiB;QAClD,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAClD,CAAC;CACF"}

package/lib/session/http-approval-waiter.d.ts

@@ -3,7 +3,7 @@
  */
 export declare class HttpApprovalWaiter {
     private readonly pending;
-    wait(requestId: string, timeoutMs?: number): Promise<boolean>;
+    wait(requestId: string, timeoutMs?: number, signal?: AbortSignal): Promise<boolean>;
     resolve(requestId: string, approved: boolean): boolean;
     has(requestId: string): boolean;
     dispose(): void;

package/lib/session/http-approval-waiter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-approval-waiter.d.ts","sourceRoot":"","sources":["../../src/session/http-approval-waiter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkC;IAE1D,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,SAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAa9D,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO;IAStD,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI/B,OAAO,IAAI,IAAI;CAOhB"}
+{"version":3,"file":"http-approval-waiter.d.ts","sourceRoot":"","sources":["../../src/session/http-approval-waiter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkC;IAE1D,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,SAAU,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAiCpF,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO;IAStD,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI/B,OAAO,IAAI,IAAI;CAOhB"}

package/lib/session/http-approval-waiter.js

@@ -3,16 +3,39 @@
  */
 export class HttpApprovalWaiter {
     pending = new Map();
-    wait(requestId, timeoutMs = 300_000) {
+    wait(requestId, timeoutMs = 300_000, signal) {
         if (this.pending.has(requestId)) {
             return Promise.reject(new Error(`Duplicate approval request: ${requestId}`));
         }
         return new Promise((resolve, reject) => {
+            const onAbort = () => {
+                const entry = this.pending.get(requestId);
+                if (!entry)
+                    return;
+                clearTimeout(entry.timer);
+                this.pending.delete(requestId);
+                reject(signal?.reason instanceof Error ? signal.reason : new Error('Approval cancelled'));
+            };
             const timer = setTimeout(() => {
+                signal?.removeEventListener('abort', onAbort);
                 this.pending.delete(requestId);
                 reject(new Error(`Approval timed out: ${requestId}`));
             }, timeoutMs);
-            this.pending.set(requestId, { resolve, reject, timer });
+            this.pending.set(requestId, {
+                resolve: (approved) => {
+                    signal?.removeEventListener('abort', onAbort);
+                    resolve(approved);
+                },
+                reject: (error) => {
+                    signal?.removeEventListener('abort', onAbort);
+                    reject(error);
+                },
+                timer,
+            });
+            if (signal?.aborted)
+                onAbort();
+            else
+                signal?.addEventListener('abort', onAbort, { once: true });
         });
     }
     resolve(requestId, approved) {

package/lib/session/http-approval-waiter.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-approval-waiter.js","sourceRoot":"","sources":["../../src/session/http-approval-waiter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,MAAM,OAAO,kBAAkB;IACZ,OAAO,GAAG,IAAI,GAAG,EAAuB,CAAC;IAE1D,IAAI,CAAC,SAAiB,EAAE,SAAS,GAAG,OAAO;QACzC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAChC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC,CAAC;QAC/E,CAAC;QACD,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC9C,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAC/B,MAAM,CAAC,IAAI,KAAK,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC,EAAE,SAAS,CAAC,CAAC;YACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,SAAiB,EAAE,QAAiB;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QACzB,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAC,SAAiB;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IAED,OAAO;QACL,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACrC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1B,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;CACF"}
+{"version":3,"file":"http-approval-waiter.js","sourceRoot":"","sources":["../../src/session/http-approval-waiter.ts"],"names":[],"mappings":"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"}

package/lib/session/index.d.ts

@@ -3,15 +3,18 @@
  */
 export type { Session, CreateSessionInput, SessionStore, SessionStrategy, SessionSystemConfig, } from './contracts.js';
 export type { SessionIODeps } from './session-io.js';
-export type { TurnSessionPrep } from './session-system.js';
+export type { IngressTurnSessionPrep, TurnSessionPrep } from './session-system.js';
 export { SessionSystem, createSessionSystem } from './session-system.js';
 export { CollaborationSessionStrategy, SimpleSessionStrategy, } from './strategies.js';
-export { buildUserMessageExtra, prepareUserContentForSession, layerInboundUserTurnBody, resolveTurnUserMessage, formatUserContentForSession, buildSessionCreateInput, buildImTranscriptQuery, buildHistoryMessagesFromContext, resolveSessionIsNewBeforeCreate, beginTurnSession, touchSession, archiveSessionByKey, } from './session-io.js';
+export { buildUserMessageExtra, prepareUserContentForSession, layerInboundUserTurnBody, resolveTurnUserMessage, formatUserContentForSession, buildAgentSessionCreateInput, buildImTranscriptQuery, buildHistoryMessagesFromContext, resolveSessionIsNewBeforeCreate, beginTurnSession, touchSession, archiveSessionByKey, } from './session-io.js';
 export { resolveAgentTurnSessionKey, resolveAgentSessionKeyForTurn, resolveArtifactRunId, } from '../collaboration/resolve-agent-session-key.js';
-export { resolvePassiveGroupSessionKey, recordPassiveGroupMessage, consumePassiveGroupContextForTurn, appendPassiveGroupMessageToContext, } from './passive-group-session.js';
+export { recordPassiveGroupObservation, consumePassiveGroupContextForTurn, } from './passive-group-session.js';
+export type { PassiveGroupObservation } from './passive-group-session.js';
 export { pushPassiveGroupLine, drainPassiveGroupBuffer, peekPassiveGroupBuffer, formatPassiveGroupContextBlock, prunePassiveLines, MAX_PASSIVE_LINES, PASSIVE_TTL_MS, } from './passive-group-buffer.js';
 export type { PassiveGroupLine } from './passive-group-buffer.js';
 export { listSessionTreeForCommMessage, jumpSessionTreeForCommMessage, } from './session-tree-commands.js';
 export { summarizeAbandonedBranchIfNeeded, } from './branch-summarization-runtime.js';
 export type { BranchSummarizationOptions } from './branch-summarization-runtime.js';
+export { beginIngressTurnSession, buildTurnSessionCreateInput, buildTurnTranscriptQuery, layerIngressUserBody, resolveIngressUserMessage, } from './turn-ingress-session.js';
+export type { ResolvedIngressUserMessage } from './turn-ingress-session.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/session/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,YAAY,EACV,OAAO,EACP,kBAAkB,EAClB,YAAY,EACZ,eAAe,EACf,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AAExB,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,qBAAqB,EACrB,4BAA4B,EAC5B,wBAAwB,EACxB,sBAAsB,EACtB,2BAA2B,EAC3B,uBAAuB,EACvB,sBAAsB,EACtB,+BAA+B,EAC/B,+BAA+B,EAC/B,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,EAC7B,oBAAoB,GACrB,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EACL,6BAA6B,EAC7B,yBAAyB,EACzB,iCAAiC,EACjC,kCAAkC,GACnC,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,8BAA8B,EAC9B,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,GACf,MAAM,2BAA2B,CAAC;AACnC,YAAY,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,GAC9B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,gCAAgC,GACjC,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,YAAY,EACV,OAAO,EACP,kBAAkB,EAClB,YAAY,EACZ,eAAe,EACf,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AAExB,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,YAAY,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,qBAAqB,EACrB,4BAA4B,EAC5B,wBAAwB,EACxB,sBAAsB,EACtB,2BAA2B,EAC3B,4BAA4B,EAC5B,sBAAsB,EACtB,+BAA+B,EAC/B,+BAA+B,EAC/B,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,EAC7B,oBAAoB,GACrB,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EACL,6BAA6B,EAC7B,iCAAiC,GAClC,MAAM,4BAA4B,CAAC;AACpC,YAAY,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAE1E,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,8BAA8B,EAC9B,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,GACf,MAAM,2BAA2B,CAAC;AACnC,YAAY,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,GAC9B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,gCAAgC,GACjC,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,EACL,uBAAuB,EACvB,2BAA2B,EAC3B,wBAAwB,EACxB,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC;AACnC,YAAY,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC"}

package/lib/session/index.js

@@ -3,10 +3,11 @@
  */
 export { SessionSystem, createSessionSystem } from './session-system.js';
 export { CollaborationSessionStrategy, SimpleSessionStrategy, } from './strategies.js';
-export { buildUserMessageExtra, prepareUserContentForSession, layerInboundUserTurnBody, resolveTurnUserMessage, formatUserContentForSession, buildSessionCreateInput, buildImTranscriptQuery, buildHistoryMessagesFromContext, resolveSessionIsNewBeforeCreate, beginTurnSession, touchSession, archiveSessionByKey, } from './session-io.js';
+export { buildUserMessageExtra, prepareUserContentForSession, layerInboundUserTurnBody, resolveTurnUserMessage, formatUserContentForSession, buildAgentSessionCreateInput, buildImTranscriptQuery, buildHistoryMessagesFromContext, resolveSessionIsNewBeforeCreate, beginTurnSession, touchSession, archiveSessionByKey, } from './session-io.js';
 export { resolveAgentTurnSessionKey, resolveAgentSessionKeyForTurn, resolveArtifactRunId, } from '../collaboration/resolve-agent-session-key.js';
-export { resolvePassiveGroupSessionKey, recordPassiveGroupMessage, consumePassiveGroupContextForTurn, appendPassiveGroupMessageToContext, } from './passive-group-session.js';
+export { recordPassiveGroupObservation, consumePassiveGroupContextForTurn, } from './passive-group-session.js';
 export { pushPassiveGroupLine, drainPassiveGroupBuffer, peekPassiveGroupBuffer, formatPassiveGroupContextBlock, prunePassiveLines, MAX_PASSIVE_LINES, PASSIVE_TTL_MS, } from './passive-group-buffer.js';
 export { listSessionTreeForCommMessage, jumpSessionTreeForCommMessage, } from './session-tree-commands.js';
 export { summarizeAbandonedBranchIfNeeded, } from './branch-summarization-runtime.js';
+export { beginIngressTurnSession, buildTurnSessionCreateInput, buildTurnTranscriptQuery, layerIngressUserBody, resolveIngressUserMessage, } from './turn-ingress-session.js';
 //# sourceMappingURL=index.js.map

package/lib/session/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAaH,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,qBAAqB,EACrB,4BAA4B,EAC5B,wBAAwB,EACxB,sBAAsB,EACtB,2BAA2B,EAC3B,uBAAuB,EACvB,sBAAsB,EACtB,+BAA+B,EAC/B,+BAA+B,EAC/B,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,EAC7B,oBAAoB,GACrB,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EACL,6BAA6B,EAC7B,yBAAyB,EACzB,iCAAiC,EACjC,kCAAkC,GACnC,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,8BAA8B,EAC9B,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,GACf,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,GAC9B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,gCAAgC,GACjC,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAaH,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,qBAAqB,EACrB,4BAA4B,EAC5B,wBAAwB,EACxB,sBAAsB,EACtB,2BAA2B,EAC3B,4BAA4B,EAC5B,sBAAsB,EACtB,+BAA+B,EAC/B,+BAA+B,EAC/B,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,EAC7B,oBAAoB,GACrB,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EACL,6BAA6B,EAC7B,iCAAiC,GAClC,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,8BAA8B,EAC9B,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,GACf,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,GAC9B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,gCAAgC,GACjC,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,uBAAuB,EACvB,2BAA2B,EAC3B,wBAAwB,EACxB,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC"}

package/lib/session/passive-group-session.d.ts

@@ -1,12 +1,10 @@
-/**
- * 群/频道 Passive Group 上下文 — session key SSOT + buffer record/drain。
- */
-import type { Message } from '@zhin.js/core';
-import type { CollaborationScene } from '../collaboration/types.js';
 import type { ZhinAgentPrivate } from '../internal/agent-host.js';
-export declare function resolvePassiveGroupSessionKey(message: Message, cell?: CollaborationScene): string;
-export declare function recordPassiveGroupMessage(agent: ZhinAgentPrivate, message: Message, rawText: string, cell?: CollaborationScene): Promise<void>;
-export declare function consumePassiveGroupContextForTurn(message: Message): string | null;
-/** @deprecated use recordPassiveGroupMessage */
-export declare function appendPassiveGroupMessageToContext(agent: ZhinAgentPrivate, message: Message, rawText: string, cell?: CollaborationScene): Promise<void>;
+export interface PassiveGroupObservation {
+    readonly sessionKey: string;
+    readonly senderId: string;
+    readonly senderName: string;
+    readonly text: string;
+}
+export declare function recordPassiveGroupObservation(agent: Pick<ZhinAgentPrivate, 'agentSessionStore'>, observation: PassiveGroupObservation): Promise<void>;
+export declare function consumePassiveGroupContextForTurn(sessionKey: string): string | null;
 //# sourceMappingURL=passive-group-session.d.ts.map

package/lib/session/passive-group-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"passive-group-session.d.ts","sourceRoot":"","sources":["../../src/session/passive-group-session.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAQpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AASlE,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,kBAAkB,GACxB,MAAM,CAER;AAED,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,kBAAkB,GACxB,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,wBAAgB,iCAAiC,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGjF;AAED,gDAAgD;AAChD,wBAAsB,kCAAkC,CACtD,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,kBAAkB,GACxB,OAAO,CAAC,IAAI,CAAC,CAEf"}
+{"version":3,"file":"passive-group-session.d.ts","sourceRoot":"","sources":["../../src/session/passive-group-session.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,wBAAsB,6BAA6B,CACjD,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,EAClD,WAAW,EAAE,uBAAuB,GACnC,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAgB,iCAAiC,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAInF"}

package/lib/session/passive-group-session.js

@@ -1,36 +1,32 @@
-import { resolveAgentTurnSessionKey } from '../collaboration/resolve-agent-session-key.js';
-import { buildSessionCreateInput, prepareUserContentForSession } from './session-io.js';
+/**
+ * Passive group context is keyed by the canonical Agent session identity.
+ * IM and collaboration adapters resolve that identity before entering here.
+ */
+import { buildAgentSessionCreateInput } from './session-io.js';
 import { drainPassiveGroupBuffer, formatPassiveGroupContextBlock, pushPassiveGroupLine, } from './passive-group-buffer.js';
-function resolveSenderDisplayName(message) {
-    if (!message?.$sender)
-        return 'unknown';
-    const sender = message.$sender;
-    const raw = sender.nickname || sender.name || sender.id;
-    return raw != null ? String(raw).trim().slice(0, 64) : 'unknown';
-}
-export function resolvePassiveGroupSessionKey(message, cell) {
-    return resolveAgentTurnSessionKey(message, cell);
-}
-export async function recordPassiveGroupMessage(agent, message, rawText, cell) {
-    const { content } = prepareUserContentForSession(message, rawText);
-    if (!content.trim())
+export async function recordPassiveGroupObservation(agent, observation) {
+    const sessionKey = observation.sessionKey.trim();
+    const text = observation.text.trim();
+    if (!sessionKey)
+        throw new TypeError('Passive group observation requires a session key');
+    if (!text)
         return;
-    const sessionKey = resolvePassiveGroupSessionKey(message, cell);
-    const sessionInput = buildSessionCreateInput(sessionKey, message);
-    await agent.agentSessionStore.getOrCreateActive(sessionInput);
+    await agent.agentSessionStore.getOrCreateActive(buildAgentSessionCreateInput(sessionKey));
     pushPassiveGroupLine(sessionKey, {
-        senderId: String(message.$sender?.id ?? 'unknown'),
-        senderName: resolveSenderDisplayName(message),
-        text: content,
+        senderId: normalizeIdentity(observation.senderId),
+        senderName: normalizeIdentity(observation.senderName),
+        text,
         at: Date.now(),
     });
 }
-export function consumePassiveGroupContextForTurn(message) {
-    const sessionKey = resolvePassiveGroupSessionKey(message);
-    return formatPassiveGroupContextBlock(drainPassiveGroupBuffer(sessionKey));
+export function consumePassiveGroupContextForTurn(sessionKey) {
+    const key = sessionKey.trim();
+    if (!key)
+        throw new TypeError('Passive group context requires a session key');
+    return formatPassiveGroupContextBlock(drainPassiveGroupBuffer(key));
 }
-/** @deprecated use recordPassiveGroupMessage */
-export async function appendPassiveGroupMessageToContext(agent, message, rawText, cell) {
-    await recordPassiveGroupMessage(agent, message, rawText, cell);
+function normalizeIdentity(value) {
+    const normalized = value.trim().replace(/[\]\s]+/g, '_');
+    return normalized ? normalized.slice(0, 64) : 'unknown';
 }
 //# sourceMappingURL=passive-group-session.js.map