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

forge-openclaw-plugin 0.2.27 → 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 (39) hide show

package/README.md +2 -1
package/dist/assets/{board-C6jCchjI.js → board-q8cfwaAW.js} +2 -2
package/dist/assets/{board-C6jCchjI.js.map → board-q8cfwaAW.js.map} +1 -1
package/dist/assets/index-C6PCeHD_.css +1 -0
package/dist/assets/index-bfHIqj0-.js +85 -0
package/dist/assets/index-bfHIqj0-.js.map +1 -0
package/dist/assets/{motion-DFHrH2rd.js → motion-DHfqFntt.js} +2 -2
package/dist/assets/{motion-DFHrH2rd.js.map → motion-DHfqFntt.js.map} +1 -1
package/dist/assets/{table-ZL7Di_u3.js → table-DLweENXt.js} +2 -2
package/dist/assets/{table-ZL7Di_u3.js.map → table-DLweENXt.js.map} +1 -1
package/dist/assets/{ui-CKNPpz7q.js → ui-BV0OYxkH.js} +2 -2
package/dist/assets/{ui-CKNPpz7q.js.map → ui-BV0OYxkH.js.map} +1 -1
package/dist/assets/{vendor-DoNZuFhn.js → vendor-OwcH20PM.js} +204 -204
package/dist/assets/vendor-OwcH20PM.js.map +1 -0
package/dist/index.html +7 -7
package/dist/server/server/migrations/044_macos_local_calendar_provider.sql +21 -0
package/dist/server/server/src/app.js +331 -14
package/dist/server/server/src/openapi.js +828 -3
package/dist/server/server/src/repositories/calendar.js +295 -12
package/dist/server/server/src/repositories/tasks.js +36 -17
package/dist/server/server/src/services/calendar-runtime.js +613 -32
package/dist/server/server/src/services/life-force-model.js +20 -0
package/dist/server/server/src/services/life-force.js +1333 -97
package/dist/server/server/src/services/macos-calendar-helper.js +748 -0
package/dist/server/server/src/types.js +67 -3
package/dist/server/src/lib/api-error.js +2 -0
package/dist/server/src/lib/api.js +39 -2
package/dist/server/src/lib/calendar-name-deduper.js +2 -0
package/dist/server/src/lib/snapshot-normalizer.js +2 -0
package/openclaw.plugin.json +1 -1
package/package.json +1 -1
package/server/migrations/044_macos_local_calendar_provider.sql +21 -0
package/skills/forge-openclaw/SKILL.md +38 -5
package/skills/forge-openclaw/entity_conversation_playbooks.md +326 -5
package/skills/forge-openclaw/psyche_entity_playbooks.md +57 -0
package/dist/assets/index-DVvS8iiU.css +0 -1
package/dist/assets/index-zYB-9Dfo.js +0 -85
package/dist/assets/index-zYB-9Dfo.js.map +0 -1
package/dist/assets/vendor-DoNZuFhn.js.map +0 -1

package/dist/index.html CHANGED Viewed

@@ -13,14 +13,14 @@
     />
     <link rel="icon" type="image/png" href="/forge/assets/favicon-BCHm9dUV.ico" />
     <link rel="alternate icon" href="/forge/assets/favicon-BCHm9dUV.ico" />
-    <script type="module" crossorigin src="/forge/assets/index-zYB-9Dfo.js"></script>
-    <link rel="modulepreload" crossorigin href="/forge/assets/vendor-DoNZuFhn.js">
-    <link rel="modulepreload" crossorigin href="/forge/assets/board-C6jCchjI.js">
-    <link rel="modulepreload" crossorigin href="/forge/assets/ui-CKNPpz7q.js">
-    <link rel="modulepreload" crossorigin href="/forge/assets/motion-DFHrH2rd.js">
-    <link rel="modulepreload" crossorigin href="/forge/assets/table-ZL7Di_u3.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-DVvS8iiU.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";
@@ -2530,6 +2530,19 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
         ],
         fieldGuide: []
     }),
+    enrichOnboardingEntityGuide({
+        entityType: "work_adjustment",
+        purpose: "A truthful signed minute correction on an existing task or project when work happened outside a live run.",
+        minimumCreateFields: [],
+        relationshipRules: [
+            "Work adjustments are action-heavy corrections, not normal CRUD entities.",
+            "Use forge_adjust_work_minutes when the target task or project already exists and only tracked minutes need to change."
+        ],
+        searchHints: [
+            "Confirm the target task or project first, then apply only the signed minute delta that is actually true."
+        ],
+        fieldGuide: []
+    }),
     enrichOnboardingEntityGuide({
         entityType: "questionnaire_run",
         purpose: "One user-owned answer session against a questionnaire instrument version.",
@@ -2543,6 +2556,32 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
         ],
         fieldGuide: []
     }),
+    enrichOnboardingEntityGuide({
+        entityType: "preference_judgment",
+        purpose: "One pairwise preference outcome between two items inside a domain and context.",
+        minimumCreateFields: [],
+        relationshipRules: [
+            "Preference judgments are action-heavy records, not batch CRUD entities.",
+            "Use the dedicated judgment route so the profile, evidence, and comparison history stay aligned."
+        ],
+        searchHints: [
+            "Confirm the left and right items, the outcome, and the active context before storing a new judgment."
+        ],
+        fieldGuide: []
+    }),
+    enrichOnboardingEntityGuide({
+        entityType: "preference_signal",
+        purpose: "One direct preference signal such as favorite, veto, bookmark, neutral, or compare-later.",
+        minimumCreateFields: [],
+        relationshipRules: [
+            "Preference signals are action-heavy records, not batch CRUD entities.",
+            "Use the dedicated signal route so the profile and evidence model stay aligned."
+        ],
+        searchHints: [
+            "Confirm the item, signal type, and context before storing a new direct signal."
+        ],
+        fieldGuide: []
+    }),
     enrichOnboardingEntityGuide({
         entityType: "calendar_connection",
         purpose: "A stored external calendar provider connection and its selected calendars.",
@@ -2582,6 +2621,45 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             }
         ]
     }),
+    enrichOnboardingEntityGuide({
+        entityType: "movement",
+        purpose: "The specialized Movement surface for day, month, all-time, timeline, trip, place, selection, and manual overlay work.",
+        minimumCreateFields: [],
+        relationshipRules: [
+            "Movement is a specialized domain surface, not a normal batch CRUD entity family.",
+            "Read and mutate it through the dedicated movement routes published under specializedDomainSurfaces."
+        ],
+        searchHints: [
+            "Clarify whether the user wants a behavioral query, one trip or place, a missing-gap overlay, a manual add or update, or a link before choosing the route."
+        ],
+        fieldGuide: []
+    }),
+    enrichOnboardingEntityGuide({
+        entityType: "life_force",
+        purpose: "The specialized Life Force surface for the current energy overview, profile edits, weekday templates, and fatigue signals.",
+        minimumCreateFields: [],
+        relationshipRules: [
+            "Life Force is a specialized domain surface, not a normal batch CRUD entity family.",
+            "Use the dedicated overview, profile, weekday-template, and fatigue-signal routes."
+        ],
+        searchHints: [
+            "Clarify whether the user wants explanation, durable model changes, or a real-time tired or recovered signal before choosing the route."
+        ],
+        fieldGuide: []
+    }),
+    enrichOnboardingEntityGuide({
+        entityType: "workbench",
+        purpose: "The specialized Workbench surface for flow catalog work, flow CRUD, execution, run history, published outputs, node results, and latest-node-output reads.",
+        minimumCreateFields: [],
+        relationshipRules: [
+            "Workbench is a specialized execution surface, not a normal batch CRUD entity family.",
+            "Use the dedicated workbench flow, run, output, and node-result routes."
+        ],
+        searchHints: [
+            "Clarify whether the user wants flow discovery, editing, execution, published output, run inspection, or node-level output before choosing the route."
+        ],
+        fieldGuide: []
+    }),
     enrichOnboardingEntityGuide({
         entityType: "self_observation",
         purpose: "The note-backed Psyche self-observation calendar surface for observed events and reflections.",
@@ -2625,13 +2703,17 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
 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.",
+    "For strategic, reflective, or emotionally meaningful non-Psyche records, ask what feels important to keep true before you ask for labels, dates, or taxonomy.",
     "For reusable records such as tags, event types, emotion definitions, preference contexts, or questionnaires, ask what distinction or decision the record should help with before you ask for wording.",
     "When useful, help the user name, define, and connect the record in that order: offer a working label, clarify what belongs inside it, then ask about links only after the record itself feels steady.",
     "When the meaning is clearer than the wording, offer a tentative title or formulation yourself and invite correction instead of forcing the user to wordsmith alone.",
@@ -2639,7 +2721,9 @@ const AGENT_ONBOARDING_CONVERSATION_RULES = [
     "Once the record is clear enough to name, stop exploring broadly and ask only for the last structural detail that still matters.",
     "If the record is already clear enough to save, save it instead of performing a ceremonial extra question.",
     "If the user accepts the wording or record shape, move to the write instead of reopening the intake.",
-    "When updating an entity, start with what is changing, what should stay true, and what prompted the update now."
+    "When updating an entity, start with what is changing, what should stay true, and what prompted the update now.",
+    "For action-heavy flows such as work adjustments, preference judgments, preference signals, and specialized Movement, Life Force, or Workbench work, first ask what the user is trying to understand, change, add, update, link, or run, then choose the dedicated action or surface route instead of forcing the request into generic CRUD.",
+    "For Movement specifically, treat missing-data corrections as user-defined overlay boxes unless the user is editing an already-recorded stay or trip. When the user already gave a clear instruction like 'that missing block was home', act after only the last ambiguity is resolved."
 ];
 const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
     {
@@ -2662,6 +2746,7 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
             "Ask what this piece of work is trying to make true.",
             "Reflect the emerging boundary so the user can hear what is in scope.",
             "Ask what outcome would make the project feel real or complete for now.",
+            "Ask what belongs inside the boundary and what can stay out if the scope still feels muddy.",
             "Ask which goal it belongs under.",
             "Land on a working name once the scope is clear.",
             "Clarify status, owner, and notes only after the scope is clear."
@@ -2696,6 +2781,7 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
         askSequence: [
             "Ask what the recurring behavior is in plain language.",
             "Ask whether doing it is aligned or a slip.",
+            "Ask what an honest hit or miss would look like in an ordinary week.",
             "Ask about cadence and what counts as an honest check-in in practice.",
             "Ask about links only if they will help later review."
         ]
@@ -2717,6 +2803,7 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
         coachingGoal: "Preserve the useful context and link it to the right places without turning the note into a dump.",
         askSequence: [
             "Ask what the note needs to preserve.",
+            "Ask what sentence future-you would need to recover from this note later.",
             "Ask what entities it should stay attached to.",
             "Ask whether it should be durable or temporary.",
             "Ask about tags or author only if they help retrieval or handoff."
@@ -2797,6 +2884,17 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
             "Start the run instead of turning it into a longer intake."
         ]
     },
+    {
+        focus: "work_adjustment",
+        openingQuestion: "Which task or project should this time correction belong to?",
+        coachingGoal: "Correct tracked minutes truthfully without pretending a live run happened.",
+        askSequence: [
+            "Ask what existing task or project the minutes belong to.",
+            "Ask whether time should be added or removed.",
+            "Ask what real work or correction the adjustment is meant to capture.",
+            "Ask for a short audit note only if the reason would otherwise be unclear later."
+        ]
+    },
     {
         focus: "self_observation",
         openingQuestion: "What did you notice most clearly in that moment?",
@@ -2804,6 +2902,7 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
         askSequence: [
             "Ask what was observed.",
             "Reflect the moment without pretending it is already a finished interpretation.",
+            "Ask for the smallest concrete slice if the observation still feels vague or global.",
             "Ask when it happened or became noticeable unless timing is already clear.",
             "Ask what it may connect to: pattern, belief, value, mode, task, project, or note.",
             "Ask for tags or extra context only if that will help later review."
@@ -2849,6 +2948,7 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
         askSequence: [
             "Ask what makes this item worth including in the catalog.",
             "Ask what catalog or domain it belongs to if that is still unclear.",
+            "Ask what would make the comparison confusing or unfair if the label stayed as-is.",
             "Ask for a short clarifying description only if the label would be ambiguous later.",
             "Ask about aliases or tags only if they help retrieval."
         ]
@@ -2876,6 +2976,28 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
             "Ask what makes the item distinct enough to compare usefully only if it is still a comparison candidate."
         ]
     },
+    {
+        focus: "preference_judgment",
+        openingQuestion: "What comparison are you actually trying to settle here?",
+        coachingGoal: "Capture one pairwise preference decision with the right context instead of only logging a left-versus-right click.",
+        askSequence: [
+            "Ask what comparison the user is actually trying to settle.",
+            "Ask which context or domain this judgment belongs to.",
+            "Ask whether the result is left, right, tie, or skip.",
+            "Ask for reason tags or strength only if they will improve later interpretation."
+        ]
+    },
+    {
+        focus: "preference_signal",
+        openingQuestion: "What do you want Forge to remember about this item right now?",
+        coachingGoal: "Store a direct preference signal such as favorite, veto, bookmark, or compare-later with enough context to interpret it later.",
+        askSequence: [
+            "Ask what item the user wants to mark.",
+            "Ask what signal they want to give it.",
+            "Ask what domain or context this belongs to if that is still unclear.",
+            "Ask about strength only if the user is expressing a gradient rather than a simple mark."
+        ]
+    },
     {
         focus: "questionnaire_instrument",
         openingQuestion: "What would this questionnaire help someone notice or track?",
@@ -2895,17 +3017,58 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
         askSequence: [
             "Ask which questionnaire run this is about.",
             "Ask whether the user wants to start, continue, review, or complete it.",
+            "If the user wants to continue or finish, ask what state they are in right now before asking for more content.",
             "If answering is still in progress, ask only for the next answer or note that matters."
         ]
     },
+    {
+        focus: "movement",
+        openingQuestion: "Are you trying to understand where you stayed and traveled, change one stay or trip, or answer a question about your movement behavior?",
+        coachingGoal: "Clarify whether the user wants a time-in-place query, travel-history review, a missing-gap overlay, one stay or trip change, one place summary, or a link before choosing the dedicated movement route.",
+        askSequence: [
+            "Ask whether the user is trying to query behavior, add something manually, update an existing movement item, or link movement to another Forge entity.",
+            "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."
+        ]
+    },
+    {
+        focus: "life_force",
+        openingQuestion: "Do you want to understand the current energy picture, change how Forge models it, or log how you feel right now?",
+        coachingGoal: "Clarify whether the job is overview, profile change, weekday-template editing, or a real-time fatigue signal before choosing the dedicated life-force route.",
+        askSequence: [
+            "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."
+        ]
+    },
+    {
+        focus: "workbench",
+        openingQuestion: "Are you trying to inspect a flow, change it, run it, or inspect one run's outputs?",
+        coachingGoal: "Clarify whether the user wants flow discovery, editing, execution, run history, published outputs, or node-level inspection before using the dedicated workbench route family.",
+        askSequence: [
+            "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."
+        ]
+    },
     {
         focus: "event_type",
         openingQuestion: "What kind of moment keeps happening that you want future reports to name the same way each time?",
         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."
         ]
     },
@@ -2915,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."
         ]
     }
@@ -2952,6 +3117,7 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
         notes: [
             "Use an ACT-style values clarification stance: values are directions to live toward, not boxes to complete.",
             "Ask one or two questions at a time, reflect back the user's language, and only then move toward naming committed actions or linked work items.",
+            "Reflect the pain, longing, or importance that makes the value alive before narrowing to action.",
             "If the user says they want to understand it first, start with one orienting question before offering a formulation or save suggestion."
         ]
     },
@@ -3036,7 +3202,8 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
             "Keep the user close to observable behavior rather than jumping straight to labels.",
             "When the behavior clearly belongs inside a larger loop, suggest linking or also mapping the related behavior_pattern.",
             "If the user asks for understanding before storage, ask about the recent example and function of the move before classifying it.",
-            "Ask what the move is trying to do for the user before moving into replacement planning."
+            "Ask what the move is trying to do for the user before moving into replacement planning.",
+            "Name the immediate protective job before discussing costs or alternatives."
         ]
     },
     {
@@ -3460,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}'
     },
@@ -3516,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."
         ],
@@ -3698,6 +3866,10 @@ function buildAgentOnboardingPayload(request) {
             calendar: "A connected calendar source mirrored into Forge. Calendar state combines provider events, recurring work blocks, and task timeboxes.",
             workBlock: "A recurring half-day or custom time window such as Main Activity, Secondary Activity, Third Activity, Rest, Holiday, or Custom. Work blocks can allow or block work by default, can define active date bounds, and remain editable through the calendar surface.",
             taskTimebox: "A planned or live calendar slot tied to a task. Timeboxes can be suggested in advance or created automatically from active task runs.",
+            workAdjustment: "A work adjustment is a truthful signed minute correction on an existing task or project when real work happened but no live run was active.",
+            movement: "Forge Movement is the first-class mobility surface. It is a timeline of stays and trips: stays capture time spent in the same place, and trips capture travel between places. Use it for time-in-place questions, travel-history review, specific stay or trip edits, selected-span aggregates, known places, and links to other Forge records rather than pretending stays and trips are normal batch CRUD entities.",
+            lifeForce: "Life Force is Forge's energy-budget and fatigue model. Read it through the dedicated life-force payload and update it through focused profile, weekday-template, and fatigue-signal routes rather than generic entity CRUD.",
+            workbench: "Workbench is Forge's graph-flow execution system. Treat flows, runs, published outputs, node results, and latest-node-output reads as a dedicated API family instead of a normal entity-batch surface.",
             psyche: "Forge Psyche is the reflective domain for values, patterns, behaviors, beliefs, modes, and trigger reports. It is sensitive and should be handled deliberately."
         },
         psycheSubmoduleModel: {
@@ -3825,6 +3997,82 @@ function buildAgentOnboardingPayload(request) {
                     writeModel: "Create or update an observed note with frontmatter.observedAt. Manual reflections usually carry the Self-observation tag, while movement sync can also publish rolling observed notes tagged movement."
                 }
             },
+            specializedDomainSurfaces: {
+                movement: {
+                    summary: "Dedicated movement workspace API. Use these routes for stays, trips, time-in-place questions, visited places, trip detail, selected-span aggregates, and user-defined overlays.",
+                    readRoutes: {
+                        day: "/api/v1/movement/day",
+                        month: "/api/v1/movement/month",
+                        allTime: "/api/v1/movement/all-time",
+                        timeline: "/api/v1/movement/timeline",
+                        places: "/api/v1/movement/places",
+                        tripDetail: "/api/v1/movement/trips/:id",
+                        selection: "/api/v1/movement/selection",
+                        settings: "/api/v1/movement/settings"
+                    },
+                    writeRoutes: {
+                        placeCreate: "/api/v1/movement/places",
+                        placeUpdate: "/api/v1/movement/places/:id",
+                        userBoxCreate: "/api/v1/movement/user-boxes",
+                        userBoxPreflight: "/api/v1/movement/user-boxes/preflight",
+                        userBoxUpdate: "/api/v1/movement/user-boxes/:id",
+                        automaticBoxInvalidate: "/api/v1/movement/automatic-boxes/:id/invalidate",
+                        stayUpdate: "/api/v1/movement/stays/:id",
+                        tripUpdate: "/api/v1/movement/trips/:id",
+                        tripPointUpdate: "/api/v1/movement/trips/:id/points/:pointId"
+                    },
+                    notes: [
+                        "Movement is not a normal batch CRUD entity family. It is a dedicated record of stays and trips: a stay means the user remained in the same place for a span of time, and a trip means they traveled between places.",
+                        "Use /api/v1/movement/day, /month, /all-time, /timeline, or /selection when the user wants behavioral answers such as how long they stayed at home, when they traveled, which places dominated a period, or what happened across a selected span.",
+                        "Use the movement write routes when the user wants to add a place or manual overlay, update a specific stay or trip, or attach movement context to another Forge record. If the user is filling a missing-data gap, the usual write path is a user-defined overlay box rather than a raw stay or trip patch.",
+                        "For an explicit statement like 'that missing block was me staying home', do not reopen broad intake. Preflight only if timing overlap is unclear, then create a user-defined `stay` box for that interval and read the updated timeline back."
+                    ]
+                },
+                lifeForce: {
+                    summary: "Dedicated life-force API. Use it to read the current energy budget, drains, recommendations, and warnings, then patch only the parts that are meant to be user-controlled.",
+                    readRoutes: {
+                        overview: "/api/v1/life-force"
+                    },
+                    writeRoutes: {
+                        profile: "/api/v1/life-force/profile",
+                        weekdayTemplate: "/api/v1/life-force/templates/:weekday",
+                        fatigueSignal: "/api/v1/life-force/fatigue-signals"
+                    },
+                    notes: [
+                        "Life Force is a focused domain surface, not a batch CRUD entity type.",
+                        "Use GET /api/v1/life-force for the current overview payload with stats, drains, recommendations, and current-curve state.",
+                        "Patch the profile only for durable personal settings, update weekday templates only for the curve itself, and post fatigue signals for real-time tired or recovered observations."
+                    ]
+                },
+                workbench: {
+                    summary: "Dedicated graph-flow API. Use it for flow catalog reads, flow CRUD, execution, run history, published outputs, node results, and latest successful node outputs.",
+                    readRoutes: {
+                        listFlows: "/api/v1/workbench/flows",
+                        flowById: "/api/v1/workbench/flows/:id",
+                        flowBySlug: "/api/v1/workbench/flows/by-slug/:slug",
+                        publishedOutput: "/api/v1/workbench/flows/:id/output",
+                        runs: "/api/v1/workbench/flows/:id/runs",
+                        runDetail: "/api/v1/workbench/flows/:id/runs/:runId",
+                        runNodes: "/api/v1/workbench/flows/:id/runs/:runId/nodes",
+                        nodeResult: "/api/v1/workbench/flows/:id/runs/:runId/nodes/:nodeId",
+                        latestNodeOutput: "/api/v1/workbench/flows/:id/nodes/:nodeId/output",
+                        boxCatalog: "/api/v1/workbench/catalog/boxes"
+                    },
+                    writeRoutes: {
+                        createFlow: "/api/v1/workbench/flows",
+                        updateFlow: "/api/v1/workbench/flows/:id",
+                        deleteFlow: "/api/v1/workbench/flows/:id",
+                        runFlow: "/api/v1/workbench/flows/:id/run",
+                        runByPayload: "/api/v1/workbench/run",
+                        chatFlow: "/api/v1/workbench/flows/:id/chat"
+                    },
+                    notes: [
+                        "Workbench is a dedicated execution surface, not a batch CRUD entity family.",
+                        "Use the flow routes when the agent needs stable public input contracts, published outputs, node-level results, or reusable execution history.",
+                        "Prefer the dedicated output and node-result routes over reverse-engineering raw traces."
+                    ]
+                }
+            },
             readModelOnlySurfaces: {
                 sleepOverview: "/api/v1/health/sleep",
                 sportsOverview: "/api/v1/health/fitness",
@@ -3908,6 +4156,24 @@ function buildAgentOnboardingPayload(request) {
             weeklyReview: "/api/v1/reviews/weekly",
             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",
@@ -7028,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"
@@ -7862,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;
         }
     });
@@ -7896,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" });