@exellix/ai-tasks 8.0.1 → 8.0.7
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/BREAKING-CHANGES.md +17 -2
- package/CHANGELOG.md +16 -0
- package/README.md +51 -6
- package/dist/core/task-sdk.d.ts.map +1 -1
- package/dist/core/task-sdk.js +3 -2
- package/dist/core/task-sdk.js.map +1 -1
- package/dist/execution-strategies/constants.d.ts +2 -3
- package/dist/execution-strategies/constants.d.ts.map +1 -1
- package/dist/execution-strategies/constants.js +2 -3
- package/dist/execution-strategies/constants.js.map +1 -1
- package/dist/execution-strategies/genericExecutionFuncxEnvelope.d.ts +1 -1
- package/dist/execution-strategies/genericExecutionFuncxEnvelope.js +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/internal/runPostStepLlmCall.d.ts.map +1 -1
- package/dist/internal/runPostStepLlmCall.js +4 -1
- package/dist/internal/runPostStepLlmCall.js.map +1 -1
- package/dist/strategies/direct-execution-strategy.d.ts.map +1 -1
- package/dist/strategies/direct-execution-strategy.js +14 -2
- package/dist/strategies/direct-execution-strategy.js.map +1 -1
- package/dist/types/model-config.d.ts +3 -5
- package/dist/types/model-config.d.ts.map +1 -1
- package/dist/types/model-config.js +3 -32
- package/dist/types/model-config.js.map +1 -1
- package/dist/utilities/runUtility.d.ts.map +1 -1
- package/dist/utilities/runUtility.js +5 -1
- package/dist/utilities/runUtility.js.map +1 -1
- package/dist/utils/concreteModelId.d.ts +3 -0
- package/dist/utils/concreteModelId.d.ts.map +1 -0
- package/dist/utils/concreteModelId.js +22 -0
- package/dist/utils/concreteModelId.js.map +1 -0
- package/dist/utils/resolveAiProfileModel.d.ts +21 -0
- package/dist/utils/resolveAiProfileModel.d.ts.map +1 -0
- package/dist/utils/resolveAiProfileModel.js +146 -0
- package/dist/utils/resolveAiProfileModel.js.map +1 -0
- package/dist/utils/resolveRunTaskModelReferences.d.ts +7 -0
- package/dist/utils/resolveRunTaskModelReferences.d.ts.map +1 -0
- package/dist/utils/resolveRunTaskModelReferences.js +172 -0
- package/dist/utils/resolveRunTaskModelReferences.js.map +1 -0
- package/dist/utils/routeModelConfigSlots.d.ts +2 -0
- package/dist/utils/routeModelConfigSlots.d.ts.map +1 -1
- package/dist/utils/routeModelConfigSlots.js +2 -0
- package/dist/utils/routeModelConfigSlots.js.map +1 -1
- package/dist/validation/helpers.d.ts +1 -1
- package/dist/validation/helpers.d.ts.map +1 -1
- package/dist/validation/helpers.js +5 -11
- package/dist/validation/helpers.js.map +1 -1
- package/package.json +6 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/execution-strategies/constants.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/execution-strategies/constants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EACL,gCAAgC,EAChC,2CAA2C,EAC3C,yCAAyC,GAC1C,MAAM,uBAAuB,CAAC;AAE/B,4GAA4G;AAC5G,eAAO,MAAM,gCAAgC,IAAI,CAAC;AAElD,6IAA6I;AAC7I,eAAO,MAAM,4BAA4B,sCAAsC,CAAC;AAEhF,eAAO,MAAM,+BAA+B,mCAAoC,CAAC;AAEjF,MAAM,MAAM,2BAA2B,GAAG,CAAC,OAAO,+BAA+B,CAAC,CAAC,MAAM,CAAC,CAAC"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Default FuncX function IDs for execution-strategy wrappers (canonical generic caps).
|
|
3
|
+
* Re-exported from `@x12i/funcx/functions` (≥4.2.0) so ids stay aligned with the catalog.
|
|
3
4
|
* Override per-invocation via {@link ExecutionStrategyInvocation.args}.`functionId` — target must accept the same generic envelope (`goal`, `input`, `context`, `result?`, `args`, `attribution`).
|
|
4
5
|
*/
|
|
5
|
-
export
|
|
6
|
-
export const FUNCX_EXECUTION_EVALUATE_RESULT_FUNCTION_ID = "execution/evaluate-result";
|
|
7
|
-
export const FUNCX_RESEARCH_PLAN_QUESTIONS_FUNCTION_ID = "research/plan-questions";
|
|
6
|
+
export { FUNCX_EXECUTION_PLAN_FUNCTION_ID, FUNCX_EXECUTION_EVALUATE_RESULT_FUNCTION_ID, FUNCX_RESEARCH_PLAN_QUESTIONS_FUNCTION_ID, } from "@x12i/funcx/functions";
|
|
8
7
|
/** Default optimizer retries when `maxIterations` is omitted on the invocation (minimum 1 MAIN attempt). */
|
|
9
8
|
export const DEFAULT_OPTIMIZER_MAX_ITERATIONS = 3;
|
|
10
9
|
/** Env: integer max iterations for optimizer when request omits `maxIterations` (falls back to {@link DEFAULT_OPTIMIZER_MAX_ITERATIONS}). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/execution-strategies/constants.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/execution-strategies/constants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EACL,gCAAgC,EAChC,2CAA2C,EAC3C,yCAAyC,GAC1C,MAAM,uBAAuB,CAAC;AAE/B,4GAA4G;AAC5G,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,CAAC;AAElD,6IAA6I;AAC7I,MAAM,CAAC,MAAM,4BAA4B,GAAG,mCAAmC,CAAC;AAEhF,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,SAAS,EAAE,WAAW,CAAU,CAAC"}
|
|
@@ -54,7 +54,7 @@ export declare function adaptExecutionPlanResult(raw: unknown): PlannerStrategyO
|
|
|
54
54
|
export declare function adaptEvaluateResultResponse(raw: unknown): OptimizerStrategyOutput;
|
|
55
55
|
/**
|
|
56
56
|
* Normalize `run()` / HTTP `/run` success payloads to the function’s JSON object.
|
|
57
|
-
* Delegates to {@link getRunJsonResult} from `@x12i/funcx/functions` (≥
|
|
57
|
+
* Delegates to {@link getRunJsonResult} from `@x12i/funcx/functions` (≥4.2.0).
|
|
58
58
|
*/
|
|
59
59
|
export declare function unwrapFuncxRunValue(raw: unknown): unknown;
|
|
60
60
|
export type ResearchPlanQuestionsGenericPayload = GenericExecutionStrategyPayload;
|
|
@@ -231,7 +231,7 @@ export function adaptEvaluateResultResponse(raw) {
|
|
|
231
231
|
}
|
|
232
232
|
/**
|
|
233
233
|
* Normalize `run()` / HTTP `/run` success payloads to the function’s JSON object.
|
|
234
|
-
* Delegates to {@link getRunJsonResult} from `@x12i/funcx/functions` (≥
|
|
234
|
+
* Delegates to {@link getRunJsonResult} from `@x12i/funcx/functions` (≥4.2.0).
|
|
235
235
|
*/
|
|
236
236
|
export function unwrapFuncxRunValue(raw) {
|
|
237
237
|
return getRunJsonResult(raw);
|
package/dist/index.d.ts
CHANGED
|
@@ -18,7 +18,7 @@ export { compileTaskConfigurationOnRunTaskRequest, type CompileTaskConfiguration
|
|
|
18
18
|
export { TaskConfigurationCompileError, TASK_CONFIGURATION_COMPILE_ERROR_NAME, isTaskConfigurationCompileError, } from "./errors/taskConfigurationCompileError.js";
|
|
19
19
|
export { AI_TASK_PRE_ENABLE_SYNTHESIS, type TaskConfigurationAuthoring, type AiTaskStrategiesAuthoring, type AiTaskProfileAuthoring, type InputSynthesisAuthoring, } from "./types/task-configuration.js";
|
|
20
20
|
export type { RunTaskModelConfig } from "./types/model-config.js";
|
|
21
|
-
export { buildAiSkillsModelConfigForMain, getSkillModelFromSlots, getXynthesisModelFromSlots, resolveXynthesisModelForPre, } from "./utils/routeModelConfigSlots.js";
|
|
21
|
+
export { buildAiSkillsModelConfigForMain, getSkillModelFromSlots, getXynthesisModelFromSlots, resolveXynthesisModelForPre, formatResolvedProfileModelId, isAliasLikeModelValue, isResolvableModelAlias, normalizeXynthesisModelAlias, resolveModelReference, resolveModelReferenceForXynthesis, resolveRunTaskModelReferences, } from "./utils/routeModelConfigSlots.js";
|
|
22
22
|
export { assertRequiredRunSkillCorrelation } from "./utils/assertRequiredRunSkillCorrelation.js";
|
|
23
23
|
export { SmartInputValidationError, SMART_INPUT_VALIDATION_ERROR_NAME, isSmartInputValidationError, formatSmartInputValidationMessage, } from "./errors/smartInputValidationError.js";
|
|
24
24
|
export type { SmartInputValidationErrorCode, SmartInputValidationErrorDetails, } from "./errors/smartInputValidationError.js";
|
|
@@ -34,7 +34,7 @@ export { setFuncxExecutionStrategyInvoker } from "./execution-strategies/runFunc
|
|
|
34
34
|
export { FUNCX_EXECUTION_PLAN_FUNCTION_ID, FUNCX_EXECUTION_EVALUATE_RESULT_FUNCTION_ID, FUNCX_RESEARCH_PLAN_QUESTIONS_FUNCTION_ID, DEFAULT_OPTIMIZER_MAX_ITERATIONS, ENV_OPTIMIZER_MAX_ITERATIONS, } from "./execution-strategies/constants.js";
|
|
35
35
|
export { adaptExecutionPlanResult, adaptEvaluateResultResponse, buildOptimizerGenericPayload, buildPlannerGenericPayload, buildResearchPlanQuestionsPayload, adaptResearchPlanQuestionsResult, unwrapFuncxRunValue, } from "./execution-strategies/genericExecutionFuncxEnvelope.js";
|
|
36
36
|
export { resolveSafeExecutionStrategyCatalogDefaultFunctionId } from "./execution-strategies/executionStrategyCatalogMetadata.js";
|
|
37
|
-
/** @see https://github.com/x12i/funcx — canonical `run()` JSON normalization (≥
|
|
37
|
+
/** @see https://github.com/x12i/funcx — canonical `run()` JSON normalization (≥4.2.0). */
|
|
38
38
|
export { getRunJsonResult, isHttpRunSuccessBody, genericExecutionEnvelopeJsonSchema, buildAskAttribution, } from "@x12i/funcx/functions";
|
|
39
39
|
export type { GenericExecutionEnvelope } from "@x12i/funcx/functions";
|
|
40
40
|
export type { GenericExecutionStrategyPayload, GenericFuncxAttribution, ResearchPlanQuestionsGenericPayload, ResearchPlanQuestionsInputShape, } from "./execution-strategies/genericExecutionFuncxEnvelope.js";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExE,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAG9E,OAAO,EACL,6BAA6B,EAI9B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,EAC7B,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,4BAA4B,CAAC;AACpC,YAAY,EACV,oCAAoC,EACpC,iCAAiC,GAClC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,2BAA2B,EAC3B,+BAA+B,GAChC,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,wCAAwC,EACxC,yBAAyB,GAC1B,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,uBAAuB,EACvB,6BAA6B,EAC7B,gCAAgC,EAChC,+BAA+B,GAChC,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,wCAAwC,EACxC,KAAK,8BAA8B,GACpC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,6BAA6B,EAC7B,qCAAqC,EACrC,+BAA+B,GAChC,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,4BAA4B,EAC5B,KAAK,0BAA0B,EAC/B,KAAK,yBAAyB,EAC9B,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,GAC7B,MAAM,+BAA+B,CAAC;AACvC,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EACL,+BAA+B,EAC/B,sBAAsB,EACtB,0BAA0B,EAC1B,2BAA2B,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -14,7 +14,7 @@ export { normalizeRunTaskRequest, collectRunTaskRequestWarnings, collectExecutio
|
|
|
14
14
|
export { compileTaskConfigurationOnRunTaskRequest, } from "./compile/index.js";
|
|
15
15
|
export { TaskConfigurationCompileError, TASK_CONFIGURATION_COMPILE_ERROR_NAME, isTaskConfigurationCompileError, } from "./errors/taskConfigurationCompileError.js";
|
|
16
16
|
export { AI_TASK_PRE_ENABLE_SYNTHESIS, } from "./types/task-configuration.js";
|
|
17
|
-
export { buildAiSkillsModelConfigForMain, getSkillModelFromSlots, getXynthesisModelFromSlots, resolveXynthesisModelForPre, } from "./utils/routeModelConfigSlots.js";
|
|
17
|
+
export { buildAiSkillsModelConfigForMain, getSkillModelFromSlots, getXynthesisModelFromSlots, resolveXynthesisModelForPre, formatResolvedProfileModelId, isAliasLikeModelValue, isResolvableModelAlias, normalizeXynthesisModelAlias, resolveModelReference, resolveModelReferenceForXynthesis, resolveRunTaskModelReferences, } from "./utils/routeModelConfigSlots.js";
|
|
18
18
|
export { assertRequiredRunSkillCorrelation } from "./utils/assertRequiredRunSkillCorrelation.js";
|
|
19
19
|
export { SmartInputValidationError, SMART_INPUT_VALIDATION_ERROR_NAME, isSmartInputValidationError, formatSmartInputValidationMessage, } from "./errors/smartInputValidationError.js";
|
|
20
20
|
export { validateRunTaskConfig, validateRunTaskInvoke, analyzeExpectedRunTaskInput, checkExpectedInputAgainstRequest, collectSmartInputValidationIssues, buildRunTaskValidationContext, } from "./validation/index.js";
|
|
@@ -26,7 +26,7 @@ export { setFuncxExecutionStrategyInvoker } from "./execution-strategies/runFunc
|
|
|
26
26
|
export { FUNCX_EXECUTION_PLAN_FUNCTION_ID, FUNCX_EXECUTION_EVALUATE_RESULT_FUNCTION_ID, FUNCX_RESEARCH_PLAN_QUESTIONS_FUNCTION_ID, DEFAULT_OPTIMIZER_MAX_ITERATIONS, ENV_OPTIMIZER_MAX_ITERATIONS, } from "./execution-strategies/constants.js";
|
|
27
27
|
export { adaptExecutionPlanResult, adaptEvaluateResultResponse, buildOptimizerGenericPayload, buildPlannerGenericPayload, buildResearchPlanQuestionsPayload, adaptResearchPlanQuestionsResult, unwrapFuncxRunValue, } from "./execution-strategies/genericExecutionFuncxEnvelope.js";
|
|
28
28
|
export { resolveSafeExecutionStrategyCatalogDefaultFunctionId } from "./execution-strategies/executionStrategyCatalogMetadata.js";
|
|
29
|
-
/** @see https://github.com/x12i/funcx — canonical `run()` JSON normalization (≥
|
|
29
|
+
/** @see https://github.com/x12i/funcx — canonical `run()` JSON normalization (≥4.2.0). */
|
|
30
30
|
export { getRunJsonResult, isHttpRunSuccessBody, genericExecutionEnvelopeJsonSchema, buildAskAttribution, } from "@x12i/funcx/functions";
|
|
31
31
|
export * from "./skillCatalogExports.js";
|
|
32
32
|
export * from "./aiSkillsUpstreamExports.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAMzD,OAAO,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EACL,6BAA6B,GAI9B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,EAC7B,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,2BAA2B,EAC3B,+BAA+B,GAChC,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,wCAAwC,EACxC,yBAAyB,GAC1B,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,uBAAuB,EACvB,6BAA6B,EAC7B,gCAAgC,EAChC,+BAA+B,GAChC,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,wCAAwC,GAEzC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,6BAA6B,EAC7B,qCAAqC,EACrC,+BAA+B,GAChC,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,4BAA4B,GAK7B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EACL,+BAA+B,EAC/B,sBAAsB,EACtB,0BAA0B,EAC1B,2BAA2B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runPostStepLlmCall.d.ts","sourceRoot":"","sources":["../../src/internal/runPostStepLlmCall.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EACV,oBAAoB,EACpB,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"runPostStepLlmCall.d.ts","sourceRoot":"","sources":["../../src/internal/runPostStepLlmCall.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EACV,oBAAoB,EACpB,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAK7B,MAAM,MAAM,wBAAwB,GAAG;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oHAAoH;IACpH,wBAAwB,CAAC,EAAE,iBAAiB,CAAC;IAC7C,uHAAuH;IACvH,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,0FAA0F;IAC1F,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8FAA8F;IAC9F,iBAAiB,CAAC,EAAE,kBAAkB,CAAC;IACvC,cAAc,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC5C,SAAS,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC;IACtF,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,UAAU,CAAC,EAAE,mBAAmB,CAAC;CAClC,CAAC;AAMF;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAgK5G"}
|
|
@@ -15,6 +15,7 @@ import { executeXynthesisAction } from "@exellix/xynthesis";
|
|
|
15
15
|
import { traceWrap } from "../observability/debugTrace.js";
|
|
16
16
|
import { LlmCallContextError } from "../types/llmCall.js";
|
|
17
17
|
import { resolveLlmCallForXynthesis } from "./resolveLlmCallForXynthesis.js";
|
|
18
|
+
import { resolveModelReferenceForXynthesis } from "../utils/resolveAiProfileModel.js";
|
|
18
19
|
function effectiveLlmCall(params) {
|
|
19
20
|
return params.llmCall ?? {};
|
|
20
21
|
}
|
|
@@ -24,7 +25,9 @@ function effectiveLlmCall(params) {
|
|
|
24
25
|
export async function runPostStepLlmCall(params) {
|
|
25
26
|
const { systemPrompt, userPrompt, extraMaterial, jobId = "post-step", taskId: taskIdParam, agentId = "post-step", workScopeIdentity, traceCollector, traceTask, stage, stepId, structuredOutput, outputExpectationDefault, observationSink, } = params;
|
|
26
27
|
const taskId = taskIdParam ?? randomUUID();
|
|
27
|
-
const
|
|
28
|
+
const effectiveRaw = effectiveLlmCall(params);
|
|
29
|
+
const resolvedModel = await resolveModelReferenceForXynthesis(effectiveRaw.model ?? "balanced");
|
|
30
|
+
const effective = { ...effectiveRaw, model: resolvedModel ?? "balanced" };
|
|
28
31
|
const startMs = Date.now();
|
|
29
32
|
const inputText = `${systemPrompt}\n\n${userPrompt}\n\n${extraMaterial ?? ""}`;
|
|
30
33
|
const resolved = stage
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runPostStepLlmCall.js","sourceRoot":"","sources":["../../src/internal/runPostStepLlmCall.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAU3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"runPostStepLlmCall.js","sourceRoot":"","sources":["../../src/internal/runPostStepLlmCall.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"direct-execution-strategy.d.ts","sourceRoot":"","sources":["../../src/strategies/direct-execution-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAA4B,MAAM,oBAAoB,CAAC;AAInF,KAAK,iBAAiB,GAAG,mBAAmB,CAAC;AAE7C,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"direct-execution-strategy.d.ts","sourceRoot":"","sources":["../../src/strategies/direct-execution-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAA4B,MAAM,oBAAoB,CAAC;AAInF,KAAK,iBAAiB,GAAG,mBAAmB,CAAC;AAE7C,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAO5E;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,uBAAwB,YAAW,kBAAkB;IAChE,OAAO,CAAC,MAAM,CAAsB;gBAExB,MAAM,EAAE,mBAAmB,GAAG,iBAAiB;IAIrD,OAAO,CAAC,OAAO,GAAG,GAAG,EACzB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAgFrC,OAAO,IAAI,MAAM;IAIjB,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO;CAG5C"}
|
|
@@ -3,6 +3,7 @@ import { ExecutionType } from "../types/executionType.js";
|
|
|
3
3
|
import { LlmCallContextError } from "../types/llmCall.js";
|
|
4
4
|
import { pickRunSkillRequestFields } from "../utils/bridgeRunSkillGatewayMemory.js";
|
|
5
5
|
import { buildAiSkillsModelConfigForMain } from "../utils/routeModelConfigSlots.js";
|
|
6
|
+
import { resolveModelReference } from "../utils/resolveAiProfileModel.js";
|
|
6
7
|
/**
|
|
7
8
|
* Direct execution strategy.
|
|
8
9
|
*
|
|
@@ -30,12 +31,23 @@ export class DirectExecutionStrategy {
|
|
|
30
31
|
const taskRequest = { ...request };
|
|
31
32
|
// Convert RunTaskRequest to RunSkillRequest. Map coreSkillId back to skillId for RunSkillRequest compatibility.
|
|
32
33
|
// modelConfig is automatically included via spread operator since it's part of RunSkillRequest
|
|
33
|
-
const { llmCall } = taskRequest;
|
|
34
|
+
const { llmCall: llmCallRaw } = taskRequest;
|
|
34
35
|
const coreSkillId = taskRequest.coreSkillId;
|
|
35
36
|
const traceMode = taskRequest.executionMode === "trace";
|
|
36
37
|
const skillBase = pickRunSkillRequestFields(taskRequest);
|
|
38
|
+
const llmCall = llmCallRaw?.model
|
|
39
|
+
? { ...llmCallRaw, model: (await resolveModelReference(llmCallRaw.model)) }
|
|
40
|
+
: llmCallRaw;
|
|
41
|
+
const modelConfigBase = skillBase.modelConfig;
|
|
42
|
+
let resolvedModelConfig = modelConfigBase;
|
|
43
|
+
if (typeof modelConfigBase?.skillModel === "string") {
|
|
44
|
+
const skillModel = await resolveModelReference(modelConfigBase.skillModel);
|
|
45
|
+
if (skillModel && skillModel !== modelConfigBase.skillModel) {
|
|
46
|
+
resolvedModelConfig = { ...modelConfigBase, skillModel };
|
|
47
|
+
}
|
|
48
|
+
}
|
|
37
49
|
// Route canonical slot pair → ai-skills `{ model, ...tuning }` at execution boundary only.
|
|
38
|
-
const overlayedModelConfig = buildAiSkillsModelConfigForMain(
|
|
50
|
+
const overlayedModelConfig = buildAiSkillsModelConfigForMain(resolvedModelConfig, llmCall);
|
|
39
51
|
const effectiveTimeoutMs = llmCall?.timeoutMs ?? skillBase.timeoutMs;
|
|
40
52
|
const runSkillRequest = {
|
|
41
53
|
...skillBase,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"direct-execution-strategy.js","sourceRoot":"","sources":["../../src/strategies/direct-execution-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAQ1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AACpF,OAAO,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"direct-execution-strategy.js","sourceRoot":"","sources":["../../src/strategies/direct-execution-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,12 +10,10 @@ export interface RunTaskModelConfig {
|
|
|
10
10
|
presencePenalty?: number;
|
|
11
11
|
[key: string]: unknown;
|
|
12
12
|
}
|
|
13
|
-
export declare const MODEL_CONFIG_SLOT_KEYS: readonly ["xynthesisModel", "skillModel"];
|
|
14
13
|
export declare function isRecord(v: unknown): v is Record<string, unknown>;
|
|
15
|
-
|
|
16
|
-
export
|
|
17
|
-
|
|
18
|
-
export declare function isAliasLikeModelValue(value: string): boolean;
|
|
14
|
+
export declare const MODEL_CONFIG_SLOT_KEYS: readonly ["xynthesisModel", "skillModel"];
|
|
15
|
+
export { isConcreteModelId } from "../utils/concreteModelId.js";
|
|
16
|
+
export { isAliasLikeModelValue, isResolvableModelAlias } from "../utils/resolveAiProfileModel.js";
|
|
19
17
|
export declare function getSkillModelFromSlots(modelConfig: unknown): string | undefined;
|
|
20
18
|
export declare function getXynthesisModelFromSlots(modelConfig: unknown): string | undefined;
|
|
21
19
|
/** Tuning fields from slot-based modelConfig (excludes slot keys and legacy `model`). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-config.d.ts","sourceRoot":"","sources":["../../src/types/model-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"model-config.d.ts","sourceRoot":"","sources":["../../src/types/model-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,mFAAmF;AACnF,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEjE;AAED,eAAO,MAAM,sBAAsB,2CAA4C,CAAC;AAEhF,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAElG,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAI/E;AAED,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAInF;AAID,yFAAyF;AACzF,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAC/C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAOzB;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAChD,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAYrC;AAED,qEAAqE;AACrE,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,OAAO,EACpB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,SAAS,CAEpB"}
|
|
@@ -1,38 +1,9 @@
|
|
|
1
|
-
export const MODEL_CONFIG_SLOT_KEYS = ["xynthesisModel", "skillModel"];
|
|
2
|
-
const KNOWN_PROFILE_ALIASES = new Set(["strong", "weak", "default"]);
|
|
3
|
-
const KNOWN_PROVIDER_PREFIXES = [
|
|
4
|
-
"openrouter/",
|
|
5
|
-
"anthropic/",
|
|
6
|
-
"openai/",
|
|
7
|
-
"google/",
|
|
8
|
-
"x-ai/",
|
|
9
|
-
"meta-llama/",
|
|
10
|
-
"mistral/",
|
|
11
|
-
"cohere/",
|
|
12
|
-
"deepseek/",
|
|
13
|
-
"groq/",
|
|
14
|
-
];
|
|
15
1
|
export function isRecord(v) {
|
|
16
2
|
return !!v && typeof v === "object" && !Array.isArray(v);
|
|
17
3
|
}
|
|
18
|
-
|
|
19
|
-
export
|
|
20
|
-
|
|
21
|
-
if (!trimmed)
|
|
22
|
-
return false;
|
|
23
|
-
if (trimmed.includes("/"))
|
|
24
|
-
return true;
|
|
25
|
-
return KNOWN_PROVIDER_PREFIXES.some((p) => trimmed.startsWith(p));
|
|
26
|
-
}
|
|
27
|
-
/** True when the value looks like an unresolved graph profile alias. */
|
|
28
|
-
export function isAliasLikeModelValue(value) {
|
|
29
|
-
const trimmed = value.trim();
|
|
30
|
-
if (!trimmed)
|
|
31
|
-
return false;
|
|
32
|
-
if (trimmed.includes("/"))
|
|
33
|
-
return false;
|
|
34
|
-
return KNOWN_PROFILE_ALIASES.has(trimmed.toLowerCase());
|
|
35
|
-
}
|
|
4
|
+
export const MODEL_CONFIG_SLOT_KEYS = ["xynthesisModel", "skillModel"];
|
|
5
|
+
export { isConcreteModelId } from "../utils/concreteModelId.js";
|
|
6
|
+
export { isAliasLikeModelValue, isResolvableModelAlias } from "../utils/resolveAiProfileModel.js";
|
|
36
7
|
export function getSkillModelFromSlots(modelConfig) {
|
|
37
8
|
if (!isRecord(modelConfig))
|
|
38
9
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-config.js","sourceRoot":"","sources":["../../src/types/model-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"model-config.js","sourceRoot":"","sources":["../../src/types/model-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runUtility.d.ts","sourceRoot":"","sources":["../../src/utilities/runUtility.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EAGnB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"runUtility.d.ts","sourceRoot":"","sources":["../../src/utilities/runUtility.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EAGnB,MAAM,wBAAwB,CAAC;AA8OhC,wBAAsB,UAAU,CAAC,OAAO,GAAG,GAAG,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAM5G"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { XynthesisInvokeError, XynthesisResponseParseError, runXynthesisFinalize, } from "@exellix/xynthesis/ai-actions";
|
|
2
|
+
import { resolveModelReferenceForXynthesis } from "../utils/resolveAiProfileModel.js";
|
|
2
3
|
function resolveExecutionPolicy(explicit) {
|
|
3
4
|
if (explicit)
|
|
4
5
|
return explicit;
|
|
@@ -42,8 +43,11 @@ async function runXynthesisFinalizeUtility(req) {
|
|
|
42
43
|
const allowRepair = shouldAllowRepair({ policy, repairBudgetRemaining: req.repairBudgetRemaining });
|
|
43
44
|
const traceMode = req.exec?.executionMode === "trace";
|
|
44
45
|
const maxTokensCap = req.exec?.maxTokensCap;
|
|
46
|
+
const resolvedModel = req.exec?.model
|
|
47
|
+
? await resolveModelReferenceForXynthesis(req.exec.model)
|
|
48
|
+
: undefined;
|
|
45
49
|
const exec = {
|
|
46
|
-
model:
|
|
50
|
+
model: resolvedModel,
|
|
47
51
|
timeoutMs: req.exec?.timeoutMs ?? defaultTimeoutMs(policy),
|
|
48
52
|
maxTokens: maxTokensCap,
|
|
49
53
|
templatesBasePath: req.exec?.templatesBasePath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runUtility.js","sourceRoot":"","sources":["../../src/utilities/runUtility.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,oBAAoB,GACrB,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"runUtility.js","sourceRoot":"","sources":["../../src/utilities/runUtility.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"concreteModelId.d.ts","sourceRoot":"","sources":["../../src/utils/concreteModelId.ts"],"names":[],"mappings":"AAaA,2FAA2F;AAC3F,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAKxD"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
const KNOWN_PROVIDER_PREFIXES = [
|
|
2
|
+
"openrouter/",
|
|
3
|
+
"anthropic/",
|
|
4
|
+
"openai/",
|
|
5
|
+
"google/",
|
|
6
|
+
"x-ai/",
|
|
7
|
+
"meta-llama/",
|
|
8
|
+
"mistral/",
|
|
9
|
+
"cohere/",
|
|
10
|
+
"deepseek/",
|
|
11
|
+
"groq/",
|
|
12
|
+
];
|
|
13
|
+
/** True when the value looks like a concrete provider model id (post alias resolution). */
|
|
14
|
+
export function isConcreteModelId(value) {
|
|
15
|
+
const trimmed = value.trim();
|
|
16
|
+
if (!trimmed)
|
|
17
|
+
return false;
|
|
18
|
+
if (trimmed.includes("/"))
|
|
19
|
+
return true;
|
|
20
|
+
return KNOWN_PROVIDER_PREFIXES.some((p) => trimmed.startsWith(p));
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=concreteModelId.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"concreteModelId.js","sourceRoot":"","sources":["../../src/utils/concreteModelId.ts"],"names":[],"mappings":"AAAA,MAAM,uBAAuB,GAAG;IAC9B,aAAa;IACb,YAAY;IACZ,SAAS;IACT,SAAS;IACT,OAAO;IACP,aAAa;IACb,UAAU;IACV,SAAS;IACT,WAAW;IACX,OAAO;CACC,CAAC;AAEX,2FAA2F;AAC3F,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC7C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IACvC,OAAO,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import type { ResolveAIProfileOptions } from "@x12i/ai-profiles";
|
|
2
|
+
/** True when `value` is a known ai-profiles profile, shortcut, or legacy tier alias. */
|
|
3
|
+
export declare function isResolvableModelAlias(value: string): boolean;
|
|
4
|
+
/** @deprecated Prefer {@link isResolvableModelAlias}. Kept for tests and call sites expecting the old name. */
|
|
5
|
+
export declare function isAliasLikeModelValue(value: string): boolean;
|
|
6
|
+
/** Format a resolved ai-profiles choice as a concrete provider model id for ai-skills / xynthesis. */
|
|
7
|
+
export declare function formatResolvedProfileModelId(provider: string, modelId: string): string;
|
|
8
|
+
export type ResolveModelReferenceOptions = ResolveAIProfileOptions;
|
|
9
|
+
/** Map legacy tiers to ai-profiles keys without resolving to a provider model id. */
|
|
10
|
+
export declare function normalizeXynthesisModelAlias(value: string): string;
|
|
11
|
+
/**
|
|
12
|
+
* Resolve a model reference for `@exellix/ai-skills` MAIN: pass through concrete ids and
|
|
13
|
+
* unrecognized strings; map known ai-profiles aliases to concrete provider/model ids.
|
|
14
|
+
*/
|
|
15
|
+
export declare function resolveModelReference(value: string | undefined, options?: ResolveModelReferenceOptions): Promise<string | undefined>;
|
|
16
|
+
/**
|
|
17
|
+
* Resolve a model reference for `@exellix/xynthesis` ≥4.0 (`executeXynthesisAction`):
|
|
18
|
+
* keep ai-profiles aliases (legacy tiers normalized); reject concrete provider ids.
|
|
19
|
+
*/
|
|
20
|
+
export declare function resolveModelReferenceForXynthesis(value: string | undefined): Promise<string | undefined>;
|
|
21
|
+
//# sourceMappingURL=resolveAiProfileModel.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolveAiProfileModel.d.ts","sourceRoot":"","sources":["../../src/utils/resolveAiProfileModel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAuEjE,wFAAwF;AACxF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAK7D;AAED,+GAA+G;AAC/G,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,sGAAsG;AACtG,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAOtF;AAED,MAAM,MAAM,4BAA4B,GAAG,uBAAuB,CAAC;AAEnE,qFAAqF;AACrF,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIlE;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,OAAO,CAAC,EAAE,4BAA4B,GACrC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAwB7B;AAED;;;GAGG;AACH,wBAAsB,iCAAiC,CACrD,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAe7B"}
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import { resolveAIProfile, AIProfilesError } from "@x12i/ai-profiles";
|
|
2
|
+
import { isConcreteModelId } from "./concreteModelId.js";
|
|
3
|
+
/** Legacy graph-engine tier names → `@x12i/ai-profiles` profile keys. */
|
|
4
|
+
const LEGACY_TIER_TO_PROFILE = {
|
|
5
|
+
weak: "cheap",
|
|
6
|
+
strong: "pro",
|
|
7
|
+
default: "balanced",
|
|
8
|
+
};
|
|
9
|
+
/** Profile keys shipped in `@x12i/ai-profiles` v1 bundled registry. */
|
|
10
|
+
const AI_PROFILE_KEYS = [
|
|
11
|
+
"cheap",
|
|
12
|
+
"fast",
|
|
13
|
+
"balanced",
|
|
14
|
+
"deep",
|
|
15
|
+
"pro",
|
|
16
|
+
"json",
|
|
17
|
+
"agentic",
|
|
18
|
+
"research",
|
|
19
|
+
];
|
|
20
|
+
/** Shortcut keys from bundled `profiles-shortcuts.json` (v1). */
|
|
21
|
+
const AI_PROFILE_SHORTCUT_KEYS = [
|
|
22
|
+
"economy",
|
|
23
|
+
"budget",
|
|
24
|
+
"low-cost",
|
|
25
|
+
"cheapest",
|
|
26
|
+
"cheap-safe",
|
|
27
|
+
"instant",
|
|
28
|
+
"quick",
|
|
29
|
+
"fast-cheap",
|
|
30
|
+
"standard",
|
|
31
|
+
"default",
|
|
32
|
+
"thinking",
|
|
33
|
+
"high-reasoning",
|
|
34
|
+
"long-context",
|
|
35
|
+
"premium",
|
|
36
|
+
"best",
|
|
37
|
+
"schema",
|
|
38
|
+
"strict-json",
|
|
39
|
+
"cheap-json",
|
|
40
|
+
"agent",
|
|
41
|
+
"tools",
|
|
42
|
+
"cheap-agent",
|
|
43
|
+
"web-research",
|
|
44
|
+
"source-review",
|
|
45
|
+
"premium-research",
|
|
46
|
+
];
|
|
47
|
+
/** Profile-level aliases from bundled `models-profiles.json` (v1). */
|
|
48
|
+
const AI_PROFILE_EXTRA_ALIASES = [
|
|
49
|
+
"cost-sensitive",
|
|
50
|
+
"low-latency",
|
|
51
|
+
"normal",
|
|
52
|
+
"reasoning",
|
|
53
|
+
"smart",
|
|
54
|
+
"highest-quality",
|
|
55
|
+
"structured",
|
|
56
|
+
"structured-output",
|
|
57
|
+
"tool-use",
|
|
58
|
+
"tool-calling",
|
|
59
|
+
];
|
|
60
|
+
const KNOWN_AI_PROFILE_ALIAS_KEYS = new Set([
|
|
61
|
+
...Object.keys(LEGACY_TIER_TO_PROFILE),
|
|
62
|
+
...AI_PROFILE_KEYS,
|
|
63
|
+
...AI_PROFILE_SHORTCUT_KEYS,
|
|
64
|
+
...AI_PROFILE_EXTRA_ALIASES,
|
|
65
|
+
]);
|
|
66
|
+
/** True when `value` is a known ai-profiles profile, shortcut, or legacy tier alias. */
|
|
67
|
+
export function isResolvableModelAlias(value) {
|
|
68
|
+
const key = value.trim().toLowerCase();
|
|
69
|
+
if (!key)
|
|
70
|
+
return false;
|
|
71
|
+
if (isConcreteModelId(value))
|
|
72
|
+
return false;
|
|
73
|
+
return KNOWN_AI_PROFILE_ALIAS_KEYS.has(key);
|
|
74
|
+
}
|
|
75
|
+
/** @deprecated Prefer {@link isResolvableModelAlias}. Kept for tests and call sites expecting the old name. */
|
|
76
|
+
export function isAliasLikeModelValue(value) {
|
|
77
|
+
return isResolvableModelAlias(value);
|
|
78
|
+
}
|
|
79
|
+
/** Format a resolved ai-profiles choice as a concrete provider model id for ai-skills / xynthesis. */
|
|
80
|
+
export function formatResolvedProfileModelId(provider, modelId) {
|
|
81
|
+
const trimmed = modelId.trim();
|
|
82
|
+
if (!trimmed)
|
|
83
|
+
return trimmed;
|
|
84
|
+
if (trimmed.includes("/"))
|
|
85
|
+
return trimmed;
|
|
86
|
+
const providerPrefix = `${provider.trim()}/`;
|
|
87
|
+
if (trimmed.startsWith(providerPrefix))
|
|
88
|
+
return trimmed;
|
|
89
|
+
return `${provider.trim()}/${trimmed}`;
|
|
90
|
+
}
|
|
91
|
+
/** Map legacy tiers to ai-profiles keys without resolving to a provider model id. */
|
|
92
|
+
export function normalizeXynthesisModelAlias(value) {
|
|
93
|
+
const trimmed = value.trim();
|
|
94
|
+
if (!trimmed)
|
|
95
|
+
return trimmed;
|
|
96
|
+
return LEGACY_TIER_TO_PROFILE[trimmed.toLowerCase()] ?? trimmed;
|
|
97
|
+
}
|
|
98
|
+
/**
|
|
99
|
+
* Resolve a model reference for `@exellix/ai-skills` MAIN: pass through concrete ids and
|
|
100
|
+
* unrecognized strings; map known ai-profiles aliases to concrete provider/model ids.
|
|
101
|
+
*/
|
|
102
|
+
export async function resolveModelReference(value, options) {
|
|
103
|
+
if (value === undefined)
|
|
104
|
+
return undefined;
|
|
105
|
+
const trimmed = value.trim();
|
|
106
|
+
if (!trimmed)
|
|
107
|
+
return undefined;
|
|
108
|
+
if (isConcreteModelId(trimmed))
|
|
109
|
+
return trimmed;
|
|
110
|
+
if (!isResolvableModelAlias(trimmed))
|
|
111
|
+
return trimmed;
|
|
112
|
+
const legacyProfile = LEGACY_TIER_TO_PROFILE[trimmed.toLowerCase()];
|
|
113
|
+
const profileInput = legacyProfile ?? trimmed;
|
|
114
|
+
try {
|
|
115
|
+
const resolved = await resolveAIProfile(profileInput, {
|
|
116
|
+
source: options?.source ?? "auto",
|
|
117
|
+
...options,
|
|
118
|
+
});
|
|
119
|
+
return formatResolvedProfileModelId(resolved.provider, resolved.modelId);
|
|
120
|
+
}
|
|
121
|
+
catch (err) {
|
|
122
|
+
if (err instanceof AIProfilesError && err.code === "UNKNOWN_PROFILE") {
|
|
123
|
+
throw new Error(`Unknown model profile alias "${trimmed}". Use a concrete provider model id or an @x12i/ai-profiles profile/shortcut (e.g. cheap, balanced, pro, default, cheapest).`);
|
|
124
|
+
}
|
|
125
|
+
throw err;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* Resolve a model reference for `@exellix/xynthesis` ≥4.0 (`executeXynthesisAction`):
|
|
130
|
+
* keep ai-profiles aliases (legacy tiers normalized); reject concrete provider ids.
|
|
131
|
+
*/
|
|
132
|
+
export async function resolveModelReferenceForXynthesis(value) {
|
|
133
|
+
if (value === undefined)
|
|
134
|
+
return undefined;
|
|
135
|
+
const normalized = normalizeXynthesisModelAlias(value);
|
|
136
|
+
if (!normalized)
|
|
137
|
+
return undefined;
|
|
138
|
+
if (isConcreteModelId(normalized)) {
|
|
139
|
+
throw new Error(`@exellix/xynthesis ≥4.0 requires ai-profiles model aliases for executeXynthesisAction (got concrete id "${normalized}"). Use a profile/shortcut such as balanced, cheapest, or json.`);
|
|
140
|
+
}
|
|
141
|
+
if (!isResolvableModelAlias(normalized)) {
|
|
142
|
+
throw new Error(`Unknown xynthesis model alias "${normalized}". Use an @x12i/ai-profiles profile or shortcut (e.g. balanced, cheapest, json).`);
|
|
143
|
+
}
|
|
144
|
+
return normalized;
|
|
145
|
+
}
|
|
146
|
+
//# sourceMappingURL=resolveAiProfileModel.js.map
|