opencode-miniterm 1.0.11 → 1.0.13

package/bun.lock

@@ -5,7 +5,7 @@
     "": {
       "name": "opencode-miniterm",
       "dependencies": {
-        "@opencode-ai/sdk": "^1.2.15",
+        "@opencode-ai/sdk": "^1.2.24",
         "allmark": "^1.0.2",
       },
       "devDependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "opencode-miniterm",
-	"version": "1.0.11",
+	"version": "1.0.13",
 	"description": "A small front-end terminal UI for OpenCode",
 	"main": "src/index.ts",
 	"bin": {

package/src/ansi.ts

@@ -5,7 +5,6 @@ export const CLEAR_SCREEN_UP = "\x1b[2A";
 export const CURSOR_HOME = "\x1b[0G";
 export const CURSOR_HIDE = "\x1b[?25l";
 export const CURSOR_SHOW = "\x1b[?25h";
-export const CURSOR_UP = (lines: number) => `\x1b[${lines}A`;
 export const DISABLE_LINE_WRAP = "\x1b[?7l";
 export const ENABLE_LINE_WRAP = "\x1b[?7h";
 export const RESET = "\x1b[0m";

package/src/index.ts

@@ -182,34 +182,50 @@ let completionCycling = false;
 let lastSpaceTime = 0;
 let currentInputBuffer: string | null = null;
 
-let count = 0;
+let oldInputBuffer = "";
 let oldWrappedRows = 0;
 let oldCursorRow = 0;
 function renderLine(): void {
 	const consoleWidth = process.stdout.columns || 80;
 
+	// Move to the start of the line (i.e. the prompt position)
 	readline.cursorTo(process.stdout, 0);
-
-	// Ensure the cursor is at the end of the old input
-	if (cursorPosition < inputBuffer.length) {
-		readline.moveCursor(process.stdout, 0, oldWrappedRows - oldCursorRow);
-	}
-
-	// Clear the old input
 	if (oldWrappedRows > 0) {
+		if (cursorPosition < inputBuffer.length) {
+			readline.moveCursor(process.stdout, 0, oldWrappedRows - oldCursorRow);
+		}
 		readline.moveCursor(process.stdout, 0, -oldWrappedRows);
 	}
+
+	// Find the position where the input has changed (i.e. where the user has
+	// typed something)
+	let start = 0;
+	let currentCol = 2;
+	let newWrappedRows = 0;
+	for (let i = 0; i < Math.min(oldInputBuffer.length, inputBuffer.length); i++) {
+		if (oldInputBuffer[i] !== inputBuffer[i]) {
+			break;
+		}
+		if (currentCol >= consoleWidth) {
+			readline.moveCursor(process.stdout, 0, 1);
+			currentCol = 0;
+			newWrappedRows++;
+		}
+		currentCol++;
+		start++;
+	}
+
+	// Clear the old, changed, input
+	readline.moveCursor(process.stdout, currentCol, 0);
 	readline.clearScreenDown(process.stdout);
-	readline.cursorTo(process.stdout, 2);
 
-	// Write the prompt
-	writePrompt();
+	if (start === 0) {
+		writePrompt();
+	}
 
-	// Write the new input buffer
+	// Write the changes from the new input buffer
 	let renderExtent = Math.max(cursorPosition + 1, inputBuffer.length);
-	let currentCol = 2;
-	let newWrappedRows = 0;
-	for (let i = 0; i < renderExtent; i++) {
+	for (let i = start; i < renderExtent; i++) {
 		if (currentCol >= consoleWidth) {
 			process.stdout.write("\n");
 			currentCol = 0;
@@ -221,14 +237,15 @@ function renderLine(): void {
 		currentCol++;
 	}
 
+	// Calculate and move to the cursor's position
 	let absolutePos = 2 + cursorPosition;
 	let newCursorRow = Math.floor(absolutePos / consoleWidth);
 	let newCursorCol = absolutePos % consoleWidth;
-
 	readline.cursorTo(process.stdout, 0);
 	readline.moveCursor(process.stdout, 0, -1 * (newWrappedRows - newCursorRow));
 	readline.cursorTo(process.stdout, newCursorCol);
 
+	oldInputBuffer = inputBuffer;
 	oldWrappedRows = newWrappedRows;
 	oldCursorRow = newCursorRow;
 }
@@ -692,8 +709,8 @@ async function processEvent(event: Event): Promise<void> {
 				const message = event.properties.status.message;
 				const retryTime = event.properties.status.next;
 				const sessionID = event.properties.sessionID;
-				console.error(`\n${ansi.RED}Error:${ansi.RESET} ${message}`);
-				console.error(`${ansi.BRIGHT_BLACK}Session:${ansi.RESET} ${sessionID}`);
+				console.error(`\n\n  ${ansi.RED}Error:${ansi.RESET} ${message}`);
+				console.error(`  ${ansi.BRIGHT_BLACK}Session:${ansi.RESET} ${sessionID}`);
 				if (retryTime) {
 					if (retryInterval) {
 						clearInterval(retryInterval);
@@ -701,13 +718,13 @@ async function processEvent(event: Event): Promise<void> {
 					const retryDate = new Date(retryTime);
 
 					let lastSeconds = Math.max(0, Math.ceil((retryDate.getTime() - Date.now()) / 1000));
-					console.error(`${ansi.BRIGHT_BLACK}Retrying in ${lastSeconds}s...${ansi.RESET}`);
+					console.error(`  ${ansi.BRIGHT_BLACK}Retrying in ${lastSeconds}s...${ansi.RESET}`);
 
 					retryInterval = setInterval(() => {
 						const remaining = Math.max(0, Math.ceil((retryDate.getTime() - Date.now()) / 1000));
 						if (remaining !== lastSeconds) {
 							process.stdout.write(
-								`\r${ansi.BRIGHT_BLACK}Retrying in ${remaining}s...${ansi.RESET}`,
+								`\r  ${ansi.BRIGHT_BLACK}Retrying in ${remaining}s...${ansi.RESET}`,
 							);
 							lastSeconds = remaining;
 						}
@@ -816,7 +833,9 @@ async function processToolUse(part: Part) {
 		toolPart.state.input["description"] ||
 		toolPart.state.input["filePath"] ||
 		toolPart.state.input["path"] ||
-		// TODO: more state.input props...
+		toolPart.state.input["include"] ||
+		toolPart.state.input["pattern"] ||
+		// TODO: more state.input props?
 		"...";
 	const toolText = `$ ${toolName}: ${ansi.BRIGHT_BLACK}${toolInput}${ansi.RESET}`;
 

package/src/render.ts

@@ -1,5 +1,6 @@
 import type { OpencodeClient } from "@opencode-ai/sdk";
 import { gfm, parse, renderToConsole } from "allmark";
+import readline from "node:readline";
 import * as ansi from "./ansi";
 import { config } from "./config";
 import type { State } from "./index";
@@ -138,9 +139,10 @@ function lastThinkingLines(text: string): string {
 
 function clearRenderedLines(state: State, linesToClear: number): void {
 	if (linesToClear > 0) {
-		state.write(`${ansi.CURSOR_UP(linesToClear)}\x1b[J`);
+		readline.moveCursor(process.stdout, 0, -1 * linesToClear);
+		readline.clearScreenDown(process.stdout);
 	}
-	state.write(ansi.CURSOR_HOME);
+	readline.cursorTo(process.stdout, 0);
 }
 
 export function wrapText(text: string, width: number): string[] {
@@ -301,7 +303,7 @@ export function startAnimation(startTime?: number): void {
 		const elapsedText = formatDuration(elapsed);
 
 		process.stdout.write(
-			`\r${ansi.BOLD_MAGENTA}${ANIMATION_CHARS[index]} ${ansi.RESET}${ansi.BRIGHT_BLACK}Running for ${elapsedText}${ansi.RESET}`,
+			`\r${ansi.BOLD_MAGENTA}${ANIMATION_CHARS[index]} ${ansi.RESET}${ansi.BRIGHT_BLACK}Running for ${elapsedText}${ansi.RESET}    `,
 		);
 		index = (index + 1) % ANIMATION_CHARS.length;
 	}, 100);