summrise-agent 1.2.491 → 1.2.492

package/bin/summrise.js

@@ -310,8 +310,42 @@ exports.psq = psq;
  *  silently reverts to the backing executable (stock `electron.exe`, since the shell runs
  *  unpackaged) with nothing on the device to read that says why.
  *  PowerShell/Windows AppUserModelIDs cannot contain spaces, and this one does not.
+ *
+ *  WHY IT IS NOT `online.saisi.summrise.agent`, WHICH IS WHAT IT WAS CALLED BEFORE —
+ *  MEASURED on desktop-14rjcr8 (release 1.2.490), ONE VARIABLE AT A TIME:
+ *
+ *    | window's AppUserModelID          | shortcut carries it  | taskbar draws   |
+ *    | window's AppUserModelID       | shortcuts carrying it          | taskbar draws |
+ *    | online.saisi.summrise.agent   | both desktops + Start Menu     | Electron logo |
+ *    | online.saisi.summrise.desktop | both desktops + Start Menu     | THE SUNRISE   |
+ *    | online.saisi.summrise.desktop | both desktops, Start Menu GONE | Electron logo |
+ *
+ *  That third row is the one that decides where the identity has to live, and it was taken
+ *  WITHOUT restarting anything: the same running shell, the same AppUserModelID already set,
+ *  and the icon fell back to the Electron logo the moment the Start Menu shortcut was
+ *  deleted. So the shortcut this lookup resolves is the **Start Menu** one — a desktop
+ *  shortcut is not enough, and writing the identity onto `Summrise.lnk` in
+ *  `%PUBLIC%\Desktop` alone changes nothing. Microsoft's appids.md does say to apply the ID
+ *  to "all of the shortcuts" when an application has several launch locations, and it lists
+ *  the Start menu FIRST; the measurement is what says which of them the taskbar actually
+ *  reads.
+ *
+ *  The other variables were held: the same `IPropertyStore` call read back on every
+ *  shortcut, the same `icon.ico` (downloaded and RENDERED — it is the orange sunrise), the
+ *  same shell restarted under the `SummriseDesktop` task, and in each restarted run the
+ *  running process appended `AUMID-SET-OK` to a log from inside `setAppUserModelId`, so "the
+ *  ID was set" is measured rather than assumed.
+ *
+ *  WHY THE OLD ID WAS DEAD. Releases up to 1.2.489 set `online.saisi.summrise.agent` on the
+ *  process while no shortcut anywhere carried it, so the shell resolved that ID against the
+ *  backing executable — stock `electron.exe` — and kept the result. `shell:AppsFolder` still
+ *  lists it as `name=[Electron] path=[online.saisi.summrise.agent]`, an app entry named after
+ *  `electron.exe`. An ID already resolved to the wrong image is not repaired by writing the
+ *  shortcut afterwards; the association has to be under a name the machine has never seen.
+ *  Keep this string STABLE from here: changing it again costs the pin and the jump list, so
+ *  this is a one-time migration, not a knob.
  */
-exports.DESKTOP_AUMID = "online.saisi.summrise.agent";
+exports.DESKTOP_AUMID = "online.saisi.summrise.desktop";
 /** The two `IPropertyStore` values `Summrise.lnk` must carry, as DATA.
  *
  *  Deliberately separated from the PowerShell that performs the write, and exported, so the
@@ -442,31 +476,60 @@ public static class SummriseLnk {
 // exported: unit-tested in test/cli.test.mjs.
 function deskShortcutRepairPs(scriptsQ, deskDirQ, sink) {
     const { id, icon } = lnkIdentity(`${deskDirQ}\\icon.ico`);
+    // BOTH shortcuts get the identity, and the START MENU one is the load-bearing half:
+    // deleting it from a running shell reverted the taskbar to the Electron logo with the ID
+    // still set on the process and both desktop shortcuts still carrying it (see DESKTOP_AUMID).
+    // The desktop link is kept because it is what a person double-clicks and because
+    // appids.md says to apply the ID to "all of the shortcuts" a user can launch from.
+    const lnk = (p, tag) => [
+        `  try { $dWs${tag} = New-Object -ComObject WScript.Shell; $dSc${tag} = $dWs${tag}.CreateShortcut(${p}); $dSc${tag}.TargetPath = Join-Path $env:SystemRoot 'System32\\WindowsPowerShell\\v1.0\\powershell.exe'; $dSc${tag}.Arguments = '-NoProfile -ExecutionPolicy Bypass -File "' + $dPs1 + '"'; $dSc${tag}.WorkingDirectory = '${deskDirQ}'; $dSc${tag}.IconLocation = $dIco + ',0'; $dSc${tag}.Save(); 'desk: ' + ${p} + ' repointed to electron shell' | ${sink} } catch { ('desk: ' + ${p} + ' repair failed: ' + $_.Exception.Message) | ${sink} }`,
+        `  if ($dSet) { try { [SummriseLnk]::Write(${p}, $dId, $dRes); ('desk: ' + ${p} + ' taskbar identity [' + [SummriseLnk]::Read(${p}) + ']') | ${sink} } catch { ('desk: ' + ${p} + ' identity write failed: ' + $_.Exception.Message) | ${sink} } }`,
+    ];
     return [
         `$dLnk = Join-Path $env:PUBLIC 'Desktop\\Summrise.lnk'`,
+        // ALL-USERS Start Menu: the shortcut the shell's app resolver actually reads, and it is
+        // CREATED here when absent — a machine that never had one is exactly the machine whose
+        // taskbar shows the Electron logo, and no amount of desktop-side repair reaches it.
+        // `setup` already requires elevation (HKLM writes, Program Files), so ProgramData is
+        // writable on every path that calls this.
+        `$dSm = Join-Path $env:ProgramData 'Microsoft\\Windows\\Start Menu\\Programs\\Summrise.lnk'`,
         `$dIco = '${deskDirQ}\\icon.ico'`,
         `$dPs1 = '${scriptsQ}\\start-desktop.ps1'`,
         `$dId = '${id}'`,
         `$dRes = '${icon}'`,
         `$dSet = $false`,
-        `$dNeed = $false`,
-        `if (Test-Path $dLnk) {`,
-        // Compiled only when there IS a link to write, so a headless install does not pay for
-        // it. The `-as [type]` guard keeps a second call in one process from turning a
-        // "type already exists" throw into a silent skip of the write below.
+        `$dShell = (Test-Path $dIco) -and (Test-Path $dPs1)`,
+        // Compiled when there is a SHELL to point at, not when a desktop link happens to exist:
+        // the Start Menu shortcut is created from nothing, so gating this on `$dLnk` would skip
+        // the identity on precisely the installs that need it. The `-as [type]` guard keeps a
+        // second call in one process from turning a "type already exists" throw into a silent
+        // skip of every write below.
+        `if ($dShell) {`,
         `  $dCs = @'\n${LNK_PROPS_CS}\n'@`,
         `  try { if (-not ('SummriseLnk' -as [type])) { Add-Type -TypeDefinition $dCs }; $dSet = [bool]('SummriseLnk' -as [type]) } catch { ('desk: lnk identity helper unavailable: ' + $_.Exception.Message) | ${sink} }`,
+        `}`,
+        `$dNeed = $false`,
+        `if (Test-Path $dLnk) {`,
         `  try { $dEx = (New-Object -ComObject WScript.Shell).CreateShortcut($dLnk); if (($dEx.TargetPath -like '*summrise-desktop.exe') -or ($dEx.TargetPath -like '*summrise-tray.exe') -or (-not (Test-Path $dEx.TargetPath))) { $dNeed = $true } } catch { $dNeed = $true }`,
         // ...and a link that is otherwise healthy still needs repairing when its identity is
         // missing or names a different ID/icon. `Read` returns "id|icon", so ONE comparison
         // covers both properties — and it is the same call the verification below prints.
         `  if ($dSet) { try { if (([SummriseLnk]::Read($dLnk)) -ne ($dId + '|' + $dRes)) { $dNeed = $true } } catch { $dNeed = $true } }`,
         `}`,
-        `if ($dNeed -and (Test-Path $dIco) -and (Test-Path $dPs1)) {`,
-        `  try { $dWs = New-Object -ComObject WScript.Shell; $dSc = $dWs.CreateShortcut($dLnk); $dSc.TargetPath = Join-Path $env:SystemRoot 'System32\\WindowsPowerShell\\v1.0\\powershell.exe'; $dSc.Arguments = '-NoProfile -ExecutionPolicy Bypass -File "' + $dPs1 + '"'; $dSc.WorkingDirectory = '${deskDirQ}'; $dSc.IconLocation = $dIco + ',0'; $dSc.Save(); 'desk: Summrise.lnk repointed to electron shell' | ${sink} } catch { ('desk: Summrise.lnk repair failed: ' + $_.Exception.Message) | ${sink} }`,
-        // The verification is the READ-BACK, not the absence of an exception: SetValue+Commit
-        // returning cleanly is a claim about a call, and this records what the file now carries.
-        `  if ($dSet) { try { [SummriseLnk]::Write($dLnk, $dId, $dRes); ('desk: Summrise.lnk taskbar identity [' + [SummriseLnk]::Read($dLnk) + ']') | ${sink} } catch { ('desk: Summrise.lnk identity write failed: ' + $_.Exception.Message) | ${sink} } }`,
+        // The Start Menu link is created when ABSENT and rewritten when its identity is wrong —
+        // it is never deleted, and a link that already matches is left alone so a second `setup`
+        // does not churn the file.
+        `$dSmNeed = $false`,
+        `if ($dShell) {`,
+        `  if (-not (Test-Path $dSm)) { $dSmNeed = $true }`,
+        `  elseif (-not $dSet) { $dSmNeed = $true }`,
+        `  else { try { if (([SummriseLnk]::Read($dSm)) -ne ($dId + '|' + $dRes)) { $dSmNeed = $true } } catch { $dSmNeed = $true } }`,
+        `}`,
+        `if ($dNeed -and $dShell) {`,
+        ...lnk("$dLnk", "1"),
+        `}`,
+        `if ($dSmNeed -and $dShell) {`,
+        ...lnk("$dSm", "2"),
         `}`,
         `foreach ($dRx in @('summrise-desktop.exe','summrise-tray.exe')) { $dRp = '${deskDirQ}\\' + $dRx; if (Test-Path $dRp) { try { Remove-Item -Force -ErrorAction Stop $dRp; ('desk: removed retired ' + $dRx) | ${sink} } catch { ('desk: retired ' + $dRx + ' locked, kept') | ${sink} } } }`,
     ];
@@ -505,7 +568,30 @@ function desktopTaskPs(installQ) {
         `$dt1 = New-ScheduledTaskTrigger -AtLogOn`,
         `$dw1 = New-ScheduledTaskTrigger -Once -At (Get-Date).AddMinutes(3) -RepetitionInterval (New-TimeSpan -Minutes 5)`,
         `$pr = New-ScheduledTaskPrincipal -UserId ('{0}\\{1}' -f $env:USERDOMAIN, $env:USERNAME) -LogonType Interactive -RunLevel Highest`,
-        `$st = New-ScheduledTaskSettingsSet -ExecutionTimeLimit (New-TimeSpan -Minutes 10) -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -MultipleInstances IgnoreNew`,
+        // NO EXECUTION TIME LIMIT -- the same value, in the same spelling, the agent's own task has
+        // carried since round 118 for the same reason: `- ExecutionTimeLimit 0   never kill the
+        // running task`. It was `-Minutes 10` here, and that WAS the defect.
+        //
+        // WHY A LIMIT KILLS A SHELL MEANT TO LIVE INDEFINITELY: this task's action is
+        // desktop-pulse.vbs -> ensure-desktop.ps1 -> start-desktop.ps1, and that last line is
+        // `& electron.exe .` -- the PowerShell CALL OPERATOR, which WAITS. The PowerShell the task
+        // launched therefore stays alive for as long as the shell does, as the shell's PARENT, and
+        // Task Scheduler enforces ExecutionTimeLimit on that process tree. Ten minutes after every
+        // start the scheduler killed the running shell; five minutes later the guarded pulse
+        // correctly brought a fresh one back; ten minutes after that it died again. The operator
+        // reported that as "反复重启", four times.
+        //
+        // NOTHING RELIED ON THE KILL, which is why removing it is the fix rather than a trade. This
+        // repository's recovery for a shell that is GONE is the guarded 5-minute pulse, and
+        // summrise-desktop-electron/src/main.ts says so from the other side, naming a logon-only task
+        // as one that "cannot recover a wedged shell". A shell that is RUNNING but wedged was never
+        // this limit's business either: the pulse's guard is a process-EXISTENCE check
+        // (`if (Get-Process electron) { exit }`), so it cannot see a wedged shell whether the limit is
+        // ten minutes or absent. `summrise update` is what heals a wedged shell, and its log says so.
+        //
+        // Measured on desktop-14rjcr8: under PT10M the four electron PIDs were replaced about every
+        // ten minutes; under PT0S the same four PIDs were still there 11 minutes later.
+        `$st = New-ScheduledTaskSettingsSet -ExecutionTimeLimit (New-TimeSpan -Seconds 0) -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -MultipleInstances IgnoreNew`,
         `Register-ScheduledTask SummriseDesktop -Action $da -Trigger @($dt1,$dw1) -Principal $pr -Settings $st -Force | Out-Null`,
         `Start-ScheduledTask -TaskName SummriseDesktop`,
     ];
@@ -3021,7 +3107,15 @@ const commands = {
             `  $da = New-ScheduledTaskAction -Execute 'wscript.exe' -Argument ('"' + $vb1 + '"') -WorkingDirectory '${q}'`,
             `  $dt1 = New-ScheduledTaskTrigger -AtLogOn`,
             `  $dw1 = New-ScheduledTaskTrigger -Once -At (Get-Date).AddMinutes(3) -RepetitionInterval (New-TimeSpan -Minutes 5)`,
-            `  Set-ScheduledTask -TaskName 'SummriseDesktop' -Action $da -Trigger @($dt1, $dw1) | Out-Null`,
+            // AND THE SETTINGS, WHICH IS THE HALF THAT REACHES A MACHINE ALREADY INSTALLED.
+            // This call used to pass only -Action and -Trigger, and `Set-ScheduledTask` PRESERVES the
+            // components it is not given — so an execution limit already on the task survived every
+            // update. That is the wrong shape for a heal: `summrise update` is the only mechanism that
+            // reaches the fleet, and a device carrying the old 10-minute limit would have kept it
+            // forever while its log said "hardened". The value is the same one `setup` writes, so the
+            // two cannot diverge — and installer_integrity.rs holds both ends to it.
+            `  $dst = New-ScheduledTaskSettingsSet -ExecutionTimeLimit (New-TimeSpan -Seconds 0) -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -MultipleInstances IgnoreNew`,
+            `  Set-ScheduledTask -TaskName 'SummriseDesktop' -Action $da -Trigger @($dt1, $dw1) -Settings $dst | Out-Null`,
             `  "[$(Get-Date -Format o)] desk: SummriseDesktop hardened (guarded 5-min pulse)" | ${log}`,
             `}`,
             `if ((Test-Path $deskDir) -and (Test-Path $deskStart)) {`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "summrise-agent",
-  "version": "1.2.491",
+  "version": "1.2.492",
   "description": "Summrise Agent — Windows device MCP server (terminal/SSH/serial) + panel. Self-hosted npm distribution.",
   "//build": "唯一构建路径：在本目录执行 npm run build。它是自包含的：经 npm exec 按需拉取 typescript@5，无需预装任何 node_modules（干净检出可跑；旧脚本引用 ../summrise-desktop-electron/node_modules/.bin/tsc，干净检出必 ENOENT）。必须用 npm exec --package … -- tsc 的形式：npx 会吃掉传给 tsc 的 -p/--outDir 等参数（round-435：npx 写法从未真正跑通过）。先编 electron TS（--noCheck 纯 emit，与 release.yml 一致）同步两处 src/*.js，再编 src/summrise.ts 到 bin/summrise.js 并校验 round-298 标记（弱 oracle，只证某次构建发生，新鲜性由 publish-release.sh 的 tsc 重编 + cmp 门保证）。",
   "bin": {

package/summrise-desktop-electron/src/main.js

@@ -909,10 +909,17 @@ if (gotTheLock) {
     // there) as System.AppUserModel.ID — the same string — plus RelaunchIconResource pointing
     // at the sunrise .ico. KEEP THE TWO IN STEP; the literal below is a copy because this file
     // is emitted to plain JS in two packages and cannot import the CLI's module.
+    // THE VALUE IS NOT THE ONE THIS FILE USED BEFORE ("…summrise.agent"), and that is the
+    // measured half of the fix rather than a rename. On desktop-14rjcr8, with that string set
+    // on the window AND read back off the shortcut, the taskbar still drew the Electron logo:
+    // releases up to 1.2.489 had already resolved that AUMID — set with no shortcut anywhere —
+    // against the backing executable and kept the answer, and `shell:AppsFolder` still lists it
+    // as an app named "Electron". The same machine drew the SUNRISE under a string it had never
+    // seen, with every other variable held. DESKTOP_AUMID carries the two-row table.
     // (The same shortcut association is also the documented precondition for the hide-to-tray
     // toast below: Electron requires a Start Menu shortcut carrying the ID and a
     // ToastActivatorCLSID, and this one carries neither — unchanged by this call.)
-    const AUMID = "online.saisi.summrise.agent";
+    const AUMID = "online.saisi.summrise.desktop";
     try {
         if (process.platform === "win32")
             electron_1.app.setAppUserModelId(AUMID);