@exellix/ai-tasks 8.6.1 → 8.6.3

package/dist/utils/prepareMainSkillModelConfigForInvoke.js

@@ -0,0 +1,108 @@
+import { throwRunTaskModelResolutionError } from "../errors/runTaskModelResolutionError.js";
+import { detectOpenRouterApiKeyPresent, readPreferOpenRouterFromEnv } from "../invocation/preferOpenRouterPolicy.js";
+import { buildAiSkillsModelConfigForMain, isRecord } from "../types/model-config.js";
+import { requireSkillModelReference } from "./aiProfileModelFormat.js";
+import { resolveModelReference } from "./resolveAiProfileModel.js";
+function throwSlotValidationError(slotPath, offendingValue, slot, message, skillKey) {
+    throwRunTaskModelResolutionError({
+        code: "MODEL_CONFIG_PROFILE_CHOICE_REQUIRED",
+        skillKey,
+        invocationPhase: "model-resolution",
+        diagnostics: { slotPath, offendingValue, slot },
+    }, message);
+}
+/**
+ * Map MAIN {@link RunTaskRequest.modelConfig} slots to the ai-skills invoke shape
+ * `{ model, provider?, ...tuning }`. Resolves profile/choice aliases to concrete gateway wire ids once.
+ */
+export async function prepareMainSkillModelConfigForInvoke(modelConfig, llmCall, options) {
+    if (!isRecord(modelConfig)) {
+        throwRunTaskModelResolutionError({
+            code: "MAIN_SKILL_WIRE_MODEL_MISSING",
+            skillKey: options?.skillKey,
+            invocationPhase: "model-resolution",
+            diagnostics: { slotPath: "modelConfig" },
+        }, "runTask requires modelConfig with preActionModel, skillModel, and postActionModel before MAIN invoke.");
+    }
+    const skillSlot = modelConfig.skillModel;
+    if (typeof skillSlot === "string" && skillSlot.trim()) {
+        try {
+            requireSkillModelReference(skillSlot, "modelConfig.skillModel");
+        }
+        catch (err) {
+            throwSlotValidationError("modelConfig.skillModel", skillSlot, "skillModel", err instanceof Error ? err.message : String(err), options?.skillKey);
+        }
+    }
+    if (llmCall?.model) {
+        try {
+            requireSkillModelReference(llmCall.model, "llmCall.model");
+        }
+        catch (err) {
+            throwSlotValidationError("llmCall.model", llmCall.model, "llmCall.model", err instanceof Error ? err.message : String(err), options?.skillKey);
+        }
+    }
+    let overlayed;
+    try {
+        overlayed = buildAiSkillsModelConfigForMain(modelConfig, llmCall);
+    }
+    catch (err) {
+        throwRunTaskModelResolutionError({
+            code: "MAIN_SKILL_WIRE_MODEL_MISSING",
+            skillKey: options?.skillKey,
+            invocationPhase: "model-resolution",
+            diagnostics: {
+                slotPath: "modelConfig.skillModel",
+                offendingValue: typeof skillSlot === "string" ? skillSlot : undefined,
+                slot: "skillModel",
+            },
+        }, err instanceof Error ? err.message : String(err));
+    }
+    const modelRef = (typeof overlayed.model === "string" ? overlayed.model.trim() : "") ||
+        (typeof overlayed.modelId === "string" ? overlayed.modelId.trim() : "");
+    if (!modelRef) {
+        throwRunTaskModelResolutionError({
+            code: "MAIN_SKILL_WIRE_MODEL_MISSING",
+            skillKey: options?.skillKey,
+            invocationPhase: "model-resolution",
+            diagnostics: {
+                slotPath: "modelConfig.skillModel",
+                offendingValue: typeof skillSlot === "string" ? skillSlot : undefined,
+                slot: "skillModel",
+            },
+        }, "MAIN skill invoke requires modelConfig.model (profile/choice or concrete provider id).");
+    }
+    let resolvedWire;
+    try {
+        const wire = await resolveModelReference(modelRef, {
+            preferOpenRouter: options?.preferOpenRouter ?? readPreferOpenRouterFromEnv(),
+            openrouterApiKeyPresent: options?.openrouterApiKeyPresent ?? detectOpenRouterApiKeyPresent(),
+        });
+        if (!wire?.trim()) {
+            throw new Error(`Model reference "${modelRef}" did not resolve to a concrete gateway wire model id.`);
+        }
+        resolvedWire = wire.trim();
+    }
+    catch (err) {
+        throwRunTaskModelResolutionError({
+            code: "MAIN_SKILL_MODEL_RESOLUTION_FAILED",
+            skillKey: options?.skillKey,
+            invocationPhase: "model-resolution",
+            diagnostics: {
+                slotPath: "modelConfig.skillModel",
+                offendingValue: modelRef,
+                slot: "skillModel",
+            },
+        }, err instanceof Error ? err.message : String(err));
+    }
+    const result = {
+        ...overlayed,
+        model: resolvedWire,
+    };
+    delete result.modelId;
+    return result;
+}
+/** Fail-fast preflight: same checks as {@link prepareMainSkillModelConfigForInvoke} without returning the overlay. */
+export async function assertMainSkillModelConfigReadyForInvoke(modelConfig, llmCall, options) {
+    await prepareMainSkillModelConfigForInvoke(modelConfig, llmCall, options);
+}
+//# sourceMappingURL=prepareMainSkillModelConfigForInvoke.js.map

package/dist/utils/prepareMainSkillModelConfigForInvoke.js.map

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

package/dist/utils/resolveAiProfileModel.d.ts

@@ -1,5 +1,5 @@
 import type { ProfileCatalogLane, RegistrySourceMode } from "@x12i/ai-profiles";
-export { formatResolvedProfileModelId, isResolvableModelAlias, normalizeXynthesisModelAlias, toStrictAiProfileResolveInput, } from "./aiProfileModelFormat.js";
+export { formatResolvedProfileModelId, isResolvableModelAlias, isStrictProfileChoiceKey, normalizeXynthesisModelAlias, requireSkillModelReference, requireStrictProfileChoiceKey, requireXynthesisModelReference, toStrictAiProfileResolveInput, } from "./aiProfileModelFormat.js";
 /** @deprecated Prefer {@link isResolvableModelAlias}. Kept for tests and call sites expecting the old name. */
 export declare function isAliasLikeModelValue(value: string): boolean;
 export type ResolveModelReferenceOptions = {
@@ -14,7 +14,7 @@ export type ResolveModelReferenceOptions = {
 };
 /**
  * Resolve a model reference for `@exellix/ai-skills` MAIN: pass through concrete ids and
- * unrecognized strings; map known ai-profiles aliases to concrete provider/model ids.
+ * map known ai-profiles aliases to concrete provider/model ids via ai-skills.
  */
 export declare function resolveModelReference(value: string | undefined, options?: ResolveModelReferenceOptions): Promise<string | undefined>;
 export type ResolveModelReferenceForXynthesisOptions = {

package/dist/utils/resolveAiProfileModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveAiProfileModel.d.ts","sourceRoot":"","sources":["../../src/utils/resolveAiProfileModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAehF,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACtB,4BAA4B,EAC5B,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AAEnC,+GAA+G;AAC/G,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,2FAA2F;IAC3F,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,0CAA0C;IAC1C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,OAAO,CAAC,EAAE,4BAA4B,GACrC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmB7B;AAED,MAAM,MAAM,wCAAwC,GAAG;IACrD,oEAAoE;IACpE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,wBAAsB,iCAAiC,CACrD,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,OAAO,CAAC,EAAE,wCAAwC,GACjD,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmB7B"}
+{"version":3,"file":"resolveAiProfileModel.d.ts","sourceRoot":"","sources":["../../src/utils/resolveAiProfileModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAehF,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACtB,wBAAwB,EACxB,4BAA4B,EAC5B,0BAA0B,EAC1B,6BAA6B,EAC7B,8BAA8B,EAC9B,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AAEnC,+GAA+G;AAC/G,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,2FAA2F;IAC3F,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,0CAA0C;IAC1C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,OAAO,CAAC,EAAE,4BAA4B,GACrC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAW7B;AAED,MAAM,MAAM,wCAAwC,GAAG;IACrD,oEAAoE;IACpE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,wBAAsB,iCAAiC,CACrD,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,OAAO,CAAC,EAAE,wCAAwC,GACjD,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkC7B"}

package/dist/utils/resolveAiProfileModel.js

@@ -1,16 +1,15 @@
-import { resolveProfileInvocationRouting } from "../invocation/resolveProfileInvocationRouting.js";
-import { resolvePreferOpenRouterPolicy } from "../invocation/preferOpenRouterPolicy.js";
+import { resolveSkillProfileToWireModel } from "@exellix/ai-skills";
 import { formatXynthesisConcreteModelRejectedMessage, throwRunTaskModelResolutionError, } from "../errors/runTaskModelResolutionError.js";
-import { isResolvableModelAlias, normalizeXynthesisModelAlias, toStrictAiProfileResolveInput, } from "./aiProfileModelFormat.js";
+import { isResolvableModelAlias, normalizeXynthesisModelAlias, requireXynthesisModelReference, } from "./aiProfileModelFormat.js";
 import { isConcreteModelId } from "./concreteModelId.js";
-export { formatResolvedProfileModelId, isResolvableModelAlias, normalizeXynthesisModelAlias, toStrictAiProfileResolveInput, } from "./aiProfileModelFormat.js";
+export { formatResolvedProfileModelId, isResolvableModelAlias, isStrictProfileChoiceKey, normalizeXynthesisModelAlias, requireSkillModelReference, requireStrictProfileChoiceKey, requireXynthesisModelReference, toStrictAiProfileResolveInput, } from "./aiProfileModelFormat.js";
 /** @deprecated Prefer {@link isResolvableModelAlias}. Kept for tests and call sites expecting the old name. */
 export function isAliasLikeModelValue(value) {
     return isResolvableModelAlias(value);
 }
 /**
  * Resolve a model reference for `@exellix/ai-skills` MAIN: pass through concrete ids and
- * unrecognized strings; map known ai-profiles aliases to concrete provider/model ids.
+ * map known ai-profiles aliases to concrete provider/model ids via ai-skills.
  */
 export async function resolveModelReference(value, options) {
     if (value === undefined)
@@ -18,20 +17,12 @@ export async function resolveModelReference(value, options) {
     const trimmed = value.trim();
     if (!trimmed)
         return undefined;
-    if (isConcreteModelId(trimmed))
-        return trimmed;
-    const { effectiveUseOpenRouter } = resolvePreferOpenRouterPolicy({
+    return resolveSkillProfileToWireModel(trimmed, {
         preferOpenRouter: options?.preferOpenRouter ?? options?.useOpenRouter,
         openrouterApiKeyPresent: options?.openrouterApiKeyPresent,
-    });
-    const resolved = await resolveProfileInvocationRouting(trimmed, {
-        phaseKind: "skill",
-        effectiveUseOpenRouter,
-        openrouterApiKeyPresent: options?.openrouterApiKeyPresent,
         source: options?.source,
         catalogLane: options?.catalogLane,
     });
-    return resolved.modelId;
 }
 /**
  * Resolve a model reference for `@exellix/xynthesis` ≥4.0 (`executeXynthesisAction`):
@@ -54,6 +45,19 @@ export async function resolveModelReferenceForXynthesis(value, options) {
             },
         }, formatXynthesisConcreteModelRejectedMessage(normalized, options?.slotPath));
     }
-    return toStrictAiProfileResolveInput(normalized);
+    try {
+        return requireXynthesisModelReference(normalized, options?.slotPath ?? "model");
+    }
+    catch (err) {
+        throwRunTaskModelResolutionError({
+            code: "MODEL_CONFIG_PROFILE_CHOICE_REQUIRED",
+            skillKey: options?.skillKey,
+            invocationPhase: "model-resolution",
+            diagnostics: {
+                slotPath: options?.slotPath,
+                offendingValue: normalized,
+            },
+        }, err instanceof Error ? err.message : String(err));
+    }
 }
 //# sourceMappingURL=resolveAiProfileModel.js.map

package/dist/utils/resolveAiProfileModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveAiProfileModel.js","sourceRoot":"","sources":["../../src/utils/resolveAiProfileModel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,kDAAkD,CAAC;AACnG,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EACL,2CAA2C,EAC3C,gCAAgC,GACjC,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAEL,sBAAsB,EACtB,4BAA4B,EAC5B,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACtB,4BAA4B,EAC5B,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AAEnC,+GAA+G;AAC/G,MAAM,UAAU,qBAAqB,CAAC,KAAa;IACjD,OAAO,sBAAsB,CAAC,KAAK,CAAC,CAAC;AACvC,CAAC;AAaD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,KAAyB,EACzB,OAAsC;IAEtC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/B,IAAI,iBAAiB,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAC;IAE/C,MAAM,EAAE,sBAAsB,EAAE,GAAG,6BAA6B,CAAC;QAC/D,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,IAAI,OAAO,EAAE,aAAa;QACrE,uBAAuB,EAAE,OAAO,EAAE,uBAAuB;KAC1D,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,+BAA+B,CAAC,OAAO,EAAE;QAC9D,SAAS,EAAE,OAAO;QAClB,sBAAsB;QACtB,uBAAuB,EAAE,OAAO,EAAE,uBAAuB;QACzD,MAAM,EAAE,OAAO,EAAE,MAAM;QACvB,WAAW,EAAE,OAAO,EAAE,WAAW;KAClC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC,OAAO,CAAC;AAC1B,CAAC;AAQD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,KAAyB,EACzB,OAAkD;IAElD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,UAAU,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IACvD,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IAClC,IAAI,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,gCAAgC,CAC9B;YACE,IAAI,EAAE,mCAAmC;YACzC,QAAQ,EAAE,OAAO,EAAE,QAAQ;YAC3B,eAAe,EAAE,kBAAkB;YACnC,WAAW,EAAE;gBACX,QAAQ,EAAE,OAAO,EAAE,QAAQ;gBAC3B,cAAc,EAAE,UAAU;aAC3B;SACF,EACD,2CAA2C,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAC3E,CAAC;IACJ,CAAC;IACD,OAAO,6BAA6B,CAAC,UAAU,CAAC,CAAC;AACnD,CAAC"}
+{"version":3,"file":"resolveAiProfileModel.js","sourceRoot":"","sources":["../../src/utils/resolveAiProfileModel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EACL,2CAA2C,EAC3C,gCAAgC,GACjC,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAEL,sBAAsB,EACtB,4BAA4B,EAC5B,8BAA8B,GAE/B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACtB,wBAAwB,EACxB,4BAA4B,EAC5B,0BAA0B,EAC1B,6BAA6B,EAC7B,8BAA8B,EAC9B,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AAEnC,+GAA+G;AAC/G,MAAM,UAAU,qBAAqB,CAAC,KAAa;IACjD,OAAO,sBAAsB,CAAC,KAAK,CAAC,CAAC;AACvC,CAAC;AAaD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,KAAyB,EACzB,OAAsC;IAEtC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAE/B,OAAO,8BAA8B,CAAC,OAAO,EAAE;QAC7C,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,IAAI,OAAO,EAAE,aAAa;QACrE,uBAAuB,EAAE,OAAO,EAAE,uBAAuB;QACzD,MAAM,EAAE,OAAO,EAAE,MAAM;QACvB,WAAW,EAAE,OAAO,EAAE,WAAW;KAClC,CAAC,CAAC;AACL,CAAC;AAQD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,KAAyB,EACzB,OAAkD;IAElD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,UAAU,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IACvD,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IAClC,IAAI,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,gCAAgC,CAC9B;YACE,IAAI,EAAE,mCAAmC;YACzC,QAAQ,EAAE,OAAO,EAAE,QAAQ;YAC3B,eAAe,EAAE,kBAAkB;YACnC,WAAW,EAAE;gBACX,QAAQ,EAAE,OAAO,EAAE,QAAQ;gBAC3B,cAAc,EAAE,UAAU;aAC3B;SACF,EACD,2CAA2C,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAC3E,CAAC;IACJ,CAAC;IACD,IAAI,CAAC;QACH,OAAO,8BAA8B,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,IAAI,OAAO,CAAC,CAAC;IAClF,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,gCAAgC,CAC9B;YACE,IAAI,EAAE,sCAAsC;YAC5C,QAAQ,EAAE,OAAO,EAAE,QAAQ;YAC3B,eAAe,EAAE,kBAAkB;YACnC,WAAW,EAAE;gBACX,QAAQ,EAAE,OAAO,EAAE,QAAQ;gBAC3B,cAAc,EAAE,UAAU;aAC3B;SACF,EACD,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CACjD,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/utils/resolveRunTaskModelReferences.d.ts

@@ -1,7 +1,7 @@
 import type { RunTaskRequest } from "../types/task-types.js";
 /**
- * Resolve ai-profiles aliases on a {@link RunTaskRequest} before validation/execution.
- * skillModel / MAIN llmCall.model → concrete provider ids; preActionModel / postActionModel → ai-profiles aliases only.
+ * Validate ai-profiles profile/choice keys on a {@link RunTaskRequest} before execution.
+ * Does not rewrite or normalize slot values — faulty input is rejected.
  */
 export declare function resolveRunTaskModelReferences(request: RunTaskRequest): Promise<RunTaskRequest>;
 //# sourceMappingURL=resolveRunTaskModelReferences.d.ts.map

package/dist/utils/resolveRunTaskModelReferences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveRunTaskModelReferences.d.ts","sourceRoot":"","sources":["../../src/utils/resolveRunTaskModelReferences.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AA6Q7D;;;GAGG;AACH,wBAAsB,6BAA6B,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CA4CpG"}
+{"version":3,"file":"resolveRunTaskModelReferences.d.ts","sourceRoot":"","sources":["../../src/utils/resolveRunTaskModelReferences.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAiO7D;;;GAGG;AACH,wBAAsB,6BAA6B,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAyBpG"}

package/dist/utils/resolveRunTaskModelReferences.js

@@ -1,242 +1,184 @@
 import { isRecord } from "../types/model-config.js";
-import { formatXynthesisAliasResolutionFailedMessage, isRunTaskModelResolutionError, throwRunTaskModelResolutionError, } from "../errors/runTaskModelResolutionError.js";
-import { normalizeXynthesisModelAlias, resolveModelReference, resolveModelReferenceForXynthesis, } from "./resolveAiProfileModel.js";
-async function resolveLlmCallModel(llmCall, target, slotPath, ctx) {
+import { throwRunTaskModelResolutionError, } from "../errors/runTaskModelResolutionError.js";
+import { requireSkillModelReference, requireXynthesisModelReference, } from "./aiProfileModelFormat.js";
+import { resolveModelReferenceForXynthesis } from "./resolveAiProfileModel.js";
+function assertXynthesisModelSlot(value, slotPath, ctx) {
+    try {
+        requireXynthesisModelReference(value, slotPath);
+    }
+    catch (err) {
+        throwRunTaskModelResolutionError({
+            code: "MODEL_CONFIG_PROFILE_CHOICE_REQUIRED",
+            skillKey: ctx?.skillKey,
+            invocationPhase: "model-resolution",
+            diagnostics: { slotPath, offendingValue: value },
+        }, err instanceof Error ? err.message : String(err));
+    }
+}
+function assertSkillModelSlot(value, slotPath, ctx) {
+    try {
+        requireSkillModelReference(value, slotPath);
+    }
+    catch (err) {
+        throwRunTaskModelResolutionError({
+            code: "MODEL_CONFIG_PROFILE_CHOICE_REQUIRED",
+            skillKey: ctx?.skillKey,
+            invocationPhase: "model-resolution",
+            diagnostics: {
+                slotPath,
+                offendingValue: value,
+                slot: slotPath.endsWith("skillModel") ? "skillModel" : undefined,
+            },
+        }, err instanceof Error ? err.message : String(err));
+    }
+}
+async function validateLlmCallModel(llmCall, target, slotPath, ctx) {
     if (!llmCall?.model)
         return llmCall;
-    const model = target === "xynthesis"
-        ? await resolveModelReferenceForXynthesis(llmCall.model, {
+    if (target === "xynthesis") {
+        await resolveModelReferenceForXynthesis(llmCall.model, {
             slotPath,
             skillKey: ctx?.skillKey,
-        })
-        : await resolveModelReference(llmCall.model);
-    if (model === llmCall.model)
-        return llmCall;
-    return { ...llmCall, model };
+        });
+    }
+    else {
+        assertSkillModelSlot(llmCall.model, slotPath, ctx);
+    }
+    return llmCall;
 }
-async function resolveModelConfigRecord(modelConfig, options) {
+async function validateModelConfigRecord(modelConfig, options) {
     if (!modelConfig)
         return modelConfig;
-    let changed = false;
-    const out = { ...modelConfig };
     const basePath = options?.basePath ?? "modelConfig";
-    if (out.xynthesisModel !== undefined) {
+    if (modelConfig.xynthesisModel !== undefined) {
         throw new Error("modelConfig.xynthesisModel is not accepted; use preActionModel and postActionModel.");
     }
     for (const key of ["preActionModel", "postActionModel", "skillModel", "model"]) {
-        const v = out[key];
+        const v = modelConfig[key];
         if (typeof v !== "string" || !v.trim())
             continue;
         const slotPath = `${basePath}.${key}`;
         if (key === "preActionModel" ||
             key === "postActionModel" ||
             (options?.xynthesisOnly && key === "model")) {
-            const normalized = normalizeXynthesisModelAlias(v);
-            const resolved = await resolveXynthesisSlot(normalized, slotPath, key, options?.ctx);
-            const next = resolved ?? normalized;
-            if (next !== v) {
-                out[key] = next;
-                changed = true;
-            }
+            assertXynthesisModelSlot(v, slotPath, options?.ctx);
             continue;
         }
         if (key === "skillModel" || key === "model") {
-            try {
-                const resolved = await resolveModelReference(v);
-                if (resolved && resolved !== v) {
-                    out[key] = resolved;
-                    changed = true;
-                }
-            }
-            catch (err) {
-                if (isRunTaskModelResolutionError(err))
-                    throw err;
-                if (/unknown model profile/i.test(err instanceof Error ? err.message : String(err))) {
-                    throwRunTaskModelResolutionError({
-                        code: "XYNTHESIS_ALIAS_RESOLUTION_FAILED",
-                        skillKey: options?.ctx?.skillKey,
-                        invocationPhase: "model-resolution",
-                        diagnostics: { slotPath, offendingValue: v, slot: key === "skillModel" ? "skillModel" : undefined },
-                    }, formatXynthesisAliasResolutionFailedMessage(v, slotPath));
-                }
-                throw err;
-            }
+            assertSkillModelSlot(v, slotPath, options?.ctx);
         }
     }
-    return changed ? out : modelConfig;
+    return modelConfig;
 }
-async function resolveXynthesisSlot(normalized, slotPath, slot, ctx) {
-    try {
-        return await resolveModelReferenceForXynthesis(normalized, {
-            slotPath,
+async function validateAuditLlmCall(llmCall, basePath, ctx) {
+    if (!llmCall)
+        return llmCall;
+    if (llmCall.audit?.model) {
+        await resolveModelReferenceForXynthesis(llmCall.audit.model, {
+            slotPath: `${basePath}.audit`,
             skillKey: ctx?.skillKey,
         });
     }
-    catch (err) {
-        if (isRunTaskModelResolutionError(err))
-            throw err;
-        if (/unknown model profile/i.test(err instanceof Error ? err.message : String(err))) {
-            throwRunTaskModelResolutionError({
-                code: "XYNTHESIS_ALIAS_RESOLUTION_FAILED",
-                skillKey: ctx?.skillKey,
-                invocationPhase: "model-resolution",
-                diagnostics: {
-                    slotPath,
-                    offendingValue: normalized,
-                    slot: slot === "model" ? undefined : slot,
-                },
-            }, formatXynthesisAliasResolutionFailedMessage(normalized, slotPath));
-        }
-        throw err;
+    if (llmCall.synthesis?.model) {
+        await resolveModelReferenceForXynthesis(llmCall.synthesis.model, {
+            slotPath: `${basePath}.synthesis`,
+            skillKey: ctx?.skillKey,
+        });
     }
+    return llmCall;
 }
-async function resolveAuditLlmCall(llmCall, basePath, ctx) {
-    if (!llmCall)
-        return llmCall;
-    const audit = await resolveLlmCallModel(llmCall.audit, "xynthesis", `${basePath}.audit`, ctx);
-    const synthesis = await resolveLlmCallModel(llmCall.synthesis, "xynthesis", `${basePath}.synthesis`, ctx);
-    if (audit === llmCall.audit && synthesis === llmCall.synthesis)
-        return llmCall;
-    return { audit, synthesis };
-}
-async function resolveSynthesisConfig(config, basePath, ctx) {
-    const llmCall = await resolveLlmCallModel(config.llmCall, "xynthesis", `${basePath}.llmCall`, ctx);
-    const modelConfig = isRecord(config.modelConfig)
-        ? await resolveModelConfigRecord(config.modelConfig, {
+async function validateSynthesisConfig(config, basePath, ctx) {
+    if (config.llmCall?.model) {
+        await resolveModelReferenceForXynthesis(config.llmCall.model, {
+            slotPath: `${basePath}.llmCall`,
+            skillKey: ctx?.skillKey,
+        });
+    }
+    if (isRecord(config.modelConfig)) {
+        await validateModelConfigRecord(config.modelConfig, {
             xynthesisOnly: true,
             basePath: `${basePath}.modelConfig`,
             ctx,
-        })
-        : config.modelConfig;
-    if (llmCall === config.llmCall && modelConfig === config.modelConfig)
-        return config;
-    return {
-        ...config,
-        ...(llmCall ? { llmCall } : {}),
-        ...(modelConfig ? { modelConfig: modelConfig } : {}),
-    };
+        });
+    }
+    return config;
 }
-async function resolveAuditConfig(config, basePath, ctx) {
-    const llmCall = await resolveAuditLlmCall(config.llmCall, `${basePath}.llmCall`, ctx);
-    const auditModelConfig = isRecord(config.auditModelConfig)
-        ? await resolveModelConfigRecord(config.auditModelConfig, {
+async function validateAuditConfig(config, basePath, ctx) {
+    await validateAuditLlmCall(config.llmCall, `${basePath}.llmCall`, ctx);
+    if (isRecord(config.auditModelConfig)) {
+        await validateModelConfigRecord(config.auditModelConfig, {
             basePath: `${basePath}.auditModelConfig`,
             ctx,
-        })
-        : config.auditModelConfig;
-    const synthesisModelConfig = isRecord(config.synthesisModelConfig)
-        ? await resolveModelConfigRecord(config.synthesisModelConfig, {
+        });
+    }
+    if (isRecord(config.synthesisModelConfig)) {
+        await validateModelConfigRecord(config.synthesisModelConfig, {
             basePath: `${basePath}.synthesisModelConfig`,
             ctx,
-        })
-        : config.synthesisModelConfig;
-    if (llmCall === config.llmCall &&
-        auditModelConfig === config.auditModelConfig &&
-        synthesisModelConfig === config.synthesisModelConfig) {
-        return config;
-    }
-    return {
-        ...config,
-        ...(llmCall ? { llmCall } : {}),
-        ...(auditModelConfig ? { auditModelConfig: auditModelConfig } : {}),
-        ...(synthesisModelConfig
-            ? { synthesisModelConfig: synthesisModelConfig }
-            : {}),
-    };
+        });
+    }
+    return config;
 }
-async function resolvePolishConfig(config, basePath, ctx) {
-    const llmCall = await resolveLlmCallModel(config.llmCall, "xynthesis", `${basePath}.llmCall`, ctx);
-    const modelConfig = isRecord(config.modelConfig)
-        ? await resolveModelConfigRecord(config.modelConfig, {
+async function validatePolishConfig(config, basePath, ctx) {
+    if (config.llmCall?.model) {
+        await resolveModelReferenceForXynthesis(config.llmCall.model, {
+            slotPath: `${basePath}.llmCall`,
+            skillKey: ctx?.skillKey,
+        });
+    }
+    if (isRecord(config.modelConfig)) {
+        await validateModelConfigRecord(config.modelConfig, {
             basePath: `${basePath}.modelConfig`,
             ctx,
-        })
-        : config.modelConfig;
-    if (llmCall === config.llmCall && modelConfig === config.modelConfig)
-        return config;
-    return {
-        ...config,
-        ...(llmCall ? { llmCall } : {}),
-        ...(modelConfig ? { modelConfig: modelConfig } : {}),
-    };
+        });
+    }
+    return config;
 }
-async function resolveExecutionStep(step, stepIndex, ctx) {
+async function validateExecutionStep(step, stepIndex, ctx) {
     if (!step.config || typeof step.config !== "object")
         return step;
     const cfg = step.config;
     const basePath = `executionPipeline[${stepIndex}].config`;
     if (step.type === "synthesized-context") {
-        const resolved = await resolveSynthesisConfig(cfg, basePath, ctx);
-        if (resolved === cfg)
-            return step;
-        return { ...step, config: resolved };
+        await validateSynthesisConfig(cfg, basePath, ctx);
+        return step;
     }
     if (step.phase === "post") {
         if (step.type === "audit") {
-            const resolved = await resolveAuditConfig(cfg, basePath, ctx);
-            if (resolved === cfg)
-                return step;
-            return { ...step, config: resolved };
+            await validateAuditConfig(cfg, basePath, ctx);
+            return step;
         }
         if (step.type === "polish") {
-            const resolved = await resolvePolishConfig(cfg, basePath, ctx);
-            if (resolved === cfg)
-                return step;
-            return { ...step, config: resolved };
+            await validatePolishConfig(cfg, basePath, ctx);
+            return step;
         }
     }
-    const modelConfig = isRecord(cfg.modelConfig)
-        ? await resolveModelConfigRecord(cfg.modelConfig, { basePath: `${basePath}.modelConfig`, ctx })
-        : cfg.modelConfig;
-    const llmCall = isRecord(cfg.llmCall)
-        ? await resolveLlmCallModel(cfg.llmCall, "xynthesis", `${basePath}.llmCall`, ctx)
-        : undefined;
-    if (modelConfig === cfg.modelConfig && llmCall === cfg.llmCall)
-        return step;
-    return {
-        ...step,
-        config: {
-            ...cfg,
-            ...(modelConfig ? { modelConfig } : {}),
-            ...(llmCall ? { llmCall } : {}),
-        },
-    };
+    if (isRecord(cfg.modelConfig)) {
+        await validateModelConfigRecord(cfg.modelConfig, { basePath: `${basePath}.modelConfig`, ctx });
+    }
+    if (isRecord(cfg.llmCall) && typeof cfg.llmCall.model === "string") {
+        await validateLlmCallModel(cfg.llmCall, "xynthesis", `${basePath}.llmCall`, ctx);
+    }
+    return step;
 }
 /**
- * Resolve ai-profiles aliases on a {@link RunTaskRequest} before validation/execution.
- * skillModel / MAIN llmCall.model → concrete provider ids; preActionModel / postActionModel → ai-profiles aliases only.
+ * Validate ai-profiles profile/choice keys on a {@link RunTaskRequest} before execution.
+ * Does not rewrite or normalize slot values — faulty input is rejected.
  */
 export async function resolveRunTaskModelReferences(request) {
-    let changed = false;
-    const next = { ...request };
     const ctx = { skillKey: request.skillKey };
-    if (isRecord(next.modelConfig)) {
-        const modelConfig = await resolveModelConfigRecord(next.modelConfig, { basePath: "modelConfig", ctx });
-        if (modelConfig !== next.modelConfig) {
-            next.modelConfig = modelConfig;
-            changed = true;
-        }
-    }
-    const llmCall = await resolveLlmCallModel(next.llmCall, "skill", "llmCall", ctx);
-    if (llmCall !== next.llmCall) {
-        next.llmCall = llmCall;
-        changed = true;
+    if (isRecord(request.modelConfig)) {
+        await validateModelConfigRecord(request.modelConfig, { basePath: "modelConfig", ctx });
     }
-    if (next.aiScopingOptions?.llmCall?.model) {
-        const scopingLlmCall = await resolveLlmCallModel(next.aiScopingOptions.llmCall, "xynthesis", "aiScopingOptions.llmCall", ctx);
-        if (scopingLlmCall !== next.aiScopingOptions.llmCall) {
-            next.aiScopingOptions = { ...next.aiScopingOptions, llmCall: scopingLlmCall };
-            changed = true;
-        }
+    await validateLlmCallModel(request.llmCall, "skill", "llmCall", ctx);
+    if (request.aiScopingOptions?.llmCall?.model) {
+        await validateLlmCallModel(request.aiScopingOptions.llmCall, "xynthesis", "aiScopingOptions.llmCall", ctx);
     }
-    if (Array.isArray(next.executionPipeline) && next.executionPipeline.length > 0) {
-        const pipeline = await Promise.all(next.executionPipeline.map((step, i) => resolveExecutionStep(step, i, ctx)));
-        const pipelineChanged = pipeline.some((step, i) => step !== next.executionPipeline[i]);
-        if (pipelineChanged) {
-            next.executionPipeline = pipeline;
-            changed = true;
+    if (Array.isArray(request.executionPipeline) && request.executionPipeline.length > 0) {
+        for (let i = 0; i < request.executionPipeline.length; i++) {
+            await validateExecutionStep(request.executionPipeline[i], i, ctx);
         }
     }
-    return changed ? next : request;
+    return request;
 }
 //# sourceMappingURL=resolveRunTaskModelReferences.js.map