@synopackageland/cli 0.7.0 → 0.7.2

package/dist/standalone/manifest.js

@@ -4,7 +4,7 @@ import { existsSync, readFileSync } from "node:fs";
 import { isAbsolute, join, relative, resolve } from "node:path";
 import { parse } from "yaml";
 import { isNativeArchFamily } from "../build-spk/dsm-arch.js";
-import { checkGlossary, isLocale, loadCatalogs } from "./i18n.js";
+import { checkGlossary, loadCatalogs, readInfoTranslations } from "./i18n.js";
 import { loadRootOps, ROOT_OPS_DIR } from "./root-ops.js";
 import { readDaemon } from "./daemon.js";
 import { readBackground } from "./background.js";
@@ -12,6 +12,7 @@ import { DEFAULT_MIN_DSM, isDsmAtLeast, PORTAL_MIN_DSM, portalMinDsmMessage } fr
 import { readSharedFolder } from "./shared-folder.js";
 import { floorAtAdministrators, permitsOrdinaryUsers, readApiPermissions } from "./api-permissions.js";
 import { readPortalDeclaration } from "../portal/alias.js";
+import { renderPackageIcons } from "../build-spk/dsm-icons.js";
 /**
  * `dsm-package.yaml`: a Standalone Package, i.e. an unsigned native SPK that
  * runs as its own DSM package account with a CGI backend and a DSM window UI.
@@ -19,10 +20,9 @@ import { readPortalDeclaration } from "../portal/alias.js";
 export const STANDALONE_MANIFEST = "dsm-package.yaml";
 export const KNOWN_FIELDS = new Set([
     "schema", "package", "version", "build", "displayname", "description",
-    "metadata", "maintainer", "os_min_ver", "arches", "backend", "ui", "capabilities", "i18n", "daemon", "install", "entry", "portal",
+    "metadata", "maintainer", "os_min_ver", "arches", "backend", "ui", "capabilities", "i18n", "daemon", "install", "entry", "portal", "icon",
 ]);
 const I18N_FIELDS = new Set(["messages", "glossary", "info"]);
-const INFO_TEXT_FIELDS = new Set(["displayname", "description"]);
 const PACKAGE_ID = /^[A-Za-z][A-Za-z0-9]{1,63}$/;
 const VERSION = /^\d+(\.\d+){0,3}$/;
 const OS_MIN_VER = /^\d+\.\d+(\.\d+)?-\d+$/;
@@ -154,6 +154,7 @@ function readManifest(raw, c) {
     if (capabilities.delegate?.scope === "install-selected" && ui && !ui.build)
         c.fail("CAPABILITY_COMBINATION_INVALID", "delegate scope install-selected 只能在 Vue 面板確認；plain UI 不支援，請改用 vue UI（init --ui vue）。");
     const i18n = raw.i18n === undefined ? undefined : readI18n(raw.i18n, c);
+    const icon = raw.icon === undefined ? undefined : readIcon(raw.icon, c);
     const portal = raw.portal === undefined || !packageId ? undefined : readPortalDeclaration(raw.portal, packageId)
         ?? c.fail("STANDALONE_PORTAL_INVALID", "portal 必須是 {} 或 { alias: <小寫英數與 -，1–64 字，不可為 DSM 保留路徑> }。");
     if (portal && osMinVer && !isDsmAtLeast(osMinVer, PORTAL_MIN_DSM)) {
@@ -185,8 +186,21 @@ function readManifest(raw, c) {
         ...(sharedFolder ? { sharedFolder } : {}),
         ...(entry ? { entry } : {}),
         ...(portal ? { portal } : {}),
+        ...(icon ? { icon } : {}),
     };
 }
+function readIcon(value, c) {
+    const path = c.path(value, "icon");
+    if (!path)
+        return undefined;
+    try {
+        renderPackageIcons(path);
+        return path;
+    }
+    catch (error) {
+        return c.fail("STANDALONE_ICON_INVALID", `icon：${error.message}`);
+    }
+}
 /**
  * The CGI enforces the entry mode only when the project's backend carries the
  * SDK gate and main wires it; `-X main.entry` on an older main would be
@@ -282,7 +296,10 @@ function readI18n(value, c) {
     if (!isRecord(value) || Object.keys(value).some((key) => !I18N_FIELDS.has(key))) {
         return invalid("只接受 messages（訊息目錄）、glossary（用語表）與 info（各語言 INFO 文字）。");
     }
-    const info = readInfoText(value.info, c);
+    const info = readInfoTranslations(value.info, {
+        invalid: (why) => c.fail("STANDALONE_I18N_INVALID", `i18n.info ${why}`),
+        text: (text, field) => c.text(text, field),
+    });
     if (value.messages === undefined) {
         return value.glossary === undefined ? info && { info } : invalid("glossary 需要搭配 messages。");
     }
@@ -300,36 +317,6 @@ function readI18n(value, c) {
     drift.forEach((e) => c.fail(e.code, e.message));
     return info && drift.length === 0 ? { catalogs: loaded.catalogs, info } : undefined;
 }
-function readInfoText(value, c) {
-    if (value === undefined) {
-        return {};
-    }
-    const invalid = (why) => c.fail("STANDALONE_I18N_INVALID", `i18n.info ${why}`);
-    if (!isRecord(value)) {
-        return invalid("必須以語言為 key，例如 zh-TW: { displayname, description }。");
-    }
-    const info = {};
-    for (const [locale, text] of Object.entries(value)) {
-        if (!isLocale(locale) || locale === "en") {
-            return invalid(`的「${locale}」不是支援的翻譯語言；英文寫在頂層 displayname / description。`);
-        }
-        if (!isRecord(text) || Object.keys(text).some((key) => !INFO_TEXT_FIELDS.has(key))) {
-            return invalid(`.${locale} 只接受 displayname 與 description。`);
-        }
-        const entry = {};
-        for (const field of INFO_TEXT_FIELDS) {
-            if (text[field] !== undefined) {
-                const checked = c.text(text[field], `i18n.info.${locale}.${field}`);
-                if (!checked) {
-                    return undefined;
-                }
-                entry[field] = checked;
-            }
-        }
-        info[locale] = entry;
-    }
-    return info;
-}
 /**
  * The nearest directory at or above `start` that holds dsm-package.yaml,
  * unless a Managed Profile project (synology-app.yaml) is found first.

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-layout.d.ts

@@ -37,6 +37,8 @@ export interface NativeLayout {
     backend: {
         kind: 'native';
     };
+    /** Project-relative package icon; the CLI then owns PACKAGE_ICON*.PNG, the payload keeps its own window icons. */
+    icon?: string;
     layout: {
         payload: string;
         metadata: string;

package/dist/standalone/native-layout.js

@@ -8,6 +8,7 @@ import { parse } from 'yaml';
 import { createReproducibleTar } from '../build-spk/reproducible-archive.js';
 import { runCommand } from './build.js';
 import { resolveMinDsm } from '../build-spk/dsm-version.js';
+import { renderPackageIcons, writePackageCenterIcons } from '../build-spk/dsm-icons.js';
 export const LAYOUT_ARCHES = { x86_64: [2, 62], aarch64: [2, 183], armv8: [2, 183], armv7: [1, 40] };
 function fail(message) { throw Object.assign(new Error(`NATIVE_LAYOUT_INVALID: ${message}`), { code: 'NATIVE_LAYOUT_INVALID' }); }
 const digest = (bytes) => createHash('sha256').update(bytes).digest('hex');
@@ -61,6 +62,18 @@ function hook(value) {
             fail('invalid hook environment');
     return { command: h.command, cwd: pathText(h.cwd ?? '.'), env };
 }
+function icon(root, value) {
+    const path = pathText(value);
+    if (existsSync(resolve(root, path)))
+        inside(root, path);
+    try {
+        renderPackageIcons(resolve(root, path));
+    }
+    catch (error) {
+        fail(`icon: ${error.message}`);
+    }
+    return path;
+}
 export function isNativeLayout(root) {
     try {
         return (() => { const raw = parse(readFileSync(join(root, 'dsm-package.yaml'), 'utf8')); return raw?.layout !== undefined || raw?.backend?.kind === 'native'; })();
@@ -71,7 +84,7 @@ export function isNativeLayout(root) {
 }
 export function loadNativeLayout(root) {
     try {
-        const m = object(parse(readFileSync(join(root, 'dsm-package.yaml'), 'utf8')), ['schema', 'backend', 'package', 'version', 'build', 'displayname', 'description', 'maintainer', 'metadata', 'os_min_ver', 'privilege', 'arches', 'layout', 'native']);
+        const m = object(parse(readFileSync(join(root, 'dsm-package.yaml'), 'utf8')), ['schema', 'backend', 'package', 'version', 'build', 'displayname', 'description', 'maintainer', 'metadata', 'os_min_ver', 'privilege', 'arches', 'layout', 'native', 'icon']);
         if (m.schema !== 2)
             fail('schema 2 required; migrate schema: 1 to schema: 2 and add backend: {kind: native}');
         const backend = object(m.backend, ['kind']);
@@ -90,6 +103,8 @@ export function loadNativeLayout(root) {
             text(m[k]);
         if (!Array.isArray(m.arches) || !m.arches.length || new Set(m.arches).size !== m.arches.length || m.arches.some((a) => !Object.hasOwn(LAYOUT_ARCHES, a)))
             fail('invalid architecture list');
+        if (m.icon !== undefined)
+            m.icon = icon(root, m.icon);
         const layout = object(m.layout, ['payload', 'metadata', 'binaries', 'anchors']);
         layout.payload = pathText(layout.payload);
         layout.metadata = pathText(layout.metadata);
@@ -291,6 +306,7 @@ export async function buildNativeLayout(options) {
     const arches = options.arches ?? m.arches;
     if (!arches.length || new Set(arches).size !== arches.length || arches.some(a => !m.arches.includes(a)))
         fail('architecture not declared');
+    const icons = m.icon === undefined ? undefined : renderPackageIcons(inside(m.root, m.icon));
     const run = options.run ?? runCommand;
     const version = `${m.version}-${String(m.build).padStart(4, '0')}`;
     const env = { SYNOPKGLAND_PACKAGE: m.package, SYNOPKGLAND_VERSION: m.version, SYNOPKGLAND_BUILD: String(m.build), SYNOPKGLAND_SPK_VERSION: version, SYNOPKGLAND_PROJECT_DIR: m.root };
@@ -313,6 +329,11 @@ export async function buildNativeLayout(options) {
             for (const b of binaries)
                 checkLayoutBinary(payload, b, arch);
             copyTree(metadata, stage);
+            if (icons) {
+                if (['PACKAGE_ICON.PNG', 'PACKAGE_ICON_256.PNG'].some(name => existsSync(join(metadata, name))))
+                    fail('icon and PACKAGE_ICON files in the layout metadata are mutually exclusive; keep one');
+                writePackageCenterIcons(stage, icons);
+            }
             const target = join(stage, 'payload');
             mkdirSync(target);
             const files = copyTree(payload, target);

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;