@synopackageland/cli 0.5.3 → 0.6.0

package/dist/standalone/root-window.js

@@ -1,420 +1,137 @@
-import { renderRootTaskScript, rootTaskHeader, rootTaskName } from "./root-ops.js";
-export function rootTasks(manifest) {
-    return (manifest.rootOps ?? []).map((op) => ({
-        op: op.name,
-        name: rootTaskName(manifest.package, op.name),
-        header: rootTaskHeader(manifest.package, op.name),
-        script: renderRootTaskScript(manifest, op),
-        output: op.exposeOutput ?? op.protectedOutput !== true,
-    }));
-}
-/**
- * `createRootAccess(options)` → `{ state, authorize, run, remove }`, plain
- * ES5 for DSM's desktop. Every DSM call goes through `options.send` (the
- * AppWindow's sendWebAPI) as the signed-in administrator:
- *
- * - authorize: DSM's own password confirmation, then one disabled root task
- *   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
- *   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.
- */
+import { bootDefinition, controlDefinition } from '../runtime/executor-tasks.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 API = "SYNO.Core.TaskScheduler";
-  var POLL_MS = 500, POLLS = 60;
-  var byOp = {}, running = {};
-  var legacy = null, probe = null;
-  options.tasks.forEach(function (task) { byOp[task.op] = task; });
-
-  function fail(code) {
-    var error = new Error(code);
-    error.code = code;
-    return error;
-  }
-  function begin(op) {
-    if (!Object.prototype.hasOwnProperty.call(byOp, op)) return Promise.reject(fail("root_unknown_op"));
-    if (options.user().admin !== true) return Promise.reject(fail("admin_required"));
-    return Promise.resolve(byOp[op]);
-  }
-  function readOutput(task) {
-    return task.output ? options.call("root.output", { op: task.op }) : Promise.resolve(null);
-  }
-  function isRootTask(summary) {
-    return summary.owner === "root" && summary.real_owner === "root" && summary.enable === false && summary.type === "script";
-  }
-  function listTasks() {
-    if (legacy === false) return options.send(API, "list", 3, { start: 0, limit: 500 });
-    if (legacy === true) return legacyList();
-    if (!probe) {
-      probe = options.send(API, "list", 3, { start: 0, limit: 500 }).then(function (data) {
-        legacy = false;
-        return data;
-      }, function (error) {
-        if (!error || (error.code !== "dsm_103" && error.code !== 103)) {
-          probe = null;
-          throw error;
-        }
-        legacy = true;
-        return legacyList();
-      });
-    }
-    return probe;
-  }
-  function legacyList() {
-    return options.send(API, "list", 2, { offset: 0, limit: 500 }).then(function (data) {
-      // Refuse a truncated snapshot: a same-named task could lie outside it.
-      if (!data || !Array.isArray(data.tasks) || data.tasks.length > 500
-          || !(typeof data.total === "number" && isFinite(data.total) && Math.floor(data.total) === data.total) || data.total !== data.tasks.length) throw fail("root_bad_response");
-      return data;
+  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; }
+  function reason(e) {
+    var code = String(e && e.code || "executor_bad_response");
+    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.");
+  }
+  function wire(params) {
+    var encoded = {};
+    Object.keys(params).forEach(function (key) {
+      var value = params[key];
+      encoded[key] = value === "" || typeof value === "boolean" || typeof value === "object" ? JSON.stringify(value) : value;
     });
+    return encoded;
   }
-  function readTask(ref) {
-    return options.send(API, "get", legacy ? 3 : 4, ref);
-  }
-  function createTask(params) {
-    return options.send(legacy ? API : API + ".Root", "create", legacy ? 3 : 4, params);
-  }
-  function deleteTask(ref) {
-    return options.send(API, "delete", 2, { tasks: [ref] });
-  }
-  function runTask(ref) {
-    return options.send(API, "run", 2, { tasks: [ref] });
-  }
+  function send(api, method, version, params) { return options.send(api, method, version, wire(params || {})); }
+  function admin() { if (!options.user() || options.user().admin !== true) throw fail("admin_required"); }
   function find(task) {
-    return listTasks().then(function (data) {
-      if (!data || !Array.isArray(data.tasks)) throw fail("root_bad_response");
-      var named = data.tasks.filter(function (summary) { return summary && summary.name === task.name; });
-      if (named.length === 0) return { state: "missing" };
-      if (named.length > 1 || !isRootTask(named[0])) return { state: "conflict" };
-      var ref = { id: named[0].id, real_owner: named[0].real_owner };
-      return readTask(ref).then(function (detail) {
-        var script = detail && detail.extra && detail.extra.script;
-        if (!detail || String(detail.id) !== String(ref.id) || detail.name !== task.name
-            || detail.owner !== "root" || detail.real_owner !== ref.real_owner || detail.enable !== false || detail.type !== "script" || typeof script !== "string") {
-          return { state: "conflict" };
-        }
-        if (script === task.script) return { state: "ready", ref: ref };
-        if (script.indexOf(task.header) === 0) return { state: "outdated", ref: ref };
-        return { state: "conflict" };
+    var boot = task.kind === "boot";
+    return send(boot ? eventAPI : taskAPI, "list", boot ? 1 : 3, boot ? {} : {start: 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; });
+      if (!named.length) return {state: "needs-admin-approval", reason: "Task is missing."};
+      if (named.length !== 1) return {state: "blocked", reason: "Duplicate task names."};
+      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);
+      return detail.then(function (r) {
+        var owner = r && r.owner;
+        var root = owner === "root" || (boot && owner && owner["0"] === "root");
+        var script = boot ? r && r.operation : r && r.extra && r.extra.script;
+        if (!r || (boot ? r.task_name !== task.name : String(r.id) !== String(ref.id) || r.name !== task.name) || !root || (!boot && (r.real_owner !== "root" || r.enable !== false || r.type !== "script")) || (boot && (r.enable !== true || r.event !== "bootup" || r.operation_type !== "script")) || typeof script !== "string") return {state: "blocked", reason: "Task ownership or definition cannot be verified."};
+        if (script === task.script) return {state: "ready", ref: ref};
+        if (script.indexOf(task.header) === 0) return {state: "needs-admin-approval", ref: ref, reason: "Approved digests differ."};
+        return {state: "blocked", reason: "Same-named task has an unrelated script."};
       });
-    });
-  }
-  function definition(task, user) {
-    var hours = [];
-    for (var h = 1; h <= 23; h++) hours.push(h);
-    return {
-      name: task.name,
-      real_owner: user,
-      owner: "root",
-      enable: false,
-      type: "script",
-      schedule: {
-        date_type: 0, week_day: "0,1,2,3,4,5,6", repeat_date: 1001, monthly_week: [], hour: 0, minute: 0,
-        repeat_hour: 0, repeat_min: 0, last_work_hour: 0,
-        repeat_min_store_config: [1, 5, 10, 15, 20, 30], repeat_hour_store_config: hours
-      },
-      extra: { notify_enable: false, script: task.script, notify_mail: "", notify_if_error: false }
-    };
-  }
-  function newest(history) {
-    if (!Array.isArray(history)) throw fail("root_bad_response");
-    return history.reduce(function (latest, entry) {
-      return entry && (!latest || Number(entry.timestamp) > Number(latest.timestamp)) ? entry : latest;
-    }, null);
-  }
-  function history(ref) {
-    return options.send(API, "get_history_status_list", 1, { id: ref.id }).then(newest);
-  }
-  function waitForRun(ref, before, polls) {
-    return history(ref).then(function (latest) {
-      var finished = latest && (!before || latest.timestamp !== before.timestamp)
-        && latest.exit_type !== "running" && latest.stop_time;
-      if (finished) {
-        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); });
-    });
-  }
-
-  function validTime(value) {
-    if (typeof value !== "string" || !/^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}$/.test(value)) return false;
-    var normalized = value.replace(" ", "T") + "Z";
-    var date = new Date(normalized);
-    return !isNaN(date.getTime()) && date.toISOString().slice(0, 19) === normalized.slice(0, 19);
-  }
-  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();
-      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"));
-        else resolve(value);
-      }, function (error) { clearTimeout(timer); reject(error); });
-    });
-  }
-  function legacyHistory(ref, deadline) {
-    return bounded(function () { return options.send(API, "view", 1, { id: ref.id }); }, deadline).then(function (records) {
-      // DSM 7.1 omits data entirely when a task has never run.
-      if (records === undefined) records = [];
-      if (!Array.isArray(records) || records.length > 500) throw fail("root_bad_response");
-      var seen = {};
-      records.forEach(function (record) {
-        if (!record || !validTime(record.start_time) || typeof record.stop_time !== "string"
-            || (record.stop_time && (!validTime(record.stop_time) || record.stop_time < record.start_time))
-            || typeof record.exit_type !== "string" || !(typeof record.exit_code === "number" && isFinite(record.exit_code) && Math.floor(record.exit_code) === record.exit_code)
-            || seen[record.start_time]) throw fail("root_bad_response");
-        seen[record.start_time] = true;
+    }).catch(function (e) { return {state: ["102","103","104","dsm_102","dsm_103","dsm_104"].indexOf(String(e && e.code)) >= 0 ? "unsupported" : "blocked", reason: reason(e)}; });
+  }
+  function read() {
+    try { admin(); } catch (e) { return Promise.resolve({state: "blocked", reason: reason(e), tasks: {}}); }
+    return Promise.all(options.tasks.map(find)).then(function (found) {
+      var result = {state: "ready", tasks: {}};
+      options.tasks.forEach(function (t, i) {
+        result.tasks[t.kind] = found[i];
+        if (found[i].state === "blocked" || (found[i].state !== "ready" && result.state === "ready")) { result.state = found[i].state; result.reason = found[i].reason; }
       });
-      return records;
+      return result;
     });
   }
-  function waitForLegacyRun(ref, before, deadline, polls) {
-    return legacyHistory(ref, deadline).then(function (records) {
-      var previous = before.map(function (record) { return record.start_time; });
-      var newestBefore = previous.slice().sort().pop();
-      var fresh = records.filter(function (record) { return previous.indexOf(record.start_time) === -1; });
-      if (fresh.length > 1) throw fail("root_bad_response");
-      var latest = fresh[0];
-      if (latest && (!newestBefore || latest.start_time > newestBefore) && latest.stop_time) {
-        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);
+  function definition(task) { return task.kind === "boot" ? (${bootDefinition.toString()})(task) : (${controlDefinition.toString()})(task); }
+  function approve(password) {
+    return read().then(function (before) {
+      if (before.state === "blocked" || before.state === "unsupported") return before;
+      if (before.state === "ready") return start(before);
+      return options.confirmPassword(password).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 = {};
+        // 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();
+        options.tasks.forEach(function (task) {
+          chain = chain.then(function () {
+            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);
+              });
+            }).catch(function (e) { errors[task.kind] = reason(e); });
+          });
+        });
+        return chain.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]; }
+          });
+          return after.state === "ready" ? start(after) : after;
+        });
       });
     });
   }
-  function execute(task, verified) {
-    if (!legacy) {
-      return history(verified.ref).then(function (before) {
-        return runTask(verified.ref).then(function () { return waitForRun(verified.ref, before, POLLS); });
-      });
-    }
-    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);
-      });
-    }).then(function () {
-      return bounded(function () { return find(task); }, deadline).then(function (after) {
-        if (after.state !== "ready" || String(after.ref.id) !== String(verified.ref.id)) throw fail("root_verify_failed");
-      });
+  function health(verified, attempts) {
+    if (verified.state !== "ready") return Promise.resolve(verified);
+    return options.call("executor.status", {}).then(function (status) {
+      if (!status || status.ready !== true || !options.pins || status.executor_digest !== options.pins.executorDigest || status.policy_digest !== options.pins.policyDigest) throw fail("executor_status_mismatch");
+      verified.executor = status; return verified;
+    }).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;
     });
   }
-  function performRun(op) {
-    return begin(op).then(function (task) {
-      return find(task).then(function (found) {
-        if (found.state !== "ready") throw fail("root_not_ready");
-        var consent = op === "helper_repair" ? options.confirmPassword() : Promise.resolve({ confirmed: true });
-        return consent.then(function (confirmation) {
-          if (!confirmation || confirmation.confirmed !== true) throw fail("root_cancelled");
-          return op === "helper_repair" ? begin(op).then(find) : found;
-        }).then(function (verified) {
-          if (verified.state !== "ready") throw fail("root_not_ready");
-          return execute(task, verified);
-        });
-      }).then(function () { return readOutput(task); });
-    });
+  function start(verified) {
+    return options.call("executor.control", {action: "start"}).then(function () {
+      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); });
+    }).catch(function (e) { verified.state = "blocked"; verified.reason = reason(e); return verified; });
   }
-
   return {
-    state: function (op) {
-      return begin(op).then(find).then(function (found) { return found.state; });
-    },
-    authorize: function (op) {
-      return begin(op).then(function (task) {
-        return find(task).then(function (found) {
-          if (found.state === "ready") return "ready";
-          if (found.state === "conflict") throw fail("root_conflict");
-          return options.confirmPassword().then(function (confirmation) {
-            if (!confirmation || confirmation.confirmed !== true) return "cancelled";
-            if (!legacy && (typeof confirmation.token !== "string" || !confirmation.token)) throw fail("root_verify_failed");
-            var params = definition(task, options.user().name);
-            if (!legacy) params.SynoConfirmPWToken = confirmation.token;
-            // Re-read after the legacy client-side dialog before replacing a task.
-            var checked = legacy ? begin(op).then(find) : Promise.resolve(found);
-            return checked.then(function (current) {
-              if (current.state === "conflict") throw fail("root_conflict");
-              if (current.state === "ready") return;
-              var replaced = current.state === "outdated" ? deleteTask(current.ref) : Promise.resolve();
-              return replaced.then(function () { return createTask(params); });
-            }).then(function () {
-              return find(task);
-            }).then(function (after) {
-              if (after.state !== "ready") throw fail("root_verify_failed");
-              return "ready";
-            });
-          });
-        });
-      });
+    status: function () { return read().then(function (verified) { return health(verified, 1); }); },
+    authorize: function (password) {
+      if (!busy) busy = approve(password).catch(function (e) { return {state: "blocked", reason: reason(e), tasks: {}}; }).then(function (r) { busy = null; return r; });
+      return busy;
     },
-    run: function (op) {
-      if (!Object.prototype.hasOwnProperty.call(byOp, op)) return Promise.reject(fail("root_unknown_op"));
-      if (options.user().admin !== true) return Promise.reject(fail("admin_required"));
-      if (running[op]) return running[op];
-      var pending = performRun(op).then(function (value) {
-        delete running[op];
-        return value;
-      }, function (error) { delete running[op]; throw error; });
-      running[op] = pending;
-      return pending;
-    },
-    remove: function (op) {
-      return begin(op).then(function (task) {
-        return find(task).then(function (found) {
-          if (found.state === "missing") return "missing";
-          if (found.state === "conflict") throw fail("root_conflict");
-          return deleteTask(found.ref).then(function () {
-            return find(task);
-          }).then(function (after) {
-            if (after.state !== "missing") throw fail("root_verify_failed");
-            return "missing";
-          });
-        });
+    control: function (action) {
+      if (["start", "stop", "purge"].indexOf(action) < 0) return Promise.reject(fail("executor_control_invalid"));
+      return read().then(function (verified) {
+        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; });
       });
-    },
-    output: function (op) {
-      return begin(op).then(readOutput);
     }
   };
 }`;
-/**
- * The authorization panel the window shows above the app for each root
- * operation, identical in every package. `rootPanelView(model)` decides what
- * it shows; `mountRootPanel(host, access, i18n, tasks, admin)` draws it with
- * DOM text nodes only (no HTML from data).
- */
-export const ROOT_PANEL = `function rootPanelShowsResult(state) {
-  return state === "ready" || state === "outdated";
-}
-
-function rootPanelView(model) {
-  if (!model.admin) return { status: null, buttons: [], message: { key: "admin_only" } };
-  function buttons(actions) {
-    return actions.map(function (action) { return { action: action, disabled: model.busy === true }; });
-  }
-  if (model.error) {
-    return {
-      status: "state." + model.state, buttons: buttons(["retry"]),
-      message: { key: "error." + model.error, params: { name: model.name, code: model.error } }
-    };
-  }
-  var message = model.notice ? { key: model.notice } : null;
-  switch (model.state) {
-    case "missing":
-      return { status: "state.missing", buttons: buttons(["authorize"]), message: message };
-    case "outdated":
-      return { status: "state.outdated", buttons: buttons(["authorize", "remove"]), message: message };
-    case "ready":
-      return { status: "state.ready", buttons: buttons(["run", "remove"]), message: message };
-    case "conflict":
-      return { status: "state.conflict", buttons: buttons(["retry"]), message: { key: "error.root_conflict", params: { name: model.name } } };
-    default:
-      return { status: "state.checking", buttons: [], message: null };
-  }
-}
-
-function mountRootPanel(host, access, i18n, tasks, admin) {
-  var t = i18n.t;
-  function el(tag, className, text) {
-    var node = document.createElement(tag);
-    if (className) node.className = className;
-    if (text !== undefined) node.textContent = text;
-    return node;
-  }
-  function say(message) {
-    if (!message) return "";
-    var text = t(message.key, message.params);
-    return text === message.key && message.key.indexOf("error.") === 0 ? t("error.default", message.params) : text;
-  }
-  tasks.forEach(function (task) {
-    var model = { admin: admin, name: task.name, state: "checking", busy: false, error: null, notice: null };
-    var result = null;
-    var section = el("section", "dsmapp-rootpanel");
-    host.appendChild(section);
-
-    function render() {
-      var view = rootPanelView(model);
-      while (section.firstChild) section.removeChild(section.firstChild);
-      section.appendChild(el("h2", null, t("title")));
-      section.appendChild(el("p", null, t("intro", { op: task.op })));
-      if (view.status) {
-        var facts = el("dl");
-        facts.appendChild(el("dt", null, t("status")));
-        facts.appendChild(el("dd", "dsmapp-rootpanel-state", t(view.status, { name: task.name })));
-        facts.appendChild(el("dt", null, t("last_run")));
-        facts.appendChild(el("dd", null, result && result.modified
-          ? new Date(result.modified * 1000).toLocaleString(i18n.locale) : t("never")));
-        section.appendChild(facts);
-      }
-      if (view.message) section.appendChild(el("p", "dsmapp-rootpanel-message", say(view.message)));
-      if (result && typeof result.output === "string") {
-        section.appendChild(el("div", "dsmapp-rootpanel-label", t("output")));
-        section.appendChild(el("pre", "dsmapp-rootpanel-output", result.output));
-      }
-      var actions = el("div", "dsmapp-rootpanel-actions");
-      view.buttons.forEach(function (button) {
-        var node = el("button", button.action === "remove" ? null : "dsmapp-rootpanel-primary", t(button.action));
-        node.type = "button";
-        node.disabled = button.disabled;
-        node.onclick = function () { act(button.action); };
-        actions.appendChild(node);
-      });
-      section.appendChild(actions);
-      if (admin && rootPanelShowsResult(model.state)) section.appendChild(el("p", "dsmapp-rootpanel-hint", t("uninstall_hint")));
-    }
-    function settle(promise, notice) {
-      model.busy = true;
-      model.error = null;
-      model.notice = null;
-      render();
-      return promise.then(function (value) {
-        model.notice = typeof notice === "function" ? notice(value) : notice;
-      }, function (error) {
-        if (error && error.code === "root_cancelled") model.notice = "cancelled";
-        else model.error = (error && error.code) || "unknown";
-      }).then(function () {
-        model.busy = false;
-        render();
-      });
-    }
-    function refresh(notice) {
-      return settle(access.state(task.op).then(function (state) {
-        model.state = state;
-        if (!rootPanelShowsResult(state)) return;
-        return access.output(task.op).then(function (out) { result = out; });
-      }), notice);
-    }
-    function refreshAfterChange() {
-      return model.error ? null : refresh(model.notice);
-    }
-    function act(action) {
-      if (action === "retry") return refresh(null);
-      if (action === "authorize") {
-        return settle(access.authorize(task.op), function (outcome) {
-          return outcome === "cancelled" ? "cancelled" : null;
-        }).then(refreshAfterChange);
-      }
-      if (action === "run") {
-        return settle(access.run(task.op).then(function (out) { result = out; }), "completed");
-      }
-      if (action === "remove") {
-        return settle(access.remove(task.op).then(function () { result = null; }), null).then(refreshAfterChange);
-      }
-    }
-    render();
-    if (admin) refresh(null);
-  });
+export const ROOT_PANEL = `function mountRootPanel(host, access, i18n, tasks, admin) {
+  if (!admin) return;
+  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 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; }); }
+  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; }); });
 }`;

package/dist/standalone/spk.d.ts

@@ -1,7 +1,6 @@
 import { type NativeArchFamily } from "../build-spk/dsm-arch.js";
 import type { StandaloneManifest } from "./manifest.js";
-import type { HelperArtifact } from "./helper.js";
-import { type AuthorizationArtifact } from "./authorization.js";
+import { type ExecutorArtifact } from "../runtime/executor-build.js";
 export declare const LIFECYCLE_SCRIPTS: readonly ["preinst", "postinst", "preuninst", "postuninst", "preupgrade", "postupgrade", "start-stop-status"];
 export declare class StandaloneBuildError extends Error {
     readonly code: string;
@@ -13,8 +12,7 @@ export interface AssembleOptions {
     /** The compiled or prebuilt CGI executable, already checked. */
     cgiPath: string;
     outputPath: string;
-    helper?: HelperArtifact;
-    authorization?: AuthorizationArtifact;
+    executor?: ExecutorArtifact;
     daemonControl?: string;
     /** The compiled background worker, required exactly when the manifest declares background. */
     backgroundWorker?: string;
@@ -22,6 +20,6 @@ export interface AssembleOptions {
 /**
  * Packs an unsigned Standalone Package SPK. DSM runs installation/lifecycle
  * as the package account, including an optional foreground daemon. Root
- * integration remains separate and requires explicit administrator approval.
+ * authorization remains separate and requires explicit administrator approval.
  */
 export declare function assembleStandaloneSpk(options: AssembleOptions): Promise<void>;