forge-openclaw-plugin 0.2.60 → 0.2.65

package/dist/server/server/src/data-management-types.js

@@ -75,6 +75,7 @@ export const dataManagementSettingsSchema = z.object({
     preferredDataRoot: z.string(),
     backupDirectory: z.string(),
     backupFrequencyHours: z.number().int().positive().nullable(),
+    backupRetentionDays: z.number().int().positive().nullable(),
     autoRepairEnabled: z.boolean(),
     lastAutoBackupAt: z.string().nullable(),
     lastManualBackupAt: z.string().nullable()
@@ -89,6 +90,7 @@ export const dataManagementStateSchema = z.object({
 export const updateDataManagementSettingsSchema = z.object({
     backupDirectory: z.string().trim().optional(),
     backupFrequencyHours: z.number().int().positive().nullable().optional(),
+    backupRetentionDays: z.number().int().positive().nullable().optional(),
     autoRepairEnabled: z.boolean().optional()
 });
 export const createDataBackupSchema = z.object({

package/dist/server/server/src/discovery-advertiser.js

@@ -3,6 +3,7 @@ import os from "node:os";
 import { promisify } from "node:util";
 import { Bonjour } from "bonjour-service";
 import { logForgeDebug } from "./debug.js";
+import { companionIrohApiBaseUrlFromNodeId, companionIrohUiBaseUrlFromNodeId, getCompanionIrohStatus } from "./services/companion-iroh.js";
 const execFileAsync = promisify(execFile);
 export async function startForgeDiscoveryAdvertiser(options) {
     if (options.enabled === false ||
@@ -15,6 +16,8 @@ export async function startForgeDiscoveryAdvertiser(options) {
         uiBaseUrl: options.tailscaleUiBaseUrl,
         basePath
     });
+    const irohTransport = getCompanionIrohStatus();
+    const irohNodeId = irohTransport.pairPayload?.node_id;
     const bonjour = new Bonjour({}, (error) => {
         logForgeDebug(`[forge-discovery] ignored mDNS advertisement error: ${formatDiscoveryError(error)}`);
     });
@@ -31,6 +34,16 @@ export async function startForgeDiscoveryAdvertiser(options) {
                 tsApiBaseUrl: tailscaleTargets.apiBaseUrl ?? "",
                 tsUiBaseUrl: tailscaleTargets.uiBaseUrl ?? "",
                 tsDnsName: tailscaleTargets.dnsName ?? "",
+                irohApiBaseUrl: irohNodeId
+                    ? companionIrohApiBaseUrlFromNodeId(irohNodeId)
+                    : "",
+                irohUiBaseUrl: irohNodeId
+                    ? companionIrohUiBaseUrlFromNodeId(irohNodeId)
+                    : "",
+                irohProvider: irohNodeId ? "forge-companion-iroh" : "",
+                irohNodeId: irohNodeId ?? "",
+                irohRelay: irohTransport.pairPayload?.relay ?? "",
+                irohAlpn: irohTransport.alpn ?? "",
                 watchReady: "1"
             }
         });

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

@@ -109,6 +109,10 @@ export const createCompanionPairingSessionSchema = z.object({
     label: z.string().trim().default("Forge Companion"),
     userId: z.string().trim().nullable().optional(),
     expiresInMinutes: z.coerce.number().int().min(5).max(24 * 60).default(30),
+    transportMode: z
+        .enum(["iroh", "manual-http"])
+        .default("iroh")
+        .transform((mode) => mode),
     capabilities: z
         .array(z.enum([
         "healthkit.sleep",
@@ -260,6 +264,16 @@ export const verifyCompanionPairingSchema = z.object({
         sourceDevice: z.string().trim().default("iPhone")
     })
 });
+export const heartbeatCompanionPairingSchema = z.object({
+    sessionId: z.string().trim().min(1),
+    pairingToken: z.string().trim().min(1),
+    device: z.object({
+        name: z.string().trim().default("iPhone"),
+        platform: z.string().trim().default("ios"),
+        appVersion: z.string().trim().default(""),
+        sourceDevice: z.string().trim().default("iPhone")
+    })
+});
 export const updateWorkoutMetadataSchema = z.object({
     subjectiveEffort: z.number().int().min(1).max(10).nullable().optional(),
     moodBefore: z.string().trim().optional(),
@@ -1461,8 +1475,17 @@ export function updateMobileCompanionSourceState(payload) {
         }
     });
 }
-export function createCompanionPairingSession(baseApiUrl, input) {
+export function createCompanionPairingSession(pairingTransport, input) {
     const parsed = createCompanionPairingSessionSchema.parse(input);
+    const resolvedTransport = typeof pairingTransport === "string"
+        ? {
+            apiBaseUrl: pairingTransport,
+            uiBaseUrl: null,
+            transportMode: "manual-http",
+            transport: undefined
+        }
+        : pairingTransport;
+    const baseApiUrl = resolvedTransport.apiBaseUrl;
     const now = new Date();
     const userId = parsed.userId ?? "user_operator";
     const serializedCapabilities = JSON.stringify(parsed.capabilities);
@@ -1474,10 +1497,9 @@ export function createCompanionPairingSession(baseApiUrl, input) {
        FROM companion_pairing_sessions
        WHERE user_id = ?
          AND label = ?
-         AND api_base_url = ?
          AND capability_flags_json = ?
          AND status = 'pending'`)
-        .all(userId, parsed.label, baseApiUrl, serializedCapabilities);
+        .all(userId, parsed.label, serializedCapabilities);
     if (stalePendingRows.length > 0) {
         revokePairingRows(stalePendingRows, {
             actor: null,
@@ -1500,6 +1522,9 @@ export function createCompanionPairingSession(baseApiUrl, input) {
     const qrPayload = {
         kind: "forge-companion-pairing",
         apiBaseUrl: baseApiUrl,
+        uiBaseUrl: resolvedTransport.uiBaseUrl ?? undefined,
+        transportMode: resolvedTransport.transportMode ?? parsed.transportMode,
+        transport: resolvedTransport.transport,
         sessionId: id,
         pairingToken,
         expiresAt,
@@ -1555,6 +1580,36 @@ export function verifyCompanionPairing(payload) {
             .get(pairing.id))
     };
 }
+export function heartbeatCompanionPairing(payload) {
+    const parsed = heartbeatCompanionPairingSchema.parse(payload);
+    const pairing = requireValidPairing(parsed.sessionId, parsed.pairingToken);
+    const now = nowIso();
+    const renewedExpiry = nextVerifiedCompanionPairingExpiry(new Date());
+    const nextStatus = pairing.status === "revoked"
+        ? pairing.status
+        : pairing.status === "permission_denied"
+            ? pairing.status
+            : pairing.status === "stale"
+                ? "paired"
+                : pairing.status === "pending"
+                    ? "paired"
+                    : pairing.status;
+    getDatabase()
+        .prepare(`UPDATE companion_pairing_sessions
+       SET status = ?, device_name = ?, platform = ?, app_version = ?,
+           last_seen_at = ?, paired_at = COALESCE(paired_at, ?),
+           expires_at = ?, updated_at = ?
+       WHERE id = ?`)
+        .run(nextStatus, parsed.device.name, parsed.device.platform, parsed.device.appVersion, now, now, renewedExpiry, now, pairing.id);
+    ensurePairingSourceStates(getDatabase()
+        .prepare(`SELECT * FROM companion_pairing_sessions WHERE id = ?`)
+        .get(pairing.id));
+    return {
+        pairingSession: mapPairingSession(getDatabase()
+            .prepare(`SELECT * FROM companion_pairing_sessions WHERE id = ?`)
+            .get(pairing.id))
+    };
+}
 export function requireValidPairing(sessionId, pairingToken) {
     const row = getDatabase()
         .prepare(`SELECT * FROM companion_pairing_sessions WHERE id = ?`)

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

@@ -233,11 +233,26 @@ export const movementSelectionAggregateSchema = z.object({
 });
 export const movementSettingsPatchSchema = movementSettingsInputSchema.partial();
 const MOVEMENT_TIMELINE_MAX_LIMIT = 360;
+const queryStringArraySchema = z.preprocess((value) => {
+    if (value === undefined || value === null) {
+        return [];
+    }
+    const rawValues = Array.isArray(value) ? value : [value];
+    return rawValues.flatMap((item) => {
+        if (typeof item !== "string") {
+            return [];
+        }
+        return item
+            .split(",")
+            .map((part) => part.trim())
+            .filter(Boolean);
+    });
+}, z.array(z.string().trim().min(1)));
 export const movementTimelineQuerySchema = z.object({
     before: z.string().trim().min(1).optional(),
     limit: z.coerce.number().int().min(1).max(MOVEMENT_TIMELINE_MAX_LIMIT).default(40),
     includeInvalid: z.coerce.boolean().default(false),
-    userIds: z.array(z.string().trim().min(1)).default([])
+    userIds: queryStringArraySchema
 });
 export const movementStayPatchSchema = z.object({
     label: z.string().trim().optional(),