@oagi/oagi 0.1.5 → 0.2.1

package/dist/cli.cjs

@@ -46,6 +46,7 @@ var ActionTypeSchema = z.enum([
   "type",
   "scroll",
   "finish",
+  "fail",
   "wait",
   "call_user"
 ]);
@@ -586,11 +587,11 @@ var MODE_ACTOR = "actor";
 var DEFAULT_MAX_STEPS = 20;
 var DEFAULT_MAX_STEPS_THINKER = 100;
 var DEFAULT_MAX_STEPS_TASKER = 60;
-var MAX_STEPS_ACTOR = 30;
-var MAX_STEPS_THINKER = 120;
+var MAX_STEPS_ACTOR = 100;
+var MAX_STEPS_THINKER = 300;
 var DEFAULT_REFLECTION_INTERVAL = 4;
 var DEFAULT_REFLECTION_INTERVAL_TASKER = 20;
-var DEFAULT_STEP_DELAY = 0.3;
+var DEFAULT_STEP_DELAY = 1;
 var DEFAULT_TEMPERATURE = 0.5;
 var DEFAULT_TEMPERATURE_LOW = 0.1;
 var HTTP_CLIENT_TIMEOUT = 60;
@@ -775,7 +776,9 @@ var parseRawOutput = (rawOutput) => {
   return {
     reason,
     actions,
-    stop: actions.some((action2) => action2.type === "finish")
+    stop: actions.some(
+      (action2) => action2.type === "finish" || action2.type === "fail"
+    )
   };
 };
 
@@ -1369,8 +1372,7 @@ var PlannerMemory = class {
       pending: 0,
       in_progress: 0,
       completed: 0,
-      skipped: 0,
-      blocked: 0
+      skipped: 0
     };
     for (const todo of this.todos) {
       summary[todo.status] = (summary[todo.status] ?? 0) + 1;
@@ -2259,8 +2261,32 @@ asyncAgentRegister("tasker:software_qa")(
 );
 
 // src/handler.ts
-var import_robotjs = __toESM(require("robotjs"), 1);
-var import_sharp = __toESM(require("sharp"), 1);
+var _robot;
+async function getRobot() {
+  if (!_robot) {
+    try {
+      _robot = (await import("robotjs")).default;
+    } catch {
+      throw new Error(
+        "robotjs is not available. Install it with: npm install robotjs\nOn Linux, ensure libx11-dev and libxtst-dev are installed."
+      );
+    }
+  }
+  return _robot;
+}
+var _sharp;
+async function getSharp() {
+  if (!_sharp) {
+    try {
+      _sharp = (await import("sharp")).default;
+    } catch {
+      throw new Error(
+        "sharp is not available. Install it with: npm install sharp"
+      );
+    }
+  }
+  return _sharp;
+}
 var sleep3 = (ms) => new Promise((r) => setTimeout(r, ms));
 var toSharpKernel = (resample) => {
   switch (resample) {
@@ -2319,8 +2345,10 @@ var ScreenshotMaker = class _ScreenshotMaker {
     return arraybuffer;
   }
   async provide() {
-    const { width, height } = import_robotjs.default.getScreenSize();
-    const screenshot = import_robotjs.default.screen.capture(0, 0, width, height);
+    const robot = await getRobot();
+    const sharp = await getSharp();
+    const { width, height } = robot.getScreenSize();
+    const screenshot = robot.screen.capture(0, 0, width, height);
     const channels = 3;
     const data = new Uint8Array(
       screenshot.width * screenshot.height * channels
@@ -2334,7 +2362,7 @@ var ScreenshotMaker = class _ScreenshotMaker {
         data[offset + 2] = screenshot.image.readUInt8(offset2 + 0);
       }
     }
-    let p = (0, import_sharp.default)(Buffer.from(data), {
+    let p = sharp(Buffer.from(data), {
       raw: {
         width: screenshot.width,
         height: screenshot.height,
@@ -2368,8 +2396,9 @@ var DefaultActionHandler = class {
       }
     }
   }
-  #denormalize(x, y) {
-    const { width, height } = import_robotjs.default.getScreenSize();
+  async #denormalize(x, y) {
+    const robot = await getRobot();
+    const { width, height } = robot.getScreenSize();
     let px = Math.floor(x * width / 1e3);
     let py = Math.floor(y * height / 1e3);
     if (px < 1) px = 1;
@@ -2379,51 +2408,52 @@ var DefaultActionHandler = class {
     return { x: px, y: py };
   }
   async #handleOne(action) {
+    const robot = await getRobot();
     const arg = stripOuterParens(action.argument);
     switch (action.type) {
       case "click": {
         const coords = parseCoords(arg);
         if (!coords) throw new Error(`Invalid coords: ${arg}`);
-        const p = this.#denormalize(coords[0], coords[1]);
-        import_robotjs.default.moveMouse(p.x, p.y);
-        import_robotjs.default.mouseClick("left", false);
+        const p = await this.#denormalize(coords[0], coords[1]);
+        robot.moveMouse(p.x, p.y);
+        robot.mouseClick("left", false);
         return;
       }
       case "left_double": {
         const coords = parseCoords(arg);
         if (!coords) throw new Error(`Invalid coords: ${arg}`);
-        const p = this.#denormalize(coords[0], coords[1]);
-        import_robotjs.default.moveMouse(p.x, p.y);
-        import_robotjs.default.mouseClick("left", true);
+        const p = await this.#denormalize(coords[0], coords[1]);
+        robot.moveMouse(p.x, p.y);
+        robot.mouseClick("left", true);
         return;
       }
       case "left_triple": {
         const coords = parseCoords(arg);
         if (!coords) throw new Error(`Invalid coords: ${arg}`);
-        const p = this.#denormalize(coords[0], coords[1]);
-        import_robotjs.default.moveMouse(p.x, p.y);
-        import_robotjs.default.mouseClick("left", true);
-        import_robotjs.default.mouseClick("left", false);
+        const p = await this.#denormalize(coords[0], coords[1]);
+        robot.moveMouse(p.x, p.y);
+        robot.mouseClick("left", true);
+        robot.mouseClick("left", false);
         return;
       }
       case "right_single": {
         const coords = parseCoords(arg);
         if (!coords) throw new Error(`Invalid coords: ${arg}`);
-        const p = this.#denormalize(coords[0], coords[1]);
-        import_robotjs.default.moveMouse(p.x, p.y);
-        import_robotjs.default.mouseClick("right", false);
+        const p = await this.#denormalize(coords[0], coords[1]);
+        robot.moveMouse(p.x, p.y);
+        robot.mouseClick("right", false);
         return;
       }
       case "drag": {
         const coords = parseDragCoords(arg);
         if (!coords) throw new Error(`Invalid drag coords: ${arg}`);
-        const p1 = this.#denormalize(coords[0], coords[1]);
-        const p2 = this.#denormalize(coords[2], coords[3]);
-        import_robotjs.default.moveMouse(p1.x, p1.y);
-        import_robotjs.default.mouseToggle("down", "left");
-        import_robotjs.default.dragMouse(p2.x, p2.y);
+        const p1 = await this.#denormalize(coords[0], coords[1]);
+        const p2 = await this.#denormalize(coords[2], coords[3]);
+        robot.moveMouse(p1.x, p1.y);
+        robot.mouseToggle("down", "left");
+        robot.dragMouse(p2.x, p2.y);
         await sleep3(this.#cfg.dragDurationMs);
-        import_robotjs.default.mouseToggle("up", "left");
+        robot.mouseToggle("up", "left");
         return;
       }
       case "hotkey": {
@@ -2432,7 +2462,7 @@ var DefaultActionHandler = class {
         });
         if (keys.length === 1 && keys[0] === "capslock") {
           if (this.#cfg.capslockMode === "system") {
-            import_robotjs.default.keyTap("capslock");
+            robot.keyTap("capslock");
           } else {
             this.#sessionCapsEnabled = !this.#sessionCapsEnabled;
           }
@@ -2441,31 +2471,32 @@ var DefaultActionHandler = class {
         const last = keys.at(-1);
         if (!last) return;
         const modifiers = keys.slice(0, -1);
-        import_robotjs.default.keyTap(last, modifiers.length ? modifiers : []);
+        robot.keyTap(last, modifiers.length ? modifiers : []);
         await sleep3(this.#cfg.hotkeyDelayMs);
         return;
       }
       case "type": {
         const raw = arg.replace(/^['"]/, "").replace(/['"]$/, "");
         const text = applySessionCaps(raw, this.#sessionCapsEnabled);
-        import_robotjs.default.typeString(text);
+        robot.typeString(text);
         return;
       }
       case "scroll": {
         const parsed = parseScroll(arg);
         if (!parsed) throw new Error(`Invalid scroll: ${arg}`);
-        const p = this.#denormalize(parsed[0], parsed[1]);
+        const p = await this.#denormalize(parsed[0], parsed[1]);
         const direction = parsed[2];
-        import_robotjs.default.moveMouse(p.x, p.y);
+        robot.moveMouse(p.x, p.y);
         const amount = direction === "up" ? this.#cfg.scrollAmount : -this.#cfg.scrollAmount;
-        import_robotjs.default.scrollMouse(0, amount);
+        robot.scrollMouse(0, amount);
         return;
       }
       case "wait": {
         await sleep3(this.#cfg.waitDurationMs);
         return;
       }
-      case "finish": {
+      case "finish":
+      case "fail": {
         this.reset();
         return;
       }
@@ -2551,7 +2582,6 @@ var StepTracker = class extends StepObserver {
 };
 
 // src/cli/agent.ts
-var import_node_mac_permissions = __toESM(require("@hurdlegroup/node-mac-permissions"), 1);
 var logger6 = logger_default("cli.agent");
 var checkPermissions = async () => {
   if (process.platform !== "darwin") {
@@ -2563,18 +2593,28 @@ var checkPermissions = async () => {
     );
     return;
   }
-  const screenPermission = import_node_mac_permissions.default.getAuthStatus("screen");
-  const accessibilityPermission = import_node_mac_permissions.default.getAuthStatus("accessibility");
+  let macPerm;
+  try {
+    macPerm = (await import("@hurdlegroup/node-mac-permissions")).default;
+  } catch {
+    console.error(
+      "node-mac-permissions not available. Install with: npm install @hurdlegroup/node-mac-permissions"
+    );
+    process.exitCode = 1;
+    return;
+  }
+  const screenPermission = macPerm.getAuthStatus("screen");
+  const accessibilityPermission = macPerm.getAuthStatus("accessibility");
   console.log("Checking permissions...");
   console.log(`  ${screenPermission ? "[OK]" : "[MISSING]"} Screen Recording`);
   console.log(
     `  ${accessibilityPermission ? "[OK]" : "[MISSING]"} Accessibility`
   );
   if (!screenPermission) {
-    import_node_mac_permissions.default.askForScreenCaptureAccess(true);
+    macPerm.askForScreenCaptureAccess(true);
   }
   if (!accessibilityPermission) {
-    import_node_mac_permissions.default.askForAccessibilityAccess();
+    macPerm.askForAccessibilityAccess();
   }
   if (screenPermission && accessibilityPermission) {
     console.log("All permissions granted. You can run the agent.");