opencode-miniterm 1.0.0 → 1.0.1

package/bun.lock

@@ -47,7 +47,7 @@
 
     "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
 
-    "@opencode-ai/sdk": ["@opencode-ai/sdk@1.2.10", "", {}, "sha512-SyXcVqry2hitPVvQtvXOhqsWyFhSycG/+LTLYXrcq8AFmd9FR7dyBSDB3f5Ol6IPkYOegk8P2Eg2kKPNSNiKGw=="],
+    "@opencode-ai/sdk": ["@opencode-ai/sdk@1.2.14", "", {}, "sha512-nPkWAmzgPJYyfCJAV4NG7HTfN/iuO3B6fv8sT26NhPiR+EqD9i8sh4X1LwI7wEbbMOwWOX1PhrssW6gXQOOQZQ=="],
 
     "@trivago/prettier-plugin-sort-imports": ["@trivago/prettier-plugin-sort-imports@6.0.2", "", { "dependencies": { "@babel/generator": "^7.28.0", "@babel/parser": "^7.28.0", "@babel/traverse": "^7.28.0", "@babel/types": "^7.28.0", "javascript-natural-sort": "^0.7.1", "lodash-es": "^4.17.21", "minimatch": "^9.0.0", "parse-imports-exports": "^0.2.4" }, "peerDependencies": { "@vue/compiler-sfc": "3.x", "prettier": "2.x - 3.x", "prettier-plugin-ember-template-tag": ">= 2.0.0", "prettier-plugin-svelte": "3.x", "svelte": "4.x || 5.x" }, "optionalPeers": ["@vue/compiler-sfc", "prettier-plugin-ember-template-tag", "prettier-plugin-svelte", "svelte"] }, "sha512-3DgfkukFyC/sE/VuYjaUUWoFfuVjPK55vOFDsxD56XXynFMCZDYFogH2l/hDfOsQAm1myoU/1xByJ3tWqtulXA=="],
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "opencode-miniterm",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"description": "A small front-end terminal UI for OpenCode",
 	"main": "src/index.ts",
 	"bin": {
@@ -28,7 +28,7 @@
 		"typescript": "^5"
 	},
 	"dependencies": {
-		"@opencode-ai/sdk": "^1.2.10",
+		"@opencode-ai/sdk": "^1.2.14",
 		"allmark": "^1.0.0"
 	}
 }

package/src/index.ts

@@ -1,8 +1,7 @@
 #!/usr/bin/env bun
 
-import { createOpencodeClient } from "@opencode-ai/sdk";
+import { createOpencodeClient, createOpencodeServer } from "@opencode-ai/sdk";
 import type { Event, FileDiff, Part, Todo, ToolPart } from "@opencode-ai/sdk";
-import { spawn } from "node:child_process";
 import { mkdir } from "node:fs/promises";
 import { glob } from "node:fs/promises";
 import { stat } from "node:fs/promises";
@@ -53,7 +52,6 @@ let client: ReturnType<typeof createOpencodeClient>;
 
 let processing = true;
 let retryInterval: ReturnType<typeof setInterval> | null = null;
-let messageAbortController: AbortController | null = null;
 
 interface AccumulatedPart {
 	key: string;
@@ -93,8 +91,17 @@ let logFilePath: string | null = null;
 async function main() {
 	loadConfig();
 
-	const serverProcess = await startOpenCodeServer();
+	console.log(`\n${ansi.BRIGHT_BLACK}Connecting to OpenCode server...${ansi.RESET}\n`);
 
+	let server: Awaited<ReturnType<typeof createOpencodeServer>> | undefined;
+	try {
+		server = await createOpencodeServer();
+	} catch {
+		// Probably the server already exists?
+		// Should figure out a better way to check this
+	}
+
+	const cwd = process.cwd();
 	client = createOpencodeClient({
 		baseUrl: SERVER_URL,
 		headers: AUTH_PASSWORD
@@ -102,6 +109,14 @@ async function main() {
 					Authorization: `Basic ${Buffer.from(`${AUTH_USERNAME}:${AUTH_PASSWORD}`).toString("base64")}`,
 				}
 			: undefined,
+		directory: cwd,
+	});
+
+	process.on("SIGINT", () => {
+		console.log("\nShutting down...");
+		saveConfig();
+		server?.close();
+		process.exit(0);
 	});
 
 	try {
@@ -330,21 +345,13 @@ async function main() {
 					return;
 				}
 				case "escape": {
-					if (messageAbortController) {
-						messageAbortController.abort();
-						stopAnimation();
-						process.stdout.write(ansi.CURSOR_SHOW);
-						process.stdout.write(`\r${ansi.BRIGHT_BLACK}Cancelled request${ansi.RESET}\n`);
-					} else {
-						inputBuffer = "";
-						cursorPosition = 0;
-						showCompletions = false;
-						completionCycling = false;
-						completions = [];
-						readline.cursorTo(process.stdout, 0);
-						readline.clearScreenDown(process.stdout);
-						writePrompt();
+					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();
 					return;
 				}
 				case "return": {
@@ -400,7 +407,7 @@ async function main() {
 		writePrompt();
 	} catch (error: any) {
 		console.error("Error:", error.message);
-		serverProcess.kill();
+		server?.close();
 		process.exit(1);
 	}
 }
@@ -409,46 +416,6 @@ async function main() {
 // SERVER COMMUNICATION
 // ====================
 
-async function startOpenCodeServer() {
-	const serverProcess = spawn("opencode", ["serve"], {
-		stdio: ["ignore", "pipe", "pipe"],
-		shell: true,
-		cwd: process.cwd(),
-	});
-
-	let started = false;
-
-	console.log(`\n${ansi.BRIGHT_BLACK}Starting OpenCode server...${ansi.RESET}\n`);
-
-	serverProcess.stdout.on("data", (data) => {
-		if (!started) {
-			process.stdout.write(`${ansi.CLEAR_SCREEN_UP}${ansi.CLEAR_FROM_CURSOR}`);
-			process.stdout.write(ansi.CURSOR_HOME);
-			started = true;
-			console.log(`${ansi.BRIGHT_BLACK}Server started, connecting...${ansi.RESET}\n`);
-		}
-	});
-
-	serverProcess.on("error", (error) => {
-		console.error("Failed to start OpenCode server:", error.message);
-		process.exit(1);
-	});
-
-	serverProcess.on("exit", (code) => {
-		console.log(`OpenCode server exited with code ${code}`);
-		process.exit(0);
-	});
-
-	process.on("SIGINT", () => {
-		console.log("\nShutting down...");
-		saveConfig();
-		serverProcess.kill("SIGINT");
-	});
-
-	await new Promise((resolve) => setTimeout(resolve, 3000));
-	return serverProcess;
-}
-
 async function createSession(): Promise<string> {
 	const result = await client.session.create({
 		body: {},
@@ -533,8 +500,6 @@ async function sendMessage(sessionID: string, message: string) {
 
 	await writeToLog(`User: ${message}\n\n`);
 
-	messageAbortController = new AbortController();
-
 	const requestStartTime = Date.now();
 
 	try {
@@ -547,7 +512,6 @@ async function sendMessage(sessionID: string, message: string) {
 				},
 				parts: [{ type: "text", text: message }],
 			},
-			signal: messageAbortController.signal,
 		});
 
 		if (result.error) {
@@ -566,14 +530,14 @@ async function sendMessage(sessionID: string, message: string) {
 		console.log(`${ansi.BRIGHT_BLACK}Completed in ${durationText}${ansi.RESET}\n`);
 
 		writePrompt();
-		readline.cursorTo(process.stdout, 2);
+
+		// HACK:
+		setTimeout(() => {
+			readline.cursorTo(process.stdout, 2);
+		}, 200);
 	} catch (error: any) {
-		if (error.name === "AbortError" || messageAbortController?.signal.aborted) {
-			throw new Error("Request cancelled");
-		}
 		throw error;
 	} finally {
-		messageAbortController = null;
 		await closeLogFile();
 	}
 }