@openape/ape-agent 2.8.12 → 2.8.13

package/dist/bridge.mjs

@@ -1053,6 +1053,7 @@ import { ofetch as ofetch2 } from "ofetch";
 import { Buffer as Buffer3 } from "buffer";
 import { createPrivateKey } from "crypto";
 import { ofetch as ofetch4 } from "ofetch";
+import { ofetch as ofetch5 } from "ofetch";
 function getConfigDir() {
   const override = process.env.OPENAPE_CLI_AUTH_HOME;
   if (override) return override;
@@ -1398,7 +1399,7 @@ import { decodeJwt } from "jose";
 import WebSocket from "ws";
 
 // src/chat-api.ts
-import { ofetch as ofetch5 } from "ofetch";
+import { ofetch as ofetch6 } from "ofetch";
 var MAX_BODY = 1e4;
 var ChatApi = class {
   constructor(endpoint, bearer) {
@@ -1414,7 +1415,7 @@ var ChatApi = class {
     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, {
+    const result = await ofetch6(url, {
       method: "POST",
       headers: { Authorization: await this.bearer() },
       body: payload
@@ -1429,14 +1430,14 @@ var ChatApi = class {
    */
   async listMessages(roomId, threadId, limit = 50) {
     const url = `${this.endpoint}/api/rooms/${encodeURIComponent(roomId)}/messages?thread_id=${encodeURIComponent(threadId)}&limit=${limit}`;
-    return await ofetch5(url, {
+    return await ofetch6(url, {
       method: "GET",
       headers: { Authorization: await this.bearer() }
     });
   }
   async requestContact(peerEmail) {
     const url = `${this.endpoint}/api/contacts`;
-    return await ofetch5(url, {
+    return await ofetch6(url, {
       method: "POST",
       headers: { Authorization: await this.bearer() },
       body: { email: peerEmail }
@@ -1444,14 +1445,14 @@ var ChatApi = class {
   }
   async listContacts() {
     const url = `${this.endpoint}/api/contacts`;
-    return await ofetch5(url, {
+    return await ofetch6(url, {
       method: "GET",
       headers: { Authorization: await this.bearer() }
     });
   }
   async acceptContact(peerEmail) {
     const url = `${this.endpoint}/api/contacts/${encodeURIComponent(peerEmail)}/accept`;
-    return await ofetch5(url, {
+    return await ofetch6(url, {
       method: "POST",
       headers: { Authorization: await this.bearer() }
     });
@@ -1464,7 +1465,7 @@ var ChatApi = class {
    */
   async createThread(roomId, name) {
     const url = `${this.endpoint}/api/rooms/${encodeURIComponent(roomId)}/threads`;
-    return await ofetch5(url, {
+    return await ofetch6(url, {
       method: "POST",
       headers: { Authorization: await this.bearer() },
       body: { name: name.slice(0, 100) }
@@ -1492,7 +1493,7 @@ var ChatApi = class {
     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, {
+    await ofetch6(url, {
       method: "PATCH",
       headers: { Authorization: await this.bearer() },
       body: payload
@@ -1505,12 +1506,133 @@ function clamp(s2, max) {
   return `${s2.slice(0, max - 1)}\u2026`;
 }
 
+// src/troop-chat-api.ts
+import { ofetch as ofetch7 } from "ofetch";
+var MAX_BODY2 = 64 * 1024;
+var SYNTHETIC_THREAD_ID = "main";
+function asHistory(msg, agentEmail, ownerEmail) {
+  return {
+    id: msg.id,
+    roomId: msg.chatId,
+    threadId: SYNTHETIC_THREAD_ID,
+    senderEmail: msg.role === "agent" ? agentEmail : ownerEmail,
+    senderAct: msg.role,
+    body: msg.body,
+    replyTo: msg.replyTo,
+    createdAt: msg.createdAt
+  };
+}
+function asPosted(msg) {
+  return {
+    id: msg.id,
+    roomId: msg.chatId,
+    threadId: SYNTHETIC_THREAD_ID,
+    body: msg.body,
+    createdAt: msg.createdAt
+  };
+}
+var TroopChatApi = class {
+  constructor(endpoint, bearer) {
+    this.endpoint = endpoint;
+    this.bearer = bearer;
+  }
+  endpoint;
+  bearer;
+  bootstrap = null;
+  /** Resolve + cache the agent's chat row (lazy fetch on first use). */
+  async getBootstrap() {
+    if (this.bootstrap) return this.bootstrap;
+    this.bootstrap = await ofetch7(`${this.endpoint}/api/agents/me/chat`, {
+      method: "GET",
+      headers: { Authorization: await this.bearer() }
+    });
+    return this.bootstrap;
+  }
+  /** chat.id + (lazy-fetched) ownerEmail for the bridge's frame-translation path. */
+  async getChatContext() {
+    const b2 = await this.getBootstrap();
+    return { chatId: b2.chat.id, ownerEmail: b2.chat.ownerEmail, agentEmail: b2.chat.agentEmail };
+  }
+  async postMessage(roomId, body, opts = {}) {
+    void roomId;
+    void opts.threadId;
+    const payload = {
+      body: body.length > MAX_BODY2 ? `${body.slice(0, MAX_BODY2 - 1)}\u2026` : body
+    };
+    if (opts.replyTo) payload.reply_to = opts.replyTo;
+    if (opts.streaming) payload.streaming = true;
+    const msg = await ofetch7(`${this.endpoint}/api/agents/me/chat/messages`, {
+      method: "POST",
+      headers: { Authorization: await this.bearer() },
+      body: payload
+    });
+    return asPosted(msg);
+  }
+  async listMessages(roomId, threadId, limit = 50) {
+    void roomId;
+    void threadId;
+    void limit;
+    const fresh = await ofetch7(`${this.endpoint}/api/agents/me/chat`, {
+      method: "GET",
+      headers: { Authorization: await this.bearer() }
+    });
+    this.bootstrap = fresh;
+    return fresh.messages.map((m2) => asHistory(m2, fresh.chat.agentEmail, fresh.chat.ownerEmail));
+  }
+  async patchMessage(messageId, opts = {}) {
+    const payload = {};
+    if (opts.body !== void 0) {
+      payload.body = opts.body.length > MAX_BODY2 ? `${opts.body.slice(0, MAX_BODY2 - 1)}\u2026` : opts.body;
+    }
+    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 ofetch7(`${this.endpoint}/api/agents/me/chat/messages/${encodeURIComponent(messageId)}`, {
+      method: "PATCH",
+      headers: { Authorization: await this.bearer() },
+      body: payload
+    });
+  }
+  /**
+   * Troop's chat doesn't have contacts — synthesize a single
+   *  always-connected entry pointing at the owner so the bridge's
+   *  initial-contact + allowlist flows are no-ops.
+   */
+  async listContacts() {
+    const b2 = await this.getBootstrap();
+    return [{
+      peerEmail: b2.chat.ownerEmail,
+      myStatus: "accepted",
+      theirStatus: "accepted",
+      connected: true,
+      roomId: b2.chat.id
+    }];
+  }
+  async requestContact(peerEmail) {
+    void peerEmail;
+    return (await this.listContacts())[0];
+  }
+  async acceptContact(peerEmail) {
+    void peerEmail;
+    return (await this.listContacts())[0];
+  }
+  /**
+   * Troop has no threads — return a synthetic one. The bridge's
+   *  cron-runner falls back to the main thread on createThread
+   *  failure already, so a stable "main" stand-in is the right shape.
+   */
+  async createThread(roomId, name) {
+    void roomId;
+    return { id: SYNTHETIC_THREAD_ID, name: name.slice(0, 100) };
+  }
+};
+
 // src/cron-runner.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync3, readdirSync as readdirSync3, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
 import { homedir as homedir6 } from "os";
 import { join as join6 } from "path";
 
-// ../../packages/apes/dist/chunk-OOKB2IL2.js
+// ../../packages/apes/dist/chunk-ZEUSCNCH.js
 import { spawn } from "child_process";
 import { mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
 import { homedir as homedir3 } from "os";
@@ -1530,8 +1652,10 @@ function capStdio(s2) {
 [truncated to ${MAX_STDIO_BYTES} bytes]`;
 }
 function runApeShell(cmd, timeoutMs = DEFAULT_TIMEOUT_MS) {
+  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(BIN, ["-c", cmd], {
+    const child = spawn(execBin, execArgs, {
       env: { ...process.env, APE_WAIT: "1" },
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -1566,7 +1690,7 @@ function runApeShell(cmd, timeoutMs = DEFAULT_TIMEOUT_MS) {
           stderr: "",
           exit_code: -1,
           error: spawnError.message,
-          hint: `Could not exec '${BIN}'. The agent host needs @openape/apes installed globally so ape-shell is on PATH.`
+          hint: `Could not exec '${execBin}'. The agent host needs @openape/apes installed globally so ape-shell is on PATH (or set OPENAPE_BYPASS_APE_SHELL=1 to skip the gated shell entirely \u2014 meant for the OpenApe pod where the container IS the sandbox).`
         });
         return;
       }
@@ -2324,6 +2448,52 @@ function previewJson(value, max = 500) {
   }
   return s2.length > max ? `${s2.slice(0, max)}\u2026` : s2;
 }
+async function aggregateChatStream(res) {
+  if (!res.body) throw new Error("LiteLLM streaming response had no body");
+  const reader = res.body.getReader();
+  const decoder = new TextDecoder();
+  let buf = "";
+  let content = "";
+  const toolCalls = /* @__PURE__ */ new Map();
+  let finishReason;
+  while (true) {
+    const { value, done } = await reader.read();
+    if (done) break;
+    buf += decoder.decode(value, { stream: true });
+    while (true) {
+      const nl = buf.indexOf("\n");
+      if (nl === -1) break;
+      const line = buf.slice(0, nl).trim();
+      buf = buf.slice(nl + 1);
+      if (!line.startsWith("data:")) continue;
+      const payload = line.slice(5).trim();
+      if (!payload || payload === "[DONE]") continue;
+      let chunk;
+      try {
+        chunk = JSON.parse(payload);
+      } catch {
+        continue;
+      }
+      const ch0 = chunk.choices?.[0];
+      const delta = ch0?.delta;
+      if (delta?.content) content += delta.content;
+      if (delta?.tool_calls) {
+        for (const tc of delta.tool_calls) {
+          const idx = tc.index ?? 0;
+          const existing = toolCalls.get(idx) ?? { id: "", type: "function", function: { name: "", arguments: "" } };
+          if (tc.id) existing.id = tc.id;
+          if (tc.function?.name) existing.function.name = tc.function.name;
+          if (tc.function?.arguments) existing.function.arguments += tc.function.arguments;
+          toolCalls.set(idx, existing);
+        }
+      }
+      if (ch0?.finish_reason) finishReason = ch0.finish_reason;
+    }
+  }
+  const message = { role: "assistant", content: content || null };
+  if (toolCalls.size > 0) message.tool_calls = Array.from(toolCalls.values());
+  return { choices: [{ message, finish_reason: finishReason }] };
+}
 async function runLoop(opts) {
   const fetchFn = opts.fetchImpl ?? fetch;
   const trace = [];
@@ -2334,23 +2504,25 @@ async function runLoop(opts) {
   ];
   const tools = asOpenAiTools(opts.tools);
   for (let step = 1; step <= opts.maxSteps; step++) {
+    const requestBody = {
+      model: opts.config.model,
+      messages,
+      ...tools.length > 0 ? { tools, tool_choice: "auto" } : {},
+      ...opts.streamAggregate ? { stream: true } : {}
+    };
     const res = await fetchFn(`${opts.config.apiBase}/chat/completions`, {
       method: "POST",
       headers: {
         "authorization": `Bearer ${opts.config.apiKey}`,
         "content-type": "application/json"
       },
-      body: JSON.stringify({
-        model: opts.config.model,
-        messages,
-        ...tools.length > 0 ? { tools, tool_choice: "auto" } : {}
-      })
+      body: JSON.stringify(requestBody)
     });
     if (!res.ok) {
       const text = await res.text().catch(() => "");
       throw new Error(`LiteLLM ${res.status}: ${text.slice(0, 500)}`);
     }
-    const data = await res.json();
+    const data = opts.streamAggregate ? await aggregateChatStream(res) : await res.json();
     const choice = data.choices?.[0];
     if (!choice) throw new Error("LiteLLM response had no choices");
     const assistant = choice.message;
@@ -3975,7 +4147,7 @@ function extractOption(args, name) {
 }
 var AUTH_FILE2 = join5(homedir52(), ".config", "apes", "auth.json");
 
-// ../../packages/apes/dist/chunk-4KPKANZT.js
+// ../../packages/apes/dist/chunk-NYJSBFLG.js
 init_chunk_OBF7IMQ2();
 var debug = process.argv.includes("--debug");
 
@@ -4794,6 +4966,8 @@ function readConfig() {
       "APE_CHAT_BRIDGE_MODEL is not set. Set it in the bridge .env (usually `~/Library/Application Support/openape/bridge/.env` on macOS) or globally in `~/litellm/.env` so resolveBridgeConfig picks it up at spawn time. Common values: `gpt-5.4` (ChatGPT-only LiteLLM proxy), `claude-haiku-4-5` (Anthropic-only)."
     );
   }
+  const targetRaw = (process3.env.OPENAPE_BRIDGE_TARGET ?? "chat").toLowerCase();
+  const target = targetRaw === "troop" ? "troop" : "chat";
   return {
     endpoint: (process3.env.APE_CHAT_ENDPOINT ?? DEFAULT_ENDPOINT).replace(/\/$/, ""),
     apesBin: process3.env.APE_CHAT_BRIDGE_APES_BIN ?? DEFAULT_APES_BIN,
@@ -4801,7 +4975,8 @@ function readConfig() {
     systemPrompt: process3.env.APE_CHAT_BRIDGE_SYSTEM_PROMPT ?? DEFAULT_SYSTEM_PROMPT,
     tools,
     maxSteps: Number.isFinite(maxSteps) && maxSteps > 0 ? maxSteps : DEFAULT_MAX_STEPS,
-    roomFilter: process3.env.APE_CHAT_BRIDGE_ROOM
+    roomFilter: process3.env.APE_CHAT_BRIDGE_ROOM,
+    target
   };
 }
 async function getIdentity() {
@@ -4837,7 +5012,7 @@ var Bridge = class {
       const idp = await ensureFreshIdpAuth();
       return `Bearer ${idp.access_token}`;
     };
-    this.chat = new ChatApi(this.cfg.endpoint, this.bearer);
+    this.chat = this.cfg.target === "troop" ? new TroopChatApi(this.cfg.endpoint, this.bearer) : new ChatApi(this.cfg.endpoint, this.bearer);
     this.cron = new CronRunner({
       runtimeConfig: this.runtimeConfig(),
       chat: this.chat,
@@ -4855,6 +5030,11 @@ var Bridge = class {
   // its own message history and calls @openape/apes' runLoop directly
   // (no stdio JSON-RPC subprocess — see thread-session.ts).
   threads = /* @__PURE__ */ new Map();
+  // ChatApi and TroopChatApi expose the same surface (postMessage /
+  // listMessages / patchMessage / listContacts / requestContact /
+  // acceptContact / createThread) so the rest of the bridge calls
+  // through a structurally-typed reference without caring which
+  // backend is in play. Picked at construction time from cfg.target.
   chat;
   bearer;
   cron;
@@ -4912,6 +5092,29 @@ var Bridge = class {
     if (accepted.length > 0) log(`accepted: ${accepted.join(", ")}`);
     if (skipped.length > 0) log(`skipped (not on allowlist): ${skipped.join(", ")}`);
   }
+  /**
+   * Translate troop's chat-frame payload shape into the
+   * chat.openape.ai-style Message the rest of this bridge expects.
+   * Troop's payload uses `role` (human|agent) + `chatId` + no
+   * senderEmail; the bridge's handleInbound checks
+   * `senderEmail === selfEmail` to skip its own echoes, so we
+   * synthesize the email from role (agent → self, human → owner).
+   * threadId is the synthetic 'main' because troop has no threads.
+   */
+  translateTroopPayload(chatId, payload) {
+    const role = payload.role === "agent" ? "agent" : "human";
+    return {
+      id: String(payload.id ?? ""),
+      roomId: chatId || String(payload.chatId ?? ""),
+      threadId: "main",
+      senderEmail: role === "agent" ? this.selfEmail : this.ownerEmail,
+      senderAct: role,
+      body: typeof payload.body === "string" ? payload.body : "",
+      replyTo: typeof payload.replyTo === "string" ? payload.replyTo : null,
+      createdAt: typeof payload.createdAt === "number" ? payload.createdAt : Math.floor(Date.now() / 1e3),
+      editedAt: typeof payload.editedAt === "number" ? payload.editedAt : null
+    };
+  }
   async handleInbound(msg) {
     if (msg.senderEmail === this.selfEmail) return;
     if (!msg.body.trim()) return;
@@ -4977,7 +5180,8 @@ var Bridge = class {
   }
   async pumpOnce() {
     const bearer = await this.bearer();
-    const wsUrl = `${this.cfg.endpoint.replace(/^http/, "ws")}/api/ws?token=${encodeURIComponent(bearer.replace(/^Bearer\s+/i, ""))}`;
+    const wsPath = this.cfg.target === "troop" ? "/_ws/chat" : "/api/ws";
+    const wsUrl = `${this.cfg.endpoint.replace(/^http/, "ws")}${wsPath}?token=${encodeURIComponent(bearer.replace(/^Bearer\s+/i, ""))}`;
     const ws = new WebSocket(wsUrl);
     return new Promise((resolve4, reject) => {
       let pingTimer;
@@ -5006,8 +5210,9 @@ var Bridge = class {
         } catch {
           return;
         }
-        if (frame.type !== "message") return;
-        void this.handleInbound(frame.payload);
+        if (frame.type !== "message" || !frame.payload) return;
+        const msg = this.cfg.target === "troop" ? this.translateTroopPayload(frame.chat_id ?? "", frame.payload) : frame.payload;
+        void this.handleInbound(msg);
       });
       ws.on("close", () => {
         if (pingTimer) clearInterval(pingTimer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openape/ape-agent",
-  "version": "2.8.12",
+  "version": "2.8.13",
   "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.11",
-    "@openape/prompt-injection-detector": "0.1.0",
-    "@openape/cli-auth": "0.4.1"
+    "@openape/apes": "1.28.12",
+    "@openape/cli-auth": "0.5.0",
+    "@openape/prompt-injection-detector": "0.1.0"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^7.6.1",