diff --git a/package.json b/package.json
index 5e1287a..ecba905 100755
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "node --test",
     "lint": "eslint '**.js' && prettier --check '**'"
   },
   "repository": {
diff --git a/src/executor.js b/src/executor.js
index 76629d4..61168a4 100755
--- a/src/executor.js
+++ b/src/executor.js
@@ -55,6 +55,10 @@ class Executor {
       const values = await this.getValues();
       this.exec(values);
     } catch (err) {
+      // The process settles here without going through end(): clear the
+      // process timeout so it cannot fire later over an already-rejected
+      // process (duplicating errors and leaking an unhandled rejection).
+      this.clearProcessTimeout();
       this.logger.log('error', `execMain Executor:`, err);
       this.process.execute_err_return = `execMain Executor: ${err}`;
       this.process.msg_output = '';
@@ -63,6 +67,13 @@ class Executor {
     }
   }
 
+  clearProcessTimeout() {
+    if (this.timeout) {
+      clearTimeout(this.timeout);
+      this.timeout = null;
+    }
+  }
+
   async exec() {
     this.logger.log('error', 'Method exec (execution) must be rewrite in child class');
     this.process.execute_err_return = 'Method exec (execution) must be rewrite in child class';
@@ -92,9 +103,7 @@ class Executor {
   }
 
   async end(options) {
-    if (this.timeout) {
-      clearTimeout(this.timeout);
-    }
+    this.clearProcessTimeout();
 
     if (!options) {
       options = {};
@@ -199,6 +208,18 @@ class Executor {
             this.process.retries_count = (this.process.retries_count || 0) + 1;
             this.process.err_output = '';
             this.process.retry();
+            // Re-arm the process timeout for the retry. It is armed once when
+            // the process starts and cleared at the top of end(), so without
+            // this a retry that hangs would run unbounded.
+            if (this.process.timeout) {
+              this.timeout = setTimeout(
+                () => {
+                  this.killMain('timeout', { end: this.process.timeout.action });
+                  this.process.time_out();
+                },
+                ms('' + this.process.timeout.delay)
+              );
+            }
             this.execMain(this.resolve, this.reject);
           }, ms(this.process.retry_delay));
         } else {
diff --git a/test/executor-timeout-retry.test.js b/test/executor-timeout-retry.test.js
new file mode 100644
index 0000000..eadb16e
--- /dev/null
+++ b/test/executor-timeout-retry.test.js
@@ -0,0 +1,189 @@
+'use strict';
+
+const { describe, it } = require('node:test');
+const assert = require('node:assert/strict');
+const ms = require('millisecond');
+const Executor = require('../index.js').Executor;
+
+const WATCHDOG_MS = 3000;
+const WATCHDOG_MESSAGE = `process did not settle within ${WATCHDOG_MS}ms`;
+
+// Drives the real Executor class the same way runnerty core does
+// (lib/classes/process.js): arm the process timeout, then execMain().
+// `execBehaviour` decides what each attempt does; `hang` never settles.
+function runProcess({ execBehaviour, retries, timeout, loadExecutorConfig }) {
+  const counters = { timeouts: 0, retries: 0, attempts: 0, errors: 0 };
+
+  const fakeProcess = {
+    id: 'FAKE-PROCESS',
+    name: 'Fake process',
+    uId: 'fake-process-uid',
+    exec: { id: 'fake_default' },
+    retries,
+    retry_delay: '50ms',
+    timeout,
+    notificate_only_last_fail: true,
+    err_output: '',
+    msg_output: '',
+    values: () => ({}),
+    loadExecutorConfig: loadExecutorConfig || (() => Promise.resolve({ type: '@runnerty-executor-fake' })),
+    error: async () => {
+      counters.errors++;
+    },
+    end: async () => {},
+    retry: () => {
+      counters.retries++;
+    },
+    time_out: () => {
+      counters.timeouts++;
+    }
+  };
+
+  class FakeExecutor extends Executor {
+    exec() {
+      counters.attempts++;
+      if (execBehaviour === 'fail') {
+        this.end({ end: 'error', err_output: 'boom', messageLog: 'boom' });
+      }
+      // 'hang': never calls this.end(), like a connection stalled forever
+    }
+  }
+
+  const executor = new FakeExecutor({
+    logger: { log: () => {} },
+    checkExecutorParams: () => {},
+    runtime: {},
+    process: fakeProcess
+  });
+
+  const settled = new Promise((resolve, reject) => {
+    if (fakeProcess.timeout) {
+      executor.timeout = setTimeout(
+        () => {
+          executor.killMain('timeout', { end: fakeProcess.timeout.action });
+          fakeProcess.time_out();
+        },
+        ms('' + fakeProcess.timeout.delay)
+      );
+    }
+    executor.execMain(resolve, reject);
+  });
+
+  return { settled, counters };
+}
+
+// Fails fast instead of hanging the test runner if the process never settles.
+function withWatchdog(settled) {
+  let timer;
+  const watchdog = new Promise((_, reject) => {
+    timer = setTimeout(() => {
+      reject(new Error(WATCHDOG_MESSAGE));
+    }, WATCHDOG_MS);
+  });
+  return Promise.race([settled, watchdog]).finally(() => clearTimeout(timer));
+}
+
+// assert.rejects validator: accept any rejection except the watchdog one,
+// so a process that never settles cannot pass the test.
+function rejectedBeforeWatchdog(message) {
+  return err => {
+    assert.notEqual(err.message, WATCHDOG_MESSAGE, message);
+    return true;
+  };
+}
+
+describe('process timeout across retries', () => {
+  it('bounds every attempt, not only the first one', async () => {
+    const { settled, counters } = runProcess({
+      execBehaviour: 'hang',
+      retries: 2,
+      timeout: { delay: '100ms', action: 'error' }
+    });
+
+    // Without re-arming, the timeout fires once, the first retry hangs
+    // forever and this await never settles.
+    await assert.rejects(
+      () => withWatchdog(settled),
+      rejectedBeforeWatchdog('the retry ran unbounded: the process timeout was not re-armed')
+    );
+
+    assert.equal(counters.attempts, 3, 'initial attempt + 2 retries');
+    assert.equal(counters.timeouts, 3, 'every attempt was killed by the timeout');
+    assert.equal(counters.retries, 2);
+  });
+
+  it('settles a hung process with no retries configured', async () => {
+    const { settled, counters } = runProcess({
+      execBehaviour: 'hang',
+      retries: undefined,
+      timeout: { delay: '100ms', action: 'error' }
+    });
+
+    await assert.rejects(
+      () => withWatchdog(settled),
+      rejectedBeforeWatchdog('the process ran unbounded: the timeout never fired')
+    );
+    assert.equal(counters.timeouts, 1);
+    assert.equal(counters.retries, 0);
+  });
+
+  it('does not arm timers on retries when the process has no timeout', async () => {
+    const { settled, counters } = runProcess({
+      execBehaviour: 'fail',
+      retries: 2,
+      timeout: undefined
+    });
+
+    await assert.rejects(
+      () => withWatchdog(settled),
+      rejectedBeforeWatchdog('the process never settled after exhausting its retries')
+    );
+    assert.equal(counters.attempts, 3);
+    assert.equal(counters.timeouts, 0, 'no process timeout configured: nothing should fire');
+    assert.equal(counters.retries, 2);
+  });
+
+  it('does not fire a late timeout when a retry fails before reaching end()', async () => {
+    const unhandled = [];
+    const onUnhandled = reason => {
+      unhandled.push(reason);
+    };
+    process.on('unhandledRejection', onUnhandled);
+
+    try {
+      // First attempt runs and fails through end(); the retry then breaks
+      // inside getValues() (loadExecutorConfig rejects), so it settles through
+      // the catch of execMain() without ever reaching end().
+      let loads = 0;
+      const { settled, counters } = runProcess({
+        execBehaviour: 'fail',
+        retries: 2,
+        timeout: { delay: '100ms', action: 'error' },
+        loadExecutorConfig: () => {
+          loads++;
+          return loads === 1
+            ? Promise.resolve({ type: '@runnerty-executor-fake' })
+            : Promise.reject(new Error('config unavailable'));
+        }
+      });
+
+      await assert.rejects(
+        () => withWatchdog(settled),
+        rejectedBeforeWatchdog('the failed retry never settled the process')
+      );
+
+      const errorsAtSettle = counters.errors;
+
+      // Outlive the re-armed timeout window: the timer cleared on the catch
+      // path must not fire late over an already-rejected process.
+      await new Promise(resolve => setTimeout(resolve, 300));
+
+      assert.equal(counters.timeouts, 0, 'a late timeout fired after the process had settled');
+      assert.equal(counters.errors, errorsAtSettle, 'process.error() ran again after settling');
+      assert.equal(loads, 2, 'a late killMain() re-read the executor config');
+      assert.equal(unhandled.length, 0, `unexpected unhandledRejection: ${unhandled[0]}`);
+    } finally {
+      process.off('unhandledRejection', onUnhandled);
+    }
+  });
+});