@qduc/term2 0.14.0 → 0.16.0

package/dist/services/ssh-service.js

@@ -1,16 +1,124 @@
 import { Client } from 'ssh2';
 import { readFileSync } from 'fs';
 import { homedir } from 'os';
+/**
+ * Typed transport settlement for a remote command. Replacing raw/unclassified
+ * rejections lets callers and recovery paths distinguish a local containment
+ * decision (`'aborted'`, `'timeout'`, `'not_connected'`) from an ambiguous
+ * transport drop without guessing at message text.
+ */
+export class SSHTransportError extends Error {
+    kind;
+    remoteEffect;
+    /** Bytes received before settlement. Best effort only — never a complete result. */
+    partialOutput;
+    constructor(kind, message, options = {}) {
+        super(message);
+        this.name = 'SSHTransportError';
+        this.kind = kind;
+        this.remoteEffect = options.remoteEffect ?? 'unknown';
+        this.cause = options.cause;
+        this.partialOutput = options.partialOutput;
+    }
+}
+/**
+ * Canonical POSIX single-quote escaping: the value is wrapped in single quotes
+ * and any embedded `'` is rewritten as `'\''` (close quote, escaped quote,
+ * reopen quote). Shell metacharacters, `$VAR`, `$(...)`, and operators inside
+ * the value become inert data. Applies to every remote path argument and the
+ * optional `cwd`.
+ */
+export function quoteShellArg(value) {
+    return `'${value.replace(/'/g, "'\\''")}'`;
+}
+function transportDropMessage(kind, cause) {
+    const detail = cause instanceof Error ? `: ${cause.message}` : '';
+    switch (kind) {
+        case 'connection_error':
+            return `SSH connection error${detail}`;
+        case 'connection_end':
+            return 'SSH connection ended while a command was in flight';
+        case 'connection_close':
+            return 'SSH connection closed while a command was in flight';
+        case 'channel_error':
+            return `SSH channel error${detail}`;
+        case 'explicit_disconnect':
+            return 'SSH connection disconnected while a command was in flight';
+        case 'exec_failed':
+            return `SSH exec failed${detail}`;
+        case 'aborted':
+            return 'SSH command aborted';
+        case 'timeout':
+            return 'SSH command timed out';
+        case 'not_connected':
+            return 'SSH client not connected';
+    }
+}
+/**
+ * Owns the SSH transport lifecycle and remote command execution.
+ *
+ * Connection-state listeners are attached exactly once per client instance
+ * (`attachLifecycleListeners`), so repeated `connect()` calls cannot stack
+ * handlers. `connect()` is single-flight: an in-progress attempt is shared and
+ * a call while already connected is a no-op, so an old connection era's
+ * listeners can never settle a later command. Keepalive policy is explicitly
+ * **none** — no keepalive configuration and no background pings; drops are
+ * detected by socket/stream events and reported through typed settlement.
+ *
+ * Every in-flight `executeCommand` registers a settler in
+ * `activeCommandSettlers`. A terminal connection event settles all active
+ * commands with a typed `SSHTransportError`; each command also settles on its
+ * own stream close, channel error, `timeoutMs` elapse, or abort signal. The
+ * promise never hangs on a dropped transport.
+ */
 export class SSHService {
     config;
     client;
     connected = false;
+    lifecycleAttached = false;
+    connecting = null;
+    /** Settlers for commands currently in flight; a terminal transport event settles them all. */
+    activeCommandSettlers = new Set();
     constructor(config, client) {
         this.config = config;
         this.client = client ?? new Client();
     }
+    /**
+     * Attaches connection-level lifecycle listeners once per client instance.
+     * The first terminal event (`error`/`end`/`close`) wins per era: after the
+     * first drop the connection is marked down and every command active at that
+     * moment settles; later events from the same close sequence find an empty
+     * active set.
+     */
+    attachLifecycleListeners() {
+        if (this.lifecycleAttached)
+            return;
+        this.lifecycleAttached = true;
+        this.client.on('error', (err) => this.onTransportDrop('connection_error', err));
+        this.client.on('end', () => this.onTransportDrop('connection_end'));
+        this.client.on('close', () => this.onTransportDrop('connection_close'));
+    }
+    onTransportDrop(kind, cause) {
+        this.connected = false;
+        const settlers = Array.from(this.activeCommandSettlers);
+        this.activeCommandSettlers.clear();
+        for (const settle of settlers) {
+            settle(kind, cause);
+        }
+    }
     async connect() {
+        if (this.connected)
+            return;
+        if (this.connecting)
+            return this.connecting;
+        this.connecting = this.performConnect().finally(() => {
+            this.connecting = null;
+        });
+        return this.connecting;
+    }
+    async performConnect() {
         return new Promise((resolve, reject) => {
+            this.attachLifecycleListeners();
             // Build connection config, including private key if identity file specified
             const connectConfig = {
                 host: this.config.host,
@@ -29,25 +137,35 @@ export class SSHService {
                     return;
                 }
             }
-            this.client
-                .on('ready', () => {
+            // Per-attempt listeners are `once` and each removes the other on
+            // settlement, so repeated connect attempts never accumulate handlers.
+            let settled = false;
+            const onReady = () => {
+                if (settled)
+                    return;
+                settled = true;
+                this.client.removeListener('error', onError);
                 this.connected = true;
                 resolve();
-            })
-                .on('error', (err) => {
+            };
+            const onError = (err) => {
+                if (settled)
+                    return;
+                settled = true;
+                this.client.removeListener('ready', onReady);
                 this.connected = false;
                 reject(err);
-            })
-                .on('end', () => {
-                this.connected = false;
-            })
-                .connect(connectConfig);
+            };
+            this.client.once('ready', onReady);
+            this.client.once('error', onError);
+            this.client.connect(connectConfig);
         });
     }
     async disconnect() {
         if (this.connected) {
-            this.client.end();
             this.connected = false;
+            this.onTransportDrop('explicit_disconnect');
+            this.client.end();
         }
     }
     isConnected() {
@@ -55,37 +173,93 @@ export class SSHService {
     }
     async executeCommand(cmd, opts) {
         if (!this.connected) {
-            throw new Error('SSH client not connected');
+            throw new SSHTransportError('not_connected', 'SSH client not connected', { remoteEffect: 'none' });
+        }
+        const signal = opts?.signal;
+        if (signal?.aborted) {
+            throw new SSHTransportError('aborted', 'SSH command aborted before dispatch', {
+                cause: signal.reason,
+                remoteEffect: 'none',
+            });
         }
         return new Promise((resolve, reject) => {
-            // If cwd is provided, wrap command to change directory first
-            // We use simple string concatenation. In a more robust system we might want to escape the cwd path.
-            const commandToExec = opts?.cwd ? `cd "${opts.cwd}" && ${cmd}` : cmd;
-            this.client.exec(commandToExec, (err, stream) => {
-                if (err)
-                    return reject(err);
-                let stdout = '';
-                let stderr = '';
-                stream
-                    .on('close', (code) => {
-                    resolve({
-                        stdout,
-                        stderr,
-                        exitCode: code, // code is null if terminated by signal
-                        timedOut: false,
-                    });
-                })
-                    .on('data', (data) => {
-                    stdout += data.toString();
-                })
-                    .stderr.on('data', (data) => {
-                    stderr += data.toString();
-                });
+            // cwd and file paths are treated strictly as data: canonical POSIX
+            // single-quote escaping keeps quotes, $VAR, $(...), and shell operators
+            // from breaking out of the command string.
+            const commandToExec = opts?.cwd ? `cd ${quoteShellArg(opts.cwd)} && ${cmd}` : cmd;
+            const timeoutMs = opts?.timeoutMs;
+            let settled = false;
+            let stream = null;
+            let timeoutHandle;
+            let stdout = '';
+            let stderr = '';
+            // Each command builds its own typed drop error so the settlement carries
+            // that command's own partial output and message.
+            const settleOnTransportDrop = (kind, cause) => rejectWith(kind, transportDropMessage(kind, cause), { cause, remoteEffect: 'unknown' });
+            const onAbort = () => rejectWith('aborted', 'SSH command aborted', { cause: signal?.reason });
+            const onStreamClose = (code) => {
+                settle(() => resolve({ stdout, stderr, exitCode: code, timedOut: false }));
+            };
+            const onStdout = (chunk) => {
+                stdout += chunk.toString();
+            };
+            const onStderr = (chunk) => {
+                stderr += chunk.toString();
+            };
+            const onStreamError = (err) => rejectWith('channel_error', `SSH channel error: ${err.message}`, { cause: err });
+            const cleanup = () => {
+                this.activeCommandSettlers.delete(settleOnTransportDrop);
+                if (timeoutHandle !== undefined) {
+                    clearTimeout(timeoutHandle);
+                    timeoutHandle = undefined;
+                }
+                if (stream) {
+                    stream.removeListener('close', onStreamClose);
+                    stream.removeListener('data', onStdout);
+                    stream.removeListener('error', onStreamError);
+                    stream.stderr.removeListener('data', onStderr);
+                }
+                if (signal) {
+                    signal.removeEventListener('abort', onAbort);
+                }
+            };
+            function settle(fn) {
+                if (settled)
+                    return;
+                settled = true;
+                cleanup();
+                fn();
+            }
+            function rejectWith(kind, message, options) {
+                settle(() => reject(new SSHTransportError(kind, message, { ...options, partialOutput: { stdout, stderr } })));
+            }
+            this.activeCommandSettlers.add(settleOnTransportDrop);
+            if (signal) {
+                signal.addEventListener('abort', onAbort, { once: true });
+            }
+            if (timeoutMs !== undefined && timeoutMs > 0) {
+                timeoutHandle = setTimeout(() => {
+                    timeoutHandle = undefined;
+                    rejectWith('timeout', `SSH command timed out after ${timeoutMs}ms`);
+                }, timeoutMs);
+            }
+            this.client.exec(commandToExec, (err, channel) => {
+                if (settled)
+                    return;
+                if (err) {
+                    rejectWith('exec_failed', `SSH exec failed: ${err.message}`, { cause: err });
+                    return;
+                }
+                stream = channel;
+                stream.on('close', onStreamClose);
+                stream.on('data', onStdout);
+                stream.on('error', onStreamError);
+                stream.stderr.on('data', onStderr);
             });
         });
     }
     async readFile(path) {
-        const result = await this.executeCommand(`cat "${path}"`);
+        const result = await this.executeCommand(`cat ${quoteShellArg(path)}`);
         if (result.exitCode !== 0) {
             throw new Error(`Failed to read file ${path}: ${result.stderr}`);
         }
@@ -103,7 +277,7 @@ export class SSHService {
             throw new Error('Content contains internal delimiter');
         }
         // We use cat with a quoted heredoc 'EOF' to prevent variable expansion in the content
-        const cmd = `cat > "${path}" << '${delimiter}'\n${content}\n${delimiter}`;
+        const cmd = `cat > ${quoteShellArg(path)} << '${delimiter}'\n${content}\n${delimiter}`;
         const result = await this.executeCommand(cmd);
         if (result.exitCode !== 0) {
             throw new Error(`Failed to write file ${path}: ${result.stderr}`);
@@ -111,7 +285,7 @@ export class SSHService {
     }
     async mkdir(path, opts) {
         const flags = opts?.recursive ? '-p' : '';
-        const result = await this.executeCommand(`mkdir ${flags} "${path}"`);
+        const result = await this.executeCommand(`mkdir ${flags} ${quoteShellArg(path)}`);
         if (result.exitCode !== 0) {
             throw new Error(`Failed to mkdir ${path}: ${result.stderr}`);
         }

package/dist/services/ssh-service.js.map

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

package/dist/services/stream-event-processor.d.ts

@@ -2,6 +2,7 @@ import type { ConversationEvent } from './conversation/conversation-events.js';
 import type { ILoggingService } from './service-interfaces.js';
 import { type NormalizedUsage } from '../utils/ai/token-usage.js';
 import { type AgentStream } from './agent-stream.js';
+import { ToolCallMarkerStore } from '../utils/streaming/extract-command-messages.js';
 export interface StreamAccumulator {
     finalOutput: string;
     reasoningOutput: string;
@@ -27,6 +28,7 @@ export interface StreamProcessorOptions {
     onFunctionCallItem?: (item: unknown) => void;
     onFunctionResultItem?: (item: unknown) => void;
     onRunItem?: (item: unknown) => void;
+    markerStore?: ToolCallMarkerStore;
 }
 export interface StreamProcessorDeps {
     logger: ILoggingService;

package/dist/services/stream-event-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-event-processor.d.ts","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAoD,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAKpH,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGxE,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;;;;;;OAOG;IACH,+BAA+B,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED,eAAO,MAAM,uBAAuB,QAAO,iBAQzC,CAAC;AAEH,MAAM,WAAW,sBAAsB;IACrC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,6BAA6B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC/C,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,4DAA4D;AAC5D,wBAAuB,mBAAmB,CACxC,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,sBAAsB,EAC5B,IAAI,EAAE,mBAAmB,GACxB,cAAc,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CAqL/C"}
+{"version":3,"file":"stream-event-processor.d.ts","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAoD,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAKpH,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAExE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAErF,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;;;;;;OAOG;IACH,+BAA+B,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED,eAAO,MAAM,uBAAuB,QAAO,iBAQzC,CAAC;AAEH,MAAM,WAAW,sBAAsB;IACrC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,6BAA6B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC/C,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACpC,WAAW,CAAC,EAAE,mBAAmB,CAAC;CACnC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,4DAA4D;AAC5D,wBAAuB,mBAAmB,CACxC,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,sBAAsB,EAC5B,IAAI,EAAE,mBAAmB,GACxB,cAAc,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CAgN/C"}

package/dist/services/stream-event-processor.js

@@ -4,6 +4,7 @@ import { normalizeRunItem } from './conversation/run-item-normalizer.js';
 import { createInvalidToolCallDiagnostic } from './logging/logging-contract.js';
 import { parseToolCallArguments } from './tool-call-arguments.js';
 import { assertAgentStream } from './agent-stream.js';
+import { ToolCallMarkerStore } from '../utils/streaming/extract-command-messages.js';
 export const createStreamAccumulator = () => ({
     finalOutput: '',
     reasoningOutput: '',
@@ -16,6 +17,7 @@ export const createStreamAccumulator = () => ({
 /** Consume only the closed ApplicationRunEvent protocol. */
 export async function* processStreamEvents(stream, acc, opts, deps) {
     assertAgentStream(stream);
+    const markerStore = opts.markerStore ?? new ToolCallMarkerStore();
     if (!opts.preserveExistingToolArgs)
         opts.toolCallArgumentsById.clear();
     acc.textDeltaCount = 0;
@@ -23,6 +25,7 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
     const emitCommandMessages = (items) => emitCommandMessagesFromItems(items, {
         toolCallArgumentsById: opts.toolCallArgumentsById,
         emittedCommandIds: acc.emittedCommandIds,
+        markerStore,
     });
     const emitText = (text) => {
         if (!text)
@@ -48,6 +51,10 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
             yield { type: 'cost_update', record: event.record };
             continue;
         }
+        if (event.type === 'run_budget') {
+            yield { type: 'run_budget', evidence: event.evidence };
+            continue;
+        }
         if (event.type === 'codex_rate_limits') {
             yield event;
             continue;
@@ -64,6 +71,13 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
                 yield emitted;
             continue;
         }
+        if (event.type === 'model_attempt_rollback') {
+            acc.finalOutput = acc.finalOutput.slice(0, Math.max(0, acc.finalOutput.length - event.textCharacters));
+            acc.reasoningOutput = acc.reasoningOutput.slice(0, Math.max(0, acc.reasoningOutput.length - event.reasoningCharacters));
+            acc.textDeltaCount = Math.max(0, acc.textDeltaCount - event.textDeltas);
+            acc.reasoningDeltaCount = Math.max(0, acc.reasoningDeltaCount - event.reasoningDeltas);
+            continue;
+        }
         if (event.type === 'tool_call_streaming_delta') {
             yield { ...event };
             continue;
@@ -105,6 +119,14 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
             };
             continue;
         }
+        if (event.type === 'tool_call_dispatched') {
+            yield {
+                type: 'tool_dispatched',
+                toolCallId: event.callId,
+                toolName: event.toolName,
+            };
+            continue;
+        }
         const item = event.item;
         captureToolCallArguments(item, opts.toolCallArgumentsById);
         opts.onRunItem?.(item);
@@ -187,13 +209,16 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
     // the run) and stays authoritative for the terminal result, the session
     // accumulator, and persisted turn usage. The footer, though, is a
     // per-model-turn indicator: it should keep showing the most recent request's
-    // own usage rather than the accumulated run total. The live `usage_update`
-    // path never fires for application run-loop streams (usage is only carried on
-    // terminal completions), so without this the footer falls back to the run
-    // total and reads as an accumulated stat. Surface the last raw response's
-    // per-request usage as one final `usage_update` so the UI's per-turn path
-    // receives a true per-request figure. Providers without per-request usage
-    // emit nothing here and the footer falls back to the run total as before.
+    // own usage rather than the accumulated run total. Surface the last raw
+    // response's per-request usage as one final `usage_update` so the UI's
+    // per-turn path receives a true per-request figure even when no live update
+    // fired. Providers without per-request usage emit nothing here and the footer
+    // falls back to the run total as before.
+    //
+    // The application run loop emits a live `usage_update` as each request
+    // settles, so for those streams this restates the last request's usage
+    // harmlessly. It stays for stream sources that carry usage only on the
+    // terminal completion.
     if (usageFromRawResponses) {
         yield { type: 'usage_update', usage: usageFromRawResponses };
     }

package/dist/services/stream-event-processor.js.map

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

package/dist/services/subagents/execution-runner.d.ts

@@ -17,7 +17,7 @@ export declare class ExecutionSubagentRunner {
         executionContext?: ExecutionContext;
         createClient?: ISubagentClientFactory['createClient'];
         toolFactory: SubagentToolFactory;
-        onEvent?: (event: ConversationEvent) => void;
+        onEvent?: (event: ConversationEvent) => void | PromiseLike<void>;
         skillsService?: SkillsService;
         toolOwnership: ToolOwnershipRegistry;
     });

package/dist/services/subagents/execution-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution-runner.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/execution-runner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAClB,cAAc,EAEd,sBAAsB,EACvB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,mBAAmB,EAA0B,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAaxD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAKpF,qBAAa,uBAAuB;;IAWlC,YAAY,IAAI,EAAE;QAChB,MAAM,EAAE,eAAe,CAAC;QACxB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,qBAAqB,EAAE,sBAAsB,CAAC;QAC9C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACtD,WAAW,EAAE,mBAAmB,CAAC;QACjC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;QAC7C,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,aAAa,EAAE,qBAAqB,CAAC;KACtC,EAUA;IAEK,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC,CAY5G;IAEK,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,UAAU,EAAE,kBAAkB,EAC9B,OAAO,EAAE,eAAe,EACxB,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,MAAM,CAAC,EAAE,WAAW,EACpB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,EACpD,cAAc,CAAC,EAAE,sBAAsB,EACvC,KAAK,SAAe,GACnB,OAAO,CAAC,cAAc,CAAC,CAYzB;CAgWF"}
+{"version":3,"file":"execution-runner.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/execution-runner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAClB,cAAc,EAEd,sBAAsB,EACvB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,mBAAmB,EAA0B,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAaxD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAKpF,qBAAa,uBAAuB;;IAWlC,YAAY,IAAI,EAAE;QAChB,MAAM,EAAE,eAAe,CAAC;QACxB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,qBAAqB,EAAE,sBAAsB,CAAC;QAC9C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACtD,WAAW,EAAE,mBAAmB,CAAC;QACjC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACjE,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,aAAa,EAAE,qBAAqB,CAAC;KACtC,EAUA;IAEK,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC,CAY5G;IAEK,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,UAAU,EAAE,kBAAkB,EAC9B,OAAO,EAAE,eAAe,EACxB,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,MAAM,CAAC,EAAE,WAAW,EACpB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,EACpD,cAAc,CAAC,EAAE,sBAAsB,EACvC,KAAK,SAAe,GACnB,OAAO,CAAC,cAAc,CAAC,CAYzB;CAoZF"}