forge-openclaw-plugin 0.2.25 → 0.2.26

package/dist/server/{db.js → server/src/db.js}

@@ -3,6 +3,7 @@ import { mkdir, readdir, readFile } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { DatabaseSync } from "node:sqlite";
+import { logForgeDebug } from "./debug.js";
 import { ensureQuestionnaireSeeds } from "./repositories/questionnaires.js";
 function nowIso() {
     return new Date().toISOString();
@@ -289,6 +290,7 @@ export async function initializeDatabase() {
     await mkdir(getDataDir(), { recursive: true });
     const database = getDatabase();
     const migrationFiles = await listMigrationFiles();
+    const pendingMigrations = [];
     database.exec(`
     CREATE TABLE IF NOT EXISTS migrations (
       id TEXT PRIMARY KEY,
@@ -303,6 +305,7 @@ export async function initializeDatabase() {
         if (applied.has(file)) {
             continue;
         }
+        pendingMigrations.push(file);
         const sql = await readFile(path.join(migrationsDir, file), "utf8");
         database.exec("BEGIN");
         try {
@@ -317,6 +320,7 @@ export async function initializeDatabase() {
             throw error;
         }
     }
+    logForgeDebug(`[forge-db] initialized database path=${getDatabasePath()} applied_count=${appliedRows.length} pending_applied=${pendingMigrations.length} pending_list=${pendingMigrations.join(",") || "none"}`);
     if (seedDemoDataEnabled) {
         seedData();
     }

package/dist/server/server/src/debug.js

@@ -0,0 +1,19 @@
+function isTruthyFlag(value) {
+    if (!value) {
+        return false;
+    }
+    const normalized = value.trim().toLowerCase();
+    return (normalized === "1" ||
+        normalized === "true" ||
+        normalized === "yes" ||
+        normalized === "on");
+}
+export function isForgeDebugLoggingEnabled(env = process.env) {
+    return isTruthyFlag(env.FORGE_DEBUG_LOGS);
+}
+export function logForgeDebug(message, env = process.env) {
+    if (!isForgeDebugLoggingEnabled(env)) {
+        return;
+    }
+    console.info(message);
+}

package/dist/server/{openapi.js → server/src/openapi.js}

@@ -1998,7 +1998,7 @@ export function buildOpenApiDocument() {
             },
             themePreference: {
                 type: "string",
-                enum: ["obsidian", "solar", "aurora", "ember", "custom", "system"]
+                enum: ["obsidian", "solar", "aurora", "ember", "paper", "dawn", "atelier", "custom", "system"]
             },
             customTheme: nullable({
                 type: "object",
@@ -2515,7 +2515,7 @@ export function buildOpenApiDocument() {
             execution: { $ref: "#/components/schemas/ExecutionSettings" },
             themePreference: {
                 type: "string",
-                enum: ["obsidian", "solar", "aurora", "ember", "custom", "system"]
+                enum: ["obsidian", "solar", "aurora", "ember", "paper", "dawn", "atelier", "custom", "system"]
             },
             customTheme: nullable({
                 type: "object",

package/dist/server/{repositories → server/src/repositories}/ai-connectors.js

@@ -193,17 +193,17 @@ function ensurePublishedOutputs(connectorId, graph) {
                 outputId: "primary"
             })
         ].map((entry) => ({
-            id: entry.boxId.replace(/^connector-output:/, ""),
+            id: entry.id.replace(/^connector-output:/, ""),
             nodeId: "node_output",
-            label: entry.label,
-            apiPath: `/api/v1/ai-connectors/${connectorId}/output`
+            label: entry.title,
+            apiPath: `/api/v1/workbench/flows/${connectorId}/output`
         }));
     }
     return outputNodes.map((node, index) => ({
         id: `${connectorId}_out_${index + 1}`,
         nodeId: node.id,
         label: node.data.label || `Output ${index + 1}`,
-        apiPath: `/api/v1/ai-connectors/${connectorId}/output`
+        apiPath: `/api/v1/workbench/flows/${connectorId}/output`
     }));
 }
 function mapRun(row) {
@@ -322,6 +322,75 @@ function tryParseStructuredAgentResponse(value) {
         return null;
     }
 }
+function tryParseJsonObject(value) {
+    try {
+        const parsed = JSON.parse(value);
+        if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+            return parsed;
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+function coerceText(value) {
+    if (typeof value === "string") {
+        return value;
+    }
+    if (value == null) {
+        return "";
+    }
+    if (typeof value === "number" || typeof value === "boolean") {
+        return String(value);
+    }
+    try {
+        return JSON.stringify(value);
+    }
+    catch {
+        return "";
+    }
+}
+function buildOutputMap(primaryText, primaryJson, outputKeys = []) {
+    const outputMap = {
+        primary: {
+            text: primaryText,
+            json: primaryJson
+        }
+    };
+    for (const key of outputKeys) {
+        if (!primaryJson || !(key in primaryJson)) {
+            continue;
+        }
+        const value = primaryJson[key];
+        outputMap[key] = {
+            text: coerceText(value),
+            json: value && typeof value === "object" && !Array.isArray(value)
+                ? value
+                : null
+        };
+    }
+    return outputMap;
+}
+function readOutputSelection(value, handle) {
+    if (!handle || handle === "primary") {
+        return { text: value.text, json: value.json };
+    }
+    const selected = value.outputMap[handle];
+    if (selected) {
+        return selected;
+    }
+    if (value.json && handle in value.json) {
+        const raw = value.json[handle];
+        return {
+            text: coerceText(raw),
+            json: raw && typeof raw === "object" && !Array.isArray(raw)
+                ? raw
+                : null
+        };
+    }
+    return { text: value.text, json: value.json };
+}
 async function executeMachineTool(tool, args) {
     if (tool === "machine_read_file") {
         const targetPath = typeof args.path === "string" ? resolveAllowedPath(args.path) : null;
@@ -522,24 +591,35 @@ async function runModelNode(input) {
         if (activeTools.length === 0) {
             return {
                 text: rawText.trim(),
-                conversationId
+                json: tryParseJsonObject(rawText.trim()),
+                conversationId,
+                logs: transcript
             };
         }
         const structured = tryParseStructuredAgentResponse(rawText.trim());
         if (!structured || structured.action === "final") {
             return {
                 text: structured?.text?.trim() || rawText.trim(),
-                conversationId
+                json: tryParseJsonObject(structured?.text?.trim() || rawText.trim()),
+                conversationId,
+                logs: transcript
             };
         }
         const toolResult = structured.tool.startsWith("machine_")
             ? await executeMachineTool(structured.tool, structured.args)
-            : await executeForgeBoxTool(activeTools.find((tool) => tool.key === structured.tool)?.boxId ?? "", structured.tool, structured.args);
+            : await executeForgeBoxTool(activeTools.find((tool) => tool.key === structured.tool)?.boxId ?? "", structured.tool, structured.args, {
+                actor: {
+                    userIds: null,
+                    source: "agent"
+                }
+            });
         transcript.push(`Tool call ${structured.tool}: ${JSON.stringify(structured.args)}`, `Tool result: ${JSON.stringify(toolResult)}`);
     }
     return {
         text: "Connector stopped after reaching the maximum tool step count.",
-        conversationId
+        json: null,
+        conversationId,
+        logs: transcript
     };
 }
 function validateConnectorGraph(graph) {
@@ -593,6 +673,27 @@ function buildOutputResult(connector, resolvedNodeValues) {
         outputs
     });
 }
+function parseValueLiteral(valueType, valueLiteral) {
+    if (valueType === "null") {
+        return null;
+    }
+    if (valueType === "boolean") {
+        return valueLiteral.trim().toLowerCase() === "true";
+    }
+    if (valueType === "number") {
+        const parsed = Number(valueLiteral);
+        return Number.isFinite(parsed) ? parsed : 0;
+    }
+    if (valueType === "array" || valueType === "object") {
+        try {
+            return JSON.parse(valueLiteral || (valueType === "array" ? "[]" : "{}"));
+        }
+        catch {
+            return valueType === "array" ? [] : {};
+        }
+    }
+    return valueLiteral;
+}
 function createConversationRecord(input) {
     const now = new Date().toISOString();
     return saveAiConnectorConversation(aiConnectorConversationSchema.parse({
@@ -615,6 +716,8 @@ async function executeConnector(connector, rawInput, services) {
         incoming.set(edge.target, list);
     }
     const values = new Map();
+    const debugNodes = [];
+    const debugErrors = [];
     const outputNodes = connector.graph.nodes.filter((node) => node.type === "output");
     const activeConversation = parsedInput.conversationId
         ? getAiConnectorConversationById(parsedInput.conversationId)
@@ -628,18 +731,50 @@ async function executeConnector(connector, rawInput, services) {
         if (!node) {
             throw new Error(`Missing connector node ${nodeId}.`);
         }
-        const upstream = await Promise.all((incoming.get(nodeId) ?? []).map((edge) => evaluateNode(edge.source)));
+        const upstreamEdges = incoming.get(nodeId) ?? [];
+        const upstream = await Promise.all(upstreamEdges.map(async (edge) => {
+            const upstreamValue = await evaluateNode(edge.source);
+            const selected = readOutputSelection(upstreamValue, edge.sourceHandle);
+            return {
+                edge,
+                sourceValue: upstreamValue,
+                selected
+            };
+        }));
         let resolved;
-        if (node.type === "box_input") {
+        if (node.type === "box" || node.type === "box_input") {
             const boxId = node.data.boxId?.trim() || "";
+            const resolvedInputs = Object.fromEntries(upstream.map(({ edge, selected }, index) => [
+                edge.targetHandle ?? edge.sourceHandle ?? `input_${index + 1}`,
+                selected.json ?? selected.text
+            ]));
+            const resolvedParams = node.data.paramValues && typeof node.data.paramValues === "object"
+                ? node.data.paramValues
+                : {};
             const providedSnapshot = boxId ? parsedInput.boxSnapshots[boxId] : null;
             const snapshot = providedSnapshot && typeof providedSnapshot === "object"
                 ? {
-                    ...resolveForgeBoxSnapshot(boxId),
+                    ...resolveForgeBoxSnapshot(boxId, {
+                        actor: {
+                            userIds: null,
+                            source: "agent"
+                        }
+                    }, {
+                        inputs: resolvedInputs,
+                        params: resolvedParams
+                    }),
                     contentJson: providedSnapshot
                 }
                 : boxId
-                    ? resolveForgeBoxSnapshot(boxId)
+                    ? resolveForgeBoxSnapshot(boxId, {
+                        actor: {
+                            userIds: null,
+                            source: "agent"
+                        }
+                    }, {
+                        inputs: resolvedInputs,
+                        params: resolvedParams
+                    })
                     : {
                         boxId: "",
                         label: node.data.label,
@@ -648,6 +783,10 @@ async function executeConnector(connector, rawInput, services) {
                         contentJson: null,
                         tools: []
                     };
+            const outputKeys = [
+                ...(node.data.outputs ?? []).map((port) => port.key),
+                ...Object.keys(snapshot.contentJson ?? {})
+            ];
             resolved = {
                 text: snapshot.contentText,
                 json: snapshot.contentJson,
@@ -657,7 +796,28 @@ async function executeConnector(connector, rawInput, services) {
                     label: tool.label,
                     description: tool.description
                 })),
-                conversationId: null
+                conversationId: null,
+                outputMap: buildOutputMap(snapshot.contentText, snapshot.contentJson, outputKeys),
+                logs: []
+            };
+        }
+        else if (node.type === "value") {
+            const parsedValue = parseValueLiteral(node.data.valueType ?? "string", node.data.valueLiteral ?? "");
+            const jsonValue = parsedValue && typeof parsedValue === "object" && !Array.isArray(parsedValue)
+                ? parsedValue
+                : null;
+            const textValue = parsedValue === null
+                ? "null"
+                : typeof parsedValue === "string"
+                    ? parsedValue
+                    : JSON.stringify(parsedValue, null, 2);
+            resolved = {
+                text: textValue,
+                json: jsonValue,
+                tools: [],
+                conversationId: null,
+                outputMap: buildOutputMap(textValue, jsonValue, ["primary"]),
+                logs: []
             };
         }
         else if (node.type === "user_input") {
@@ -665,16 +825,76 @@ async function executeConnector(connector, rawInput, services) {
                 text: parsedInput.userInput || "",
                 json: Object.keys(parsedInput.context).length > 0 ? parsedInput.context : null,
                 tools: [],
-                conversationId: activeConversation?.id ?? null
+                conversationId: activeConversation?.id ?? null,
+                outputMap: buildOutputMap(parsedInput.userInput || "", Object.keys(parsedInput.context).length > 0 ? parsedInput.context : null, Object.keys(parsedInput.context ?? {})),
+                logs: []
+            };
+        }
+        else if (node.type === "merge") {
+            const mergedText = upstream
+                .map((entry) => entry.selected.text)
+                .filter(Boolean)
+                .join("\n\n");
+            const mergedJson = Object.assign({}, ...upstream
+                .map((entry) => entry.selected.json)
+                .filter((entry) => Boolean(entry) && typeof entry === "object"));
+            resolved = {
+                text: mergedText,
+                json: Object.keys(mergedJson).length > 0 ? mergedJson : null,
+                tools: upstream.flatMap((entry) => entry.sourceValue.tools),
+                conversationId: upstream.find((entry) => entry.sourceValue.conversationId)?.sourceValue
+                    .conversationId ?? null,
+                outputMap: buildOutputMap(mergedText, Object.keys(mergedJson).length > 0 ? mergedJson : null, Object.keys(mergedJson)),
+                logs: []
+            };
+        }
+        else if (node.type === "template") {
+            const primary = upstream[0]?.selected ?? { text: "", json: null };
+            const rendered = (node.data.template ?? node.data.promptTemplate ?? "")
+                .replaceAll("{{input}}", primary.text)
+                .replaceAll("{{json}}", primary.json ? JSON.stringify(primary.json) : "");
+            resolved = {
+                text: rendered,
+                json: tryParseJsonObject(rendered),
+                tools: [],
+                conversationId: upstream.find((entry) => entry.sourceValue.conversationId)?.sourceValue
+                    .conversationId ?? null,
+                outputMap: buildOutputMap(rendered, tryParseJsonObject(rendered)),
+                logs: []
+            };
+        }
+        else if (node.type === "pick_key") {
+            const primary = upstream[0]?.selected ?? { text: "", json: null };
+            const selectedKey = node.data.selectedKey?.trim() || "";
+            const selectedValue = primary.json && selectedKey in primary.json ? primary.json[selectedKey] : null;
+            const selectedJson = selectedValue &&
+                typeof selectedValue === "object" &&
+                !Array.isArray(selectedValue)
+                ? selectedValue
+                : null;
+            resolved = {
+                text: coerceText(selectedValue),
+                json: selectedJson,
+                tools: [],
+                conversationId: upstream.find((entry) => entry.sourceValue.conversationId)?.sourceValue
+                    .conversationId ?? null,
+                outputMap: buildOutputMap(coerceText(selectedValue), selectedJson),
+                logs: []
             };
         }
         else if (node.type === "output") {
-            const mergedText = upstream.map((entry) => entry.text).filter(Boolean).join("\n\n");
+            const mergedText = upstream
+                .map((entry) => entry.selected.text)
+                .filter(Boolean)
+                .join("\n\n");
             resolved = {
                 text: mergedText,
-                json: upstream[0]?.json ?? null,
+                json: upstream[0]?.selected.json ?? null,
                 tools: [],
-                conversationId: upstream.find((entry) => entry.conversationId)?.conversationId ?? null
+                conversationId: upstream.find((entry) => entry.sourceValue.conversationId)?.sourceValue
+                    .conversationId ?? null,
+                outputMap: buildOutputMap(mergedText, upstream[0]?.selected.json ?? null, Object.keys(upstream[0]?.selected.json ?? {})),
+                logs: []
             };
         }
         else {
@@ -682,24 +902,67 @@ async function executeConnector(connector, rawInput, services) {
                 connector,
                 node,
                 userInput: parsedInput.userInput,
-                upstream,
+                upstream: upstream.map((entry) => ({
+                    text: entry.selected.text,
+                    json: entry.selected.json,
+                    tools: entry.sourceValue.tools,
+                    conversationId: entry.sourceValue.conversationId,
+                    outputMap: entry.sourceValue.outputMap,
+                    logs: entry.sourceValue.logs
+                })),
                 services,
                 conversation: activeConversation
             });
+            const outputKeys = (node.data.outputs ?? []).map((port) => port.key);
             resolved = {
                 text: modelResult.text,
-                json: null,
+                json: modelResult.json,
                 tools: [],
-                conversationId: modelResult.conversationId
+                conversationId: modelResult.conversationId,
+                outputMap: buildOutputMap(modelResult.text, modelResult.json, outputKeys),
+                logs: modelResult.logs
             };
         }
         values.set(nodeId, resolved);
+        debugNodes.push({
+            nodeId: node.id,
+            nodeType: node.type,
+            label: node.data.label,
+            input: upstream.map((entry) => ({
+                sourceNodeId: entry.edge.source,
+                sourceHandle: entry.edge.sourceHandle ?? null,
+                targetHandle: entry.edge.targetHandle ?? null,
+                text: entry.selected.text,
+                json: entry.selected.json
+            })),
+            output: {
+                text: resolved.text,
+                json: resolved.json
+            },
+            tools: resolved.tools.map((tool) => tool.key),
+            logs: resolved.logs,
+            error: null
+        });
         return resolved;
     };
-    for (const outputNode of outputNodes) {
-        await evaluateNode(outputNode.id);
+    try {
+        for (const outputNode of outputNodes) {
+            await evaluateNode(outputNode.id);
+        }
     }
-    const result = buildOutputResult(connector, values);
+    catch (error) {
+        debugErrors.push(error instanceof Error ? error.message : "Flow execution failed");
+        throw error;
+    }
+    const result = aiConnectorRunResultSchema.parse({
+        ...buildOutputResult(connector, values),
+        debugTrace: parsedInput.debug
+            ? {
+                nodes: debugNodes,
+                errors: debugErrors
+            }
+            : undefined
+    });
     const conversationProviderNode = connector.graph.nodes.find((node) => node.type === "chat");
     const resolvedConversationId = [...values.values()].find((entry) => entry.conversationId)?.conversationId ?? null;
     const nextConversation = conversationProviderNode

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

@@ -1132,7 +1132,7 @@ export function getCalendarOverview(query) {
                 provider: "google",
                 label: "Google Calendar",
                 supportsDedicatedForgeCalendar: true,
-                connectionHelp: "Use a Google refresh token plus client credentials to sync calendars and publish Forge-owned events and timeboxes."
+                connectionHelp: "Forge uses a localhost Authorization Code + PKCE flow. Users sign in with Google from the same machine running Forge, Forge exchanges the code on the backend, and stores a per-user refresh token server-side."
             },
             {
                 provider: "apple",

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

@@ -1,7 +1,9 @@
 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 { 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) {
@@ -25,6 +27,12 @@ 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 : "";
@@ -137,7 +145,7 @@ function readSettingsRow() {
         .prepare(`SELECT
         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,
+        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`)
@@ -213,6 +221,18 @@ 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);
@@ -248,6 +268,7 @@ export function getSettings() {
             psycheAuthRequired: boolFromInt(row.psyche_auth_required)
         },
         calendarProviders: {
+            google: googleConfig,
             microsoft: {
                 clientId: microsoftClientId,
                 tenantId: microsoftTenantId,
@@ -297,6 +318,20 @@ export function updateSettings(input, options = {}) {
     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,
@@ -317,6 +352,10 @@ export function updateSettings(input, options = {}) {
             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,
@@ -350,10 +389,16 @@ export function updateSettings(input, options = {}) {
             .prepare(`UPDATE app_settings
          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 = ?,
+             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.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), 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);
+            .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);
         }
@@ -374,6 +419,9 @@ export function updateSettings(input, options = {}) {
                     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,
                     forgeBasicChatModel: next.modelSettings.forgeAgent.basicChat.model,