dsh-life-pack 0.3.60 → 0.3.62

package/dist/client.js

@@ -471,7 +471,7 @@ window.__ModuleLoader__.load({
 			path: "/api/ilife-manager"
 		};
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/config.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.2/node_modules/dsh-plugin-update/dist/config.js
 		const DEFAULT_PANEL_POLL_MS = 1e3;
 		function assertPrefix(value, role) {
 			if (typeof value !== "string" || value.length === 0) throw new Error("[dsh-plugin-update] " + role + " 非法：须为非空字符串（收到 " + JSON.stringify(value) + "）");
@@ -492,7 +492,7 @@ window.__ModuleLoader__.load({
 			return buildPhoneNames(prefix).logAppend;
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/redaction.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.2/node_modules/dsh-plugin-update/dist/redaction.js
 		const COPY_BUDGET_CHARS = 1500;
 		const REDACTED_PATH = "<路径>";
 		const REDACTED_SECRET = "<脱敏>";
@@ -556,7 +556,7 @@ window.__ModuleLoader__.load({
 			return truncateForCopy(scrubWithoutBudget(flat));
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/service.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.2/node_modules/dsh-plugin-update/dist/service.js
 		function updateError(code) {
 			return Object.assign(new Error(code), { code });
 		}
@@ -643,7 +643,7 @@ window.__ModuleLoader__.load({
 			return 0;
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/lang.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.2/node_modules/dsh-plugin-update/dist/lang.js
 		function normalizeLangTag(tag) {
 			if (typeof tag !== "string") return "zh";
 			const s = tag.trim().toLowerCase().replace(/_/g, "-");
@@ -785,7 +785,7 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/bilingual.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.2/node_modules/dsh-plugin-update/dist/bilingual.js
 		const BILINGUAL_STRINGS = {
 			"entry.label.idle": {
 				en: "Check for updates",
@@ -2432,7 +2432,7 @@ window.__ModuleLoader__.load({
 		}
 		const BILINGUAL_CSS = [".dsh-upd-bi{display:inline;overflow-wrap:anywhere}", ".dsh-upd-bi [lang]{overflow-wrap:anywhere}"].join("\n");
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/changelog.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.2/node_modules/dsh-plugin-update/dist/changelog.js
 		const CHANGELOG_MAX_CHARS = 65536;
 		const CHANGELOG_ALL_CATEGORIES = [
 			"Added",
@@ -3540,7 +3540,7 @@ ${note}${blocks.join("\n")}
 			}
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/log-events.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.2/node_modules/dsh-plugin-update/dist/log-events.js
 		const LOG_EVENT_CALL = "host.call";
 		const LOG_EVENT_CALL_FAIL = "host.call.fail";
 		const LOG_EVENT_INSTALL_EXEC = "update.install.exec";
@@ -3791,7 +3791,7 @@ ${note}${blocks.join("\n")}
 			};
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/codes.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.2/node_modules/dsh-plugin-update/dist/codes.js
 		const BLOCKED_REASONS = [
 			"unknown-profile",
 			"channel-mismatch",
@@ -3825,7 +3825,7 @@ ${note}${blocks.join("\n")}
 			return typeof code === "string" && isOneOf(CHECK_SIDE_FAILURE_CODES, code.trim());
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/panel.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.2/node_modules/dsh-plugin-update/dist/panel.js
 		function normalizePanelTheme(value) {
 			return value === "archive" ? "archive" : "default";
 		}
@@ -5060,7 +5060,7 @@ ${UPDATE_PANEL_ARCHIVE_CSS}` : UPDATE_PANEL_CSS}</style>
 ${body}`;
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/entry.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.2/node_modules/dsh-plugin-update/dist/entry.js
 		const UPDATE_ENTRY_CSS = [
 			".dsh-upd-entry{display:inline-flex;align-items:center;gap:8px;font:13px/1.6 var(--dsh-update-font-sans,system-ui,\"Microsoft YaHei\",sans-serif);font-size:var(--dsh-update-entry-font-size,13px);color:var(--dsh-update-text,#1f2937)}",
 			".dsh-upd-entry-btn{font:inherit;border:1px solid var(--dsh-update-border,#d1d5db);border-radius:var(--dsh-update-entry-border-radius,6px);",
@@ -5174,7 +5174,7 @@ ${body}`;
 			}
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/panel-batch.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.2/node_modules/dsh-plugin-update/dist/panel-batch.js
 		const BATCH_PANEL_POLL = {
 			defaultMs: 1500,
 			minMs: 250
@@ -5357,7 +5357,7 @@ ${body}`;
 					latest: sessionTarget,
 					hasUpdate: true
 				};
-				if (current2 === sessionTarget) return {
+				if (current2 === sessionTarget || !isUpgradeOf(sessionTarget, current2)) return {
 					current: current2,
 					latest: null,
 					hasUpdate: false
@@ -5372,7 +5372,7 @@ ${body}`;
 			const knowledgeCurrent = knowledge && knowledge.installed !== false && typeof knowledge.installedVersion === "string" && knowledge.installedVersion ? knowledge.installedVersion : null;
 			const current = snapshotCurrent ?? knowledgeCurrent;
 			const latest = knowledge && typeof knowledge.latestVersion === "string" && knowledge.latestVersion ? knowledge.latestVersion : null;
-			if (current && latest && latest !== current) return {
+			if (current && latest && latest !== current && isUpgradeOf(latest, current)) return {
 				current,
 				latest,
 				hasUpdate: true
@@ -5393,6 +5393,13 @@ ${body}`;
 				hasUpdate: false
 			};
 		}
+		function isUpgradeOf(target, current) {
+			try {
+				return compareReleaseVersions(target, current) === 1;
+			} catch {
+				return true;
+			}
+		}
 		function batchRowVersionHTML(row, knowledge, lang) {
 			const parts = batchRowVersionParts(row, knowledge);
 			if (parts.hasUpdate && parts.latest) {
@@ -6693,7 +6700,7 @@ ${body}`;
 			};
 		}
 		//#endregion
-		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.1/node_modules/dsh-plugin-update/dist/entry-batch.js
+		//#region ../../node_modules/.pnpm/dsh-plugin-update@0.18.2/node_modules/dsh-plugin-update/dist/entry-batch.js
 		function isObject$1(value) {
 			return !!value && typeof value === "object" && !Array.isArray(value);
 		}
@@ -10488,32 +10495,38 @@ ${body}`;
 		*
 		*  上游首查回包里的 `manual`（精确手工命令）读出来交 `onManual`：带精确版本号与 registry，
 		*  调用方拿它画自己的命令行＋复制按钮（单一定位，不复述上游 details 里的同一条）。
-		*  只读、不重查：读两次（800／2600ms，覆盖默认 1000ms 轮询的首查落定），读不到就只剩双包命令。 */
+		*  只读、不重查：每秒读一次、读到为止、最多 10 次（0.3.60 现场：固定两次读不到，首查落定比预期晚）。 */
 		function TabInstallSlot(props) {
 			const slotRef = react.useRef(null);
 			const callReady = props.getCall() !== null;
 			const onManualRef = react.useRef(props.onManual);
-			onManualRef.current = props.onManual;
+			react.useEffect(() => {
+				onManualRef.current = props.onManual;
+			}, [props.onManual]);
 			react.useEffect(() => {
 				const mount = slotRef.current;
 				if (mount === null || !callReady) return;
 				const button = mountLifeInstallButton(mount, managerCallAdapter(props.getCall()), props.tab);
 				if (button === null) return;
 				let alive = true;
-				const timers = [];
-				for (const ms of [800, 2600]) {
-					if (typeof setTimeout !== "function") break;
-					timers.push(setTimeout(() => {
-						if (!alive) return;
-						try {
-							const manual = button.state().manual;
-							if (typeof manual === "string" && manual.length > 0) onManualRef.current?.(manual);
-						} catch {}
-					}, ms));
-				}
+				let attempts = 0;
+				const readOnce = () => {
+					if (!alive) return;
+					attempts += 1;
+					try {
+						const manual = button.state().manual;
+						if (typeof manual === "string" && manual.length > 0) {
+							onManualRef.current?.(manual);
+							return;
+						}
+					} catch {}
+					if (attempts < 10 && typeof setTimeout === "function") timer = setTimeout(readOnce, 1e3);
+				};
+				let timer = null;
+				if (typeof setTimeout === "function") timer = setTimeout(readOnce, 800);
 				return () => {
 					alive = false;
-					for (const t of timers) clearTimeout(t);
+					if (timer !== null) clearTimeout(timer);
 					button.unmount();
 				};
 			}, [callReady, props.tab]);
@@ -10528,10 +10541,13 @@ ${body}`;
 		*  全收敛在 `[data-ilife-absent]` 作用域下；容器 `S.reco` 与子顺序一字不动。
 		*  上游主按钮换色用容器覆盖（`button[data-primary="1"]` 特异度压上游缺省；上游自带 CSS 无 hover
 		*  规则，见 update-dialog.ts 注释——themeTokens 对安装控件无视觉效果，故悬停也收在这里）。
-		*  悬停取深橙＋白字＋投影（用户 verdict：8% 提亮看不见）；颜色原型定稿 hex，见 v4 原型。 */
+		*  悬停取深橙＋白字＋投影（用户 verdict：8% 提亮看不见）；颜色原型定稿 hex，见 v4 原型。
+		*  常态橙底（0.3.61 补上：首版只写了 hover 没写常态，线上按钮常态掉回宿主灰——原型 L33 整条）。
+		*  上游自带折叠手工行（0.3.60 现场：②里贴着按钮又冒出一条“手工命令”）：默认不动，
+		*  只有当③的精确命令取到了（`data-manual="ready"`）才藏它——取不到时它仍是兜底。 */
 		const ABSENT_TOAST_MS = 1500;
 		function absentStepsCss() {
-			return "[data-ilife-absent=\"panel\"]>.ilife-step{display:block;position:relative;padding:10px 4px 10px 40px;border-bottom:1px solid rgba(255,255,255,.07)}[data-ilife-absent=\"panel\"]>.ilife-step:last-child{border-bottom:0}[data-ilife-absent=\"panel\"]>.ilife-step::before{content:attr(data-step);position:absolute;left:4px;top:10px;width:24px;height:24px;border-radius:50%;background:#2b2b2b;color:#9a9a9a;font-size:12px;display:flex;align-items:center;justify-content:center;font-weight:700}[data-ilife-absent=\"panel\"]>.ilife-step[data-step=\"1\"]::before{background:#e5534b;color:#fff}[data-ilife-absent=\"panel\"]>.ilife-step[data-step=\"2\"]::before{background:#f2a65a;color:#1a1206}[data-ilife-absent=\"panel\"] .ilife-step-t{display:block;color:#fff;font-weight:700;font-size:14px;margin-bottom:2px}[data-ilife-absent=\"panel\"] .ilife-tray{background:rgba(242,166,90,.08);border-radius:8px;padding:10px 12px}[data-ilife-absent=\"panel\"] .dsh-upd-ib button[data-primary=\"1\"]{transition:background .15s,color .15s,transform .06s,box-shadow .15s}[data-ilife-absent=\"panel\"] .dsh-upd-ib button[data-primary=\"1\"]:hover{background:#cf6f1f;color:#fff;transform:translateY(-1px);box-shadow:0 4px 14px rgba(207,111,31,.45)}[data-ilife-absent=\"panel\"] .dsh-upd-ib button[data-primary=\"1\"]:active{transform:translateY(1px);box-shadow:none;background:#a8561a;color:#fff}[data-ilife-absent=\"panel\"] .dsh-upd-ib button[data-primary=\"1\"]:disabled{opacity:.55;cursor:default;transform:none;box-shadow:none}[data-ilife-absent=\"panel\"] .dsh-upd-ib button[data-primary=\"1\"]:focus-visible{outline:2px solid #f2a65a;outline-offset:2px}[data-ilife-absent=\"panel\"] .ilife-cmdrow{display:flex;gap:8px;align-items:stretch;margin-top:8px}[data-ilife-absent=\"panel\"] .ilife-cmdrow>code{flex:1;padding:8px 10px;border-radius:8px;background:rgba(128,128,128,.12);color:#57b883;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:12px;user-select:all;white-space:pre-wrap;overflow-wrap:anywhere}[data-ilife-absent=\"panel\"] .ilife-cmdrow>code.plain{color:inherit}[data-ilife-absent=\"panel\"] .ilife-copycmd{flex:0 0 auto;align-self:center;background:#2b2b2b;color:inherit;border:1px solid rgba(255,255,255,.12);border-radius:8px;padding:6px 14px;font-size:12.5px;cursor:pointer;transition:background .15s,border-color .15s,color .15s,transform .06s,box-shadow .15s}[data-ilife-absent=\"panel\"] .ilife-copycmd:hover{border-color:#f2a65a;color:#f2a65a;background:#353535;transform:translateY(-1px);box-shadow:0 2px 8px rgba(242,166,90,.25)}[data-ilife-absent=\"panel\"] .ilife-copycmd:active{transform:translateY(1px);box-shadow:none;background:#242424}[data-ilife-absent=\"panel\"] .ilife-copycmd:focus-visible{outline:2px solid #f2a65a;outline-offset:2px}[data-ilife-absent=\"toast\"]{position:fixed;left:50%;bottom:48px;transform:translateX(-50%) translateY(" + String(8) + "px);background:#1f1f1f;color:#fff;border:1px solid rgba(87,184,131,.6);border-radius:999px;padding:6px 18px;font-size:13px;z-index:99;animation:absentToastIn " + String(180 / 1e3) + "s ease}@keyframes absentToastIn{from{opacity:0;transform:translateX(-50%) translateY(" + String(8) + "px)}to{opacity:1;transform:translateX(-50%) translateY(0)}}";
+			return "[data-ilife-absent=\"panel\"]>.ilife-step{display:block;position:relative;padding:10px 4px 10px 40px;border-bottom:1px solid rgba(255,255,255,.07)}[data-ilife-absent=\"panel\"]>.ilife-step:last-child{border-bottom:0}[data-ilife-absent=\"panel\"]>.ilife-step::before{content:attr(data-step);position:absolute;left:4px;top:10px;width:24px;height:24px;border-radius:50%;background:#2b2b2b;color:#9a9a9a;font-size:12px;display:flex;align-items:center;justify-content:center;font-weight:700}[data-ilife-absent=\"panel\"]>.ilife-step[data-step=\"1\"]::before{background:#e5534b;color:#fff}[data-ilife-absent=\"panel\"]>.ilife-step[data-step=\"2\"]::before{background:#f2a65a;color:#1a1206}[data-ilife-absent=\"panel\"] .ilife-step-t{display:block;color:#fff;font-weight:700;font-size:14px;margin-bottom:2px}[data-ilife-absent=\"panel\"] .ilife-tray{background:rgba(242,166,90,.14);border-radius:8px;padding:10px 12px}[data-ilife-absent=\"panel\"] .dsh-upd-ib button[data-primary=\"1\"]{background:#f2a65a;color:#1a1206;border:0;border-radius:8px;padding:9px 24px;font-size:14px;font-weight:700;cursor:pointer;transition:background .15s,color .15s,transform .06s,box-shadow .15s}[data-ilife-absent=\"panel\"][data-manual=\"ready\"] .dsh-upd-ib-manual{display:none}[data-ilife-absent=\"panel\"] .dsh-upd-ib button[data-primary=\"1\"]:hover{background:#cf6f1f;color:#fff;transform:translateY(-1px);box-shadow:0 4px 14px rgba(207,111,31,.45)}[data-ilife-absent=\"panel\"] .dsh-upd-ib button[data-primary=\"1\"]:active{transform:translateY(1px);box-shadow:none;background:#a8561a;color:#fff}[data-ilife-absent=\"panel\"] .dsh-upd-ib button[data-primary=\"1\"]:disabled{opacity:.55;cursor:default;transform:none;box-shadow:none}[data-ilife-absent=\"panel\"] .dsh-upd-ib button[data-primary=\"1\"]:focus-visible{outline:2px solid #f2a65a;outline-offset:2px}[data-ilife-absent=\"panel\"] .ilife-cmdrow{display:flex;gap:8px;align-items:stretch;margin-top:8px}[data-ilife-absent=\"panel\"] .ilife-cmdrow>code{flex:1;padding:8px 10px;border-radius:8px;background:rgba(128,128,128,.12);color:#57b883;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:12px;user-select:all;white-space:pre-wrap;overflow-wrap:anywhere}[data-ilife-absent=\"panel\"] .ilife-cmdrow>code.plain{color:#e8e8e8}[data-ilife-absent=\"panel\"] .ilife-copycmd{flex:0 0 auto;align-self:center;background:#2b2b2b;color:#e8e8e8;border:1px solid rgba(255,255,255,.12);border-radius:8px;padding:6px 14px;font-size:12.5px;cursor:pointer;transition:background .15s,border-color .15s,color .15s,transform .06s,box-shadow .15s}[data-ilife-absent=\"panel\"] .ilife-copycmd:hover{border-color:#f2a65a;color:#f2a65a;background:#353535;transform:translateY(-1px);box-shadow:0 2px 8px rgba(242,166,90,.25)}[data-ilife-absent=\"panel\"] .ilife-copycmd:active{transform:translateY(1px);box-shadow:none;background:#242424}[data-ilife-absent=\"panel\"] .ilife-copycmd:focus-visible{outline:2px solid #f2a65a;outline-offset:2px}[data-ilife-absent=\"toast\"]{position:fixed;left:50%;bottom:48px;transform:translateX(-50%) translateY(" + String(8) + "px);background:#1f1f1f;color:#fff;border:1px solid rgba(87,184,131,.6);border-radius:999px;padding:6px 18px;font-size:13px;z-index:99;animation:absentToastIn " + String(180 / 1e3) + "s ease}@keyframes absentToastIn{from{opacity:0;transform:translateX(-50%) translateY(" + String(8) + "px)}to{opacity:1;transform:translateX(-50%) translateY(0)}}";
 		}
 		/** 命令行文本进剪贴板：先走 Clipboard API，摸不到（老宿主／非安全上下文）就地降级为隐藏 textarea。
 		*  文案保持「复制」二字不动（用户口径）：成功只弹 Toast，不改按钮字。 */
@@ -10603,7 +10619,8 @@ ${body}`;
 			});
 			return react.createElement("div", {
 				style: S.reco,
-				"data-ilife-absent": "panel"
+				"data-ilife-absent": "panel",
+				"data-manual": manual !== null ? "ready" : "pending"
 			}, react.createElement("style", { "data-ilife-absent": "steps-css" }, absentStepsCss()), react.createElement("span", {
 				className: "ilife-step",
 				"data-step": "1"
@@ -10642,7 +10659,7 @@ ${body}`;
 			}, react.createElement("span", { style: S.morePkg }, row.pkg), react.createElement("span", { style: S.moreDesc }, row.desc), react.createElement("span", { style: S.moreIcon }, react.createElement(ExternalIcon, null)))));
 		}
 		/** 版本胶囊那一行字：只在这里拼一次，屏上与用例读的是同一串。 */
-		const MANAGER_VERSION_TEXT = "dsh-life-pack · 0.3.60";
+		const MANAGER_VERSION_TEXT = "dsh-life-pack · 0.3.62";
 		/** 右下角那本书离面板两沿的距离：用户口径「一直处于面板右下角、不随列表滑动消失」
 		*  ⇒ sticky 吸附（面板相对，视口多大都落在面板角上）；INSET＝右沿，BOTTOM＝底沿。 */
 		const MANUAL_ENTRY_INSET = 16;