@zhin.js/agent 1.0.1 → 1.0.3

package/lib/turn/process-stream.js

@@ -0,0 +1,70 @@
+import { randomUUID } from 'node:crypto';
+import { resolveIMSessionIdFromMessage } from '@zhin.js/core';
+import { publishTurnStreamEvents } from '../event/publish-agent-stream.js';
+import { readHttpSessionId } from '../session/resolve-session-interaction-port.js';
+import { runWithInboundQueue } from '../turn/inbound-queue-runtime.js';
+import { processTextTurn } from './turn-pipeline.js';
+export async function* processTextTurnStream(agent, opts) {
+    const { content, commMessage, externalTools, inboundQueueConfig, inboundTurnQueue, runInTurnContext } = opts;
+    const turnId = randomUUID();
+    const sessionId = resolveIMSessionIdFromMessage(commMessage);
+    const streamCtx = () => ({
+        sessionId,
+        turnId,
+        httpSessionId: readHttpSessionId(commMessage),
+    });
+    const turnStart = { type: 'turn_start', sessionId, turnId };
+    yield turnStart;
+    publishTurnStreamEvents(agent, turnStart, streamCtx());
+    const eventQueue = [];
+    let resolveWaiting;
+    let done = false;
+    let sawTurnEnd = false;
+    let finalOutput = [];
+    let finalError;
+    const onTurnEvent = (event) => {
+        if (event.type === 'turn_end')
+            sawTurnEnd = true;
+        eventQueue.push(event);
+        publishTurnStreamEvents(agent, event, streamCtx());
+        resolveWaiting?.();
+    };
+    const runPromise = runInTurnContext(turnId, () => runWithInboundQueue(commMessage, inboundQueueConfig, inboundTurnQueue, {
+        content,
+        run: (mergedContent) => processTextTurn(agent, mergedContent, commMessage, externalTools, undefined, { onTurnEvent }),
+    })).then((output) => {
+        finalOutput = output;
+        done = true;
+        resolveWaiting?.();
+    }).catch((err) => {
+        finalError = err instanceof Error ? err : new Error(String(err));
+        done = true;
+        resolveWaiting?.();
+    });
+    while (!done || eventQueue.length > 0) {
+        if (eventQueue.length > 0) {
+            yield eventQueue.shift();
+            continue;
+        }
+        if (!done) {
+            await new Promise((resolve) => { resolveWaiting = resolve; });
+            resolveWaiting = undefined;
+        }
+    }
+    if (finalError) {
+        const errorEvent = { type: 'error', error: finalError, recoverable: false };
+        publishTurnStreamEvents(agent, errorEvent, streamCtx());
+        yield errorEvent;
+    }
+    else if (!sawTurnEnd) {
+        const syntheticEnd = {
+            type: 'turn_end',
+            output: finalOutput,
+            usage: { promptTokens: 0, completionTokens: 0, totalTokens: 0 },
+        };
+        publishTurnStreamEvents(agent, syntheticEnd, streamCtx());
+        yield syntheticEnd;
+    }
+    await runPromise.catch(() => { });
+}
+//# sourceMappingURL=process-stream.js.map

package/lib/turn/process-stream.js.map

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

package/lib/turn/prompt-access.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-access.d.ts","sourceRoot":"","sources":["../../src/turn/prompt-access.ts"],"names":[],"mappings":"AAAA,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,OAAO,EAAE,MAAM;CAI5B"}

package/lib/turn/prompt-access.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-access.js","sourceRoot":"","sources":["../../src/turn/prompt-access.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IAChD,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACxC,CAAC;CACF"}

package/lib/turn/prompt-api.d.ts

@@ -0,0 +1,14 @@
+import type { AgentMessage, ImageContent, OutputElement } from '@zhin.js/ai';
+import type { Message } from '../orchestrator/types.js';
+import type { OnChunkCallback } from '../config/index.js';
+import type { PromptController } from '../turn/prompt-controller.js';
+import type { ZhinAgentEventEmitter } from '../event/event-emitter.js';
+import type { ZhinAgentPrivate } from '../internal/agent-host.js';
+export declare function assertMasterForPromptControl(emitter: ZhinAgentEventEmitter, commMessage: Message): void;
+export declare function runPromptTurn(agent: ZhinAgentPrivate, input: string | AgentMessage | AgentMessage[], commMessage: Message, runInTurnContext: <T>(turnId: string, fn: () => Promise<T>) => Promise<T>, options?: {
+    images?: ImageContent[];
+    onChunk?: OnChunkCallback;
+}): Promise<OutputElement[]>;
+export declare function steerMessage(promptController: PromptController, emitter: ZhinAgentEventEmitter, message: AgentMessage, commMessage: Message): void;
+export declare function followUpMessage(promptController: PromptController, emitter: ZhinAgentEventEmitter, message: AgentMessage, commMessage: Message): void;
+//# sourceMappingURL=prompt-api.d.ts.map

package/lib/turn/prompt-api.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-api.d.ts","sourceRoot":"","sources":["../../src/turn/prompt-api.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAe,MAAM,aAAa,CAAC;AAC1F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAKxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,qBAAqB,EAC9B,WAAW,EAAE,OAAO,GACnB,IAAI,CAcN;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,gBAAgB,EACvB,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY,EAAE,EAC7C,WAAW,EAAE,OAAO,EACpB,gBAAgB,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EACzE,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;IAAC,OAAO,CAAC,EAAE,eAAe,CAAA;CAAE,GAC/D,OAAO,CAAC,aAAa,EAAE,CAAC,CAiB1B;AAED,wBAAgB,YAAY,CAC1B,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,OAAO,GACnB,IAAI,CAIN;AAED,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,OAAO,GACnB,IAAI,CAIN"}

package/lib/turn/prompt-api.js

@@ -0,0 +1,51 @@
+import { randomUUID } from 'node:crypto';
+import { resolveIMSessionIdFromMessage } from '@zhin.js/core';
+import { PromptAccessDeniedError } from './prompt-access.js';
+import { resolveToolRequesterRole } from '../security/owner-approve-always-store.js';
+import { normalizePromptMessages } from './prompt-input.js';
+import { processTextTurn } from '../turn/turn-pipeline.js';
+export function assertMasterForPromptControl(emitter, commMessage) {
+    const plugin = emitter.getHostPlugin();
+    if (!plugin) {
+        throw new PromptAccessDeniedError('steer/followUp 需要有效的 master 上下文');
+    }
+    try {
+        const role = resolveToolRequesterRole(plugin, commMessage);
+        if (role !== 'master') {
+            throw new PromptAccessDeniedError('steer/followUp 仅 master 可用');
+        }
+    }
+    catch (error) {
+        if (error instanceof PromptAccessDeniedError)
+            throw error;
+        throw new PromptAccessDeniedError('steer/followUp 需要有效的 master 上下文');
+    }
+}
+export async function runPromptTurn(agent, input, commMessage, runInTurnContext, options) {
+    const messages = normalizePromptMessages(input, options?.images);
+    const text = messages
+        .flatMap((message) => {
+        if (message.role !== 'user')
+            return [];
+        const user = message;
+        return user.content
+            .filter((block) => block.type === 'text')
+            .map((block) => block.text);
+    })
+        .join('\n')
+        .trim();
+    return runInTurnContext(randomUUID(), () => processTextTurn(agent, text, commMessage, [], options?.onChunk, {
+        prebuiltMessages: messages,
+    }));
+}
+export function steerMessage(promptController, emitter, message, commMessage) {
+    assertMasterForPromptControl(emitter, commMessage);
+    const sessionKey = resolveIMSessionIdFromMessage(commMessage);
+    promptController.steer(sessionKey, message);
+}
+export function followUpMessage(promptController, emitter, message, commMessage) {
+    assertMasterForPromptControl(emitter, commMessage);
+    const sessionKey = resolveIMSessionIdFromMessage(commMessage);
+    promptController.followUp(sessionKey, message);
+}
+//# sourceMappingURL=prompt-api.js.map

package/lib/turn/prompt-api.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-api.js","sourceRoot":"","sources":["../../src/turn/prompt-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,6BAA6B,EAAe,MAAM,eAAe,CAAC;AAG3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAK3D,MAAM,UAAU,4BAA4B,CAC1C,OAA8B,EAC9B,WAAoB;IAEpB,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IACvC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,uBAAuB,CAAC,iCAAiC,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,wBAAwB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC3D,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,MAAM,IAAI,uBAAuB,CAAC,4BAA4B,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,uBAAuB;YAAE,MAAM,KAAK,CAAC;QAC1D,MAAM,IAAI,uBAAuB,CAAC,iCAAiC,CAAC,CAAC;IACvE,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,KAAuB,EACvB,KAA6C,EAC7C,WAAoB,EACpB,gBAAyE,EACzE,OAAgE;IAEhE,MAAM,QAAQ,GAAG,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,QAAQ;SAClB,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACnB,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO,EAAc,CAAC;QACnD,MAAM,IAAI,GAAG,OAAsB,CAAC;QACpC,OAAO,IAAI,CAAC,OAAO;aAChB,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC;aACxC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,EAAE,CAAC;IACV,OAAO,gBAAgB,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,CACzC,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;QAC9D,gBAAgB,EAAE,QAAQ;KAC3B,CAAC,CACH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,gBAAkC,EAClC,OAA8B,EAC9B,OAAqB,EACrB,WAAoB;IAEpB,4BAA4B,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,6BAA6B,CAAC,WAAW,CAAC,CAAC;IAC9D,gBAAgB,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,gBAAkC,EAClC,OAA8B,EAC9B,OAAqB,EACrB,WAAoB;IAEpB,4BAA4B,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,6BAA6B,CAAC,WAAW,CAAC,CAAC;IAC9D,gBAAgB,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC"}

package/lib/turn/prompt-controller.d.ts

@@ -0,0 +1,59 @@
+import type { AgentEvent, AgentMessage, QueueMode } from '@zhin.js/ai';
+import type { Message } from '../orchestrator/types.js';
+import type { OnChunkCallback } from '../config/index.js';
+import type { AgentLoopTurnResult } from '../core/agent-loop-turn.js';
+export interface PromptTurnHooks {
+    getSteeringMessages: () => Promise<AgentMessage[]>;
+    getFollowUpMessages: () => Promise<AgentMessage[]>;
+}
+export interface PromptTurnRequest {
+    sessionKey: string;
+    sessionId: string;
+    userMessages: AgentMessage[];
+    commMessage: Message;
+    onChunk?: OnChunkCallback;
+    execute: (initialMessages: AgentMessage[], hooks: PromptTurnHooks, signal: AbortSignal, turnId: string) => Promise<AgentLoopTurnResult>;
+}
+/** 同 session 新入站消息取代仍在执行的旧 turn 时抛出；调用方应跳过出站回复。 */
+export declare class TurnSupersededError extends Error {
+    readonly sessionKey: string;
+    constructor(sessionKey: string);
+}
+type PromptSubscriber = (event: AgentEvent, signal: AbortSignal) => void | Promise<void>;
+export declare class PromptController {
+    private readonly steeringMode;
+    private readonly followUpMode;
+    private readonly subscribers;
+    private readonly activeTurns;
+    private readonly latestTurnBySession;
+    private idleWaiters;
+    private lastResult;
+    constructor(steeringMode: QueueMode, followUpMode: QueueMode);
+    isIdle(): boolean;
+    isBusy(): boolean;
+    getActiveTurnCount(): number;
+    getActiveSessionKey(): string | null;
+    getActiveContext(): Message | null;
+    getLastResult(): AgentLoopTurnResult | null;
+    subscribe(listener: PromptSubscriber): () => void;
+    waitForIdle(): Promise<void>;
+    /** Abort all active turns (optionally scoped to one session). */
+    abort(sessionKey?: string): void;
+    clearSteeringQueue(sessionKey?: string): void;
+    clearFollowUpQueue(sessionKey?: string): void;
+    /** Master-only: inject into the latest active turn on this session. */
+    steer(sessionKey: string, message: AgentMessage | AgentMessage[]): void;
+    /** Master-only: queue continuation on the latest active turn. */
+    followUp(sessionKey: string, message: AgentMessage | AgentMessage[]): void;
+    /** 同 session 串行：新 turn 开始前 abort 仍在执行的旧 turn，避免过期回复污染群上下文。 */
+    schedule(request: PromptTurnRequest): Promise<AgentLoopTurnResult>;
+    private resolveLatestTurn;
+    private notifyIdle;
+    private emitEvent;
+    private promoteLatestTurn;
+    private demoteLatestTurn;
+    private runTurn;
+    dispose(): void;
+}
+export {};
+//# sourceMappingURL=prompt-controller.d.ts.map

package/lib/turn/prompt-controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-controller.d.ts","sourceRoot":"","sources":["../../src/turn/prompt-controller.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,MAAM,WAAW,eAAe;IAC9B,mBAAmB,EAAE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IACnD,mBAAmB,EAAE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,CACP,eAAe,EAAE,YAAY,EAAE,EAC/B,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACnC;AAED,mDAAmD;AACnD,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;gBAEhB,UAAU,EAAE,MAAM;CAK/B;AAED,KAAK,gBAAgB,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAUzF,qBAAa,gBAAgB;IAQzB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAR/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+B;IAC3D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAiC;IAC7D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA6B;IACjE,OAAO,CAAC,WAAW,CAAyB;IAC5C,OAAO,CAAC,UAAU,CAAoC;gBAGnC,YAAY,EAAE,SAAS,EACvB,YAAY,EAAE,SAAS;IAG1C,MAAM,IAAI,OAAO;IAIjB,MAAM,IAAI,OAAO;IAIjB,kBAAkB,IAAI,MAAM;IAI5B,mBAAmB,IAAI,MAAM,GAAG,IAAI;IAKpC,gBAAgB,IAAI,OAAO,GAAG,IAAI;IAMlC,aAAa,IAAI,mBAAmB,GAAG,IAAI;IAI3C,SAAS,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,IAAI;IAO3C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAOlC,iEAAiE;IACjE,KAAK,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAOhC,kBAAkB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAO7C,kBAAkB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAO7C,uEAAuE;IACvE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,YAAY,EAAE,GAAG,IAAI;IAQvE,iEAAiE;IACjE,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,YAAY,EAAE,GAAG,IAAI;IAQ1E,8DAA8D;IAC9D,QAAQ,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAKlE,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,UAAU;YAQJ,SAAS;IAMvB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,gBAAgB;YAWV,OAAO;IAoDrB,OAAO,IAAI,IAAI;CAWhB"}

package/lib/turn/prompt-controller.js

@@ -0,0 +1,190 @@
+import { randomUUID } from 'node:crypto';
+import { SessionMessageQueue } from './session-message-queue.js';
+/** 同 session 新入站消息取代仍在执行的旧 turn 时抛出；调用方应跳过出站回复。 */
+export class TurnSupersededError extends Error {
+    sessionKey;
+    constructor(sessionKey) {
+        super(`Turn superseded on session ${sessionKey}`);
+        this.name = 'TurnSupersededError';
+        this.sessionKey = sessionKey;
+    }
+}
+export class PromptController {
+    steeringMode;
+    followUpMode;
+    subscribers = new Set();
+    activeTurns = new Map();
+    latestTurnBySession = new Map();
+    idleWaiters = [];
+    lastResult = null;
+    constructor(steeringMode, followUpMode) {
+        this.steeringMode = steeringMode;
+        this.followUpMode = followUpMode;
+    }
+    isIdle() {
+        return this.activeTurns.size === 0;
+    }
+    isBusy() {
+        return this.activeTurns.size > 0;
+    }
+    getActiveTurnCount() {
+        return this.activeTurns.size;
+    }
+    getActiveSessionKey() {
+        const latest = [...this.latestTurnBySession.entries()].at(-1);
+        return latest?.[0] ?? null;
+    }
+    getActiveContext() {
+        const turnId = [...this.latestTurnBySession.values()].at(-1);
+        if (!turnId)
+            return null;
+        return this.activeTurns.get(turnId)?.commMessage ?? null;
+    }
+    getLastResult() {
+        return this.lastResult;
+    }
+    subscribe(listener) {
+        this.subscribers.add(listener);
+        return () => {
+            this.subscribers.delete(listener);
+        };
+    }
+    async waitForIdle() {
+        if (this.isIdle())
+            return;
+        await new Promise((resolve) => {
+            this.idleWaiters.push(resolve);
+        });
+    }
+    /** Abort all active turns (optionally scoped to one session). */
+    abort(sessionKey) {
+        for (const turn of this.activeTurns.values()) {
+            if (sessionKey && turn.sessionKey !== sessionKey)
+                continue;
+            turn.abortController.abort();
+        }
+    }
+    clearSteeringQueue(sessionKey) {
+        for (const turn of this.activeTurns.values()) {
+            if (sessionKey && turn.sessionKey !== sessionKey)
+                continue;
+            turn.queue.clearSteering();
+        }
+    }
+    clearFollowUpQueue(sessionKey) {
+        for (const turn of this.activeTurns.values()) {
+            if (sessionKey && turn.sessionKey !== sessionKey)
+                continue;
+            turn.queue.clearFollowUp();
+        }
+    }
+    /** Master-only: inject into the latest active turn on this session. */
+    steer(sessionKey, message) {
+        const turn = this.resolveLatestTurn(sessionKey);
+        if (!turn) {
+            throw new Error('steer requires an active turn on the same session');
+        }
+        turn.queue.pushSteering(message);
+    }
+    /** Master-only: queue continuation on the latest active turn. */
+    followUp(sessionKey, message) {
+        const turn = this.resolveLatestTurn(sessionKey);
+        if (!turn) {
+            throw new Error('followUp requires an active turn on the same session');
+        }
+        turn.queue.pushFollowUp(message);
+    }
+    /** 同 session 串行：新 turn 开始前 abort 仍在执行的旧 turn，避免过期回复污染群上下文。 */
+    schedule(request) {
+        this.abort(request.sessionKey);
+        return this.runTurn(request);
+    }
+    resolveLatestTurn(sessionKey) {
+        const turnId = this.latestTurnBySession.get(sessionKey);
+        if (!turnId)
+            return undefined;
+        return this.activeTurns.get(turnId);
+    }
+    notifyIdle() {
+        if (!this.isIdle())
+            return;
+        const waiters = this.idleWaiters.splice(0);
+        for (const resolve of waiters) {
+            resolve();
+        }
+    }
+    async emitEvent(event, signal) {
+        for (const listener of this.subscribers) {
+            await listener(event, signal);
+        }
+    }
+    promoteLatestTurn(sessionKey, turnId) {
+        this.latestTurnBySession.set(sessionKey, turnId);
+    }
+    demoteLatestTurn(sessionKey, turnId) {
+        if (this.latestTurnBySession.get(sessionKey) !== turnId)
+            return;
+        this.latestTurnBySession.delete(sessionKey);
+        for (const [id, turn] of this.activeTurns) {
+            if (turn.sessionKey === sessionKey) {
+                this.latestTurnBySession.set(sessionKey, id);
+                return;
+            }
+        }
+    }
+    async runTurn(request) {
+        const turnId = randomUUID();
+        const abortController = new AbortController();
+        const signal = abortController.signal;
+        const queue = new SessionMessageQueue(this.steeringMode, this.followUpMode);
+        const activeTurn = {
+            turnId,
+            sessionKey: request.sessionKey,
+            commMessage: request.commMessage,
+            queue,
+            abortController,
+        };
+        this.activeTurns.set(turnId, activeTurn);
+        this.promoteLatestTurn(request.sessionKey, turnId);
+        let lastResult = null;
+        try {
+            await this.emitEvent({ type: 'agent_start' }, signal);
+            const hooks = {
+                getSteeringMessages: async () => queue.drainSteering(),
+                getFollowUpMessages: async () => queue.drainFollowUp(),
+            };
+            lastResult = await request.execute(request.userMessages, hooks, signal, turnId);
+            while (queue.hasFollowUp() && !signal.aborted) {
+                const batch = queue.drainFollowUp();
+                lastResult = await request.execute(batch, hooks, signal, turnId);
+            }
+            if (signal.aborted) {
+                throw new TurnSupersededError(request.sessionKey);
+            }
+            await this.emitEvent({ type: 'agent_end', messages: request.userMessages }, signal);
+            if (!lastResult) {
+                throw new Error('Prompt turn produced no result');
+            }
+            this.lastResult = lastResult;
+            return lastResult;
+        }
+        finally {
+            this.activeTurns.delete(turnId);
+            this.demoteLatestTurn(request.sessionKey, turnId);
+            this.notifyIdle();
+        }
+    }
+    dispose() {
+        for (const turn of this.activeTurns.values()) {
+            turn.abortController.abort();
+        }
+        this.activeTurns.clear();
+        this.latestTurnBySession.clear();
+        this.subscribers.clear();
+        const waiters = this.idleWaiters.splice(0);
+        for (const resolve of waiters)
+            resolve();
+        this.lastResult = null;
+    }
+}
+//# sourceMappingURL=prompt-controller.js.map

package/lib/turn/prompt-controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-controller.js","sourceRoot":"","sources":["../../src/turn/prompt-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAqBjE,mDAAmD;AACnD,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IACnC,UAAU,CAAS;IAE5B,YAAY,UAAkB;QAC5B,KAAK,CAAC,8BAA8B,UAAU,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CACF;AAYD,MAAM,OAAO,gBAAgB;IAQR;IACA;IARF,WAAW,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC1C,WAAW,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC5C,mBAAmB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzD,WAAW,GAAsB,EAAE,CAAC;IACpC,UAAU,GAA+B,IAAI,CAAC;IAEtD,YACmB,YAAuB,EACvB,YAAuB;QADvB,iBAAY,GAAZ,YAAY,CAAW;QACvB,iBAAY,GAAZ,YAAY,CAAW;IACvC,CAAC;IAEJ,MAAM;QACJ,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,CAAC;IAED,mBAAmB;QACjB,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,OAAO,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAC7B,CAAC;IAED,gBAAgB;QACd,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,WAAW,IAAI,IAAI,CAAC;IAC3D,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,SAAS,CAAC,QAA0B;QAClC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/B,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW;QACf,IAAI,IAAI,CAAC,MAAM,EAAE;YAAE,OAAO;QAC1B,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,iEAAiE;IACjE,KAAK,CAAC,UAAmB;QACvB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7C,IAAI,UAAU,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU;gBAAE,SAAS;YAC3D,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,kBAAkB,CAAC,UAAmB;QACpC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7C,IAAI,UAAU,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU;gBAAE,SAAS;YAC3D,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,kBAAkB,CAAC,UAAmB;QACpC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7C,IAAI,UAAU,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU;gBAAE,SAAS;YAC3D,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,uEAAuE;IACvE,KAAK,CAAC,UAAkB,EAAE,OAAsC;QAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,iEAAiE;IACjE,QAAQ,CAAC,UAAkB,EAAE,OAAsC;QACjE,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,8DAA8D;IAC9D,QAAQ,CAAC,OAA0B;QACjC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAEO,iBAAiB,CAAC,UAAkB;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAEO,UAAU;QAChB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAAE,OAAO;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3C,KAAK,MAAM,OAAO,IAAI,OAAO,EAAE,CAAC;YAC9B,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,KAAiB,EAAE,MAAmB;QAC5D,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACxC,MAAM,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAEO,iBAAiB,CAAC,UAAkB,EAAE,MAAc;QAC1D,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;IAEO,gBAAgB,CAAC,UAAkB,EAAE,MAAc;QACzD,IAAI,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,MAAM;YAAE,OAAO;QAChE,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC5C,KAAK,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1C,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;gBACnC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBAC7C,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,OAA0B;QAC9C,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;QAC5B,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;QACtC,MAAM,KAAK,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAE5E,MAAM,UAAU,GAAe;YAC7B,MAAM;YACN,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,KAAK;YACL,eAAe;SAChB,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACzC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAEnD,IAAI,UAAU,GAA+B,IAAI,CAAC;QAElD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,CAAC;YAEtD,MAAM,KAAK,GAAoB;gBAC7B,mBAAmB,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE;gBACtD,mBAAmB,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE;aACvD,CAAC;YAEF,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAEhF,OAAO,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;gBACpC,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YACnE,CAAC;YAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,MAAM,IAAI,mBAAmB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACpD,CAAC;YAED,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,EAAE,MAAM,CAAC,CAAC;YAEpF,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,CAAC;YAED,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC7B,OAAO,UAAU,CAAC;QACpB,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAChC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAClD,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;IAED,OAAO;QACL,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7C,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;QACjC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3C,KAAK,MAAM,OAAO,IAAI,OAAO;YAAE,OAAO,EAAE,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;CACF"}

package/lib/turn/prompt-input.d.ts

@@ -0,0 +1,3 @@
+import { type AgentMessage, type ImageContent } from '@zhin.js/ai';
+export declare function normalizePromptMessages(input: string | AgentMessage | AgentMessage[], images?: ImageContent[]): AgentMessage[];
+//# sourceMappingURL=prompt-input.d.ts.map

package/lib/turn/prompt-input.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-input.d.ts","sourceRoot":"","sources":["../../src/turn/prompt-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAqB,MAAM,aAAa,CAAC;AACtF,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY,EAAE,EAC7C,MAAM,CAAC,EAAE,YAAY,EAAE,GACtB,YAAY,EAAE,CAKhB"}

package/lib/turn/prompt-input.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-input.js","sourceRoot":"","sources":["../../src/turn/prompt-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACtF,MAAM,UAAU,uBAAuB,CACrC,KAA6C,EAC7C,MAAuB;IAEvB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAChD,CAAC"}

package/lib/turn/session-message-queue.d.ts

@@ -0,0 +1,19 @@
+import type { AgentMessage, QueueMode } from '@zhin.js/ai';
+/** Per-sessionKey steering / follow-up queues (ADR 0009 D6 / Grill #13). */
+export declare class SessionMessageQueue {
+    readonly steeringMode: QueueMode;
+    readonly followUpMode: QueueMode;
+    private steering;
+    private followUp;
+    constructor(steeringMode: QueueMode, followUpMode: QueueMode);
+    pushSteering(input: AgentMessage | AgentMessage[]): void;
+    pushFollowUp(input: AgentMessage | AgentMessage[]): void;
+    drainSteering(): AgentMessage[];
+    drainFollowUp(): AgentMessage[];
+    clearSteering(): void;
+    clearFollowUp(): void;
+    hasFollowUp(): boolean;
+    steeringDepth(): number;
+    followUpDepth(): number;
+}
+//# sourceMappingURL=session-message-queue.d.ts.map

package/lib/turn/session-message-queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-message-queue.d.ts","sourceRoot":"","sources":["../../src/turn/session-message-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAK3D,4EAA4E;AAC5E,qBAAa,mBAAmB;IAK5B,QAAQ,CAAC,YAAY,EAAE,SAAS;IAChC,QAAQ,CAAC,YAAY,EAAE,SAAS;IALlC,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,QAAQ,CAAsB;gBAG3B,YAAY,EAAE,SAAS,EACvB,YAAY,EAAE,SAAS;IAGlC,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,YAAY,EAAE,GAAG,IAAI;IAIxD,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,YAAY,EAAE,GAAG,IAAI;IAIxD,aAAa,IAAI,YAAY,EAAE;IAQ/B,aAAa,IAAI,YAAY,EAAE;IAQ/B,aAAa,IAAI,IAAI;IAIrB,aAAa,IAAI,IAAI;IAIrB,WAAW,IAAI,OAAO;IAItB,aAAa,IAAI,MAAM;IAIvB,aAAa,IAAI,MAAM;CAGxB"}

package/lib/turn/session-message-queue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-message-queue.js","sourceRoot":"","sources":["../../src/turn/session-message-queue.ts"],"names":[],"mappings":"AACA,SAAS,iBAAiB,CAAC,KAAoC;IAC7D,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAChD,CAAC;AAED,4EAA4E;AAC5E,MAAM,OAAO,mBAAmB;IAKnB;IACA;IALH,QAAQ,GAAmB,EAAE,CAAC;IAC9B,QAAQ,GAAmB,EAAE,CAAC;IAEtC,YACW,YAAuB,EACvB,YAAuB;QADvB,iBAAY,GAAZ,YAAY,CAAW;QACvB,iBAAY,GAAZ,YAAY,CAAW;IAC/B,CAAC;IAEJ,YAAY,CAAC,KAAoC;QAC/C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,YAAY,CAAC,KAAoC;QAC/C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,aAAa;QACX,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,aAAa;QACX,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,aAAa;QACX,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,aAAa;QACX,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC9B,CAAC;CACF"}

package/lib/turn/subagent-auto-continue.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Async subagent completion — wake main agent with persisted sub-agent output.
+ */
+import { type UserMessage } from '@zhin.js/ai';
+export declare const SUBAGENT_AUTO_CONTINUE_MARKER = "[Subagent completed \u2014 auto-continue]";
+export declare function buildSubagentAutoContinueUserMessage(taskId: string, label: string, status: 'ok' | 'error'): UserMessage;
+//# sourceMappingURL=subagent-auto-continue.d.ts.map

package/lib/turn/subagent-auto-continue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subagent-auto-continue.d.ts","sourceRoot":"","sources":["../../src/turn/subagent-auto-continue.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAElE,eAAO,MAAM,6BAA6B,8CAAyC,CAAC;AAEpF,wBAAgB,oCAAoC,CAClD,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,IAAI,GAAG,OAAO,GACrB,WAAW,CASb"}

package/lib/turn/subagent-auto-continue.js

@@ -0,0 +1,16 @@
+/**
+ * Async subagent completion — wake main agent with persisted sub-agent output.
+ */
+import { createUserMessage } from '@zhin.js/ai';
+export const SUBAGENT_AUTO_CONTINUE_MARKER = '[Subagent completed — auto-continue]';
+export function buildSubagentAutoContinueUserMessage(taskId, label, status) {
+    const text = [
+        SUBAGENT_AUTO_CONTINUE_MARKER,
+        `Task [${taskId}] · ${label}`,
+        `Sub-agent status: ${status}.`,
+        'Continue from the sub-agent output already appended to this session context.',
+        'Summarize for the user or take the next orchestration step; do not paste the full raw sub-agent output verbatim.',
+    ].join('\n');
+    return createUserMessage(text);
+}
+//# sourceMappingURL=subagent-auto-continue.js.map

package/lib/turn/subagent-auto-continue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subagent-auto-continue.js","sourceRoot":"","sources":["../../src/turn/subagent-auto-continue.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,iBAAiB,EAAoB,MAAM,aAAa,CAAC;AAElE,MAAM,CAAC,MAAM,6BAA6B,GAAG,sCAAsC,CAAC;AAEpF,MAAM,UAAU,oCAAoC,CAClD,MAAc,EACd,KAAa,EACb,MAAsB;IAEtB,MAAM,IAAI,GAAG;QACX,6BAA6B;QAC7B,SAAS,MAAM,OAAO,KAAK,EAAE;QAC7B,qBAAqB,MAAM,GAAG;QAC9B,8EAA8E;QAC9E,kHAAkH;KACnH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC"}

package/lib/turn/task-continuation.d.ts.map

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

package/lib/turn/task-continuation.js.map

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

package/lib/turn/turn-complete.d.ts

@@ -0,0 +1,25 @@
+import type { AgentLoopTurnResult } from '../core/agent-loop-turn.js';
+import type { ZhinAgentPrivate, OutputElement } from '../internal/agent-host.js';
+import type { Message } from '@zhin.js/core';
+import type { SessionSystem } from '../session/session-system.js';
+import { TurnSupersededError } from './prompt-controller.js';
+export type TurnPipelineMode = 'text' | 'multimodal';
+export declare function handleTurnSuperseded(host: ZhinAgentPrivate, sessionId: string, commMessage: Message, mode: TurnPipelineMode, err: TurnSupersededError): Promise<OutputElement[]>;
+export interface FinalizeTurnAfterLoopParams {
+    host: ZhinAgentPrivate;
+    sessionSystem: SessionSystem;
+    sessionId: string;
+    commMessage: Message;
+    mode: TurnPipelineMode;
+    loopResult: AgentLoopTurnResult;
+    isNewSession: boolean;
+    rawContent: string;
+    reply: string;
+    /** multimodal 可显式传 `multimodal`；text 默认用 loopResult.path */
+    finishPath?: AgentLoopTurnResult['path'];
+    filterMs?: string;
+    startedAt?: number;
+}
+export declare function finalizeTurnAfterAgentLoop(p: FinalizeTurnAfterLoopParams): Promise<void>;
+export declare function buildTextTurnOutbound(reply: string, loopResult: AgentLoopTurnResult): OutputElement[];
+//# sourceMappingURL=turn-complete.d.ts.map

package/lib/turn/turn-complete.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-complete.d.ts","sourceRoot":"","sources":["../../src/turn/turn-complete.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACjF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,YAAY,CAAC;AAErD,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,OAAO,EACpB,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,mBAAmB,GACvB,OAAO,CAAC,aAAa,EAAE,CAAC,CAS1B;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,gBAAgB,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,mBAAmB,CAAC;IAChC,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,4DAA4D;IAC5D,UAAU,CAAC,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,0BAA0B,CAAC,CAAC,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAqC9F;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,GAAG,aAAa,EAAE,CAIrG"}

package/lib/turn/turn-complete.js

@@ -0,0 +1,59 @@
+import { parseOutput } from '@zhin.js/ai';
+import { mergeToolOutboundElements } from '../media/media-tool-bridge.js';
+import { logPhase } from '../internal/phase-trace.js';
+import { EMPTY_USAGE } from './turn-metrics.js';
+export async function handleTurnSuperseded(host, sessionId, commMessage, mode, err) {
+    if (mode === 'text') {
+        logPhase(host.phaseConfig, 'turn.superseded', sessionId, { sessionKey: err.sessionKey });
+    }
+    host.emitter.emit('ai.typing.stop', host.emitter.createPayload(sessionId, commMessage, mode, {
+        reason: 'superseded',
+    }));
+    await host.finalizeActiveTurn({ usage: EMPTY_USAGE, path: 'superseded' });
+    return [];
+}
+export async function finalizeTurnAfterAgentLoop(p) {
+    const reportPath = p.finishPath ?? p.loopResult.path;
+    const finalizePath = reportPath;
+    await p.host.emitter.dispatch('ai.response', p.host.emitter.createPayload(p.sessionId, p.commMessage, p.mode, {
+        path: reportPath,
+        model: p.loopResult.model,
+        iterations: p.loopResult.iterations,
+        reply: p.reply,
+    }));
+    await p.sessionSystem.touchAfterTurn(p.host, p.sessionId);
+    if (p.isNewSession) {
+        p.host.emitSessionNewEvent(p.sessionId, p.commMessage, p.mode, p.rawContent, p.reply);
+    }
+    await p.host.finalizeActiveTurn({
+        usage: p.loopResult.usage,
+        path: finalizePath,
+        iterations: p.loopResult.iterations,
+        model: p.loopResult.model,
+        userInput: p.rawContent.trim() || undefined,
+        thinking: p.loopResult.thinking,
+        output: p.reply.trim() || undefined,
+    });
+    await p.host.emitter.dispatch('ai.processing.finish', p.host.emitter.createPayload(p.sessionId, p.commMessage, p.mode, {
+        path: reportPath,
+        model: p.loopResult.model,
+        reply: p.reply,
+    }));
+    p.host.emitter.emit('ai.typing.stop', p.host.emitter.createPayload(p.sessionId, p.commMessage, p.mode, {
+        reason: 'processing_complete',
+    }));
+    if (p.mode === 'text' && p.startedAt != null) {
+        logPhase(p.host.phaseConfig, 'turn.end', p.sessionId, {
+            path: reportPath,
+            filter_ms: p.filterMs,
+            total_ms: Math.round(performance.now() - p.startedAt),
+        });
+    }
+}
+export function buildTextTurnOutbound(reply, loopResult) {
+    const outbound = mergeToolOutboundElements(parseOutput(reply), loopResult.toolCalls);
+    if (!reply.trim() && outbound.length === 0)
+        return [];
+    return outbound;
+}
+//# sourceMappingURL=turn-complete.js.map