@takeshape/schema 11.38.0 → 11.40.0

package/dist/agents.d.ts

@@ -1,5 +1,7 @@
-import { type AgentJSON } from './project-schema';
+import { type AgentAPIArgument, type AgentJSON } from './project-schema';
 export declare const END_AGENT_EXECUTION = "endAgentExecution";
+export declare const BUILT_IN_CHAT_ARGS: AgentAPIArgument[];
+export declare const BUILT_IN_CHAT_ARG_NAMES: string[];
 export type AgentEndTransition = {
     type: 'done' | 'progress';
     originStateId: string;

package/dist/agents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/agents.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,SAAS,EAA4B,MAAM,kBAAkB,CAAC;AAE3E,eAAO,MAAM,mBAAmB,sBAAsB,CAAC;AAEvD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAwBF,eAAO,MAAM,sBAAsB,UAAW,SAAS,+BAA2B,kBAAkB,EAUnG,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAAW,SAAS,+BAA2B,IAAI,MAAM,CAKtF,CAAC;AAEF,eAAO,MAAM,+BAA+B,cAAe,MAAM,KAAG,MAEnE,CAAC"}
+{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/agents.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,gBAAgB,EAAE,KAAK,SAAS,EAA4B,MAAM,kBAAkB,CAAC;AAElG,eAAO,MAAM,mBAAmB,sBAAsB,CAAC;AAEvD,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,EAUhD,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAA6C,CAAC;AAElF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAwBF,eAAO,MAAM,sBAAsB,UAAW,SAAS,+BAA2B,kBAAkB,EAUnG,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAAW,SAAS,+BAA2B,IAAI,MAAM,CAKtF,CAAC;AAEF,eAAO,MAAM,+BAA+B,cAAe,MAAM,KAAG,MAEnE,CAAC"}

package/dist/agents.js

@@ -3,10 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getInspectAgentSessionQueryName = exports.getAgentEndTransitions = exports.getAgentEndStates = exports.END_AGENT_EXECUTION = void 0;
+exports.getInspectAgentSessionQueryName = exports.getAgentEndTransitions = exports.getAgentEndStates = exports.END_AGENT_EXECUTION = exports.BUILT_IN_CHAT_ARG_NAMES = exports.BUILT_IN_CHAT_ARGS = void 0;
 var _upperFirst = _interopRequireDefault(require("lodash/upperFirst"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const END_AGENT_EXECUTION = exports.END_AGENT_EXECUTION = 'endAgentExecution';
+const BUILT_IN_CHAT_ARGS = exports.BUILT_IN_CHAT_ARGS = [{
+  argName: 'input',
+  argType: 'string',
+  required: true
+}, {
+  argName: 'sessionId',
+  argType: 'sessionId'
+}];
+const BUILT_IN_CHAT_ARG_NAMES = exports.BUILT_IN_CHAT_ARG_NAMES = BUILT_IN_CHAT_ARGS.map(arg => arg.argName);
 const transitionCanEnd = (transition, includeSuspend = false) => {
   if (!transition || transition.length === 0) {
     return true;

package/dist/builtin-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builtin-schema.d.ts","sourceRoot":"","sources":["../../src/builtin-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAC,KAAK,OAAO,EAAC,MAAM,eAAe,CAAC;AAE3C,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAEjD;AAID,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAEnE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAEnE;AAED,eAAO,MAAM,SAAS,EAAE,SAKvB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QA0X3B,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,OAsN1B,CAAC"}
+{"version":3,"file":"builtin-schema.d.ts","sourceRoot":"","sources":["../../src/builtin-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAC,KAAK,OAAO,EAAC,MAAM,eAAe,CAAC;AAE3C,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAEjD;AAID,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAEnE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAEnE;AAED,eAAO,MAAM,SAAS,EAAE,SAKvB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,QA2X3B,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,OAsN1B,CAAC"}

package/dist/builtin-schema.js

@@ -425,6 +425,9 @@ const builtInShapes = exports.builtInShapes = {
         },
         done: {
           type: 'boolean'
+        },
+        artifact: {
+          type: 'object'
         }
       },
       required: ['content']

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

@@ -56,7 +56,7 @@
       },
       "required": ["type"],
       "additionalProperties": false
-    }, 
+    },
     "agentApiGenerate": {
       "title": "Agent API Generate",
       "type": "object",
@@ -73,7 +73,7 @@
       },
       "required": ["type"],
       "additionalProperties": false
-    },  
+    },
     "agentVariable": {
       "title": "Agent Variable",
       "type": "object",
@@ -263,7 +263,8 @@
       "type": "object",
       "properties": {
         "name": {
-          "type": "string"
+          "type": "string",
+          "pattern": "^[a-zA-Z][0-9A-Za-z_]*$"
         },
         "variables": {
           "title": "Variables",

package/dist/validate.d.ts.map

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

package/dist/validate.js

@@ -809,13 +809,24 @@ function validateAgents(projectSchema) {
     return errors;
   }
   for (const [agentName, agent] of Object.entries(agents)) {
+    const stateNames = new Set();
     for (const [stateId, state] of Object.entries(agent.states)) {
+      const statePath = ['ai-experimental', 'agents', agentName, 'states', stateId];
+      if (stateNames.has(state.name)) {
+        errors.push({
+          path: [...statePath, 'name'],
+          type: 'conflict',
+          message: `Duplicate state name "${state.name}"`
+        });
+      } else {
+        stateNames.add(state.name);
+      }
       if (state.execution.type === 'generate' || state.execution.type === 'chat') {
         if (!state.execution.tools) {
           continue;
         }
         state.execution.tools.forEach((tool, toolIndex) => {
-          pushErrors(errors, validateAIToolConfig(projectSchema, getNamespace, tool, ['ai-experimental', 'agents', agentName, 'states', stateId, 'execution', 'tools', toolIndex, 'ref']));
+          pushErrors(errors, validateAIToolConfig(projectSchema, getNamespace, tool, [...statePath, 'execution', 'tools', toolIndex, 'ref']));
         });
       }
     }

package/es/agents.js

@@ -1,5 +1,14 @@
 import upperFirst from 'lodash/upperFirst';
 export const END_AGENT_EXECUTION = 'endAgentExecution';
+export const BUILT_IN_CHAT_ARGS = [{
+  argName: 'input',
+  argType: 'string',
+  required: true
+}, {
+  argName: 'sessionId',
+  argType: 'sessionId'
+}];
+export const BUILT_IN_CHAT_ARG_NAMES = BUILT_IN_CHAT_ARGS.map(arg => arg.argName);
 const transitionCanEnd = (transition, includeSuspend = false) => {
   if (!transition || transition.length === 0) {
     return true;

package/es/builtin-schema.js

@@ -415,6 +415,9 @@ export const builtInShapes = {
         },
         done: {
           type: 'boolean'
+        },
+        artifact: {
+          type: 'object'
         }
       },
       required: ['content']

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

@@ -56,7 +56,7 @@
       },
       "required": ["type"],
       "additionalProperties": false
-    }, 
+    },
     "agentApiGenerate": {
       "title": "Agent API Generate",
       "type": "object",
@@ -73,7 +73,7 @@
       },
       "required": ["type"],
       "additionalProperties": false
-    },  
+    },
     "agentVariable": {
       "title": "Agent Variable",
       "type": "object",
@@ -263,7 +263,8 @@
       "type": "object",
       "properties": {
         "name": {
-          "type": "string"
+          "type": "string",
+          "pattern": "^[a-zA-Z][0-9A-Za-z_]*$"
         },
         "variables": {
           "title": "Variables",

package/es/validate.js

@@ -794,13 +794,24 @@ function validateAgents(projectSchema) {
     return errors;
   }
   for (const [agentName, agent] of Object.entries(agents)) {
+    const stateNames = new Set();
     for (const [stateId, state] of Object.entries(agent.states)) {
+      const statePath = ['ai-experimental', 'agents', agentName, 'states', stateId];
+      if (stateNames.has(state.name)) {
+        errors.push({
+          path: [...statePath, 'name'],
+          type: 'conflict',
+          message: `Duplicate state name "${state.name}"`
+        });
+      } else {
+        stateNames.add(state.name);
+      }
       if (state.execution.type === 'generate' || state.execution.type === 'chat') {
         if (!state.execution.tools) {
           continue;
         }
         state.execution.tools.forEach((tool, toolIndex) => {
-          pushErrors(errors, validateAIToolConfig(projectSchema, getNamespace, tool, ['ai-experimental', 'agents', agentName, 'states', stateId, 'execution', 'tools', toolIndex, 'ref']));
+          pushErrors(errors, validateAIToolConfig(projectSchema, getNamespace, tool, [...statePath, 'execution', 'tools', toolIndex, 'ref']));
         });
       }
     }

package/package.json

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