@openape/ape-agent 2.1.0 → 2.3.0

package/default-skills/bash/SKILL.md

@@ -1,7 +1,9 @@
 ---
 name: bash
 description: When a task can't be done with the other curated tools (file.read, http.get, tasks.create, mail.list, etc.), use bash — runs any shell command on the agent host through the DDISA grant cycle.
-requires_tools: [bash]
+metadata:
+  openape:
+    requires_tools: [bash]
 ---
 
 # Shell access via ape-shell

package/default-skills/file/SKILL.md

@@ -1,7 +1,9 @@
 ---
 name: file
 description: When the user asks you to read, write, or check a file in your home directory, use the file.read / file.write tools — they're $HOME-jailed and safer than bash cat.
-requires_tools: [file.read]
+metadata:
+  openape:
+    requires_tools: [file.read]
 ---
 
 # Files in $HOME

package/default-skills/http/SKILL.md

@@ -1,7 +1,9 @@
 ---
 name: http
 description: When the user asks to fetch a webpage, hit a REST API, or POST JSON to an endpoint, use the http.get / http.post tools — never invent URLs.
-requires_tools: [http.get]
+metadata:
+  openape:
+    requires_tools: [http.get]
 ---
 
 # HTTP fetch

package/default-skills/mail/SKILL.md

@@ -1,7 +1,15 @@
 ---
 name: mail
 description: When the user asks about their inbox — what's there, search for an email, recent unread — use mail.list / mail.search.
-requires_tools: [mail.list]
+metadata:
+  openape:
+    requires_tools: [mail.list]
+  openclaw:
+    # If the o365-cli binary isn't on PATH the underlying tool fails
+    # at runtime — skip the skill from the prompt so the LLM doesn't
+    # try to use it on a host where it can't run.
+    requires:
+      bins: [o365-cli]
 ---
 
 # Inbox (o365-cli)

package/default-skills/tasks/SKILL.md

@@ -1,7 +1,15 @@
 ---
 name: tasks
 description: When the user wants to see, create, or schedule a task/reminder/wiedervorlage on their personal task list, use tasks.list / tasks.create.
-requires_tools: [tasks.list]
+metadata:
+  openape:
+    requires_tools: [tasks.list]
+  openclaw:
+    # The bash escape-hatch path uses ape-tasks; surface it as a soft
+    # dependency so on a host without ape-tasks the LLM is told this
+    # skill doesn't apply.
+    requires:
+      bins: [ape-tasks]
 ---
 
 # Personal tasks (ape-tasks)

package/default-skills/time/SKILL.md

@@ -1,7 +1,9 @@
 ---
 name: time
 description: When the user asks for the current time, date, or wants a sanity-check that the runtime is alive, use the time.now tool — never guess.
-requires_tools: [time.now]
+metadata:
+  openape:
+    requires_tools: [time.now]
 ---
 
 # Time and date

package/dist/bridge.mjs

@@ -1353,11 +1353,12 @@ var ChatApi = class {
     this.bearer = bearer;
   }
   async postMessage(roomId, body, opts = {}) {
-    const trimmed = clamp(body, MAX_BODY);
+    const bodyForServer = opts.streaming ? body : clamp(body, MAX_BODY);
     const url = `${this.endpoint}/api/rooms/${encodeURIComponent(roomId)}/messages`;
-    const payload = { body: trimmed };
+    const payload = { body: bodyForServer };
     if (opts.replyTo) payload.reply_to = opts.replyTo;
     if (opts.threadId) payload.thread_id = opts.threadId;
+    if (opts.streaming) payload.streaming = true;
     const result = await ofetch5(url, {
       method: "POST",
       headers: { Authorization: await this.bearer() },
@@ -1401,13 +1402,32 @@ var ChatApi = class {
       body: { name: name.slice(0, 100) }
     });
   }
-  async patchMessage(messageId, body) {
-    const trimmed = clamp(body, MAX_BODY);
+  /**
+   * Update an in-flight or completed message. The server differentiates
+   * three modes via the message's current `streaming` state and the
+   * `streaming` field in this call:
+   *
+   *   - Stream tick: pass `body` only (current accumulated text).
+   *     Server keeps streaming=true and does NOT bump edited_at.
+   *   - Stream end: pass `body` + `streaming: false`. Server clears
+   *     the streaming flag and triggers the user-facing push.
+   *   - Tool-call status: pass `streamingStatus` only (no body).
+   *     Renders as "🔧 time.now" in the typing-subtitle.
+   *   - Tool-call cleared: pass `streamingStatus: null`.
+   */
+  async patchMessage(messageId, opts = {}) {
     const url = `${this.endpoint}/api/messages/${encodeURIComponent(messageId)}`;
+    const payload = {};
+    if (opts.body !== void 0) {
+      payload.body = opts.streaming === false && opts.body.trim().length === 0 ? clamp(opts.body, MAX_BODY) : opts.body.length <= MAX_BODY ? opts.body : `${opts.body.slice(0, MAX_BODY - 1)}\u2026`;
+    }
+    if (opts.streaming !== void 0) payload.streaming = opts.streaming;
+    if (opts.streamingStatus !== void 0) payload.streaming_status = opts.streamingStatus;
+    if (Object.keys(payload).length === 0) return;
     await ofetch5(url, {
       method: "PATCH",
       headers: { Authorization: await this.bearer() },
-      body: { body: trimmed }
+      body: payload
     });
   }
 };
@@ -3800,10 +3820,12 @@ function shouldAutoAccept(peerEmail, identity, allowlist) {
 }
 
 // src/skills.ts
+import { execFileSync as execFileSync3 } from "child_process";
 import { existsSync as existsSync6, readdirSync as readdirSync4, readFileSync as readFileSync7, statSync } from "fs";
 import { homedir as homedir8 } from "os";
 import { dirname as dirname2, join as join8, resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
+import { parse as parseYaml } from "yaml";
 var SKILLS_SUBDIR = [".openape", "agent", "skills"];
 var SOUL_PATH_PARTS = [".openape", "agent", "SOUL.md"];
 function soulPath(home = homedir8()) {
@@ -3828,40 +3850,48 @@ function parseFrontmatter(content) {
   const closeIdx = trimmed.indexOf("\n---", 3);
   if (closeIdx < 0) return null;
   const fmBlock = trimmed.slice(3, closeIdx).trim();
-  const fields = {};
-  let arrayKey = null;
-  let arrayBuf = [];
-  for (const rawLine of fmBlock.split("\n")) {
-    const line = rawLine.replace(/\r$/, "");
-    if (arrayKey) {
-      const m2 = line.match(/^[\t ]*-[\t ]+(\S.*)$/);
-      if (m2) {
-        arrayBuf.push(m2[1].trim());
-        continue;
-      }
-      fields[arrayKey] = arrayBuf.join(",");
-      arrayKey = null;
-      arrayBuf = [];
-    }
-    const kv = line.match(/^([a-z_]\w*)[\t ]*:[\t ]?(.*)$/i);
-    if (!kv) continue;
-    const [, key, value] = kv;
-    if (value.trim() === "") {
-      arrayKey = key;
-      arrayBuf = [];
-      continue;
-    }
-    const inlineArray = value.match(/^\[(.*)\]$/);
-    if (inlineArray) {
-      fields[key] = inlineArray[1].split(",").map((s2) => s2.trim().replace(/^["']|["']$/g, "")).filter(Boolean).join(",");
-      continue;
+  let parsed;
+  try {
+    parsed = parseYaml(fmBlock);
+  } catch {
+    return null;
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+  const fields = parsed;
+  const name = typeof fields.name === "string" ? fields.name.trim() : "";
+  const description = typeof fields.description === "string" ? fields.description.trim() : "";
+  if (!name || !description) return null;
+  function asStringArray(v2) {
+    if (!Array.isArray(v2)) return void 0;
+    const out = v2.map((x2) => typeof x2 === "string" ? x2.trim() : "").filter((s2) => s2.length > 0);
+    return out.length > 0 ? out : void 0;
+  }
+  const meta = fields.metadata && typeof fields.metadata === "object" && !Array.isArray(fields.metadata) ? fields.metadata : {};
+  const openapeMeta = meta.openape && typeof meta.openape === "object" && !Array.isArray(meta.openape) ? meta.openape : {};
+  const openclawMeta = meta.openclaw && typeof meta.openclaw === "object" && !Array.isArray(meta.openclaw) ? meta.openclaw : {};
+  const requiresTools = asStringArray(openapeMeta.requires_tools) ?? asStringArray(fields.requires_tools);
+  function readRequiresBins(scope) {
+    const requires = scope.requires;
+    if (requires && typeof requires === "object" && !Array.isArray(requires)) {
+      return asStringArray(requires.bins);
     }
-    fields[key] = value.trim().replace(/^["']|["']$/g, "");
+    return void 0;
   }
-  if (arrayKey) fields[arrayKey] = arrayBuf.join(",");
-  if (!fields.name || !fields.description) return null;
-  const requiresTools = fields.requires_tools ? fields.requires_tools.split(",").map((s2) => s2.trim()).filter(Boolean) : void 0;
-  return { name: fields.name, description: fields.description, requiresTools };
+  const requiresBins = readRequiresBins(openclawMeta) ?? readRequiresBins(openapeMeta) ?? asStringArray(fields.requires_bins);
+  return { name, description, requiresTools, requiresBins };
+}
+var binCheckCache = /* @__PURE__ */ new Map();
+function hasBinaryOnPath(bin) {
+  const cached = binCheckCache.get(bin);
+  if (cached !== void 0) return cached;
+  let found = false;
+  try {
+    execFileSync3("/usr/bin/which", [bin], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
+    found = true;
+  } catch {
+  }
+  binCheckCache.set(bin, found);
+  return found;
 }
 function scanSkillsDir(dir) {
   if (!existsSync6(dir)) return [];
@@ -3894,7 +3924,8 @@ function scanSkillsDir(dir) {
       name: fm.name,
       description: fm.description,
       filePath: skillPath,
-      requiresTools: fm.requiresTools
+      requiresTools: fm.requiresTools,
+      requiresBins: fm.requiresBins
     });
   }
   return out;
@@ -3914,6 +3945,10 @@ function composeSkills(home, enabledTools) {
       const allPresent = s2.requiresTools.every((t2) => enabled.has(t2));
       if (!allPresent) continue;
     }
+    if (s2.requiresBins && s2.requiresBins.length > 0) {
+      const allBinsPresent = s2.requiresBins.every((b2) => hasBinaryOnPath(b2));
+      if (!allBinsPresent) continue;
+    }
     out.push(s2);
   }
   out.sort((a2, b2) => a2.name.localeCompare(b2.name));
@@ -4025,9 +4060,10 @@ var ThreadSession = class {
     void this.startTurn(body, replyToMessageId);
   }
   async startTurn(body, replyToMessageId) {
-    const placeholder = await this.deps.chat.postMessage(this.deps.roomId, "\u2026", {
+    const placeholder = await this.deps.chat.postMessage(this.deps.roomId, "", {
       replyTo: replyToMessageId,
-      threadId: this.deps.threadId
+      threadId: this.deps.threadId,
+      streaming: true
     });
     const turn = {
       placeholderId: placeholder.id,
@@ -4035,15 +4071,23 @@ var ThreadSession = class {
       replyToMessageId,
       throttle: createThrottle(async () => {
         if (!this.active || this.active.placeholderId !== placeholder.id) return;
-        const text = this.active.accumulated || "\u2026";
+        const text = this.active.accumulated;
+        if (text.length === 0) return;
         try {
-          await this.deps.chat.patchMessage(placeholder.id, text);
+          await this.deps.chat.patchMessage(placeholder.id, { body: text });
         } catch (err) {
           this.deps.log(`patch failed (room=${this.deps.roomId} thread=${this.deps.threadId}): ${err instanceof Error ? err.message : String(err)}`);
         }
       }, PATCH_INTERVAL_MS)
     };
     this.active = turn;
+    const setStatus = async (status) => {
+      try {
+        await this.deps.chat.patchMessage(placeholder.id, { streamingStatus: status });
+      } catch (err) {
+        this.deps.log(`status patch failed: ${err instanceof Error ? err.message : String(err)}`);
+      }
+    };
     try {
       const result = await runLoop({
         config: this.deps.runtimeConfig,
@@ -4060,12 +4104,15 @@ var ThreadSession = class {
           },
           onToolCall: ({ name }) => {
             this.deps.log(`[${this.deps.roomId}/${this.deps.threadId.slice(0, 8)}] tool_call: ${name}`);
+            void setStatus(`\u{1F527} ${name}`);
           },
           onToolResult: ({ name }) => {
             this.deps.log(`[${this.deps.roomId}/${this.deps.threadId.slice(0, 8)}] tool_result: ${name}`);
+            void setStatus(null);
           },
           onToolError: ({ name, error }) => {
             this.deps.log(`[${this.deps.roomId}/${this.deps.threadId.slice(0, 8)}] tool_error: ${name} \u2192 ${error}`);
+            void setStatus(null);
           }
         }
       });
@@ -4076,28 +4123,51 @@ var ThreadSession = class {
       if (result.status === "error") {
         this.deps.log(`runtime done with status=error (room=${this.deps.roomId} thread=${this.deps.threadId})`);
       }
-      this.endTurn();
+      await this.endTurn();
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       this.deps.log(`runtime error (room=${this.deps.roomId} thread=${this.deps.threadId}): ${message}`);
-      this.failTurn(`(runtime error: ${message})`);
+      await this.failTurn(`(runtime error: ${message})`);
     }
   }
-  endTurn() {
+  /**
+   * Stream-end: flush any pending throttled body PATCH, then mark the
+   * message as no-longer-streaming. The combined call also triggers
+   * the user-facing push (the placeholder POST suppressed it).
+   */
+  async endTurn() {
     const turn = this.active;
     if (!turn) return;
     turn.throttle.flush();
+    try {
+      await this.deps.chat.patchMessage(turn.placeholderId, {
+        body: turn.accumulated || "(empty response)",
+        streaming: false,
+        streamingStatus: null
+      });
+    } catch (err) {
+      this.deps.log(`stream-end patch failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
     this.active = void 0;
     const next = this.queue.shift();
     if (next) {
       void this.startTurn(next.body, next.replyToMessageId);
     }
   }
-  failTurn(message) {
+  async failTurn(message) {
     const turn = this.active;
     if (!turn) return;
     turn.accumulated = message;
     turn.throttle.flush();
+    try {
+      await this.deps.chat.patchMessage(turn.placeholderId, {
+        body: message,
+        streaming: false,
+        streamingStatus: null
+      });
+    } catch (err) {
+      this.deps.log(`fail-turn patch failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
     this.active = void 0;
     const next = this.queue.shift();
     if (next) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openape/ape-agent",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "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",
@@ -21,6 +21,7 @@
     "jose": "^5.9.0",
     "ofetch": "^1.4.1",
     "ws": "^8.18.0",
+    "yaml": "^2.8.0",
     "@openape/apes": "1.22.0",
     "@openape/cli-auth": "0.4.0"
   },