@itsaplan/runner 0.7.0 → 0.8.1

package/README.md

@@ -8,7 +8,8 @@ This package runs such agents on your own machine — one, or several at once.
 - Polls your instance for the agent's queued runs. Runs each one with a coding agent CLI.
   Reports the result.
 - Has presets for Claude Code, Codex, opencode, Antigravity CLI, GitHub Copilot CLI,
-  Pi, and Oh My Pi (`omp`). Each preset sets the unattended flags and the session resume.
+  Pi, Oh My Pi (`omp`), and Mastra Code. Each preset sets the unattended flags and the
+  session resume.
 - Runs your own `command` instead, if you prefer. The command takes the task on stdin.
 - Answers the agent's chat. Sends the text and the tool calls while the CLI prints them.
 - Sends the messages and the tool calls of a queued run to the issue while the run works.
@@ -23,9 +24,9 @@ of kind External. The key appears one time only, at creation.
 **2. Enable MCP** for the project, in Settings, MCP Server. MCP is off by default. The
 agent reads the issue and writes its result through it.
 
-**3. Give the coding agent the address of that server.** Claude Code, Oh My Pi, and Pi
-(through `pi-mcp-adapter`) read `.mcp.json` from the folder they run in. For the other
-CLIs, see
+**3. Give the coding agent the address of that server.** Claude Code, Oh My Pi, Mastra
+Code, and Pi (through `pi-mcp-adapter`) read `.mcp.json` from the folder they run in. For
+the other CLIs, see
 [Coding agent setup](https://github.com/croffasia/itsaplan/blob/main/docs/runner.md).
 
 ```json
@@ -67,15 +68,16 @@ or mention it in a comment. The task then starts in your terminal.
 `agent` names a CLI that the runner knows. The runner then builds the command itself: the
 flags for an unattended run, and the session resume. Every preset keeps a chat session.
 
-| Agent         | Runs               |
-| ------------- | ------------------ |
-| `claude`      | Claude Code        |
-| `codex`       | Codex CLI          |
-| `opencode`    | opencode           |
-| `antigravity` | Antigravity CLI    |
-| `copilot`     | GitHub Copilot CLI |
-| `pi`          | Pi                 |
-| `omp`         | Oh My Pi           |
+| Agent         | Runs                                                                         |
+| ------------- | ---------------------------------------------------------------------------- |
+| `claude`      | [Claude Code](https://code.claude.com/docs/en/overview)                      |
+| `codex`       | [Codex CLI](https://github.com/openai/codex)                                 |
+| `opencode`    | [opencode](https://opencode.ai)                                              |
+| `antigravity` | [Antigravity CLI](https://antigravity.google/docs/getting-started?tab=cli)   |
+| `copilot`     | [GitHub Copilot CLI](https://github.com/github/copilot-cli)                  |
+| `pi`          | [Pi](https://pi.dev)                                                         |
+| `omp`         | [Oh My Pi](https://omp.sh)                                                   |
+| `mastracode`  | [Mastra Code](https://code.mastra.ai)                                        |
 
 Each preset needs the CLI's own MCP config.
 [Coding agent setup](https://github.com/croffasia/itsaplan/blob/main/docs/runner.md) holds
@@ -273,8 +275,8 @@ npx -y @itsaplan/runner --agent claude
 
 The server writes the task text. The text states what occurred, what to do, and to post
 the result as a comment on the issue. Your own `command` receives the text on **stdin**. A
-preset gives it to its CLI in the way that CLI accepts it: on stdin for `claude`, `codex`
-and `pi`, as an argument for `antigravity`, `copilot`, `opencode` and `omp`.
+preset gives it to its CLI in the way that CLI accepts it: on stdin for `claude`, `codex`,
+`pi` and `mastracode`, as an argument for `antigravity`, `copilot`, `opencode` and `omp`.
 
 The agent reads all other data through the MCP server at `$ITSAPLAN_URL/mcp`. The agent
 sends `$ITSAPLAN_API_KEY` as a bearer token, and acts as its own user with its role.
@@ -323,8 +325,8 @@ error.
 
 - `text` — all of stdout is the answer.
 - `claude-stream-json`, `codex-jsonl`, `opencode-json`, `antigravity-stream-json`,
-  `copilot-json`, `pi-json` — the event stream of that CLI. `pi` and `omp` both use
-  `pi-json`. The runner reads the text and the tool calls from it.
+  `copilot-json`, `pi-json`, `mastracode-jsonl` — the event stream of that CLI. `pi` and
+  `omp` both use `pi-json`. The runner reads the text and the tool calls from it.
 
 A preset sets `outputFormat` for you. Set it yourself only with your own `command`. If the
 output does not agree with the format, the runner uses the output as plain text.

package/dist/cli.js

@@ -177,6 +177,19 @@ var PRESETS = {
       ...sessionId ? ["--resume", sessionId] : []
     ],
     tail: ["--"]
+  },
+  mastracode: {
+    bin: "mastracode",
+    outputFormat: "mastracode-jsonl",
+    promptVia: "stdin",
+    head: (sessionId) => [
+      "--output",
+      "jsonl",
+      "--permission-mode",
+      "auto",
+      ...sessionId ? ["--thread", sessionId] : []
+    ],
+    tail: ["--prompt", "-"]
   }
 };
 var PRESET_NAMES = Object.keys(PRESETS);
@@ -208,7 +221,8 @@ var OUTPUT_FORMATS = [
   "opencode-json",
   "antigravity-stream-json",
   "copilot-json",
-  "pi-json"
+  "pi-json",
+  "mastracode-jsonl"
 ];
 function presetOf(config) {
   if (config.command || !config.agent)
@@ -529,6 +543,7 @@ function startListener(port, agents, log) {
 var FLUSH_CHARS = 1500;
 var DELTA_LIMIT = 12000;
 var TOOL_TEXT_LIMIT = 32000;
+var TERMINAL_CODES = /\x1b\[[0-?]*[ -/]*[@-~]/g;
 
 class AnswerStream {
   format;
@@ -537,6 +552,7 @@ class AnswerStream {
   send;
   messageId;
   queued = [];
+  unsent = [];
   text = "";
   started = false;
   line = "";
@@ -544,6 +560,7 @@ class AnswerStream {
   openTextPart = "";
   openToolCalls = new Set;
   closedToolCalls = new Set;
+  mastraMessageId;
   sawPartialText = false;
   sawAnyText = false;
   segment = "";
@@ -587,15 +604,13 @@ class AnswerStream {
   }
   async sendQueued() {
     this.drainText();
-    if (this.queued.length === 0)
-      return;
-    const batch = this.queued;
-    this.queued = [];
-    try {
-      await this.send(batch);
-    } catch (err) {
-      this.queued.unshift(...batch);
-      throw err;
+    while (this.unsent.length > 0 || this.queued.length > 0) {
+      if (this.unsent.length === 0) {
+        this.unsent = this.queued;
+        this.queued = [];
+      }
+      await this.send(this.unsent);
+      this.unsent = [];
     }
   }
   async finish(fallback) {
@@ -654,7 +669,9 @@ class AnswerStream {
     try {
       parsed = JSON.parse(trimmed);
     } catch {
-      this.appendText(`${trimmed}
+      const plain = trimmed.replace(TERMINAL_CODES, "").trim();
+      if (plain)
+        this.appendText(`${plain}
 `);
       return;
     }
@@ -680,6 +697,39 @@ class AnswerStream {
       case "pi-json":
         this.readPiLine(parsed);
         break;
+      case "mastracode-jsonl":
+        this.readMastraLine(parsed);
+        break;
+    }
+  }
+  readMastraLine(message) {
+    switch (message.type) {
+      case "thread_created":
+        if (message.thread?.id)
+          this.sessionId ??= message.thread.id;
+        return;
+      case "message_start":
+        if (message.message?.role === "assistant")
+          this.mastraMessageId = message.message.id;
+        return;
+      case "message_update":
+        if (message.id === this.mastraMessageId && message.event?.type === "text-delta") {
+          this.appendText(message.event.delta ?? "");
+        }
+        return;
+      case "tool_start":
+        if (message.toolCallId) {
+          this.pushToolCall(message.toolCallId, message.toolName ?? "tool", JSON.stringify(message.args ?? {}));
+        }
+        return;
+      case "tool_end":
+        if (message.toolCallId)
+          this.pushToolResult(message.toolCallId, toolResultText(message.result));
+        return;
+      case "result":
+        if (!this.sawAnyText)
+          this.appendText(message.text || message.error?.message || "");
+        return;
     }
   }
   readPiLine(message) {
@@ -704,7 +754,7 @@ class AnswerStream {
         if (!message.toolCallId || this.closedToolCalls.has(message.toolCallId))
           return;
         this.closedToolCalls.add(message.toolCallId);
-        this.pushToolResult(message.toolCallId, piResultText(message.result));
+        this.pushToolResult(message.toolCallId, toolResultText(message.result));
         return;
       }
       case "message_end":
@@ -970,8 +1020,19 @@ class UsageReader {
       case "pi-json":
         this.readPi(parsed);
         return;
+      case "mastracode-jsonl":
+        this.readMastra(parsed);
+        return;
     }
   }
+  readMastra(message) {
+    if (message.type !== "usage_update" || !message.usage)
+      return;
+    this.last = {
+      inputTokens: message.usage.promptTokens ?? 0,
+      outputTokens: message.usage.completionTokens ?? 0
+    };
+  }
   readClaude(message) {
     const event = message.type === "stream_event" ? message.event : undefined;
     if (!event)
@@ -1042,7 +1103,7 @@ function textOfResult(content) {
   }
   return "";
 }
-function piResultText(result) {
+function toolResultText(result) {
   if (result && typeof result === "object" && !Array.isArray(result) && "content" in result) {
     return textOfResult(result.content);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itsaplan/runner",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "description": "Runs an Itsaplan external agent's queued tasks and answers its chat on your own machine",
   "keywords": [
     "itsaplan",
@@ -20,7 +20,8 @@
     "antigravity",
     "opencode",
     "pi",
-    "omp"
+    "omp",
+    "mastracode"
   ],
   "homepage": "https://github.com/croffasia/itsaplan/tree/main/packages/runner#readme",
   "repository": {