fix: 修复 Agent Preset 页面样式、优化插件恢复文案并缩短安装超时

build/plugin-recovery.html

@@ -523,7 +523,7 @@ <h1 id="heading"></h1>
             const versionStr = candidate.targetVersion.startsWith('v')
               ? candidate.targetVersion
               : `v${candidate.targetVersion}`
-            upgradeBtn.textContent = model.upgradeHint || (model.locale === 'zh' ? '该插件有新的兼容版本' : 'A compatible update is available')
+            upgradeBtn.textContent = model.upgradeHint || (model.locale === 'zh' ? `该插件有新的兼容版本（${versionStr}）` : `A compatible update is available (${versionStr})`)
             upgradeBtn.title = model.locale === 'zh' ? `可升级至 ${versionStr}` : `Can upgrade to ${versionStr}`
             upgradeBtn.addEventListener('click', () => {
               primary.click()
@@ -547,7 +547,7 @@ <h1 id="heading"></h1>
 
       if (model.upgradeCandidate) {
         setText('primary', model.upgradeLabel)
-        setText('secondary', model.uninstallLabel || (model.locale === 'zh' ? '仍要卸载此插件' : 'Uninstall plugin instead'))
+        setText('secondary', model.uninstallLabel || (model.locale === 'zh' ? '卸载插件' : 'Uninstall plugin'))
         secondary.hidden = false
         secondary.addEventListener('click', () => {
           secondary.disabled = true

packages/dsh-desktop-market-installer/generations/installer.d.ts

@@ -13,7 +13,7 @@ export interface GenerationInstallOptions {
   sourceDirectory?: string
   nodeExecutablePath: string
   pnpmEntryPath: string
-  /** Hard ceiling for the pnpm subprocess; defaults to 12 minutes. */
+  /** Hard ceiling for the pnpm subprocess; defaults to 90 seconds. */
   installTimeoutMs?: number
   spawnProcess?: unknown
   environment?: NodeJS.ProcessEnv

packages/dsh-desktop-market-installer/generations/installer.mjs

@@ -35,7 +35,7 @@ const GIT_ALLOW_BUILD_PATTERN = /^[A-Za-z0-9@/_.-]+@git\+https:\/\/github\.com\/
 const CODELOAD_ALLOW_BUILD_PATTERN = /^[A-Za-z0-9@/_.-]+@https:\/\/codeload\.github\.com\/[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+\/tar\.gz\/[0-9a-f]{40}$/u
 const PINNED_GITHUB_TARGET_PATTERN = /^github:(?<owner>[A-Za-z0-9_.-]+)\/(?<repo>[A-Za-z0-9_.-]+)#(?<sha>[0-9a-f]{40})(?<subpath>&path:\/(?:(?!\.\.?\/)[A-Za-z0-9_.-]+\/)*(?!\.\.?$)[A-Za-z0-9_.-]+)?$/u
 const PINNED_GIT_APPROVAL_PATTERN = /@git\+ssh:\/\/git@github\.com\//u
-const GENERATION_INSTALL_TIMEOUT_MS = 12 * 60 * 1000
+const GENERATION_INSTALL_TIMEOUT_MS = 90 * 1000
 
 function isHostSingleton(name) {
   return HOST_SINGLETON_PATTERNS.some((pattern) => pattern.test(name))
@@ -153,8 +153,9 @@ async function defaultRunInstall(options, stagingDir) {
     }
     child.stdout?.on('data', collect)
     child.stderr?.on('data', collect)
-    // Source monorepos can legitimately spend several minutes in prepare, but
-    // they still stay below the host's fifteen-minute operation ceiling.
+    // Do not leave a launch or generation operation stalled indefinitely; the
+    // caller may override this ceiling when a longer explicit operation is
+    // appropriate.
     const timer = setTimeout(
       () => child.kill('SIGKILL'),
       options.installTimeoutMs ?? GENERATION_INSTALL_TIMEOUT_MS

patches/@deepseek-ai+dsh-client-ui-agent-preset+0.1.2-rc.1.patch

@@ -454,7 +454,7 @@ diff --git a/node_modules/@deepseek-ai/dsh-client-ui-agent-preset/lib/client.js
  			tag.dataset.plugin = "@deepseek-ai/dsh-client-ui-agent-preset";
  			tag.dataset.pluginCss = tagId;
 -			tag.textContent = css;
-+			tag.textContent = `${css}.rtSEdW_sectionHead{align-items:center;gap:16px;display:flex}.rtSEdW_sectionActions{flex:none;align-items:center;justify-content:flex-end;gap:8px;margin-left:auto;display:flex}.rtSEdW_hiddenInput{display:none}`;
++			tag.textContent = `${css}.rtSEdW_sectionHead{align-items:center;gap:16px;display:flex}.rtSEdW_sectionActions{flex:none;align-items:center;justify-content:flex-end;gap:8px;margin-left:auto;display:flex}.rtSEdW_importButton{flex:none}.rtSEdW_hiddenInput{display:none}.rtSEdW_importSecurity{color:var(--dsw-alias-label-secondary);background:var(--dsw-alias-interactive-bg-hover);border-radius:8px;margin:0;padding:8px 10px;font-size:12px;line-height:1.5}.rtSEdW_importSummary{grid-template-columns:max-content minmax(0,1fr);column-gap:12px;row-gap:4px;margin:0;font-size:12px;display:grid}.rtSEdW_importSummary dt{color:var(--dsw-alias-label-tertiary)}.rtSEdW_importSummary dd{margin:0;overflow-wrap:anywhere}.rtSEdW_importWarnings{color:var(--dsw-alias-state-warning-primary,var(--dsw-alias-label-secondary));margin:0;padding-left:20px;font-size:12px;line-height:1.5}`;
  			document.head.appendChild(tag);
  		}
  		var AgentPresetSection_module_css_default = {
@@ -500,41 +500,41 @@ diff --git a/node_modules/@deepseek-ai/dsh-client-ui-agent-preset/lib/client.js
 +			"importSecurity": "rtSEdW_importSecurity",
 +			"importSummary": "rtSEdW_importSummary",
 +			"importWarnings": "rtSEdW_importWarnings",
-+			"badge": "eWkxHa_badge",
-+			"brokenBadge": "eWkxHa_brokenBadge",
-+			"brokenTip": "eWkxHa_brokenTip",
-+			"card": "eWkxHa_card",
-+			"cardActive": "eWkxHa_cardActive",
-+			"cardBroken": "eWkxHa_cardBroken",
-+			"cardBrokenReason": "eWkxHa_cardBrokenReason",
-+			"cardDesc": "eWkxHa_cardDesc",
-+			"cardFoot": "eWkxHa_cardFoot",
-+			"cardHead": "eWkxHa_cardHead",
-+			"cardId": "eWkxHa_cardId",
-+			"cardMain": "eWkxHa_cardMain",
-+			"cardName": "eWkxHa_cardName",
-+			"cards": "eWkxHa_cards",
-+			"creatorButton": "eWkxHa_creatorButton",
-+			"deleteConfirm": "eWkxHa_deleteConfirm",
-+			"deleteDialog": "eWkxHa_deleteDialog",
-+			"dialog": "eWkxHa_dialog",
-+			"dialogFields": "eWkxHa_dialogFields",
-+			"error": "eWkxHa_error",
-+			"field": "eWkxHa_field",
-+			"fieldLabel": "eWkxHa_fieldLabel",
-+			"group": "eWkxHa_group",
-+			"groupHead": "eWkxHa_groupHead",
-+			"iconButton": "eWkxHa_iconButton",
-+			"iconDanger": "eWkxHa_iconDanger",
-+			"inUse": "eWkxHa_inUse",
-+			"input": "eWkxHa_input",
-+			"intro": "eWkxHa_intro",
-+			"revealedPath": "eWkxHa_revealedPath",
-+			"revealedPathLabel": "eWkxHa_revealedPathLabel",
-+			"secondaryButton": "eWkxHa_secondaryButton",
-+			"section": "eWkxHa_section",
-+			"title": "eWkxHa_title",
-+			"viewerCode": "eWkxHa_viewerCode"
++			"badge": "aThYWW_badge",
++			"brokenBadge": "aThYWW_brokenBadge",
++			"brokenTip": "aThYWW_brokenTip",
++			"card": "aThYWW_card",
++			"cardActive": "aThYWW_cardActive",
++			"cardBroken": "aThYWW_cardBroken",
++			"cardBrokenReason": "aThYWW_cardBrokenReason",
++			"cardDesc": "aThYWW_cardDesc",
++			"cardFoot": "aThYWW_cardFoot",
++			"cardHead": "aThYWW_cardHead",
++			"cardId": "aThYWW_cardId",
++			"cardMain": "aThYWW_cardMain",
++			"cardName": "aThYWW_cardName",
++			"cards": "aThYWW_cards",
++			"creatorButton": "aThYWW_creatorButton",
++			"deleteConfirm": "aThYWW_deleteConfirm",
++			"deleteDialog": "aThYWW_deleteDialog",
++			"dialog": "aThYWW_dialog",
++			"dialogFields": "aThYWW_dialogFields",
++			"error": "aThYWW_error",
++			"field": "aThYWW_field",
++			"fieldLabel": "aThYWW_fieldLabel",
++			"group": "aThYWW_group",
++			"groupHead": "aThYWW_groupHead",
++			"iconButton": "aThYWW_iconButton",
++			"iconDanger": "aThYWW_iconDanger",
++			"inUse": "aThYWW_inUse",
++			"input": "aThYWW_input",
++			"intro": "aThYWW_intro",
++			"revealedPath": "aThYWW_revealedPath",
++			"revealedPathLabel": "aThYWW_revealedPathLabel",
++			"secondaryButton": "aThYWW_secondaryButton",
++			"section": "aThYWW_section",
++			"title": "aThYWW_title",
++			"viewerCode": "aThYWW_viewerCode"
  		};
  		//#endregion
  		//#region lib/types/client/AgentPresetSection.js

src/main/plugin-recovery-view.ts

@@ -198,9 +198,9 @@ export function buildPluginRecoveryViewModel(options: {
         : undefined,
       upgradeBusyLabel: upgradeCandidate ? '正在升级…' : undefined,
       upgradeHint: upgradeCandidate
-        ? '该插件有新的兼容版本'
+        ? `该插件有新的兼容版本（${upgradeCandidate.targetVersion.startsWith('v') ? upgradeCandidate.targetVersion : `v${upgradeCandidate.targetVersion}`}）`
         : undefined,
-      uninstallLabel: upgradeCandidate ? '仍要卸载此插件' : undefined,
+      uninstallLabel: upgradeCandidate ? '卸载插件' : undefined,
       logLabel: '打开 Harness 日志',
       advancedLabel: '查看技术详情',
       errorLabel: '错误信息',
@@ -242,9 +242,9 @@ export function buildPluginRecoveryViewModel(options: {
       : undefined,
     upgradeBusyLabel: upgradeCandidate ? 'Upgrading…' : undefined,
     upgradeHint: upgradeCandidate
-      ? 'A compatible update is available'
+      ? `A compatible update is available (${upgradeCandidate.targetVersion.startsWith('v') ? upgradeCandidate.targetVersion : `v${upgradeCandidate.targetVersion}`})`
       : undefined,
-    uninstallLabel: upgradeCandidate ? 'Uninstall this plugin instead' : undefined,
+    uninstallLabel: upgradeCandidate ? 'Uninstall plugin' : undefined,
     logLabel: 'Open Harness log',
     advancedLabel: 'View technical details',
     errorLabel: 'Error details',