@synopackageland/cli 0.7.0 → 0.7.1

package/dist/standalone/native-authorization-window.d.ts

@@ -1,2 +1,2 @@
 /** Shared host flow. CGI plans are never accepted as completed authorization. */
-export declare const AUTHORIZATION_RUNTIME = "function createAuthorizationAccess(options) {\n  var busy = null;\n  function fail(code) { var error = new Error(code); error.code = code; return error; }\n  function status() { return options.call(\"authorization.status\").then(function (d) {\n    if (!d || d.command !== \"authorization\" || d.schema_version !== 1 || [\"ready\",\"authorization_required\",\"not_admin\",\"session_expired\",\"unavailable\"].indexOf(d.state) < 0) throw fail(\"authorization_bad_response\");\n    // upgrade_reapproval is a reason-only tombstone: it can only explain a pending request.\n    if (d.reason === \"upgrade_reapproval\" && d.state !== \"authorization_required\") throw fail(\"authorization_bad_response\");\n    return d;\n  }); }\n  function plan(method) { return options.call(method).then(function (p) {\n    if (!p || p.command !== \"authorization\" || p.schema_version !== 1 || p.phase !== \"plan\" || !Array.isArray(p.operations) || p.operations.length === 0 || p.operations.length > options.tasks.length) throw fail(\"authorization_bad_response\");\n    var seen = {};\n    p.operations.forEach(function (op) { if (seen[op] || !options.tasks.some(function (t) { return t.op === op; })) throw fail(\"authorization_bad_response\"); seen[op] = true; });\n    return p;\n  }); }\n  function exclusive(fn) { if (busy) return busy; busy = Promise.resolve().then(fn).then(function (s) { busy = null; return s; },function (e) { busy = null; throw e; });return busy; }\n  function authorize(ops,run) { return ops.reduce(function (previous,op) { return previous.then(function () {\n    return options.root.authorize(op).then(function (state) { if (state !== \"ready\") throw fail(\"root_cancelled\"); return run ? options.root.run(op) : null; });\n  }); },Promise.resolve()); }\n  return {canManage:function () {return !!options.user && options.user().admin === true;},status:status,request:function () { return exclusive(function () {\n    return plan(\"authorization.request\").then(function (p) { return authorize(p.operations,p.run === true); }).then(status,function (e) { if (e.code === \"root_cancelled\") return status();throw e; });\n  }); },revoke:function () { return exclusive(function () {\n    return plan(\"authorization.revoke\").then(function (p) {\n      if (p.withdraw === true && typeof options.withdraw !== \"function\") throw fail(\"authorization_bad_response\");\n      var disabled = p.withdraw === true ? options.withdraw() : p.disable === true ? authorize([\"helper_disable\"],true) : Promise.resolve();\n      return disabled.then(function () { return p.purge === true ? authorize([\"helper_purge\"],true) : null; }).then(function () { return p.operations.reduce(function (previous,op) {return previous.then(function () {return options.root.remove(op);});},Promise.resolve()); });\n    }).then(status,function (e) { if (e.code === \"root_cancelled\") return status();throw e; });\n  }); }};\n}";
+export declare const AUTHORIZATION_RUNTIME = "function createAuthorizationAccess(options) {\n  var busy = null;\n  function fail(code) { var error = new Error(code); error.code = code; return error; }\n  function status() { return options.call(\"authorization.status\").then(function (d) {\n    if (!d || d.command !== \"authorization\" || d.schema_version !== 1 || [\"ready\",\"authorization_required\",\"not_admin\",\"session_expired\",\"unavailable\"].indexOf(d.state) < 0) throw fail(\"authorization_bad_response\");\n    // upgrade_reapproval is a reason-only tombstone: it can only explain a pending request.\n    if (d.reason === \"upgrade_reapproval\" && d.state !== \"authorization_required\") throw fail(\"authorization_bad_response\");\n    return d;\n  }); }\n  function plan(method) { return options.call(method).then(function (p) {\n    if (!p || p.command !== \"authorization\" || p.schema_version !== 1 || p.phase !== \"plan\" || !Array.isArray(p.operations) || p.operations.length === 0 || p.operations.length > options.tasks.length) throw fail(\"authorization_bad_response\");\n    var seen = {};\n    p.operations.forEach(function (op) { if (seen[op] || !options.tasks.some(function (t) { return t.op === op; })) throw fail(\"authorization_bad_response\"); seen[op] = true; });\n    return p;\n  }); }\n  // The backend's grant decides: a task still waiting at the window's limit, or\n  // one signalled after it wrote the grant, has still authorized the package.\n  function settled(e) {\n    if (!e || (e.code !== \"root_timeout\" && e.code !== \"root_task_failed\")) throw e;\n    return status().then(function (d) { if (d.state !== \"ready\") throw e; });\n  }\n  function exclusive(fn) { if (busy) return busy; busy = Promise.resolve().then(fn).then(function (s) { busy = null; return s; },function (e) { busy = null; throw e; });return busy; }\n  function authorize(ops,run) { return ops.reduce(function (previous,op) { return previous.then(function () {\n    return options.root.authorize(op).then(function (state) { if (state !== \"ready\") throw fail(\"root_cancelled\"); return run ? options.root.run(op).catch(settled) : null; });\n  }); },Promise.resolve()); }\n  return {canManage:function () {return !!options.user && options.user().admin === true;},status:status,request:function () { return exclusive(function () {\n    return plan(\"authorization.request\").then(function (p) { return authorize(p.operations,p.run === true); }).then(status,function (e) { if (e.code === \"root_cancelled\") return status();throw e; });\n  }); },revoke:function () { return exclusive(function () {\n    return plan(\"authorization.revoke\").then(function (p) {\n      if (p.withdraw === true && typeof options.withdraw !== \"function\") throw fail(\"authorization_bad_response\");\n      var disabled = p.withdraw === true ? options.withdraw() : p.disable === true ? authorize([\"helper_disable\"],true) : Promise.resolve();\n      return disabled.then(function () { return p.purge === true ? authorize([\"helper_purge\"],true) : null; }).then(function () { return p.operations.reduce(function (previous,op) {return previous.then(function () {return options.root.remove(op);});},Promise.resolve()); });\n    }).then(status,function (e) { if (e.code === \"root_cancelled\") return status();throw e; });\n  }); }};\n}";

package/dist/standalone/native-authorization-window.js

@@ -14,9 +14,15 @@ export const AUTHORIZATION_RUNTIME = `function createAuthorizationAccess(options
     p.operations.forEach(function (op) { if (seen[op] || !options.tasks.some(function (t) { return t.op === op; })) throw fail("authorization_bad_response"); seen[op] = true; });
     return p;
   }); }
+  // The backend's grant decides: a task still waiting at the window's limit, or
+  // one signalled after it wrote the grant, has still authorized the package.
+  function settled(e) {
+    if (!e || (e.code !== "root_timeout" && e.code !== "root_task_failed")) throw e;
+    return status().then(function (d) { if (d.state !== "ready") throw e; });
+  }
   function exclusive(fn) { if (busy) return busy; busy = Promise.resolve().then(fn).then(function (s) { busy = null; return s; },function (e) { busy = null; throw e; });return busy; }
   function authorize(ops,run) { return ops.reduce(function (previous,op) { return previous.then(function () {
-    return options.root.authorize(op).then(function (state) { if (state !== "ready") throw fail("root_cancelled"); return run ? options.root.run(op) : null; });
+    return options.root.authorize(op).then(function (state) { if (state !== "ready") throw fail("root_cancelled"); return run ? options.root.run(op).catch(settled) : null; });
   }); },Promise.resolve()); }
   return {canManage:function () {return !!options.user && options.user().admin === true;},status:status,request:function () { return exclusive(function () {
     return plan("authorization.request").then(function (p) { return authorize(p.operations,p.run === true); }).then(status,function (e) { if (e.code === "root_cancelled") return status();throw e; });

package/dist/standalone/native-root-window.d.ts

@@ -17,10 +17,12 @@ export interface RootTask {
  *   with exactly the embedded script. The one-use token goes into that single
  *   create call and is never kept.
  * - run: re-reads the task and runs it only if it is still exactly ours, then
- *   waits for its history entry and asks the backend for the output. Repair
+ *   waits for its history entry and asks the backend for the output. A queued
+ *   or running task keeps the wait going, up to RUN_LIMIT_MS (loaded NAS took
+ *   4.5 minutes), and `options.progress({op, state, elapsedMs})` hears each poll. Repair
  *   additionally requires fresh PasswordConfirm and another exact task check.
  * - an older version of our task is "outdated" and never runs; authorizing
  *   again replaces it. A same-named task that is not ours is a "conflict" and
  *   is never run, replaced or deleted.
  */
-export declare const ROOT_RUNTIME = "function createRootAccess(options) {\n  var API = \"SYNO.Core.TaskScheduler\";\n  var POLL_MS = 500, POLLS = 60;\n  var byOp = {}, running = {};\n  var legacy = null, probe = null;\n  options.tasks.forEach(function (task) { byOp[task.op] = task; });\n\n  function fail(code) {\n    var error = new Error(code);\n    error.code = code;\n    return error;\n  }\n  function begin(op) {\n    if (!Object.prototype.hasOwnProperty.call(byOp, op)) return Promise.reject(fail(\"root_unknown_op\"));\n    if (options.user().admin !== true) return Promise.reject(fail(\"admin_required\"));\n    return Promise.resolve(byOp[op]);\n  }\n  function readOutput(task) {\n    return task.output ? options.call(\"root.output\", { op: task.op }) : Promise.resolve(null);\n  }\n  function isRootTask(summary) {\n    return summary.owner === \"root\" && summary.real_owner === \"root\" && summary.enable === false && summary.type === \"script\";\n  }\n  function listTasks() {\n    if (legacy === false) return options.send(API, \"list\", 3, { start: 0, limit: 500 });\n    if (legacy === true) return legacyList();\n    if (!probe) {\n      probe = options.send(API, \"list\", 3, { start: 0, limit: 500 }).then(function (data) {\n        legacy = false;\n        return data;\n      }, function (error) {\n        if (!error || (error.code !== \"dsm_103\" && error.code !== 103)) {\n          probe = null;\n          throw error;\n        }\n        legacy = true;\n        return legacyList();\n      });\n    }\n    return probe;\n  }\n  function legacyList() {\n    return options.send(API, \"list\", 2, { offset: 0, limit: 500 }).then(function (data) {\n      // Refuse a truncated snapshot: a same-named task could lie outside it.\n      if (!data || !Array.isArray(data.tasks) || data.tasks.length > 500\n          || !(typeof data.total === \"number\" && isFinite(data.total) && Math.floor(data.total) === data.total) || data.total !== data.tasks.length) throw fail(\"root_bad_response\");\n      return data;\n    });\n  }\n  function readTask(ref) {\n    return options.send(API, \"get\", legacy ? 3 : 4, ref);\n  }\n  function createTask(params) {\n    return options.send(legacy ? API : API + \".Root\", \"create\", legacy ? 3 : 4, params);\n  }\n  function deleteTask(ref) {\n    return options.send(API, \"delete\", 2, { tasks: [ref] });\n  }\n  function runTask(ref) {\n    return options.send(API, \"run\", 2, { tasks: [ref] });\n  }\n  function find(task) {\n    return listTasks().then(function (data) {\n      if (!data || !Array.isArray(data.tasks)) throw fail(\"root_bad_response\");\n      var named = data.tasks.filter(function (summary) { return summary && summary.name === task.name; });\n      if (named.length === 0) return { state: \"missing\" };\n      if (named.length > 1 || !isRootTask(named[0])) return { state: \"conflict\" };\n      var ref = { id: named[0].id, real_owner: named[0].real_owner };\n      return readTask(ref).then(function (detail) {\n        var script = detail && detail.extra && detail.extra.script;\n        if (!detail || String(detail.id) !== String(ref.id) || detail.name !== task.name\n            || detail.owner !== \"root\" || detail.real_owner !== ref.real_owner || detail.enable !== false || detail.type !== \"script\" || typeof script !== \"string\") {\n          return { state: \"conflict\" };\n        }\n        if (script === task.script) return { state: \"ready\", ref: ref };\n        if (script.indexOf(task.header) === 0) return { state: \"outdated\", ref: ref };\n        return { state: \"conflict\" };\n      });\n    });\n  }\n  function definition(task, user) {\n    var hours = [];\n    for (var h = 1; h <= 23; h++) hours.push(h);\n    return {\n      name: task.name,\n      real_owner: user,\n      owner: \"root\",\n      enable: false,\n      type: \"script\",\n      schedule: {\n        date_type: 0, week_day: \"0,1,2,3,4,5,6\", repeat_date: 1001, monthly_week: [], hour: 0, minute: 0,\n        repeat_hour: 0, repeat_min: 0, last_work_hour: 0,\n        repeat_min_store_config: [1, 5, 10, 15, 20, 30], repeat_hour_store_config: hours\n      },\n      extra: { notify_enable: false, script: task.script, notify_mail: \"\", notify_if_error: false }\n    };\n  }\n  function newest(history) {\n    if (!Array.isArray(history)) throw fail(\"root_bad_response\");\n    return history.reduce(function (latest, entry) {\n      return entry && (!latest || Number(entry.timestamp) > Number(latest.timestamp)) ? entry : latest;\n    }, null);\n  }\n  function history(ref) {\n    return options.send(API, \"get_history_status_list\", 1, { id: ref.id }).then(newest);\n  }\n  function waitForRun(ref, before, polls) {\n    return history(ref).then(function (latest) {\n      var finished = latest && (!before || latest.timestamp !== before.timestamp)\n        && latest.exit_type !== \"running\" && latest.stop_time;\n      if (finished) {\n        if (latest.exit_code !== 0) throw fail(\"root_task_failed\");\n        return;\n      }\n      if (polls <= 1) throw fail(\"root_timeout\");\n      return options.wait(POLL_MS).then(function () { return waitForRun(ref, before, polls - 1); });\n    });\n  }\n\n  function validTime(value) {\n    if (typeof value !== \"string\" || !/^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}$/.test(value)) return false;\n    var normalized = value.replace(\" \", \"T\") + \"Z\";\n    var date = new Date(normalized);\n    return !isNaN(date.getTime()) && date.toISOString().slice(0, 19) === normalized.slice(0, 19);\n  }\n  function bounded(call, deadline) {\n    // A poll count alone cannot bound a stalled DSM callback. Discard late replies.\n    return new Promise(function (resolve, reject) {\n      var remaining = deadline - Date.now();\n      if (remaining <= 0) { reject(fail(\"root_timeout\")); return; }\n      var timer = setTimeout(function () { reject(fail(\"root_timeout\")); }, remaining);\n      Promise.resolve().then(call).then(function (value) {\n        clearTimeout(timer);\n        if (Date.now() >= deadline) reject(fail(\"root_timeout\"));\n        else resolve(value);\n      }, function (error) { clearTimeout(timer); reject(error); });\n    });\n  }\n  function legacyHistory(ref, deadline) {\n    return bounded(function () { return options.send(API, \"view\", 1, { id: ref.id }); }, deadline).then(function (records) {\n      // DSM 7.1 omits data entirely when a task has never run.\n      if (records === undefined) records = [];\n      if (!Array.isArray(records) || records.length > 500) throw fail(\"root_bad_response\");\n      var seen = {};\n      records.forEach(function (record) {\n        if (!record || !validTime(record.start_time) || typeof record.stop_time !== \"string\"\n            || (record.stop_time && (!validTime(record.stop_time) || record.stop_time < record.start_time))\n            || typeof record.exit_type !== \"string\" || !(typeof record.exit_code === \"number\" && isFinite(record.exit_code) && Math.floor(record.exit_code) === record.exit_code)\n            || seen[record.start_time]) throw fail(\"root_bad_response\");\n        seen[record.start_time] = true;\n      });\n      return records;\n    });\n  }\n  function waitForLegacyRun(ref, before, deadline, polls) {\n    return legacyHistory(ref, deadline).then(function (records) {\n      var previous = before.map(function (record) { return record.start_time; });\n      var newestBefore = previous.slice().sort().pop();\n      var fresh = records.filter(function (record) { return previous.indexOf(record.start_time) === -1; });\n      if (fresh.length > 1) throw fail(\"root_bad_response\");\n      var latest = fresh[0];\n      if (latest && (!newestBefore || latest.start_time > newestBefore) && latest.stop_time) {\n        if (latest.exit_code !== 0 || latest.exit_type !== \"normal\") throw fail(\"root_task_failed\");\n        return;\n      }\n      if (polls <= 1 || Date.now() >= deadline) throw fail(\"root_timeout\");\n      return options.wait(Math.min(POLL_MS, deadline - Date.now())).then(function () {\n        return waitForLegacyRun(ref, before, deadline, polls - 1);\n      });\n    });\n  }\n  function execute(task, verified) {\n    if (!legacy) {\n      return history(verified.ref).then(function (before) {\n        return runTask(verified.ref).then(function () { return waitForRun(verified.ref, before, POLLS); });\n      });\n    }\n    var deadline = Date.now() + POLL_MS * POLLS;\n    return legacyHistory(verified.ref, deadline).then(function (before) {\n      if (before.some(function (record) { return !record.stop_time || record.exit_type === \"running\"; })) throw fail(\"root_not_ready\");\n      // Mutating calls are sent exactly once, never retried with another profile.\n      return bounded(function () { return runTask(verified.ref); }, deadline).then(function () {\n        return waitForLegacyRun(verified.ref, before, deadline, POLLS);\n      });\n    }).then(function () {\n      return bounded(function () { return find(task); }, deadline).then(function (after) {\n        if (after.state !== \"ready\" || String(after.ref.id) !== String(verified.ref.id)) throw fail(\"root_verify_failed\");\n      });\n    });\n  }\n  function performRun(op) {\n    return begin(op).then(function (task) {\n      return find(task).then(function (found) {\n        if (found.state !== \"ready\") throw fail(\"root_not_ready\");\n        var consent = op === \"helper_repair\" ? options.confirmPassword() : Promise.resolve({ confirmed: true });\n        return consent.then(function (confirmation) {\n          if (!confirmation || confirmation.confirmed !== true) throw fail(\"root_cancelled\");\n          return op === \"helper_repair\" ? begin(op).then(find) : found;\n        }).then(function (verified) {\n          if (verified.state !== \"ready\") throw fail(\"root_not_ready\");\n          return execute(task, verified);\n        });\n      }).then(function () { return readOutput(task); });\n    });\n  }\n\n  return {\n    state: function (op) {\n      return begin(op).then(find).then(function (found) { return found.state; });\n    },\n    authorize: function (op) {\n      return begin(op).then(function (task) {\n        return find(task).then(function (found) {\n          if (found.state === \"ready\") return \"ready\";\n          if (found.state === \"conflict\") throw fail(\"root_conflict\");\n          return options.confirmPassword().then(function (confirmation) {\n            if (!confirmation || confirmation.confirmed !== true) return \"cancelled\";\n            if (!legacy && (typeof confirmation.token !== \"string\" || !confirmation.token)) throw fail(\"root_verify_failed\");\n            var params = definition(task, options.user().name);\n            if (!legacy) params.SynoConfirmPWToken = confirmation.token;\n            // Re-read after the legacy client-side dialog before replacing a task.\n            var checked = legacy ? begin(op).then(find) : Promise.resolve(found);\n            return checked.then(function (current) {\n              if (current.state === \"conflict\") throw fail(\"root_conflict\");\n              if (current.state === \"ready\") return;\n              var replaced = current.state === \"outdated\" ? deleteTask(current.ref) : Promise.resolve();\n              return replaced.then(function () { return createTask(params); });\n            }).then(function () {\n              return find(task);\n            }).then(function (after) {\n              if (after.state !== \"ready\") throw fail(\"root_verify_failed\");\n              return \"ready\";\n            });\n          });\n        });\n      });\n    },\n    run: function (op) {\n      if (!Object.prototype.hasOwnProperty.call(byOp, op)) return Promise.reject(fail(\"root_unknown_op\"));\n      if (options.user().admin !== true) return Promise.reject(fail(\"admin_required\"));\n      if (running[op]) return running[op];\n      var pending = performRun(op).then(function (value) {\n        delete running[op];\n        return value;\n      }, function (error) { delete running[op]; throw error; });\n      running[op] = pending;\n      return pending;\n    },\n    remove: function (op) {\n      return begin(op).then(function (task) {\n        return find(task).then(function (found) {\n          if (found.state === \"missing\") return \"missing\";\n          if (found.state === \"conflict\") throw fail(\"root_conflict\");\n          return deleteTask(found.ref).then(function () {\n            return find(task);\n          }).then(function (after) {\n            if (after.state !== \"missing\") throw fail(\"root_verify_failed\");\n            return \"missing\";\n          });\n        });\n      });\n    },\n    output: function (op) {\n      return begin(op).then(readOutput);\n    }\n  };\n}";
+export declare const ROOT_RUNTIME: string;

package/dist/standalone/native-root-window.js

@@ -1,3 +1,4 @@
+import { versionUnsupported } from "../runtime/dsm-version.js";
 /**
  * `createRootAccess(options)` → `{ state, authorize, run, remove }`, plain
  * ES5 for DSM's desktop. Every DSM call goes through `options.send` (the
@@ -7,7 +8,9 @@
  *   with exactly the embedded script. The one-use token goes into that single
  *   create call and is never kept.
  * - run: re-reads the task and runs it only if it is still exactly ours, then
- *   waits for its history entry and asks the backend for the output. Repair
+ *   waits for its history entry and asks the backend for the output. A queued
+ *   or running task keeps the wait going, up to RUN_LIMIT_MS (loaded NAS took
+ *   4.5 minutes), and `options.progress({op, state, elapsedMs})` hears each poll. Repair
  *   additionally requires fresh PasswordConfirm and another exact task check.
  * - an older version of our task is "outdated" and never runs; authorizing
  *   again replaces it. A same-named task that is not ours is a "conflict" and
@@ -15,11 +18,20 @@
  */
 export const ROOT_RUNTIME = `function createRootAccess(options) {
   var API = "SYNO.Core.TaskScheduler";
-  var POLL_MS = 500, POLLS = 60;
+  var POLL_MS = 500, MAX_POLL_MS = 2000, RUN_LIMIT_MS = 10 * 60 * 1000;
   var byOp = {}, running = {};
   var legacy = null, probe = null;
+  var versionUnsupported = ${versionUnsupported.toString()};
   options.tasks.forEach(function (task) { byOp[task.op] = task; });
 
+  function now() { return options.now ? options.now() : Date.now(); }
+  function report(task, state, started) {
+    if (typeof options.progress !== "function") return;
+    try { options.progress({ op: task.op, state: state, elapsedMs: now() - started }); } catch (error) {}
+  }
+  function pause(interval, deadline) {
+    return options.wait(Math.max(0, Math.min(interval, deadline - now())));
+  }
   function fail(code) {
     var error = new Error(code);
     error.code = code;
@@ -44,7 +56,7 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
         legacy = false;
         return data;
       }, function (error) {
-        if (!error || (error.code !== "dsm_103" && error.code !== 103)) {
+        if (!error || !versionUnsupported(error.code)) {
           probe = null;
           throw error;
         }
@@ -119,16 +131,18 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
   function history(ref) {
     return options.send(API, "get_history_status_list", 1, { id: ref.id }).then(newest);
   }
-  function waitForRun(ref, before, polls) {
+  function waitForRun(task, ref, before, started, deadline, interval) {
     return history(ref).then(function (latest) {
-      var finished = latest && (!before || latest.timestamp !== before.timestamp)
-        && latest.exit_type !== "running" && latest.stop_time;
-      if (finished) {
+      var fresh = latest && (!before || latest.timestamp !== before.timestamp);
+      if (fresh && latest.exit_type !== "running" && latest.stop_time) {
         if (latest.exit_code !== 0) throw fail("root_task_failed");
         return;
       }
-      if (polls <= 1) throw fail("root_timeout");
-      return options.wait(POLL_MS).then(function () { return waitForRun(ref, before, polls - 1); });
+      report(task, fresh ? "running" : "queued", started);
+      if (now() >= deadline) throw fail("root_timeout");
+      return pause(interval, deadline).then(function () {
+        return waitForRun(task, ref, before, started, deadline, Math.min(interval * 2, MAX_POLL_MS));
+      });
     });
   }
 
@@ -141,12 +155,12 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
   function bounded(call, deadline) {
     // A poll count alone cannot bound a stalled DSM callback. Discard late replies.
     return new Promise(function (resolve, reject) {
-      var remaining = deadline - Date.now();
+      var remaining = deadline - now();
       if (remaining <= 0) { reject(fail("root_timeout")); return; }
       var timer = setTimeout(function () { reject(fail("root_timeout")); }, remaining);
       Promise.resolve().then(call).then(function (value) {
         clearTimeout(timer);
-        if (Date.now() >= deadline) reject(fail("root_timeout"));
+        if (now() >= deadline) reject(fail("root_timeout"));
         else resolve(value);
       }, function (error) { clearTimeout(timer); reject(error); });
     });
@@ -167,7 +181,7 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
       return records;
     });
   }
-  function waitForLegacyRun(ref, before, deadline, polls) {
+  function waitForLegacyRun(task, ref, before, started, deadline, interval) {
     return legacyHistory(ref, deadline).then(function (records) {
       var previous = before.map(function (record) { return record.start_time; });
       var newestBefore = previous.slice().sort().pop();
@@ -178,24 +192,25 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
         if (latest.exit_code !== 0 || latest.exit_type !== "normal") throw fail("root_task_failed");
         return;
       }
-      if (polls <= 1 || Date.now() >= deadline) throw fail("root_timeout");
-      return options.wait(Math.min(POLL_MS, deadline - Date.now())).then(function () {
-        return waitForLegacyRun(ref, before, deadline, polls - 1);
+      report(task, latest ? "running" : "queued", started);
+      if (now() >= deadline) throw fail("root_timeout");
+      return pause(interval, deadline).then(function () {
+        return waitForLegacyRun(task, ref, before, started, deadline, Math.min(interval * 2, MAX_POLL_MS));
       });
     });
   }
   function execute(task, verified) {
+    var started = now(), deadline = started + RUN_LIMIT_MS;
     if (!legacy) {
       return history(verified.ref).then(function (before) {
-        return runTask(verified.ref).then(function () { return waitForRun(verified.ref, before, POLLS); });
+        return runTask(verified.ref).then(function () { return waitForRun(task, verified.ref, before, started, deadline, POLL_MS); });
       });
     }
-    var deadline = Date.now() + POLL_MS * POLLS;
     return legacyHistory(verified.ref, deadline).then(function (before) {
       if (before.some(function (record) { return !record.stop_time || record.exit_type === "running"; })) throw fail("root_not_ready");
       // Mutating calls are sent exactly once, never retried with another profile.
       return bounded(function () { return runTask(verified.ref); }, deadline).then(function () {
-        return waitForLegacyRun(verified.ref, before, deadline, POLLS);
+        return waitForLegacyRun(task, verified.ref, before, started, deadline, POLL_MS);
       });
     }).then(function () {
       return bounded(function () { return find(task); }, deadline).then(function (after) {

package/dist/standalone/root-window.d.ts

@@ -2,4 +2,7 @@ export { executorTasks as rootTasks, type ExecutorTask as RootTask } from '../ru
 /** Exact readback is authoritative. PasswordConfirm tokens are reused immediately,
  * across both Root APIs, and never persisted (DSM validity is about 300 seconds). */
 export declare const ROOT_RUNTIME: string;
-export declare const ROOT_PANEL = "function mountRootPanel(host, access, i18n, tasks, admin) {\n  if (!admin) return;\n  var status = document.createElement(\"p\"), approve = document.createElement(\"button\"), retry = document.createElement(\"button\");\n  approve.textContent = \"Approve background access\"; retry.textContent = \"Check status\";\n  host.appendChild(status); host.appendChild(approve); host.appendChild(retry);\n  function show(result) { status.textContent = result.state + (result.reason ? \": \" + result.reason : \"\"); approve.hidden = result.state !== \"needs-admin-approval\"; }\n  function run(fn) { approve.disabled = retry.disabled = true; return fn().then(show, function(e) { show({state: \"blocked\", reason: e.message || e.code}); }).then(function() { approve.disabled = retry.disabled = false; }); }\n  approve.onclick = function() { return run(function() { return access.authorize(); }); };\n  retry.onclick = function() { return run(function() { return access.status(); }); };\n  run(function() { return access.status().then(function(result) { return result.tasks && result.tasks.boot && result.tasks.control && result.tasks.boot.state === \"ready\" && result.tasks.control.state === \"ready\" ? access.control(\"start\") : result; }); });\n}";
+export declare const ROOT_PANEL = "function mountRootPanel(host, access, i18n, tasks, admin) {\n  if (!admin) return;\n  var status = document.createElement(\"p\"), approve = document.createElement(\"button\"), retry = document.createElement(\"button\");\n  approve.textContent = \"Approve background access\"; retry.textContent = \"Check status\";\n  host.appendChild(status); host.appendChild(approve); host.appendChild(retry);\n  function show(result) { status.textContent = result.state + (result.reason ? \": \" + result.reason : \"\"); approve.hidden = result.state !== \"needs-admin-approval\" && result.retry !== true; }\n  function run(fn) { approve.disabled = retry.disabled = true; return fn().then(show, function(e) { show({state: \"blocked\", reason: e.message || e.code}); }).then(function() { approve.disabled = retry.disabled = false; }); }\n  access.subscribe(show);\n  approve.onclick = function() { return run(function() { return access.authorize(); }); };\n  retry.onclick = function() { return run(function() { return access.status(); }); };\n  run(function() { return access.status().then(function(result) { return result.tasks && result.tasks.boot && result.tasks.control && result.tasks.boot.state === \"ready\" && result.tasks.control.state === \"ready\" ? access.control(\"start\") : result; }); });\n}";
+/** Administrator password confirmation in the window's own session: a supplied
+ * password, or a masked form when none is given. */
+export declare const PASSWORD_CONFIRM: string;

package/dist/standalone/root-window.js

@@ -1,23 +1,47 @@
 import { bootDefinition, controlDefinition } from '../runtime/executor-tasks.js';
 import { executorScopeTask } from '../runtime/executor-scope-task.js';
+import { versionUnsupported } from '../runtime/dsm-version.js';
 export { executorTasks as rootTasks } from '../runtime/executor-tasks.js';
 /** Exact readback is authoritative. PasswordConfirm tokens are reused immediately,
  * across both Root APIs, and never persisted (DSM validity is about 300 seconds). */
 export const ROOT_RUNTIME = `function createRootAccess(options) {
   var eventAPI = "SYNO.Core.EventScheduler", taskAPI = "SYNO.Core.TaskScheduler";
-  var busy = null;
-  function fail(code) { var e = new Error(code); e.code = code; return e; }
+  var busy = null, legacy = false;
+  var versionUnsupported = ${versionUnsupported.toString()};
+  function fail(code, detail) { var e = new Error(code); e.code = code; if (detail) e.detail = detail; return e; }
   function reason(e) {
     var code = String(e && e.code || "executor_bad_response");
+    if (e && e.passwordConfirm) return code + (code === "dsm_3121" ? ": DSM rejected the administrator password." : ": administrator password confirmation failed.") + " Nothing was created.";
+    if (e && e.detail) return code + ": " + e.detail;
     return code + (code === "105" || code === "dsm_105" ? ": DSM denied administrator scheduler access. Check the DSM session and scheduler; a NAS restart resolved this on the measured DSM. No automatic retry was made." : ": scheduler readback or operation failed.");
   }
   // AppWindow.sendWebAPI encodes JSON parameters. Preserve their native types;
   // pre-encoding turns objects/booleans into strings and DSM rejects create.
   function send(api, method, version, params) { return options.send(api, method, version, params || {}); }
+  // DSM 7.1 has no Root APIs: TaskScheduler stops at list v2 (offset) and get v3.
+  // Only an unsupported method version on a read selects that profile, which
+  // then creates through the plain scheduler APIs. Writes never fall back.
+  function taskRead(method, version, params, legacyVersion, legacyParams) {
+    if (legacy) return send(taskAPI, method, legacyVersion, legacyParams);
+    return send(taskAPI, method, version, params).catch(function (e) {
+      if (!versionUnsupported(e && e.code)) throw e;
+      legacy = true;
+      return send(taskAPI, method, legacyVersion, legacyParams);
+    });
+  }
+  function create(boot, params, confirmation) {
+    if (legacy) return send(boot ? eventAPI : taskAPI, "create", boot ? 1 : 3, params);
+    params.SynoConfirmPWToken = confirmation.token;
+    return send(boot ? eventAPI + ".Root" : taskAPI + ".Root", "create", boot ? 1 : 4, params);
+  }
+  function remove(task, ref) {
+    var boot = task.kind === "boot";
+    return send(boot ? eventAPI : taskAPI, "delete", boot ? 1 : 2, boot ? ref : {tasks: [ref]});
+  }
   function admin() { if (!options.user() || options.user().admin !== true) throw fail("admin_required"); }
   function find(task) {
     var boot = task.kind === "boot";
-    return send(boot ? eventAPI : taskAPI, "list", boot ? 1 : 3, boot ? {} : {start: 0, limit: 500}).then(function (data) {
+    return (boot ? send(eventAPI, "list", 1, {}) : taskRead("list", 3, {start: 0, limit: 500}, 2, {offset: 0, limit: 500})).then(function (data) {
       var records = boot ? data : data && data.tasks;
       if (!Array.isArray(records) || records.length > 500 || (!boot && (!Number.isInteger(data.total) || data.total !== records.length))) throw fail("executor_bad_response");
       var named = records.filter(function (r) { return r && (boot ? r.task_name : r.name) === task.name; });
@@ -26,7 +50,7 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
       var summary = named[0];
       if (!boot && !/^[0-9]+$/.test(String(summary.id))) throw fail("executor_bad_response");
       var ref = boot ? {task_name: task.name} : {id: summary.id, real_owner: "root"};
-      var detail = send(boot ? eventAPI : taskAPI, "get", boot ? 1 : 4, ref);
+      var detail = boot ? send(eventAPI, "get", 1, ref) : taskRead("get", 4, ref, 3, ref);
       return detail.then(function (r) {
         var owner = r && r.owner;
         var root = owner === "root" || (boot && owner && owner["0"] === "root");
@@ -49,6 +73,16 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
       return result;
     });
   }
+  // Removes, newest first, the tasks one approval created and still reads as
+  // exactly ours. Resolves with the last refusal's reason, if any.
+  function withdraw(created) {
+    var failed;
+    return created.reduceRight(function (withdrawn, task) {
+      return withdrawn.then(function () { return find(task); }).then(function (current) {
+        if (current.state === "ready") return remove(task, current.ref);
+      }).catch(function (e) { failed = reason(e); });
+    }, Promise.resolve()).then(function () { return failed; });
+  }
   function definition(task) { return task.kind === "boot" ? (${bootDefinition.toString()})(task) : (${controlDefinition.toString()})(task); }
   function approve(password, selectedScope) {
     var selectionTask;
@@ -56,10 +90,13 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
     return read().then(function (before) {
       if (before.state === "blocked" || before.state === "unsupported") return before;
       if (before.state === "ready" && !selectionTask) return start(before);
-      return options.confirmPassword(password).then(function (confirmation) {
+      return options.confirmPassword(password).catch(function (e) {
+        throw {code: e && e.code, passwordConfirm: true};
+      }).then(function (confirmation) {
         if (!confirmation || confirmation.confirmed !== true) return {state: "cancelled", tasks: before.tasks};
-        if (typeof confirmation.token !== "string" || !confirmation.token) throw fail("executor_confirmation_missing");
-        var errors = {};
+        // DSM 7.1 confirms the password server-side but issues no create token.
+        if (!legacy && (typeof confirmation.token !== "string" || !confirmation.token)) throw fail("executor_confirmation_missing");
+        var errors = {}, created = [], withdrawFailed;
         // Delete only a verified, same-header outdated task, then create the pinned
         // replacement. set has no measured wire contract. Re-read before each write.
         var chain = Promise.resolve();
@@ -68,22 +105,35 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
             return find(task).then(function (current) {
               if (current.state === "ready") return;
               if (current.state === "blocked") throw fail(current.reason);
-              var boot = task.kind === "boot";
-              var removed = current.ref ? send(boot ? eventAPI : taskAPI, "delete", boot ? 1 : 2, boot ? current.ref : {tasks: [current.ref]}) : Promise.resolve();
-              return removed.then(function () {
-                var params = definition(task); params.SynoConfirmPWToken = confirmation.token;
-                return send(boot ? eventAPI + ".Root" : taskAPI + ".Root", "create", boot ? 1 : 4, params);
-              });
+              var removed = current.ref ? remove(task, current.ref) : Promise.resolve();
+              return removed.then(function () { return create(task.kind === "boot", definition(task), confirmation); }).then(function () { created.push(task); });
             }).catch(function (e) { errors[task.kind] = reason(e); });
           });
         });
-        return chain.then(read).then(function (after) {
+        // A partial approval must not leave an enabled root bootup task that no
+        // control task or uninstall inventory owns: withdraw what it created.
+        return chain.then(function () {
+          if (Object.keys(errors).length) return withdraw(created).then(function (failed) { withdrawFailed = failed; });
+        }).then(read).then(function (after) {
           Object.keys(errors).forEach(function (kind) {
             if (after.tasks[kind].state !== "ready") { after.tasks[kind].state = "blocked"; after.tasks[kind].reason = errors[kind]; after.state = "blocked"; after.reason = errors[kind]; }
           });
+          if (withdrawFailed) { after.state = "blocked"; after.reason = (after.reason ? after.reason + " " : "") + "Withdrawing the tasks this approval created failed: " + withdrawFailed; }
           // A scope change must not restart a running executor: the boot task
           // stops it, which interrupts in-flight copies instead of canceling them.
           return after.state === "ready" ? (selectionTask ? running(after) : Promise.resolve(null)).then(function (live) { return live || start(after); }).then(function (started) {
+            // Without a running executor there is no task inventory, so uninstall
+            // cannot find these tasks: withdraw what this approval created.
+            if (started.state === "ready" || !created.length) return started;
+            return withdraw(created).then(function (failed) {
+              return read().then(function (current) {
+                current.state = "blocked";
+                current.reason = started.reason + (failed ? " Withdrawing the tasks this approval created failed: " + failed : " The tasks this approval created were withdrawn.");
+                current.retry = !failed;
+                return current;
+              });
+            });
+          }).then(function (started) {
             if (!selectionTask || started.state !== "ready") return started;
             var generation = started.executor.selection ? started.executor.selection.generation : 0;
             if (started.executor.selection && (!Number.isSafeInteger(generation) || generation <= 0)) throw fail("executor_selection_invalid");
@@ -102,23 +152,20 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
   function selectScope(task, confirmation, verified, selectedScope) {
     function removeExact() {
       return find(task).then(function (current) {
-        if (current.state === "ready") return send(taskAPI, "delete", 2, {tasks: [current.ref]});
+        if (current.state === "ready") return remove(task, current.ref);
         if (current.ref) throw fail("executor_selection_cleanup_conflict");
       });
     }
     return find(task).then(function (current) {
       if (current.state === "blocked" || current.state === "unsupported") throw fail("executor_selection_conflict");
-      var removed = current.ref ? send(taskAPI, "delete", 2, {tasks: [current.ref]}) : Promise.resolve();
-      return removed.then(function () {
-        var params = definition(task); params.SynoConfirmPWToken = confirmation.token;
-        return send(taskAPI + ".Root", "create", 4, params);
-      });
+      var removed = current.ref ? remove(task, current.ref) : Promise.resolve();
+      return removed.then(function () { return create(false, definition(task), confirmation); });
     }).then(function () { return find(task); }).then(function (current) {
       if (current.state !== "ready") throw fail("executor_selection_readback_mismatch");
       return send(taskAPI, "run", 2, {tasks: [current.ref]});
     }).then(function () {
       function readSelection(attempts) {
-        return health(verified, 1).then(function (current) {
+        return health(verified, 0).then(function (current) {
           if (current.state === "ready" && current.executor.selection && current.executor.selection.scope === selectedScope && Number.isSafeInteger(current.executor.selection.generation) && current.executor.selection.generation > 0) return current;
           if (attempts > 1 && options.wait) return options.wait(500).then(function () { verified.state = "ready"; return readSelection(attempts - 1); });
           throw fail("executor_selection_unconfirmed");
@@ -129,21 +176,35 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
       return removeExact().then(function () { throw error; });
     });
   }
-  function pinned(status) { return !!status && status.ready === true && !!options.pins && status.executor_digest === options.pins.executorDigest && status.policy_digest === options.pins.policyDigest; }
+  // Why a status reply is not the approved, running executor; null when it is.
+  function mismatch(status) {
+    if (!status || status.ready !== true) return "the approved executor is not answering" + (status && (status.reason || status.state) ? " (" + (status.reason || status.state) + ")" : "") + ".";
+    if (!options.pins || status.executor_digest !== options.pins.executorDigest || status.policy_digest !== options.pins.policyDigest) return "the running executor reports other digests than this package pins.";
+    return null;
+  }
+  function pinned(status) { return mismatch(status) === null; }
   function running(verified) {
     return options.call("executor.status", {}).then(function (status) {
       if (!pinned(status)) return null;
       verified.executor = status; return verified;
     }, function () { return null; });
   }
-  function health(verified, attempts) {
+  // budget: how long to keep asking after a start (ms). The wait doubles from
+  // 500 ms to 2 s so an open window does not poll the executor twice a second.
+  function health(verified, budget, delay) {
     if (verified.state !== "ready") return Promise.resolve(verified);
+    delay = Math.min(delay || 500, 2000);
     return options.call("executor.status", {}).then(function (status) {
-      if (!pinned(status)) throw fail("executor_status_mismatch");
+      var why = mismatch(status);
+      if (why) throw fail("executor_status_mismatch", why);
       verified.executor = status; return verified;
+    }, function (e) {
+      throw fail(e && e.code, "the executor status request failed.");
     }).catch(function (e) {
-      if (attempts > 1 && options.wait) return options.wait(500).then(function () { return health(verified, attempts - 1); });
-      verified.state = "blocked"; verified.reason = reason(e); return verified;
+      if (budget >= delay && options.wait) return options.wait(delay).then(function () { return health(verified, budget - delay, delay * 2); });
+      // The tasks are approved: approving again runs start, which restarts the
+      // executor without a password, so the panel offers it.
+      verified.state = "blocked"; verified.reason = reason(e); verified.retry = true; return verified;
     });
   }
   function start(verified) {
@@ -151,13 +212,17 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
       return send(eventAPI, "run", 1, verified.tasks.boot.ref);
     }).then(function () {
       // run can succeed for a nonexistent task. Read both definitions again.
-      return read().then(function (after) { return health(after, 20); });
+      return read().then(function (after) { return health(after, 10000); });
     }).catch(function (e) { verified.state = "blocked"; verified.reason = reason(e); return verified; });
   }
+  // The window panel and the app's own settings share this access; each
+  // result reaches every view so neither shows a stale state.
+  var listeners = [];
+  function publish(result) { listeners.forEach(function (listener) { listener(result); }); return result; }
   return {
-    status: function () { return read().then(function (verified) { return health(verified, 1); }); },
+    status: function () { return read().then(function (verified) { return health(verified, 0); }).then(publish); },
     authorize: function (password, selectedScope) {
-      if (!busy) busy = Promise.resolve().then(function () { return approve(password, selectedScope); }).catch(function (e) { return {state: "blocked", reason: reason(e), tasks: {}}; }).then(function (r) { busy = null; return r; });
+      if (!busy) busy = Promise.resolve().then(function () { return approve(password, selectedScope); }).catch(function (e) { return {state: "blocked", reason: reason(e), tasks: {}, retry: !!(e && e.passwordConfirm)}; }).then(function (r) { busy = null; return publish(r); });
       return busy;
     },
     control: function (action) {
@@ -166,9 +231,10 @@ export const ROOT_RUNTIME = `function createRootAccess(options) {
         if (verified.state !== "ready") throw fail("executor_not_ready");
         return options.call("executor.control", {action: action}).then(function () {
           return send(taskAPI, "run", 2, {tasks: [verified.tasks.control.ref]});
-        }).then(read).then(function (after) { return action === "start" ? health(after, 20) : after; });
-      });
-    }
+        }).then(read).then(function (after) { return action === "start" ? health(after, 10000) : after; });
+      }).then(publish);
+    },
+    subscribe: function (listener) { listeners.push(listener); }
   };
 }`;
 export const ROOT_PANEL = `function mountRootPanel(host, access, i18n, tasks, admin) {
@@ -176,9 +242,53 @@ export const ROOT_PANEL = `function mountRootPanel(host, access, i18n, tasks, ad
   var status = document.createElement("p"), approve = document.createElement("button"), retry = document.createElement("button");
   approve.textContent = "Approve background access"; retry.textContent = "Check status";
   host.appendChild(status); host.appendChild(approve); host.appendChild(retry);
-  function show(result) { status.textContent = result.state + (result.reason ? ": " + result.reason : ""); approve.hidden = result.state !== "needs-admin-approval"; }
+  function show(result) { status.textContent = result.state + (result.reason ? ": " + result.reason : ""); approve.hidden = result.state !== "needs-admin-approval" && result.retry !== true; }
   function run(fn) { approve.disabled = retry.disabled = true; return fn().then(show, function(e) { show({state: "blocked", reason: e.message || e.code}); }).then(function() { approve.disabled = retry.disabled = false; }); }
+  access.subscribe(show);
   approve.onclick = function() { return run(function() { return access.authorize(); }); };
   retry.onclick = function() { return run(function() { return access.status(); }); };
   run(function() { return access.status().then(function(result) { return result.tasks && result.tasks.boot && result.tasks.control && result.tasks.boot.state === "ready" && result.tasks.control.state === "ready" ? access.control("start") : result; }); });
 }`;
+/** Administrator password confirmation in the window's own session: a supplied
+ * password, or a masked form when none is given. */
+export const PASSWORD_CONFIRM = `function createPasswordConfirm(win) {
+  var versionUnsupported = ${versionUnsupported.toString()};
+  function send(password, version) {
+    return new Promise(function (resolve, reject) {
+      win.sendWebAPI({api: "SYNO.Core.User.PasswordConfirm", method: "auth", version: version, params: {password: password}, scope: win,
+        callback: function (success, response) {
+          if (!success) reject({code: "dsm_" + ((response && response.code) || "error")});
+          else resolve({confirmed: true, token: response && response.SynoConfirmPWToken});
+        }
+      });
+    });
+  }
+  // DSM 7.1 has PasswordConfirm v1 only, which checks the password but issues no
+  // token. Only an unsupported version is retried; a wrong password is not.
+  function auth(password) {
+    return send(password, 2).catch(function (error) {
+      if (!versionUnsupported(error.code)) throw error;
+      return send(password, 1);
+    });
+  }
+  return function (suppliedPassword) {
+    if (typeof suppliedPassword === "string" && suppliedPassword) return auth(suppliedPassword);
+    return new Promise(function (resolve, reject) {
+      var form = document.createElement("form"), label = document.createElement("label"), input = document.createElement("input");
+      var submit = document.createElement("button"), cancel = document.createElement("button");
+      label.textContent = "Confirm your DSM administrator password";
+      input.type = "password"; input.autocomplete = "current-password"; input.required = true;
+      label.appendChild(input); form.appendChild(label);
+      submit.type = "submit"; submit.textContent = "Approve"; form.appendChild(submit);
+      cancel.type = "button"; cancel.textContent = "Cancel"; form.appendChild(cancel);
+      win.body.dom.appendChild(form); input.focus();
+      function close() { input.value = ""; if (form.parentNode) form.parentNode.removeChild(form); }
+      cancel.onclick = function () { close(); resolve({confirmed: false}); };
+      form.onsubmit = function (event) {
+        event.preventDefault(); submit.disabled = cancel.disabled = true;
+        var password = input.value; input.value = "";
+        auth(password).then(function (result) { close(); resolve(result); }, function (error) { close(); reject(error); });
+      };
+    });
+  };
+}`;

package/dist/templates/_daemon/go.mod

@@ -2,4 +2,4 @@ module synopkgland-daemon
 
 go 1.24
 
-toolchain go1.26.8
+toolchain go1.26.9

package/dist/templates/_daemon/main.go

@@ -28,6 +28,9 @@ type deadlines struct {
 	Start  int `json:"start"`
 	Stop   int `json:"stop"`
 	Status int `json:"status"`
+	// Uninstall bounds uninstall_args separately from Stop: a revoke on a
+	// loaded NAS can take longer than stopping the daemon.
+	Uninstall int `json:"uninstall"`
 }
 type config struct {
 	Package       string            `json:"package"`
@@ -88,7 +91,7 @@ func load(dest, data string) (*controller, error) {
 	if cfg.Exec == "" || filepath.IsAbs(cfg.Exec) || filepath.Clean(cfg.Exec) != cfg.Exec || strings.HasPrefix(cfg.Exec, "../") {
 		return nil, errors.New("invalid fixed executable")
 	}
-	if cfg.Timeouts.Start < 2 || cfg.Timeouts.Start > 120 || cfg.Timeouts.Stop < 2 || cfg.Timeouts.Stop > 120 || cfg.Timeouts.Status < 1 || cfg.Timeouts.Status > 10 {
+	if cfg.Timeouts.Start < 2 || cfg.Timeouts.Start > 120 || cfg.Timeouts.Stop < 2 || cfg.Timeouts.Stop > 120 || cfg.Timeouts.Status < 1 || cfg.Timeouts.Status > 10 || cfg.Timeouts.Uninstall < 2 || cfg.Timeouts.Uninstall > 120 {
 		return nil, errors.New("invalid daemon deadlines")
 	}
 	hash := sha256.Sum256(raw)
@@ -162,7 +165,7 @@ func (c *controller) run(action string) (int, error) {
 		budget += c.Timeouts.Start
 	}
 	if action == "uninstall" {
-		budget += c.Timeouts.Stop + 1
+		budget += c.Timeouts.Uninstall + 2
 	}
 	if action != "start" && action != "stop" && action != "status" && action != "restart" && action != "uninstall" {
 		return 1, errors.New("unsupported daemon action")
@@ -414,7 +417,7 @@ func (c *controller) uninstall() error {
 	select {
 	case err := <-done:
 		return err
-	case <-time.After(time.Duration(c.Timeouts.Stop-1) * time.Second):
+	case <-time.After(time.Duration(c.Timeouts.Uninstall) * time.Second):
 		cmd.Process.Signal(syscall.SIGTERM)
 	}
 	select {

package/dist/templates/_daemon/main_test.go

@@ -50,7 +50,7 @@ func fixture(t *testing.T, mode string) (string, string, string) {
 	if raw, err := exec.Command(app, "cleanup").CombinedOutput(); err != nil {
 		t.Fatalf("payload warm-up: %v %s", err, raw)
 	}
-	cfg := config{Package: "DaemonFixture", Exec: "app", Args: []string{"${SYNOPKG_PKGVAR}/a space", "$(touch BAD)'", "${SYNOPKG_PKGDEST}"}, Env: map[string]string{"APP_MODE": mode}, Timeouts: deadlines{Start: 2, Stop: 2, Status: 1}}
+	cfg := config{Package: "DaemonFixture", Exec: "app", Args: []string{"${SYNOPKG_PKGVAR}/a space", "$(touch BAD)'", "${SYNOPKG_PKGDEST}"}, Env: map[string]string{"APP_MODE": mode}, Timeouts: deadlines{Start: 2, Stop: 2, Status: 1, Uninstall: 2}}
 	if os.Geteuid() == 0 {
 		cfg.Package = "nobody"
 	} else {
@@ -250,6 +250,26 @@ func TestUninstallCleanup(t *testing.T) {
 	}
 }
 
+// A revoke on uninstall can outlast the stop deadline on a loaded NAS; it has
+// its own budget instead of Stop-1.
+func TestUninstallCommandHasItsOwnBudget(t *testing.T) {
+	control, dest, data := fixture(t, "normal")
+	path := filepath.Join(dest, "daemon/config.json")
+	raw, _ := os.ReadFile(path)
+	var cfg config
+	json.Unmarshal(raw, &cfg)
+	cfg.UninstallArgs = []string{"cleanup-slow"}
+	cfg.Timeouts.Uninstall = 5
+	raw, _ = json.Marshal(cfg)
+	os.WriteFile(path, raw, 0644)
+	if rc, out := runControl(control, "start", dest, data); rc != 0 {
+		t.Fatalf("start: %d %s", rc, out)
+	}
+	if rc, out := runControl(control, "uninstall", dest, data); rc != 0 {
+		t.Fatalf("slow uninstall within its budget failed: %d %s", rc, out)
+	}
+}
+
 func TestPackageAccountIdentity(t *testing.T) {
 	control, dest, data := fixture(t, "normal")
 	path := filepath.Join(dest, "daemon/config.json")

package/dist/templates/_daemon/testdata/child.go

@@ -14,6 +14,9 @@ func main() {
 		switch os.Args[1] {
 		case "cleanup":
 			os.Exit(0)
+		case "cleanup-slow":
+			time.Sleep(2500 * time.Millisecond)
+			os.Exit(0)
 		case "cleanup-fail":
 			os.Exit(2)
 		case "cleanup-hang":