@iinm/plain-agent 1.8.1 → 1.8.3

package/README.md

@@ -1,3 +1,7 @@
+<p align="center">
+  <img src="https://pub-0bb49aa929f242d49c89ed8c297932b5.r2.dev/plain-agent/plain-agent-logo.png" alt="plain-agent logo" width="320">
+</p>
+
 # Plain Agent
 
 A lightweight CLI-based coding agent.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iinm/plain-agent",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "A lightweight CLI-based coding agent",
   "license": "MIT",
   "type": "module",
@@ -9,9 +9,9 @@
     "url": "git+https://github.com/iinm/plain-agent.git"
   },
   "bin": {
-    "plain": "./bin/plain",
-    "plain-notify-desktop": "./bin/plain-notify-desktop",
-    "plain-sandbox": "./sandbox/bin/plain-sandbox"
+    "plain": "bin/plain",
+    "plain-notify-desktop": "bin/plain-notify-desktop",
+    "plain-sandbox": "sandbox/bin/plain-sandbox"
   },
   "files": [
     "bin",
@@ -20,8 +20,9 @@
     "src/**/*.mjs",
     "src/**/*.d.ts",
     "!src/**/*.test.mjs",
+    "!src/**/*.test.*.mjs",
     "!src/**/*.playground.mjs",
-    "!src/utils/test/"
+    "!src/**/test/"
   ],
   "engines": {
     "node": ">=22"
@@ -34,11 +35,10 @@
   },
   "dependencies": {
     "diff": "^8.0.4",
-    "js-yaml": "^4.1.1"
+    "yaml": "^2.8.3"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.12",
-    "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.19.17",
     "typescript": "^6.0.2"
   }

package/src/cliBatch.mjs

@@ -14,6 +14,7 @@ import { appendUsageRecord, buildUsageRecord } from "./usageStore.mjs";
  * @property {string} sessionId
  * @property {string} modelName
  * @property {boolean} sandbox
+ * @property {Date} startTime
  * @property {() => Promise<void>} onStop
  */
 
@@ -32,6 +33,7 @@ export async function startBatchSession({
   sessionId,
   modelName,
   sandbox,
+  startTime,
   onStop,
 }) {
   setupEventHandlers(agentEventEmitter, { sessionId, modelName, sandbox });
@@ -55,6 +57,7 @@ export async function startBatchSession({
           modelName,
           workingDir: process.cwd(),
           costSummary,
+          now: startTime,
         });
         if (record) {
           await appendUsageRecord(record);

package/src/cliInteractive.mjs

@@ -57,6 +57,7 @@ const HELP_MESSAGE = [
  * @property {AgentCommands} agentCommands
  * @property {string} sessionId
  * @property {string} modelName
+ * @property {Date} startTime
  * @property {{ command: string; args?: string[] } | undefined} notifyCmd
  * @property {boolean} sandbox
  * @property {() => Promise<void>} onStop
@@ -69,9 +70,9 @@ const HELP_MESSAGE = [
  * Failures are logged but never thrown so exit is not blocked.
  *
  * @param {import("./costTracker.mjs").CostSummary} summary
- * @param {{ sessionId: string, modelName: string }} meta
+ * @param {{ sessionId: string, modelName: string, startTime: Date }} meta
  */
-async function persistUsage(summary, { sessionId, modelName }) {
+async function persistUsage(summary, { sessionId, modelName, startTime }) {
   try {
     const record = buildUsageRecord({
       sessionId,
@@ -79,6 +80,7 @@ async function persistUsage(summary, { sessionId, modelName }) {
       modelName,
       workingDir: process.cwd(),
       costSummary: summary,
+      now: startTime,
     });
     if (!record) return;
     await appendUsageRecord(record);
@@ -99,6 +101,7 @@ export function startInteractiveSession({
   agentCommands,
   sessionId,
   modelName,
+  startTime,
   notifyCmd,
   sandbox,
   onStop,
@@ -153,7 +156,7 @@ export function startInteractiveSession({
     const summary = agentCommands.getCostSummary();
     console.log();
     console.log(formatCostSummary(summary));
-    await persistUsage(summary, { sessionId, modelName });
+    await persistUsage(summary, { sessionId, modelName, startTime });
     await onStop();
     process.exit(0);
   };

package/src/context/loadAgentRoles.mjs

@@ -3,7 +3,7 @@
 import crypto from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
-import yaml from "js-yaml";
+import { parse as parseYaml } from "yaml";
 import {
   AGENT_CACHE_DIR,
   AGENT_PROJECT_METADATA_DIR,
@@ -246,7 +246,7 @@ function parseAgentRole(relativePath, fileContent, fullPath, idPrefix = "") {
   let frontmatter;
   try {
     frontmatter = /** @type {{description?:string; import?:string}} */ (
-      yaml.load(match[1])
+      parseYaml(match[1])
     );
   } catch (_err) {
     return {

package/src/context/loadPrompts.mjs

@@ -4,7 +4,7 @@ import { execFileSync } from "node:child_process";
 import crypto from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
-import yaml from "js-yaml";
+import { parse as parseYaml } from "yaml";
 import {
   AGENT_CACHE_DIR,
   AGENT_PROJECT_METADATA_DIR,
@@ -279,7 +279,7 @@ function parsePrompt(relativePath, fileContent, fullPath, idPrefix = "") {
   try {
     frontmatter =
       /** @type {{description?:string; import?:string; "user-invocable"?:boolean}} */ (
-        yaml.load(match[1])
+        parseYaml(match[1])
       );
   } catch (_err) {
     return {

package/src/main.mjs

@@ -248,6 +248,7 @@ if (cliArgs.subcommand.type === "cost") {
     sessionId,
     modelName: modelNameWithVariant,
     sandbox: Boolean(appConfig.sandbox),
+    startTime,
     onStop: async () => {
       for (const cleanup of mcpCleanups) {
         await cleanup();

package/src/providers/platform/googleCloud.mjs

@@ -5,7 +5,7 @@ import { execFile } from "node:child_process";
  * @returns {Promise<string>}
  */
 export async function getGoogleCloudAccessToken(account) {
-  const accountOption = account?.endsWith("iam.gserviceaccount.com")
+  const accountOption = account?.endsWith(".iam.gserviceaccount.com")
     ? ["--impersonate-service-account", account]
     : account
       ? [account]

package/src/mcpClient.test.mockServer.mjs

@@ -1,83 +0,0 @@
-/**
- * Mock MCP server for testing.
- * Speaks JSON-RPC 2.0 over stdio.
- * Handles: initialize, notifications/initialized, tools/list, tools/call.
- */
-
-import { createInterface } from "node:readline";
-
-const rl = createInterface({ input: process.stdin });
-
-rl.on("line", (line) => {
-  let msg;
-  try {
-    msg = JSON.parse(line);
-  } catch {
-    return;
-  }
-
-  if (msg.method === "initialize") {
-    respond(msg.id, {
-      protocolVersion: "2025-03-26",
-      capabilities: {},
-      serverInfo: { name: "mock", version: "0.0.0" },
-    });
-    return;
-  }
-
-  if (msg.method === "notifications/initialized") {
-    return;
-  }
-
-  if (msg.method === "tools/list") {
-    respond(msg.id, {
-      tools: [
-        {
-          name: "echo",
-          description: "Echo tool",
-          inputSchema: {
-            type: "object",
-            properties: { text: { type: "string" } },
-          },
-        },
-        {
-          name: "add",
-          description: "Add numbers",
-          inputSchema: {
-            type: "object",
-            properties: {
-              a: { type: "number" },
-              b: { type: "number" },
-            },
-          },
-        },
-      ],
-    });
-    return;
-  }
-
-  if (msg.method === "tools/call") {
-    const { name, arguments: args } = msg.params;
-    if (name === "echo") {
-      respond(msg.id, { content: [{ type: "text", text: args.text }] });
-    } else if (name === "add") {
-      respond(msg.id, {
-        content: [{ type: "text", text: String(args.a + args.b) }],
-      });
-    } else if (name === "error_tool") {
-      respondError(msg.id, -1, "tool failed");
-    }
-  }
-});
-
-/** @param {number} id @param {unknown} result */
-function respond(id, result) {
-  process.stdout.write(`${JSON.stringify({ jsonrpc: "2.0", id, result })}\n`);
-}
-
-/** @param {number} id @param {number} code @param {string} message */
-function respondError(id, code, message) {
-  process.stdout.write(
-    `${JSON.stringify({ jsonrpc: "2.0", id, error: { code, message } })}\n`,
-  );
-}