clocktopus 1.5.1 → 1.6.1

package/dist/clockify.js

@@ -104,7 +104,7 @@ export class Clockify {
             return null;
         }
     }
-    async startTimer(workspaceId, projectId, description = 'Working on a task...', jiraTicket) {
+    async startTimer(workspaceId, projectId, description = 'Working on a task...', jiraTicket, billable = true) {
         try {
             const user = await this.getUser();
             if (!user) {
@@ -123,6 +123,7 @@ export class Clockify {
                 projectId: projectId,
                 description: finalDescription,
                 start: startedAt,
+                billable,
             });
             // Log session to SQLite
             logSessionStart(sessionId, projectId, finalDescription, startedAt, jiraTicket);
@@ -195,7 +196,7 @@ export class Clockify {
             return [];
         }
     }
-    async logTime(workspaceId, projectId, start, end, description) {
+    async logTime(workspaceId, projectId, start, end, description, billable = true) {
         if (!projectId) {
             return null;
         }
@@ -205,6 +206,7 @@ export class Clockify {
                 start: start,
                 end: end,
                 description: description,
+                billable,
             });
             return response.data;
         }

package/dist/dashboard/routes/calendar.js

@@ -31,13 +31,33 @@ calendarRoutes.get('/calendar/events', async (c) => {
         const endOfDay = new Date(end);
         endOfDay.setDate(endOfDay.getDate() + 1);
         const timeMax = endOfDay.toISOString();
-        const res = await calendar.events.list({
+        const listEvents = () => calendar.events.list({
             calendarId: 'primary',
             timeMin,
             timeMax,
             singleEvents: true,
             orderBy: 'startTime',
         });
+        let res;
+        try {
+            res = await listEvents();
+        }
+        catch (err) {
+            const status = err?.code ?? err?.status;
+            if (status === 401 && token.refresh_token) {
+                console.log('[calendar] Access token rejected (401). Refreshing and retrying...');
+                token = await getRefreshedToken(token);
+                storeToken(token);
+                oAuth2Client.setCredentials(token);
+                res = await listEvents();
+            }
+            else if (status === 401) {
+                return c.json({ ok: false, error: 'Google auth expired. Please reconnect your Google account in Settings.' }, 401);
+            }
+            else {
+                throw err;
+            }
+        }
         // Fetch existing Clockify entries for the same range to detect duplicates
         const clockify = new Clockify();
         const user = await clockify.getUser();
@@ -86,7 +106,7 @@ calendarRoutes.post('/calendar/log', async (c) => {
                 continue;
             }
             try {
-                await clockify.logTime(user.defaultWorkspace, entry.projectId, entry.start, entry.end, entry.summary);
+                await clockify.logTime(user.defaultWorkspace, entry.projectId, entry.start, entry.end, entry.summary, entry.billable ?? true);
                 setEventProject(entry.summary, entry.projectId);
                 logged.push(entry.summary);
             }

package/dist/dashboard/routes/timer.js

@@ -56,7 +56,7 @@ timerRoutes.get('/timer/active', async (c) => {
     }
 });
 timerRoutes.post('/timer/start', async (c) => {
-    const { projectId, description, jiraTicket } = await c.req.json();
+    const { projectId, description, jiraTicket, billable } = await c.req.json();
     if (!projectId || !description) {
         return c.json({ ok: false, error: 'Project and description are required.' }, 400);
     }
@@ -65,7 +65,7 @@ timerRoutes.post('/timer/start', async (c) => {
         const user = await clockify.getUser();
         if (!user)
             return c.json({ ok: false, error: 'Could not connect to Clockify.' }, 500);
-        const result = await clockify.startTimer(user.defaultWorkspace, projectId, description, jiraTicket);
+        const result = await clockify.startTimer(user.defaultWorkspace, projectId, description, jiraTicket, billable ?? true);
         if (!result)
             return c.json({ ok: false, error: 'Failed to start timer.' }, 500);
         return c.json({ ok: true });
@@ -104,7 +104,7 @@ timerRoutes.post('/timer/stop', async (c) => {
     }
 });
 timerRoutes.post('/timer/log', async (c) => {
-    const { projectId, description, start, end, jiraTicket } = await c.req.json();
+    const { projectId, description, start, end, jiraTicket, billable } = await c.req.json();
     if (!projectId) {
         return c.json({ ok: false, error: 'Project is required.' }, 400);
     }
@@ -132,7 +132,7 @@ timerRoutes.post('/timer/log', async (c) => {
         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);
+        const entry = await clockify.logTime(user.defaultWorkspace, projectId, startIso, endIso, finalDescription, billable ?? true);
         if (!entry)
             return c.json({ ok: false, error: 'Failed to log time in Clockify.' }, 500);
         const entryId = entry.id ?? uuidv4();

package/dist/dashboard/views.js

@@ -159,6 +159,10 @@ export function indexPage() {
                 <input type="text" id="timer-jira" placeholder="e.g. PROJ-123" />
               </div>
             </div>
+            <label style="display:flex; align-items:center; gap:0.5rem; font-weight:normal; cursor:pointer;">
+              <input type="checkbox" id="timer-billable" checked style="width:auto; margin:0;" />
+              Billable
+            </label>
             <button id="start-btn" onclick="startTimer()">Start Timer</button>
           </div>
           <div id="last-tasks" style="display:none; margin-top:0.75rem;"></div>
@@ -190,6 +194,10 @@ export function indexPage() {
               <input type="text" id="manual-jira" placeholder="e.g. PROJ-123" />
             </div>
           </div>
+          <label style="display:flex; align-items:center; gap:0.5rem; font-weight:normal; cursor:pointer;">
+            <input type="checkbox" id="manual-billable" checked style="width:auto; margin:0;" />
+            Billable
+          </label>
           <button id="manual-log-btn" onclick="logManualTime()">Log Time</button>
           <div class="msg" id="manual-msg"></div>
         </div>
@@ -442,6 +450,7 @@ export function indexPage() {
       const projectId = document.getElementById('project-select').value;
       const description = document.getElementById('timer-description').value.trim();
       const jiraTicket = document.getElementById('timer-jira').value.trim();
+      const billable = document.getElementById('timer-billable').checked;
 
       if (!projectId) return setMsg('timer-msg', 'Please select a project.', false);
       if (!description && !jiraTicket) return setMsg('timer-msg', 'Please enter a description or Jira ticket.', false);
@@ -454,7 +463,7 @@ export function indexPage() {
         const res = await fetch('/api/timer/start', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ projectId, description: description || 'Working on a task...', jiraTicket: jiraTicket || undefined }),
+          body: JSON.stringify({ projectId, description: description || 'Working on a task...', jiraTicket: jiraTicket || undefined, billable }),
         });
         const data = await res.json();
         if (data.ok) {
@@ -514,6 +523,7 @@ export function indexPage() {
       const endVal = document.getElementById('manual-end').value;
       const description = document.getElementById('manual-description').value.trim();
       const jiraTicket = document.getElementById('manual-jira').value.trim();
+      const billable = document.getElementById('manual-billable').checked;
 
       if (!projectId) return setMsg('manual-msg', 'Please select a project.', false);
       if (!startVal || !endVal) return setMsg('manual-msg', 'Please set start and end.', false);
@@ -538,6 +548,7 @@ export function indexPage() {
             start: new Date(startMs).toISOString(),
             end: new Date(endMs).toISOString(),
             jiraTicket: jiraTicket || undefined,
+            billable: billable,
           }),
         });
         const data = await res.json();
@@ -599,6 +610,7 @@ export function indexPage() {
             projectId: task.projectId,
             description: task.description || 'Working on a task...',
             jiraTicket: task.jiraTicket || undefined,
+            billable: document.getElementById('timer-billable').checked,
           }),
         });
         var data = await res.json();
@@ -649,18 +661,54 @@ export function indexPage() {
     }
 
     async function monitorAction(action) {
-      setMsg('monitor-msg', '', true);
+      const startBtn = document.getElementById('monitor-start-btn');
+      const stopBtn = document.getElementById('monitor-stop-btn');
+      const restartBtn = document.getElementById('monitor-restart-btn');
+      const desc = document.getElementById('monitor-desc');
+      const dot = document.getElementById('monitor-dot');
+
+      const labels = { start: 'Starting', stop: 'Stopping', restart: 'Restarting' };
+      const pending = labels[action] || 'Working';
+
+      const prevDesc = desc.textContent;
+      const prevColor = desc.style.color;
+      const prevDot = dot.className;
+
+      startBtn.disabled = true;
+      stopBtn.disabled = true;
+      restartBtn.disabled = true;
+      dot.className = 'dot gray';
+      desc.textContent = pending + ' server...';
+      desc.style.color = '#d29922';
+      setMsg('monitor-msg', pending + ' server...', true);
+
+      const MIN_DISPLAY_MS = 1500;
+      const started = Date.now();
+      const waitMin = function() {
+        const elapsed = Date.now() - started;
+        return new Promise(function(r) { setTimeout(r, Math.max(0, MIN_DISPLAY_MS - elapsed)); });
+      };
+
       try {
         const res = await fetch('/api/monitor/' + action, { method: 'POST' });
         const data = await res.json();
+        await waitMin();
         if (data.ok) {
           setMsg('monitor-msg', 'Monitor ' + action + (action === 'stop' ? 'ped' : 'ed') + '.', true);
         } else {
           setMsg('monitor-msg', data.output || 'Failed.', false);
+          desc.textContent = prevDesc;
+          desc.style.color = prevColor;
+          dot.className = prevDot;
         }
-        setTimeout(checkMonitorStatus, 1000);
+        setTimeout(checkMonitorStatus, 500);
       } catch {
+        await waitMin();
         setMsg('monitor-msg', 'Request failed.', false);
+        desc.textContent = prevDesc;
+        desc.style.color = prevColor;
+        dot.className = prevDot;
+        checkMonitorStatus();
       }
     }
 
@@ -1036,9 +1084,10 @@ export function indexPage() {
         document.getElementById('cal-table-wrap').style.display = 'block';
       } catch {
         setMsg('cal-msg', 'Request failed.', false);
+      } finally {
+        fetchBtn.disabled = false;
+        fetchBtn.textContent = 'Fetch Events';
       }
-      fetchBtn.disabled = false;
-      fetchBtn.textContent = 'Fetch Events';
     }
 
     function renderCalendarTable() {
@@ -1060,10 +1109,15 @@ export function indexPage() {
             return '<option value="' + p.id + '"' + selected + '>' + escapeHtml(p.name) + '</option>';
           }).join('');
 
+        const billableChecked = ev.billable === false ? '' : ' checked';
         return '<div class="cal-event-card' + (logged ? ' logged' : '') + '">' +
           '<div class="cal-card-name">' + escapeHtml(ev.summary || 'Untitled') + badge + '</div>' +
           '<div class="cal-card-time">' + startDay + ' ' + startTime + ' — ' + endTime + ' (' + formatDuration(durationMs) + ')</div>' +
           '<select class="cal-project-sel" data-index="' + i + '"' + selDisabled + '>' + projectOptions + '</select>' +
+          '<label style="display:flex; align-items:center; gap:0.4rem; font-size:0.75rem; color:#8b949e; margin-top:0.5rem; cursor:pointer;">' +
+            '<input type="checkbox" class="cal-billable-sel" data-index="' + i + '"' + billableChecked + (logged ? ' disabled' : '') + ' style="width:auto; margin:0;" />' +
+            'Billable' +
+          '</label>' +
         '</div>';
       }).join('');
 
@@ -1073,6 +1127,13 @@ export function indexPage() {
           calEvents[idx].savedProjectId = sel.value || null;
         });
       });
+
+      document.querySelectorAll('.cal-billable-sel').forEach(function(cb) {
+        cb.addEventListener('change', function() {
+          const idx = parseInt(cb.dataset.index);
+          calEvents[idx].billable = cb.checked;
+        });
+      });
     }
 
     async function logCalendarEvents() {
@@ -1082,7 +1143,9 @@ export function indexPage() {
         if (sel.value === 'skip' || !sel.value) return;
         const idx = parseInt(sel.dataset.index);
         const ev = calEvents[idx];
-        entries.push({ projectId: sel.value, summary: ev.summary, start: ev.start, end: ev.end });
+        const cb = document.querySelector('.cal-billable-sel[data-index="' + idx + '"]');
+        const billable = cb ? cb.checked : true;
+        entries.push({ projectId: sel.value, summary: ev.summary, start: ev.start, end: ev.end, billable: billable });
       });
 
       if (entries.length === 0) {

package/dist/index.js

@@ -56,6 +56,7 @@ program
     .description('Start a new time entry. Select a project interactively.')
     .argument('[message]', 'Description for the time entry')
     .option('-j, --jira <ticket>', 'Jira ticket number')
+    .option('--no-billable', 'Mark the time entry as non-billable')
     .action(async (message, options) => {
     const { workspaceId } = await getWorkspaceAndUser();
     let projects = await clockify.getProjects(workspaceId);
@@ -84,7 +85,7 @@ program
             choices: projects.map((p) => ({ name: p.name, value: p.id })),
         },
     ]);
-    const entry = await clockify.startTimer(workspaceId, selectedProjectId, message, options.jira);
+    const entry = await clockify.startTimer(workspaceId, selectedProjectId, message, options.jira, options.billable);
     if (entry) {
         const projectName = projects.find((p) => p.id === selectedProjectId)?.name;
         console.log(chalk.green(`Timer started for project: ${chalk.bold(projectName)}`));

package/dist/scripts/log-calendar-events.js

@@ -35,9 +35,10 @@ program
     .option('-e, --end-date <endDate>', 'End date for fetching calendar events')
     .option('-t, --today', 'Log time for today')
     .option('-p, --project-id <projectId>', 'Clockify project ID')
+    .option('--no-billable', 'Mark logged entries as non-billable')
     .parse(process.argv);
 const opts = program.opts();
-const { projectId, today } = opts;
+const { projectId, today, billable } = opts;
 let { startDate, endDate } = opts;
 if (today) {
     const todayDate = new Date();
@@ -124,7 +125,7 @@ async function main() {
                     }
                     if (eventProjectId) {
                         console.log(`Logging "${event.summary}" to Clockify...`);
-                        await clockify.logTime(user.activeWorkspace, eventProjectId, event.start.dateTime, event.end.dateTime, event.summary);
+                        await clockify.logTime(user.activeWorkspace, eventProjectId, event.start.dateTime, event.end.dateTime, event.summary, billable);
                     }
                 }
             }

package/package.json

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