clocktopus 1.6.7 → 1.6.9

package/dist/clockify.js

@@ -196,6 +196,18 @@ export class Clockify {
             return [];
         }
     }
+    async deleteTimeEntry(workspaceId, entryId) {
+        try {
+            await this.httpClient.delete(`/workspaces/${workspaceId}/time-entries/${entryId}`);
+            return true;
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                console.error('Error deleting time entry:', error.message);
+            }
+            return false;
+        }
+    }
     async logTime(workspaceId, projectId, start, end, description, billable = true) {
         if (!projectId) {
             return null;

package/dist/dashboard/routes/timer.js

@@ -1,8 +1,8 @@
 import { Hono } from 'hono';
 import { v4 as uuidv4 } from 'uuid';
 import { Clockify } from '../../clockify.js';
-import { completeLatestSession, getOpenSession, logCompletedSession, logSessionStart } from '../../lib/db.js';
-import { stopJiraTimer } from '../../lib/jira.js';
+import { completeLatestSession, deleteSessionById, getOpenSession, getSessionById, logCompletedSession, logSessionStart, setSessionJiraWorklogId, } from '../../lib/db.js';
+import { deleteJiraWorklog, stopJiraTimer } from '../../lib/jira.js';
 function extractJiraTicket(description) {
     const match = description.match(/\b([A-Z][A-Z0-9]+-\d+)\b/);
     return match?.[1];
@@ -25,7 +25,9 @@ timerRoutes.get('/timer/active', async (c) => {
                     const timeSpentSeconds = Math.round((new Date(completedAt).getTime() - new Date(openSession.startedAt).getTime()) / 1000);
                     if (timeSpentSeconds >= 60) {
                         try {
-                            await stopJiraTimer(openSession.jiraTicket, timeSpentSeconds);
+                            const worklog = await stopJiraTimer(openSession.jiraTicket, timeSpentSeconds);
+                            if (worklog?.id)
+                                setSessionJiraWorklogId(openSession.id, worklog.id);
                         }
                         catch (err) {
                             console.error('Error stopping Jira timer on external stop:', err);
@@ -90,7 +92,9 @@ timerRoutes.post('/timer/stop', async (c) => {
             const timeSpentSeconds = Math.round((new Date(completedAt).getTime() - new Date(openSession.startedAt).getTime()) / 1000);
             if (timeSpentSeconds >= 60) {
                 try {
-                    await stopJiraTimer(openSession.jiraTicket, timeSpentSeconds);
+                    const worklog = await stopJiraTimer(openSession.jiraTicket, timeSpentSeconds);
+                    if (worklog?.id)
+                        setSessionJiraWorklogId(openSession.id, worklog.id);
                 }
                 catch (err) {
                     console.error('Error stopping Jira timer:', err);
@@ -141,7 +145,9 @@ timerRoutes.post('/timer/log', async (c) => {
             const timeSpentSeconds = Math.round((endMs - startMs) / 1000);
             if (timeSpentSeconds >= 60) {
                 try {
-                    await stopJiraTimer(cleanJira, timeSpentSeconds);
+                    const worklog = await stopJiraTimer(cleanJira, timeSpentSeconds);
+                    if (worklog?.id)
+                        setSessionJiraWorklogId(entryId, worklog.id);
                 }
                 catch (err) {
                     console.error('Error posting Jira worklog for manual entry:', err);
@@ -155,4 +161,36 @@ timerRoutes.post('/timer/log', async (c) => {
         return c.json({ ok: false, error: 'Failed to log time.' }, 500);
     }
 });
+timerRoutes.delete('/timer/:id', async (c) => {
+    const id = c.req.param('id');
+    if (!id)
+        return c.json({ ok: false, error: 'Missing id.' }, 400);
+    const session = getSessionById(id);
+    if (!session)
+        return c.json({ ok: false, error: 'Session not found.' }, 404);
+    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 clockifyOk = await clockify.deleteTimeEntry(user.defaultWorkspace, id);
+        // Continue even if Clockify delete fails — the entry may already be gone remotely.
+        if (!clockifyOk)
+            console.warn(`Clockify delete returned failure for ${id}; removing local record anyway.`);
+        if (session.jiraTicket && session.jiraWorklogId) {
+            try {
+                await deleteJiraWorklog(session.jiraTicket, session.jiraWorklogId);
+            }
+            catch (err) {
+                console.error('Error deleting Jira worklog:', err);
+            }
+        }
+        deleteSessionById(id);
+        return c.json({ ok: true });
+    }
+    catch (err) {
+        console.error('Error deleting entry:', err);
+        return c.json({ ok: false, error: 'Failed to delete entry.' }, 500);
+    }
+});
 export default timerRoutes;

package/dist/dashboard/views.js

@@ -78,6 +78,8 @@ export function indexPage() {
     .sessions-table td { padding: 0.5rem 0.75rem; border-bottom: 1px solid #21262d; }
     .sessions-table tr:hover { background: #161b22; }
     .sessions-table .in-progress { color: #3fb950; font-style: italic; }
+    .delete-btn { background: transparent; color: #8b949e; border: none; cursor: pointer; font-size: 1.1rem; line-height: 1; padding: 0 0.4rem; margin-top: 0; }
+    .delete-btn:hover { color: #f85149; background: transparent; }
     .empty-state { color: #8b949e; font-size: 0.9rem; padding: 2rem; text-align: center; }
 
     /* Inline form row */
@@ -230,10 +232,11 @@ export function indexPage() {
                 <th>Started</th>
                 <th>Duration</th>
                 <th>Jira</th>
+                <th></th>
               </tr>
             </thead>
             <tbody id="sessions-body">
-              <tr><td colspan="5" class="empty-state">Loading...</td></tr>
+              <tr><td colspan="6" class="empty-state">Loading...</td></tr>
             </tbody>
           </table>
           <div id="pagination" style="display:none; margin-top:1rem; align-items:center; justify-content:center; gap:0.75rem; flex-wrap:wrap;">
@@ -841,7 +844,7 @@ export function indexPage() {
         const pagination = document.getElementById('pagination');
 
         if (sessions.length === 0 && currentPage === 1) {
-          tbody.innerHTML = '<tr><td colspan="5" class="empty-state">No sessions yet. Start a timer to get going!</td></tr>';
+          tbody.innerHTML = '<tr><td colspan="6" class="empty-state">No sessions yet. Start a timer to get going!</td></tr>';
           pagination.style.display = 'none';
           return;
         }
@@ -856,12 +859,16 @@ export function indexPage() {
             duration = '<span class="in-progress">In progress</span>';
           }
           const jira = s.jiraTicket || '-';
+          const deleteBtn = s.completedAt
+            ? '<button class="delete-btn" title="Delete entry" onclick="deleteSession(\'' + escapeHtml(s.id) + '\')">&times;</button>'
+            : '';
           return '<tr>' +
             '<td>' + escapeHtml(s.description) + '</td>' +
             '<td>' + escapeHtml(s.projectName) + '</td>' +
             '<td>' + started + '</td>' +
             '<td>' + duration + '</td>' +
             '<td>' + escapeHtml(jira) + '</td>' +
+            '<td style="text-align:right;">' + deleteBtn + '</td>' +
             '</tr>';
         }).join('');
 
@@ -871,7 +878,7 @@ export function indexPage() {
         document.getElementById('next-btn').disabled = currentPage >= totalPages;
         document.getElementById('page-info').textContent = 'Page ' + currentPage + ' of ' + totalPages + ' (' + result.total + ' sessions)';
       } catch {
-        document.getElementById('sessions-body').innerHTML = '<tr><td colspan="5" class="empty-state">Failed to load sessions.</td></tr>';
+        document.getElementById('sessions-body').innerHTML = '<tr><td colspan="6" class="empty-state">Failed to load sessions.</td></tr>';
       }
     }
 
@@ -882,6 +889,21 @@ export function indexPage() {
       loadSessions();
     }
 
+    async function deleteSession(id) {
+      if (!confirm('Delete this entry from Clockify and Jira?')) return;
+      try {
+        const res = await fetch('/api/timer/' + encodeURIComponent(id), { method: 'DELETE' });
+        const result = await res.json();
+        if (!result.ok) {
+          alert(result.error || 'Failed to delete entry.');
+          return;
+        }
+        loadSessions();
+      } catch {
+        alert('Failed to delete entry.');
+      }
+    }
+
     function escapeHtml(str) {
       const div = document.createElement('div');
       div.textContent = str;

package/dist/index.js

@@ -8,7 +8,7 @@ import * as path from 'path';
 import { fileURLToPath } from 'url';
 import { createRequire } from 'module';
 import { execSync } from 'child_process';
-import { completeLatestSession, getLatestSession } from './lib/db.js';
+import { completeLatestSession, getLatestSession, setSessionJiraWorklogId } from './lib/db.js';
 import { stopJiraTimer } from './lib/jira.js';
 import { startDashboard } from './dashboard/server.js';
 import { ensureNativeAddons } from './lib/ensure-native-addons.js';
@@ -106,7 +106,9 @@ program
             const timeSpentSeconds = Math.round((new Date(completedAt).getTime() - new Date(latestSession.startedAt).getTime()) / 1000);
             if (timeSpentSeconds >= 60) {
                 try {
-                    await stopJiraTimer(latestSession.jiraTicket, timeSpentSeconds);
+                    const worklog = await stopJiraTimer(latestSession.jiraTicket, timeSpentSeconds);
+                    if (worklog?.id)
+                        setSessionJiraWorklogId(latestSession.id, worklog.id);
                 }
                 catch (error) {
                     console.error('Error stopping Jira timer:', error);
@@ -161,7 +163,9 @@ program
             const timeSpentSeconds = Math.round((new Date(completedAt).getTime() - new Date(latestSession.startedAt).getTime()) / 1000);
             if (timeSpentSeconds >= 60) {
                 try {
-                    await stopJiraTimer(latestSession.jiraTicket, timeSpentSeconds);
+                    const worklog = await stopJiraTimer(latestSession.jiraTicket, timeSpentSeconds);
+                    if (worklog?.id)
+                        setSessionJiraWorklogId(latestSession.id, worklog.id);
                 }
                 catch (err) {
                     console.error('Error stopping Jira timer:', err);

package/dist/lib/db.js

@@ -23,6 +23,7 @@ const SessionSchema = z.object({
     completedAt: z.string().nullable(),
     isAutoCompleted: z.number(),
     jiraTicket: z.string().nullable(),
+    jiraWorklogId: z.string().nullable().optional(),
 });
 let dbInstance = null;
 function getDb() {
@@ -37,9 +38,15 @@ function getDb() {
         startedAt TEXT NOT NULL,
         completedAt TEXT,
         isAutoCompleted INTEGER DEFAULT 0,
-        jiraTicket TEXT
+        jiraTicket TEXT,
+        jiraWorklogId TEXT
       )
     `);
+        // Migration: add jiraWorklogId to pre-existing sessions tables
+        const sessionCols = dbInstance.prepare('PRAGMA table_info(sessions)').all();
+        if (!sessionCols.some((c) => c.name === 'jiraWorklogId')) {
+            dbInstance.exec('ALTER TABLE sessions ADD COLUMN jiraWorklogId TEXT');
+        }
         dbInstance.exec(`
       CREATE TABLE IF NOT EXISTS google_tokens (
         id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -124,6 +131,21 @@ export function completeLatestSession(completedAt, isAutoCompleted = false) {
   `);
     stmt.run(completedAt, isAutoCompleted ? 1 : 0);
 }
+export function setSessionJiraWorklogId(sessionId, worklogId) {
+    const db = getDb();
+    db.prepare('UPDATE sessions SET jiraWorklogId = ? WHERE id = ?').run(worklogId, sessionId);
+}
+export function getSessionById(id) {
+    const db = getDb();
+    const row = db.prepare('SELECT * FROM sessions WHERE id = ?').get(id);
+    if (!row)
+        return null;
+    return SessionSchema.parse(row);
+}
+export function deleteSessionById(id) {
+    const db = getDb();
+    db.prepare('DELETE FROM sessions WHERE id = ?').run(id);
+}
 export function getRecentSessions(limit = 10, offset = 0) {
     const db = getDb();
     const stmt = db.prepare('SELECT * FROM sessions ORDER BY startedAt DESC LIMIT ? OFFSET ?');

package/dist/lib/jira.js

@@ -80,8 +80,13 @@ export async function stopJiraTimer(ticketId, timeSpentSeconds) {
             ],
         },
     };
-    console.log('Jira request body:', JSON.stringify(body, null, 2));
-    return await jiraApiRequest(`/issue/${ticketId}/worklog`, 'POST', body);
+    const response = await jiraApiRequest(`/issue/${ticketId}/worklog`, 'POST', body);
+    const id = response?.id;
+    return id != null ? { id: String(id) } : null;
+}
+export async function deleteJiraWorklog(ticketId, worklogId) {
+    const result = await jiraApiRequest(`/issue/${ticketId}/worklog/${worklogId}`, 'DELETE');
+    return result !== null;
 }
 export async function getJiraTicket(ticketId) {
     return await jiraApiRequest(`/issue/${ticketId}`, 'GET');

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "clocktopus",
-  "version": "1.6.7",
+  "version": "1.6.9",
+  "description": "Time-tracking automation for Clockify with idle monitoring, Jira integration, Google Calendar sync, CLI, web dashboard, and desktop app.",
   "type": "module",
   "main": "dist/index.js",
   "bin": {