forge-openclaw-plugin 0.2.47 → 0.2.48

package/dist/server/server/src/health.js

@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
 import { z } from "zod";
 import { getDatabase, runInTransaction } from "./db.js";
 import { HttpError } from "./errors.js";
+import { buildWorkoutSessionPersistenceSeed, buildWorkoutSessionPresentation, workoutActivityDescriptorSchema, workoutDetailsSchema } from "./health-workout-adapters.js";
 import { getMovementMobileBootstrap, ingestMovementSync, movementSyncPayloadSchema } from "./movement.js";
 import { ingestScreenTimeSync, screenTimeSyncPayloadSchema } from "./screen-time.js";
 import { recordActivityEvent } from "./repositories/activity-events.js";
@@ -235,6 +236,11 @@ export const mobileHealthSyncSchema = z.object({
         averageHeartRate: z.number().nonnegative().nullable().optional(),
         maxHeartRate: z.number().nonnegative().nullable().optional(),
         sourceDevice: z.string().trim().default("Apple Health"),
+        sourceSystem: z.string().trim().min(1).default("apple_health"),
+        sourceBundleIdentifier: z.string().trim().optional(),
+        sourceProductType: z.string().trim().optional(),
+        activity: workoutActivityDescriptorSchema.optional(),
+        details: workoutDetailsSchema.optional(),
         links: z.array(healthLinkSchema).default([]),
         annotations: workoutAnnotationSchema.partial().default({})
     }))
@@ -766,6 +772,15 @@ function mapSleepRawLog(row) {
     };
 }
 function mapWorkoutSession(row) {
+    const provenance = safeJsonParse(row.provenance_json, {});
+    const derived = safeJsonParse(row.derived_json, {});
+    const presentation = buildWorkoutSessionPresentation({
+        source: row.source,
+        sourceType: row.source_type,
+        workoutType: row.workout_type,
+        provenance,
+        derived
+    });
     return {
         id: row.id,
         externalUid: row.external_uid,
@@ -773,7 +788,15 @@ function mapWorkoutSession(row) {
         userId: row.user_id,
         source: row.source,
         sourceType: row.source_type,
-        workoutType: row.workout_type,
+        sourceSystem: presentation.sourceSystem,
+        sourceBundleIdentifier: presentation.sourceBundleIdentifier,
+        sourceProductType: presentation.sourceProductType,
+        workoutType: presentation.workoutType,
+        workoutTypeLabel: presentation.workoutTypeLabel,
+        activityFamily: presentation.activityFamily,
+        activityFamilyLabel: presentation.activityFamilyLabel,
+        activity: presentation.activity,
+        details: presentation.details,
         sourceDevice: row.source_device,
         startedAt: row.started_at,
         endedAt: row.ended_at,
@@ -794,8 +817,8 @@ function mapWorkoutSession(row) {
         links: safeJsonParse(row.links_json, []),
         tags: safeJsonParse(row.tags_json, []),
         annotations: safeJsonParse(row.annotations_json, {}),
-        provenance: safeJsonParse(row.provenance_json, {}),
-        derived: safeJsonParse(row.derived_json, {}),
+        provenance,
+        derived,
         generatedFromHabitId: row.generated_from_habit_id,
         generatedFromCheckInId: row.generated_from_check_in_id,
         reconciliationStatus: row.reconciliation_status,
@@ -1904,10 +1927,20 @@ function insertOrUpdateWorkoutSession(pairing, input) {
         .get(pairing.user_id, input.externalUid);
     const annotations = workoutAnnotationSchema.parse(input.annotations ?? {});
     const now = nowIso();
+    const basePersistenceSeed = buildWorkoutSessionPersistenceSeed({
+        source: "apple_health",
+        sourceType: "healthkit",
+        workoutType: input.workoutType,
+        sourceSystem: input.sourceSystem,
+        sourceBundleIdentifier: input.sourceBundleIdentifier,
+        sourceProductType: input.sourceProductType,
+        activity: input.activity,
+        details: input.details
+    });
     const matchedGenerated = existing ??
         findMatchingGeneratedWorkout({
             userId: pairing.user_id,
-            workoutType: input.workoutType,
+            workoutType: basePersistenceSeed.activity.canonicalKey,
             startedAt: input.startedAt,
             endedAt: input.endedAt
         });
@@ -1915,6 +1948,26 @@ function insertOrUpdateWorkoutSession(pairing, input) {
         const existingLinks = safeJsonParse(matchedGenerated.links_json, []);
         const existingTags = safeJsonParse(matchedGenerated.tags_json, []);
         const existingAnnotations = safeJsonParse(matchedGenerated.annotations_json, {});
+        const existingProvenance = safeJsonParse(matchedGenerated.provenance_json, {});
+        const existingDerived = safeJsonParse(matchedGenerated.derived_json, {});
+        const persistenceSeed = buildWorkoutSessionPersistenceSeed({
+            source: "apple_health",
+            sourceType: matchedGenerated.generated_from_habit_id
+                ? "reconciled"
+                : "healthkit",
+            workoutType: input.workoutType,
+            sourceSystem: input.sourceSystem,
+            sourceBundleIdentifier: input.sourceBundleIdentifier ??
+                (typeof existingProvenance.sourceBundleIdentifier === "string"
+                    ? existingProvenance.sourceBundleIdentifier
+                    : null),
+            sourceProductType: input.sourceProductType ??
+                (typeof existingProvenance.sourceProductType === "string"
+                    ? existingProvenance.sourceProductType
+                    : null),
+            activity: input.activity ?? existingDerived.activity ?? existingProvenance.activity,
+            details: input.details ?? existingDerived.details ?? existingProvenance.details
+        });
         const mergedLinks = mergeHealthLinks(existingLinks, input.links, annotations.links);
         const mergedTags = mergeStringLists(existingTags, annotations.tags);
         const nextSubjectiveEffort = matchedGenerated.subjective_effort ?? annotations.subjectiveEffort ?? null;
@@ -1945,12 +1998,21 @@ function insertOrUpdateWorkoutSession(pairing, input) {
              reconciliation_status = ?, updated_at = ?
          WHERE id = ?`)
             .run(input.externalUid, pairing.id, matchedGenerated.generated_from_habit_id ? "reconciled" : "healthkit", input.sourceDevice, input.startedAt, input.endedAt, Math.max(0, Math.round((Date.parse(input.endedAt) - Date.parse(input.startedAt)) / 1000)), input.activeEnergyKcal ?? null, input.totalEnergyKcal ?? null, input.distanceMeters ?? null, input.stepCount ?? null, input.exerciseMinutes ?? null, input.averageHeartRate ?? null, input.maxHeartRate ?? null, nextSubjectiveEffort, nextMoodBefore, nextMoodAfter, nextMeaningText, nextPlannedContext, nextSocialContext, JSON.stringify(mergedLinks), JSON.stringify(mergedTags), JSON.stringify(nextAnnotations), JSON.stringify({
+            ...existingProvenance,
             importedVia: "ios_companion",
             pairingSessionId: pairing.id,
+            sourceSystem: persistenceSeed.sourceSystem,
+            sourceBundleIdentifier: persistenceSeed.sourceBundleIdentifier,
+            sourceProductType: persistenceSeed.sourceProductType,
+            activity: persistenceSeed.activity,
+            details: persistenceSeed.details,
             mergedWithGenerated: matchedGenerated.generated_from_habit_id !== null,
             priorSource: matchedGenerated.source,
             updatedAt: now
         }), JSON.stringify({
+            ...existingDerived,
+            activity: persistenceSeed.activity,
+            details: persistenceSeed.details,
             paceMetersPerMinute: input.distanceMeters && input.exerciseMinutes
                 ? Number((input.distanceMeters / input.exerciseMinutes).toFixed(2))
                 : null
@@ -1972,11 +2034,18 @@ function insertOrUpdateWorkoutSession(pairing, input) {
          provenance_json, derived_json, reconciliation_status, created_at, updated_at
        )
        VALUES (?, ?, ?, ?, 'apple_health', 'healthkit', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'standalone', ?, ?)`)
-        .run(id, input.externalUid, pairing.id, pairing.user_id, input.workoutType, input.sourceDevice, input.startedAt, input.endedAt, Math.max(0, Math.round((Date.parse(input.endedAt) - Date.parse(input.startedAt)) / 1000)), input.activeEnergyKcal ?? null, input.totalEnergyKcal ?? null, input.distanceMeters ?? null, input.stepCount ?? null, input.exerciseMinutes ?? null, input.averageHeartRate ?? null, input.maxHeartRate ?? null, annotations.subjectiveEffort, annotations.moodBefore, annotations.moodAfter, annotations.meaningText, annotations.plannedContext, annotations.socialContext, JSON.stringify(input.links), JSON.stringify(annotations.tags), JSON.stringify(annotations), JSON.stringify({
+        .run(id, input.externalUid, pairing.id, pairing.user_id, basePersistenceSeed.activity.canonicalKey, input.sourceDevice, input.startedAt, input.endedAt, Math.max(0, Math.round((Date.parse(input.endedAt) - Date.parse(input.startedAt)) / 1000)), input.activeEnergyKcal ?? null, input.totalEnergyKcal ?? null, input.distanceMeters ?? null, input.stepCount ?? null, input.exerciseMinutes ?? null, input.averageHeartRate ?? null, input.maxHeartRate ?? null, annotations.subjectiveEffort, annotations.moodBefore, annotations.moodAfter, annotations.meaningText, annotations.plannedContext, annotations.socialContext, JSON.stringify(input.links), JSON.stringify(annotations.tags), JSON.stringify(annotations), JSON.stringify({
         importedVia: "ios_companion",
         pairingSessionId: pairing.id,
+        sourceSystem: basePersistenceSeed.sourceSystem,
+        sourceBundleIdentifier: basePersistenceSeed.sourceBundleIdentifier,
+        sourceProductType: basePersistenceSeed.sourceProductType,
+        activity: basePersistenceSeed.activity,
+        details: basePersistenceSeed.details,
         createdAt: now
     }), JSON.stringify({
+        activity: basePersistenceSeed.activity,
+        details: basePersistenceSeed.details,
         paceMetersPerMinute: input.distanceMeters && input.exerciseMinutes
             ? Number((input.distanceMeters / input.exerciseMinutes).toFixed(2))
             : null
@@ -2814,6 +2883,8 @@ export function getFitnessViewData(userIds) {
             habitGeneratedSessionCount: recent.filter((session) => session.sourceType === "habit_generated").length,
             reconciledSessionCount: recent.filter((session) => session.reconciliationStatus === "merged").length,
             topWorkoutType: orderedWorkoutTypes[0]?.[0] ?? null,
+            topWorkoutTypeLabel: recent.find((session) => session.workoutType === orderedWorkoutTypes[0]?.[0])
+                ?.workoutTypeLabel ?? null,
             streakDays: Array.from(new Set(weekly.map((session) => dayKey(session.startedAt)))).length
         },
         weeklyTrend: weekly
@@ -2821,12 +2892,21 @@ export function getFitnessViewData(userIds) {
             id: session.id,
             dateKey: dayKey(session.startedAt),
             workoutType: session.workoutType,
+            workoutTypeLabel: session.workoutTypeLabel,
+            activityFamily: session.activityFamily,
+            activityFamilyLabel: session.activityFamilyLabel,
             durationMinutes: Math.round(session.durationSeconds / 60),
             energyKcal: Math.round(session.totalEnergyKcal ?? session.activeEnergyKcal ?? 0)
         }))
             .reverse(),
         typeBreakdown: orderedWorkoutTypes.map(([workoutType, metrics]) => ({
             workoutType,
+            workoutTypeLabel: recent.find((session) => session.workoutType === workoutType)?.workoutTypeLabel ??
+                workoutType,
+            activityFamily: recent.find((session) => session.workoutType === workoutType)?.activityFamily ??
+                "other",
+            activityFamilyLabel: recent.find((session) => session.workoutType === workoutType)
+                ?.activityFamilyLabel ?? "Other",
             sessionCount: metrics.sessionCount,
             totalMinutes: metrics.totalMinutes,
             energyKcal: metrics.energyKcal
@@ -3180,6 +3260,11 @@ export function createWorkoutSession(input, activity) {
         tags: parsed.tags,
         links: parsed.links
     };
+    const persistenceSeed = buildWorkoutSessionPersistenceSeed({
+        source: parsed.source,
+        sourceType: parsed.sourceType,
+        workoutType: parsed.workoutType
+    });
     getDatabase()
         .prepare(`INSERT INTO health_workout_sessions (
          id, external_uid, pairing_session_id, user_id, source, source_type, workout_type, source_device,
@@ -3189,16 +3274,21 @@ export function createWorkoutSession(input, activity) {
          provenance_json, derived_json, reconciliation_status, created_at, updated_at
        )
        VALUES (?, ?, NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'standalone', ?, ?)`)
-        .run(id, externalUid, userId, parsed.source, parsed.sourceType, parsed.workoutType, parsed.sourceDevice, parsed.startedAt, parsed.endedAt, durationSeconds, parsed.activeEnergyKcal ?? null, parsed.totalEnergyKcal ?? null, parsed.distanceMeters ?? null, parsed.stepCount ?? null, parsed.exerciseMinutes ?? null, parsed.averageHeartRate ?? null, parsed.maxHeartRate ?? null, parsed.subjectiveEffort ?? null, parsed.moodBefore, parsed.moodAfter, parsed.meaningText, parsed.plannedContext, parsed.socialContext, JSON.stringify(parsed.links), JSON.stringify(parsed.tags), JSON.stringify(annotations), JSON.stringify({
+        .run(id, externalUid, userId, parsed.source, parsed.sourceType, persistenceSeed.activity.canonicalKey, parsed.sourceDevice, parsed.startedAt, parsed.endedAt, durationSeconds, parsed.activeEnergyKcal ?? null, parsed.totalEnergyKcal ?? null, parsed.distanceMeters ?? null, parsed.stepCount ?? null, parsed.exerciseMinutes ?? null, parsed.averageHeartRate ?? null, parsed.maxHeartRate ?? null, parsed.subjectiveEffort ?? null, parsed.moodBefore, parsed.moodAfter, parsed.meaningText, parsed.plannedContext, parsed.socialContext, JSON.stringify(parsed.links), JSON.stringify(parsed.tags), JSON.stringify(annotations), JSON.stringify({
         manualEntry: true,
         entryMode: "local",
         source: parsed.source,
         sourceType: parsed.sourceType,
+        sourceSystem: persistenceSeed.sourceSystem,
+        activity: persistenceSeed.activity,
+        details: persistenceSeed.details,
         sourceDevice: parsed.sourceDevice,
         actor: activity?.actor ?? null,
         createdAt: now,
         ...parsed.provenance
     }), JSON.stringify({
+        activity: persistenceSeed.activity,
+        details: persistenceSeed.details,
         paceMetersPerMinute: parsed.distanceMeters && parsed.exerciseMinutes
             ? Number((parsed.distanceMeters / parsed.exerciseMinutes).toFixed(2))
             : null
@@ -3268,8 +3358,25 @@ export function updateWorkoutSession(workoutId, patch, activity) {
         links
     };
     const currentProvenance = safeJsonParse(current.provenance_json, {});
+    const currentDerived = safeJsonParse(current.derived_json, {});
     const nextExerciseMinutes = parsed.exerciseMinutes ?? current.exercise_minutes;
     const nextDistanceMeters = parsed.distanceMeters ?? current.distance_meters;
+    const persistenceSeed = buildWorkoutSessionPersistenceSeed({
+        source: parsed.source ?? current.source,
+        sourceType: parsed.sourceType ?? current.source_type,
+        workoutType: parsed.workoutType ?? current.workout_type,
+        sourceSystem: typeof currentProvenance.sourceSystem === "string"
+            ? currentProvenance.sourceSystem
+            : null,
+        sourceBundleIdentifier: typeof currentProvenance.sourceBundleIdentifier === "string"
+            ? currentProvenance.sourceBundleIdentifier
+            : null,
+        sourceProductType: typeof currentProvenance.sourceProductType === "string"
+            ? currentProvenance.sourceProductType
+            : null,
+        activity: currentDerived.activity ?? currentProvenance.activity,
+        details: currentDerived.details ?? currentProvenance.details
+    });
     getDatabase()
         .prepare(`UPDATE health_workout_sessions
        SET external_uid = ?, source = ?, source_type = ?, workout_type = ?, source_device = ?,
@@ -3279,12 +3386,20 @@ export function updateWorkoutSession(workoutId, patch, activity) {
            social_context = ?, links_json = ?, tags_json = ?, annotations_json = ?, provenance_json = ?,
            derived_json = ?, updated_at = ?
        WHERE id = ?`)
-        .run(parsed.externalUid ?? current.external_uid, parsed.source ?? current.source, parsed.sourceType ?? current.source_type, parsed.workoutType ?? current.workout_type, parsed.sourceDevice ?? current.source_device, startedAt, endedAt, durationSeconds, parsed.activeEnergyKcal ?? current.active_energy_kcal, parsed.totalEnergyKcal ?? current.total_energy_kcal, nextDistanceMeters, parsed.stepCount ?? current.step_count, nextExerciseMinutes, parsed.averageHeartRate ?? current.average_heart_rate, parsed.maxHeartRate ?? current.max_heart_rate, annotations.subjectiveEffort, annotations.moodBefore, annotations.moodAfter, annotations.meaningText, annotations.plannedContext, annotations.socialContext, JSON.stringify(links), JSON.stringify(tags), JSON.stringify(annotations), JSON.stringify({
+        .run(parsed.externalUid ?? current.external_uid, parsed.source ?? current.source, parsed.sourceType ?? current.source_type, persistenceSeed.activity.canonicalKey, parsed.sourceDevice ?? current.source_device, startedAt, endedAt, durationSeconds, parsed.activeEnergyKcal ?? current.active_energy_kcal, parsed.totalEnergyKcal ?? current.total_energy_kcal, nextDistanceMeters, parsed.stepCount ?? current.step_count, nextExerciseMinutes, parsed.averageHeartRate ?? current.average_heart_rate, parsed.maxHeartRate ?? current.max_heart_rate, annotations.subjectiveEffort, annotations.moodBefore, annotations.moodAfter, annotations.meaningText, annotations.plannedContext, annotations.socialContext, JSON.stringify(links), JSON.stringify(tags), JSON.stringify(annotations), JSON.stringify({
         ...currentProvenance,
         ...(parsed.provenance ?? {}),
+        sourceSystem: persistenceSeed.sourceSystem,
+        sourceBundleIdentifier: persistenceSeed.sourceBundleIdentifier,
+        sourceProductType: persistenceSeed.sourceProductType,
+        activity: persistenceSeed.activity,
+        details: persistenceSeed.details,
         updatedAt: now,
         updatedByActor: activity?.actor ?? null
     }), JSON.stringify({
+        ...currentDerived,
+        activity: persistenceSeed.activity,
+        details: persistenceSeed.details,
         paceMetersPerMinute: nextDistanceMeters && nextExerciseMinutes
             ? Number((nextDistanceMeters / nextExerciseMinutes).toFixed(2))
             : null
@@ -3441,6 +3556,11 @@ export function createGeneratedWorkoutFromHabit(args) {
     }
     const now = nowIso();
     const id = `workout_${randomUUID().replaceAll("-", "").slice(0, 10)}`;
+    const persistenceSeed = buildWorkoutSessionPersistenceSeed({
+        source: "forge_habit",
+        sourceType: "habit_generated",
+        workoutType: template.workoutType
+    });
     getDatabase()
         .prepare(`INSERT INTO health_workout_sessions (
          id, external_uid, pairing_session_id, user_id, source, source_type, workout_type, source_device,
@@ -3448,7 +3568,7 @@ export function createGeneratedWorkoutFromHabit(args) {
          derived_json, generated_from_habit_id, generated_from_check_in_id, reconciliation_status, created_at, updated_at
        )
        VALUES (?, ?, NULL, ?, 'forge_habit', 'habit_generated', ?, 'Habit automation', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'awaiting_import_match', ?, ?)`)
-        .run(id, `habit_${args.checkInId}`, args.userId, template.workoutType, startedAt, endedAt, template.durationMinutes * 60, JSON.stringify([
+        .run(id, `habit_${args.checkInId}`, args.userId, persistenceSeed.activity.canonicalKey, startedAt, endedAt, template.durationMinutes * 60, JSON.stringify([
         ...(template.links ?? []),
         ...(args.linkedEntities ?? [])
     ]), JSON.stringify(template.tags), JSON.stringify({
@@ -3457,8 +3577,13 @@ export function createGeneratedWorkoutFromHabit(args) {
     }), JSON.stringify({
         generatedFrom: "habit_completion",
         habitId: args.habitId,
-        checkInId: args.checkInId
+        checkInId: args.checkInId,
+        sourceSystem: persistenceSeed.sourceSystem,
+        activity: persistenceSeed.activity,
+        details: persistenceSeed.details
     }), JSON.stringify({
+        activity: persistenceSeed.activity,
+        details: persistenceSeed.details,
         xpReward: template.xpReward
     }), args.habitId, args.checkInId, now, now);
     recordActivityEvent({

package/dist/server/server/src/openapi.js

@@ -4055,6 +4055,12 @@ export function buildOpenApiDocument() {
             "userId",
             "source",
             "sourceType",
+            "sourceSystem",
+            "workoutTypeLabel",
+            "activityFamily",
+            "activityFamilyLabel",
+            "activity",
+            "details",
             "workoutType",
             "sourceDevice",
             "startedAt",
@@ -4091,7 +4097,15 @@ export function buildOpenApiDocument() {
             userId: { type: "string" },
             source: { type: "string" },
             sourceType: { type: "string" },
+            sourceSystem: { type: "string" },
+            sourceBundleIdentifier: nullable({ type: "string" }),
+            sourceProductType: nullable({ type: "string" }),
             workoutType: { type: "string" },
+            workoutTypeLabel: { type: "string" },
+            activityFamily: { type: "string" },
+            activityFamilyLabel: { type: "string" },
+            activity: { type: "object", additionalProperties: true },
+            details: { type: "object", additionalProperties: true },
             sourceDevice: { type: "string" },
             startedAt: { type: "string", format: "date-time" },
             endedAt: { type: "string", format: "date-time" },

package/dist/server/server/src/repositories/habits.js

@@ -11,8 +11,9 @@ import { recordActivityEvent } from "./activity-events.js";
 import { filterDeletedEntities, filterDeletedIds, isEntityDeleted } from "./deleted-entities.js";
 import { recordHabitCheckInReward, reverseLatestHabitCheckInReward } from "./rewards.js";
 import { createHabitCheckInSchema, createHabitSchema, habitCheckInSchema, habitSchema, updateHabitSchema } from "../types.js";
+import { formatLocalDateKey } from "../../../src/lib/date-keys.js";
 function todayKey(now = new Date()) {
-    return now.toISOString().slice(0, 10);
+    return formatLocalDateKey(now);
 }
 function parseWeekDays(raw) {
     const parsed = JSON.parse(raw);
@@ -87,25 +88,25 @@ function calculateStreak(habit, checkIns, now = new Date()) {
             statusByDate.set(checkIn.dateKey, checkIn.status);
         }
     }
-    const isScheduledOn = (date) => habit.frequency === "daily" || habit.weekDays.includes(date.getUTCDay());
-    const toDateKey = (date) => date.toISOString().slice(0, 10);
-    const atUtcDayStart = (date) => new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()));
+    const isScheduledOn = (date) => habit.frequency === "daily" || habit.weekDays.includes(date.getDay());
+    const toDateKey = (date) => formatLocalDateKey(date);
+    const atLocalDayStart = (date) => new Date(date.getFullYear(), date.getMonth(), date.getDate());
     const previousScheduledDate = (date) => {
-        const cursor = atUtcDayStart(date);
+        const cursor = atLocalDayStart(date);
         do {
-            cursor.setUTCDate(cursor.getUTCDate() - 1);
+            cursor.setDate(cursor.getDate() - 1);
         } while (!isScheduledOn(cursor));
         return cursor;
     };
-    const startOfUtcWeek = (date) => {
-        const start = atUtcDayStart(date);
-        const offset = (start.getUTCDay() + 6) % 7;
-        start.setUTCDate(start.getUTCDate() - offset);
+    const startOfLocalWeek = (date) => {
+        const start = atLocalDayStart(date);
+        const offset = (start.getDay() + 6) % 7;
+        start.setDate(start.getDate() - offset);
         return start;
     };
-    const previousUtcWeek = (date) => {
-        const start = startOfUtcWeek(date);
-        start.setUTCDate(start.getUTCDate() - 7);
+    const previousLocalWeek = (date) => {
+        const start = startOfLocalWeek(date);
+        start.setDate(start.getDate() - 7);
         return start;
     };
     const alignedStatusOn = (date) => {
@@ -113,7 +114,7 @@ function calculateStreak(habit, checkIns, now = new Date()) {
         return status ? isAligned(habit, { status }) : false;
     };
     if (habit.frequency === "daily") {
-        const today = atUtcDayStart(now);
+        const today = atLocalDayStart(now);
         let cursor = isScheduledOn(today) && !statusByDate.has(toDateKey(today))
             ? previousScheduledDate(today)
             : today;
@@ -128,21 +129,21 @@ function calculateStreak(habit, checkIns, now = new Date()) {
         let count = 0;
         for (let offset = 0; offset < 7; offset += 1) {
             const day = new Date(weekStart);
-            day.setUTCDate(weekStart.getUTCDate() + offset);
+            day.setDate(weekStart.getDate() + offset);
             if (isScheduledOn(day) && alignedStatusOn(day)) {
                 count += 1;
             }
         }
         return count;
     };
-    const currentWeekStart = startOfUtcWeek(now);
+    const currentWeekStart = startOfLocalWeek(now);
     let cursor = alignedCountForWeek(currentWeekStart) >= habit.targetCount
         ? currentWeekStart
-        : previousUtcWeek(currentWeekStart);
+        : previousLocalWeek(currentWeekStart);
     let streak = 0;
     while (alignedCountForWeek(cursor) >= habit.targetCount) {
         streak += 1;
-        cursor = previousUtcWeek(cursor);
+        cursor = previousLocalWeek(cursor);
     }
     return streak;
 }
@@ -157,7 +158,7 @@ function isHabitDueToday(habit, latestCheckIn, now = new Date()) {
     if (habit.frequency === "daily") {
         return true;
     }
-    return habit.weekDays.includes(now.getUTCDay());
+    return habit.weekDays.includes(now.getDay());
 }
 function mapHabit(row, checkIns = listCheckInsForHabit(row.id)) {
     const latestCheckIn = checkIns[0] ?? null;
@@ -235,21 +236,28 @@ function sortHabits(habits, orderBy) {
     const nextHabits = [...habits];
     nextHabits.sort((left, right) => {
         if (orderBy === "name") {
-            return (left.title.localeCompare(right.title, undefined, { sensitivity: "base" }) ||
-                compareDateDesc(left.createdAt, right.createdAt));
+            return (left.title.localeCompare(right.title, undefined, {
+                sensitivity: "base"
+            }) || compareDateDesc(left.createdAt, right.createdAt));
         }
         if (orderBy === "streak") {
             return (right.streakCount - left.streakCount ||
                 Number(right.dueToday) - Number(left.dueToday) ||
-                left.title.localeCompare(right.title, undefined, { sensitivity: "base" }));
+                left.title.localeCompare(right.title, undefined, {
+                    sensitivity: "base"
+                }));
         }
         if (orderBy === "created_at") {
             return (compareDateDesc(left.createdAt, right.createdAt) ||
-                left.title.localeCompare(right.title, undefined, { sensitivity: "base" }));
+                left.title.localeCompare(right.title, undefined, {
+                    sensitivity: "base"
+                }));
         }
         if (orderBy === "updated_at") {
             return (compareDateDesc(left.updatedAt, right.updatedAt) ||
-                left.title.localeCompare(right.title, undefined, { sensitivity: "base" }));
+                left.title.localeCompare(right.title, undefined, {
+                    sensitivity: "base"
+                }));
         }
         return (Number(right.dueToday) - Number(left.dueToday) ||
             compareDateAsc(left.lastCheckInAt, right.lastCheckInAt) ||
@@ -367,6 +375,32 @@ export function updateHabit(habitId, input, activity) {
         return undefined;
     }
     const parsed = updateHabitSchema.parse(input);
+    const shouldApplyEntityPatch = parsed.title !== undefined ||
+        parsed.description !== undefined ||
+        parsed.status !== undefined ||
+        parsed.polarity !== undefined ||
+        parsed.frequency !== undefined ||
+        parsed.targetCount !== undefined ||
+        parsed.weekDays !== undefined ||
+        parsed.linkedGoalIds !== undefined ||
+        parsed.linkedProjectIds !== undefined ||
+        parsed.linkedTaskIds !== undefined ||
+        parsed.linkedValueIds !== undefined ||
+        parsed.linkedPatternIds !== undefined ||
+        parsed.linkedBehaviorIds !== undefined ||
+        parsed.linkedBeliefIds !== undefined ||
+        parsed.linkedModeIds !== undefined ||
+        parsed.linkedReportIds !== undefined ||
+        parsed.linkedBehaviorId !== undefined ||
+        parsed.rewardXp !== undefined ||
+        parsed.penaltyXp !== undefined ||
+        parsed.generatedHealthEventTemplate !== undefined ||
+        parsed.userId !== undefined;
+    if (!shouldApplyEntityPatch) {
+        return parsed.checkIn
+            ? createHabitCheckIn(habitId, parsed.checkIn, activity)
+            : current;
+    }
     const nextLinkedBehaviorIds = parsed.linkedBehaviorIds !== undefined ||
         parsed.linkedBehaviorId !== undefined
         ? normalizeLinkedBehaviorIds({
@@ -385,7 +419,7 @@ export function updateHabit(habitId, input, activity) {
     validateExistingIds(parsed.linkedBeliefIds ?? current.linkedBeliefIds, getBeliefEntryById, "belief_not_found", "Belief");
     validateExistingIds(parsed.linkedModeIds ?? current.linkedModeIds, getModeProfileById, "mode_not_found", "Mode");
     validateExistingIds(parsed.linkedReportIds ?? current.linkedReportIds, getTriggerReportById, "report_not_found", "Report");
-    return runInTransaction(() => {
+    const updatedHabit = runInTransaction(() => {
         const updatedAt = new Date().toISOString();
         getDatabase()
             .prepare(`UPDATE habits
@@ -419,6 +453,9 @@ export function updateHabit(habitId, input, activity) {
         }
         return habit;
     });
+    return parsed.checkIn
+        ? createHabitCheckIn(habitId, parsed.checkIn, activity) ?? updatedHabit
+        : updatedHabit;
 }
 export function deleteHabit(habitId, activity) {
     const current = getHabitById(habitId);

package/dist/server/server/src/types.js

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { LEGACY_WORKBENCH_PORT_KINDS, WORKBENCH_PORT_KINDS, normalizeWorkbenchPortKind } from "../../src/lib/workbench/nodes.js";
+import { formatLocalDateKey } from "../../src/lib/date-keys.js";
 export const taskStatusSchema = z.enum([
     "backlog",
     "focus",
@@ -3120,6 +3121,12 @@ export const taskMutationShape = {
     notes: z.array(nestedCreateNoteSchema).default([])
 };
 export const createTaskSchema = z.object(taskMutationShape);
+const habitCheckInWriteSchema = z.object({
+    dateKey: dateOnlySchema.default(() => formatLocalDateKey()),
+    status: habitCheckInStatusSchema,
+    note: trimmedString.default(""),
+    description: trimmedString.optional()
+});
 const habitMutationShape = {
     title: nonEmptyTrimmedString,
     description: trimmedString.default(""),
@@ -3206,6 +3213,7 @@ export const updateHabitSchema = z
     linkedBehaviorId: nonEmptyTrimmedString.nullable().optional(),
     rewardXp: z.number().int().min(1).max(100).optional(),
     penaltyXp: z.number().int().min(1).max(100).optional(),
+    checkIn: habitCheckInWriteSchema.optional(),
     generatedHealthEventTemplate: z
         .object({
         enabled: z.boolean().optional(),
@@ -3371,12 +3379,7 @@ export const taskRunFinishSchema = z.object({
 export const taskRunFocusSchema = z.object({
     actor: nonEmptyTrimmedString.optional()
 });
-export const createHabitCheckInSchema = z.object({
-    dateKey: dateOnlySchema.default(new Date().toISOString().slice(0, 10)),
-    status: habitCheckInStatusSchema,
-    note: trimmedString.default(""),
-    description: trimmedString.optional()
-});
+export const createHabitCheckInSchema = habitCheckInWriteSchema;
 export const updateSettingsSchema = z.object({
     profile: z
         .object({