@openape/ape-agent 2.8.13 → 2.8.14

package/dist/bridge.mjs

@@ -2594,7 +2594,7 @@ async function runLoop(opts) {
 }
 var RPC_SESSION_TTL_MS = 60 * 60 * 1e3;
 
-// ../../packages/apes/dist/chunk-DYSFQ26B.js
+// ../../packages/apes/dist/chunk-PEA2RDWK.js
 init_chunk_OBF7IMQ2();
 import { createHash } from "crypto";
 import { existsSync as existsSync3, readdirSync as readdirSync2, readFileSync as readFileSync4 } from "fs";
@@ -2632,6 +2632,149 @@ async function computeArgvHash(argv2) {
   const digest2 = Array.from(hashArray).map((b2) => b2.toString(16).padStart(2, "0")).join("");
   return `SHA-256:${digest2}`;
 }
+function parseOptionArgs(tokens, valueOptions) {
+  const options = {};
+  const positionals = [];
+  const takesValue = new Set(valueOptions ?? []);
+  for (let index = 0; index < tokens.length; index += 1) {
+    const token = tokens[index];
+    if (token.startsWith("--")) {
+      const stripped = token.slice(2);
+      const eqIndex = stripped.indexOf("=");
+      if (eqIndex >= 0) {
+        options[stripped.slice(0, eqIndex)] = stripped.slice(eqIndex + 1);
+        continue;
+      }
+      const next = tokens[index + 1];
+      if (next && !next.startsWith("-")) {
+        options[stripped] = next;
+        index += 1;
+        continue;
+      }
+      options[stripped] = "true";
+    } else if (token.startsWith("-") && token.length > 1 && !/^-\d/.test(token)) {
+      const key = token.slice(1);
+      if (key.length === 1 && !takesValue.has(key)) {
+        options[key] = "true";
+      } else {
+        const next = tokens[index + 1];
+        if (next && !next.startsWith("-")) {
+          options[key] = next;
+          index += 1;
+        } else {
+          options[key] = "true";
+        }
+      }
+    } else {
+      positionals.push(token);
+    }
+  }
+  return { options, positionals };
+}
+function resolveBindingToken(binding, bindings) {
+  const match = binding.match(/^\{([^}|]+)(?:\|([^}]+))?\}$/);
+  if (!match) return binding;
+  const [, name, transform] = match;
+  const value = bindings[name];
+  if (!value) throw new Error(`Missing binding: ${name}`);
+  if (!transform) return value;
+  if (transform === "owner" || transform === "name") {
+    const [owner, repo] = value.split("/");
+    if (!owner || !repo) throw new Error(`Binding ${name} must be in owner/name form`);
+    return transform === "owner" ? owner : repo;
+  }
+  throw new Error(`Unsupported binding transform: ${transform}`);
+}
+function renderTemplate(template, bindings) {
+  return template.replace(/\{([^}]+)\}/g, (_3, expression) => resolveBindingToken(`{${expression}}`, bindings));
+}
+function parseResourceChain(chain, bindings) {
+  return chain.map((entry) => {
+    const [resource, selectorSpec = "*"] = entry.split(":", 2);
+    if (!resource) throw new Error(`Invalid resource chain entry: ${entry}`);
+    if (selectorSpec === "*") return { resource };
+    const selector = Object.fromEntries(
+      selectorSpec.split(",").map((segment) => {
+        const [key, rawValue] = segment.split("=", 2);
+        if (!key || !rawValue) throw new Error(`Invalid selector segment: ${segment}`);
+        return [key, renderTemplate(rawValue, bindings)];
+      })
+    );
+    return { resource, selector };
+  });
+}
+function matchOperation(operation, argv2) {
+  if (argv2.length < operation.command.length) return null;
+  const prefix = argv2.slice(0, operation.command.length);
+  if (prefix.join("\0") !== operation.command.join("\0")) return null;
+  const remainder = argv2.slice(operation.command.length);
+  const { options, positionals } = parseOptionArgs(remainder, operation.required_options);
+  const expectedPositionals = operation.positionals ?? [];
+  if (positionals.length !== expectedPositionals.length) return null;
+  for (const option of operation.required_options ?? []) {
+    if (!options[option]) return null;
+  }
+  const bindings = { ...options };
+  for (let index = 0; index < expectedPositionals.length; index += 1) {
+    const name = expectedPositionals[index];
+    const value = positionals[index];
+    if (name.startsWith("=")) {
+      if (value !== name.slice(1)) return null;
+      continue;
+    }
+    bindings[name] = value;
+  }
+  return bindings;
+}
+function expandCombinedFlags(argv2) {
+  return argv2.flatMap((token) => {
+    if (token.startsWith("-") && !token.startsWith("--") && token.length > 2 && /^-[a-z]+$/i.test(token)) {
+      return Array.from(token.slice(1), (c3) => `-${c3}`);
+    }
+    return [token];
+  });
+}
+function tryMatch(operations, argv2) {
+  return operations.flatMap((operation) => {
+    try {
+      const bindings = matchOperation(operation, argv2);
+      return bindings ? [{ operation, bindings }] : [];
+    } catch {
+      return [];
+    }
+  });
+}
+function matchArgvToOperation(operations, commandArgv) {
+  let matches = tryMatch(operations, commandArgv);
+  if (matches.length === 0) {
+    const expanded = expandCombinedFlags(commandArgv);
+    if (expanded.length !== commandArgv.length) {
+      matches = tryMatch(operations, expanded);
+    }
+  }
+  if (matches.length === 0) return null;
+  if (matches.length > 1) {
+    matches.sort((a2, b2) => b2.operation.command.length - a2.operation.command.length);
+    matches = [matches[0]];
+  }
+  return matches[0];
+}
+function buildCliAuthDetail(cliId, operation, bindings) {
+  const resource_chain = parseResourceChain(operation.resource_chain, bindings);
+  const detail = {
+    type: "openape_cli",
+    cli_id: cliId,
+    operation_id: operation.id,
+    resource_chain,
+    action: operation.action,
+    permission: "",
+    display: renderTemplate(operation.display, bindings),
+    risk: operation.risk,
+    ...operation.exact_command ? { constraints: { exact_command: true } } : {}
+  };
+  detail.permission = canonicalizeCliPermission(detail);
+  return detail;
+}
 
 // ../../node_modules/.pnpm/consola@3.4.2/node_modules/consola/dist/core.mjs
 var LogLevels = {
@@ -3734,7 +3877,7 @@ function _getDefaultLogLevel() {
 }
 var consola = createConsola2();
 
-// ../../packages/apes/dist/chunk-DYSFQ26B.js
+// ../../packages/apes/dist/chunk-PEA2RDWK.js
 var import_shell_quote = __toESM(require_shell_quote(), 1);
 
 // ../../node_modules/.pnpm/citty@0.2.2/node_modules/citty/dist/index.mjs
@@ -3743,7 +3886,7 @@ function defineCommand(def) {
   return def;
 }
 
-// ../../packages/apes/dist/chunk-DYSFQ26B.js
+// ../../packages/apes/dist/chunk-PEA2RDWK.js
 import { homedir as homedir52 } from "os";
 import { join as join5 } from "path";
 function parseKeyValue(line) {
@@ -3916,131 +4059,6 @@ function loadAdapter(cliId, explicitPath) {
 }
 var REGISTRY_URL = process.env.SHAPES_REGISTRY_URL ?? "https://raw.githubusercontent.com/openape-ai/shapes-registry/main/registry.json";
 var CACHE_TTL_MS = 60 * 60 * 1e3;
-function parseOptionArgs(tokens, valueOptions) {
-  const options = {};
-  const positionals = [];
-  const takesValue = new Set(valueOptions ?? []);
-  for (let index = 0; index < tokens.length; index += 1) {
-    const token = tokens[index];
-    if (token.startsWith("--")) {
-      const stripped = token.slice(2);
-      const eqIndex = stripped.indexOf("=");
-      if (eqIndex >= 0) {
-        options[stripped.slice(0, eqIndex)] = stripped.slice(eqIndex + 1);
-        continue;
-      }
-      const next = tokens[index + 1];
-      if (next && !next.startsWith("-")) {
-        options[stripped] = next;
-        index += 1;
-        continue;
-      }
-      options[stripped] = "true";
-    } else if (token.startsWith("-") && token.length > 1 && !/^-\d/.test(token)) {
-      const key = token.slice(1);
-      if (key.length === 1 && !takesValue.has(key)) {
-        options[key] = "true";
-      } else {
-        const next = tokens[index + 1];
-        if (next && !next.startsWith("-")) {
-          options[key] = next;
-          index += 1;
-        } else {
-          options[key] = "true";
-        }
-      }
-    } else {
-      positionals.push(token);
-    }
-  }
-  return { options, positionals };
-}
-function resolveBindingToken(binding, bindings) {
-  const match = binding.match(/^\{([^}|]+)(?:\|([^}]+))?\}$/);
-  if (!match)
-    return binding;
-  const [, name, transform] = match;
-  const value = bindings[name];
-  if (!value)
-    throw new Error(`Missing binding: ${name}`);
-  if (!transform)
-    return value;
-  if (transform === "owner" || transform === "name") {
-    const [owner, repo] = value.split("/");
-    if (!owner || !repo)
-      throw new Error(`Binding ${name} must be in owner/name form`);
-    return transform === "owner" ? owner : repo;
-  }
-  throw new Error(`Unsupported binding transform: ${transform}`);
-}
-function renderTemplate(template, bindings) {
-  return template.replace(/\{([^}]+)\}/g, (_3, expression) => resolveBindingToken(`{${expression}}`, bindings));
-}
-function parseResourceChain(chain, bindings) {
-  return chain.map((entry) => {
-    const [resource, selectorSpec = "*"] = entry.split(":", 2);
-    if (!resource)
-      throw new Error(`Invalid resource chain entry: ${entry}`);
-    if (selectorSpec === "*") {
-      return { resource };
-    }
-    const selector = Object.fromEntries(
-      selectorSpec.split(",").map((segment) => {
-        const [key, rawValue] = segment.split("=", 2);
-        if (!key || !rawValue)
-          throw new Error(`Invalid selector segment: ${segment}`);
-        return [key, renderTemplate(rawValue, bindings)];
-      })
-    );
-    return { resource, selector };
-  });
-}
-function matchOperation(operation, argv2) {
-  if (argv2.length < operation.command.length)
-    return null;
-  const prefix = argv2.slice(0, operation.command.length);
-  if (prefix.join("\0") !== operation.command.join("\0"))
-    return null;
-  const remainder = argv2.slice(operation.command.length);
-  const { options, positionals } = parseOptionArgs(remainder, operation.required_options);
-  const expectedPositionals = operation.positionals ?? [];
-  if (positionals.length !== expectedPositionals.length)
-    return null;
-  for (const option of operation.required_options ?? []) {
-    if (!options[option])
-      return null;
-  }
-  const bindings = { ...options };
-  for (let index = 0; index < expectedPositionals.length; index += 1) {
-    const name = expectedPositionals[index];
-    const value = positionals[index];
-    if (name.startsWith("=")) {
-      if (value !== name.slice(1))
-        return null;
-      continue;
-    }
-    bindings[name] = value;
-  }
-  return bindings;
-}
-function expandCombinedFlags(argv2) {
-  return argv2.flatMap((token) => {
-    if (token.startsWith("-") && !token.startsWith("--") && token.length > 2 && /^-[a-z]+$/i.test(token)) {
-      return Array.from(token.slice(1), (c3) => `-${c3}`);
-    }
-    return [token];
-  });
-}
-function tryMatch(operations, argv2) {
-  return operations.flatMap((operation) => {
-    try {
-      const bindings = matchOperation(operation, argv2);
-      return bindings ? [{ operation, bindings }] : [];
-    } catch {
-      return [];
-    }
-  });
-}
 async function resolveCommand(loaded, fullArgv) {
   const [executable, ...commandArgv] = fullArgv;
   if (!executable) {
@@ -4049,34 +4067,12 @@ async function resolveCommand(loaded, fullArgv) {
   if (executable !== loaded.adapter.cli.executable) {
     throw new Error(`Adapter ${loaded.adapter.cli.id} expects executable ${loaded.adapter.cli.executable}, got ${executable}`);
   }
-  let matches = tryMatch(loaded.adapter.operations, commandArgv);
-  if (matches.length === 0) {
-    const expanded = expandCombinedFlags(commandArgv);
-    if (expanded.length !== commandArgv.length) {
-      matches = tryMatch(loaded.adapter.operations, expanded);
-    }
-  }
-  if (matches.length === 0) {
+  const match = matchArgvToOperation(loaded.adapter.operations, commandArgv);
+  if (!match) {
     throw new Error(`No adapter operation matched: ${fullArgv.join(" ")}`);
   }
-  if (matches.length > 1) {
-    matches.sort((a2, b2) => b2.operation.command.length - a2.operation.command.length);
-    matches = [matches[0]];
-  }
-  const { operation, bindings } = matches[0];
-  const resource_chain = parseResourceChain(operation.resource_chain, bindings);
-  const detail = {
-    type: "openape_cli",
-    cli_id: loaded.adapter.cli.id,
-    operation_id: operation.id,
-    resource_chain,
-    action: operation.action,
-    permission: "",
-    display: renderTemplate(operation.display, bindings),
-    risk: operation.risk,
-    ...operation.exact_command ? { constraints: { exact_command: true } } : {}
-  };
-  detail.permission = canonicalizeCliPermission(detail);
+  const { operation, bindings } = match;
+  const detail = buildCliAuthDetail(loaded.adapter.cli.id, operation, bindings);
   return {
     adapter: loaded.adapter,
     source: loaded.source,
@@ -4466,7 +4462,7 @@ function readAgentIdentity() {
   const ownerEmail = parsed.owner_email ?? process.env.OPENAPE_OWNER_EMAIL;
   if (!ownerEmail) {
     throw new Error(
-      `auth.json at ${path} missing 'owner_email' and no OPENAPE_OWNER_EMAIL env var set \u2014 re-spawn the agent with @openape/apes >= 0.28 or add OPENAPE_OWNER_EMAIL to the launchd plist`
+      `auth.json at ${path} missing 'owner_email' and no OPENAPE_OWNER_EMAIL env var set \u2014 re-spawn the agent with @openape/apes >= 0.28 or set OPENAPE_OWNER_EMAIL in the container env`
     );
   }
   return { email: parsed.email, ownerEmail, idp: parsed.idp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openape/ape-agent",
-  "version": "2.8.13",
+  "version": "2.8.14",
   "description": "OpenApe agent runtime: per-agent process that connects to chat.openape.ai, runs the LLM loop with tools + cron tasks, and streams replies back to owners.",
   "type": "module",
   "license": "MIT",
@@ -23,9 +23,9 @@
     "ofetch": "^1.4.1",
     "ws": "^8.18.0",
     "yaml": "^2.8.0",
-    "@openape/apes": "1.28.12",
-    "@openape/cli-auth": "0.5.0",
-    "@openape/prompt-injection-detector": "0.1.0"
+    "@openape/apes": "1.28.13",
+    "@openape/prompt-injection-detector": "0.1.0",
+    "@openape/cli-auth": "0.5.0"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^7.6.1",