@qduc/term2 0.11.1 → 0.12.0

package/dist/lib/tool-invoke.d.ts

@@ -1,5 +1,5 @@
-import type { Tool } from '@openai/agents';
 import { z } from 'zod';
+import type { AnyToolDefinition, ToolParameterSchema } from '../tools/types.js';
 /**
  * Heuristic-based JSON repair for common model-generated errors.
  *
@@ -14,6 +14,12 @@ import { z } from 'zod';
  * input, so already-valid JSON is never modified.
  */
 export declare const repairJson: (text: string) => string;
+/**
+ * Normalize heterogeneous tool arguments before invoking an erased registry
+ * entry. Strict-provider JSON schemas are already transport-normalized; Zod
+ * schemas retain the established object coercions without parsing defaults.
+ */
+export declare const normalizeToolParameters: (params: unknown, schema: ToolParameterSchema) => unknown;
 /**
  * Normalize a plain-object params bag in-place according to the Zod schema.
  *
@@ -43,7 +49,15 @@ export declare const isInvalidToolInputError: (error: any) => boolean;
  * (mirroring the SDK's default behavior) so the runner stays stable.
  */
 export declare const toolErrorFunction: (_context: unknown, error: unknown) => string;
-export declare const wrapToolInvoke: <T extends Tool>(tool: T, originalSchema?: z.ZodTypeAny, options?: {
+/**
+ * Wraps a `ToolDefinition`'s `execute` with the input normalisation and schema
+ * diagnostics the SDK-era `tool()` + `invoke` pipeline provided: JSON-string
+ * params (direct invokers) go through the string pipeline (repair per mode),
+ * already-parsed objects get the schema-aware coercions directly, and
+ * structurally invalid params become a non-fatal diagnostic result string so
+ * the model can self-correct within the same turn.
+ */
+export declare const wrapToolInvoke: <T extends AnyToolDefinition>(tool: T, originalSchema?: z.ZodTypeAny, options?: {
     argumentParsing?: ToolInputNormalizationMode;
 }) => T;
 /**
@@ -59,14 +73,8 @@ export declare const wrapToolInvoke: <T extends Tool>(tool: T, originalSchema?:
  * This handles the OpenAI strict-schema convention where omitted optional fields
  * arrive as null, as well as models that stringify structured parameters.
  */
-export declare function wrapNeedsApproval(definition: {
+export declare function wrapNeedsApproval(definition: Pick<AnyToolDefinition, 'parameters' | 'needsApproval'> & {
     name?: string;
-    parameters: {
-        safeParse: (v: unknown) => {
-            success: boolean;
-        };
-    };
-    needsApproval: (params: unknown, context?: unknown) => Promise<boolean> | boolean;
 }, options?: {
     checkInterceptors?: (params: unknown) => Promise<string | null>;
     toolName?: string;
@@ -77,6 +85,6 @@ export declare function wrapNeedsApproval(definition: {
             needsApproval: (params: unknown, context?: unknown) => Promise<boolean> | boolean;
         }) => void;
     };
-}): (context: unknown, params: unknown) => Promise<boolean>;
+}): (params: unknown, context?: unknown) => Promise<boolean>;
 export {};
 //# sourceMappingURL=tool-invoke.d.ts.map

package/dist/lib/tool-invoke.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-invoke.d.ts","sourceRoot":"","sources":["../../source/lib/tool-invoke.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAgB,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA0ExB;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,MA2DzC,CAAC;AA2BF;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,WAAY,OAAO,WAAW,CAAC,CAAC,UAAU,KAAG,OA6F9E,CAAC;AAEF,KAAK,0BAA0B,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEtD,eAAO,MAAM,kBAAkB,UACtB,OAAO,WACL,CAAC,CAAC,UAAU,SACf,0BAA0B,KAC/B,MA4BF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,UAAW,GAAG,KAAG,OAIpD,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,aAAc,OAAO,SAAS,OAAO,KAAG,MASrE,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,IAAI,QACrC,CAAC,mBACU,CAAC,CAAC,UAAU,YACpB;IAAE,eAAe,CAAC,EAAE,0BAA0B,CAAA;CAAE,KACxD,CA8DF,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE;IACV,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,EAAE;QAAE,SAAS,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK;YAAE,OAAO,EAAE,OAAO,CAAA;SAAE,CAAA;KAAE,CAAC;IAChE,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CACnF,EACD,OAAO,CAAC,EAAE;IAGR,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAChE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE;QACT,QAAQ,EAAE,CAAC,YAAY,EAAE;YACvB,QAAQ,EAAE,MAAM,CAAC;YACjB,UAAU,CAAC,EAAE,OAAO,CAAC;YACrB,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;SACnF,KAAK,IAAI,CAAC;KACZ,CAAC;CACH,GACA,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAuDzD"}
+{"version":3,"file":"tool-invoke.d.ts","sourceRoot":"","sources":["../../source/lib/tool-invoke.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AA6FhF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,MA2DzC,CAAC;AA2BF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,WAAY,OAAO,UAAU,mBAAmB,KAAG,OACJ,CAAC;AAEpF;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,WAAY,OAAO,WAAW,CAAC,CAAC,UAAU,KAAG,OA6F9E,CAAC;AAEF,KAAK,0BAA0B,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEtD,eAAO,MAAM,kBAAkB,UACtB,OAAO,WACL,CAAC,CAAC,UAAU,SACf,0BAA0B,KAC/B,MA4BF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,UAAW,GAAG,KAAG,OAIpD,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,aAAc,OAAO,SAAS,OAAO,KAAG,MASrE,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,iBAAiB,QAClD,CAAC,mBACU,CAAC,CAAC,UAAU,YACpB;IAAE,eAAe,CAAC,EAAE,0BAA0B,CAAA;CAAE,KACxD,CAsEF,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,eAAe,CAAC,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EACvF,OAAO,CAAC,EAAE;IAGR,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAChE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE;QACT,QAAQ,EAAE,CAAC,YAAY,EAAE;YACvB,QAAQ,EAAE,MAAM,CAAC;YACjB,UAAU,CAAC,EAAE,OAAO,CAAC;YACrB,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;SACnF,KAAK,IAAI,CAAC;KACZ,CAAC;CACH,GACA,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CA4D1D"}

package/dist/lib/tool-invoke.js

@@ -1,11 +1,29 @@
 import { z } from 'zod';
 import { isAbortLike } from '../services/subagents/utils.js';
 import { unwrapSchema } from '../services/settings/setting-schema-utils.js';
+import { isZodToolParameterSchema } from '../tools/types.js';
 /**
  * Maximum payload size (in characters) for which JSON repair is attempted.
  * Very large payloads are returned as-is to avoid regex backtracking costs.
  */
 const MAX_REPAIR_LENGTH = 200_000;
+const MAX_VALIDATION_ISSUES = 8;
+const MAX_VALIDATION_FEEDBACK_CHARS = 2_048;
+const MAX_VALIDATION_FIELD_CHARS = 160;
+const MAX_VALIDATION_KEYS = 16;
+const truncateValidationText = (value, limit = MAX_VALIDATION_FIELD_CHARS) => value.length <= limit ? value : `${value.slice(0, limit - 1)}…`;
+const describeValidationInput = (input) => {
+    if (Array.isArray(input)) {
+        return `Received an array with ${input.length} item${input.length === 1 ? '' : 's'}.`;
+    }
+    if (input && typeof input === 'object') {
+        const keys = Object.keys(input).sort();
+        const displayedKeys = keys.slice(0, MAX_VALIDATION_KEYS);
+        const remainder = keys.length - displayedKeys.length;
+        return `Received keys: ${displayedKeys.join(', ')}${remainder > 0 ? `, and ${remainder} more` : ''}.`;
+    }
+    return `Received ${input === null ? 'null' : typeof input}.`;
+};
 const escapeRawControlCharactersInStrings = (text) => {
     let result = '';
     let inString = false;
@@ -148,6 +166,12 @@ function getObjectShape(schema) {
     return null;
 }
 // Re-exported from setting-schema-utils for tool parameter normalization.
+/**
+ * Normalize heterogeneous tool arguments before invoking an erased registry
+ * entry. Strict-provider JSON schemas are already transport-normalized; Zod
+ * schemas retain the established object coercions without parsing defaults.
+ */
+export const normalizeToolParameters = (params, schema) => isZodToolParameterSchema(schema) ? normalizeObjectParams(params, schema) : params;
 /**
  * Normalize a plain-object params bag in-place according to the Zod schema.
  *
@@ -310,57 +334,76 @@ export const toolErrorFunction = (_context, error) => {
     const details = error instanceof Error ? error.toString() : String(error);
     return `An error occurred while running the tool. Please try again. Error: ${details}`;
 };
+/**
+ * Wraps a `ToolDefinition`'s `execute` with the input normalisation and schema
+ * diagnostics the SDK-era `tool()` + `invoke` pipeline provided: JSON-string
+ * params (direct invokers) go through the string pipeline (repair per mode),
+ * already-parsed objects get the schema-aware coercions directly, and
+ * structurally invalid params become a non-fatal diagnostic result string so
+ * the model can self-correct within the same turn.
+ */
 export const wrapToolInvoke = (tool, originalSchema, options = {}) => {
-    // Only FunctionTool has an invoke method
-    if (tool.type !== 'function') {
-        return tool;
-    }
-    const functionTool = tool;
-    const originalInvoke = functionTool.invoke.bind(functionTool);
-    functionTool.invoke = async (context, input, details) => {
-        const targetSchema = originalSchema || functionTool.parameters;
-        const normalizedInput = normalizeToolInput(input, targetSchema, options.argumentParsing ?? 'repair');
-        const runDiagnostics = (toolName, schema, rawInput) => {
-            let parsedInput;
-            try {
-                parsedInput = typeof rawInput === 'string' ? JSON.parse(rawInput) : rawInput;
+    const targetSchema = originalSchema || tool.parameters;
+    const originalExecute = tool.execute.bind(tool);
+    const runDiagnostics = (toolName, schema, rawInput) => {
+        let parsedInput;
+        try {
+            parsedInput = typeof rawInput === 'string' ? JSON.parse(rawInput) : rawInput;
+        }
+        catch {
+            parsedInput = rawInput;
+        }
+        const zodSchema = getZodSchema(schema);
+        if (zodSchema) {
+            const parseResult = zodSchema.safeParse(parsedInput);
+            if (!parseResult.success) {
+                const issues = parseResult.error.issues.slice(0, MAX_VALIDATION_ISSUES).map((issue) => {
+                    const field = truncateValidationText(issue.path.join('.') || 'input');
+                    let msg = truncateValidationText(String(issue.message).replace(/\s+/g, ' '));
+                    if (issue.code === 'invalid_type') {
+                        msg = `must be ${issue.expected}`;
+                    }
+                    return `${field} ${msg}`;
+                });
+                const feedback = `Tool input did not match schema for ${toolName}: ${issues.join('; ')}. ${describeValidationInput(parsedInput)} Retry with valid JSON arguments.`;
+                return truncateValidationText(feedback, MAX_VALIDATION_FEEDBACK_CHARS);
             }
-            catch {
-                parsedInput = rawInput;
+        }
+        return `Tool input was invalid for this tool. Retry with arguments matching the tool schema.`;
+    };
+    tool.execute = async (params, context, details) => {
+        try {
+            let normalizedInput = params;
+            if (typeof params === 'string') {
+                const json = normalizeToolInput(params, targetSchema, options.argumentParsing ?? 'repair');
+                try {
+                    normalizedInput = JSON.parse(json);
+                }
+                catch (error) {
+                    throw Object.assign(error, { name: 'InvalidToolInputError' });
+                }
             }
-            const zodSchema = getZodSchema(schema);
-            if (zodSchema) {
-                const parseResult = zodSchema.safeParse(parsedInput);
-                if (!parseResult.success) {
-                    const issues = parseResult.error.issues.map((issue) => {
-                        const field = issue.path.join('.') || 'input';
-                        let actualVal = parsedInput;
-                        for (const segment of issue.path) {
-                            if (actualVal && typeof actualVal === 'object') {
-                                actualVal = actualVal[segment];
-                            }
-                        }
-                        const valStr = typeof actualVal === 'string' ? `"${actualVal}"` : JSON.stringify(actualVal);
-                        const typeStr = actualVal === null ? 'null' : typeof actualVal;
-                        let msg = issue.message;
-                        if (issue.code === 'invalid_type') {
-                            msg = `must be ${issue.expected}`;
-                        }
-                        return `${field} ${msg}, got ${typeStr} ${valStr}`;
-                    });
-                    return `Tool input did not match schema for ${toolName}: ${issues.join('; ')}. Retry with valid JSON arguments.`;
+            else {
+                try {
+                    normalizedInput = normalizeObjectParams(params, targetSchema);
+                }
+                catch {
+                    normalizedInput = params;
                 }
             }
-            return `Tool input was invalid for this tool. Retry with arguments matching the tool schema.`;
-        };
-        try {
-            return await originalInvoke(context, normalizedInput, details);
+            // Schema validation before execute: structurally invalid params become a
+            // non-fatal diagnostic result, matching the old invoke path.
+            const zodSchema = getZodSchema(targetSchema);
+            if (zodSchema && !zodSchema.safeParse(normalizedInput).success) {
+                return runDiagnostics(tool.name ?? 'unknown', targetSchema, normalizedInput);
+            }
+            return await originalExecute(normalizedInput, context, details);
         }
         catch (error) {
             if (isInvalidToolInputError(error)) {
                 // Surface schema diagnostics as a non-fatal tool result so the model
                 // can self-correct within the same turn, rather than aborting the run.
-                return runDiagnostics(functionTool.name, targetSchema, normalizedInput);
+                return runDiagnostics(tool.name ?? 'unknown', targetSchema, params);
             }
             throw error;
         }
@@ -389,7 +432,12 @@ export function wrapNeedsApproval(definition, options) {
             needsApproval: definition.needsApproval,
         });
     }
-    return async (context, params) => {
+    // (params, context) order matches ToolDefinition.needsApproval and the
+    // ApplicationRunLoop's `needsApproval(params, toolContext)` call. The SDK
+    // convention was (context, args); shipping that here silently swapped the
+    // loop's arguments, so the wrapper schema-validated the loop's options bag
+    // and every wrapped tool reported "no approval needed".
+    return async (params, context) => {
         if (options?.checkInterceptors) {
             try {
                 const rejectionMessage = await options.checkInterceptors(params);
@@ -407,7 +455,7 @@ export function wrapNeedsApproval(definition, options) {
         // or normalisation itself throws.
         let normalized;
         try {
-            normalized = normalizeObjectParams(params, definition.parameters);
+            normalized = normalizeToolParameters(params, definition.parameters);
         }
         catch {
             normalized =
@@ -415,7 +463,7 @@ export function wrapNeedsApproval(definition, options) {
                     ? Object.fromEntries(Object.entries(params).map(([k, v]) => [k, v === null ? undefined : v]))
                     : params;
         }
-        if (!definition.parameters.safeParse(normalized).success) {
+        if (isZodToolParameterSchema(definition.parameters) && !definition.parameters.safeParse(normalized).success) {
             return false;
         }
         try {

package/dist/lib/tool-invoke.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-invoke.js","sourceRoot":"","sources":["../../source/lib/tool-invoke.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-invoke.js","sourceRoot":"","sources":["../../source/lib/tool-invoke.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AAE5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAE7D;;;GAGG;AACH,MAAM,iBAAiB,GAAG,OAAO,CAAC;AAClC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAChC,MAAM,6BAA6B,GAAG,KAAK,CAAC;AAC5C,MAAM,0BAA0B,GAAG,GAAG,CAAC;AACvC,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B,MAAM,sBAAsB,GAAG,CAAC,KAAa,EAAE,KAAK,GAAG,0BAA0B,EAAU,EAAE,CAC3F,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC;AAElE,MAAM,uBAAuB,GAAG,CAAC,KAAc,EAAU,EAAE;IACzD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,0BAA0B,KAAK,CAAC,MAAM,QAAQ,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;IACxF,CAAC;IACD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAgC,CAAC,CAAC,IAAI,EAAE,CAAC;QAClE,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;QACrD,OAAO,kBAAkB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,SAAS,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;IACxG,CAAC;IACD,OAAO,YAAY,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,KAAK,GAAG,CAAC;AAC/D,CAAC,CAAC;AAEF,MAAM,mCAAmC,GAAG,CAAC,IAAY,EAAU,EAAE;IACnE,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QAEzB,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACjB,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC;YACD,MAAM,IAAI,IAAI,CAAC;YACf,SAAS;QACX,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,IAAI,IAAI,CAAC;YACf,OAAO,GAAG,KAAK,CAAC;YAChB,SAAS;QACX,CAAC;QAED,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,IAAI,CAAC;YACf,OAAO,GAAG,IAAI,CAAC;YACf,SAAS;QACX,CAAC;QAED,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACjB,QAAQ,GAAG,KAAK,CAAC;YACjB,MAAM,IAAI,IAAI,CAAC;YACf,SAAS;QACX,CAAC;QAED,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC7B,KAAK,EAAE,CAAC;YACV,CAAC;YACD,MAAM,IAAI,KAAK,CAAC;YAChB,SAAS;QACX,CAAC;QAED,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC;YAChB,SAAS;QACX,CAAC;QAED,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC;YAChB,SAAS;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,QAAQ,GAAG,IAAI,EAAE,CAAC;YACpB,MAAM,IAAI,MAAM,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;YACzD,SAAS;QACX,CAAC;QAED,MAAM,IAAI,IAAI,CAAC;IACjB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAU,EAAE;IACjD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IAE7C,kEAAkE;IAClE,IAAI,IAAI,CAAC,MAAM,GAAG,iBAAiB;QAAE,OAAO,IAAI,CAAC;IAEjD,kEAAkE;IAClE,IAAI,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,+BAA+B;IACjC,CAAC;IAED,IAAI,QAAQ,GAAG,IAAI,CAAC;IAEpB,kDAAkD;IAClD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAErF,sDAAsD;IACtD,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC9D,IAAI,SAAS,EAAE,CAAC;QACd,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAED,sEAAsE;IACtE,IAAI,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACrB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,+BAA+B;IACjC,CAAC;IAED,oEAAoE;IACpE,2EAA2E;IAC3E,8DAA8D;IAC9D,QAAQ,GAAG,mCAAmC,CAAC,QAAQ,CAAC,CAAC;IAEzD,IAAI,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACrB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,+BAA+B;IACjC,CAAC;IAED,gDAAgD;IAChD,8FAA8F;IAC9F,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,oCAAoC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACpG,sEAAsE;QACtE,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC3D,OAAO,MAAM,GAAG,cAAc,GAAG,MAAM,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,QAAQ,GAAG,mCAAmC,CAAC,QAAQ,CAAC,CAAC;IAEzD,2CAA2C;IAC3C,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAElD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,SAAS,YAAY,CAAC,MAAW;IAC/B,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,IAAI,MAAM,CAAC,SAAS,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;QAC/D,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,IAAI,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;QACnE,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,cAAc,CAAC,MAAW;IACjC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IAC5B,IAAI,SAAS,YAAY,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACxD,OAAO,SAAS,CAAC,KAAK,CAAC;IACzB,CAAC;IACD,IAAI,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QAC5C,OAAO,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,0EAA0E;AAE1E;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,MAAe,EAAE,MAA2B,EAAW,EAAE,CAC/F,wBAAwB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AAEpF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,MAAe,EAAE,MAAqB,EAAW,EAAE;IACvF,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IAC3D,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IACvE,IAAI,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IAE3B,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACrC,IAAI,CAAC,KAAK;QAAE,OAAO,MAAM,CAAC;IAE1B,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,MAAM,GAAG,EAAE,GAAI,MAAkC,EAAE,CAAC;IAE1D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,CAAC,SAAS,KAAK,UAAU;YAAE,SAAS;QAE1E,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,KAAK,KAAK,SAAS;YAAE,SAAS;QAElC,8EAA8E;QAC9E,IAAI,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;YAC7C,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,EAAE,IAAI,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACpG,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;gBACnB,QAAQ,GAAG,IAAI,CAAC;gBAChB,SAAS;YACX,CAAC;QACH,CAAC;QAED,iDAAiD;QACjD,MAAM,MAAM,GACV,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO;YACnC,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO;YACpC,CAAC,WAAW,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC;QAClD,IAAI,MAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACxC,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;YAClC,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;gBACrB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;gBACnB,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC;iBAAM,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;gBAC7B,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACpB,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC;QACH,CAAC;QAED,+BAA+B;QAC/B,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC;QACpG,IAAI,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC1C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;YAC7B,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;gBACnB,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC/B,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC5B,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;oBACrB,QAAQ,GAAG,IAAI,CAAC;gBAClB,CAAC;YACH,CAAC;QACH,CAAC;QAED,8DAA8D;QAC9D,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;QAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,SAAS,EAAE,CAAC;YAC3C,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC;YAC5C,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;gBAC1C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC7B,IAAI,CAAC,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,UAAU,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC1G,IAAI,CAAC;wBACH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;wBACxC,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;4BAC/B,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;4BAC1B,QAAQ,GAAG,IAAI,CAAC;wBAClB,CAAC;oBACH,CAAC;oBAAC,MAAM,CAAC;wBACP,uBAAuB;oBACzB,CAAC;gBACH,CAAC;qBAAM,IACL,CAAC,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,WAAW,CAAC;oBACnD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;oBACvB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EACrB,CAAC;oBACD,IAAI,CAAC;wBACH,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;wBACtC,IAAI,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;4BAC5E,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;4BACxB,QAAQ,GAAG,IAAI,CAAC;wBAClB,CAAC;oBACH,CAAC;oBAAC,MAAM,CAAC;wBACP,uBAAuB;oBACzB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;AACpC,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAAc,EACd,MAAqB,EACrB,IAAI,GAA+B,QAAQ,EACnC,EAAE;IACV,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAChC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAChC,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;IACH,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,UAAU,GAAG,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACzD,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;gBAC1B,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,iDAAiD;QACnD,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,KAAU,EAAW,EAAE;IAC7D,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC;IACnD,OAAO,IAAI,KAAK,uBAAuB,IAAI,IAAI,KAAK,0BAA0B,CAAC;AACjF,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAAiB,EAAE,KAAc,EAAU,EAAE;IAC7E,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,WAAW,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;QAC3E,MAAM,KAAK,CAAC;IACd,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1E,OAAO,sEAAsE,OAAO,EAAE,CAAC;AACzF,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,IAAO,EACP,cAA6B,EAC7B,OAAO,GAAqD,EAAE,EAC3D,EAAE;IACL,MAAM,YAAY,GAAG,cAAc,IAAI,IAAI,CAAC,UAAU,CAAC;IACvD,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEhD,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,MAAoB,EAAE,QAAa,EAAU,EAAE;QACvF,IAAI,WAAgB,CAAC;QACrB,IAAI,CAAC;YACH,WAAW,GAAG,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC/E,CAAC;QAAC,MAAM,CAAC;YACP,WAAW,GAAG,QAAQ,CAAC;QACzB,CAAC;QAED,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACrD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;gBACzB,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE;oBACzF,MAAM,KAAK,GAAG,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC;oBACtE,IAAI,GAAG,GAAG,sBAAsB,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;oBAC7E,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;wBAClC,GAAG,GAAG,WAAW,KAAK,CAAC,QAAQ,EAAE,CAAC;oBACpC,CAAC;oBACD,OAAO,GAAG,KAAK,IAAI,GAAG,EAAE,CAAC;gBAC3B,CAAC,CAAC,CAAC;gBACH,MAAM,QAAQ,GAAG,uCAAuC,QAAQ,KAAK,MAAM,CAAC,IAAI,CAC9E,IAAI,CACL,KAAK,uBAAuB,CAAC,WAAW,CAAC,mCAAmC,CAAC;gBAC9E,OAAO,sBAAsB,CAAC,QAAQ,EAAE,6BAA6B,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;QACD,OAAO,sFAAsF,CAAC;IAChG,CAAC,CAAC;IAEF,IAAI,CAAC,OAAO,GAAG,KAAK,EAAE,MAAW,EAAE,OAAgB,EAAE,OAAY,EAAE,EAAE;QACnE,IAAI,CAAC;YACH,IAAI,eAAe,GAAY,MAAM,CAAC;YACtC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC/B,MAAM,IAAI,GAAG,kBAAkB,CAAC,MAAM,EAAE,YAAmB,EAAE,OAAO,CAAC,eAAe,IAAI,QAAQ,CAAC,CAAC;gBAClG,IAAI,CAAC;oBACH,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACrC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,MAAM,CAAC,MAAM,CAAC,KAAc,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC,CAAC;gBACzE,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC;oBACH,eAAe,GAAG,qBAAqB,CAAC,MAAM,EAAE,YAA4B,CAAC,CAAC;gBAChF,CAAC;gBAAC,MAAM,CAAC;oBACP,eAAe,GAAG,MAAM,CAAC;gBAC3B,CAAC;YACH,CAAC;YAED,yEAAyE;YACzE,6DAA6D;YAC7D,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;YAC7C,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,CAAC;gBAC/D,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE,YAAmB,EAAE,eAAe,CAAC,CAAC;YACtF,CAAC;YAED,OAAO,MAAM,eAAe,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAClE,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnC,qEAAqE;gBACrE,uEAAuE;gBACvE,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE,YAAmB,EAAE,MAAM,CAAC,CAAC;YAC7E,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,iBAAiB,CAC/B,UAAuF,EACvF,OAYC;IAED,MAAM,kBAAkB,GAAG,OAAO,EAAE,QAAQ,IAAI,UAAU,CAAC,IAAI,CAAC;IAChE,IAAI,kBAAkB,IAAI,OAAO,EAAE,QAAQ,EAAE,CAAC;QAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACxB,QAAQ,EAAE,kBAAkB;YAC5B,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,aAAa,EAAE,UAAU,CAAC,aAAa;SACxC,CAAC,CAAC;IACL,CAAC;IAED,uEAAuE;IACvE,0EAA0E;IAC1E,0EAA0E;IAC1E,2EAA2E;IAC3E,wDAAwD;IACxD,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC/B,IAAI,OAAO,EAAE,iBAAiB,EAAE,CAAC;YAC/B,IAAI,CAAC;gBACH,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBACjE,IAAI,gBAAgB,EAAE,CAAC;oBACrB,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,mEAAmE;gBACnE,kDAAkD;YACpD,CAAC;QACH,CAAC;QAED,gFAAgF;QAChF,2EAA2E;QAC3E,kCAAkC;QAClC,IAAI,UAAmB,CAAC;QACxB,IAAI,CAAC;YACH,UAAU,GAAG,uBAAuB,CAAC,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;QACtE,CAAC;QAAC,MAAM,CAAC;YACP,UAAU;gBACR,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;oBACrE,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,MAAiC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACnG;oBACH,CAAC,CAAC,MAAM,CAAC;QACf,CAAC;QAED,IAAI,wBAAwB,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;YAC5G,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAC7E,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC;gBACvB,OAAO,gBAAgB,CAAC;YAC1B,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,yEAAyE;YACzE,mEAAmE;YACnE,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}

package/dist/non-interactive.d.ts

@@ -1,21 +1,32 @@
-import type { AgentClient } from './lib/agent-client.js';
 import type { ILoggingService, ISettingsService, ISessionContextService } from './services/service-interfaces.js';
+import { type SessionClientFactory } from './services/session/session-client-factory.js';
+import type { ConversationAgentClient } from './services/conversation-agent-client.js';
 import type { ConversationEvent } from './services/conversation/conversation-events.js';
 import type { UserTurn } from './types/user-turn.js';
 import type { ConversationTerminal } from './contracts/conversation.js';
 import type { SendMessageOptions, HandleApprovalDecisionOptions } from './services/conversation/conversation-adapter.js';
 import type { SavedToolExecution } from './services/tool-execution-ledger.js';
+import { ToolOwnershipRegistry } from './services/approval/tool-ownership-registry.js';
+import type { HookLifecyclePort } from './services/hooks/hook-service.js';
+import type { HookEventFactory } from './services/hooks/hook-event-factory.js';
 export interface NonInteractiveConfig {
     prompt: string;
     autoApprove: boolean;
     stdout?: NodeJS.WritableStream;
     stderr?: NodeJS.WritableStream;
     settingsService?: ISettingsService;
-    agentClient?: AgentClient;
+    /** Compatibility seam; the caller continues to own this client. */
+    agentClient?: ConversationAgentClient;
+    /** Required with a caller-owned client to preserve approval/nested identity. */
+    toolOwnership?: ToolOwnershipRegistry;
+    /** Production seam; creates a client owned by this one-shot session. */
+    sessionClientFactory?: SessionClientFactory;
     logger?: ILoggingService;
     sessionContextService?: ISessionContextService;
+    hookLifecycle?: HookLifecyclePort;
+    hookEvents?: HookEventFactory;
 }
-export declare const NON_INTERACTIVE_REJECTION_REASON = "Non-interactive mode: use --auto-approve to allow tool execution";
+export { NON_INTERACTIVE_REJECTION_REASON } from './services/approval/non-interactive-approval-policy.js';
 export declare const createNonInteractiveSessionId: () => string;
 export interface ConversationSessionLike {
     sendMessage(input: string | UserTurn, options?: SendMessageOptions): Promise<ConversationTerminal>;
@@ -29,7 +40,6 @@ export interface ConversationSessionLike {
 }
 export declare function runWithSession(session: ConversationSessionLike, config: NonInteractiveConfig): Promise<number>;
 export declare function runNonInteractive(config: NonInteractiveConfig & {
-    agentClient: AgentClient;
     logger: ILoggingService;
     settingsService: ISettingsService;
 }): Promise<number>;

package/dist/non-interactive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"non-interactive.d.ts","sourceRoot":"","sources":["../source/non-interactive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAGlH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACxF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAsB,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,KAAK,EACV,kBAAkB,EAClB,6BAA6B,EAC9B,MAAM,iDAAiD,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAM9E,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,eAAe,CAAC,EAAE,gBAAgB,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;CAChD;AAED,eAAO,MAAM,gCAAgC,qEAAqE,CAAC;AAEnH,eAAO,MAAM,6BAA6B,QAAO,MAA2C,CAAC;AAE7F,MAAM,WAAW,uBAAuB;IACtC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnG,sBAAsB,CACpB,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,MAAM,EACxB,OAAO,CAAC,EAAE,6BAA6B,GACtC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IACxC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;IAC3E,WAAW,CAAC,IAAI;QAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,UAAU,EAAE,kBAAkB,EAAE,CAAA;KAAE,CAAC;CAC7G;AAuCD,wBAAsB,cAAc,CAAC,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0IpH;AAED,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,oBAAoB,GAAG;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,eAAe,CAAC;IACxB,eAAe,EAAE,gBAAgB,CAAC;CACnC,GACA,OAAO,CAAC,MAAM,CAAC,CAiBjB"}
+{"version":3,"file":"non-interactive.d.ts","sourceRoot":"","sources":["../source/non-interactive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAGlH,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACxF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EACV,kBAAkB,EAClB,6BAA6B,EAC9B,MAAM,iDAAiD,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AAEvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE/E,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,eAAe,CAAC,EAAE,gBAAgB,CAAC;IACnC,mEAAmE;IACnE,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC,gFAAgF;IAChF,aAAa,CAAC,EAAE,qBAAqB,CAAC;IACtC,wEAAwE;IACxE,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;IAC/C,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,UAAU,CAAC,EAAE,gBAAgB,CAAC;CAC/B;AAED,OAAO,EAAE,gCAAgC,EAAE,MAAM,wDAAwD,CAAC;AAE1G,eAAO,MAAM,6BAA6B,QAAO,MAA2C,CAAC;AAE7F,MAAM,WAAW,uBAAuB;IACtC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnG,sBAAsB,CACpB,MAAM,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,MAAM,EACxB,OAAO,CAAC,EAAE,6BAA6B,GACtC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IACxC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;IAC3E,WAAW,CAAC,IAAI;QAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,UAAU,EAAE,kBAAkB,EAAE,CAAA;KAAE,CAAC;CAC7G;AAuCD,wBAAsB,cAAc,CAAC,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAgGpH;AAED,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,oBAAoB,GAAG;IAC7B,MAAM,EAAE,eAAe,CAAC;IACxB,eAAe,EAAE,gBAAgB,CAAC;CACnC,GACA,OAAO,CAAC,MAAM,CAAC,CAwEjB"}

package/dist/non-interactive.js

@@ -1,10 +1,9 @@
 import { createConversationRuntime } from './services/conversation/conversation-runtime-factory.js';
 import { SessionContextService } from './services/session/session-context-service.js';
+import { createCallerOwnedSessionClientFactory, } from './services/session/session-client-factory.js';
 import { randomUUID } from 'node:crypto';
-import { classifyCommandDetailed } from './utils/shell/command-safety/index.js';
-import { SafetyStatus } from './utils/shell/command-safety/constants.js';
-import { evaluateShellAutoApprovalAdvisories } from './services/approval/shell-auto-approval-evaluator.js';
-export const NON_INTERACTIVE_REJECTION_REASON = 'Non-interactive mode: use --auto-approve to allow tool execution';
+import { NonInteractiveApprovalPolicy } from './services/approval/non-interactive-approval-policy.js';
+export { NON_INTERACTIVE_REJECTION_REASON } from './services/approval/non-interactive-approval-policy.js';
 export const createNonInteractiveSessionId = () => `non-interactive-${randomUUID()}`;
 const safePreview = (value, maxLen = 500) => {
     try {
@@ -46,8 +45,16 @@ export async function runWithSession(session, config) {
     const stdout = config.stdout ?? process.stdout;
     const stderr = config.stderr ?? process.stderr;
     const sessionContextService = config.sessionContextService ?? new SessionContextService();
+    const approvalPolicy = new NonInteractiveApprovalPolicy({
+        settingsService: config.settingsService,
+        agentClient: config.agentClient,
+        logger: config.logger,
+        sessionContextService,
+    });
+    let streamedTextLength = 0;
     const onEvent = (event) => {
         if (event.type === 'text_delta') {
+            streamedTextLength += event.delta.length;
             stdout.write(event.delta);
             return;
         }
@@ -55,6 +62,16 @@ export async function runWithSession(session, config) {
             stderr.write(event.delta);
             return;
         }
+        if (event.type === 'final') {
+            // Some completion paths (e.g. tool-only turns, or providers that don't
+            // stream token deltas) deliver the response text solely via `finalText`
+            // rather than `text_delta`. Write whatever wasn't already streamed so
+            // the response isn't silently dropped.
+            if (event.finalText && event.finalText.length > streamedTextLength) {
+                stdout.write(event.finalText.slice(streamedTextLength));
+            }
+            return;
+        }
         const line = formatEventForStderr(event);
         if (line) {
             stderr.write(line);
@@ -73,77 +90,18 @@ export async function runWithSession(session, config) {
             ? await session.sendMessage(config.prompt)
             : await session.sendMessage(config.prompt, { onEvent });
         while (result?.type === 'approval_required') {
-            if (config.autoApprove) {
-                const approval = result.approval;
-                let shouldApprove = true;
-                let rejectionReason;
-                if (approval.toolName === 'shell' || approval.toolName === 'bash') {
-                    const command = approval.argumentsText;
-                    const classification = classifyCommandDetailed(command, config.logger);
-                    if (classification.status === SafetyStatus.RED) {
-                        shouldApprove = false;
-                        rejectionReason = `Heuristic validation failed: command is RED (dangerous) and cannot be executed automatically: ${command}`;
-                    }
-                    else if (classification.status === SafetyStatus.YELLOW) {
-                        const autoApproveModel = config.settingsService && config.agentClient
-                            ? config.settingsService.get('agent.choreModel') ??
-                                config.settingsService.get('agent.autoApproveModel')
-                            : undefined;
-                        if (!autoApproveModel) {
-                            shouldApprove = false;
-                            rejectionReason = `Heuristic validation failed: command is YELLOW (suspicious) and no auto-approve model is configured: ${command}`;
-                        }
-                        else {
-                            const history = session.exportState ? session.exportState().history : [];
-                            try {
-                                const advisories = await evaluateShellAutoApprovalAdvisories({
-                                    commands: [{ id: approval.callId || '__single__', command }],
-                                    history: history,
-                                    settingsService: config.settingsService,
-                                    agentClient: config.agentClient,
-                                    logger: config.logger ??
-                                        {
-                                            debug: () => { },
-                                            info: () => { },
-                                            warn: () => { },
-                                            error: () => { },
-                                            security: () => { },
-                                        },
-                                    sessionContextService,
-                                });
-                                const advisory = advisories.get(approval.callId || '__single__');
-                                if (advisory?.approved) {
-                                    shouldApprove = true;
-                                }
-                                else {
-                                    shouldApprove = false;
-                                    rejectionReason = `LLM evaluation rejected the command: ${advisory?.reasoning ?? 'No reasoning provided'}`;
-                                }
-                            }
-                            catch (err) {
-                                shouldApprove = false;
-                                rejectionReason = `LLM auto-approval evaluation failed: ${err instanceof Error ? err.message : String(err)}`;
-                            }
-                        }
-                    }
-                }
-                if (shouldApprove) {
-                    result = supportsPersistentEventSink
-                        ? await session.handleApprovalDecision('y', undefined)
-                        : await session.handleApprovalDecision('y', undefined, { onEvent });
-                }
-                else {
-                    stderr.write(`Approval Rejected: ${rejectionReason}\n`);
-                    result = supportsPersistentEventSink
-                        ? await session.handleApprovalDecision('n', rejectionReason)
-                        : await session.handleApprovalDecision('n', rejectionReason, { onEvent });
-                }
-            }
-            else {
-                result = supportsPersistentEventSink
-                    ? await session.handleApprovalDecision('n', NON_INTERACTIVE_REJECTION_REASON)
-                    : await session.handleApprovalDecision('n', NON_INTERACTIVE_REJECTION_REASON, { onEvent });
+            const decision = await approvalPolicy.decide({
+                autoApprove: config.autoApprove,
+                approval: result.approval,
+                getHistory: () => session.exportState?.().history ?? [],
+            });
+            const rejectionReason = decision.answer === 'n' ? decision.rejectionReason : undefined;
+            if (decision.answer === 'n' && decision.reportRejection) {
+                stderr.write(`Approval Rejected: ${rejectionReason}\n`);
             }
+            result = supportsPersistentEventSink
+                ? await session.handleApprovalDecision(decision.answer, rejectionReason)
+                : await session.handleApprovalDecision(decision.answer, rejectionReason, { onEvent });
             if (result === null) {
                 stderr.write('error No pending approval context (unexpected in non-interactive mode).\n');
                 return 1;
@@ -169,20 +127,69 @@ export async function runWithSession(session, config) {
 }
 export async function runNonInteractive(config) {
     const sessionContextService = config.sessionContextService ?? new SessionContextService();
-    const { runtime, adapter } = createConversationRuntime({
-        sessionId: createNonInteractiveSessionId(),
-        agentClient: config.agentClient,
-        deps: {
-            logger: config.logger,
-            settingsService: config.settingsService,
-            sessionContextService,
-        },
+    if (!config.sessionClientFactory && !config.agentClient) {
+        throw new Error('runNonInteractive requires an agentClient or sessionClientFactory');
+    }
+    if (!config.sessionClientFactory && !config.toolOwnership) {
+        throw new Error('runNonInteractive requires toolOwnership with an agentClient');
+    }
+    const clientFactory = config.sessionClientFactory ?? createCallerOwnedSessionClientFactory(config.agentClient, config.toolOwnership);
+    const sessionId = createNonInteractiveSessionId();
+    const clientHandle = clientFactory.create(sessionId, { allowBackgroundShell: false });
+    const removeBackgroundShellInterceptor = clientHandle.agentClient.addToolInterceptor(async (name, params) => {
+        if (name === 'shell' &&
+            params !== null &&
+            typeof params === 'object' &&
+            !Array.isArray(params) &&
+            params.background === true) {
+            return 'Error: Background shell execution is unavailable in non-interactive mode.';
+        }
+        return null;
     });
+    let runtime;
+    let fatal = false;
     try {
-        return await runWithSession(adapter, { ...config, sessionContextService });
+        const createdRuntime = createConversationRuntime({
+            sessionId,
+            agentClient: clientHandle.agentClient,
+            toolOwnership: clientHandle.toolOwnership,
+            deps: {
+                logger: config.logger,
+                settingsService: config.settingsService,
+                sessionContextService,
+            },
+            hookLifecycle: config.hookLifecycle ?? clientHandle.hookLifecycle,
+            hookEvents: config.hookEvents ?? clientHandle.hookEvents,
+        });
+        runtime = createdRuntime.runtime;
+        if (config.hookLifecycle && clientHandle.hookEvents) {
+            await config.hookLifecycle.emit(clientHandle.hookEvents.create('session.start', {
+                cwd: process.cwd(),
+                mode: 'non-interactive',
+                providerName: clientHandle.agentClient.getProvider?.() ?? config.settingsService.get('agent.provider'),
+                modelName: config.settingsService.get('agent.model'),
+            }));
+        }
+        return await runWithSession(createdRuntime.adapter, {
+            ...config,
+            agentClient: clientHandle.agentClient,
+            sessionContextService,
+        });
+    }
+    catch (error) {
+        fatal = true;
+        throw error;
     }
     finally {
-        runtime.dispose();
+        removeBackgroundShellInterceptor();
+        if (config.hookLifecycle && clientHandle.hookEvents) {
+            await config.hookLifecycle.emit(clientHandle.hookEvents.create('session.end', {
+                reason: fatal ? 'fatal_error' : 'normal',
+                sessionDuration: runtime ? Math.max(0, Date.now() - Date.parse(runtime.sessionStartedAt)) : 0,
+            }));
+        }
+        await runtime?.shutdown();
+        clientHandle.dispose();
     }
 }
 //# sourceMappingURL=non-interactive.js.map