@leo000001/opencode-quota-sidebar 4.0.4 → 4.0.9

package/dist/cli.d.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { spawn } from 'node:child_process';
 import { type HistoryPeriod } from './period.js';
 type CliCommand = {
     period: HistoryPeriod;
@@ -10,9 +11,15 @@ type CliServerCommand = {
     args: string[];
     shell?: boolean;
 };
+type SpawnedCliServerProcess = ReturnType<typeof spawn>;
 export declare function parseCliArgs(argv: string[]): CliCommand;
 export declare function cliBaseUrl(): string;
 export declare function cliServerCommandCandidates(platform?: NodeJS.Platform): CliServerCommand[];
+export declare function closeCliServerProcess(proc: SpawnedCliServerProcess, platform?: NodeJS.Platform, killProcess?: typeof process.kill, spawnProcess?: typeof spawn): void;
+export declare function tryStartCliOpencodeServer(candidate: CliServerCommand, spawnProcess?: typeof spawn, closeProcess?: typeof closeCliServerProcess): Promise<{
+    url: string;
+    close: () => void;
+}>;
 export declare function runCli(argv: string[]): Promise<string>;
 export declare function cliExitCodeForError(message: string): 0 | 1;
 export declare function cliShouldRunMain(argv1?: string, modulePath?: string, resolvePath?: (filePath: string) => string): boolean;

package/dist/cli.js

@@ -132,12 +132,48 @@ export function cliServerCommandCandidates(platform = process.platform) {
     }
     return [{ command: 'opencode', args: directArgs }];
 }
-async function tryStartCliOpencodeServer(candidate) {
+function releaseCliServerPipes(proc, inspect, onError, onExit) {
+    if (inspect) {
+        proc.stdout?.removeListener('data', inspect);
+        proc.stderr?.removeListener('data', inspect);
+    }
+    if (onError)
+        proc.removeListener('error', onError);
+    if (onExit)
+        proc.removeListener('exit', onExit);
+    proc.stdout?.unpipe();
+    proc.stderr?.unpipe();
+    proc.stdout?.destroy();
+    proc.stderr?.destroy();
+}
+export function closeCliServerProcess(proc, platform = process.platform, killProcess = process.kill, spawnProcess = spawn) {
+    const pid = proc.pid;
+    if (typeof pid !== 'number' || pid <= 0)
+        return;
+    if (platform === 'win32') {
+        const killer = spawnProcess('taskkill', ['/PID', String(pid), '/T', '/F'], {
+            stdio: 'ignore',
+            windowsHide: true,
+        });
+        killer.unref();
+        return;
+    }
+    try {
+        killProcess(-pid, 'SIGTERM');
+    }
+    catch (error) {
+        const code = error.code;
+        if (code !== 'ESRCH')
+            throw error;
+    }
+}
+export async function tryStartCliOpencodeServer(candidate, spawnProcess = spawn, closeProcess = closeCliServerProcess) {
     let proc;
     try {
-        proc = spawn(candidate.command, candidate.args, {
+        proc = spawnProcess(candidate.command, candidate.args, {
             env: process.env,
             shell: candidate.shell ?? false,
+            detached: true,
             windowsHide: true,
         });
     }
@@ -150,12 +186,20 @@ async function tryStartCliOpencodeServer(candidate) {
         };
     }
     const url = await new Promise((resolve, reject) => {
+        let inspect;
+        let onError;
+        let onExit;
         const id = setTimeout(() => {
+            if (settled)
+                return;
+            settled = true;
+            releaseCliServerPipes(proc, inspect, onError, onExit);
+            closeProcess(proc);
             reject(new Error(`Timeout waiting for OpenCode server to start after ${CLI_SERVER_TIMEOUT_MS}ms`));
         }, CLI_SERVER_TIMEOUT_MS);
         let output = '';
         let settled = false;
-        const inspect = (chunk) => {
+        inspect = (chunk) => {
             output += chunk.toString();
             const lines = output.split('\n');
             for (const line of lines) {
@@ -166,36 +210,48 @@ async function tryStartCliOpencodeServer(candidate) {
                     continue;
                 clearTimeout(id);
                 settled = true;
+                releaseCliServerPipes(proc, inspect, onError, onExit);
+                // The CLI only needs the startup line; after that the detached server
+                // must not keep the parent process alive.
+                proc.unref();
                 resolve(match[1]);
                 return;
             }
         };
         proc.stdout?.on('data', inspect);
         proc.stderr?.on('data', inspect);
-        proc.on('error', (error) => {
+        onError = (error) => {
+            if (settled)
+                return;
+            settled = true;
             clearTimeout(id);
+            releaseCliServerPipes(proc, inspect, onError, onExit);
             const code = error.code;
             reject({
                 error,
                 output,
                 recoverable: code === 'ENOENT' || code === 'EINVAL',
             });
-        });
-        proc.on('exit', (code) => {
+        };
+        onExit = (code) => {
             if (settled)
                 return;
+            settled = true;
             clearTimeout(id);
+            releaseCliServerPipes(proc, inspect, onError, onExit);
             let message = `OpenCode server exited with code ${code}`;
             if (output.trim())
                 message += `\n${output}`;
             const recoverable = /not recognized as an internal or external command/i.test(output) ||
                 /command not found/i.test(output);
             reject({ error: new Error(message), output, recoverable });
-        });
+        };
+        proc.on('error', onError);
+        proc.on('exit', onExit);
     });
     return {
         url,
-        close: () => proc.kill(),
+        close: () => closeProcess(proc),
     };
 }
 async function startCliOpencodeServer() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leo000001/opencode-quota-sidebar",
-  "version": "4.0.4",
+  "version": "4.0.9",
   "description": "OpenCode plugin that shows quota and token usage in TUI sidebar panels and compact session titles",
   "type": "module",
   "main": "./dist/index.js",