@exellix/ai-tasks 8.2.9 → 8.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +26 -0
- package/README.md +17 -13
- package/RUNTASK_REQUEST.md +3 -3
- package/dist/aiSkillsUpstreamExports.d.ts +1 -1
- package/dist/aiSkillsUpstreamExports.d.ts.map +1 -1
- package/dist/aiSkillsUpstreamExports.js +1 -1
- package/dist/aiSkillsUpstreamExports.js.map +1 -1
- package/dist/analysis/analyzeRunTaskRequest.d.ts +2 -2
- package/dist/analysis/analyzeRunTaskRequest.d.ts.map +1 -1
- package/dist/analysis/analyzeRunTaskRequest.js +11 -4
- package/dist/analysis/analyzeRunTaskRequest.js.map +1 -1
- package/dist/builders/task-request-builder.d.ts +9 -12
- package/dist/builders/task-request-builder.d.ts.map +1 -1
- package/dist/builders/task-request-builder.js +22 -15
- package/dist/builders/task-request-builder.js.map +1 -1
- package/dist/compile/compileTaskConfiguration.d.ts.map +1 -1
- package/dist/compile/compileTaskConfiguration.js +4 -3
- package/dist/compile/compileTaskConfiguration.js.map +1 -1
- package/dist/core/task-sdk.d.ts.map +1 -1
- package/dist/core/task-sdk.js +10 -11
- package/dist/core/task-sdk.js.map +1 -1
- package/dist/errors/modelConfigRequiredError.d.ts +9 -0
- package/dist/errors/modelConfigRequiredError.d.ts.map +1 -0
- package/dist/errors/modelConfigRequiredError.js +20 -0
- package/dist/errors/modelConfigRequiredError.js.map +1 -0
- package/dist/errors/runTaskExecutionError.d.ts +2 -1
- package/dist/errors/runTaskExecutionError.d.ts.map +1 -1
- package/dist/errors/runTaskExecutionError.js +1 -1
- package/dist/errors/runTaskExecutionError.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/internal/resolveLlmCallForXynthesis.d.ts +17 -40
- package/dist/internal/resolveLlmCallForXynthesis.d.ts.map +1 -1
- package/dist/internal/resolveLlmCallForXynthesis.js +15 -55
- package/dist/internal/resolveLlmCallForXynthesis.js.map +1 -1
- package/dist/internal/runPostStepLlmCall.d.ts +3 -17
- package/dist/internal/runPostStepLlmCall.d.ts.map +1 -1
- package/dist/internal/runPostStepLlmCall.js +31 -30
- package/dist/internal/runPostStepLlmCall.js.map +1 -1
- package/dist/invocation/defaultAiProfilesResolveOptions.d.ts +27 -0
- package/dist/invocation/defaultAiProfilesResolveOptions.d.ts.map +1 -0
- package/dist/invocation/defaultAiProfilesResolveOptions.js +43 -0
- package/dist/invocation/defaultAiProfilesResolveOptions.js.map +1 -0
- package/dist/invocation/resolveProfileInvocationRouting.d.ts +4 -2
- package/dist/invocation/resolveProfileInvocationRouting.d.ts.map +1 -1
- package/dist/invocation/resolveProfileInvocationRouting.js +15 -5
- package/dist/invocation/resolveProfileInvocationRouting.js.map +1 -1
- package/dist/logxer/packageLogxers.d.ts +0 -1
- package/dist/logxer/packageLogxers.d.ts.map +1 -1
- package/dist/observability/classifyRunTaskFailure.js +2 -2
- package/dist/observability/classifyRunTaskFailure.js.map +1 -1
- package/dist/observability/logLlmProviderInvocation.d.ts +1 -2
- package/dist/observability/logLlmProviderInvocation.d.ts.map +1 -1
- package/dist/observability/logLlmProviderInvocation.js +3 -3
- package/dist/observability/logLlmProviderInvocation.js.map +1 -1
- package/dist/packaged-tasks-client.js +1 -1
- package/dist/packaged-tasks-client.js.map +1 -1
- package/dist/post-steps/audit/runAudit.d.ts.map +1 -1
- package/dist/post-steps/audit/runAudit.js +6 -16
- package/dist/post-steps/audit/runAudit.js.map +1 -1
- package/dist/post-steps/polish/runPolish.d.ts +2 -0
- package/dist/post-steps/polish/runPolish.d.ts.map +1 -1
- package/dist/post-steps/polish/runPolish.js +5 -9
- package/dist/post-steps/polish/runPolish.js.map +1 -1
- package/dist/post-steps/resolvePostStepConfig.d.ts +4 -35
- package/dist/post-steps/resolvePostStepConfig.d.ts.map +1 -1
- package/dist/post-steps/resolvePostStepConfig.js +9 -36
- package/dist/post-steps/resolvePostStepConfig.js.map +1 -1
- package/dist/strategies/direct-execution-strategy.d.ts.map +1 -1
- package/dist/strategies/direct-execution-strategy.js +6 -3
- package/dist/strategies/direct-execution-strategy.js.map +1 -1
- package/dist/synthesis/runStructuredSynthesisRobust.d.ts +0 -1
- package/dist/synthesis/runStructuredSynthesisRobust.d.ts.map +1 -1
- package/dist/synthesis/runStructuredSynthesisRobust.js +20 -58
- package/dist/synthesis/runStructuredSynthesisRobust.js.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/llmCall.d.ts +18 -47
- package/dist/types/llmCall.d.ts.map +1 -1
- package/dist/types/llmCall.js +1 -10
- package/dist/types/llmCall.js.map +1 -1
- package/dist/types/model-config.d.ts +22 -9
- package/dist/types/model-config.d.ts.map +1 -1
- package/dist/types/model-config.js +62 -13
- package/dist/types/model-config.js.map +1 -1
- package/dist/types/task-types.d.ts +16 -12
- package/dist/types/task-types.d.ts.map +1 -1
- package/dist/types/task-types.js.map +1 -1
- package/dist/utilities/runUtility.d.ts.map +1 -1
- package/dist/utilities/runUtility.js +8 -11
- package/dist/utilities/runUtility.js.map +1 -1
- package/dist/utils/aiProfileModelFormat.d.ts.map +1 -1
- package/dist/utils/aiProfileModelFormat.js +8 -65
- package/dist/utils/aiProfileModelFormat.js.map +1 -1
- package/dist/utils/resolveAiProfileModel.d.ts +5 -2
- package/dist/utils/resolveAiProfileModel.d.ts.map +1 -1
- package/dist/utils/resolveAiProfileModel.js +3 -1
- package/dist/utils/resolveAiProfileModel.js.map +1 -1
- package/dist/utils/resolveRunTaskModelReferences.d.ts +1 -1
- package/dist/utils/resolveRunTaskModelReferences.d.ts.map +1 -1
- package/dist/utils/resolveRunTaskModelReferences.js +8 -3
- package/dist/utils/resolveRunTaskModelReferences.js.map +1 -1
- package/dist/utils/routeModelConfigSlots.d.ts +1 -1
- package/dist/utils/routeModelConfigSlots.d.ts.map +1 -1
- package/dist/utils/routeModelConfigSlots.js +1 -1
- package/dist/utils/routeModelConfigSlots.js.map +1 -1
- package/dist/validation/helpers.d.ts +5 -2
- package/dist/validation/helpers.d.ts.map +1 -1
- package/dist/validation/helpers.js +65 -22
- package/dist/validation/helpers.js.map +1 -1
- package/dist/validation/types.d.ts +1 -1
- package/dist/validation/types.d.ts.map +1 -1
- package/dist/validation/validateRunTaskConfig.d.ts.map +1 -1
- package/dist/validation/validateRunTaskConfig.js +2 -1
- package/dist/validation/validateRunTaskConfig.js.map +1 -1
- package/documenations/upstream-feature-requests/README.md +21 -0
- package/documenations/upstream-feature-requests/ai-skills-orchestrator-invoke-contract-5.9.md +151 -0
- package/documenations/upstream-feature-requests/ai-tasks-wrap-up-after-upstream.md +126 -0
- package/documenations/upstream-feature-requests/xynthesis-orchestrator-invoke-contract-4.2.md +175 -0
- package/package.json +5 -5
|
@@ -1 +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,EAEL,sBAAsB,EACtB,4BAA4B,GAC7B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACtB,4BAA4B,GAC7B,MAAM,2BAA2B,CAAC;AAEnC,+GAA+G;AAC/G,MAAM,UAAU,qBAAqB,CAAC,KAAa;IACjD,OAAO,sBAAsB,CAAC,KAAK,CAAC,CAAC;AACvC,CAAC;
|
|
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,EAEL,sBAAsB,EACtB,4BAA4B,GAC7B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACtB,4BAA4B,GAC7B,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;IAC/C,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,OAAO,CAAC;IAE/E,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;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,KAAyB;IAEzB,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,MAAM,IAAI,KAAK,CACb,2GAA2G,UAAU,iEAAiE,CACvL,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,kCAAkC,UAAU,kFAAkF,CAC/H,CAAC;IACJ,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { RunTaskRequest } from "../types/task-types.js";
|
|
2
2
|
/**
|
|
3
3
|
* Resolve ai-profiles aliases on a {@link RunTaskRequest} before validation/execution.
|
|
4
|
-
* skillModel / MAIN llmCall.model → concrete provider ids;
|
|
4
|
+
* skillModel / MAIN llmCall.model → concrete provider ids; preActionModel / postActionModel → ai-profiles aliases only.
|
|
5
5
|
*/
|
|
6
6
|
export declare function resolveRunTaskModelReferences(request: RunTaskRequest): Promise<RunTaskRequest>;
|
|
7
7
|
//# sourceMappingURL=resolveRunTaskModelReferences.d.ts.map
|
|
@@ -1 +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;
|
|
1
|
+
{"version":3,"file":"resolveRunTaskModelReferences.d.ts","sourceRoot":"","sources":["../../src/utils/resolveRunTaskModelReferences.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AA2K7D;;;GAGG;AACH,wBAAsB,6BAA6B,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAoCpG"}
|
|
@@ -15,11 +15,16 @@ async function resolveModelConfigRecord(modelConfig, options) {
|
|
|
15
15
|
return modelConfig;
|
|
16
16
|
let changed = false;
|
|
17
17
|
const out = { ...modelConfig };
|
|
18
|
-
|
|
18
|
+
if (out.xynthesisModel !== undefined) {
|
|
19
|
+
throw new Error("modelConfig.xynthesisModel is not accepted; use preActionModel and postActionModel.");
|
|
20
|
+
}
|
|
21
|
+
for (const key of ["preActionModel", "postActionModel", "skillModel", "model"]) {
|
|
19
22
|
const v = out[key];
|
|
20
23
|
if (typeof v !== "string" || !v.trim())
|
|
21
24
|
continue;
|
|
22
|
-
if (key === "
|
|
25
|
+
if (key === "preActionModel" ||
|
|
26
|
+
key === "postActionModel" ||
|
|
27
|
+
(options?.xynthesisOnly && key === "model")) {
|
|
23
28
|
const normalized = normalizeXynthesisModelAlias(v);
|
|
24
29
|
const resolved = await resolveModelReferenceForXynthesis(normalized);
|
|
25
30
|
const next = resolved ?? normalized;
|
|
@@ -137,7 +142,7 @@ async function resolveExecutionStep(step) {
|
|
|
137
142
|
}
|
|
138
143
|
/**
|
|
139
144
|
* Resolve ai-profiles aliases on a {@link RunTaskRequest} before validation/execution.
|
|
140
|
-
* skillModel / MAIN llmCall.model → concrete provider ids;
|
|
145
|
+
* skillModel / MAIN llmCall.model → concrete provider ids; preActionModel / postActionModel → ai-profiles aliases only.
|
|
141
146
|
*/
|
|
142
147
|
export async function resolveRunTaskModelReferences(request) {
|
|
143
148
|
let changed = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveRunTaskModelReferences.js","sourceRoot":"","sources":["../../src/utils/resolveRunTaskModelReferences.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,EACrB,iCAAiC,GAClC,MAAM,4BAA4B,CAAC;AAIpC,KAAK,UAAU,mBAAmB,CAChC,OAAkC,EAClC,MAA0B;IAE1B,IAAI,CAAC,OAAO,EAAE,KAAK;QAAE,OAAO,OAAO,CAAC;IACpC,MAAM,KAAK,GACT,MAAM,KAAK,WAAW;QACpB,CAAC,CAAC,MAAM,iCAAiC,CAAC,OAAO,CAAC,KAAK,CAAC;QACxD,CAAC,CAAC,MAAM,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACjD,IAAI,KAAK,KAAK,OAAO,CAAC,KAAK;QAAE,OAAO,OAAO,CAAC;IAC5C,OAAO,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,CAAC;AAC/B,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,WAAgD,EAChD,OAAqC;IAErC,IAAI,CAAC,WAAW;QAAE,OAAO,WAAW,CAAC;IACrC,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,GAAG,GAA4B,EAAE,GAAG,WAAW,EAAE,CAAC;IAExD,KAAK,MAAM,GAAG,IAAI,CAAC,gBAAgB,EAAE,YAAY,EAAE,OAAO,CAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"resolveRunTaskModelReferences.js","sourceRoot":"","sources":["../../src/utils/resolveRunTaskModelReferences.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { buildAiSkillsModelConfigForMain, getSkillModelFromSlots,
|
|
1
|
+
export { buildAiSkillsModelConfigForMain, getPreActionModelFromSlots, getPostActionModelFromSlots, getSkillModelFromSlots, isRootLlmCallPreMainModelCollision, resolveMainSkillModel, resolvePostActionModel, resolvePreActionModel, } from "../types/model-config.js";
|
|
2
2
|
export { formatResolvedProfileModelId, isAliasLikeModelValue, isResolvableModelAlias, normalizeXynthesisModelAlias, resolveModelReference, resolveModelReferenceForXynthesis, } from "./resolveAiProfileModel.js";
|
|
3
3
|
export { resolveRunTaskModelReferences } from "./resolveRunTaskModelReferences.js";
|
|
4
4
|
//# sourceMappingURL=routeModelConfigSlots.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routeModelConfigSlots.d.ts","sourceRoot":"","sources":["../../src/utils/routeModelConfigSlots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,sBAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"routeModelConfigSlots.d.ts","sourceRoot":"","sources":["../../src/utils/routeModelConfigSlots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,0BAA0B,EAC1B,2BAA2B,EAC3B,sBAAsB,EACtB,kCAAkC,EAClC,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,EACrB,sBAAsB,EACtB,4BAA4B,EAC5B,qBAAqB,EACrB,iCAAiC,GAClC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { buildAiSkillsModelConfigForMain, getSkillModelFromSlots,
|
|
1
|
+
export { buildAiSkillsModelConfigForMain, getPreActionModelFromSlots, getPostActionModelFromSlots, getSkillModelFromSlots, isRootLlmCallPreMainModelCollision, resolveMainSkillModel, resolvePostActionModel, resolvePreActionModel, } from "../types/model-config.js";
|
|
2
2
|
export { formatResolvedProfileModelId, isAliasLikeModelValue, isResolvableModelAlias, normalizeXynthesisModelAlias, resolveModelReference, resolveModelReferenceForXynthesis, } from "./resolveAiProfileModel.js";
|
|
3
3
|
export { resolveRunTaskModelReferences } from "./resolveRunTaskModelReferences.js";
|
|
4
4
|
//# sourceMappingURL=routeModelConfigSlots.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routeModelConfigSlots.js","sourceRoot":"","sources":["../../src/utils/routeModelConfigSlots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,sBAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"routeModelConfigSlots.js","sourceRoot":"","sources":["../../src/utils/routeModelConfigSlots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,0BAA0B,EAC1B,2BAA2B,EAC3B,sBAAsB,EACtB,kCAAkC,EAClC,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,EACrB,sBAAsB,EACtB,4BAA4B,EAC5B,qBAAqB,EACrB,iCAAiC,GAClC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { LlmCallConfig } from "../types/llmCall.js";
|
|
1
2
|
import type { RunTaskRequest } from "../types/task-types.js";
|
|
2
3
|
import type { RunTaskValidationIssue, RunTaskValidationResult, RunTaskValidationSeverity } from "./types.js";
|
|
3
4
|
export declare function pushIssue(issues: RunTaskValidationIssue[], issue: Omit<RunTaskValidationIssue, "severity"> & {
|
|
@@ -12,10 +13,12 @@ export declare function valueIsPresent(v: unknown): boolean;
|
|
|
12
13
|
export declare function previewValue(v: unknown, max?: number): string | undefined;
|
|
13
14
|
export declare function validateLlmCallFields(llmCall: unknown, basePath: string, issues: RunTaskValidationIssue[]): void;
|
|
14
15
|
/**
|
|
15
|
-
* Validate canonical {@link RunTaskRequest.modelConfig}:
|
|
16
|
-
* Rejects legacy `model`. Accepts `@x12i/ai-profiles` aliases (resolved at `runTask` entry).
|
|
16
|
+
* Validate canonical {@link RunTaskRequest.modelConfig}: preActionModel + skillModel + postActionModel.
|
|
17
|
+
* Rejects legacy `model` and deprecated `xynthesisModel`. Accepts `@x12i/ai-profiles` aliases (resolved at `runTask` entry).
|
|
17
18
|
*/
|
|
18
19
|
export declare function validateRunTaskModelConfig(modelConfig: unknown, basePath: string, issues: RunTaskValidationIssue[]): void;
|
|
20
|
+
/** Warn when root llmCall.model duplicates preActionModel but skillModel differs (PRE → MAIN leak). */
|
|
21
|
+
export declare function validateRootLlmCallModelScope(modelConfig: unknown, llmCall: LlmCallConfig | undefined, issues: RunTaskValidationIssue[]): void;
|
|
19
22
|
/** Pipeline / step-level modelConfig (may use `model` on internal synthesis configs). */
|
|
20
23
|
export declare function validateModelConfigFields(modelConfig: unknown, basePath: string, issues: RunTaskValidationIssue[]): void;
|
|
21
24
|
//# sourceMappingURL=helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AASzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAG7D,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EACvB,yBAAyB,EAC1B,MAAM,YAAY,CAAC;AAEpB,wBAAgB,SAAS,CACvB,MAAM,EAAE,sBAAsB,EAAE,EAChC,KAAK,EAAE,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,GAAG;IAAE,QAAQ,CAAC,EAAE,yBAAyB,CAAA;CAAE,GACzF,IAAI,CAEN;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,sBAAsB,EAAE,GAAG,uBAAuB,CASlG;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,MAAM,CAExD;AAED,oGAAoG;AACpG,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA4B1F;AAED,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,IAAI,EAAE,MAAM,GACX,OAAO,CAST;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAMlD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,SAAM,GAAG,MAAM,GAAG,SAAS,CAatE;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,sBAAsB,EAAE,GAC/B,IAAI,CAyEN;AA4CD;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,sBAAsB,EAAE,GAC/B,IAAI,CA0DN;AAED,uGAAuG;AACvG,wBAAgB,6BAA6B,CAC3C,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,aAAa,GAAG,SAAS,EAClC,MAAM,EAAE,sBAAsB,EAAE,GAC/B,IAAI,CAYN;AAED,yFAAyF;AACzF,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,sBAAsB,EAAE,GAC/B,IAAI,CA0DN"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isResolvableModelAlias, isConcreteModelId, isRecord, } from "../types/model-config.js";
|
|
1
|
+
import { isResolvableModelAlias, isConcreteModelId, isRecord, isRootLlmCallPreMainModelCollision, getPreActionModelFromSlots, getSkillModelFromSlots, } from "../types/model-config.js";
|
|
2
2
|
import { getByPath } from "../utils/jsonPaths.js";
|
|
3
3
|
import { resolveXynthesizedSmartInputPath } from "../utils/xynthesizedSmartInputPaths.js";
|
|
4
4
|
export function pushIssue(issues, issue) {
|
|
@@ -99,14 +99,12 @@ export function validateLlmCallFields(llmCall, basePath, issues) {
|
|
|
99
99
|
message: `${basePath}.model must be a non-empty string when set.`,
|
|
100
100
|
});
|
|
101
101
|
}
|
|
102
|
-
if (
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
});
|
|
109
|
-
}
|
|
102
|
+
if (o.maxTokensCap !== undefined || o.maxTokens !== undefined) {
|
|
103
|
+
pushIssue(issues, {
|
|
104
|
+
code: "LLM_CALL_TOKEN_CAP_NOT_ACCEPTED",
|
|
105
|
+
path: `${basePath}.maxTokensCap`,
|
|
106
|
+
message: `${basePath} must not set maxTokensCap or maxTokens; completion caps are owned by ai-skills / xynthesis Optimixer.`,
|
|
107
|
+
});
|
|
110
108
|
}
|
|
111
109
|
if (cfg.timeoutMs !== undefined) {
|
|
112
110
|
if (typeof cfg.timeoutMs !== "number" || !Number.isFinite(cfg.timeoutMs) || cfg.timeoutMs < 1) {
|
|
@@ -195,12 +193,18 @@ function validateModelConfigSlot(value, slotPath, issues, options) {
|
|
|
195
193
|
}
|
|
196
194
|
}
|
|
197
195
|
/**
|
|
198
|
-
* Validate canonical {@link RunTaskRequest.modelConfig}:
|
|
199
|
-
* Rejects legacy `model`. Accepts `@x12i/ai-profiles` aliases (resolved at `runTask` entry).
|
|
196
|
+
* Validate canonical {@link RunTaskRequest.modelConfig}: preActionModel + skillModel + postActionModel.
|
|
197
|
+
* Rejects legacy `model` and deprecated `xynthesisModel`. Accepts `@x12i/ai-profiles` aliases (resolved at `runTask` entry).
|
|
200
198
|
*/
|
|
201
199
|
export function validateRunTaskModelConfig(modelConfig, basePath, issues) {
|
|
202
|
-
if (modelConfig === undefined || modelConfig === null)
|
|
200
|
+
if (modelConfig === undefined || modelConfig === null) {
|
|
201
|
+
pushIssue(issues, {
|
|
202
|
+
code: "MODEL_CONFIG_REQUIRED",
|
|
203
|
+
path: basePath,
|
|
204
|
+
message: `${basePath} is required with preActionModel, skillModel, and postActionModel (no env or built-in model defaults).`,
|
|
205
|
+
});
|
|
203
206
|
return;
|
|
207
|
+
}
|
|
204
208
|
if (!isRecord(modelConfig)) {
|
|
205
209
|
pushIssue(issues, {
|
|
206
210
|
code: "MODEL_CONFIG_NOT_OBJECT",
|
|
@@ -213,24 +217,50 @@ export function validateRunTaskModelConfig(modelConfig, basePath, issues) {
|
|
|
213
217
|
pushIssue(issues, {
|
|
214
218
|
code: "NON_CANONICAL_MODEL_CONFIG",
|
|
215
219
|
path: `${basePath}.model`,
|
|
216
|
-
message: `${basePath}.model is not accepted on RunTaskRequest; use skillModel and
|
|
220
|
+
message: `${basePath}.model is not accepted on RunTaskRequest; use preActionModel, skillModel, and postActionModel.`,
|
|
221
|
+
});
|
|
222
|
+
}
|
|
223
|
+
if (modelConfig.xynthesisModel !== undefined) {
|
|
224
|
+
pushIssue(issues, {
|
|
225
|
+
code: "NON_CANONICAL_MODEL_CONFIG",
|
|
226
|
+
path: `${basePath}.xynthesisModel`,
|
|
227
|
+
message: `${basePath}.xynthesisModel is not accepted; use preActionModel and postActionModel instead.`,
|
|
217
228
|
});
|
|
218
229
|
}
|
|
219
|
-
const
|
|
230
|
+
const hasPre = modelConfig.preActionModel !== undefined;
|
|
220
231
|
const hasSkill = modelConfig.skillModel !== undefined;
|
|
221
|
-
|
|
232
|
+
const hasPost = modelConfig.postActionModel !== undefined;
|
|
233
|
+
if (!hasPre || !hasSkill || !hasPost) {
|
|
222
234
|
pushIssue(issues, {
|
|
223
235
|
code: "MODEL_CONFIG_SLOTS_REQUIRED",
|
|
224
236
|
path: basePath,
|
|
225
|
-
message: `${basePath} must include
|
|
237
|
+
message: `${basePath} must include preActionModel, skillModel, and postActionModel when modelConfig is set.`,
|
|
226
238
|
});
|
|
227
239
|
}
|
|
228
|
-
validateModelConfigSlot(modelConfig.
|
|
240
|
+
validateModelConfigSlot(modelConfig.preActionModel, `${basePath}.preActionModel`, issues, {
|
|
241
|
+
requireConcrete: false,
|
|
242
|
+
rejectConcrete: true,
|
|
243
|
+
});
|
|
244
|
+
validateModelConfigSlot(modelConfig.postActionModel, `${basePath}.postActionModel`, issues, {
|
|
229
245
|
requireConcrete: false,
|
|
230
246
|
rejectConcrete: true,
|
|
231
247
|
});
|
|
232
248
|
validateModelConfigSlot(modelConfig.skillModel, `${basePath}.skillModel`, issues, {
|
|
233
|
-
requireConcrete:
|
|
249
|
+
requireConcrete: false,
|
|
250
|
+
});
|
|
251
|
+
}
|
|
252
|
+
/** Warn when root llmCall.model duplicates preActionModel but skillModel differs (PRE → MAIN leak). */
|
|
253
|
+
export function validateRootLlmCallModelScope(modelConfig, llmCall, issues) {
|
|
254
|
+
if (!isRootLlmCallPreMainModelCollision(modelConfig, llmCall))
|
|
255
|
+
return;
|
|
256
|
+
const pre = getPreActionModelFromSlots(modelConfig) ?? "?";
|
|
257
|
+
const skill = getSkillModelFromSlots(modelConfig) ?? "?";
|
|
258
|
+
pushIssue(issues, {
|
|
259
|
+
code: "MODEL_CONFIG_LLM_CALL_PRE_MAIN_COLLISION",
|
|
260
|
+
severity: "warning",
|
|
261
|
+
path: "llmCall.model",
|
|
262
|
+
message: `llmCall.model duplicates preActionModel ("${pre}") but skillModel is "${skill}"; MAIN uses skillModel. ` +
|
|
263
|
+
"Set PRE model via preActionModel or executionPipeline[pre].config.llmCall; reserve root llmCall for MAIN overrides.",
|
|
234
264
|
});
|
|
235
265
|
}
|
|
236
266
|
/** Pipeline / step-level modelConfig (may use `model` on internal synthesis configs). */
|
|
@@ -245,9 +275,22 @@ export function validateModelConfigFields(modelConfig, basePath, issues) {
|
|
|
245
275
|
});
|
|
246
276
|
return;
|
|
247
277
|
}
|
|
248
|
-
const
|
|
249
|
-
|
|
250
|
-
|
|
278
|
+
const hasTriplet = modelConfig.preActionModel !== undefined ||
|
|
279
|
+
modelConfig.postActionModel !== undefined ||
|
|
280
|
+
modelConfig.skillModel !== undefined;
|
|
281
|
+
if (hasTriplet) {
|
|
282
|
+
if (modelConfig.xynthesisModel !== undefined) {
|
|
283
|
+
pushIssue(issues, {
|
|
284
|
+
code: "NON_CANONICAL_MODEL_CONFIG",
|
|
285
|
+
path: `${basePath}.xynthesisModel`,
|
|
286
|
+
message: `${basePath}.xynthesisModel is not accepted; use preActionModel and postActionModel.`,
|
|
287
|
+
});
|
|
288
|
+
}
|
|
289
|
+
validateModelConfigSlot(modelConfig.preActionModel, `${basePath}.preActionModel`, issues, {
|
|
290
|
+
requireConcrete: false,
|
|
291
|
+
rejectConcrete: true,
|
|
292
|
+
});
|
|
293
|
+
validateModelConfigSlot(modelConfig.postActionModel, `${basePath}.postActionModel`, issues, {
|
|
251
294
|
requireConcrete: false,
|
|
252
295
|
rejectConcrete: true,
|
|
253
296
|
});
|
|
@@ -258,7 +301,7 @@ export function validateModelConfigFields(modelConfig, basePath, issues) {
|
|
|
258
301
|
pushIssue(issues, {
|
|
259
302
|
code: "NON_CANONICAL_MODEL_CONFIG",
|
|
260
303
|
path: `${basePath}.model`,
|
|
261
|
-
message: `${basePath} must not combine legacy model with
|
|
304
|
+
message: `${basePath} must not combine legacy model with preActionModel/skillModel/postActionModel slots.`,
|
|
262
305
|
});
|
|
263
306
|
}
|
|
264
307
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,QAAQ,EACR,kCAAkC,EAClC,0BAA0B,EAC1B,sBAAsB,GACvB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAO1F,MAAM,UAAU,SAAS,CACvB,MAAgC,EAChC,KAA0F;IAE1F,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAAgC;IACvE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;IAChE,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC;QACvB,MAAM;QACN,MAAM;QACN,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,CAAU;IACzC,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;AACtD,CAAC;AAED,oGAAoG;AACpG,MAAM,UAAU,6BAA6B,CAAC,GAAmB;IAC/D,MAAM,EAAE,GACN,GAAG,CAAC,eAAe,IAAI,OAAO,GAAG,CAAC,eAAe,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACnG,CAAC,CAAE,GAAG,CAAC,eAA2C;QAClD,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,YAAY,GAChB,EAAE,CAAC,YAAY;QACf,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;YAClF,CAAC,CAAC,GAAG,CAAC,SAAS;YACf,CAAC,CAAC,EAAE,CAAC,CAAC;IACV,MAAM,aAAa,GACjB,EAAE,CAAC,aAAa,IAAI,OAAO,EAAE,CAAC,aAAa,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC;QAC1F,CAAC,CAAC,EAAE,CAAC,aAAa;QAClB,CAAC,CAAC,EAAE,CAAC;IAET,OAAO;QACL,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,YAAY;QACZ,aAAa;QACb,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,EAAE;QAC9B,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,EAAE;QAChC,eAAe,EAAE,EAAE;QACnB,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE;QAClC,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,UAAU,EAAE,GAAG,CAAC,UAAU;KAC3B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,OAAgC,EAChC,IAAY;IAEZ,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACpC,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC;QAC9B,OAAO,gCAAgC,CACrC,IAAI,EACJ,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,CAA6B,CAAC,CAAC,CAAC,SAAS,CAC7F,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,CAAU;IACvC,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAChD,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;IACtD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1C,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC,CAAW,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACtE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,CAAU,EAAE,GAAG,GAAG,GAAG;IAChD,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACtC,IAAI,CAAS,CAAC;IACd,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,CAAC,GAAG,CAAC,CAAC;SAC5B,CAAC;QACJ,IAAI,CAAC;YACH,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC;QAAC,MAAM,CAAC;YACP,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAChB,CAAC;IACH,CAAC;IACD,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG;QAAE,OAAO,CAAC,CAAC;IAC9B,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,OAAgB,EAChB,QAAgB,EAChB,MAAgC;IAEhC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO;IACtD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1D,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,qBAAqB;YAC3B,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG,QAAQ,wCAAwC;SAC7D,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,MAAM,CAAC,GAAG,OAAkC,CAAC;IAC7C,MAAM,GAAG,GAAG,CAAkB,CAAC;IAC/B,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5D,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,sBAAsB;YAC5B,IAAI,EAAE,GAAG,QAAQ,QAAQ;YACzB,OAAO,EAAE,GAAG,QAAQ,6CAA6C;SAClE,CAAC,CAAC;IACL,CAAC;IACD,IAAI,CAAC,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QAC9D,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,iCAAiC;YACvC,IAAI,EAAE,GAAG,QAAQ,eAAe;YAChC,OAAO,EAAE,GAAG,QAAQ,wGAAwG;SAC7H,CAAC,CAAC;IACL,CAAC;IACD,IAAI,GAAG,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QAChC,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;YAC9F,SAAS,CAAC,MAAM,EAAE;gBAChB,IAAI,EAAE,0BAA0B;gBAChC,IAAI,EAAE,GAAG,QAAQ,YAAY;gBAC7B,OAAO,EAAE,GAAG,QAAQ,mDAAmD;aACxE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,IAAI,GAAG,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;QACtC,IACE,OAAO,GAAG,CAAC,eAAe,KAAK,QAAQ;YACvC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC;YACrC,GAAG,CAAC,eAAe,GAAG,CAAC,EACvB,CAAC;YACD,SAAS,CAAC,MAAM,EAAE;gBAChB,IAAI,EAAE,oCAAoC;gBAC1C,IAAI,EAAE,GAAG,QAAQ,kBAAkB;gBACnC,OAAO,EAAE,GAAG,QAAQ,yDAAyD;aAC9E,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,IAAI,GAAG,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAClC,IAAI,OAAO,GAAG,CAAC,WAAW,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7E,SAAS,CAAC,MAAM,EAAE;gBAChB,IAAI,EAAE,8BAA8B;gBACpC,IAAI,EAAE,GAAG,QAAQ,cAAc;gBAC/B,OAAO,EAAE,GAAG,QAAQ,gDAAgD;aACrE,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,GAAG,CAAC,WAAW,GAAG,CAAC,IAAI,GAAG,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;YACtD,SAAS,CAAC,MAAM,EAAE;gBAChB,IAAI,EAAE,mCAAmC;gBACzC,QAAQ,EAAE,SAAS;gBACnB,IAAI,EAAE,GAAG,QAAQ,cAAc;gBAC/B,OAAO,EAAE,GAAG,QAAQ,gDAAgD,GAAG,CAAC,WAAW,IAAI;aACxF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC3B,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YAChG,SAAS,CAAC,MAAM,EAAE;gBAChB,IAAI,EAAE,wBAAwB;gBAC9B,IAAI,EAAE,GAAG,QAAQ,OAAO;gBACxB,OAAO,EAAE,GAAG,QAAQ,4CAA4C;aACjE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,uBAAuB,CAC9B,KAAc,EACd,QAAgB,EAChB,MAAgC,EAChC,OAA+D;IAE/D,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO;IAChC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,2BAA2B;YACjC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG,QAAQ,uCAAuC;SAC5D,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAClB,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,2BAA2B;YACjC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG,QAAQ,8BAA8B;SACnD,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,IAAI,OAAO,CAAC,cAAc,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QACvD,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,6CAA6C;YACnD,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG,QAAQ,uHAAuH;SAC5I,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,eAAe;QAAE,OAAO;IACrC,IAAI,sBAAsB,CAAC,KAAK,CAAC;QAAE,OAAO;IAC1C,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,2BAA2B;YACjC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG,QAAQ,6FAA6F;SAClH,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CACxC,WAAoB,EACpB,QAAgB,EAChB,MAAgC;IAEhC,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;QACtD,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,uBAAuB;YAC7B,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG,QAAQ,wGAAwG;SAC7H,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC3B,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,yBAAyB;YAC/B,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG,QAAQ,wCAAwC;SAC7D,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,WAAW,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACpC,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,4BAA4B;YAClC,IAAI,EAAE,GAAG,QAAQ,QAAQ;YACzB,OAAO,EACL,GAAG,QAAQ,gGAAgG;SAC9G,CAAC,CAAC;IACL,CAAC;IAED,IAAI,WAAW,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QAC7C,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,4BAA4B;YAClC,IAAI,EAAE,GAAG,QAAQ,iBAAiB;YAClC,OAAO,EACL,GAAG,QAAQ,kFAAkF;SAChG,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,WAAW,CAAC,cAAc,KAAK,SAAS,CAAC;IACxD,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,KAAK,SAAS,CAAC;IACtD,MAAM,OAAO,GAAG,WAAW,CAAC,eAAe,KAAK,SAAS,CAAC;IAC1D,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE,CAAC;QACrC,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,6BAA6B;YACnC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG,QAAQ,wFAAwF;SAC7G,CAAC,CAAC;IACL,CAAC;IAED,uBAAuB,CAAC,WAAW,CAAC,cAAc,EAAE,GAAG,QAAQ,iBAAiB,EAAE,MAAM,EAAE;QACxF,eAAe,EAAE,KAAK;QACtB,cAAc,EAAE,IAAI;KACrB,CAAC,CAAC;IACH,uBAAuB,CAAC,WAAW,CAAC,eAAe,EAAE,GAAG,QAAQ,kBAAkB,EAAE,MAAM,EAAE;QAC1F,eAAe,EAAE,KAAK;QACtB,cAAc,EAAE,IAAI;KACrB,CAAC,CAAC;IACH,uBAAuB,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,QAAQ,aAAa,EAAE,MAAM,EAAE;QAChF,eAAe,EAAE,KAAK;KACvB,CAAC,CAAC;AACL,CAAC;AAED,uGAAuG;AACvG,MAAM,UAAU,6BAA6B,CAC3C,WAAoB,EACpB,OAAkC,EAClC,MAAgC;IAEhC,IAAI,CAAC,kCAAkC,CAAC,WAAW,EAAE,OAAO,CAAC;QAAE,OAAO;IACtE,MAAM,GAAG,GAAG,0BAA0B,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC;IAC3D,MAAM,KAAK,GAAG,sBAAsB,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC;IACzD,SAAS,CAAC,MAAM,EAAE;QAChB,IAAI,EAAE,0CAA0C;QAChD,QAAQ,EAAE,SAAS;QACnB,IAAI,EAAE,eAAe;QACrB,OAAO,EACL,6CAA6C,GAAG,yBAAyB,KAAK,2BAA2B;YACzG,qHAAqH;KACxH,CAAC,CAAC;AACL,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,yBAAyB,CACvC,WAAoB,EACpB,QAAgB,EAChB,MAAgC;IAEhC,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI;QAAE,OAAO;IAC9D,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC3B,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,yBAAyB;YAC/B,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG,QAAQ,wCAAwC;SAC7D,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GACd,WAAW,CAAC,cAAc,KAAK,SAAS;QACxC,WAAW,CAAC,eAAe,KAAK,SAAS;QACzC,WAAW,CAAC,UAAU,KAAK,SAAS,CAAC;IACvC,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,WAAW,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YAC7C,SAAS,CAAC,MAAM,EAAE;gBAChB,IAAI,EAAE,4BAA4B;gBAClC,IAAI,EAAE,GAAG,QAAQ,iBAAiB;gBAClC,OAAO,EAAE,GAAG,QAAQ,0EAA0E;aAC/F,CAAC,CAAC;QACL,CAAC;QACD,uBAAuB,CAAC,WAAW,CAAC,cAAc,EAAE,GAAG,QAAQ,iBAAiB,EAAE,MAAM,EAAE;YACxF,eAAe,EAAE,KAAK;YACtB,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QACH,uBAAuB,CAAC,WAAW,CAAC,eAAe,EAAE,GAAG,QAAQ,kBAAkB,EAAE,MAAM,EAAE;YAC1F,eAAe,EAAE,KAAK;YACtB,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QACH,uBAAuB,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,QAAQ,aAAa,EAAE,MAAM,EAAE;YAChF,eAAe,EAAE,KAAK;SACvB,CAAC,CAAC;QACH,IAAI,WAAW,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACpC,SAAS,CAAC,MAAM,EAAE;gBAChB,IAAI,EAAE,4BAA4B;gBAClC,IAAI,EAAE,GAAG,QAAQ,QAAQ;gBACzB,OAAO,EAAE,GAAG,QAAQ,sFAAsF;aAC3G,CAAC,CAAC;QACL,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC;IAC5B,IAAI,CAAC,KAAK,SAAS,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC7C,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,+BAA+B;YACrC,IAAI,EAAE,GAAG,QAAQ,QAAQ;YACzB,OAAO,EAAE,GAAG,QAAQ,mCAAmC;SACxD,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QAC9C,SAAS,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,0BAA0B;YAChC,IAAI,EAAE,GAAG,QAAQ,QAAQ;YACzB,OAAO,EAAE,GAAG,QAAQ,oCAAoC;SACzD,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -8,7 +8,7 @@ export type RunTaskValidationIssue = {
|
|
|
8
8
|
severity: RunTaskValidationSeverity;
|
|
9
9
|
/** Human-readable explanation (includes `skillKey` when relevant). */
|
|
10
10
|
message: string;
|
|
11
|
-
/** Dot path into the request or sub-config (e.g. `smartInput.paths[0].path`, `llmCall.
|
|
11
|
+
/** Dot path into the request or sub-config (e.g. `smartInput.paths[0].path`, `llmCall.model`). */
|
|
12
12
|
path?: string;
|
|
13
13
|
};
|
|
14
14
|
export type RunTaskValidationResult = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/validation/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,yBAAyB,GAAG,OAAO,GAAG,SAAS,CAAC;AAE5D,MAAM,MAAM,sBAAsB,GAAG;IACnC,6FAA6F;IAC7F,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,yBAAyB,CAAC;IACpC,sEAAsE;IACtE,OAAO,EAAE,MAAM,CAAC;IAChB,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/validation/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,yBAAyB,GAAG,OAAO,GAAG,SAAS,CAAC;AAE5D,MAAM,MAAM,sBAAsB,GAAG;IACnC,6FAA6F;IAC7F,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,yBAAyB,CAAC;IACpC,sEAAsE;IACtE,OAAO,EAAE,MAAM,CAAC;IAChB,kGAAkG;IAClG,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,gEAAgE;IAChE,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,sBAAsB,EAAE,CAAC;IACjC,MAAM,EAAE,sBAAsB,EAAE,CAAC;IACjC,QAAQ,EAAE,sBAAsB,EAAE,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAClC,YAAY,GACZ,uBAAuB,GACvB,iBAAiB,CAAC;AAEtB,mEAAmE;AACnE,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,0BAA0B,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,0DAA0D;IAC1D,KAAK,EAAE,wBAAwB,EAAE,CAAC;IAClC,sFAAsF;IACtF,cAAc,EAAE;QACd,YAAY,EAAE,OAAO,eAAe,EAAE,gBAAgB,EAAE,CAAC;QACzD,MAAM,EAAE,OAAO,eAAe,EAAE,gBAAgB,EAAE,CAAC;KACpD,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,uBAAuB,GAAG;IACpE,aAAa,EAAE,iCAAiC,CAAC;IACjD,gGAAgG;IAChG,iBAAiB,EAAE,wBAAwB,EAAE,CAAC;IAC9C,sEAAsE;IACtE,kBAAkB,EAAE,KAAK,CAAC,wBAAwB,GAAG;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateRunTaskConfig.d.ts","sourceRoot":"","sources":["../../src/validation/validateRunTaskConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,cAAc,EAAmB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"validateRunTaskConfig.d.ts","sourceRoot":"","sources":["../../src/validation/validateRunTaskConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,cAAc,EAAmB,MAAM,wBAAwB,CAAC;AAgB7F,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AA4E1D;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,cAAc,GAAG,uBAAuB,CA2FtF"}
|
|
@@ -4,7 +4,7 @@ import { isTaskConfigurationCompileError } from "../errors/taskConfigurationComp
|
|
|
4
4
|
import { collectExecutionPipelineWarnings } from "../utils/runTaskRequestShape.js";
|
|
5
5
|
import { resolveRunTaskRuntimeKnobs } from "../internal/resolveRunTaskRuntimeKnobs.js";
|
|
6
6
|
import { collectSmartInputValidationIssues } from "./collectSmartInputValidationIssues.js";
|
|
7
|
-
import { finalizeValidationResult, isNonEmptyString, pushIssue, validateLlmCallFields, validateModelConfigFields, validateRunTaskModelConfig, } from "./helpers.js";
|
|
7
|
+
import { finalizeValidationResult, isNonEmptyString, pushIssue, validateLlmCallFields, validateModelConfigFields, validateRunTaskModelConfig, validateRootLlmCallModelScope, } from "./helpers.js";
|
|
8
8
|
function validateExecutionPipeline(pipeline, issues) {
|
|
9
9
|
if (!pipeline?.length)
|
|
10
10
|
return;
|
|
@@ -139,6 +139,7 @@ export function validateRunTaskConfig(request) {
|
|
|
139
139
|
issues.push(...collectSmartInputValidationIssues(resolved.smartInput, skillKey));
|
|
140
140
|
validateRunTaskModelConfig(resolved.modelConfig, "modelConfig", issues);
|
|
141
141
|
validateLlmCallFields(resolved.llmCall, "llmCall", issues);
|
|
142
|
+
validateRootLlmCallModelScope(resolved.modelConfig, resolved.llmCall, issues);
|
|
142
143
|
if (resolved.timeoutMs !== undefined) {
|
|
143
144
|
if (typeof resolved.timeoutMs !== "number" || !Number.isFinite(resolved.timeoutMs) || resolved.timeoutMs < 1) {
|
|
144
145
|
pushIssue(issues, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateRunTaskConfig.js","sourceRoot":"","sources":["../../src/validation/validateRunTaskConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,wCAAwC,EAAE,MAAM,wCAAwC,CAAC;AAClG,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAC7F,OAAO,EAAE,gCAAgC,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAC;AAC3F,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAChB,SAAS,EACT,qBAAqB,EACrB,yBAAyB,EACzB,0BAA0B,
|
|
1
|
+
{"version":3,"file":"validateRunTaskConfig.js","sourceRoot":"","sources":["../../src/validation/validateRunTaskConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
# Upstream feature requests (from `@exellix/ai-tasks`)
|
|
2
|
+
|
|
3
|
+
Fix reports filed for sibling packages. Hand these to the package owners; after they ship, complete the ai-tasks wrap-up.
|
|
4
|
+
|
|
5
|
+
## Invoke contract (8.4+) — **current priority**
|
|
6
|
+
|
|
7
|
+
| Package | Document | Status |
|
|
8
|
+
|---------|----------|--------|
|
|
9
|
+
| `@exellix/ai-skills` ≥ 5.9 | [ai-skills-orchestrator-invoke-contract-5.9.md](./ai-skills-orchestrator-invoke-contract-5.9.md) | **open** — `reasoningEffort` on request |
|
|
10
|
+
| `@exellix/xynthesis` ≥ 4.2 | [xynthesis-orchestrator-invoke-contract-4.2.md](./xynthesis-orchestrator-invoke-contract-4.2.md) | **open** — `reasoningEffort`, temperature/topP audit, docs |
|
|
11
|
+
| `@exellix/ai-tasks` | [ai-tasks-wrap-up-after-upstream.md](./ai-tasks-wrap-up-after-upstream.md) | **blocked** on above |
|
|
12
|
+
|
|
13
|
+
## Older / parallel tracks
|
|
14
|
+
|
|
15
|
+
| Package | Document |
|
|
16
|
+
|---------|----------|
|
|
17
|
+
| `@exellix/ai-skills` | [ai-skills-llm-observability.md](./ai-skills-llm-observability.md) |
|
|
18
|
+
| `@exellix/xynthesis` | [xynthesis-llm-observability.md](./xynthesis-llm-observability.md) |
|
|
19
|
+
| `@x12i/logxer` | [logxer-failure-classification-and-causal-diagnostics.md](./logxer-failure-classification-and-causal-diagnostics.md) |
|
|
20
|
+
| `@x12i/funcx` | [funcx-openrouter-model-id-pass-through.md](./funcx-openrouter-model-id-pass-through.md) |
|
|
21
|
+
| `@exellix/xynthesis` | [xynthesis-openrouter-wire-model-double-prefix-bug.md](./xynthesis-openrouter-wire-model-double-prefix-bug.md) |
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
# `@exellix/ai-skills` — orchestrator invoke contract fixes (≥ 5.9)
|
|
2
|
+
|
|
3
|
+
Status: **open** — blocks clean `@exellix/ai-tasks` 8.4+ integration
|
|
4
|
+
Owner: `@exellix/ai-skills`
|
|
5
|
+
Filed by: `@exellix/ai-tasks`
|
|
6
|
+
Consumer: `@exellix/ai-tasks` 8.4.0, graph-engine 7.x (`RunTaskRequest.modelConfig` triplet)
|
|
7
|
+
Pinned in ai-tasks today: `@exellix/ai-skills@5.9.11`
|
|
8
|
+
|
|
9
|
+
Related (older, partially superseded): [`ai-skills-llm-observability.md`](./ai-skills-llm-observability.md)
|
|
10
|
+
|
|
11
|
+
---
|
|
12
|
+
|
|
13
|
+
## Summary
|
|
14
|
+
|
|
15
|
+
**MAIN** skill invocation should follow the same contract as xynthesis 4.2+:
|
|
16
|
+
|
|
17
|
+
| Orchestrator sends | Package owns internally |
|
|
18
|
+
|--------------------|-------------------------|
|
|
19
|
+
| Wire **model** (`model` / `modelId`) | — |
|
|
20
|
+
| **temperature**, **topP**, other sampling knobs | — |
|
|
21
|
+
| **reasoningEffort** (for Optimixer / provider) | — |
|
|
22
|
+
| — | **max completion tokens** (Optimixer + Catalox catalog) |
|
|
23
|
+
|
|
24
|
+
ai-skills **5.9.11 already enforces the right side** (`ModelConfig.maxTokens?: never`, Optimixer merge before invoke). The remaining gap is the **left side**: the public request must **ask for `reasoningEffort`**, not only read it from Catalox.
|
|
25
|
+
|
|
26
|
+
---
|
|
27
|
+
|
|
28
|
+
## Already correct in 5.9.11 (no change needed)
|
|
29
|
+
|
|
30
|
+
### 1. Caller must not set completion token caps on `ModelConfig`
|
|
31
|
+
|
|
32
|
+
- `ModelConfig.maxTokens` is typed `never` and validated/rejected at invoke.
|
|
33
|
+
- `mergeOptimixerPredictionIntoModelConfig` / `skills-optimixer` set the effective cap.
|
|
34
|
+
- Trace echo uses `maxTokensRequested` on `SkillDiagnosticsTrace`, not `invokeRequest.modelConfig.maxTokens`.
|
|
35
|
+
|
|
36
|
+
**Acceptance (already met):** Hosts that pass `modelConfig: { model, temperature, topP }` without `maxTokens` succeed; hosts that pass `maxTokens` get a clear rejection or strip + anomaly log.
|
|
37
|
+
|
|
38
|
+
### 2. Catalox catalog carries Optimixer metadata
|
|
39
|
+
|
|
40
|
+
- `SkillOptimixerCatalogSpec` includes mandatory `reasoningEffort`, `outputIntent`, etc. (`skill-optimixer-catalog.ts`).
|
|
41
|
+
|
|
42
|
+
---
|
|
43
|
+
|
|
44
|
+
## Required fixes
|
|
45
|
+
|
|
46
|
+
### 1. Accept `reasoningEffort` on `RunSkillRequest` (or explicit `ModelConfig` extension)
|
|
47
|
+
|
|
48
|
+
#### Today
|
|
49
|
+
|
|
50
|
+
- `reasoningEffort` exists only on the **Catalox `ai-skills` catalog row** (`SkillOptimixerCatalogSpec.reasoningEffort`).
|
|
51
|
+
- `RunSkillRequest` / `ModelConfig` expose `model`, `temperature`, `topP`, … but **no `reasoningEffort`**.
|
|
52
|
+
- `@exellix/ai-tasks` has nothing to forward from graph-engine / `llmCall` even when the operator configures it per task.
|
|
53
|
+
|
|
54
|
+
#### Why it hurts
|
|
55
|
+
|
|
56
|
+
Orchestrators (graph-engine, ai-tasks) are the **source of truth** for per-node tuning. Catalog defaults are not enough when one skill key is reused with different reasoning depth per graph node. xynthesis 4.2 already threads `reasoningEffort` into Optimixer predict input internally; ai-skills should expose the same knob on the **host-facing** API.
|
|
57
|
+
|
|
58
|
+
#### Asked behavior
|
|
59
|
+
|
|
60
|
+
Add optional:
|
|
61
|
+
|
|
62
|
+
```typescript
|
|
63
|
+
import type { OptimixerReasoningEffort } from "@x12i/optimixer";
|
|
64
|
+
|
|
65
|
+
// Option A — on ModelConfig (preferred for parity with temperature/topP):
|
|
66
|
+
interface ModelConfig {
|
|
67
|
+
// ...existing fields...
|
|
68
|
+
reasoningEffort?: OptimixerReasoningEffort;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
// Option B — top-level on RunSkillRequest:
|
|
72
|
+
interface RunSkillRequest {
|
|
73
|
+
reasoningEffort?: OptimixerReasoningEffort;
|
|
74
|
+
}
|
|
75
|
+
```
|
|
76
|
+
|
|
77
|
+
**Resolution order** (document and implement consistently):
|
|
78
|
+
|
|
79
|
+
1. Request override (`modelConfig.reasoningEffort` or `RunSkillRequest.reasoningEffort`)
|
|
80
|
+
2. Catalox `SkillOptimixerCatalogSpec.reasoningEffort`
|
|
81
|
+
3. Package default (e.g. `"not-applicable"`)
|
|
82
|
+
|
|
83
|
+
Forward the resolved value into `buildAiMaxTokensPredictionInput` / Optimixer predict (same as xynthesis `resolveEffectiveMaxTokens`).
|
|
84
|
+
|
|
85
|
+
#### Acceptance
|
|
86
|
+
|
|
87
|
+
- `runSkill({ modelConfig: { model: "…", reasoningEffort: "high" } })` uses `"high"` in Optimixer predict even when catalog says `"medium"`.
|
|
88
|
+
- Trace / `invokeRequest` echo includes effective `reasoningEffort` (or Optimixer diagnostics slice).
|
|
89
|
+
- Omitting the field keeps today’s catalog-only behavior unchanged.
|
|
90
|
+
|
|
91
|
+
---
|
|
92
|
+
|
|
93
|
+
### 2. Document the orchestrator ↔ MAIN invoke contract (README / BREAKING)
|
|
94
|
+
|
|
95
|
+
Add a short **“Host responsibilities”** section:
|
|
96
|
+
|
|
97
|
+
- **Send:** concrete or resolved wire `model`, optional `temperature`, `topP`, `reasoningEffort`, `timeoutMs`.
|
|
98
|
+
- **Do not send:** `maxTokens`, `max_completion_tokens`, `max_output_tokens` on `modelConfig` (rejected).
|
|
99
|
+
- **Token budget:** owned by Optimixer from catalog + prompts; echo `usage.maxTokensRequested` / `metadata.maxTokensRequested` after invoke.
|
|
100
|
+
|
|
101
|
+
Point `@exellix/ai-tasks` integrators to this section instead of legacy `modelConfig.maxTokens` docs.
|
|
102
|
+
|
|
103
|
+
---
|
|
104
|
+
|
|
105
|
+
### 3. Update §2 in `ai-skills-llm-observability.md` (stale)
|
|
106
|
+
|
|
107
|
+
The open item **“`outputExpectation` passthrough + xynthesis-style auto-sizer on RunSkillRequest”** assumed hosts still set `modelConfig.maxTokens`. With 5.9 Optimixer, revise to:
|
|
108
|
+
|
|
109
|
+
- **Optional:** `outputExpectation` on `RunSkillRequest` to steer Optimixer output intent (parity with xynthesis), **not** to supply a literal token count.
|
|
110
|
+
- **Not asked:** restoring caller `modelConfig.maxTokens`.
|
|
111
|
+
|
|
112
|
+
(Can be a separate FR or folded into §1 if output intent is also catalog-only today.)
|
|
113
|
+
|
|
114
|
+
---
|
|
115
|
+
|
|
116
|
+
## Integration note (5.9.12 — ai-tasks)
|
|
117
|
+
|
|
118
|
+
### `analyzeSkillRequest` root export removed
|
|
119
|
+
|
|
120
|
+
- **Today:** `analyzeSkillRequest(catalox, …)` exists in `dist/analysis/` but is **not** re-exported from `@exellix/ai-skills` package root. Use **`ExellixSkillsClient.analyzeSkillRequest`** (or export the function again from `index.js` for Catalox-only callers).
|
|
121
|
+
- **ai-tasks:** `analyzeRunTaskRequest` uses a short-lived `ExellixSkillsClient` until root export returns.
|
|
122
|
+
|
|
123
|
+
### `testContentRegistryConnection` renamed
|
|
124
|
+
|
|
125
|
+
- Use **`ExellixSkillsClient.testCatalogConnection()`** (Catalox reachability; replaces gateway content-registry check).
|
|
126
|
+
|
|
127
|
+
---
|
|
128
|
+
|
|
129
|
+
## Optional (lower priority)
|
|
130
|
+
|
|
131
|
+
### 4. `SkillExecutionError` in default mode
|
|
132
|
+
|
|
133
|
+
Still valuable; see [`ai-skills-llm-observability.md` §1](./ai-skills-llm-observability.md). Independent of token / reasoning contract.
|
|
134
|
+
|
|
135
|
+
---
|
|
136
|
+
|
|
137
|
+
## Verification checklist (for ai-skills PR)
|
|
138
|
+
|
|
139
|
+
- [ ] TypeScript: `ModelConfig` / `RunSkillRequest` exposes `reasoningEffort`.
|
|
140
|
+
- [ ] Unit test: request override beats catalog default in Optimixer predict input.
|
|
141
|
+
- [ ] Unit test: `modelConfig.maxTokens` still rejected.
|
|
142
|
+
- [ ] README/BREAKING: host must not send max token caps on `modelConfig`.
|
|
143
|
+
|
|
144
|
+
---
|
|
145
|
+
|
|
146
|
+
## After this ships — ai-tasks follow-up
|
|
147
|
+
|
|
148
|
+
See [`ai-tasks-wrap-up-after-upstream.md`](./ai-tasks-wrap-up-after-upstream.md):
|
|
149
|
+
|
|
150
|
+
- Add `reasoningEffort` to `LlmCallConfig` / tuning passthrough → `buildAiSkillsModelConfigForMain`.
|
|
151
|
+
- Stop forwarding any `maxTokens` / `maxTokensCap` to `runSkill`.
|