clocktopus 1.2.0 → 1.3.0

package/README.md

@@ -21,9 +21,11 @@ curl -fsSL https://bun.sh/install | bash
 ### Install
 
 ```bash
-bun i -g clocktopus
+bun install -g clocktopus --trust
 ```
 
+> **Note:** `--trust` allows the postinstall script to build native addons (required for idle monitor on macOS). Without it, addon compilation is skipped and the monitor may fail to load.
+
 ### Run
 
 ```bash
@@ -160,10 +162,16 @@ bun pm cache rm && bun i -g clocktopus@latest
 
 ### Native addons not built (untrusted postinstall)
 
-If `bun install -g` skips the postinstall script, the monitor will auto-build native addons on first run (requires Node.js for `npx`). Alternatively, trust the package and reinstall:
+Bun skips postinstall scripts for untrusted packages. Install with `--trust` to fix this:
+
+```bash
+bun install -g clocktopus --trust
+```
+
+Or if already installed, rebuild manually:
 
 ```bash
-bun pm trust clocktopus && bun i -g clocktopus
+cd ~/.bun/install/global/node_modules/macos-notification-state && npx node-gyp rebuild
 ```
 
 ### Linux

package/dist/dashboard/routes/timer.js

@@ -1,6 +1,12 @@
 import { Hono } from 'hono';
+import { v4 as uuidv4 } from 'uuid';
 import { Clockify } from '../../clockify.js';
-import { completeLatestSession } from '../../lib/db.js';
+import { completeLatestSession, getOpenSession, logCompletedSession, logSessionStart } from '../../lib/db.js';
+import { stopJiraTimer } from '../../lib/jira.js';
+function extractJiraTicket(description) {
+    const match = description.match(/\b([A-Z][A-Z0-9]+-\d+)\b/);
+    return match?.[1];
+}
 const timerRoutes = new Hono();
 timerRoutes.get('/timer/active', async (c) => {
     try {
@@ -11,11 +17,20 @@ timerRoutes.get('/timer/active', async (c) => {
         const timer = await clockify.getActiveTimer(user.defaultWorkspace, user.id);
         if (!timer)
             return c.json({ active: false });
+        // Sync externally-started timers (e.g. from Clockify app or Jira plugin) to DB
+        const timerStart = timer.timeInterval.start;
+        const jiraTicket = extractJiraTicket(timer.description ?? '');
+        const openSession = getOpenSession();
+        const alreadyTracked = openSession && openSession.startedAt.slice(0, 19) === timerStart.slice(0, 19);
+        if (!alreadyTracked) {
+            logSessionStart(timer.id ?? uuidv4(), timer.projectId, timer.description ?? '', timerStart, jiraTicket);
+        }
         return c.json({
             active: true,
             description: timer.description,
             projectId: timer.projectId,
-            start: timer.timeInterval.start,
+            start: timerStart,
+            ...(jiraTicket ? { jiraTicket } : {}),
         });
     }
     catch {
@@ -47,14 +62,79 @@ timerRoutes.post('/timer/stop', async (c) => {
         const user = await clockify.getUser();
         if (!user)
             return c.json({ ok: false, error: 'Could not connect to Clockify.' }, 500);
+        const openSession = getOpenSession();
         const result = await clockify.stopTimer(user.defaultWorkspace, user.id);
         if (!result)
             return c.json({ ok: false, error: 'Failed to stop timer.' }, 500);
-        completeLatestSession(new Date().toISOString(), false);
+        const completedAt = new Date().toISOString();
+        completeLatestSession(completedAt, false);
+        if (openSession?.jiraTicket) {
+            const timeSpentSeconds = Math.round((new Date(completedAt).getTime() - new Date(openSession.startedAt).getTime()) / 1000);
+            if (timeSpentSeconds >= 60) {
+                try {
+                    await stopJiraTimer(openSession.jiraTicket, timeSpentSeconds);
+                }
+                catch (err) {
+                    console.error('Error stopping Jira timer:', err);
+                }
+            }
+        }
         return c.json({ ok: true });
     }
     catch {
         return c.json({ ok: false, error: 'Failed to stop timer.' }, 500);
     }
 });
+timerRoutes.post('/timer/log', async (c) => {
+    const { projectId, description, start, end, jiraTicket } = await c.req.json();
+    if (!projectId) {
+        return c.json({ ok: false, error: 'Project is required.' }, 400);
+    }
+    if (!start || !end) {
+        return c.json({ ok: false, error: 'Start and end are required.' }, 400);
+    }
+    const startMs = new Date(start).getTime();
+    const endMs = new Date(end).getTime();
+    if (Number.isNaN(startMs) || Number.isNaN(endMs)) {
+        return c.json({ ok: false, error: 'Invalid start or end date.' }, 400);
+    }
+    if (endMs <= startMs) {
+        return c.json({ ok: false, error: 'End must be after start.' }, 400);
+    }
+    const cleanDescription = (description ?? '').trim();
+    const cleanJira = jiraTicket?.trim() || undefined;
+    if (!cleanDescription && !cleanJira) {
+        return c.json({ ok: false, error: 'Description or Jira ticket is required.' }, 400);
+    }
+    try {
+        const clockify = new Clockify();
+        const user = await clockify.getUser();
+        if (!user)
+            return c.json({ ok: false, error: 'Could not connect to Clockify.' }, 500);
+        const startIso = new Date(startMs).toISOString();
+        const endIso = new Date(endMs).toISOString();
+        const finalDescription = cleanDescription || cleanJira;
+        const entry = await clockify.logTime(user.defaultWorkspace, projectId, startIso, endIso, finalDescription);
+        if (!entry)
+            return c.json({ ok: false, error: 'Failed to log time in Clockify.' }, 500);
+        const entryId = entry.id ?? uuidv4();
+        logCompletedSession(entryId, projectId, finalDescription, startIso, endIso, cleanJira);
+        if (cleanJira) {
+            const timeSpentSeconds = Math.round((endMs - startMs) / 1000);
+            if (timeSpentSeconds >= 60) {
+                try {
+                    await stopJiraTimer(cleanJira, timeSpentSeconds);
+                }
+                catch (err) {
+                    console.error('Error posting Jira worklog for manual entry:', err);
+                }
+            }
+        }
+        return c.json({ ok: true });
+    }
+    catch (err) {
+        console.error('Error logging manual time:', err);
+        return c.json({ ok: false, error: 'Failed to log time.' }, 500);
+    }
+});
 export default timerRoutes;

package/dist/dashboard/views.js

@@ -22,11 +22,18 @@ export function indexPage() {
 
     /* Cards */
     .cards { display: grid; grid-template-columns: repeat(auto-fill, minmax(380px, 1fr)); gap: 1.5rem; }
-    .card { background: #1c1f26; border: 1px solid #2d3139; border-radius: 12px; padding: 1.5rem; }
+    .home-cards { grid-template-columns: minmax(0, 2fr) minmax(0, 1fr); }
+    .card { background: #1c1f26; border: 1px solid #2d3139; border-radius: 12px; padding: 1.5rem; min-width: 0; }
     .card-header { display: flex; align-items: center; gap: 0.75rem; margin-bottom: 1rem; }
     .card-header h2 { margin-bottom: 0; }
     .card-full { grid-column: 1 / -1; }
 
+    /* Track tabs */
+    .track-tabs { display: inline-flex; gap: 0.25rem; background: #0d1117; border: 1px solid #30363d; border-radius: 8px; padding: 0.25rem; margin-bottom: 1rem; }
+    .track-tab-btn { margin-top: 0; padding: 0.4rem 1rem; border: none; border-radius: 6px; background: transparent; color: #8b949e; font-size: 0.85rem; cursor: pointer; }
+    .track-tab-btn:hover { color: #e1e4e8; }
+    .track-tab-btn.active { background: #30363d; color: #fff; }
+
     /* Active timer */
     .active-timer { border-left: 3px solid #3fb950; display: flex; align-items: center; justify-content: space-between; gap: 1rem; flex-wrap: wrap; }
     .active-timer .timer-info { flex: 1; }
@@ -69,6 +76,7 @@ export function indexPage() {
 
     /* Inline form row */
     .form-row { display: grid; grid-template-columns: 1fr 1fr; gap: 1rem; }
+    .form-row > div { min-width: 0; }
     /* Calendar event cards */
     .cal-event-card { background: #161b22; border: 1px solid #30363d; border-radius: 8px; padding: 0.75rem; margin-bottom: 0.5rem; }
     .cal-event-card .cal-card-name { color: #e1e4e8; font-size: 0.85rem; font-weight: 500; margin-bottom: 0.5rem; }
@@ -80,6 +88,7 @@ export function indexPage() {
     @media (max-width: 600px) {
       body { padding: 0.75rem; }
       .form-row { grid-template-columns: 1fr; }
+      .home-cards { grid-template-columns: 1fr; }
       .header { flex-direction: column; gap: 0; align-items: stretch; margin-bottom: 1rem; }
       .header h1 { display: none; }
       .nav { justify-content: center; flex-wrap: wrap; }
@@ -120,29 +129,64 @@ export function indexPage() {
       <button class="stop-btn" onclick="stopTimer()">Stop Timer</button>
     </div>
 
-    <div class="cards">
-      <!-- Start Timer -->
+    <div class="cards home-cards">
+      <!-- Track Time -->
       <div class="card">
-        <h2>Start Timer</h2>
-        <div id="start-timer-form">
-          <label for="project-select">Project</label>
-          <select id="project-select">
+        <div class="track-tabs">
+          <button class="track-tab-btn active" data-mode="auto" onclick="switchTrackMode('auto')">Auto Track</button>
+          <button class="track-tab-btn" data-mode="manual" onclick="switchTrackMode('manual')">Manual Log</button>
+        </div>
+
+        <div id="track-auto">
+          <div id="start-timer-form">
+            <label for="project-select">Project</label>
+            <select id="project-select">
+              <option value="">Loading projects...</option>
+            </select>
+            <div class="form-row">
+              <div>
+                <label for="timer-description">Description</label>
+                <input type="text" id="timer-description" placeholder="What are you working on?" />
+              </div>
+              <div>
+                <label for="timer-jira">Jira Ticket (optional)</label>
+                <input type="text" id="timer-jira" placeholder="e.g. PROJ-123" />
+              </div>
+            </div>
+            <button id="start-btn" onclick="startTimer()">Start Timer</button>
+          </div>
+          <div id="last-tasks" style="display:none; margin-top:0.75rem;"></div>
+          <div class="msg" id="timer-msg"></div>
+        </div>
+
+        <div id="track-manual" style="display:none;">
+          <label for="manual-project">Project</label>
+          <select id="manual-project">
             <option value="">Loading projects...</option>
           </select>
           <div class="form-row">
             <div>
-              <label for="timer-description">Description</label>
-              <input type="text" id="timer-description" placeholder="What are you working on?" />
+              <label for="manual-start">Start</label>
+              <input type="datetime-local" id="manual-start" />
             </div>
             <div>
-              <label for="timer-jira">Jira Ticket (optional)</label>
-              <input type="text" id="timer-jira" placeholder="e.g. PROJ-123" />
+              <label for="manual-end">End</label>
+              <input type="datetime-local" id="manual-end" />
             </div>
           </div>
-          <button id="start-btn" onclick="startTimer()">Start Timer</button>
+          <div class="form-row">
+            <div>
+              <label for="manual-description">Description</label>
+              <input type="text" id="manual-description" placeholder="What did you work on?" />
+            </div>
+            <div>
+              <label for="manual-jira">Jira Ticket (optional)</label>
+              <input type="text" id="manual-jira" placeholder="e.g. PROJ-123" />
+            </div>
+          </div>
+          <button id="manual-log-btn" onclick="logManualTime()">Log Time</button>
+          <div class="msg" id="manual-msg"></div>
         </div>
-        <div id="last-tasks" style="display:none; margin-top:0.75rem;"></div>
-        <div class="msg" id="timer-msg"></div>
       </div>
 
       <!-- Monitor Control -->
@@ -311,6 +355,14 @@ export function indexPage() {
       document.getElementById('nav-' + tab).classList.add('active');
     }
 
+    function switchTrackMode(mode) {
+      document.querySelectorAll('.track-tab-btn').forEach(function(b) {
+        b.classList.toggle('active', b.dataset.mode === mode);
+      });
+      document.getElementById('track-auto').style.display = mode === 'auto' ? 'block' : 'none';
+      document.getElementById('track-manual').style.display = mode === 'manual' ? 'block' : 'none';
+    }
+
     // --- Utilities ---
     function setMsg(id, text, ok) {
       const el = document.getElementById(id);
@@ -430,6 +482,70 @@ export function indexPage() {
       }
     }
 
+    function toLocalInputValue(date) {
+      const pad = function(n) { return String(n).padStart(2, '0'); };
+      return date.getFullYear() + '-' + pad(date.getMonth() + 1) + '-' + pad(date.getDate()) +
+        'T' + pad(date.getHours()) + ':' + pad(date.getMinutes());
+    }
+
+    function setManualDefaults() {
+      const now = new Date();
+      const hourAgo = new Date(now.getTime() - 60 * 60 * 1000);
+      const startEl = document.getElementById('manual-start');
+      const endEl = document.getElementById('manual-end');
+      if (startEl) startEl.value = toLocalInputValue(hourAgo);
+      if (endEl) endEl.value = toLocalInputValue(now);
+    }
+
+    async function logManualTime() {
+      const projectId = document.getElementById('manual-project').value;
+      const startVal = document.getElementById('manual-start').value;
+      const endVal = document.getElementById('manual-end').value;
+      const description = document.getElementById('manual-description').value.trim();
+      const jiraTicket = document.getElementById('manual-jira').value.trim();
+
+      if (!projectId) return setMsg('manual-msg', 'Please select a project.', false);
+      if (!startVal || !endVal) return setMsg('manual-msg', 'Please set start and end.', false);
+
+      const startMs = new Date(startVal).getTime();
+      const endMs = new Date(endVal).getTime();
+      if (isNaN(startMs) || isNaN(endMs)) return setMsg('manual-msg', 'Invalid date.', false);
+      if (endMs <= startMs) return setMsg('manual-msg', 'End must be after start.', false);
+      if (!description && !jiraTicket) return setMsg('manual-msg', 'Please enter a description or Jira ticket.', false);
+
+      const btn = document.getElementById('manual-log-btn');
+      btn.disabled = true;
+      btn.textContent = 'Logging...';
+
+      try {
+        const res = await fetch('/api/timer/log', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({
+            projectId: projectId,
+            description: description,
+            start: new Date(startMs).toISOString(),
+            end: new Date(endMs).toISOString(),
+            jiraTicket: jiraTicket || undefined,
+          }),
+        });
+        const data = await res.json();
+        if (data.ok) {
+          setMsg('manual-msg', 'Time logged.', true);
+          document.getElementById('manual-description').value = '';
+          document.getElementById('manual-jira').value = '';
+          setManualDefaults();
+          loadSessions();
+        } else {
+          setMsg('manual-msg', data.error || 'Failed to log time.', false);
+        }
+      } catch {
+        setMsg('manual-msg', 'Request failed.', false);
+      }
+      btn.disabled = false;
+      btn.textContent = 'Log Time';
+    }
+
     // --- Last Tasks ---
     var lastTasks = [];
 
@@ -542,20 +658,26 @@ export function indexPage() {
       try {
         const res = await fetch('/api/projects');
         const projects = await res.json();
-        const select = document.getElementById('project-select');
-        select.innerHTML = '<option value="">Select a project</option>';
-        if (projects.length === 0) {
-          select.innerHTML = '<option value="">No active projects \u2014 pull from Clockify in Settings</option>';
-          return;
-        }
-        projects.forEach(function(p) {
-          const opt = document.createElement('option');
-          opt.value = p.id;
-          opt.textContent = p.name;
-          select.appendChild(opt);
+        const selects = [document.getElementById('project-select'), document.getElementById('manual-project')];
+        selects.forEach(function(select) {
+          if (!select) return;
+          select.innerHTML = '<option value="">Select a project</option>';
+          if (projects.length === 0) {
+            select.innerHTML = '<option value="">No active projects \u2014 pull from Clockify in Settings</option>';
+            return;
+          }
+          projects.forEach(function(p) {
+            const opt = document.createElement('option');
+            opt.value = p.id;
+            opt.textContent = p.name;
+            select.appendChild(opt);
+          });
         });
       } catch {
-        document.getElementById('project-select').innerHTML = '<option value="">Failed to load projects</option>';
+        const select = document.getElementById('project-select');
+        if (select) select.innerHTML = '<option value="">Failed to load projects</option>';
+        const manual = document.getElementById('manual-project');
+        if (manual) manual.innerHTML = '<option value="">Failed to load projects</option>';
       }
     }
 
@@ -1000,6 +1122,7 @@ export function indexPage() {
     checkActiveTimer();
     checkMonitorStatus();
     loadAllProjects();
+    setManualDefaults();
 
   </script>
 </body>

package/dist/lib/db.js

@@ -105,9 +105,14 @@ export function getLatestToken() {
 }
 export function logSessionStart(id, projectId, description, startedAt, jiraTicket) {
     const db = getDb();
-    const stmt = db.prepare('INSERT INTO sessions (id, projectId, description, startedAt, isAutoCompleted, jiraTicket) VALUES (?, ?, ?, ?, ?, ?)');
+    const stmt = db.prepare('INSERT OR IGNORE INTO sessions (id, projectId, description, startedAt, isAutoCompleted, jiraTicket) VALUES (?, ?, ?, ?, ?, ?)');
     stmt.run(id, projectId, description, startedAt, 0, jiraTicket ?? null);
 }
+export function logCompletedSession(id, projectId, description, startedAt, completedAt, jiraTicket) {
+    const db = getDb();
+    const stmt = db.prepare('INSERT OR IGNORE INTO sessions (id, projectId, description, startedAt, completedAt, isAutoCompleted, jiraTicket) VALUES (?, ?, ?, ?, ?, 0, ?)');
+    stmt.run(id, projectId, description, startedAt, completedAt, jiraTicket ?? null);
+}
 export function completeLatestSession(completedAt, isAutoCompleted = false) {
     const db = getDb();
     const stmt = db.prepare(`
@@ -130,6 +135,14 @@ export function getSessionCount() {
     const row = stmt.get();
     return row.count;
 }
+export function getOpenSession() {
+    const db = getDb();
+    const stmt = db.prepare('SELECT * FROM sessions WHERE completedAt IS NULL ORDER BY startedAt DESC LIMIT 1');
+    const row = stmt.get();
+    if (!row)
+        return null;
+    return SessionSchema.parse(row);
+}
 export function getLatestSession() {
     const db = getDb();
     const stmt = db.prepare(`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clocktopus",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "type": "module",
   "main": "dist/index.js",
   "bin": {