@iinm/plain-agent 1.6.1 → 1.7.1

package/README.md

@@ -66,7 +66,7 @@ Create the configuration.
     {
       // Requires Azure CLI to get access token
       "name": "azure",
-      "variant": "default",
+      "variant": "openai",
       "baseURL": "https://<resource>.openai.azure.com/openai",
       // Optional
       "azureConfigDir": "/home/xxx/.azure-for-agent"
@@ -131,21 +131,27 @@ Create the configuration.
 {
   "platforms": [
     {
-      "name": "openai",
+      "name": "openai-compatible",
       "variant": "ollama",
       "baseURL": "https://ollama.com",
       "apiKey": "FIXME"
     },
     {
-      "name": "openai",
+      "name": "openai-compatible",
       "variant": "huggingface",
       "baseURL": "https://router.huggingface.co",
       "apiKey": "FIXME"
     },
     {
-      "name": "openai",
+      "name": "openai-compatible",
       "variant": "xai",
       "apiKey": "FIXME"
+    },
+    {
+      "name": "openai-compatible",
+      "variant": "fireworks",
+      "baseURL": "https://api.fireworks.ai/inference",
+      "apiKey": "FIXME"
     }
   ]
 }
@@ -238,9 +244,10 @@ Run in batch mode (non-interactive).
 In batch mode, config files are not loaded automatically. Only the files specified with `--config` are loaded.
 
 ```sh
-plain batch "Add tests for src/main.mjs" \
-      --config ~/.config/plain-agent/config.local.json \
-      --config .plain-agent/config.json
+plain batch \
+      -c ~/.config/plain-agent/config.local.json \
+      -c .plain-agent/config.json \
+      "Add tests for ..."
 ```
 
 Display the help message.
@@ -249,11 +256,9 @@ Display the help message.
 /help
 ```
 
-Interrupt the agent while it's running by providing additional instructions:
+Interrupt the agent while it's running:
 
-```sh
-plain-interrupt Stop and report the progress
-```
+Press **Ctrl-C** to pause auto-approve. The agent will finish the current tool call, then return to the prompt.
 
 ## Available Tools
 
@@ -281,7 +286,6 @@ The agent can use the following tools to assist with tasks:
   \__ .plain-agent/
         \__ config.json            # Project-specific configuration
         \__ config.local.json      # Project-specific local configuration (including secrets)
-        \__ interrupt-message.txt  # Interrupt message consumed by the agent
         \__ memory/                # Task-specific memory files
         \__ prompts/               # Project-specific prompts
         \__ agents/                # Project-specific agent roles

package/{.config → config}/config.predefined.json

@@ -891,7 +891,7 @@
       "variant": "thinking-medium-azure",
       "platform": {
         "name": "azure",
-        "variant": "default"
+        "variant": "openai"
       },
       "model": {
         "format": "openai-responses",
@@ -972,10 +972,33 @@
       }
     },
     {
-      "name": "glm-5",
+      "name": "glm-5.1",
+      "variant": "fireworks",
+      "platform": {
+        "name": "openai-compatible",
+        "variant": "fireworks"
+      },
+      "model": {
+        "format": "openai-messages",
+        "config": {
+          "model": "accounts/fireworks/models/glm-5p1"
+        }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "prompt_tokens": 1.4,
+          "prompt_tokens_details.cached_tokens": -1.14,
+          "completion_tokens": 4.4
+        }
+      }
+    },
+    {
+      "name": "glm-5.1",
       "variant": "ollama",
       "platform": {
-        "name": "openai",
+        "name": "openai-compatible",
         "variant": "ollama"
       },
       "model": {
@@ -986,16 +1009,16 @@
       }
     },
     {
-      "name": "glm-5",
+      "name": "glm-5.1",
       "variant": "huggingface",
       "platform": {
-        "name": "openai",
+        "name": "openai-compatible",
         "variant": "huggingface"
       },
       "model": {
         "format": "openai-messages",
         "config": {
-          "model": "zai-org/GLM-5:novita"
+          "model": "zai-org/GLM-5.1:together"
         }
       }
     },
@@ -1066,7 +1089,7 @@
       "name": "minimax-m2.7",
       "variant": "ollama",
       "platform": {
-        "name": "openai",
+        "name": "openai-compatible",
         "variant": "ollama"
       },
       "model": {
@@ -1091,6 +1114,58 @@
         }
       }
     },
+    {
+      "name": "qwen3.6-plus",
+      "variant": "fireworks",
+      "platform": {
+        "name": "openai-compatible",
+        "variant": "fireworks"
+      },
+      "model": {
+        "format": "openai-messages",
+        "config": {
+          "model": "accounts/fireworks/models/qwen3p6-plus"
+        }
+      },
+      "cost": {
+        "currency": "USD",
+        "unit": "1M",
+        "costs": {
+          "prompt_tokens": 0.5,
+          "prompt_tokens_details.cached_tokens": -0.4,
+          "completion_tokens": 3
+        }
+      }
+    },
+
+    {
+      "name": "gemma4",
+      "variant": "ollama",
+      "platform": {
+        "name": "openai-compatible",
+        "variant": "ollama"
+      },
+      "model": {
+        "format": "openai-responses",
+        "config": {
+          "model": "gemma4:31b-cloud"
+        }
+      }
+    },
+    {
+      "name": "gemma4",
+      "variant": "huggingface",
+      "platform": {
+        "name": "openai-compatible",
+        "variant": "huggingface"
+      },
+      "model": {
+        "format": "openai-messages",
+        "config": {
+          "model": "google/gemma-4-31B-it:together"
+        }
+      }
+    },
 
     {
       "name": "nova-2-lite",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iinm/plain-agent",
-  "version": "1.6.1",
+  "version": "1.7.1",
   "description": "A lightweight CLI-based coding agent",
   "license": "MIT",
   "type": "module",
@@ -18,7 +18,7 @@
   "files": [
     "bin",
     "sandbox/bin",
-    ".config",
+    "config",
     "src/**/*.mjs",
     "src/**/*.d.ts",
     "!src/**/*.test.mjs",

package/src/agent.d.ts

@@ -21,6 +21,7 @@ export type AgentCommands = {
   dumpMessages: () => Promise<void>;
   loadMessages: () => Promise<void>;
   getCostSummary: () => CostSummary;
+  pauseAutoApprove: () => void;
 };
 
 type UserEventMap = {

package/src/agent.mjs

@@ -144,6 +144,16 @@ export function createAgent({
     }
   }
 
+  // Pause signal: set by Ctrl-C during agent execution, checked after each tool batch completes
+  let paused = false;
+  /** @type {import("./agentLoop.mjs").PauseSignal} */
+  const pauseSignal = {
+    isPaused: () => paused,
+    reset: () => {
+      paused = false;
+    },
+  };
+
   const agentLoop = createAgentLoop({
     callModel,
     stateManager,
@@ -152,6 +162,7 @@ export function createAgent({
     agentEventEmitter,
     toolUseApprover,
     subagentManager,
+    pauseSignal,
   });
 
   userEventEmitter.on("userInput", agentLoop.handleUserInput);
@@ -163,6 +174,9 @@ export function createAgent({
       dumpMessages,
       loadMessages,
       getCostSummary: () => costTracker.calculateCost(),
+      pauseAutoApprove: () => {
+        paused = true;
+      },
     },
   };
 }

package/src/agentLoop.mjs

@@ -7,7 +7,12 @@
  */
 
 import { styleText } from "node:util";
-import { consumeInterruptMessage } from "./context/consumeInterruptMessage.mjs";
+
+/**
+ * @typedef {Object} PauseSignal
+ * @property {() => boolean} isPaused - Returns true if auto-approve should be paused
+ * @property {() => void} reset - Resets the paused state
+ */
 
 /**
  * @typedef {Object} AgentLoopConfig
@@ -18,6 +23,7 @@ import { consumeInterruptMessage } from "./context/consumeInterruptMessage.mjs";
  * @property {AgentEventEmitter} agentEventEmitter - Event emitter for agent events
  * @property {ToolUseApprover} toolUseApprover - Tool use approval checker
  * @property {SubagentManager} subagentManager - Subagent manager instance
+ * @property {PauseSignal} pauseSignal - Signal to pause auto-approve after current tool completes
  */
 
 /**
@@ -36,6 +42,7 @@ export function createAgentLoop({
   agentEventEmitter,
   toolUseApprover,
   subagentManager,
+  pauseSignal,
 }) {
   const inputHandler = createInputHandler({
     stateManager,
@@ -198,14 +205,10 @@ export function createAgentLoop({
         stateManager.appendMessages([{ role: "user", content: toolResults }]);
       }
 
-      const interruptMessage = await consumeInterruptMessage();
-      if (interruptMessage) {
-        stateManager.appendMessages([
-          {
-            role: "user",
-            content: [{ type: "text", text: interruptMessage }],
-          },
-        ]);
+      // Check if auto-approve was paused by Ctrl-C during tool execution
+      if (pauseSignal.isPaused()) {
+        pauseSignal.reset();
+        break;
       }
     }
   }

package/src/cliArgs.mjs

@@ -125,10 +125,12 @@ Usage: plain [options]
 Options:
   -m, --model <model+variant>  Model to use
   -h, --help                   Show this help message
-  -c, --config <file>          Config file to load
+  -c, --config <file>          Config file to load (repeatable)
 
 Subcommands:
-  batch <task>                 Run in batch mode with the given task instruction
+  batch <task>                 Run in batch mode with the given task instruction.
+                               Config files are NOT auto-loaded in batch mode;
+                               use -c to specify config files explicitly.
   list-models                  List available models
   install-claude-code-plugins  Install Claude Code plugins
 
@@ -137,9 +139,7 @@ Examples:
   plain batch \\
         -c ~/.config/plain-agent/config.local.json \\
         -c .plain-agent/config.json \\
-        "Add tests for src/main.mjs"
-  plain list-models
-  plain install-claude-code-plugins
+        "Add tests for ..."
 `);
   process.exit(exitCode);
 }

package/src/cliCompleter.mjs

@@ -200,8 +200,8 @@ export function createCompleter(getCliRef, claudeCodePlugins) {
               const name = typeof cmd === "string" ? cmd : cmd.name;
               return (
                 name !== "/<id>" &&
-                (name === "/agents:" || !name.startsWith("/agent:")) &&
-                (name === "/prompts:" || !name.startsWith("/prompt:"))
+                (name === "/agents:" || !name.startsWith("/agents:")) &&
+                (name === "/prompts:" || !name.startsWith("/prompts:"))
               );
             },
           );

package/src/cliInteractive.mjs

@@ -16,7 +16,6 @@ import {
   createPasteTransform,
   resolvePastePlaceholders,
 } from "./cliPasteTransform.mjs";
-import { consumeInterruptMessage } from "./context/consumeInterruptMessage.mjs";
 import { notify } from "./utils/notify.mjs";
 
 const HELP_MESSAGE = [
@@ -121,7 +120,19 @@ export function startInteractiveSession({
   let lastExitAttempt = 0;
   const EXIT_CONFIRM_TIMEOUT = 1500;
 
-  const confirmExit = () => {
+  const handleCtrlC = () => {
+    // If agent is running, pause auto-approve instead of exiting
+    if (!state.turn) {
+      agentCommands.pauseAutoApprove();
+      console.log(
+        styleText(
+          "yellow",
+          "\n⚠ Ctrl-C: Auto-approve paused. Finishing current tool...",
+        ),
+      );
+      return;
+    }
+
     const now = Date.now();
     if (now - lastExitAttempt < EXIT_CONFIRM_TIMEOUT) {
       handleExit();
@@ -132,7 +143,7 @@ export function startInteractiveSession({
   };
 
   // Create a transform stream to handle bracketed paste before readline
-  const pasteTransform = createPasteTransform(confirmExit);
+  const pasteTransform = createPasteTransform(handleCtrlC);
 
   // Set up transformed stdin for readline
   process.stdin.pipe(pasteTransform);
@@ -198,7 +209,6 @@ export function startInteractiveSession({
     }
 
     cli.setPrompt(currentCliPrompt);
-    await consumeInterruptMessage();
 
     const result = await handleCommand(inputTrimmed);
     if (result === "prompt") {

package/src/cliPasteTransform.mjs

@@ -53,10 +53,10 @@ export function resolvePastePlaceholders(input) {
 
 /**
  * Create a Transform stream to handle bracketed paste before readline.
- * @param {() => void} onExitRequest - Called when Ctrl-C or Ctrl-D is detected
+ * @param {() => void} onCtrlC - Called when Ctrl-C or Ctrl-D is detected
  * @returns {Transform}
  */
-export function createPasteTransform(onExitRequest) {
+export function createPasteTransform(onCtrlC) {
   let inPasteMode = false;
   let pasteBuffer = "";
 
@@ -67,8 +67,7 @@ export function createPasteTransform(onExitRequest) {
 
       // Handle Ctrl-C and Ctrl-D
       if (data.includes("\x03") || data.includes("\x04")) {
-        // Ctrl-C / Ctrl-D: request exit (handled by confirmExit)
-        onExitRequest();
+        onCtrlC();
         callback();
         return;
       }

package/src/config.mjs

@@ -34,7 +34,7 @@ export async function loadAppConfig(options = {}) {
   } = options;
 
   // Always load predefined config
-  const paths = [`${AGENT_ROOT}/.config/config.predefined.json`];
+  const paths = [`${AGENT_ROOT}/config/config.predefined.json`];
 
   if (!skipUserConfig) {
     paths.push(

package/src/context/loadAgentRoles.mjs

@@ -30,7 +30,7 @@ export async function loadAgentRoles(claudeCodePlugins) {
   /** @type {Array<{dir: string, idPrefix: string, only?: RegExp}>} */
   const agentDirs = [
     {
-      dir: path.resolve(AGENT_ROOT, ".config", "agents.predefined"),
+      dir: path.resolve(AGENT_ROOT, "config", "agents.predefined"),
       idPrefix: "",
     },
     { dir: path.resolve(AGENT_USER_CONFIG_DIR, "agents"), idPrefix: "" },

package/src/context/loadPrompts.mjs

@@ -34,7 +34,7 @@ export async function loadPrompts(claudeCodePlugins) {
   /** @type {Array<{dir: string, idPrefix: string, only?: RegExp}>} */
   const promptDirs = [
     {
-      dir: path.resolve(AGENT_ROOT, ".config", "prompts.predefined"),
+      dir: path.resolve(AGENT_ROOT, "config", "prompts.predefined"),
       idPrefix: "",
     },
     { dir: path.resolve(AGENT_USER_CONFIG_DIR, "prompts"), idPrefix: "" },

package/src/env.mjs

@@ -38,9 +38,4 @@ export const AGENT_NOTIFY_CMD_DEFAULT = path.join(
   "plain-notify-terminal-bell",
 );
 
-export const AGENT_INTERRUPT_MESSAGE_FILE_PATH = path.join(
-  AGENT_PROJECT_METADATA_DIR,
-  "interrupt-message.txt",
-);
-
 export const USER_NAME = process.env.USER || "unknown";

package/src/modelDefinition.d.ts

@@ -34,6 +34,13 @@ export type PlatformConfig =
       customHeaders?: Record<string, string>;
       apiKey: string;
     }
+  | {
+      name: "openai-compatible";
+      variant: string;
+      baseURL: string;
+      customHeaders?: Record<string, string>;
+      apiKey: string;
+    }
   | {
       name: "azure";
       variant: string;

package/src/providers/openaiCompatible.mjs

@@ -36,6 +36,7 @@ export async function callOpenAICompatibleModel(
 
       switch (platformConfig.name) {
         case "openai":
+        case "openai-compatible":
           return `${baseURL}/v1/chat/completions`;
         case "bedrock":
           return `${baseURL}/model/${modelConfig.model}/invoke-with-response-stream`;
@@ -50,6 +51,7 @@ export async function callOpenAICompatibleModel(
     const headers = await (async () => {
       switch (platformConfig.name) {
         case "openai":
+        case "openai-compatible":
           return {
             ...platformConfig.customHeaders,
             Authorization: `Bearer ${platformConfig.apiKey}`,
@@ -68,6 +70,7 @@ export async function callOpenAICompatibleModel(
     const platformRequest = (() => {
       switch (platformConfig.name) {
         case "openai":
+        case "openai-compatible":
           return {
             ...modelConfig,
             stream: true,

package/src/subagent.mjs

@@ -25,6 +25,7 @@ import { reportAsSubagentToolName } from "./tools/reportAsSubagent.mjs";
 export function createSubagentManager(agentRoles, handlers) {
   /** @type {{name: string; goal: string; delegationMessageIndex: number}[]} */
   const subagents = [];
+  let subagentCount = 0;
 
   /**
    * @typedef {DelegateSuccess | DelegateFailure} DelegateResult
@@ -79,6 +80,9 @@ export function createSubagentManager(agentRoles, handlers) {
         : role.content;
     }
 
+    subagentCount++;
+    const sequenceNumber = String(subagentCount).padStart(2, "0");
+
     subagents.push({
       name: actualName,
       goal,
@@ -89,11 +93,11 @@ export function createSubagentManager(agentRoles, handlers) {
     return {
       success: true,
       value: [
-        `✓ Delegation successful. You are now the subagent "${actualName}".`,
+        `You are now the subagent "${actualName}". Start working on the following goal.`,
         `Your goal: ${goal}`,
         `Role: ${actualName}\n---\n${roleContent}\n---`,
-        `Memory file path format: ${AGENT_PROJECT_METADATA_DIR}/memory/<session-id>--${actualName}--<kebab-case-title>.md (Replace <kebab-case-title> to match the parent task)`,
-        `Start working on this goal now. When finished, call "report_as_subagent" with the memory file path.`,
+        `Memory file path format: ${AGENT_PROJECT_METADATA_DIR}/memory/<session-id>--${sequenceNumber}--${actualName}--<kebab-case-title>.md (Replace <kebab-case-title> with a short title describing your own goal)`,
+        `When finished, call "report_as_subagent" with the memory file path.`,
       ].join("\n\n"),
     };
   }

package/bin/plain-interrupt

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu -o pipefail
-
-mkdir -p .plain-agent
-echo -e "$@" >> .plain-agent/interrupt-message.txt

package/src/context/consumeInterruptMessage.mjs

@@ -1,30 +0,0 @@
-import fs from "node:fs/promises";
-import { AGENT_INTERRUPT_MESSAGE_FILE_PATH } from "../env.mjs";
-
-/**
- * @returns {Promise<string | undefined>}
- */
-export async function consumeInterruptMessage() {
-  try {
-    const content = await fs.readFile(
-      AGENT_INTERRUPT_MESSAGE_FILE_PATH,
-      "utf8",
-    );
-    await fs.truncate(AGENT_INTERRUPT_MESSAGE_FILE_PATH, 0);
-
-    if (content.trim() === "") {
-      return undefined;
-    }
-    return content;
-  } catch (err) {
-    if (
-      err instanceof Error &&
-      "code" in err &&
-      typeof err.code === "string" &&
-      err.code === "ENOENT"
-    ) {
-      return undefined;
-    }
-    throw err;
-  }
-}