@iinm/plain-agent 1.8.3 → 1.8.4

package/src/cliCost.mjs

@@ -1,309 +0,0 @@
-/**
- * @import { UsageRecord } from "./usageStore.mjs"
- */
-
-import { styleText } from "node:util";
-import * as usageStore from "./usageStore.mjs";
-
-/**
- * @typedef {Object} CostPeriod
- * @property {string} from - YYYY-MM-DD (inclusive, local date)
- * @property {string} to - YYYY-MM-DD (inclusive, local date)
- */
-
-/**
- * @typedef {Object} DailyEntry
- * @property {string} date - YYYY-MM-DD
- * @property {number} totalCost
- * @property {number} sessionCount
- */
-
-/**
- * @typedef {Object} CurrencyAggregation
- * @property {string} currency
- * @property {DailyEntry[]} daily - sorted by date ascending
- * @property {number} totalCost
- * @property {number} sessionCount
- */
-
-/**
- * @typedef {Object} CostReport
- * @property {CostPeriod} period
- * @property {CurrencyAggregation[]} byCurrency - sorted by currency
- * @property {number} noPricingSessionCount - sessions without cost data
- * @property {number} excludedOutOfRange - records dropped (out of period)
- * @property {number} totalRecords - records considered (before filtering)
- */
-
-/**
- * Compute the default period: first day of current month (local) through today (local).
- * @param {Date} [now]
- * @returns {CostPeriod}
- */
-export function defaultPeriod(now = new Date()) {
-  const y = now.getFullYear();
-  const m = now.getMonth();
-  const firstOfMonth = new Date(y, m, 1);
-  return {
-    from: formatLocalDate(firstOfMonth),
-    to: formatLocalDate(now),
-  };
-}
-
-/**
- * Format a Date as YYYY-MM-DD in local time.
- * @param {Date} date
- * @returns {string}
- */
-export function formatLocalDate(date) {
-  const y = date.getFullYear();
-  const m = `${date.getMonth() + 1}`.padStart(2, "0");
-  const d = `${date.getDate()}`.padStart(2, "0");
-  return `${y}-${m}-${d}`;
-}
-
-/**
- * Parse and validate a YYYY-MM-DD string, returning a Date at local midnight.
- * @param {string} value
- * @returns {Date}
- */
-export function parseDateOnly(value) {
-  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
-  if (!match) {
-    throw new Error(`Invalid date: "${value}" (expected YYYY-MM-DD)`);
-  }
-  const [, year, month, day] = match;
-  const y = Number(year);
-  const m = Number(month);
-  const d = Number(day);
-  const date = new Date(y, m - 1, d);
-  if (
-    date.getFullYear() !== y ||
-    date.getMonth() !== m - 1 ||
-    date.getDate() !== d
-  ) {
-    throw new Error(`Invalid date: "${value}"`);
-  }
-  return date;
-}
-
-/**
- * Aggregate usage records into a cost report.
- *
- * @param {UsageRecord[]} records
- * @param {CostPeriod} period
- * @returns {CostReport}
- */
-export function aggregateUsage(records, period) {
-  const fromDate = parseDateOnly(period.from);
-  const toDate = parseDateOnly(period.to);
-  if (fromDate.getTime() > toDate.getTime()) {
-    throw new Error(
-      `"from" (${period.from}) must be on or before "to" (${period.to}).`,
-    );
-  }
-
-  /** @type {Map<string, Map<string, DailyEntry>>} */
-  const byCurrency = new Map();
-  let noPricingSessionCount = 0;
-  let excludedOutOfRange = 0;
-
-  for (const record of records) {
-    if (record.timestamp == null) {
-      excludedOutOfRange++;
-      continue;
-    }
-    const recordedAt = new Date(record.timestamp);
-    if (Number.isNaN(recordedAt.getTime())) {
-      excludedOutOfRange++;
-      continue;
-    }
-    const localDate = formatLocalDate(recordedAt);
-    if (localDate < period.from || localDate > period.to) {
-      excludedOutOfRange++;
-      continue;
-    }
-    if (record.totalCost === null) {
-      noPricingSessionCount++;
-      continue;
-    }
-    if (!record.currency || typeof record.currency !== "string") {
-      excludedOutOfRange++;
-      continue;
-    }
-
-    const perDate = byCurrency.get(record.currency) ?? new Map();
-    byCurrency.set(record.currency, perDate);
-    const existing = perDate.get(localDate);
-    if (existing) {
-      existing.totalCost += record.totalCost;
-      existing.sessionCount += 1;
-    } else {
-      perDate.set(localDate, {
-        date: localDate,
-        totalCost: record.totalCost,
-        sessionCount: 1,
-      });
-    }
-  }
-
-  /** @type {CurrencyAggregation[]} */
-  const aggregations = [];
-  for (const [currency, perDate] of byCurrency) {
-    const daily = Array.from(perDate.values()).sort((a, b) =>
-      a.date.localeCompare(b.date),
-    );
-    let totalCost = 0;
-    let sessionCount = 0;
-    for (const entry of daily) {
-      totalCost += entry.totalCost;
-      sessionCount += entry.sessionCount;
-    }
-    aggregations.push({ currency, daily, totalCost, sessionCount });
-  }
-  aggregations.sort((a, b) => a.currency.localeCompare(b.currency));
-
-  return {
-    period,
-    byCurrency: aggregations,
-    noPricingSessionCount,
-    excludedOutOfRange,
-    totalRecords: records.length,
-  };
-}
-
-/**
- * @param {number} count
- * @returns {string}
- */
-function formatSessions(count) {
-  return `${count} session${count === 1 ? "" : "s"}`;
-}
-
-/**
- * Render a cost report as a human-readable string.
- *
- * @param {CostReport} report
- * @param {{ color?: boolean }} [options]
- * @returns {string}
- */
-export function formatCostReport(report, options = {}) {
-  const color = options.color ?? true;
-  /** @param {string | string[]} _modifiers @param {string} text @returns {string} */
-  const plainStyle = (_modifiers, text) => text;
-  const style = color ? styleText : plainStyle;
-
-  const lines = [];
-  lines.push(
-    style("bold", `Period: ${report.period.from} to ${report.period.to}`),
-  );
-
-  if (report.byCurrency.length === 0) {
-    lines.push("");
-    lines.push(style("gray", "No usage recorded in this period."));
-    if (report.noPricingSessionCount > 0) {
-      lines.push(
-        style(
-          "gray",
-          `(${report.noPricingSessionCount} session(s) had no pricing configuration)`,
-        ),
-      );
-    }
-    return lines.join("\n");
-  }
-
-  for (const agg of report.byCurrency) {
-    lines.push("");
-    lines.push(style("bold", `Daily cost (${agg.currency}):`));
-    for (const entry of agg.daily) {
-      lines.push(
-        `  ${entry.date}   ${formatCost(entry.totalCost)} ${agg.currency}   (${formatSessions(entry.sessionCount)})`,
-      );
-    }
-    lines.push("");
-    lines.push(
-      style(
-        "bold",
-        `Total: ${formatCost(agg.totalCost)} ${agg.currency} (${formatSessions(agg.sessionCount)})`,
-      ),
-    );
-  }
-
-  if (report.noPricingSessionCount > 0) {
-    lines.push("");
-    lines.push(
-      style(
-        "gray",
-        `Note: ${report.noPricingSessionCount} session(s) had no pricing configuration and are excluded from totals.`,
-      ),
-    );
-  }
-
-  return lines.join("\n");
-}
-
-/**
- * Format a cost value with 4 decimals.
- * @param {number} value
- * @returns {string}
- */
-function formatCost(value) {
-  return value.toFixed(4);
-}
-
-/**
- * Run the `plain cost` subcommand.
- *
- * @param {{ from: string | null, to: string | null }} args
- * @param {{ readUsageRecords?: typeof import("./usageStore.mjs").readUsageRecords }} [deps]
- * @returns {Promise<number>} exit code
- */
-export async function runCostCommand(args, deps = {}) {
-  let from;
-  let to;
-  try {
-    ({ from, to } = resolvePeriod(args));
-  } catch (err) {
-    if (err instanceof Error) {
-      console.error(`Error: ${err.message}`);
-    } else {
-      console.error("Error: invalid period arguments");
-    }
-    return 1;
-  }
-
-  const { records, skipped } = await (
-    deps.readUsageRecords ?? usageStore.readUsageRecords
-  )();
-  if (skipped.length > 0) {
-    const details = skipped
-      .slice(0, 3)
-      .map((s) => `line ${s.line}: ${s.reason}`)
-      .join(", ");
-    const ellipsis =
-      skipped.length > 3 ? `, and ${skipped.length - 3} more` : "";
-    console.error(
-      `Warning: skipped ${skipped.length} malformed line(s) in usage log (${details}${ellipsis}).`,
-    );
-  }
-
-  const report = aggregateUsage(records, { from, to });
-  console.log(formatCostReport(report));
-  return skipped.length > 0 ? 1 : 0;
-}
-
-/**
- * Resolve a period from CLI arguments, falling back to the current month.
- *
- * @param {{ from: string | null, to: string | null }} args
- * @returns {CostPeriod}
- */
-export function resolvePeriod(args) {
-  const fallback = defaultPeriod();
-  const from = args.from ?? fallback.from;
-  const to = args.to ?? fallback.to;
-  // Validate format (throws on invalid input).
-  parseDateOnly(from);
-  parseDateOnly(to);
-  return { from, to };
-}

package/src/cliFormatter.mjs

@@ -1,413 +0,0 @@
-/**
- * @import { Message, MessageContentToolUse, MessageContentToolResult, ProviderTokenUsage } from "./model"
- * @import { CompactContextInput } from "./tools/compactContext"
- * @import { ExecCommandInput } from "./tools/execCommand"
- * @import { PatchFileInput } from "./tools/patchFile"
- * @import { WriteFileInput } from "./tools/writeFile"
- * @import { TmuxCommandInput } from "./tools/tmuxCommand"
- * @import { DelegateToSubagentInput } from "./tools/delegateToSubagent"
- */
-
-import { styleText } from "node:util";
-import { createPatch } from "diff";
-
-/** Length above which a single-line arg forces block-form rendering. */
-const ARG_BLOCK_LENGTH_THRESHOLD = 60;
-
-/**
- * Format an args array for display.
- * Uses compact JSON for short single-line args; switches to a YAML-style
- * block form when any arg contains newlines or exceeds
- * {@link ARG_BLOCK_LENGTH_THRESHOLD} characters so that long scripts passed
- * to `bash -c`, `python -c`, `node -e`, etc. stay readable.
- * @param {unknown} args
- * @returns {string}
- */
-export function formatArgs(args) {
-  if (!Array.isArray(args) || args.length === 0) {
-    return `args: ${JSON.stringify(args ?? [])}`;
-  }
-
-  const needsBlock = args.some(
-    (a) =>
-      typeof a === "string" &&
-      (a.includes("\n") || a.length > ARG_BLOCK_LENGTH_THRESHOLD),
-  );
-  if (!needsBlock) {
-    return `args: ${JSON.stringify(args)}`;
-  }
-
-  const lines = ["args:"];
-  for (const arg of args) {
-    if (
-      typeof arg === "string" &&
-      (arg.includes("\n") || arg.length > ARG_BLOCK_LENGTH_THRESHOLD)
-    ) {
-      lines.push("  - |");
-      for (const line of arg.split("\n")) {
-        lines.push(`      ${line}`);
-      }
-    } else {
-      lines.push(`  - ${JSON.stringify(arg)}`);
-    }
-  }
-  return lines.join("\n");
-}
-
-/**
- * Format tool use for display.
- * @param {MessageContentToolUse} toolUse
- * @returns {string}
- */
-export function formatToolUse(toolUse) {
-  const { toolName, input } = toolUse;
-
-  if (toolName === "exec_command") {
-    /** @type {Partial<ExecCommandInput>} */
-    const execCommandInput = input;
-    return [
-      `tool: ${toolName}`,
-      `command: ${JSON.stringify(execCommandInput.command)}`,
-      formatArgs(execCommandInput.args),
-    ].join("\n");
-  }
-
-  if (toolName === "write_file") {
-    /** @type {Partial<WriteFileInput>} */
-    const writeFileInput = input;
-    return [
-      `tool: ${toolName}`,
-      `filePath: ${writeFileInput.filePath}`,
-      `content:\n${writeFileInput.content}`,
-    ].join("\n");
-  }
-
-  if (toolName === "patch_file") {
-    /** @type {Partial<PatchFileInput>} */
-    const patchFileInput = input;
-    const diff = patchFileInput.diff || "";
-
-    /** @type {{search:string; replace:string}[]} */
-    const diffs = [];
-    const matches = Array.from(
-      diff.matchAll(
-        /<<< [0-9a-z]{3} <<< SEARCH\n(.*?)\n=== [0-9a-z]{3} ===\n(.*?)\n?>>> [0-9a-z]{3} >>> REPLACE/gs,
-      ),
-    );
-    for (const match of matches) {
-      const [_, search, replace] = match;
-      diffs.push({ search, replace });
-    }
-
-    const highlightedDiff = diffs
-      .map(
-        ({ search, replace }) =>
-          `${createPatch(patchFileInput.filePath || "", search, replace)
-            .replace(/^-.+$/gm, (match) => styleText("red", match))
-            .replace(/^\+.+$/gm, (match) => styleText("green", match))
-            .replace(/^@@.+$/gm, (match) => styleText("gray", match))
-            .replace(/^\$/gm, (match) =>
-              styleText("gray", match),
-            )}\n-------\n${replace}`,
-      )
-      .join("\n\n");
-
-    return [
-      `tool: ${toolName}`,
-      `path: ${patchFileInput.filePath}`,
-      `diff:\n${highlightedDiff}`,
-    ].join("\n");
-  }
-
-  if (toolName === "tmux_command") {
-    /** @type {Partial<TmuxCommandInput>} */
-    const tmuxCommandInput = input;
-    return [
-      `tool: ${toolName}`,
-      `command: ${tmuxCommandInput.command}`,
-      formatArgs(tmuxCommandInput.args),
-    ].join("\n");
-  }
-
-  if (toolName === "delegate_to_subagent") {
-    /** @type {Partial<DelegateToSubagentInput>} */
-    const delegateInput = input;
-    return [
-      `tool: ${toolName}`,
-      `name: ${delegateInput.name}`,
-      `goal: ${delegateInput.goal}`,
-    ].join("\n");
-  }
-
-  if (toolName === "compact_context") {
-    /** @type {Partial<CompactContextInput>} */
-    const compactContextInput = input;
-    return [
-      `tool: ${toolName}`,
-      `memoryPath: ${compactContextInput.memoryPath}`,
-      `reason: ${compactContextInput.reason}`,
-    ].join("\n");
-  }
-
-  if (toolName === "report_as_subagent") {
-    /** @type {Partial<import("./tools/reportAsSubagent").ReportAsSubagentInput>} */
-    const reportAsSubagentInput = input;
-    return [
-      `tool: ${toolName}`,
-      `memoryPath: ${reportAsSubagentInput.memoryPath}`,
-    ].join("\n");
-  }
-
-  if (toolName === "ask_web") {
-    /** @type {Partial<import("./tools/askWeb.mjs").AskWebInput>} */
-    const askWebInput = input;
-    return [`tool: ${toolName}`, `question: ${askWebInput.question}`].join(
-      "\n",
-    );
-  }
-
-  if (toolName === "ask_url") {
-    /** @type {Partial<import("./tools/askURL.mjs").AskURLInput>} */
-    const askURLInput = input;
-    return [`tool: ${toolName}`, `question: ${askURLInput.question}`].join(
-      "\n",
-    );
-  }
-
-  const { provider: _, ...filteredToolUse } = toolUse;
-
-  return JSON.stringify(filteredToolUse, null, 2);
-}
-
-/** Maximum length of output to display */
-const MAX_DISPLAY_OUTPUT_LENGTH = 1024;
-
-/**
- * Format tool result for display.
- * @param {MessageContentToolResult} toolResult
- * @returns {string}
- */
-export function formatToolResult(toolResult) {
-  const { content, isError } = toolResult;
-
-  /** @type {string[]} */
-  const contentStringParts = [];
-  for (const part of content) {
-    switch (part.type) {
-      case "text":
-        contentStringParts.push(part.text);
-        break;
-      case "image":
-        contentStringParts.push(
-          `data:${part.mimeType};base64,${part.data.slice(0, 20)}...`,
-        );
-        break;
-      default:
-        console.log(`Unsupported content part: ${JSON.stringify(part)}`);
-        break;
-    }
-  }
-
-  const contentString = contentStringParts.join("\n\n");
-
-  if (isError) {
-    return styleText("red", contentString);
-  }
-
-  if (toolResult.toolName === "exec_command") {
-    return contentString
-      .replace(/(^<stdout>|<\/stdout>$)/gm, styleText("blue", "$1"))
-      .replace(
-        /(<truncated_output.+?>|<\/truncated_output>)/g,
-        styleText("yellow", "$1"),
-      )
-      .replace(/(^<stderr>|<\/stderr>$)/gm, styleText("magenta", "$1"))
-      .replace(/(^<error>|<\/error>$)/gm, styleText("red", "$1"));
-  }
-
-  if (toolResult.toolName === "tmux_command") {
-    return contentString
-      .replace(/(^<stdout>|<\/stdout>$)/gm, styleText("blue", "$1"))
-      .replace(/(^<stderr>|<\/stderr>$)/gm, styleText("magenta", "$1"))
-      .replace(/(^<error>|<\/error>$)/gm, styleText("red", "$1"))
-      .replace(/(^<tmux:.*?>|<\/tmux:.*?>$)/gm, styleText("green", "$1"));
-  }
-
-  if (contentString.length > MAX_DISPLAY_OUTPUT_LENGTH) {
-    return [
-      contentString.slice(0, MAX_DISPLAY_OUTPUT_LENGTH),
-      styleText("yellow", "... (Output truncated for display)"),
-      "\n",
-    ].join("");
-  }
-
-  return contentString;
-}
-
-/**
- * Format provider token usage for display.
- * @param {ProviderTokenUsage} usage
- * @returns {string}
- */
-export function formatProviderTokenUsage(usage) {
-  /** @type {string[]} */
-  const lines = [];
-  /** @type {string[]} */
-  const header = [];
-  for (const [key, value] of Object.entries(usage)) {
-    if (typeof value === "number") {
-      header.push(`${key}: ${value}`);
-    } else if (typeof value === "string") {
-      header.push(`${key}: ${value}`);
-    } else if (value) {
-      lines.push(
-        `(${key}) ${Object.entries(value)
-          .filter(
-            ([k]) =>
-              ![
-                // OpenAI
-                "audio_tokens",
-                "accepted_prediction_tokens",
-                "rejected_prediction_tokens",
-              ].includes(k),
-          )
-          .map(([k, v]) => `${k}: ${JSON.stringify(v)}`)
-          .join(", ")}`,
-      );
-    }
-  }
-
-  const outputLines = [`\n${header.join(", ")}`];
-
-  if (lines.length) {
-    outputLines.push(lines.join(" / "));
-  }
-
-  return styleText("gray", outputLines.join("\n"));
-}
-
-/**
- * Format cost summary for interactive display
- * @param {import("./costTracker.mjs").CostSummary} summary
- * @returns {string}
- */
-export function formatCostSummary(summary) {
-  if (!summary || Object.keys(summary.breakdown).length === 0) {
-    return styleText("gray", "No token usage recorded yet.");
-  }
-
-  const lines = [];
-
-  if (summary.totalCost !== undefined) {
-    lines.push(
-      styleText(
-        "bold",
-        `\nTotal: ${summary.totalCost.toFixed(4)} ${summary.currency}`,
-      ),
-    );
-  } else {
-    lines.push(styleText("yellow", "Total: N/A (no cost configuration)"));
-  }
-
-  lines.push(styleText("bold", "\nTokens:"));
-  for (const [key, { tokens, cost }] of Object.entries(summary.breakdown)) {
-    const tokenStr = `${key}: ${tokens.toLocaleString()}`;
-
-    if (cost !== undefined) {
-      const costStr = `${cost.toFixed(4)} ${summary.currency}`;
-      lines.push(`  ${tokenStr.padEnd(30)} ${styleText("cyan", costStr)}`);
-    } else {
-      lines.push(`  ${tokenStr.padEnd(30)} ${styleText("gray", "N/A")}`);
-    }
-  }
-
-  return lines.join("\n");
-}
-
-/**
- * Format cost for batch mode JSON output
- * @param {import("./costTracker.mjs").CostSummary} summary
- */
-export function formatCostForBatch(summary) {
-  if (!summary || Object.keys(summary.breakdown).length === 0) {
-    return undefined;
-  }
-
-  return {
-    total: summary.totalCost,
-    currency: summary.currency,
-    unit: summary.unit,
-    breakdown: Object.fromEntries(
-      Object.entries(summary.breakdown).map(([key, { tokens, cost }]) => [
-        key,
-        { tokens, cost },
-      ]),
-    ),
-  };
-}
-
-/**
- * Print a message to the console.
- * @param {Message} message
- */
-export function printMessage(message) {
-  switch (message.role) {
-    case "assistant": {
-      // console.log(styleText("bold", "\nAgent:"));
-      for (const part of message.content) {
-        switch (part.type) {
-          // Note: Streamで表示するためここでは表示しない
-          // case "thinking":
-          //   console.log(
-          //     [
-          //       styleText("blue", "<thinking>"),
-          //       part.thinking,
-          //       styleText("blue", "</thinking>\n"),
-          //     ].join("\n"),
-          //   );
-          //   break;
-          // case "text":
-          //   console.log(part.text);
-          //   break;
-          case "tool_use":
-            console.log(styleText("bold", "\nTool call:"));
-            console.log(formatToolUse(part));
-            break;
-        }
-      }
-      break;
-    }
-    case "user": {
-      for (const part of message.content) {
-        switch (part.type) {
-          case "tool_result": {
-            console.log(styleText("bold", "\nTool result:"));
-            console.log(formatToolResult(part));
-            break;
-          }
-          case "text": {
-            console.log(styleText("bold", "\nUser:"));
-            const highlighted = part.text.replace(
-              /^(<context.+?>|<\/context>)/gm,
-              styleText("green", "$1"),
-            );
-            console.log(highlighted);
-            break;
-          }
-          case "image": {
-            break;
-          }
-          default: {
-            console.log(styleText("bold", "\nUnknown Message Format:"));
-            console.log(JSON.stringify(part, null, 2));
-          }
-        }
-      }
-      break;
-    }
-    default: {
-      console.log(styleText("bold", "\nUnknown Message Format:"));
-      console.log(JSON.stringify(message, null, 2));
-    }
-  }
-}