forge-openclaw-plugin 0.2.15 → 0.2.19

package/dist/server/app.js

@@ -1,33 +1,38 @@
 import Fastify from "fastify";
 import cors from "@fastify/cors";
 import { ZodError } from "zod";
-import { configureDatabase, configureDatabaseSeeding } from "./db.js";
-import { isHttpError } from "./errors.js";
-import { listActivityEvents, listActivityEventsForTask, removeActivityEvent } from "./repositories/activity-events.js";
+import { configureDatabase, configureDatabaseSeeding, runInTransaction } from "./db.js";
+import { HttpError, isHttpError } from "./errors.js";
+import { listActivityEvents, listActivityEventsForTask, recordActivityEvent, removeActivityEvent } from "./repositories/activity-events.js";
 import { approveApprovalRequest, createAgentAction, createInsight, createInsightFeedback, deleteInsight, getInsightById, listAgentActions, listApprovalRequests, listInsights, rejectApprovalRequest, updateInsight } from "./repositories/collaboration.js";
 import { listEventLog } from "./repositories/event-log.js";
 import { createGoal, getGoalById, listGoals, updateGoal } from "./repositories/goals.js";
+import { createHabit, createHabitCheckIn, getHabitById, listHabits, updateHabit } from "./repositories/habits.js";
 import { listDomains } from "./repositories/domains.js";
 import { buildNotesSummaryByEntity, createNote, getNoteById, listNotes, updateNote } from "./repositories/notes.js";
 import { createBehavior, createBehaviorPattern, createBeliefEntry, createEmotionDefinition, createEventType, createModeGuideSession, createModeProfile, createPsycheValue, createTriggerReport, getBehaviorById, getBehaviorPatternById, getBeliefEntryById, getEmotionDefinitionById, getEventTypeById, getModeGuideSessionById, getModeProfileById, getPsycheValueById, getTriggerReportById, listBehaviors, listBehaviorPatterns, listBeliefEntries, listEmotionDefinitions, listEventTypes, listModeGuideSessions, listModeProfiles, listPsycheValues, listSchemaCatalog, listTriggerReports, updateBehavior, updateBehaviorPattern, updateBeliefEntry, updateEmotionDefinition, updateEventType, updateModeGuideSession, updateModeProfile, updatePsycheValue, updateTriggerReport } from "./repositories/psyche.js";
 import { createProject, updateProject } from "./repositories/projects.js";
-import { createManualRewardGrant, getDailyAmbientXp, getRewardRuleById, listRewardLedger, listRewardRules, recordSessionEvent, updateRewardRule } from "./repositories/rewards.js";
+import { createManualRewardGrant, getDailyAmbientXp, getRewardRuleById, listRewardLedger, listRewardRules, recordWorkAdjustmentReward, recordSessionEvent, updateRewardRule } from "./repositories/rewards.js";
 import { listAgentIdentities, getSettings, isPsycheAuthRequired, updateSettings, verifyAgentToken } from "./repositories/settings.js";
 import { createTag, getTagById, listTags, updateTag } from "./repositories/tags.js";
 import { claimTaskRun, completeTaskRun, focusTaskRun, heartbeatTaskRun, listTaskRuns, recoverTimedOutTaskRuns, releaseTaskRun } from "./repositories/task-runs.js";
 import { createTask, createTaskWithIdempotency, getTaskById, listTasks, uncompleteTask, updateTask } from "./repositories/tasks.js";
+import { createWorkAdjustment } from "./repositories/work-adjustments.js";
+import { createCalendarEvent, createTaskTimebox, createWorkBlockTemplate, deleteCalendarEvent, deleteTaskTimebox, deleteWorkBlockTemplate, getCalendarConnectionById, getCalendarEventById, listCalendars, listCalendarEvents, listTaskTimeboxes, suggestTaskTimeboxes, listWorkBlockInstances, listWorkBlockTemplates, updateCalendarEvent, updateTaskTimebox, updateWorkBlockTemplate } from "./repositories/calendar.js";
 import { getDashboard } from "./services/dashboard.js";
 import { getOverviewContext, getRiskContext, getTodayContext } from "./services/context.js";
 import { buildGamificationOverview, buildGamificationProfile, buildXpMomentumPulse } from "./services/gamification.js";
 import { getInsightsPayload } from "./services/insights.js";
 import { createEntities, deleteEntities, deleteEntity, getSettingsBinPayload, restoreEntities, searchEntities, updateEntities } from "./services/entity-crud.js";
 import { getPsycheOverview } from "./services/psyche.js";
-import { getProjectBoard, listProjectSummaries } from "./services/projects.js";
+import { getProjectBoard, getProjectSummary, listProjectSummaries } from "./services/projects.js";
 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, completeMicrosoftCalendarOauth, createCalendarConnection, deleteCalendarEventProjection, discoverCalendarConnection, discoverExistingCalendarConnection, getMicrosoftCalendarOauthSession, listConnectedCalendarConnections, removeCalendarConnection, pushCalendarEventUpdate, readCalendarOverview, syncCalendarConnection, startMicrosoftCalendarOauth, testMicrosoftCalendarOauthConfiguration, listCalendarProviderMetadata, updateCalendarConnectionSelection } from "./services/calendar-runtime.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 { activityListQuerySchema, activitySourceSchema, createAgentActionSchema, createAgentTokenSchema, batchCreateEntitiesSchema, batchDeleteEntitiesSchema, batchRestoreEntitiesSchema, batchSearchEntitiesSchema, batchUpdateEntitiesSchema, createGoalSchema, createInsightFeedbackSchema, createInsightSchema, createNoteSchema, createProjectSchema, createManualRewardGrantSchema, createSessionEventSchema, createTagSchema, notesListQuerySchema, updateTagSchema, createTaskSchema, eventsListQuerySchema, operatorLogWorkSchema, projectBoardPayloadSchema, projectListQuerySchema, entityDeleteQuerySchema, removeActivityEventSchema, resolveApprovalRequestSchema, rewardsLedgerQuerySchema, taskContextPayloadSchema, taskRunClaimSchema, taskRunFocusSchema, taskRunFinishSchema, taskRunHeartbeatSchema, taskRunListQuerySchema, taskListQuerySchema, tagSuggestionRequestSchema, uncompleteTaskSchema, updateSettingsSchema, updateGoalSchema, updateInsightSchema, updateNoteSchema, updateProjectSchema, updateRewardRuleSchema, updateTaskSchema } from "./types.js";
+import { activityListQuerySchema, activitySourceSchema, createAgentActionSchema, createAgentTokenSchema, batchCreateEntitiesSchema, batchDeleteEntitiesSchema, batchRestoreEntitiesSchema, batchSearchEntitiesSchema, batchUpdateEntitiesSchema, createGoalSchema, createInsightFeedbackSchema, createInsightSchema, createNoteSchema, createProjectSchema, createManualRewardGrantSchema, createCalendarEventSchema, createHabitCheckInSchema, createCalendarConnectionSchema, discoverCalendarConnectionSchema, startMicrosoftCalendarOauthSchema, testMicrosoftCalendarOauthConfigurationSchema, createHabitSchema, createTaskTimeboxSchema, createWorkBlockTemplateSchema, createSessionEventSchema, createWorkAdjustmentSchema, createTagSchema, calendarOverviewQuerySchema, notesListQuerySchema, updateTagSchema, createTaskSchema, eventsListQuerySchema, operatorLogWorkSchema, projectBoardPayloadSchema, projectListQuerySchema, entityDeleteQuerySchema, removeActivityEventSchema, resolveApprovalRequestSchema, rewardsLedgerQuerySchema, habitListQuerySchema, taskContextPayloadSchema, taskRunClaimSchema, taskRunFocusSchema, taskRunFinishSchema, taskRunHeartbeatSchema, taskRunListQuerySchema, taskListQuerySchema, tagSuggestionRequestSchema, uncompleteTaskSchema, updateSettingsSchema, updateGoalSchema, updateHabitSchema, updateInsightSchema, updateCalendarConnectionSchema, updateCalendarEventSchema, updateNoteSchema, updateProjectSchema, updateRewardRuleSchema, updateTaskTimeboxSchema, updateTaskSchema, updateWorkBlockTemplateSchema, workAdjustmentResultSchema, finalizeWeeklyReviewResultSchema, recommendTaskTimeboxesSchema } from "./types.js";
 import { buildOpenApiDocument } from "./openapi.js";
 import { registerWebRoutes } from "./web.js";
 import { createManagerRuntime } from "./managers/runtime.js";
@@ -105,7 +110,9 @@ function readSingleForwardedHeader(value) {
     return null;
 }
 function getRequestOrigin(request) {
-    const protocol = readSingleForwardedHeader(request.headers["x-forwarded-proto"]) ?? request.protocol ?? "http";
+    const protocol = readSingleForwardedHeader(request.headers["x-forwarded-proto"]) ??
+        request.protocol ??
+        "http";
     const host = readSingleForwardedHeader(request.headers["x-forwarded-host"]) ??
         readSingleForwardedHeader(request.headers.host) ??
         request.hostname;
@@ -121,20 +128,72 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "Projects should usually link to one goal through goalId.",
             "Tasks can link directly to a goal when no project exists yet."
         ],
-        searchHints: ["Search by title before creating a new goal.", "Use status filters when looking for paused or completed goals."],
+        searchHints: [
+            "Search by title before creating a new goal.",
+            "Use status filters when looking for paused or completed goals."
+        ],
         examples: [
             '{"title":"Create meaningfully","horizon":"lifetime","description":"Make work that is honest, beautiful, and published."}',
             '{"title":"Build a beautiful family","horizon":"lifetime","description":"Invest in love, stability, and shared rituals."}'
         ],
         fieldGuide: [
-            { name: "title", type: "string", required: true, description: "Human-readable goal name." },
-            { name: "description", type: "string", required: false, description: "Why the goal matters or what success looks like.", defaultValue: "" },
-            { name: "horizon", type: "quarter|year|lifetime", required: false, description: "How far out the goal is meant to live.", enumValues: ["quarter", "year", "lifetime"], defaultValue: "year" },
-            { name: "status", type: "active|paused|completed", required: false, description: "Current lifecycle state for the goal.", enumValues: ["active", "paused", "completed"], defaultValue: "active" },
-            { name: "targetPoints", type: "integer", required: false, description: "Approximate XP/point target for the goal.", defaultValue: 400 },
-            { name: "themeColor", type: "hex-color", required: false, description: "Visual color used in the UI.", defaultValue: "#c8a46b" },
-            { name: "tagIds", type: "string[]", required: false, description: "Existing tag ids linked to the goal.", defaultValue: [] },
-            { name: "notes", type: "Array<{ contentMarkdown, author?, links? }>", required: false, description: "Optional nested notes that will auto-link to the new goal.", defaultValue: [] }
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Human-readable goal name."
+            },
+            {
+                name: "description",
+                type: "string",
+                required: false,
+                description: "Markdown description for why the goal matters or what success looks like.",
+                defaultValue: ""
+            },
+            {
+                name: "horizon",
+                type: "quarter|year|lifetime",
+                required: false,
+                description: "How far out the goal is meant to live.",
+                enumValues: ["quarter", "year", "lifetime"],
+                defaultValue: "year"
+            },
+            {
+                name: "status",
+                type: "active|paused|completed",
+                required: false,
+                description: "Current lifecycle state for the goal.",
+                enumValues: ["active", "paused", "completed"],
+                defaultValue: "active"
+            },
+            {
+                name: "targetPoints",
+                type: "integer",
+                required: false,
+                description: "Approximate XP/point target for the goal.",
+                defaultValue: 400
+            },
+            {
+                name: "themeColor",
+                type: "hex-color",
+                required: false,
+                description: "Visual color used in the UI.",
+                defaultValue: "#c8a46b"
+            },
+            {
+                name: "tagIds",
+                type: "string[]",
+                required: false,
+                description: "Existing tag ids linked to the goal.",
+                defaultValue: []
+            },
+            {
+                name: "notes",
+                type: "Array<{ contentMarkdown, author?, tags?, destroyAt?, links? }>",
+                required: false,
+                description: "Optional nested notes that will auto-link to the new goal.",
+                defaultValue: []
+            }
         ]
     },
     {
@@ -146,16 +205,61 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "Tasks can link to a project through projectId.",
             "Projects inherit strategic meaning from their parent goal."
         ],
-        searchHints: ["Search by title inside the target goal before creating a new project."],
-        examples: ['{"goalId":"goal_create_meaningfully","title":"Launch the public Forge plugin","description":"Ship a real public release that people can install."}'],
+        searchHints: [
+            "Search by title inside the target goal before creating a new project."
+        ],
+        examples: [
+            '{"goalId":"goal_create_meaningfully","title":"Launch the public Forge plugin","description":"Ship a real public release that people can install."}'
+        ],
         fieldGuide: [
-            { name: "goalId", type: "string", required: true, description: "Existing parent goal id." },
-            { name: "title", type: "string", required: true, description: "Project name." },
-            { name: "description", type: "string", required: false, description: "Desired outcome or scope.", defaultValue: "" },
-            { name: "status", type: "active|paused|completed", required: false, description: "Lifecycle state.", enumValues: ["active", "paused", "completed"], defaultValue: "active" },
-            { name: "targetPoints", type: "integer", required: false, description: "Approximate XP/point target for the project.", defaultValue: 240 },
-            { name: "themeColor", type: "hex-color", required: false, description: "Visual color used in the UI.", defaultValue: "#c0c1ff" },
-            { name: "notes", type: "Array<{ contentMarkdown, author?, links? }>", required: false, description: "Optional nested notes that will auto-link to the new project.", defaultValue: [] }
+            {
+                name: "goalId",
+                type: "string",
+                required: true,
+                description: "Existing parent goal id."
+            },
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Project name."
+            },
+            {
+                name: "description",
+                type: "string",
+                required: false,
+                description: "Markdown description for the desired outcome or scope.",
+                defaultValue: ""
+            },
+            {
+                name: "status",
+                type: "active|paused|completed",
+                required: false,
+                description: "Lifecycle state.",
+                enumValues: ["active", "paused", "completed"],
+                defaultValue: "active"
+            },
+            {
+                name: "targetPoints",
+                type: "integer",
+                required: false,
+                description: "Approximate XP/point target for the project.",
+                defaultValue: 240
+            },
+            {
+                name: "themeColor",
+                type: "hex-color",
+                required: false,
+                description: "Visual color used in the UI.",
+                defaultValue: "#c0c1ff"
+            },
+            {
+                name: "notes",
+                type: "Array<{ contentMarkdown, author?, tags?, destroyAt?, links? }>",
+                required: false,
+                description: "Optional nested notes that will auto-link to the new project.",
+                defaultValue: []
+            }
         ]
     },
     {
@@ -167,42 +271,604 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "Live work is tracked by task runs, not by task status alone.",
             "A task status of in_progress does not guarantee a live active run."
         ],
-        searchHints: ["Search by title before creating a duplicate task.", "Use linkedTo filters when you know the parent goal or project."],
-        examples: ['{"title":"Write the plugin release notes","projectId":"project_forge_plugin_launch","status":"focus","priority":"high"}'],
+        searchHints: [
+            "Search by title before creating a duplicate task.",
+            "Use linkedTo filters when you know the parent goal or project."
+        ],
+        examples: [
+            '{"title":"Write the plugin release notes","projectId":"project_forge_plugin_launch","status":"focus","priority":"high"}'
+        ],
+        fieldGuide: [
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Concrete action label."
+            },
+            {
+                name: "description",
+                type: "string",
+                required: false,
+                description: "Markdown context, constraints, or acceptance notes.",
+                defaultValue: ""
+            },
+            {
+                name: "status",
+                type: "backlog|focus|in_progress|blocked|done",
+                required: false,
+                description: "Board lane or completion state.",
+                enumValues: ["backlog", "focus", "in_progress", "blocked", "done"],
+                defaultValue: "backlog"
+            },
+            {
+                name: "priority",
+                type: "low|medium|high|critical",
+                required: false,
+                description: "Relative urgency.",
+                enumValues: ["low", "medium", "high", "critical"],
+                defaultValue: "medium"
+            },
+            {
+                name: "owner",
+                type: "string",
+                required: false,
+                description: "Human-facing owner label.",
+                defaultValue: "Albert"
+            },
+            {
+                name: "goalId",
+                type: "string|null",
+                required: false,
+                description: "Linked goal id.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "projectId",
+                type: "string|null",
+                required: false,
+                description: "Linked project id.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "dueDate",
+                type: "YYYY-MM-DD|null",
+                required: false,
+                description: "Optional due date.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "effort",
+                type: "light|deep|marathon",
+                required: false,
+                description: "How heavy the task feels.",
+                enumValues: ["light", "deep", "marathon"],
+                defaultValue: "deep"
+            },
+            {
+                name: "energy",
+                type: "low|steady|high",
+                required: false,
+                description: "Energy demand.",
+                enumValues: ["low", "steady", "high"],
+                defaultValue: "steady"
+            },
+            {
+                name: "points",
+                type: "integer",
+                required: false,
+                description: "Reward value for the task.",
+                defaultValue: 40
+            },
+            {
+                name: "sortOrder",
+                type: "integer",
+                required: false,
+                description: "Lane ordering hint when set explicitly."
+            },
+            {
+                name: "tagIds",
+                type: "string[]",
+                required: false,
+                description: "Existing tag ids linked to the task.",
+                defaultValue: []
+            },
+            {
+                name: "notes",
+                type: "Array<{ contentMarkdown, author?, tags?, destroyAt?, links? }>",
+                required: false,
+                description: "Optional nested notes that will auto-link to the new task.",
+                defaultValue: []
+            }
+        ]
+    },
+    {
+        entityType: "calendar_event",
+        purpose: "A canonical Forge calendar event that can live locally first and then project to connected provider calendars.",
+        minimumCreateFields: ["title", "startAt", "endAt"],
+        relationshipRules: [
+            "Forge stores the canonical event first; provider copies are downstream projections.",
+            "Use links to connect the event to goals, projects, tasks, habits, notes, or Psyche entities.",
+            "If preferredCalendarId is omitted, Forge uses the default writable connected calendar when one exists.",
+            "Set preferredCalendarId to null only when the user explicitly wants Forge-only storage."
+        ],
+        searchHints: [
+            "Search by title or linked entity before creating a duplicate event.",
+            "Use linkedTo when you know the goal, project, task, or habit the event should already reference."
+        ],
+        examples: [
+            '{"title":"Weekly research supervision","startAt":"2026-04-06T06:00:00.000Z","endAt":"2026-04-06T07:00:00.000Z","timezone":"Europe/Zurich","links":[{"entityType":"project","entityId":"project_123","relationshipType":"meeting_for"}]}'
+        ],
+        fieldGuide: [
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Human-readable event title."
+            },
+            {
+                name: "description",
+                type: "string",
+                required: false,
+                description: "Longer event description.",
+                defaultValue: ""
+            },
+            {
+                name: "location",
+                type: "string",
+                required: false,
+                description: "Location or meeting place.",
+                defaultValue: ""
+            },
+            {
+                name: "startAt",
+                type: "ISO datetime",
+                required: true,
+                description: "Start instant in ISO-8601 form."
+            },
+            {
+                name: "endAt",
+                type: "ISO datetime",
+                required: true,
+                description: "End instant in ISO-8601 form."
+            },
+            {
+                name: "timezone",
+                type: "string",
+                required: false,
+                description: "IANA timezone label.",
+                defaultValue: "UTC"
+            },
+            {
+                name: "isAllDay",
+                type: "boolean",
+                required: false,
+                description: "Whether this is an all-day event.",
+                defaultValue: false
+            },
+            {
+                name: "availability",
+                type: "busy|free",
+                required: false,
+                description: "Availability state exposed to scheduling rules.",
+                enumValues: ["busy", "free"],
+                defaultValue: "busy"
+            },
+            {
+                name: "eventType",
+                type: "string",
+                required: false,
+                description: "Optional event category label used by scheduling rules.",
+                defaultValue: ""
+            },
+            {
+                name: "categories",
+                type: "string[]",
+                required: false,
+                description: "Optional provider-style categories.",
+                defaultValue: []
+            },
+            {
+                name: "preferredCalendarId",
+                type: "string|null",
+                required: false,
+                description: "Writable connected calendar to project into. Omit it to use the default writable connected calendar. Set null only to force Forge-only storage.",
+                defaultValue: "default writable connected calendar when available",
+                nullable: true
+            },
+            {
+                name: "links",
+                type: "Array<{ entityType, entityId, relationshipType? }>",
+                required: false,
+                description: "Forge entities linked to this event.",
+                defaultValue: []
+            }
+        ]
+    },
+    {
+        entityType: "work_block_template",
+        purpose: "A recurring work-availability template such as Main Activity, Secondary Activity, Third Activity, Rest, Holiday, or Custom.",
+        minimumCreateFields: [
+            "title",
+            "kind",
+            "timezone",
+            "weekDays",
+            "startMinute",
+            "endMinute",
+            "blockingState"
+        ],
+        relationshipRules: [
+            "Work block templates derive visible calendar instances for the requested range instead of storing one repeated event per day.",
+            "startsOn and endsOn are optional active-date bounds. Leaving endsOn null makes the block repeat indefinitely.",
+            "They are Forge-owned scheduling structures, not mirrored provider events."
+        ],
+        searchHints: [
+            "Search by title or kind before creating a duplicate recurring block."
+        ],
+        examples: [
+            '{"title":"Main Activity","kind":"main_activity","color":"#f97316","timezone":"Europe/Zurich","weekDays":[1,2,3,4,5],"startMinute":480,"endMinute":720,"startsOn":"2026-04-06","endsOn":null,"blockingState":"blocked"}',
+            '{"title":"Summer holiday","kind":"holiday","color":"#14b8a6","timezone":"Europe/Zurich","weekDays":[0,1,2,3,4,5,6],"startMinute":0,"endMinute":1440,"startsOn":"2026-08-01","endsOn":"2026-08-16","blockingState":"blocked"}'
+        ],
+        fieldGuide: [
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Display name for the recurring block."
+            },
+            {
+                name: "kind",
+                type: "main_activity|secondary_activity|third_activity|rest|holiday|custom",
+                required: true,
+                description: "Preset or custom block type.",
+                enumValues: [
+                    "main_activity",
+                    "secondary_activity",
+                    "third_activity",
+                    "rest",
+                    "holiday",
+                    "custom"
+                ]
+            },
+            {
+                name: "color",
+                type: "hex-color",
+                required: false,
+                description: "UI color for generated instances.",
+                defaultValue: "#60a5fa"
+            },
+            {
+                name: "timezone",
+                type: "string",
+                required: true,
+                description: "IANA timezone that defines the recurring window."
+            },
+            {
+                name: "weekDays",
+                type: "integer[]",
+                required: true,
+                description: "Weekday numbers where Sunday is 0 and Saturday is 6."
+            },
+            {
+                name: "startMinute",
+                type: "integer",
+                required: true,
+                description: "Minute from midnight where the block starts."
+            },
+            {
+                name: "endMinute",
+                type: "integer",
+                required: true,
+                description: "Minute from midnight where the block ends."
+            },
+            {
+                name: "startsOn",
+                type: "YYYY-MM-DD|null",
+                required: false,
+                description: "Optional first active date for the recurring block.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "endsOn",
+                type: "YYYY-MM-DD|null",
+                required: false,
+                description: "Optional last active date. Null means repeat indefinitely.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "blockingState",
+                type: "allowed|blocked",
+                required: true,
+                description: "Whether this block generally allows or blocks work.",
+                enumValues: ["allowed", "blocked"]
+            }
+        ]
+    },
+    {
+        entityType: "task_timebox",
+        purpose: "A planned or live calendar slot attached to a task.",
+        minimumCreateFields: ["taskId", "title", "startsAt", "endsAt"],
+        relationshipRules: [
+            "Task timeboxes belong to a task and can optionally carry the parent project id.",
+            "Live task runs can attach to matching timeboxes later; creating a timebox does not start work by itself."
+        ],
+        searchHints: [
+            "Search by task linkage or title before creating another slot for the same work block."
+        ],
+        examples: [
+            '{"taskId":"task_123","projectId":"project_456","title":"Draft the methods section","startsAt":"2026-04-03T08:00:00.000Z","endsAt":"2026-04-03T09:30:00.000Z","source":"suggested"}'
+        ],
         fieldGuide: [
-            { name: "title", type: "string", required: true, description: "Concrete action label." },
-            { name: "description", type: "string", required: false, description: "Helpful context or acceptance notes.", defaultValue: "" },
-            { name: "status", type: "backlog|focus|in_progress|blocked|done", required: false, description: "Board lane or completion state.", enumValues: ["backlog", "focus", "in_progress", "blocked", "done"], defaultValue: "backlog" },
-            { name: "priority", type: "low|medium|high|critical", required: false, description: "Relative urgency.", enumValues: ["low", "medium", "high", "critical"], defaultValue: "medium" },
-            { name: "owner", type: "string", required: false, description: "Human-facing owner label.", defaultValue: "Albert" },
-            { name: "goalId", type: "string|null", required: false, description: "Linked goal id.", defaultValue: null, nullable: true },
-            { name: "projectId", type: "string|null", required: false, description: "Linked project id.", defaultValue: null, nullable: true },
-            { name: "dueDate", type: "YYYY-MM-DD|null", required: false, description: "Optional due date.", defaultValue: null, nullable: true },
-            { name: "effort", type: "light|deep|marathon", required: false, description: "How heavy the task feels.", enumValues: ["light", "deep", "marathon"], defaultValue: "deep" },
-            { name: "energy", type: "low|steady|high", required: false, description: "Energy demand.", enumValues: ["low", "steady", "high"], defaultValue: "steady" },
-            { name: "points", type: "integer", required: false, description: "Reward value for the task.", defaultValue: 40 },
-            { name: "sortOrder", type: "integer", required: false, description: "Lane ordering hint when set explicitly." },
-            { name: "tagIds", type: "string[]", required: false, description: "Existing tag ids linked to the task.", defaultValue: [] },
-            { name: "notes", type: "Array<{ contentMarkdown, author?, links? }>", required: false, description: "Optional nested notes that will auto-link to the new task.", defaultValue: [] }
+            {
+                name: "taskId",
+                type: "string",
+                required: true,
+                description: "Linked task id."
+            },
+            {
+                name: "projectId",
+                type: "string|null",
+                required: false,
+                description: "Optional parent project id.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Timebox title shown on the calendar."
+            },
+            {
+                name: "startsAt",
+                type: "ISO datetime",
+                required: true,
+                description: "Start instant in ISO-8601 form."
+            },
+            {
+                name: "endsAt",
+                type: "ISO datetime",
+                required: true,
+                description: "End instant in ISO-8601 form."
+            },
+            {
+                name: "source",
+                type: "manual|suggested|live_run",
+                required: false,
+                description: "How the timebox was created.",
+                enumValues: ["manual", "suggested", "live_run"],
+                defaultValue: "manual"
+            },
+            {
+                name: "status",
+                type: "planned|active|completed|cancelled",
+                required: false,
+                description: "Current timebox state.",
+                enumValues: ["planned", "active", "completed", "cancelled"],
+                defaultValue: "planned"
+            },
+            {
+                name: "overrideReason",
+                type: "string|null",
+                required: false,
+                description: "Audited reason when the slot overrides a blocked context.",
+                defaultValue: null,
+                nullable: true
+            }
+        ]
+    },
+    {
+        entityType: "habit",
+        purpose: "A recurring commitment or recurring slip with explicit cadence, graph links, and XP consequences.",
+        minimumCreateFields: ["title"],
+        relationshipRules: [
+            "Habits can link directly to goals, projects, tasks, values, patterns, behaviors, beliefs, modes, and trigger reports.",
+            "Habits are recurring records, not task variants, and they participate in search, notes, delete/restore, and XP.",
+            "linkedBehaviorId remains a compatibility alias; linkedBehaviorIds is the canonical array form."
+        ],
+        searchHints: [
+            "Search by title before creating a duplicate habit.",
+            "Use linkedTo when the habit should already be attached to a goal, project, task, or Psyche entity."
+        ],
+        examples: [
+            '{"title":"Morning training","frequency":"daily","polarity":"positive","linkedGoalIds":["goal_train_body"],"linkedValueIds":["value_steadiness"],"linkedBehaviorIds":["behavior_regulating_walk"]}'
+        ],
+        fieldGuide: [
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Concrete recurring behavior label."
+            },
+            {
+                name: "description",
+                type: "string",
+                required: false,
+                description: "Markdown definition of what counts as success or failure for this habit.",
+                defaultValue: ""
+            },
+            {
+                name: "status",
+                type: "active|paused|archived",
+                required: false,
+                description: "Lifecycle state.",
+                enumValues: ["active", "paused", "archived"],
+                defaultValue: "active"
+            },
+            {
+                name: "polarity",
+                type: "positive|negative",
+                required: false,
+                description: "Whether doing the behavior is aligned or misaligned.",
+                enumValues: ["positive", "negative"],
+                defaultValue: "positive"
+            },
+            {
+                name: "frequency",
+                type: "daily|weekly",
+                required: false,
+                description: "Recurrence cadence.",
+                enumValues: ["daily", "weekly"],
+                defaultValue: "daily"
+            },
+            {
+                name: "targetCount",
+                type: "integer",
+                required: false,
+                description: "How many repetitions define the cadence window.",
+                defaultValue: 1
+            },
+            {
+                name: "weekDays",
+                type: "integer[]",
+                required: false,
+                description: "Weekday numbers for weekly habits where Monday is 1 and Sunday is 0.",
+                defaultValue: []
+            },
+            {
+                name: "linkedGoalIds",
+                type: "string[]",
+                required: false,
+                description: "Linked goal ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedProjectIds",
+                type: "string[]",
+                required: false,
+                description: "Linked project ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedTaskIds",
+                type: "string[]",
+                required: false,
+                description: "Linked task ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedValueIds",
+                type: "string[]",
+                required: false,
+                description: "Linked value ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedPatternIds",
+                type: "string[]",
+                required: false,
+                description: "Linked pattern ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedBehaviorIds",
+                type: "string[]",
+                required: false,
+                description: "Canonical linked behavior ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedBehaviorId",
+                type: "string|null",
+                required: false,
+                description: "Compatibility alias for the first linked behavior id.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "linkedBeliefIds",
+                type: "string[]",
+                required: false,
+                description: "Linked belief ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedModeIds",
+                type: "string[]",
+                required: false,
+                description: "Linked mode ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedReportIds",
+                type: "string[]",
+                required: false,
+                description: "Linked trigger report ids.",
+                defaultValue: []
+            },
+            {
+                name: "rewardXp",
+                type: "integer",
+                required: false,
+                description: "XP granted on aligned check-ins.",
+                defaultValue: 12
+            },
+            {
+                name: "penaltyXp",
+                type: "integer",
+                required: false,
+                description: "XP removed on misaligned check-ins.",
+                defaultValue: 8
+            }
         ]
     },
     {
         entityType: "note",
-        purpose: "A Markdown note that can link to one or many Forge entities.",
+        purpose: "A first-class Markdown note entity that can link to one or many Forge entities.",
         minimumCreateFields: ["contentMarkdown", "links"],
         relationshipRules: [
             "Notes can link to goals, projects, tasks, Psyche records, and other supported Forge entities.",
-            "When nested under another create flow, notes auto-link to that new entity and can optionally include extra links."
+            "When nested under another create flow, notes auto-link to that new entity and can optionally include extra links.",
+            "Agents can also create standalone notes directly through forge_create_entities with entityType note."
+        ],
+        searchHints: [
+            "Search by Markdown content, author, or linked entity before creating a duplicate note."
         ],
-        searchHints: ["Search by Markdown content, author, or linked entity before creating a duplicate note."],
         examples: [
             '{"contentMarkdown":"Finished the review pass and captured the remaining edge cases.","links":[{"entityType":"task","entityId":"task_123"}]}',
-            '{"contentMarkdown":"Observed a stronger protector response after the meeting.","author":"forge-agent","links":[{"entityType":"trigger_report","entityId":"report_123"},{"entityType":"behavior_pattern","entityId":"pattern_123"}]}'
+            '{"contentMarkdown":"Observed a stronger protector response after the meeting.","author":"forge-agent","tags":["Short-term memory","therapy"],"links":[{"entityType":"trigger_report","entityId":"report_123"},{"entityType":"behavior_pattern","entityId":"pattern_123"}]}',
+            '{"contentMarkdown":"Scratch capture for what I am actively holding in mind.","tags":["Working memory","handoff"],"destroyAt":"2026-04-04T12:00:00.000Z","links":[{"entityType":"task","entityId":"task_123"}]}'
         ],
         fieldGuide: [
-            { name: "contentMarkdown", type: "string", required: true, description: "Markdown body of the note." },
-            { name: "author", type: "string|null", required: false, description: "Optional display author for the note.", defaultValue: null, nullable: true },
-            { name: "links", type: "Array<{ entityType, entityId, anchorKey? }>", required: true, description: "Entities this note should link to." }
+            {
+                name: "contentMarkdown",
+                type: "string",
+                required: true,
+                description: "Markdown body of the note."
+            },
+            {
+                name: "author",
+                type: "string|null",
+                required: false,
+                description: "Optional display author for the note.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "tags",
+                type: "string[]",
+                required: false,
+                description: "Optional note-owned tags such as Working memory, Short-term memory, Episodic memory, Semantic memory, Procedural memory, or custom labels.",
+                defaultValue: []
+            },
+            {
+                name: "destroyAt",
+                type: "ISO datetime|null",
+                required: false,
+                description: "Optional auto-destroy timestamp. If set, Forge deletes the note after that time as ephemeral memory.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "links",
+                type: "Array<{ entityType, entityId, anchorKey? }>",
+                required: true,
+                description: "Entities this note should link to."
+            }
         ]
     },
     {
@@ -213,19 +879,83 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "Insights can optionally point at one entity through entityType and entityId.",
             "Use insights for interpretation or advice, not as a replacement for goals, tasks, or trigger reports."
         ],
-        searchHints: ["Search recent insights before posting a new one if the same pattern may already be captured."],
-        examples: ['{"entityType":"goal","entityId":"goal_create_meaningfully","title":"Admin drag is masking momentum","summary":"Creative progress is happening, but admin cleanup keeps interrupting it.","recommendation":"Protect one clean creative block and isolate admin into a separate recurring task."}'],
+        searchHints: [
+            "Search recent insights before posting a new one if the same pattern may already be captured."
+        ],
+        examples: [
+            '{"entityType":"goal","entityId":"goal_create_meaningfully","title":"Admin drag is masking momentum","summary":"Creative progress is happening, but admin cleanup keeps interrupting it.","recommendation":"Protect one clean creative block and isolate admin into a separate recurring task."}'
+        ],
         fieldGuide: [
-            { name: "entityType", type: "string|null", required: false, description: "Optional linked entity type.", defaultValue: null, nullable: true },
-            { name: "entityId", type: "string|null", required: false, description: "Optional linked entity id.", defaultValue: null, nullable: true },
-            { name: "timeframeLabel", type: "string|null", required: false, description: "Optional time window label.", defaultValue: null, nullable: true },
-            { name: "title", type: "string", required: true, description: "Insight title." },
-            { name: "summary", type: "string", required: true, description: "Short explanation of the pattern or tension." },
-            { name: "recommendation", type: "string", required: true, description: "Actionable next move or reframing." },
-            { name: "rationale", type: "string", required: false, description: "Why this insight is grounded in the data.", defaultValue: "" },
-            { name: "confidence", type: "number", required: false, description: "Confidence from 0 to 1.", defaultValue: 0.7 },
-            { name: "visibility", type: "string", required: false, description: "Visibility mode for the insight.", defaultValue: "visible" },
-            { name: "ctaLabel", type: "string", required: false, description: "CTA shown in the UI.", defaultValue: "Review insight" }
+            {
+                name: "entityType",
+                type: "string|null",
+                required: false,
+                description: "Optional linked entity type.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "entityId",
+                type: "string|null",
+                required: false,
+                description: "Optional linked entity id.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "timeframeLabel",
+                type: "string|null",
+                required: false,
+                description: "Optional time window label.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Insight title."
+            },
+            {
+                name: "summary",
+                type: "string",
+                required: true,
+                description: "Short explanation of the pattern or tension."
+            },
+            {
+                name: "recommendation",
+                type: "string",
+                required: true,
+                description: "Actionable next move or reframing."
+            },
+            {
+                name: "rationale",
+                type: "string",
+                required: false,
+                description: "Why this insight is grounded in the data.",
+                defaultValue: ""
+            },
+            {
+                name: "confidence",
+                type: "number",
+                required: false,
+                description: "Confidence from 0 to 1.",
+                defaultValue: 0.7
+            },
+            {
+                name: "visibility",
+                type: "string",
+                required: false,
+                description: "Visibility mode for the insight.",
+                defaultValue: "visible"
+            },
+            {
+                name: "ctaLabel",
+                type: "string",
+                required: false,
+                description: "CTA shown in the UI.",
+                defaultValue: "Review insight"
+            }
         ]
     },
     {
@@ -236,10 +966,24 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "Trigger reports can reference one event type through eventTypeId.",
             "Use event types to normalize repeated report categories instead of inventing new wording every time."
         ],
-        searchHints: ["Search by label before creating a new event type.", "Prefer existing event types when one clearly fits the situation."],
+        searchHints: [
+            "Search by label before creating a new event type.",
+            "Prefer existing event types when one clearly fits the situation."
+        ],
         fieldGuide: [
-            { name: "label", type: "string", required: true, description: "Human-readable event type label." },
-            { name: "description", type: "string", required: false, description: "What kind of incident this event type represents.", defaultValue: "" }
+            {
+                name: "label",
+                type: "string",
+                required: true,
+                description: "Human-readable event type label."
+            },
+            {
+                name: "description",
+                type: "string",
+                required: false,
+                description: "What kind of incident this event type represents.",
+                defaultValue: ""
+            }
         ]
     },
     {
@@ -250,11 +994,31 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "Trigger report emotions can reference an emotion definition through emotionDefinitionId.",
             "Use emotion definitions to normalize repeated emotional labels across reports."
         ],
-        searchHints: ["Search by label before creating a new emotion definition.", "Prefer an existing emotion definition when the label already captures the feeling well."],
+        searchHints: [
+            "Search by label before creating a new emotion definition.",
+            "Prefer an existing emotion definition when the label already captures the feeling well."
+        ],
         fieldGuide: [
-            { name: "label", type: "string", required: true, description: "Emotion label." },
-            { name: "description", type: "string", required: false, description: "What this emotion label is meant to capture.", defaultValue: "" },
-            { name: "category", type: "string", required: false, description: "Optional grouping such as threat, grief, anger, or connection.", defaultValue: "" }
+            {
+                name: "label",
+                type: "string",
+                required: true,
+                description: "Emotion label."
+            },
+            {
+                name: "description",
+                type: "string",
+                required: false,
+                description: "What this emotion label is meant to capture.",
+                defaultValue: ""
+            },
+            {
+                name: "category",
+                type: "string",
+                required: false,
+                description: "Optional grouping such as threat, grief, anger, or connection.",
+                defaultValue: ""
+            }
         ]
     },
     {
@@ -265,17 +1029,69 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "Values can link to goals, projects, and tasks.",
             "Patterns, behaviors, beliefs, and reports can all point back to values."
         ],
-        searchHints: ["Search by title before creating a new value.", "Use linkedTo if the value should already be attached to a goal or task."],
-        examples: ['{"title":"Steadiness","valuedDirection":"Respond calmly instead of collapsing or reacting fast.","whyItMatters":"I want to stay grounded in relationships and work."}'],
+        searchHints: [
+            "Search by title before creating a new value.",
+            "Use linkedTo if the value should already be attached to a goal or task."
+        ],
+        examples: [
+            '{"title":"Steadiness","valuedDirection":"Respond calmly instead of collapsing or reacting fast.","whyItMatters":"I want to stay grounded in relationships and work."}'
+        ],
         fieldGuide: [
-            { name: "title", type: "string", required: true, description: "Value name." },
-            { name: "description", type: "string", required: false, description: "What the value means in practice.", defaultValue: "" },
-            { name: "valuedDirection", type: "string", required: false, description: "How the user wants to live or act when guided by this value.", defaultValue: "" },
-            { name: "whyItMatters", type: "string", required: false, description: "Why the value matters to the user.", defaultValue: "" },
-            { name: "linkedGoalIds", type: "string[]", required: false, description: "Linked goal ids.", defaultValue: [] },
-            { name: "linkedProjectIds", type: "string[]", required: false, description: "Linked project ids.", defaultValue: [] },
-            { name: "linkedTaskIds", type: "string[]", required: false, description: "Linked task ids.", defaultValue: [] },
-            { name: "committedActions", type: "string[]", required: false, description: "Small concrete actions that enact the value.", defaultValue: [] }
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Value name."
+            },
+            {
+                name: "description",
+                type: "string",
+                required: false,
+                description: "What the value means in practice.",
+                defaultValue: ""
+            },
+            {
+                name: "valuedDirection",
+                type: "string",
+                required: false,
+                description: "How the user wants to live or act when guided by this value.",
+                defaultValue: ""
+            },
+            {
+                name: "whyItMatters",
+                type: "string",
+                required: false,
+                description: "Why the value matters to the user.",
+                defaultValue: ""
+            },
+            {
+                name: "linkedGoalIds",
+                type: "string[]",
+                required: false,
+                description: "Linked goal ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedProjectIds",
+                type: "string[]",
+                required: false,
+                description: "Linked project ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedTaskIds",
+                type: "string[]",
+                required: false,
+                description: "Linked task ids.",
+                defaultValue: []
+            },
+            {
+                name: "committedActions",
+                type: "string[]",
+                required: false,
+                description: "Small concrete actions that enact the value.",
+                defaultValue: []
+            }
         ]
     },
     {
@@ -286,21 +1102,96 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "Patterns can link to values, beliefs, and modes.",
             "Trigger reports can link back to patterns they instantiate."
         ],
-        searchHints: ["Search by title or by trigger language before creating a new pattern."],
-        examples: ['{"title":"Late-night father text freeze","cueContexts":["Father texts late at night"],"targetBehavior":"Freeze, avoid replying, and doomscroll","shortTermPayoff":"Avoids immediate overwhelm","longTermCost":"Sleep loss, guilt, and dread","preferredResponse":"Pause, regulate, and reply on my own terms the next morning"}'],
+        searchHints: [
+            "Search by title or by trigger language before creating a new pattern."
+        ],
+        examples: [
+            '{"title":"Late-night father text freeze","cueContexts":["Father texts late at night"],"targetBehavior":"Freeze, avoid replying, and doomscroll","shortTermPayoff":"Avoids immediate overwhelm","longTermCost":"Sleep loss, guilt, and dread","preferredResponse":"Pause, regulate, and reply on my own terms the next morning"}'
+        ],
         fieldGuide: [
-            { name: "title", type: "string", required: true, description: "Short pattern name." },
-            { name: "description", type: "string", required: false, description: "What usually happens in this loop.", defaultValue: "" },
-            { name: "targetBehavior", type: "string", required: false, description: "The visible behavior this pattern tends to produce.", defaultValue: "" },
-            { name: "cueContexts", type: "string[]", required: false, description: "Typical cues, contexts, or triggers.", defaultValue: [] },
-            { name: "shortTermPayoff", type: "string", required: false, description: "What the loop gives immediately.", defaultValue: "" },
-            { name: "longTermCost", type: "string", required: false, description: "What the loop costs later.", defaultValue: "" },
-            { name: "preferredResponse", type: "string", required: false, description: "Preferred alternative response.", defaultValue: "" },
-            { name: "linkedValueIds", type: "string[]", required: false, description: "Linked value ids.", defaultValue: [] },
-            { name: "linkedSchemaLabels", type: "string[]", required: false, description: "Schema labels involved in the pattern.", defaultValue: [] },
-            { name: "linkedModeLabels", type: "string[]", required: false, description: "Mode labels involved in the pattern.", defaultValue: [] },
-            { name: "linkedModeIds", type: "string[]", required: false, description: "Linked mode ids.", defaultValue: [] },
-            { name: "linkedBeliefIds", type: "string[]", required: false, description: "Linked belief ids.", defaultValue: [] }
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Short pattern name."
+            },
+            {
+                name: "description",
+                type: "string",
+                required: false,
+                description: "What usually happens in this loop.",
+                defaultValue: ""
+            },
+            {
+                name: "targetBehavior",
+                type: "string",
+                required: false,
+                description: "The visible behavior this pattern tends to produce.",
+                defaultValue: ""
+            },
+            {
+                name: "cueContexts",
+                type: "string[]",
+                required: false,
+                description: "Typical cues, contexts, or triggers.",
+                defaultValue: []
+            },
+            {
+                name: "shortTermPayoff",
+                type: "string",
+                required: false,
+                description: "What the loop gives immediately.",
+                defaultValue: ""
+            },
+            {
+                name: "longTermCost",
+                type: "string",
+                required: false,
+                description: "What the loop costs later.",
+                defaultValue: ""
+            },
+            {
+                name: "preferredResponse",
+                type: "string",
+                required: false,
+                description: "Preferred alternative response.",
+                defaultValue: ""
+            },
+            {
+                name: "linkedValueIds",
+                type: "string[]",
+                required: false,
+                description: "Linked value ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedSchemaLabels",
+                type: "string[]",
+                required: false,
+                description: "Schema labels involved in the pattern.",
+                defaultValue: []
+            },
+            {
+                name: "linkedModeLabels",
+                type: "string[]",
+                required: false,
+                description: "Mode labels involved in the pattern.",
+                defaultValue: []
+            },
+            {
+                name: "linkedModeIds",
+                type: "string[]",
+                required: false,
+                description: "Linked mode ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedBeliefIds",
+                type: "string[]",
+                required: false,
+                description: "Linked belief ids.",
+                defaultValue: []
+            }
         ]
     },
     {
@@ -312,21 +1203,100 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "Trigger reports can link to behaviors they contained."
         ],
         searchHints: ["Search by title and kind before creating a new behavior."],
-        examples: ['{"kind":"away","title":"Doomscroll after conflict cue","commonCues":["Received a critical text"],"shortTermPayoff":"Numbs the anxiety","longTermCost":"Loses time and deepens shame","replacementMove":"Put phone down and take one slow lap outside"}'],
+        examples: [
+            '{"kind":"away","title":"Doomscroll after conflict cue","commonCues":["Received a critical text"],"shortTermPayoff":"Numbs the anxiety","longTermCost":"Loses time and deepens shame","replacementMove":"Put phone down and take one slow lap outside"}'
+        ],
         fieldGuide: [
-            { name: "kind", type: "away|committed|recovery", required: true, description: "Whether the behavior moves away from values, toward them, or repairs after rupture.", enumValues: ["away", "committed", "recovery"] },
-            { name: "title", type: "string", required: true, description: "Behavior label." },
-            { name: "description", type: "string", required: false, description: "What the behavior looks like.", defaultValue: "" },
-            { name: "commonCues", type: "string[]", required: false, description: "Typical cues for this behavior.", defaultValue: [] },
-            { name: "urgeStory", type: "string", required: false, description: "What the inner urge or story feels like.", defaultValue: "" },
-            { name: "shortTermPayoff", type: "string", required: false, description: "Immediate payoff.", defaultValue: "" },
-            { name: "longTermCost", type: "string", required: false, description: "Longer-term cost.", defaultValue: "" },
-            { name: "replacementMove", type: "string", required: false, description: "Preferred replacement move.", defaultValue: "" },
-            { name: "repairPlan", type: "string", required: false, description: "Repair plan after the behavior occurs.", defaultValue: "" },
-            { name: "linkedPatternIds", type: "string[]", required: false, description: "Linked behavior pattern ids.", defaultValue: [] },
-            { name: "linkedValueIds", type: "string[]", required: false, description: "Linked value ids.", defaultValue: [] },
-            { name: "linkedSchemaIds", type: "string[]", required: false, description: "Linked schema ids.", defaultValue: [] },
-            { name: "linkedModeIds", type: "string[]", required: false, description: "Linked mode ids.", defaultValue: [] }
+            {
+                name: "kind",
+                type: "away|committed|recovery",
+                required: true,
+                description: "Whether the behavior moves away from values, toward them, or repairs after rupture.",
+                enumValues: ["away", "committed", "recovery"]
+            },
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Behavior label."
+            },
+            {
+                name: "description",
+                type: "string",
+                required: false,
+                description: "What the behavior looks like.",
+                defaultValue: ""
+            },
+            {
+                name: "commonCues",
+                type: "string[]",
+                required: false,
+                description: "Typical cues for this behavior.",
+                defaultValue: []
+            },
+            {
+                name: "urgeStory",
+                type: "string",
+                required: false,
+                description: "What the inner urge or story feels like.",
+                defaultValue: ""
+            },
+            {
+                name: "shortTermPayoff",
+                type: "string",
+                required: false,
+                description: "Immediate payoff.",
+                defaultValue: ""
+            },
+            {
+                name: "longTermCost",
+                type: "string",
+                required: false,
+                description: "Longer-term cost.",
+                defaultValue: ""
+            },
+            {
+                name: "replacementMove",
+                type: "string",
+                required: false,
+                description: "Preferred replacement move.",
+                defaultValue: ""
+            },
+            {
+                name: "repairPlan",
+                type: "string",
+                required: false,
+                description: "Repair plan after the behavior occurs.",
+                defaultValue: ""
+            },
+            {
+                name: "linkedPatternIds",
+                type: "string[]",
+                required: false,
+                description: "Linked behavior pattern ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedValueIds",
+                type: "string[]",
+                required: false,
+                description: "Linked value ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedSchemaIds",
+                type: "string[]",
+                required: false,
+                description: "Linked schema ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedModeIds",
+                type: "string[]",
+                required: false,
+                description: "Linked mode ids.",
+                defaultValue: []
+            }
         ]
     },
     {
@@ -337,21 +1307,97 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "Beliefs can link to values, behaviors, modes, and trigger reports.",
             "Behavior patterns can point to beliefs that keep the loop alive."
         ],
-        searchHints: ["Search by statement or known schema theme before creating a new belief entry."],
-        examples: ['{"statement":"If I disappoint people, they will leave me.","beliefType":"conditional","confidence":82,"evidenceFor":["People got cold when I failed them before"],"evidenceAgainst":["Some people stayed with me even after conflict"],"flexibleAlternative":"Disappointing someone can strain a relationship, but it does not automatically mean abandonment."}'],
+        searchHints: [
+            "Search by statement or known schema theme before creating a new belief entry."
+        ],
+        examples: [
+            '{"statement":"If I disappoint people, they will leave me.","beliefType":"conditional","confidence":82,"evidenceFor":["People got cold when I failed them before"],"evidenceAgainst":["Some people stayed with me even after conflict"],"flexibleAlternative":"Disappointing someone can strain a relationship, but it does not automatically mean abandonment."}'
+        ],
         fieldGuide: [
-            { name: "schemaId", type: "string|null", required: false, description: "Optional linked schema catalog id.", defaultValue: null, nullable: true },
-            { name: "statement", type: "string", required: true, description: "Belief statement in the user's own words." },
-            { name: "beliefType", type: "absolute|conditional", required: true, description: "Whether the belief is absolute or if-then shaped.", enumValues: ["absolute", "conditional"] },
-            { name: "originNote", type: "string", required: false, description: "Where the belief seems to come from.", defaultValue: "" },
-            { name: "confidence", type: "integer", required: false, description: "How strongly the belief feels true from 0 to 100.", defaultValue: 60 },
-            { name: "evidenceFor", type: "string[]", required: false, description: "Evidence that seems to support the belief.", defaultValue: [] },
-            { name: "evidenceAgainst", type: "string[]", required: false, description: "Evidence that weakens the belief.", defaultValue: [] },
-            { name: "flexibleAlternative", type: "string", required: false, description: "More flexible alternative belief.", defaultValue: "" },
-            { name: "linkedValueIds", type: "string[]", required: false, description: "Linked value ids.", defaultValue: [] },
-            { name: "linkedBehaviorIds", type: "string[]", required: false, description: "Linked behavior ids.", defaultValue: [] },
-            { name: "linkedModeIds", type: "string[]", required: false, description: "Linked mode ids.", defaultValue: [] },
-            { name: "linkedReportIds", type: "string[]", required: false, description: "Linked trigger report ids.", defaultValue: [] }
+            {
+                name: "schemaId",
+                type: "string|null",
+                required: false,
+                description: "Optional linked schema catalog id.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "statement",
+                type: "string",
+                required: true,
+                description: "Belief statement in the user's own words."
+            },
+            {
+                name: "beliefType",
+                type: "absolute|conditional",
+                required: true,
+                description: "Whether the belief is absolute or if-then shaped.",
+                enumValues: ["absolute", "conditional"]
+            },
+            {
+                name: "originNote",
+                type: "string",
+                required: false,
+                description: "Where the belief seems to come from.",
+                defaultValue: ""
+            },
+            {
+                name: "confidence",
+                type: "integer",
+                required: false,
+                description: "How strongly the belief feels true from 0 to 100.",
+                defaultValue: 60
+            },
+            {
+                name: "evidenceFor",
+                type: "string[]",
+                required: false,
+                description: "Evidence that seems to support the belief.",
+                defaultValue: []
+            },
+            {
+                name: "evidenceAgainst",
+                type: "string[]",
+                required: false,
+                description: "Evidence that weakens the belief.",
+                defaultValue: []
+            },
+            {
+                name: "flexibleAlternative",
+                type: "string",
+                required: false,
+                description: "More flexible alternative belief.",
+                defaultValue: ""
+            },
+            {
+                name: "linkedValueIds",
+                type: "string[]",
+                required: false,
+                description: "Linked value ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedBehaviorIds",
+                type: "string[]",
+                required: false,
+                description: "Linked behavior ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedModeIds",
+                type: "string[]",
+                required: false,
+                description: "Linked mode ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedReportIds",
+                type: "string[]",
+                required: false,
+                description: "Linked trigger report ids.",
+                defaultValue: []
+            }
         ]
     },
     {
@@ -362,24 +1408,124 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "Modes can link to patterns, behaviors, and values.",
             "Trigger reports can include linkedModeIds and modeOverlays that reference modes."
         ],
-        searchHints: ["Search by title or family before creating a new mode profile."],
-        examples: ['{"family":"coping","title":"Cold controller","fear":"If I soften, I will be humiliated or lose control.","protectiveJob":"Stay hyper-competent and unreachable when threatened."}'],
+        searchHints: [
+            "Search by title or family before creating a new mode profile."
+        ],
+        examples: [
+            '{"family":"coping","title":"Cold controller","fear":"If I soften, I will be humiliated or lose control.","protectiveJob":"Stay hyper-competent and unreachable when threatened."}'
+        ],
         fieldGuide: [
-            { name: "family", type: "coping|child|critic_parent|healthy_adult|happy_child", required: true, description: "Mode family.", enumValues: ["coping", "child", "critic_parent", "healthy_adult", "happy_child"] },
-            { name: "title", type: "string", required: true, description: "Mode title." },
-            { name: "archetype", type: "string", required: false, description: "Optional archetype label.", defaultValue: "" },
-            { name: "persona", type: "string", required: false, description: "Narrative or felt sense of the mode.", defaultValue: "" },
-            { name: "imagery", type: "string", required: false, description: "Imagery associated with the mode.", defaultValue: "" },
-            { name: "symbolicForm", type: "string", required: false, description: "Symbolic form or metaphor.", defaultValue: "" },
-            { name: "facialExpression", type: "string", required: false, description: "Typical facial expression or posture.", defaultValue: "" },
-            { name: "fear", type: "string", required: false, description: "Core fear carried by the mode.", defaultValue: "" },
-            { name: "burden", type: "string", required: false, description: "Burden or pain the mode carries.", defaultValue: "" },
-            { name: "protectiveJob", type: "string", required: false, description: "What job the mode thinks it is doing.", defaultValue: "" },
-            { name: "originContext", type: "string", required: false, description: "Where the mode seems to come from.", defaultValue: "" },
-            { name: "firstAppearanceAt", type: "string|null", required: false, description: "Optional first-seen marker.", defaultValue: null, nullable: true },
-            { name: "linkedPatternIds", type: "string[]", required: false, description: "Linked pattern ids.", defaultValue: [] },
-            { name: "linkedBehaviorIds", type: "string[]", required: false, description: "Linked behavior ids.", defaultValue: [] },
-            { name: "linkedValueIds", type: "string[]", required: false, description: "Linked value ids.", defaultValue: [] }
+            {
+                name: "family",
+                type: "coping|child|critic_parent|healthy_adult|happy_child",
+                required: true,
+                description: "Mode family.",
+                enumValues: [
+                    "coping",
+                    "child",
+                    "critic_parent",
+                    "healthy_adult",
+                    "happy_child"
+                ]
+            },
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Mode title."
+            },
+            {
+                name: "archetype",
+                type: "string",
+                required: false,
+                description: "Optional archetype label.",
+                defaultValue: ""
+            },
+            {
+                name: "persona",
+                type: "string",
+                required: false,
+                description: "Narrative or felt sense of the mode.",
+                defaultValue: ""
+            },
+            {
+                name: "imagery",
+                type: "string",
+                required: false,
+                description: "Imagery associated with the mode.",
+                defaultValue: ""
+            },
+            {
+                name: "symbolicForm",
+                type: "string",
+                required: false,
+                description: "Symbolic form or metaphor.",
+                defaultValue: ""
+            },
+            {
+                name: "facialExpression",
+                type: "string",
+                required: false,
+                description: "Typical facial expression or posture.",
+                defaultValue: ""
+            },
+            {
+                name: "fear",
+                type: "string",
+                required: false,
+                description: "Core fear carried by the mode.",
+                defaultValue: ""
+            },
+            {
+                name: "burden",
+                type: "string",
+                required: false,
+                description: "Burden or pain the mode carries.",
+                defaultValue: ""
+            },
+            {
+                name: "protectiveJob",
+                type: "string",
+                required: false,
+                description: "What job the mode thinks it is doing.",
+                defaultValue: ""
+            },
+            {
+                name: "originContext",
+                type: "string",
+                required: false,
+                description: "Where the mode seems to come from.",
+                defaultValue: ""
+            },
+            {
+                name: "firstAppearanceAt",
+                type: "string|null",
+                required: false,
+                description: "Optional first-seen marker.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "linkedPatternIds",
+                type: "string[]",
+                required: false,
+                description: "Linked pattern ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedBehaviorIds",
+                type: "string[]",
+                required: false,
+                description: "Linked behavior ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedValueIds",
+                type: "string[]",
+                required: false,
+                description: "Linked value ids.",
+                defaultValue: []
+            }
         ]
     },
     {
@@ -390,12 +1536,31 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "Mode guide sessions help the user reason toward likely modes before or alongside mode profiles.",
             "Use mode guide sessions for guided interpretation, not as a replacement for durable mode profiles."
         ],
-        searchHints: ["Search by summary when revisiting a prior guided mode session."],
-        examples: ['{"summary":"Mapping the part that takes over under criticism","answers":[{"questionKey":"felt_shift","value":"I go cold and rigid"}],"results":[{"family":"coping","archetype":"detached_protector","label":"Cold controller","confidence":0.74,"reasoning":"It distances from shame and tries to stay untouchable."}]}'],
+        searchHints: [
+            "Search by summary when revisiting a prior guided mode session."
+        ],
+        examples: [
+            '{"summary":"Mapping the part that takes over under criticism","answers":[{"questionKey":"felt_shift","value":"I go cold and rigid"}],"results":[{"family":"coping","archetype":"detached_protector","label":"Cold controller","confidence":0.74,"reasoning":"It distances from shame and tries to stay untouchable."}]}'
+        ],
         fieldGuide: [
-            { name: "summary", type: "string", required: true, description: "Short summary of what the guided session explored." },
-            { name: "answers", type: "array", required: true, description: "List of { questionKey, value } items capturing the user's guided answers." },
-            { name: "results", type: "array", required: true, description: "List of { family, archetype, label, confidence 0-1, reasoning } candidate mode interpretations." }
+            {
+                name: "summary",
+                type: "string",
+                required: true,
+                description: "Short summary of what the guided session explored."
+            },
+            {
+                name: "answers",
+                type: "array",
+                required: true,
+                description: "List of { questionKey, value } items capturing the user's guided answers."
+            },
+            {
+                name: "results",
+                type: "array",
+                required: true,
+                description: "List of { family, archetype, label, confidence 0-1, reasoning } candidate mode interpretations."
+            }
         ]
     },
     {
@@ -407,31 +1572,168 @@ const AGENT_ONBOARDING_ENTITY_CATALOG = [
             "A report is the best container for one specific emotionally meaningful episode.",
             "Use reports when you need one event chain, not just a generic pattern."
         ],
-        searchHints: ["Search by title, event wording, or linked entities before creating a duplicate report."],
-        examples: ['{"title":"Partner said we need to talk and I spiraled","customEventType":"relationship threat","eventSituation":"My partner texted that we needed to talk tonight.","emotions":[{"label":"fear","intensity":85},{"label":"shame","intensity":60}],"thoughts":[{"text":"This means I messed everything up."}],"behaviors":[{"text":"Paced, catastrophized, and checked my phone repeatedly"}],"nextMoves":["Wait until we speak before predicting the outcome","Write down the facts I actually know"]}'],
+        searchHints: [
+            "Search by title, event wording, or linked entities before creating a duplicate report."
+        ],
+        examples: [
+            '{"title":"Partner said we need to talk and I spiraled","customEventType":"relationship threat","eventSituation":"My partner texted that we needed to talk tonight.","emotions":[{"label":"fear","intensity":85},{"label":"shame","intensity":60}],"thoughts":[{"text":"This means I messed everything up."}],"behaviors":[{"text":"Paced, catastrophized, and checked my phone repeatedly"}],"nextMoves":["Wait until we speak before predicting the outcome","Write down the facts I actually know"]}'
+        ],
         fieldGuide: [
-            { name: "title", type: "string", required: true, description: "Short name for the incident." },
-            { name: "status", type: "draft|reviewed|integrated", required: false, description: "Reflection progress state.", enumValues: ["draft", "reviewed", "integrated"], defaultValue: "draft" },
-            { name: "eventTypeId", type: "string|null", required: false, description: "Known event type id if already cataloged.", defaultValue: null, nullable: true },
-            { name: "customEventType", type: "string", required: false, description: "Free-text event type when no existing type fits.", defaultValue: "" },
-            { name: "eventSituation", type: "string", required: false, description: "What happened in the situation.", defaultValue: "" },
-            { name: "occurredAt", type: "string|null", required: false, description: "When it happened.", defaultValue: null, nullable: true },
-            { name: "emotions", type: "array", required: false, description: "List of { emotionDefinitionId|null, label, intensity 0-100, note } items.", defaultValue: [] },
-            { name: "thoughts", type: "array", required: false, description: "List of { text, parentMode, criticMode, beliefId|null } items.", defaultValue: [] },
-            { name: "behaviors", type: "array", required: false, description: "List of { text, mode, behaviorId|null } items.", defaultValue: [] },
-            { name: "consequences", type: "object", required: false, description: "Object with selfShortTerm, selfLongTerm, othersShortTerm, othersLongTerm string arrays." },
-            { name: "linkedPatternIds", type: "string[]", required: false, description: "Linked pattern ids.", defaultValue: [] },
-            { name: "linkedValueIds", type: "string[]", required: false, description: "Linked value ids.", defaultValue: [] },
-            { name: "linkedGoalIds", type: "string[]", required: false, description: "Linked goal ids.", defaultValue: [] },
-            { name: "linkedProjectIds", type: "string[]", required: false, description: "Linked project ids.", defaultValue: [] },
-            { name: "linkedTaskIds", type: "string[]", required: false, description: "Linked task ids.", defaultValue: [] },
-            { name: "linkedBehaviorIds", type: "string[]", required: false, description: "Linked behavior ids.", defaultValue: [] },
-            { name: "linkedBeliefIds", type: "string[]", required: false, description: "Linked belief ids.", defaultValue: [] },
-            { name: "linkedModeIds", type: "string[]", required: false, description: "Linked mode ids.", defaultValue: [] },
-            { name: "modeOverlays", type: "string[]", required: false, description: "Extra mode labels noticed during the incident.", defaultValue: [] },
-            { name: "schemaLinks", type: "string[]", required: false, description: "Schema names or themes that seem related to the incident.", defaultValue: [] },
-            { name: "modeTimeline", type: "array", required: false, description: "List of { stage, modeId|null, label, note } items describing the sequence of modes.", defaultValue: [] },
-            { name: "nextMoves", type: "string[]", required: false, description: "Concrete next steps or repair moves.", defaultValue: [] }
+            {
+                name: "title",
+                type: "string",
+                required: true,
+                description: "Short name for the incident."
+            },
+            {
+                name: "status",
+                type: "draft|reviewed|integrated",
+                required: false,
+                description: "Reflection progress state.",
+                enumValues: ["draft", "reviewed", "integrated"],
+                defaultValue: "draft"
+            },
+            {
+                name: "eventTypeId",
+                type: "string|null",
+                required: false,
+                description: "Known event type id if already cataloged.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "customEventType",
+                type: "string",
+                required: false,
+                description: "Free-text event type when no existing type fits.",
+                defaultValue: ""
+            },
+            {
+                name: "eventSituation",
+                type: "string",
+                required: false,
+                description: "What happened in the situation.",
+                defaultValue: ""
+            },
+            {
+                name: "occurredAt",
+                type: "string|null",
+                required: false,
+                description: "When it happened.",
+                defaultValue: null,
+                nullable: true
+            },
+            {
+                name: "emotions",
+                type: "array",
+                required: false,
+                description: "List of { emotionDefinitionId|null, label, intensity 0-100, note } items.",
+                defaultValue: []
+            },
+            {
+                name: "thoughts",
+                type: "array",
+                required: false,
+                description: "List of { text, parentMode, criticMode, beliefId|null } items.",
+                defaultValue: []
+            },
+            {
+                name: "behaviors",
+                type: "array",
+                required: false,
+                description: "List of { text, mode, behaviorId|null } items.",
+                defaultValue: []
+            },
+            {
+                name: "consequences",
+                type: "object",
+                required: false,
+                description: "Object with selfShortTerm, selfLongTerm, othersShortTerm, othersLongTerm string arrays."
+            },
+            {
+                name: "linkedPatternIds",
+                type: "string[]",
+                required: false,
+                description: "Linked pattern ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedValueIds",
+                type: "string[]",
+                required: false,
+                description: "Linked value ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedGoalIds",
+                type: "string[]",
+                required: false,
+                description: "Linked goal ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedProjectIds",
+                type: "string[]",
+                required: false,
+                description: "Linked project ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedTaskIds",
+                type: "string[]",
+                required: false,
+                description: "Linked task ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedBehaviorIds",
+                type: "string[]",
+                required: false,
+                description: "Linked behavior ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedBeliefIds",
+                type: "string[]",
+                required: false,
+                description: "Linked belief ids.",
+                defaultValue: []
+            },
+            {
+                name: "linkedModeIds",
+                type: "string[]",
+                required: false,
+                description: "Linked mode ids.",
+                defaultValue: []
+            },
+            {
+                name: "modeOverlays",
+                type: "string[]",
+                required: false,
+                description: "Extra mode labels noticed during the incident.",
+                defaultValue: []
+            },
+            {
+                name: "schemaLinks",
+                type: "string[]",
+                required: false,
+                description: "Schema names or themes that seem related to the incident.",
+                defaultValue: []
+            },
+            {
+                name: "modeTimeline",
+                type: "array",
+                required: false,
+                description: "List of { stage, modeId|null, label, note } items describing the sequence of modes.",
+                defaultValue: []
+            },
+            {
+                name: "nextMoves",
+                type: "string[]",
+                required: false,
+                description: "Concrete next steps or repair moves.",
+                defaultValue: []
+            }
         ]
     }
 ];
@@ -449,7 +1751,17 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
             "Name the preferred alternative response."
         ],
         requiredForCreate: ["title"],
-        highValueOptionalFields: ["description", "targetBehavior", "cueContexts", "shortTermPayoff", "longTermCost", "preferredResponse", "linkedBeliefIds", "linkedModeIds", "linkedValueIds"],
+        highValueOptionalFields: [
+            "description",
+            "targetBehavior",
+            "cueContexts",
+            "shortTermPayoff",
+            "longTermCost",
+            "preferredResponse",
+            "linkedBeliefIds",
+            "linkedModeIds",
+            "linkedValueIds"
+        ],
         exampleQuestions: [
             "What usually sets this loop off?",
             "What do you tend to do next, outwardly or inwardly?",
@@ -475,7 +1787,17 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
             "Link a schemaId only when a real schema catalog match is known."
         ],
         requiredForCreate: ["statement", "beliefType"],
-        highValueOptionalFields: ["schemaId", "confidence", "originNote", "evidenceFor", "evidenceAgainst", "flexibleAlternative", "linkedReportIds", "linkedBehaviorIds", "linkedModeIds"],
+        highValueOptionalFields: [
+            "schemaId",
+            "confidence",
+            "originNote",
+            "evidenceFor",
+            "evidenceAgainst",
+            "flexibleAlternative",
+            "linkedReportIds",
+            "linkedBehaviorIds",
+            "linkedModeIds"
+        ],
         exampleQuestions: [
             "What is the sentence your mind seems to be pushing here?",
             "Is it more of an always/never belief, or an if-then rule?",
@@ -500,7 +1822,17 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
             "Optionally note origin context and linked patterns or behaviors."
         ],
         requiredForCreate: ["family", "title"],
-        highValueOptionalFields: ["persona", "imagery", "fear", "burden", "protectiveJob", "originContext", "linkedPatternIds", "linkedBehaviorIds", "linkedValueIds"],
+        highValueOptionalFields: [
+            "persona",
+            "imagery",
+            "fear",
+            "burden",
+            "protectiveJob",
+            "originContext",
+            "linkedPatternIds",
+            "linkedBehaviorIds",
+            "linkedValueIds"
+        ],
         exampleQuestions: [
             "What kind of part does this feel like: coping, child, critic-parent, healthy-adult, or happy-child?",
             "If you gave this mode a name, what would it be?",
@@ -526,7 +1858,22 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
             "Identify next moves and linked patterns, beliefs, modes, values, or tasks."
         ],
         requiredForCreate: ["title"],
-        highValueOptionalFields: ["eventTypeId", "customEventType", "eventSituation", "occurredAt", "emotions", "thoughts", "behaviors", "consequences", "modeTimeline", "nextMoves", "linkedPatternIds", "linkedBeliefIds", "linkedModeIds", "linkedValueIds"],
+        highValueOptionalFields: [
+            "eventTypeId",
+            "customEventType",
+            "eventSituation",
+            "occurredAt",
+            "emotions",
+            "thoughts",
+            "behaviors",
+            "consequences",
+            "modeTimeline",
+            "nextMoves",
+            "linkedPatternIds",
+            "linkedBeliefIds",
+            "linkedModeIds",
+            "linkedValueIds"
+        ],
         exampleQuestions: [
             "What happened, as concretely as you can say it?",
             "What emotions were there, and how intense were they?",
@@ -559,11 +1906,16 @@ const AGENT_ONBOARDING_TOOL_INPUT_CATALOG = [
         summary: "Create one or more entities in one ordered batch.",
         whenToUse: "Use after explicit save intent and after duplicate checks when needed.",
         inputShape: "{ atomic?: boolean, operations: Array<{ entityType: CrudEntityType, clientRef?: string, data: object }> }",
-        requiredFields: ["operations", "operations[].entityType", "operations[].data"],
+        requiredFields: [
+            "operations",
+            "operations[].entityType",
+            "operations[].data"
+        ],
         notes: [
             "entityType alone is never enough; full data is required.",
             "Batch multiple related creates together when they come from one user ask.",
-            "Goal, project, and task creates can include notes: [{ contentMarkdown, author?, links? }] and Forge will auto-link those notes to the newly created entity."
+            "Goal, project, and task creates can include notes: [{ contentMarkdown, author?, tags?, destroyAt?, links? }] and Forge will auto-link those notes to the newly created entity.",
+            "The same batch create route also handles calendar_event, work_block_template, and task_timebox. Calendar-event creates still trigger downstream projection sync when a writable provider calendar is selected."
         ],
         example: '{"operations":[{"entityType":"task","data":{"title":"Write the public release notes","projectId":"project_123","status":"focus","notes":[{"contentMarkdown":"Starting from the changelog draft and the last QA pass."}]},"clientRef":"task-1"}]}'
     },
@@ -572,17 +1924,37 @@ const AGENT_ONBOARDING_TOOL_INPUT_CATALOG = [
         summary: "Patch one or more entities in one ordered batch.",
         whenToUse: "Use when ids are known and the user explicitly wants a change persisted.",
         inputShape: "{ atomic?: boolean, operations: Array<{ entityType: CrudEntityType, id: string, clientRef?: string, patch: object }> }",
-        requiredFields: ["operations", "operations[].entityType", "operations[].id", "operations[].patch"],
-        notes: ["patch is partial; only send the fields that should change."],
-        example: '{"operations":[{"entityType":"task","id":"task_123","patch":{"status":"focus","priority":"high"},"clientRef":"task-patch-1"}]}'
+        requiredFields: [
+            "operations",
+            "operations[].entityType",
+            "operations[].id",
+            "operations[].patch"
+        ],
+        notes: [
+            "patch is partial; only send the fields that should change.",
+            "Project lifecycle is status-driven: patch project.status to active, paused, or completed instead of looking for separate suspend, restart, or finish routes.",
+            "Setting project.status to completed finishes the project and auto-completes linked unfinished tasks through the normal task completion path.",
+            "Task and project scheduling rules stay on these same entity patches. Update task.schedulingRules, task.plannedDurationSeconds, or project.schedulingRules here.",
+            "Use this same route to move or relink calendar_event records and to edit work_block_template or task_timebox records without switching to narrower calendar CRUD tools."
+        ],
+        example: '{"operations":[{"entityType":"project","id":"project_123","patch":{"status":"completed"},"clientRef":"project-finish-1"}]}'
     },
     {
         toolName: "forge_delete_entities",
         summary: "Delete one or more entities through the batch delete flow.",
         whenToUse: "Use for explicit delete intent only.",
-        inputShape: "{ atomic?: boolean, operations: Array<{ entityType: CrudEntityType, id: string, clientRef?: string, mode?: \"soft\"|\"hard\", reason?: string }> }",
-        requiredFields: ["operations", "operations[].entityType", "operations[].id"],
-        notes: ["Delete defaults to soft.", "Use mode=hard only for explicit permanent removal."],
+        inputShape: '{ atomic?: boolean, operations: Array<{ entityType: CrudEntityType, id: string, clientRef?: string, mode?: "soft"|"hard", reason?: string }> }',
+        requiredFields: [
+            "operations",
+            "operations[].entityType",
+            "operations[].id"
+        ],
+        notes: [
+            "Delete defaults to soft.",
+            "Use mode=hard only for explicit permanent removal.",
+            "Restoration is only possible after soft delete.",
+            "calendar_event, work_block_template, and task_timebox are immediate calendar-domain deletions: calendar events delete remote projections too, and these records do not go through the settings bin."
+        ],
         example: '{"operations":[{"entityType":"task","id":"task_123","mode":"soft","reason":"Merged into another task"}]}'
     },
     {
@@ -590,36 +1962,152 @@ const AGENT_ONBOARDING_TOOL_INPUT_CATALOG = [
         summary: "Restore soft-deleted entities from the settings bin.",
         whenToUse: "Use when the user wants an entity brought back after a soft delete.",
         inputShape: "{ atomic?: boolean, operations: Array<{ entityType: CrudEntityType, id: string, clientRef?: string }> }",
-        requiredFields: ["operations", "operations[].entityType", "operations[].id"],
+        requiredFields: [
+            "operations",
+            "operations[].entityType",
+            "operations[].id"
+        ],
         notes: ["Restore only works for soft-deleted entities."],
         example: '{"operations":[{"entityType":"goal","id":"goal_123","clientRef":"goal-restore-1"}]}'
     },
+    {
+        toolName: "forge_get_calendar_overview",
+        summary: "Read connected calendars, Forge-native events, mirrored events, recurring work blocks, and task timeboxes together.",
+        whenToUse: "Use before calendar-aware planning, slot selection, or scheduling diagnostics.",
+        inputShape: "{ from?: string, to?: string }",
+        requiredFields: [],
+        notes: [
+            "Use ISO datetimes.",
+            "The response includes provider metadata, live connections, mirrored external events, derived work-block instances, and task timeboxes."
+        ],
+        example: '{"from":"2026-04-02T00:00:00.000Z","to":"2026-04-09T00:00:00.000Z"}'
+    },
+    {
+        toolName: "forge_connect_calendar_provider",
+        summary: "Create a Forge calendar connection for Google, Apple, Exchange Online, 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, clientId?: string, clientSecret?: string, refreshToken?: string, password?: string, serverUrl?: string, authSessionId?: string, selectedCalendarUrls: string[], forgeCalendarUrl?: string, createForgeCalendar?: boolean }',
+        requiredFields: ["provider", "label", "provider-specific credentials"],
+        notes: [
+            "Google uses OAuth client credentials plus a refresh token.",
+            "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.",
+            "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."
+        ],
+        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}'
+    },
+    {
+        toolName: "forge_create_work_block_template",
+        summary: "Create a recurring half-day, holiday, or custom work-block template.",
+        whenToUse: "Use when the operator wants recurring time windows such as Main Activity, Secondary Activity, Third Activity, Rest, Holiday, or a custom block.",
+        inputShape: '{ title: string, kind: "main_activity"|"secondary_activity"|"third_activity"|"rest"|"holiday"|"custom", color: string, timezone: string, weekDays: integer[], startMinute: integer, endMinute: integer, startsOn?: "YYYY-MM-DD"|null, endsOn?: "YYYY-MM-DD"|null, blockingState: "allowed"|"blocked" }',
+        requiredFields: [
+            "title",
+            "kind",
+            "timezone",
+            "weekDays",
+            "startMinute",
+            "endMinute",
+            "blockingState"
+        ],
+        notes: [
+            "Minutes are measured from midnight in the selected timezone.",
+            "startsOn and endsOn are optional date bounds. Leaving endsOn null makes the block repeat indefinitely.",
+            "Use kind=holiday with weekDays [0,1,2,3,4,5,6] and minutes 0-1440 for vacations or other full-day blocked ranges.",
+            "Derived instances appear in calendar overview responses immediately after creation.",
+            "This is a convenience helper; agents can also create work_block_template through forge_create_entities."
+        ],
+        example: '{"title":"Summer holiday","kind":"holiday","color":"#14b8a6","timezone":"Europe/Zurich","weekDays":[0,1,2,3,4,5,6],"startMinute":0,"endMinute":1440,"startsOn":"2026-08-01","endsOn":"2026-08-16","blockingState":"blocked"}'
+    },
+    {
+        toolName: "forge_recommend_task_timeboxes",
+        summary: "Suggest future task slots that fit the current calendar rules and schedule.",
+        whenToUse: "Use when preparing focused work in advance.",
+        inputShape: "{ taskId: string, from?: string, to?: string, limit?: integer }",
+        requiredFields: ["taskId"],
+        notes: [
+            "Recommendations consider mirrored calendar events, recurring work blocks, task or project scheduling rules, and the task's planned duration when available.",
+            "Confirm a suggested slot by creating a task timebox."
+        ],
+        example: '{"taskId":"task_123","from":"2026-04-02T00:00:00.000Z","to":"2026-04-09T00:00:00.000Z","limit":6}'
+    },
+    {
+        toolName: "forge_create_task_timebox",
+        summary: "Create a planned task timebox in the Forge calendar domain.",
+        whenToUse: "Use after choosing a valid future slot or when creating a manual timebox directly.",
+        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.",
+            "Live task runs can later attach to matching timeboxes.",
+            "This is a convenience helper; agents can also create task_timebox through forge_create_entities."
+        ],
+        example: '{"taskId":"task_123","projectId":"project_456","title":"Draft the methods section","startsAt":"2026-04-03T08:00:00.000Z","endsAt":"2026-04-03T09:30:00.000Z","source":"suggested"}'
+    },
+    {
+        toolName: "forge_grant_reward_bonus",
+        summary: "Grant an explicit manual XP bonus or penalty with clear provenance.",
+        whenToUse: "Use when the user or operator explicitly wants an auditable reward adjustment beyond the automatic task and habit reward paths.",
+        inputShape: "{ entityType: RewardableEntityType, entityId: string, deltaXp: integer, reasonTitle: string, reasonSummary?: string, metadata?: object }",
+        requiredFields: ["entityType", "entityId", "deltaXp", "reasonTitle"],
+        notes: [
+            "Requires rewards.manage and write scopes.",
+            "Use this for explicit operator judgement, not as a substitute for normal task_run or habit check-in rewards."
+        ],
+        example: '{"entityType":"habit","entityId":"habit_morning_training","deltaXp":18,"reasonTitle":"Operator bonus","reasonSummary":"Stayed with the habit through unusual travel friction.","metadata":{"manual":true,"source":"agent"}}'
+    },
     {
         toolName: "forge_post_insight",
         summary: "Store an agent-authored insight.",
         whenToUse: "Use when you have a data-grounded observation or recommendation worth keeping visible in Forge.",
         inputShape: "{ entityType?: string|null, entityId?: string|null, timeframeLabel?: string|null, title: string, summary: string, recommendation: string, rationale?: string, confidence?: number, visibility?: string, ctaLabel?: string }",
         requiredFields: ["title", "summary", "recommendation"],
-        notes: ["Insights are for interpretation and advice, not for replacing user-owned goals or tasks."],
+        notes: [
+            "Insights are for interpretation and advice, not for replacing user-owned goals or tasks."
+        ],
         example: '{"entityType":"goal","entityId":"goal_123","title":"Admin drag is masking momentum","summary":"Creative progress is happening, but admin cleanup keeps interrupting it.","recommendation":"Protect one clean creative block and isolate admin into a separate recurring task.","confidence":0.82}'
     },
+    {
+        toolName: "forge_adjust_work_minutes",
+        summary: "Add or remove tracked work minutes on a task or project without creating a live task run.",
+        whenToUse: "Use for truthful retrospective minute corrections. Use this instead of forge_log_work when the task or project already exists and only tracked minutes need adjusting.",
+        inputShape: '{ entityType: "task"|"project", entityId: string, deltaMinutes: integer, note?: string }',
+        requiredFields: ["entityType", "entityId", "deltaMinutes"],
+        notes: [
+            "Positive deltaMinutes add tracked minutes and may award XP when a progress bucket is crossed.",
+            "Negative deltaMinutes remove tracked minutes and may reverse XP symmetrically when a progress bucket is crossed downward.",
+            "Requires rewards.manage and write scopes."
+        ],
+        example: '{"entityType":"task","entityId":"task_123","deltaMinutes":25,"note":"Captured the off-timer review pass from this morning."}'
+    },
     {
         toolName: "forge_log_work",
         summary: "Log work that already happened.",
-        whenToUse: "Use for retroactive work, not for starting a live session.",
-        inputShape: "{ taskId?: string, title?: string, description?: string, summary?: string, goalId?: string|null, projectId?: string|null, owner?: string, status?: TaskStatus, priority?: TaskPriority, dueDate?: string|null, effort?: TaskEffort, energy?: TaskEnergy, points?: number, tagIds?: string[], closeoutNote?: { contentMarkdown: string, author?: string|null, links?: Array<{ entityType, entityId, anchorKey? }> } }",
+        whenToUse: "Use for completion-style retroactive work, not for starting a live session or adjusting minutes on an existing record.",
+        inputShape: "{ taskId?: string, title?: string, description?: string, summary?: string, goalId?: string|null, projectId?: string|null, owner?: string, status?: TaskStatus, priority?: TaskPriority, dueDate?: string|null, effort?: TaskEffort, energy?: TaskEnergy, points?: number, tagIds?: string[], closeoutNote?: { contentMarkdown: string, author?: string|null, tags?: string[], destroyAt?: string|null, links?: Array<{ entityType, entityId, anchorKey? }> } }",
         requiredFields: ["taskId or title"],
-        notes: ["Use taskId when logging work against an existing task.", "Use title when a new completed work item should be created and logged.", "closeoutNote persists the work summary as a real linked note."],
+        notes: [
+            "Use taskId when logging work against an existing task.",
+            "Use title when a new completed work item should be created and logged.",
+            "Use forge_adjust_work_minutes for signed minute corrections on existing tasks or projects.",
+            "closeoutNote persists the work summary as a real linked note."
+        ],
         example: '{"taskId":"task_123","summary":"Finished the review draft and cleaned the notes.","points":40,"closeoutNote":{"contentMarkdown":"Finished the review draft, cleaned the note structure, and left one follow-up for QA."}}'
     },
     {
         toolName: "forge_start_task_run",
         summary: "Start truthful live work on a task.",
         whenToUse: "Use when the user wants to begin working now.",
-        inputShape: "{ taskId: string, actor: string, timerMode?: \"planned\"|\"unlimited\", plannedDurationSeconds?: number|null, isCurrent?: boolean, leaseTtlSeconds?: number, note?: string }",
+        inputShape: '{ taskId: string, actor: string, timerMode?: "planned"|"unlimited", plannedDurationSeconds?: number|null, overrideReason?: string|null, isCurrent?: boolean, leaseTtlSeconds?: number, note?: string }',
         requiredFields: ["taskId", "actor"],
-        notes: ["If timerMode is planned, plannedDurationSeconds is required.", "If timerMode is unlimited, plannedDurationSeconds must be null or omitted."],
-        example: '{"taskId":"task_123","actor":"aurel","timerMode":"planned","plannedDurationSeconds":1500,"isCurrent":true,"leaseTtlSeconds":900,"note":"Starting focused writing block"}'
+        notes: [
+            "If timerMode is planned, plannedDurationSeconds is required.",
+            "If timerMode is unlimited, plannedDurationSeconds must be null or omitted.",
+            "If calendar rules currently block the task, pass an explicit overrideReason to proceed and keep the exception auditable."
+        ],
+        example: '{"taskId":"task_123","actor":"aurel","timerMode":"planned","plannedDurationSeconds":1500,"overrideReason":"Protected creative block after clinic hours.","isCurrent":true,"leaseTtlSeconds":900,"note":"Starting focused writing block"}'
     },
     {
         toolName: "forge_heartbeat_task_run",
@@ -636,25 +2124,33 @@ const AGENT_ONBOARDING_TOOL_INPUT_CATALOG = [
         whenToUse: "Use when several runs exist and one should be the visible current run.",
         inputShape: "{ taskRunId: string, actor?: string }",
         requiredFields: ["taskRunId"],
-        notes: ["This does not complete or release a run; it just changes current focus."],
+        notes: [
+            "This does not complete or release a run; it just changes current focus."
+        ],
         example: '{"taskRunId":"run_123","actor":"aurel"}'
     },
     {
         toolName: "forge_complete_task_run",
         summary: "Finish an active run as completed work.",
         whenToUse: "Use when the user has finished the live work block.",
-        inputShape: "{ taskRunId: string, actor?: string, note?: string, closeoutNote?: { contentMarkdown: string, author?: string|null, links?: Array<{ entityType, entityId, anchorKey? }> } }",
+        inputShape: "{ taskRunId: string, actor?: string, note?: string, closeoutNote?: { contentMarkdown: string, author?: string|null, tags?: string[], destroyAt?: string|null, links?: Array<{ entityType, entityId, anchorKey? }> } }",
         requiredFields: ["taskRunId"],
-        notes: ["This is the truthful way to finish live work and award completion effects.", "closeoutNote persists a real linked note instead of only updating the transient run note."],
+        notes: [
+            "This is the truthful way to finish live work and award completion effects.",
+            "closeoutNote persists a real linked note instead of only updating the transient run note."
+        ],
         example: '{"taskRunId":"run_123","actor":"aurel","note":"Finished the review draft","closeoutNote":{"contentMarkdown":"Completed the draft review and listed the follow-up fixes."}}'
     },
     {
         toolName: "forge_release_task_run",
         summary: "Stop an active run without marking the task complete.",
         whenToUse: "Use when the user is stopping or pausing work without completion.",
-        inputShape: "{ taskRunId: string, actor?: string, note?: string, closeoutNote?: { contentMarkdown: string, author?: string|null, links?: Array<{ entityType, entityId, anchorKey? }> } }",
+        inputShape: "{ taskRunId: string, actor?: string, note?: string, closeoutNote?: { contentMarkdown: string, author?: string|null, tags?: string[], destroyAt?: string|null, links?: Array<{ entityType, entityId, anchorKey? }> } }",
         requiredFields: ["taskRunId"],
-        notes: ["Use this instead of faking a stop by only changing task status.", "closeoutNote is useful for documenting blockers or handoff context."],
+        notes: [
+            "Use this instead of faking a stop by only changing task status.",
+            "closeoutNote is useful for documenting blockers or handoff context."
+        ],
         example: '{"taskRunId":"run_123","actor":"aurel","note":"Stopping for now; blocked on feedback","closeoutNote":{"contentMarkdown":"Blocked on feedback from design before I can continue."}}'
     }
 ];
@@ -712,11 +2208,14 @@ function buildAgentOnboardingPayload(request) {
         },
         conceptModel: {
             goal: "Long-horizon direction or outcome. Goals anchor projects and sometimes tasks directly.",
-            project: "A multi-step workstream under one goal. Projects organize related tasks.",
+            project: "A multi-step workstream under one goal. Projects organize related tasks. Project lifecycle is driven by status: active means in play, paused means suspended, and completed means finished. Setting a project to completed auto-completes linked unfinished tasks.",
             task: "A concrete actionable work item. Task status is board state, not proof of live work.",
             taskRun: "A live work session attached to a task. Start, heartbeat, focus, complete, and release runs instead of faking work with status alone.",
             note: "A Markdown work note that can link to one or many entities. Use notes for progress evidence, context, and close-out summaries.",
             insight: "An agent-authored observation or recommendation grounded in Forge data.",
+            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.",
             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: {
@@ -736,6 +2235,7 @@ function buildAgentOnboardingPayload(request) {
             "Goals are the top-level strategic layer.",
             "Projects belong to one goal through goalId.",
             "Tasks can belong to a goal, a project, both, or neither.",
+            "Habits are recurring records that can connect directly to goals, projects, tasks, and durable Psyche entities.",
             "Task runs represent live work sessions on tasks and are separate from task status.",
             "Notes can link to one or many entities and are the canonical place for Markdown progress context or close-out evidence.",
             "Psyche values can link to goals, projects, and tasks.",
@@ -748,6 +2248,7 @@ function buildAgentOnboardingPayload(request) {
             context: "/api/v1/context",
             xpMetrics: "/api/v1/metrics/xp",
             weeklyReview: "/api/v1/reviews/weekly",
+            calendarOverview: "/api/v1/calendar/overview",
             settingsBin: "/api/v1/settings/bin",
             batchSearch: "/api/v1/entities/search",
             psycheSchemaCatalog: "/api/v1/psyche/schema-catalog",
@@ -771,7 +2272,9 @@ function buildAgentOnboardingPayload(request) {
                 "forge_delete_entities",
                 "forge_restore_entities"
             ],
+            rewardWorkflow: ["forge_grant_reward_bonus"],
             workWorkflow: [
+                "forge_adjust_work_minutes",
                 "forge_log_work",
                 "forge_start_task_run",
                 "forge_heartbeat_task_run",
@@ -779,6 +2282,14 @@ function buildAgentOnboardingPayload(request) {
                 "forge_complete_task_run",
                 "forge_release_task_run"
             ],
+            calendarWorkflow: [
+                "forge_get_calendar_overview",
+                "forge_connect_calendar_provider",
+                "forge_sync_calendar_connection",
+                "forge_create_work_block_template",
+                "forge_recommend_task_timeboxes",
+                "forge_create_task_timebox"
+            ],
             insightWorkflow: ["forge_post_insight"]
         },
         interactionGuidance: {
@@ -801,14 +2312,14 @@ function buildAgentOnboardingPayload(request) {
             },
             deleteDefault: "soft",
             hardDeleteRequiresExplicitMode: true,
-            restoreSummary: "Restore soft-deleted entities through the restore route or the settings bin.",
-            entityDeleteSummary: "Entity DELETE routes default to soft delete. Pass mode=hard only when permanent removal is intended.",
+            restoreSummary: "Restore soft-deleted entities through the restore route or the settings bin. Calendar-domain deletes for calendar_event, work_block_template, and task_timebox are immediate and do not enter the bin.",
+            entityDeleteSummary: "Entity DELETE routes default to soft delete. Pass mode=hard only when permanent removal is intended. Calendar-event deletes still remove remote projections downstream.",
             batchingRule: "forge_create_entities, forge_update_entities, forge_delete_entities, and forge_restore_entities all accept operations as arrays. Batch multiple related mutations together in one request when possible.",
             searchRule: "forge_search_entities accepts searches as an array. Search before create or update when duplicate risk exists.",
-            createRule: "Each create operation must include entityType and full data. entityType alone is not enough.",
-            updateRule: "Each update operation must include entityType, id, and patch.",
+            createRule: "Each create operation must include entityType and full data. entityType alone is not enough. This includes calendar_event, work_block_template, and task_timebox alongside the usual planning and Psyche entities.",
+            updateRule: "Each update operation must include entityType, id, and patch. For projects, lifecycle changes are status patches: active to restart, paused to suspend, completed to finish. Keep task and project scheduling rules on those same patch payloads. Calendar-event updates still run downstream provider projection sync.",
             createExample: '{"operations":[{"entityType":"goal","data":{"title":"Create meaningfully"},"clientRef":"goal-create-1"},{"entityType":"goal","data":{"title":"Build a beautiful family"},"clientRef":"goal-create-2"}]}',
-            updateExample: '{"operations":[{"entityType":"task","id":"task_123","patch":{"status":"focus","priority":"high"},"clientRef":"task-update-1"}]}'
+            updateExample: '{"operations":[{"entityType":"project","id":"project_123","patch":{"status":"paused","schedulingRules":{"blockWorkBlockKinds":["main_activity"],"allowWorkBlockKinds":["secondary_activity"]}},"clientRef":"project-suspend-1"},{"entityType":"task","id":"task_456","patch":{"plannedDurationSeconds":5400,"schedulingRules":{"allowEventKeywords":["creative"],"blockEventKeywords":["clinic"]}},"clientRef":"task-scheduling-1"}]}'
         }
     };
 }
@@ -872,7 +2383,9 @@ function parseActivityContext(headers) {
     if (Array.isArray(rawSource)) {
         throw new Error("X-Forge-Source must be a single header value");
     }
-    const source = rawSource === undefined ? "ui" : activitySourceSchema.parse(typeof rawSource === "string" ? rawSource.trim() : rawSource);
+    const source = rawSource === undefined
+        ? "ui"
+        : activitySourceSchema.parse(typeof rawSource === "string" ? rawSource.trim() : rawSource);
     return {
         source,
         actor: parseOptionalActorHeader(headers)
@@ -915,7 +2428,8 @@ function hasTokenScope(token, scope) {
     return Boolean(token?.scopes.includes(scope));
 }
 function isPsycheEntityType(entityType) {
-    return Boolean(entityType && PSYCHE_ENTITY_TYPES.includes(entityType));
+    return Boolean(entityType &&
+        PSYCHE_ENTITY_TYPES.includes(entityType));
 }
 function getWatchdogHealth(taskRunWatchdog) {
     if (!taskRunWatchdog) {
@@ -955,7 +2469,17 @@ function buildHealthPayload(taskRunWatchdog, extras = {}) {
         ...extras
     };
 }
+function shouldIncludeRuntimeProbe(headers) {
+    const probeHeader = headers["x-forge-runtime-probe"];
+    if (Array.isArray(probeHeader)) {
+        return probeHeader.some((value) => typeof value === "string" && value.trim() === "1");
+    }
+    return typeof probeHeader === "string" && probeHeader.trim() === "1";
+}
 function buildV1Context() {
+    const goals = listGoals();
+    const tasks = listTasks();
+    const habits = listHabits();
     return {
         meta: {
             apiVersion: "v1",
@@ -964,15 +2488,16 @@ function buildV1Context() {
             backend: "forge-node-runtime",
             mode: "transitional-node"
         },
-        metrics: buildGamificationProfile(listGoals(), listTasks()),
+        metrics: buildGamificationProfile(goals, tasks, habits),
         dashboard: getDashboard(),
         overview: getOverviewContext(),
         today: getTodayContext(),
         risk: getRiskContext(),
-        goals: listGoals(),
+        goals,
         projects: listProjectSummaries(),
         tags: listTags(),
-        tasks: listTasks(),
+        tasks,
+        habits,
         activeTaskRuns: listTaskRuns({ active: true, limit: 25 }),
         activity: listActivityEvents({ limit: 25 })
     };
@@ -980,8 +2505,9 @@ function buildV1Context() {
 function buildXpMetricsPayload() {
     const goals = listGoals();
     const tasks = listTasks();
+    const habits = listHabits();
     const rules = listRewardRules();
-    const gamificationOverview = buildGamificationOverview(goals, tasks);
+    const gamificationOverview = buildGamificationOverview(goals, tasks, habits);
     const dailyAmbientCap = rules
         .filter((rule) => rule.family === "ambient")
         .reduce((max, rule) => Math.max(max, Number(rule.config.dailyCap ?? 0)), 0) || 12;
@@ -989,15 +2515,58 @@ function buildXpMetricsPayload() {
         profile: gamificationOverview.profile,
         achievements: gamificationOverview.achievements,
         milestoneRewards: gamificationOverview.milestoneRewards,
-        momentumPulse: buildXpMomentumPulse(goals, tasks),
+        momentumPulse: buildXpMomentumPulse(goals, tasks, habits),
         recentLedger: listRewardLedger({ limit: 25 }),
         rules,
         dailyAmbientXp: getDailyAmbientXp(new Date().toISOString().slice(0, 10)),
         dailyAmbientCap
     };
 }
+function resolveWorkAdjustmentTarget(entityType, entityId) {
+    if (entityType === "task") {
+        const task = getTaskById(entityId);
+        return task
+            ? {
+                entityType,
+                entityId: task.id,
+                title: task.title,
+                time: task.time
+            }
+            : null;
+    }
+    const project = getProjectSummary(entityId);
+    return project
+        ? {
+            entityType,
+            entityId: project.id,
+            title: project.title,
+            time: project.time
+        }
+        : null;
+}
+function clampWorkAdjustmentMinutes(deltaMinutes, currentCreditedSeconds) {
+    if (deltaMinutes >= 0) {
+        return deltaMinutes;
+    }
+    const maxRemovableMinutes = Math.max(0, Math.floor(currentCreditedSeconds / 60));
+    return -Math.min(Math.abs(deltaMinutes), maxRemovableMinutes);
+}
+function describeWorkAdjustment(input) {
+    const entityLabel = input.entityType === "task" ? "Task" : "Project";
+    const requestedLabel = `${Math.abs(input.requestedDeltaMinutes)} minute${Math.abs(input.requestedDeltaMinutes) === 1 ? "" : "s"}`;
+    const appliedLabel = `${Math.abs(input.appliedDeltaMinutes)} minute${Math.abs(input.appliedDeltaMinutes) === 1 ? "" : "s"}`;
+    const direction = input.appliedDeltaMinutes >= 0 ? "added" : "removed";
+    const clamped = input.requestedDeltaMinutes !== input.appliedDeltaMinutes;
+    return {
+        title: `${entityLabel} work adjusted: ${input.targetTitle}`,
+        description: clamped
+            ? `${requestedLabel} requested, ${appliedLabel} ${direction} after clamping to the currently tracked time.`
+            : `${appliedLabel} ${direction} from the tracked work total.`
+    };
+}
 function buildOperatorContext() {
     const tasks = listTasks();
+    const dueHabits = listHabits({ dueToday: true }).slice(0, 12);
     const activeProjects = listProjectSummaries({ status: "active" }).filter((project) => project.activeTaskCount > 0 || project.completedTaskCount > 0);
     const focusTasks = tasks.filter((task) => task.status === "focus" || task.status === "in_progress");
     const recommendedNextTask = focusTasks[0] ??
@@ -1008,10 +2577,13 @@ function buildOperatorContext() {
         generatedAt: new Date().toISOString(),
         activeProjects: activeProjects.slice(0, 8),
         focusTasks: focusTasks.slice(0, 12),
+        dueHabits,
         currentBoard: {
             backlog: tasks.filter((task) => task.status === "backlog").slice(0, 20),
             focus: tasks.filter((task) => task.status === "focus").slice(0, 20),
-            inProgress: tasks.filter((task) => task.status === "in_progress").slice(0, 20),
+            inProgress: tasks
+                .filter((task) => task.status === "in_progress")
+                .slice(0, 20),
             blocked: tasks.filter((task) => task.status === "blocked").slice(0, 20),
             done: tasks.filter((task) => task.status === "done").slice(0, 20)
         },
@@ -1085,6 +2657,12 @@ function buildOperatorOverviewRouteGuide() {
                 summary: "Preferred multi-entity mutation surface for agents. Delete defaults to soft delete and restore reverses soft deletion.",
                 requiredScope: "write"
             },
+            {
+                id: "work_adjustments",
+                path: "/api/v1/work-adjustments",
+                summary: "Signed retrospective minute adjustments for existing tasks or projects, with symmetric progress-XP updates and clamp protection.",
+                requiredScope: "write"
+            },
             {
                 id: "operator_log_work",
                 path: "/api/v1/operator/log-work",
@@ -1102,8 +2680,14 @@ function buildOperatorOverviewRouteGuide() {
 }
 function buildOperatorOverview(request) {
     const auth = parseRequestAuth(request.headers);
-    const canReadPsyche = auth.token ? hasTokenScope(auth.token, "psyche.read") : true;
-    const warnings = canReadPsyche ? [] : ["Psyche summary omitted because the active token does not include psyche.read."];
+    const canReadPsyche = auth.token
+        ? hasTokenScope(auth.token, "psyche.read")
+        : true;
+    const warnings = canReadPsyche
+        ? []
+        : [
+            "Psyche summary omitted because the active token does not include psyche.read."
+        ];
     return {
         generatedAt: new Date().toISOString(),
         snapshot: buildV1Context(),
@@ -1115,9 +2699,15 @@ function buildOperatorOverview(request) {
             tokenPresent: Boolean(auth.token),
             scopes: auth.token?.scopes ?? [],
             canReadPsyche,
-            canWritePsyche: auth.token ? hasTokenScope(auth.token, "psyche.write") : true,
-            canManageModes: auth.token ? hasTokenScope(auth.token, "psyche.mode") : true,
-            canManageRewards: auth.token ? hasTokenScope(auth.token, "rewards.manage") : true
+            canWritePsyche: auth.token
+                ? hasTokenScope(auth.token, "psyche.write")
+                : true,
+            canManageModes: auth.token
+                ? hasTokenScope(auth.token, "psyche.mode")
+                : true,
+            canManageRewards: auth.token
+                ? hasTokenScope(auth.token, "rewards.manage")
+                : true
         },
         warnings,
         routeGuide: buildOperatorOverviewRouteGuide()
@@ -1125,7 +2715,21 @@ function buildOperatorOverview(request) {
 }
 export async function buildServer(options = {}) {
     const managers = createManagerRuntime({ dataRoot: options.dataRoot });
-    const runtimeConfig = managers.configuration.readRuntimeConfig({ dataRoot: options.dataRoot });
+    managers.externalServices.register("google_calendar", {
+        provider: "google",
+        label: "Google Calendar"
+    });
+    managers.externalServices.register("microsoft_graph_calendar", {
+        provider: "microsoft",
+        label: "Exchange Online"
+    });
+    managers.externalServices.register("caldav", {
+        provider: "caldav",
+        label: "CalDAV"
+    });
+    const runtimeConfig = managers.configuration.readRuntimeConfig({
+        dataRoot: options.dataRoot
+    });
     configureDatabase({ dataRoot: runtimeConfig.dataRoot ?? undefined });
     configureDatabaseSeeding(options.seedDemoData ?? false);
     await managers.migration.initialize();
@@ -1133,7 +2737,9 @@ export async function buildServer(options = {}) {
         logger: false,
         rewriteUrl: (request) => rewriteMountPath(request.url ?? "/")
     });
-    const taskRunWatchdog = options.taskRunWatchdog === false ? null : createTaskRunWatchdog(options.taskRunWatchdog);
+    const taskRunWatchdog = options.taskRunWatchdog === false
+        ? null
+        : createTaskRunWatchdog(options.taskRunWatchdog);
     await app.register(cors, {
         origin: (origin, callback) => {
             if (!origin) {
@@ -1164,7 +2770,9 @@ export async function buildServer(options = {}) {
                     : statusCode === 400
                         ? "invalid_request"
                         : "internal_error",
-            error: validationIssues ? "Request validation failed" : getErrorMessage(error),
+            error: validationIssues
+                ? "Request validation failed"
+                : getErrorMessage(error),
             statusCode,
             ...(validationIssues ? { details: validationIssues } : {}),
             ...(isHttpError(error) && error.details ? error.details : {}),
@@ -1176,6 +2784,112 @@ export async function buildServer(options = {}) {
         actor: context.actor,
         source: context.source
     });
+    const applyBatchCalendarEntityEffects = async (results, auth, action) => {
+        for (const result of results) {
+            if (!result.ok ||
+                typeof result.entityType !== "string" ||
+                typeof result.id !== "string") {
+                continue;
+            }
+            if (result.entityType === "calendar_event") {
+                if (action === "delete") {
+                    await deleteCalendarEventProjection(result.id, managers.secrets);
+                    const event = (result.entity ?? {});
+                    recordActivityEvent({
+                        entityType: "calendar_event",
+                        entityId: result.id,
+                        eventType: "calendar_event_deleted",
+                        title: `Calendar event deleted: ${typeof event.title === "string" ? event.title : result.id}`,
+                        description: "The Forge calendar event was removed and any projected remote copies were deleted.",
+                        actor: auth.actor ?? null,
+                        source: auth.source,
+                        metadata: {
+                            calendarId: typeof event.calendarId === "string" ? event.calendarId : null,
+                            originType: typeof event.originType === "string" ? event.originType : null
+                        }
+                    });
+                    continue;
+                }
+                await pushCalendarEventUpdate(result.id, managers.secrets);
+                const refreshed = getCalendarEventById(result.id);
+                if (!refreshed) {
+                    continue;
+                }
+                result.entity = refreshed;
+                recordActivityEvent({
+                    entityType: "calendar_event",
+                    entityId: refreshed.id,
+                    eventType: action === "create"
+                        ? "calendar_event_created"
+                        : "calendar_event_updated",
+                    title: `Calendar event ${action === "create" ? "created" : "updated"}: ${refreshed.title}`,
+                    description: action === "create"
+                        ? "A native Forge calendar event was created."
+                        : "The Forge calendar event was updated and projected to remote calendars when configured.",
+                    actor: auth.actor ?? null,
+                    source: auth.source,
+                    metadata: {
+                        calendarId: refreshed.calendarId,
+                        originType: refreshed.originType
+                    }
+                });
+                continue;
+            }
+            if (result.entityType === "work_block_template" &&
+                result.entity &&
+                typeof result.entity === "object") {
+                const template = result.entity;
+                recordActivityEvent({
+                    entityType: "work_block",
+                    entityId: template.id,
+                    eventType: action === "create"
+                        ? "work_block_created"
+                        : action === "update"
+                            ? "work_block_updated"
+                            : "work_block_deleted",
+                    title: `Work block ${action}: ${template.title}`,
+                    description: action === "create"
+                        ? "A recurring work block was added to Forge."
+                        : action === "update"
+                            ? "The recurring work block was updated."
+                            : "The recurring work block was removed.",
+                    actor: auth.actor ?? null,
+                    source: auth.source,
+                    metadata: {
+                        kind: template.kind ?? null,
+                        blockingState: action === "delete" ? null : (template.blockingState ?? null)
+                    }
+                });
+                continue;
+            }
+            if (result.entityType === "task_timebox" &&
+                result.entity &&
+                typeof result.entity === "object") {
+                const timebox = result.entity;
+                recordActivityEvent({
+                    entityType: "task_timebox",
+                    entityId: timebox.id,
+                    eventType: action === "create"
+                        ? "task_timebox_created"
+                        : action === "update"
+                            ? "task_timebox_updated"
+                            : "task_timebox_deleted",
+                    title: `Task timebox ${action}: ${timebox.title}`,
+                    description: action === "create"
+                        ? "A future work slot was planned in Forge."
+                        : action === "update"
+                            ? "The planned work slot was updated."
+                            : "The planned work slot was removed.",
+                    actor: auth.actor ?? null,
+                    source: auth.source,
+                    metadata: {
+                        taskId: timebox.taskId ?? null,
+                        status: action === "delete" ? null : (timebox.status ?? null)
+                    }
+                });
+            }
+        }
+    };
     const requireOperatorSession = (headers, detail) => {
         const context = authenticateRequest(headers);
         managers.authorization.requireAuthenticatedOperator(context, detail);
@@ -1231,9 +2945,18 @@ export async function buildServer(options = {}) {
         return context;
     };
     app.get("/api/health", async () => buildHealthPayload(taskRunWatchdog));
-    app.get("/api/v1/health", async () => buildHealthPayload(taskRunWatchdog, {
+    app.get("/api/v1/health", async (request) => buildHealthPayload(taskRunWatchdog, {
         apiVersion: "v1",
-        backend: "forge-node-runtime"
+        backend: "forge-node-runtime",
+        ...(shouldIncludeRuntimeProbe(request.headers)
+            ? {
+                runtime: {
+                    pid: process.pid,
+                    storageRoot: runtimeConfig.dataRoot ?? process.cwd(),
+                    basePath: runtimeConfig.basePath
+                }
+            }
+            : {})
     }));
     app.get("/api/v1/auth/operator-session", async (request, reply) => ({
         session: managers.session.ensureLocalOperatorSession(request.headers, reply)
@@ -1244,13 +2967,17 @@ export async function buildServer(options = {}) {
     app.get("/api/v1/openapi.json", async () => buildOpenApiDocument());
     app.get("/api/v1/context", async () => buildV1Context());
     app.get("/api/v1/operator/context", async (request) => {
-        requireOperatorSession(request.headers, { route: "/api/v1/operator/context" });
+        requireOperatorSession(request.headers, {
+            route: "/api/v1/operator/context"
+        });
         return {
             context: buildOperatorContext()
         };
     });
     app.get("/api/v1/operator/overview", async (request) => {
-        requireOperatorSession(request.headers, { route: "/api/v1/operator/overview" });
+        requireOperatorSession(request.headers, {
+            route: "/api/v1/operator/overview"
+        });
         return {
             overview: buildOperatorOverview(request)
         };
@@ -1606,8 +3333,16 @@ export async function buildServer(options = {}) {
         }
         return {
             report,
-            notes: listNotes({ linkedEntityType: "trigger_report", linkedEntityId: id, limit: 50 }),
-            insights: listInsights({ entityType: "trigger_report", entityId: id, limit: 50 })
+            notes: listNotes({
+                linkedEntityType: "trigger_report",
+                linkedEntityId: id,
+                limit: 50
+            }),
+            insights: listInsights({
+                entityType: "trigger_report",
+                entityId: id,
+                limit: 50
+            })
         };
     });
     app.patch("/api/v1/psyche/reports/:id", async (request, reply) => {
@@ -1686,7 +3421,10 @@ export async function buildServer(options = {}) {
     app.delete("/api/v1/notes/:id", async (request, reply) => {
         const { id } = request.params;
         const current = getNoteById(id);
-        const linkedEntityType = current?.links.find((link) => isPsycheEntityType(link.entityType))?.entityType ?? current?.links[0]?.entityType ?? null;
+        const linkedEntityType = current?.links.find((link) => isPsycheEntityType(link.entityType))
+            ?.entityType ??
+            current?.links[0]?.entityType ??
+            null;
         const auth = requireNoteAccess(request.headers, linkedEntityType, {
             route: "/api/v1/notes/:id",
             entityType: linkedEntityType
@@ -1721,6 +3459,160 @@ export async function buildServer(options = {}) {
         const query = taskListQuerySchema.parse(request.query ?? {});
         return { tasks: listTasks(query) };
     });
+    app.get("/api/v1/calendar/overview", async (request) => {
+        const query = calendarOverviewQuerySchema.parse(request.query ?? {});
+        const now = new Date();
+        const from = query.from ??
+            new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000).toISOString();
+        const to = query.to ??
+            new Date(now.getTime() + 21 * 24 * 60 * 60 * 1000).toISOString();
+        return { calendar: readCalendarOverview({ from, to }) };
+    });
+    app.get("/api/v1/calendar/agenda", async (request) => {
+        const query = calendarOverviewQuerySchema.parse(request.query ?? {});
+        const now = new Date();
+        const from = query.from ??
+            new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000).toISOString();
+        const to = query.to ??
+            new Date(now.getTime() + 21 * 24 * 60 * 60 * 1000).toISOString();
+        return {
+            providers: listCalendarProviderMetadata(),
+            calendars: listCalendars(),
+            events: listCalendarEvents({ from, to }),
+            workBlocks: listWorkBlockInstances({ from, to }),
+            timeboxes: listTaskTimeboxes({ from, to })
+        };
+    });
+    app.get("/api/v1/calendar/connections", async () => ({
+        providers: listCalendarProviderMetadata(),
+        connections: listConnectedCalendarConnections()
+    }));
+    app.post("/api/v1/calendar/oauth/microsoft/start", async (request) => {
+        requireScopedAccess(request.headers, ["write"], {
+            route: "/api/v1/calendar/oauth/microsoft/start"
+        });
+        return await startMicrosoftCalendarOauth(startMicrosoftCalendarOauthSchema.parse(request.body ?? {}), getRequestOrigin(request));
+    });
+    app.post("/api/v1/calendar/oauth/microsoft/test-config", async (request) => {
+        requireScopedAccess(request.headers, ["write"], {
+            route: "/api/v1/calendar/oauth/microsoft/test-config"
+        });
+        return {
+            result: await testMicrosoftCalendarOauthConfiguration(testMicrosoftCalendarOauthConfigurationSchema.parse(request.body ?? {}))
+        };
+    });
+    app.get("/api/v1/calendar/oauth/microsoft/session/:id", async (request, reply) => {
+        requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/oauth/microsoft/session/:id" });
+        try {
+            return getMicrosoftCalendarOauthSession(request.params.id);
+        }
+        catch (error) {
+            if (error instanceof Error &&
+                error.message.startsWith("Unknown Microsoft calendar auth session")) {
+                reply.code(404);
+                return { error: "Microsoft calendar auth session not found" };
+            }
+            throw error;
+        }
+    });
+    app.get("/api/v1/calendar/oauth/microsoft/callback", async (request, reply) => {
+        const query = request.query;
+        const result = await completeMicrosoftCalendarOauth({
+            state: query.state ?? null,
+            code: query.code ?? null,
+            error: query.error ?? null,
+            errorDescription: query.error_description ?? null
+        });
+        const session = result.session;
+        const escapedOrigin = JSON.stringify(result.openerOrigin || "*");
+        const escapedMessage = JSON.stringify({
+            type: "forge:microsoft-calendar-auth",
+            sessionId: session.sessionId,
+            status: session.status
+        });
+        const body = `<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Forge Microsoft sign-in</title>
+    <style>
+      body{margin:0;font-family:ui-sans-serif,system-ui,sans-serif;background:#0b1320;color:#f8fafc;display:grid;place-items:center;min-height:100vh}
+      main{max-width:28rem;padding:2rem;border:1px solid rgba(255,255,255,.08);border-radius:24px;background:linear-gradient(180deg,rgba(18,28,38,.98),rgba(11,17,28,.98))}
+      h1{margin:0 0 .75rem;font-size:1.15rem}
+      p{margin:0;color:rgba(248,250,252,.72);line-height:1.6}
+    </style>
+  </head>
+  <body>
+    <main>
+      <h1>${session.status === "authorized" ? "Microsoft account connected" : "Microsoft sign-in needs attention"}</h1>
+      <p>${session.status === "authorized" ? "Forge received your Microsoft account and sent the result back to the calendar setup flow. You can close this window." : (session.error ?? "Forge could not complete Microsoft sign-in. You can close this window and try again from Settings.")}</p>
+    </main>
+    <script>
+      const message = ${escapedMessage};
+      const targetOrigin = ${escapedOrigin};
+      try {
+        if (window.opener && !window.opener.closed) {
+          window.opener.postMessage(message, targetOrigin);
+        }
+      } catch {}
+      setTimeout(() => window.close(), 180);
+    </script>
+  </body>
+</html>`;
+        reply.type("text/html; charset=utf-8");
+        return body;
+    });
+    app.post("/api/v1/calendar/discovery", async (request) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/discovery" });
+        const discovery = await discoverCalendarConnection(discoverCalendarConnectionSchema.parse(request.body ?? {}));
+        recordActivityEvent({
+            entityType: "calendar_connection",
+            entityId: "calendar_discovery",
+            eventType: "calendar_connection_discovered",
+            title: `Calendar discovery completed for ${discovery.provider}`,
+            description: "Forge discovered provider calendars before connection setup.",
+            actor: auth.actor ?? null,
+            source: auth.source,
+            metadata: {
+                provider: discovery.provider,
+                calendars: discovery.calendars.length
+            }
+        });
+        return { discovery };
+    });
+    app.get("/api/v1/calendar/calendars", async () => ({
+        calendars: listCalendars()
+    }));
+    app.get("/api/v1/calendar/connections/:id/discovery", async (request, reply) => {
+        requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/connections/:id/discovery" });
+        const { id } = request.params;
+        try {
+            const discovery = await discoverExistingCalendarConnection(id, managers.secrets);
+            return { discovery };
+        }
+        catch (error) {
+            if (error instanceof Error &&
+                error.message.startsWith("Unknown calendar connection")) {
+                reply.code(404);
+                return { error: "Calendar connection not found" };
+            }
+            throw error;
+        }
+    });
+    app.get("/api/v1/habits", async (request) => {
+        const query = habitListQuerySchema.parse(request.query ?? {});
+        return { habits: listHabits(query) };
+    });
+    app.get("/api/v1/habits/:id", async (request, reply) => {
+        const { id } = request.params;
+        const habit = getHabitById(id);
+        if (!habit) {
+            reply.code(404);
+            return { error: "Habit not found" };
+        }
+        return { habit };
+    });
     app.get("/api/v1/projects/:id", async (request, reply) => {
         const { id } = request.params;
         const project = listProjectSummaries().find((entry) => entry.id === id);
@@ -1754,7 +3646,9 @@ export async function buildServer(options = {}) {
         return { activity: listActivityEvents(query) };
     });
     app.post("/api/v1/activity/:id/remove", async (request, reply) => {
-        requireScopedAccess(request.headers, ["write"], { route: "/api/v1/activity/:id/remove" });
+        requireScopedAccess(request.headers, ["write"], {
+            route: "/api/v1/activity/:id/remove"
+        });
         const { id } = request.params;
         const event = removeActivityEvent(id, removeActivityEventSchema.parse(request.body ?? {}), parseActivityContext(request.headers));
         if (!event) {
@@ -1764,7 +3658,7 @@ export async function buildServer(options = {}) {
         return { event };
     });
     app.get("/api/v1/metrics", async () => ({
-        metrics: buildGamificationOverview(listGoals(), listTasks())
+        metrics: buildGamificationOverview(listGoals(), listTasks(), listHabits())
     }));
     app.get("/api/v1/metrics/xp", async () => ({
         metrics: buildXpMetricsPayload()
@@ -1778,7 +3672,10 @@ export async function buildServer(options = {}) {
             route: "/api/v1/insights",
             entityType: input.entityType
         });
-        const insight = createInsight(input, { actor: auth.actor, source: auth.source });
+        const insight = createInsight(input, {
+            actor: auth.actor,
+            source: auth.source
+        });
         reply.code(201);
         return { insight };
     });
@@ -1815,7 +3712,10 @@ export async function buildServer(options = {}) {
         const query = entityDeleteQuerySchema.parse(request.query ?? {});
         const insight = query.mode === "hard"
             ? deleteInsight(id, { actor: auth.actor, source: auth.source })
-            : deleteEntity("insight", id, query, { actor: auth.actor, source: auth.source });
+            : deleteEntity("insight", id, query, {
+                actor: auth.actor,
+                source: auth.source
+            });
         if (!insight) {
             reply.code(404);
             return { error: "Insight not found" };
@@ -1837,7 +3737,9 @@ export async function buildServer(options = {}) {
         return { feedback };
     });
     app.get("/api/v1/approval-requests", async (request) => {
-        requireOperatorSession(request.headers, { route: "/api/v1/approval-requests" });
+        requireOperatorSession(request.headers, {
+            route: "/api/v1/approval-requests"
+        });
         const query = request.query;
         return { approvalRequests: listApprovalRequests(query?.status) };
     });
@@ -1845,7 +3747,9 @@ export async function buildServer(options = {}) {
         const context = requireOperatorSession(request.headers, { route: "/api/v1/approval-requests/:id/approve" });
         const { id } = request.params;
         const body = resolveApprovalRequestSchema.parse(request.body ?? {});
-        const approvalRequest = approveApprovalRequest(id, body.note, body.actor ?? context.actor ?? parseOptionalActorHeader(request.headers));
+        const approvalRequest = approveApprovalRequest(id, body.note, body.actor ??
+            context.actor ??
+            parseOptionalActorHeader(request.headers));
         if (!approvalRequest) {
             reply.code(404);
             return { error: "Approval request not found" };
@@ -1856,7 +3760,9 @@ export async function buildServer(options = {}) {
         const context = requireOperatorSession(request.headers, { route: "/api/v1/approval-requests/:id/reject" });
         const { id } = request.params;
         const body = resolveApprovalRequestSchema.parse(request.body ?? {});
-        const approvalRequest = rejectApprovalRequest(id, body.note, body.actor ?? context.actor ?? parseOptionalActorHeader(request.headers));
+        const approvalRequest = rejectApprovalRequest(id, body.note, body.actor ??
+            context.actor ??
+            parseOptionalActorHeader(request.headers));
         if (!approvalRequest) {
             reply.code(404);
             return { error: "Approval request not found" };
@@ -1877,16 +3783,24 @@ export async function buildServer(options = {}) {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/agent-actions" });
         const input = createAgentActionSchema.parse(request.body ?? {});
         const idempotencyKey = parseIdempotencyKey(request.headers);
-        const result = createAgentAction(input, { actor: auth.actor, source: auth.source, token: auth.token ? managers.token.getTokenById(auth.token.id) : null }, idempotencyKey);
+        const result = createAgentAction(input, {
+            actor: auth.actor,
+            source: auth.source,
+            token: auth.token ? managers.token.getTokenById(auth.token.id) : null
+        }, idempotencyKey);
         reply.code(result.approvalRequest ? 202 : 201);
         return result;
     });
     app.get("/api/v1/rewards/rules", async (request) => {
-        requireOperatorSession(request.headers, { route: "/api/v1/rewards/rules" });
+        requireOperatorSession(request.headers, {
+            route: "/api/v1/rewards/rules"
+        });
         return { rules: listRewardRules() };
     });
     app.get("/api/v1/rewards/rules/:id", async (request, reply) => {
-        requireOperatorSession(request.headers, { route: "/api/v1/rewards/rules/:id" });
+        requireOperatorSession(request.headers, {
+            route: "/api/v1/rewards/rules/:id"
+        });
         const { id } = request.params;
         const rule = getRewardRuleById(id);
         if (!rule) {
@@ -1906,7 +3820,9 @@ export async function buildServer(options = {}) {
         return { rule };
     });
     app.get("/api/v1/rewards/ledger", async (request) => {
-        requireOperatorSession(request.headers, { route: "/api/v1/rewards/ledger" });
+        requireOperatorSession(request.headers, {
+            route: "/api/v1/rewards/ledger"
+        });
         const query = rewardsLedgerQuerySchema.parse(request.query ?? {});
         return { ledger: listRewardLedger(query) };
     });
@@ -1919,7 +3835,10 @@ export async function buildServer(options = {}) {
     app.post("/api/v1/session-events", async (request, reply) => {
         const auth = requireAuthenticatedActor(request.headers, { route: "/api/v1/session-events" });
         const payload = createSessionEventSchema.parse(request.body ?? {});
-        const event = recordSessionEvent(payload, { actor: auth.actor, source: auth.source });
+        const event = recordSessionEvent(payload, {
+            actor: auth.actor,
+            source: auth.source
+        });
         reply.code(201);
         return event;
     });
@@ -1930,6 +3849,27 @@ export async function buildServer(options = {}) {
     app.get("/api/v1/reviews/weekly", async () => ({
         review: getWeeklyReviewPayload()
     }));
+    app.post("/api/v1/reviews/weekly/finalize", async (request, reply) => {
+        const auth = requireAuthenticatedActor(request.headers, { route: "/api/v1/reviews/weekly/finalize" });
+        const currentReview = getWeeklyReviewPayload();
+        const finalized = finalizeWeeklyReviewClosure({
+            weekKey: currentReview.weekKey,
+            weekStartDate: currentReview.weekStartDate,
+            weekEndDate: currentReview.weekEndDate,
+            windowLabel: currentReview.windowLabel,
+            rewardXp: currentReview.reward.rewardXp,
+            actor: auth.actor,
+            source: auth.source
+        });
+        const result = finalizeWeeklyReviewResultSchema.parse({
+            closure: finalized.closure,
+            reward: finalized.reward,
+            review: getWeeklyReviewPayload(),
+            metrics: buildXpMetricsPayload()
+        });
+        reply.code(finalized.created ? 201 : 200);
+        return result;
+    });
     app.get("/api/v1/settings", async (request) => {
         requireScopedAccess(request.headers, ["read", "write"], { route: "/api/v1/settings" });
         return { settings: getSettings() };
@@ -1944,6 +3884,301 @@ export async function buildServer(options = {}) {
         reply.code(201);
         return { project };
     });
+    app.post("/api/v1/calendar/connections", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/connections" });
+        try {
+            const connection = await createCalendarConnection(createCalendarConnectionSchema.parse(request.body ?? {}), managers.secrets, toActivityContext(auth));
+            reply.code(201);
+            return { connection };
+        }
+        catch (error) {
+            if (error instanceof CalendarConnectionConflictError) {
+                reply.code(409);
+                return {
+                    code: "calendar_connection_duplicate",
+                    error: error.message,
+                    existingConnectionId: error.connectionId
+                };
+            }
+            throw error;
+        }
+    });
+    app.patch("/api/v1/calendar/connections/:id", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/connections/:id" });
+        const { id } = request.params;
+        const patch = updateCalendarConnectionSchema.parse(request.body ?? {});
+        try {
+            const connection = patch.label !== undefined || patch.selectedCalendarUrls !== undefined
+                ? await updateCalendarConnectionSelection(id, {
+                    label: patch.label,
+                    selectedCalendarUrls: patch.selectedCalendarUrls
+                }, managers.secrets, toActivityContext(auth))
+                : getCalendarConnectionById(id);
+            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.startsWith("Unknown calendar connection")) {
+                reply.code(404);
+                return { error: "Calendar connection not found" };
+            }
+            throw error;
+        }
+    });
+    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" };
+        }
+        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" });
+        const { id } = request.params;
+        const connection = await removeCalendarConnection(id, managers.secrets, toActivityContext(auth));
+        if (!connection) {
+            reply.code(404);
+            return { error: "Calendar connection not found" };
+        }
+        return { connection };
+    });
+    app.get("/api/v1/calendar/work-block-templates", async () => ({
+        templates: listWorkBlockTemplates()
+    }));
+    app.post("/api/v1/calendar/work-block-templates", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/work-block-templates" });
+        const template = createWorkBlockTemplate(createWorkBlockTemplateSchema.parse(request.body ?? {}));
+        recordActivityEvent({
+            entityType: "work_block",
+            entityId: template.id,
+            eventType: "work_block_created",
+            title: `Work block created: ${template.title}`,
+            description: "A recurring work block was added to Forge.",
+            actor: auth.actor ?? null,
+            source: auth.source,
+            metadata: {
+                kind: template.kind,
+                blockingState: template.blockingState
+            }
+        });
+        reply.code(201);
+        return { template };
+    });
+    app.patch("/api/v1/calendar/work-block-templates/:id", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/work-block-templates/:id" });
+        const { id } = request.params;
+        const template = updateWorkBlockTemplate(id, updateWorkBlockTemplateSchema.parse(request.body ?? {}));
+        if (!template) {
+            reply.code(404);
+            return { error: "Work block template not found" };
+        }
+        recordActivityEvent({
+            entityType: "work_block",
+            entityId: template.id,
+            eventType: "work_block_updated",
+            title: `Work block updated: ${template.title}`,
+            description: "The recurring work block was updated.",
+            actor: auth.actor ?? null,
+            source: auth.source,
+            metadata: {
+                kind: template.kind,
+                blockingState: template.blockingState
+            }
+        });
+        return { template };
+    });
+    app.delete("/api/v1/calendar/work-block-templates/:id", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/work-block-templates/:id" });
+        const { id } = request.params;
+        const template = deleteWorkBlockTemplate(id);
+        if (!template) {
+            reply.code(404);
+            return { error: "Work block template not found" };
+        }
+        recordActivityEvent({
+            entityType: "work_block",
+            entityId: template.id,
+            eventType: "work_block_deleted",
+            title: `Work block deleted: ${template.title}`,
+            description: "The recurring work block was removed.",
+            actor: auth.actor ?? null,
+            source: auth.source,
+            metadata: {
+                kind: template.kind
+            }
+        });
+        return { template };
+    });
+    app.get("/api/v1/calendar/timeboxes", async (request) => {
+        const query = calendarOverviewQuerySchema.parse(request.query ?? {});
+        const now = new Date();
+        const from = query.from ??
+            new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000).toISOString();
+        const to = query.to ??
+            new Date(now.getTime() + 21 * 24 * 60 * 60 * 1000).toISOString();
+        return { timeboxes: listTaskTimeboxes({ from, to }) };
+    });
+    app.post("/api/v1/calendar/timeboxes", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/timeboxes" });
+        const timebox = createTaskTimebox(createTaskTimeboxSchema.parse(request.body ?? {}));
+        recordActivityEvent({
+            entityType: "task_timebox",
+            entityId: timebox.id,
+            eventType: "task_timebox_created",
+            title: `Task timebox created: ${timebox.title}`,
+            description: "A future work slot was planned in Forge.",
+            actor: auth.actor ?? null,
+            source: auth.source,
+            metadata: {
+                taskId: timebox.taskId,
+                status: timebox.status
+            }
+        });
+        reply.code(201);
+        return { timebox };
+    });
+    app.patch("/api/v1/calendar/timeboxes/:id", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/timeboxes/:id" });
+        const { id } = request.params;
+        const timebox = updateTaskTimebox(id, updateTaskTimeboxSchema.parse(request.body ?? {}));
+        if (!timebox) {
+            reply.code(404);
+            return { error: "Task timebox not found" };
+        }
+        recordActivityEvent({
+            entityType: "task_timebox",
+            entityId: timebox.id,
+            eventType: "task_timebox_updated",
+            title: `Task timebox updated: ${timebox.title}`,
+            description: "The planned work slot was updated.",
+            actor: auth.actor ?? null,
+            source: auth.source,
+            metadata: {
+                taskId: timebox.taskId,
+                status: timebox.status
+            }
+        });
+        return { timebox };
+    });
+    app.delete("/api/v1/calendar/timeboxes/:id", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/timeboxes/:id" });
+        const { id } = request.params;
+        const timebox = deleteTaskTimebox(id);
+        if (!timebox) {
+            reply.code(404);
+            return { error: "Task timebox not found" };
+        }
+        recordActivityEvent({
+            entityType: "task_timebox",
+            entityId: timebox.id,
+            eventType: "task_timebox_deleted",
+            title: `Task timebox deleted: ${timebox.title}`,
+            description: "The planned work slot was removed.",
+            actor: auth.actor ?? null,
+            source: auth.source,
+            metadata: {
+                taskId: timebox.taskId
+            }
+        });
+        return { timebox };
+    });
+    app.post("/api/v1/calendar/timeboxes/recommend", async (request) => {
+        const input = recommendTaskTimeboxesSchema.parse(request.body ?? {});
+        return {
+            timeboxes: suggestTaskTimeboxes(input.taskId, {
+                from: input.from,
+                to: input.to,
+                limit: input.limit
+            })
+        };
+    });
+    app.post("/api/v1/calendar/events", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/events" });
+        const event = createCalendarEvent(createCalendarEventSchema.parse(request.body ?? {}));
+        await pushCalendarEventUpdate(event.id, managers.secrets);
+        const refreshed = getCalendarEventById(event.id);
+        recordActivityEvent({
+            entityType: "calendar_event",
+            entityId: refreshed.id,
+            eventType: "calendar_event_created",
+            title: `Calendar event created: ${refreshed.title}`,
+            description: "A native Forge calendar event was created.",
+            actor: auth.actor ?? null,
+            source: auth.source,
+            metadata: {
+                calendarId: refreshed.calendarId,
+                originType: refreshed.originType
+            }
+        });
+        reply.code(201);
+        return { event: refreshed };
+    });
+    app.patch("/api/v1/calendar/events/:id", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/events/:id" });
+        const { id } = request.params;
+        const event = updateCalendarEvent(id, updateCalendarEventSchema.parse(request.body ?? {}));
+        if (!event) {
+            reply.code(404);
+            return { error: "Calendar event not found" };
+        }
+        await pushCalendarEventUpdate(id, managers.secrets);
+        const refreshed = getCalendarEventById(id);
+        recordActivityEvent({
+            entityType: "calendar_event",
+            entityId: refreshed.id,
+            eventType: "calendar_event_updated",
+            title: `Calendar event updated: ${refreshed.title}`,
+            description: "The Forge calendar event was updated and projected to remote calendars when configured.",
+            actor: auth.actor ?? null,
+            source: auth.source,
+            metadata: {
+                calendarId: refreshed.calendarId,
+                originType: refreshed.originType
+            }
+        });
+        return { event: refreshed };
+    });
+    app.delete("/api/v1/calendar/events/:id", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/calendar/events/:id" });
+        const { id } = request.params;
+        const event = deleteCalendarEvent(id);
+        if (!event) {
+            reply.code(404);
+            return { error: "Calendar event not found" };
+        }
+        await deleteCalendarEventProjection(id, managers.secrets);
+        recordActivityEvent({
+            entityType: "calendar_event",
+            entityId: event.id,
+            eventType: "calendar_event_deleted",
+            title: `Calendar event deleted: ${event.title}`,
+            description: "The Forge calendar event was removed and any projected remote copies were deleted.",
+            actor: auth.actor ?? null,
+            source: auth.source,
+            metadata: {
+                calendarId: event.calendarId,
+                originType: event.originType
+            }
+        });
+        return { event };
+    });
+    app.post("/api/v1/habits", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/habits" });
+        const habit = createHabit(createHabitSchema.parse(request.body ?? {}), toActivityContext(auth));
+        reply.code(201);
+        return { habit };
+    });
     app.patch("/api/v1/projects/:id", async (request, reply) => {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/projects/:id" });
         const { id } = request.params;
@@ -1964,6 +4199,36 @@ export async function buildServer(options = {}) {
         }
         return { project };
     });
+    app.patch("/api/v1/habits/:id", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/habits/:id" });
+        const { id } = request.params;
+        const habit = updateHabit(id, updateHabitSchema.parse(request.body ?? {}), toActivityContext(auth));
+        if (!habit) {
+            reply.code(404);
+            return { error: "Habit not found" };
+        }
+        return { habit };
+    });
+    app.delete("/api/v1/habits/:id", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/habits/:id" });
+        const { id } = request.params;
+        const habit = deleteEntity("habit", id, entityDeleteQuerySchema.parse(request.query ?? {}), toActivityContext(auth));
+        if (!habit) {
+            reply.code(404);
+            return { error: "Habit not found" };
+        }
+        return { habit };
+    });
+    app.post("/api/v1/habits/:id/check-ins", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/habits/:id/check-ins" });
+        const { id } = request.params;
+        const habit = createHabitCheckIn(id, createHabitCheckInSchema.parse(request.body ?? {}), toActivityContext(auth));
+        if (!habit) {
+            reply.code(404);
+            return { error: "Habit not found" };
+        }
+        return { habit, metrics: buildXpMetricsPayload() };
+    });
     app.patch("/api/v1/settings", async (request) => {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/settings" });
         return {
@@ -2072,7 +4337,7 @@ export async function buildServer(options = {}) {
     app.get("/api/metrics", async (_request, reply) => {
         markCompatibilityRoute(reply);
         return {
-            metrics: buildGamificationProfile(listGoals(), listTasks())
+            metrics: buildGamificationProfile(listGoals(), listTasks(), listHabits())
         };
     });
     app.get("/api/task-runs", async (request, reply) => {
@@ -2102,7 +4367,7 @@ export async function buildServer(options = {}) {
         markCompatibilityRoute(reply);
         const query = taskListQuerySchema.parse(request.query ?? {});
         return {
-            metrics: buildGamificationProfile(listGoals(), listTasks()),
+            metrics: buildGamificationProfile(listGoals(), listTasks(), listHabits()),
             dashboard: getDashboard(),
             overview: getOverviewContext(),
             today: getTodayContext(),
@@ -2111,6 +4376,7 @@ export async function buildServer(options = {}) {
             projects: listProjectSummaries(),
             tags: listTags(),
             tasks: listTasks(query),
+            habits: listHabits(),
             activeTaskRuns: listTaskRuns({ active: true, limit: 25 }),
             activity: listActivityEvents({ limit: 25 })
         };
@@ -2145,8 +4411,10 @@ export async function buildServer(options = {}) {
         const taskRuns = listTaskRuns({ taskId: id, limit: 10 });
         return taskContextPayloadSchema.parse({
             task,
-            goal: task.goalId ? getGoalById(task.goalId) ?? null : null,
-            project: task.projectId ? listProjectSummaries().find((project) => project.id === task.projectId) ?? null : null,
+            goal: task.goalId ? (getGoalById(task.goalId) ?? null) : null,
+            project: task.projectId
+                ? (listProjectSummaries().find((project) => project.id === task.projectId) ?? null)
+                : null,
             activeTaskRun: taskRuns.find((run) => run.status === "active") ?? null,
             taskRuns,
             activity: listActivityEventsForTask(id, 20),
@@ -2163,8 +4431,10 @@ export async function buildServer(options = {}) {
         const taskRuns = listTaskRuns({ taskId: id, limit: 10 });
         return taskContextPayloadSchema.parse({
             task,
-            goal: task.goalId ? getGoalById(task.goalId) ?? null : null,
-            project: task.projectId ? listProjectSummaries().find((project) => project.id === task.projectId) ?? null : null,
+            goal: task.goalId ? (getGoalById(task.goalId) ?? null) : null,
+            project: task.projectId
+                ? (listProjectSummaries().find((project) => project.id === task.projectId) ?? null)
+                : null,
             activeTaskRun: taskRuns.find((run) => run.status === "active") ?? null,
             taskRuns,
             activity: listActivityEventsForTask(id, 20),
@@ -2340,7 +4610,9 @@ export async function buildServer(options = {}) {
         const input = operatorLogWorkSchema.parse(request.body ?? {});
         if (input.taskId) {
             const task = updateTask(input.taskId, {
-                title: input.title && input.title.trim().length > 0 ? input.title : undefined,
+                title: input.title && input.title.trim().length > 0
+                    ? input.title
+                    : undefined,
                 description: typeof input.description === "string"
                     ? input.description
                     : input.summary.trim().length > 0
@@ -2386,6 +4658,72 @@ export async function buildServer(options = {}) {
         reply.code(201);
         return { task, xp: buildXpMetricsPayload() };
     });
+    app.post("/api/v1/work-adjustments", async (request, reply) => {
+        const auth = requireScopedAccess(request.headers, ["write", "rewards.manage"], { route: "/api/v1/work-adjustments" });
+        const input = createWorkAdjustmentSchema.parse(request.body ?? {});
+        const currentTarget = resolveWorkAdjustmentTarget(input.entityType, input.entityId);
+        if (!currentTarget) {
+            reply.code(404);
+            return {
+                error: `${input.entityType === "task" ? "Task" : "Project"} not found`
+            };
+        }
+        const appliedDeltaMinutes = clampWorkAdjustmentMinutes(input.deltaMinutes, currentTarget.time.totalCreditedSeconds);
+        const nextCreditedSeconds = Math.max(0, currentTarget.time.totalCreditedSeconds + appliedDeltaMinutes * 60);
+        const result = runInTransaction(() => {
+            const adjustment = createWorkAdjustment({
+                ...input,
+                appliedDeltaMinutes
+            }, toActivityContext(auth));
+            const reward = recordWorkAdjustmentReward({
+                entityType: input.entityType,
+                entityId: input.entityId,
+                targetTitle: currentTarget.title,
+                actor: auth.actor ?? null,
+                source: auth.source,
+                requestedDeltaMinutes: input.deltaMinutes,
+                appliedDeltaMinutes,
+                previousCreditedSeconds: currentTarget.time.totalCreditedSeconds,
+                nextCreditedSeconds,
+                adjustmentId: adjustment.id
+            });
+            const copy = describeWorkAdjustment({
+                entityType: input.entityType,
+                targetTitle: currentTarget.title,
+                requestedDeltaMinutes: input.deltaMinutes,
+                appliedDeltaMinutes
+            });
+            recordActivityEvent({
+                entityType: input.entityType,
+                entityId: input.entityId,
+                eventType: "work_adjusted",
+                title: copy.title,
+                description: copy.description,
+                actor: auth.actor ?? null,
+                source: auth.source,
+                metadata: {
+                    adjustmentId: adjustment.id,
+                    requestedDeltaMinutes: input.deltaMinutes,
+                    appliedDeltaMinutes,
+                    rewardDeltaXp: reward?.deltaXp ?? 0,
+                    rewardId: reward?.id ?? null,
+                    note: input.note || null
+                }
+            });
+            return { adjustment, reward };
+        });
+        const updatedTarget = resolveWorkAdjustmentTarget(input.entityType, input.entityId);
+        if (!updatedTarget) {
+            throw new HttpError(500, "work_adjustment_target_missing", `Could not reload ${input.entityType} ${input.entityId} after adjustment`);
+        }
+        reply.code(201);
+        return workAdjustmentResultSchema.parse({
+            adjustment: result.adjustment,
+            target: updatedTarget,
+            reward: result.reward,
+            metrics: buildXpMetricsPayload()
+        });
+    });
     app.post("/api/v1/tasks/:id/uncomplete", async (request, reply) => {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/tasks/:id/uncomplete" });
         const { id } = request.params;
@@ -2399,18 +4737,26 @@ export async function buildServer(options = {}) {
     });
     app.post("/api/v1/entities/create", async (request) => {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/entities/create" });
-        return createEntities(batchCreateEntitiesSchema.parse(request.body ?? {}), toActivityContext(auth));
+        const result = createEntities(batchCreateEntitiesSchema.parse(request.body ?? {}), toActivityContext(auth));
+        await applyBatchCalendarEntityEffects(result.results, auth, "create");
+        return result;
     });
     app.post("/api/v1/entities/update", async (request) => {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/entities/update" });
-        return updateEntities(batchUpdateEntitiesSchema.parse(request.body ?? {}), toActivityContext(auth));
+        const result = updateEntities(batchUpdateEntitiesSchema.parse(request.body ?? {}), toActivityContext(auth));
+        await applyBatchCalendarEntityEffects(result.results, auth, "update");
+        return result;
     });
     app.post("/api/v1/entities/delete", async (request) => {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/entities/delete" });
-        return deleteEntities(batchDeleteEntitiesSchema.parse(request.body ?? {}), toActivityContext(auth));
+        const result = deleteEntities(batchDeleteEntitiesSchema.parse(request.body ?? {}), toActivityContext(auth));
+        await applyBatchCalendarEntityEffects(result.results, auth, "delete");
+        return result;
     });
     app.post("/api/v1/entities/restore", async (request) => {
-        requireScopedAccess(request.headers, ["write"], { route: "/api/v1/entities/restore" });
+        requireScopedAccess(request.headers, ["write"], {
+            route: "/api/v1/entities/restore"
+        });
         return restoreEntities(batchRestoreEntitiesSchema.parse(request.body ?? {}));
     });
     app.post("/api/v1/entities/search", async (request) => {
@@ -2419,7 +4765,9 @@ export async function buildServer(options = {}) {
     });
     app.post("/api/task-runs/recover", async (request, reply) => {
         markCompatibilityRoute(reply);
-        const payload = taskRunListQuerySchema.pick({ limit: true }).parse(request.body ?? {});
+        const payload = taskRunListQuerySchema
+            .pick({ limit: true })
+            .parse(request.body ?? {});
         return { timedOutRuns: recoverTimedOutTaskRuns({ limit: payload.limit }) };
     });
     app.post("/api/task-runs/:id/heartbeat", async (request, reply) => {
@@ -2427,52 +4775,68 @@ export async function buildServer(options = {}) {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/task-runs/:id/heartbeat" });
         const { id } = request.params;
         const input = taskRunHeartbeatSchema.parse(request.body ?? {});
-        return { taskRun: heartbeatTaskRun(id, input, new Date(), toActivityContext(auth)) };
+        return {
+            taskRun: heartbeatTaskRun(id, input, new Date(), toActivityContext(auth))
+        };
     });
     app.post("/api/v1/task-runs/:id/heartbeat", async (request) => {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/task-runs/:id/heartbeat" });
         const { id } = request.params;
         const input = taskRunHeartbeatSchema.parse(request.body ?? {});
-        return { taskRun: heartbeatTaskRun(id, input, new Date(), toActivityContext(auth)) };
+        return {
+            taskRun: heartbeatTaskRun(id, input, new Date(), toActivityContext(auth))
+        };
     });
     app.post("/api/task-runs/:id/focus", async (request, reply) => {
         markCompatibilityRoute(reply);
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/task-runs/:id/focus" });
         const { id } = request.params;
         const input = taskRunFocusSchema.parse(request.body ?? {});
-        return { taskRun: focusTaskRun(id, input, new Date(), toActivityContext(auth)) };
+        return {
+            taskRun: focusTaskRun(id, input, new Date(), toActivityContext(auth))
+        };
     });
     app.post("/api/v1/task-runs/:id/focus", async (request) => {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/task-runs/:id/focus" });
         const { id } = request.params;
         const input = taskRunFocusSchema.parse(request.body ?? {});
-        return { taskRun: focusTaskRun(id, input, new Date(), toActivityContext(auth)) };
+        return {
+            taskRun: focusTaskRun(id, input, new Date(), toActivityContext(auth))
+        };
     });
     app.post("/api/task-runs/:id/complete", async (request, reply) => {
         markCompatibilityRoute(reply);
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/task-runs/:id/complete" });
         const { id } = request.params;
         const input = taskRunFinishSchema.parse(request.body ?? {});
-        return { taskRun: completeTaskRun(id, input, new Date(), toActivityContext(auth)) };
+        return {
+            taskRun: completeTaskRun(id, input, new Date(), toActivityContext(auth))
+        };
     });
     app.post("/api/v1/task-runs/:id/complete", async (request) => {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/task-runs/:id/complete" });
         const { id } = request.params;
         const input = taskRunFinishSchema.parse(request.body ?? {});
-        return { taskRun: completeTaskRun(id, input, new Date(), toActivityContext(auth)) };
+        return {
+            taskRun: completeTaskRun(id, input, new Date(), toActivityContext(auth))
+        };
     });
     app.post("/api/task-runs/:id/release", async (request, reply) => {
         markCompatibilityRoute(reply);
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/task-runs/:id/release" });
         const { id } = request.params;
         const input = taskRunFinishSchema.parse(request.body ?? {});
-        return { taskRun: releaseTaskRun(id, input, new Date(), toActivityContext(auth)) };
+        return {
+            taskRun: releaseTaskRun(id, input, new Date(), toActivityContext(auth))
+        };
     });
     app.post("/api/v1/task-runs/:id/release", async (request) => {
         const auth = requireScopedAccess(request.headers, ["write"], { route: "/api/v1/task-runs/:id/release" });
         const { id } = request.params;
         const input = taskRunFinishSchema.parse(request.body ?? {});
-        return { taskRun: releaseTaskRun(id, input, new Date(), toActivityContext(auth)) };
+        return {
+            taskRun: releaseTaskRun(id, input, new Date(), toActivityContext(auth))
+        };
     });
     app.post("/api/tags/suggestions", async (request, reply) => {
         markCompatibilityRoute(reply);