dsh-nextsteps 1.4.6 → 1.4.8

package/client.js

@@ -10,6 +10,8 @@ window.__ModuleLoader__.load({
     const MAX_FOLLOWUPS = 6;
     const PROMPT_TRUNCATE = 60;
     const CLICKED_KEY = 'dsh-nextsteps.clicked';
+    const UPDATE_KEY = 'dsh-nextsteps.updated';
+    const remembered = () => { try { return localStorage.getItem(UPDATE_KEY); } catch { return null; } };
 
 
     const CSS = `
@@ -371,14 +373,6 @@ window.__ModuleLoader__.load({
     let pluginSettings = { lang: 'auto', maxFollowups: 3, showHeader: true };
     let updateManager = undefined;
 
-    function compareVersions(a, b) {
-      const pa = String(a ?? '').replace(/^v/, '').split('.').map((part) => Number(part) || 0);
-      const pb = String(b ?? '').replace(/^v/, '').split('.').map((part) => Number(part) || 0);
-      for (let index = 0; index < Math.max(pa.length, pb.length); index += 1) {
-        if ((pa[index] ?? 0) !== (pb[index] ?? 0)) return (pa[index] ?? 0) < (pb[index] ?? 0) ? -1 : 1;
-      }
-      return 0;
-    }
     let pluginVersion;
 
     async function responseJson(response) {
@@ -565,8 +559,7 @@ window.__ModuleLoader__.load({
             const response = await fetch(UPDATE_ROUTE, { cache: 'no-store' });
             const info = await responseJson(response);
             if (!response.ok || info === null || typeof info !== 'object' || info.error !== undefined) throw new Error(info?.error ?? 'HTTP ' + response.status);
-            const installedNewer = compareVersions(info.installed, info.current) > 0;
-            const status = installedNewer ? 'restart' : info.newer !== true ? 'current' : info.managed ? 'available' : 'manual';
+            const status = info.newer !== true ? 'current' : remembered() === info.latest ? 'restart' : info.managed ? 'available' : 'manual';
             setUpdate({ status, info });
           } catch (error) {
             setUpdate((previous) => previous.status === 'restart' ? previous : { status: 'error', info: previous.info, error: String(error?.message ?? error) });
@@ -588,10 +581,12 @@ window.__ModuleLoader__.load({
             };
             let result = await installSpec(NPM_NAME + '@' + info.latest);
             if (result?.error?.code === 'already-installed') result = await installSpec('https://registry.npmjs.org/' + NPM_NAME + '/-/' + NPM_NAME + '-' + info.latest + '.tgz');
-            const firstLine = () => result?.error?.diagnostic?.split(String.fromCharCode(10)).find((line) => line.trim() !== '') ?? result?.error?.code ?? result?.application;
+            const diagnosticLines = String(result?.error?.diagnostic ?? '').split(String.fromCharCode(10)).map((line) => line.trim()).filter((line) => line !== '');
+            const firstLine = () => diagnosticLines.find((line) => line.startsWith('dsh:')) ?? diagnosticLines.at(-1) ?? result?.error?.code ?? result?.application;
             const live = result?.application === 'applied';
             if (!live && result?.application !== 'restart-required' && result?.version !== info.latest) throw new Error(firstLine());
             if (result?.application === 'failed') console.warn(`dsh-nextsteps: ${info.latest} is installed; dsh could not start it before a restart: ${firstLine()}`);
+            try { localStorage.setItem(UPDATE_KEY, info.latest); } catch { }
             setUpdate(live
               ? { status: 'current', info: { ...info, current: info.latest, newer: false } }
               : { status: 'restart', info });

package/cordis.patch.yml

@@ -0,0 +1,4 @@
+- insert:
+    - id: dsh-nextsteps
+      name: 'dsh-nextsteps'
+      config: {}

package/index.js

@@ -172,10 +172,6 @@ function nextstepsSectionText() {
   ].join('\n');
 }
 
-function onDiskVersion() {
-  try { return JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8')).version ?? null; } catch { return null; }
-}
-
 const PLUGIN_REV = 'sf-2';
 
 function toolSpec(settings = { lang: 'auto', maxFollowups: 3, model: '' }) {
@@ -453,7 +449,7 @@ async function apply(ctx) {
     fetch: async (request) => {
       try {
         const info = await checkUpdate(fetch, PACKAGE, request.signal);
-        return json({ ...info, installed: onDiskVersion() });
+        return json({ ...info, installed: undefined });
       } catch (error) {
         return json({ error: String(error?.message ?? error) }, 502);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-nextsteps",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "type": "module",
   "exports": {
     ".": "./index.js",
@@ -9,6 +9,7 @@
     "./package.json": "./package.json"
   },
   "files": [
+    "cordis.patch.yml",
     "index.js",
     "client.js",
     "lib/locale",