@qduc/term2 0.11.0 → 0.12.0

package/dist/tools/agent/run-subagent-async.d.ts

@@ -1,25 +1,67 @@
 import { z } from 'zod';
 import type { ToolDefinition, FormatCommandMessage } from '../types.js';
-import type { SubagentResult, SubagentRunHandle } from '../../services/subagents/types.js';
+import type { SubagentResult, SubagentRunHandle, SubagentRunStatus } from '../../services/subagents/types.js';
 declare const runSubagentAsyncSchema: z.ZodObject<{
     role: z.ZodEnum<{
         explorer: "explorer";
         librarian: "librarian";
         mentor: "mentor";
-        researcher: "researcher";
         worker: "worker";
     }>;
     task: z.ZodString;
+    name: z.ZodOptional<z.ZodString>;
     continue_run_id: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 declare const getSubagentResultSchema: z.ZodObject<{
     runId: z.ZodString;
 }, z.core.$strip>;
+declare const getSubagentStatusSchema: z.ZodObject<{
+    runId: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+declare const sendMessageSchema: z.ZodObject<{
+    target: z.ZodString;
+    message: z.ZodString;
+    reply_to: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+declare const cancelRunSchema: z.ZodObject<{
+    target: z.ZodString;
+}, z.core.$strip>;
+export type GetSubagentStatusParams = z.infer<typeof getSubagentStatusSchema>;
 export type RunSubagentAsyncParams = z.infer<typeof runSubagentAsyncSchema>;
 export type GetSubagentResultParams = z.infer<typeof getSubagentResultSchema>;
+export type SendMessageParams = z.infer<typeof sendMessageSchema>;
+export type CancelRunParams = z.infer<typeof cancelRunSchema>;
+export type SendMessageAcknowledgement = {
+    ok: true;
+    runId: string;
+    status: 'running';
+    delivery: 'queued' | 'answered';
+} | {
+    ok: false;
+    code: string;
+    target: string;
+};
+export type CancelRunAcknowledgement = {
+    ok: true;
+    runId: string;
+    status: 'cancelling';
+} | {
+    ok: false;
+    code: 'not_active';
+    target: string;
+};
 export declare const formatRunSubagentAsyncCommandMessage: FormatCommandMessage;
 export declare const formatGetSubagentResultCommandMessage: FormatCommandMessage;
-export declare function createRunSubagentAsyncToolDefinition(runSubagentAsync: (params: RunSubagentAsyncParams, context?: unknown, details?: unknown) => Promise<SubagentRunHandle>): ToolDefinition<RunSubagentAsyncParams>;
-export declare function createGetSubagentResultToolDefinition(getSubagentResult: (params: GetSubagentResultParams, context?: unknown, details?: unknown) => Promise<SubagentResult>): ToolDefinition<GetSubagentResultParams>;
+/** @deprecated Historical compatibility only. New agents register the unified run_subagent tool. */
+export declare function createRunSubagentAsyncToolDefinition(runSubagentAsync: (params: RunSubagentAsyncParams, context?: unknown, details?: unknown) => Promise<SubagentRunHandle>): ToolDefinition<typeof runSubagentAsyncSchema>;
+export declare function createGetSubagentResultToolDefinition(getSubagentResult: (params: GetSubagentResultParams, context?: unknown, details?: unknown) => Promise<SubagentResult>): ToolDefinition<typeof getSubagentResultSchema>;
+export declare const formatGetSubagentStatusCommandMessage: FormatCommandMessage;
+export declare function createGetSubagentStatusToolDefinition(getSubagentStatus: (params: GetSubagentStatusParams, context?: unknown, details?: unknown) => SubagentRunStatus | SubagentRunStatus[]): ToolDefinition<typeof getSubagentStatusSchema>;
+export declare const formatSendMessageCommandMessage: FormatCommandMessage;
+export declare const formatCancelRunCommandMessage: FormatCommandMessage;
+/** Parent-only, non-blocking control channel for an active async execution run. */
+export declare function createSendMessageToolDefinition(sendMessage: (params: SendMessageParams) => SendMessageAcknowledgement): ToolDefinition<typeof sendMessageSchema>;
+/** Parent-only, non-blocking request for two-phase async run cancellation. */
+export declare function createCancelRunToolDefinition(cancelRun: (params: CancelRunParams) => CancelRunAcknowledgement): ToolDefinition<typeof cancelRunSchema>;
 export {};
 //# sourceMappingURL=run-subagent-async.d.ts.map

package/dist/tools/agent/run-subagent-async.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-subagent-async.d.ts","sourceRoot":"","sources":["../../../source/tools/agent/run-subagent-async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQxE,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAM3F,QAAA,MAAM,sBAAsB;;;;;;;;;;iBAO1B,CAAC;AAEH,QAAA,MAAM,uBAAuB;;iBAE3B,CAAC;AAEH,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAC5E,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AA4B9E,eAAO,MAAM,oCAAoC,EAAE,oBA2BlD,CAAC;AAEF,eAAO,MAAM,qCAAqC,EAAE,oBAiDnD,CAAC;AAEF,wBAAgB,oCAAoC,CAClD,gBAAgB,EAAE,CAChB,MAAM,EAAE,sBAAsB,EAC9B,OAAO,CAAC,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,KACd,OAAO,CAAC,iBAAiB,CAAC,GAC9B,cAAc,CAAC,sBAAsB,CAAC,CA+BxC;AAED,wBAAgB,qCAAqC,CACnD,iBAAiB,EAAE,CAAC,MAAM,EAAE,uBAAuB,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,cAAc,CAAC,GACpH,cAAc,CAAC,uBAAuB,CAAC,CAqCzC"}
+{"version":3,"file":"run-subagent-async.d.ts","sourceRoot":"","sources":["../../../source/tools/agent/run-subagent-async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQxE,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAM9G,QAAA,MAAM,sBAAsB;;;;;;;;;;iBAc1B,CAAC;AAEH,QAAA,MAAM,uBAAuB;;iBAE3B,CAAC;AAEH,QAAA,MAAM,uBAAuB;;iBAE3B,CAAC;AAEH,QAAA,MAAM,iBAAiB;;;;iBAerB,CAAC;AAEH,QAAA,MAAM,eAAe;;iBAEnB,CAAC;AAEH,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAE9E,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAC5E,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAC9E,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAClE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,MAAM,MAAM,0BAA0B,GAClC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,QAAQ,GAAG,UAAU,CAAA;CAAE,GAC/E;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhD,MAAM,MAAM,wBAAwB,GAChC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,YAAY,CAAA;CAAE,GACjD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtD,eAAO,MAAM,oCAAoC,EAAE,oBA4BlD,CAAC;AAEF,eAAO,MAAM,qCAAqC,EAAE,oBAiDnD,CAAC;AAEF,oGAAoG;AACpG,wBAAgB,oCAAoC,CAClD,gBAAgB,EAAE,CAChB,MAAM,EAAE,sBAAsB,EAC9B,OAAO,CAAC,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,KACd,OAAO,CAAC,iBAAiB,CAAC,GAC9B,cAAc,CAAC,OAAO,sBAAsB,CAAC,CAsC/C;AAED,wBAAgB,qCAAqC,CACnD,iBAAiB,EAAE,CAAC,MAAM,EAAE,uBAAuB,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,cAAc,CAAC,GACpH,cAAc,CAAC,OAAO,uBAAuB,CAAC,CAuChD;AA6CD,eAAO,MAAM,qCAAqC,EAAE,oBAqBnD,CAAC;AAEF,wBAAgB,qCAAqC,CACnD,iBAAiB,EAAE,CACjB,MAAM,EAAE,uBAAuB,EAC/B,OAAO,CAAC,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,KACd,iBAAiB,GAAG,iBAAiB,EAAE,GAC3C,cAAc,CAAC,OAAO,uBAAuB,CAAC,CAwBhD;AAED,eAAO,MAAM,+BAA+B,EAAE,oBA0B7C,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,oBA0B3C,CAAC;AAEF,mFAAmF;AACnF,wBAAgB,+BAA+B,CAC7C,WAAW,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,0BAA0B,GACrE,cAAc,CAAC,OAAO,iBAAiB,CAAC,CAe1C;AAED,8EAA8E;AAC9E,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,wBAAwB,GAC/D,cAAc,CAAC,OAAO,eAAe,CAAC,CAaxC"}

package/dist/tools/agent/run-subagent-async.js

@@ -1,39 +1,46 @@
 import { z } from 'zod';
 import { getOutputText, normalizeToolArguments, createBaseMessage, getCallIdFromItem, safeJsonParse, } from '../format-helpers.js';
-import { SubagentRegistryError } from '../../services/subagents/subagent-async-registry.js';
-import { isAbortLike, truncatePreview } from '../../services/subagents/utils.js';
-const ASYNC_ROLES = ['explorer', 'worker', 'researcher', 'mentor', 'librarian'];
+import { SUBAGENT_RUN_NAME_PATTERN, SubagentRegistryError } from '../../services/subagents/subagent-async-registry.js';
+import { isAbortLike, truncatePreview, formatSubagentResult } from '../../services/subagents/utils.js';
+const ASYNC_ROLES = ['explorer', 'worker', 'mentor', 'librarian'];
 const runSubagentAsyncSchema = z.object({
-    role: z.enum(ASYNC_ROLES).describe('The subagent role to use: explorer, worker, researcher, mentor, or librarian.'),
+    role: z.enum(ASYNC_ROLES).describe('The subagent role to use: explorer, worker, mentor, or librarian.'),
     task: z.string().describe('The full task description.'),
+    name: z
+        .string()
+        .regex(SUBAGENT_RUN_NAME_PATTERN)
+        .optional()
+        .describe('Optional active-run alias: lowercase letter first, then up to 31 lowercase letters, digits, underscores, or hyphens.'),
     continue_run_id: z
         .string()
         .optional()
         .describe('Continue a completed run using its runId. Required for explicit session reuse.'),
 });
 const getSubagentResultSchema = z.object({
-    runId: z.string().describe('The runId returned by run_subagent_async.'),
+    runId: z.string().describe('The runId returned by run_subagent with execution: "background".'),
+});
+const getSubagentStatusSchema = z.object({
+    runId: z.string().optional().describe('The runId to inspect. Omit to list the status of all current runs at once.'),
+});
+const sendMessageSchema = z.object({
+    target: z.string().trim().min(1).max(128).describe('The active run name or canonical runId to steer or answer.'),
+    message: z
+        .string()
+        .trim()
+        .min(1)
+        .max(2_000)
+        .describe('Bounded steering guidance, or the answer to the referenced ask_orchestrator question.'),
+    reply_to: z
+        .string()
+        .trim()
+        .min(1)
+        .max(256)
+        .optional()
+        .describe('Optional ask_orchestrator messageId. When provided, message answers that exact pending question.'),
+});
+const cancelRunSchema = z.object({
+    target: z.string().trim().min(1).max(128).describe('The active run name or canonical runId to cancel.'),
 });
-function formatSubagentResult(result) {
-    const lines = [];
-    lines.push(`Status: ${result.status}`);
-    if (result.error) {
-        lines.push(`Error: ${result.error}`);
-    }
-    if (result.finalText) {
-        lines.push('');
-        lines.push(result.finalText);
-    }
-    if (result.toolsUsed && result.toolsUsed.length > 0) {
-        lines.push('');
-        lines.push(`Tools used: ${result.toolsUsed.map((t) => `${t.toolName}(${t.count})`).join(', ')}`);
-    }
-    if (result.filesChanged && result.filesChanged.length > 0) {
-        lines.push('');
-        lines.push(`Files changed: ${result.filesChanged.join(', ')}`);
-    }
-    return lines.join('\n') || `Status: ${result.status}`;
-}
 export const formatRunSubagentAsyncCommandMessage = (item, index, toolCallArgumentsById) => {
     const callId = getCallIdFromItem(item);
     const fallbackArgs = callId && toolCallArgumentsById.has(callId) ? toolCallArgumentsById.get(callId) : null;
@@ -48,6 +55,8 @@ export const formatRunSubagentAsyncCommandMessage = (item, index, toolCallArgume
     if (runId && typeof runId === 'string') {
         command += ` — runId: ${runId}`;
     }
+    if (parsedOutput?.name)
+        command += ` — name: ${parsedOutput.name}`;
     return [
         createBaseMessage(item, index, 0, false, {
             command,
@@ -105,21 +114,30 @@ export const formatGetSubagentResultCommandMessage = (item, index, toolCallArgum
         }),
     ];
 };
+/** @deprecated Historical compatibility only. New agents register the unified run_subagent tool. */
 export function createRunSubagentAsyncToolDefinition(runSubagentAsync) {
     return {
         name: 'run_subagent_async',
-        description: 'Start a subagent that runs asynchronously in the background and returns a runId immediately. ' +
+        description: 'Start a subagent that runs asynchronously in the background and returns a runId immediately — the call does NOT block. ' +
+            'After a successful launch, do NOT immediately call get_subagent_result; that call blocks until completion and freezes you out of doing other work or receiving the next user instruction. ' +
+            'Instead, end your turn and wait for the harness completion notification, which inlines the full result so you can continue without a second tool call. ' +
             'A returned handle with status: "running" means the launch succeeded; do not duplicate the delegated task. ' +
-            'Return control and wait for the automatic completion notification. ' +
-            'Fresh runs support explorer, worker, researcher, mentor, and librarian. ' +
-            'Only completed non-worker runs can be continued across turns; worker continuation is blocked. ' +
-            'Call get_subagent_result from the notification turn, or earlier only when you explicitly need the result immediately.',
+            'Only call get_subagent_result inline if, after honest assessment, you truly cannot take any other useful action or reply to the user without the result at all. ' +
+            'Fresh runs support explorer, worker, mentor, and librarian. ' +
+            'Only completed non-worker runs can be continued across turns; worker continuation is blocked.',
         parameters: runSubagentAsyncSchema,
         needsApproval: () => false,
         execute: async (params, context, details) => {
             try {
                 const handle = await runSubagentAsync(params, context, details);
-                return JSON.stringify({ runId: handle.runId, status: handle.status });
+                const handleOutput = { runId: handle.runId, status: handle.status };
+                if (handle.name)
+                    handleOutput.name = handle.name;
+                if (handle.status === 'running') {
+                    handleOutput.hint =
+                        'Background run launched — do NOT call get_subagent_result now. End your turn; the completion notification will inline the full result.';
+                }
+                return JSON.stringify(handleOutput);
             }
             catch (error) {
                 if (isAbortLike(error?.message, error)) {
@@ -140,8 +158,10 @@ export function createRunSubagentAsyncToolDefinition(runSubagentAsync) {
 export function createGetSubagentResultToolDefinition(getSubagentResult) {
     return {
         name: 'get_subagent_result',
-        description: 'Retrieve the final result of an asynchronous subagent run started with run_subagent_async. ' +
-            'Provide the runId returned by run_subagent_async. This call blocks until the run completes.',
+        description: 'Retrieve the final result of a background subagent run started with run_subagent using execution: "background". ' +
+            'Provide the runId returned by that background launch. This call BLOCKS until the run completes. ' +
+            'Do not call it immediately after launching a subagent — that defeats async and freezes you out of doing other work. ' +
+            'The completion notification already inlines the full result, so you normally will not need this tool at all; use it only if you need to re-fetch a result you already saw.',
         parameters: getSubagentResultSchema,
         needsApproval: () => false,
         execute: async (params, context, details) => {
@@ -175,4 +195,171 @@ export function createGetSubagentResultToolDefinition(getSubagentResult) {
         formatCommandMessage: formatGetSubagentResultCommandMessage,
     };
 }
+function formatSubagentStatus(status) {
+    const formatOne = (s) => {
+        const parts = [
+            `${s.name ? `${s.name} (${s.runId})` : s.runId} [${s.role}] ${s.status}`,
+            `task: ${s.taskPreview || '(none)'}`,
+            `elapsed: ${Math.round(s.elapsedMs / 1000)}s`,
+        ];
+        if (s.lastToolName)
+            parts.push(`lastTool: ${s.lastToolName}`);
+        const toolSummary = Object.entries(s.toolCounts)
+            .map(([name, count]) => `${name}(${count})`)
+            .join(', ');
+        if (toolSummary)
+            parts.push(`tools: ${toolSummary}`);
+        for (const [index, turn] of (s.turnHistory ?? []).entries()) {
+            const precedingToolSummary = Object.entries(turn.precedingToolCounts)
+                .map(([name, count]) => `${name}(${count})`)
+                .join(', ');
+            parts.push(`turn ${index + 1}: ${turn.text}${precedingToolSummary ? ` → ${precedingToolSummary}` : ''}`);
+        }
+        if (s.currentText?.trim())
+            parts.push(`streaming: ${JSON.stringify(s.currentText)}`);
+        const pendingToolSummary = Object.entries(s.pendingToolCounts ?? {})
+            .map(([name, count]) => `${name}(${count})`)
+            .join(', ');
+        if (pendingToolSummary)
+            parts.push(`pending: ${pendingToolSummary}`);
+        return parts.join(' | ');
+    };
+    if (Array.isArray(status)) {
+        if (status.length === 0)
+            return 'No subagent runs.';
+        return status.map(formatOne).join('\n');
+    }
+    if (status.status === 'not_found') {
+        return `Run ${status.runId} was not found (evicted or never existed).`;
+    }
+    if (status.status === 'running' || status.status === 'waiting_for_answer' || status.status === 'cancelling') {
+        return `${formatOne(status)}\n\nThis run is still in progress. The completion notification will inline the full result once it settles.`;
+    }
+    return `${formatOne(status)}\n\nThis run has finished. The completion notification inlined its full result; call get_subagent_result only to re-fetch it.`;
+}
+export const formatGetSubagentStatusCommandMessage = (item, index, toolCallArgumentsById) => {
+    const callId = getCallIdFromItem(item);
+    const fallbackArgs = callId && toolCallArgumentsById.has(callId) ? toolCallArgumentsById.get(callId) : null;
+    const normalizedArgs = item?.rawItem?.arguments ?? item?.arguments;
+    const args = normalizeToolArguments(normalizedArgs) ?? normalizeToolArguments(fallbackArgs) ?? {};
+    const rawOutput = getOutputText(item);
+    const runId = args?.runId ?? 'all';
+    const command = rawOutput?.includes('not found')
+        ? `get_subagent_status [${runId}] — not found`
+        : `get_subagent_status [${runId}]`;
+    return [
+        createBaseMessage(item, index, 0, false, {
+            command,
+            output: rawOutput || 'No status',
+            success: true,
+            toolName: 'get_subagent_status',
+            toolArgs: args,
+        }),
+    ];
+};
+export function createGetSubagentStatusToolDefinition(getSubagentStatus) {
+    return {
+        name: 'get_subagent_status',
+        description: 'Non-blocking status of one async subagent run (runId provided) or all runs (runId omitted). ' +
+            'Use this to answer a mid-run "what is it doing" question without blocking your turn. ' +
+            'Returns status, elapsed, last tool, and tool counts only — never the final report or diff evidence. ' +
+            'For a finished or settled run, the completion notification inlines the full result; use get_subagent_result only to re-fetch one you already saw. ' +
+            'This call never blocks and never awaits a run.',
+        parameters: getSubagentStatusSchema,
+        needsApproval: () => false,
+        execute: (params, context, details) => {
+            try {
+                const status = getSubagentStatus(params, context, details);
+                return formatSubagentStatus(status);
+            }
+            catch (error) {
+                return JSON.stringify({
+                    status: 'failed',
+                    error: { code: 'execution_failed', message: error?.message || String(error) },
+                });
+            }
+        },
+        formatCommandMessage: formatGetSubagentStatusCommandMessage,
+    };
+}
+export const formatSendMessageCommandMessage = (item, index, toolCallArgumentsById) => {
+    const callId = getCallIdFromItem(item);
+    const fallbackArgs = callId && toolCallArgumentsById.has(callId) ? toolCallArgumentsById.get(callId) : null;
+    const args = normalizeToolArguments(item?.rawItem?.arguments ?? item?.arguments) ?? normalizeToolArguments(fallbackArgs) ?? {};
+    const rawOutput = getOutputText(item);
+    const acknowledgement = safeJsonParse(rawOutput);
+    const successfulAcknowledgement = acknowledgement !== null && acknowledgement.ok;
+    const failureCode = acknowledgement !== null && !acknowledgement.ok ? acknowledgement.code : undefined;
+    const target = args.target ?? (successfulAcknowledgement ? acknowledgement.runId : 'unknown');
+    const command = successfulAcknowledgement
+        ? `send_message [${target}] — ${acknowledgement.delivery}`
+        : `send_message [${target}] — ${failureCode ?? 'failed'}`;
+    const output = successfulAcknowledgement
+        ? `Message ${acknowledgement.delivery} for ${acknowledgement.runId}; run remains ${acknowledgement.status}.`
+        : `Message was not delivered: ${failureCode ?? rawOutput ?? 'unknown error'}.`;
+    return [
+        createBaseMessage(item, index, 0, false, {
+            command,
+            output,
+            success: successfulAcknowledgement,
+            toolName: 'send_message',
+            toolArgs: args,
+        }),
+    ];
+};
+export const formatCancelRunCommandMessage = (item, index, toolCallArgumentsById) => {
+    const callId = getCallIdFromItem(item);
+    const fallbackArgs = callId && toolCallArgumentsById.has(callId) ? toolCallArgumentsById.get(callId) : null;
+    const args = normalizeToolArguments(item?.rawItem?.arguments ?? item?.arguments) ?? normalizeToolArguments(fallbackArgs) ?? {};
+    const rawOutput = getOutputText(item);
+    const acknowledgement = safeJsonParse(rawOutput);
+    const successfulAcknowledgement = acknowledgement !== null && acknowledgement.ok;
+    const failureCode = acknowledgement !== null && !acknowledgement.ok ? acknowledgement.code : undefined;
+    const target = args.target ?? (successfulAcknowledgement ? acknowledgement.runId : 'unknown');
+    const command = successfulAcknowledgement
+        ? `cancel_run [${target}] — cancelling`
+        : `cancel_run [${target}] — ${failureCode ?? 'failed'}`;
+    const output = successfulAcknowledgement
+        ? `Cancellation requested for ${acknowledgement.runId}; awaiting normal completion.`
+        : `Run is not active: ${target}.`;
+    return [
+        createBaseMessage(item, index, 0, false, {
+            command,
+            output,
+            success: successfulAcknowledgement,
+            toolName: 'cancel_run',
+            toolArgs: args,
+        }),
+    ];
+};
+/** Parent-only, non-blocking control channel for an active async execution run. */
+export function createSendMessageToolDefinition(sendMessage) {
+    return {
+        name: 'send_message',
+        description: 'Queue non-blocking steering for an active async execution run addressed by its active name or canonical runId; this does NOT wait for a result. ' +
+            'Steering is delivered by safely ending the current model stream (never an active tool) and starting a bounded fresh session turn; it is not live SDK input injection. ' +
+            'A logical run permits at most three steering continuation segments. Do not immediately call get_subagent_result after this acknowledgement; the completion notification inlines the full result. ' +
+            'To answer a waiting ask_orchestrator question, provide its messageId as reply_to; the message then answers that exact question and its tool call continues. ' +
+            'While a question is waiting, steering without reply_to is refused with question_pending, because only an answer can resume the blocked tool call: answer it or cancel_run. ' +
+            'The mentor role does not support steering. Use cancel_run to stop a run instead of sending a correction that must not continue.',
+        parameters: sendMessageSchema,
+        needsApproval: () => false,
+        execute: (params) => JSON.stringify(sendMessage(params)),
+        formatCommandMessage: formatSendMessageCommandMessage,
+    };
+}
+/** Parent-only, non-blocking request for two-phase async run cancellation. */
+export function createCancelRunToolDefinition(cancelRun) {
+    return {
+        name: 'cancel_run',
+        description: 'Request non-blocking two-phase cancellation of an active async run by active name or canonical runId. This does NOT wait for the result. ' +
+            'It returns cancelling immediately; the runner later settles through the normal completion path with truthful partial work, tool, diff, and validation evidence. ' +
+            'Do not immediately call get_subagent_result after this acknowledgement; the completion notification inlines the full result. ' +
+            'Use send_message to steer productive execution; use cancel_run when the run should stop.',
+        parameters: cancelRunSchema,
+        needsApproval: () => false,
+        execute: (params) => JSON.stringify(cancelRun(params)),
+        formatCommandMessage: formatCancelRunCommandMessage,
+    };
+}
 //# sourceMappingURL=run-subagent-async.js.map

package/dist/tools/agent/run-subagent-async.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-subagent-async.js","sourceRoot":"","sources":["../../../source/tools/agent/run-subagent-async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,aAAa,EACb,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,GACd,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC5F,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAEjF,MAAM,WAAW,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAU,CAAC;AAEzF,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,+EAA+E,CAAC;IACnH,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,4BAA4B,CAAC;IACvD,eAAe,EAAE,CAAC;SACf,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,gFAAgF,CAAC;CAC9F,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,2CAA2C,CAAC;CACxE,CAAC,CAAC;AAKH,SAAS,oBAAoB,CAAC,MAAsB;IAClD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAEvC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnG,CAAC;IAED,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1D,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,kBAAkB,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,WAAW,MAAM,CAAC,MAAM,EAAE,CAAC;AACxD,CAAC;AAED,MAAM,CAAC,MAAM,oCAAoC,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;IAC/G,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,MAAM,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC;IACnE,MAAM,IAAI,GAAG,sBAAsB,CAAC,cAAc,CAAC,IAAI,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAElG,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,IAAI,UAAU,CAAC;IACtC,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAChD,IAAI,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,uBAAuB,IAAI,KAAK,WAAW,EAAE,CAAC,CAAC,CAAC,uBAAuB,IAAI,GAAG,CAAC;IAE3G,MAAM,YAAY,GAAG,aAAa,CAAC,SAAS,CAA8B,CAAC;IAC3E,MAAM,KAAK,GAAG,YAAY,EAAE,KAAK,IAAI,SAAS,CAAC;IAE/C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,OAAO,IAAI,aAAa,KAAK,EAAE,CAAC;IAClC,CAAC;IAED,OAAO;QACL,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACvC,OAAO;YACP,MAAM,EAAE,SAAS,IAAI,aAAa;YAClC,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,oBAAoB;YAC9B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qCAAqC,GAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE;IAChH,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5G,MAAM,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC;IACnE,MAAM,IAAI,GAAG,sBAAsB,CAAC,cAAc,CAAC,IAAI,sBAAsB,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAElG,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAA0B,CAAC;IAEjE,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,SAAS,CAAC;IACvC,IAAI,OAAO,GAAG,wBAAwB,KAAK,GAAG,CAAC;IAC/C,IAAI,MAAM,GAAG,SAAS,IAAI,aAAa,CAAC;IACxC,IAAI,OAAO,GAAG,IAAI,CAAC;IAEnB,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,GAAG,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC;QACxC,OAAO;YACL,MAAM,CAAC,MAAM,KAAK,WAAW;gBAC3B,CAAC,CAAC,wBAAwB,KAAK,eAAe;gBAC9C,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ;oBAC5B,CAAC,CAAC,wBAAwB,KAAK,YAAY;oBAC3C,CAAC,CAAC,wBAAwB,KAAK,GAAG,CAAC;QAEvC,MAAM,aAAa,GAAG,eAAe,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,KAAK,IAAI,WAAW,CAAC,CAAC;QACvF,MAAM,KAAK,GAAG,CAAC,aAAa,CAAC,CAAC;QAC9B,IAAI,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9F,CAAC;QACD,IAAI,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,KAAK,CAAC,IAAI,CAAC,kBAAkB,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;SAAM,IAAI,SAAS,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACjD,OAAO,GAAG,KAAK,CAAC;QAChB,OAAO,GAAG,wBAAwB,KAAK,YAAY,CAAC;IACtD,CAAC;SAAM,IAAI,SAAS,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACpD,OAAO,GAAG,KAAK,CAAC;QAChB,OAAO,GAAG,wBAAwB,KAAK,eAAe,CAAC;IACzD,CAAC;IAED,OAAO;QACL,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACvC,OAAO;YACP,MAAM;YACN,OAAO;YACP,QAAQ,EAAE,qBAAqB;YAC/B,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,oCAAoC,CAClD,gBAI+B;IAE/B,OAAO;QACL,IAAI,EAAE,oBAAoB;QAC1B,WAAW,EACT,+FAA+F;YAC/F,4GAA4G;YAC5G,qEAAqE;YACrE,0EAA0E;YAC1E,gGAAgG;YAChG,uHAAuH;QACzH,UAAU,EAAE,sBAAsB;QAClC,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YAC1C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAChE,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YACxE,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;oBACvC,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,IAAI,KAAK,YAAY,qBAAqB,EAAE,CAAC;oBAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBACnG,CAAC;gBACD,OAAO,IAAI,CAAC,SAAS,CAAC;oBACpB,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;iBAC9E,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,oBAAoB,EAAE,oCAAoC;KAC3D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qCAAqC,CACnD,iBAAqH;IAErH,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,WAAW,EACT,6FAA6F;YAC7F,6FAA6F;QAC/F,UAAU,EAAE,uBAAuB;QACnC,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YAC1C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBACjE,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;YACtC,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;oBACvC,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,IAAI,KAAK,YAAY,qBAAqB,EAAE,CAAC;oBAC3C,OAAO,IAAI,CAAC,SAAS,CAAC;wBACpB,MAAM,EAAE,QAAQ;wBAChB,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE;wBACnD,KAAK,EAAE,MAAM,CAAC,KAAK;qBACpB,CAAC,CAAC;gBACL,CAAC;gBACD,MAAM,WAAW,GAAmB;oBAClC,OAAO,EAAE,MAAM,CAAC,KAAK;oBACrB,IAAI,EAAE,SAAS;oBACf,MAAM,EAAE,QAAQ;oBAChB,SAAS,EAAE,EAAE;oBACb,YAAY,EAAE,EAAE;oBAChB,SAAS,EAAE,EAAE;oBACb,KAAK,EAAE,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;iBACvC,CAAC;gBACF,OAAO,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QACD,oBAAoB,EAAE,qCAAqC;KAC5D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"run-subagent-async.js","sourceRoot":"","sources":["../../../source/tools/agent/run-subagent-async.ts"],"names":[],"mappings":"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"}

package/dist/tools/agent/run-subagent.d.ts

@@ -1,20 +1,34 @@
-import { z } from 'zod';
 import type { ToolDefinition, FormatCommandMessage } from '../types.js';
-import type { SubagentResult } from '../../services/subagents/types.js';
-declare const runSubagentSchema: z.ZodObject<{
-    role: z.ZodEnum<{
-        explorer: "explorer";
-        librarian: "librarian";
-        researcher: "researcher";
-        worker: "worker";
-    }>;
-    task: z.ZodString;
-}, z.core.$strip>;
-export type RunSubagentParams = z.infer<typeof runSubagentSchema>;
+import type { NestedSubagentResult, SubagentRunHandle } from '../../services/subagents/types.js';
+declare const FOREGROUND_ROLES: readonly ['explorer', 'worker', 'librarian'];
+declare const BACKGROUND_ROLES: readonly ['explorer', 'worker', 'mentor', 'librarian'];
+export type ForegroundRunSubagentParams = {
+    role: (typeof FOREGROUND_ROLES)[number];
+    task: string;
+};
+export type RunSubagentParams = ({
+    execution: 'foreground';
+} & ForegroundRunSubagentParams & {
+    name?: string;
+    continue_run_id?: string;
+}) | {
+    execution: 'background';
+    role: (typeof BACKGROUND_ROLES)[number];
+    task: string;
+    name?: string;
+    continue_run_id?: string;
+};
+export type RunSubagentToolCallbacks = {
+    runSubagent?: (params: ForegroundRunSubagentParams, context?: unknown, details?: unknown) => Promise<NestedSubagentResult>;
+    runSubagentAsync?: (params: Pick<Extract<RunSubagentParams, {
+        execution: 'background';
+    }>, 'role' | 'task' | 'name' | 'continue_run_id'>, context?: unknown, details?: unknown) => Promise<SubagentRunHandle>;
+};
 export declare const formatRunSubagentCommandMessage: FormatCommandMessage;
-export declare function getSubagentsRolesSection({ includeLibrarian }?: {
+export declare function getSubagentsRolesSection({ includeLibrarian, includeMentor, }?: {
     includeLibrarian?: boolean;
+    includeMentor?: boolean;
 }): string;
-export declare const createRunSubagentToolDefinition: (runSubagent: (params: RunSubagentParams, context?: unknown, details?: unknown) => Promise<SubagentResult>) => ToolDefinition<RunSubagentParams>;
+export declare function createRunSubagentToolDefinition(callbacks: RunSubagentToolCallbacks | ((params: ForegroundRunSubagentParams, context?: unknown, details?: unknown) => Promise<NestedSubagentResult>)): ToolDefinition;
 export {};
 //# sourceMappingURL=run-subagent.d.ts.map

package/dist/tools/agent/run-subagent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-subagent.d.ts","sourceRoot":"","sources":["../../../source/tools/agent/run-subagent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAaxE,QAAA,MAAM,iBAAiB;;;;;;;;iBAKrB,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAmDlE,eAAO,MAAM,+BAA+B,EAAE,oBAqD7C,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,EAAE,gBAAuB,EAAE,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,CA6EjH;AAED,eAAO,MAAM,+BAA+B,gBAC7B,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,cAAc,CAAC,KACxG,cAAc,CAAC,iBAAiB,CA0BjC,CAAC"}
+{"version":3,"file":"run-subagent.d.ts","sourceRoot":"","sources":["../../../source/tools/agent/run-subagent.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQxE,OAAO,KAAK,EAAE,oBAAoB,EAAkB,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAgBjH,QAAA,MAAM,gBAAgB,YAAI,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAU,CAAC;AACtE,QAAA,MAAM,gBAAgB,YAAI,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAU,CAAC;AA4BhF,MAAM,MAAM,2BAA2B,GAAG;IAAE,IAAI,EAAE,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AACpG,MAAM,MAAM,iBAAiB,GACzB,CAAC;IAAE,SAAS,EAAE,YAAY,CAAA;CAAE,GAAG,2BAA2B,GAAG;IACzD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC,GACJ;IACE,SAAS,EAAE,YAAY,CAAC;IACxB,IAAI,EAAE,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEN,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,CAAC,EAAE,CACZ,MAAM,EAAE,2BAA2B,EACnC,OAAO,CAAC,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,KACd,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,gBAAgB,CAAC,EAAE,CACjB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;QAAE,SAAS,EAAE,YAAY,CAAA;KAAE,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,iBAAiB,CAAC,EACnH,OAAO,CAAC,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,KACd,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACjC,CAAC;AAkDF,eAAO,MAAM,+BAA+B,EAAE,oBAwF7C,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,EACvC,gBAAuB,EACvB,aAAoB,GACrB,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,CA2EvE;AAsBD,wBAAgB,+BAA+B,CAC7C,SAAS,EACL,wBAAwB,GACxB,CAAC,CAAC,MAAM,EAAE,2BAA2B,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAC,GACjH,cAAc,CA6EhB"}