opencode-miniterm 1.0.1 → 1.0.3

package/src/index.ts

@@ -14,7 +14,6 @@ import detailsCommand from "./commands/details";
 import diffCommand from "./commands/diff";
 import exitCommand from "./commands/exit";
 import initCommand from "./commands/init";
-import killCommand from "./commands/kill";
 import logCommand, { isLoggingEnabled } from "./commands/log";
 import modelsCommand from "./commands/models";
 import newCommand from "./commands/new";
@@ -42,7 +41,6 @@ const SLASH_COMMANDS = [
 	debugCommand,
 	logCommand,
 	pageCommand,
-	killCommand,
 	exitCommand,
 	quitCommand,
 	runCommand,
@@ -52,6 +50,7 @@ let client: ReturnType<typeof createOpencodeClient>;
 
 let processing = true;
 let retryInterval: ReturnType<typeof setInterval> | null = null;
+let isRequestActive = false;
 
 interface AccumulatedPart {
 	key: string;
@@ -122,11 +121,11 @@ async function main() {
 	try {
 		let isNewSession = false;
 
-		const initialSessionID = config.sessionID;
+		const initialSessionID = config.sessionIDs[cwd];
 		if (!initialSessionID || !(await validateSession(initialSessionID))) {
 			state.sessionID = await createSession();
 			isNewSession = true;
-			config.sessionID = state.sessionID;
+			config.sessionIDs[cwd] = state.sessionID;
 			saveConfig();
 		} else {
 			state.sessionID = initialSessionID;
@@ -136,6 +135,8 @@ async function main() {
 
 		await updateSessionTitle();
 
+		const sessionHistory = await loadSessionHistory();
+
 		const activeDisplay = await getActiveDisplay(client);
 
 		process.stdout.write(`${ansi.CLEAR_SCREEN_UP}${ansi.CLEAR_FROM_CURSOR}`);
@@ -160,11 +161,13 @@ async function main() {
 		let inputBuffer = "";
 		let cursorPosition = 0;
 		let completions: string[] = [];
-		let history: string[] = [];
-		let historyIndex = -1;
+		let history: string[] = sessionHistory;
+		let historyIndex = history.length;
 		let selectedCompletion = 0;
 		let showCompletions = false;
 		let completionCycling = false;
+		let lastSpaceTime = 0;
+		let currentInputBuffer: string | null = null;
 
 		const getCompletions = async (text: string): Promise<string[]> => {
 			if (text.startsWith("/")) {
@@ -251,6 +254,7 @@ async function main() {
 			showCompletions = false;
 			completionCycling = false;
 			completions = [];
+			currentInputBuffer = null;
 
 			if (input) {
 				if (history[history.length - 1] !== input) {
@@ -283,13 +287,16 @@ async function main() {
 						return;
 					}
 
+					isRequestActive = true;
 					process.stdout.write(ansi.CURSOR_HIDE);
 					startAnimation();
 					if (isLoggingEnabled()) {
 						console.log(`📝 ${ansi.BRIGHT_BLACK}Logging to ${getLogDir()}\n${ansi.RESET}`);
 					}
 					await sendMessage(state.sessionID, input);
+					isRequestActive = false;
 				} catch (error: any) {
+					isRequestActive = false;
 					if (error.message !== "Request cancelled") {
 						stopAnimation();
 						console.error("Error:", error.message);
@@ -312,11 +319,17 @@ async function main() {
 
 			switch (key.name) {
 				case "up": {
+					if (historyIndex === history.length) {
+						currentInputBuffer = inputBuffer;
+					}
 					if (history.length > 0) {
 						if (historyIndex > 0) {
 							historyIndex--;
+							inputBuffer = history[historyIndex]!;
+						} else {
+							historyIndex = Math.max(-1, historyIndex - 1);
+							inputBuffer = "";
 						}
-						inputBuffer = history[historyIndex]!;
 						cursorPosition = inputBuffer.length;
 						renderLine();
 					}
@@ -326,9 +339,11 @@ async function main() {
 					if (history.length > 0) {
 						if (historyIndex < history.length - 1) {
 							historyIndex++;
+							inputBuffer = history[historyIndex]!;
 						} else {
 							historyIndex = history.length;
-							inputBuffer = "";
+							inputBuffer = currentInputBuffer || "";
+							currentInputBuffer = null;
 						}
 						cursorPosition = inputBuffer.length;
 						renderLine();
@@ -345,13 +360,21 @@ async function main() {
 					return;
 				}
 				case "escape": {
-					if (state.sessionID) {
-						client.session.abort({ path: { id: state.sessionID } }).catch(() => {});
+					if (isRequestActive) {
+						if (state.sessionID) {
+							client.session.abort({ path: { id: state.sessionID } }).catch(() => {});
+						}
+						stopAnimation();
+						process.stdout.write(ansi.CURSOR_SHOW);
+						process.stdout.write(`\r  ${ansi.BRIGHT_BLACK}Cancelled request${ansi.RESET}\n`);
+						writePrompt();
+						isRequestActive = false;
+					} else {
+						inputBuffer = "";
+						cursorPosition = 0;
+						currentInputBuffer = null;
+						renderLine();
 					}
-					stopAnimation();
-					process.stdout.write(ansi.CURSOR_SHOW);
-					process.stdout.write(`\r${ansi.BRIGHT_BLACK}Cancelled request${ansi.RESET}\n`);
-					writePrompt();
 					return;
 				}
 				case "return": {
@@ -363,6 +386,7 @@ async function main() {
 						inputBuffer =
 							inputBuffer.slice(0, cursorPosition - 1) + inputBuffer.slice(cursorPosition);
 						cursorPosition--;
+						currentInputBuffer = null;
 					}
 					break;
 				}
@@ -370,6 +394,7 @@ async function main() {
 					if (cursorPosition < inputBuffer.length) {
 						inputBuffer =
 							inputBuffer.slice(0, cursorPosition) + inputBuffer.slice(cursorPosition + 1);
+						currentInputBuffer = null;
 					}
 					break;
 				}
@@ -391,9 +416,30 @@ async function main() {
 				}
 				default: {
 					if (str) {
-						inputBuffer =
-							inputBuffer.slice(0, cursorPosition) + str + inputBuffer.slice(cursorPosition);
-						cursorPosition += str.length;
+						if (str === " ") {
+							const now = Date.now();
+							if (
+								now - lastSpaceTime < 500 &&
+								cursorPosition > 0 &&
+								inputBuffer[cursorPosition - 1] === " "
+							) {
+								inputBuffer =
+									inputBuffer.slice(0, cursorPosition - 1) +
+									". " +
+									inputBuffer.slice(cursorPosition);
+								cursorPosition += 1;
+							} else {
+								inputBuffer =
+									inputBuffer.slice(0, cursorPosition) + str + inputBuffer.slice(cursorPosition);
+								cursorPosition += str.length;
+							}
+							lastSpaceTime = now;
+						} else {
+							inputBuffer =
+								inputBuffer.slice(0, cursorPosition) + str + inputBuffer.slice(cursorPosition);
+							cursorPosition += str.length;
+						}
+						currentInputBuffer = null;
 					}
 				}
 			}
@@ -461,6 +507,34 @@ async function updateSessionTitle(): Promise<void> {
 	}
 }
 
+async function loadSessionHistory(): Promise<string[]> {
+	try {
+		const result = await client.session.messages({
+			path: { id: state.sessionID },
+		});
+		if (result.error || !result.data) {
+			return [];
+		}
+
+		const history: string[] = [];
+		for (const msg of result.data) {
+			if (msg.info.role === "user") {
+				const textParts = msg.parts
+					.filter((p: Part) => p.type === "text")
+					.map((p: Part) => (p as any).text || "")
+					.filter(Boolean);
+				const text = textParts.join("").trim();
+				if (text && !text.startsWith("/")) {
+					history.push(text);
+				}
+			}
+		}
+		return history;
+	} catch {
+		return [];
+	}
+}
+
 async function startEventListener(): Promise<void> {
 	try {
 		const { stream } = await client.event.subscribe({
@@ -527,7 +601,7 @@ async function sendMessage(sessionID: string, message: string) {
 
 		const duration = Date.now() - requestStartTime;
 		const durationText = formatDuration(duration);
-		console.log(`${ansi.BRIGHT_BLACK}Completed in ${durationText}${ansi.RESET}\n`);
+		console.log(`  ${ansi.BRIGHT_BLACK}Completed in ${durationText}${ansi.RESET}\n`);
 
 		writePrompt();
 
@@ -591,6 +665,7 @@ async function processEvent(event: Event): Promise<void> {
 		case "session.status":
 			if (event.type === "session.status" && event.properties.status.type === "idle") {
 				stopAnimation();
+				isRequestActive = false;
 				process.stdout.write(ansi.CURSOR_SHOW);
 				if (retryInterval) {
 					clearInterval(retryInterval);
@@ -699,7 +774,7 @@ async function processReasoning(part: Part) {
 
 	const text = (part as any).text || "";
 	const cleanText = ansi.stripAnsiCodes(text.trimStart());
-	await writeToLog(`💭 Thinking...\n\n${cleanText}\n\n`);
+	await writeToLog(`Thinking:\n\n${cleanText}\n\n`);
 
 	render(state);
 }
@@ -715,7 +790,7 @@ async function processText(part: Part) {
 
 	const text = (part as any).text || "";
 	const cleanText = ansi.stripAnsiCodes(text.trimStart());
-	await writeToLog(`💬 Response:\n\n${cleanText}\n\n`);
+	await writeToLog(`Response:\n\n${cleanText}\n\n`);
 
 	render(state);
 }
@@ -724,7 +799,7 @@ async function processToolUse(part: Part) {
 	const toolPart = part as ToolPart;
 	const toolName = toolPart.tool || "unknown";
 	const toolInput = toolPart.state.input["description"] || toolPart.state.input["filePath"] || {};
-	const toolText = `🔧 ${toolName}: ${ansi.BRIGHT_BLACK}${toolInput}${ansi.RESET}`;
+	const toolText = `${ansi.BRIGHT_BLACK}$${ansi.RESET} ${toolName}: ${ansi.BRIGHT_BLACK}${toolInput}${ansi.RESET}`;
 
 	if (state.accumulatedResponse[state.accumulatedResponse.length - 1]?.title === "tool") {
 		state.accumulatedResponse[state.accumulatedResponse.length - 1]!.text = toolText;
@@ -733,7 +808,7 @@ async function processToolUse(part: Part) {
 	}
 
 	const cleanToolText = ansi.stripAnsiCodes(toolText);
-	await writeToLog(`${cleanToolText}\n\n`);
+	await writeToLog(`$ ${cleanToolText}\n\n`);
 
 	render(state);
 }
@@ -748,28 +823,26 @@ function processDelta(partID: string, delta: string) {
 }
 
 async function processDiff(diff: FileDiff[]) {
-	let hasChanges = false;
 	const parts: string[] = [];
 	for (const file of diff) {
-		const status = !file.before ? "added" : !file.after ? "deleted" : "modified";
-		const statusIcon = status === "added" ? "A" : status === "modified" ? "M" : "D";
-		const statusLabel =
-			status === "added" ? "added" : status === "modified" ? "modified" : "deleted";
-		const addStr = file.additions > 0 ? `${ansi.GREEN}+${file.additions}${ansi.RESET}` : "";
-		const delStr = file.deletions > 0 ? `${ansi.RED}-${file.deletions}${ansi.RESET}` : "";
-		const stats = [addStr, delStr].filter(Boolean).join(" ");
-		const line = `  ${ansi.BLUE}${statusIcon}${ansi.RESET} ${file.file} (${statusLabel}) ${stats}`;
-		parts.push(line);
-
 		const newAfter = file.after ?? "";
 		const oldAfter = state.lastFileAfter.get(file.file);
 		if (newAfter !== oldAfter) {
-			hasChanges = true;
+			const status = !file.before ? "added" : !file.after ? "deleted" : "modified";
+			const statusIcon = status === "added" ? "A" : status === "modified" ? "M" : "D";
+			const statusLabel =
+				status === "added" ? "added" : status === "modified" ? "modified" : "deleted";
+			const addStr = file.additions > 0 ? `${ansi.GREEN}+${file.additions}${ansi.RESET}` : "";
+			const delStr = file.deletions > 0 ? `${ansi.RED}-${file.deletions}${ansi.RESET}` : "";
+			const stats = [addStr, delStr].filter(Boolean).join(" ");
+			const line = `${ansi.BLUE}${statusIcon}${ansi.RESET} ${file.file} (${statusLabel}) ${stats}`;
+			parts.push(line);
+
 			state.lastFileAfter.set(file.file, newAfter);
 		}
 	}
 
-	if (hasChanges) {
+	if (parts.length > 0) {
 		state.accumulatedResponse.push({ key: "diff", title: "files", text: parts.join("\n") });
 
 		const diffText = ansi.stripAnsiCodes(parts.join("\n"));
@@ -785,15 +858,11 @@ async function processTodos(todos: Todo[]) {
 	for (let todo of todos) {
 		let todoText = "";
 		if (todo.status === "completed") {
-			todoText += ansi.STRIKETHROUGH;
 			todoText += "- [✓] ";
 		} else {
 			todoText += "- [ ] ";
 		}
 		todoText += todo.content;
-		if (todo.status === "completed") {
-			todoText += ansi.RESET;
-		}
 		todoListText += todoText + "\n";
 	}
 

package/src/render.ts

@@ -12,11 +12,7 @@ export function render(state: State, details = false): void {
 	}
 
 	// Only show the last (i.e. active) thinking part
-	// Only show the last (i.e. active) tool use
-	// Only show the last files part between parts
 	let foundPart = false;
-	let foundFiles = false;
-	let foundTodo = false;
 	for (let i = state.accumulatedResponse.length - 1; i >= 0; i--) {
 		const part = state.accumulatedResponse[i];
 		if (!part) continue;
@@ -26,18 +22,15 @@ export function render(state: State, details = false): void {
 		}
 
 		if (part.title === "thinking") {
+			if (part.active === false) {
+				break;
+			}
 			part.active = !foundPart;
 			foundPart = true;
-		} else if (part.title === "tool") {
-			part.active = !foundPart;
-		} else if (part.title === "files") {
-			part.active = !foundFiles;
-			foundFiles = true;
-		} else if (part.title === "todo") {
-			part.active = !foundTodo;
-			foundTodo = true;
-		} else {
+		} else if (part.title === "response") {
+			part.active = true;
 			foundPart = true;
+		} else {
 			part.active = true;
 		}
 	}
@@ -48,17 +41,19 @@ export function render(state: State, details = false): void {
 		if (!part.text.trim()) continue;
 
 		if (part.title === "thinking") {
+			// Show max 10 thinking lines
 			const partText = details ? part.text.trimStart() : lastThinkingLines(part.text.trimStart());
-			output += `💭 ${ansi.BRIGHT_BLACK}${partText}${ansi.RESET}\n\n`;
+			output += `${ansi.BOLD_BRIGHT_BLACK}~${ansi.RESET} ${ansi.BRIGHT_BLACK}${partText}${ansi.RESET}\n\n`;
 		} else if (part.title === "response") {
+			// Show all response lines
 			const doc = parse(part.text.trimStart(), gfm);
 			const partText = renderToConsole(doc);
-			output += `💬 ${partText}\n\n`;
-		} else if (part.title === "tool") {
-			output += part.text + "\n\n";
-		} else if (part.title === "files") {
+			output += `${ansi.WHITE_BACKGROUND}${ansi.BOLD_BLACK}*${ansi.RESET} ${partText}\n\n`;
+		} else if (part.title === "tool" || part.title === "files") {
+			// TODO: Show max 10 tool/file lines?
 			output += part.text + "\n\n";
 		} else if (part.title === "todo") {
+			// Show the whole todo list
 			output += part.text + "\n\n";
 		}
 	}
@@ -84,6 +79,9 @@ export function render(state: State, details = false): void {
 		}
 
 		state.renderedLines = lines;
+	} else if (state.renderedLines.length > 0) {
+		clearRenderedLines(state, state.renderedLines.length);
+		state.renderedLines = [];
 	}
 }
 
@@ -130,15 +128,17 @@ function clearRenderedLines(state: State, linesToClear: number): void {
 }
 
 export function wrapText(text: string, width: number): string[] {
+	const INDENT = "  ";
+	const indentLength = INDENT.length;
 	const lines: string[] = [];
-	let currentLine = "";
-	let visibleLength = 0;
+	let currentLine = INDENT;
+	let visibleLength = indentLength;
 	let i = 0;
 
 	const pushLine = () => {
 		lines.push(currentLine);
-		currentLine = "";
-		visibleLength = 0;
+		currentLine = INDENT;
+		visibleLength = indentLength;
 	};
 
 	const addWord = (word: string, wordVisibleLength: number) => {
@@ -150,21 +150,21 @@ export function wrapText(text: string, width: number): string[] {
 				: visibleLength + 1 + wordVisibleLength <= width;
 
 		if (wouldFit) {
-			if (visibleLength > 0) {
+			if (visibleLength > indentLength) {
 				currentLine += " ";
 				visibleLength++;
 			}
 			currentLine += word;
 			visibleLength += wordVisibleLength;
-		} else if (visibleLength > 0) {
+		} else if (visibleLength > indentLength) {
 			pushLine();
-			currentLine = word;
-			visibleLength = wordVisibleLength;
+			currentLine = INDENT + word;
+			visibleLength = indentLength + wordVisibleLength;
 		} else if (wordVisibleLength <= width) {
-			currentLine = word;
-			visibleLength = wordVisibleLength;
+			currentLine = INDENT + word;
+			visibleLength = indentLength + wordVisibleLength;
 		} else {
-			const wordWidth = width;
+			const wordWidth = width - indentLength;
 			for (let w = 0; w < word.length; ) {
 				let segment = "";
 				let segmentVisible = 0;
@@ -192,8 +192,8 @@ export function wrapText(text: string, width: number): string[] {
 					if (currentLine) {
 						pushLine();
 					}
-					currentLine = segment;
-					visibleLength = segmentVisible;
+					currentLine = INDENT + segment;
+					visibleLength = indentLength + segmentVisible;
 				}
 			}
 		}
@@ -237,7 +237,7 @@ export function wrapText(text: string, width: number): string[] {
 		}
 	}
 
-	if (currentLine || lines.length === 0) {
+	if (currentLine.trim() || lines.length === 0) {
 		pushLine();
 	}
 
@@ -252,18 +252,40 @@ export function writePrompt(): void {
 
 const ANIMATION_CHARS = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇"];
 let animationInterval: ReturnType<typeof setInterval> | null = null;
+let requestStartTime: number | null = null;
 
-export function startAnimation(): void {
+export function startAnimation(startTime?: number): void {
 	if (animationInterval) return;
 
+	requestStartTime = startTime || Date.now();
+
 	let index = 0;
 	animationInterval = setInterval(() => {
-		process.stdout.write(`\r${ansi.BOLD_MAGENTA}`);
-		process.stdout.write(`${ANIMATION_CHARS[index]}${ansi.RESET}`);
+		const elapsed = Date.now() - requestStartTime!;
+		const elapsedText = formatDuration(elapsed);
+
+		process.stdout.write(
+			`\r${ansi.BOLD_MAGENTA}${ANIMATION_CHARS[index]} ${ansi.RESET}${ansi.BRIGHT_BLACK}Running for ${elapsedText}${ansi.RESET}`,
+		);
 		index = (index + 1) % ANIMATION_CHARS.length;
 	}, 100);
 }
 
+function formatDuration(ms: number): string {
+	const seconds = ms / 1000;
+	if (seconds < 60) {
+		return `${Math.round(seconds)}s`;
+	}
+	const minutes = Math.floor(seconds / 60);
+	const remainingSeconds = Math.round(seconds % 60);
+	if (minutes < 60) {
+		return remainingSeconds > 0 ? `${minutes}m ${remainingSeconds}s` : `${minutes}m`;
+	}
+	const hours = Math.floor(minutes / 60);
+	const remainingMinutes = minutes % 60;
+	return remainingMinutes > 0 ? `${hours}h ${remainingMinutes}m` : `${hours}h`;
+}
+
 export function stopAnimation(): void {
 	if (animationInterval) {
 		clearInterval(animationInterval);