forge-openclaw-plugin 0.2.60 → 0.2.65

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

@@ -26,6 +26,7 @@ import { createProject, updateProject } from "./repositories/projects.js";
 import { createPreferenceCatalog, createPreferenceCatalogItem, createPreferenceContext, createPreferenceItem, createPreferenceItemFromEntity, deletePreferenceCatalog, deletePreferenceCatalogItem, deletePreferenceContext, deletePreferenceItem, getPreferenceCatalogById, getPreferenceCatalogItemById, getPreferenceContextById, getPreferenceItemById, getPreferenceWorkspace, listPreferenceCatalogItems, listPreferenceCatalogs, listPreferenceContexts, listPreferenceItems, mergePreferenceContexts, startPreferenceGame, submitAbsoluteSignal, submitPairwiseJudgment, updatePreferenceCatalog, updatePreferenceCatalogItem, updatePreferenceContext, updatePreferenceItem, updatePreferenceScore } from "./repositories/preferences.js";
 import { createStrategy, getStrategyById, listStrategies, updateStrategy } from "./repositories/strategies.js";
 import { buildKnowledgeGraph, buildKnowledgeGraphFocus } from "./services/knowledge-graph.js";
+import { applyForgeDoctorFixes, buildForgeDoctorReport } from "./services/doctor.js";
 import { createManualRewardGrant, getRewardRuleById, listRewardLedger, listRewardRules, recordWorkAdjustmentReward, recordSessionEvent, updateRewardRule } from "./repositories/rewards.js";
 import { markGamificationCelebrationSeen } from "./repositories/gamification.js";
 import { getSettingsFileStatus, listAgentIdentities, getSettings, isPsycheAuthRequired, mirrorSettingsFileFromCurrentState, updateSettings, verifyAgentToken } from "./repositories/settings.js";
@@ -63,7 +64,8 @@ import { buildOpenApiDocument } from "./openapi.js";
 import { registerWebRoutes } from "./web.js";
 import { createManagerRuntime } from "./managers/runtime.js";
 import { isManagerError } from "./managers/type-guards.js";
-import { createCompanionPairingSession, createCompanionPairingSessionSchema, createSleepSession, createSleepSessionSchema, createWorkoutSession, createWorkoutSessionSchema, deleteSleepSession, deleteWorkoutSession, getCompanionPairingSessionById, getCompanionOverview, getFitnessViewData, getSleepSessionById, getSleepSessionDetailById, getSleepTimelineOverlaysForRange, getSleepViewData, getVitalsViewData, getWorkoutSessionById, ingestMobileHealthSync, mobileHealthSyncSchema, patchCompanionPairingSourceState, patchCompanionPairingSourceStateSchema, companionSourceKeySchema, requireValidPairing, revokeAllCompanionPairingSessions, revokeAllCompanionPairingSessionsSchema, revokeCompanionPairingSession, updateMobileCompanionSourceState, updateMobileCompanionSourceStateSchema, verifyCompanionPairing, verifyCompanionPairingSchema, updateSleepMetadata, updateSleepMetadataSchema, updateWorkoutMetadata, updateWorkoutMetadataSchema } from "./health.js";
+import { buildCompanionPairingTransport, getCompanionIrohStatus, stopCompanionIroh } from "./services/companion-iroh.js";
+import { createCompanionPairingSession, createCompanionPairingSessionSchema, createSleepSession, createSleepSessionSchema, createWorkoutSession, createWorkoutSessionSchema, deleteSleepSession, deleteWorkoutSession, getCompanionPairingSessionById, getCompanionOverview, getFitnessViewData, getSleepSessionById, getSleepSessionDetailById, getSleepTimelineOverlaysForRange, getSleepViewData, getVitalsViewData, getWorkoutSessionById, heartbeatCompanionPairing, heartbeatCompanionPairingSchema, ingestMobileHealthSync, mobileHealthSyncSchema, patchCompanionPairingSourceState, patchCompanionPairingSourceStateSchema, companionSourceKeySchema, requireValidPairing, revokeAllCompanionPairingSessions, revokeAllCompanionPairingSessionsSchema, revokeCompanionPairingSession, updateMobileCompanionSourceState, updateMobileCompanionSourceStateSchema, verifyCompanionPairing, verifyCompanionPairingSchema, updateSleepMetadata, updateSleepMetadataSchema, updateWorkoutMetadata, updateWorkoutMetadataSchema } from "./health.js";
 import { analyzeMovementUserBoxPreflight, createMovementUserBox, createMovementPlace, deleteMovementUserBox, getMovementAllTimeSummary, getMovementBoxDetail, getMovementDayDetail, getMovementMobileBootstrap, getMovementTimeline, getMovementSelectionAggregate, getMovementSettings, getMovementTripDetail, getMovementMonthSummary, invalidateAutomaticMovementBox, listMovementPlaces, movementAutomaticBoxInvalidateSchema, movementMobileBootstrapSchema, movementMobilePlaceMutationSchema, movementMobileStayPatchSchema, movementMobileUserBoxCreateSchema, movementMobileUserBoxPreflightSchema, movementMobileUserBoxPatchSchema, movementMobileAutomaticBoxInvalidateSchema, movementMobileTimelineSchema, movementPlaceMutationSchema, movementPlacePatchSchema, movementSelectionAggregateSchema, movementStayPatchSchema, movementTripPatchSchema, movementUserBoxCreateSchema, movementUserBoxPreflightSchema, movementUserBoxPatchSchema, movementSettingsPatchSchema, movementTimelineQuerySchema, movementTripPointPatchSchema, deleteMovementStay, deleteMovementTrip, deleteMovementTripPoint, updateMovementPlace, updateMovementSettings, updateMovementStay, updateMovementTrip, updateMovementUserBox, updateMovementTripPoint, resolveMovementTimelineSegmentForBox } from "./movement.js";
 import { getScreenTimeAllTimeSummary, getScreenTimeDayDetail, getScreenTimeMonthSummary, getScreenTimeSettings, screenTimeSettingsPatchSchema, updateScreenTimeSettings } from "./screen-time.js";
 import { assertWatchReady, buildWatchBootstrap, ingestWatchCaptureBatch, mobileWatchBootstrapSchema, mobileWatchCaptureBatchSchema, mobileWatchHabitCheckInSchema } from "./watch-mobile.js";
@@ -153,6 +155,18 @@ function buildApiBaseUrl(request) {
     const basePath = forwardedPrefix.replace(/\/$/, "");
     return `${request.protocol}://${host}${basePath}/api/v1`;
 }
+function buildUiBaseUrlFromApiBaseUrl(apiBaseUrl) {
+    try {
+        const url = new URL(apiBaseUrl);
+        url.pathname = "/forge/";
+        url.search = "";
+        url.hash = "";
+        return url.toString();
+    }
+    catch {
+        return apiBaseUrl;
+    }
+}
 function readSingleForwardedHeader(value) {
     if (Array.isArray(value)) {
         return value[0]?.split(",")[0]?.trim() || null;
@@ -1956,7 +1970,7 @@ function buildPreferredMutationPath(entityType) {
         case "wiki_page":
             return "Use /api/v1/wiki/pages with POST or PATCH for page CRUD.";
         case "calendar_connection":
-            return "Use /api/v1/calendar/connections plus provider-specific setup flows.";
+            return "Use /api/v1/calendar/discovery or /api/v1/calendar/macos-local/discovery before setup when needed; use /api/v1/calendar/connections with POST, PATCH, DELETE, rediscovery, and sync for connection lifecycle work.";
         case "task_run":
             return "Use the task-run action routes to start, heartbeat, focus, complete, or release live work.";
         case "questionnaire_run":
@@ -1991,7 +2005,7 @@ function buildPreferredMutationTool(entityType) {
         case "wiki_page":
             return "forge_upsert_wiki_page";
         case "calendar_connection":
-            return "forge_connect_calendar_provider | forge_sync_calendar_connection";
+            return "forge_connect_calendar_provider | forge_sync_calendar_connection | mirrored calendar connection routes";
         case "task_run":
             return "forge_start_task_run | forge_heartbeat_task_run | forge_focus_task_run | forge_complete_task_run | forge_release_task_run";
         case "questionnaire_run":
@@ -2802,6 +2816,7 @@ const AGENT_ONBOARDING_CONVERSATION_RULES = [
     "Once the route family is clear, say it plainly enough that another agent could follow the same path without guessing.",
     "For Movement specifically, treat missing-data corrections as user-defined overlay boxes unless the user is editing an already-recorded stay or trip. When the user already gave a clear instruction like 'that missing block was home', act after only the last ambiguity is resolved.",
     "For action workflows such as task_run, work_adjustment, questionnaire_run, preference_judgment, preference_signal, and self_observation, keep the question focused on the missing action payload and do not downgrade the request into generic batch CRUD.",
+    "For read-model-only health surfaces such as sleep_overview and sports_overview, use the dedicated overview reads first when the user wants review, pattern interpretation, recovery context, or training-load context. Move to sleep_session or workout_session writes only after one specific stored session needs enrichment.",
     "For normal stored Preferences and questionnaire records, use batch CRUD by default; switch to dedicated action routes only for judgments, signals, run answers, clone/draft/publish lifecycle, or visual comparison gameplay.",
     "When the user wants to remember a book, article, paper, source, concept, person, conversation, project reference, recurring explanation, or personal manual, consider wiki_page before note or self_observation.",
     "For meaning-bearing updates, especially in Psyche, briefly say what feels newly true before you ask for the one structural detail that still changes the save."
@@ -3018,6 +3033,30 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
             "Ask about tags only if they help later retrieval."
         ]
     },
+    {
+        focus: "sleep_overview",
+        openingQuestion: "What are you trying to understand from your sleep picture right now?",
+        coachingGoal: "Review recent nights, regularity, score, stages, and recovery context before deciding whether one sleep_session needs enrichment.",
+        askSequence: [
+            "Ask what practical sleep question the user wants the overview to answer.",
+            "Ask which night or date range matters only if the scope is not already clear.",
+            "Use the dedicated sleep overview read before asking the user to reconstruct metrics from memory.",
+            "Reflect the pattern or decision the user is trying to understand.",
+            "Move to a sleep_session write only when one specific night needs reflective context, tags, notes, or links."
+        ]
+    },
+    {
+        focus: "sports_overview",
+        openingQuestion: "What are you trying to understand from your workout picture right now?",
+        coachingGoal: "Review workouts, training load, effort, activity types, and recovery context before deciding whether one workout_session needs enrichment.",
+        askSequence: [
+            "Ask what practical training or recovery question the user wants the overview to answer.",
+            "Ask which workout or date range matters only if the scope is not already clear.",
+            "Use the dedicated sports overview read before asking the user to reconstruct metrics from memory.",
+            "Reflect the decision the user is trying to make from the training picture.",
+            "Move to a workout_session write only when one specific workout needs reflective context, tags, notes, or links."
+        ]
+    },
     {
         focus: "preference_catalog",
         openingQuestion: "What decision or taste question should this catalog help with?",
@@ -3122,10 +3161,12 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
         askSequence: [
             "Ask what they are trying to make clearer, repair, or preserve about where they were before you narrow to the exact movement lane.",
             "Ask whether the user is trying to query behavior, add something manually, update an existing movement item, or link movement to another Forge entity.",
+            "Treat day, month, all-time, timeline, trip detail, and selection as internal route lanes. With the user, ask for the useful time window, place, selected span, stay, or trip instead of listing route choices.",
             "Ask whether the focus is a stay, a trip, a place, a timeline window, or a selected span.",
             "Ask for the time window, place, or movement item that makes the question concrete.",
             "Ask what they are trying to notice, preserve, or answer through that movement context.",
             "Choose the dedicated day, month, all-time, timeline, places, trip-detail, or selection route once the question shape is clear.",
+            "Use allTime for whole-history aggregates, selection for a bounded selected-span aggregate, and tripDetail only when a concrete trip id is known.",
             "If the truth of one uncertain span is still unclear, read the timeline or saved-box detail before you mutate it.",
             "Skip the meta lane question when the user already named the exact correction or review target and only one ambiguity remains.",
             "If the request is filling a missing-data gap, use a user-defined movement box rather than a raw stay or trip patch.",
@@ -3142,6 +3183,8 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
         askSequence: [
             "Ask what feels off, important, or worth tracking in their energy picture before you reduce it to one life-force lane.",
             "Ask whether the job is overview, profile change, weekday-template change, or fatigue signaling.",
+            "Treat overview, profile, weekday-template, and fatigue-signal as internal route lanes. With the user, ask whether this is a current read, a durable assumption, a repeated weekday rhythm, or a right-now state instead of reciting route names.",
+            "Use routeKey overview for the current read; it maps to GET /api/v1/life-force, not /api/v1/life-force/overview.",
             "Ask what part of the current energy picture feels most important or inaccurate.",
             "Ask what should stay true if they are changing profile or template assumptions.",
             "Ask whether the user is describing a stable weekly shape or just how today feels when the lane is still blurred.",
@@ -3159,6 +3202,8 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
         askSequence: [
             "Ask what they are trying to learn, repair, publish, or run through Workbench before you narrow to flow discovery, editing, execution, or results.",
             "Ask whether the job is flow discovery, one flow edit, execution, run history, published output, node-level inspection, or latest-node-output lookup.",
+            "Treat saved-flow catalog, box catalog, run history, run detail, node result, latest node output, and published output as internal read lanes. With the user, ask whether they need the saved flow, its input contract, one run, one node, or the public result instead of listing route keys.",
+            "Use listFlows for the saved flow catalog and boxCatalog for available input-box contracts; do not collapse both into a vague catalog read.",
             "Ask which flow, slug, run, or node the request is about.",
             "Ask whether they need the stable flow contract, one run result, one published output, one node result, or the latest node output.",
             "If the user already named the flow and action clearly, skip the meta lane question and ask only for the missing run, node, or output scope.",
@@ -3172,26 +3217,29 @@ const AGENT_ONBOARDING_ENTITY_CONVERSATION_PLAYBOOKS = [
     {
         focus: "event_type",
         openingQuestion: "What kind of moment keeps happening that you want future reports to name the same way each time?",
-        coachingGoal: "Create a reusable incident category that will actually help future reports stay consistent.",
+        coachingGoal: "Bridge into Psyche-quality questioning for a reusable incident category without flattening the lived episode into cold taxonomy.",
         askSequence: [
-            "Ask what kind of moment or incident this label should capture in lived terms.",
-            "Reflect the repeated moment back in plain language before narrowing the wording.",
-            "Ask how narrow or broad it should be.",
-            "Ask what would count as inside versus outside the category if that boundary is still fuzzy.",
-            "Offer a concise label if the lived meaning is clearer than the wording.",
-            "Ask for a short description only if the label could be ambiguous later."
+            "Treat event_type as Psyche taxonomy: use the event_type Psyche coaching playbook when the user is exploring meaning, and keep batch CRUD as the storage path.",
+            "Ask what kind of emotionally meaningful moment keeps recurring and why naming it consistently would help future trigger reports.",
+            "Reflect the repeated moment back in plain language by naming the emotional or relational stake before narrowing the wording.",
+            "Ask for one recent example if the boundary is still abstract.",
+            "Clarify what belongs inside this event type and what should stay outside it.",
+            "Offer one concise candidate label once the repeated moment is clear.",
+            "Link it to trigger reports, beliefs, patterns, modes, or emotion definitions only after the category itself feels accurate."
         ]
     },
     {
         focus: "emotion_definition",
         openingQuestion: "When this feeling is present, what tells you it is this feeling and not a nearby one?",
-        coachingGoal: "Create a reusable emotion label with enough clarity to use consistently later.",
+        coachingGoal: "Bridge into Psyche-quality questioning for a reusable emotion label by its lived signature, not by a dictionary definition.",
         askSequence: [
-            "Ask what this feeling is like in lived terms when the user says it.",
-            "Reflect the felt signature back in plain language before you settle the label.",
+            "Treat emotion_definition as Psyche taxonomy: use the emotion_definition Psyche coaching playbook when the user is exploring the feeling, and keep batch CRUD as the storage path.",
+            "Ask when this feeling was present recently and what made it recognizable.",
+            "Reflect the felt signature back in plain language before asking for category or label polish.",
             "Ask what distinguishes it from nearby emotions if that matters.",
-            "Offer a concise label if the felt meaning is clearer than the wording.",
-            "Ask for a broader category only if it will help later browsing or reporting."
+            "Ask what the feeling tends to signal, protect, warn about, long for, or demand.",
+            "Offer one concise definition in the user's language and invite correction.",
+            "Link it to trigger reports, modes, beliefs, or patterns only after the definition feels steady."
         ]
     }
 ];
@@ -3201,9 +3249,10 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
         useWhen: "Use for a lived direction, quality of being, or way of showing up that matters to the user and should guide actions rather than just describe an outcome.",
         coachingGoal: "Clarify the value as a chosen direction, distinguish it from a goal, and gather one concrete way the user wants to embody it now.",
         askSequence: [
-            "Start with what matters and why it matters now.",
-            "Ask for one concrete example of what living this value would look like in ordinary life.",
-            "Separate the value direction from any specific outcome or achievement goal.",
+            "Start with one ordinary recent moment where the value felt alive, absent, or painfully important.",
+            "Ask what mattered in that moment and why it matters now.",
+            "Reflect the direction in the user's own language before separating it from any specific outcome or achievement goal.",
+            "Ask what someone would see this week if the user lived this value a little more.",
             "Notice tensions, barriers, or situations where the value gets lost.",
             "Name one small committed action that would move toward the value."
         ],
@@ -3218,6 +3267,7 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
             "linkedTaskIds"
         ],
         exampleQuestions: [
+            "Where did this value show up recently, even faintly?",
             "What feels deeply important about this to you?",
             "If you were living this value a little more this week, what would someone be able to see?",
             "What goal or area of life does this value belong to most clearly?",
@@ -3322,12 +3372,12 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
         useWhen: "Use for a belief, rule, or self-statement that keeps showing up in reactions, especially when the user can phrase it as a sentence.",
         coachingGoal: "Turn implicit self-talk or a likely schema theme into one explicit belief statement that can be tested and linked to patterns, reports, and modes without forcing the user into a debate too early.",
         askSequence: [
-            "Reflect the likely belief in the user's own words and ask for confirmation or correction.",
-            "Decide whether it is absolute or conditional.",
-            "Estimate how true it feels from 0 to 100.",
-            "Collect evidence for and evidence against.",
-            "Notice where the belief may have been learned or reinforced.",
-            "Offer a more flexible alternative belief.",
+            "Anchor the belief in one recent moment or reaction before abstracting it.",
+            "Reflect the likely belief sentence in the user's own words and ask for confirmation or correction.",
+            "Condense it into one saveable statement only after the wording feels accurate.",
+            "Decide whether it is absolute or conditional after the sentence lands.",
+            "Estimate how true it feels from 0 to 100 only if that helps the user understand its grip or guide later review.",
+            "Explore evidence, origin, and a flexible alternative only if the user wants to examine or soften the belief now.",
             "Link a schemaId only when a real schema catalog match is known."
         ],
         requiredForCreate: ["statement", "beliefType"],
@@ -3343,6 +3393,7 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
             "linkedModeIds"
         ],
         exampleQuestions: [
+            "When did this belief show up most recently?",
             "If we turned that reaction into one sentence, what would it sound like?",
             "When that reaction hits, what does it start telling you?",
             "Is it more of an always/never belief, or an if-then rule?",
@@ -3355,6 +3406,7 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
             "Schema catalog entries are reference concepts; belief_entry is the user-owned record.",
             "If no schema catalog match is known, omit schemaId rather than inventing one.",
             "Do not argue the user out of the belief. Reflect it, understand its function, and then collaboratively test for flexibility.",
+            "Do not rush to confidence, evidence, or flexible alternatives before the user feels the belief has been captured.",
             "When the wording is nearly there, ask whether it feels true enough before you move into confidence, evidence, or alternative-belief details.",
             "A useful hypothesis should name the rule or prediction the moment seems to activate and then invite correction before saving it as the belief sentence."
         ]
@@ -3400,6 +3452,7 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
             "Mode profiles are durable parts descriptions.",
             "Mode guide sessions are the guided reasoning process that can lead toward a mode profile.",
             "Do not overpathologize. The point is to understand the part's job and cost, then increase choice.",
+            "Do not start by asking for the mode family; choose the family after the lived description, protective job, fear, or burden is visible enough.",
             "If the user asks to understand the mode first, start from a recent moment and ask what the part is trying to do before you name it.",
             "When enough evidence is present, offer one tentative hypothesis about the mode's protective job, fear, or burden before choosing the family label."
         ]
@@ -3436,12 +3489,13 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
         useWhen: "Use for one specific emotionally meaningful incident that should be mapped from situation through emotions, thoughts, behaviors, consequences, and next moves.",
         coachingGoal: "Help the user build a clear incident chain with enough structure to learn from one episode while staying grounded and not rushing past the user's felt experience.",
         askSequence: [
-            "Name the incident briefly and anchor it in one concrete sequence.",
-            "Describe what happened in the situation.",
-            "Capture emotions and intensity.",
+            "Start with the situation and felt stake: what happened, and why did it hit enough to save.",
+            "Name the incident briefly only after the concrete sequence is clear.",
+            "Capture emotions, body state, and intensity before moving into interpretation.",
             "Capture thoughts, meanings, or belief-linked interpretations.",
-            "Capture behaviors and immediate coping moves.",
-            "Capture short-term and long-term consequences.",
+            "Capture behaviors, urges, and immediate coping moves.",
+            "Capture what the move did short term and what it cost or changed later.",
+            "Offer one careful hypothesis about the sequence only after situation, emotion, meaning, behavior, and consequence are partly visible.",
             "Identify next moves and linked patterns, beliefs, modes, values, or tasks."
         ],
         requiredForCreate: ["title"],
@@ -3473,6 +3527,7 @@ const AGENT_ONBOARDING_PSYCHE_PLAYBOOKS = [
         notes: [
             "Use eventTypeId only when a known event taxonomy item fits; otherwise use customEventType.",
             "Use emotionDefinitionId only when a known emotion definition fits; otherwise keep the raw label.",
+            "Do not turn the report into a worksheet dump before the felt stake is clear; reflect what made the episode matter before asking for the full chain.",
             "If the user becomes overwhelmed, slow down, summarize, and return to one segment of the chain at a time instead of pushing for the full report in one turn.",
             "Only hypothesize about the incident sequence after the situation, emotion, meaning, behavior, and consequence are at least partly visible."
         ]
@@ -4230,8 +4285,12 @@ function buildAgentOnboardingPayload(request) {
                 },
                 calendar_connection: {
                     list: "/api/v1/calendar/connections",
+                    discover: "/api/v1/calendar/discovery",
+                    discoverMacOSLocal: "/api/v1/calendar/macos-local/discovery",
+                    rediscover: "/api/v1/calendar/connections/:id/discovery",
                     create: "/api/v1/calendar/connections",
                     update: "/api/v1/calendar/connections/:id",
+                    sync: "/api/v1/calendar/connections/:id/sync",
                     delete: "/api/v1/calendar/connections/:id"
                 }
             },
@@ -4305,12 +4364,38 @@ function buildAgentOnboardingPayload(request) {
             specializedDomainSurfaces: {
                 movement: {
                     classification: "specialized_domain_surface",
+                    aliases: ["movement", "Movement"],
                     summary: "Dedicated movement workspace API. Use these routes for stays, trips, time-in-place questions, visited places, trip detail, selection aggregates, user-defined overlays, and repair actions on already-recorded movement data.",
                     routeSelectionQuestions: [
                         "Is the user asking for a day, month, all-time, timeline, place, trip detail, or selected-span answer?",
                         "Is this a missing-gap overlay, a saved-overlay repair, or an edit to one already-recorded stay, trip, or trip point?",
                         "If the target is already known, what one time, place, or saved-object detail is still missing before acting?"
                     ],
+                    methodRoutes: {
+                        day: "GET /api/v1/movement/day",
+                        month: "GET /api/v1/movement/month",
+                        allTime: "GET /api/v1/movement/all-time",
+                        timeline: "GET /api/v1/movement/timeline",
+                        places: "GET /api/v1/movement/places",
+                        boxDetail: "GET /api/v1/movement/boxes/:id",
+                        tripDetail: "GET /api/v1/movement/trips/:id",
+                        selection: "POST /api/v1/movement/selection",
+                        settings: "GET /api/v1/movement/settings",
+                        settingsUpdate: "PATCH /api/v1/movement/settings",
+                        placeCreate: "POST /api/v1/movement/places",
+                        placeUpdate: "PATCH /api/v1/movement/places/:id",
+                        userBoxCreate: "POST /api/v1/movement/user-boxes",
+                        userBoxPreflight: "POST /api/v1/movement/user-boxes/preflight",
+                        userBoxUpdate: "PATCH /api/v1/movement/user-boxes/:id",
+                        userBoxDelete: "DELETE /api/v1/movement/user-boxes/:id",
+                        automaticBoxInvalidate: "POST /api/v1/movement/automatic-boxes/:id/invalidate",
+                        stayUpdate: "PATCH /api/v1/movement/stays/:id",
+                        stayDelete: "DELETE /api/v1/movement/stays/:id",
+                        tripUpdate: "PATCH /api/v1/movement/trips/:id",
+                        tripDelete: "DELETE /api/v1/movement/trips/:id",
+                        tripPointUpdate: "PATCH /api/v1/movement/trips/:id/points/:pointId",
+                        tripPointDelete: "DELETE /api/v1/movement/trips/:id/points/:pointId"
+                    },
                     readRoutes: {
                         day: "/api/v1/movement/day",
                         month: "/api/v1/movement/month",
@@ -4340,6 +4425,7 @@ function buildAgentOnboardingPayload(request) {
                     },
                     notes: [
                         "Movement is not a normal batch CRUD entity family. It is a dedicated record of stays and trips: a stay means the user remained in the same place for a span of time, and a trip means they traveled between places.",
+                        "Route-selection questions are internal. User-facing questions should ask for the useful time window, place, selected span, stay, or trip instead of reciting day/month/all-time/timeline/selection route keys.",
                         "Use /api/v1/movement/day, /month, /all-time, /timeline, or /selection when the user wants behavioral answers such as how long they stayed at home, when they traveled, which places dominated a period, or what happened across a selected span.",
                         "Use the movement write routes when the user wants to add a place or manual overlay, update a specific stay or trip, repair one recorded movement span, or attach movement context to another Forge record. If the user is filling a missing-data gap, the usual write path is a user-defined overlay box rather than a raw stay or trip patch.",
                         "If the user is revising or removing an existing correction, first identify whether the saved object is a user-defined box, automatic box, recorded stay, recorded trip, or trip point so the repair or delete path stays truthful.",
@@ -4348,12 +4434,19 @@ function buildAgentOnboardingPayload(request) {
                 },
                 lifeForce: {
                     classification: "specialized_domain_surface",
+                    aliases: ["life_force", "life-force", "Life Force"],
                     summary: "Dedicated life-force API. Use it to read the current energy budget, drains, recommendations, and warnings, then patch only the parts that are meant to be user-controlled.",
                     routeSelectionQuestions: [
                         "Is the user trying to understand the overview, change durable profile assumptions, change a weekday curve, or log a right-now fatigue signal?",
                         "Are they describing a repeatable weekly shape or a one-off current state?",
                         "If the lane is already clear, what one weekday, profile field, or signal detail is still missing?"
                     ],
+                    methodRoutes: {
+                        overview: "GET /api/v1/life-force",
+                        profile: "PATCH /api/v1/life-force/profile",
+                        weekdayTemplate: "PUT /api/v1/life-force/templates/:weekday",
+                        fatigueSignal: "POST /api/v1/life-force/fatigue-signals"
+                    },
                     readRoutes: {
                         overview: "/api/v1/life-force"
                     },
@@ -4364,6 +4457,41 @@ function buildAgentOnboardingPayload(request) {
                     },
                     notes: [
                         "Life Force is a focused domain surface, not a batch CRUD entity type.",
+                        "Route-selection questions are internal. User-facing questions should ask whether this is a current read, durable assumption, repeated weekday rhythm, or right-now state instead of reciting overview/profile/template/signal route keys.",
+                        "Use GET /api/v1/life-force for the current overview payload with stats, drains, recommendations, and current-curve state.",
+                        "Patch the profile only for durable personal settings, update weekday templates only for the curve itself, and post fatigue signals for real-time tired or recovered observations.",
+                        "If the user says something like 'I always dip on Tuesdays after lunch', treat that as a weekday-template change rather than a one-off fatigue signal.",
+                        "If the user is asking what changed after a profile, template, or fatigue write, read the overview back so the effect stays visible.",
+                        "If the user already knows they want a profile change, weekday-template edit, or right-now fatigue signal, skip the broad lane question and ask only for the missing weekday, profile field, or signal detail."
+                    ]
+                },
+                life_force: {
+                    classification: "specialized_domain_surface",
+                    aliases: ["lifeForce", "life-force", "Life Force"],
+                    summary: "Alias for the dedicated Life Force API keyed to the entity-style name `life_force`. Use the same overview, profile, weekday-template, and fatigue-signal routes as `lifeForce`.",
+                    routeSelectionQuestions: [
+                        "Is the user trying to understand the overview, change durable profile assumptions, change a weekday curve, or log a right-now fatigue signal?",
+                        "Are they describing a repeatable weekly shape or a one-off current state?",
+                        "If the lane is already clear, what one weekday, profile field, or signal detail is still missing?"
+                    ],
+                    methodRoutes: {
+                        overview: "GET /api/v1/life-force",
+                        profile: "PATCH /api/v1/life-force/profile",
+                        weekdayTemplate: "PUT /api/v1/life-force/templates/:weekday",
+                        fatigueSignal: "POST /api/v1/life-force/fatigue-signals"
+                    },
+                    readRoutes: {
+                        overview: "/api/v1/life-force"
+                    },
+                    writeRoutes: {
+                        profile: "/api/v1/life-force/profile",
+                        weekdayTemplate: "/api/v1/life-force/templates/:weekday",
+                        fatigueSignal: "/api/v1/life-force/fatigue-signals"
+                    },
+                    notes: [
+                        "This `life_force` key exists so agents can look up the specialized route family by the entity catalog name without guessing that the canonical surface key is `lifeForce`.",
+                        "Life Force is a focused domain surface, not a batch CRUD entity type.",
+                        "Route-selection questions are internal. User-facing questions should ask whether this is a current read, durable assumption, repeated weekday rhythm, or right-now state instead of reciting overview/profile/template/signal route keys.",
                         "Use GET /api/v1/life-force for the current overview payload with stats, drains, recommendations, and current-curve state.",
                         "Patch the profile only for durable personal settings, update weekday templates only for the curve itself, and post fatigue signals for real-time tired or recovered observations.",
                         "If the user says something like 'I always dip on Tuesdays after lunch', treat that as a weekday-template change rather than a one-off fatigue signal.",
@@ -4373,12 +4501,31 @@ function buildAgentOnboardingPayload(request) {
                 },
                 workbench: {
                     classification: "specialized_domain_surface",
+                    aliases: ["workbench", "Workbench"],
                     summary: "Dedicated graph-flow API. Use it for flow catalog reads, flow CRUD, execution, run history, published outputs, node results, and latest successful node outputs.",
                     routeSelectionQuestions: [
-                        "Is the job flow discovery, flow editing, execution, published output, run detail, node result, latest node output, or flow chat follow-up?",
+                        "Is the job flow discovery, flow editing, execution, run history, published output, run detail, node result, latest node output, or flow chat follow-up?",
                         "Does the user need a stable public contract or one execution artifact?",
                         "If the flow is already known, what one run, node, or output scope detail is still missing before acting?"
                     ],
+                    methodRoutes: {
+                        listFlows: "GET /api/v1/workbench/flows",
+                        flowById: "GET /api/v1/workbench/flows/:id",
+                        flowBySlug: "GET /api/v1/workbench/flows/by-slug/:slug",
+                        publishedOutput: "GET /api/v1/workbench/flows/:id/output",
+                        runs: "GET /api/v1/workbench/flows/:id/runs",
+                        runDetail: "GET /api/v1/workbench/flows/:id/runs/:runId",
+                        runNodes: "GET /api/v1/workbench/flows/:id/runs/:runId/nodes",
+                        nodeResult: "GET /api/v1/workbench/flows/:id/runs/:runId/nodes/:nodeId",
+                        latestNodeOutput: "GET /api/v1/workbench/flows/:id/nodes/:nodeId/output",
+                        boxCatalog: "GET /api/v1/workbench/catalog/boxes",
+                        createFlow: "POST /api/v1/workbench/flows",
+                        updateFlow: "PATCH /api/v1/workbench/flows/:id",
+                        deleteFlow: "DELETE /api/v1/workbench/flows/:id",
+                        runFlow: "POST /api/v1/workbench/flows/:id/run",
+                        runByPayload: "POST /api/v1/workbench/run",
+                        chatFlow: "POST /api/v1/workbench/flows/:id/chat"
+                    },
                     readRoutes: {
                         listFlows: "/api/v1/workbench/flows",
                         flowById: "/api/v1/workbench/flows/:id",
@@ -4401,6 +4548,7 @@ function buildAgentOnboardingPayload(request) {
                     },
                     notes: [
                         "Workbench is a dedicated execution surface, not a batch CRUD entity family.",
+                        "Route-selection questions are internal. User-facing questions should ask whether the user needs the saved flow, its input contract, one run, one node, or the public result instead of reciting Workbench route keys.",
                         "Use the flow routes when the agent needs stable public input contracts, published outputs, node-level results, or reusable execution history.",
                         "If the user is still figuring out inputs or editable structure, read flow detail or box catalog before asking them to author a payload from memory.",
                         "Prefer the dedicated output and node-result routes over reverse-engineering raw traces.",
@@ -4411,10 +4559,15 @@ function buildAgentOnboardingPayload(request) {
             },
             readModelOnlySurfaces: {
                 sleepOverview: "/api/v1/health/sleep",
+                sleep_overview: "/api/v1/health/sleep",
                 sportsOverview: "/api/v1/health/fitness",
+                sports_overview: "/api/v1/health/fitness",
                 selfObservation: "/api/v1/psyche/self-observation/calendar",
+                self_observation: "/api/v1/psyche/self-observation/calendar",
                 calendarOverview: "/api/v1/calendar/overview",
+                calendar_overview: "/api/v1/calendar/overview",
                 operatorOverview: "/api/v1/operator/overview",
+                operator_overview: "/api/v1/operator/overview",
                 operatorContext: "/api/v1/operator/context"
             }
         },
@@ -4626,7 +4779,7 @@ function buildAgentOnboardingPayload(request) {
             saveSuggestionPlacement: "end_of_message",
             saveSuggestionTone: "gentle_optional",
             maxQuestionsPerTurn: 1,
-            psycheExplorationRule: "When a Psyche entity needs understanding first, begin with one exploratory question before any working formulation, replacement belief, suggested title, or save pitch. Keep the opening reflection to one or two short sentences, stay in plain prose instead of bullets or numbered lists, keep that first reply short, do not mention Forge search or save structure yet, avoid colons or list-shaped phrasing, prefer what/when/how over why until the experience is grounded, wait for the user's answer before offering a fuller formulation, ask permission before moving from charged exploration into naming or challenge when needed, make the next question help the user feel more able to name the experience rather than more examined, do not widen into adjacent entities until the current one has a working sentence the user recognizes, and once the lived experience is coherent stop deepening and help the user name it cleanly. When the user is updating a Psyche record because of one fresh episode, anchor in that episode before renaming the durable formulation, begin with the smallest part of the old wording that no longer fits, and do not reopen the full origin story unless the new understanding is truly structural. If the user accepts the wording, move toward the save instead of reopening deeper exploration.",
+            psycheExplorationRule: "When a Psyche entity needs understanding first, begin with one exploratory question before any working formulation, replacement belief, suggested title, or save pitch. Keep the opening reflection to one or two short sentences, stay in plain prose instead of bullets or numbered lists, keep that first reply short, do not mention Forge search or save structure yet, avoid colons or list-shaped phrasing, prefer what/when/how over why until the experience is grounded, wait for the user's answer before offering a fuller formulation, ask permission before moving from charged exploration into naming or challenge when needed, make the next question help the user feel more able to name the experience rather than more examined, do not widen into adjacent entities until the current one has a working sentence the user recognizes, and once the lived experience is coherent stop deepening and help the user name it cleanly. After one concrete example is clear and a hypothesis lands or is corrected, translate it into a saveable record shape such as a belief sentence, functional loop, behavior, mode, trigger report, value, event type, or emotion definition; ask one accuracy question instead of reopening broad exploration, then use the shared batch entity routes after the user accepts the wording or explicitly asks to save. When the user is updating a Psyche record because of one fresh episode, anchor in that episode before renaming the durable formulation, begin with the smallest part of the old wording that no longer fits, and do not reopen the full origin story unless the new understanding is truly structural. If the user accepts the wording, move toward the save instead of reopening deeper exploration.",
             specializedSurfaceRule: "For Movement, Life Force, and Workbench, clarify the job first, then choose the dedicated route family internally and do not guess at a generic CRUD path. Use specializedDomainSurfaces.routeSelectionQuestions when they are present so the next follow-up selects the right route instead of asking generic questions. When available, use forge_call_movement_route, forge_call_life_force_route, or forge_call_workbench_route after the lane is clear. In user-facing language, talk about timeline, overlay, weekday template, published output, run detail, or node result rather than surfaces, payloads, read paths, mutation paths, or CRUD. If the truth of the current state is still uncertain, read the relevant dedicated view before you mutate it. When the user already named a precise correction or review target, confirm only the route-selecting detail that is still missing. After a concrete Movement, Life Force, or Workbench correction, read the relevant view back when the user is trying to understand the result rather than just store it. The canonical runtime routes stay under /api/v1/*, and the OpenClaw HTTP mirror exposes the same families under /forge/v1/movement, /forge/v1/life-force, and /forge/v1/workbench.",
             reviewShortcutRule: "When the user is reviewing or correcting an existing record, ask what practical question they want the read or correction to answer, then narrow the saved object, timeframe, or route family first. Do not reopen the whole intake unless the user is actually redefining the record.",
             readModelWriteRule: "Self-observation is note-backed and should be written through observed notes with frontmatter.observedAt only when a lightweight episode observation is the right container. Do not use it as the default bucket for Psyche material: prefer trigger_report for one emotionally meaningful episode, behavior_pattern for functional analysis of a recurring loop, behavior for one repeated move, belief_entry for a core sentence, mode_guide_session or mode_profile for a central part-state, and wiki_page for durable memory such as books, articles, concepts, sources, or personal manuals. Sleep and workout sessions stay on batch CRUD by default; use the reflective review helpers only when enriching one already-known record after review.",
@@ -4652,10 +4805,28 @@ function buildAgentOnboardingPayload(request) {
             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. This includes calendar_event, work_block_template, task_timebox, sleep_session, workout_session, preference CRUD entities, and questionnaire_instrument 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. Official habit outcomes can also be logged through forge_update_entities by patching the habit with checkIn: { status, dateKey?, note?, description? } instead of route-hunting. Calendar-event updates still run downstream provider projection sync, and manual health-session field edits belong on the batch route by default rather than on the reflective review helpers.",
-            specializedRouteToolRule: "forge_call_movement_route, forge_call_life_force_route, and forge_call_workbench_route expect { routeKey, pathParams?, query?, body? }. Choose routeKey from the tool schema or entityRouteModel.specializedDomainSurfaces, fill pathParams for placeholders such as id, weekday, slug, runId, nodeId, or pointId, use query for read filters and userIds, and use body only for POST, PATCH, or PUT route keys. Normal stored entities still use the shared batch entity tools.",
+            specializedRouteToolRule: "forge_call_movement_route, forge_call_life_force_route, and forge_call_workbench_route expect { routeKey, pathParams?, query?, body? }. Choose routeKey from the tool schema or entityRouteModel.specializedDomainSurfaces, fill pathParams for placeholders such as id, weekday, slug, runId, nodeId, or pointId, use query for read filters and userIds, and use body only for POST, PATCH, or PUT route keys. The Life Force overview route key maps to GET /api/v1/life-force; do not invent /api/v1/life-force/overview. Normal stored entities still use the shared batch entity tools.",
             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":"project","id":"project_123","patch":{"status":"paused","schedulingRules":{"blockWorkBlockKinds":["main_activity"],"allowWorkBlockKinds":["secondary_activity"]}},"clientRef":"project-suspend-1"},{"entityType":"habit","id":"habit_456","patch":{"checkIn":{"status":"missed","note":"Resisted the urge after dinner.","description":"85 sec reset"}},"clientRef":"habit-check-in-1"}]}',
-            specializedRouteToolExample: '{"routeKey":"weekdayTemplate","pathParams":{"weekday":"monday"},"body":{"points":[{"hour":13,"freeAp":-4}]}}'
+            specializedRouteToolExample: '{"routeKey":"weekdayTemplate","pathParams":{"weekday":"monday"},"body":{"points":[{"hour":13,"freeAp":-4}]}}',
+            specializedRouteToolExamples: {
+                movementAllTime: '{"routeKey":"allTime","query":{"userIds":["user_operator"]}}',
+                movementTimeline: '{"routeKey":"timeline","query":{"from":"2026-05-01T00:00:00.000Z","to":"2026-05-06T23:59:59.999Z","userIds":["user_operator"]}}',
+                movementSelection: '{"routeKey":"selection","query":{"from":"2026-05-01T00:00:00.000Z","to":"2026-05-14T23:59:59.999Z","placeIds":["place_home"],"userIds":["user_operator"]}}',
+                movementTripDetail: '{"routeKey":"tripDetail","pathParams":{"id":"trip_123"}}',
+                movementMissingStayPreflight: '{"routeKey":"userBoxPreflight","body":{"kind":"stay","startedAt":"2026-05-06T13:00:00.000Z","endedAt":"2026-05-06T15:00:00.000Z","placeLabel":"Home","userId":"user_operator"}}',
+                movementMissingStayCreate: '{"routeKey":"userBoxCreate","body":{"kind":"stay","startedAt":"2026-05-06T13:00:00.000Z","endedAt":"2026-05-06T15:00:00.000Z","placeLabel":"Home","userId":"user_operator","note":"Manual correction after reviewing the timeline."}}',
+                lifeForceOverview: '{"routeKey":"overview"}',
+                lifeForceProfile: '{"routeKey":"profile","body":{"baselineDailyAp":24,"recoveryNotes":"Clinic-admin days need a lower expected afternoon load."}}',
+                lifeForceWeekdayTemplate: '{"routeKey":"weekdayTemplate","pathParams":{"weekday":"monday"},"body":{"points":[{"hour":13,"freeAp":-4}]}}',
+                lifeForceFatigueSignal: '{"routeKey":"fatigueSignal","body":{"signal":"tired","intensity":7,"note":"Sharp post-lunch dip after clinic admin."}}',
+                workbenchFlowCatalog: '{"routeKey":"listFlows","query":{"includeArchived":false}}',
+                workbenchBoxCatalog: '{"routeKey":"boxCatalog"}',
+                workbenchRunDetail: '{"routeKey":"runDetail","pathParams":{"id":"flow_research_digest","runId":"run_123"}}',
+                workbenchPublishedOutput: '{"routeKey":"publishedOutput","pathParams":{"id":"flow_research_digest"}}',
+                workbenchLatestNodeOutput: '{"routeKey":"latestNodeOutput","pathParams":{"id":"flow_research_digest","nodeId":"node_summary"}}',
+                workbenchRunFlow: '{"routeKey":"runFlow","pathParams":{"id":"flow_research_digest"},"body":{"input":{"topic":"question flow quality"}}}'
+            }
         }
     };
 }
@@ -6055,6 +6226,7 @@ export async function buildServer(options = {}) {
         clearInterval(cronSchedulerTimer);
         clearInterval(dataBackupTimer);
         taskRunWatchdog?.stop();
+        await stopCompanionIroh();
         await managers.backgroundJobs.stop();
     });
     const enqueueWikiIngestJob = (jobId) => {
@@ -6377,6 +6549,7 @@ export async function buildServer(options = {}) {
             storageRoot: getEffectiveDataRoot(),
             dataDir: resolveDataDir(),
             databasePath: resolveDatabasePathForDataRoot(),
+            port: runtimeConfig.port,
             basePath: runtimeConfig.basePath,
             devWebOrigin: process.env.FORGE_DEV_WEB_ORIGIN?.trim() || null
         };
@@ -6385,34 +6558,72 @@ export async function buildServer(options = {}) {
             backend: "forge-node-runtime",
             runtime
         });
-        const warnings = [];
-        if (!settingsFile.valid) {
-            warnings.push(`forge.json is invalid at ${settingsFile.path}. Forge ignored file precedence until the JSON is repaired or rewritten.`);
-        }
-        if (settingsFile.syncState === "applied_file_overrides") {
-            warnings.push("forge.json overrode one or more persisted database settings on this run.");
-        }
-        if (health.ok === false) {
-            warnings.push("The task-run watchdog reported degraded health.");
-        }
         return {
-            doctor: {
-                ok: health.ok && settingsFile.valid,
-                now: new Date().toISOString(),
+            doctor: await buildForgeDoctorReport({
+                settings,
+                settingsFile,
                 runtime,
-                health,
+                health
+            })
+        };
+    });
+    app.post("/api/v1/doctor/fixes", async (request) => {
+        requireScopedAccess(request.headers, ["write"], { route: "/api/v1/doctor/fixes" });
+        const parsed = z
+            .object({
+            fixIds: z.array(z.string().min(1)).optional(),
+            applyAllSafe: z.boolean().optional()
+        })
+            .parse(request.body ?? {});
+        const initialSettings = getSettings();
+        const initialSettingsFile = getSettingsFileStatus();
+        const initialRuntime = {
+            pid: process.pid,
+            storageRoot: getEffectiveDataRoot(),
+            dataDir: resolveDataDir(),
+            databasePath: resolveDatabasePathForDataRoot(),
+            port: runtimeConfig.port,
+            basePath: runtimeConfig.basePath,
+            devWebOrigin: process.env.FORGE_DEV_WEB_ORIGIN?.trim() || null
+        };
+        const initialHealth = buildHealthPayload(taskRunWatchdog, {
+            apiVersion: "v1",
+            backend: "forge-node-runtime",
+            runtime: initialRuntime
+        });
+        const initialDoctor = await buildForgeDoctorReport({
+            settings: initialSettings,
+            settingsFile: initialSettingsFile,
+            runtime: initialRuntime,
+            health: initialHealth
+        });
+        const fixResult = applyForgeDoctorFixes(parsed, {
+            integrityScore: initialDoctor.integrity.score
+        });
+        const settings = getSettings();
+        const settingsFile = getSettingsFileStatus();
+        const runtime = {
+            pid: process.pid,
+            storageRoot: getEffectiveDataRoot(),
+            dataDir: resolveDataDir(),
+            databasePath: resolveDatabasePathForDataRoot(),
+            port: runtimeConfig.port,
+            basePath: runtimeConfig.basePath,
+            devWebOrigin: process.env.FORGE_DEV_WEB_ORIGIN?.trim() || null
+        };
+        const health = buildHealthPayload(taskRunWatchdog, {
+            apiVersion: "v1",
+            backend: "forge-node-runtime",
+            runtime
+        });
+        return {
+            ...fixResult,
+            doctor: await buildForgeDoctorReport({
+                settings,
                 settingsFile,
-                settingsSummary: {
-                    themePreference: settings.themePreference,
-                    localePreference: settings.localePreference,
-                    operatorName: settings.profile.operatorName,
-                    maxActiveTasks: settings.execution.maxActiveTasks,
-                    timeAccountingMode: settings.execution.timeAccountingMode,
-                    psycheAuthRequired: settings.security.psycheAuthRequired,
-                    webAppUrl: `http://127.0.0.1:${runtimeConfig.port}${runtimeConfig.basePath}`
-                },
-                warnings
-            }
+                runtime,
+                health
+            })
         };
     });
     app.get("/api/v1/auth/operator-session", async (request, reply) => ({
@@ -6803,11 +7014,26 @@ export async function buildServer(options = {}) {
         requireOperatorSession(request.headers, {
             route: "/api/v1/health/pairing-sessions"
         });
-        reply.code(201);
-        return createCompanionPairingSession(buildApiBaseUrl({
+        const parsed = createCompanionPairingSessionSchema.parse(request.body ?? {});
+        const requestApiBaseUrl = buildApiBaseUrl({
             protocol: request.protocol,
             headers: request.headers
-        }), createCompanionPairingSessionSchema.parse(request.body ?? {}));
+        });
+        const pairingTransport = await buildCompanionPairingTransport({
+            requestedMode: parsed.transportMode,
+            requestApiBaseUrl,
+            requestUiBaseUrl: buildUiBaseUrlFromApiBaseUrl(requestApiBaseUrl)
+        });
+        reply.code(201);
+        return createCompanionPairingSession(pairingTransport, parsed);
+    });
+    app.get("/api/v1/health/companion-iroh", async (request) => {
+        requireOperatorSession(request.headers, {
+            route: "/api/v1/health/companion-iroh"
+        });
+        return {
+            iroh: getCompanionIrohStatus()
+        };
     });
     app.delete("/api/v1/health/pairing-sessions/:id", async (request, reply) => {
         const auth = requireOperatorSession(request.headers, {
@@ -6853,6 +7079,7 @@ export async function buildServer(options = {}) {
     app.post("/api/v1/mobile/pairing/verify", async (request) => ({
         pairing: verifyCompanionPairing(verifyCompanionPairingSchema.parse(request.body ?? {}))
     }));
+    app.post("/api/v1/mobile/pairing/heartbeat", async (request) => heartbeatCompanionPairing(heartbeatCompanionPairingSchema.parse(request.body ?? {})));
     app.post("/api/v1/mobile/movement/bootstrap", async (request) => {
         const parsed = movementMobileBootstrapSchema.parse(request.body ?? {});
         const pairing = requireValidPairing(parsed.sessionId, parsed.pairingToken);