opencode-miniterm 1.0.3 → 1.0.4

package/package.json

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

package/src/commands/page.ts

@@ -25,13 +25,9 @@ function run(client: OpencodeClient, state: State): void {
 		if (!part || !part.text.trim()) continue;
 
 		if (part.title === "thinking") {
-			pages.push(
-				`${ansi.BOLD_BRIGHT_BLACK}~${ansi.RESET} ${ansi.BRIGHT_BLACK}${part.text.trimStart()}${ansi.RESET}`,
-			);
+			pages.push(`💭 ${ansi.BRIGHT_BLACK}${part.text.trimStart()}${ansi.RESET}`);
 		} else if (part.title === "response") {
-			pages.push(
-				`${ansi.WHITE_BACKGROUND}${ansi.BOLD_BLACK}*${ansi.RESET} ${part.text.trimStart()}`,
-			);
+			pages.push(`💭 ${part.text.trimStart()}`);
 		} else {
 			pages.push(part.text);
 		}

package/src/render.ts

@@ -23,6 +23,7 @@ export function render(state: State, details = false): void {
 
 		if (part.title === "thinking") {
 			if (part.active === false) {
+				// We've already checked all the parts before here
 				break;
 			}
 			part.active = !foundPart;
@@ -35,6 +36,7 @@ export function render(state: State, details = false): void {
 		}
 	}
 
+	let lastPartWasTool = false;
 	for (let i = 0; i < state.accumulatedResponse.length; i++) {
 		const part = state.accumulatedResponse[i];
 		if (!part || !part.active) continue;
@@ -43,19 +45,29 @@ export function render(state: State, details = false): void {
 		if (part.title === "thinking") {
 			// Show max 10 thinking lines
 			const partText = details ? part.text.trimStart() : lastThinkingLines(part.text.trimStart());
-			output += `${ansi.BOLD_BRIGHT_BLACK}~${ansi.RESET} ${ansi.BRIGHT_BLACK}${partText}${ansi.RESET}\n\n`;
+			output += "<ocmt-thinking>\n";
+			output += `💭 ${partText}\n\n`;
+			output += "</ocmt-thinking>\n";
 		} else if (part.title === "response") {
 			// Show all response lines
 			const doc = parse(part.text.trimStart(), gfm);
 			const partText = renderToConsole(doc);
-			output += `${ansi.WHITE_BACKGROUND}${ansi.BOLD_BLACK}*${ansi.RESET} ${partText}\n\n`;
-		} else if (part.title === "tool" || part.title === "files") {
+			output += `💬 ${partText}\n\n`;
+		} else if (part.title === "tool") {
+			// TODO: Show max 10 tool/file lines?
+			if (lastPartWasTool && output.endsWith("\n\n")) {
+				output = output.substring(0, output.length - 1);
+			}
+			output += part.text + "\n\n";
+		} else if (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";
 		}
+
+		lastPartWasTool = part.title === "tool";
 	}
 
 	if (output) {
@@ -135,8 +147,18 @@ export function wrapText(text: string, width: number): string[] {
 	let visibleLength = indentLength;
 	let i = 0;
 
+	let inThinking = false;
+
 	const pushLine = () => {
-		lines.push(currentLine);
+		if (currentLine === "  <ocmt-thinking>") {
+			inThinking = true;
+		} else if (currentLine === "  </ocmt-thinking>") {
+			inThinking = false;
+		} else {
+			let text = inThinking ? `${ansi.BRIGHT_BLACK}${currentLine}${ansi.RESET}` : currentLine;
+			lines.push(text);
+		}
+
 		currentLine = INDENT;
 		visibleLength = indentLength;
 	};

package/test/render.test.ts

@@ -1,3 +1,4 @@
+import { stripANSI } from "bun";
 import { describe, expect, it, vi } from "bun:test";
 import { type State } from "../src";
 import * as ansi from "../src/ansi";
@@ -62,7 +63,7 @@ describe("render", () => {
 			const calls = write.mock.calls.map((c) => c[0]);
 			expect(calls.some((c) => c.includes("\u001B[2A"))).toBe(true);
 			const outputCall = calls.find((c) => c.includes("i've done it"));
-			expect(outputCall).toContain(`${ansi.WHITE_BACKGROUND}${ansi.BOLD_BLACK}*${ansi.RESET}`);
+			expect(outputCall).toContain(`💬`);
 		});
 	});
 
@@ -77,9 +78,7 @@ describe("render", () => {
 			render(state);
 
 			const output = write.mock.calls.map((c) => c[0]).join("");
-			expect(output).toContain(
-				`${ansi.BOLD_BRIGHT_BLACK}~${ansi.RESET} ${ansi.BRIGHT_BLACK}分析问题${ansi.RESET}`,
-			);
+			expect(output).toContain(`${ansi.BRIGHT_BLACK}  💭 分析问题${ansi.RESET}`);
 		});
 
 		it("should only show thinking indicator for last thinking part", () => {
@@ -95,9 +94,7 @@ describe("render", () => {
 			render(state);
 
 			const output = write.mock.calls.map((c) => c[0]).join("");
-			expect(output).toContain(
-				`${ansi.BOLD_BRIGHT_BLACK}~${ansi.RESET} ${ansi.BRIGHT_BLACK}second${ansi.RESET}`,
-			);
+			expect(output).toContain(`${ansi.BRIGHT_BLACK}  💭 second${ansi.RESET}`);
 			expect(output).not.toContain("first");
 		});
 
@@ -124,6 +121,31 @@ describe("render", () => {
 
 			expect(write).toHaveBeenCalled();
 		});
+
+		it("all thinking lines should be gray", () => {
+			const write = vi.fn();
+			const state = createMockState({
+				accumulatedResponse: [
+					{
+						key: "xxx",
+						title: "thinking",
+						text: "Cookware and bakeware is food preparation equipment, such as cooking pots, pans, baking sheets etc. used in kitchens. Cookware is used on a stove or range cooktop, while bakeware is used in an oven. Some utensils are considered both cookware and bakeware.",
+					},
+				],
+				write,
+			});
+
+			render(state);
+
+			const output = write.mock.calls.map((c) => c[0]).join("");
+			expect(output).toContain(
+				`${ansi.BRIGHT_BLACK}  💭 Cookware and bakeware is food preparation equipment, such as cooking pots, pans, baking sheets etc. used in kitchens. Cookware is used on a stove${ansi.RESET}`,
+			);
+			expect(output).toContain(
+				`${ansi.BRIGHT_BLACK}  or range cooktop, while bakeware is used in an oven. Some utensils are considered both cookware and bakeware.${ansi.RESET}`,
+			);
+			expect(output).not.toContain("first");
+		});
 	});
 
 	describe("response parts", () => {
@@ -137,9 +159,7 @@ describe("render", () => {
 			render(state);
 
 			const output = write.mock.calls.map((c) => c[0]).join("");
-			expect(output).toContain(
-				`${ansi.WHITE_BACKGROUND}${ansi.BOLD_BLACK}*${ansi.RESET} Hello world`,
-			);
+			expect(output).toContain(`💬 Hello world`);
 		});
 	});
 
@@ -156,6 +176,27 @@ describe("render", () => {
 			const output = write.mock.calls.map((c) => c[0]).join("");
 			expect(output).toContain("bash: ls -la");
 		});
+
+		it("multiple tool parts separated by inactive parts shouldn't have a blank line", () => {
+			const write = vi.fn();
+			const state = createMockState({
+				accumulatedResponse: [
+					{ key: "xxx", title: "tool", text: "foo" },
+					{ key: "xxx", title: "thinking", text: "need to do the stuff" },
+					{ key: "xxx", title: "tool", text: "bar" },
+					{ key: "xxx", title: "thinking", text: "ok, more stuff" },
+					{ key: "xxx", title: "tool", text: "baz" },
+				],
+				write,
+			});
+
+			render(state);
+
+			const output = stripANSI(write.mock.calls.map((c) => c[0]).join("")).replaceAll("  ", "");
+			console.log(output);
+			expect(output).toContain("foo\nbar\n\n💭 ok");
+			expect(output).toContain("stuff\n\nbaz");
+		});
 	});
 
 	describe("files parts", () => {
@@ -253,9 +294,7 @@ describe("render", () => {
 			const output = write.mock.calls.map((c) => c[0]).join("");
 			expect(output).not.toContain(`分析中`);
 			expect(output).toContain(`bash: npm test`);
-			expect(output).toContain(
-				`${ansi.WHITE_BACKGROUND}${ansi.BOLD_BLACK}*${ansi.RESET} Test results: 5 passed`,
-			);
+			expect(output).toContain(`💬 Test results: 5 passed`);
 		});
 	});
 });