taskmonkey-cli 0.11.1 → 0.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taskmonkey-cli",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "TaskMonkey CLI — Remote dev tools for tenant config editing and tool testing",
   "bin": {
     "tm": "./bin/tm.js",

package/src/commands/watch.js

@@ -108,12 +108,13 @@ export async function watch(options = {}) {
  * kill the watcher.
  */
 async function runLogStreamForever(initialConfig) {
-  const abort = new AbortController();
+  // Outer abort: tied to the watcher's lifetime, set by SIGINT.
+  const outerAbort = new AbortController();
   let config = initialConfig;
   let firstConnect = true;
 
   (async () => {
-    while (!abort.signal.aborted) {
+    while (!outerAbort.signal.aborted) {
       try {
         // Refresh token before each (re)connect — cheap and prevents
         // silent auth drops on long-running sessions.
@@ -124,11 +125,18 @@ async function runLogStreamForever(initialConfig) {
         continue;
       }
 
+      // Per-connection abort: a fresh AbortController for every fetch so we
+      // never accumulate listeners on the long-lived outer signal. Linked to
+      // the outer one so SIGINT still tears the in-flight stream down.
+      const innerAbort = new AbortController();
+      const onOuterAbort = () => innerAbort.abort();
+      outerAbort.signal.addEventListener('abort', onOuterAbort, { once: true });
+
       try {
         await streamLogs({
           config,
           lines: firstConnect ? 20 : 0,
-          signal: abort.signal,
+          signal: innerAbort.signal,
           onLine: (line, type) => {
             const prefix = chalk.gray('  │ ');
             switch (type) {
@@ -146,19 +154,22 @@ async function runLogStreamForever(initialConfig) {
           },
         });
       } catch (err) {
-        if (abort.signal.aborted) return;
+        if (outerAbort.signal.aborted) return;
         // Server timeouts after 5 min are expected; don't spam.
         if (!/HTTP 5|fetch failed|terminated|ECONN/i.test(err.message)) {
           console.error(chalk.yellow(`  [logs] ${err.message}`));
         }
+      } finally {
+        outerAbort.signal.removeEventListener('abort', onOuterAbort);
       }
 
-      if (abort.signal.aborted) return;
+      if (outerAbort.signal.aborted) return;
+      // Backoff: 1 s after a normal stream end, longer if we're flapping.
       await sleep(1000);
     }
   })();
 
-  return abort;
+  return outerAbort;
 }
 
 function sleep(ms) {