@exellix/ai-tasks 7.8.1 → 8.0.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/BREAKING-CHANGES.md +24 -0
- package/README.md +10 -7
- package/RUNTASK_REQUEST.md +3 -3
- package/dist/builders/task-request-builder.d.ts +14 -21
- package/dist/builders/task-request-builder.d.ts.map +1 -1
- package/dist/builders/task-request-builder.js +33 -20
- package/dist/builders/task-request-builder.js.map +1 -1
- package/dist/compile/compileTaskConfiguration.d.ts +3 -1
- package/dist/compile/compileTaskConfiguration.d.ts.map +1 -1
- package/dist/compile/compileTaskConfiguration.js +44 -9
- package/dist/compile/compileTaskConfiguration.js.map +1 -1
- package/dist/core/task-sdk.d.ts.map +1 -1
- package/dist/core/task-sdk.js +4 -5
- package/dist/core/task-sdk.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/narrix/bundleToNarrixPack.d.ts +8 -0
- package/dist/narrix/bundleToNarrixPack.d.ts.map +1 -0
- package/dist/narrix/bundleToNarrixPack.js +60 -0
- package/dist/narrix/bundleToNarrixPack.js.map +1 -0
- package/dist/narrix/createNarrixRunnerFromBundle.d.ts +8 -0
- package/dist/narrix/createNarrixRunnerFromBundle.d.ts.map +1 -0
- package/dist/narrix/createNarrixRunnerFromBundle.js +17 -0
- package/dist/narrix/createNarrixRunnerFromBundle.js.map +1 -0
- package/dist/narrix/index.d.ts +1 -1
- package/dist/narrix/index.d.ts.map +1 -1
- package/dist/narrix/index.js +1 -1
- package/dist/narrix/index.js.map +1 -1
- package/dist/narrix/loadNarrixBundleFromCatalox.d.ts +8 -0
- package/dist/narrix/loadNarrixBundleFromCatalox.d.ts.map +1 -0
- package/dist/narrix/loadNarrixBundleFromCatalox.js +73 -0
- package/dist/narrix/loadNarrixBundleFromCatalox.js.map +1 -0
- package/dist/narrix/narrixCatalogBundleLoader.d.ts +15 -0
- package/dist/narrix/narrixCatalogBundleLoader.d.ts.map +1 -0
- package/dist/narrix/narrixCatalogBundleLoader.js +67 -0
- package/dist/narrix/narrixCatalogBundleLoader.js.map +1 -0
- package/dist/narrix/narrixCatalogCredentials.d.ts +8 -0
- package/dist/narrix/narrixCatalogCredentials.d.ts.map +1 -0
- package/dist/narrix/narrixCatalogCredentials.js +20 -0
- package/dist/narrix/narrixCatalogCredentials.js.map +1 -0
- package/dist/narrix/narrixClient.d.ts.map +1 -1
- package/dist/narrix/narrixClient.js +4 -3
- package/dist/narrix/narrixClient.js.map +1 -1
- package/dist/narrix/runNarrixForChat.d.ts.map +1 -1
- package/dist/narrix/runNarrixForChat.js +3 -1
- package/dist/narrix/runNarrixForChat.js.map +1 -1
- package/dist/narrix/runNarrixForDocs.d.ts.map +1 -1
- package/dist/narrix/runNarrixForDocs.js +3 -1
- package/dist/narrix/runNarrixForDocs.js.map +1 -1
- package/dist/narrix/runNarrixForRecord.d.ts.map +1 -1
- package/dist/narrix/runNarrixForRecord.js +3 -1
- package/dist/narrix/runNarrixForRecord.js.map +1 -1
- package/dist/narrix/runNarrixForText.d.ts.map +1 -1
- package/dist/narrix/runNarrixForText.js +3 -1
- package/dist/narrix/runNarrixForText.js.map +1 -1
- package/dist/narrix/runnerDispatch.d.ts.map +1 -1
- package/dist/narrix/runnerDispatch.js +2 -1
- package/dist/narrix/runnerDispatch.js.map +1 -1
- package/dist/narrix/seedBundleRouting.d.ts +13 -3
- package/dist/narrix/seedBundleRouting.d.ts.map +1 -1
- package/dist/narrix/seedBundleRouting.js +61 -11
- package/dist/narrix/seedBundleRouting.js.map +1 -1
- package/dist/post-steps/audit/runAudit.d.ts.map +1 -1
- package/dist/post-steps/audit/runAudit.js +2 -1
- package/dist/post-steps/audit/runAudit.js.map +1 -1
- package/dist/strategies/direct-execution-strategy.d.ts.map +1 -1
- package/dist/strategies/direct-execution-strategy.js +3 -12
- package/dist/strategies/direct-execution-strategy.js.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/model-config.d.ts +30 -0
- package/dist/types/model-config.d.ts.map +1 -0
- package/dist/types/model-config.js +82 -0
- package/dist/types/model-config.js.map +1 -0
- package/dist/types/task-configuration.d.ts +6 -0
- package/dist/types/task-configuration.d.ts.map +1 -1
- package/dist/utils/routeModelConfigSlots.d.ts +2 -0
- package/dist/utils/routeModelConfigSlots.d.ts.map +1 -0
- package/dist/utils/routeModelConfigSlots.js +2 -0
- package/dist/utils/routeModelConfigSlots.js.map +1 -0
- package/dist/validation/helpers.d.ts +6 -0
- package/dist/validation/helpers.d.ts.map +1 -1
- package/dist/validation/helpers.js +95 -1
- package/dist/validation/helpers.js.map +1 -1
- package/dist/validation/validateRunTaskConfig.d.ts.map +1 -1
- package/dist/validation/validateRunTaskConfig.js +2 -2
- package/dist/validation/validateRunTaskConfig.js.map +1 -1
- package/package.json +2 -1
package/BREAKING-CHANGES.md
CHANGED
|
@@ -1,5 +1,29 @@
|
|
|
1
1
|
# Breaking changes (`@exellix/ai-tasks`)
|
|
2
2
|
|
|
3
|
+
## 8.0.0 — Canonical `modelConfig` slots (graph-engine 7.x)
|
|
4
|
+
|
|
5
|
+
`RunTaskRequest.modelConfig` no longer accepts the legacy **`model`** field. When set, it **must** be the resolved slot pair from graph-engine (or direct callers with concrete provider ids):
|
|
6
|
+
|
|
7
|
+
```json
|
|
8
|
+
{
|
|
9
|
+
"xynthesisModel": "openrouter/google/gemini-2.5-flash",
|
|
10
|
+
"skillModel": "anthropic/claude-sonnet-4"
|
|
11
|
+
}
|
|
12
|
+
```
|
|
13
|
+
|
|
14
|
+
| Field | Role |
|
|
15
|
+
|-------|------|
|
|
16
|
+
| `xynthesisModel` | PRE synthesis / xynthesis utility paths |
|
|
17
|
+
| `skillModel` | MAIN skill (routed internally to ai-skills `model` at execution) |
|
|
18
|
+
| `model` | **Rejected** — use `MODEL_CONFIG_SLOTS_REQUIRED` / `NON_CANONICAL_MODEL_CONFIG` |
|
|
19
|
+
| Profile aliases (`strong`, `weak`, `default`) | **Rejected** on `runTask` — resolve in graph-engine / host via `runtime.aliasConfig` |
|
|
20
|
+
|
|
21
|
+
**Migration:** replace `{ model: "provider/..." }` with `{ skillModel: "...", xynthesisModel: "..." }` (same or different concrete ids per slot).
|
|
22
|
+
|
|
23
|
+
See [`.docs/ai-tasks-model-profile-aliases-7x.md`](.docs/ai-tasks-model-profile-aliases-7x.md).
|
|
24
|
+
|
|
25
|
+
---
|
|
26
|
+
|
|
3
27
|
## Unreleased (synced runtime model)
|
|
4
28
|
|
|
5
29
|
### `@exellix/xynthesis` ≥ 3.6: `runSynthesisCall` removed
|
package/README.md
CHANGED
|
@@ -313,7 +313,8 @@ const res = await tasks.runTask({
|
|
|
313
313
|
// optional
|
|
314
314
|
variables: { orgName: "Acme" },
|
|
315
315
|
modelConfig: {
|
|
316
|
-
|
|
316
|
+
xynthesisModel: "openai/gpt-5-nano",
|
|
317
|
+
skillModel: "openai/gpt-5",
|
|
317
318
|
temperature: 0.7,
|
|
318
319
|
maxTokens: 2000
|
|
319
320
|
},
|
|
@@ -1078,7 +1079,7 @@ The legacy `llmCall.maxTokens` field is still accepted as an alias for `maxToken
|
|
|
1078
1079
|
|
|
1079
1080
|
## LLM call configuration (`LlmCallConfig`)
|
|
1080
1081
|
|
|
1081
|
-
`LlmCallConfig` is the
|
|
1082
|
+
`LlmCallConfig` is the per-stage override knob set. On MAIN it composes with `RunTaskRequest.modelConfig` slots (`skillModel` / `xynthesisModel`) — when both are set, `llmCall.*` wins.
|
|
1082
1083
|
|
|
1083
1084
|
```typescript
|
|
1084
1085
|
type LlmCallConfig = {
|
|
@@ -1097,7 +1098,7 @@ type LlmCallConfig = {
|
|
|
1097
1098
|
|
|
1098
1099
|
| Stage | Where to set `llmCall` |
|
|
1099
1100
|
|-------|------------------------|
|
|
1100
|
-
| MAIN skill | `RunTaskRequest.llmCall` (
|
|
1101
|
+
| MAIN skill | `RunTaskRequest.llmCall` (overrides `modelConfig.skillModel`) |
|
|
1101
1102
|
| AI scoping (per-instruction) | `RunTaskRequest.aiScoping[].llmCall` |
|
|
1102
1103
|
| AI scoping (request fallback) | `RunTaskRequest.aiScopingOptions.llmCall` |
|
|
1103
1104
|
| PRE synthesis | `SynthesisConfig.llmCall` (on the `synthesized-context` PRE step) |
|
|
@@ -2081,8 +2082,9 @@ interface ModelConfig {
|
|
|
2081
2082
|
|
|
2082
2083
|
**Example:**
|
|
2083
2084
|
```typescript
|
|
2084
|
-
const modelConfig
|
|
2085
|
-
|
|
2085
|
+
const modelConfig = {
|
|
2086
|
+
xynthesisModel: "openai/gpt-5-nano",
|
|
2087
|
+
skillModel: "openai/gpt-5",
|
|
2086
2088
|
temperature: 0.7,
|
|
2087
2089
|
maxTokens: 2000,
|
|
2088
2090
|
topP: 0.9
|
|
@@ -2096,7 +2098,7 @@ const result = await runTask({
|
|
|
2096
2098
|
});
|
|
2097
2099
|
```
|
|
2098
2100
|
|
|
2099
|
-
**Note:** `
|
|
2101
|
+
**Note:** Root `RunTaskRequest.modelConfig` uses canonical slots (`RunTaskModelConfig`). See [`.docs/ai-tasks-model-profile-aliases-7x.md`](.docs/ai-tasks-model-profile-aliases-7x.md).
|
|
2100
2102
|
|
|
2101
2103
|
### `JobHistory`, `TaskHistory`, and `ExecutionHistory`
|
|
2102
2104
|
|
|
@@ -2218,7 +2220,8 @@ const result = await tasks.runTask({
|
|
|
2218
2220
|
input: { assetId: "a-123" },
|
|
2219
2221
|
variables: { orgName: "MyOrganization" },
|
|
2220
2222
|
modelConfig: {
|
|
2221
|
-
|
|
2223
|
+
xynthesisModel: "openai/gpt-5-nano",
|
|
2224
|
+
skillModel: "openai/gpt-5",
|
|
2222
2225
|
temperature: 0.7
|
|
2223
2226
|
}
|
|
2224
2227
|
});
|
package/RUNTASK_REQUEST.md
CHANGED
|
@@ -93,8 +93,8 @@ Properties are classified for **default MAIN path** unless noted. Inherited **`R
|
|
|
93
93
|
| `input` | Optional task payload (`string` or object). |
|
|
94
94
|
| `variables` | Job/graph template bucket; forwarded as-is on MAIN (see [Canonical input bucket](#canonical-input-bucket)). |
|
|
95
95
|
| `jobMemory`, `taskMemory` | Enriched and forwarded; see executor payload. |
|
|
96
|
-
| `modelConfig` |
|
|
97
|
-
| `llmCall` | MAIN
|
|
96
|
+
| `modelConfig` | **Canonical slots:** `xynthesisModel` + `skillModel` (concrete provider ids). `skillModel` routes to ai-skills `model` at MAIN; `xynthesisModel` routes to PRE synthesis. Legacy `model` rejected. |
|
|
97
|
+
| `llmCall` | Per-stage override; on MAIN, `llmCall.model` wins over `skillModel`. Stripped before `runSkill` (merged into ai-skills `modelConfig` only at execution boundary). |
|
|
98
98
|
| `timeoutMs` | Forwarded when set (also overlaid from `llmCall.timeoutMs`). |
|
|
99
99
|
| `coreSkillId` | Maps to `skillId` on `RunSkillRequest` for gateway. |
|
|
100
100
|
| `graphId`, `nodeId`, `prevNodeId`, `masterSkillId`, `masterSkillActivityId` | Graph / activity telemetry (read in task-sdk & tracing). |
|
|
@@ -247,7 +247,7 @@ Legacy path alias: **`variables.*`** ≡ **`jobVariables.*`** (prefer **`jobVari
|
|
|
247
247
|
| `taskTypeId` | **`taskTypeId`** |
|
|
248
248
|
| `executionStrategies` | **`executionStrategies`** (required; use **`[]`** for plain MAIN) |
|
|
249
249
|
| `executionStrategyCatalogItems` | **`executionStrategyCatalogItems`** |
|
|
250
|
-
| `modelConfig` (+ `runtime.nodes[id].modelConfig`) | **`modelConfig`** (
|
|
250
|
+
| `modelConfig` (+ `runtime.nodes[id].modelConfig`) | **`modelConfig`** — resolved `{ xynthesisModel, skillModel }` (aliases resolved by graph-engine; see [`.docs/ai-tasks-model-profile-aliases-7x.md`](.docs/ai-tasks-model-profile-aliases-7x.md)) |
|
|
251
251
|
| `llmCall`, `timeoutMs` | same |
|
|
252
252
|
| `narrix`, `narrixMode`, `narrixInput` | **`narrix`**, **`narrixMode`**, **`narrixInput`**, **`narrixScope`** |
|
|
253
253
|
| `inputStrategyKey` | **`inputStrategyKey`** |
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { RunTaskRequest,
|
|
1
|
+
import type { RunTaskRequest, AIScopingInstruction, ExecutionStep, SynthesisConfig, SynthesisMode, AuditConfig, PolishConfig, TemplateRenderOptions, GatewayTemplateTokens, LlmCallConfig, ExecutionStrategyInvocation, SmartInputRenderOptions, RunTaskSmartInput, XynthesizedMemory } from "../types/index.js";
|
|
2
|
+
import type { RunTaskModelConfig } from "../types/model-config.js";
|
|
2
3
|
/**
|
|
3
4
|
* Builder for constructing task requests.
|
|
4
5
|
*
|
|
@@ -192,32 +193,25 @@ export declare class TaskRequestBuilder {
|
|
|
192
193
|
*/
|
|
193
194
|
withPrevNodeId(prevNodeId: string): this;
|
|
194
195
|
/**
|
|
195
|
-
* Set model
|
|
196
|
+
* Set canonical model slots for this task (graph-engine 7.x resolved pair).
|
|
196
197
|
*
|
|
197
|
-
*
|
|
198
|
-
*
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
*
|
|
203
|
-
*
|
|
204
|
-
* @example
|
|
205
|
-
* ```typescript
|
|
206
|
-
* builder.withModelConfig({
|
|
207
|
-
* model: "gpt-4-turbo",
|
|
208
|
-
* temperature: 0.7,
|
|
209
|
-
* maxTokens: 2000
|
|
210
|
-
* })
|
|
211
|
-
* ```
|
|
198
|
+
* @param modelConfig `{ xynthesisModel, skillModel }` plus optional tuning fields.
|
|
199
|
+
* @throws if legacy `model` is present on the config object.
|
|
200
|
+
*/
|
|
201
|
+
withModelConfig(modelConfig: RunTaskModelConfig): this;
|
|
202
|
+
/**
|
|
203
|
+
* Set both model slots to the same concrete provider id.
|
|
212
204
|
*/
|
|
213
|
-
|
|
205
|
+
withModel(concreteModelId: string): this;
|
|
206
|
+
withSkillModel(skillModel: string): this;
|
|
207
|
+
withXynthesisModel(xynthesisModel: string): this;
|
|
214
208
|
/**
|
|
215
209
|
* Set the **main-skill** LLM call configuration (`RunTaskRequest.llmCall`).
|
|
216
210
|
*
|
|
217
211
|
* `LlmCallConfig` is the canonical, per-stage knob set used everywhere LLMs are invoked
|
|
218
212
|
* (PRE synthesis, AI scoping, MAIN skill, POST audit/polish, utilities). It supports:
|
|
219
213
|
*
|
|
220
|
-
* - `model` — provider/model id (overrides `modelConfig.
|
|
214
|
+
* - `model` — provider/model id (overrides `modelConfig.skillModel` for MAIN).
|
|
221
215
|
* - `maxTokensCap` — **hard ceiling** for completion tokens; passed to `xynthesis.resolveMaxTokens`
|
|
222
216
|
* so the dynamic budget never exceeds this value. Use this instead of a bare
|
|
223
217
|
* `maxTokens` when you want to keep auto-sizing on but bound it.
|
|
@@ -229,8 +223,7 @@ export declare class TaskRequestBuilder {
|
|
|
229
223
|
* - `maxOutputLength` — character cap applied after the LLM returns (post-truncation, not a token cap).
|
|
230
224
|
* - `timeoutMs` — per-call timeout for the underlying invoke.
|
|
231
225
|
*
|
|
232
|
-
* `LlmCallConfig`
|
|
233
|
-
* `maxOutputLength` fields — when both are set, `llmCall.*` wins.
|
|
226
|
+
* `LlmCallConfig` composes with `modelConfig` slots — when both are set, `llmCall.*` wins for MAIN.
|
|
234
227
|
*
|
|
235
228
|
* @example
|
|
236
229
|
* ```typescript
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-request-builder.d.ts","sourceRoot":"","sources":["../../src/builders/task-request-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,
|
|
1
|
+
{"version":3,"file":"task-request-builder.d.ts","sourceRoot":"","sources":["../../src/builders/task-request-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { SYNTHESIZED_CONTEXT } from "../types/index.js";
|
|
2
|
+
import { isRecord } from "../types/model-config.js";
|
|
2
3
|
/**
|
|
3
4
|
* Builder for constructing task requests.
|
|
4
5
|
*
|
|
@@ -78,7 +79,7 @@ export class TaskRequestBuilder {
|
|
|
78
79
|
withSynthesizedContextPreStep(modelOrConfig) {
|
|
79
80
|
this.request.includeContextInPrompt = true;
|
|
80
81
|
const config = typeof modelOrConfig === "string"
|
|
81
|
-
? {
|
|
82
|
+
? { llmCall: { model: modelOrConfig } }
|
|
82
83
|
: modelOrConfig ?? {};
|
|
83
84
|
const preStep = {
|
|
84
85
|
phase: "pre",
|
|
@@ -349,35 +350,48 @@ export class TaskRequestBuilder {
|
|
|
349
350
|
return this;
|
|
350
351
|
}
|
|
351
352
|
/**
|
|
352
|
-
* Set model
|
|
353
|
+
* Set canonical model slots for this task (graph-engine 7.x resolved pair).
|
|
353
354
|
*
|
|
354
|
-
*
|
|
355
|
-
*
|
|
356
|
-
* and is passed through to the gateway for model selection and parameter control.
|
|
357
|
-
*
|
|
358
|
-
* @param modelConfig Model configuration (model, temperature, maxTokens, etc.)
|
|
359
|
-
* @returns The builder instance for chaining
|
|
360
|
-
*
|
|
361
|
-
* @example
|
|
362
|
-
* ```typescript
|
|
363
|
-
* builder.withModelConfig({
|
|
364
|
-
* model: "gpt-4-turbo",
|
|
365
|
-
* temperature: 0.7,
|
|
366
|
-
* maxTokens: 2000
|
|
367
|
-
* })
|
|
368
|
-
* ```
|
|
355
|
+
* @param modelConfig `{ xynthesisModel, skillModel }` plus optional tuning fields.
|
|
356
|
+
* @throws if legacy `model` is present on the config object.
|
|
369
357
|
*/
|
|
370
358
|
withModelConfig(modelConfig) {
|
|
359
|
+
if (isRecord(modelConfig) && modelConfig.model !== undefined) {
|
|
360
|
+
throw new Error("withModelConfig: modelConfig.model is not accepted; use skillModel and xynthesisModel.");
|
|
361
|
+
}
|
|
371
362
|
this.request.modelConfig = modelConfig;
|
|
372
363
|
return this;
|
|
373
364
|
}
|
|
365
|
+
/**
|
|
366
|
+
* Set both model slots to the same concrete provider id.
|
|
367
|
+
*/
|
|
368
|
+
withModel(concreteModelId) {
|
|
369
|
+
return this.withModelConfig({
|
|
370
|
+
xynthesisModel: concreteModelId,
|
|
371
|
+
skillModel: concreteModelId,
|
|
372
|
+
});
|
|
373
|
+
}
|
|
374
|
+
withSkillModel(skillModel) {
|
|
375
|
+
this.request.modelConfig = {
|
|
376
|
+
...this.request.modelConfig,
|
|
377
|
+
skillModel,
|
|
378
|
+
};
|
|
379
|
+
return this;
|
|
380
|
+
}
|
|
381
|
+
withXynthesisModel(xynthesisModel) {
|
|
382
|
+
this.request.modelConfig = {
|
|
383
|
+
...this.request.modelConfig,
|
|
384
|
+
xynthesisModel,
|
|
385
|
+
};
|
|
386
|
+
return this;
|
|
387
|
+
}
|
|
374
388
|
/**
|
|
375
389
|
* Set the **main-skill** LLM call configuration (`RunTaskRequest.llmCall`).
|
|
376
390
|
*
|
|
377
391
|
* `LlmCallConfig` is the canonical, per-stage knob set used everywhere LLMs are invoked
|
|
378
392
|
* (PRE synthesis, AI scoping, MAIN skill, POST audit/polish, utilities). It supports:
|
|
379
393
|
*
|
|
380
|
-
* - `model` — provider/model id (overrides `modelConfig.
|
|
394
|
+
* - `model` — provider/model id (overrides `modelConfig.skillModel` for MAIN).
|
|
381
395
|
* - `maxTokensCap` — **hard ceiling** for completion tokens; passed to `xynthesis.resolveMaxTokens`
|
|
382
396
|
* so the dynamic budget never exceeds this value. Use this instead of a bare
|
|
383
397
|
* `maxTokens` when you want to keep auto-sizing on but bound it.
|
|
@@ -389,8 +403,7 @@ export class TaskRequestBuilder {
|
|
|
389
403
|
* - `maxOutputLength` — character cap applied after the LLM returns (post-truncation, not a token cap).
|
|
390
404
|
* - `timeoutMs` — per-call timeout for the underlying invoke.
|
|
391
405
|
*
|
|
392
|
-
* `LlmCallConfig`
|
|
393
|
-
* `maxOutputLength` fields — when both are set, `llmCall.*` wins.
|
|
406
|
+
* `LlmCallConfig` composes with `modelConfig` slots — when both are set, `llmCall.*` wins for MAIN.
|
|
394
407
|
*
|
|
395
408
|
* @example
|
|
396
409
|
* ```typescript
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-request-builder.js","sourceRoot":"","sources":["../../src/builders/task-request-builder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-request-builder.js","sourceRoot":"","sources":["../../src/builders/task-request-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,13 @@ import { type CompileTaskConfigurationResult } from "../types/task-configuration
|
|
|
2
2
|
import type { RunTaskRequest } from "../types/task-types.js";
|
|
3
3
|
/**
|
|
4
4
|
* Compile graph `taskConfiguration` on a {@link RunTaskRequest} into `executionPipeline`,
|
|
5
|
-
* `includeContextInPrompt`,
|
|
5
|
+
* `includeContextInPrompt`, related PRE synthesis fields, and lifted `narrix` config.
|
|
6
6
|
*
|
|
7
7
|
* - **`aiTaskStrategies.pre: "synthesis"`** (or array containing `"synthesis"`) → PRE step.
|
|
8
8
|
* - **`aiTaskProfile.inputSynthesis.enabled: true`** → PRE step (same as graph-engine compile table).
|
|
9
9
|
* - **`preInputStrategy`** / pre-core keys on `pre` → `SynthesisConfig.synthesisInputStrategy`.
|
|
10
|
+
* - **`taskConfiguration.narrix`** → merged into `request.narrix` (request fields win).
|
|
11
|
+
* - **`aiTaskProfile.webScoping`** → `request.narrix.webScoping` when unset (requires narrix config).
|
|
10
12
|
*
|
|
11
13
|
* Removes `taskConfiguration` from the returned request (compile-only blob).
|
|
12
14
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileTaskConfiguration.d.ts","sourceRoot":"","sources":["../../src/compile/compileTaskConfiguration.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,8BAA8B,EAGpC,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"compileTaskConfiguration.d.ts","sourceRoot":"","sources":["../../src/compile/compileTaskConfiguration.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,8BAA8B,EAGpC,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAGV,cAAc,EAGf,MAAM,wBAAwB,CAAC;AAgMhC;;;;;;;;;;;GAWG;AACH,wBAAgB,wCAAwC,CACtD,OAAO,EAAE,cAAc,GACtB,8BAA8B,CAsFhC;AAED,YAAY,EAAE,8BAA8B,EAAE,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { CANONICAL_TASK_STRATEGY_KEYS } from "../task-strategies/canonicalTaskStrategies.js";
|
|
2
2
|
import { TaskConfigurationCompileError } from "../errors/taskConfigurationCompileError.js";
|
|
3
3
|
import { AI_TASK_PRE_ENABLE_SYNTHESIS, } from "../types/task-configuration.js";
|
|
4
|
+
import { resolveXynthesisModelForPre } from "../utils/routeModelConfigSlots.js";
|
|
4
5
|
import { SYNTHESIZED_CONTEXT } from "../types/task-types.js";
|
|
5
6
|
const PRE_INPUT_STRATEGY_KEYS = new Set(CANONICAL_TASK_STRATEGY_KEYS);
|
|
6
7
|
function isRecord(v) {
|
|
@@ -69,12 +70,10 @@ function buildSynthesisConfigFromAuthoring(taskConfiguration, request, strategie
|
|
|
69
70
|
alsoWriteLegacySynthesizedContext: inputSynthesis.alsoWriteLegacySynthesizedContext,
|
|
70
71
|
};
|
|
71
72
|
}
|
|
72
|
-
const modelConfig =
|
|
73
|
+
const modelConfig = taskConfiguration.modelConfig ?? request.modelConfig;
|
|
73
74
|
const llmCall = taskConfiguration.llmCall ?? request.llmCall;
|
|
74
75
|
const timeoutMs = taskConfiguration.timeoutMs ?? request.timeoutMs;
|
|
75
|
-
const model = llmCall
|
|
76
|
-
modelConfig?.xynthesisModel ??
|
|
77
|
-
(typeof modelConfig?.model === "string" ? modelConfig.model : undefined);
|
|
76
|
+
const model = resolveXynthesisModelForPre(modelConfig, llmCall);
|
|
78
77
|
if (model || llmCall || timeoutMs !== undefined) {
|
|
79
78
|
cfg.llmCall = {
|
|
80
79
|
...(llmCall ?? {}),
|
|
@@ -120,13 +119,47 @@ function mergeExecutionPipeline(requestPipeline, configPipeline) {
|
|
|
120
119
|
return configPipeline;
|
|
121
120
|
return undefined;
|
|
122
121
|
}
|
|
122
|
+
function hasNonEmptyScopingRecord(v) {
|
|
123
|
+
return isRecord(v) && Object.keys(v).length > 0;
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* Lift `taskConfiguration.narrix` and `aiTaskProfile.webScoping` onto `request.narrix`.
|
|
127
|
+
* Existing `request.narrix` fields win over `taskConfiguration.narrix`; `narrix.webScoping`
|
|
128
|
+
* wins over `aiTaskProfile.webScoping`.
|
|
129
|
+
*/
|
|
130
|
+
function liftNarrixFromAuthoring(request, taskConfiguration, profile, warnings) {
|
|
131
|
+
const configNarrix = isRecord(taskConfiguration.narrix) ? taskConfiguration.narrix : undefined;
|
|
132
|
+
const requestNarrix = request.narrix;
|
|
133
|
+
let merged;
|
|
134
|
+
if (configNarrix && requestNarrix) {
|
|
135
|
+
merged = { ...configNarrix, ...requestNarrix };
|
|
136
|
+
}
|
|
137
|
+
else if (requestNarrix) {
|
|
138
|
+
merged = { ...requestNarrix };
|
|
139
|
+
}
|
|
140
|
+
else if (configNarrix) {
|
|
141
|
+
merged = { ...configNarrix };
|
|
142
|
+
}
|
|
143
|
+
const profileScoping = profile?.webScoping;
|
|
144
|
+
if (merged && hasNonEmptyScopingRecord(profileScoping)) {
|
|
145
|
+
if (!hasNonEmptyScopingRecord(merged.webScoping)) {
|
|
146
|
+
merged = { ...merged, webScoping: profileScoping };
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
else if (!merged && hasNonEmptyScopingRecord(profileScoping)) {
|
|
150
|
+
warnings.push("taskConfiguration.aiTaskProfile.webScoping is set but no narrix config is present; webScoping is ignored until request.narrix or taskConfiguration.narrix defines a NARRIX preprocessor.");
|
|
151
|
+
}
|
|
152
|
+
return merged;
|
|
153
|
+
}
|
|
123
154
|
/**
|
|
124
155
|
* Compile graph `taskConfiguration` on a {@link RunTaskRequest} into `executionPipeline`,
|
|
125
|
-
* `includeContextInPrompt`,
|
|
156
|
+
* `includeContextInPrompt`, related PRE synthesis fields, and lifted `narrix` config.
|
|
126
157
|
*
|
|
127
158
|
* - **`aiTaskStrategies.pre: "synthesis"`** (or array containing `"synthesis"`) → PRE step.
|
|
128
159
|
* - **`aiTaskProfile.inputSynthesis.enabled: true`** → PRE step (same as graph-engine compile table).
|
|
129
160
|
* - **`preInputStrategy`** / pre-core keys on `pre` → `SynthesisConfig.synthesisInputStrategy`.
|
|
161
|
+
* - **`taskConfiguration.narrix`** → merged into `request.narrix` (request fields win).
|
|
162
|
+
* - **`aiTaskProfile.webScoping`** → `request.narrix.webScoping` when unset (requires narrix config).
|
|
130
163
|
*
|
|
131
164
|
* Removes `taskConfiguration` from the returned request (compile-only blob).
|
|
132
165
|
*/
|
|
@@ -144,8 +177,10 @@ export function compileTaskConfigurationOnRunTaskRequest(request) {
|
|
|
144
177
|
const strategies = taskConfiguration.aiTaskStrategies;
|
|
145
178
|
const profile = taskConfiguration.aiTaskProfile;
|
|
146
179
|
const inputSynthesis = profile?.inputSynthesis;
|
|
180
|
+
const liftedNarrix = liftNarrixFromAuthoring(request, taskConfiguration, profile, warnings);
|
|
181
|
+
const requestWithNarrix = liftedNarrix !== undefined ? { ...request, narrix: liftedNarrix } : request;
|
|
147
182
|
const wantsPre = preSynthesisRequested(strategies, inputSynthesis);
|
|
148
|
-
const mergedPipeline = mergeExecutionPipeline(
|
|
183
|
+
const mergedPipeline = mergeExecutionPipeline(requestWithNarrix.executionPipeline, taskConfiguration.executionPipeline);
|
|
149
184
|
const alreadyHasSynthPre = pipelineHasSynthPre(mergedPipeline);
|
|
150
185
|
if (inputSynthesis?.enabled === true &&
|
|
151
186
|
taskConfiguration.executionPipeline?.length &&
|
|
@@ -153,10 +188,10 @@ export function compileTaskConfigurationOnRunTaskRequest(request) {
|
|
|
153
188
|
throw new TaskConfigurationCompileError("INPUT_SYNTHESIS_PIPELINE_CONFLICT", 'taskConfiguration defines both aiTaskProfile.inputSynthesis.enabled and an explicit PRE "synthesized-context" executionPipeline. Use one source of truth.', { skillKey, details: { inputSynthesisEnabled: true, hasExplicitPre: true } });
|
|
154
189
|
}
|
|
155
190
|
let executionPipeline = mergedPipeline;
|
|
156
|
-
let includeContextInPrompt =
|
|
191
|
+
let includeContextInPrompt = requestWithNarrix.includeContextInPrompt;
|
|
157
192
|
let preSynthesisEnabled = alreadyHasSynthPre;
|
|
158
193
|
if (wantsPre && !alreadyHasSynthPre) {
|
|
159
|
-
const synthesisConfig = buildSynthesisConfigFromAuthoring(taskConfiguration,
|
|
194
|
+
const synthesisConfig = buildSynthesisConfigFromAuthoring(taskConfiguration, requestWithNarrix, strategies, inputSynthesis);
|
|
160
195
|
executionPipeline = insertSynthPreStep(executionPipeline, synthesisConfig);
|
|
161
196
|
includeContextInPrompt = true;
|
|
162
197
|
preSynthesisEnabled = true;
|
|
@@ -168,7 +203,7 @@ export function compileTaskConfigurationOnRunTaskRequest(request) {
|
|
|
168
203
|
includeContextInPrompt = true;
|
|
169
204
|
}
|
|
170
205
|
}
|
|
171
|
-
const { taskConfiguration: _removed, ...rest } =
|
|
206
|
+
const { taskConfiguration: _removed, ...rest } = requestWithNarrix;
|
|
172
207
|
const compiled = {
|
|
173
208
|
...rest,
|
|
174
209
|
...(executionPipeline !== undefined ? { executionPipeline } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileTaskConfiguration.js","sourceRoot":"","sources":["../../src/compile/compileTaskConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAE7F,OAAO,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAC3F,OAAO,EACL,4BAA4B,GAM7B,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"compileTaskConfiguration.js","sourceRoot":"","sources":["../../src/compile/compileTaskConfiguration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-sdk.d.ts","sourceRoot":"","sources":["../../src/core/task-sdk.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAazD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAuB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"task-sdk.d.ts","sourceRoot":"","sources":["../../src/core/task-sdk.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAazD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAuB,MAAM,mBAAmB,CAAC;AAiQzF,KAAK,iBAAiB,GAAG,mBAAmB,CAAC;AA0S7C;;;;;;;;;;;GAWG;AACH,qBAAa,gBAAgB;IAEzB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB;IAClD,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBADN,YAAY,EAAE,iBAAiB,EACjC,QAAQ,EAAE;QACzB,OAAO,CAAC,OAAO,GAAG,GAAG,EACnB,KAAK,EAAE,GAAG,EACV,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GACzC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;KACtC;IAGG,OAAO,CAAC,OAAO,GAAG,GAAG,EAAE,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAghDtF;;OAEG;YACW,6BAA6B;IAqgB3C;;;;;OAKG;YACW,cAAc;CAuR7B"}
|
package/dist/core/task-sdk.js
CHANGED
|
@@ -35,6 +35,7 @@ import { createDebugTraceCollector, traceWrap } from "../observability/debugTrac
|
|
|
35
35
|
import { loadSynthesisTemplates, buildSynthesisSystemPrompt, buildSynthesisUserPrompt, resolveSourceMaterial, resolveSourceMaterialParts, getRenderedTemplates, buildSynthesizedContextMarkdown, resolveSynthesisQuestion, runStructuredSynthesisGatewayCallRobust, getContextSynthesizer, normalizeAndValidateSynthesizedPayload, discoverTemplateCores, } from "../synthesis/index.js";
|
|
36
36
|
import { resolveOutputExpectation as resolveOutputExpectationXynthesis } from "@exellix/xynthesis/ai-actions";
|
|
37
37
|
import { llmCallEnvPrefix, resolveLlmCall } from "../post-steps/resolvePostStepConfig.js";
|
|
38
|
+
import { getSkillModelFromSlots, resolveXynthesisModelForPre } from "../utils/routeModelConfigSlots.js";
|
|
38
39
|
import { runPostStepLlmCall } from "../internal/runPostStepLlmCall.js";
|
|
39
40
|
registerBuiltInLocalTasks();
|
|
40
41
|
const DEFAULT_SYNTH_INPUT_MAX_CHARS = 200_000;
|
|
@@ -1823,12 +1824,10 @@ export class WorexClientTasks {
|
|
|
1823
1824
|
resolveRawTemplate,
|
|
1824
1825
|
});
|
|
1825
1826
|
// Resolve effective LlmCallConfig for the PRE synthesis call. `config.llmCall` overrides
|
|
1826
|
-
// `
|
|
1827
|
-
// `resolveOutputExpectation("synthesis")` (per xynthesis routing JSON).
|
|
1827
|
+
// `xynthesisModel` on the synthesis config / `timeoutMs` / `maxOutputLength`.
|
|
1828
1828
|
const synthLlmCallInput = {
|
|
1829
1829
|
...(config.llmCall ?? {}),
|
|
1830
|
-
model: config.llmCall
|
|
1831
|
-
config.modelConfig?.model,
|
|
1830
|
+
model: resolveXynthesisModelForPre(config.modelConfig, config.llmCall),
|
|
1832
1831
|
timeoutMs: config.llmCall?.timeoutMs ?? config.timeoutMs,
|
|
1833
1832
|
maxOutputLength: config.llmCall?.maxOutputLength ?? config.maxOutputLength,
|
|
1834
1833
|
};
|
|
@@ -2312,7 +2311,7 @@ export class WorexClientTasks {
|
|
|
2312
2311
|
if (input.aiScoping && input.aiScoping.length > 0) {
|
|
2313
2312
|
const requestLevelLlmCall = input.aiScopingOptions?.llmCall;
|
|
2314
2313
|
const fallbackModel = requestLevelLlmCall?.model ??
|
|
2315
|
-
input.modelConfig
|
|
2314
|
+
getSkillModelFromSlots(input.modelConfig) ??
|
|
2316
2315
|
process.env.AI_SCOPING_MODEL;
|
|
2317
2316
|
const concurrency = input.aiScopingOptions?.concurrency ??
|
|
2318
2317
|
(process.env.AI_SCOPING_CONCURRENCY
|