@arcteninc/core 0.0.42 → 0.0.43

package/dist/lib/useAgent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAgent.d.ts","sourceRoot":"","sources":["../../src/lib/useAgent.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EAGf,MAAM,oBAAoB,CAAC;AAE5B,wBAAgB,QAAQ,CAAC,EACvB,UAAqC,EACrC,aAAmC,EACnC,WAAW,EAAE,aAAa,EAC1B,cAAsB,EACtB,IAAI,EACJ,KAAU,EACV,SAAc,EACd,YAAY,EACZ,YAAiB,EACjB,eAAoB,EACpB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EACV,QAAQ,EACR,UAAU,GACX,GAAE,eAAoB,GAAG,cAAc,CAkdvC"}
+{"version":3,"file":"useAgent.d.ts","sourceRoot":"","sources":["../../src/lib/useAgent.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EAGf,MAAM,oBAAoB,CAAC;AAE5B,wBAAgB,QAAQ,CAAC,EACvB,UAAqC,EACrC,aAAmC,EACnC,WAAW,EAAE,aAAa,EAC1B,cAAsB,EACtB,IAAI,EACJ,KAAU,EACV,SAAc,EACd,YAAY,EACZ,YAAiB,EACjB,eAAoB,EACpB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EACV,QAAQ,EACR,UAAU,GACX,GAAE,eAAoB,GAAG,cAAc,CAodvC"}

package/dist/utils/extract-tool-metadata.d.ts

@@ -28,6 +28,10 @@ interface BuildTimeFunctionMetadata {
     returnType?: string;
     isAsync?: boolean;
 }
+interface BuildTimeMetadata {
+    functions: Record<string, BuildTimeFunctionMetadata>;
+    toolOrder?: string[];
+}
 /**
  * Extract tool metadata from functions using build-time generated metadata
  * Automatically preserves original function names to survive minification
@@ -37,6 +41,6 @@ interface BuildTimeFunctionMetadata {
  * @returns Array of tool metadata - tools without metadata are filtered out (with a warning)
  * @throws Error if buildTimeMeta is not provided
  */
-export declare function extractToolsMetadata(functions: Function[], buildTimeMeta?: Record<string, BuildTimeFunctionMetadata> | null): ToolMetadata[];
+export declare function extractToolsMetadata(functions: Function[], buildTimeMeta?: Record<string, BuildTimeFunctionMetadata> | BuildTimeMetadata | null): ToolMetadata[];
 export {};
 //# sourceMappingURL=extract-tool-metadata.d.ts.map

package/dist/utils/extract-tool-metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract-tool-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/extract-tool-metadata.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,eAAO,MAAM,oBAAoB,eAA6C,CAAC;AAE/E;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,QAAQ,EAAE,EAAE,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,GAAG,CAAC,CAGnF;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,GAAG,CAAC;CACjB;AAGD,UAAU,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AA+CD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,QAAQ,EAAE,EACrB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,GAAG,IAAI,GAC/D,YAAY,EAAE,CAiGhB"}
+{"version":3,"file":"extract-tool-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/extract-tool-metadata.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,eAAO,MAAM,oBAAoB,eAA6C,CAAC;AAE/E;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,QAAQ,EAAE,EAAE,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,GAAG,CAAC,CAGnF;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,GAAG,CAAC;CACjB;AAGD,UAAU,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAGD,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;IACrD,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AA+DD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,QAAQ,EAAE,EACrB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,yBAAyB,CAAC,GAAG,iBAAiB,GAAG,IAAI,GACnF,YAAY,EAAE,CAoEhB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcteninc/core",
-  "version": "0.0.42",
+  "version": "0.0.43",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",

package/scripts/cli-extract-types-auto.ts

@@ -42,10 +42,12 @@ interface GeneratedMetadata {
   generated: string;
   discoveredFrom: string[];
   functions: Record<string, FunctionMetadata>;
+  toolOrder?: string[]; // Ordered array of tool names as they appear in components
 }
 
 interface ToolUsage {
   toolNames: Set<string>;
+  toolOrder: string[]; // Ordered array of tool names as they appear in the component
   file: string;
   component: 'ArctenAgent' | 'useAgent';
 }
@@ -70,8 +72,9 @@ function extractToolNamesFromExpression(
   expr: ts.Expression,
   sourceFile: ts.SourceFile,
   variableMap: Map<string, ts.Expression>
-): Set<string> {
+): { names: Set<string>; order: string[] } {
   const toolNames = new Set<string>();
+  const toolOrder: string[] = []; // Preserve order
   const visited = new Set<ts.Node>();
 
   function extractFromExpr(node: ts.Node): void {
@@ -95,13 +98,19 @@ function extractToolNamesFromExpression(
           // Direct identifier: toolName
           const name = element.text;
           if (name && name !== 'undefined' && name !== 'null') {
-            toolNames.add(name);
+            if (!toolNames.has(name)) {
+              toolNames.add(name);
+              toolOrder.push(name); // Preserve order
+            }
           }
         } else if (ts.isPropertyAccessExpression(element)) {
           // Property access: tools.getOrders -> extract "getOrders"
           const propName = element.name.text;
           if (propName) {
-            toolNames.add(propName);
+            if (!toolNames.has(propName)) {
+              toolNames.add(propName);
+              toolOrder.push(propName); // Preserve order
+            }
           }
         } else if (ts.isElementAccessExpression(element)) {
           // Element access: tools['getOrders'] -> extract the property name if it's a string literal
@@ -109,7 +118,10 @@ function extractToolNamesFromExpression(
           if (ts.isStringLiteral(indexExpr) || ts.isNumericLiteral(indexExpr)) {
             const name = indexExpr.text;
             if (name && name !== 'undefined' && name !== 'null') {
-              toolNames.add(name);
+              if (!toolNames.has(name)) {
+                toolNames.add(name);
+                toolOrder.push(name); // Preserve order
+              }
             }
           } else {
             // For dynamic access like tools[someVar], recursively extract
@@ -134,7 +146,10 @@ function extractToolNamesFromExpression(
         // If not in variableMap, it might be a function declaration name
         // Add it directly as a tool name (findFunctionDefinition will find it later)
         if (varName && varName !== 'undefined' && varName !== 'null') {
-          toolNames.add(varName);
+          if (!toolNames.has(varName)) {
+            toolNames.add(varName);
+            toolOrder.push(varName);
+          }
         }
       }
       return;
@@ -143,7 +158,10 @@ function extractToolNamesFromExpression(
     // Property access: wrappedTools.getRAGInfo
     if (ts.isPropertyAccessExpression(node)) {
       const propName = node.name.text;
-      toolNames.add(propName);
+      if (!toolNames.has(propName)) {
+        toolNames.add(propName);
+        toolOrder.push(propName);
+      }
       return;
     }
 
@@ -185,7 +203,7 @@ function extractToolNamesFromExpression(
   }
 
   extractFromExpr(expr);
-  return toolNames;
+  return { names: toolNames, order: toolOrder };
 }
 
 /**
@@ -249,7 +267,7 @@ function extractToolNamesFromFile(
                 const expr = attr.initializer.expression;
                 if (expr) {
                   const extracted = extractToolNamesFromExpression(expr, sourceFile, variableMap);
-                  extracted.forEach(name => toolNames.add(name));
+                  extracted.names.forEach(name => toolNames.add(name));
                 }
               }
             }
@@ -257,8 +275,26 @@ function extractToolNamesFromFile(
         }
 
         if (toolNames.size > 0) {
+          // Collect ordered tool names from all attributes
+          const allToolOrder: string[] = [];
+          for (const attr of attributes) {
+            if (ts.isJsxAttribute(attr)) {
+              const attrName = attr.name.getText(sourceFile);
+              if (attrName === 'tools' || attrName === 'safeTools') {
+                if (attr.initializer && ts.isJsxExpression(attr.initializer)) {
+                  const expr = attr.initializer.expression;
+                  if (expr) {
+                    const extracted = extractToolNamesFromExpression(expr, sourceFile, variableMap);
+                    allToolOrder.push(...extracted.order);
+                  }
+                }
+              }
+            }
+          }
+          
           usages.push({
             toolNames,
+            toolOrder: allToolOrder,
             file: sourceFile.fileName,
             component: 'ArctenAgent',
           });
@@ -284,7 +320,7 @@ function extractToolNamesFromFile(
                     sourceFile,
                     variableMap
                   );
-                  extracted.forEach(name => toolNames.add(name));
+                  extracted.names.forEach(name => toolNames.add(name));
                 }
               }
             }
@@ -292,8 +328,30 @@ function extractToolNamesFromFile(
         }
 
         if (toolNames.size > 0) {
+          // Collect ordered tool names from tools and safeTools properties
+          const allToolOrder: string[] = [];
+          if (node.arguments.length > 0) {
+            const arg = node.arguments[0];
+            if (ts.isObjectLiteralExpression(arg)) {
+              for (const prop of arg.properties) {
+                if (ts.isPropertyAssignment(prop)) {
+                  const propName = prop.name.getText(sourceFile);
+                  if (propName === 'tools' || propName === 'safeTools') {
+                    const extracted = extractToolNamesFromExpression(
+                      prop.initializer,
+                      sourceFile,
+                      variableMap
+                    );
+                    allToolOrder.push(...extracted.order);
+                  }
+                }
+              }
+            }
+          }
+          
           usages.push({
             toolNames,
+            toolOrder: allToolOrder,
             file: sourceFile.fileName,
             component: 'useAgent',
           });
@@ -1426,11 +1484,38 @@ async function autoDiscoverAndExtract(projectRoot: string, outputPath: string) {
     }
   }
 
+  // Collect tool order from all usage sites (preserve discovery order)
+  // Use the first occurrence order from the first usage site as the canonical order
+  const toolOrder: string[] = [];
+  if (allToolUsages.length > 0) {
+    // Use the order from the first usage site (most common case: single agent)
+    // For multiple agents, this gives a consistent ordering
+    const firstUsage = allToolUsages[0];
+    if (firstUsage.toolOrder && firstUsage.toolOrder.length > 0) {
+      // Add tools in the order they appear, but only if they have metadata
+      for (const toolName of firstUsage.toolOrder) {
+        if (functionsMap[toolName] && !toolOrder.includes(toolName)) {
+          toolOrder.push(toolName);
+        }
+      }
+    }
+    // Add any remaining tools that weren't in the first usage's order
+    for (const toolName of Object.keys(functionsMap)) {
+      if (!toolOrder.includes(toolName)) {
+        toolOrder.push(toolName);
+      }
+    }
+  } else {
+    // Fallback: use the order tools were discovered
+    toolOrder.push(...Object.keys(functionsMap));
+  }
+
   // Generate output
   const output: GeneratedMetadata = {
     generated: new Date().toISOString(),
     discoveredFrom: Array.from(new Set(discoveredFrom)),
     functions: functionsMap,
+    toolOrder: toolOrder.length > 0 ? toolOrder : undefined,
   };
 
   const outputDir = path.dirname(outputPath);