@ai-setting/roy-agent-core 1.5.34 → 1.5.36

package/dist/shared/@ai-setting/{roy-agent-core-wzbeqtmc.js → roy-agent-core-qfdp3pvq.js}

@@ -11,155 +11,124 @@ import {
 // src/env/tool/built-in/bash.ts
 init_propagation();
 import { z } from "zod";
+import { Effect as Effect2 } from "effect";
+
+// src/env/tool/built-in/bash-effect.ts
+import { Effect, Context, Layer } from "effect";
 import { spawn } from "child_process";
-import path from "path";
-var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-function getPlatform() {
-  return process.platform;
-}
-function isWindows() {
-  return getPlatform() === "win32";
-}
-async function killProcessTree(pid) {
-  if (isWindows()) {
-    await new Promise((resolve) => {
-      const killer = spawn("taskkill", ["/pid", String(pid), "/f", "/t"], {
-        stdio: "ignore",
-        windowsHide: true
-      });
-      killer.on("exit", () => resolve());
-      killer.on("error", () => resolve());
+var BashSpawner = Context.GenericTag("BashSpawner");
+var isWindows = process.platform === "win32";
+var SIGKILL_TIMEOUT_MS = 200;
+var killTree = (proc, signal = "SIGKILL") => {
+  if (isWindows) {
+    spawn("taskkill", ["/pid", String(proc.pid), "/f", "/t"], {
+      stdio: "ignore",
+      windowsHide: true
     });
     return;
   }
+  const pid = proc.pid;
+  if (!pid)
+    return;
   try {
     process.kill(-pid, "SIGTERM");
-    await sleep(200);
-    try {
-      process.kill(-pid, 0);
-      process.kill(-pid, "SIGKILL");
-      await sleep(100);
-    } catch {}
+    setTimeout(() => {
+      try {
+        process.kill(-pid, 0);
+        process.kill(-pid, signal);
+      } catch {}
+    }, SIGKILL_TIMEOUT_MS);
   } catch {}
-}
-function normalizeCwd(cwd) {
-  if (!cwd)
-    return;
-  return path.normalize(cwd);
-}
-function executeCommand(command, options) {
-  return new Promise((resolve) => {
-    let stdout = "";
-    let stderr = "";
-    let timedOut = false;
-    let resolved = false;
-    let timer = null;
-    let childPid;
-    let processGroupId;
-    const cwd = normalizeCwd(options.cwd);
-    if (isWindows()) {
-      const child2 = spawn("cmd.exe", ["/c", command], {
-        cwd,
-        env: options.env,
-        stdio: ["ignore", "pipe", "pipe"],
-        windowsHide: true,
-        detached: true
-      });
-      childPid = child2.pid;
-      child2.unref();
-      const cleanup2 = () => {
+};
+var makeBashSpawner = () => {
+  return {
+    run: (command, options) => {
+      return Effect.gen(function* () {
+        const cwd = options?.cwd;
+        const timeout = options?.timeout ?? 60000;
+        const env = options?.env ?? {};
+        let stdout = "";
+        let stderr = "";
+        let timedOut = false;
+        let timer = null;
+        let child = null;
+        let exitResolve = null;
+        let exited = false;
+        const spawnOpts = {
+          shell: true,
+          cwd,
+          env: { ...process.env, ...env },
+          stdio: ["pipe", "pipe", "pipe"]
+        };
+        child = spawn(command, [], spawnOpts);
+        const checkExited = () => exited || !child || !child.pid || child.killed || child.exitCode !== null;
+        if (timeout > 0) {
+          timer = setTimeout(() => {
+            if (!checkExited()) {
+              timedOut = true;
+              killTree(child, "SIGKILL");
+              if (exitResolve) {
+                exitResolve(-1);
+                exited = true;
+              }
+            }
+          }, timeout);
+        }
+        yield* Effect.addFinalizer(() => {
+          return Effect.sync(() => {
+            if (timer)
+              clearTimeout(timer);
+            if (!checkExited() && child) {
+              child.kill("SIGKILL");
+            }
+          });
+        });
+        const stdoutChunks = [];
+        const stderrChunks = [];
+        child.stdout?.on("data", (data) => {
+          stdoutChunks.push(data);
+        });
+        child.stderr?.on("data", (data) => {
+          stderrChunks.push(data);
+        });
+        const exitCode = yield* Effect.async((resume) => {
+          exitResolve = (code) => {
+            if (!exited) {
+              exited = true;
+              resume(Effect.succeed(code));
+            }
+          };
+          child.on("exit", (code) => {
+            if (!exited) {
+              exited = true;
+              resume(Effect.succeed(code ?? 0));
+            }
+          });
+          child.on("error", () => {
+            if (!exited) {
+              exited = true;
+              resume(Effect.succeed(1));
+            }
+          });
+        });
         if (timer)
           clearTimeout(timer);
-      };
-      const doResolve2 = (exitCode, timedOutFlag) => {
-        if (!resolved) {
-          resolved = true;
-          cleanup2();
-          resolve({
-            stdout: stdout.trim(),
-            stderr: stderr.trim(),
-            exitCode: timedOutFlag ? -1 : exitCode,
-            timedOut: timedOutFlag
-          });
-        }
-      };
-      if (options.timeout) {
-        timer = setTimeout(async () => {
-          timedOut = true;
-          if (childPid) {
-            await killProcessTree(childPid);
-          } else {
-            child2.kill("SIGKILL");
-          }
-        }, options.timeout);
-      }
-      child2.stdout?.on("data", (data) => {
-        stdout += data.toString();
-      });
-      child2.stderr?.on("data", (data) => {
-        stderr += data.toString();
-      });
-      child2.on("exit", (code) => {
-        doResolve2(code ?? 0, timedOut);
-      });
-      child2.on("error", () => {
-        doResolve2(1, false);
-      });
-      return;
-    }
-    const child = spawn(command, [], {
-      shell: true,
-      cwd,
-      env: options.env,
-      stdio: ["ignore", "pipe", "pipe"],
-      windowsHide: true,
-      detached: true
-    });
-    childPid = child.pid;
-    processGroupId = childPid;
-    const cleanup = () => {
-      if (timer)
-        clearTimeout(timer);
-    };
-    const doResolve = (exitCode, timedOutFlag) => {
-      if (!resolved) {
-        resolved = true;
-        cleanup();
-        resolve({
+        stdout = Buffer.concat(stdoutChunks).toString("utf-8");
+        stderr = Buffer.concat(stderrChunks).toString("utf-8");
+        return {
           stdout: stdout.trim(),
           stderr: stderr.trim(),
-          exitCode: timedOutFlag ? -1 : exitCode,
-          timedOut: timedOutFlag
-        });
-      }
-    };
-    if (options.timeout) {
-      timer = setTimeout(async () => {
-        timedOut = true;
-        if (processGroupId) {
-          await killProcessTree(processGroupId);
-        }
-        if (childPid) {
-          try {
-            process.kill(childPid, "SIGKILL");
-          } catch {}
-        }
-      }, options.timeout);
+          exitCode: timedOut ? -1 : exitCode,
+          success: !timedOut && exitCode === 0,
+          timedOut
+        };
+      });
     }
-    child.stdout?.on("data", (data) => {
-      stdout += data.toString();
-    });
-    child.stderr?.on("data", (data) => {
-      stderr += data.toString();
-    });
-    child.on("exit", (code, signal) => {
-      doResolve(code ?? (signal ? 1 : 0), timedOut);
-    });
-    child.on("error", () => {
-      doResolve(1, false);
-    });
-  });
-}
+  };
+};
+var BashSpawnerLayer = Layer.succeed(BashSpawner, makeBashSpawner());
+
+// src/env/tool/built-in/bash.ts
 function getCurrentSpanContext() {
   try {
     const { getTracerProvider } = (init_tracer_provider(), __toCommonJS(exports_tracer_provider));
@@ -207,7 +176,7 @@ var bashTool = {
   metadata: {
     category: "system",
     tags: ["shell", "command", "terminal", "exec"],
-    version: "1.3.0"
+    version: "2.0.0"
   },
   execute: async (args, ctx) => {
     const startTime = Date.now();
@@ -253,11 +222,16 @@ var bashTool = {
     } catch {}
     const spanId = otelSpan?.spanContext?.spanId;
     try {
-      const result = await executeCommand(command, {
-        cwd,
-        timeout,
-        env: childEnv
+      const program = Effect2.gen(function* () {
+        const spawner = yield* BashSpawner;
+        const result2 = yield* spawner.run(command, {
+          cwd,
+          timeout,
+          env: childEnv
+        });
+        return result2;
       });
+      const result = await Effect2.runPromise(program.pipe(Effect2.scoped, Effect2.provide(BashSpawnerLayer)));
       if (otelSpan) {
         if (result.timedOut) {
           const execError = new Error(`Command timed out after ${timeout}ms`);
@@ -339,7 +313,7 @@ var echoTool = {
 import { z as z2 } from "zod";
 import { glob as globAsync } from "glob";
 import { stat } from "fs/promises";
-import path2 from "path";
+import path from "path";
 var globTool = {
   name: "glob",
   description: "Search for files matching a glob pattern. Use this to find files by name patterns like **/*.ts or **/*.md.",
@@ -380,7 +354,7 @@ var globTool = {
       };
     }
     try {
-      const absolutePattern = path2.isAbsolute(pattern) ? pattern : pattern;
+      const absolutePattern = path.isAbsolute(pattern) ? pattern : pattern;
       const files = await globAsync(absolutePattern, {
         cwd: searchDir,
         ignore: ignore || ["**/node_modules/**", "**/.git/**"],
@@ -391,7 +365,7 @@ var globTool = {
       const filesWithMtime = [];
       for (const file of files) {
         try {
-          const fullPath = path2.join(searchDir, file);
+          const fullPath = path.join(searchDir, file);
           const stats = await stat(fullPath);
           if (stats.isFile()) {
             filesWithMtime.push({
@@ -443,7 +417,7 @@ var globTool = {
 // src/env/tool/built-in/read-file.ts
 import { z as z3 } from "zod";
 import { readFile, stat as stat2 } from "fs/promises";
-import path3 from "path";
+import path2 from "path";
 var readFileTool = {
   name: "read_file",
   description: "Read the contents of a file. Use this to read source code, configuration files, or any text files.",
@@ -480,7 +454,7 @@ var readFileTool = {
         metadata: { execution_time_ms: Date.now() - startTime }
       };
     }
-    const normalizedPath = path3.normalize(filePath);
+    const normalizedPath = path2.normalize(filePath);
     try {
       const stats = await stat2(normalizedPath);
       if (stats.isDirectory()) {
@@ -558,7 +532,7 @@ var readFileTool = {
 // src/env/tool/built-in/write-file.ts
 import { z as z4 } from "zod";
 import { writeFile, mkdir, stat as stat3 } from "fs/promises";
-import path4 from "path";
+import path3 from "path";
 var writeFileTool = {
   name: "write_file",
   description: "Write content to a file. Use this to create new files or overwrite existing ones.",
@@ -596,7 +570,7 @@ var writeFileTool = {
         metadata: { execution_time_ms: Date.now() - startTime }
       };
     }
-    const normalizedPath = path4.normalize(filePath);
+    const normalizedPath = path3.normalize(filePath);
     try {
       const stats = await stat3(normalizedPath);
       if (stats.isDirectory()) {
@@ -619,7 +593,7 @@ var writeFileTool = {
     }
     try {
       if (createDirs) {
-        await mkdir(path4.dirname(normalizedPath), { recursive: true });
+        await mkdir(path3.dirname(normalizedPath), { recursive: true });
       }
       const flags = append ? "a" : "w";
       await writeFile(normalizedPath, content, { flag: flags });
@@ -648,7 +622,7 @@ var writeFileTool = {
 // src/env/tool/built-in/edit-file.ts
 import { z as z5 } from "zod";
 import { readFile as readFile2, writeFile as writeFile2, stat as stat4, unlink } from "fs/promises";
-import path5 from "path";
+import path4 from "path";
 import { randomUUID } from "crypto";
 var editFileTool = {
   name: "edit_file",
@@ -687,7 +661,7 @@ var editFileTool = {
         metadata: { execution_time_ms: Date.now() - startTime }
       };
     }
-    const normalizedPath = path5.normalize(filePath);
+    const normalizedPath = path4.normalize(filePath);
     try {
       const stats = await stat4(normalizedPath);
       if (stats.isDirectory()) {
@@ -765,7 +739,7 @@ function escapeRegExp(string) {
 import { z as z6 } from "zod";
 import { readFile as readFile3, stat as stat5 } from "fs/promises";
 import { glob as globAsync2 } from "glob";
-import path6 from "path";
+import path5 from "path";
 function isBinaryContent(content) {
   for (let i = 0;i < Math.min(content.length, 8192); i++) {
     if (content[i] === 0) {
@@ -835,7 +809,7 @@ var grepTool = {
           maxDepth: 10,
           nodir: true
         });
-        files = files.map((f) => path6.join(basePath, f));
+        files = files.map((f) => path5.join(basePath, f));
       }
       const results = [];
       const regexFlags = caseSensitive ? "" : "i";
@@ -866,7 +840,7 @@ var grepTool = {
             regex.lastIndex = 0;
             if (regex.test(lines[i])) {
               const lineNum = showLineNumbers ? `${i + 1}:` : "";
-              const relativePath = path6.relative(basePath, file);
+              const relativePath = path5.relative(basePath, file);
               results.push(`${relativePath}:${lineNum}${lines[i]}`);
               if (results.length >= maxResults)
                 break;

package/dist/shared/@ai-setting/{roy-agent-core-c1q5pw77.js → roy-agent-core-vqspcspb.js}

@@ -8,11 +8,11 @@ import {
 } from "./roy-agent-core-qxhq8ven.js";
 import {
   BaseComponent
-} from "./roy-agent-core-kkbwepqb.js";
+} from "./roy-agent-core-cefh9hjv.js";
 import {
   ToolHookPoints,
   globalHookManager
-} from "./roy-agent-core-gjq1yk68.js";
+} from "./roy-agent-core-86gphny5.js";
 import {
   createLogger,
   init_logger

package/dist/shared/@ai-setting/{roy-agent-core-mrcxzpbg.js → roy-agent-core-wjd5kars.js}

@@ -4,13 +4,13 @@ import {
 } from "./roy-agent-core-qxhq8ven.js";
 import {
   BaseComponent
-} from "./roy-agent-core-kkbwepqb.js";
+} from "./roy-agent-core-cefh9hjv.js";
 import {
   createHook
 } from "./roy-agent-core-2dhd60aw.js";
 import {
   globalHookManager
-} from "./roy-agent-core-gjq1yk68.js";
+} from "./roy-agent-core-86gphny5.js";
 import {
   createLogger,
   init_logger

package/dist/shared/@ai-setting/{roy-agent-core-avq1x4t7.js → roy-agent-core-xb4hvk1m.js}

@@ -1,10 +1,6 @@
 // src/env/event-source/types.ts
 var BUILT_IN_EVENT_SOURCE_TYPES = {
-  LARK_CLI: "lark-cli",
-  WEBSOCKET: "websocket",
-  TIMER: "timer",
-  HTTP_WEBHOOK: "http-webhook",
-  FILE_WATCHER: "file-watcher"
+  LARK_CLI: "lark-cli"
 };
 var BUILT_IN_EVENT_SOURCE_TYPE_LIST = Object.values(BUILT_IN_EVENT_SOURCE_TYPES);
 
@@ -41,12 +37,8 @@ function isValidEventSourceType(type) {
 }
 function getDefaultConfigForType(type) {
   switch (type) {
-    case BUILT_IN_EVENT_SOURCE_TYPES.TIMER:
-      return { interval: 60000 };
     case BUILT_IN_EVENT_SOURCE_TYPES.LARK_CLI:
-      return { command: "lark-cli event +subscribe" };
-    case BUILT_IN_EVENT_SOURCE_TYPES.WEBSOCKET:
-      return {};
+      return { command: "lark-cli event consume im.message.receive_v1 --as bot" };
     default:
       return {};
   }
@@ -65,18 +57,6 @@ function validateEventSourceConfig(config, handler) {
   if (handler) {
     const handlerErrors = handler.validateConfig(config);
     errors.push(...handlerErrors);
-  } else {
-    if (config.type === BUILT_IN_EVENT_SOURCE_TYPES.TIMER) {
-      if (!config.interval || config.interval <= 0) {
-        errors.push("Timer interval must be a positive number");
-      }
-    }
-    if (config.type === BUILT_IN_EVENT_SOURCE_TYPES.LARK_CLI && !config.command) {
-      errors.push("lark-cli command is required");
-    }
-    if (config.type === BUILT_IN_EVENT_SOURCE_TYPES.WEBSOCKET && !config.url) {
-      errors.push("WebSocket URL is required");
-    }
   }
   return errors;
 }

package/dist/shared/@ai-setting/{roy-agent-core-gwc4h96n.js → roy-agent-core-xt3fx7m1.js}

@@ -2,7 +2,7 @@ import {
   BackgroundTaskManager,
   createDelegateTool,
   createStopTool
-} from "./roy-agent-core-vf215qfv.js";
+} from "./roy-agent-core-3prpabp8.js";
 import {
   SQLiteTaskStore,
   getDefaultTaskDbPath
@@ -33,10 +33,10 @@ import {
 } from "./roy-agent-core-qxhq8ven.js";
 import {
   BaseComponent
-} from "./roy-agent-core-kkbwepqb.js";
+} from "./roy-agent-core-cefh9hjv.js";
 import {
   globalHookManager
-} from "./roy-agent-core-gjq1yk68.js";
+} from "./roy-agent-core-86gphny5.js";
 import {
   createLogger,
   init_logger

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-core",
-  "version": "1.5.34",
+  "version": "1.5.36",
   "type": "module",
   "description": "Core SDK for roy-agent - Environment, Components, Tools, Sessions, Tasks",
   "main": "./dist/index.js",
@@ -38,9 +38,12 @@
     "@ai-sdk/google": "^3.0.0",
     "@ai-sdk/openai": "^3.0.0",
     "@ai-sdk/openai-compatible": "^2.0.0",
+    "@effect/platform": "^0.96.1",
+    "@effect/platform-node": "^0.106.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "ai": "^6.0.0",
     "better-sqlite3": "^11.10.0",
+    "effect": "^3.21.2",
     "glob": "^13.0.6",
     "jsonc-parser": "^3.2.0",
     "reflect-metadata": "^0.2.2",