@takeshape/schema 11.88.4 → 11.89.0

package/dist/project-schema/latest.d.ts

@@ -1854,6 +1854,7 @@ export interface AgentAIStateInputTemplate {
     inputTemplate: string;
 }
 export interface AgentToolConfig {
+    name: string;
     ref: string;
     description?: string;
     args?: AgentToolConfigArg[];
@@ -1993,6 +1994,7 @@ export interface ToolMap {
  * via the `patternProperty` "^[0-9A-Za-z_]+$".
  */
 export interface ToolJSON {
+    name: string;
     ref: string;
     description?: string;
     args?: ToolArg[];

package/dist/project-schema/v3.48.0.d.ts

@@ -1702,6 +1702,7 @@ export interface AgentAIStateInputTemplateV3_48_0 {
     inputTemplate: string;
 }
 export interface AgentToolConfigV3_48_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: AgentToolConfigArgV3_48_0[];
@@ -1841,6 +1842,7 @@ export interface ToolMapV3_48_0 {
  * via the `patternProperty` "^[0-9A-Za-z_]+$".
  */
 export interface ToolJSONV3_48_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: ToolArgV3_48_0[];

package/dist/project-schema/v3.49.0.d.ts

@@ -1702,6 +1702,7 @@ export interface AgentAIStateInputTemplateV3_49_0 {
     inputTemplate: string;
 }
 export interface AgentToolConfigV3_49_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: AgentToolConfigArgV3_49_0[];
@@ -1841,6 +1842,7 @@ export interface ToolMapV3_49_0 {
  * via the `patternProperty` "^[0-9A-Za-z_]+$".
  */
 export interface ToolJSONV3_49_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: ToolArgV3_49_0[];

package/dist/project-schema/v3.50.0.d.ts

@@ -1754,6 +1754,7 @@ export interface AgentAIStateInputTemplateV3_50_0 {
     inputTemplate: string;
 }
 export interface AgentToolConfigV3_50_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: AgentToolConfigArgV3_50_0[];
@@ -1893,6 +1894,7 @@ export interface ToolMapV3_50_0 {
  * via the `patternProperty` "^[0-9A-Za-z_]+$".
  */
 export interface ToolJSONV3_50_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: ToolArgV3_50_0[];

package/dist/project-schema/v3.51.0.d.ts

@@ -1754,6 +1754,7 @@ export interface AgentAIStateInputTemplateV3_51_0 {
     inputTemplate: string;
 }
 export interface AgentToolConfigV3_51_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: AgentToolConfigArgV3_51_0[];
@@ -1893,6 +1894,7 @@ export interface ToolMapV3_51_0 {
  * via the `patternProperty` "^[0-9A-Za-z_]+$".
  */
 export interface ToolJSONV3_51_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: ToolArgV3_51_0[];

package/dist/project-schema/v3.52.0.d.ts

@@ -1754,6 +1754,7 @@ export interface AgentAIStateInputTemplateV3_52_0 {
     inputTemplate: string;
 }
 export interface AgentToolConfigV3_52_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: AgentToolConfigArgV3_52_0[];
@@ -1893,6 +1894,7 @@ export interface ToolMapV3_52_0 {
  * via the `patternProperty` "^[0-9A-Za-z_]+$".
  */
 export interface ToolJSONV3_52_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: ToolArgV3_52_0[];

package/dist/project-schema/v3.53.0.d.ts

@@ -1835,6 +1835,7 @@ export interface AgentAIStateInputTemplateV3_53_0 {
     inputTemplate: string;
 }
 export interface AgentToolConfigV3_53_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: AgentToolConfigArgV3_53_0[];
@@ -1974,6 +1975,7 @@ export interface ToolMapV3_53_0 {
  * via the `patternProperty` "^[0-9A-Za-z_]+$".
  */
 export interface ToolJSONV3_53_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: ToolArgV3_53_0[];

package/dist/project-schema/v3.54.0.d.ts

@@ -1854,6 +1854,7 @@ export interface AgentAIStateInputTemplateV3_54_0 {
     inputTemplate: string;
 }
 export interface AgentToolConfigV3_54_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: AgentToolConfigArgV3_54_0[];
@@ -1993,6 +1994,7 @@ export interface ToolMapV3_54_0 {
  * via the `patternProperty` "^[0-9A-Za-z_]+$".
  */
 export interface ToolJSONV3_54_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: ToolArgV3_54_0[];

package/dist/project-schema/v3.55.0.d.ts

@@ -1854,6 +1854,7 @@ export interface AgentAIStateInputTemplateV3_55_0 {
     inputTemplate: string;
 }
 export interface AgentToolConfigV3_55_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: AgentToolConfigArgV3_55_0[];
@@ -1993,6 +1994,7 @@ export interface ToolMapV3_55_0 {
  * via the `patternProperty` "^[0-9A-Za-z_]+$".
  */
 export interface ToolJSONV3_55_0 {
+    name: string;
     ref: string;
     description?: string;
     args?: ToolArgV3_55_0[];

package/dist/refs.d.ts

@@ -1,5 +1,5 @@
 import { type Maybe } from '@takeshape/util';
-import type { Args, ObjectSchema, ProjectSchemaJSON, PropertySchema, QueryJSON, Ref, ReturnShape, ShapeJSON, ShapeSchema } from './project-schema/index.ts';
+import type { AIToolConfig, Args, ObjectSchema, ProjectSchemaJSON, PropertySchema, QueryJSON, Ref, ReturnShape, ShapeJSON, ShapeSchema } from './project-schema/index.ts';
 import type { SchemaPath, SchemaWithRef } from './types/index.ts';
 export type ServicesContext = Pick<ProjectSchemaJSON, 'services'>;
 export type ServicesShapesContext = Pick<ProjectSchemaJSON, 'services' | 'shapes'>;
@@ -235,3 +235,4 @@ export declare function getReferencedShape(projectSchema: ProjectSchemaJSON, ref
  * Get a PropertySchema from a RefItem.
  */
 export declare function getReferencedShapeProperty(projectSchema: ProjectSchemaJSON, refItem: PropertyRefItem, namespace?: string): PropertySchema | undefined;
+export declare function getToolRef(tool: Pick<AIToolConfig, 'ref'> | string): string;

package/dist/refs.js

@@ -8,7 +8,6 @@ import isString from 'lodash/isString.js';
 import { isScalar } from "./scalars.js";
 import { getServiceNamespaces } from "./services/util.js";
 import { getRefType, isAllOfSchema, isExtendsSchema, isObjectSchema, isOneOfSchema, isRefSchema, isRefSchemaLegacy } from "./types/index.js";
-import { getToolRef } from "./util/ai-tools.js";
 import { mergeDeepObjectSchemas, mergeObjectSchemas } from "./util/merge.js";
 import { getShape } from "./util/shapes.js";
 /**
@@ -637,3 +636,6 @@ export function getReferencedShapeProperty(projectSchema, refItem, namespace) {
         return shape.schema.properties[refItem.propertyName];
     }
 }
+export function getToolRef(tool) {
+    return typeof tool === 'string' ? tool : tool.ref;
+}

package/dist/schemas/project-schema/experimental.json

@@ -39,6 +39,9 @@
       "title": "Tool JSON",
       "type": "object",
       "properties": {
+        "name": {
+          "type": "string"
+        },
         "ref": {
           "type": "string"
         },
@@ -55,7 +58,7 @@
           "type": "string"
         }
       },
-      "required": ["ref"],
+      "required": ["name", "ref"],
       "additionalProperties": false
     },
     "toolArg": {
@@ -527,6 +530,9 @@
       "title": "AgentToolConfig",
       "type": "object",
       "properties": {
+        "name": {
+          "type": "string"
+        },
         "ref": {
           "type": "string"
         },
@@ -543,7 +549,7 @@
           "type": "string"
         }
       },
-      "required": ["ref"],
+      "required": ["name", "ref"],
       "additionalProperties": false
     },
     "agentToolConfigArg": {

package/dist/util/ai-tools.d.ts

@@ -1,3 +1,2 @@
-import type { AgentToolConfig, AIToolConfig } from '../project-schema/latest.ts';
-export declare function getToolRef(tool: Pick<AIToolConfig, 'ref'> | string): string;
-export declare function normalizeToolConfig(tool: AIToolConfig | AgentToolConfig | string): AIToolConfig | AgentToolConfig;
+import type { AgentToolConfig, AIToolConfig, ToolJSON } from '../project-schema/index.ts';
+export declare function normalizeToolConfig(tool: AIToolConfig | AgentToolConfig | ToolJSON | string): AgentToolConfig;

package/dist/util/ai-tools.js

@@ -1,6 +1,14 @@
-export function getToolRef(tool) {
-    return typeof tool === 'string' ? tool : tool.ref;
-}
+import { parsePropertyRef } from "../refs.js";
 export function normalizeToolConfig(tool) {
-    return typeof tool === 'string' ? { ref: tool } : tool;
+    if (typeof tool === 'string') {
+        return {
+            name: parsePropertyRef(tool)?.propertyName ?? tool,
+            ref: tool
+        };
+    }
+    const name = 'name' in tool ? tool.name : (parsePropertyRef(tool.ref)?.propertyName ?? tool.ref);
+    return {
+        name,
+        ...tool
+    };
 }

package/dist/validate/validate.js

@@ -19,7 +19,7 @@ import neq from 'semver/functions/neq.js';
 import { builtInShapes } from "../builtin-schema.js";
 import { isEnumLikeSchema } from "../enum.js";
 import { isLatestProjectSchemaJSON } from "../project-schema/index.js";
-import { atRefToRefItem, createGetNamespace, getRefShapeName, parsePropertyRef, propertyRefItemToPath, propertyRefItemToResolverPath, refItemToAtRef, refItemToNamespacedShapeName, refItemToShape } from "../refs.js";
+import { atRefToRefItem, createGetNamespace, getRefShapeName, getToolRef, parsePropertyRef, propertyRefItemToPath, propertyRefItemToResolverPath, refItemToAtRef, refItemToNamespacedShapeName, refItemToShape } from "../refs.js";
 import { getRelationship } from "../relationships.js";
 import { scalars } from "../scalars.js";
 import { getAllRefs, isBuiltinMutation, isBuiltinQuery } from "../schema-util.js";
@@ -29,7 +29,6 @@ import { isValidTemplate } from "../template-shapes/index.js";
 import { legacyProjectSchemaImportOptionalProps, projectSchemaImportOptionalProps } from "../types/types.js";
 import { isAIResolver, isBasicResolver, isComposeResolver, isExtendsSchema, isObjectSchema } from "../types/utils.js";
 import { isUnionSchema } from "../unions.js";
-import { getToolRef } from "../util/ai-tools.js";
 import { validateExpression } from "../util/expressions.js";
 import { getShape } from "../util/shapes.js";
 import { CURRENT_SCHEMA_VERSION, LEGACY_API_VERSION, LEGACY_SCHEMA_VERSION } from "../versions.js";
@@ -74,6 +73,15 @@ function checkShapeNames(shapes) {
         message: `Shape.name "${shape.name}" must match key "${name}".`
     }));
 }
+function checkToolNames(tools) {
+    return Object.entries(tools)
+        .filter(([name, tool]) => name !== tool.name)
+        .map(([name, tool]) => ({
+        path: ['ai-experimental', 'tools', name, 'name'],
+        type: 'conflict',
+        message: `Tool.name "${tool.name}" must match key "${name}".`
+    }));
+}
 function checkWorkflowStepNames(workflows) {
     return Object.entries(workflows).flatMap(([name, workflow]) => {
         const items = workflow.steps.map((step, i) => ({
@@ -1018,6 +1026,9 @@ function validateSyntax(context, schema) {
         .concat(validateInterfaceImplementations(schema))
         .concat(validateAgents(schema))
         .concat(validateGuards(context, schema));
+    if (schema['ai-experimental']?.tools) {
+        errors = errors.concat(checkToolNames(schema['ai-experimental']?.tools ?? {}));
+    }
     return formatValidationResult(context, errors, schema);
 }
 async function validateReferences(context, schema) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "11.88.4",
+  "version": "11.89.0",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -57,9 +57,9 @@
     "p-reduce": "^2.1.0",
     "semver": "^7.3.2",
     "tiny-invariant": "^1.2.0",
-    "@takeshape/errors": "11.88.4",
-    "@takeshape/json-schema": "11.88.4",
-    "@takeshape/util": "11.88.4"
+    "@takeshape/errors": "11.89.0",
+    "@takeshape/json-schema": "11.89.0",
+    "@takeshape/util": "11.89.0"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "^11.0.0",
@@ -76,7 +76,7 @@
     "json-schema-to-ts": "^3.1.1",
     "meow": "^9.0.0",
     "shortid": "^2.2.15",
-    "@takeshape/infra": "11.88.4"
+    "@takeshape/infra": "11.89.0"
   },
   "engines": {
     "node": ">=20"