@exellix/graph-engine 6.0.0 → 6.0.2

package/dist/src/inspection/nodeInspection.js

@@ -367,7 +367,7 @@ export function getNodeNarrixDiscovery(node) {
         return null;
     const n = narrix;
     const web = task.taskConfiguration?.aiTaskProfile?.webScoping;
-    const enableWebScope = web?.enabled === true;
+    const enableWebScope = n.enableWebScope === true || web?.enabled === true;
     return {
         nodeId: node.id,
         enabled: true,

package/dist/src/runtime/applyAiTaskProfileWebScopingToNarrix.d.ts

@@ -8,10 +8,8 @@ export declare function mapAiTaskProfileQuestionsToWebScopeQuestions(questions:
 /**
  * Returns the resolved outbound `RunTaskRequest.narrix` payload.
  *
- * Authoring contract (5.x): `taskConfiguration.narrix` only carries the discovery fields on
- * {@link NarrixPreProcessorConfig} (`datasetId`, `layer`, `narrativeTypeIds`, `questionId`).
- * Web-scope fields (`enableWebScope`, `webScopeQuestions`, ...) are produced here from
- * `taskConfiguration.aiTaskProfile.webScoping` and merged onto the wire payload — they are not
- * authored on `taskConfiguration.narrix`.
+ * `enableWebScope` is forwarded from `taskConfiguration.narrix` (default `false`) and may be set to
+ * `true` when `taskConfiguration.aiTaskProfile.webScoping` is active. `webScopeQuestions` are derived
+ * only from the ai-task profile.
  */
 export declare function applyAiTaskProfileWebScopingToNarrix(narrix: NarrixPreProcessorConfig | undefined, aiTaskProfile: AiTaskProfileMetadata | undefined): ResolvedNarrixWirePayload | undefined;

package/dist/src/runtime/applyAiTaskProfileWebScopingToNarrix.js

@@ -25,22 +25,19 @@ function webScopingFromProfileIsActive(profile) {
 /**
  * Returns the resolved outbound `RunTaskRequest.narrix` payload.
  *
- * Authoring contract (5.x): `taskConfiguration.narrix` only carries the discovery fields on
- * {@link NarrixPreProcessorConfig} (`datasetId`, `layer`, `narrativeTypeIds`, `questionId`).
- * Web-scope fields (`enableWebScope`, `webScopeQuestions`, ...) are produced here from
- * `taskConfiguration.aiTaskProfile.webScoping` and merged onto the wire payload — they are not
- * authored on `taskConfiguration.narrix`.
+ * `enableWebScope` is forwarded from `taskConfiguration.narrix` (default `false`) and may be set to
+ * `true` when `taskConfiguration.aiTaskProfile.webScoping` is active. `webScopeQuestions` are derived
+ * only from the ai-task profile.
  */
 export function applyAiTaskProfileWebScopingToNarrix(narrix, aiTaskProfile) {
-    const base = narrix != null ? { ...narrix } : undefined;
-    if (!webScopingFromProfileIsActive(aiTaskProfile)) {
-        return base;
+    const profileActive = webScopingFromProfileIsActive(aiTaskProfile);
+    if (narrix == null && !profileActive) {
+        return undefined;
     }
-    const mapped = mapAiTaskProfileQuestionsToWebScopeQuestions(aiTaskProfile.webScoping.questions);
-    const wire = (base ?? {});
-    return {
-        ...wire,
-        enableWebScope: true,
-        webScopeQuestions: mapped,
-    };
+    const wire = (narrix != null ? { ...narrix } : {});
+    wire.enableWebScope = narrix?.enableWebScope === true || profileActive;
+    if (profileActive) {
+        wire.webScopeQuestions = mapAiTaskProfileQuestionsToWebScopeQuestions(aiTaskProfile.webScoping.questions);
+    }
+    return wire;
 }

package/dist/src/runtime/resolveNarrixForTaskNode.d.ts

@@ -1,9 +1,9 @@
 import type { NarrixPreProcessorConfig, ResolvedNarrixWirePayload } from '../types/narrix.js';
 import type { AiTaskProfileMetadata } from '../types/aiTaskProfile.js';
 /**
- * Resolves outbound `RunTaskRequest.narrix`: starts from node taskConfiguration (authoring shape, no web fields),
- * shallow-merges graph-level `variables.narrix` discovery fields, then derives web-scope fields from
- * `taskConfiguration.aiTaskProfile.webScoping` via {@link applyAiTaskProfileWebScopingToNarrix}.
+ * Resolves outbound `RunTaskRequest.narrix`: starts from node `taskConfiguration.narrix`,
+ * shallow-merges graph-level `variables.narrix`, then applies `enableWebScope` / `webScopeQuestions`
+ * via {@link applyAiTaskProfileWebScopingToNarrix}.
  *
  * Shared by {@link ExellixGraphRuntime}.
  */

package/dist/src/runtime/resolveNarrixForTaskNode.js

@@ -1,8 +1,8 @@
 import { applyAiTaskProfileWebScopingToNarrix } from './applyAiTaskProfileWebScopingToNarrix.js';
 /**
- * Resolves outbound `RunTaskRequest.narrix`: starts from node taskConfiguration (authoring shape, no web fields),
- * shallow-merges graph-level `variables.narrix` discovery fields, then derives web-scope fields from
- * `taskConfiguration.aiTaskProfile.webScoping` via {@link applyAiTaskProfileWebScopingToNarrix}.
+ * Resolves outbound `RunTaskRequest.narrix`: starts from node `taskConfiguration.narrix`,
+ * shallow-merges graph-level `variables.narrix`, then applies `enableWebScope` / `webScopeQuestions`
+ * via {@link applyAiTaskProfileWebScopingToNarrix}.
  *
  * Shared by {@link ExellixGraphRuntime}.
  */

package/dist/src/runtime/validateCanonicalGraphDocument.js

@@ -95,9 +95,8 @@ const LEGACY_METADATA_TO_TASK_CONFIGURATION = {
     executionMemory: 'runtime.executionMemory',
     outputsMemory: 'runtime.outputsMemory',
 };
-/** Web-scope keys are not allowed under `taskConfiguration.narrix` (use `taskConfiguration.aiTaskProfile.webScoping`). */
+/** Web-scope keys are not allowed under `taskConfiguration.narrix` except `enableWebScope` (use `taskConfiguration.aiTaskProfile.webScoping` for questions). */
 const FORBIDDEN_NARRIX_WEB_KEYS = [
-    'enableWebScope',
     'forceWebScope',
     'webScopeQuestions',
     'webScoping',
@@ -466,6 +465,11 @@ export function assertCanonicalTaskNode(node, context) {
     }
     const narrixTc = tc && isPlainObject(tc.narrix) ? tc.narrix : undefined;
     if (narrixTc) {
+        if ('enableWebScope' in narrixTc &&
+            narrixTc.enableWebScope != null &&
+            typeof narrixTc.enableWebScope !== 'boolean') {
+            throw new ExellixGraphError(ExellixGraphErrorCode.NON_CANONICAL_TASK_NODE, `Task node "${String(node.id)}": taskConfiguration.narrix.enableWebScope must be a boolean when present.`, { jobId: context?.jobId, graphId: context?.graphId, nodeId: String(node.id), narrixWebKey: 'enableWebScope' });
+        }
         for (const k of FORBIDDEN_NARRIX_WEB_KEYS) {
             if (k in narrixTc) {
                 throw new ExellixGraphError(ExellixGraphErrorCode.NON_CANONICAL_TASK_NODE, `Task node "${String(node.id)}": taskConfiguration.narrix.${k} is forbidden — author web scope under taskConfiguration.aiTaskProfile.webScoping.`, { jobId: context?.jobId, graphId: context?.graphId, nodeId: String(node.id), narrixWebKey: k });

package/dist/src/types/narrix.d.ts

@@ -3,8 +3,7 @@ import type { RunTaskRequest } from '@exellix/ai-tasks';
 type AITasksNarrixPreProcessorConfig = NonNullable<RunTaskRequest['narrix']>;
 /**
  * Graph-engine wire shape for the resolved `RunTaskRequest.narrix` payload after merging
- * `taskConfiguration.aiTaskProfile.webScoping` into `taskConfiguration.narrix`. Used internally; authors do
- * **not** set web-scope fields on `taskConfiguration.narrix`.
+ * `taskConfiguration.narrix` with graph variables and optional `taskConfiguration.aiTaskProfile.webScoping`.
  */
 export type ResolvedNarrixWirePayload = AITasksNarrixPreProcessorConfig;
 /** One web-scope question on the resolved narrix wire payload; produced from `aiTaskProfile.webScoping.questions`. */
@@ -14,12 +13,10 @@ export type WebScopeQuestion = {
     purpose?: string;
 };
 /**
- * Authoring shape for `taskConfiguration.narrix` on a graph task node — discovery only.
+ * Authoring shape for `taskConfiguration.narrix` on a graph task node.
  *
- * 5.x removed every web-scope key from this type. Authors set web intent under
- * `taskConfiguration.aiTaskProfile.webScoping` (`enabled`, `questions: string[]`); graph-engine
- * fills the corresponding fields on the resolved `RunTaskRequest.narrix` automatically,
- * and `assertCanonicalGraphDocument` rejects web-scope keys here at load time.
+ * Discovery fields plus `enableWebScope` (forwarded to `RunTaskRequest.narrix.enableWebScope`).
+ * Question packs for web scoping may also be supplied via `taskConfiguration.aiTaskProfile.webScoping`.
  */
 export type NarrixPreProcessorConfig = {
     /** Which pack and entity type the engine runs (e.g. `"network.vuln.instances"`). */
@@ -33,6 +30,15 @@ export type NarrixPreProcessorConfig = {
     narrativeTypeIds?: string[];
     /** Framework question this node answers (e.g. q0, q1, q2, q3, q5, q6). */
     questionId?: string;
+    /** When true, ai-tasks runs `@exellix/narrix-web-scoper` after CNI and writes `executionMemory.webContext`. */
+    enableWebScope?: boolean;
+    /**
+     * When true with `enableWebScope`, skip internal web-scoper if `executionMemory.webContextMarkdown` is already set.
+     * See `@exellix/ai-tasks` `NarrixPreProcessorConfig.skipWebScopeWhenExternalWebMarkdownPresent`.
+     */
+    skipWebScopeWhenExternalWebMarkdownPresent?: boolean;
+    /** Execution memory key for the Narrix attachment (default `_narrix` in ai-tasks). */
+    attachToField?: string;
 };
 /**
  * Context shape passed to NARRIX graph task handlers (matches ai-tasks LocalTaskContext).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exellix/graph-engine",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "type": "module",
   "description": "Graph executor SDK",
   "main": "dist/src/index.js",
@@ -48,7 +48,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@exellix/ai-tasks": "^7.8.1",
+    "@exellix/ai-tasks": "^7.8.2",
     "@x12i/activix": "^7.1.0",
     "@x12i/catalox": "^5.1.1",
     "@x12i/env": "^4.0.1",