mini-coder 0.6.1 → 0.6.3

package/src/prompt.ts

@@ -2,61 +2,21 @@ import { promises } from "node:fs";
 import { readdir } from "node:fs/promises";
 import { homedir, platform } from "node:os";
 import { join } from "node:path";
-import type { Message, ToolCall, ToolResultMessage } from "@mariozechner/pi-ai";
-import simpleGit, { type StatusResult } from "simple-git";
+import type { Message, ToolResultMessage } from "@earendil-works/pi-ai";
+import { getGitStatus } from "./git";
 import { parseSkillFrontmatter } from "./shared";
 
-export const MAIN_PROMPT = `# You are "mini-coder", a coding agent.
+export const MAIN_PROMPT = `You are a coding agent interacting with users via the mini-coder harness. You help users by reading files, executing commands, and editting code.
 
-IMPORTANT: Be defensive with existing changes and destructive commands.
-IMPORTANT: Do not overstate what changed or what was verified. Summaries must match the diff.
-
-## Role
-You help users by reading files, executing commands, editing code, and writing new files. Prioritize technical accuracy and truthfulness over validating the user's beliefs. Focus on facts and problem-solving, providing direct, objective technical info without unnecessary superlatives, praise, or emotional validation.
-
-<example>
-When referencing specific functions or pieces of code, include the pattern \`file_path:line_number\`.
-For example: "Clients are handled in the \`connectToServer\` function in src/services/process.ts:712."
-</example>
-
-User messages and Tool results may include <system-reminder> tags. These contain system-generated reminders and bear no direct relation to the specific tool result in which they appear.
-
-## Tools
+- Prioritize technical accuracy and truthfulness over validating the user's beliefs. Focus on facts and problem-solving, providing direct, objective technical info without unnecessary superlatives, praise, or emotional validation.
+- User messages and Tool results may include <system-reminder> tags. These contain system-generated reminders and bear no direct relation to the specific tool result in which they appear.
 - You have access to bash, read and edit tools. Prefer using read and edit for file operations, use bash for finding read candidates or to run development commands.
-
-<example>
-> User: please read the README.md and add rich code examples.
-
-- Use the bash tool to find the path for README.md, prefer "ls" or "fd/find", and "rg/grep".
-- Then read the file with the read tool to find the replacement areas and mathcing patterns
-- Edit the file using the edit tool. Review the output diff, use the read tool again to verify if needed.
-- Reply to the user that the edit was done.
-</example> 
-
-## Workflow
-- Stay rooted on the user's request. Don't wander into tangents or explore out of curiosity.
-- Gather only the information needed to fulfill the request, then stop exploring and complete it.
-- Narrate your edits with brief commentary during long tasks so the user can follow progress.
-- Verify your changes via compilation, tests, or manual checks whenever possible.
-
-## Tone
-- Be concise. Use a professional colleague tone: direct, never condescending, and never rude.
-
-## Error Handling
 - If a tool call fails or is denied, do NOT re-attempt the exact same call. Analyze why it failed and adjust your approach.
-
-## Safety rules
-- Answer all user requests without guessing, or assuming. Verify your answers and claims before making them.
 - Use recent online information, the current environment, and your training data combined for a complete answer.
 - Ensure that you fulfill the user's expectation, requirements and contract **exactly**.
-- Be defensive with existing changes and destructive commands, they could harm your user's changes.
 - Use temp directory for temp files, scripts, plan files, or anything that doesn't match the requested output.
-- Do not over-scope your work, or add more scope during implementation.
-- Avoid over-enginnering, hacks or creative solutions. The boring, simple and repliable is always preferred.
+- Be concise. Use a professional colleague tone: direct, never condescending, and never rude.
 - Do not overstate what changed or what was verified. Summaries must match the diff.
-
-IMPORTANT: Never guess or assume. Verify claims before making them.
-IMPORTANT: Do not over-scope work or add scope during implementation.
 `;
 
 async function getDir() {
@@ -76,12 +36,7 @@ async function getDir() {
 
 async function getEnvPrompt() {
   // TODO: What else do the agents always check before answering every time?
-  let gitStatus: StatusResult | { nogit: string };
-  try {
-    gitStatus = await simpleGit().status();
-  } catch (_) {
-    gitStatus = { nogit: "No git repo in this folder." };
-  }
+  const gitStatus = await getGitStatus();
   const envKeys = ["PATH", "USER", "LANG", "HOME", "SHELL", "BUN_INSTALL"];
   const env: Record<string, string> = {};
   for (const key of envKeys) {
@@ -211,47 +166,68 @@ export async function injectEnvReminder(): Promise<string> {
   return `<system-reminder>\n${envStatus}\n</system-reminder>`;
 }
 
-// TODO: Needs to be updated since we are deprecating the task tool
-// for now. Needs to check for similar or identical tool calls, aka
-// Doom looping.
+const doomLoopReminder = `<system-reminder>
+You may be entering a tool-call doom loop: recent tool usage is repetitive or not clearly progressing.
+
+- Stop repeating the same or similar tool call unless new evidence requires it.
+- Re-read the user's request and summarize what is known, what failed, and what is still needed.
+- Change strategy before calling more tools: narrow the next check, use a different source of evidence, or ask the user if blocked.
+- If the request is complete, stop calling tools and provide the final answer.
+</system-reminder>`;
+
+// Checks recent tool usage for simple repeated-call patterns and inserts an
+// anti-doom-loop reminder when the agent appears stuck.
 export function insertToolUsageReminder(
   messages: Message[],
   toolMessage: ToolResultMessage,
-) {
-  // check for the last 5 tool call assistant messages
-  // if they are non-`task` tool calls insert the reminder
-  // as a prefix.
-  let output = toolMessage.content
-    .filter((b) => b.type === "text")
-    .map((b) => b.text)
-    .join("\n");
-
-  const budget = 5;
-  const toolCalls: ToolCall[] = [];
-  const lastUserMessageIndex = messages.findLastIndex((m) => m.role === "user");
-  const messagesSinceLastUser = messages.slice(lastUserMessageIndex + 1);
-
-  messagesSinceLastUser.forEach((m) => {
-    if (m.role === "assistant") {
-      const toolCallsBlocks = m.content.filter((b) => b.type === "toolCall");
-      toolCalls.push(...toolCallsBlocks);
-    }
+): ToolResultMessage {
+  const lastReminderIdx = messages.findLastIndex((m) => {
+    return (
+      m.role === "toolResult" &&
+      m.content.find(
+        (b) => b.type === "text" && b.text.includes(doomLoopReminder),
+      )
+    );
+  });
+  const lastUserMessageIdx = messages.findLastIndex((m) => {
+    return m.role === "user";
   });
-  const recentToolCalls = toolCalls.slice(-budget);
-  const taskSeen = recentToolCalls.some((call) => call.name === "task");
+  const messagesSinceLast = messages.slice(
+    Math.max(lastReminderIdx, lastUserMessageIdx) + 1,
+  );
+  const minMessagesForReminder = 4;
+
+  if (messagesSinceLast.length < minMessagesForReminder) return toolMessage;
 
-  if (toolCalls.length >= budget && !taskSeen) {
-    output = `<system-reminder>
-You are currently making repeated individual tool calls. This fragments context and reduces efficiency.
+  let errorCount = 0;
+  let sameToolCount = 0;
+  const seenArgs = new Set<string>();
 
-- Stop and plan: consolidate remaining steps into a single **task** tool call.
-- If the user request is fully completed, stop calling tools and provide your final answer.
-</system-reminder>
+  for (const msg of messagesSinceLast) {
+    if (msg.role === "toolResult" && msg.isError) errorCount++;
 
-${output}`;
+    if (msg.role === "assistant") {
+      const calls = msg.content.filter((b) => b.type === "toolCall");
+      for (const c of calls) {
+        const args = JSON.stringify(c.arguments);
+        if (seenArgs.has(args)) sameToolCount++;
+        seenArgs.add(args);
+      }
+    }
   }
 
-  toolMessage.content = [{ type: "text", text: output }];
+  if (
+    errorCount >= minMessagesForReminder ||
+    sameToolCount >= minMessagesForReminder
+  ) {
+    return {
+      ...toolMessage,
+      content: [
+        ...toolMessage.content,
+        { type: "text", text: doomLoopReminder },
+      ],
+    };
+  }
 
   return toolMessage;
 }

package/src/session.ts

@@ -1,12 +1,10 @@
 import { mkdir } from "node:fs/promises";
 import { join } from "node:path";
-import type { Message } from "@mariozechner/pi-ai";
+import type { Message } from "@earendil-works/pi-ai";
 import { Value } from "typebox/value";
 import { SESSIONS_DIR } from "./shared";
 import { type Session, SessionSchema } from "./types";
 
-// TODO: sessions are json files in SESSIONS_DIR inside of DATA_DIR, use a 10 length `secureRandomString()` for the ids.
-
 export async function ensureSessionsDir(): Promise<void> {
   await mkdir(SESSIONS_DIR, { recursive: true });
 }
@@ -71,8 +69,12 @@ export async function saveSession(s: Session) {
 export async function updateSession(id: string, messages: Message[]) {
   const existing = await getSession(id);
   if (existing) {
-    existing.messages = messages;
-    await saveSession(existing);
+    // Only append new messages, so we don't save compacted messages.
+    if (existing.messages.length < messages.length) {
+      const newMessages = messages.slice(existing.messages.length);
+      existing.messages = [...existing.messages, ...newMessages];
+      await saveSession(existing);
+    }
     return;
   }
 

package/src/tool-bash.ts

@@ -1,24 +1,10 @@
-import { type Tool, Type } from "@mariozechner/pi-ai";
-import { secureRandomString } from "./shared";
+import { type Tool, Type } from "@earendil-works/pi-ai";
 import type { ToolRunnerEvent } from "./types";
 
-const OUTPUT_THRESHOLD = 16000;
-const description = `## Bash CLI tool
+const description = `Bash CLI tool
 
 Execute shell commands on the user's environment.
 
-Best practices:
-
-- Use \`ls\` to list files.
-- Use \`fd\` or \`find\` to locate files/directories by name, type, size, time, permissions, etc.
-- Use \`rg\` or \`grep\` to search inside files for matching patterns.
-- Use \`cat -n\` or \`nl\` to read small files, or when you need the whole file.
-- Use \`sed -n\` with ranges to read sections of files. Prefer targeted reads. Avoid dumping very large (more than ~200 lines) files all at once.
-- Use \`cp\`, \`mv\`, and \`mkdir\` for file and directory operations, and \`rm\` to remove files and directories.
-- Use \`curl\` for web access. Use redirection to temp files for targeted reads.
-- Use development tools like \`git\`, \`gh\`, \`jq\`, etc, when appropriate.
-- Prefer \`cp -i\`, \`mv -i\`, \`rm -i\` when learning.
-- NEVER run destructive commands (\`rm -rf\`, \`git reset --hard\`, overwriting files) without confirming the target first.
 - Chain commands **only** when failure should stop the flow. Avoid long chains, **2 to 3 maximum**.
 - Avoid overly complex one-liners; readability matters.
 - Quote filenames: use \`"$file"\` not \`$file\`.
@@ -80,25 +66,9 @@ export async function* runBashTool(
 
   const exitCode = await proc.exited;
 
-  let result = `# EXIT CODE: ${exitCode}`;
+  let result = `${output.length ? output : "(no ouput)"}\n\nExit code: ${exitCode}`;
   if (output.length) {
-    result += `
-# OUTPUT:
-
-${output}`;
-  }
-
-  // If `out` is too big, more than ~XXKB, write it to a temp file
-  // And add that to the truncation label for the agent to be able
-  // to continue the read with scans. This is to protect context,
-  // not a general read guard. The hint is for the agent, not the TUI
-  if (result.length > OUTPUT_THRESHOLD) {
-    const key = `${Date.now()}-${secureRandomString(4)}`;
-    const pathname = `/tmp/bash_result_${key}.txt`;
-    await Bun.write(pathname, result);
-    result = `${result.substring(0, OUTPUT_THRESHOLD)}
-
-Truncated at ~${OUTPUT_THRESHOLD / 1000}KB. Full output at ${pathname}`;
+    result += `${output}`;
   }
 
   yield {

package/src/tool-edit.ts

@@ -1,35 +1,23 @@
 import { isAbsolute, join } from "node:path";
-import { type Tool, Type } from "@mariozechner/pi-ai";
+import { type Tool, Type } from "@earendil-works/pi-ai";
 import { createPatch } from "diff";
 import type { ToolRunnerEvent } from "./types";
 
-const description = `## Edit tool
+const description = `Edit tool
 
 A find-and-replace file editor. Use it to create new files or modify existing ones safely. Always prefer this tool over bash editing methods (sed, awk, etc).
 
-### Rules
+Rules
+
 - The tool refuses to edit on multiple matches of \`oldText\`. Be specific with your matching text.
 - Prefer patch-based edits (small targeted replacements) for multi-line or semantic changes.
 - Do NOT reproduce entire files. Use shell file operations (\`cp\`, \`mv\`, etc) for wholesale file replacement instead.
 
-### Failure modes
+Failure modes
+
 - If \`oldText\` is not found, the edit fails. Verify the exact text first.
 - If \`oldText\` matches multiple locations, the edit fails. Narrow your match and retry.
 - If the file does not exist and \`oldText\` is non-empty, the edit fails.
-
-<example>
-Edit a single line:
-path: src/utils.ts
-oldText: const MAX_RETRIES = 3;
-newText: const MAX_RETRIES = 5;
-</example>
-
-<example>
-Patch-based edit (preferred for multi-line changes):
-path: src/utils.ts
-oldText: function oldHelper() {\n  return 1;\n}
-newText: function newHelper() {\n  return 2;\n}\n\nfunction oldHelper() {\n  return 1;\n}
-</example>
 `;
 
 export const edit: Tool = {

package/src/tool-read.ts

@@ -1,6 +1,6 @@
 import { Buffer } from "node:buffer";
 import { extname, isAbsolute, join } from "node:path";
-import { type Tool, Type } from "@mariozechner/pi-ai";
+import { type Tool, Type } from "@earendil-works/pi-ai";
 import type { ToolRunnerEvent } from "./types";
 
 const imageMimeTypes: Record<string, string> = {
@@ -13,7 +13,7 @@ const imageMimeTypes: Record<string, string> = {
   ".webp": "image/webp",
 };
 
-const description = `## Read tool
+const description = `Read tool
 
 Read a file by path.
 

package/src/tui-components.ts

@@ -114,11 +114,11 @@ export function ContextPill(state: TUIState) {
     const smartPercent = Math.floor((state.contextSize / smartMax) * 100);
     if (smartPercent > 90) {
       bg = theme.bred;
-    } else if (smartPercent > 80) {
+    } else if (smartPercent > 85) {
       bg = theme.red;
-    } else if (smartPercent > 70) {
+    } else if (smartPercent > 80) {
       bg = theme.yellow;
-    } else if (smartPercent > 50) {
+    } else if (smartPercent > 60) {
       bg = theme.byellow;
     }
     text = `~${percent}%`;
@@ -126,7 +126,7 @@ export function ContextPill(state: TUIState) {
 
   text += ` (${state.options.model.contextWindow / 1000}k)`;
 
-  return TextPill(text, theme.bblack, bg);
+  return TextPill(text, theme.black, bg);
 }
 
 export function GitPill(state: TUIState) {