@exellix/graph-composer 2.12.0 → 2.14.1

package/CHANGELOG.md

@@ -111,7 +111,7 @@
 
 ### Fixed
 
-- Load `@exellix/ai-skills` analysis helpers via resolved file paths instead of non-exported package subpaths, so consumers importing `@exellix/graph-composer` or `@exellix/exellix-runtime` (e.g. `@exellix/exellix-jobs`) no longer fail at module load.
+- Load `@exellix/ai-skills` analysis helpers via resolved file paths instead of non-exported package subpaths, so consumers importing `@exellix/graph-composer` or `@x12i/exellix-runtime` (e.g. `@x12i/exellix-jobs`) no longer fail at module load.
 
 ## 2.5.0
 

package/README.md

@@ -1,9 +1,9 @@
-# @x12i/graph-composer
+# @exellix/graph-composer
 
 | | Location |
 |---|----------|
 | **GitHub (source)** | [`woroces/graph-composer`](https://github.com/woroces/graph-composer) — clone: `git@github.com:woroces/graph-composer.git` |
-| **npm (package)** | [`@x12i/graph-composer`](https://www.npmjs.com/package/@x12i/graph-composer) |
+| **npm (package)** | [`@exellix/graph-composer`](https://www.npmjs.com/package/@exellix/graph-composer) |
 
 The Git repo lives under the **woroces** org with repo name **graph-composer**. That is separate from the npm scope **@x12i**.
 
@@ -62,7 +62,7 @@ Copy [`.env.example`](./.env.example) to `.env` for local development. **Do not
 ## Quick start (direct worker)
 
 ```ts
-import { runGraphComposer } from "@x12i/graph-composer";
+import { runGraphComposer } from "@exellix/graph-composer";
 
 const result = await runGraphComposer(
   {
@@ -103,7 +103,7 @@ const result = await runGraphComposer(
 ### Orchestrator (toolbox)
 
 ```ts
-import { runGraphComposerAgent } from "@x12i/graph-composer";
+import { runGraphComposerAgent } from "@exellix/graph-composer";
 
 const out = await runGraphComposerAgent(
   {
@@ -162,7 +162,7 @@ Types: `GraphConceptPatch`, `GraphConceptPatchKey`, `PrimaryIntentType`. Helper:
 **Example using the bundled fixture helper:**
 
 ```ts
-import { runGraphComposer, inputSuggestConceptObjectiveNetworkVulnSubnet } from "@x12i/graph-composer";
+import { runGraphComposer, inputSuggestConceptObjectiveNetworkVulnSubnet } from "@exellix/graph-composer";
 
 const result = await runGraphComposer(inputSuggestConceptObjectiveNetworkVulnSubnet(), {
   askTimeoutMs: 120_000,
@@ -186,7 +186,7 @@ import {
   configureGraphComposerLogging,
   getGraphComposerLoggingConfig,
   runGraphComposer,
-} from "@x12i/graph-composer";
+} from "@exellix/graph-composer";
 
 // Process-wide (e.g. after reading your service config)
 configureGraphComposerLogging({ logsLevel: "info" });
@@ -205,7 +205,7 @@ Precedence per worker run: **`options.logsLevel`** → **`configureGraphComposer
 Use `generateGraphJsonInputExample` when a host has a graph-specific expected input JSON Schema and wants a realistic smoke-test payload. It wraps Funcx `generateJsonExample`, adding graph metadata such as `metadata.graphConcept.expectedInput` and core tasks to the guidance.
 
 ```ts
-import { generateGraphJsonInputExample } from "@x12i/graph-composer";
+import { generateGraphJsonInputExample } from "@exellix/graph-composer";
 
 const out = await generateGraphJsonInputExample({
   existingGraph: myGraphJson,
@@ -220,7 +220,7 @@ The package also re-exports Funcx `generateJsonExample`, `generateMdExample`, an
 
 ### Catalog resolution & creation (`suggestCatalogResolution`, `suggestCatalogCreations`)
 
-Both **require** `existingGraph`. Pass **`catalogCandidates`** (from **Catalox** via `loadCatalogCandidatesFromCatalox`, or fixtures): `aiSkills`, `utilitySkills`, `scopingMaps`, `narrixTemplates` — see [`docs/worox-graphs-catalogs.md`](./docs/worox-graphs-catalogs.md) and [`docs/catalog-metadb-end-state-contract.md`](./docs/catalog-metadb-end-state-contract.md) (**Catalox bridge + `catalogCandidates` as documented there: `@x12i/graph-composer` ≥ 1.6.0**).
+Both **require** `existingGraph`. Pass **`catalogCandidates`** (from **Catalox** via `loadCatalogCandidatesFromCatalox`, or fixtures): `aiSkills`, `utilitySkills`, `scopingMaps`, `narrixTemplates` — see [`docs/worox-graphs-catalogs.md`](./docs/worox-graphs-catalogs.md) and [`docs/catalog-metadb-end-state-contract.md`](./docs/catalog-metadb-end-state-contract.md) (**Catalox bridge + `catalogCandidates` as documented there: `@exellix/graph-composer` ≥ 1.6.0**).
 
 - **`suggestCatalogResolution`** — Per-node style recommendations: `skillResolution`, `scopingResolution`, `narrixResolution`, `gaps`. Optional **`matchLists`** pre-pass (skills / scoping / narrix) injects **`catalogMatchHints`** into the worker prompt when `catalogMatchListsAssist !== false` (default) and an OpenRouter **client** is available.
 - **`suggestCatalogCreations`** — `catalogRequestProposals` (+ optional `newSkillDescriptors`). Host applies approved rows via **Catalox** (or your store); this package emits JSON only.
@@ -228,7 +228,7 @@ Both **require** `existingGraph`. Pass **`catalogCandidates`** (from **Catalox**
 ### Scoping need match & scoping map creation
 
 - **`suggestScopingNeedMatch`** — **Does not** require `existingGraph` (optional context). **Requires** non-empty **`catalogCandidates.scopingMaps`**. Put the data need in **`intent.description`**. Output: **`hasSuitableMatch`**, **`recommended`** (`scopingMapId` / `questionId` when true, **`null` when false**), **`gaps`**, optional **`alternatives`**. Optional **`matchLists`** injects **`scopingNeedMatchHints`** (same client / `catalogMatchListsAssist` flag).
-- **`suggestScopingMapCreation`** — Plan a new scoping map: **`scopingMapProposal`** + non-empty **`catalogRequestProposals`**. Host persists approved artifacts; see **`WoroxScopingMapCatalogCreatePayload`** exported from **`@x12i/graph-composer`** (authored as `src/scopingCatalogHostTypes.ts` in this repo).
+- **`suggestScopingMapCreation`** — Plan a new scoping map: **`scopingMapProposal`** + non-empty **`catalogRequestProposals`**. Host persists approved artifacts; see **`WoroxScopingMapCatalogCreatePayload`** exported from **`@exellix/graph-composer`** (authored as `src/scopingCatalogHostTypes.ts` in this repo).
 
 ### `RunGraphComposerOptions` (workers)
 
@@ -266,8 +266,8 @@ Authoritative JSON shapes: [`functions/graph-composer/meta.json`](./functions/gr
 
 ```bash
 export OPENROUTER_API_KEY=sk-or-...
-npx @x12i/graph-composer explain-basic
-npx @x12i/graph-composer network-vuln
+npx @exellix/graph-composer explain-basic
+npx @exellix/graph-composer network-vuln
 ```
 
 Or use the binary name:
@@ -339,11 +339,7 @@ npm run typecheck
 npm test          # live tests; needs OPENROUTER_API_KEY in .env
 ```
 
-Optional: [nx-config2](https://www.npmjs.com/package/nx-config2) for scripts that load `.env`:
-
-```bash
-npx nx-config2 run --env-file .env -- npm test
-```
+Live tests and scripts load `.env` via `@x12i/env` (`x12i-env run --env-file .env -- …`); see `npm test` / `npm run test:live` scripts.
 
 **Maintainer smoke (suggest only, truncated JSON):** `npm run suggest-smoke` (repo only; uses `scripts/run-suggest-concept-smoke.ts`).
 
@@ -363,11 +359,11 @@ Published npm tarball still **does not** ship `docs/`; clone the repo or read th
 
 ## Publishing (maintainers)
 
-Scoped package `@x12i/graph-composer` uses `publishConfig.access: "public"`. Ensure your npm user is a member of the **x12i** org (or owns the scope) and has a valid token in `~/.npmrc` or project `.npmrc` (never commit tokens).
+Scoped package `@exellix/graph-composer` uses `publishConfig.access: "public"`. Ensure your npm user is a member of the **x12i** org (or owns the scope) and has a valid token in the **monorepo root** `.npmrc` (copy from `.npmrc.example`; never commit tokens). Publish via `npm run publish:all` from the repo root — do not run `npm publish` in this folder directly.
 
 ```bash
-npm run build
-npm publish
+# From monorepo root (uses root .npmrc for all packages)
+npm run publish:all -- --packages graph-composer
 ```
 
 Confirm tarball: `npm run pack:check` (must **not** list `docs/`, `.env`, or `test/`).

package/dist/funcxModel.d.ts

@@ -1,6 +1,3 @@
-/**
- * funcx 4.4+ uses `model` on call sites; legacy graph-composer options used `mode` (weak/normal/strong/ultra).
- */
 export declare function resolveFuncxModel(opts: {
     model?: string;
     mode?: string;

package/dist/funcxModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"funcxModel.d.ts","sourceRoot":"","sources":["../src/funcxModel.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAK7F"}
+{"version":3,"file":"funcxModel.d.ts","sourceRoot":"","sources":["../src/funcxModel.ts"],"names":[],"mappings":"AAmBA,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,MAAM,GAAG,SAAS,CAcrB"}

package/dist/funcxModel.js

@@ -1,10 +1,32 @@
 /**
- * funcx 4.4+ uses `model` on call sites; legacy graph-composer options used `mode` (weak/normal/strong/ultra).
+ * funcx 4.9+ call sites require `model` as a profile/choice key or catalog slug.
+ * Legacy graph-composer options still accept `mode` (weak/normal/strong/ultra):
+ * resolve via LLM_MODEL_* env, then fall back to ai-profiles keys.
  */
+const MODE_ENV = {
+    weak: "LLM_MODEL_WEAK",
+    normal: "LLM_MODEL_NORMAL",
+    strong: "LLM_MODEL_STRONG",
+    ultra: "LLM_MODEL_ULTRA",
+};
+const MODE_DEFAULT_PROFILE = {
+    weak: "cheap/default",
+    normal: "balanced/default",
+    strong: "balanced/default",
+    ultra: "deep/default",
+};
 export function resolveFuncxModel(opts) {
     const model = opts.model?.trim();
     if (model)
         return model;
-    const mode = opts.mode?.trim();
-    return mode || undefined;
+    const mode = opts.mode?.trim().toLowerCase();
+    if (!mode)
+        return undefined;
+    const envKey = MODE_ENV[mode];
+    if (envKey) {
+        const fromEnv = process.env[envKey]?.trim();
+        if (fromEnv)
+            return fromEnv;
+    }
+    return MODE_DEFAULT_PROFILE[mode];
 }

package/functions/graph-composer/prompts/action-create.md

@@ -12,13 +12,14 @@ You are a graph architect for the **worox-graph** flat authoring format (`@exell
 7. **Task node config:** For every **non-local** AI task node, set **`taskConfiguration.aiTaskProfile`** with non-empty **`preStrategyKey`** and **`postStrategyKey`**. Add **`taskConfiguration.narrix`** when discovery applies (discovery only). Add **`webQueryTemplate`** / **`inputSynthesis`** under **`aiTaskProfile`** when needed. Use **`inputsConfig`** + **`taskVariable`** + **`executionMapping`** (not deprecated `inputs` / `outputMapping`). Add **`metadata.graphReadability`** / **`catalogBinding`** for planning only.
 
 **Web scope (Graphenix 2.7.2+ — Rendrix template on `aiTaskProfile`, not `narrix`):**
+In emitted graph JSON, wrap input field paths in Rendrix double-brace delimiters (example field path: `input.assetId`).
 ```json
 "taskConfiguration": {
   "narrix": { "datasetId": "network.assets", "layer": "asset" },
   "aiTaskProfile": {
     "preStrategyKey": "pre-v1",
     "postStrategyKey": "post-v1",
-    "webQueryTemplate": "Is {{input.assetId}} reachable from the internet?"
+    "webQueryTemplate": "Is input.assetId reachable from the internet?"
   }
 }
 ```

package/functions/graph-composer/prompts/action-review-concept.md

@@ -29,7 +29,7 @@ Cover what matters for the graph at hand; skip axes that clearly do not apply. *
 - **Narrix discovery**: For **`professional-answer`** (or other LLM) nodes that imply discovery, check **`taskConfiguration.narrix`** (`datasetId`, `layer`, `narrativeTypeIds`) for coherence with **`inputsConfig`** / **`taskVariable`** and **`catalogCandidates.narrixTemplates`** when present.
 - **Catalog planning vs runtime**: When **`metadata.catalogBinding`** / **`metadata.catalogRequests`** (graph) exist, note mismatches vs actual **`taskConfiguration.narrix`** / **`taskConfiguration.scopingMapId`** on nodes, or vs gaps declared in **`catalogRequests`**.
 - **Graph I/O contracts**: When **`metadata.graphEntry`** or **`metadata.graphResponse`** exist, comment on whether **`inputs`**, **`taskVariable`**, execution paths, and finalizer outputs align with declared **`requiredExecutionPaths`** / **`notableExecutionPaths`** / schemas (authoring-level review).
-- **Web scoping + input synthesis (node-level)**: Under **`taskConfiguration.aiTaskProfile`**, web scope requires non-empty **`webQueryTemplate`** (Rendrix string with `{{input.*}}` refs) — do **not** author **`webScoping`** or web keys on **`narrix`**. When **`inputSynthesis.enabled`** is true, require non-empty **`catalogId`**, **`strategyKey`**, **`outputKey`**, **`sources`**, and **`destination`** (`job`, `task`, or `execution`).
+- **Web scoping + input synthesis (node-level)**: Under **`taskConfiguration.aiTaskProfile`**, web scope requires non-empty **`webQueryTemplate`** (Rendrix string with `input.<fieldName>` refs in double-brace syntax) — do **not** author **`webScoping`** or web keys on **`narrix`**. When **`inputSynthesis.enabled`** is true, require non-empty **`catalogId`**, **`strategyKey`**, **`outputKey`**, **`sources`**, and **`destination`** (`job`, `task`, or `execution`).
 - **Task decomposition**: One clear responsibility per node; avoid redundant or oversized steps.
 - **Skill selection**: Right tool for deterministic vs inferential work; catalog alignment in locked mode.
 - **Data flow**: Execution-memory paths and `jobContextMapping` / `inputs` trace from `input.*` or upstream writers; `taskVariable.question` and other task variables stay out of runtime payload bindings; `taskVariable` refs trace to top-level `variables`; no obvious dangling reads.

package/functions/graph-composer/prompts/shared/graph-format.md

@@ -43,7 +43,7 @@ A graph is a single JSON object. Top-level fields (canonical root keys only):
     "aiTaskProfile": {
       "preStrategyKey": "<pre-strategy-row-id>",
       "postStrategyKey": "<post-strategy-row-id>",
-      "webQueryTemplate": "Optional Rendrix template, e.g. Patch status for {{input.cveId}}?",
+      "webQueryTemplate": "Optional Rendrix template, e.g. Patch status for input.cveId (wrap field paths in Rendrix double-brace syntax in real graph JSON)",
       "inputSynthesis": { "enabled": false }
     },
     "narrix": { "datasetId": "<optional>", "layer": "<optional>" },

package/functions/graph-composer/prompts/shared/structural-validation.md

@@ -10,7 +10,7 @@ Before returning any graph (create/modify only), verify:
 8. If `maxNodes` is set, the total node count does not exceed it.
 9. All `skillKey` values exist in the provided catalog (unless extensible mode is active).
 10. For every **AI task** node, include **`taskConfiguration.aiTaskProfile.preStrategyKey`** and **`postStrategyKey`** (non-empty strings matching deployment PRE/POST strategy catalog row ids). Omit only on local/utility skills.
-11. When web scope is needed, set non-empty **`taskConfiguration.aiTaskProfile.webQueryTemplate`** (Rendrix string with `{{input.*}}` refs). Optional **`webQueryTemplates[]`** for pack mode. Do **not** author **`webScoping`** or web keys on **`narrix`**.
+11. When web scope is needed, set non-empty **`taskConfiguration.aiTaskProfile.webQueryTemplate`** (Rendrix string with `input.<fieldName>` refs in double-brace syntax). Optional **`webQueryTemplates[]`** for pack mode. Do **not** author **`webScoping`** or web keys on **`narrix`**.
 12. When **`inputSynthesis.enabled`** is `true`, set non-empty **`inputSynthesis.catalogId`**, **`strategyKey`**, **`outputKey`**, **`sources`** (memory paths), and **`destination`** (`job`, `task`, or `execution`). Do not add manual PRE `synthesized-context` steps when profile synthesis is enabled.
 13. Do not author deprecated task-node **`inputs`** or **`outputMapping`** — use **`inputsConfig`** and **`executionMapping`**.
 14. **Narrix** belongs under **`taskConfiguration.narrix`** (`datasetId`, `layer`, `narrativeTypeIds` when needed). Discovery only — no web fields on `narrix`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exellix/graph-composer",
-  "version": "2.12.0",
+  "version": "2.14.1",
   "publishConfig": {
     "access": "public"
   },
@@ -28,7 +28,6 @@
     ".env.example"
   ],
   "scripts": {
-    "postinstall": "node -e \"const fs=require('fs'),p=require('path');const s=p.join('node_modules','nx-config2','bin','nx-config2.js'),d=p.join('node_modules','@x12i','env','bin','nx-config2.js');try{if(fs.existsSync(s)&&!fs.existsSync(d))fs.copyFileSync(s,d);}catch(_){}\"",
     "build": "tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run build",
     "start": "x12i-env run --env-file .env -- node dist/cli.js",
@@ -37,7 +36,7 @@
     "verify:local": "tsx src/verify-local.ts",
     "verify:catalog-live": "x12i-env run --env-file .env -- tsx scripts/verify-catalog-live.ts",
     "test": "npm run test:unit && npm run test:live",
-    "test:unit": "node --import tsx/esm --test --test-force-exit --test-concurrency=1 test/unit/explain-shape.test.ts test/unit/graph-concept-patch.test.ts test/unit/graph-concept-story-parse.test.ts test/unit/review-concept-output-validation.test.ts test/unit/review-concept-catalog-alias.test.ts test/unit/redact-for-log.test.ts test/unit/graph-composer-logging.test.ts test/unit/worker-instructions.test.ts test/unit/catalog-output-validation.test.ts test/unit/catalox-catalog-bridge.test.ts test/unit/ai-task-profile.test.ts test/unit/create-modify-output-validation.test.ts test/unit/task-node-task-variable.test.ts test/unit/canonical-graph-document.test.ts test/unit/graph-engine-bridge.test.ts test/unit/authoring-graph-validation.test.ts test/unit/graph-model-layers.test.ts test/unit/example-generation.test.ts test/unit/graph-entry-schema.test.ts test/unit/graph-entry-patch-validation.test.ts test/unit/graph-entry-entity-alignment.test.ts test/unit/model-config-patch-merge.test.ts test/unit/graph-entry-registry.test.ts test/unit/graph-model-label-format.test.ts test/unit/llm-call-config.test.ts",
+    "test:unit": "node --import tsx/esm --test --test-force-exit --test-concurrency=1 test/unit/explain-shape.test.ts test/unit/graph-concept-patch.test.ts test/unit/graph-concept-story-parse.test.ts test/unit/review-concept-output-validation.test.ts test/unit/review-concept-catalog-alias.test.ts test/unit/redact-for-log.test.ts test/unit/graph-composer-logging.test.ts test/unit/worker-instructions.test.ts test/unit/catalog-output-validation.test.ts test/unit/catalox-catalog-bridge.test.ts test/unit/ai-task-profile.test.ts test/unit/create-modify-output-validation.test.ts test/unit/task-node-task-variable.test.ts test/unit/canonical-graph-document.test.ts test/unit/graph-engine-bridge.test.ts test/unit/authoring-graph-validation.test.ts test/unit/graph-model-layers.test.ts test/unit/example-generation.test.ts test/unit/graph-entry-schema.test.ts test/unit/graph-entry-patch-validation.test.ts test/unit/graph-entry-entity-alignment.test.ts test/unit/model-config-patch-merge.test.ts test/unit/graph-entry-registry.test.ts test/unit/graph-model-label-format.test.ts test/unit/llm-call-config.test.ts test/unit/funcx-model.test.ts test/unit/instruction-template.test.ts",
     "test:live": "x12i-env run --env-file .env -- node --import tsx/esm --test test/live/all.ts",
     "pack:check": "npm pack --dry-run",
     "suggest-smoke": "x12i-env run --env-file .env -- tsx scripts/run-suggest-concept-smoke.ts"
@@ -57,34 +56,18 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/woroces/graph-composer.git"
+    "url": "git+ssh://git@github.com/exellix/exellix-engine-mono-repo.git",
+    "directory": "graph-composer"
   },
   "bugs": {
     "url": "https://github.com/woroces/graph-composer/issues"
   },
   "homepage": "https://github.com/woroces/graph-composer#readme",
-  "overrides": {
-    "@x12i/graphenix-authoring-format": "^2.7.3",
-    "@x12i/graphenix-case-format": "^2.7.3",
-    "@x12i/graphenix-core": "^2.7.3",
-    "@x12i/graphenix-executable-contracts": "^2.7.3",
-    "@x12i/graphenix-executable-format": "^2.7.3",
-    "@x12i/graphenix-execute-envelope": "^2.7.3",
-    "@x12i/graphenix-format": "^2.0.0",
-    "@x12i/graphenix-plan-compiler": "^2.7.3",
-    "@x12i/graphenix-plan-format": "^2.7.3",
-    "@x12i/graphenix-task-node-format": "^2.7.3",
-    "@x12i/graphenix-trace-format": "^2.7.3"
-  },
   "peerDependencies": {
     "@exellix/ai-skills": "^6.12.5",
-    "@exellix/ai-tasks": "^10.0.13",
-    "@exellix/graph-engine": "^8.6.0"
+    "@exellix/ai-tasks": "^10.0.13"
   },
   "peerDependenciesMeta": {
-    "@exellix/graph-engine": {
-      "optional": true
-    },
     "@exellix/ai-tasks": {
       "optional": true
     },
@@ -93,18 +76,17 @@
     }
   },
   "dependencies": {
+    "@exellix/graph-engine": "^8.7.0",
     "@x12i/catalox": "^5.9.8",
-    "@x12i/env": "^4.0.1",
+    "@x12i/env": "^4.0.3",
     "@x12i/funcx": "^4.9.13",
     "@x12i/logxer": "^4.6.0"
   },
   "devDependencies": {
     "@exellix/ai-skills": "^6.12.5",
     "@exellix/ai-tasks": "^10.0.13",
-    "@exellix/graph-engine": "^8.6.0",
     "@types/node": "^22.10.2",
     "@x12i/rendrix": "^4.3.0",
-    "nx-config2": "^3.6.5",
     "tsx": "^4.19.2",
     "typescript": "^5.7.2"
   }