forge-openclaw-plugin 0.2.24 → 0.2.26

package/dist/server/{repositories → server/src/repositories}/settings.js

@@ -1,8 +1,11 @@
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { getDatabase, runInTransaction } from "../db.js";
+import { logForgeDebug } from "../debug.js";
 import { recordActivityEvent } from "./activity-events.js";
 import { recordEventLog } from "./event-log.js";
-import { createAgentTokenSchema, agentIdentitySchema, settingsPayloadSchema, updateSettingsSchema } from "../types.js";
+import { resolveGoogleCalendarOauthPublicConfig } from "../services/google-calendar-oauth-config.js";
+import { buildConnectionAgentIdentity, FORGE_DEFAULT_AGENT_ID, listAiModelConnections, syncForgeManagedWikiProfile } from "./model-settings.js";
+import { createAgentTokenSchema, agentIdentitySchema, customThemeSchema, settingsPayloadSchema, updateSettingsSchema } from "../types.js";
 function boolFromInt(value) {
     return value === 1;
 }
@@ -24,9 +27,31 @@ function normalizeMicrosoftRedirectUri(value) {
     const trimmed = value?.trim();
     return trimmed && trimmed.length > 0 ? trimmed : defaultMicrosoftRedirectUri();
 }
+function logCalendarSettingsDebug(message, details) {
+    const serialized = Object.entries(details)
+        .map(([key, value]) => `${key}=${JSON.stringify(value)}`)
+        .join(" ");
+    logForgeDebug(`[forge-calendar-settings] ${message} ${serialized}`);
+}
+function normalizeModelConnectionId(value) {
+    const trimmed = value?.trim();
+    return trimmed && trimmed.length > 0 ? trimmed : "";
+}
 function buildTokenSecret() {
     return `fg_live_${randomBytes(18).toString("hex")}`;
 }
+function parseCustomThemeJson(raw) {
+    const trimmed = raw?.trim();
+    if (!trimmed) {
+        return null;
+    }
+    try {
+        return customThemeSchema.parse(JSON.parse(trimmed));
+    }
+    catch {
+        return null;
+    }
+}
 function mapAgent(row) {
     return agentIdentitySchema.parse({
         id: row.id,
@@ -118,9 +143,10 @@ function readSettingsRow() {
     ensureSettingsRow();
     return getDatabase()
         .prepare(`SELECT
-        operator_name, operator_email, operator_title, theme_preference, locale_preference,
+        operator_name, operator_email, operator_title, theme_preference, custom_theme_json, locale_preference,
         goal_drift_alerts, daily_quest_reminders, achievement_celebrations, max_active_tasks, time_accounting_mode,
-        integrity_score, last_audit_at, psyche_auth_required, microsoft_client_id, microsoft_tenant_id, microsoft_redirect_uri, created_at, updated_at
+        integrity_score, last_audit_at, psyche_auth_required, google_client_id, google_client_secret, microsoft_client_id, microsoft_tenant_id, microsoft_redirect_uri,
+        forge_basic_chat_connection_id, forge_basic_chat_model, forge_wiki_connection_id, forge_wiki_model, created_at, updated_at
        FROM app_settings
        WHERE id = 1`)
         .get();
@@ -167,7 +193,23 @@ export function listAgentIdentities() {
        GROUP BY agent_identities.id
        ORDER BY agent_identities.created_at DESC`)
         .all();
-    return rows.map(mapAgent);
+    const manualAgents = rows.map(mapAgent);
+    const modelAgents = listAiModelConnections().map(buildConnectionAgentIdentity);
+    const settings = readSettingsRow();
+    const forgeAgent = agentIdentitySchema.parse({
+        id: FORGE_DEFAULT_AGENT_ID,
+        label: "Forge Agent",
+        agentType: "forge_default",
+        trustLevel: "trusted",
+        autonomyMode: "approval_required",
+        approvalMode: "approval_by_default",
+        description: "Built-in Forge operator agent. Owns Forge-native task flows, prompts, and orchestration.",
+        tokenCount: 0,
+        activeTokenCount: 0,
+        createdAt: settings.created_at,
+        updatedAt: settings.updated_at
+    });
+    return [forgeAgent, ...modelAgents, ...manualAgents];
 }
 export function isPsycheAuthRequired() {
     ensureSettingsRow();
@@ -178,9 +220,27 @@ export function isPsycheAuthRequired() {
 }
 export function getSettings() {
     const row = readSettingsRow();
+    const connections = listAiModelConnections();
+    const googleConfig = resolveGoogleCalendarOauthPublicConfig(process.env, {
+        clientId: row.google_client_id,
+        clientSecret: row.google_client_secret
+    });
+    logCalendarSettingsDebug("get_settings", {
+        storedGoogleClientId: row.google_client_id,
+        storedGoogleClientSecret: row.google_client_secret.length > 0,
+        resolvedGoogleClientId: googleConfig.clientId,
+        resolvedGoogleClientSecret: googleConfig.clientSecret.length > 0,
+        googleIsConfigured: googleConfig.isConfigured,
+        googleRedirectUri: googleConfig.redirectUri
+    });
     const microsoftClientId = row.microsoft_client_id?.trim() ?? "";
     const microsoftTenantId = normalizeMicrosoftTenantId(row.microsoft_tenant_id);
     const microsoftRedirectUri = normalizeMicrosoftRedirectUri(row.microsoft_redirect_uri);
+    const basicChatConnectionId = normalizeModelConnectionId(row.forge_basic_chat_connection_id);
+    const wikiConnectionId = normalizeModelConnectionId(row.forge_wiki_connection_id);
+    const basicChatConnection = connections.find((entry) => entry.id === basicChatConnectionId) ?? null;
+    const wikiConnection = connections.find((entry) => entry.id === wikiConnectionId) ?? null;
+    const customTheme = parseCustomThemeJson(row.custom_theme_json);
     return settingsPayloadSchema.parse({
         profile: {
             operatorName: row.operator_name,
@@ -197,6 +257,7 @@ export function getSettings() {
             timeAccountingMode: row.time_accounting_mode
         },
         themePreference: row.theme_preference,
+        customTheme,
         localePreference: row.locale_preference,
         security: {
             integrityScore: row.integrity_score,
@@ -207,6 +268,7 @@ export function getSettings() {
             psycheAuthRequired: boolFromInt(row.psyche_auth_required)
         },
         calendarProviders: {
+            google: googleConfig,
             microsoft: {
                 clientId: microsoftClientId,
                 tenantId: microsoftTenantId,
@@ -221,15 +283,55 @@ export function getSettings() {
                     : "Save the Microsoft client ID and the Forge callback redirect URI here before you try to sign in."
             }
         },
+        modelSettings: {
+            forgeAgent: {
+                basicChat: {
+                    connectionId: basicChatConnection?.id ?? null,
+                    connectionLabel: basicChatConnection?.label ?? null,
+                    provider: basicChatConnection?.provider ?? null,
+                    baseUrl: basicChatConnection?.baseUrl ?? null,
+                    model: row.forge_basic_chat_model?.trim() || basicChatConnection?.model || "gpt-5.4-mini"
+                },
+                wiki: {
+                    connectionId: wikiConnection?.id ?? null,
+                    connectionLabel: wikiConnection?.label ?? null,
+                    provider: wikiConnection?.provider ?? null,
+                    baseUrl: wikiConnection?.baseUrl ?? null,
+                    model: row.forge_wiki_model?.trim() || wikiConnection?.model || "gpt-5.4-mini"
+                }
+            },
+            connections,
+            oauth: {
+                openAiCodex: {
+                    authorizeUrl: "https://auth.openai.com/oauth/authorize",
+                    callbackUrl: "http://127.0.0.1:1455/auth/callback",
+                    setupMessage: "Forge mirrors OpenClaw's local OpenAI Codex PKCE flow. The browser returns to localhost:1455, and Forge can also accept a pasted redirect URL when the callback cannot bind."
+                }
+            }
+        },
         agents: listAgentIdentities(),
         agentTokens: listAgentTokens()
     });
 }
-export function updateSettings(input, activity) {
+export function updateSettings(input, options = {}) {
     const parsed = updateSettingsSchema.parse(input);
     return runInTransaction(() => {
         const current = getSettings();
         const now = new Date().toISOString();
+        const nextGoogleClientId = parsed.calendarProviders?.google?.clientId?.trim() ??
+            current.calendarProviders.google.storedClientId;
+        const nextGoogleClientSecret = parsed.calendarProviders?.google?.clientSecret?.trim() ??
+            current.calendarProviders.google.storedClientSecret;
+        logCalendarSettingsDebug("update_settings_requested", {
+            requestedGoogleClientId: parsed.calendarProviders?.google?.clientId ?? null,
+            requestedGoogleClientSecret: parsed.calendarProviders?.google?.clientSecret !== undefined
+                ? parsed.calendarProviders.google.clientSecret.length > 0
+                : null,
+            currentGoogleClientId: current.calendarProviders.google.storedClientId,
+            currentGoogleClientSecret: current.calendarProviders.google.storedClientSecret.length > 0,
+            nextGoogleClientId,
+            nextGoogleClientSecret: nextGoogleClientSecret.length > 0
+        });
         const next = {
             profile: {
                 operatorName: parsed.profile?.operatorName ?? current.profile.operatorName,
@@ -246,9 +348,14 @@ export function updateSettings(input, activity) {
                 timeAccountingMode: parsed.execution?.timeAccountingMode ?? current.execution.timeAccountingMode
             },
             themePreference: parsed.themePreference ?? current.themePreference,
+            customTheme: parsed.customTheme === undefined ? (current.customTheme ?? null) : parsed.customTheme,
             localePreference: parsed.localePreference ?? current.localePreference,
             psycheAuthRequired: parsed.security?.psycheAuthRequired ?? current.security.psycheAuthRequired,
             calendarProviders: {
+                google: resolveGoogleCalendarOauthPublicConfig(process.env, {
+                    clientId: nextGoogleClientId,
+                    clientSecret: nextGoogleClientSecret
+                }),
                 microsoft: {
                     clientId: parsed.calendarProviders?.microsoft?.clientId?.trim() ??
                         current.calendarProviders.microsoft.clientId,
@@ -257,33 +364,70 @@ export function updateSettings(input, activity) {
                     redirectUri: normalizeMicrosoftRedirectUri(parsed.calendarProviders?.microsoft?.redirectUri ??
                         current.calendarProviders.microsoft.redirectUri)
                 }
+            },
+            modelSettings: {
+                forgeAgent: {
+                    basicChat: {
+                        connectionId: parsed.modelSettings?.forgeAgent?.basicChat?.connectionId !==
+                            undefined
+                            ? normalizeModelConnectionId(parsed.modelSettings.forgeAgent.basicChat.connectionId)
+                            : current.modelSettings.forgeAgent.basicChat.connectionId ?? "",
+                        model: parsed.modelSettings?.forgeAgent?.basicChat?.model?.trim() ||
+                            current.modelSettings.forgeAgent.basicChat.model
+                    },
+                    wiki: {
+                        connectionId: parsed.modelSettings?.forgeAgent?.wiki?.connectionId !== undefined
+                            ? normalizeModelConnectionId(parsed.modelSettings.forgeAgent.wiki.connectionId)
+                            : current.modelSettings.forgeAgent.wiki.connectionId ?? "",
+                        model: parsed.modelSettings?.forgeAgent?.wiki?.model?.trim() ||
+                            current.modelSettings.forgeAgent.wiki.model
+                    }
+                }
             }
         };
         getDatabase()
             .prepare(`UPDATE app_settings
-         SET operator_name = ?, operator_email = ?, operator_title = ?, theme_preference = ?, locale_preference = ?,
+         SET operator_name = ?, operator_email = ?, operator_title = ?, theme_preference = ?, custom_theme_json = ?, locale_preference = ?,
              goal_drift_alerts = ?, daily_quest_reminders = ?, achievement_celebrations = ?, max_active_tasks = ?, time_accounting_mode = ?,
-             psyche_auth_required = ?, microsoft_client_id = ?, microsoft_tenant_id = ?, microsoft_redirect_uri = ?, updated_at = ?
+             psyche_auth_required = ?, google_client_id = ?, google_client_secret = ?, microsoft_client_id = ?, microsoft_tenant_id = ?, microsoft_redirect_uri = ?,
+             forge_basic_chat_connection_id = ?, forge_basic_chat_model = ?, forge_wiki_connection_id = ?, forge_wiki_model = ?, updated_at = ?
          WHERE id = 1`)
-            .run(next.profile.operatorName, next.profile.operatorEmail, next.profile.operatorTitle, next.themePreference, next.localePreference, toInt(next.notifications.goalDriftAlerts), toInt(next.notifications.dailyQuestReminders), toInt(next.notifications.achievementCelebrations), next.execution.maxActiveTasks, next.execution.timeAccountingMode, toInt(next.psycheAuthRequired), next.calendarProviders.microsoft.clientId, next.calendarProviders.microsoft.tenantId, next.calendarProviders.microsoft.redirectUri, now);
-        if (activity) {
+            .run(next.profile.operatorName, next.profile.operatorEmail, next.profile.operatorTitle, next.themePreference, next.customTheme ? JSON.stringify(next.customTheme) : "", next.localePreference, toInt(next.notifications.goalDriftAlerts), toInt(next.notifications.dailyQuestReminders), toInt(next.notifications.achievementCelebrations), next.execution.maxActiveTasks, next.execution.timeAccountingMode, toInt(next.psycheAuthRequired), nextGoogleClientId, nextGoogleClientSecret, next.calendarProviders.microsoft.clientId, next.calendarProviders.microsoft.tenantId, next.calendarProviders.microsoft.redirectUri, next.modelSettings.forgeAgent.basicChat.connectionId, next.modelSettings.forgeAgent.basicChat.model, next.modelSettings.forgeAgent.wiki.connectionId, next.modelSettings.forgeAgent.wiki.model, now);
+        logCalendarSettingsDebug("update_settings_committed", {
+            persistedGoogleClientId: nextGoogleClientId,
+            persistedGoogleClientSecret: nextGoogleClientSecret.length > 0,
+            persistedMicrosoftClientId: next.calendarProviders.microsoft.clientId,
+            updatedAt: now
+        });
+        if (options.secrets) {
+            syncForgeManagedWikiProfile(options.secrets);
+        }
+        if (options.activity) {
             recordActivityEvent({
                 entityType: "system",
                 entityId: "app_settings",
                 eventType: "settings_updated",
                 title: "Forge settings updated",
                 description: `Theme is now ${next.themePreference}. Language is ${next.localePreference}.`,
-                actor: activity.actor ?? null,
-                source: activity.source,
+                actor: options.activity.actor ?? null,
+                source: options.activity.source,
                 metadata: {
                     themePreference: next.themePreference,
+                    customThemeLabel: next.customTheme?.label ?? null,
                     localePreference: next.localePreference,
                     goalDriftAlerts: next.notifications.goalDriftAlerts,
                     dailyQuestReminders: next.notifications.dailyQuestReminders,
                     maxActiveTasks: next.execution.maxActiveTasks,
                     timeAccountingMode: next.execution.timeAccountingMode,
+                    googleConfigured: next.calendarProviders.google.isConfigured,
+                    googleAppBaseUrl: next.calendarProviders.google.appBaseUrl,
+                    googleRedirectUri: next.calendarProviders.google.redirectUri,
                     microsoftConfigured: next.calendarProviders.microsoft.clientId.trim().length > 0,
-                    microsoftTenantId: next.calendarProviders.microsoft.tenantId
+                    microsoftTenantId: next.calendarProviders.microsoft.tenantId,
+                    forgeBasicChatModel: next.modelSettings.forgeAgent.basicChat.model,
+                    forgeWikiModel: next.modelSettings.forgeAgent.wiki.model,
+                    forgeBasicChatConnectionId: next.modelSettings.forgeAgent.basicChat.connectionId || null,
+                    forgeWikiConnectionId: next.modelSettings.forgeAgent.wiki.connectionId || null
                 }
             });
         }

package/dist/server/server/src/repositories/surface-layouts.js

@@ -0,0 +1,76 @@
+import { getDatabase } from "../db.js";
+import { surfaceLayoutPayloadSchema } from "../types.js";
+function parseLayout(row) {
+    const parsed = JSON.parse(row.payload_json);
+    const legacy = "layouts" in parsed ? parsed : null;
+    const legacyOrder = Array.isArray(legacy?.layouts?.lg)
+        ? [...legacy.layouts.lg]
+            .sort((left, right) => {
+            const leftY = typeof left.y === "number" ? left.y : 0;
+            const rightY = typeof right.y === "number" ? right.y : 0;
+            if (leftY !== rightY) {
+                return leftY - rightY;
+            }
+            const leftX = typeof left.x === "number" ? left.x : 0;
+            const rightX = typeof right.x === "number" ? right.x : 0;
+            return leftX - rightX;
+        })
+            .map((item) => item.i)
+            .filter((item) => typeof item === "string" && item.trim().length > 0)
+        : [];
+    const widgets = Object.fromEntries(Object.entries(parsed.widgets ?? {}).map(([widgetId, rawValue]) => {
+        const value = rawValue && typeof rawValue === "object"
+            ? rawValue
+            : {};
+        const legacyLg = legacy?.layouts?.lg?.find((entry) => entry.i === widgetId);
+        return [
+            widgetId,
+            {
+                hidden: value.hidden === true,
+                fullWidth: value.fullWidth === true ||
+                    (typeof legacyLg?.w === "number" && legacyLg.w >= 10),
+                titleVisible: value.titleVisible !== false,
+                descriptionVisible: value.descriptionVisible !== false
+            }
+        ];
+    }));
+    return surfaceLayoutPayloadSchema.parse({
+        ...parsed,
+        surfaceId: row.surface_id,
+        order: Array.isArray(parsed.order) && parsed.order.length > 0
+            ? parsed.order
+            : legacyOrder,
+        widgets,
+        updatedAt: row.updated_at
+    });
+}
+export function getSurfaceLayout(surfaceId) {
+    const row = getDatabase()
+        .prepare(`SELECT surface_id, payload_json, updated_at
+       FROM surface_layouts
+       WHERE surface_id = ?`)
+        .get(surfaceId);
+    return row ? parseLayout(row) : null;
+}
+export function saveSurfaceLayout(surfaceId, payload) {
+    const now = new Date().toISOString();
+    const next = surfaceLayoutPayloadSchema.parse({
+        surfaceId,
+        updatedAt: now,
+        ...payload
+    });
+    getDatabase()
+        .prepare(`INSERT INTO surface_layouts (surface_id, payload_json, updated_at)
+       VALUES (?, ?, ?)
+       ON CONFLICT(surface_id) DO UPDATE SET
+         payload_json = excluded.payload_json,
+         updated_at = excluded.updated_at`)
+        .run(surfaceId, JSON.stringify(next), now);
+    return getSurfaceLayout(surfaceId);
+}
+export function resetSurfaceLayout(surfaceId) {
+    getDatabase()
+        .prepare(`DELETE FROM surface_layouts WHERE surface_id = ?`)
+        .run(surfaceId);
+    return null;
+}

package/dist/server/{repositories → server/src/repositories}/wiki-memory.js

@@ -274,6 +274,7 @@ export const upsertWikiLlmProfileSchema = z.object({
     baseUrl: z.string().trim().default("https://api.openai.com/v1"),
     model: z.string().trim().min(1),
     apiKey: z.string().trim().optional(),
+    secretId: z.string().trim().nullable().optional(),
     systemPrompt: z.string().trim().default(""),
     reasoningEffort: wikiLlmReasoningEffortSchema.optional(),
     verbosity: wikiLlmVerbositySchema.optional(),
@@ -737,6 +738,7 @@ function getNoteStoragePath(note, space) {
 }
 function buildNoteFrontmatter(note) {
     return {
+        ...note.frontmatter,
         id: note.id,
         kind: note.kind,
         title: note.title,
@@ -2058,7 +2060,9 @@ export function upsertWikiLlmProfile(input, secrets) {
     const now = nowIso();
     const id = parsed.id?.trim() ||
         `wiki_llm_${randomUUID().replaceAll("-", "").slice(0, 10)}`;
-    let secretId = listWikiLlmProfiles().find((entry) => entry.id === id)?.secretId ?? null;
+    let secretId = parsed.secretId ??
+        listWikiLlmProfiles().find((entry) => entry.id === id)?.secretId ??
+        null;
     if (parsed.apiKey?.trim()) {
         secretId =
             secretId ??