npm - forge-openclaw-plugin - Versions diffs - 0.2.29 → 0.2.32 - Mend

forge-openclaw-plugin 0.2.29 → 0.2.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/dist/assets/index-BE_4LX2c.js +85 -0
package/dist/assets/index-BE_4LX2c.js.map +1 -0
package/dist/assets/index-DiyKCDxL.css +1 -0
package/dist/index.html +2 -2
package/dist/server/server/src/app.js +26 -5
package/dist/server/server/src/movement.js +151 -0
package/dist/server/server/src/services/life-force.js +84 -52
package/dist/server/server/src/web.js +68 -2
package/dist/server/src/lib/api.js +12 -0
package/openclaw.plugin.json +1 -1
package/package.json +1 -1
package/skills/forge-openclaw/SKILL.md +19 -2
package/dist/assets/index-C6PCeHD_.css +0 -1
package/dist/assets/index-bfHIqj0-.js +0 -85
package/dist/assets/index-bfHIqj0-.js.map +0 -1

package/dist/index.html CHANGED Viewed

@@ -13,14 +13,14 @@
     />
     <link rel="icon" type="image/png" href="/forge/assets/favicon-BCHm9dUV.ico" />
     <link rel="alternate icon" href="/forge/assets/favicon-BCHm9dUV.ico" />
-    <script type="module" crossorigin src="/forge/assets/index-bfHIqj0-.js"></script>
+    <script type="module" crossorigin src="/forge/assets/index-BE_4LX2c.js"></script>
     <link rel="modulepreload" crossorigin href="/forge/assets/vendor-OwcH20PM.js">
     <link rel="modulepreload" crossorigin href="/forge/assets/board-q8cfwaAW.js">
     <link rel="modulepreload" crossorigin href="/forge/assets/ui-BV0OYxkH.js">
     <link rel="modulepreload" crossorigin href="/forge/assets/motion-DHfqFntt.js">
     <link rel="modulepreload" crossorigin href="/forge/assets/table-DLweENXt.js">
     <link rel="stylesheet" crossorigin href="/forge/assets/vendor-DT3pnAKJ.css">
-    <link rel="stylesheet" crossorigin href="/forge/assets/index-C6PCeHD_.css">
+    <link rel="stylesheet" crossorigin href="/forge/assets/index-DiyKCDxL.css">
   </head>
   <body class="bg-canvas text-ink antialiased">
     <div id="root"></div>

package/dist/server/server/src/app.js CHANGED Viewed

@@ -60,7 +60,7 @@ import { registerWebRoutes } from "./web.js";
 import { createManagerRuntime } from "./managers/runtime.js";
 import { isManagerError } from "./managers/type-guards.js";
 import { createCompanionPairingSession, createCompanionPairingSessionSchema, createSleepSession, createSleepSessionSchema, createWorkoutSession, createWorkoutSessionSchema, deleteSleepSession, deleteWorkoutSession, getCompanionPairingSessionById, getCompanionOverview, getFitnessViewData, getSleepSessionById, getSleepViewData, getWorkoutSessionById, ingestMobileHealthSync, mobileHealthSyncSchema, patchCompanionPairingSourceState, patchCompanionPairingSourceStateSchema, companionSourceKeySchema, requireValidPairing, revokeAllCompanionPairingSessions, revokeAllCompanionPairingSessionsSchema, revokeCompanionPairingSession, updateMobileCompanionSourceState, updateMobileCompanionSourceStateSchema, verifyCompanionPairing, verifyCompanionPairingSchema, updateSleepMetadata, updateSleepMetadataSchema, updateWorkoutMetadata, updateWorkoutMetadataSchema } from "./health.js";
-import { analyzeMovementUserBoxPreflight, createMovementUserBox, createMovementPlace, deleteMovementUserBox, getMovementAllTimeSummary, getMovementDayDetail, getMovementMobileBootstrap, getMovementTimeline, getMovementSelectionAggregate, getMovementSettings, getMovementTripDetail, getMovementMonthSummary, invalidateAutomaticMovementBox, listMovementPlaces, movementAutomaticBoxInvalidateSchema, movementMobileBootstrapSchema, movementMobilePlaceMutationSchema, movementMobileUserBoxCreateSchema, movementMobileUserBoxPreflightSchema, movementMobileUserBoxPatchSchema, movementMobileAutomaticBoxInvalidateSchema, movementMobileTimelineSchema, movementPlaceMutationSchema, movementPlacePatchSchema, movementSelectionAggregateSchema, movementStayPatchSchema, movementTripPatchSchema, movementUserBoxCreateSchema, movementUserBoxPreflightSchema, movementUserBoxPatchSchema, movementSettingsPatchSchema, movementTimelineQuerySchema, movementTripPointPatchSchema, deleteMovementStay, deleteMovementTrip, deleteMovementTripPoint, updateMovementPlace, updateMovementSettings, updateMovementStay, updateMovementTrip, updateMovementUserBox, updateMovementTripPoint, resolveMovementTimelineSegmentForBox } from "./movement.js";
+import { analyzeMovementUserBoxPreflight, createMovementUserBox, createMovementPlace, deleteMovementUserBox, getMovementAllTimeSummary, getMovementBoxDetail, getMovementDayDetail, getMovementMobileBootstrap, getMovementTimeline, getMovementSelectionAggregate, getMovementSettings, getMovementTripDetail, getMovementMonthSummary, invalidateAutomaticMovementBox, listMovementPlaces, movementAutomaticBoxInvalidateSchema, movementMobileBootstrapSchema, movementMobilePlaceMutationSchema, movementMobileUserBoxCreateSchema, movementMobileUserBoxPreflightSchema, movementMobileUserBoxPatchSchema, movementMobileAutomaticBoxInvalidateSchema, movementMobileTimelineSchema, movementPlaceMutationSchema, movementPlacePatchSchema, movementSelectionAggregateSchema, movementStayPatchSchema, movementTripPatchSchema, movementUserBoxCreateSchema, movementUserBoxPreflightSchema, movementUserBoxPatchSchema, movementSettingsPatchSchema, movementTimelineQuerySchema, movementTripPointPatchSchema, deleteMovementStay, deleteMovementTrip, deleteMovementTripPoint, updateMovementPlace, updateMovementSettings, updateMovementStay, updateMovementTrip, updateMovementUserBox, updateMovementTripPoint, resolveMovementTimelineSegmentForBox } from "./movement.js";
 import { getScreenTimeAllTimeSummary, getScreenTimeDayDetail, getScreenTimeMonthSummary, getScreenTimeSettings, screenTimeSettingsPatchSchema, updateScreenTimeSettings } from "./screen-time.js";
 import { assertWatchReady, buildWatchBootstrap, ingestWatchCaptureBatch, mobileWatchBootstrapSchema, mobileWatchCaptureBatchSchema, mobileWatchHabitCheckInSchema } from "./watch-mobile.js";
 const COMPATIBILITY_SUNSET = "transitional-node";
@@ -3668,7 +3668,7 @@ const AGENT_ONBOARDING_TOOL_INPUT_CATALOG = [
     {
         toolName: "forge_recommend_task_timeboxes",
         summary: "Suggest future task slots that fit the current calendar rules and schedule.",
-        whenToUse: "Use when preparing focused work in advance.",
+        whenToUse: "Use when preparing focused work in advance and the agent wants Forge to propose candidate slots instead of picking one manually.",
         inputShape: "{ taskId: string, from?: string, to?: string, limit?: integer }",
         requiredFields: ["taskId"],
         notes: [
@@ -3680,15 +3680,16 @@ const AGENT_ONBOARDING_TOOL_INPUT_CATALOG = [
     {
         toolName: "forge_create_task_timebox",
         summary: "Create a planned task timebox in the Forge calendar domain.",
-        whenToUse: "Use after choosing a valid future slot or when creating a manual timebox directly.",
-        inputShape: '{ taskId: string, projectId?: string|null, title: string, startsAt: string, endsAt: string, source?: "manual"|"suggested"|"live_run" }',
+        whenToUse: "Use after choosing a valid future slot or, preferably, when the agent has already reasoned over the live calendar and wants to place a manual timebox directly.",
+        inputShape: '{ taskId: string, projectId?: string|null, title: string, startsAt: string, endsAt: string, source?: "manual"|"suggested"|"live_run", overrideReason?: string|null, activityPresetKey?: string|null, customSustainRateApPerHour?: number|null, userId?: string|null }',
         requiredFields: ["taskId", "title", "startsAt", "endsAt"],
         notes: [
+            "Manual timeboxing is the main direct path when the agent already understands the calendar and wants to choose the slot itself.",
             "Forge publishes these through the shared Forge write target during provider sync.",
             "Live task runs can later attach to matching timeboxes.",
             "This is a convenience helper; agents can also create task_timebox through forge_create_entities."
         ],
-        example: '{"taskId":"task_123","projectId":"project_456","title":"Draft the methods section","startsAt":"2026-04-03T08:00:00.000Z","endsAt":"2026-04-03T09:30:00.000Z","source":"suggested"}'
+        example: '{"taskId":"task_123","projectId":"project_456","title":"Draft the methods section","startsAt":"2026-04-03T08:00:00.000Z","endsAt":"2026-04-03T09:30:00.000Z","source":"manual","overrideReason":"Protected writing block before clinic.","activityPresetKey":"deep_work","customSustainRateApPerHour":6.5}'
     },
     {
         toolName: "forge_grant_reward_bonus",
@@ -5580,6 +5581,15 @@ export async function buildServer(options = {}) {
         }
         return { movement };
     });
+    app.get("/api/v1/movement/boxes/:id", async (request, reply) => {
+        const { id } = request.params;
+        const movement = getMovementBoxDetail(id, resolveScopedUserIds(request.query) ?? []);
+        if (!movement) {
+            reply.code(404);
+            return { error: "Movement box not found" };
+        }
+        return { movement };
+    });
     app.post("/api/v1/movement/selection", async (request) => ({
         movement: getMovementSelectionAggregate(movementSelectionAggregateSchema.parse(request.body ?? {}))
     }));
@@ -5674,6 +5684,17 @@ export async function buildServer(options = {}) {
             })
         };
     });
+    app.post("/api/v1/mobile/movement/boxes/:id/detail", async (request, reply) => {
+        const parsed = movementMobileBootstrapSchema.parse(request.body ?? {});
+        const pairing = requireValidPairing(parsed.sessionId, parsed.pairingToken);
+        const { id } = request.params;
+        const movement = getMovementBoxDetail(id, [pairing.user_id]);
+        if (!movement) {
+            reply.code(404);
+            return { error: "Movement box not found" };
+        }
+        return { movement };
+    });
     app.post("/api/v1/mobile/movement/user-boxes", async (request, reply) => {
         const parsed = movementMobileUserBoxCreateSchema.parse(request.body ?? {});
         const pairing = requireValidPairing(parsed.sessionId, parsed.pairingToken);

package/dist/server/server/src/movement.js CHANGED Viewed

@@ -4670,6 +4670,157 @@ export function getMovementTripDetail(tripId) {
         selectionAggregate
     };
 }
+export function getMovementBoxDetail(boxId, userIds = []) {
+    const scopedUserIds = userIds.length > 0 ? userIds : [getDefaultUser().id];
+    const segment = buildProjectedMovementTimelineSegments(scopedUserIds).find((entry) => entry.boxId === boxId);
+    if (!segment) {
+        return undefined;
+    }
+    const places = listMovementPlaceRows(scopedUserIds).map(mapMovementPlace);
+    const placesById = new Map(places.map((place) => [place.id, place]));
+    const stayRows = listMovementStayRows(scopedUserIds);
+    const rawStays = segment.rawStayIds
+        .map((id) => stayRows.find((row) => row.id === id))
+        .filter((row) => Boolean(row))
+        .map((row) => mapMovementStay(row, placesById));
+    const tripRows = listMovementTripRows(scopedUserIds);
+    const rawTripRows = segment.rawTripIds
+        .map((id) => tripRows.find((row) => row.id === id))
+        .filter((row) => Boolean(row));
+    const rawTripIds = rawTripRows.map((row) => row.id);
+    const pointsByTrip = new Map();
+    listTripPoints(rawTripIds).forEach((point) => {
+        pointsByTrip.set(point.trip_id, [...(pointsByTrip.get(point.trip_id) ?? []), point]);
+    });
+    const stopsByTrip = new Map();
+    listTripStops(rawTripIds).forEach((stop) => {
+        stopsByTrip.set(stop.trip_id, [...(stopsByTrip.get(stop.trip_id) ?? []), stop]);
+    });
+    const rawTrips = rawTripRows.map((row) => mapMovementTrip(row, placesById, pointsByTrip.get(row.id) ?? [], stopsByTrip.get(row.id) ?? []));
+    const stayPositions = rawStays.length > 0
+        ? rawStays.map((stay, index) => ({
+            latitude: stay.centerLatitude,
+            longitude: stay.centerLongitude,
+            recordedAt: stay.startedAt,
+            label: stay.place?.label ?? (stay.label || `Stay ${index + 1}`)
+        }))
+        : segment.kind === "stay" && segment.stay
+            ? [
+                {
+                    latitude: segment.stay.centerLatitude,
+                    longitude: segment.stay.centerLongitude,
+                    recordedAt: segment.stay.startedAt,
+                    label: segment.stay.place?.label ?? (segment.stay.label || "Stay")
+                }
+            ]
+            : [];
+    const averageStayPosition = stayPositions.length > 0
+        ? {
+            latitude: round(stayPositions.reduce((sum, position) => sum + position.latitude, 0) /
+                stayPositions.length, 6),
+            longitude: round(stayPositions.reduce((sum, position) => sum + position.longitude, 0) /
+                stayPositions.length, 6),
+            recordedAt: null,
+            label: "Average position"
+        }
+        : null;
+    const stayDetail = segment.kind === "stay"
+        ? {
+            positions: stayPositions,
+            averagePosition: averageStayPosition,
+            canonicalPlace: rawStays[0]?.place ?? segment.stay?.place ?? null,
+            radiusMeters: rawStays.length > 0
+                ? Math.max(...rawStays.map((stay) => stay.radiusMeters))
+                : segment.stay?.radiusMeters ?? null,
+            sampleCount: rawStays.length > 0
+                ? rawStays.reduce((sum, stay) => sum + stay.sampleCount, 0)
+                : segment.stay?.sampleCount ?? 0
+        }
+        : null;
+    const tripPositions = rawTrips.length > 0
+        ? rawTrips
+            .flatMap((trip) => trip.points)
+            .sort((left, right) => Date.parse(left.recordedAt) - Date.parse(right.recordedAt))
+            .map((point, index) => ({
+            latitude: point.latitude,
+            longitude: point.longitude,
+            recordedAt: point.recordedAt,
+            label: index === 0 ? "Start" : null,
+            accuracyMeters: point.accuracyMeters,
+            altitudeMeters: point.altitudeMeters,
+            speedMps: point.speedMps,
+            isStopAnchor: point.isStopAnchor
+        }))
+        : segment.kind === "trip" && segment.trip
+            ? segment.trip.points.map((point, index) => ({
+                latitude: point.latitude,
+                longitude: point.longitude,
+                recordedAt: point.recordedAt,
+                label: index === 0 ? "Start" : null,
+                accuracyMeters: point.accuracyMeters,
+                altitudeMeters: point.altitudeMeters,
+                speedMps: point.speedMps,
+                isStopAnchor: point.isStopAnchor
+            }))
+            : [];
+    const resolveEndpoint = (kind) => {
+        const fromPoints = kind === "start"
+            ? tripPositions[0] ?? null
+            : tripPositions[tripPositions.length - 1] ?? null;
+        if (fromPoints) {
+            return {
+                ...fromPoints,
+                label: kind === "start" ? "Start position" : "End position"
+            };
+        }
+        if (segment.kind === "trip") {
+            const place = kind === "start" ? segment.trip?.startPlace : segment.trip?.endPlace;
+            if (place) {
+                return {
+                    latitude: place.latitude,
+                    longitude: place.longitude,
+                    recordedAt: kind === "start" ? segment.startedAt : segment.endedAt,
+                    label: place.label
+                };
+            }
+        }
+        return null;
+    };
+    const totalMovingSeconds = rawTrips.length > 0
+        ? rawTrips.reduce((sum, trip) => sum + trip.movingSeconds, 0)
+        : segment.trip?.movingSeconds ?? 0;
+    const totalDistanceMeters = rawTrips.length > 0
+        ? rawTrips.reduce((sum, trip) => sum + trip.distanceMeters, 0)
+        : segment.trip?.distanceMeters ?? 0;
+    const tripDetail = segment.kind === "trip"
+        ? {
+            positions: tripPositions,
+            startPosition: resolveEndpoint("start"),
+            endPosition: resolveEndpoint("end"),
+            totalDistanceMeters,
+            movingSeconds: totalMovingSeconds,
+            idleSeconds: rawTrips.length > 0
+                ? rawTrips.reduce((sum, trip) => sum + trip.idleSeconds, 0)
+                : segment.trip?.idleSeconds ?? 0,
+            averageSpeedMps: totalMovingSeconds > 0
+                ? round(totalDistanceMeters / totalMovingSeconds, 2)
+                : segment.trip?.averageSpeedMps ?? null,
+            maxSpeedMps: rawTrips.length > 0
+                ? rawTrips.reduce((maxSpeed, trip) => Math.max(maxSpeed, trip.maxSpeedMps ?? 0), 0) || null
+                : segment.trip?.maxSpeedMps ?? null,
+            stopCount: rawTrips.length > 0
+                ? rawTrips.reduce((sum, trip) => sum + trip.stops.length, 0)
+                : segment.trip?.stops.length ?? 0
+        }
+        : null;
+    return {
+        segment,
+        rawStays,
+        rawTrips,
+        stayDetail,
+        tripDetail
+    };
+}
 export function getMovementSelectionAggregate(input) {
     const parsed = movementSelectionAggregateSchema.parse(input);
     const placeRows = listMovementPlaceRows(parsed.userIds);

package/dist/server/server/src/services/life-force.js CHANGED Viewed

@@ -234,6 +234,15 @@ function computeUncoveredSeconds(window, blockingWindows) {
     coveredMs += activeEndMs - activeStartMs;
     return Math.max(0, totalSeconds - Math.floor(coveredMs / 1000));
 }
+function containsInstant(window, instantIso) {
+    const instantMs = Date.parse(instantIso);
+    return (Number.isFinite(instantMs) &&
+        Date.parse(window.startAt) <= instantMs &&
+        Date.parse(window.endAt) > instantMs);
+}
+function isInstantCovered(instantIso, blockingWindows) {
+    return blockingWindows.some((window) => containsInstant(window, instantIso));
+}
 function nowIso() {
     return new Date().toISOString();
 }
@@ -1635,6 +1644,36 @@ function readTaskTimeboxLifeForceRows(userId, range) {
         return [];
     }
 }
+function readCalendarEventLifeForceRows(range) {
+    try {
+        return getDatabase()
+            .prepare(`SELECT
+           forge_events.id,
+           forge_events.title,
+           forge_events.start_at,
+           forge_events.end_at,
+           forge_events.availability,
+           forge_events.event_type,
+           COUNT(forge_event_links.id) AS link_count
+         FROM forge_events
+         LEFT JOIN forge_event_links
+           ON forge_event_links.forge_event_id = forge_events.id
+         WHERE forge_events.deleted_at IS NULL
+           AND forge_events.end_at > ?
+           AND forge_events.start_at < ?
+         GROUP BY
+           forge_events.id,
+           forge_events.title,
+           forge_events.start_at,
+           forge_events.end_at,
+           forge_events.availability,
+           forge_events.event_type`)
+            .all(range.from, range.to);
+    }
+    catch {
+        return [];
+    }
+}
 function readWorkBlockTemplateLifeForceRows(userId) {
     try {
         return getDatabase()
@@ -1717,7 +1756,7 @@ function buildWorkBlockProfile(input) {
         endMinute
     });
 }
-function buildTimeboxAndWorkBlockDrains(userId, range, now, lifeForceProfile, activeTaskRunTaskIds, actualSourceWindows) {
+function buildTimeboxAndWorkBlockDrains(userId, range, now, lifeForceProfile, activeTaskRunTaskIds, actualSourceWindows, calendarEventWindows) {
     const actualContributions = [];
     const plannedDrains = [];
     const activeDrains = [];
@@ -1756,11 +1795,12 @@ function buildTimeboxAndWorkBlockDrains(userId, range, now, lifeForceProfile, ac
                     startsAt: row.starts_at,
                     endsAt: row.ends_at
                 });
+        const higherPriorityWindows = [...actualSourceWindows, ...calendarEventWindows];
         const elapsedWindow = {
             startAt: row.starts_at,
             endAt: new Date(Math.min(now.getTime(), Date.parse(row.ends_at))).toISOString()
         };
-        const elapsedSeconds = computeUncoveredSeconds(elapsedWindow, actualSourceWindows);
+        const elapsedSeconds = computeUncoveredSeconds(elapsedWindow, higherPriorityWindows);
         if (elapsedSeconds > 0) {
             actualContributions.push({
                 entityType: "task_timebox",
@@ -1778,7 +1818,15 @@ function buildTimeboxAndWorkBlockDrains(userId, range, now, lifeForceProfile, ac
         }
         const remainingStartMs = Math.max(now.getTime(), Date.parse(row.starts_at));
         const remainingEndMs = Math.min(range.endMs, Date.parse(row.ends_at));
-        const remainingSeconds = Math.max(0, Math.floor((remainingEndMs - remainingStartMs) / 1000));
+        const remainingWindow = remainingEndMs > remainingStartMs
+            ? {
+                startAt: new Date(remainingStartMs).toISOString(),
+                endAt: new Date(remainingEndMs).toISOString()
+            }
+            : null;
+        const remainingSeconds = remainingWindow
+            ? computeUncoveredSeconds(remainingWindow, higherPriorityWindows)
+            : 0;
         if (remainingSeconds > 0) {
             plannedDrains.push({
                 entityType: "task_timebox",
@@ -1789,15 +1837,15 @@ function buildTimeboxAndWorkBlockDrains(userId, range, now, lifeForceProfile, ac
                 rateApPerHour: profile.sustainRateApPerHour,
                 title: row.title,
                 why: "Planned task timeboxes forecast how much Action Point throughput is still booked today.",
-                startsAt: row.starts_at,
-                endsAt: row.ends_at,
+                startsAt: remainingWindow?.startAt ?? row.starts_at,
+                endsAt: remainingWindow?.endAt ?? row.ends_at,
                 role: "secondary"
             });
         }
         if (Date.parse(row.starts_at) <= now.getTime() &&
             Date.parse(row.ends_at) > now.getTime() &&
             !activeTaskRunTaskIds.has(row.task_id) &&
-            !actualSourceWindows.some((window) => overlapsWindow(row.starts_at, row.ends_at, window.startAt, window.endAt))) {
+            !isInstantCovered(now.toISOString(), higherPriorityWindows)) {
             activeDrains.push({
                 entityType: "task_timebox",
                 entityId: row.id,
@@ -1819,8 +1867,11 @@ function buildTimeboxAndWorkBlockDrains(userId, range, now, lifeForceProfile, ac
             startAt: block.start_at,
             endAt: block.end_at
         });
-        const overlapsTimebox = timeboxes.some((timebox) => timebox.status !== "cancelled" &&
-            overlapsWindow(block.start_at, block.end_at, timebox.starts_at, timebox.ends_at));
+        const higherPriorityWindows = [
+            ...actualSourceWindows,
+            ...calendarEventWindows,
+            ...timeboxWindows
+        ];
         const profile = buildEffectiveProfile(buildWorkBlockProfile({
             templateId: block.id,
             title: block.title,
@@ -1832,11 +1883,8 @@ function buildTimeboxAndWorkBlockDrains(userId, range, now, lifeForceProfile, ac
             startAt: block.start_at,
             endAt: new Date(Math.min(now.getTime(), Date.parse(block.end_at))).toISOString()
         };
-        const elapsedSeconds = computeUncoveredSeconds(elapsedWindow, [
-            ...actualSourceWindows,
-            ...timeboxWindows
-        ]);
-        if (elapsedSeconds > 0 && !overlapsTimebox) {
+        const elapsedSeconds = computeUncoveredSeconds(elapsedWindow, higherPriorityWindows);
+        if (elapsedSeconds > 0) {
             actualContributions.push({
                 entityType: "work_block",
                 entityId: block.instance_id,
@@ -1857,8 +1905,16 @@ function buildTimeboxAndWorkBlockDrains(userId, range, now, lifeForceProfile, ac
         }
         const remainingStartMs = Math.max(now.getTime(), Date.parse(block.start_at));
         const remainingEndMs = Math.min(range.endMs, Date.parse(block.end_at));
-        const remainingSeconds = Math.max(0, Math.floor((remainingEndMs - remainingStartMs) / 1000));
-        if (remainingSeconds > 0 && !overlapsTimebox) {
+        const remainingWindow = remainingEndMs > remainingStartMs
+            ? {
+                startAt: new Date(remainingStartMs).toISOString(),
+                endAt: new Date(remainingEndMs).toISOString()
+            }
+            : null;
+        const remainingSeconds = remainingWindow
+            ? computeUncoveredSeconds(remainingWindow, higherPriorityWindows)
+            : 0;
+        if (remainingSeconds > 0) {
             plannedDrains.push({
                 entityType: "work_block",
                 entityId: block.instance_id,
@@ -1868,8 +1924,8 @@ function buildTimeboxAndWorkBlockDrains(userId, range, now, lifeForceProfile, ac
                 rateApPerHour: profile.sustainRateApPerHour,
                 title: block.title,
                 why: "Work blocks act as planning containers and forecast background load when no richer task plan exists.",
-                startsAt: block.start_at,
-                endsAt: block.end_at,
+                startsAt: remainingWindow?.startAt ?? block.start_at,
+                endsAt: remainingWindow?.endAt ?? block.end_at,
                 role: "background",
                 metadata: {
                     templateId: block.id,
@@ -1879,9 +1935,8 @@ function buildTimeboxAndWorkBlockDrains(userId, range, now, lifeForceProfile, ac
         }
         if (Date.parse(block.start_at) <= now.getTime() &&
             Date.parse(block.end_at) > now.getTime() &&
-            !overlapsTimebox &&
             activeTaskRunTaskIds.size === 0 &&
-            !actualSourceWindows.some((window) => overlapsWindow(block.start_at, block.end_at, window.startAt, window.endAt))) {
+            !isInstantCovered(now.toISOString(), higherPriorityWindows)) {
             activeDrains.push({
                 entityType: "work_block",
                 entityId: block.instance_id,
@@ -1909,35 +1964,12 @@ function buildTimeboxAndWorkBlockDrains(userId, range, now, lifeForceProfile, ac
         workBlockWindows
     };
 }
-function buildCalendarDrains(userId, now, range, lifeForceProfile, blockingWindows) {
+function buildCalendarDrains(rows, now, range, lifeForceProfile, blockingWindows) {
     const actualContributions = [];
     const nowIsoValue = now.toISOString();
     const activeDrains = [];
     const plannedDrains = [];
     try {
-        const rows = getDatabase()
-            .prepare(`SELECT
-           forge_events.id,
-           forge_events.title,
-           forge_events.start_at,
-           forge_events.end_at,
-           forge_events.availability,
-           forge_events.event_type,
-           COUNT(forge_event_links.id) AS link_count
-         FROM forge_events
-         LEFT JOIN forge_event_links
-           ON forge_event_links.forge_event_id = forge_events.id
-         WHERE forge_events.deleted_at IS NULL
-           AND forge_events.end_at > ?
-           AND forge_events.start_at < ?
-         GROUP BY
-           forge_events.id,
-           forge_events.title,
-           forge_events.start_at,
-           forge_events.end_at,
-           forge_events.availability,
-           forge_events.event_type`)
-            .all(range.from, range.to);
         for (const row of rows) {
             const calendarProfile = buildEffectiveProfile(readEntityActionProfile("calendar_event", row.id, {
                 profileKey: `calendar_event_${row.id}`,
@@ -1952,7 +1984,6 @@ function buildCalendarDrains(userId, now, range, lifeForceProfile, blockingWindo
                     startAt: row.start_at,
                     endAt: row.end_at
                 }), lifeForceProfile);
-            const overlapsBlockingWindow = blockingWindows.some((window) => overlapsWindow(row.start_at, row.end_at, window.startAt, window.endAt));
             const elapsedWindow = {
                 startAt: row.start_at,
                 endAt: new Date(Math.min(now.getTime(), Date.parse(row.end_at))).toISOString()
@@ -1993,7 +2024,7 @@ function buildCalendarDrains(userId, now, range, lifeForceProfile, blockingWindo
             }
             if (row.start_at <= nowIsoValue &&
                 row.end_at > nowIsoValue &&
-                !overlapsBlockingWindow) {
+                !isInstantCovered(nowIsoValue, blockingWindows)) {
                 activeDrains.push({
                     entityType: "calendar_event",
                     entityId: row.id,
@@ -2172,14 +2203,15 @@ export function buildLifeForcePayload(now = new Date(), userIds) {
         startAt: entry.startsAt,
         endAt: entry.endsAt
     }));
+    const calendarRows = readCalendarEventLifeForceRows(range);
+    const calendarEventWindows = calendarRows.map((row) => ({
+        startAt: row.start_at,
+        endAt: row.end_at
+    }));
     const activeTaskRunTaskIds = new Set(taskRuns.activeDrains.map((entry) => entry.entityId));
-    const plannedContainers = buildTimeboxAndWorkBlockDrains(user.id, range, now, profile, activeTaskRunTaskIds, actualSourceWindows);
-    const calendarBlockingWindows = [
-        ...actualSourceWindows,
-        ...plannedContainers.timeboxWindows,
-        ...plannedContainers.workBlockWindows
-    ];
-    const calendarDrains = buildCalendarDrains(user.id, now, range, profile, calendarBlockingWindows);
+    const plannedContainers = buildTimeboxAndWorkBlockDrains(user.id, range, now, profile, activeTaskRunTaskIds, actualSourceWindows, calendarEventWindows);
+    const calendarBlockingWindows = [...actualSourceWindows];
+    const calendarDrains = buildCalendarDrains(calendarRows, now, range, profile, calendarBlockingWindows);
     const contributions = [
         ...taskRuns.contributions,
         ...adjustments,

package/dist/server/server/src/web.js CHANGED Viewed

@@ -1,3 +1,5 @@
+import { request as httpRequest } from "node:http";
+import { request as httpsRequest } from "node:https";
 import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import { access, readFile } from "node:fs/promises";
@@ -133,9 +135,13 @@ function copyProxyHeaders(response, reply) {
         reply.header(name, value);
     }
 }
+function buildDevWebTarget(origin, pathname, search) {
+    const target = new URL(pathname.startsWith("/") ? pathname.slice(1) : pathname, origin);
+    target.search = search;
+    return target;
+}
 async function proxyDevAsset(input) {
-    const target = new URL(input.pathname.startsWith("/") ? input.pathname.slice(1) : input.pathname, input.origin);
-    target.search = input.search;
+    const target = buildDevWebTarget(input.origin, input.pathname, input.search);
     const response = await input.fetchImpl(target, { redirect: "manual" });
     input.reply.code(response.status);
     copyProxyHeaders(response, input.reply);
@@ -147,6 +153,56 @@ async function proxyDevAsset(input) {
     }
     return Buffer.from(await response.arrayBuffer());
 }
+function writeProxyUpgradeResponse(socket, response) {
+    const statusCode = response.statusCode ?? 101;
+    const statusMessage = response.statusMessage ?? "Switching Protocols";
+    const headerLines = [];
+    for (let index = 0; index < response.rawHeaders.length; index += 2) {
+        const name = response.rawHeaders[index];
+        const value = response.rawHeaders[index + 1];
+        if (name && value) {
+            headerLines.push(`${name}: ${value}`);
+        }
+    }
+    socket.write(`HTTP/${response.httpVersion} ${statusCode} ${statusMessage}\r\n${headerLines.join("\r\n")}\r\n\r\n`);
+}
+async function proxyDevWebSocket(input) {
+    const requestTarget = parseRequestTarget(input.request.url ?? "/");
+    const normalizedRequestPath = stripBasePath(requestTarget.pathname, getDefaultBasePath());
+    if (!normalizedRequestPath.startsWith("/__vite_hmr")) {
+        return false;
+    }
+    const devWebOrigin = await input.devWebRuntime.ensureReady();
+    if (!devWebOrigin) {
+        input.socket.destroy();
+        return true;
+    }
+    const target = buildDevWebTarget(devWebOrigin, normalizedRequestPath, requestTarget.search);
+    const proxyRequest = (target.protocol === "https:" ? httpsRequest : httpRequest)(target, {
+        headers: {
+            ...input.request.headers,
+            host: target.host
+        }
+    });
+    proxyRequest.on("upgrade", (response, proxySocket, proxyHead) => {
+        writeProxyUpgradeResponse(input.socket, response);
+        if (proxyHead.length > 0) {
+            input.socket.write(proxyHead);
+        }
+        if (input.head.length > 0) {
+            proxySocket.write(input.head);
+        }
+        proxySocket.pipe(input.socket).pipe(proxySocket);
+    });
+    proxyRequest.on("response", () => {
+        input.socket.destroy();
+    });
+    proxyRequest.on("error", () => {
+        input.socket.destroy();
+    });
+    proxyRequest.end();
+    return true;
+}
 async function waitForProcessExit(child, timeoutMs = 5_000) {
     if (child.exitCode !== null) {
         return;
@@ -327,6 +383,16 @@ export async function registerWebRoutes(app, options = {}) {
     app.addHook("onClose", async () => {
         await devWebRuntime.stop();
     });
+    app.server.on("upgrade", (request, socket, head) => {
+        void (async () => {
+            await proxyDevWebSocket({
+                devWebRuntime,
+                request,
+                socket,
+                head
+            });
+        })();
+    });
     app.get("/", async (_request, reply) => serveAsset("/", reply, { devWebRuntime, fetchImpl }));
     app.get("/*", async (request, reply) => serveAsset(request.url, reply, { devWebRuntime, fetchImpl }));
 }

package/dist/server/src/lib/api.js CHANGED Viewed

@@ -1657,9 +1657,21 @@ export function patchMovementPlace(placeId, patch) {
         body: JSON.stringify(patch)
     });
 }
+export function patchMovementStay(stayId, patch) {
+    return request(`/api/v1/movement/stays/${stayId}`, {
+        method: "PATCH",
+        body: JSON.stringify(patch)
+    });
+}
 export function getMovementTripDetail(tripId) {
     return request(`/api/v1/movement/trips/${tripId}`);
 }
+export function getMovementBoxDetail(boxId, userIds) {
+    const search = new URLSearchParams();
+    appendUserIds(search, coerceUserIds(userIds));
+    const suffix = search.size > 0 ? `?${search.toString()}` : "";
+    return request(`/api/v1/movement/boxes/${boxId}${suffix}`);
+}
 export function getMovementTimeline(input) {
     const search = new URLSearchParams();
     if (input?.before) {

package/openclaw.plugin.json CHANGED Viewed

@@ -2,7 +2,7 @@
   "id": "forge-openclaw-plugin",
   "name": "Forge",
   "description": "Curated OpenClaw adapter for the Forge collaboration API, UI entrypoint, and localhost auto-start runtime.",
-  "version": "0.2.29",
+  "version": "0.2.32",
   "skills": [
     "./skills"
   ],

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "forge-openclaw-plugin",
-  "version": "0.2.29",
+  "version": "0.2.32",
   "description": "Curated OpenClaw adapter for the Forge collaboration API, UI entrypoint, and localhost auto-start runtime.",
   "type": "module",
   "license": "MIT",