- Worklog is the missing piece. It collects everything you did, lays it out hour by hour, and uses AI to translate it into billable time entries — mapped to the right projects and activity types, with descriptions you'd actually write yourself.
+ Worklog is the missing piece. It collects everything you did, lays it out hour by hour, and uses AI to translate it into billable time entries — mapped to the right projects and activity types, with descriptions you'd actually write yourself.
@@ -146,7 +146,7 @@ export default function AboutPage() {
- This is where the interesting stuff happens. Here's the full journey from "you pick a date" to "here's your timelog."
+ This is where the interesting stuff happens. Here's the full journey from "you pick a date" to "here's your timelog."
@@ -171,7 +171,7 @@ export default function AboutPage() {
Parallel fetch
- All seven sources are queried simultaneously. Each has its own OAuth token stored as a secure HTTP-only cookie. Google uses NextAuth's JWT; Jira stores only the refresh token (access tokens are too big for cookies) and fetches a fresh one per request.
+ All seven sources are queried simultaneously. Each has its own OAuth token stored as a secure HTTP-only cookie. Google uses NextAuth's JWT; Jira stores only the refresh token (access tokens are too big for cookies) and fetches a fresh one per request.
PM context fetch
- When you click Generate, the app pulls your project context from the time-tracking system: the 20 projects you've used most in the last 14 days, the top 3 activity types per project, your hour allocations for the day, any existing time records, and the time-lock date (logged hours before that date are untouchable).
+ When you click Generate, the app pulls your project context from the time-tracking system: the 20 projects you've used most in the last 14 days, the top 3 activity types per project, your hour allocations for the day, any existing time records, and the time-lock date (logged hours before that date are untouchable).
@@ -222,7 +222,7 @@ export default function AboutPage() {
Review and submit
- You see the suggestions, edit anything that looks off, and hit Submit. Each entry is validated server-side against the time-lock before being written to your time-tracking system. The suggestions are cached in localStorage per date so a page refresh doesn't throw away your work.
+ You see the suggestions, edit anything that looks off, and hit Submit. Each entry is validated server-side against the time-lock before being written to your time-tracking system. The suggestions are cached in localStorage per date so a page refresh doesn't throw away your work.
@@ -247,7 +247,7 @@ export default function AboutPage() {
Milient / Moment
- Milient (also known as Moment) is a time management platform widely used by Norwegian consulting firms. Worklog uses it as the source of truth for projects, activity types, hour allocations, and as the destination for submitted time records. Your user account is resolved dynamically from your Google sign-in email, so there's no separate login.
+ Milient (also known as Moment) is a time management platform widely used by Norwegian consulting firms. Worklog uses it as the source of truth for projects, activity types, hour allocations, and as the destination for submitted time records. Your user account is resolved dynamically from your Google sign-in email, so there's no separate login.
diff --git a/app/lib/__tests__/aggregator.test.ts b/app/lib/__tests__/aggregator.test.ts
new file mode 100644
index 0000000..309cc57
--- /dev/null
+++ b/app/lib/__tests__/aggregator.test.ts
@@ -0,0 +1,75 @@
+import { describe, it, expect } from "vitest"
+import { processActivities, getDaySummary } from "../aggregator"
+
+// All fixtures use explicit UTC timestamps and pass timezone "UTC" so the
+// bucketing is deterministic regardless of the machine timezone.
+function cal(start: string, end?: string, title = "Event") {
+ return {
+ source: "calendar" as const,
+ type: "event",
+ title,
+ timestamp: new Date(start),
+ ...(end ? { endTime: new Date(end) } : {}),
+ }
+}
+
+describe("processActivities", () => {
+ it("buckets a single calendar event into its start hour", () => {
+ const processed = processActivities([cal("2026-05-28T14:00:00Z", "2026-05-28T14:30:00Z")], 0, 24, "UTC")
+ expect(processed[14].primaries).toHaveLength(1)
+ expect(processed[14].primaries[0].spanStart).toBe(true)
+ expect(processed[14].primaries[0].isSpanning).toBe(false)
+ expect(processed[13].primaries).toHaveLength(0)
+ })
+
+ it("spans a multi-hour event across buckets, flagging continuation hours", () => {
+ const processed = processActivities([cal("2026-05-28T09:00:00Z", "2026-05-28T11:00:00Z")], 0, 24, "UTC")
+ expect(processed[9].primaries[0].isSpanning).toBe(false)
+ expect(processed[9].primaries[0].spanStart).toBe(true)
+ expect(processed[10].primaries[0].isSpanning).toBe(true)
+ expect(processed[11].primaries[0].isSpanning).toBe(true)
+ })
+
+ it("ignores events outside the configured hour window", () => {
+ const processed = processActivities([cal("2026-05-28T03:00:00Z", "2026-05-28T03:30:00Z")], 6, 23, "UTC")
+ const total = Object.values(processed).reduce((n, h) => n + h.primaries.length, 0)
+ expect(total).toBe(0)
+ })
+
+ it("dedupes emails by normalized thread subject and drops calendar notifications", () => {
+ const acts = [
+ { source: "gmail" as const, type: "email", subject: "Re: Status", from: "a@x.com", timestamp: new Date("2026-05-28T10:00:00Z") },
+ { source: "gmail" as const, type: "email", subject: "Status", from: "b@x.com", timestamp: new Date("2026-05-28T10:05:00Z") },
+ { source: "gmail" as const, type: "email", subject: "Invite", from: "calendar-notification@google.com", timestamp: new Date("2026-05-28T10:10:00Z") },
+ ]
+ const processed = processActivities(acts, 0, 24, "UTC")
+ expect(processed[10].communications).toHaveLength(1)
+ })
+
+ it("sorts communications chronologically within an hour", () => {
+ const acts = [
+ { source: "slack" as const, type: "message", channel: "general", timestamp: new Date("2026-05-28T10:40:00Z") },
+ { source: "github" as const, type: "commit", repoName: "acme/web", title: "fix", timestamp: new Date("2026-05-28T10:10:00Z") },
+ ]
+ const processed = processActivities(acts, 0, 24, "UTC")
+ const sources = processed[10].communications.map((c) => c.source)
+ expect(sources).toEqual(["github", "slack"])
+ })
+})
+
+describe("getDaySummary", () => {
+ it("counts meetings once for spanning events and tallies communications by source", () => {
+ const acts = [
+ cal("2026-05-28T09:00:00Z", "2026-05-28T11:00:00Z", "Workshop"),
+ { source: "slack" as const, type: "message", channel: "general", timestamp: new Date("2026-05-28T09:15:00Z") },
+ { source: "slack" as const, type: "message", channel: "random", timestamp: new Date("2026-05-28T09:20:00Z") },
+ { source: "jira" as const, type: "transition", issueKey: "P-1", timestamp: new Date("2026-05-28T10:00:00Z") },
+ ]
+ const processed = processActivities(acts, 0, 24, "UTC")
+ const summary = getDaySummary(processed)
+ expect(summary.totalMeetings).toBe(1)
+ expect(summary.totalSlackMessages).toBe(2)
+ expect(summary.totalJiraActivities).toBe(1)
+ expect(summary.totalEmails).toBe(0)
+ })
+})
diff --git a/app/lib/ai/__tests__/parse.test.ts b/app/lib/ai/__tests__/parse.test.ts
new file mode 100644
index 0000000..77b3ccb
--- /dev/null
+++ b/app/lib/ai/__tests__/parse.test.ts
@@ -0,0 +1,79 @@
+import { describe, it, expect } from "vitest"
+import { parseSuggestions } from "../parse"
+
+const base = {
+ projectId: "p1",
+ activityTypeId: "a1",
+ hours: 2,
+ description: "Did the thing",
+}
+
+describe("parseSuggestions", () => {
+ it("parses a clean JSON array and maps fields with generated ids", () => {
+ const out = parseSuggestions(JSON.stringify([base]))
+ expect(out).toHaveLength(1)
+ expect(out[0].projectId).toBe("p1")
+ expect(out[0].activityTypeId).toBe("a1")
+ expect(out[0].hours).toBe(2)
+ expect(out[0].description).toBe("Did the thing")
+ expect(out[0].status).toBe("pending")
+ expect(out[0].id).toMatch(/[0-9a-f-]{36}/)
+ })
+
+ it("extracts the array when wrapped in markdown / prose", () => {
+ const text = "Here are your entries:\n```json\n" + JSON.stringify([base]) + "\n```\nDone!"
+ const out = parseSuggestions(text)
+ expect(out).toHaveLength(1)
+ expect(out[0].projectId).toBe("p1")
+ })
+
+ it("salvages a truncated response up to the last complete object", () => {
+ const truncated = '[{"projectId":"p1","hours":1,"description":"a"},{"projectId":"p2","hours":2,"description":"b"}'
+ const out = parseSuggestions(truncated)
+ expect(out).toHaveLength(2)
+ expect(out[1].projectId).toBe("p2")
+ })
+
+ it("throws when no JSON array can be found", () => {
+ expect(() => parseSuggestions("no json here")).toThrow(/Kunne ikke finne JSON/)
+ })
+
+ it("rounds hours to the nearest half and enforces a 0.5 minimum", () => {
+ const out = parseSuggestions(JSON.stringify([
+ { ...base, hours: 2.3 },
+ { ...base, hours: 0 },
+ { ...base, hours: 0.1 },
+ ]))
+ expect(out[0].hours).toBe(2.5)
+ expect(out[1].hours).toBe(0.5)
+ expect(out[2].hours).toBe(0.5)
+ })
+
+ it("normalizes confidence to medium when invalid", () => {
+ const out = parseSuggestions(JSON.stringify([
+ { ...base, confidence: "high" },
+ { ...base, confidence: "bogus" },
+ { ...base },
+ ]))
+ expect(out[0].confidence).toBe("high")
+ expect(out[1].confidence).toBe("medium")
+ expect(out[2].confidence).toBe("medium")
+ })
+
+ it("coerces missing optional fields to safe defaults", () => {
+ const out = parseSuggestions(JSON.stringify([{ description: "only desc" }]))
+ expect(out[0].projectId).toBe("")
+ expect(out[0].activityTypeId).toBe("")
+ expect(out[0].hours).toBe(0.5)
+ expect(out[0].internalNote).toBeUndefined()
+ expect(out[0].sourceActivities).toEqual([])
+ })
+
+ it("maps source activities when present", () => {
+ const out = parseSuggestions(JSON.stringify([
+ { ...base, sourceActivities: [{ source: "slack", title: "#general", timestamp: "t", estimatedMinutes: 15 }] },
+ ]))
+ expect(out[0].sourceActivities).toHaveLength(1)
+ expect(out[0].sourceActivities[0].estimatedMinutes).toBe(15)
+ })
+})
diff --git a/app/lib/ai/__tests__/preprocess.test.ts b/app/lib/ai/__tests__/preprocess.test.ts
new file mode 100644
index 0000000..05a59bb
--- /dev/null
+++ b/app/lib/ai/__tests__/preprocess.test.ts
@@ -0,0 +1,80 @@
+import { describe, it, expect } from "vitest"
+import { preprocessActivities } from "../preprocess"
+
+// Timestamps are intentionally written WITHOUT a timezone suffix so they parse
+// in local time and `getHours()` reads back the literal hour — keeping the
+// lunch/gap math deterministic regardless of the machine timezone.
+function hour(primaries: any[] = [], communications: any[] = []) {
+ return { primaries, communications }
+}
+
+describe("preprocessActivities", () => {
+ it("flattens activities, skips spanning copies and calendar invites, and derives titles", () => {
+ const data = preprocessActivities({
+ "9": hour(
+ [
+ { source: "calendar", title: "Standup", timestamp: "2026-05-28T09:00:00", endTime: "2026-05-28T09:30:00" },
+ { source: "calendar", title: "Workshop", timestamp: "2026-05-28T09:00:00", isSpanning: true },
+ ],
+ [
+ { source: "slack", channel: "general", isDm: false, timestamp: "2026-05-28T09:05:00" },
+ { source: "gmail", subject: "Project update", timestamp: "2026-05-28T09:10:00" },
+ { source: "gmail", subject: "Invitasjon: lunsj", timestamp: "2026-05-28T09:15:00" },
+ ],
+ ),
+ })
+ const titles = data.activities.map((a) => a.title)
+ expect(data.activities).toHaveLength(3)
+ expect(titles).toContain("Standup")
+ expect(titles).toContain("#general")
+ expect(titles).toContain("Project update")
+ expect(titles).not.toContain("Workshop")
+ expect(data.calendarMinutes).toBe(30)
+ })
+
+ it("builds source-specific titles", () => {
+ const data = preprocessActivities({
+ "10": hour([], [
+ { source: "github", repoName: "acme/web", title: "Fix bug", timestamp: "2026-05-28T10:00:00" },
+ { source: "jira", issueKey: "PROJ-1", issueSummary: "Login broken", timestamp: "2026-05-28T10:05:00" },
+ { source: "docs", type: "Edited", title: "Q2 plan", timestamp: "2026-05-28T10:10:00" },
+ { source: "trello", cardName: "Card A", timestamp: "2026-05-28T10:15:00" },
+ { source: "slack", isDm: true, channel: "Bob", timestamp: "2026-05-28T10:20:00" },
+ ]),
+ })
+ const titles = data.activities.map((a) => a.title)
+ expect(titles).toEqual(["acme/web: Fix bug", "PROJ-1: Login broken", "Edited: Q2 plan", "Card A", "DM: Bob"])
+ })
+
+ it("detects a lunch gap and deducts 30 minutes", () => {
+ const data = preprocessActivities({
+ "9": hour([
+ { source: "calendar", title: "Focus", timestamp: "2026-05-28T09:00:00", endTime: "2026-05-28T10:00:00" },
+ ]),
+ })
+ expect(data.calendarMinutes).toBe(60)
+ expect(data.lunchDetected).toBe(true)
+ expect(data.totalActiveMinutes).toBe(30)
+ })
+
+ it("does not deduct lunch when a meeting covers the lunch window, and sums gaps", () => {
+ const data = preprocessActivities({
+ "9": hour([
+ { source: "calendar", title: "Morning", timestamp: "2026-05-28T09:00:00", endTime: "2026-05-28T09:30:00" },
+ ]),
+ "11": hour([
+ { source: "calendar", title: "Lunch meeting", timestamp: "2026-05-28T11:00:00", endTime: "2026-05-28T13:00:00" },
+ ]),
+ })
+ expect(data.calendarMinutes).toBe(150)
+ expect(data.lunchDetected).toBe(false)
+ expect(data.gapMinutes).toBe(90)
+ expect(data.totalActiveMinutes).toBe(240)
+ })
+
+ it("dedupes identical activities", () => {
+ const dup = { source: "slack", channel: "general", timestamp: "2026-05-28T09:00:00" }
+ const data = preprocessActivities({ "9": hour([], [dup, { ...dup }]) })
+ expect(data.activities).toHaveLength(1)
+ })
+})
diff --git a/docs/CALLBACK-URLS.md b/docs/CALLBACK-URLS.md
index b12a783..5a97056 100644
--- a/docs/CALLBACK-URLS.md
+++ b/docs/CALLBACK-URLS.md
@@ -2,7 +2,9 @@
Quick reference for where to update callback/redirect URLs when the domain changes.
-**Production callback pattern:** `https://