@exellix/ai-tasks 8.4.2 → 8.5.0

package/.docs/upstream-issue/2026-03-21_woroces-ai-tasks_ISSUE-006_web-scope-question-from-cni-entity.md

@@ -0,0 +1,46 @@
+# ISSUE-006 — Render web-scope search question from Narrix entity / CNI (CVE, vendor, label)
+
+**Status:** Implemented in `@woroces/ai-tasks` (`src/narrix/buildWebScopeScopeInput.ts`, `narrix.*` config fields). See `documenations/web-scoping-in-ai-tasks.md` §3.2.1.
+
+**Issue:** ISSUE-006  
+**Package to fix:** `@woroces/ai-tasks`  
+**Date:** 2026-03-21  
+**Type:** Feature request  
+**Related index:** [`2026-03-21_worox-graphs_ISSUE-000_gap-analysis-index.md`](./2026-03-21_worox-graphs_ISSUE-000_gap-analysis-index.md)  
+**Complements:** [`2026-03-21_worox-graphs_ISSUE-008_enrich-web-scope-question-from-execution-input.md`](./2026-03-21_worox-graphs_ISSUE-008_enrich-web-scope-question-from-execution-input.md) (same problem, fix in executor)
+
+---
+
+## Problem
+
+Web scoping uses a **generic** `inputs.question` (e.g. “What is the exploitability of this vulnerability?”) without embedding CVE id, vendor, or product from the current entity. Search queries stay broad; evidence is less targeted than it could be.
+
+`@woroces/ai-tasks` (or NARRIX pre-processing inside it) often has access to **CNI / entity facts** after Narrix runs — ideal place to render `baseQuestion + entityArgs` before calling the scoper.
+
+---
+
+## Desired behavior
+
+1. Keep `questionId` / pack routing as today.
+2. Before `scopeGeneric` / internal web scope, compute `webScopeQuestion = render(template, { cve, vendor, label, ... })`.
+3. Pass that string into the scoper as the `question` argument.
+
+---
+
+## Options (from prior design discussion)
+
+- **Downstream-heavy:** `ai-tasks` renders from `narrixResult.entity` / CNI (this issue).
+- **Executor-heavy:** `worox-graphs` enriches before scope (ISSUE-008). Both can coexist; prefer one owner to avoid double logic.
+
+---
+
+## Acceptance criteria
+
+1. For vuln-group–style jobs, logged or asserted `queriesUsed` contains vulnerability-specific tokens (e.g. CVE id) when entity provides them.
+2. No regression when entity facts are missing (fallback to base question).
+
+---
+
+## Longer design notes
+
+See also `.docs/web-scoping/feature-request-narrix-web-scope-question-templating.md` (narrative duplicate; **this ISSUE file is the canonical tracker name** for `@woroces/ai-tasks`).

package/.docs/web-scopper-embed.md

@@ -0,0 +1,93 @@
+# Feature Request: NARRIX Web Scoper (question-driven web context)
+
+## Overview
+
+This feature request proposes adding support in `@woroces/ai-tasks` for **question-driven web context** when the NARRIX pre-processor runs. When a task request includes `narrix` and a question (or questionId), ai-tasks should optionally call **@narrices/narrix-web-scoper** to plan and fetch web context (via @narrices/search-adapter), merge it with narrative from memory, and pass the combined context to the task so that answers can use both data-scoped narrative and web search as needed.
+
+**Depends on (or extends):** [ai-tasks-narrix-pre-processor-feature-request.md](ai-tasks-narrix-pre-processor-feature-request.md) — the NARRIX pre-processor must have built or received CNI before web-scoper can run.
+
+## Background
+
+- **Question-driven flow:** Graph nodes often carry a question (`inputs.question`) and/or `metadata.narrix.questionId`. Some questions are best answered from **narrative already in memory** (e.g. from NARRIX scoping/discovery on the record); others benefit from **web search** (e.g. public threat intel, vendor docs). The desired behavior is to support both in one flow: narrative on memory + search on the web as needed.
+- **narrix-web-scoper:** The package `@narrices/narrix-web-scoper` is a CNI-aware web context planner and mapper. It uses `@narrices/narrix-cni` and `@narrices/search-adapter` to plan what to search for from the CNI (and optional question) and map retrieval results into a structured web context. It is designed to run where CNI is already available.
+- **Where CNI lives:** In the intended architecture, when ai-tasks runs the NARRIX pre-processor (resolve input → CNI conversion → engine-enrich → inject context → run task), CNI exists internally after the CNI conversion step. That is the right place to optionally run web-scoper before or in tandem with engine-enrich, so the task receives both NARRIX narrative and web-derived context.
+
+## Problem
+
+- There is no way for the NARRIX pre-processor to extend scoped data with web search.
+- Tasks that could benefit from both narrative (memory) and web context currently get only one or the other, or require a separate graph node for web search (which we want to avoid).
+
+## Proposed contract
+
+### 1. Opt-in on request
+
+When `request.narrix` is present, support an optional flag to enable web context (so existing behavior is unchanged):
+
+- **Option A (recommended):** Extend the `narrix` object with `enableWebScope?: boolean`. If `true`, the pre-processor runs web-scoper when it has CNI and question/questionId.
+- **Option B:** A separate request-level field, e.g. `narrixWebScope?: boolean` or `request.options?.enableNarrixWebScope`. Document that it is only honored when `request.narrix` is set.
+
+worox-graphs (or other callers) would set this from e.g. `node.metadata.narrix.enableWebScope` or a graph-level variable.
+
+### 2. When to run web-scoper
+
+- **Precondition:** NARRIX pre-processor has already built or obtained CNI (after “CNI conversion” in the pre-processor flow).
+- **Precondition:** A question is available for the current task: either `request.narrix.questionId` or `request.inputs?.question` / `request.input?.question` (or the same from executionMemory/jobContext if that is where the pre-processor reads question from).
+- **Precondition:** Web scope is enabled (e.g. `request.narrix.enableWebScope === true`).
+- **Action:** Call `@narrices/narrix-web-scoper` with (CNI, datasetId, optional questionId/question, and any options the package exposes). Obtain the planned/mapped web context (exact API to be taken from the package’s public API).
+
+### 3. Where to inject web context
+
+Merge the web-scoper output into the context that the task receives, in a well-defined place, for example:
+
+- **Option A:** Merge into the same structure used for NARRIX enrichment (e.g. `executionMemory.narrixEnriched.webContext` or `jobContext._narrix.webContext`), so the task sees one enriched object that includes both narrative and web context.
+- **Option B:** A dedicated path such as `executionMemory.webContext` or `jobContext.webContext` that the task and templates can reference.
+
+Document the chosen path so that worox-graphs and skill templates can rely on it.
+
+### 4. Dependencies
+
+- ai-tasks (or the module that implements the NARRIX pre-processor) should add:
+  - `@narrices/narrix-web-scoper` (and its peer/transitive dependencies, e.g. `@narrices/narrix-cni`, `@narrices/search-adapter` as required by the package).
+
+No change required in worox-graphs for this feature beyond optionally setting `enableWebScope` when building the request (once ai-tasks supports it).
+
+### 5. Failure and fallback
+
+- If web-scoper fails (e.g. search-adapter timeout, API error), the pre-processor should either:
+  - **Strict:** Fail the task with a clear error, or
+  - **Lenient (recommended default):** Log the error, omit web context for this run, and continue with only NARRIX narrative. Document the behavior.
+
+### 6. Question availability
+
+The pre-processor already has access to:
+
+- `request.narrix` (datasetId, questionId, etc.)
+- `request.input` / `request.inputs` (e.g. question text)
+- Possibly `executionMemory` / `jobContext` (if question is passed from the graph there)
+
+Use the same resolution order as for other NARRIX inputs so that questionId and/or question text are available when invoking web-scoper.
+
+## Expected behavior summary
+
+| Scenario | Behavior |
+|----------|----------|
+| `request.narrix` absent | No change; no NARRIX pre-processing. |
+| `request.narrix` present, `enableWebScope` absent or false | Pre-processor runs as today (CNI → engine-enrich → inject narrative). No web-scoper call. |
+| `request.narrix` present, `enableWebScope` true, question/questionId available, CNI built | Run web-scoper with CNI + question; merge web context into the injected context; then run engine-enrich (if applicable) and task with combined narrative + web context. |
+| Web-scoper fails (lenient) | Log error; inject only NARRIX narrative; task runs without web context. |
+
+## Implementation notes (for ai-tasks)
+
+- **Placement:** In the NARRIX pre-processor path, after CNI is built and before (or in parallel with) engine-enrich. If engine-enrich consumes `sourceMeta` or similar, extend it with the web context so the runner can use it if needed.
+- **API:** Consult `@narrices/narrix-web-scoper`’s public API (e.g. a `planAndMap(cni, options)` or similar) and wire it with datasetId, questionId/question, and any required adapter config (e.g. search-adapter API keys from env).
+- **Tests:** Add unit/integration tests that mock the search-adapter and assert that when `enableWebScope` is true and question is present, web context is merged into the context passed to the task (and that when web-scoper fails, the chosen fallback behavior is applied).
+
+## worox-graphs changes (when feature exists)
+
+- Optional: Extend graph node schema to allow `metadata.narrix.enableWebScope` (or read from variables) and pass it through to `RunTaskRequest.narrix.enableWebScope` so authors can enable question-driven web scope per node or per graph without code changes.
+
+## References
+
+- [ai-tasks-narrix-pre-processor-feature-request.md](ai-tasks-narrix-pre-processor-feature-request.md) — NARRIX as task-level pre-processor (input contract, CNI, engine-enrich, inject context).
+- `@narrices/narrix-web-scoper` — CNI-aware web context planner; uses `@narrices/search-adapter` for retrieval.
+- [question-questionId-first-class-experience.md](question-questionId-first-class-experience.md) — Question and questionId as first-class in worox-graphs (resolution, request build).

package/.docs/xynthesis-wiring-and-io.md

@@ -0,0 +1,12 @@
+# Moved
+
+This document was split into focused pages. Start here:
+
+**[flow-io/flow-README.md](./flow-io/flow-README.md)** — high-level blocks
+
+| Topic | Doc |
+|-------|-----|
+| PRE — calling `@exellix/xynthesis` | [flow-io/xynthesis-pre.md](./flow-io/xynthesis-pre.md) |
+| POST — calling `@exellix/xynthesis` | [flow-io/xynthesis-post.md](./flow-io/xynthesis-post.md) |
+| NARRIX | [flow-io/narrix.md](./flow-io/narrix.md) |
+| Web scoping | [flow-io/web-scoping.md](./flow-io/web-scoping.md) |

package/CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to `@exellix/ai-tasks` are documented here.
 
 The published **npm version** always matches **`version`** in [`package.json`](package.json). If this file skips a semver, treat [`BREAKING-CHANGES.md`](BREAKING-CHANGES.md) and [`RUNTASK_REQUEST.md`](RUNTASK_REQUEST.md) as the source of truth for cross-version upgrades.
 
+## [8.5.0] - 2026-06-03
+
+### Changed (breaking)
+
+- **Execution strategies:** planner/optimizer invoke **`@exellix/xynthesis` ≥ 4.4.0** (`execution-plan`, `execution-evaluate-result`) with `modelConfig.preActionModel` / `postActionModel`. Removed direct `@x12i/funcx` `run()` from ai-tasks.
+- **`runPlanWebScopeQuestions`:** xynthesis `plan-web-scope-questions` only; removed `backend: "funcx"`.
+- **Catalog:** `runtimeKind: "xynthesis-action"`, `defaultSidekickAction` on planner/optimizer rows.
+
+### Added
+
+- `runPlannerViaXynthesis`, `runOptimizerViaXynthesis`, `setExecutionStrategyActionInvoker`, `setPlanWebScopeQuestionsActionInvoker`, `resolveSafeExecutionStrategyCatalogDefaultSidekickAction`.
+
+### Removed
+
+- `setFuncxExecutionStrategyInvoker`, `setResearchPlanQuestionsFuncxInvoker`, direct `@x12i/funcx` dependency.
+
 ## [Unreleased]
 
 ### Changed (breaking)

package/README.md

@@ -10,11 +10,11 @@ Private Git/npm package for executing **tasks** using the Woreces execution stac
 
 | Package | Role in `runTask` | Minimum |
 |---------|-------------------|---------|
-| `@x12i/ai-profiles` | Profile/shortcut → wire model (`catalogLane` required on resolve) | **2.1.0** |
-| `@exellix/xynthesis` | PRE synthesis, POST audit/polish, scoping, utilities (`executeXynthesisAction`) | **≥ 4.3.1** (4.3.0 breaks import with ai-profiles 2.1 — see [upstream §0](./documenations/upstream-feature-requests/xynthesis-orchestrator-invoke-contract-4.2.md)) |
+| `@x12i/ai-profiles` | Profile/choice → wire model (`catalogLane` required on resolve) | **2.1.0** |
+| `@exellix/xynthesis` | PRE synthesis, POST audit/polish, scoping, utilities (`executeXynthesisAction`) | **≥ 4.3.1** |
 | `@exellix/ai-skills` | MAIN `runSkill` (Optimixer caps, `ModelConfig.reasoningEffort`) | **6.0.0** |
 
-Use explicit **ai-profiles** profile keys (`cheap`, `pro`, `cyber`, …) or **shortcuts** (`cheapest`, `default`, …) or **`profile/choice`** keys — not removed sync helpers or legacy tier aliases.
+Use explicit **ai-profiles** **`profile/choice`** keys (`cheap/default`, `pro/default`, …) or bare profile keys (`cheap`, `pro`) expanded at invoke — not legacy tier aliases or removed sync helpers.
 
 **FuncX catalog / hosting:** Those function ids must exist in your FuncX content resolver for live **`run()`** calls — see [`documenations/funcx-catalog-hosting-checklist.md`](documenations/funcx-catalog-hosting-checklist.md).
 
@@ -1093,9 +1093,11 @@ Orchestrators send **model** + **sampling** + **`reasoningEffort`** + (for xynth
 
 **Accepted alias shapes** (`@x12i/ai-profiles` v2.1+):
 
-- **Profile keys:** `cheap`, `fast`, `balanced`, `deep`, `pro`, `json`, `agentic`, `research`, `cyber`, …
-- **Shortcuts:** `cheapest`, `default`, `best`, `standard`, `thinking`, `schema`, …
-- **Explicit choice:** `cheap/default`, `pro@default`, …
+- **Profile/choice keys:** `cheap/default`, `pro/default`, `cyber/default`, …
+- **Bare profile + implicit default choice:** `cheap`, `pro`, `cyber` (expanded to `profile/default` at invoke)
+- **Explicit `@` form:** `cheap@default`, `pro@fast`, …
+
+**List available keys:** `listAiTasksProfileChoices()` / `listAiTasksProfileChoiceKeys()` (re-exported from `@x12i/ai-profiles` via `@exellix/ai-tasks`). Same registry as xynthesis (`listAIProfiles` / `listAIProfileChoices` on `@exellix/xynthesis`).
 
 **Not accepted:** legacy graph tiers (`weak`, `strong`), deprecated `xynthesisModel`, or sync-only alias guessing removed in ai-profiles 2.1. Unknown keys fail at **`resolveAIProfile`** with a clear error.
 
@@ -1112,7 +1114,7 @@ await runTask({
   modelConfig: {
     preActionModel: "cheap",   // PRE synthesis
     postActionModel: "cheap",  // POST audit/polish
-    skillModel: "balanced",    // MAIN skill
+    skillModel: "pro/default",    // MAIN skill
   },
 });
 ```
@@ -1124,7 +1126,7 @@ Concrete ids (`openrouter/...`, `anthropic/claude-sonnet-4`, `openai/gpt-5`, …
 - **No change** if you already send concrete provider model ids.
 - **New:** you may send ai-profiles aliases on `modelConfig`, `llmCall.model`, and pipeline step configs — graph-engine no longer has to pre-resolve every alias before `runTask` (hosts that already resolve can keep doing so; double resolution is a no-op for concrete ids).
 - **Validation:** alias tokens on `modelConfig` slots are accepted; unknown aliases fail at resolution with a clear error.
-- **Helpers:** `resolveModelReference`, `resolveRunTaskModelReferences`, `isResolvableModelAlias` (true only for **`profile/choice`** keys and **shortcuts** — bare profile keys are resolved at invoke, not sync-listed).
+- **Helpers:** `resolveModelReference`, `resolveRunTaskModelReferences`, `isResolvableModelAlias` (true only for **`profile/choice`** keys — bare profile keys are resolved at invoke, not sync-listed).
 
 Resolution uses the ai-profiles registry (`auto`: remote refresh with bundled fallback). See [`.docs/ai-tasks-model-profile-aliases-7x.md`](.docs/ai-tasks-model-profile-aliases-7x.md).
 
@@ -1278,9 +1280,9 @@ const result = await runTask({
   taskTypeId: "security-task",
   executionStrategies: [],
   modelConfig: {
-    preActionModel: "cheap",
-    postActionModel: "cheap",
-    skillModel: "balanced",
+    preActionModel: "cheap/default",
+    postActionModel: "cheap/default",
+    skillModel: "pro/default",
   },
   input: { assetId: "a-123" },
   executionMode: "trace",
@@ -2279,8 +2281,8 @@ const result = await tasks.runTask({
   input: { assetId: "a-123" },
   variables: { orgName: "MyOrganization" },
   modelConfig: {
-    preActionModel: "balanced",
-    postActionModel: "balanced",
+    preActionModel: "cheap/default",
+    postActionModel: "cheap/default",
     skillModel: "openai/gpt-5",
     temperature: 0.7
   }

package/dist/core/task-sdk.d.ts.map

@@ -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;AA2BzF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA2OxD,KAAK,iBAAiB,GAAG,mBAAmB,CAAC;AA0S7C;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,+FAA+F;IAC/F,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC/B,CAAC;AAEF,qBAAa,gBAAgB;IAIzB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB;IAClD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAJ3B,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,mBAAmB,CAAC;gBAGjC,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,EACD,OAAO,CAAC,EAAE,uBAAuB;IAQ7B,OAAO,CAAC,OAAO,GAAG,GAAG,EAAE,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IA6kDtF;;OAEG;YACW,6BAA6B;IAshB3C;;;;;OAKG;YACW,cAAc;CAyR7B"}
+{"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;AA2BzF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA2OxD,KAAK,iBAAiB,GAAG,mBAAmB,CAAC;AA0S7C;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,+FAA+F;IAC/F,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC/B,CAAC;AAEF,qBAAa,gBAAgB;IAIzB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB;IAClD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAJ3B,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,mBAAmB,CAAC;gBAGjC,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,EACD,OAAO,CAAC,EAAE,uBAAuB;IAQ7B,OAAO,CAAC,OAAO,GAAG,GAAG,EAAE,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAkmDtF;;OAEG;YACW,6BAA6B;IAshB3C;;;;;OAKG;YACW,cAAc;CAyR7B"}

package/dist/core/task-sdk.js

@@ -2,8 +2,9 @@
 import { randomUUID } from "crypto";
 import { resolveRunTaskRuntimeKnobs, } from "../internal/resolveRunTaskRuntimeKnobs.js";
 import { applyOptimizerFeedbackToRequest, applyPlannerOutputToRequest } from "../execution-strategies/applyExecutionStrategyOutputs.js";
-import { buildExecutionStrategyRequestPayload, runOptimizerFuncx, runPlannerFuncx, } from "../execution-strategies/runFuncxExecutionStrategy.js";
-import { resolveSafeExecutionStrategyCatalogDefaultFunctionId } from "../execution-strategies/executionStrategyCatalogMetadata.js";
+import { buildExecutionStrategyRequestPayload } from "../execution-strategies/executionStrategyRequestPayload.js";
+import { runOptimizerViaXynthesis, runPlannerViaXynthesis, } from "../execution-strategies/runExecutionStrategyViaXynthesis.js";
+import { resolveSafeExecutionStrategyCatalogDefaultSidekickAction } from "../execution-strategies/executionStrategyCatalogMetadata.js";
 import { SYNTHESIZED_CONTEXT } from "../types/index.js";
 import { runAuditPostStep } from "../post-steps/audit/runAudit.js";
 import { buildRunTaskResultMetaFromModelId } from "../invocation/buildRunTaskResultMeta.js";
@@ -718,33 +719,45 @@ export class WorexClientTasks {
                             coreSkillId: working.coreSkillId,
                             includeContextInPrompt: working.includeContextInPrompt,
                         });
-                        const catalogDefaultFunctionId = resolveSafeExecutionStrategyCatalogDefaultFunctionId(req.executionStrategyCatalogItems, spec);
-                        const plannerOut = await runPlannerFuncx({
+                        const catalogDefaultSidekickAction = resolveSafeExecutionStrategyCatalogDefaultSidekickAction(req.executionStrategyCatalogItems, spec);
+                        const plannerOut = await runPlannerViaXynthesis({
                             args: spec.args,
                             requestPayload: payload,
-                            defaultFunctionId: catalogDefaultFunctionId,
+                            modelConfig: req.modelConfig,
+                            jobId: working.jobId,
+                            taskId: working.taskId,
+                            agentId: working.agentId,
+                            workScopeIdentity: buildXynthesisWorkScopeIdentity({
+                                jobId: working.jobId,
+                                taskId: working.taskId,
+                                agentId: working.agentId,
+                                graphId: working.graphId,
+                                nodeId: working.nodeId,
+                                prevNodeId: working.prevNodeId,
+                                coreSkillId: working.coreSkillId,
+                            }),
                         });
                         working = applyPlannerOutputToRequest(working, plannerOut, pi);
                         prefixSteps.push({
                             step: prefixSteps.length + 1,
                             id: `executionStrategy.planner.${pi}`,
                             ok: true,
-                            summary: "FuncX planner (execution/plan)",
+                            summary: "xynthesis planner (execution-plan)",
                             outputExcerpt: {
                                 hasInstructions: typeof plannerOut.instructions === "string",
                                 hasPrompt: typeof plannerOut.prompt === "string",
                                 variableKeys: plannerOut.variables ? Object.keys(plannerOut.variables).slice(0, 20) : [],
-                                functionIdSource: typeof spec.args?.functionId === "string"
-                                    ? "invocation"
-                                    : catalogDefaultFunctionId
-                                        ? "catalog"
-                                        : "code-default",
+                                sidekickActionSource: catalogDefaultSidekickAction
+                                    ? "catalog"
+                                    : spec.strategyKey === "planner"
+                                        ? "execution-plan"
+                                        : "execution-evaluate-result",
                             },
                         });
                         if (traceCollector) {
                             traceCollector.push({
                                 taskType: "pre-execution",
-                                details: "execution strategy planner (FuncX)",
+                                details: "execution strategy planner (xynthesis)",
                                 metadata: {
                                     ...baseTraceMeta(),
                                     phase: "execution_strategy_planner",
@@ -776,9 +789,21 @@ export class WorexClientTasks {
                             skillKey: last.skillKey,
                             metadata: last.metadata ? summarizeForOuter(last.metadata, 6_000) : undefined,
                         };
-                        const evalOut = await runOptimizerFuncx({
+                        const evalOut = await runOptimizerViaXynthesis({
                             args: primary.args,
-                            defaultFunctionId: resolveSafeExecutionStrategyCatalogDefaultFunctionId(req.executionStrategyCatalogItems, primary),
+                            modelConfig: req.modelConfig,
+                            jobId: working.jobId,
+                            taskId: working.taskId,
+                            agentId: working.agentId,
+                            workScopeIdentity: buildXynthesisWorkScopeIdentity({
+                                jobId: working.jobId,
+                                taskId: working.taskId,
+                                agentId: working.agentId,
+                                graphId: working.graphId,
+                                nodeId: working.nodeId,
+                                prevNodeId: working.prevNodeId,
+                                coreSkillId: working.coreSkillId,
+                            }),
                             requestPayload: buildExecutionStrategyRequestPayload({
                                 skillKey: working.skillKey,
                                 input: working.input,
@@ -802,7 +827,7 @@ export class WorexClientTasks {
                         if (traceCollector) {
                             traceCollector.push({
                                 taskType: "ai-task",
-                                details: "execution strategy optimizer (FuncX)",
+                                details: "execution strategy optimizer (xynthesis)",
                                 metadata: {
                                     ...baseTraceMeta(),
                                     phase: "execution_strategy_optimizer",