@adobe/design-data-agent-mcp 1.5.0 → 1.6.1

package/README.md

@@ -1,6 +1,6 @@
 # `@adobe/design-data-agent-mcp`
 
-MCP server and Claude Code skill for the [Spectrum Design Data](../../packages/design-data/) agent surface. Shells out to the `design-data` CLI — all logic stays in the Rust SDK.
+MCP server and Claude Code skill for the [Spectrum Design Data](../../packages/design-data/) agent surface. Read tools (`primer`, `resolve_token`, `query_tokens`, `describe_component`) run fully in-process via `@adobe/design-data-wasm` — no CLI binary required for those. Only `authoring_session_step_intent` still invokes the native binary (for NLP suggest ranking, not yet on the wasm surface).
 
 ## Install
 
@@ -29,7 +29,7 @@ https://github.com/adobe/spectrum-design-data/tree/main/tools/design-data-agent-
 npx @adobe/design-data-agent-mcp
 ```
 
-Requires the `@adobe/design-data` CLI on `PATH` (or set `DESIGN_DATA_BIN`).
+The `@adobe/design-data` CLI binary is **only** needed for `authoring_session_step_intent`. All other tools run in-process. Set `DESIGN_DATA_BIN` if the binary is not on `PATH`.
 
 ## MCP server
 
@@ -49,7 +49,7 @@ node tools/design-data-agent-mcp/src/index.js
 
 | Variable                 | Default       | Description                                       |
 | ------------------------ | ------------- | ------------------------------------------------- |
-| `DESIGN_DATA_BIN`        | `design-data` | Path to the `design-data` binary                  |
+| `DESIGN_DATA_BIN`        | `design-data` | Path to the `design-data` binary (authoring only) |
 | `DESIGN_DATA_ROOT`       | —             | Absolute root that relative paths are anchored to |
 | `DESIGN_DATA_PATH`       | `.`           | Dataset root path                                 |
 | `DESIGN_DATA_COMPONENTS` | —             | Override components directory                     |
@@ -74,8 +74,9 @@ node tools/design-data-agent-mcp/src/index.js
 >    `packages/design-data`; when published it uses the installed dependency. This
 >    is independent of the working directory.
 > 3. **Fallback.** `dataPath` falls back to the (anchored) current directory; the
->    component/field overrides fall back to the `design-data` binary's own
->    discovery (including its embedded snapshot).
+>    component/field overrides fall back to `null` (not supplied), which means
+>    `describe_component` will throw an error if `@adobe/spectrum-design-data` is
+>    not resolvable.
 >
 > In a monorepo checkout you typically need no `DESIGN_DATA_*` env vars at all —
 > resolution via the workspace package handles it.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adobe/design-data-agent-mcp",
-  "version": "1.5.0",
-  "description": "MCP server and Claude Code skill for the design-data agent surface — shells out to the design-data CLI",
+  "version": "1.6.1",
+  "description": "MCP server and Claude Code skill for the design-data agent surface — read tools run in-process via wasm",
   "type": "module",
   "main": "./src/index.js",
   "bin": {
@@ -30,8 +30,8 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.27.1",
-    "@adobe/design-data": "2.0.0",
-    "@adobe/design-data-wasm": "0.1.0",
+    "@adobe/design-data": "2.0.1",
+    "@adobe/design-data-wasm": "0.2.0",
     "@adobe/spectrum-design-data": "0.3.0"
   },
   "devDependencies": {

package/src/tools/read.js

@@ -11,19 +11,54 @@
 /**
  * Read tools for design-data-agent-mcp.
  *
- * query_tokens and resolve_token use @adobe/design-data (loadDataset) + the
- * wasm Dataset to run in-process without spawning the CLI binary.
+ * All read tools run fully in-process via @adobe/design-data-wasm — no CLI binary
+ * required. primer and describe_component were migrated in issue m1r.
  *
- * primer and describe_component still invoke the CLI: primer aggregates complex
- * catalog metadata (components, fields) not yet on the wasm surface, and
- * describe_component requires the components catalog path resolution that the CLI
- * handles. These will be ported when those APIs are added to the wasm surface.
+ * Note: authoring_session_step_intent in authoring.js still uses the CLI because
+ * the NLP suggest ranking is not yet on the wasm surface.
  */
 
+import { readFileSync, existsSync, readdirSync } from "fs";
+import { join } from "path";
 import { loadDataset } from "@adobe/design-data/load";
-import { runCli } from "../cli.js";
 import { config } from "../config.js";
 
+let _wasm;
+/** Lazy-load and cache the wasm module (nodejs target, no init() required). */
+async function getWasm() {
+  if (!_wasm) _wasm = await import("@adobe/design-data-wasm");
+  return _wasm;
+}
+
+let _dataset;
+/**
+ * Return the embedded Spectrum dataset, caching it after first access.
+ *
+ * Dataset.embedded() clones the in-memory graph on every call; caching here
+ * avoids that per-request cost.
+ */
+async function getDataset() {
+  if (!_dataset) {
+    const wasm = await getWasm();
+    _dataset = wasm.Dataset.embedded();
+  }
+  return _dataset;
+}
+
+/**
+ * Validate a component ID against the same rule as the Rust SDK.
+ * See sdk/core/src/component.rs:validate_id — prevents path traversal.
+ */
+const COMPONENT_ID_RE = /^[a-z][a-z0-9-]*$/;
+function validateComponentId(id) {
+  if (!COMPONENT_ID_RE.test(id)) {
+    throw new Error(
+      `Invalid component ID "${id}". IDs must be kebab-case: start with a lowercase ` +
+        `letter and contain only lowercase letters, digits, and hyphens.`,
+    );
+  }
+}
+
 export function createReadTools() {
   return [
     {
@@ -36,14 +71,31 @@ export function createReadTools() {
         additionalProperties: false,
       },
       async handler() {
-        const args = ["primer", config.dataPath, "--format", "json"];
-        if (config.componentsDir)
-          args.push("--components-dir", config.componentsDir);
-        if (config.fieldsDir) args.push("--fields-dir", config.fieldsDir);
-        const { exitCode, stdout, stderr } = await runCli(args);
-        if (exitCode !== 0)
-          throw new Error(stderr || `primer exited ${exitCode}`);
-        return JSON.parse(stdout);
+        // Shape note: this response intentionally diverges from the CLI PrimerData
+        // struct (sdk/core/src/primer.rs). The CLI emits modeSets as an array of
+        // {name, values} objects and taxonomyFields as a flat array. This in-process
+        // shape uses keyed objects (matching the sibling design-data-mcp), which agents
+        // and the SKILL.md skill prompt consume by key name. Skill contract:
+        // tokenCount, modeSets.{colorScheme,scale,contrast}, components[],
+        // taxonomyFields.{indexed,advisory}. CLI-only fields (specVersion, manifest,
+        // provenance) are not present — no SKILL.md reference or consumer relies on them.
+        const wasm = await getWasm();
+        const ds = await getDataset();
+        return {
+          source: "embedded",
+          tokenCount: ds.tokenCount(),
+          modeSets: {
+            colorScheme: wasm.getFieldValues("colorScheme") ?? [],
+            scale: wasm.getFieldValues("scale") ?? [],
+            contrast: wasm.getFieldValues("contrast") ?? [],
+          },
+          taxonomyFields: {
+            indexed: wasm.getIndexedFields(),
+            advisory: wasm.getAdvisoryFields() ?? [],
+          },
+          components: wasm.getFieldValues("component") ?? [],
+          properties: wasm.getFieldValues("property") ?? [],
+        };
       },
     },
 
@@ -127,13 +179,32 @@ export function createReadTools() {
         additionalProperties: false,
       },
       async handler({ id }) {
-        const args = ["component", id];
-        if (config.componentsDir)
-          args.push("--components-dir", config.componentsDir);
-        const { exitCode, stdout, stderr } = await runCli(args);
-        if (exitCode !== 0)
-          throw new Error(stderr || `component exited ${exitCode}`);
-        return JSON.parse(stdout);
+        validateComponentId(id);
+        const componentsDir = config.componentsDir;
+        if (!componentsDir) {
+          throw new Error(
+            `@adobe/spectrum-design-data is not installed — cannot load component "${id}". ` +
+              `Install it with: pnpm add @adobe/spectrum-design-data`,
+          );
+        }
+        const componentFile = join(componentsDir, `${id}.json`);
+        if (!existsSync(componentFile)) {
+          let available;
+          try {
+            available = readdirSync(componentsDir)
+              .filter((f) => f.endsWith(".json"))
+              .map((f) => f.replace(/\.json$/, ""))
+              .sort()
+              .join(", ");
+          } catch {
+            available = null;
+          }
+          const hint = available
+            ? `Available components: ${available}`
+            : `Call primer to see available component IDs.`;
+          throw new Error(`Component not found: "${id}". ${hint}`);
+        }
+        return JSON.parse(readFileSync(componentFile, "utf-8"));
       },
     },
   ];