@salesforce/graphiti 10.20.1 → 10.21.0

package/dist/mcp/tools/sf-gql-create.js.map

@@ -1 +1 @@
-{"version":3,"file":"sf-gql-create.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-create.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAM9D,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC;AAEvC,MAAM,UAAU,uBAAuB,CACtC,MAAiB,EACjB,OAA+B,EAAE;IAEjC,MAAM,CAAC,YAAY,CAClB,eAAe,EACf;QACC,WAAW,EACV,4QAA4Q;QAC7Q,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;QACd,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACvD,OAAO;YACN,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;SACzD,CAAC;IACH,CAAC,CACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"sf-gql-create.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-create.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAMxD,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC;AAEvC,MAAM,UAAU,uBAAuB,CACtC,MAAiB,EACjB,OAA+B,EAAE;IAEjC,MAAM,CAAC,YAAY,CAClB,eAAe,EACf;QACC,WAAW,EACV,4QAA4Q;QAC7Q,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAChE,CAAC;AACH,CAAC"}

package/dist/mcp/tools/sf-gql-delete.js

@@ -5,16 +5,12 @@
  */
 import { buildDelete } from "../../intent/build-delete.js";
 import { DELETE_INPUT } from "../../schemas/input-schemas.js";
+import { runTool } from "../../schemas/tool-adapter.js";
 const inputSchema = DELETE_INPUT.shape;
 export function registerSfGqlDeleteTool(server, opts = {}) {
     server.registerTool("sf_gql_delete", {
         description: "Build a UIAPI delete mutation against a Salesforce org. Declares a typed input variable ($input: RecordDeleteInput!) and selects Id on the deleted record. The input type is schema-wide (not <Object>-specific) and the result is Id only. Returns rendered GraphQL, declared variables, generated TypeScript types, and validation warnings.",
         inputSchema,
-    }, async (args) => {
-        const output = await buildDelete(args, opts.primeDeps);
-        return {
-            content: [{ type: "text", text: JSON.stringify(output) }],
-        };
-    });
+    }, async (args) => runTool(() => buildDelete(args, opts.primeDeps)));
 }
 //# sourceMappingURL=sf-gql-delete.js.map

package/dist/mcp/tools/sf-gql-delete.js.map

@@ -1 +1 @@
-{"version":3,"file":"sf-gql-delete.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-delete.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAM9D,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC;AAEvC,MAAM,UAAU,uBAAuB,CACtC,MAAiB,EACjB,OAA+B,EAAE;IAEjC,MAAM,CAAC,YAAY,CAClB,eAAe,EACf;QACC,WAAW,EACV,gVAAgV;QACjV,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;QACd,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACvD,OAAO;YACN,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;SACzD,CAAC;IACH,CAAC,CACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"sf-gql-delete.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-delete.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAMxD,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC;AAEvC,MAAM,UAAU,uBAAuB,CACtC,MAAiB,EACjB,OAA+B,EAAE;IAEjC,MAAM,CAAC,YAAY,CAClB,eAAe,EACf;QACC,WAAW,EACV,gVAAgV;QACjV,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAChE,CAAC;AACH,CAAC"}

package/dist/mcp/tools/sf-gql-detail.js

@@ -5,6 +5,7 @@
  */
 import { buildDetail } from "../../intent/build-detail.js";
 import { DETAIL_INPUT } from "../../schemas/input-schemas.js";
+import { runTool } from "../../schemas/tool-adapter.js";
 const inputSchema = DETAIL_INPUT;
 export function registerSfGqlDetailTool(server, opts = {}) {
     server.registerTool("sf_gql_detail", {
@@ -20,11 +21,6 @@ export function registerSfGqlDetailTool(server, opts = {}) {
             '  - With child relationships and a custom id variable name: { org: "ebikes", object: "Account", fields: ["Id"], idVariable: "accountId", childRelationships: [{ relationshipName: "Contacts", fields: ["LastName"], first: 5 }] }',
         ].join("\n"),
         inputSchema,
-    }, async (args) => {
-        const output = await buildDetail(args, opts.primeDeps);
-        return {
-            content: [{ type: "text", text: JSON.stringify(output) }],
-        };
-    });
+    }, async (args) => runTool(() => buildDetail(args, opts.primeDeps)));
 }
 //# sourceMappingURL=sf-gql-detail.js.map

package/dist/mcp/tools/sf-gql-detail.js.map

@@ -1 +1 @@
-{"version":3,"file":"sf-gql-detail.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-detail.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAM9D,MAAM,WAAW,GAAG,YAAY,CAAC;AAEjC,MAAM,UAAU,uBAAuB,CACtC,MAAiB,EACjB,OAA+B,EAAE;IAEjC,MAAM,CAAC,YAAY,CAClB,eAAe,EACf;QACC,WAAW,EAAE;YACZ,iGAAiG;YACjG,kKAAkK;YAClK,sGAAsG;YACtG,kFAAkF;YAClF,EAAE;YACF,WAAW;YACX,uFAAuF;YACvF,oIAAoI;YACpI,mOAAmO;SACnO,CAAC,IAAI,CAAC,IAAI,CAAC;QACZ,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;QACd,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACvD,OAAO;YACN,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;SACzD,CAAC;IACH,CAAC,CACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"sf-gql-detail.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-detail.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAMxD,MAAM,WAAW,GAAG,YAAY,CAAC;AAEjC,MAAM,UAAU,uBAAuB,CACtC,MAAiB,EACjB,OAA+B,EAAE;IAEjC,MAAM,CAAC,YAAY,CAClB,eAAe,EACf;QACC,WAAW,EAAE;YACZ,iGAAiG;YACjG,kKAAkK;YAClK,sGAAsG;YACtG,kFAAkF;YAClF,EAAE;YACF,WAAW;YACX,uFAAuF;YACvF,oIAAoI;YACpI,mOAAmO;SACnO,CAAC,IAAI,CAAC,IAAI,CAAC;QACZ,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAChE,CAAC;AACH,CAAC"}

package/dist/mcp/tools/sf-gql-discover.js

@@ -5,16 +5,12 @@
  */
 import { buildDiscover } from "../../intent/build-discover.js";
 import { DISCOVER_INPUT } from "../../schemas/input-schemas.js";
+import { runTool } from "../../schemas/tool-adapter.js";
 const inputSchema = DISCOVER_INPUT.shape;
 export function registerSfGqlDiscoverTool(server, opts = {}) {
     server.registerTool("sf_gql_discover", {
         description: "Discover Salesforce UIAPI schema metadata: list queryable SObjects, describe an object's fields/picklists/child relationships, or describe a single field. Returns mode-specific metadata (not the standard ToolOutput envelope).",
         inputSchema,
-    }, async (args) => {
-        const output = await buildDiscover(args, opts);
-        return {
-            content: [{ type: "text", text: JSON.stringify(output) }],
-        };
-    });
+    }, async (args) => runTool(() => buildDiscover(args, opts)));
 }
 //# sourceMappingURL=sf-gql-discover.js.map

package/dist/mcp/tools/sf-gql-discover.js.map

@@ -1 +1 @@
-{"version":3,"file":"sf-gql-discover.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-discover.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,aAAa,EAAqB,MAAM,gCAAgC,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAIhE,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC;AAEzC,MAAM,UAAU,yBAAyB,CACxC,MAAiB,EACjB,OAAiC,EAAE;IAEnC,MAAM,CAAC,YAAY,CAClB,iBAAiB,EACjB;QACC,WAAW,EACV,mOAAmO;QACpO,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;QACd,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/C,OAAO;YACN,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;SACzD,CAAC;IACH,CAAC,CACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"sf-gql-discover.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-discover.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,aAAa,EAAqB,MAAM,gCAAgC,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAIxD,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC;AAEzC,MAAM,UAAU,yBAAyB,CACxC,MAAiB,EACjB,OAAiC,EAAE;IAEnC,MAAM,CAAC,YAAY,CAClB,iBAAiB,EACjB;QACC,WAAW,EACV,mOAAmO;QACpO,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CACxD,CAAC;AACH,CAAC"}

package/dist/mcp/tools/sf-gql-list.js

@@ -5,16 +5,12 @@
  */
 import { buildList } from "../../intent/build-list.js";
 import { LIST_INPUT } from "../../schemas/input-schemas.js";
+import { runTool } from "../../schemas/tool-adapter.js";
 const inputSchema = LIST_INPUT.shape;
 export function registerSfGqlListTool(server, opts = {}) {
     server.registerTool("sf_gql_list", {
         description: "Build a UIAPI list query against a Salesforce org. Returns rendered GraphQL, declared variables, generated TypeScript types, and validation warnings.",
         inputSchema,
-    }, async (args) => {
-        const output = await buildList(args, opts.primeDeps);
-        return {
-            content: [{ type: "text", text: JSON.stringify(output) }],
-        };
-    });
+    }, async (args) => runTool(() => buildList(args, opts.primeDeps)));
 }
 //# sourceMappingURL=sf-gql-list.js.map

package/dist/mcp/tools/sf-gql-list.js.map

@@ -1 +1 @@
-{"version":3,"file":"sf-gql-list.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-list.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAM5D,MAAM,WAAW,GAAG,UAAU,CAAC,KAAK,CAAC;AAErC,MAAM,UAAU,qBAAqB,CAAC,MAAiB,EAAE,OAA6B,EAAE;IACvF,MAAM,CAAC,YAAY,CAClB,aAAa,EACb;QACC,WAAW,EACV,uJAAuJ;QACxJ,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;QACd,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACrD,OAAO;YACN,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;SACzD,CAAC;IACH,CAAC,CACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"sf-gql-list.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-list.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAMxD,MAAM,WAAW,GAAG,UAAU,CAAC,KAAK,CAAC;AAErC,MAAM,UAAU,qBAAqB,CAAC,MAAiB,EAAE,OAA6B,EAAE;IACvF,MAAM,CAAC,YAAY,CAClB,aAAa,EACb;QACC,WAAW,EACV,uJAAuJ;QACxJ,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAC9D,CAAC;AACH,CAAC"}

package/dist/mcp/tools/sf-gql-raw.js

@@ -5,16 +5,12 @@
  */
 import { buildRaw } from "../../intent/build-raw.js";
 import { RAW_INPUT } from "../../schemas/input-schemas.js";
+import { runTool } from "../../schemas/tool-adapter.js";
 const inputSchema = RAW_INPUT.shape;
 export function registerSfGqlRawTool(server, opts = {}) {
     server.registerTool("sf_gql_raw", {
         description: "Low-level escape hatch: build an arbitrary UIAPI query, mutation, or aggregate from CLI-style commands (select/set/var) when the typed tools don't model the case (cross-union selections, custom mutations). Returns rendered GraphQL, declared variables, generated TypeScript types, and validation warnings. Fails fast on a bad command.",
         inputSchema,
-    }, async (args) => {
-        const output = await buildRaw(args, opts.primeDeps);
-        return {
-            content: [{ type: "text", text: JSON.stringify(output) }],
-        };
-    });
+    }, async (args) => runTool(() => buildRaw(args, opts.primeDeps)));
 }
 //# sourceMappingURL=sf-gql-raw.js.map

package/dist/mcp/tools/sf-gql-raw.js.map

@@ -1 +1 @@
-{"version":3,"file":"sf-gql-raw.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-raw.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAM3D,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC;AAEpC,MAAM,UAAU,oBAAoB,CAAC,MAAiB,EAAE,OAA4B,EAAE;IACrF,MAAM,CAAC,YAAY,CAClB,YAAY,EACZ;QACC,WAAW,EACV,+UAA+U;QAChV,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;QACd,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACpD,OAAO;YACN,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;SACzD,CAAC;IACH,CAAC,CACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"sf-gql-raw.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-raw.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAMxD,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC;AAEpC,MAAM,UAAU,oBAAoB,CAAC,MAAiB,EAAE,OAA4B,EAAE;IACrF,MAAM,CAAC,YAAY,CAClB,YAAY,EACZ;QACC,WAAW,EACV,+UAA+U;QAChV,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAC7D,CAAC;AACH,CAAC"}

package/dist/mcp/tools/sf-gql-update.js

@@ -5,16 +5,12 @@
  */
 import { buildUpdate } from "../../intent/build-update.js";
 import { UPDATE_INPUT } from "../../schemas/input-schemas.js";
+import { runTool } from "../../schemas/tool-adapter.js";
 const inputSchema = UPDATE_INPUT.shape;
 export function registerSfGqlUpdateTool(server, opts = {}) {
     server.registerTool("sf_gql_update", {
         description: "Build a UIAPI update mutation against a Salesforce org. Declares a typed input variable ($input: <Object>UpdateInput!) and selects return fields on the updated record. Returns rendered GraphQL, declared variables, generated TypeScript types, and validation warnings.",
         inputSchema,
-    }, async (args) => {
-        const output = await buildUpdate(args, opts.primeDeps);
-        return {
-            content: [{ type: "text", text: JSON.stringify(output) }],
-        };
-    });
+    }, async (args) => runTool(() => buildUpdate(args, opts.primeDeps)));
 }
 //# sourceMappingURL=sf-gql-update.js.map

package/dist/mcp/tools/sf-gql-update.js.map

@@ -1 +1 @@
-{"version":3,"file":"sf-gql-update.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-update.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAM9D,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC;AAEvC,MAAM,UAAU,uBAAuB,CACtC,MAAiB,EACjB,OAA+B,EAAE;IAEjC,MAAM,CAAC,YAAY,CAClB,eAAe,EACf;QACC,WAAW,EACV,4QAA4Q;QAC7Q,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;QACd,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACvD,OAAO;YACN,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;SACzD,CAAC;IACH,CAAC,CACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"sf-gql-update.js","sourceRoot":"","sources":["../../../src/mcp/tools/sf-gql-update.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAMxD,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC;AAEvC,MAAM,UAAU,uBAAuB,CACtC,MAAiB,EACjB,OAA+B,EAAE;IAEjC,MAAM,CAAC,YAAY,CAClB,eAAe,EACf;QACC,WAAW,EACV,4QAA4Q;QAC7Q,WAAW;KACX,EACD,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAChE,CAAC;AACH,CAAC"}

package/dist/schemas/tool-adapter.d.ts

@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) 2026, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+/**
+ * Shared MCP tool adapter (W-22697673). Wraps an intent invocation so that any
+ * throw becomes a sanitized, category-prefixed error envelope instead of leaking
+ * a raw stack/file path to the MCP host. Categories (message prefix):
+ *  - `UserInput:` — bad agent input / spec violations (FR-8.3/8.4, GraphQL Name,
+ *                   walker navigation).
+ *  - `Auth:`      — credential resolution failures.
+ *  - `Schema:`    — introspection / priming / schema-build failures.
+ *  - `Internal:`  — everything else; message + a truncated stack (the full error
+ *                   is logged to stderr, off the stdio channel).
+ *
+ * Auth/Schema/UserInput are carried by typed markers (AuthError, SchemaError,
+ * SchemaRefreshError, UserInputError, MutationContextError) classified by
+ * `instanceof`; the message-shape heuristics below are a secondary fallback for
+ * untyped throws. The sanitized message is returned for EVERY category — not
+ * just Internal — because typed Auth/Schema errors embed cache/lock paths and
+ * wrapped jsforce/@salesforce/core causes embed `~/.sfdx/...` paths.
+ */
+export type ErrorCategory = "UserInput" | "Auth" | "Schema" | "Internal";
+interface ToolTextResult {
+    [key: string]: unknown;
+    content: {
+        type: "text";
+        text: string;
+    }[];
+    isError?: boolean;
+}
+/**
+ * Markers substituted for redacted local paths. Exported as the single source of
+ * truth so tests assert against these constants instead of re-typing the literals
+ * (closes the drift between the sanitizer and its tests).
+ */
+export declare const PATH_MARKERS: {
+    readonly schemaCache: "<schema-cache>";
+    readonly graphitiHome: "<graphiti-home>";
+    readonly home: "~";
+    readonly redacted: "<path>";
+};
+/** Classify a thrown error into a category + sanitized message text. */
+export declare function classifyError(e: unknown): {
+    category: ErrorCategory;
+    text: string;
+};
+/**
+ * Run an MCP tool's intent invocation. Returns the success envelope
+ * (`JSON.stringify(output)`) or a category-prefixed `{ isError: true }` envelope.
+ * Internal (unexpected) errors are additionally logged in full to stderr, which
+ * is separate from the stdio JSON-RPC channel, so operators keep the real stack.
+ */
+export declare function runTool(fn: () => Promise<unknown>): Promise<ToolTextResult>;
+export {};

package/dist/schemas/tool-adapter.js

@@ -0,0 +1,129 @@
+/**
+ * Copyright (c) 2026, Salesforce, Inc.,
+ * All rights reserved.
+ * For full license text, see the LICENSE.txt file
+ */
+import os from "node:os";
+import { AuthError, SchemaError, UserInputError } from "../lib/errors.js";
+import { graphitiHome, schemaDir } from "../lib/introspect.js";
+import { SchemaRefreshError } from "../lib/prime-schema.js";
+import { MutationContextError } from "../lib/walker.js";
+// UserInput failures thrown by the intent/lib layer that aren't already carried
+// by a typed error. Each alternative is anchored to (or contextualized by) the
+// actual emitting message so a generic Node/library error does NOT get
+// mislabeled UserInput (which would also hide it from the Internal stderr log).
+// New UserInput sites should prefer throwing `UserInputError` over extending this.
+const USER_INPUT_RE = /(^build[A-Z]\w*:|^sf_gql_discover |^command \d+ \(|^empty command\b|^unknown command\b|^(?:select|set|var)\b.*\brequires\b|^set: usage is|is not a valid GraphQL Name|not found on (?:type|input type|field|any member of union)|not found on "|not found in schema|Cannot select field|Cannot apply an inline fragment|Cannot navigate into|Cannot index into non-list type|^Argument "|Empty field name|not supported in v1|Invalid org alias or username)/;
+// Defensive fallbacks in case a schema/auth failure ever reaches the adapter
+// untyped (the typed AuthError/SchemaError markers are the primary signal).
+const SCHEMA_RE = /(No cached schema|Introspection query|Schema has no |did not return a __schema|Schema priming)/;
+const AUTH_RE = /(Failed to get org info|Missing accessToken or instanceUrl|sf org login)/;
+/**
+ * Markers substituted for redacted local paths. Exported as the single source of
+ * truth so tests assert against these constants instead of re-typing the literals
+ * (closes the drift between the sanitizer and its tests).
+ */
+export const PATH_MARKERS = {
+    schemaCache: "<schema-cache>",
+    graphitiHome: "<graphiti-home>",
+    home: "~",
+    redacted: "<path>",
+};
+// Unicode line separators (U+2028/U+2029) are legal in JSON strings but are NOT
+// escaped by JSON.stringify; left raw in `content.text` they trip a Claude.AI 408
+// timeout (MCP TS SDK #2155). Strip them from every host-visible envelope.
+const LINE_SEPARATOR_RE = /[\u2028\u2029]/g;
+function stripLineSeparators(s) {
+    return s.replace(LINE_SEPARATOR_RE, "");
+}
+/**
+ * Redact local filesystem layout from error text so the MCP host never sees the
+ * developer's home dir, OS username, repo checkout location, or schema-cache
+ * path (W-22697673 info-disclosure). Applied to every category's message.
+ */
+function sanitizePaths(s) {
+    let out = stripLineSeparators(s).replace(/file:\/\//g, "");
+    // 1) Repo-internal: drop any absolute prefix before packages/ or node_modules/
+    //    so a frame relativizes to `packages/graphiti/...` regardless of checkout.
+    out = out.replace(/(?:\/[^\s/]+)+\/(?=packages\/|node_modules\/)/g, "");
+    // 2) Relativize known graphiti roots to stable, non-sensitive markers. Longest
+    //    first: schemaDir() is under graphitiHome() is (usually) under homedir().
+    //    Relativizing against schemaDir()/graphitiHome() — not just homedir() —
+    //    closes the leak when GRAPHITI_HOME lives outside the home dir (CI/shared mounts).
+    const roots = [
+        [schemaDir(), PATH_MARKERS.schemaCache],
+        [graphitiHome(), PATH_MARKERS.graphitiHome],
+        [os.homedir(), PATH_MARKERS.home],
+    ]
+        .filter(([root]) => root.length > 1)
+        .sort((a, b) => b[0].length - a[0].length);
+    for (const [root, marker] of roots)
+        out = out.split(root).join(marker);
+    // 3) Redact any remaining absolute path (POSIX or Windows) at a token boundary
+    //    — /tmp, /var/folders, a foreign user's home, etc. The leading-boundary
+    //    guard avoids mangling URLs, whose path follows a non-boundary char (":"/host).
+    out = out.replace(/(^|[\s("'=])(?:[A-Za-z]:)?(?:[/\\][^\s:)"',\\]+){2,}/g, (_m, pre) => `${pre}${PATH_MARKERS.redacted}`);
+    return out;
+}
+function truncatedStack(e) {
+    if (!(e instanceof Error) || !e.stack)
+        return [];
+    return e.stack
+        .split("\n")
+        .slice(1, 4) // first ~3 frames after the message line
+        .map((line) => sanitizePaths(line.trim()));
+}
+function categoryOf(e, message) {
+    if (e instanceof SchemaRefreshError || e instanceof SchemaError)
+        return "Schema";
+    if (e instanceof AuthError)
+        return "Auth";
+    if (e instanceof UserInputError || e instanceof MutationContextError)
+        return "UserInput";
+    if (USER_INPUT_RE.test(message))
+        return "UserInput";
+    if (AUTH_RE.test(message))
+        return "Auth";
+    if (SCHEMA_RE.test(message))
+        return "Schema";
+    return "Internal";
+}
+/** Classify a thrown error into a category + sanitized message text. */
+export function classifyError(e) {
+    const message = e instanceof Error ? e.message : String(e);
+    const category = categoryOf(e, message);
+    const safeMessage = sanitizePaths(message);
+    if (category !== "Internal")
+        return { category, text: safeMessage };
+    // Internal: unexpected. Attach a truncated, path-stripped stack for the host.
+    const frames = truncatedStack(e);
+    const text = frames.length
+        ? `${safeMessage}\n${frames.map((f) => `  ${f}`).join("\n")}`
+        : safeMessage;
+    return { category, text };
+}
+/**
+ * Run an MCP tool's intent invocation. Returns the success envelope
+ * (`JSON.stringify(output)`) or a category-prefixed `{ isError: true }` envelope.
+ * Internal (unexpected) errors are additionally logged in full to stderr, which
+ * is separate from the stdio JSON-RPC channel, so operators keep the real stack.
+ */
+export async function runTool(fn) {
+    try {
+        const output = await fn();
+        // Strip U+2028/2029 from the success envelope too: codegen/GraphQL output can
+        // carry them and JSON.stringify won't escape them (MCP TS SDK #2155).
+        return { content: [{ type: "text", text: stripLineSeparators(JSON.stringify(output)) }] };
+    }
+    catch (e) {
+        const { category, text } = classifyError(e);
+        if (category === "Internal") {
+            console.error("[graphiti-mcp] Internal tool error:", e);
+        }
+        return {
+            isError: true,
+            content: [{ type: "text", text: stripLineSeparators(`${category}: ${text}`) }],
+        };
+    }
+}
+//# sourceMappingURL=tool-adapter.js.map

package/dist/schemas/tool-adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-adapter.js","sourceRoot":"","sources":["../../src/schemas/tool-adapter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/graphiti",
-  "version": "10.20.1",
+  "version": "10.21.0",
   "description": "Progressive GraphQL query builder CLI for Salesforce orgs",
   "license": "SEE LICENSE IN LICENSE.txt",
   "type": "module",

package/src/commands/args.ts

@@ -210,6 +210,27 @@ export function queryDefine(sessionId: string, rest: string[]): void {
 	throw new CommandError("Usage: define $name <path> [default]\n  e.g. define $filter @args/where");
 }
 
+/**
+ * Declare a variable, or throw a CommandError if it collides with an existing
+ * declaration of a different type (first-wins). Single-sources the collision
+ * message for the two `define` entry points so they can't drift. The
+ * variable-promotion path intentionally warns instead of throwing and does not
+ * use this helper.
+ */
+function addVariableOrThrow(
+	session: QuerySession,
+	cleanName: string,
+	type: string,
+	defaultValue?: string,
+): void {
+	const collision = addVariable(session, cleanName, type, defaultValue);
+	if (collision) {
+		throw new CommandError(
+			`$${cleanName} is already declared as ${collision.existingType}; cannot redefine it as ${collision.ignoredType}. Use a different variable name, or \`undo\` the earlier definition first.`,
+		);
+	}
+}
+
 function defineFromCurrentArgsPosition(session: QuerySession, cleanName: string): void {
 	const schema = getSessionSchema(session);
 	const fieldSchemaPath = getArgsFieldPath(session.navigationPath);
@@ -227,7 +248,7 @@ function defineFromCurrentArgsPosition(session: QuerySession, cleanName: string)
 		fieldSchemaPath,
 		inputSubPath,
 	);
-	addVariable(session, cleanName, inferredType);
+	addVariableOrThrow(session, cleanName, inferredType);
 	deepSetArg(session, fieldSchemaPath, argName, argInputPath, `$${cleanName}`);
 
 	const pathDesc = inputSubPath.join(".");
@@ -296,7 +317,7 @@ export function defineAtPath(
 		fieldSchemaPath,
 		inputSubPath,
 	);
-	addVariable(session, cleanName, inferredType, defaultValue);
+	addVariableOrThrow(session, cleanName, inferredType, defaultValue);
 	deepSetArg(session, fieldSchemaPath, argName, argInputPath, `$${cleanName}`);
 
 	const pathDesc = inputSubPath.join(".");

package/src/intent/__tests__/build-aggregate.spec.ts

@@ -795,6 +795,70 @@ describe("intent/build-aggregate", () => {
 		expect(out.warnings.some((w) => w.startsWith("Variable:") && w.includes("$1var"))).toBe(true);
 	});
 
+	// GAP 1 (W-22697670) — the same `$x` referenced under two filter fields of
+	// differing GraphQL types infers two different types. `addVariable` keeps
+	// the first-declared type (first-wins) and reports the conflict, which
+	// `buildAggregate` threads into `warnings`. Account_Filter.Industry is a
+	// PicklistOperators (String operands) and Account_Filter.AnnualRevenue is a
+	// DoubleOperators (Float operands), so `$x` is inferred as String then Float.
+	it("type collision on a reused $var keeps first type and surfaces a warning (GAP 1)", async () => {
+		const out = await buildAggregate(
+			{
+				org: ORG,
+				object: "Account",
+				groupBy: [],
+				aggregations: [{ function: "count" }],
+				filter: { Industry: { eq: "$x" }, AnnualRevenue: { gt: "$x" } },
+			},
+			noopPrimeDeps(),
+		);
+
+		// A collision warning naming $x is surfaced (not silently dropped).
+		expect(
+			out.warnings.some(
+				(w) =>
+					w.startsWith("Variable:") &&
+					w.includes("type collision for $x") &&
+					w.includes("String") &&
+					w.includes("Float"),
+			),
+		).toBe(true);
+
+		// First-wins: $x is declared exactly once, with the first-inferred type (String).
+		const declarations = out.query.match(/\$x\s*:/g) ?? [];
+		expect(declarations).toHaveLength(1);
+		expect(out.query).toMatch(/\$x\s*:\s*String/);
+		expect(out.query).not.toMatch(/\$x\s*:\s*Float/);
+
+		// Both references still render as the bare variable in the where arg.
+		expect(out.query).toMatch(/Industry\s*:\s*\{\s*eq\s*:\s*\$x\s*\}/s);
+		expect(out.query).toMatch(/AnnualRevenue\s*:\s*\{\s*gt\s*:\s*\$x\s*\}/s);
+	});
+
+	// C1 (W-22697670): a filter reusing the reserved cursor variable $after must keep
+	// its String type (first-wins) so pagination stays valid, and surface a collision
+	// warning — regression guard for the addVariable("after") ordering in buildAggregate.
+	it("a filter reusing $after keeps String (first-wins) and warns", async () => {
+		const out = await buildAggregate(
+			{
+				org: ORG,
+				object: "Account",
+				groupBy: [],
+				aggregations: [{ function: "count" }],
+				filter: { AnnualRevenue: { gt: "$after" } },
+			},
+			noopPrimeDeps(),
+		);
+		// $after stays String (not overwritten to the filter's Float), so pagination is valid.
+		expect(out.query).toMatch(/\$after\s*:\s*String/);
+		expect(out.query).not.toMatch(/\$after\s*:\s*Float/);
+		expect(
+			out.warnings.some(
+				(w) => w.startsWith("Variable:") && w.includes("type collision for $after"),
+			),
+		).toBe(true);
+	});
+
 	// FR-10.2 + FR-10.5: picklist `min`/`max` must emit the picklist literal
 	// union under each aggregator wrapper, not `string | null`. Documented as
 	// e2e Gap 4 — `tryEnrichPicklist` previously bailed when it found

package/src/intent/__tests__/build-list.spec.ts

@@ -28,12 +28,13 @@ const SCHEMA_SDL = `
 	enum Scope { MINE EVERYTHING }
 	enum Order { ASC DESC }
 
-	input Account_Filter { Industry: PicklistOperators, Name: StringOperators }
+	input Account_Filter { Industry: PicklistOperators, Name: StringOperators, AnnualRevenue: DoubleOperators }
 	input Account_OrderBy { Name: OrderByClause, Industry: OrderByClause }
 	input Case_Filter { Status: PicklistOperators, Priority: PicklistOperators }
 	input Case_OrderBy { CreatedDate: OrderByClause }
 	input PicklistOperators { eq: String, ne: String, in: [String!] }
 	input StringOperators { eq: String, like: String }
+	input DoubleOperators { eq: Float, gt: Float, lt: Float }
 	input OrderByClause { order: Order!, nulls: NullsOrder }
 	enum NullsOrder { FIRST LAST }
 
@@ -67,7 +68,7 @@ const SCHEMA_SDL = `
 
 	type ContactConnection { edges: [ContactEdge!]! }
 	type ContactEdge { node: Contact! }
-	input Contact_Filter { Title: StringOperators }
+	input Contact_Filter { Title: StringOperators, Rank: DoubleOperators }
 	input Contact_OrderBy { LastName: OrderByClause }
 
 	type Contact {
@@ -298,4 +299,116 @@ describe("intent/build-list", () => {
 		await buildList({ org: ORG, object: "Case", fields: ["Id"] }, noopPrimeDeps());
 		expect(spy).toHaveBeenCalledWith(ORG, "query", ORG_URL);
 	});
+
+	// GAP 1 (W-22697670) — the same `$x` referenced under two filter fields of
+	// differing GraphQL types infers two different types. `addVariable` keeps the
+	// first-declared type (first-wins) and reports the conflict, which `buildList`
+	// now threads into `warnings`. Account_Filter.Name is a StringOperators (String
+	// operands) and Account_Filter.AnnualRevenue is a DoubleOperators (Float
+	// operands), so `$x` is inferred as String then Float.
+	it("type collision on a reused $var keeps first type and surfaces a warning (GAP 1)", async () => {
+		const out = await buildList(
+			{
+				org: ORG,
+				object: "Account",
+				fields: ["Id"],
+				filter: { Name: { eq: "$x" }, AnnualRevenue: { gt: "$x" } },
+			},
+			noopPrimeDeps(),
+		);
+
+		// A collision warning naming $x is surfaced (not silently dropped). This
+		// also proves buildList now threads `warnings` through promoteVariables.
+		expect(
+			out.warnings.some(
+				(w) =>
+					w.startsWith("Variable:") &&
+					w.includes("type collision for $x") &&
+					w.includes("String") &&
+					w.includes("Float"),
+			),
+		).toBe(true);
+
+		// First-wins: $x is declared exactly once, with the first-inferred type (String).
+		const declarations = out.query.match(/\$x\s*:/g) ?? [];
+		expect(declarations).toHaveLength(1);
+		expect(out.query).toMatch(/\$x\s*:\s*String/);
+		expect(out.query).not.toMatch(/\$x\s*:\s*Float/);
+
+		// Both references still render as the bare variable in the where arg.
+		expect(out.query).toMatch(/Name\s*:\s*\{\s*eq\s*:\s*\$x\s*\}/s);
+		expect(out.query).toMatch(/AnnualRevenue\s*:\s*\{\s*gt\s*:\s*\$x\s*\}/s);
+	});
+
+	// GAP 2 (W-22697670) — a `$`-prefixed string whose remainder is not a valid
+	// GraphQL Name (e.g. `$1var`) is not a real variable placeholder. It must NOT
+	// be promoted nor rendered as a bare `$1var`; it is quoted as a literal and a
+	// `Variable:` warning is surfaced so the typo is not silently swallowed.
+	it("invalid $-placeholder renders as a quoted literal and surfaces a warning (GAP 2)", async () => {
+		const out = await buildList(
+			{
+				org: ORG,
+				object: "Account",
+				fields: ["Id"],
+				filter: { Name: { eq: "$1var" } },
+			},
+			noopPrimeDeps(),
+		);
+
+		// The invalid placeholder warning is surfaced (proves the warnings sink is threaded).
+		expect(out.warnings.some((w) => w.startsWith("Variable:") && w.includes("$1var"))).toBe(true);
+
+		// Not promoted to a query variable.
+		expect(out.variables.find((v) => v.name === "1var")).toBeUndefined();
+		expect(out.query).not.toMatch(/\$1var\s*:/);
+
+		// Rendered as a quoted literal, not a bare variable reference.
+		expect(out.query).toMatch(/Name\s*:\s*\{\s*eq\s*:\s*"\$1var"\s*\}/s);
+		expect(out.query).not.toMatch(/eq\s*:\s*\$1var\b/);
+	});
+
+	// C2 (W-22697670): warnings from childRelationship filters must surface too —
+	// selectChildRelationship now threads the warnings sink through promoteVariables.
+	it("surfaces $-placeholder warnings from a childRelationship filter", async () => {
+		const out = await buildList(
+			{
+				org: ORG,
+				object: "Account",
+				fields: ["Id"],
+				childRelationships: [
+					{ relationshipName: "Contacts", fields: ["Id"], filter: { Title: { eq: "$1var" } } },
+				],
+			},
+			noopPrimeDeps(),
+		);
+		// The invalid placeholder warning surfaces from the CHILD filter (not dropped).
+		expect(out.warnings.some((w) => w.startsWith("Variable:") && w.includes("$1var"))).toBe(true);
+		// And the child filter renders the quoted literal, not a bare reference.
+		expect(out.query).toMatch(/Title\s*:\s*\{\s*eq\s*:\s*"\$1var"\s*\}/s);
+	});
+
+	// C1 (W-22697670): a childRelationship filter reusing the reserved $after cursor
+	// must keep String (first-wins) so pagination stays valid, and surface a warning.
+	// Regression guard: $after is now declared before the childRelationships loop.
+	it("childRelationship filter reusing $after keeps String (first-wins) and warns", async () => {
+		const out = await buildList(
+			{
+				org: ORG,
+				object: "Account",
+				fields: ["Id"],
+				childRelationships: [
+					{ relationshipName: "Contacts", fields: ["Id"], filter: { Rank: { gt: "$after" } } },
+				],
+			},
+			noopPrimeDeps(),
+		);
+		// Pagination's $after stays String, not overwritten to the child's Float.
+		expect(out.query).toMatch(/\$after\s*:\s*String/);
+		expect(out.query).not.toMatch(/\$after\s*:\s*Float/);
+		expect(
+			out.warnings.some(
+				(w) => w.startsWith("Variable:") && w.includes("type collision for $after"),
+			),
+		).toBe(true);
+	});
 });