@bivy/bivy 0.16.6-staging.4 → 0.16.6-staging.6

package/bin/agent-manifest.json

@@ -189,7 +189,8 @@
       "command": "grok",
       "hidden": false,
       "supportTier": "supported",
-      "certification": "adapter-tested",
+      "certification": "release-tested",
+      "testedVersion": "1.0.0",
       "headlessFlags": [
         "-p",
         "--resume"

package/dist/agents/profiles.js

@@ -356,6 +356,7 @@ export const AGENT_PROFILES = {
         command: "grok",
         packageName: "grok (curl -fsSL https://x.ai/cli/install.sh | bash)",
         supportTier: "supported",
+        testedVersion: "1.0.0",
         authOwner: "mixed",
         blurb: "xAI's official Grok coding agent (Grok CLI) — SuperGrok/X subscription or API key.",
         // Official CLI: `grok -p "<prompt>"` (alias `--single`) runs one headless
@@ -369,6 +370,13 @@ export const AGENT_PROFILES = {
         // TUI uses the same store via `grok --resume <id>`. Model ids match
         // `grok models` for the official CLI (override with BIVY_GROK_MODELS).
         args: ["-p"],
+        // The current CLI's streaming-json mode is ACP's standard NDJSON envelope.
+        // The shared tolerant parser unwraps session/update notifications, including
+        // tool calls/results and sub-agent activity, so Grok gets faithful transcripts
+        // without a Grok-specific adapter. Keep the plain args as the explicit
+        // BIVY_AGENT_STRUCTURED=0 fallback.
+        jsonArgs: ["--output-format", "streaming-json", "-p"],
+        parserId: "generic-stream-json",
         resume: {
             template: ["--resume", "{id}", "-p"],
             historyLoader: "grok",

package/dist/runtime/cli-parsers.js

@@ -542,8 +542,19 @@ export function geminiJsonParser() {
  * event carries no assistant text (a control frame), so the caller can ignore it.
  */
 function textFromStreamEvent(msg) {
+    // ACP session/update notifications nest the update below JSON-RPC params.
+    // Grok's streaming-json mode uses this standard shape, while other CLIs put
+    // the same content directly on the event. Unwrap it before applying the
+    // broad fallbacks below so ACP remains a generic capability, not an agent
+    // specific parser.
+    const nested = msg.params?.update
+        ?? msg.update;
+    const source = nested && typeof nested === "object" ? nested : msg;
+    const nestedContent = source.content;
+    if (nestedContent && typeof nestedContent.text === "string")
+        return nestedContent.text;
     // Claude / ACP assistant shape: { message: { content: [{type:"text",text}] } }.
-    const mc = msg.message?.content;
+    const mc = source.message?.content;
     if (Array.isArray(mc)) {
         return mc.map((b) => (b && typeof b === "object" && typeof b.text === "string" ? b.text : "")).join("");
     }
@@ -569,8 +580,34 @@ function textFromStreamEvent(msg) {
     }
     return "";
 }
+/** Extract an ACP tool update from a JSON-RPC session/update notification.
+ * ACP deliberately calls these updates rather than tool calls; mapping the
+ * common fields here lets any ACP-speaking CLI show the same tool cards. */
+function acpToolUpdate(msg) {
+    const params = msg.params;
+    const update = (params?.update ?? msg.update);
+    if (!update || typeof update !== "object")
+        return undefined;
+    const type = String(update.sessionUpdate ?? update.type ?? "").toLowerCase();
+    const id = String(update.toolCallId ?? update.tool_call_id ?? update.id ?? "");
+    if (!id)
+        return undefined;
+    if (type === "tool_call" || type === "tool_call_started" || type === "tool_call_start") {
+        return { kind: "call", id, name: String(update.title ?? update.name ?? "tool"), input: update.rawInput ?? update.input ?? update.arguments };
+    }
+    if (type === "tool_call_update" || type === "tool_result" || type === "tool_call_completed") {
+        const status = String(update.status ?? "").toLowerCase();
+        // ACP sends progress updates through the same envelope. Only close the
+        // card once it has a terminal status or an actual result payload.
+        const output = update.rawOutput ?? update.output ?? update.content ?? update.result;
+        if (type === "tool_call_update" && (status === "in_progress" || status === "pending" || (output === undefined && !["completed", "failed", "error"].includes(status))))
+            return undefined;
+        return { kind: "result", id, output, error: status === "failed" || status === "error" };
+    }
+    return undefined;
+}
 // Event `type` values that mean "the turn is finished" across the various CLIs.
-const STREAM_TERMINALS = new Set(["result", "done", "complete", "completed", "turn.completed", "session.done", "message_stop", "response.completed", "final"]);
+const STREAM_TERMINALS = new Set(["result", "done", "complete", "completed", "turn.completed", "session.done", "session_end", "session/ended", "message_stop", "response.completed", "final"]);
 /**
  * A TOLERANT line-delimited JSON parser for CLIs whose `--stream-json` /
  * `--format json` streaming vocabularies we haven't pinned exactly (Amp, Cursor,
@@ -599,7 +636,14 @@ export function genericStreamJsonParser() {
                 return events;
             }
             acc.addUsage(extractTokenUsage(msg.usage ?? msg.stats ?? msg));
-            const type = String(msg.type ?? "");
+            const nestedUpdate = (msg.params?.update
+                ?? msg.update);
+            const type = String(msg.type ?? msg.method ?? nestedUpdate?.sessionUpdate ?? nestedUpdate?.type ?? "");
+            const tool = acpToolUpdate(msg);
+            if (tool?.kind === "call")
+                acc.addToolUse(tool.id, tool.name ?? "tool", tool.input, events);
+            else if (tool?.kind === "result")
+                acc.addToolResult(tool.id, tool.name ?? "tool", tool.output, events, tool.error);
             if (msg.error && !type.includes("delta")) {
                 const m = msg.error.message ?? msg.error;
                 events.push({ type: "session.error", error: String(m) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.16.6-staging.4",
+  "version": "0.16.6-staging.6",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",