v1.0.40: bump version.json so auto-updater delivers update to staff

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

com.pdma.notion-timer.sdPlugin/bin/plugin.js

@@ -6438,7 +6438,7 @@ async function stopTimer(token, entryId) {
 }
 
 // src/plugin.ts
-var CURRENT_VERSION = "1.0.26";
+var CURRENT_VERSION = "1.0.40";
 var GITEA_BASE = "https://gitea.pdmarf.co.uk/pdm/stream_deck_notion_timer/raw/branch/stable-rebuild";
 var SIGNING_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----
 MCowBQYDK2VwAyEAN7ko8TUpuPzPAJuKAZCRjV0c4ZSlou5d9pUAF6o12b4=
@@ -6488,6 +6488,28 @@ async function checkForUpdates(sendStatus) {
       return;
     }
     const fs3 = await import("fs");
+    const path5 = await import("path");
+    const pluginRoot = path5.join(path5.dirname(__filename), "..");
+    const ASSETS = [
+      "ui/property-inspector.html",
+      "ui/global-property-inspector.html",
+      "imgs/idle.png",
+      "imgs/running.png"
+    ];
+    const PLUGIN_BASE = `${GITEA_BASE}/com.pdma.notion-timer.sdPlugin`;
+    const assetResps = await Promise.all(ASSETS.map((p) => fetchWithTimeout2(`${PLUGIN_BASE}/${p}`)));
+    for (let i = 0; i < ASSETS.length; i++) {
+      if (assetResps[i].ok) {
+        fs3.writeFileSync(path5.join(pluginRoot, ASSETS[i]), Buffer.from(await assetResps[i].arrayBuffer()));
+      }
+    }
+    const LEGACY = ["imgs/idle.svg", "imgs/running.svg"];
+    for (const f of LEGACY) {
+      try {
+        fs3.unlinkSync(path5.join(pluginRoot, f));
+      } catch {
+      }
+    }
     fs3.writeFileSync(__filename, newCode);
     plugin_default.logger.info(`Updated to ${version}, restarting\u2026`);
     process.exit(0);
@@ -6506,55 +6528,29 @@ async function getGlobal() {
   return { ...stored, ...HARDCODED };
 }
 var memRunningEntryId = void 0;
-async function getRunningEntryId() {
-  if (memRunningEntryId === void 0) {
+var memRunningActionId = void 0;
+async function loadRunningState() {
+  if (memRunningEntryId !== void 0) return;
   const stored = await plugin_default.settings.getGlobalSettings();
   memRunningEntryId = stored.runningEntryId ?? null;
+  memRunningActionId = stored.runningActionId ?? null;
 }
-  return memRunningEntryId;
-}
-async function setRunningEntry(entryId) {
+function setRunningEntry(entryId, actionId) {
   memRunningEntryId = entryId;
-  const stored = await plugin_default.settings.getGlobalSettings();
-  await plugin_default.settings.setGlobalSettings({ ...stored, runningEntryId: entryId });
+  memRunningActionId = actionId;
+  plugin_default.settings.getGlobalSettings().then((stored) => plugin_default.settings.setGlobalSettings({ ...stored, runningEntryId: entryId, runningActionId: actionId })).catch((err) => plugin_default.logger.error("Failed to persist running state:", err));
 }
-function isConfigured(g) {
-  return !!(g.notionToken && g.userId);
-}
-function buttonTitle(projectName) {
-  return projectName.replace(/^[\p{Extended_Pictographic}\uFE0F\s]+/u, "").trim();
-}
-var TimerToggle = class extends SingletonAction {
-  settingsCache = /* @__PURE__ */ new Map();
-  async onWillAppear(ev) {
-    const { activeEntryId, projectName } = ev.payload.settings;
-    const title = buttonTitle(projectName || "");
-    const running = await getRunningEntryId();
-    const isRunning = !!activeEntryId && activeEntryId === running;
-    if (activeEntryId && !isRunning) {
-      const cleared = { ...ev.payload.settings, activeEntryId: null };
-      await ev.action.setSettings(cleared);
-      this.settingsCache.set(ev.action.id, cleared);
-      await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
-    } else {
-      this.settingsCache.set(ev.action.id, ev.payload.settings);
-      if (isRunning) {
-        await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
-      } else {
-        await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
-      }
-    }
-  }
-  async onPropertyInspectorDidAppear(ev) {
+async function sendProjectsToPI(tokenOverride) {
   try {
     const global = await getGlobal();
-      if (!global.notionToken) {
+    const token = tokenOverride ?? global.notionToken;
+    if (!token) {
       await plugin_default.ui.sendToPropertyInspector({ event: "projects", data: [], error: "Enter your Notion API token above.", version: CURRENT_VERSION });
       return;
     }
     const [projects, usersResult] = await Promise.all([
-        fetchProjects(global.notionToken, global.projectsDbId),
-        fetchUsers(global.notionToken).catch((err) => {
+      fetchProjects(token, global.projectsDbId),
+      fetchUsers(token).catch((err) => {
         plugin_default.logger.error("Failed to fetch users:", err);
         return [];
       })
@@ -6565,11 +6561,51 @@ var TimerToggle = class extends SingletonAction {
     await plugin_default.ui.sendToPropertyInspector({ event: "projects", data: [], error: String(err), version: CURRENT_VERSION });
   }
 }
+function isConfigured(g) {
+  return !!(g.notionToken && g.userId);
+}
+function buttonTitle(projectName) {
+  return projectName.replace(/^[\p{Extended_Pictographic}\uFE0F\s]+/u, "").trim();
+}
+var TimerToggle = class extends SingletonAction {
+  projectCache = /* @__PURE__ */ new Map();
+  pendingKeyDown = /* @__PURE__ */ new Set();
+  async onWillAppear(ev) {
+    this.projectCache.set(ev.action.id, ev.payload.settings);
+    const title = buttonTitle(ev.payload.settings.projectName || "");
+    await loadRunningState();
+    const isRunning = memRunningActionId === ev.action.id;
+    if (isRunning) {
+      await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
+    } else {
+      await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+    }
+  }
+  async onPropertyInspectorDidAppear(_ev) {
+    await sendProjectsToPI();
+  }
   async onKeyDown(ev) {
-    this.settingsCache.set(ev.action.id, ev.payload.settings);
-    const global = await getGlobal();
-    const { projectId, projectName, activeEntryId } = ev.payload.settings;
+    if (this.pendingKeyDown.has(ev.action.id)) return;
+    this.pendingKeyDown.add(ev.action.id);
+    try {
+      const { projectId, projectName } = ev.payload.settings;
       const title = buttonTitle(projectName || "");
+      const isRunning = memRunningActionId === ev.action.id;
+      if (projectId) {
+        if (isRunning) {
+          await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+        } else {
+          for (const other of this.actions) {
+            if (other.id === ev.action.id) continue;
+            if (memRunningActionId === other.id) {
+              const s = this.projectCache.get(other.id);
+              await Promise.all([other.setState(0), other.setTitle(buttonTitle(s?.projectName || ""))]);
+            }
+          }
+          await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
+        }
+      }
+      const global = await getGlobal();
       if (!isConfigured(global)) {
         await ev.action.showAlert();
         return;
@@ -6579,54 +6615,29 @@ var TimerToggle = class extends SingletonAction {
         return;
       }
       try {
-      if (activeEntryId) {
-        await stopTimer(global.notionToken, activeEntryId);
-        const stopped = { ...ev.payload.settings, activeEntryId: null };
-        await ev.action.setSettings(stopped);
-        this.settingsCache.set(ev.action.id, stopped);
-        await ev.action.setState(0);
-        await ev.action.setTitle(title);
-        await setRunningEntry(null);
+        if (isRunning) {
+          await stopTimer(global.notionToken, memRunningEntryId);
+          setRunningEntry(null, null);
+          await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
         } else {
-        const prevEntryId = await getRunningEntryId();
-        if (prevEntryId) {
-          for (const other of this.actions) {
-            if (other.id === ev.action.id) continue;
-            const otherSettings = this.settingsCache.get(other.id);
-            if (otherSettings?.activeEntryId === prevEntryId) {
-              await Promise.all([other.setState(0), other.setTitle(buttonTitle(otherSettings.projectName || ""))]);
-            }
-          }
+          if (memRunningEntryId) {
+            await stopTimer(global.notionToken, memRunningEntryId);
           }
+          const entryId = await startTimer(global.notionToken, global.timingDbId, projectId, projectName, global.userId);
+          setRunningEntry(entryId, ev.action.id);
           await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
-        if (prevEntryId) {
-          await stopTimer(global.notionToken, prevEntryId);
-          for (const other of this.actions) {
-            if (other.id === ev.action.id) continue;
-            const otherSettings = this.settingsCache.get(other.id);
-            if (otherSettings?.activeEntryId === prevEntryId) {
-              const stopped = { ...otherSettings, activeEntryId: null };
-              await other.setSettings(stopped);
-              this.settingsCache.set(other.id, stopped);
-            }
-          }
-        }
-        const entryId = await startTimer(
-          global.notionToken,
-          global.timingDbId,
-          projectId,
-          projectName,
-          global.userId
-        );
-        const started = { ...ev.payload.settings, activeEntryId: entryId };
-        await ev.action.setSettings(started);
-        this.settingsCache.set(ev.action.id, started);
-        await setRunningEntry(entryId);
         }
       } catch (err) {
+        await Promise.all([
+          ev.action.setState(isRunning ? 1 : 0),
+          ev.action.setTitle(isRunning ? `\u23F1 ${title}` : title)
+        ]);
         plugin_default.logger.error("Timer toggle failed:", err);
         await ev.action.showAlert();
       }
+    } finally {
+      this.pendingKeyDown.delete(ev.action.id);
+    }
   }
 };
 TimerToggle = __decorateClass([
@@ -6640,6 +6651,9 @@ plugin_default.ui.onSendToPlugin(async (ev) => {
     const title = buttonTitle(ev.payload.settings.projectName || "");
     if (title) await ev.action.setTitle(title);
   }
+  if (ev.payload.event === "refreshProjects") {
+    await sendProjectsToPI(ev.payload.token);
+  }
   if (ev.payload.event === "checkForUpdates") {
     const send = (msg) => plugin_default.ui.sendToPropertyInspector({ event: "updateStatus", message: msg });
     send("Checking\u2026");

com.pdma.notion-timer.sdPlugin/manifest.json

@@ -2,7 +2,7 @@
   "Author": "Pete Marfleet",
   "Description": "Toggle Notion time tracking for a project with a single button press.",
   "Name": "Notion Timer",
-  "Version": "1.0.0",
+  "Version": "1.0.39",
   "SDKVersion": 2,
   "Software": { "MinimumVersion": "5.0" },
   "OS": [{ "Platform": "mac", "MinimumVersion": "10.11" }],

com.pdma.notion-timer.sdPlugin/ui/property-inspector.html

@@ -127,7 +127,6 @@
         <option value="">— Select your name —</option>
       </select>
     </div>
-    <p id="userError" class="hint" style="color:#e57373;padding-left:0;"></p>
     <p class="hint">Shared across all buttons. Select once per device.</p>
     <p id="credStatus"></p>
     <hr class="divider">
@@ -162,6 +161,8 @@
     var currentSettings = {};
     var credSaveTimer = null;
     var credConfigured = false;
+    var globalUserId = "";
+    var cachedUsers = [];
 
     function setStatus(msg, cls) {
       var el = document.getElementById("statusText");
@@ -194,30 +195,35 @@
         userId:      document.getElementById("userId").value,
       };
       $PI.setGlobalSettings(creds);
+      globalUserId = creds.userId;
       setCredStatus("Credentials saved.", "ok");
-      if (creds.notionToken) {
-        $PI.sendToPlugin({ event: "refresh", notionToken: creds.notionToken });
-      }
     }
 
-    function populateUsers(users, savedUserId) {
+    function scheduleCredSave() {
+      clearTimeout(credSaveTimer);
+      credSaveTimer = setTimeout(function() {
+        saveCredentials();
+        var token = document.getElementById("notionToken").value.trim();
+        if (token) {
+          setStatus("Loading…", "");
+          $PI.sendToPlugin({ event: "refreshProjects", token: token });
+        }
+      }, 600);
+    }
+
+    function populateUsers(users, userId) {
+      cachedUsers = users;
       var sel = document.getElementById("userId");
-      var current = savedUserId || sel.value;
       sel.innerHTML = '<option value="">— Select your name —</option>';
       users.forEach(function(u) {
         var opt = document.createElement("option");
         opt.value = u.id;
         opt.textContent = u.name;
-        if (u.id === current) opt.selected = true;
+        if (u.id === userId) opt.selected = true;
         sel.appendChild(opt);
       });
     }
 
-    function scheduleCredSave() {
-      clearTimeout(credSaveTimer);
-      credSaveTimer = setTimeout(saveCredentials, 600);
-    }
-
     function save() {
       var sel = document.getElementById("projectSelect");
       var opt = sel.options[sel.selectedIndex];
@@ -264,11 +270,10 @@
     $PI.onDidReceiveGlobalSettings(function(jsn) {
       var s = jsn.payload.settings || {};
       document.getElementById("notionToken").value = s.notionToken || "";
-      if (s.userId) {
-        var sel = document.getElementById("userId");
-        if (sel.querySelector('option[value="' + s.userId + '"]')) {
-          sel.value = s.userId;
-        }
+      globalUserId = s.userId || "";
+      if (globalUserId && cachedUsers.length > 0) {
+        // Users already loaded — re-populate with correct selection
+        populateUsers(cachedUsers, globalUserId);
       }
 
       credConfigured = !!(s.notionToken && s.userId);
@@ -300,25 +305,13 @@
       var payload = jsn.payload;
       if (payload.event === "updateStatus") {
         document.getElementById("updateStatus").textContent = payload.message;
-        if (payload.message && payload.message.indexOf("Updating") === 0) {
-          setTimeout(function() { location.reload(); }, 4000);
-        }
       }
       if (payload.event === "projects") {
         if (payload.version) {
           document.getElementById("versionText").textContent = "v" + payload.version;
         }
-        if (payload.users !== undefined) {
-          var savedUserId = document.getElementById("userId").value;
-          populateUsers(payload.users, savedUserId);
-          var userErr = document.getElementById("userError");
-          if (payload.usersError) {
-            userErr.textContent = "Could not load names: " + payload.usersError;
-          } else if (payload.users.length === 0) {
-            userErr.textContent = "No users found — check the integration has \u201cRead user information\u201d enabled.";
-          } else {
-            userErr.textContent = "";
-          }
+        if (payload.users) {
+          populateUsers(payload.users, globalUserId);
         }
         if (payload.error) {
           setStatus(payload.error, "error");

install.sh

@@ -7,7 +7,7 @@ TMP_DIR=$(mktemp -d)
 PLUGIN_FILE="${TMP_DIR}/notion-timer.streamDeckPlugin"
 
 echo "Downloading Notion Timer..."
-curl -sL "${GITEA}/${REPO}/raw/branch/master/notion-timer.streamDeckPlugin" -o "${PLUGIN_FILE}"
+curl -sL "${GITEA}/${REPO}/raw/branch/stable-rebuild/notion-timer.streamDeckPlugin" -o "${PLUGIN_FILE}"
 
 echo "Installing — Stream Deck will open automatically..."
 open "${PLUGIN_FILE}"

package.json

@@ -4,7 +4,7 @@
   "description": "Notion time tracking toggle for Stream Deck",
   "scripts": {
     "build": "esbuild src/plugin.ts --bundle --platform=node --target=node20 --outfile=com.pdma.notion-timer.sdPlugin/bin/plugin.js --external:electron && node scripts/sign.js",
-    "package": "npm run build && rm -f notion-timer.streamDeckPlugin && zip -r notion-timer.streamDeckPlugin com.pdma.notion-timer.sdPlugin && echo 'Packaged: notion-timer.streamDeckPlugin'",
+    "package": "npm run build && zip -r notion-timer.streamDeckPlugin com.pdma.notion-timer.sdPlugin && echo 'Packaged: notion-timer.streamDeckPlugin'",
     "dev": "esbuild src/plugin.ts --bundle --platform=node --target=node20 --outfile=com.pdma.notion-timer.sdPlugin/bin/plugin.js --external:electron --watch",
     "sign": "node scripts/sign.js",
     "link": "ln -sf \"$(pwd)/com.pdma.notion-timer.sdPlugin\" \"$HOME/Library/Application Support/com.elgato.StreamDeck/Plugins/com.pdma.notion-timer.sdPlugin\"",

src/plugin.ts

@@ -1,20 +1,16 @@
-const CURRENT_VERSION = "1.0.22";
-const GITEA_BASE = "https://gitea.pdmarf.co.uk/pdm/stream_deck_notion_timer/raw/branch/master";
+const CURRENT_VERSION = "1.0.40";
+const GITEA_BASE = "https://gitea.pdmarf.co.uk/pdm/stream_deck_notion_timer/raw/branch/stable-rebuild";
 const SIGNING_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----
 MCowBQYDK2VwAyEAN7ko8TUpuPzPAJuKAZCRjV0c4ZSlou5d9pUAF6o12b4=
 -----END PUBLIC KEY-----`;
 
 function isNewerVersion(remote: string, current: string): boolean {
   const parse = (v: string) => v.split(".").map(Number);
-  const r = parse(remote);
-  const c = parse(current);
-  const len = Math.max(r.length, c.length);
-  for (let i = 0; i < len; i++) {
-    const rv = r[i] ?? 0;
-    const cv = c[i] ?? 0;
-    if (rv !== cv) return rv > cv;
-  }
-  return false;
+  const [rMaj, rMin, rPat] = parse(remote);
+  const [cMaj, cMin, cPat] = parse(current);
+  if (rMaj !== cMaj) return rMaj > cMaj;
+  if (rMin !== cMin) return rMin > cMin;
+  return rPat > cPat;
 }
 
 function fetchWithTimeout(url: string): Promise<Response> {
@@ -28,17 +24,16 @@ async function checkForUpdates(sendStatus?: (msg: string) => void): Promise<void
     const resp = await fetchWithTimeout(`${GITEA_BASE}/version.json`);
     if (!resp.ok) { sendStatus?.("Update check failed"); return; }
     const { version } = await resp.json() as { version: string };
-    if (!/^\d+(\.\d+)+$/.test(version)) return;
+    if (!/^\d+\.\d+\.\d+$/.test(version)) return;
     if (!isNewerVersion(version, CURRENT_VERSION)) {
       sendStatus?.(`Already up to date (v${CURRENT_VERSION})`);
       return;
     }
 
     sendStatus?.(`Updating to v${version}…`);
-    const PLUGIN_BASE = `${GITEA_BASE}/com.pdma.notion-timer.sdPlugin`;
     const [pluginResp, sigResp] = await Promise.all([
-      fetchWithTimeout(`${PLUGIN_BASE}/bin/plugin.js`),
-      fetchWithTimeout(`${PLUGIN_BASE}/bin/plugin.js.sig`),
+      fetchWithTimeout(`${GITEA_BASE}/com.pdma.notion-timer.sdPlugin/bin/plugin.js`),
+      fetchWithTimeout(`${GITEA_BASE}/com.pdma.notion-timer.sdPlugin/bin/plugin.js.sig`),
     ]);
     if (!pluginResp.ok || !sigResp.ok) { sendStatus?.("Download failed"); return; }
 
@@ -57,29 +52,26 @@ async function checkForUpdates(sendStatus?: (msg: string) => void): Promise<void
     const path = await import("path");
     const pluginRoot = path.join(path.dirname(__filename), "..");
 
-    // Also update UI and image assets. These are not separately signed — they run in a browser
-    // sandbox (not Node), and are fetched over HTTPS from the same trusted server.
     const ASSETS = [
       "ui/property-inspector.html",
       "ui/global-property-inspector.html",
       "imgs/idle.png",
       "imgs/running.png",
     ];
+    const PLUGIN_BASE = `${GITEA_BASE}/com.pdma.notion-timer.sdPlugin`;
     const assetResps = await Promise.all(ASSETS.map(p => fetchWithTimeout(`${PLUGIN_BASE}/${p}`)));
-
-    fs.writeFileSync(__filename, newCode);
     for (let i = 0; i < ASSETS.length; i++) {
-      if (!assetResps[i].ok) { streamDeck.logger.warn(`Asset download failed: ${ASSETS[i]}`); continue; }
+      if (assetResps[i].ok) {
         fs.writeFileSync(path.join(pluginRoot, ASSETS[i]), Buffer.from(await assetResps[i].arrayBuffer()));
       }
+    }
 
-    // Remove legacy files that were replaced in older versions but persist on disk
-    // because Stream Deck merges rather than replaces the plugin folder on reinstall.
     const LEGACY = ["imgs/idle.svg", "imgs/running.svg"];
     for (const f of LEGACY) {
       try { fs.unlinkSync(path.join(pluginRoot, f)); } catch { /* already gone */ }
     }
 
+    fs.writeFileSync(__filename, newCode);
     streamDeck.logger.info(`Updated to ${version}, restarting…`);
     process.exit(0);
   } catch (err) {
@@ -104,12 +96,12 @@ interface GlobalSettings {
   projectsDbId: string;
   userId: string;
   runningEntryId?: string | null;
+  runningActionId?: string | null;
 }
 
 interface TimerSettings {
   projectId: string;
   projectName: string;
-  activeEntryId: string | null;
 }
 
 const HARDCODED = {
@@ -122,41 +114,42 @@ async function getGlobal(): Promise<GlobalSettings> {
   return { ...stored, ...HARDCODED };
 }
 
-// In-memory cache so onWillAppear can check running state without an async round-trip
-let memRunningEntryId: string | null | undefined = undefined; // undefined = not yet loaded
+// In-memory running state — avoids async round-trips on every button press
+let memRunningEntryId:  string | null | undefined = undefined;
+let memRunningActionId: string | null | undefined = undefined;
 
-async function getRunningEntryId(): Promise<string | null> {
-  if (memRunningEntryId === undefined) {
+async function loadRunningState(): Promise<void> {
+  if (memRunningEntryId !== undefined) return;
   const stored = await streamDeck.settings.getGlobalSettings<GlobalSettings>();
   memRunningEntryId  = stored.runningEntryId  ?? null;
-  }
-  return memRunningEntryId;
+  memRunningActionId = stored.runningActionId ?? null;
 }
 
-async function setRunningEntry(entryId: string | null): Promise<void> {
+function setRunningEntry(entryId: string | null, actionId: string | null): void {
   memRunningEntryId  = entryId;
-  const stored = await streamDeck.settings.getGlobalSettings<GlobalSettings>();
-  await streamDeck.settings.setGlobalSettings({ ...stored, runningEntryId: entryId });
+  memRunningActionId = actionId;
+  // Persist in background — do not await, so the visual is never blocked
+  streamDeck.settings.getGlobalSettings<GlobalSettings>()
+    .then(stored => streamDeck.settings.setGlobalSettings({ ...stored, runningEntryId: entryId, runningActionId: actionId }))
+    .catch(err => streamDeck.logger.error("Failed to persist running state:", err));
 }
 
-async function sendProjectsToPI(overrideToken?: string): Promise<void> {
+async function sendProjectsToPI(tokenOverride?: string): Promise<void> {
   try {
     const global = await getGlobal();
-    const token = overrideToken || global.notionToken;
+    const token = tokenOverride ?? global.notionToken;
     if (!token) {
       await streamDeck.ui.sendToPropertyInspector({ event: "projects", data: [], error: "Enter your Notion API token above.", version: CURRENT_VERSION });
       return;
     }
-    let usersResult: Awaited<ReturnType<typeof fetchUsers>> = [];
-    let usersError: string | undefined;
-    const [projects] = await Promise.all([
+    const [projects, usersResult] = await Promise.all([
       fetchProjects(token, global.projectsDbId),
-      fetchUsers(token).then((u) => { usersResult = u; }).catch((err) => {
+      fetchUsers(token).catch((err) => {
         streamDeck.logger.error("Failed to fetch users:", err);
-        usersError = err instanceof Error ? err.message : String(err);
+        return [];
       }),
     ]);
-    await streamDeck.ui.sendToPropertyInspector({ event: "projects", data: projects, users: usersResult, usersError, version: CURRENT_VERSION });
+    await streamDeck.ui.sendToPropertyInspector({ event: "projects", data: projects, users: usersResult, version: CURRENT_VERSION });
   } catch (err) {
     streamDeck.logger.error("Failed to fetch projects:", err);
     await streamDeck.ui.sendToPropertyInspector({ event: "projects", data: [], error: String(err), version: CURRENT_VERSION });
@@ -167,120 +160,98 @@ function isConfigured(g: GlobalSettings): boolean {
   return !!(g.notionToken && g.userId);
 }
 
-// Strip leading emoji characters so the button title shows just the project name
 function buttonTitle(projectName: string): string {
   return projectName.replace(/^[\p{Extended_Pictographic}\uFE0F\s]+/u, "").trim();
 }
 
 @action({ UUID: "com.pdma.notion-timer.toggle" })
 class TimerToggle extends SingletonAction<TimerSettings> {
-  private settingsCache = new Map<string, TimerSettings>();
+  private projectCache = new Map<string, TimerSettings>();
+  private pendingKeyDown = new Set<string>();
 
   async onWillAppear(ev: WillAppearEvent<TimerSettings>): Promise<void> {
-    const { activeEntryId, projectName } = ev.payload.settings;
-    const title = buttonTitle(projectName || "");
-
-    // Use in-memory cache to determine correct state before rendering — no flash
-    const running = await getRunningEntryId();
-    const isRunning = !!activeEntryId && activeEntryId === running;
-
-    if (activeEntryId && !isRunning) {
-      // Self-heal: this button thinks it's running but it's not — clear it
-      const cleared = { ...ev.payload.settings, activeEntryId: null };
-      await ev.action.setSettings(cleared);
-      this.settingsCache.set(ev.action.id, cleared);
-      await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
-    } else {
-      this.settingsCache.set(ev.action.id, ev.payload.settings);
+    this.projectCache.set(ev.action.id, ev.payload.settings);
+    const title = buttonTitle(ev.payload.settings.projectName || "");
+    await loadRunningState();
+    const isRunning = memRunningActionId === ev.action.id;
     if (isRunning) {
       await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
     } else {
       await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
     }
   }
-  }
 
   async onPropertyInspectorDidAppear(_ev: PropertyInspectorDidAppearEvent<TimerSettings>): Promise<void> {
     await sendProjectsToPI();
   }
 
   async onKeyDown(ev: KeyDownEvent<TimerSettings>): Promise<void> {
-    this.settingsCache.set(ev.action.id, ev.payload.settings);
-    const global = await getGlobal();
-    const { projectId, projectName, activeEntryId } = ev.payload.settings;
-    const title = buttonTitle(projectName || "");
-
-    if (!isConfigured(global)) {
-      await ev.action.showAlert();
-      return;
-    }
-
-    if (!projectId) {
-      await ev.action.showAlert();
-      return;
-    }
-
+    if (this.pendingKeyDown.has(ev.action.id)) return;
+    this.pendingKeyDown.add(ev.action.id);
     try {
-      if (activeEntryId) {
-        await stopTimer(global.notionToken, activeEntryId);
-        const stopped = { ...ev.payload.settings, activeEntryId: null };
-        await ev.action.setSettings(stopped);
-        this.settingsCache.set(ev.action.id, stopped);
-        await ev.action.setState(0);
-        await ev.action.setTitle(title);
-        await setRunningEntry(null);
-      } else {
-        const prevEntryId = await getRunningEntryId();
+    const { projectId, projectName } = ev.payload.settings;
+    const title = buttonTitle(projectName || "");
+    const isRunning = memRunningActionId === ev.action.id;
 
-        // Stop previous timer
-        if (prevEntryId) {
-          await stopTimer(global.notionToken, prevEntryId);
+    // Instant visual feedback — no setSettings, no flash
+    if (projectId) {
+      if (isRunning) {
+        await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+      } else {
         for (const other of this.actions) {
           if (other.id === ev.action.id) continue;
-            const otherSettings = this.settingsCache.get(other.id);
-            if (otherSettings?.activeEntryId === prevEntryId) {
-              const stopped = { ...otherSettings, activeEntryId: null };
-              await other.setSettings(stopped);
-              this.settingsCache.set(other.id, stopped);
-              await other.setState(0);
-              await other.setTitle(buttonTitle(otherSettings.projectName || ""));
+          if (memRunningActionId === other.id) {
+            const s = this.projectCache.get(other.id);
+            await Promise.all([other.setState(0), other.setTitle(buttonTitle(s?.projectName || ""))]);
           }
         }
+        await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
+      }
     }
 
-        const entryId = await startTimer(
-          global.notionToken,
-          global.timingDbId,
-          projectId,
-          projectName,
-          global.userId,
-        );
-        const started = { ...ev.payload.settings, activeEntryId: entryId };
-        await ev.action.setSettings(started);
-        this.settingsCache.set(ev.action.id, started);
-        await setRunningEntry(entryId);
-        await ev.action.setState(1);
-        await ev.action.setTitle(`⏱ ${title}`);
+    const global = await getGlobal();
+    if (!isConfigured(global)) { await ev.action.showAlert(); return; }
+    if (!projectId)             { await ev.action.showAlert(); return; }
+
+    try {
+      if (isRunning) {
+        await stopTimer(global.notionToken, memRunningEntryId!);
+        setRunningEntry(null, null);
+        await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+      } else {
+        if (memRunningEntryId) {
+          await stopTimer(global.notionToken, memRunningEntryId);
+        }
+        const entryId = await startTimer(global.notionToken, global.timingDbId, projectId, projectName, global.userId);
+        setRunningEntry(entryId, ev.action.id);
+        await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
       }
     } catch (err) {
+      // Revert visual on error
+      await Promise.all([
+        ev.action.setState(isRunning ? 1 : 0),
+        ev.action.setTitle(isRunning ? `⏱ ${title}` : title),
+      ]);
       streamDeck.logger.error("Timer toggle failed:", err);
       await ev.action.showAlert();
     }
+    } finally {
+      this.pendingKeyDown.delete(ev.action.id);
+    }
   }
 }
 
 const timerAction = new TimerToggle();
 streamDeck.actions.registerAction(timerAction);
 
-// v2 requires using streamDeck.ui.onSendToPlugin — the SingletonAction method does not fire
-streamDeck.ui.onSendToPlugin<{ event: string; settings?: TimerSettings }>(async (ev) => {
+streamDeck.ui.onSendToPlugin<{ event: string; settings?: TimerSettings; token?: string }>(async (ev) => {
   if (ev.payload.event === "saveSettings" && ev.payload.settings) {
     await ev.action.setSettings(ev.payload.settings);
     const title = buttonTitle(ev.payload.settings.projectName || "");
     if (title) await ev.action.setTitle(title);
   }
-  if (ev.payload.event === "refresh") {
-    await sendProjectsToPI(ev.payload.notionToken as string | undefined);
+  if (ev.payload.event === "refreshProjects") {
+    await sendProjectsToPI(ev.payload.token);
   }
   if (ev.payload.event === "checkForUpdates") {
     const send = (msg: string) => streamDeck.ui.sendToPropertyInspector({ event: "updateStatus", message: msg });
@@ -291,5 +262,4 @@ streamDeck.ui.onSendToPlugin<{ event: string; settings?: TimerSettings }>(async
 
 streamDeck.connect();
 
-// Check for updates 10 seconds after startup to avoid disrupting initial connection
 setTimeout(() => checkForUpdates(), 10_000);

version.json

@@ -1 +1 @@
-{ "version": "1.0.26" }
+{ "version": "1.0.40" }