Merge stable-rebuild into master; everything now on master

Install script and auto-updater both point at master. No more separate branches needed. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Deploy stable-rebuild v1.0.26 plugin.js to master
2026-04-24 07:52:00 +01:00 · 2026-04-24 07:50:44 +01:00 · 2026-04-23 20:49:33 +01:00 · 2026-04-23 20:43:24 +01:00 · 2026-04-23 20:39:51 +01:00 · 2026-04-23 20:02:14 +01:00
9 changed files with 222 additions and 232 deletions
--- a/com.pdma.notion-timer.sdPlugin/bin/plugin.js
+++ b/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.39";
+var CURRENT_VERSION = "1.0.26";
 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,28 +6488,6 @@ 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);
@@ -6528,29 +6506,55 @@ async function getGlobal() {
  return { ...stored, ...HARDCODED };
 }
 var memRunningEntryId = void 0;
-var memRunningActionId = void 0;
-async function loadRunningState() {
-  if (memRunningEntryId !== void 0) return;
+async function getRunningEntryId() {
+  if (memRunningEntryId === void 0) {
    const stored = await plugin_default.settings.getGlobalSettings();
    memRunningEntryId = stored.runningEntryId ?? null;
-  memRunningActionId = stored.runningActionId ?? null;
  }
-function setRunningEntry(entryId, actionId) {
+  return memRunningEntryId;
+}
+async function setRunningEntry(entryId) {
  memRunningEntryId = 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));
+  const stored = await plugin_default.settings.getGlobalSettings();
+  await plugin_default.settings.setGlobalSettings({ ...stored, runningEntryId: entryId });
 }
-async function sendProjectsToPI(tokenOverride) {
+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) {
    try {
      const global = await getGlobal();
-    const token = tokenOverride ?? global.notionToken;
-    if (!token) {
+      if (!global.notionToken) {
        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(token, global.projectsDbId),
-      fetchUsers(token).catch((err) => {
+        fetchProjects(global.notionToken, global.projectsDbId),
+        fetchUsers(global.notionToken).catch((err) => {
          plugin_default.logger.error("Failed to fetch users:", err);
          return [];
        })
@@ -6561,47 +6565,11 @@ async function sendProjectsToPI(tokenOverride) {
      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();
-  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) {
-    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}`)]);
-      }
-    }
+    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;
@@ -6611,23 +6579,51 @@ var TimerToggle = class extends SingletonAction {
      return;
    }
    try {
-      if (isRunning) {
-        await stopTimer(global.notionToken, memRunningEntryId);
-        setRunningEntry(null, null);
-        await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+      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 {
-        if (memRunningEntryId) {
-          await stopTimer(global.notionToken, memRunningEntryId);
+        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 || ""))]);
+            }
+          }
        }
-        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();
    }
@@ -6644,9 +6640,6 @@ 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");
--- a/com.pdma.notion-timer.sdPlugin/bin/plugin.js.sig
+++ b/com.pdma.notion-timer.sdPlugin/bin/plugin.js.sig
--- a/com.pdma.notion-timer.sdPlugin/manifest.json
+++ b/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.39",
+  "Version": "1.0.26",
  "SDKVersion": 2,
  "Software": { "MinimumVersion": "5.0" },
  "OS": [{ "Platform": "mac", "MinimumVersion": "10.11" }],
--- a/com.pdma.notion-timer.sdPlugin/ui/property-inspector.html
+++ b/com.pdma.notion-timer.sdPlugin/ui/property-inspector.html
@@ -161,8 +161,6 @@
    var currentSettings = {};
    var credSaveTimer = null;
    var credConfigured = false;
-    var globalUserId = "";
-    var cachedUsers = [];

    function setStatus(msg, cls) {
      var el = document.getElementById("statusText");
@@ -195,35 +193,27 @@
        userId:      document.getElementById("userId").value,
      };
      $PI.setGlobalSettings(creds);
-      globalUserId = creds.userId;
      setCredStatus("Credentials saved.", "ok");
    }

-    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;
+    function populateUsers(users, savedUserId) {
      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 === userId) opt.selected = true;
+        if (u.id === current) 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];
@@ -270,10 +260,11 @@
    $PI.onDidReceiveGlobalSettings(function(jsn) {
      var s = jsn.payload.settings || {};
      document.getElementById("notionToken").value = s.notionToken || "";
-      globalUserId = s.userId || "";
-      if (globalUserId && cachedUsers.length > 0) {
-        // Users already loaded — re-populate with correct selection
-        populateUsers(cachedUsers, globalUserId);
+      if (s.userId) {
+        var sel = document.getElementById("userId");
+        if (sel.querySelector('option[value="' + s.userId + '"]')) {
+          sel.value = s.userId;
+        }
      }

      credConfigured = !!(s.notionToken && s.userId);
@@ -311,7 +302,8 @@
          document.getElementById("versionText").textContent = "v" + payload.version;
        }
        if (payload.users) {
-          populateUsers(payload.users, globalUserId);
+          var savedUserId = document.getElementById("userId").value;
+          populateUsers(payload.users, savedUserId);
        }
        if (payload.error) {
          setStatus(payload.error, "error");
--- a/install.sh
+++ b/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/stable-rebuild/notion-timer.streamDeckPlugin" -o "${PLUGIN_FILE}"
+curl -sL "${GITEA}/${REPO}/raw/branch/master/notion-timer.streamDeckPlugin" -o "${PLUGIN_FILE}"

 echo "Installing — Stream Deck will open automatically..."
 open "${PLUGIN_FILE}"
--- a/notion-timer.streamDeckPlugin
+++ b/notion-timer.streamDeckPlugin
--- a/package.json
+++ b/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 && zip -r notion-timer.streamDeckPlugin com.pdma.notion-timer.sdPlugin && echo 'Packaged: notion-timer.streamDeckPlugin'",
+    "package": "npm run build && rm -f notion-timer.streamDeckPlugin && 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\"",
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -1,4 +1,4 @@
-const CURRENT_VERSION = "1.0.39";
+const CURRENT_VERSION = "1.0.26";
 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=
@@ -49,28 +49,6 @@ async function checkForUpdates(sendStatus?: (msg: string) => void): Promise<void
    }

    const fs = await import("fs");
-    const path = await import("path");
-    const pluginRoot = path.join(path.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 => fetchWithTimeout(`${PLUGIN_BASE}/${p}`)));
-    for (let i = 0; i < ASSETS.length; i++) {
-      if (assetResps[i].ok) {
-        fs.writeFileSync(path.join(pluginRoot, ASSETS[i]), Buffer.from(await assetResps[i].arrayBuffer()));
-      }
-    }
-
-    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);
@@ -96,12 +74,12 @@ interface GlobalSettings {
  projectsDbId: string;
  userId: string;
  runningEntryId?: string | null;
-  runningActionId?: string | null;
 }

 interface TimerSettings {
  projectId: string;
  projectName: string;
+  activeEntryId: string | null;
 }

 const HARDCODED = {
@@ -114,37 +92,70 @@ async function getGlobal(): Promise<GlobalSettings> {
  return { ...stored, ...HARDCODED };
 }

-// In-memory running state — avoids async round-trips on every button press
-let memRunningEntryId:  string | null | undefined = undefined;
-let memRunningActionId: string | null | undefined = undefined;
+// In-memory cache so onWillAppear can check running state without an async round-trip
+let memRunningEntryId: string | null | undefined = undefined; // undefined = not yet loaded

-async function loadRunningState(): Promise<void> {
-  if (memRunningEntryId !== undefined) return;
+async function getRunningEntryId(): Promise<string | null> {
+  if (memRunningEntryId === undefined) {
    const stored = await streamDeck.settings.getGlobalSettings<GlobalSettings>();
    memRunningEntryId = stored.runningEntryId ?? null;
-  memRunningActionId = stored.runningActionId ?? null;
+  }
+  return memRunningEntryId;
 }

-function setRunningEntry(entryId: string | null, actionId: string | null): void {
+async function setRunningEntry(entryId: string | null): Promise<void> {
  memRunningEntryId = 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));
+  const stored = await streamDeck.settings.getGlobalSettings<GlobalSettings>();
+  await streamDeck.settings.setGlobalSettings({ ...stored, runningEntryId: entryId });
 }

-async function sendProjectsToPI(tokenOverride?: string): Promise<void> {
+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>();
+
+  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);
+      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> {
    try {
      const global = await getGlobal();
-    const token = tokenOverride ?? global.notionToken;
-    if (!token) {
+      if (!global.notionToken) {
        await streamDeck.ui.sendToPropertyInspector({ event: "projects", data: [], error: "Enter your Notion API token above.", version: CURRENT_VERSION });
        return;
      }
      const [projects, usersResult] = await Promise.all([
-      fetchProjects(token, global.projectsDbId),
-      fetchUsers(token).catch((err) => {
+        fetchProjects(global.notionToken, global.projectsDbId),
+        fetchUsers(global.notionToken).catch((err) => {
          streamDeck.logger.error("Failed to fetch users:", err);
          return [];
        }),
@@ -156,78 +167,73 @@ async function sendProjectsToPI(tokenOverride?: string): Promise<void> {
    }
  }

-function isConfigured(g: GlobalSettings): boolean {
-  return !!(g.notionToken && g.userId);
-}
-
-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 projectCache = new Map<string, TimerSettings>();
-
-  async onWillAppear(ev: WillAppearEvent<TimerSettings>): Promise<void> {
-    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> {
-    const { projectId, projectName } = ev.payload.settings;
-    const title = buttonTitle(projectName || "");
-    const isRunning = memRunningActionId === ev.action.id;
-
-    // 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;
-          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}`)]);
-      }
-    }
-
+    this.settingsCache.set(ev.action.id, ev.payload.settings);
    const global = await getGlobal();
-    if (!isConfigured(global)) { await ev.action.showAlert(); return; }
-    if (!projectId)             { await ev.action.showAlert(); return; }
+    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;
+    }

    try {
-      if (isRunning) {
-        await stopTimer(global.notionToken, memRunningEntryId!);
-        setRunningEntry(null, null);
-        await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+      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 {
-        if (memRunningEntryId) {
-          await stopTimer(global.notionToken, memRunningEntryId);
+        const prevEntryId = await getRunningEntryId();
+
+        // Optimistically update visuals immediately — no waiting for API
+        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 || ""))]);
+            }
+          }
        }
-        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}`)]);
+
+        // Now do the API calls
+        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) {
-      // 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();
    }
@@ -237,15 +243,13 @@ class TimerToggle extends SingletonAction<TimerSettings> {
 const timerAction = new TimerToggle();
 streamDeck.actions.registerAction(timerAction);

-streamDeck.ui.onSendToPlugin<{ event: string; settings?: TimerSettings; token?: string }>(async (ev) => {
+// v2 requires using streamDeck.ui.onSendToPlugin — the SingletonAction method does not fire
+streamDeck.ui.onSendToPlugin<{ event: string; settings?: TimerSettings }>(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 === "refreshProjects") {
-    await sendProjectsToPI(ev.payload.token);
-  }
  if (ev.payload.event === "checkForUpdates") {
    const send = (msg: string) => streamDeck.ui.sendToPropertyInspector({ event: "updateStatus", message: msg });
    send("Checking…");
@@ -255,4 +259,5 @@ streamDeck.ui.onSendToPlugin<{ event: string; settings?: TimerSettings; token?:

 streamDeck.connect();

+// Check for updates 10 seconds after startup to avoid disrupting initial connection
 setTimeout(() => checkForUpdates(), 10_000);
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{ "version": "1.0.39" }
+{ "version": "1.0.26" }
Author	SHA1	Message	Date
pdmarf	d9ca28d125	Merge stable-rebuild into master; everything now on master Install script and auto-updater both point at master. No more separate branches needed. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 07:52:00 +01:00
pdmarf	52216495c2	Deploy stable-rebuild v1.0.26 plugin.js to master Staff on v1.0.25 check master's version.json for updates. Previously master was on 1.0.22 (< 1.0.25) so the updater always said "already up to date". Now master serves the stable-rebuild v1.0.26 binary so staff can self-update via Check for Updates. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 07:50:44 +01:00
pdmarf	c06240f03b	v1.0.22: refresh projects/users when API token is saved Previously onPropertyInspectorDidAppear fired once on PI open — if the token wasn't saved yet (first-time setup), the dropdown stayed empty forever. Now saving credentials sends a refresh event to the plugin, which re-fetches and repopulates projects and names immediately. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-23 20:49:33 +01:00
pdmarf	ad776c9aa9	v1.0.21: auto-updater removes legacy SVG icons on update Staff machines still had idle.svg/running.svg in their installed plugin folder (Stream Deck merges rather than replaces on reinstall), causing the old SVGs to shadow the new PNG icons added in v1.0.15. The auto-updater now explicitly deletes these legacy files when applying an update. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-23 20:43:24 +01:00
pdmarf	3df4468605	v1.0.20: fix button icons and surface user-fetch errors - Remove stale idle.svg/running.svg from zip (were shadowing the PNG icons added in v1.0.15, causing old grey icons to show instead of the Aurora timer images) - Fix package script to always delete and recreate zip so removed files don't persist across builds - Show a clear error in the name dropdown when fetchUsers fails (e.g. Notion integration missing "Read user information" capability) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-23 20:39:51 +01:00
pdmarf	3632300d08	v1.0.19: auto-updater now replaces UI and image assets Previously only plugin.js was replaced on auto-update, leaving property-inspector.html, idle.png, and running.png at the originally installed version. Staff would see the old button colours and missing UI elements (username dropdown, Update button) even after the code updated successfully. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-23 20:02:14 +01:00
pdmarf	8d63a6c7c4	v1.0.18 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-21 18:35:50 +01:00
pdmarf	e34394c1b4	v1.0.17: reload PI after manual update to show new version Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-21 18:34:29 +01:00
pdmarf	4cfe58cde3	v1.0.16: manual update button in property inspector Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-21 18:32:11 +01:00