opencode-rtk-plugin 0.1.3 → 1.0.0

package/index.js

@@ -4,74 +4,28 @@
 // model in a token-efficient form. All rewrite logic lives in rtk itself; this
 // plugin is a thin delegating adapter for OpenCode's shell hook.
 //
-// Requires: rtk (https://github.com/rtk-ai/rtk)
+// Requires: rtk >= 0.23.0 on PATH (https://github.com/rtk-ai/rtk)
 
 import { execFile } from "node:child_process";
 
-const DEFAULT_TIMEOUT_MS = 5000;
-const MAX_TIMEOUT_MS = 600_000;
-
-/**
- * Run `rtk rewrite <command>` and resolve to the rewritten command, or null.
- *
- * rtk signals the result on STDOUT, not via exit status: since v0.34.0
- * `rtk rewrite` exits 3 with the rewritten command on stdout (its
- * permission-verdict protocol). So the exit code must be ignored and the
- * decision made on stdout alone.
- *
- * Never rejects and never hangs: a spawn failure, timeout, or empty/unchanged
- * output resolves to null so the original command runs.
- */
+/** Run `rtk rewrite <command>`; resolve to the rewritten command or null. */
 function rewriteCommand(binary, command, timeoutMs) {
   return new Promise((resolve) => {
-    let settled = false;
-    let timer;
-    const done = (value) => {
-      if (settled) return;
-      settled = true;
-      if (timer) clearTimeout(timer);
-      resolve(value);
-    };
-
-    let child;
-    try {
-      // timeout: 0 disables execFile's own SIGTERM-only timeout; we enforce a
-      // hard SIGKILL deadline below so a SIGTERM-ignoring rtk cannot hang.
-      child = execFile(
-        binary,
-        ["rewrite", command],
-        { timeout: 0, encoding: "utf8" },
-        (_err, stdout) => {
-          const out = String(stdout ?? "").trim();
-          done(out && out !== command ? out : null);
-        }
-      );
-    } catch {
-      return done(null);
-    }
-
-    child.on("error", () => done(null));
-
-    timer = setTimeout(() => {
-      try {
-        child.kill("SIGKILL");
-      } catch {
-        /* already gone */
+    const child = execFile(
+      binary,
+      ["rewrite", command],
+      { timeout: timeoutMs },
+      (err, stdout) => {
+        if (err) return resolve(null);
+        const rewritten = String(stdout).trim();
+        resolve(rewritten && rewritten !== command ? rewritten : null);
       }
-      done(null);
-    }, timeoutMs + 250);
+    );
+    // execFile can emit before the callback; never let it surface.
+    child.on("error", () => resolve(null));
   });
 }
 
-function resolveBinary(value) {
-  return typeof value === "string" && value.trim() !== "" ? value : "rtk";
-}
-
-function resolveTimeout(value) {
-  if (Number.isInteger(value) && value >= 1 && value <= MAX_TIMEOUT_MS) return value;
-  return DEFAULT_TIMEOUT_MS;
-}
-
 export default {
   id: "rtk",
 
@@ -79,17 +33,13 @@ export default {
     const options = ctx.options ?? {};
     if (options.enabled === false) return;
 
-    const binary = resolveBinary(options.binary);
-    const timeoutMs = resolveTimeout(options.timeoutMs);
+    const binary = typeof options.binary === "string" ? options.binary : "rtk";
+    const timeoutMs = Number.isFinite(options.timeoutMs) ? options.timeoutMs : 5000;
 
     await ctx.shell.hook("create.before", async (event) => {
-      try {
-        if (!event || typeof event.command !== "string" || !event.command) return;
-        const rewritten = await rewriteCommand(binary, event.command, timeoutMs);
-        if (rewritten) event.command = rewritten;
-      } catch {
-        // Never fail the shell call: any error leaves the command unchanged.
-      }
+      if (!event || typeof event.command !== "string" || !event.command) return;
+      const rewritten = await rewriteCommand(binary, event.command, timeoutMs);
+      if (rewritten) event.command = rewritten;
     });
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-rtk-plugin",
-  "version": "0.1.3",
+  "version": "1.0.0",
   "description": "OpenCode v2 plugin that rewrites shell commands through rtk to cut LLM token usage by 60-90%.",
   "type": "module",
   "main": "index.js",
@@ -42,7 +42,7 @@
   },
   "scripts": {
     "lint": "markdownlint-cli2 \"**/*.md\"",
-    "test": "node --check index.js && node --test test/*.test.mjs",
+    "test": "node --check index.js && node -e \"import('./index.js').then(m => { if (!m.default?.id || typeof m.default.setup !== 'function') { console.error('invalid plugin export'); process.exit(1) } console.log('plugin id:', m.default.id) })\"",
     "check": "npm run lint && npm test"
   },
   "devDependencies": {