orchajs 0.23.0 → 0.23.2

package/dist/compiler/compile.js

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { existsSync, readFileSync, readdirSync } from "node:fs";
+import { existsSync, readFileSync, readdirSync, statSync, } from "node:fs";
 import { resolve } from "node:path";
 import { buildSync } from "esbuild";
 import { isBuiltInProvider } from "../providers/catalog.js";
@@ -163,27 +163,24 @@ function compileActions(agentName, sourceDirectory, actionRuntime, target) {
         return {};
     }
     const actions = {};
-    for (const entry of readdirSync(actionsDirectory, { withFileTypes: true })) {
-        if (!entry.isDirectory()) {
-            continue;
-        }
-        const configurationPath = resolve(actionsDirectory, entry.name, "index.json");
+    for (const entry of discoverDirectories(actionsDirectory)) {
+        const configurationPath = resolve(actionsDirectory, entry, "index.json");
         let configuration;
         try {
             configuration = JSON.parse(readFileSync(configurationPath, "utf8"));
         }
         catch (error) {
-            throw new Error(`Action "${agentName}/${entry.name}" is missing a valid index.json.`, { cause: error });
+            throw new Error(`Action "${agentName}/${entry}" is missing a valid index.json.`, { cause: error });
         }
-        validateEnabled(`Action "${agentName}/${entry.name}"`, configuration?.enabled);
+        validateEnabled(`Action "${agentName}/${entry}"`, configuration?.enabled);
         if (configuration?.enabled === false) {
             continue;
         }
         if (!configuration.name?.trim() || !configuration.description?.trim()) {
-            throw new Error(`Action "${agentName}/${entry.name}" requires name and description.`);
+            throw new Error(`Action "${agentName}/${entry}" requires name and description.`);
         }
         if (!/^[a-zA-Z0-9_-]{1,64}$/.test(configuration.name)) {
-            throw new Error(`Action "${agentName}/${entry.name}" has an invalid model-facing name.`);
+            throw new Error(`Action "${agentName}/${entry}" has an invalid model-facing name.`);
         }
         if ([
             "load_skill",
@@ -191,50 +188,50 @@ function compileActions(agentName, sourceDirectory, actionRuntime, target) {
             "resume_agent",
             "inspect_agent",
         ].includes(configuration.name)) {
-            throw new Error(`Action "${agentName}/${entry.name}" uses reserved name "${configuration.name}".`);
+            throw new Error(`Action "${agentName}/${entry}" uses reserved name "${configuration.name}".`);
         }
         const execution = configuration.execution ?? "local";
         if (!["client", "local"].includes(execution)) {
-            throw new Error(`Action "${agentName}/${entry.name}" has invalid execution "${configuration.execution}".`);
+            throw new Error(`Action "${agentName}/${entry}" has invalid execution "${configuration.execution}".`);
         }
         if (!configuration.parameters ||
             typeof configuration.parameters !== "object" ||
             Array.isArray(configuration.parameters)) {
-            throw new Error(`Action "${agentName}/${entry.name}" requires a parameters JSON Schema.`);
+            throw new Error(`Action "${agentName}/${entry}" requires a parameters JSON Schema.`);
         }
         if (configuration.outputSchema !== undefined &&
             (typeof configuration.outputSchema !== "object" ||
                 configuration.outputSchema === null ||
                 Array.isArray(configuration.outputSchema))) {
-            throw new Error(`Action "${agentName}/${entry.name}" has an invalid outputSchema.`);
+            throw new Error(`Action "${agentName}/${entry}" has an invalid outputSchema.`);
         }
-        validateNumber(`${agentName}/${entry.name}`, "timeoutMs", configuration.timeoutMs, { integer: true, minimum: 1, maximum: 120_000 });
+        validateNumber(`${agentName}/${entry}`, "timeoutMs", configuration.timeoutMs, { integer: true, minimum: 1, maximum: 120_000 });
         if (configuration.permissions?.env !== undefined &&
             !Array.isArray(configuration.permissions.env)) {
-            throw new Error(`Action "${agentName}/${entry.name}" permissions.env must be an array.`);
+            throw new Error(`Action "${agentName}/${entry}" permissions.env must be an array.`);
         }
         if (configuration.permissions?.network !== undefined &&
             !Array.isArray(configuration.permissions.network)) {
-            throw new Error(`Action "${agentName}/${entry.name}" permissions.network must be an array.`);
+            throw new Error(`Action "${agentName}/${entry}" permissions.network must be an array.`);
         }
         for (const permission of [
             ...(configuration.permissions?.env ?? []),
             ...(configuration.permissions?.network ?? []),
         ]) {
             if (typeof permission !== "string" || !permission.trim()) {
-                throw new Error(`Action "${agentName}/${entry.name}" has an invalid permission.`);
+                throw new Error(`Action "${agentName}/${entry}" has an invalid permission.`);
             }
         }
         if (actions[configuration.name]) {
             throw new Error(`Agent "${agentName}" has duplicate action name "${configuration.name}".`);
         }
         const compiledSource = execution === "local"
-            ? compileLocalAction(agentName, entry.name, actionsDirectory, actionRuntime, target)
+            ? compileLocalAction(agentName, entry, actionsDirectory, actionRuntime, target)
             : undefined;
         actions[configuration.name] = Object.freeze({
             ...configuration,
             execution,
-            directoryName: entry.name,
+            directoryName: entry,
             ...compiledSource,
         });
     }
@@ -321,7 +318,10 @@ function compileEvaluations(agentName, sourceDirectory) {
 }
 function discoverDirectories(directory) {
     return readdirSync(directory, { withFileTypes: true })
-        .filter((entry) => entry.isDirectory() && !entry.name.startsWith("."))
+        .filter((entry) => !entry.name.startsWith(".") &&
+        (entry.isDirectory() ||
+            (entry.isSymbolicLink() &&
+                statSync(resolve(directory, entry.name)).isDirectory())))
         .map((entry) => entry.name)
         .sort();
 }

package/dist/playground/server.js

@@ -2,8 +2,8 @@ import { spawn } from "node:child_process";
 import { randomBytes } from "node:crypto";
 import { existsSync } from "node:fs";
 import { copyFile, mkdir, readFile, writeFile, } from "node:fs/promises";
-import { createRequire } from "node:module";
 import { extname, isAbsolute, relative, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 import { createServer, } from "node:http";
 import { watch } from "chokidar";
 import { build } from "esbuild";
@@ -475,12 +475,11 @@ async function serveAsset(response, pathname, publicRoot) {
     response.end(await readFile(path));
 }
 async function buildPlaygroundAssets(projectRoot) {
-    const require = createRequire(import.meta.url);
     let entryPath;
     let logoPath;
     try {
-        entryPath = require.resolve("@orchajs/playground-ui/mount");
-        logoPath = require.resolve("@orchajs/playground-ui/orcha-logo.svg");
+        entryPath = fileURLToPath(import.meta.resolve("@orchajs/playground-ui/mount"));
+        logoPath = fileURLToPath(import.meta.resolve("@orchajs/playground-ui/orcha-logo.svg"));
     }
     catch (error) {
         throw new Error('The playground requires the optional "@orchajs/playground-ui" package. Install it as a development dependency.', { cause: error });

package/dist/playground/source.js

@@ -1,4 +1,4 @@
-import { readFile, readdir } from "node:fs/promises";
+import { readFile, readdir, stat } from "node:fs/promises";
 import { resolve } from "node:path";
 import { getOrchaRuntimeContext } from "../runtime/context.js";
 export async function readPlaygroundAgentSource(orcha, agentKey) {
@@ -57,10 +57,17 @@ async function readCollectionItems(agentDirectory, collection, manifests, includ
         manifest.directoryName,
         { key, manifest },
     ]));
-    return Promise.all(entries
-        .filter((entry) => entry.isDirectory() && !entry.name.startsWith("."))
-        .sort((left, right) => left.name.localeCompare(right.name))
-        .map(async (entry) => {
+    const directories = (await Promise.all(entries
+        .filter((entry) => !entry.name.startsWith("."))
+        .map(async (entry) => ({
+        entry,
+        isDirectory: entry.isDirectory() ||
+            (entry.isSymbolicLink() &&
+                (await stat(resolve(root, entry.name))).isDirectory()),
+    })))).filter(({ isDirectory }) => isDirectory);
+    return Promise.all(directories
+        .sort((left, right) => left.entry.name.localeCompare(right.entry.name))
+        .map(async ({ entry }) => {
         const directory = resolve(root, entry.name);
         const rawConfiguration = await readRequired(resolve(directory, "index.json"));
         const configuration = parseObject(rawConfiguration, `${collection}/${entry.name}/index.json`);

package/dist/runtime/agent.js

@@ -1740,7 +1740,16 @@ function normalizeDelegatedInput(input, projectRoot) {
     if (!content) {
         throw new Error("run_agent input must contain at least one valid content item.");
     }
-    return content;
+    if (content.some((item) => item.type === "text")) {
+        return content;
+    }
+    return [
+        {
+            type: "text",
+            text: "Process the attached content according to your agent instructions.",
+        },
+        ...content,
+    ];
 }
 function agentContentInputSchema() {
     const textItem = {

package/dist-cjs/compiler/compile.js

@@ -215,13 +215,10 @@ function compileActions(agentName, sourceDirectory, actionRuntime, target) {
     return {};
   }
   const actions = {};
-  for (const entry of (0, import_fs.readdirSync)(actionsDirectory, { withFileTypes: true })) {
-    if (!entry.isDirectory()) {
-      continue;
-    }
+  for (const entry of discoverDirectories(actionsDirectory)) {
     const configurationPath = (0, import_path.resolve)(
       actionsDirectory,
-      entry.name,
+      entry,
       "index.json"
     );
     let configuration;
@@ -231,12 +228,12 @@ function compileActions(agentName, sourceDirectory, actionRuntime, target) {
       );
     } catch (error) {
       throw new Error(
-        `Action "${agentName}/${entry.name}" is missing a valid index.json.`,
+        `Action "${agentName}/${entry}" is missing a valid index.json.`,
         { cause: error }
       );
     }
     validateEnabled(
-      `Action "${agentName}/${entry.name}"`,
+      `Action "${agentName}/${entry}"`,
       configuration?.enabled
     );
     if (configuration?.enabled === false) {
@@ -244,12 +241,12 @@ function compileActions(agentName, sourceDirectory, actionRuntime, target) {
     }
     if (!configuration.name?.trim() || !configuration.description?.trim()) {
       throw new Error(
-        `Action "${agentName}/${entry.name}" requires name and description.`
+        `Action "${agentName}/${entry}" requires name and description.`
       );
     }
     if (!/^[a-zA-Z0-9_-]{1,64}$/.test(configuration.name)) {
       throw new Error(
-        `Action "${agentName}/${entry.name}" has an invalid model-facing name.`
+        `Action "${agentName}/${entry}" has an invalid model-facing name.`
       );
     }
     if ([
@@ -259,39 +256,39 @@ function compileActions(agentName, sourceDirectory, actionRuntime, target) {
       "inspect_agent"
     ].includes(configuration.name)) {
       throw new Error(
-        `Action "${agentName}/${entry.name}" uses reserved name "${configuration.name}".`
+        `Action "${agentName}/${entry}" uses reserved name "${configuration.name}".`
       );
     }
     const execution = configuration.execution ?? "local";
     if (!["client", "local"].includes(execution)) {
       throw new Error(
-        `Action "${agentName}/${entry.name}" has invalid execution "${configuration.execution}".`
+        `Action "${agentName}/${entry}" has invalid execution "${configuration.execution}".`
       );
     }
     if (!configuration.parameters || typeof configuration.parameters !== "object" || Array.isArray(configuration.parameters)) {
       throw new Error(
-        `Action "${agentName}/${entry.name}" requires a parameters JSON Schema.`
+        `Action "${agentName}/${entry}" requires a parameters JSON Schema.`
       );
     }
     if (configuration.outputSchema !== void 0 && (typeof configuration.outputSchema !== "object" || configuration.outputSchema === null || Array.isArray(configuration.outputSchema))) {
       throw new Error(
-        `Action "${agentName}/${entry.name}" has an invalid outputSchema.`
+        `Action "${agentName}/${entry}" has an invalid outputSchema.`
       );
     }
     validateNumber(
-      `${agentName}/${entry.name}`,
+      `${agentName}/${entry}`,
       "timeoutMs",
       configuration.timeoutMs,
       { integer: true, minimum: 1, maximum: 12e4 }
     );
     if (configuration.permissions?.env !== void 0 && !Array.isArray(configuration.permissions.env)) {
       throw new Error(
-        `Action "${agentName}/${entry.name}" permissions.env must be an array.`
+        `Action "${agentName}/${entry}" permissions.env must be an array.`
       );
     }
     if (configuration.permissions?.network !== void 0 && !Array.isArray(configuration.permissions.network)) {
       throw new Error(
-        `Action "${agentName}/${entry.name}" permissions.network must be an array.`
+        `Action "${agentName}/${entry}" permissions.network must be an array.`
       );
     }
     for (const permission of [
@@ -300,7 +297,7 @@ function compileActions(agentName, sourceDirectory, actionRuntime, target) {
     ]) {
       if (typeof permission !== "string" || !permission.trim()) {
         throw new Error(
-          `Action "${agentName}/${entry.name}" has an invalid permission.`
+          `Action "${agentName}/${entry}" has an invalid permission.`
         );
       }
     }
@@ -311,7 +308,7 @@ function compileActions(agentName, sourceDirectory, actionRuntime, target) {
     }
     const compiledSource = execution === "local" ? compileLocalAction(
       agentName,
-      entry.name,
+      entry,
       actionsDirectory,
       actionRuntime,
       target
@@ -319,7 +316,7 @@ function compileActions(agentName, sourceDirectory, actionRuntime, target) {
     actions[configuration.name] = Object.freeze({
       ...configuration,
       execution,
-      directoryName: entry.name,
+      directoryName: entry,
       ...compiledSource
     });
   }
@@ -426,7 +423,9 @@ function compileEvaluations(agentName, sourceDirectory) {
   return Object.freeze(evaluations);
 }
 function discoverDirectories(directory) {
-  return (0, import_fs.readdirSync)(directory, { withFileTypes: true }).filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).map((entry) => entry.name).sort();
+  return (0, import_fs.readdirSync)(directory, { withFileTypes: true }).filter(
+    (entry) => !entry.name.startsWith(".") && (entry.isDirectory() || entry.isSymbolicLink() && (0, import_fs.statSync)((0, import_path.resolve)(directory, entry.name)).isDirectory())
+  ).map((entry) => entry.name).sort();
 }
 function rejectLegacyRegistry(agentName, directory, collection) {
   if ((0, import_fs.existsSync)((0, import_path.resolve)(directory, "index.js"))) {

package/dist-cjs/playground/server.js

@@ -26,8 +26,8 @@ var import_child_process = require("child_process");
 var import_crypto = require("crypto");
 var import_fs = require("fs");
 var import_promises = require("fs/promises");
-var import_module = require("module");
 var import_path = require("path");
+var import_url = require("url");
 var import_http = require("http");
 var import_chokidar = require("chokidar");
 var import_esbuild = require("esbuild");
@@ -35,6 +35,7 @@ var import_orcha = require("../orcha.js");
 var import_project_loader = require("../project-loader.js");
 var import_testing = require("../testing.js");
 var import_source = require("./source.js");
+const import_meta = {};
 async function startPlayground(options = {}) {
   const projectRoot = (0, import_path.resolve)(options.projectRoot ?? process.cwd());
   const host = options.host ?? "localhost";
@@ -501,12 +502,15 @@ async function serveAsset(response, pathname, publicRoot) {
   response.end(await (0, import_promises.readFile)(path));
 }
 async function buildPlaygroundAssets(projectRoot) {
-  const require2 = (0, import_module.createRequire)(__orchaImportMetaUrl);
   let entryPath;
   let logoPath;
   try {
-    entryPath = require2.resolve("@orchajs/playground-ui/mount");
-    logoPath = require2.resolve("@orchajs/playground-ui/orcha-logo.svg");
+    entryPath = (0, import_url.fileURLToPath)(
+      import_meta.resolve("@orchajs/playground-ui/mount")
+    );
+    logoPath = (0, import_url.fileURLToPath)(
+      import_meta.resolve("@orchajs/playground-ui/orcha-logo.svg")
+    );
   } catch (error) {
     throw new Error(
       'The playground requires the optional "@orchajs/playground-ui" package. Install it as a development dependency.',

package/dist-cjs/playground/source.js

@@ -102,8 +102,16 @@ async function readCollectionItems(agentDirectory, collection, manifests, includ
       { key, manifest }
     ])
   );
+  const directories = (await Promise.all(
+    entries.filter((entry) => !entry.name.startsWith(".")).map(async (entry) => ({
+      entry,
+      isDirectory: entry.isDirectory() || entry.isSymbolicLink() && (await (0, import_promises.stat)((0, import_path.resolve)(root, entry.name))).isDirectory()
+    }))
+  )).filter(({ isDirectory }) => isDirectory);
   return Promise.all(
-    entries.filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).sort((left, right) => left.name.localeCompare(right.name)).map(async (entry) => {
+    directories.sort(
+      (left, right) => left.entry.name.localeCompare(right.entry.name)
+    ).map(async ({ entry }) => {
       const directory = (0, import_path.resolve)(root, entry.name);
       const rawConfiguration = await readRequired(
         (0, import_path.resolve)(directory, "index.json")

package/dist-cjs/runtime/agent.js

@@ -2024,7 +2024,16 @@ function normalizeDelegatedInput(input, projectRoot) {
       "run_agent input must contain at least one valid content item."
     );
   }
-  return content;
+  if (content.some((item) => item.type === "text")) {
+    return content;
+  }
+  return [
+    {
+      type: "text",
+      text: "Process the attached content according to your agent instructions."
+    },
+    ...content
+  ];
 }
 function agentContentInputSchema() {
   const textItem = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchajs",
-  "version": "0.23.0",
+  "version": "0.23.2",
   "description": "A filesystem-convention, stateful agent framework for JavaScript.",
   "license": "MIT",
   "repository": {
@@ -124,7 +124,7 @@
     "node": ">=18.20.8"
   },
   "peerDependencies": {
-    "@orchajs/playground-ui": ">=0.2.2 <1",
+    "@orchajs/playground-ui": ">=0.2.3",
     "@react-native-async-storage/async-storage": ">=2 <3",
     "@aws-sdk/client-bedrock-runtime": ">=3.864.0 <4",
     "@google/genai": ">=2.22.0 <3",