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

forge-openclaw-plugin 0.2.28 → 0.2.29

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 (34) hide show

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-D1H7myQH.js"></script>
-    <link rel="modulepreload" crossorigin href="/forge/assets/vendor-Cwf49UMz.js">
-    <link rel="modulepreload" crossorigin href="/forge/assets/board-DPFvZf-D.js">
-    <link rel="modulepreload" crossorigin href="/forge/assets/ui-GXFcgvSw.js">
-    <link rel="modulepreload" crossorigin href="/forge/assets/motion-Bvwc85ch.js">
-    <link rel="modulepreload" crossorigin href="/forge/assets/table-FJQTJvUR.js">
+    <script type="module" crossorigin src="/forge/assets/index-bfHIqj0-.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-Auw3JrdE.css">
+    <link rel="stylesheet" crossorigin href="/forge/assets/index-C6PCeHD_.css">
   </head>
   <body class="bg-canvas text-ink antialiased">
     <div id="root"></div>

package/dist/server/server/migrations/044_macos_local_calendar_provider.sql ADDED Viewed

@@ -0,0 +1,21 @@
+ALTER TABLE calendar_calendars
+ADD COLUMN source_id TEXT;
+ALTER TABLE calendar_calendars
+ADD COLUMN source_title TEXT;
+ALTER TABLE calendar_calendars
+ADD COLUMN source_type TEXT;
+ALTER TABLE calendar_calendars
+ADD COLUMN calendar_type TEXT;
+ALTER TABLE calendar_calendars
+ADD COLUMN host_calendar_id TEXT;
+ALTER TABLE calendar_calendars
+ADD COLUMN canonical_key TEXT;
+UPDATE calendar_calendars
+SET canonical_key = remote_id
+WHERE canonical_key IS NULL OR TRIM(canonical_key) = '';

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

@@ -48,7 +48,7 @@ import { getWeeklyReviewPayload } from "./services/reviews.js";
 import { finalizeWeeklyReviewClosure } from "./repositories/weekly-reviews.js";
 import { createTaskRunWatchdog } from "./services/task-run-watchdog.js";
 import { suggestTags } from "./services/tagging.js";
-import { CalendarConnectionConflictError, completeGoogleCalendarOauth, completeMicrosoftCalendarOauth, createCalendarConnection, deleteCalendarEventProjection, discoverCalendarConnection, discoverExistingCalendarConnection, getGoogleCalendarOauthSession, getMicrosoftCalendarOauthSession, listConnectedCalendarConnections, removeCalendarConnection, pushCalendarEventUpdate, readCalendarOverview, syncCalendarConnection, startGoogleCalendarOauth, startMicrosoftCalendarOauth, testMicrosoftCalendarOauthConfiguration, listCalendarProviderMetadata, updateCalendarConnectionSelection } from "./services/calendar-runtime.js";
+import { CalendarConnectionConflictError, CalendarConnectionOverlapError, completeGoogleCalendarOauth, completeMicrosoftCalendarOauth, createCalendarConnection, discoverMacOSLocalCalendarSources, deleteCalendarEventProjection, discoverCalendarConnection, discoverExistingCalendarConnection, getGoogleCalendarOauthSession, getMacOSLocalCalendarAccessStatus, getMicrosoftCalendarOauthSession, listConnectedCalendarConnections, removeCalendarConnection, requestMacOSLocalCalendarAccess, pushCalendarEventUpdate, readCalendarOverview, syncCalendarConnection, startGoogleCalendarOauth, startMicrosoftCalendarOauth, testMicrosoftCalendarOauthConfiguration, listCalendarProviderMetadata, updateCalendarConnectionSelection } from "./services/calendar-runtime.js";
 import { consumeOpenAiCodexOauthCredentials, getOpenAiCodexOauthSession, startOpenAiCodexOauthSession, submitOpenAiCodexOauthManualInput } from "./services/openai-codex-oauth.js";
 import { PSYCHE_ENTITY_TYPES, createBehaviorSchema, createBeliefEntrySchema, createBehaviorPatternSchema, createEmotionDefinitionSchema, createEventTypeSchema, createModeGuideSessionSchema, createModeProfileSchema, createPsycheValueSchema, createTriggerReportSchema, updateBehaviorSchema, updateBeliefEntrySchema, updateBehaviorPatternSchema, updateEmotionDefinitionSchema, updateEventTypeSchema, updateModeGuideSessionSchema, updateModeProfileSchema, updatePsycheValueSchema, updateTriggerReportSchema } from "./psyche-types.js";
 import { createQuestionnaireInstrumentSchema, publishQuestionnaireVersionSchema, startQuestionnaireRunSchema, updateQuestionnaireRunSchema, updateQuestionnaireVersionSchema } from "./questionnaire-types.js";
@@ -2704,10 +2704,12 @@ const AGENT_ONBOARDING_CONVERSATION_RULES = [
     "Ask only for what is missing or unclear instead of walking the user through every optional field.",
     "Start by saying what seems to matter here or what the record is becoming, then ask the next useful question.",
     "Whenever possible, make the direction of the intake visible before the question by naming what you think the user is trying to preserve, clarify, decide, schedule, or make easier.",
+    "When the user's operation is not already explicit, identify the job first: add, update, review, compare, navigate, link, or run.",
     "Before each question, decide the one missing thing you are trying to clarify and why it matters for the record.",
     "Use a progression of concrete example or intent, working name, purpose or meaning, placement in Forge, operational details, and linked context.",
     "Ask one to three focused questions at a time. One is usually best when the user is uncertain or emotionally loaded.",
     "One focused question is the default. Only stack a second question when both serve the same clarification job and the user is steady enough for it.",
+    "When the user wants review, comparison, or navigation around an existing record, ask what they are trying to understand first and route to the read path before reopening create or update intake.",
     "If the user already answered the normal opening question, do not repeat it. Move to the next missing clarification.",
     "Do not over-therapize logistical entities. For tasks, calendar events, work blocks, timeboxes, and task runs, one brief confirming sentence plus one question is usually enough.",
     "After each substantive answer, briefly say what is becoming clearer and ask only for the next thing that still changes the record shape or usefulness.",
@@ -3028,6 +3030,7 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
             "Ask whether the focus is a stay, a trip, a place, a timeline window, or a selected span.",
             "Ask for the time window, place, or movement item that makes the question concrete.",
             "Ask what they are trying to notice, preserve, or answer through that movement context.",
+            "Skip the meta lane question when the user already named the exact correction or review target and only one ambiguity remains.",
             "If the request is filling a missing-data gap, use a user-defined movement box rather than a raw stay or trip patch.",
             "When the user already gave a concrete correction like 'I stayed home during that missing block', confirm only the interval or place if needed, then create the overlay and read the timeline back."
         ]
@@ -3040,6 +3043,7 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
             "Ask whether the job is overview, profile change, weekday-template change, or fatigue signaling.",
             "Ask what part of the current energy picture feels most important or inaccurate.",
             "Ask what should stay true if they are changing profile or template assumptions.",
+            "If the user already named the life-force lane clearly, skip the meta lane question and ask only for the specific weekday, profile field, or signal that still matters.",
             "Route to the dedicated life-force path once the lane is clear."
         ]
     },
@@ -3051,6 +3055,7 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
             "Ask whether the job is flow discovery, one flow edit, execution, run history, published output, node-level inspection, or latest-node-output lookup.",
             "Ask which flow, slug, run, or node the request is about.",
             "Ask what the user is trying to learn, repair, or publish through that flow.",
+            "If the user already named the flow and action clearly, skip the meta lane question and ask only for the missing run, node, or output scope.",
             "Route to the dedicated workbench route family once the execution lane is clear."
         ]
     },
@@ -3060,8 +3065,10 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
         coachingGoal: "Create a reusable incident category that will actually help future reports stay consistent.",
         askSequence: [
             "Ask what kind of moment or incident this label should capture in lived terms.",
+            "Reflect the repeated moment back in plain language before narrowing the wording.",
             "Ask how narrow or broad it should be.",
             "Ask what would count as inside versus outside the category if that boundary is still fuzzy.",
+            "Offer a concise label if the lived meaning is clearer than the wording.",
             "Ask for a short description only if the label could be ambiguous later."
         ]
     },
@@ -3071,7 +3078,9 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
         coachingGoal: "Create a reusable emotion label with enough clarity to use consistently later.",
         askSequence: [
             "Ask what this feeling is like in lived terms when the user says it.",
+            "Reflect the felt signature back in plain language before you settle the label.",
             "Ask what distinguishes it from nearby emotions if that matters.",
+            "Offer a concise label if the felt meaning is clearer than the wording.",
             "Ask for a broader category only if it will help later browsing or reporting."
         ]
     }
@@ -3618,17 +3627,18 @@ const AGENT_ONBOARDING_TOOL_INPUT_CATALOG = [
     },
     {
         toolName: "forge_connect_calendar_provider",
-        summary: "Create a Forge calendar connection for Google, Apple, Exchange Online, or custom CalDAV.",
+        summary: "Create a Forge calendar connection for Google, Apple, Exchange Online, calendars already configured on this Mac, or custom CalDAV.",
         whenToUse: "Use only when the operator explicitly wants Forge connected to an external calendar provider.",
-        inputShape: '{ provider: "google"|"apple"|"caldav"|"microsoft", label: string, username?: string, password?: string, serverUrl?: string, authSessionId?: string, selectedCalendarUrls: string[], forgeCalendarUrl?: string, createForgeCalendar?: boolean }',
+        inputShape: '{ provider: "google"|"apple"|"caldav"|"microsoft"|"macos_local", label: string, username?: string, password?: string, serverUrl?: string, authSessionId?: string, sourceId?: string, selectedCalendarUrls: string[], forgeCalendarUrl?: string, createForgeCalendar?: boolean, replaceConnectionIds?: string[] }',
         requiredFields: ["provider", "label", "provider-specific credentials"],
         notes: [
             "Google now uses an interactive localhost Authorization Code + PKCE flow. The user signs in interactively on the same machine running Forge, Forge exchanges the authorization code on the backend, and forge_connect_calendar_provider should only be used after a completed Google authSessionId exists.",
             "Apple starts from https://caldav.icloud.com and autodiscovers the principal plus calendars after authentication.",
             "Exchange Online uses Microsoft Graph. In the current Forge implementation it is read-only: Forge mirrors the selected calendars but does not publish work blocks or timeboxes back to Microsoft.",
             "In the current self-hosted local runtime, Exchange Online now uses an interactive Microsoft public-client sign-in flow with PKCE after the operator has saved the Microsoft client ID, tenant, and redirect URI in Settings -> Calendar. Non-interactive callers should treat Microsoft connection setup as a Settings-owned operator action unless a completed authSessionId already exists.",
+            "macos_local uses EventKit to read and write the calendars already configured on the host Mac. Discovery is grouped by host calendar source, and Forge replaces overlapping remote connections for the same account instead of keeping duplicate copies.",
             "Custom CalDAV uses an account-level server URL, not a single calendar collection URL.",
-            "Writable providers publish Forge work blocks and timeboxes to the dedicated Forge calendar for that connection."
+            "Writable providers publish Forge work blocks and timeboxes through one shared Forge write target. A new connection only needs its own write calendar when the runtime does not already have one."
         ],
         example: '{"provider":"apple","label":"Primary Apple","username":"operator@example.com","password":"app-password","selectedCalendarUrls":["https://caldav.icloud.com/.../Family/"],"forgeCalendarUrl":"https://caldav.icloud.com/.../Forge/","createForgeCalendar":false}'
     },
@@ -3674,7 +3684,7 @@ const AGENT_ONBOARDING_TOOL_INPUT_CATALOG = [
         inputShape: '{ taskId: string, projectId?: string|null, title: string, startsAt: string, endsAt: string, source?: "manual"|"suggested"|"live_run" }',
         requiredFields: ["taskId", "title", "startsAt", "endsAt"],
         notes: [
-            "Forge publishes these into the dedicated Forge calendar during provider sync.",
+            "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."
         ],
@@ -4147,9 +4157,23 @@ function buildAgentOnboardingPayload(request) {
             sleepOverview: "/api/v1/health/sleep",
             sportsOverview: "/api/v1/health/fitness",
             lifeForce: "/api/v1/life-force",
+            lifeForceProfile: "/api/v1/life-force/profile",
+            lifeForceWeekdayTemplate: "/api/v1/life-force/templates/:weekday",
+            lifeForceFatigueSignals: "/api/v1/life-force/fatigue-signals",
+            movementDay: "/api/v1/movement/day",
+            movementMonth: "/api/v1/movement/month",
             movementTimeline: "/api/v1/movement/timeline",
             movementAllTime: "/api/v1/movement/all-time",
+            movementPlaces: "/api/v1/movement/places",
+            movementTripDetail: "/api/v1/movement/trips/:id",
+            movementSelection: "/api/v1/movement/selection",
+            movementUserBoxPreflight: "/api/v1/movement/user-boxes/preflight",
             workbenchFlows: "/api/v1/workbench/flows",
+            workbenchFlowBySlug: "/api/v1/workbench/flows/by-slug/:slug",
+            workbenchPublishedOutput: "/api/v1/workbench/flows/:id/output",
+            workbenchRunDetail: "/api/v1/workbench/flows/:id/runs/:runId",
+            workbenchNodeResult: "/api/v1/workbench/flows/:id/runs/:runId/nodes/:nodeId",
+            workbenchLatestNodeOutput: "/api/v1/workbench/flows/:id/nodes/:nodeId/output",
             wikiSettings: "/api/v1/wiki/settings",
             wikiSearch: "/api/v1/wiki/search",
             wikiHealth: "/api/v1/wiki/health",
@@ -7270,6 +7294,36 @@ export async function buildServer(options = {}) {
         providers: listCalendarProviderMetadata(),
         connections: listConnectedCalendarConnections()
     }));
+    app.get("/api/v1/calendar/macos-local/status", async (request) => {
+        requireScopedAccess(request.headers, ["write"], {
+            route: "/api/v1/calendar/macos-local/status"
+        });
+        return await getMacOSLocalCalendarAccessStatus();
+    });
+    app.post("/api/v1/calendar/macos-local/request-access", async (request) => {
+        requireScopedAccess(request.headers, ["write"], {
+            route: "/api/v1/calendar/macos-local/request-access"
+        });
+        return await requestMacOSLocalCalendarAccess();
+    });
+    app.get("/api/v1/calendar/macos-local/discovery", async (request) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/macos-local/discovery" });
+        const discovery = await discoverMacOSLocalCalendarSources();
+        recordActivityEvent({
+            entityType: "calendar_connection",
+            entityId: "calendar_discovery_macos_local",
+            eventType: "calendar_connection_discovered",
+            title: "Calendar discovery completed for macOS local calendars",
+            description: "Forge discovered the calendars already configured on this Mac before connection setup.",
+            actor: auth.actor ?? null,
+            source: auth.source,
+            metadata: {
+                provider: "macos_local",
+                sources: discovery.sources.length
+            }
+        });
+        return { discovery };
+    });
     app.post("/api/v1/calendar/oauth/google/start", async (request) => {
         requireScopedAccess(request.headers, ["write"], {
             route: "/api/v1/calendar/oauth/google/start"
@@ -8104,6 +8158,14 @@ export async function buildServer(options = {}) {
                     existingConnectionId: error.connectionId
                 };
             }
+            if (error instanceof CalendarConnectionOverlapError) {
+                reply.code(409);
+                return {
+                    code: "calendar_connection_overlap",
+                    error: error.message,
+                    overlappingConnectionIds: error.connectionIds
+                };
+            }
             throw error;
         }
     });
@@ -8138,14 +8200,27 @@ export async function buildServer(options = {}) {
     app.post("/api/v1/calendar/connections/:id/sync", async (request, reply) => {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/connections/:id/sync" });
         const { id } = request.params;
-        const connection = await syncCalendarConnection(id, managers.secrets, toActivityContext(auth));
-        if (!connection) {
-            reply.code(404);
-            return { error: "Calendar connection not found" };
+        try {
+            const connection = await syncCalendarConnection(id, managers.secrets, toActivityContext(auth));
+            if (!connection) {
+                reply.code(404);
+                return { error: "Calendar connection not found" };
+            }
+            return {
+                connection: listConnectedCalendarConnections().find((entry) => entry.id === id)
+            };
+        }
+        catch (error) {
+            if (error instanceof Error &&
+                error.message.includes("replaced by a newer canonical connection")) {
+                reply.code(409);
+                return {
+                    code: "calendar_connection_superseded",
+                    error: error.message
+                };
+            }
+            throw error;
         }
-        return {
-            connection: listConnectedCalendarConnections().find((entry) => entry.id === id)
-        };
     });
     app.delete("/api/v1/calendar/connections/:id", async (request, reply) => {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/connections/:id" });

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

@@ -3003,9 +3003,23 @@ export function buildOpenApiDocument() {
                     "sleepOverview",
                     "sportsOverview",
                     "lifeForce",
+                    "lifeForceProfile",
+                    "lifeForceWeekdayTemplate",
+                    "lifeForceFatigueSignals",
+                    "movementDay",
+                    "movementMonth",
                     "movementTimeline",
                     "movementAllTime",
+                    "movementPlaces",
+                    "movementTripDetail",
+                    "movementSelection",
+                    "movementUserBoxPreflight",
                     "workbenchFlows",
+                    "workbenchFlowBySlug",
+                    "workbenchPublishedOutput",
+                    "workbenchRunDetail",
+                    "workbenchNodeResult",
+                    "workbenchLatestNodeOutput",
                     "wikiSettings",
                     "wikiSearch",
                     "wikiHealth",
@@ -3023,9 +3037,23 @@ export function buildOpenApiDocument() {
                     sleepOverview: { type: "string" },
                     sportsOverview: { type: "string" },
                     lifeForce: { type: "string" },
+                    lifeForceProfile: { type: "string" },
+                    lifeForceWeekdayTemplate: { type: "string" },
+                    lifeForceFatigueSignals: { type: "string" },
+                    movementDay: { type: "string" },
+                    movementMonth: { type: "string" },
                     movementTimeline: { type: "string" },
                     movementAllTime: { type: "string" },
+                    movementPlaces: { type: "string" },
+                    movementTripDetail: { type: "string" },
+                    movementSelection: { type: "string" },
+                    movementUserBoxPreflight: { type: "string" },
                     workbenchFlows: { type: "string" },
+                    workbenchFlowBySlug: { type: "string" },
+                    workbenchPublishedOutput: { type: "string" },
+                    workbenchRunDetail: { type: "string" },
+                    workbenchNodeResult: { type: "string" },
+                    workbenchLatestNodeOutput: { type: "string" },
                     wikiSettings: { type: "string" },
                     wikiSearch: { type: "string" },
                     wikiHealth: { type: "string" },
@@ -6776,7 +6804,7 @@ export function buildOpenApiDocument() {
                 },
                 post: {
                     summary: "Create a Google, Apple, or custom CalDAV calendar connection",
-                    description: "Forge first discovers the writable calendars for the account, then stores the chosen mirrored calendars and dedicated Forge write calendar.",
+                    description: "Forge first discovers the writable calendars for the account, then stores the chosen mirrored calendars and either reuses the existing shared Forge write target or saves a new one when needed.",
                     responses: {
                         "201": jsonResponse({
                             type: "object",

package/dist/server/server/src/repositories/calendar.js CHANGED Viewed

@@ -64,6 +64,12 @@ function mapCalendar(row) {
         canWrite: Boolean(row.can_write),
         selectedForSync: Boolean(row.selected_for_sync),
         forgeManaged: Boolean(row.forge_managed),
+        sourceId: row.source_id,
+        sourceTitle: row.source_title,
+        sourceType: row.source_type,
+        calendarType: row.calendar_type,
+        hostCalendarId: row.host_calendar_id,
+        canonicalKey: row.canonical_key,
         lastSyncedAt: row.last_synced_at,
         createdAt: row.created_at,
         updatedAt: row.updated_at
@@ -255,6 +261,13 @@ export function readEncryptedSecret(secretId) {
 export function deleteEncryptedSecret(secretId) {
     getDatabase().prepare(`DELETE FROM stored_secrets WHERE id = ?`).run(secretId);
 }
+export function isSupersededCalendarConnection(connectionId) {
+    const connection = getCalendarConnectionById(connectionId);
+    if (!connection) {
+        return false;
+    }
+    return isSupersededConnection(connection);
+}
 export function listCalendarConnections() {
     const rows = getDatabase()
         .prepare(`SELECT id, provider, label, account_label, status, config_json, credentials_secret_id, forge_calendar_id,
@@ -264,6 +277,15 @@ export function listCalendarConnections() {
         .all();
     return rows.map(mapConnection);
 }
+function isSupersededConnection(connection) {
+    return (typeof connection.config.replacedByConnectionId === "string" &&
+        connection.config.replacedByConnectionId.trim().length > 0);
+}
+function activeConnectionIds() {
+    return new Set(listCalendarConnections()
+        .filter((connection) => !isSupersededConnection(connection))
+        .map((connection) => connection.id));
+}
 export function getCalendarConnectionById(connectionId) {
     const row = getDatabase()
         .prepare(`SELECT id, provider, label, account_label, status, config_json, credentials_secret_id, forge_calendar_id,
@@ -330,6 +352,70 @@ export function deleteExternalEventsForConnection(connectionId) {
     }
     return rows.map((row) => row.id);
 }
+export function rehomeCalendarConnectionReferences(input) {
+    return runInTransaction(() => {
+        const fromCalendars = listCalendars(input.fromConnectionId, {
+            includeUnselected: true
+        });
+        const toCalendars = listCalendars(input.toConnectionId, {
+            includeUnselected: true
+        });
+        const toForgeCalendar = toCalendars.find((calendar) => calendar.forgeManaged) ??
+            toCalendars.find((calendar) => calendar.canWrite) ??
+            null;
+        const toByCanonicalKey = new Map(toCalendars
+            .filter((calendar) => typeof calendar.canonicalKey === "string" &&
+            calendar.canonicalKey.trim().length > 0)
+            .map((calendar) => [calendar.canonicalKey, calendar]));
+        const mappedCalendarIds = new Map();
+        for (const fromCalendar of fromCalendars) {
+            const mapped = (fromCalendar.canonicalKey
+                ? toByCanonicalKey.get(fromCalendar.canonicalKey)
+                : null) ??
+                (fromCalendar.forgeManaged ? toForgeCalendar : null) ??
+                null;
+            mappedCalendarIds.set(fromCalendar.id, mapped?.id ?? null);
+        }
+        const now = nowIso();
+        const forgeEventRows = getDatabase()
+            .prepare(`SELECT id, preferred_calendar_id
+         FROM forge_events
+         WHERE ownership = 'forge' AND preferred_connection_id = ?`)
+            .all(input.fromConnectionId);
+        const updateForgeEvent = getDatabase().prepare(`UPDATE forge_events
+       SET preferred_connection_id = ?, preferred_calendar_id = ?, updated_at = ?
+       WHERE id = ?`);
+        for (const row of forgeEventRows) {
+            const nextCalendarId = row.preferred_calendar_id
+                ? (mappedCalendarIds.get(row.preferred_calendar_id) ?? toForgeCalendar?.id ?? null)
+                : (toForgeCalendar?.id ?? null);
+            updateForgeEvent.run(nextCalendarId ? input.toConnectionId : null, nextCalendarId, now, row.id);
+        }
+        const timeboxRows = getDatabase()
+            .prepare(`SELECT id, calendar_id
+         FROM task_timeboxes
+         WHERE connection_id = ?`)
+            .all(input.fromConnectionId);
+        const updateTimebox = getDatabase().prepare(`UPDATE task_timeboxes
+       SET connection_id = ?, calendar_id = ?, remote_event_id = NULL, updated_at = ?
+       WHERE id = ?`);
+        for (const row of timeboxRows) {
+            const nextCalendarId = row.calendar_id
+                ? (mappedCalendarIds.get(row.calendar_id) ?? toForgeCalendar?.id ?? null)
+                : (toForgeCalendar?.id ?? null);
+            updateTimebox.run(nextCalendarId ? input.toConnectionId : null, nextCalendarId, now, row.id);
+        }
+        getDatabase()
+            .prepare(`DELETE FROM forge_event_sources
+         WHERE connection_id = ?
+           AND forge_event_id IN (
+             SELECT id
+             FROM forge_events
+             WHERE ownership = 'forge'
+           )`)
+            .run(input.fromConnectionId);
+    });
+}
 export function detachConnectionFromForgeEvents(connectionId) {
     const now = nowIso();
     getDatabase()
@@ -352,16 +438,23 @@ export function listCalendars(connectionId, options = {}) {
             : "WHERE (selected_for_sync = 1 OR forge_managed = 1)";
     const rows = getDatabase()
         .prepare(`SELECT id, connection_id, remote_id, title, description, color, timezone, is_primary, can_write, selected_for_sync, forge_managed,
+              source_id, source_title, source_type, calendar_type, host_calendar_id, canonical_key,
               last_synced_at, created_at, updated_at
        FROM calendar_calendars
        ${connectionId ? `WHERE connection_id = ? ${visibilityClause}` : visibilityClause}
        ORDER BY forge_managed DESC, title ASC`)
         .all(...(connectionId ? [connectionId] : []));
-    return rows.map(mapCalendar);
+    const mapped = rows.map(mapCalendar);
+    if (connectionId) {
+        return mapped;
+    }
+    const activeIds = activeConnectionIds();
+    return mapped.filter((calendar) => activeIds.has(calendar.connectionId));
 }
 export function getCalendarById(calendarId) {
     const row = getDatabase()
         .prepare(`SELECT id, connection_id, remote_id, title, description, color, timezone, is_primary, can_write, selected_for_sync, forge_managed,
+              source_id, source_title, source_type, calendar_type, host_calendar_id, canonical_key,
               last_synced_at, created_at, updated_at
        FROM calendar_calendars
        WHERE id = ?`)
@@ -371,6 +464,7 @@ export function getCalendarById(calendarId) {
 function getDefaultWritableCalendar() {
     const row = getDatabase()
         .prepare(`SELECT id, connection_id, remote_id, title, description, color, timezone, is_primary, can_write, selected_for_sync, forge_managed,
+              source_id, source_title, source_type, calendar_type, host_calendar_id, canonical_key,
               last_synced_at, created_at, updated_at
        FROM calendar_calendars
        WHERE can_write = 1
@@ -383,6 +477,7 @@ function getDefaultWritableCalendar() {
 export function getCalendarByRemoteId(connectionId, remoteId) {
     const row = getDatabase()
         .prepare(`SELECT id, connection_id, remote_id, title, description, color, timezone, is_primary, can_write, selected_for_sync, forge_managed,
+              source_id, source_title, source_type, calendar_type, host_calendar_id, canonical_key,
               last_synced_at, created_at, updated_at
        FROM calendar_calendars
        WHERE connection_id = ? AND remote_id = ?`)
@@ -395,18 +490,21 @@ export function upsertCalendarRecord(connectionId, input) {
     if (existing) {
         getDatabase()
             .prepare(`UPDATE calendar_calendars
-         SET title = ?, description = ?, color = ?, timezone = ?, is_primary = ?, can_write = ?, selected_for_sync = ?, forge_managed = ?, last_synced_at = ?, updated_at = ?
+         SET title = ?, description = ?, color = ?, timezone = ?, is_primary = ?, can_write = ?, selected_for_sync = ?, forge_managed = ?,
+             source_id = ?, source_title = ?, source_type = ?, calendar_type = ?, host_calendar_id = ?, canonical_key = ?,
+             last_synced_at = ?, updated_at = ?
          WHERE id = ?`)
-            .run(input.title, input.description ?? existing.description, input.color ?? existing.color, normalizeTimezone(input.timezone ?? existing.timezone), input.isPrimary ? 1 : 0, input.canWrite === false ? 0 : 1, input.selectedForSync === false ? 0 : 1, input.forgeManaged ? 1 : 0, now, now, existing.id);
+            .run(input.title, input.description ?? existing.description, input.color ?? existing.color, normalizeTimezone(input.timezone ?? existing.timezone), input.isPrimary ? 1 : 0, input.canWrite === false ? 0 : 1, input.selectedForSync === false ? 0 : 1, input.forgeManaged ? 1 : 0, input.sourceId ?? existing.sourceId, input.sourceTitle ?? existing.sourceTitle, input.sourceType ?? existing.sourceType, input.calendarType ?? existing.calendarType, input.hostCalendarId ?? existing.hostCalendarId, input.canonicalKey ?? existing.canonicalKey ?? existing.remoteId, now, now, existing.id);
         return getCalendarById(existing.id);
     }
     const id = `calendar_${randomUUID().replaceAll("-", "").slice(0, 10)}`;
     getDatabase()
         .prepare(`INSERT INTO calendar_calendars (
-         id, connection_id, remote_id, title, description, color, timezone, is_primary, can_write, selected_for_sync, forge_managed, last_synced_at, created_at, updated_at
+         id, connection_id, remote_id, title, description, color, timezone, is_primary, can_write, selected_for_sync, forge_managed,
+         source_id, source_title, source_type, calendar_type, host_calendar_id, canonical_key, last_synced_at, created_at, updated_at
        )
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-        .run(id, connectionId, input.remoteId, input.title, input.description ?? "", input.color ?? "#7dd3fc", normalizeTimezone(input.timezone), input.isPrimary ? 1 : 0, input.canWrite === false ? 0 : 1, input.selectedForSync === false ? 0 : 1, input.forgeManaged ? 1 : 0, now, now, now);
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+        .run(id, connectionId, input.remoteId, input.title, input.description ?? "", input.color ?? "#7dd3fc", normalizeTimezone(input.timezone), input.isPrimary ? 1 : 0, input.canWrite === false ? 0 : 1, input.selectedForSync === false ? 0 : 1, input.forgeManaged ? 1 : 0, input.sourceId ?? null, input.sourceTitle ?? null, input.sourceType ?? null, input.calendarType ?? null, input.hostCalendarId ?? null, input.canonicalKey ?? input.remoteId, now, now, now);
     return getCalendarById(id);
 }
 export function listCalendarEvents(query) {
@@ -442,7 +540,12 @@ export function listCalendarEvents(query) {
        WHERE ${clauses.join(" AND ")}
        ORDER BY start_at ASC, title ASC`)
         .all(...params);
-    return filterOwnedEntities("calendar_event", rows.map(mapEvent), query.userIds);
+    const activeIds = activeConnectionIds();
+    return filterOwnedEntities("calendar_event", rows
+        .map(mapEvent)
+        .filter((event) => event.ownership !== "external" ||
+        event.connectionId === null ||
+        activeIds.has(event.connectionId)), query.userIds);
 }
 export function getCalendarEventById(eventId) {
     const row = getDatabase()
@@ -556,10 +659,20 @@ export function upsertCalendarEventRecord(connectionId, input) {
             calendarId: calendar.id,
             remoteCalendarId: calendar.remoteId,
             remoteEventId: input.remoteId,
-            remoteUid: typeof input.rawPayload?.uid === "string" ? String(input.rawPayload.uid) : null,
+            remoteUid: typeof input.rawPayload?.uid === "string"
+                ? String(input.rawPayload.uid)
+                : typeof input.rawPayload?.externalId === "string"
+                    ? String(input.rawPayload.externalId)
+                    : typeof input.rawPayload?.iCalUID === "string"
+                        ? String(input.rawPayload.iCalUID)
+                        : typeof input.rawPayload?.iCalUId === "string"
+                            ? String(input.rawPayload.iCalUId)
+                            : null,
             recurrenceInstanceId: typeof input.rawPayload?.recurrenceid === "string"
                 ? String(input.rawPayload.recurrenceid)
-                : null,
+                : typeof input.rawPayload?.occurrenceDate === "string"
+                    ? String(input.rawPayload.occurrenceDate)
+                    : null,
             isMasterRecurring: Boolean(input.rawPayload?.rrule),
             remoteHref: input.remoteHref ?? null,
             remoteEtag: input.remoteEtag ?? null,
@@ -585,10 +698,20 @@ export function upsertCalendarEventRecord(connectionId, input) {
         calendarId: calendar.id,
         remoteCalendarId: calendar.remoteId,
         remoteEventId: input.remoteId,
-        remoteUid: typeof input.rawPayload?.uid === "string" ? String(input.rawPayload.uid) : null,
+        remoteUid: typeof input.rawPayload?.uid === "string"
+            ? String(input.rawPayload.uid)
+            : typeof input.rawPayload?.externalId === "string"
+                ? String(input.rawPayload.externalId)
+                : typeof input.rawPayload?.iCalUID === "string"
+                    ? String(input.rawPayload.iCalUID)
+                    : typeof input.rawPayload?.iCalUId === "string"
+                        ? String(input.rawPayload.iCalUId)
+                        : null,
         recurrenceInstanceId: typeof input.rawPayload?.recurrenceid === "string"
             ? String(input.rawPayload.recurrenceid)
-            : null,
+            : typeof input.rawPayload?.occurrenceDate === "string"
+                ? String(input.rawPayload.occurrenceDate)
+                : null,
         isMasterRecurring: Boolean(input.rawPayload?.rrule),
         remoteHref: input.remoteHref ?? null,
         remoteEtag: input.remoteEtag ?? null,
@@ -931,7 +1054,10 @@ export function listTaskTimeboxes(query) {
        WHERE ${clauses.join(" AND ")}
        ORDER BY starts_at ASC`)
         .all(...params);
-    return filterOwnedEntities("task_timebox", rows.map(mapTimebox), query.userIds);
+    const activeIds = activeConnectionIds();
+    return filterOwnedEntities("task_timebox", rows
+        .map(mapTimebox)
+        .filter((timebox) => timebox.connectionId === null || activeIds.has(timebox.connectionId)), query.userIds);
 }
 export function getTaskTimeboxById(timeboxId) {
     const row = getDatabase()
@@ -1302,6 +1428,12 @@ export function getCalendarOverview(query) {
                 label: "Custom CalDAV",
                 supportsDedicatedForgeCalendar: true,
                 connectionHelp: "Use an account-level CalDAV base URL, then let Forge discover the calendars before selecting sync and write targets."
+            },
+            {
+                provider: "macos_local",
+                label: "Calendars On This Mac",
+                supportsDedicatedForgeCalendar: true,
+                connectionHelp: "Use EventKit to access the calendars already configured in Calendar.app on this Mac. Forge replaces overlapping remote account connections instead of showing duplicate copies."
             }
         ],
         connections: listCalendarConnections().map(({ credentialsSecretId: _secret, ...connection }) => connection),