kalvium-worklog 1.0.3 → 1.2.0

package/README.md

@@ -11,66 +11,40 @@ npm install -g kalvium-worklog
 ## Quick Start
 
 ```bash
-# Full setup (login + discover position + schedule + phone webapp)
+# Full setup (login + discover position + schedule)
 kalvium-worklog install
 
 # Or step by step:
 kalvium-worklog login       # log in via browser (Google + 2FA)
 kalvium-worklog discover    # auto-discover your position ID
 kalvium-worklog schedule 14:00  # daily auto-submit at 2 PM
-kalvium-worklog webapp      # generate phone web app
 ```
 
 ## Commands
 
 | Command | Description |
 |---------|-------------|
-| `kalvium-worklog install` | Full setup: login + discover + schedule + webapp |
+| `kalvium-worklog install` | Full setup: login + discover + schedule |
 | `kalvium-worklog login` | Log in to Kalvium (opens browser, waits for Google + 2FA) |
 | `kalvium-worklog discover` | Auto-discover your internship position ID |
-| `kalvium-worklog submit [text]` | Submit worklog (default: "working") |
+| `kalvium-worklog submit [text]` | Submit worklog (default: "Working on assigned task") |
 | `kalvium-worklog submit "built a feature"` | Submit with custom text |
-| `kalvium-worklog submit --status remote` | Submit with custom status |
 | `kalvium-worklog submit --dry-run` | Test without submitting |
 | `kalvium-worklog status` | Check recent worklog entries |
 | `kalvium-worklog schedule 14:00` | Set up daily auto-submit at 2 PM |
 | `kalvium-worklog schedule --remove` | Remove daily auto-submit |
-| `kalvium-worklog webapp [path]` | Generate phone web app HTML |
 | `kalvium-worklog daily` | Run daily submit (used by scheduler) |
+| `kalvium-worklog catchup` | Check if today's worklog is missing and submit if needed |
 
 ## Features
 
 - **Cross-platform**: macOS (launchd), Windows (Task Scheduler), Linux (cron)
 - **Auto re-login**: If the token expires, automatically opens browser, waits for login, and retries
 - **Token auto-refresh**: Refresh token rotates on each use, lasts 6 days
-- **Phone web app**: Submit from your iPhone/Android (no computer needed after setup)
 - **Auto-discovers position ID**: Works for any user, no hardcoded IDs
 - **Weekend skipping**: Auto-submit skips Saturdays and Sundays
-
-## Work Statuses
-
-| Key | Label |
-|-----|-------|
-| `on_site` | Working on-site (Company location) |
-| `remote` | Working Remotely (Not in the Kalvium environment) |
-| `classroom` | Working out of the Kalvium environment (Classroom) |
-| `holiday` | Today was a company Holiday |
-| `leave` | Took an approved leave from work |
-
-```bash
-kalvium-worklog submit "worked from home" --status remote
-```
-
-## Phone Web App
-
-After running `kalvium-worklog webapp`:
-
-1. AirDrop `~/KalviumWorklog.html` to your phone
-2. Open in **Safari** (iPhone) or **Chrome** (Android)
-3. **Add to Home Screen**
-4. Tap the icon to submit worklogs from your phone
-
-The phone app works independently — it refreshes its own token and auto-retries if the token expires.
+- **Network retry**: Retries up to 5 times on network failure (covers laptop waking up, internet reconnecting)
+- **Catch-up on wake**: If the scheduled time was missed (laptop asleep/offline), submits when the device wakes up
 
 ## How It Works
 
@@ -81,9 +55,10 @@ One-time setup:
 Daily auto-submit (scheduler):
   Refresh token → PUT worklog API → done
   If token expired → auto open browser → re-login → retry
+  If network fails → retry up to 5 times (1 min apart)
 
-Manual submit:
-  kalvium-worklog submit "my update" → refresh token → PUT worklog
+Catch-up (on login/wake, every 30 min):
+  Check if today's worklog is submitted → if not, submit it
 ```
 
 ## Token Lifecycle
@@ -100,10 +75,10 @@ Manual submit:
 ├── refresh_token.json    # Current token (auto-rotates)
 ├── config.json           # Position ID + API URL
 ├── daily_submit.js       # Scheduler entry point
+├── catchup_submit.js     # Catch-up entry point
 └── worklog.log           # Log file
 
 ~/.kalvium_profile/       # Browser profile (saved login)
-~/KalviumWorklog.html     # Phone web app
 ```
 
 ## Uninstall
@@ -111,7 +86,7 @@ Manual submit:
 ```bash
 kalvium-worklog schedule --remove
 npm uninstall -g kalvium-worklog
-rm -rf ~/.kalvium ~/.kalvium_profile ~/KalviumWorklog.html
+rm -rf ~/.kalvium ~/.kalvium_profile
 ```
 
 ## Requirements

package/dist/catchup.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/catchup.js

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+/**
+ * Catch-up entry point — runs on login/wake.
+ * Checks if today's worklog was submitted, and if not, submits it.
+ * Used by the login launchd job (RunAtLoad).
+ */
+import { catchUpSubmit } from "./submit.js";
+catchUpSubmit().then((ok) => {
+    process.exit(ok ? 0 : 1);
+});

package/dist/cli.js

@@ -2,9 +2,8 @@
 import { Command } from "commander";
 import { captureToken } from "./capture-token.js";
 import { discoverPosition } from "./discover-position.js";
-import { submitWorklog, checkStatus, dailySubmit } from "./submit.js";
+import { submitWorklog, checkStatus, dailySubmit, catchUpSubmit } from "./submit.js";
 import { setupScheduler, removeScheduler } from "./scheduler.js";
-import { generateWebapp } from "./generate-webapp.js";
 import { loadToken, saveConfig, getPositionIdFromToken } from "./config.js";
 import { existsSync } from "fs";
 import { join, dirname } from "path";
@@ -42,7 +41,6 @@ program
 program
     .command("submit [text]")
     .description("Submit worklog (default text: 'Working on assigned task')")
-    .option("--status <type>", "Work status", "on_site")
     .option("--dry-run", "Test without submitting")
     .action(async (text, opts) => {
     // Skip weekends (unless dry run)
@@ -53,7 +51,6 @@ program
     }
     const result = await submitWorklog({
         text: text ?? "Working on assigned task",
-        status: opts.status,
         dryRun: opts.dryRun,
     });
     if (!result.success)
@@ -69,12 +66,21 @@ program
 // ─── daily ─────────────────────────────────────────────────────────────────
 program
     .command("daily")
-    .description("Run daily auto-submit (used by scheduler — skips weekends)")
+    .description("Run daily auto-submit (used by scheduler — skips weekends, retries on network failure)")
     .action(async () => {
     const ok = await dailySubmit();
     if (!ok)
         process.exit(1);
 });
+// ─── catchup ───────────────────────────────────────────────────────────────
+program
+    .command("catchup")
+    .description("Check if today's worklog is missing and submit if needed (runs on login/wake)")
+    .action(async () => {
+    const ok = await catchUpSubmit();
+    if (!ok)
+        process.exit(1);
+});
 // ─── schedule ──────────────────────────────────────────────────────────────
 program
     .command("schedule [time]")
@@ -126,19 +132,10 @@ program
     if (!ok)
         process.exit(1);
 });
-// ─── webapp ────────────────────────────────────────────────────────────────
-program
-    .command("webapp [path]")
-    .description("Generate phone web app HTML (default: ~/KalviumWorklog.html)")
-    .action(async (path) => {
-    const ok = await generateWebapp(path);
-    if (!ok)
-        process.exit(1);
-});
 // ─── install (full setup) ──────────────────────────────────────────────────
 program
     .command("install")
-    .description("Full setup: login + discover + schedule + webapp")
+    .description("Full setup: login + discover + schedule")
     .action(async () => {
     const readline = await import("readline");
     const rl = readline.createInterface({
@@ -196,9 +193,6 @@ program
         }
     }
     await setupScheduler({ hour, minute });
-    // Step 4: Webapp
-    console.log("\n── Step 4: Generate phone web app ──");
-    await generateWebapp();
     console.log("\n✅ Setup complete!\n");
     console.log("Commands:");
     console.log("  kalvium-worklog submit              # submit with default text");
@@ -221,7 +215,7 @@ if (process.argv.length <= 2) {
         console.log("    kalvium-worklog install");
         console.log("");
         console.log("  This will log you in, discover your position ID,");
-        console.log("  set up daily auto-submit, and generate a phone web app.");
+        console.log("  and set up daily auto-submit.");
         console.log("");
         console.log("  Or run kalvium-worklog --help to see all commands.");
         console.log("");

package/dist/index.d.ts

@@ -1,10 +1,9 @@
 export { captureToken } from "./capture-token.js";
 export { discoverPosition } from "./discover-position.js";
-export { submitWorklog, checkStatus, dailySubmit, STATUS_OPTIONS } from "./submit.js";
+export { submitWorklog, checkStatus, dailySubmit, catchUpSubmit } from "./submit.js";
 export type { SubmitOptions, SubmitResult } from "./submit.js";
 export { setupScheduler, removeScheduler } from "./scheduler.js";
 export type { ScheduleOptions } from "./scheduler.js";
-export { generateWebapp } from "./generate-webapp.js";
 export { refreshToken } from "./refresh.js";
 export { loadToken, saveToken, loadConfig, saveConfig, getWorklogApi, INSTALL_DIR, TOKEN_FILE, CONFIG_FILE, LOG_FILE, } from "./config.js";
 export type { TokenData, ConfigData } from "./config.js";

package/dist/index.js

@@ -1,7 +1,6 @@
 export { captureToken } from "./capture-token.js";
 export { discoverPosition } from "./discover-position.js";
-export { submitWorklog, checkStatus, dailySubmit, STATUS_OPTIONS } from "./submit.js";
+export { submitWorklog, checkStatus, dailySubmit, catchUpSubmit } from "./submit.js";
 export { setupScheduler, removeScheduler } from "./scheduler.js";
-export { generateWebapp } from "./generate-webapp.js";
 export { refreshToken } from "./refresh.js";
 export { loadToken, saveToken, loadConfig, saveConfig, getWorklogApi, INSTALL_DIR, TOKEN_FILE, CONFIG_FILE, LOG_FILE, } from "./config.js";

package/dist/postinstall.js

@@ -50,7 +50,6 @@ else if (isGlobal) {
     log("    1. Open a browser for you to log in to Kalvium");
     log("    2. Auto-discover your internship position ID");
     log("    3. Set up daily auto-submit at your chosen time");
-    log("    4. Generate a phone web app");
     log("");
     log("  Or set up step by step:");
     log("    " + BOLD + "kalvium-worklog login" + NC + "       log in");

package/dist/scheduler.js

@@ -37,30 +37,39 @@ function formatTime(hour, minute) {
     return `${hour - 12}:${minute.toString().padStart(2, "0")} PM`;
 }
 /**
- * Copy the daily-submit.js script to ~/.kalvium/ as a wrapper that
- * imports from the npm package's dist directory (using absolute paths).
- * This way it works even if the package is updated.
+ * Copy the daily-submit.js and catchup.js scripts to ~/.kalvium/ as wrappers
+ * that import from the npm package's dist directory (using absolute paths).
  */
 function copyDailyScript() {
     ensureInstallDir();
-    const dst = join(INSTALL_DIR, "daily_submit.js");
-    // Create a wrapper that imports from the package's dist directory
     const distDir = __dirname;
-    const wrapper = `#!/usr/bin/env node
+    // Daily submit wrapper
+    const dailyDst = join(INSTALL_DIR, "daily_submit.js");
+    const dailyWrapper = `#!/usr/bin/env node
 // Auto-generated by kalvium-worklog. Do not edit.
 import { dailySubmit } from "${join(distDir, "submit.js")}";
 dailySubmit().then((ok) => process.exit(ok ? 0 : 1));
 `;
-    writeFileSync(dst, wrapper);
-    return dst;
+    writeFileSync(dailyDst, dailyWrapper);
+    // Catch-up wrapper (runs on login/wake)
+    const catchupDst = join(INSTALL_DIR, "catchup_submit.js");
+    const catchupWrapper = `#!/usr/bin/env node
+// Auto-generated by kalvium-worklog. Do not edit.
+import { catchUpSubmit } from "${join(distDir, "submit.js")}";
+catchUpSubmit().then((ok) => process.exit(ok ? 0 : 1));
+`;
+    writeFileSync(catchupDst, catchupWrapper);
+    return dailyDst;
 }
 function setupLaunchd(hour, minute) {
     const launchAgentsDir = join(homedir(), "Library", "LaunchAgents");
     if (!existsSync(launchAgentsDir)) {
         mkdirSync(launchAgentsDir, { recursive: true });
     }
-    const plistPath = join(launchAgentsDir, "com.kalvium.worklog.plist");
     const dailyScript = copyDailyScript();
+    const catchupScript = join(INSTALL_DIR, "catchup_submit.js");
+    // ─── 1. Scheduled daily plist (fires at chosen time) ────────────────────
+    const plistPath = join(launchAgentsDir, "com.kalvium.worklog.plist");
     const plist = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -103,7 +112,43 @@ function setupLaunchd(hour, minute) {
     writeFileSync(plistPath, plist);
     execSync(`launchctl unload "${plistPath}"`, { stdio: "ignore" });
     execSync(`launchctl load "${plistPath}"`, { stdio: "ignore" });
+    // ─── 2. Catch-up plist (fires on login/wake — RunAtLoad) ────────────────
+    // This checks if today's worklog was already submitted. If not, submits it.
+    // Handles the case where the scheduled time was missed (laptop asleep/offline).
+    const catchupPlistPath = join(launchAgentsDir, "com.kalvium.worklog.catchup.plist");
+    const catchupPlist = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>com.kalvium.worklog.catchup</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>${process.execPath}</string>
+        <string>${catchupScript}</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>StartInterval</key>
+    <integer>1800</integer>
+    <key>StandardOutPath</key>
+    <string>${LOG_FILE}</string>
+    <key>StandardErrorPath</key>
+    <string>${LOG_FILE}</string>
+    <key>EnvironmentVariables</key>
+    <dict>
+        <key>HOME</key>
+        <string>${homedir()}</string>
+        <key>PATH</key>
+        <string>/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/homebrew/bin</string>
+    </dict>
+</dict>
+</plist>`;
+    writeFileSync(catchupPlistPath, catchupPlist);
+    execSync(`launchctl unload "${catchupPlistPath}"`, { stdio: "ignore" });
+    execSync(`launchctl load "${catchupPlistPath}"`, { stdio: "ignore" });
     console.log(`Daily auto-submit installed (${formatTime(hour, minute)} every weekday)`);
+    console.log("  + Catch-up check on login/wake (every 30 min)");
     return true;
 }
 function setupTaskScheduler(hour, minute) {
@@ -159,6 +204,7 @@ function setupCron(hour, minute) {
  */
 export async function removeScheduler() {
     if (IS_MAC) {
+        // Remove daily plist
         const plistPath = join(homedir(), "Library/LaunchAgents/com.kalvium.worklog.plist");
         try {
             execSync(`launchctl unload "${plistPath}"`, { stdio: "ignore" });
@@ -169,7 +215,18 @@ export async function removeScheduler() {
         if (existsSync(plistPath)) {
             execSync(`rm "${plistPath}"`);
         }
-        console.log("Daily auto-submit removed.");
+        // Remove catch-up plist
+        const catchupPlistPath = join(homedir(), "Library/LaunchAgents/com.kalvium.worklog.catchup.plist");
+        try {
+            execSync(`launchctl unload "${catchupPlistPath}"`, { stdio: "ignore" });
+        }
+        catch {
+            // ignore
+        }
+        if (existsSync(catchupPlistPath)) {
+            execSync(`rm "${catchupPlistPath}"`);
+        }
+        console.log("Daily auto-submit removed (including catch-up).");
         return true;
     }
     else if (IS_WINDOWS) {

package/dist/submit.d.ts

@@ -1,6 +1,5 @@
 export interface SubmitOptions {
     text?: string;
-    status?: string;
     dryRun?: boolean;
 }
 export interface SubmitResult {
@@ -8,7 +7,6 @@ export interface SubmitResult {
     message: string;
     worklogId?: string;
 }
-export declare const STATUS_OPTIONS: Record<string, string>;
 /**
  * Submit worklog with auto-relogin retry.
  * If the refresh token has expired, automatically opens a browser
@@ -22,5 +20,11 @@ export declare function checkStatus(): Promise<void>;
 /**
  * Daily auto-submit (used by scheduler).
  * Skips weekends. Logs to file.
+ * Retries on network failure (up to 5 times with 60s delay).
  */
 export declare function dailySubmit(): Promise<boolean>;
+/**
+ * Catch-up check: if it's a weekday and today's worklog hasn't been
+ * submitted yet, submit it. Used on login/wake to handle missed runs.
+ */
+export declare function catchUpSubmit(): Promise<boolean>;

package/dist/submit.js

@@ -1,13 +1,8 @@
 import { getWorklogApi, log } from "./config.js";
 import { refreshToken } from "./refresh.js";
 import { captureToken } from "./capture-token.js";
-export const STATUS_OPTIONS = {
-    on_site: "Working on-site (Company location)",
-    remote: "Working Remotely (Not in the Kalvium environment)",
-    classroom: "Working out of the Kalvium environment (Classroom)",
-    holiday: "Today was a company Holiday",
-    leave: "Took an approved leave from work",
-};
+const STATUS_KEY = "on_site";
+const STATUS_LABEL = "Working on-site (Company location)";
 /**
  * Submit worklog with auto-relogin retry.
  * If the refresh token has expired, automatically opens a browser
@@ -15,7 +10,6 @@ export const STATUS_OPTIONS = {
  */
 export async function submitWorklog(options = {}) {
     const text = options.text ?? "Working on assigned task";
-    const statusKey = options.status ?? "on_site";
     const dryRun = options.dryRun ?? false;
     const worklogApi = getWorklogApi();
     if (!worklogApi) {
@@ -24,11 +18,10 @@ export async function submitWorklog(options = {}) {
             message: "No config found. Run `kalvium-worklog discover` first.",
         };
     }
-    const statusLabel = STATUS_OPTIONS[statusKey] ?? STATUS_OPTIONS.on_site;
     const body = JSON.stringify({
-        title: statusLabel,
-        description: statusLabel,
-        category: statusKey,
+        title: STATUS_LABEL,
+        description: STATUS_LABEL,
+        category: STATUS_KEY,
         timeSpent: 0,
         priorityLevel: "medium",
         blockers: "",
@@ -36,7 +29,7 @@ export async function submitWorklog(options = {}) {
     });
     if (dryRun) {
         console.log(`[DRY RUN] Would submit to ${worklogApi}`);
-        console.log(`  text='${text}', status=${statusKey}`);
+        console.log(`  text='${text}', status=${STATUS_KEY}`);
         console.log(`  Body: ${body}`);
         return { success: true, message: "Dry run" };
     }
@@ -177,6 +170,7 @@ export async function checkStatus() {
 /**
  * Daily auto-submit (used by scheduler).
  * Skips weekends. Logs to file.
+ * Retries on network failure (up to 5 times with 60s delay).
  */
 export async function dailySubmit() {
     const day = new Date().getDay();
@@ -185,12 +179,94 @@ export async function dailySubmit() {
         return true;
     }
     log("[INFO] Starting daily worklog submission...");
-    const result = await submitWorklog({ text: "Working on assigned task", status: "on_site" });
-    if (result.success) {
-        log(`[INFO] SUCCESS: ${result.message}`);
+    // Retry up to 5 times in case of network failure
+    // (covers: laptop waking up, internet reconnecting, etc.)
+    const MAX_RETRIES = 5;
+    const RETRY_DELAY_MS = 60000; // 1 minute between retries
+    for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+        if (attempt > 1) {
+            log(`[INFO] Retry ${attempt}/${MAX_RETRIES} (waiting for network...)`);
+        }
+        const result = await submitWorklog({
+            text: "Working on assigned task",
+        });
+        if (result.success) {
+            log(`[INFO] SUCCESS: ${result.message}`);
+            return true;
+        }
+        // Check if it's a network error (retry) vs a real error (give up)
+        const isNetworkError = result.message.includes("fetch") ||
+            result.message.includes("ECONNREFUSED") ||
+            result.message.includes("ENOTFOUND") ||
+            result.message.includes("ETIMEDOUT") ||
+            result.message.includes("network") ||
+            result.message.includes("Failed to fetch") ||
+            result.message.includes("refresh failed");
+        // "Already submitted" is a success, not an error
+        if (result.message.includes("Already submitted")) {
+            log(`[INFO] ${result.message}`);
+            return true;
+        }
+        if (isNetworkError && attempt < MAX_RETRIES) {
+            log(`[WARN] Network error: ${result.message}. Retrying in 60s...`);
+            await sleep(RETRY_DELAY_MS);
+            continue;
+        }
+        // Non-network error or max retries reached
+        log(`[ERROR] ${result.message}`);
+        return false;
+    }
+    return false;
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/**
+ * Catch-up check: if it's a weekday and today's worklog hasn't been
+ * submitted yet, submit it. Used on login/wake to handle missed runs.
+ */
+export async function catchUpSubmit() {
+    const day = new Date().getDay();
+    if (day === 0 || day === 6) {
+        return true; // weekend, nothing to do
+    }
+    log("[INFO] Catch-up check: verifying today's worklog...");
+    // Check if today's worklog was already submitted
+    const worklogApi = getWorklogApi();
+    if (!worklogApi) {
+        log("[ERROR] No config found. Run `kalvium-worklog discover` first.");
+        return false;
+    }
+    // Try to refresh token and check status
+    const refreshResult = await refreshToken();
+    if (!refreshResult.success || !refreshResult.accessToken) {
+        log("[WARN] Could not refresh token for catch-up check. Will try submit directly.");
+        // Fall through to submit attempt — it has its own retry/relogin logic
     }
     else {
-        log(`[ERROR] ${result.message}`);
+        try {
+            const res = await fetch(worklogApi, {
+                headers: { authorization: `Bearer ${refreshResult.accessToken}` },
+            });
+            if (res.ok) {
+                const worklogs = await res.json();
+                if (Array.isArray(worklogs)) {
+                    const today = new Date().toISOString().slice(0, 10);
+                    const todayEntry = worklogs.find((w) => (w.worklogDate ?? "").slice(0, 10) === today &&
+                        w.status === "complete");
+                    if (todayEntry) {
+                        log("[INFO] Today's worklog already submitted. No catch-up needed.");
+                        return true;
+                    }
+                }
+            }
+        }
+        catch {
+            // Network error — fall through to submit attempt
+            log("[WARN] Could not check status for catch-up. Will try submit directly.");
+        }
     }
-    return result.success;
+    // Today's worklog is missing — submit it
+    log("[INFO] Today's worklog is missing. Running catch-up submit...");
+    return dailySubmit();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kalvium-worklog",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "description": "Auto-submit your daily Kalvium worklog without opening the website",
   "keywords": [
     "kalvium",
@@ -27,8 +27,7 @@
     "kworklog": "dist/cli.js"
   },
   "files": [
-    "dist",
-    "templates"
+    "dist"
   ],
   "scripts": {
     "build": "tsc",