v1.0.65: default untagged timer entries to Client Books

Buttons can carry a Timer Tags select value and prompt for an optional
description before starting. Tag options and the prompt toggle are
configured per-button in the property inspector; startTimer writes the
tag to the Timer Tags select property and the description to the
Description rich_text property when set.

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

@@ -6375,6 +6375,15 @@ async function fetchUsers(token) {
   const data = await resp.json();
   return data.results.filter((u) => u.type === "person" && u.person?.email).map((u) => ({ id: u.id, name: u.name })).sort((a, b) => a.name.localeCompare(b.name));
 }
+async function fetchTagOptions(token, databaseId, propertyName) {
+  const resp = await fetchWithTimeout(`${NOTION_BASE}/databases/${databaseId}`, {
+    headers: headers(token)
+  });
+  if (!resp.ok) throw new Error(`Failed to fetch database schema: ${resp.status}`);
+  const data = await resp.json();
+  const options = data.properties?.[propertyName]?.select?.options ?? [];
+  return options.map((o) => o.name);
+}
 async function fetchProjects(token, dbId) {
   const results = [];
   let cursor;
@@ -6401,21 +6410,24 @@ async function fetchProjects(token, dbId) {
   } while (cursor);
   return results;
 }
-async function startTimer(token, timingDbId, projectId, projectName, userId) {
+async function startTimer(token, timingDbId, projectId, projectName, userId, tag, description) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
+  const properties = {
+    Name: { title: [{ text: { content: "Timer Task" } }] },
+    "Start Time": { date: { start: now } },
+    Projects: { relation: [{ id: projectId }] },
+    Status: { status: { name: "Running" } },
+    Responsible: { people: [{ object: "user", id: userId }] }
+  };
+  if (tag) properties["Timer Tags"] = { select: { name: tag } };
+  if (description) properties.Description = { rich_text: [{ text: { content: description } }] };
   const resp = await fetchWithTimeout(`${NOTION_BASE}/pages`, {
     method: "POST",
     headers: headers(token),
     body: JSON.stringify({
       parent: { database_id: timingDbId },
       icon: { type: "emoji", emoji: "\u23F1\uFE0F" },
-      properties: {
+      properties
-        Name: { title: [{ text: { content: "Timer Task" } }] },
-        "Start Time": { date: { start: now } },
-        Projects: { relation: [{ id: projectId }] },
-        Status: { status: { name: "Running" } },
-        Responsible: { people: [{ object: "user", id: userId }] }
-      }
     })
   });
   if (!resp.ok) throw new Error(`Failed to start timer: ${resp.status}`);
@@ -6438,7 +6450,7 @@ async function stopTimer(token, entryId) {
 }
 
 // src/plugin.ts
-var CURRENT_VERSION = "1.0.39";
+var CURRENT_VERSION = "1.0.65";
 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=
@@ -6460,12 +6472,17 @@ async function checkForUpdates(sendStatus) {
   try {
     const resp = await fetchWithTimeout2(`${GITEA_BASE}/version.json`);
     if (!resp.ok) {
+      plugin_default.logger.warn(`Update check: version.json fetch returned ${resp.status}`);
       sendStatus?.("Update check failed");
       return;
     }
     const { version } = await resp.json();
-    if (!/^\d+\.\d+\.\d+$/.test(version)) return;
+    if (!/^\d+\.\d+\.\d+$/.test(version)) {
+      plugin_default.logger.warn(`Update check: version.json had unexpected content: ${JSON.stringify(version)}`);
+      return;
+    }
     if (!isNewerVersion(version, CURRENT_VERSION)) {
+      plugin_default.logger.info(`Update check: up to date (v${CURRENT_VERSION}, server has v${version})`);
       sendStatus?.(`Already up to date (v${CURRENT_VERSION})`);
       return;
     }
@@ -6512,6 +6529,8 @@ async function checkForUpdates(sendStatus) {
     }
     fs3.writeFileSync(__filename, newCode);
     plugin_default.logger.info(`Updated to ${version}, restarting\u2026`);
+    await sendStatus?.(`Updated to v${version}. Click any other button above to confirm version update has been successful.`);
+    await new Promise((resolve) => setTimeout(resolve, 200));
     process.exit(0);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -6523,6 +6542,7 @@ var HARDCODED = {
   timingDbId: "2ec93117da3a80799ee2cf91244ee264",
   projectsDbId: "cd65c760-0f0a-4d6e-a262-d572c9e31585"
 };
+var DEFAULT_TAG = "Client Books";
 async function getGlobal() {
   const stored = await plugin_default.settings.getGlobalSettings();
   return { ...stored, ...HARDCODED };
@@ -6548,14 +6568,18 @@ async function sendProjectsToPI(tokenOverride) {
       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([
+    const [projects, usersResult, tagsResult] = await Promise.all([
       fetchProjects(token, global.projectsDbId),
       fetchUsers(token).catch((err) => {
         plugin_default.logger.error("Failed to fetch users:", err);
         return [];
+      }),
+      fetchTagOptions(token, global.timingDbId, "Timer Tags").catch((err) => {
+        plugin_default.logger.error("Failed to fetch tag options:", err);
+        return [];
       })
     ]);
-    await plugin_default.ui.sendToPropertyInspector({ event: "projects", data: projects, users: usersResult, version: CURRENT_VERSION });
+    await plugin_default.ui.sendToPropertyInspector({ event: "projects", data: projects, users: usersResult, tags: tagsResult, version: CURRENT_VERSION });
   } catch (err) {
     plugin_default.logger.error("Failed to fetch projects:", err);
     await plugin_default.ui.sendToPropertyInspector({ event: "projects", data: [], error: String(err), version: CURRENT_VERSION });
@@ -6564,14 +6588,84 @@ async function sendProjectsToPI(tokenOverride) {
 function isConfigured(g) {
   return !!(g.notionToken && g.userId);
 }
-function buttonTitle(projectName) {
+function buttonTitle(projectName, tag) {
-  return projectName.replace(/^[\p{Extended_Pictographic}\uFE0F\s]+/u, "").trim();
+  const base = projectName.replace(/^[\p{Extended_Pictographic}\uFE0F\s]+/u, "").trim();
+  return tag ? `${base} \xB7 ${tag}` : base;
+}
+var ELAPSED_CHECK_MS = 60 * 60 * 1e3;
+var DIALOG_TIMEOUT_SECONDS = 300;
+async function promptContinue(title) {
+  const { execFile: execFile3 } = await import("node:child_process");
+  const safeTitle = title.replace(/[\\"]/g, "");
+  const script = `display dialog "Timer for ${safeTitle} has been running for over an hour.
+
+Should it continue?" buttons {"Stop", "Continue"} default button "Continue" giving up after ${DIALOG_TIMEOUT_SECONDS}`;
+  return new Promise((resolve) => {
+    execFile3("osascript", ["-e", script], (err, stdout) => {
+      if (err || /gave up:true/.test(String(stdout))) {
+        resolve("timeout");
+        return;
+      }
+      resolve(/button returned:Stop/.test(String(stdout)) ? "stop" : "continue");
+    });
+  });
+}
+async function promptDescription(title) {
+  const { execFile: execFile3 } = await import("node:child_process");
+  const safeTitle = title.replace(/[\\"]/g, "");
+  const script = `display dialog "Description for ${safeTitle} (optional):" default answer "" buttons {"Cancel", "Start"} default button "Start" giving up after ${DIALOG_TIMEOUT_SECONDS}`;
+  return new Promise((resolve) => {
+    execFile3("osascript", ["-e", script], (err, stdout) => {
+      const out = String(stdout);
+      if (err || /gave up:true/.test(out) || !/button returned:Start/.test(out)) {
+        resolve({ ok: false, text: "" });
+        return;
+      }
+      const match = /text returned:(.*?)(?:, gave up:|$)/.exec(out);
+      resolve({ ok: true, text: match ? match[1].trim() : "" });
+    });
+  });
 }
 var TimerToggle = class extends SingletonAction {
   projectCache = /* @__PURE__ */ new Map();
+  keyDownBusy = false;
+  elapsedCheckTimer = null;
+  clearElapsedCheck() {
+    if (this.elapsedCheckTimer) clearTimeout(this.elapsedCheckTimer);
+    this.elapsedCheckTimer = null;
+  }
+  scheduleElapsedCheck(entryId, actionId, title) {
+    this.clearElapsedCheck();
+    this.elapsedCheckTimer = setTimeout(() => {
+      this.checkElapsed(entryId, actionId, title);
+    }, ELAPSED_CHECK_MS);
+  }
+  async checkElapsed(entryId, actionId, title) {
+    if (memRunningEntryId !== entryId) return;
+    const answer = await promptContinue(title);
+    if (memRunningEntryId !== entryId) return;
+    if (answer === "continue") {
+      this.scheduleElapsedCheck(entryId, actionId, title);
+      return;
+    }
+    try {
+      const global = await getGlobal();
+      await stopTimer(global.notionToken, entryId);
+    } catch (err) {
+      plugin_default.logger.error("Auto-stop after elapsed-check failed:", err);
+    }
+    setRunningEntry(null, null);
+    this.clearElapsedCheck();
+    for (const action2 of this.actions) {
+      if (action2.id === actionId) {
+        await Promise.all([action2.setState(0), action2.setTitle(title)]);
+        break;
+      }
+    }
+  }
   async onWillAppear(ev) {
     this.projectCache.set(ev.action.id, ev.payload.settings);
-    const title = buttonTitle(ev.payload.settings.projectName || "");
+    const title = buttonTitle(ev.payload.settings.projectName || "", ev.payload.settings.tag);
     await loadRunningState();
     const isRunning = memRunningActionId === ev.action.id;
     if (isRunning) {
@@ -6584,64 +6678,118 @@ var TimerToggle = class extends SingletonAction {
     await sendProjectsToPI();
   }
   async onKeyDown(ev) {
-    const { projectId, projectName } = ev.payload.settings;
+    if (this.keyDownBusy) {
-    const title = buttonTitle(projectName || "");
+      const title = buttonTitle(ev.payload.settings.projectName || "", ev.payload.settings.tag);
-    const isRunning = memRunningActionId === ev.action.id;
+      const shouldBeRunning = memRunningActionId === ev.action.id;
-    if (projectId) {
+      await new Promise((resolve) => setTimeout(resolve, 150));
-      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;
-    }
-    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(`\u23F1 ${title}`)]);
-      }
-    } catch (err) {
       await Promise.all([
-        ev.action.setState(isRunning ? 1 : 0),
+        ev.action.setState(shouldBeRunning ? 1 : 0),
-        ev.action.setTitle(isRunning ? `\u23F1 ${title}` : title)
+        ev.action.setTitle(shouldBeRunning ? `\u23F1 ${title}` : title)
       ]);
-      plugin_default.logger.error("Timer toggle failed:", err);
+      return;
-      await ev.action.showAlert();
+    }
+    this.keyDownBusy = true;
+    try {
+      const { projectId, projectName, tag, askDescription } = ev.payload.settings;
+      const title = buttonTitle(projectName || "", tag);
+      const isRunning = memRunningActionId === ev.action.id;
+      let description = "";
+      if (!isRunning && projectId && askDescription) {
+        const result = await promptDescription(title);
+        if (!result.ok) return;
+        description = result.text;
+      }
+      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 || "", s?.tag))]);
+            }
+          }
+          await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
+        }
+      }
+      const global = await getGlobal();
+      if (!isConfigured(global)) {
+        await ev.action.showAlert();
+        return;
+      }
+      if (!projectId) {
+        await ev.action.showAlert();
+        return;
+      }
+      try {
+        if (isRunning) {
+          try {
+            await stopTimer(global.notionToken, memRunningEntryId);
+          } catch (err) {
+            plugin_default.logger.error("Failed to stop timer in Notion (clearing local state anyway):", err);
+          }
+          setRunningEntry(null, null);
+          this.clearElapsedCheck();
+          await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
+        } else {
+          if (memRunningEntryId) {
+            try {
+              await stopTimer(global.notionToken, memRunningEntryId);
+            } catch (err) {
+              plugin_default.logger.error("Failed to stop previous timer in Notion (clearing local state anyway):", err);
+            }
+            setRunningEntry(null, null);
+            this.clearElapsedCheck();
+          }
+          const entryId = await startTimer(global.notionToken, global.timingDbId, projectId, projectName, global.userId, tag || DEFAULT_TAG, description);
+          setRunningEntry(entryId, ev.action.id);
+          this.scheduleElapsedCheck(entryId, ev.action.id, title);
+          await Promise.all([ev.action.setState(1), ev.action.setTitle(`\u23F1 ${title}`)]);
+        }
+      } 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.keyDownBusy = false;
     }
   }
 };
 TimerToggle = __decorateClass([
   action({ UUID: "com.pdma.notion-timer.toggle" })
 ], TimerToggle);
+var NEXTCLOUD_BIN = "/Applications/Nextcloud.app/Contents/MacOS/Nextcloud";
+var LaunchNextcloud = class extends SingletonAction {
+  async onKeyDown(ev) {
+    try {
+      const { spawn } = await import("node:child_process");
+      const child = spawn(NEXTCLOUD_BIN, [], { detached: true, stdio: "ignore" });
+      child.once("error", (err) => {
+        plugin_default.logger.error("Failed to launch Nextcloud:", err);
+      });
+      child.unref();
+      await ev.action.showOk();
+    } catch (err) {
+      plugin_default.logger.error("Failed to launch Nextcloud:", err);
+      await ev.action.showAlert();
+    }
+  }
+};
+LaunchNextcloud = __decorateClass([
+  action({ UUID: "com.pdma.notion-timer.launch-nextcloud" })
+], LaunchNextcloud);
 var timerAction = new TimerToggle();
 plugin_default.actions.registerAction(timerAction);
+plugin_default.actions.registerAction(new LaunchNextcloud());
 plugin_default.ui.onSendToPlugin(async (ev) => {
   if (ev.payload.event === "saveSettings" && ev.payload.settings) {
     await ev.action.setSettings(ev.payload.settings);
-    const title = buttonTitle(ev.payload.settings.projectName || "");
+    const title = buttonTitle(ev.payload.settings.projectName || "", ev.payload.settings.tag);
     if (title) await ev.action.setTitle(title);
   }
   if (ev.payload.event === "refreshProjects") {
@@ -6653,8 +6801,16 @@ plugin_default.ui.onSendToPlugin(async (ev) => {
     await checkForUpdates(send);
   }
 });
+var UPDATE_CHECK_INTERVAL_MS = 30 * 60 * 1e3;
 plugin_default.connect();
-setTimeout(() => checkForUpdates(), 1e4);
+setTimeout(() => {
+  plugin_default.logger.info("Running initial (10s post-launch) update check");
+  checkForUpdates();
+}, 1e4);
+setInterval(() => {
+  plugin_default.logger.info("Running scheduled (30min) update check");
+  checkForUpdates();
+}, UPDATE_CHECK_INTERVAL_MS);
 /*! Bundled license information:
 
 @elgato/schemas/dist/streamdeck/plugins/index.mjs:

com.pdma.notion-timer.sdPlugin/imgs/nextcloud-icon.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 144 144" width="144" height="144">
+  <rect width="144" height="144" rx="16" fill="#0082c9"/>
+  <path d="M72 46c-13.3 0-24.4 9.4-27.1 22a16 16 0 0 0 3.1 31.8h48a16.5 16.5 0 0 0 3.6-32.6C97.3 55.6 85.9 46 72 46z"
+        fill="none" stroke="white" stroke-width="6" stroke-linejoin="round"/>
+</svg>

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.40",
   "SDKVersion": 2,
   "Software": { "MinimumVersion": "5.0" },
   "OS": [{ "Platform": "mac", "MinimumVersion": "10.11" }],
@@ -30,6 +30,19 @@
       ],
       "PropertyInspectorPath": "ui/property-inspector.html",
       "SupportedInMultiActions": false
+    },
+    {
+      "Icon": "imgs/nextcloud-icon",
+      "Name": "Launch Nextcloud",
+      "UUID": "com.pdma.notion-timer.launch-nextcloud",
+      "Tooltip": "Launch the Nextcloud desktop client in the background.",
+      "States": [
+        {
+          "Image": "imgs/nextcloud-icon",
+          "TitleAlignment": "bottom"
+        }
+      ],
+      "SupportedInMultiActions": false
     }
   ]
 }

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

@@ -58,6 +58,11 @@
       padding-left: 98px;
       line-height: 1.4;
     }
+    .info-icon {
+      color: #888;
+      font-size: 13px;
+      cursor: help;
+    }
     .divider {
       border: none;
       border-top: 1px solid #333;
@@ -142,6 +147,22 @@
       <option value="">Loading projects…</option>
     </select>
   </div>
+  <div class="row">
+    <label>Ask description (optional)</label>
+    <input type="checkbox" id="askDescription" style="flex: none; width: auto;">
+    <span class="info-icon" title="Prompt for a description when starting this button's timer.">ⓘ</span>
+  </div>
+  <div class="row">
+    <label>Use tag (Pete only)</label>
+    <input type="checkbox" id="tagEnabled" style="flex: none; width: auto;">
+  </div>
+  <div class="row" id="tagRow">
+    <label></label>
+    <select id="tagSelect">
+      <option value="">— No tag —</option>
+    </select>
+  </div>
+  <p class="hint" id="tagHint">Recorded as the entry's Tag in Notion and shown on the button.</p>
 
   <p id="statusText"></p>
   <p id="versionText"></p>
@@ -163,6 +184,7 @@
     var credConfigured = false;
     var globalUserId = "";
     var cachedUsers = [];
+    var cachedTags = [];
 
     function setStatus(msg, cls) {
       var el = document.getElementById("statusText");
@@ -224,11 +246,39 @@
       });
     }
 
+    function populateTags(tags) {
+      cachedTags = tags;
+      var sel = document.getElementById("tagSelect");
+      sel.innerHTML = '<option value="">— No tag —</option>';
+      var values = tags.slice();
+      // A tag saved on this button before it existed as a Notion select option
+      // (or since removed there) must still show up, selected, instead of
+      // silently reverting to "No tag".
+      if (currentSettings.tag && values.indexOf(currentSettings.tag) === -1) {
+        values.push(currentSettings.tag);
+      }
+      values.forEach(function(t) {
+        var opt = document.createElement("option");
+        opt.value = t;
+        opt.textContent = t;
+        if (currentSettings.tag === t) opt.selected = true;
+        sel.appendChild(opt);
+      });
+    }
+
+    function setTagRowVisible(visible) {
+      document.getElementById("tagRow").style.display = visible ? "" : "none";
+      document.getElementById("tagHint").style.display = visible ? "" : "none";
+    }
+
     function save() {
       var sel = document.getElementById("projectSelect");
       var opt = sel.options[sel.selectedIndex];
       currentSettings.projectId   = sel.value;
       currentSettings.projectName = sel.value ? opt.textContent.trim() : "";
+      currentSettings.tagEnabled  = document.getElementById("tagEnabled").checked;
+      currentSettings.tag         = currentSettings.tagEnabled ? document.getElementById("tagSelect").value : "";
+      currentSettings.askDescription = document.getElementById("askDescription").checked;
       $PI.setSettings(currentSettings);
       $PI.sendToPlugin({ event: "saveSettings", settings: currentSettings });
       setStatus(currentSettings.projectName ? "Saved: " + currentSettings.projectName : "", "");
@@ -255,10 +305,19 @@
 
     $PI.onConnected(function(jsn) {
       currentSettings = jsn.actionInfo.payload.settings || {};
+      document.getElementById("tagEnabled").checked = !!currentSettings.tagEnabled;
+      setTagRowVisible(!!currentSettings.tagEnabled);
+      document.getElementById("askDescription").checked = !!currentSettings.askDescription;
       $PI.getSettings();
       $PI.getGlobalSettings();
 
       document.getElementById("projectSelect").addEventListener("change", save);
+      document.getElementById("tagEnabled").addEventListener("change", function() {
+        setTagRowVisible(this.checked);
+        save();
+      });
+      document.getElementById("tagSelect").addEventListener("change", save);
+      document.getElementById("askDescription").addEventListener("change", save);
       document.getElementById("notionToken").addEventListener("input", scheduleCredSave);
       document.getElementById("userId").addEventListener("change", saveCredentials);
       document.getElementById("updateBtn").addEventListener("click", function() {
@@ -296,6 +355,10 @@
       if (currentSettings.projectId && sel.options.length > 1) {
         sel.value = currentSettings.projectId;
       }
+      document.getElementById("tagEnabled").checked = !!currentSettings.tagEnabled;
+      setTagRowVisible(!!currentSettings.tagEnabled);
+      populateTags(cachedTags);
+      document.getElementById("askDescription").checked = !!currentSettings.askDescription;
       if (currentSettings.activeEntryId) {
         setStatus("⏱ Timer running", "running");
       }
@@ -313,6 +376,9 @@
         if (payload.users) {
           populateUsers(payload.users, globalUserId);
         }
+        if (payload.tags) {
+          populateTags(payload.tags);
+        }
         if (payload.error) {
           setStatus(payload.error, "error");
         } else {

src/notion.ts

@@ -63,6 +63,20 @@ export async function fetchUsers(token: string): Promise<NotionUser[]> {
     .sort((a, b) => a.name.localeCompare(b.name));
 }
 
+export async function fetchTagOptions(
+  token: string,
+  databaseId: string,
+  propertyName: string
+): Promise<string[]> {
+  const resp = await fetchWithTimeout(`${NOTION_BASE}/databases/${databaseId}`, {
+    headers: headers(token),
+  });
+  if (!resp.ok) throw new Error(`Failed to fetch database schema: ${resp.status}`);
+  const data = (await resp.json()) as { properties?: Record<string, any> };
+  const options: any[] = data.properties?.[propertyName]?.select?.options ?? [];
+  return options.map((o: any) => o.name as string);
+}
+
 export async function fetchProjects(token: string, dbId: string): Promise<NotionProject[]> {
   const results: NotionProject[] = [];
   let cursor: string | undefined;
@@ -102,23 +116,29 @@ export async function startTimer(
   timingDbId: string,
   projectId: string,
   projectName: string,
-  userId: string
+  userId: string,
+  tag?: string,
+  description?: string
 ): Promise<string> {
   const now = new Date().toISOString();
 
+  const properties: Record<string, unknown> = {
+    Name: { title: [{ text: { content: "Timer Task" } }] },
+    "Start Time": { date: { start: now } },
+    Projects: { relation: [{ id: projectId }] },
+    Status: { status: { name: "Running" } },
+    Responsible: { people: [{ object: "user", id: userId }] },
+  };
+  if (tag) properties["Timer Tags"] = { select: { name: tag } };
+  if (description) properties.Description = { rich_text: [{ text: { content: description } }] };
+
   const resp = await fetchWithTimeout(`${NOTION_BASE}/pages`, {
     method: "POST",
     headers: headers(token),
     body: JSON.stringify({
       parent: { database_id: timingDbId },
       icon: { type: "emoji", emoji: "⏱️" },
-      properties: {
+      properties,
-        Name: { title: [{ text: { content: "Timer Task" } }] },
-        "Start Time": { date: { start: now } },
-        Projects: { relation: [{ id: projectId }] },
-        Status: { status: { name: "Running" } },
-        Responsible: { people: [{ object: "user", id: userId }] },
-      },
     }),
   });
 

src/plugin.ts

@@ -1,4 +1,4 @@
-const CURRENT_VERSION = "1.0.39";
+const CURRENT_VERSION = "1.0.65";
 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=
@@ -19,13 +19,21 @@ function fetchWithTimeout(url: string): Promise<Response> {
   return fetch(url, { signal: controller.signal }).finally(() => clearTimeout(timer));
 }
 
-async function checkForUpdates(sendStatus?: (msg: string) => void): Promise<void> {
+async function checkForUpdates(sendStatus?: (msg: string) => void | Promise<void>): Promise<void> {
   try {
     const resp = await fetchWithTimeout(`${GITEA_BASE}/version.json`);
-    if (!resp.ok) { sendStatus?.("Update check failed"); return; }
+    if (!resp.ok) {
+      streamDeck.logger.warn(`Update check: version.json fetch returned ${resp.status}`);
+      sendStatus?.("Update check failed");
+      return;
+    }
     const { version } = await resp.json() as { version: string };
-    if (!/^\d+\.\d+\.\d+$/.test(version)) return;
+    if (!/^\d+\.\d+\.\d+$/.test(version)) {
+      streamDeck.logger.warn(`Update check: version.json had unexpected content: ${JSON.stringify(version)}`);
+      return;
+    }
     if (!isNewerVersion(version, CURRENT_VERSION)) {
+      streamDeck.logger.info(`Update check: up to date (v${CURRENT_VERSION}, server has v${version})`);
       sendStatus?.(`Already up to date (v${CURRENT_VERSION})`);
       return;
     }
@@ -73,6 +81,11 @@ async function checkForUpdates(sendStatus?: (msg: string) => void): Promise<void
 
     fs.writeFileSync(__filename, newCode);
     streamDeck.logger.info(`Updated to ${version}, restarting…`);
+    // Await + a short delay so the message actually reaches the socket before
+    // the process dies. The panel can't reliably learn its own new version
+    // number after this restart, so it just tells the user how to confirm it.
+    await sendStatus?.(`Updated to v${version}. Click any other button above to confirm version update has been successful.`);
+    await new Promise((resolve) => setTimeout(resolve, 200));
     process.exit(0);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -88,7 +101,7 @@ import streamDeck, {
   SingletonAction,
   WillAppearEvent,
 } from "@elgato/streamdeck";
-import { fetchProjects, fetchUsers, startTimer, stopTimer } from "./notion.js";
+import { fetchProjects, fetchTagOptions, fetchUsers, startTimer, stopTimer } from "./notion.js";
 
 interface GlobalSettings {
   notionToken: string;
@@ -102,6 +115,9 @@ interface GlobalSettings {
 interface TimerSettings {
   projectId: string;
   projectName: string;
+  tag?: string;
+  tagEnabled?: boolean;
+  askDescription?: boolean;
 }
 
 const HARDCODED = {
@@ -109,6 +125,8 @@ const HARDCODED = {
   projectsDbId: "cd65c760-0f0a-4d6e-a262-d572c9e31585",
 };
 
+const DEFAULT_TAG = "Client Books";
+
 async function getGlobal(): Promise<GlobalSettings> {
   const stored = await streamDeck.settings.getGlobalSettings<GlobalSettings>();
   return { ...stored, ...HARDCODED };
@@ -142,14 +160,18 @@ async function sendProjectsToPI(tokenOverride?: string): Promise<void> {
       await streamDeck.ui.sendToPropertyInspector({ event: "projects", data: [], error: "Enter your Notion API token above.", version: CURRENT_VERSION });
       return;
     }
-    const [projects, usersResult] = await Promise.all([
+    const [projects, usersResult, tagsResult] = await Promise.all([
       fetchProjects(token, global.projectsDbId),
       fetchUsers(token).catch((err) => {
         streamDeck.logger.error("Failed to fetch users:", err);
         return [];
       }),
+      fetchTagOptions(token, global.timingDbId, "Timer Tags").catch((err) => {
+        streamDeck.logger.error("Failed to fetch tag options:", err);
+        return [];
+      }),
     ]);
-    await streamDeck.ui.sendToPropertyInspector({ event: "projects", data: projects, users: usersResult, version: CURRENT_VERSION });
+    await streamDeck.ui.sendToPropertyInspector({ event: "projects", data: projects, users: usersResult, tags: tagsResult, 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 });
@@ -160,17 +182,92 @@ function isConfigured(g: GlobalSettings): boolean {
   return !!(g.notionToken && g.userId);
 }
 
-function buttonTitle(projectName: string): string {
+function buttonTitle(projectName: string, tag?: string): string {
-  return projectName.replace(/^[\p{Extended_Pictographic}\uFE0F\s]+/u, "").trim();
+  const base = projectName.replace(/^[\p{Extended_Pictographic}\uFE0F\s]+/u, "").trim();
+  return tag ? `${base} \u00B7 ${tag}` : base;
+}
+
+const ELAPSED_CHECK_MS = 60 * 60 * 1000; // 1 hour
+const DIALOG_TIMEOUT_SECONDS = 300; // 5 minutes
+
+async function promptContinue(title: string): Promise<"stop" | "continue" | "timeout"> {
+  const { execFile } = await import("node:child_process");
+  const safeTitle = title.replace(/[\\"]/g, "");
+  const script = `display dialog "Timer for ${safeTitle} has been running for over an hour.\n\nShould it continue?" buttons {"Stop", "Continue"} default button "Continue" giving up after ${DIALOG_TIMEOUT_SECONDS}`;
+  return new Promise((resolve) => {
+    execFile("osascript", ["-e", script], (err, stdout) => {
+      if (err || /gave up:true/.test(String(stdout))) { resolve("timeout"); return; }
+      resolve(/button returned:Stop/.test(String(stdout)) ? "stop" : "continue");
+    });
+  });
+}
+
+// Cancelling or letting the dialog time out means "don't start the timer" —
+// the caller treats ok:false as a no-op, not as "start with no description".
+async function promptDescription(title: string): Promise<{ ok: boolean; text: string }> {
+  const { execFile } = await import("node:child_process");
+  const safeTitle = title.replace(/[\\"]/g, "");
+  const script = `display dialog "Description for ${safeTitle} (optional):" default answer "" buttons {"Cancel", "Start"} default button "Start" giving up after ${DIALOG_TIMEOUT_SECONDS}`;
+  return new Promise((resolve) => {
+    execFile("osascript", ["-e", script], (err, stdout) => {
+      const out = String(stdout);
+      if (err || /gave up:true/.test(out) || !/button returned:Start/.test(out)) {
+        resolve({ ok: false, text: "" });
+        return;
+      }
+      const match = /text returned:(.*?)(?:, gave up:|$)/.exec(out);
+      resolve({ ok: true, text: match ? match[1].trim() : "" });
+    });
+  });
 }
 
 @action({ UUID: "com.pdma.notion-timer.toggle" })
 class TimerToggle extends SingletonAction<TimerSettings> {
   private projectCache = new Map<string, TimerSettings>();
+  private keyDownBusy = false;
+  private elapsedCheckTimer: NodeJS.Timeout | null = null;
+
+  private clearElapsedCheck(): void {
+    if (this.elapsedCheckTimer) clearTimeout(this.elapsedCheckTimer);
+    this.elapsedCheckTimer = null;
+  }
+
+  private scheduleElapsedCheck(entryId: string, actionId: string, title: string): void {
+    this.clearElapsedCheck();
+    this.elapsedCheckTimer = setTimeout(() => {
+      this.checkElapsed(entryId, actionId, title);
+    }, ELAPSED_CHECK_MS);
+  }
+
+  private async checkElapsed(entryId: string, actionId: string, title: string): Promise<void> {
+    if (memRunningEntryId !== entryId) return;
+    const answer = await promptContinue(title);
+    if (memRunningEntryId !== entryId) return;
+
+    if (answer === "continue") {
+      this.scheduleElapsedCheck(entryId, actionId, title);
+      return;
+    }
+
+    try {
+      const global = await getGlobal();
+      await stopTimer(global.notionToken, entryId);
+    } catch (err) {
+      streamDeck.logger.error("Auto-stop after elapsed-check failed:", err);
+    }
+    setRunningEntry(null, null);
+    this.clearElapsedCheck();
+    for (const action of this.actions) {
+      if (action.id === actionId) {
+        await Promise.all([action.setState(0), action.setTitle(title)]);
+        break;
+      }
+    }
+  }
 
   async onWillAppear(ev: WillAppearEvent<TimerSettings>): Promise<void> {
     this.projectCache.set(ev.action.id, ev.payload.settings);
-    const title = buttonTitle(ev.payload.settings.projectName || "");
+    const title = buttonTitle(ev.payload.settings.projectName || "", ev.payload.settings.tag);
     await loadRunningState();
     const isRunning = memRunningActionId === ev.action.id;
     if (isRunning) {
@@ -185,10 +282,40 @@ class TimerToggle extends SingletonAction<TimerSettings> {
   }
 
   async onKeyDown(ev: KeyDownEvent<TimerSettings>): Promise<void> {
-    const { projectId, projectName } = ev.payload.settings;
+    // Global lock across ALL buttons of this action, not just this one — otherwise
-    const title = buttonTitle(projectName || "");
+    // near-simultaneous presses on two different buttons both read memRunningActionId
+    // as "nothing running" and both start a timer in Notion.
+    if (this.keyDownBusy) {
+      // Blocked press: redraw THIS button to match known truth instead of leaving
+      // whatever it was already showing (which can be stale from an out-of-band
+      // Notion edit) — a pure visual correction, no Notion calls. Delayed slightly
+      // because redrawing immediately can collide with Stream Deck's own native
+      // key-press flash animation and get silently dropped.
+      const title = buttonTitle(ev.payload.settings.projectName || "", ev.payload.settings.tag);
+      const shouldBeRunning = memRunningActionId === ev.action.id;
+      await new Promise((resolve) => setTimeout(resolve, 150));
+      await Promise.all([
+        ev.action.setState(shouldBeRunning ? 1 : 0),
+        ev.action.setTitle(shouldBeRunning ? `⏱ ${title}` : title),
+      ]);
+      return;
+    }
+    this.keyDownBusy = true;
+    try {
+    const { projectId, projectName, tag, askDescription } = ev.payload.settings;
+    const title = buttonTitle(projectName || "", tag);
     const isRunning = memRunningActionId === ev.action.id;
 
+    // Asking for a description blocks on a native dialog, so it has to happen
+    // before any optimistic UI update — a cancel/timeout must leave everything
+    // exactly as it was, not flip the button and then silently revert it.
+    let description = "";
+    if (!isRunning && projectId && askDescription) {
+      const result = await promptDescription(title);
+      if (!result.ok) return;
+      description = result.text;
+    }
+
     // Instant visual feedback — no setSettings, no flash
     if (projectId) {
       if (isRunning) {
@@ -198,7 +325,7 @@ class TimerToggle extends SingletonAction<TimerSettings> {
           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([other.setState(0), other.setTitle(buttonTitle(s?.projectName || "", s?.tag))]);
           }
         }
         await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
@@ -211,15 +338,31 @@ class TimerToggle extends SingletonAction<TimerSettings> {
 
     try {
       if (isRunning) {
-        await stopTimer(global.notionToken, memRunningEntryId!);
+        // Stopping the entry in Notion is best-effort: if the page is already
+        // gone/archived (e.g. edited outside the plugin) this throws, but the
+        // local "running" tracking must clear anyway or every future keypress
+        // retries this same doomed stop call and the deck gets stuck forever.
+        try {
+          await stopTimer(global.notionToken, memRunningEntryId!);
+        } catch (err) {
+          streamDeck.logger.error("Failed to stop timer in Notion (clearing local state anyway):", err);
+        }
         setRunningEntry(null, null);
+        this.clearElapsedCheck();
         await Promise.all([ev.action.setState(0), ev.action.setTitle(title)]);
       } else {
         if (memRunningEntryId) {
-          await stopTimer(global.notionToken, memRunningEntryId);
+          try {
+            await stopTimer(global.notionToken, memRunningEntryId);
+          } catch (err) {
+            streamDeck.logger.error("Failed to stop previous timer in Notion (clearing local state anyway):", err);
+          }
+          setRunningEntry(null, null);
+          this.clearElapsedCheck();
         }
-        const entryId = await startTimer(global.notionToken, global.timingDbId, projectId, projectName, global.userId);
+        const entryId = await startTimer(global.notionToken, global.timingDbId, projectId, projectName, global.userId, tag || DEFAULT_TAG, description);
         setRunningEntry(entryId, ev.action.id);
+        this.scheduleElapsedCheck(entryId, ev.action.id, title);
         await Promise.all([ev.action.setState(1), ev.action.setTitle(`⏱ ${title}`)]);
       }
     } catch (err) {
@@ -231,16 +374,42 @@ class TimerToggle extends SingletonAction<TimerSettings> {
       streamDeck.logger.error("Timer toggle failed:", err);
       await ev.action.showAlert();
     }
+    } finally {
+      this.keyDownBusy = false;
+    }
+  }
+}
+
+const NEXTCLOUD_BIN = "/Applications/Nextcloud.app/Contents/MacOS/Nextcloud";
+
+@action({ UUID: "com.pdma.notion-timer.launch-nextcloud" })
+class LaunchNextcloud extends SingletonAction {
+  async onKeyDown(ev: KeyDownEvent): Promise<void> {
+    try {
+      const { spawn } = await import("node:child_process");
+      const child = spawn(NEXTCLOUD_BIN, [], { detached: true, stdio: "ignore" });
+      // "error" (e.g. ENOENT if Nextcloud isn't installed at this path) fires
+      // asynchronously — without this listener it would crash the plugin process.
+      child.once("error", (err) => {
+        streamDeck.logger.error("Failed to launch Nextcloud:", err);
+      });
+      child.unref();
+      await ev.action.showOk();
+    } catch (err) {
+      streamDeck.logger.error("Failed to launch Nextcloud:", err);
+      await ev.action.showAlert();
+    }
   }
 }
 
 const timerAction = new TimerToggle();
 streamDeck.actions.registerAction(timerAction);
+streamDeck.actions.registerAction(new LaunchNextcloud());
 
 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 || "");
+    const title = buttonTitle(ev.payload.settings.projectName || "", ev.payload.settings.tag);
     if (title) await ev.action.setTitle(title);
   }
   if (ev.payload.event === "refreshProjects") {
@@ -253,6 +422,15 @@ streamDeck.ui.onSendToPlugin<{ event: string; settings?: TimerSettings; token?:
   }
 });
 
+const UPDATE_CHECK_INTERVAL_MS = 30 * 60 * 1000; // 30 minutes
+
 streamDeck.connect();
 
-setTimeout(() => checkForUpdates(), 10_000);
+setTimeout(() => {
+  streamDeck.logger.info("Running initial (10s post-launch) update check");
+  checkForUpdates();
+}, 10_000);
+setInterval(() => {
+  streamDeck.logger.info("Running scheduled (30min) update check");
+  checkForUpdates();
+}, UPDATE_CHECK_INTERVAL_MS);

version.json

@@ -1 +1 @@
-{ "version": "1.0.39" }
+{ "version": "1.0.65" }