@openape/ape-agent 2.9.1 → 2.10.0

package/dist/bridge.mjs

@@ -802,17 +802,58 @@ ${e.cyan(d)}
   }
 });
 
-// ../../node_modules/.pnpm/shell-quote@1.8.3/node_modules/shell-quote/quote.js
+// ../../node_modules/.pnpm/shell-quote@1.8.4/node_modules/shell-quote/quote.js
 var require_quote = __commonJS({
-  "../../node_modules/.pnpm/shell-quote@1.8.3/node_modules/shell-quote/quote.js"(exports, module) {
+  "../../node_modules/.pnpm/shell-quote@1.8.4/node_modules/shell-quote/quote.js"(exports, module) {
     "use strict";
+    var OPS = [
+      "||",
+      "&&",
+      ";;",
+      "|&",
+      "<(",
+      "<<<",
+      ">>",
+      ">&",
+      "<&",
+      "&",
+      ";",
+      "(",
+      ")",
+      "|",
+      "<",
+      ">"
+    ];
+    var LINE_TERMINATORS = /[\n\r\u2028\u2029]/;
+    var GLOB_SHELL_SPECIAL = /[\s#!"$&'():;<=>@\\^`|]/g;
     module.exports = function quote(xs) {
       return xs.map(function(s2) {
         if (s2 === "") {
           return "''";
         }
         if (s2 && typeof s2 === "object") {
-          return s2.op.replace(/(.)/g, "\\$1");
+          if (s2.op === "glob") {
+            if (typeof s2.pattern !== "string") {
+              throw new TypeError("glob token requires a string `pattern`");
+            }
+            if (LINE_TERMINATORS.test(s2.pattern)) {
+              throw new TypeError("glob `pattern` must not contain line terminators");
+            }
+            return s2.pattern.replace(GLOB_SHELL_SPECIAL, "\\$&");
+          }
+          if (typeof s2.op === "string") {
+            if (OPS.indexOf(s2.op) < 0) {
+              throw new TypeError("invalid `op` value: " + JSON.stringify(s2.op));
+            }
+            return s2.op.replace(/[\s\S]/g, "\\$&");
+          }
+          if (typeof s2.comment === "string") {
+            if (LINE_TERMINATORS.test(s2.comment)) {
+              throw new TypeError("`comment` must not contain line terminators");
+            }
+            return "#" + s2.comment;
+          }
+          throw new TypeError("unrecognized object token shape");
         }
         if (/["\s\\]/.test(s2) && !/'/.test(s2)) {
           return "'" + s2.replace(/(['])/g, "\\$1") + "'";
@@ -826,9 +867,9 @@ var require_quote = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/shell-quote@1.8.3/node_modules/shell-quote/parse.js
+// ../../node_modules/.pnpm/shell-quote@1.8.4/node_modules/shell-quote/parse.js
 var require_parse = __commonJS({
-  "../../node_modules/.pnpm/shell-quote@1.8.3/node_modules/shell-quote/parse.js"(exports, module) {
+  "../../node_modules/.pnpm/shell-quote@1.8.4/node_modules/shell-quote/parse.js"(exports, module) {
     "use strict";
     var CONTROL = "(?:" + [
       "\\|\\|",
@@ -1023,9 +1064,9 @@ var require_parse = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/shell-quote@1.8.3/node_modules/shell-quote/index.js
+// ../../node_modules/.pnpm/shell-quote@1.8.4/node_modules/shell-quote/index.js
 var require_shell_quote = __commonJS({
-  "../../node_modules/.pnpm/shell-quote@1.8.3/node_modules/shell-quote/index.js"(exports) {
+  "../../node_modules/.pnpm/shell-quote@1.8.4/node_modules/shell-quote/index.js"(exports) {
     "use strict";
     exports.quote = require_quote();
     exports.parse = require_parse();
@@ -3130,7 +3171,7 @@ function extractOption(args, name) {
   return void 0;
 }
 
-// ../../packages/apes/dist/chunk-NYJSBFLG.js
+// ../../packages/apes/dist/chunk-MMBFV5WN.js
 init_chunk_OBF7IMQ2();
 var debug = process.argv.includes("--debug");
 
@@ -3156,13 +3197,14 @@ function capStdio(s2) {
   return `${buf.subarray(0, MAX_STDIO_BYTES).toString("utf8")}
 [truncated to ${MAX_STDIO_BYTES} bytes]`;
 }
-function runApeShell(cmd, timeoutMs = DEFAULT_TIMEOUT_MS) {
+function runApeShell(cmd, timeoutMs = DEFAULT_TIMEOUT_MS, cwd) {
   const bypass = process.env.OPENAPE_BYPASS_APE_SHELL === "1";
   const [execBin, execArgs] = bypass ? ["/bin/bash", ["-c", cmd]] : [BIN, ["-c", cmd]];
   return new Promise((resolveResult) => {
     const child = spawn(execBin, execArgs, {
       env: { ...process.env, APE_WAIT: "1" },
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", "pipe", "pipe"],
+      ...cwd ? { cwd } : {}
     });
     let stdout2 = "";
     let stderr = "";
@@ -4141,6 +4183,9 @@ var REVIEW_SYSTEM = [
 // src/cron-runner.ts
 var TASK_CACHE_DIR = join4(homedir6(), ".openape", "agent", "tasks");
 var AGENT_CONFIG_PATH = join4(homedir6(), ".openape", "agent", "agent.json");
+function resolveRecipeDir() {
+  return process.env.OPENAPE_RECIPE_DEV_DIR || join4(homedir6(), "recipe");
+}
 var TASK_THREADS_PATH = join4(homedir6(), ".openape", "agent", "task-threads.json");
 var TICK_INTERVAL_MS = 6e4;
 function parseField(token, range, allowStep) {
@@ -4207,6 +4252,9 @@ ${tail(out, 2500)}`);
 ${tail(err, 2500)}`);
   return parts.join("\n\n");
 }
+function shouldReportCommandRun(exitCode, stdout2, stderr) {
+  return exitCode !== 0 || `${stdout2}${stderr}`.trim() !== "";
+}
 function readSystemPrompt() {
   if (!existsSync3(AGENT_CONFIG_PATH)) return "";
   try {
@@ -4327,13 +4375,15 @@ var CronRunner = class {
   async runTask(sessionId, systemPrompt, spec) {
     if (spec.command) {
       try {
-        const res = await runApeShell(spec.command, 30 * 60 * 1e3);
+        const recipeDir = resolveRecipeDir();
+        const res = await runApeShell(spec.command, 30 * 60 * 1e3, existsSync3(recipeDir) ? recipeDir : void 0);
         const turn = this.pending.get(sessionId);
         if (!turn) return;
         turn.status = res.exit_code === 0 ? "ok" : "error";
         turn.accumulated = composeTaskOutput(spec.command, res.exit_code, res.stdout, res.stderr);
         await this.finaliseRun(turn, 1);
-        await this.postResult(sessionId, turn);
+        if (shouldReportCommandRun(res.exit_code, res.stdout, res.stderr))
+          await this.postResult(sessionId, turn);
         this.pending.delete(sessionId);
       } catch (err) {
         const turn = this.pending.get(sessionId);
@@ -4711,6 +4761,8 @@ function createThrottle(fn, intervalMs) {
 
 // src/thread-session.ts
 var PATCH_INTERVAL_MS = 300;
+var NO_ACTIVITY_TIMEOUT_MS = 6e4;
+var NO_RESPONSE_MESSAGE = "(no response from the model backend \u2014 it may be unavailable or its API auth expired; nothing was changed, please retry)";
 var ThreadSession = class {
   constructor(deps) {
     this.deps = deps;
@@ -4772,6 +4824,18 @@ var ThreadSession = class {
     };
     const { systemPrompt, tools } = this.deps.resolveConfig();
     await this.backfillHistoryOnce(replyToMessageId, body);
+    let sawActivity = false;
+    let turnSettled = false;
+    const settleOnce = () => {
+      if (turnSettled) return true;
+      turnSettled = true;
+      return false;
+    };
+    const watchdog = setTimeout(() => {
+      if (sawActivity || this.active !== turn || settleOnce()) return;
+      this.deps.log(`turn watchdog: no model activity in ${NO_ACTIVITY_TIMEOUT_MS}ms \u2014 failing turn (room=${this.deps.roomId} thread=${this.deps.threadId})`);
+      void this.failTurn(NO_RESPONSE_MESSAGE);
+    }, NO_ACTIVITY_TIMEOUT_MS);
     try {
       const result = await runLoop({
         config: this.deps.runtimeConfig,
@@ -4782,11 +4846,13 @@ var ThreadSession = class {
         history: this.history,
         handlers: {
           onTextDelta: (delta) => {
+            sawActivity = true;
             if (!this.active) return;
             this.active.accumulated += delta;
             this.active.throttle.schedule();
           },
           onToolCall: ({ name }) => {
+            sawActivity = true;
             this.deps.log(`[${this.deps.roomId}/${this.deps.threadId.slice(0, 8)}] tool_call: ${name}`);
             void setStatus(`\u{1F527} ${name}`);
           },
@@ -4800,15 +4866,23 @@ var ThreadSession = class {
           }
         }
       });
+      clearTimeout(watchdog);
+      if (settleOnce()) return;
       this.history.push({ role: "user", content: body });
       if (result.finalMessage) {
         this.history.push({ role: "assistant", content: result.finalMessage });
       }
       if (result.status === "error") {
         this.deps.log(`runtime done with status=error (room=${this.deps.roomId} thread=${this.deps.threadId})`);
+        if (!turn.accumulated) {
+          await this.failTurn("(the model run ended with an error and produced no output \u2014 please retry)");
+          return;
+        }
       }
       await this.endTurn();
     } catch (err) {
+      clearTimeout(watchdog);
+      if (settleOnce()) return;
       const message = err instanceof Error ? err.message : String(err);
       this.deps.log(`runtime error (room=${this.deps.roomId} thread=${this.deps.threadId}): ${message}`);
       await this.failTurn(`(runtime error: ${message})`);