@synopackageland/cli 0.9.6 → 0.10.0

package/dist/compose/analyze.js

@@ -320,17 +320,17 @@ function collectPermanentRouteErrors(contract, parsed, composeFile) {
             const basePath = `services.${serviceName}`;
             if ("build" in service && service.build !== undefined) {
                 const path = `${basePath}.build`;
-                errors.push(makeError("COMPOSE_BUILD_FORBIDDEN", composeSpanForPath(compose, composeFile, path), `service「${serviceName}」宣告 build:；D0 route 不支援 install-time build。`, "請移除 build:，改用已存在的 image（最好使用 image@sha256:... 固定 digest），再重新執行 check。"));
+                errors.push(makeError("COMPOSE_BUILD_FORBIDDEN", composeSpanForPath(compose, composeFile, path), `service "${serviceName}" declares build:; the D0 route does not support install-time build.`, "Remove build: and use an existing image (preferably pinned with image@sha256:...), then run check again."));
             }
             if (dsmUserParams.length > 0 && typeof service.user === "string" && service.user.trim() !== "") {
                 const path = `${basePath}.user`;
-                errors.push(makeError("COMPOSE_USER_CONFLICTS_DSM_USER", composeSpanForPath(compose, composeFile, path), `service「${serviceName}」已定義 user:「${service.user.trim()}」，與 contract 宣告的 dsm_user 衝突。`, "請從 Compose 移除 user 欄位，由 generator 依 dsm_user 自動注入 user: \"${NAME_UID}:${NAME_GID}\" 與 group_add。"));
+                errors.push(makeError("COMPOSE_USER_CONFLICTS_DSM_USER", composeSpanForPath(compose, composeFile, path), `service "${serviceName}" defines user: "${service.user.trim()}", which conflicts with the dsm_user declared in the contract.`, "Remove the user field from Compose; the generator injects user: \"${NAME_UID}:${NAME_GID}\" and group_add from dsm_user."));
             }
             errors.push(...validateSocketMounts(compose, service, composeFile, `${basePath}.volumes`));
         }
     }
     for (const finding of scanComposePrivilege(compose)) {
-        errors.push(makeError(finding.code, composeSpanForPath(compose, composeFile, finding.path), `service「${finding.serviceName}」使用 ${finding.flag}；D0 route 永久拒收高權限 capability，即使 contract 已宣告也不會放行。`, "請移除 privileged、host network/PID/IPC、devices 或 cap_add，改用 package-only static-zero-config Compose。"));
+        errors.push(makeError(finding.code, composeSpanForPath(compose, composeFile, finding.path), `service "${finding.serviceName}" uses ${finding.flag}; the D0 route permanently rejects high-privilege capabilities, even when the contract declares them.`, "Remove privileged, host network/PID/IPC, devices or cap_add, and use a package-only static-zero-config Compose."));
     }
     return errors;
 }
@@ -398,13 +398,13 @@ function collectDynamicRouteError(contract, parsed, composeFile) {
         ? unsupportedInterpolation
         : undefined;
     const interpolationSuggestion = undeclaredName
-        ? `請在 synology-app.yaml 的 install 宣告 ${undeclaredName}，type 為 string 或 boolean；或從 Compose 移除該引用。`
-        : "請只使用 ${NAME} 形式，並在 synology-app.yaml 的 install 宣告對應的 string 或 boolean parameter。";
-    return makeError("COMPOSE_DYNAMIC_ROUTE_UNSUPPORTED", composeSpanForPath(compose, composeFile, path), "Compose dynamic route 含有不在 D1/D2 白名單內的輸入（" +
+        ? `Declare ${undeclaredName} in the synology-app.yaml install with type string or boolean, or remove the reference from Compose.`
+        : "Use only the ${NAME} form and declare the matching string or boolean parameter in the synology-app.yaml install.";
+    return makeError("COMPOSE_DYNAMIC_ROUTE_UNSUPPORTED", composeSpanForPath(compose, composeFile, path), "The Compose dynamic route contains an input outside the D1/D2 allowlist (" +
         reasonText +
-        "）；這條 route 會拒收，不會靜默改用其他執行方式。", undeclaredName
+        "); this route is rejected and does not silently fall back to another execution mode.", undeclaredName
         ? interpolationSuggestion
-        : `${interpolationSuggestion} secret/config 因 DSM worker 不讀 docker-compose.override.yml 而拒收，請移除後重新執行 check。`);
+        : `${interpolationSuggestion} secret/config are rejected because the DSM worker does not read docker-compose.override.yml; remove them and run check again.`);
 }
 function parsedComposeForAnalysis(compose) {
     const source = composeSources.get(compose) ?? "";
@@ -563,7 +563,7 @@ export function validateComposeSecurity(compose, composeFile, options) {
         const dependsOn = normalizeDependsOn(service.depends_on);
         for (const dependency of dependsOn) {
             if (!compose.services?.[dependency]) {
-                errors.push(makeError("COMPOSE_SERVICE_NOT_FOUND", composeSpanForPath(compose, composeFile, `${basePath}.depends_on`), `Compose 引用了不存在的 service「${dependency}」。`, "請修正 depends_on，或補上對應的 service 定義。"));
+                errors.push(makeError("COMPOSE_SERVICE_NOT_FOUND", composeSpanForPath(compose, composeFile, `${basePath}.depends_on`), `Compose references a service that does not exist: "${dependency}".`, "Fix depends_on, or add the matching service definition."));
             }
         }
     }
@@ -592,8 +592,8 @@ export function validateComposeNumericCommandArgs(compose, composeFile) {
             if (numericStrings.length === 0) {
                 continue;
             }
-            const quotedValues = numericStrings.map((item) => `「${item}」`).join("、");
-            errors.push(makeError("COMPOSE_NUMERIC_COMMAND_ARG_FORBIDDEN", composeSpanForPath(compose, composeFile, `${basePath}.${field}`), `${field} 陣列含純數字字串 ${quotedValues}。此 Compose 會走 DSM Docker Project resource worker；worker 可能在 YAML round-trip 時移除引號並將它轉成整數，導致 project acquire 失敗。`, `請把整個命令包成單一字串，例如 ${field}: ["sh", "-c", "httpd -f -p 8080 -h /srv"]，或與 flag 併寫成 "-p8080"。`));
+            const quotedValues = numericStrings.map((item) => `"${item}"`).join(", ");
+            errors.push(makeError("COMPOSE_NUMERIC_COMMAND_ARG_FORBIDDEN", composeSpanForPath(compose, composeFile, `${basePath}.${field}`), `The ${field} array contains the pure numeric string ${quotedValues}. This Compose goes through the DSM Docker Project resource worker; the worker may drop the quotes during a YAML round-trip and turn it into an integer, so project acquire fails.`, `Wrap the whole command in one string, for example ${field}: ["sh", "-c", "httpd -f -p 8080 -h /srv"], or join it with the flag as "-p8080".`));
         }
     }
     return errors;
@@ -616,7 +616,7 @@ function validateSocketMounts(compose, service, composeFile, basePath) {
     for (const mount of volumes) {
         const source = mount.split(":")[0]?.trim() ?? "";
         if (isForbiddenSocketMount(source)) {
-            errors.push(makeError("COMPOSE_SOCKET_MOUNT_FORBIDDEN", composeSpanForPath(compose, composeFile, `${basePath}.volumes`), "Managed Profile 不允許掛載 Docker 或 Container Manager socket。", "請移除 docker.sock／container-manager socket 的 volume mount。"));
+            errors.push(makeError("COMPOSE_SOCKET_MOUNT_FORBIDDEN", composeSpanForPath(compose, composeFile, `${basePath}.volumes`), "A Managed Profile does not allow mounting the Docker or Container Manager socket.", "Remove the docker.sock/container-manager socket volume mount."));
         }
     }
     return errors;
@@ -753,29 +753,29 @@ function classifyVolumeSource(compose, mount, namedVolumes, context, composeFile
             return null;
         }
         if (context.installParamNames.has(varName)) {
-            return makeError("COMPOSE_BIND_SOURCE_FORBIDDEN", span, `參數「${varName}」不能作為 host bind source。`, "請改用 ${SYNOPKG_PKGVAR}、${SYNO_APP_SECRETS_DIR}、type 為 shared_folder 的 install 參數，或 type 為 homes 的平台解析槽。");
+            return makeError("COMPOSE_BIND_SOURCE_FORBIDDEN", span, `The parameter "${varName}" cannot be a host bind source.`, "Use ${SYNOPKG_PKGVAR}, ${SYNO_APP_SECRETS_DIR}, an install parameter with type shared_folder, or the platform-resolved type homes slot.");
         }
-        return makeError("COMPOSE_BIND_SOURCE_UNDECLARED", span, `volume source 引用了未宣告的參數「${varName}」。`, `請在 synology-app.yaml 的 install 宣告 ${varName}，且 type 為 shared_folder 或 homes。`);
+        return makeError("COMPOSE_BIND_SOURCE_UNDECLARED", span, `The volume source references an undeclared parameter "${varName}".`, `Declare ${varName} in the synology-app.yaml install with type shared_folder or homes.`);
     }
     if (isProjectRelativePath(source, projectRoot)) {
         return null;
     }
     if (isLiteralHostPath(source)) {
-        return makeError("COMPOSE_HOST_BIND_FORBIDDEN", span, "禁止將 /volume*、絕對路徑或開發者機器路徑寫成 Compose volume source。", "請改用 install 參數 type: shared_folder 或 homes，並以 ${參數名} 作為 bind source。");
+        return makeError("COMPOSE_HOST_BIND_FORBIDDEN", span, "Writing /volume*, an absolute path or a developer machine path as a Compose volume source is forbidden.", "Use an install parameter with type: shared_folder or homes and take ${PARAM} as the bind source.");
     }
     if (mount.type === "tmpfs") {
         return null;
     }
     if (mount.type === "bind") {
-        return makeError("COMPOSE_BIND_SOURCE_FORBIDDEN", span, "禁止使用 type: bind 掛載非平台允許的 host source。", "請改用 ${SYNOPKG_PKGVAR}、${SYNO_APP_SECRETS_DIR} 或契約中的 ${shared_folder 參數}。");
+        return makeError("COMPOSE_BIND_SOURCE_FORBIDDEN", span, "Mounting a host source the platform does not allow with type: bind is forbidden.", "Use ${SYNOPKG_PKGVAR}, ${SYNO_APP_SECRETS_DIR} or a ${shared_folder parameter} from the contract.");
     }
     if (!namedVolumes.has(source)) {
-        return makeError("COMPOSE_NAMED_VOLUME_UNDECLARED", span, `短語法 named volume「${source}」未在頂層 volumes 宣告，無法判斷它是 Docker volume 還是 Share 名。`, `請在頂層 volumes 宣告 ${source}，或改用 \${參數名} 作為 shared_folder bind source。`);
+        return makeError("COMPOSE_NAMED_VOLUME_UNDECLARED", span, `The short-syntax named volume "${source}" is not declared in the top-level volumes, so it is unclear whether it is a Docker volume or a Share name.`, `Declare ${source} in the top-level volumes, or use \${PARAM} as the shared_folder bind source.`);
     }
     return null;
 }
 function invalidBindSuffix(span) {
-    return makeError("COMPOSE_BIND_SUFFIX_INVALID", span, "volume source 的路徑後綴不合法。", "後綴只能是 / 加上一段或多段 [A-Za-z0-9._-]，不可含 ..、${ 或絕對路徑。");
+    return makeError("COMPOSE_BIND_SUFFIX_INVALID", span, "The path suffix of the volume source is invalid.", "The suffix can only be / followed by one or more [A-Za-z0-9._-] segments, and must not contain .., ${ or an absolute path.");
 }
 function isValidatedBindSuffix(suffix) {
     if (suffix === "") {
@@ -853,18 +853,18 @@ export function validateComposeRunAs(compose, composeFile, context) {
         const user = raw.trim();
         const span = composeSpanForPath(compose, composeFile, `services.${serviceName}.user`);
         if (context.hasDsmUser) {
-            errors.push(makeError("COMPOSE_USER_CONFLICTS_DSM_USER", span, `service「${serviceName}」已定義 user:「${user}」，與 contract 宣告的 dsm_user 衝突。`, "請從 Compose 移除 user 欄位，由 generator 依 dsm_user 自動注入 user: \"${NAME_UID}:${NAME_GID}\" 與 group_add。"));
+            errors.push(makeError("COMPOSE_USER_CONFLICTS_DSM_USER", span, `service "${serviceName}" defines user: "${user}", which conflicts with the dsm_user declared in the contract.`, "Remove the user field from Compose; the generator injects user: \"${NAME_UID}:${NAME_GID}\" and group_add from dsm_user."));
             continue;
         }
         if (user.includes("${")) {
             continue;
         }
         if (context.hasSharedFolder && ROOT_USERS.has(user)) {
-            errors.push(makeError("COMPOSE_USER_ROOT_FORBIDDEN", span, "有 Shared Folder 時容器不可用 uid 0／root 寫入 Share。", "請宣告 dsm_user，並以 ${NAME_UID}:${NAME_GID} 當 Compose user。", "warning"));
+            errors.push(makeError("COMPOSE_USER_ROOT_FORBIDDEN", span, "With a Shared Folder, a container must not write to the Share as uid 0/root.", "Declare dsm_user and use ${NAME_UID}:${NAME_GID} as the Compose user.", "warning"));
             continue;
         }
         if (NUMERIC_USER.test(user)) {
-            errors.push(makeError("COMPOSE_USER_NUMERIC_FORBIDDEN", span, "契約不准寫死數字 uid。", "請改用 install dsm_user 參數的 ${NAME_UID}:${NAME_GID}。"));
+            errors.push(makeError("COMPOSE_USER_NUMERIC_FORBIDDEN", span, "The contract forbids hard-coded numeric uids.", "Use ${NAME_UID}:${NAME_GID} from the install dsm_user parameter."));
         }
     }
     return errors;
@@ -873,14 +873,14 @@ export function validateComposeRunAs(compose, composeFile, context) {
 export function validateGatewayPortLoopback(adminport, compose, composeFile) {
     return listPortExposures(compose)
         .filter((exposure) => exposure.hostPort === adminport && !exposure.loopbackOnly)
-        .map((exposure) => makeError("COMPOSE_GATEWAY_PORT_EXPOSED", composeSpanForPath(compose, composeFile, `services.${exposure.service}.ports`), `${exposure.service} 的 port ${exposure.entry} 綁在所有網路介面上，不經 DSM 驗證就能直接連到容器。`, `請改成只綁 loopback：\"127.0.0.1:${adminport}:${exposure.containerPort ?? adminport}\"，或在 synology-app.yaml 的 integration.web.access 明確選 public。`));
+        .map((exposure) => makeError("COMPOSE_GATEWAY_PORT_EXPOSED", composeSpanForPath(compose, composeFile, `services.${exposure.service}.ports`), `The port ${exposure.entry} of ${exposure.service} binds to every network interface, so the container is reachable without DSM verification.`, `Bind it to loopback only: \"127.0.0.1:${adminport}:${exposure.containerPort ?? adminport}\", or choose public explicitly in integration.web.access in synology-app.yaml.`));
 }
 export function validateAdminPortMapping(adminport, compose, composeFile) {
     const published = collectPublishedTcpPorts(compose);
     const services = published.get(adminport) ?? [];
     if (services.length !== 1) {
         return [
-            makeError("CONTRACT_ADMINPORT_UNMAPPED", composeSpanForPath(compose, composeFile, `adminport:${adminport}`), `adminport ${adminport} 必須對應 Compose 中恰好一個 published TCP port。`, "請在 compose.yaml 發佈與 adminport 相同的 host port，並確認只有一個 service 使用它。"),
+            makeError("CONTRACT_ADMINPORT_UNMAPPED", composeSpanForPath(compose, composeFile, `adminport:${adminport}`), `adminport ${adminport} must map to exactly one published TCP port in Compose.`, "Publish the same host port as adminport in compose.yaml and make sure only one service uses it."),
         ];
     }
     return [];

package/dist/compose/privilege.js

@@ -9,33 +9,33 @@ export const PRIVILEGE_FLAGS = [
 const FLAG_ERRORS = {
     privileged: {
         code: "COMPOSE_PRIVILEGED_FORBIDDEN",
-        message: "Compose 使用 privileged 容器，契約未宣告 privilege.privileged。",
-        suggestion: "請在 synology-app.yaml 加上 privilege.privileged: true，或移除 privileged: true。",
+        message: "Compose uses a privileged container but the contract does not declare privilege.privileged.",
+        suggestion: "Add privilege.privileged: true to synology-app.yaml, or remove privileged: true.",
     },
     host_network: {
         code: "COMPOSE_HOST_NETWORK_FORBIDDEN",
-        message: "Compose 使用 host network，契約未宣告 privilege.host_network。",
-        suggestion: "請在 synology-app.yaml 加上 privilege.host_network: true，或改用受控網路模式。",
+        message: "Compose uses host network but the contract does not declare privilege.host_network.",
+        suggestion: "Add privilege.host_network: true to synology-app.yaml, or use a controlled network mode.",
     },
     host_pid: {
         code: "COMPOSE_HOST_PID_FORBIDDEN",
-        message: "Compose 使用 host PID，契約未宣告 privilege.host_pid。",
-        suggestion: "請在 synology-app.yaml 加上 privilege.host_pid: true，或移除 pid: host。",
+        message: "Compose uses host PID but the contract does not declare privilege.host_pid.",
+        suggestion: "Add privilege.host_pid: true to synology-app.yaml, or remove pid: host.",
     },
     host_ipc: {
         code: "COMPOSE_HOST_IPC_FORBIDDEN",
-        message: "Compose 使用 host IPC，契約未宣告 privilege.host_ipc。",
-        suggestion: "請在 synology-app.yaml 加上 privilege.host_ipc: true，或移除 ipc: host。",
+        message: "Compose uses host IPC but the contract does not declare privilege.host_ipc.",
+        suggestion: "Add privilege.host_ipc: true to synology-app.yaml, or remove ipc: host.",
     },
     devices: {
         code: "COMPOSE_DEVICES_FORBIDDEN",
-        message: "Compose 掛載 devices，契約未宣告 privilege.devices。",
-        suggestion: "請在 synology-app.yaml 加上 privilege.devices: true，或移除 devices。",
+        message: "Compose mounts devices but the contract does not declare privilege.devices.",
+        suggestion: "Add privilege.devices: true to synology-app.yaml, or remove devices.",
     },
     cap_add: {
         code: "COMPOSE_CAP_ADD_FORBIDDEN",
-        message: "Compose 使用額外 cap_add，契約未宣告 privilege.cap_add。",
-        suggestion: "請在 synology-app.yaml 加上 privilege.cap_add: true，或移除 cap_add。",
+        message: "Compose uses extra cap_add but the contract does not declare privilege.cap_add.",
+        suggestion: "Add privilege.cap_add: true to synology-app.yaml, or remove cap_add.",
     },
 };
 export function declaredPrivilegeFlags(contract) {

package/dist/contract/i18n.js

@@ -28,12 +28,12 @@ export function validateContractI18n(parsed, contractFile) {
     const errors = [];
     const invalid = (why) => {
         const pos = getValuePosition(doc, ["i18n"]) ?? { line: 1, column: 1 };
-        errors.push(makeError("CONTRACT_I18N_INVALID", contractSpan(contractFile, pos.line, pos.column, "i18n"), `i18n ${why}`, "i18n 只接受 info；info 以 zh-TW、ja 等支援語言為 key，值為單行、不含 \" 或 \\ 的 displayname / description（英文寫在頂層）。"));
+        errors.push(makeError("CONTRACT_I18N_INVALID", contractSpan(contractFile, pos.line, pos.column, "i18n"), `i18n ${why}`, "i18n accepts only info; info is keyed by a supported language such as zh-TW or ja with single-line displayname / description values without \" or \\ (English goes at the top level)."));
         return undefined;
     };
-    const text = (value, field) => plain(value) ? value : invalid(`${field} 必須是單行、非空且不含 " 或 \\ 的文字。`);
+    const text = (value, field) => plain(value) ? value : invalid(`${field} must be single-line, non-empty text without " or \\.`);
     if (!isRecord(contract.i18n) || Object.keys(contract.i18n).some((key) => key !== "info")) {
-        return invalid("只接受 info（各語言的 displayname 與 description）。") ?? errors;
+        return invalid("Only info is accepted (per-language displayname and description).") ?? errors;
     }
     const info = readInfoTranslations(contract.i18n.info, { invalid: (why) => invalid(`.info ${why}`), text });
     if (info && Object.keys(info).length > 0) {

package/dist/contract/icon.js

@@ -11,11 +11,11 @@ export function validateContractIcon(parsed, contractFile) {
     if (contract.icon === undefined || !contractPath)
         return [];
     const pos = getValuePosition(doc, ["icon"]) ?? { line: 1, column: 1 };
-    const invalid = (message) => [makeError("CONTRACT_ICON_INVALID", contractSpan(contractFile, pos.line, pos.column, "icon"), `icon：${message}`, "icon 填專案內的正方形 PNG（至少 256×256），或含 icon_256.png 的 icon_<size>.png 目錄；省略則使用 SDK 預設圖示。")];
+    const invalid = (message) => [makeError("CONTRACT_ICON_INVALID", contractSpan(contractFile, pos.line, pos.column, "icon"), `icon: ${message}`, "Set icon to a square PNG inside the project (at least 256x256), or a directory of icon_<size>.png including icon_256.png; omit it to use the SDK default icon.")];
     const root = dirname(contractPath);
     const rel = typeof contract.icon === "string" && contract.icon.trim() !== "" ? relative(root, resolve(root, contract.icon)) : undefined;
     if (rel === undefined || isAbsolute(String(contract.icon)) || rel.startsWith("..") || isAbsolute(rel)) {
-        return invalid(`「${String(contract.icon)}」必須是位於專案目錄內的相對路徑。`);
+        return invalid(`"${String(contract.icon)}" must be a relative path inside the project directory.`);
     }
     try {
         renderPackageIcons(resolve(root, rel));

package/dist/contract/posix-all-shares.js

@@ -39,12 +39,12 @@ export function validatePosixAllSharesSources(compose, composeFile, declaredPara
             const path = `services.${serviceName}.volumes.${index}`;
             if (declaredParameters.has(name)) {
                 if (suffix !== "") {
-                    errors.push(makeError("COMPOSE_POSIX_ALL_SHARES_SUFFIX_FORBIDDEN", composeSpan(composeFile, 1, 1, path), `POSIX all-shares 參數「${name}」只能作為完整 volume source，不能附加子路徑。`, `請將 ${source} 改成 \${${name}}，並保留 Compose 的 container target；Share 名稱由 package-only preinst 在安裝時展開。`));
+                    errors.push(makeError("COMPOSE_POSIX_ALL_SHARES_SUFFIX_FORBIDDEN", composeSpan(composeFile, 1, 1, path), `The POSIX all-shares parameter "${name}" can only be the complete volume source, with no subpath.`, `Change ${source} to \${${name}} and keep the Compose container target; the package-only preinst expands the Share names at install time.`));
                 }
                 continue;
             }
             if (RESERVED_MARKER_NAMES.has(name)) {
-                errors.push(makeError("COMPOSE_POSIX_ALL_SHARES_UNDECLARED", composeSpan(composeFile, 1, 1, path), `Compose 使用了未宣告的 POSIX all-shares marker「${name}」。`, `請在 synology-app.yaml 宣告 install.${name}.type: ${POSIX_ALL_SHARES_TYPE}，並讓 wizard／CLI 取得安裝當下的 Share 清單。`));
+                errors.push(makeError("COMPOSE_POSIX_ALL_SHARES_UNDECLARED", composeSpan(composeFile, 1, 1, path), `Compose uses an undeclared POSIX all-shares marker "${name}".`, `Declare install.${name}.type: ${POSIX_ALL_SHARES_TYPE} in synology-app.yaml and let the wizard/CLI take the Share list at install time.`));
             }
         }
     }

package/dist/contract/schema-validate.js

@@ -20,14 +20,14 @@ function mapSchemaError(error, contractFile, parsed) {
     const path = error.instancePath.replace(/^\//, "").replace(/\//g, ".") || "schema";
     const pos = getValuePosition(parsed.doc, path.split(".").filter(Boolean)) ?? { line: 1, column: 1 };
     if (error.keyword === "const" && path === "schema") {
-        return makeError("CONTRACT_SCHEMA_UNSUPPORTED", contractSpan(contractFile, pos.line, pos.column, "schema"), "不支援的 App Contract schema 版本。", "請將 schema 設為整數 1。");
+        return makeError("CONTRACT_SCHEMA_UNSUPPORTED", contractSpan(contractFile, pos.line, pos.column, "schema"), "Unsupported App Contract schema version.", "Set schema to the integer 1.");
     }
     if (error.keyword === "required") {
         const missing = String(error.params.missingProperty);
         const missingPos = getValuePosition(parsed.doc, [missing]) ?? { line: 1, column: 1 };
-        return makeError("CONTRACT_MISSING_FIELD", contractSpan(contractFile, missingPos.line, missingPos.column, missing), `缺少必填欄位「${missing}」。`, `請在 synology-app.yaml 補上 ${missing}。`);
+        return makeError("CONTRACT_MISSING_FIELD", contractSpan(contractFile, missingPos.line, missingPos.column, missing), `Missing required field "${missing}".`, `Add ${missing} to synology-app.yaml.`);
     }
-    return makeError("CONTRACT_SCHEMA_INVALID", contractSpan(contractFile, pos.line, pos.column, path), `App Contract 不符合 JSON Schema：${error.message ?? error.keyword}。`, "請修正 synology-app.yaml 的欄位格式。");
+    return makeError("CONTRACT_SCHEMA_INVALID", contractSpan(contractFile, pos.line, pos.column, path), `App Contract does not match the JSON Schema: ${error.message ?? error.keyword}.`, "Fix the field formats in synology-app.yaml.");
 }
 export function validateContractSchema(parsed, contractFile) {
     const validate = getValidator();

package/dist/contract/validate.js

@@ -37,18 +37,18 @@ export function validateContract(parsed, contractFile) {
     // does not.
     if (typeof contract.package === "string" && contract.package.length > DSM_PACKAGE_IDENTITY_MAX) {
         const pos = getValuePosition(doc, ["package"]) ?? { line: 1, column: 1 };
-        errors.push(makeError("CONTRACT_PACKAGE_TOO_LONG", contractSpan(contractFile, pos.line, pos.column, "package"), `Package Identity 超過 DSM 上限 ${DSM_PACKAGE_IDENTITY_MAX} 字元（目前 ${contract.package.length}）。`, "請縮短 package，否則 Package Center 會以「Invalid file format」拒絕安裝。"));
+        errors.push(makeError("CONTRACT_PACKAGE_TOO_LONG", contractSpan(contractFile, pos.line, pos.column, "package"), `The Package Identity exceeds the DSM limit of ${DSM_PACKAGE_IDENTITY_MAX} characters (currently ${contract.package.length}).`, "Shorten package, or Package Center rejects the install with \"Invalid file format\"."));
     }
     // Formal Package Identity length limit (28 characters to reserve 4 characters for .dev suffix)
     if (typeof contract.package === "string" &&
         contract.package.length > FORMAL_PACKAGE_IDENTITY_MAX_LENGTH) {
         const pos = getValuePosition(doc, ["package"]) ?? { line: 1, column: 1 };
-        errors.push(makeError("PACKAGE_IDENTITY_TOO_LONG", contractSpan(contractFile, pos.line, pos.column, "package"), `Package Identity 長度 ${contract.package.length} 超過正式身分上限 ${FORMAL_PACKAGE_IDENTITY_MAX_LENGTH} 字元（DSM 32 字元上限，.dev 需保留 4 字元）。`, `請將 package 縮短至 ${FORMAL_PACKAGE_IDENTITY_MAX_LENGTH} 字元以內，以利 --dev 部署（上限 ${PACKAGE_IDENTITY_MAX_LENGTH} 字元）。`));
+        errors.push(makeError("PACKAGE_IDENTITY_TOO_LONG", contractSpan(contractFile, pos.line, pos.column, "package"), `The Package Identity length ${contract.package.length} exceeds the formal identity limit of ${FORMAL_PACKAGE_IDENTITY_MAX_LENGTH} characters (the DSM limit is 32, and .dev needs 4 reserved).`, `Shorten package to ${FORMAL_PACKAGE_IDENTITY_MAX_LENGTH} characters or fewer for --dev deploys (limit ${PACKAGE_IDENTITY_MAX_LENGTH} characters).`));
     }
     if (contract.adminport !== undefined) {
         if (typeof contract.adminport !== "number" || !Number.isInteger(contract.adminport)) {
             const pos = getValuePosition(doc, ["adminport"]) ?? { line: 1, column: 1 };
-            errors.push(makeError("CONTRACT_ADMINPORT_INVALID", contractSpan(contractFile, pos.line, pos.column, "adminport"), "adminport 必須是整數。", "請提供與 Compose published port 對應的數字 adminport。"));
+            errors.push(makeError("CONTRACT_ADMINPORT_INVALID", contractSpan(contractFile, pos.line, pos.column, "adminport"), "adminport must be an integer.", "Provide a numeric adminport that matches the Compose published port."));
         }
     }
     errors.push(...validateInstallParameters(parsed, contractFile));
@@ -85,11 +85,11 @@ function validateWebLaunch(parsed, contractFile) {
     }
     const pos = getValuePosition(doc, ["integration", "web", "launch"]) ?? { line: 1, column: 1 };
     if (!isWebLaunchMode(web.launch)) {
-        errors.push(makeError("CONTRACT_LAUNCH_INVALID", contractSpan(contractFile, pos.line, pos.column, "integration.web.launch"), "integration.web.launch 只能是 dsm-window 或 new-page。", "請改為 dsm-window（DSM 視窗，預設）或 new-page（新分頁），Headless App 請省略此欄位。"));
+        errors.push(makeError("CONTRACT_LAUNCH_INVALID", contractSpan(contractFile, pos.line, pos.column, "integration.web.launch"), "integration.web.launch can only be dsm-window or new-page.", "Use dsm-window (DSM window, the default) or new-page (new tab); omit this field for a headless App."));
         return errors;
     }
     if (contract.adminport === undefined) {
-        errors.push(makeError("CONTRACT_LAUNCH_REQUIRES_WEB", contractSpan(contractFile, pos.line, pos.column, "integration.web.launch"), "Headless App 不需要 Launch Mode。", "請省略 integration.web.launch，或補上對應 Compose published port 的 adminport。"));
+        errors.push(makeError("CONTRACT_LAUNCH_REQUIRES_WEB", contractSpan(contractFile, pos.line, pos.column, "integration.web.launch"), "A headless App does not need a Launch Mode.", "Remove integration.web.launch, or add the adminport that matches the Compose published port."));
     }
     return errors;
 }
@@ -105,12 +105,12 @@ function validateWebAccess(parsed, contractFile) {
     };
     if (contract.adminport === undefined) {
         return [
-            makeError("CONTRACT_ACCESS_REQUIRES_WEB", at(web.access !== undefined ? "access" : "groups"), "Headless App 沒有網頁入口，不需要 access 或 groups。", "請省略 integration.web.access／groups，或補上對應 Compose published port 的 adminport。"),
+            makeError("CONTRACT_ACCESS_REQUIRES_WEB", at(web.access !== undefined ? "access" : "groups"), "A headless App has no web entry, so it does not need access or groups.", "Remove integration.web.access/groups, or add the adminport that matches the Compose published port."),
         ];
     }
     if (web.access !== undefined && !isWebAccessMode(web.access)) {
         return [
-            makeError("CONTRACT_ACCESS_INVALID", at("access"), "integration.web.access 只能是 dsm-users、dsm-admins、dsm-groups 或 public。", "請改為 dsm-users（已登入的 DSM 使用者，預設）、dsm-admins、dsm-groups（需搭配 groups），或明確選 public 以保留匿名 Web Station 入口。"),
+            makeError("CONTRACT_ACCESS_INVALID", at("access"), "integration.web.access can only be dsm-users, dsm-admins, dsm-groups or public.", "Use dsm-users (signed-in DSM users, the default), dsm-admins, dsm-groups (with groups), or public to keep an anonymous Web Station entry."),
         ];
     }
     const groups = web.groups;
@@ -119,7 +119,7 @@ function validateWebAccess(parsed, contractFile) {
         groups.every((g) => typeof g === "string" && DSM_GROUP_NAME.test(g));
     if (web.access === "dsm-groups" ? !groupsValid : groups !== undefined) {
         return [
-            makeError("CONTRACT_ACCESS_GROUPS_INVALID", at("groups"), "integration.web.groups 必須搭配 access: dsm-groups，且是 DSM 本機群組或完整 DOMAIN\\group／group@domain 名稱（網域最長 64、群組最長 128 字元）的非空清單。", "請改用 access: dsm-groups 並列出群組名稱，或移除 groups。"),
+            makeError("CONTRACT_ACCESS_GROUPS_INVALID", at("groups"), "integration.web.groups needs access: dsm-groups and must be a non-empty list of DSM local groups or full DOMAIN\\group/group@domain names (domain up to 64, group up to 128 characters).", "Use access: dsm-groups and list the group names, or remove groups."),
         ];
     }
     return [];
@@ -133,17 +133,17 @@ function validateWebPortal(parsed, contractFile) {
     const pos = getValuePosition(doc, ["integration", "web", "portal"]) ?? { line: 1, column: 1 };
     // A Compose App has no root executor, and only its purge can stop nginx serving the alias after uninstall.
     return [
-        makeError("CONTRACT_PORTAL_REQUIRES_EXECUTOR", contractSpan(contractFile, pos.line, pos.column, "integration.web.portal"), "Compose App 沒有 executor，不能宣告 Application Portal：解除安裝後 DSM 不會 reload nginx，別名要 root 才能清除。", "請移除 integration.web.portal；需要登入入口別名時，由管理員在 DSM 手動設定反向代理。"),
+        makeError("CONTRACT_PORTAL_REQUIRES_EXECUTOR", contractSpan(contractFile, pos.line, pos.column, "integration.web.portal"), "A Compose App has no executor and cannot declare an Application Portal: after uninstall DSM does not reload nginx, and only root can remove the alias.", "Remove integration.web.portal; for a sign-in alias, ask an administrator to configure a reverse proxy in DSM."),
     ];
 }
 function validateDeveloperString(value, contractFile, path, pos) {
     const errors = [];
     const violations = stringViolations(value);
     if (violations.hasControlChars) {
-        errors.push(makeError("CONTRACT_INVALID_STRING", contractSpan(contractFile, pos.line, pos.column, path), "合約字串含有不允許的控制字元。", "請移除控制字元後再驗證。"));
+        errors.push(makeError("CONTRACT_INVALID_STRING", contractSpan(contractFile, pos.line, pos.column, path), "The contract string contains a disallowed control character.", "Remove the control character and validate again."));
     }
     if (violations.hasInterpolation) {
-        errors.push(makeError("CONTRACT_INVALID_STRING", contractSpan(contractFile, pos.line, pos.column, path), "合約字串不可包含 ${ 插值語法。", "請改為固定字面值，安裝參數請使用 install 區塊宣告。"));
+        errors.push(makeError("CONTRACT_INVALID_STRING", contractSpan(contractFile, pos.line, pos.column, path), "A contract string must not contain ${ interpolation.", "Use a fixed literal value and declare install parameters in the install block."));
     }
     return errors;
 }
@@ -157,10 +157,10 @@ function validateInstallParameters(parsed, contractFile) {
             const pos = getValuePosition(doc, ["install", name, "default"]) ?? { line: 1, column: 1 };
             const violations = stringViolations(param.default);
             if (violations.tooLong) {
-                errors.push(makeError("INSTALL_STRING_TOO_LONG", contractSpan(contractFile, pos.line, pos.column, `${basePath}.default`), `Install Parameter「${name}」的預設值超過 256 字元。`, "請縮短字串預設值。"));
+                errors.push(makeError("INSTALL_STRING_TOO_LONG", contractSpan(contractFile, pos.line, pos.column, `${basePath}.default`), `The Install Parameter "${name}" default exceeds 256 characters.`, "Shorten the string default."));
             }
             if (violations.hasControlChars || violations.hasInterpolation) {
-                errors.push(makeError("INSTALL_STRING_INVALID", contractSpan(contractFile, pos.line, pos.column, `${basePath}.default`), `Install Parameter「${name}」的字串值不合法。`, "請移除控制字元與 ${ 插值語法。"));
+                errors.push(makeError("INSTALL_STRING_INVALID", contractSpan(contractFile, pos.line, pos.column, `${basePath}.default`), `The Install Parameter "${name}" string value is invalid.`, "Remove control characters and ${ interpolation."));
             }
         }
         // A45/A46: both types are in the schema enum but neither has a working
@@ -181,7 +181,7 @@ function validateInstallParameters(parsed, contractFile) {
             // script generation -- turning those red would cost real coverage for no
             // extra safety. Nothing unshippable can reach a NAS or the community repo,
             // because both gates refuse; the author still learns at validate time.
-            errors.push(makeError(code, contractSpan(contractFile, pos.line, pos.column, `${basePath}.type`), `Install Parameter「${name}」的 type: ${type} 目前沒有可用的安裝路徑，經 Package Center 安裝會以 DSM broken／150 結束；deploy 與 publish 會拒絕。`, entry?.suggestion ?? "請改用其他 install parameter type。", "warning"));
+            errors.push(makeError(code, contractSpan(contractFile, pos.line, pos.column, `${basePath}.type`), `Install Parameter "${name}" with type: ${type} has no usable install path today: a Package Center install ends in DSM broken/150, and deploy and publish refuse it.`, entry?.suggestion ?? "Use another install parameter type.", "warning"));
             // Deliberately no `continue`: the type-specific checks below still apply.
             // Skipping them once silently dropped CONTRACT_HOMES_PATH_FORBIDDEN.
         }
@@ -195,7 +195,7 @@ function validateInstallParameters(parsed, contractFile) {
             const pos = getValuePosition(doc, ["install", name, field]) ??
                 getValuePosition(doc, ["install", name]) ??
                 { line: 1, column: 1 };
-            errors.push(makeError("CONTRACT_HOMES_PATH_FORBIDDEN", contractSpan(contractFile, pos.line, pos.column, `${basePath}.${field}`), `homes Install Parameter「${name}」不得在契約欄位「${field}」指定 NAS 實體路徑或預設值。`, `請保留 install.${name}.type: homes，Compose 只引用 \${${name}}；由套件 在安裝時依這台 NAS 的 User Home 設定解析路徑。`));
+            errors.push(makeError("CONTRACT_HOMES_PATH_FORBIDDEN", contractSpan(contractFile, pos.line, pos.column, `${basePath}.${field}`), `The homes Install Parameter "${name}" must not set a NAS physical path or default in the contract field "${field}".`, `Keep install.${name}.type: homes and reference only \${${name}} in Compose; the package resolves the path from this NAS's User Home setting at install time.`));
         }
         if (isPosixAllSharesType(type)) {
             const configuredValue = Object.entries(param).find(([key, value]) => key !== "type" && (key === "default" || value !== undefined));
@@ -204,7 +204,7 @@ function validateInstallParameters(parsed, contractFile) {
                 const pos = getValuePosition(doc, ["install", name, field]) ??
                     getValuePosition(doc, ["install", name]) ??
                     { line: 1, column: 1 };
-                errors.push(makeError("CONTRACT_POSIX_ALL_SHARES_VALUE_FORBIDDEN", contractSpan(contractFile, pos.line, pos.column, `${basePath}.${field}`), `POSIX all-shares Install Parameter「${name}」不得指定 default 或 NAS 實體路徑；Share 清單只在安裝時由 CLI 透過 DSM API 取得快照。`, `請只保留 install.${name}.type: posix_all_shares，Compose 使用 \${${name}} 作為完整 volume source。`));
+                errors.push(makeError("CONTRACT_POSIX_ALL_SHARES_VALUE_FORBIDDEN", contractSpan(contractFile, pos.line, pos.column, `${basePath}.${field}`), `The POSIX all-shares Install Parameter "${name}" must not set a default or NAS physical path; the Share list is snapshotted by the CLI through the DSM API only at install time.`, `Keep only install.${name}.type: posix_all_shares and use \${${name}} in Compose as the complete volume source.`));
             }
         }
     }

package/dist/contract/web-launch.d.ts

@@ -1,3 +1,4 @@
+import { type PackageIcons } from "../build-spk/dsm-icons.js";
 import type { AppContract } from "../types.js";
 /** DSM Web Station portal alias max length (error 1311 above this). */
 export declare const WEB_STATION_ALIAS_MAX = 20;
@@ -44,4 +45,4 @@ export declare function cookieStripHeaders(contract: AppContract): Array<{
 export declare function webStationServiceName(alias: string): string;
 export declare function webStationServiceRoot(alias: string): string;
 export declare function renderWebStationResource(contract: AppContract): string;
-export declare function renderDsmWindowConfig(contract: AppContract): string;
+export declare function renderDsmWindowConfig(contract: AppContract, icons: PackageIcons): string;

package/dist/contract/web-launch.js

@@ -1,5 +1,6 @@
 import { createHash } from "node:crypto";
 import { uiTitleFields } from "../build-spk/ui-texts.js";
+import { windowIconTemplate } from "../build-spk/dsm-icons.js";
 import { contractAppTitle } from "./i18n.js";
 /** DSM Web Station portal alias max length (error 1311 above this). */
 export const WEB_STATION_ALIAS_MAX = 20;
@@ -139,7 +140,7 @@ export function renderWebStationResource(contract) {
     }
     return `${JSON.stringify({ webservice: { services: [service], portals: [portal] } }, null, 2)}\n`;
 }
-export function renderDsmWindowConfig(contract) {
+export function renderDsmWindowConfig(contract, icons) {
     const packageId = String(contract.package);
     return `${JSON.stringify({
         ".url": {
@@ -147,7 +148,7 @@ export function renderDsmWindowConfig(contract) {
                 type: "url",
                 allUsers: true,
                 ...uiTitleFields(contractAppTitle(contract)),
-                icon: "images/app_{0}.png",
+                icon: windowIconTemplate(icons),
                 url: trustedAppEntryPath(contract),
             },
         },

package/dist/deploy/deploy.js

@@ -25,11 +25,11 @@ export async function deployProject(options) {
         return {
             ok: false,
             code: first.code,
-            message: `Install Parameter「${first.name}」的 type: ${first.type} 目前沒有可用的安裝路徑，` +
-                "Package Center 安裝會以 DSM broken／150 結束，因此 deploy 拒絕部署。" +
+            message: `The Install Parameter "${first.name}" with type: ${first.type} has no usable install path today, ` +
+                "a Package Center install ends in DSM broken/150, so deploy refuses to deploy." +
                 (first.type === "homes"
-                    ? "若需要管理員選定的資料夾，請改用 type: shared_folder。"
-                    : "請改用 type: string，或讓 App 自行從 ${SYNO_APP_SECRETS_DIR} 讀檔。"),
+                    ? "If you need an administrator-chosen folder, use type: shared_folder."
+                    : "Use type: string, or have the App read the file from ${SYNO_APP_SECRETS_DIR}."),
         };
     }
     const validation = validateProject(options.project);
@@ -41,7 +41,7 @@ export async function deployProject(options) {
         return {
             ok: false,
             code: "PACKAGE_IDENTITY_TOO_LONG",
-            message: `最終 Package Identity「${identity.packageId}」長度 ${identity.packageId.length} 超過 DSM 上限 ${PACKAGE_IDENTITY_MAX_LENGTH} 字元。`,
+            message: `The final Package Identity "${identity.packageId}" length ${identity.packageId.length} exceeds the DSM limit of ${PACKAGE_IDENTITY_MAX_LENGTH} characters.`,
         };
     }
     const packageInstalled = await options.host.isPackageInstalled(identity.packageId);
@@ -66,7 +66,7 @@ export async function deployProject(options) {
             return {
                 ok: false,
                 code: POSIX_ALL_SHARES_LOOKUP_FAILED,
-                message: `無法用管理員 session 列出這台 NAS 的 Shared Folder，無法填入 POSIX all-shares 參數「${name}」。`,
+                message: `The Shared Folders of this NAS could not be listed with an administrator session, so the POSIX all-shares parameter "${name}" cannot be filled.`,
             };
         }
         paramValues[name] = names.join(",");
@@ -171,7 +171,7 @@ export async function deployProject(options) {
             return {
                 ok: false,
                 code: "NATIVE_ARCH_UNDETERMINED",
-                message: "無法從這台 NAS 判定 CPU 架構。請用 --arch x86_64 或 --arch aarch64 明確指定。",
+                message: "The CPU architecture could not be determined from this NAS. Specify --arch x86_64 or --arch aarch64 explicitly.",
             };
         }
     }
@@ -179,7 +179,7 @@ export async function deployProject(options) {
         return {
             ok: false,
             code: "CONTAINER_ARCH_UNSUPPORTED",
-            message: `Container Manager App 只支援 ${CONTAINER_ARCH_FAMILIES.join("、")}；DSM 不為 ${archFamily} 提供 Container Manager。`,
+            message: `Container Manager Apps support only ${CONTAINER_ARCH_FAMILIES.join(", ")}; DSM does not provide Container Manager for ${archFamily}.`,
         };
     }
     const build = await buildSpk({

package/dist/deploy/homes-values.js

@@ -19,7 +19,7 @@ export async function resolveHomesExtraValues(input) {
         return {
             ok: false,
             code: "HOMES_NOT_ENABLED",
-            message: "這台 NAS 未啟用 DSM User Home，或 DSM API 無法解析 user home 路徑；無法安裝需要 homes 的 App。請在 DSM 啟用 User Home 後重試。",
+            message: "This NAS has DSM User Home disabled, or the DSM API cannot resolve the user home path; an App that needs homes cannot be installed. Enable User Home in DSM and retry.",
         };
     }
     return {

package/dist/deploy/identity-shared.js

@@ -1,7 +1,7 @@
 export const PACKAGE_IDENTITY_MAX_LENGTH = 32;
 export const FORMAL_PACKAGE_IDENTITY_MAX_LENGTH = 28;
 const DEV_SUFFIX = ".dev";
-const DEV_DISPLAY_SUFFIX = "（開發中）";
+const DEV_DISPLAY_SUFFIX = " (Dev)";
 export function developmentPackageIdentity(packageIdentity) {
     return `${packageIdentity}${DEV_SUFFIX}`;
 }

package/dist/deploy/native-install-values.js

@@ -1,4 +1,4 @@
-const USAGE = "synopkgland deploy --param delegate_share=<shared folder>，或 --param delegate_home=true";
+const USAGE = "synopkgland deploy --param delegate_share=<shared folder>, or --param delegate_home=true";
 /** Mirrors the preinst draft check in build-spk/delegate-scope.ts. */
 function validShareName(name) {
     return (name !== "" && name !== "." && !name.includes("..") &&

package/dist/deploy/param-values.js

@@ -17,7 +17,7 @@ export function resolveInstallParameterExtraValues(input) {
             return {
                 ok: false,
                 code: "DEPLOY_PARAM_UNDECLARED",
-                message: `--param 提供了未宣告的 Install Parameter「${name}」。只接受 synology-app.yaml install 中宣告的 string/boolean 名稱。`,
+                message: `--param provided an undeclared Install Parameter "${name}". Only string/boolean names declared in synology-app.yaml install are accepted.`,
             };
         }
         if (param.type === "boolean") {
@@ -25,7 +25,7 @@ export function resolveInstallParameterExtraValues(input) {
                 return {
                     ok: false,
                     code: "DEPLOY_PARAM_TYPE_INVALID",
-                    message: `--param ${name}=... 必須是 boolean 的 true 或 false；DSM multiselect 會以這兩個字串交給 Installation/install。`,
+                    message: `--param ${name}=... must be the boolean true or false; DSM multiselect passes these two strings to Installation/install.`,
                 };
             }
             extraValues[name] = raw;
@@ -35,7 +35,7 @@ export function resolveInstallParameterExtraValues(input) {
             return {
                 ok: false,
                 code: "DEPLOY_PARAM_TYPE_INVALID",
-                message: `--param ${name}=... 對應的契約型別是 ${String(param.type ?? "未指定")}；deploy --param 只接受 string/boolean。`,
+                message: `--param ${name}=... maps to contract type ${String(param.type ?? "unspecified")}; deploy --param accepts only string/boolean.`,
             };
         }
         const violations = stringViolations(raw);
@@ -43,7 +43,7 @@ export function resolveInstallParameterExtraValues(input) {
             return {
                 ok: false,
                 code: "DEPLOY_PARAM_TYPE_INVALID",
-                message: `--param ${name}=... 不符合 string Install Parameter 約束（不可空白、控制字元、\${ 插值或超過 256 字元）。`,
+                message: `--param ${name}=... does not meet the string Install Parameter rules (no blanks, control characters, \${ interpolation or more than 256 characters).`,
             };
         }
         extraValues[name] = raw;

package/dist/deploy/plan.d.ts

@@ -3,7 +3,7 @@ import type { NativeArchFamily } from "../build-spk/dsm-arch.js";
 import type { NasHost } from "../host/types.js";
 export interface DeploymentPlan {
     root: string;
-    kind: "native-go" | "native-rust" | "binary" | "native-layout" | "container";
+    kind: "native-go" | "native-python" | "native-node" | "native-rust" | "binary" | "native-layout" | "container";
     packageId: string;
     version: string;
     arch?: NativeArchFamily;

package/dist/deploy/port-preflight.js

@@ -32,11 +32,11 @@ export async function runPortPreflight(input) {
     if (!conflict) {
         return { ok: true };
     }
-    const occupants = conflict.occupants.map(formatPortOccupant).join("、");
+    const occupants = conflict.occupants.map(formatPortOccupant).join(", ");
     return {
         ok: false,
         code: PORT_ALREADY_IN_USE,
-        message: `Published port ${conflict.port} 已被 ${occupants} 佔用（Compose service：${conflict.services.join("、")}）。` +
-            "請改用未被其他服務使用的 host port；同一 Package Identity 的既有容器會在升級／重裝時放行。",
+        message: `Published port ${conflict.port} is already taken by ${occupants} (Compose services: ${conflict.services.join(", ")}).` +
+            "Use a host port no other service uses; existing containers of the same Package Identity are allowed during upgrade/reinstall.",
     };
 }