dsh-config-manager 0.1.24 → 0.1.26

package/lib/client.d.ts

@@ -472,6 +472,9 @@ declare const uiZh: {
   readonly 'sync.interval.6h': "6 小时";
   readonly 'sync.interval.12h': "12 小时";
   readonly 'sync.interval.24h': "24 小时";
+  readonly 'sync.duration.min': "{n} 分钟";
+  readonly 'sync.duration.hour': "{n} 小时";
+  readonly 'sync.duration.day': "{n} 天";
   readonly 'sync.hist.autosync': "自动同步";
   readonly 'sync.hist.directionPull': "下载";
   readonly 'sync.hist.directionPush': "上传";
@@ -1097,6 +1100,7 @@ declare const zh: {
   readonly 'autosync.status': "上次运行：{status}（{time}）";
   readonly 'autosync.statusNever': "从未运行";
   readonly 'autosync.nextRun': "下次约 {time} 后";
+  readonly 'autosync.due': "已到同步时间，即将执行";
   readonly 'autosync.failCount': "连续失败 {n} 次";
   readonly 'autosync.running': "自动同步进行中…";
   readonly 'autosync.success': "成功";

package/lib/client.js

@@ -211,6 +211,9 @@ const uiZh = {
 	"sync.interval.6h": "6 小时",
 	"sync.interval.12h": "12 小时",
 	"sync.interval.24h": "24 小时",
+	"sync.duration.min": "{n} 分钟",
+	"sync.duration.hour": "{n} 小时",
+	"sync.duration.day": "{n} 天",
 	"sync.hist.autosync": "自动同步",
 	"sync.hist.directionPull": "下载",
 	"sync.hist.directionPush": "上传",
@@ -430,6 +433,9 @@ const uiEn = {
 	"sync.interval.6h": "6 hr",
 	"sync.interval.12h": "12 hr",
 	"sync.interval.24h": "24 hr",
+	"sync.duration.min": "{n} min",
+	"sync.duration.hour": "{n} hr",
+	"sync.duration.day": "{n} day",
 	"sync.hist.autosync": "Auto Sync",
 	"sync.hist.directionPull": "Pull",
 	"sync.hist.directionPush": "Push",
@@ -2075,108 +2081,108 @@ if (typeof document !== "undefined" && document.querySelector("style[data-tag=\"
 	document.head.appendChild(tag);
 }
 var config_manager_module_css_default = {
-	"viewTab": "_367UGW_viewTab",
-	"conflictItem": "_367UGW_conflictItem",
-	"pathValue": "_367UGW_pathValue",
-	"formError": "_367UGW_formError",
-	"pathRow": "_367UGW_pathRow",
-	"viewBody": "_367UGW_viewBody",
-	"badgeWarn": "_367UGW_badgeWarn",
-	"fieldLabel": "_367UGW_fieldLabel",
-	"conflictDetail": "_367UGW_conflictDetail",
-	"pathMappingList": "_367UGW_pathMappingList",
+	"categoryName": "_367UGW_categoryName",
+	"badge": "_367UGW_badge",
 	"rowActions": "_367UGW_rowActions",
-	"modeTabs": "_367UGW_modeTabs",
-	"ghostButton": "_367UGW_ghostButton",
-	"errorLine": "_367UGW_errorLine",
-	"pathNew": "_367UGW_pathNew",
-	"progressBadgeCount": "_367UGW_progressBadgeCount",
-	"confirmScroll": "_367UGW_confirmScroll",
-	"conflictId": "_367UGW_conflictId",
+	"sectionBody": "_367UGW_sectionBody",
+	"badgeOk": "_367UGW_badgeOk",
+	"section": "_367UGW_section",
+	"progressBar": "_367UGW_progressBar",
+	"hint": "_367UGW_hint",
+	"sectionTitle": "_367UGW_sectionTitle",
+	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
+	"errorTitle": "_367UGW_errorTitle",
+	"pathRow": "_367UGW_pathRow",
+	"pathIssueKind": "_367UGW_pathIssueKind",
+	"conflictList": "_367UGW_conflictList",
+	"spinnerLabel": "_367UGW_spinnerLabel",
+	"groupNote": "_367UGW_groupNote",
+	"reportView": "_367UGW_reportView",
+	"snapshotRowHeader": "_367UGW_snapshotRowHeader",
 	"primaryButton": "_367UGW_primaryButton",
-	"progressMeta": "_367UGW_progressMeta",
-	"secretsList": "_367UGW_secretsList",
-	"groupList": "_367UGW_groupList",
-	"badge": "_367UGW_badge",
+	"categoryItem": "_367UGW_categoryItem",
 	"warnList": "_367UGW_warnList",
-	"sectionTitle": "_367UGW_sectionTitle",
-	"snapshotList": "_367UGW_snapshotList",
+	"progressPercent": "_367UGW_progressPercent",
+	"errorReason": "_367UGW_errorReason",
+	"conflictDetail": "_367UGW_conflictDetail",
+	"badgeWarn": "_367UGW_badgeWarn",
+	"groupList": "_367UGW_groupList",
 	"warnText": "_367UGW_warnText",
-	"reportList": "_367UGW_reportList",
-	"card": "_367UGW_card",
-	"actionRow": "_367UGW_actionRow",
 	"progressLabel": "_367UGW_progressLabel",
-	"statRow": "_367UGW_statRow",
-	"input": "_367UGW_input",
-	"checkboxRow": "_367UGW_checkboxRow",
-	"groupCard": "_367UGW_groupCard",
-	"progressPercent": "_367UGW_progressPercent",
-	"conflictList": "_367UGW_conflictList",
+	"kindTag": "_367UGW_kindTag",
+	"progressBadgeSection": "_367UGW_progressBadgeSection",
+	"conflictItem": "_367UGW_conflictItem",
 	"reportFooter": "_367UGW_reportFooter",
-	"snapshotRow": "_367UGW_snapshotRow",
-	"badgeOk": "_367UGW_badgeOk",
-	"severityError": "_367UGW_severityError",
-	"snapshotRowHeader": "_367UGW_snapshotRowHeader",
-	"progressTrack": "_367UGW_progressTrack",
-	"sectionHeader": "_367UGW_sectionHeader",
-	"modeTab": "_367UGW_modeTab",
-	"categoryDesc": "_367UGW_categoryDesc",
-	"conflictHead": "_367UGW_conflictHead",
-	"spinnerWrap": "_367UGW_spinnerWrap",
-	"progressBlock": "_367UGW_progressBlock",
+	"conflictOptions": "_367UGW_conflictOptions",
+	"pathValue": "_367UGW_pathValue",
+	"progressBadge": "_367UGW_progressBadge",
+	"banner": "_367UGW_banner",
+	"field": "_367UGW_field",
+	"conflictId": "_367UGW_conflictId",
+	"errorFooter": "_367UGW_errorFooter",
+	"errorBanner": "_367UGW_errorBanner",
+	"spinner": "_367UGW_spinner",
 	"hiddenFile": "_367UGW_hiddenFile",
-	"hint": "_367UGW_hint",
-	"diffScroll": "_367UGW_diffScroll",
 	"groupLabel": "_367UGW_groupLabel",
-	"modeHint": "_367UGW_modeHint",
-	"field": "_367UGW_field",
-	"sectionBody": "_367UGW_sectionBody",
-	"progressIndeterminate": "_367UGW_progressIndeterminate",
-	"errorList": "_367UGW_errorList",
+	"severityError": "_367UGW_severityError",
+	"snapshotRow": "_367UGW_snapshotRow",
 	"planScroll": "_367UGW_planScroll",
-	"groupNote": "_367UGW_groupNote",
-	"badgeInfo": "_367UGW_badgeInfo",
-	"reportView": "_367UGW_reportView",
-	"pullScroll": "_367UGW_pullScroll",
-	"categoryName": "_367UGW_categoryName",
-	"conflictOptions": "_367UGW_conflictOptions",
-	"progressBarDone": "_367UGW_progressBarDone",
-	"progressBadgeSection": "_367UGW_progressBadgeSection",
+	"statRow": "_367UGW_statRow",
+	"snapshotList": "_367UGW_snapshotList",
+	"empty": "_367UGW_empty",
 	"secretFields": "_367UGW_secretFields",
-	"errorBanner": "_367UGW_errorBanner",
-	"pathOld": "_367UGW_pathOld",
-	"dshCmSpin": "_367UGW_dshCmSpin",
-	"spinner": "_367UGW_spinner",
-	"rollbackBox": "_367UGW_rollbackBox",
-	"progressBar": "_367UGW_progressBar",
-	"badgeError": "_367UGW_badgeError",
+	"viewTabs": "_367UGW_viewTabs",
+	"progressBarDone": "_367UGW_progressBarDone",
+	"viewBody": "_367UGW_viewBody",
 	"radioLabel": "_367UGW_radioLabel",
-	"section": "_367UGW_section",
-	"groupHeader": "_367UGW_groupHeader",
-	"progressBadge": "_367UGW_progressBadge",
-	"errorFooter": "_367UGW_errorFooter",
-	"empty": "_367UGW_empty",
-	"banner": "_367UGW_banner",
-	"spinnerLabel": "_367UGW_spinnerLabel",
+	"progressIndeterminate": "_367UGW_progressIndeterminate",
+	"fieldLabel": "_367UGW_fieldLabel",
+	"reportScroll": "_367UGW_reportScroll",
+	"secretsList": "_367UGW_secretsList",
+	"actionRow": "_367UGW_actionRow",
+	"errorActionLabel": "_367UGW_errorActionLabel",
+	"conflictHead": "_367UGW_conflictHead",
+	"modeHint": "_367UGW_modeHint",
+	"groupCard": "_367UGW_groupCard",
+	"rollbackBox": "_367UGW_rollbackBox",
+	"progressTrack": "_367UGW_progressTrack",
+	"pathMappingList": "_367UGW_pathMappingList",
+	"dshCmSpin": "_367UGW_dshCmSpin",
+	"confirmScroll": "_367UGW_confirmScroll",
+	"select": "_367UGW_select",
+	"progressBadgeCount": "_367UGW_progressBadgeCount",
+	"sectionHeader": "_367UGW_sectionHeader",
+	"input": "_367UGW_input",
+	"modeTabs": "_367UGW_modeTabs",
 	"reportText": "_367UGW_reportText",
-	"groupItems": "_367UGW_groupItems",
-	"errorReason": "_367UGW_errorReason",
-	"dangerButton": "_367UGW_dangerButton",
-	"categoryItem": "_367UGW_categoryItem",
-	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
-	"errorTitle": "_367UGW_errorTitle",
+	"errorItem": "_367UGW_errorItem",
 	"errorAction": "_367UGW_errorAction",
-	"pathIssueKind": "_367UGW_pathIssueKind",
-	"kindTag": "_367UGW_kindTag",
+	"optionsCard": "_367UGW_optionsCard",
+	"viewTab": "_367UGW_viewTab",
+	"dangerButton": "_367UGW_dangerButton",
 	"sectionTitleBlock": "_367UGW_sectionTitleBlock",
 	"sectionSubtitle": "_367UGW_sectionSubtitle",
-	"optionsCard": "_367UGW_optionsCard",
-	"errorActionLabel": "_367UGW_errorActionLabel",
-	"errorItem": "_367UGW_errorItem",
-	"reportScroll": "_367UGW_reportScroll",
+	"modeTab": "_367UGW_modeTab",
+	"errorList": "_367UGW_errorList",
+	"progressMeta": "_367UGW_progressMeta",
+	"progressBlock": "_367UGW_progressBlock",
+	"pathOld": "_367UGW_pathOld",
+	"spinnerWrap": "_367UGW_spinnerWrap",
+	"diffScroll": "_367UGW_diffScroll",
+	"ghostButton": "_367UGW_ghostButton",
 	"progressDetail": "_367UGW_progressDetail",
-	"select": "_367UGW_select",
-	"viewTabs": "_367UGW_viewTabs"
+	"badgeError": "_367UGW_badgeError",
+	"errorLine": "_367UGW_errorLine",
+	"card": "_367UGW_card",
+	"pathNew": "_367UGW_pathNew",
+	"categoryDesc": "_367UGW_categoryDesc",
+	"reportList": "_367UGW_reportList",
+	"formError": "_367UGW_formError",
+	"groupItems": "_367UGW_groupItems",
+	"pullScroll": "_367UGW_pullScroll",
+	"groupHeader": "_367UGW_groupHeader",
+	"checkboxRow": "_367UGW_checkboxRow",
+	"badgeInfo": "_367UGW_badgeInfo"
 };
 //#endregion
 //#region src/client/common/ui.tsx
@@ -4359,15 +4365,16 @@ function computeAutosyncCountdown(elapsedMs, intervalMs) {
 	if (elapsedMs < 0) return -1;
 	return Math.max(0, intervalMs - elapsedMs);
 }
-/** 间隔 ms → 可读时长（如「30 分钟」「6 小时」）。 */
+/**
+* 剩余时长 → 可读文案（向上取整，避免出现「0 分钟」；≤0 视为 1 分钟兜底）。
+* 例：4 分钟 →「4 分钟」；90 分钟 →「2 小时」；30 小时 →「2 天」。
+*/
 function formatIntervalDuration(ms, t = zhUiT) {
-	const minutes = Math.round(ms / 6e4);
-	if (minutes < 60) return t("sync.interval.30m");
-	const hours = Math.round(minutes / 60);
-	if (hours === 6) return t("sync.interval.6h");
-	if (hours === 12) return t("sync.interval.12h");
-	if (hours === 24) return t("sync.interval.24h");
-	return `${hours}h`;
+	const totalMinutes = Math.max(1, Math.ceil(ms / 6e4));
+	if (totalMinutes < 60) return t("sync.duration.min", { n: totalMinutes });
+	const totalHours = Math.ceil(totalMinutes / 60);
+	if (totalHours < 24) return t("sync.duration.hour", { n: totalHours });
+	return t("sync.duration.day", { n: Math.ceil(totalHours / 24) });
 }
 /** 自动同步状态行的可读文案（未运行 / 上次状态 / 连续失败计数）。 */
 function autosyncStatusText(status, t = zhUiT) {
@@ -5279,7 +5286,8 @@ function SyncSettingsView({ api, t }) {
 	/** GitHub 流程进行中（请求设备码 / 等待授权 / 轮询）：禁用 push/pull，避免无凭据操作 */
 	const githubBusy = state.github.phase === "starting" || state.github.phase === "waiting" || state.github.phase === "polling";
 	const autosyncText = state.autosync !== null ? autosyncStatusText(state.autosync, uiT) : t("autosync.statusNever");
-	const autosyncCountdown = state.autosync !== null && state.autosync.elapsedMs >= 0 ? formatIntervalDuration(computeAutosyncCountdown(state.autosync.elapsedMs, autosyncIntervalMs(state.autosync.interval)), uiT) : null;
+	/** 距下次自动同步剩余 ms（null = 从未运行；0 = 已到期） */
+	const autosyncCountdownMs = state.autosync !== null && state.autosync.elapsedMs >= 0 ? computeAutosyncCountdown(state.autosync.elapsedMs, autosyncIntervalMs(state.autosync.interval)) : null;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: config_manager_module_css_default.viewBody,
 		children: [
@@ -5663,9 +5671,9 @@ function SyncSettingsView({ api, t }) {
 					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
 						kind: state.autosync?.lastRunStatus === "failed" ? "error" : state.autosync?.lastRunStatus === "skipped" ? "warn" : "info",
 						children: autosyncText
-					}), autosyncCountdown !== null && state.autosyncEnabled && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
+					}), autosyncCountdownMs !== null && state.autosyncEnabled && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Badge, {
 						kind: "info",
-						children: t("autosync.nextRun", { time: autosyncCountdown })
+						children: autosyncCountdownMs <= 0 ? t("autosync.due") : t("autosync.nextRun", { time: formatIntervalDuration(autosyncCountdownMs, uiT) })
 					})]
 				})
 			] }),
@@ -6123,6 +6131,7 @@ const zh = {
 	"autosync.status": "上次运行：{status}（{time}）",
 	"autosync.statusNever": "从未运行",
 	"autosync.nextRun": "下次约 {time} 后",
+	"autosync.due": "已到同步时间，即将执行",
 	"autosync.failCount": "连续失败 {n} 次",
 	"autosync.running": "自动同步进行中…",
 	"autosync.success": "成功",
@@ -6242,6 +6251,7 @@ const en = {
 	"autosync.status": "Last run: {status} ({time})",
 	"autosync.statusNever": "Never run",
 	"autosync.nextRun": "Next in ~{time}",
+	"autosync.due": "Due — running soon",
 	"autosync.failCount": "{n} consecutive failure(s)",
 	"autosync.running": "Auto sync running…",
 	"autosync.success": "Success",