feat: add server restart coordination and health status tracking (#300)

* feat: add server restart coordination and health status tracking

* refactor: consolidate server restart logic, extract hooks, remove dead code

Author: chriswritescode-dev

backend/src/index.ts

@@ -50,6 +50,8 @@ import { migrateGlobalSkills } from './services/skills'
 import { installAssistantWorkspace } from './services/assistant-mode'
 import { getOpenCodeImportStatus, syncOpenCodeImport } from './services/opencode-import'
 import { OpenCodeSupervisor } from './services/opencode-supervisor'
+import { OpenCodeRestartCoordinator } from './services/opencode-restart-coordinator'
+import { setOpenCodeRestartCoordinator } from './services/opencode-restart'
 import { OpenCodeConfigSchema } from '@opencode-manager/shared/schemas'
 import { parse as parseJsonc } from 'jsonc-parser'
 import { getModelStatePath, ModelStateSchema } from './routes/providers'
@@ -320,6 +322,13 @@ sseAggregator.setPendingActionsFetcher(openCodeClient)
 sseAggregator.setPasswordResolver(() => new SettingsService(db).getOpenCodeServerPassword())
 sseAggregator.start()
 
+sseAggregator.setScheduledSessionsResolver(
+  () => scheduleService.getActiveRunSessionIds(),
+)
+
+const openCodeRestartCoordinator = new OpenCodeRestartCoordinator(openCodeClient, sseAggregator)
+setOpenCodeRestartCoordinator(openCodeRestartCoordinator)
+
 void scheduleRunnerInstance.start()
 
 const settingsService = new SettingsService(db)

backend/src/routes/oauth.ts

@@ -7,18 +7,9 @@ import {
   OAuthAuthorizeResponseSchema,
   OAuthCallbackRequestSchema
 } from '../../../shared/src/schemas/auth'
-import { opencodeServerManager } from '../services/opencode-single-server'
+import { reloadOpenCodeConfig } from '../services/opencode-restart'
 import type { OpenCodeSupervisor } from '../services/opencode-supervisor'
 
-async function reloadOpenCodeConfig(openCodeSupervisor?: OpenCodeSupervisor): Promise<void> {
-  if (openCodeSupervisor) {
-    await openCodeSupervisor.reloadConfig('settings_reload')
-    return
-  }
-
-  await opencodeServerManager.reloadConfig()
-}
-
 export function createOAuthRoutes(openCodeClient: OpenCodeClient, openCodeSupervisor?: OpenCodeSupervisor) {
   const app = new Hono()
 

backend/src/routes/providers.ts

@@ -5,7 +5,7 @@ import { AuthService } from '../services/auth'
 import { SetCredentialRequestSchema } from '../../../shared/src/schemas/auth'
 import { logger } from '../utils/logger'
 import type { OpenCodeClient } from '../services/opencode/client'
-import { opencodeServerManager } from '../services/opencode-single-server'
+import { reloadOpenCodeConfig } from '../services/opencode-restart'
 import type { OpenCodeSupervisor } from '../services/opencode-supervisor'
 import type { Database } from 'bun:sqlite'
 import { getWorkspacePath } from '@opencode-manager/shared/config/env'
@@ -54,15 +54,6 @@ async function mirrorModelStateToFile(state: OpenCodeModelStateRecord): Promise<
   }
 }
 
-async function reloadOpenCodeConfig(openCodeSupervisor?: OpenCodeSupervisor): Promise<void> {
-  if (openCodeSupervisor) {
-    await openCodeSupervisor.reloadConfig('settings_reload')
-    return
-  }
-
-  await opencodeServerManager.reloadConfig()
-}
-
 export function createProvidersRoutes(db: Database, openCodeClient: OpenCodeClient, openCodeSupervisor?: OpenCodeSupervisor) {
   const app = new Hono()
   const authService = new AuthService()

backend/src/routes/repos.ts

@@ -8,7 +8,7 @@ import * as repoService from '../services/repo'
 import * as archiveService from '../services/archive'
 import { SettingsService } from '../services/settings'
 import { writeFileContent } from '../services/file-operations'
-import { opencodeServerManager } from '../services/opencode-single-server'
+import { restartOpenCode } from '../services/opencode-restart'
 import type { OpenCodeSupervisor } from '../services/opencode-supervisor'
 import type { OpenCodeClient } from '../services/opencode/client'
 import { logger } from '../utils/logger'
@@ -22,16 +22,6 @@ import { ScheduleService } from '../services/schedules'
 import { ensureAssistantMode, getAssistantModeStatus, buildAssistantRepo } from '../services/assistant-mode'
 import path from 'path'
 
-async function restartOpenCode(openCodeSupervisor?: OpenCodeSupervisor): Promise<void> {
-  if (openCodeSupervisor) {
-    await openCodeSupervisor.restart('settings_restart')
-    return
-  }
-
-  opencodeServerManager.clearStartupError()
-  await opencodeServerManager.restart()
-}
-
 function resolveRepo(database: Database, id: number): Repo | null {
   return getRepoById(database, id) ?? (id === ASSISTANT_REPO_ID ? buildAssistantRepo() : null)
 }

backend/src/routes/settings.test.ts

@@ -11,6 +11,8 @@ import { opencodeServerManager } from '../services/opencode-single-server'
 import type { GitAuthService } from '../services/git-auth'
 import type { OpenCodeSupervisor } from '../services/opencode-supervisor'
 import { createStubOpenCodeClient } from '../../test/helpers/stub-opencode-client'
+import type { OpenCodeRestartCoordinator, ResumableSession } from '../services/opencode-restart-coordinator'
+import { setOpenCodeRestartCoordinator } from '../services/opencode-restart'
 
 interface TestUserPreferenceRow {
   preferences: string
@@ -450,3 +452,67 @@ describe('settings routes — opencode model discovery', () => {
     expect(data.models).toEqual([])
   })
 })
+
+describe('settings routes — restart coordinator wiring', () => {
+  let db: Database
+  let app: Hono
+
+  beforeEach(() => {
+    db = createTestDb()
+  })
+
+  afterEach(() => {
+    db.close()
+    setOpenCodeRestartCoordinator(null)
+  })
+
+  it('GET /opencode-active-sessions returns count and sessions from coordinator', async () => {
+    const fakeCoordinator = {
+      captureResumableSessions: vi.fn(() => [{
+        sessionID: 's1',
+        directory: '/a',
+      } satisfies ResumableSession]),
+      abortSessions: vi.fn(),
+      resumeSessions: vi.fn(),
+      runWithResume: vi.fn(),
+    } as unknown as OpenCodeRestartCoordinator
+    setOpenCodeRestartCoordinator(fakeCoordinator)
+
+    app = createTestApp(db)
+    const res = await app.request('/settings/opencode-active-sessions')
+    expect(res.status).toBe(200)
+    const body = (await res.json()) as { count: number; sessions: ResumableSession[] }
+    expect(body.count).toBe(1)
+    expect(body.sessions).toEqual([{ sessionID: 's1', directory: '/a' }])
+    expect(fakeCoordinator.captureResumableSessions).toHaveBeenCalledTimes(1)
+  })
+
+  it('GET /opencode-active-sessions returns empty when no coordinator', async () => {
+    setOpenCodeRestartCoordinator(null)
+    app = createTestApp(db)
+    const res = await app.request('/settings/opencode-active-sessions')
+    expect(res.status).toBe(200)
+    const body = (await res.json()) as { count: number; sessions: ResumableSession[] }
+    expect(body.count).toBe(0)
+    expect(body.sessions).toEqual([])
+  })
+
+  it('POST /opencode-restart routes through coordinator.runWithResume and returns resumedSessions', async () => {
+    const runWithResume = vi.fn().mockResolvedValue({ healthy: true, resumedSessionIDs: ['s1'] })
+    const fakeCoordinator = {
+      captureResumableSessions: vi.fn(() => []),
+      abortSessions: vi.fn(),
+      resumeSessions: vi.fn(),
+      runWithResume,
+    } as unknown as OpenCodeRestartCoordinator
+    setOpenCodeRestartCoordinator(fakeCoordinator)
+
+    app = createTestApp(db)
+    const res = await app.request('/settings/opencode-restart', { method: 'POST' })
+    expect(res.status).toBe(200)
+    const body = (await res.json()) as { success: boolean; resumedSessions: string[] }
+    expect(body.success).toBe(true)
+    expect(body.resumedSessions).toEqual(['s1'])
+    expect(runWithResume).toHaveBeenCalledTimes(1)
+  })
+})

backend/src/routes/settings.ts

@@ -31,6 +31,7 @@ import { opencodeServerManager, ConfigReloadError } from '../services/opencode-s
 import { getOrCreateInternalToken, rotateInternalToken } from '../services/internal-token'
 import { sseAggregator } from '../services/sse-aggregator'
 import type { OpenCodeSupervisor } from '../services/opencode-supervisor'
+import { restartOpenCode, reloadOpenCodeConfig, getOpenCodeRestartCoordinator } from '../services/opencode-restart'
 import type { GitAuthService } from '../services/git-auth'
 import { DEFAULT_AGENTS_MD } from '../constants'
 import { validateSSHPrivateKey } from '../utils/ssh-validation'
@@ -92,25 +93,6 @@ function getOpenCodeConfigContentToWrite(
   return JSON.stringify(appliedConfig, null, 2)
 }
 
-async function reloadOpenCodeConfig(openCodeSupervisor?: OpenCodeSupervisor): Promise<void> {
-  if (openCodeSupervisor) {
-    await openCodeSupervisor.reloadConfig('settings_reload')
-    return
-  }
-
-  await opencodeServerManager.reloadConfig()
-}
-
-async function restartOpenCode(openCodeSupervisor?: OpenCodeSupervisor): Promise<void> {
-  if (openCodeSupervisor) {
-    await openCodeSupervisor.restart('settings_restart')
-    return
-  }
-
-  opencodeServerManager.clearStartupError()
-  await opencodeServerManager.restart()
-}
-
 async function restartOpenCodeSafe(openCodeSupervisor: OpenCodeSupervisor | undefined, context: string): Promise<void> {
   try {
     await restartOpenCode(openCodeSupervisor)
@@ -728,8 +710,12 @@ export function createSettingsRoutes(db: Database, gitAuthService: GitAuthServic
     try {
       logger.info('Manual OpenCode server restart requested')
       opencodeServerManager.clearStartupError()
-      await restartOpenCode(openCodeSupervisor)
-      return c.json({ success: true, message: 'OpenCode server restarted successfully' })
+      const { resumedSessionIDs } = await restartOpenCode(openCodeSupervisor)
+      return c.json({
+        success: true,
+        message: 'OpenCode server restarted successfully',
+        resumedSessions: resumedSessionIDs,
+      })
     } catch (error) {
       logger.error('Failed to restart OpenCode server:', error)
       const startupError = opencodeServerManager.getLastStartupError()
@@ -1879,6 +1865,11 @@ export function createSettingsRoutes(db: Database, gitAuthService: GitAuthServic
     }
   })
 
+  app.get('/opencode-active-sessions', (c) => {
+    const sessions = getOpenCodeRestartCoordinator()?.captureResumableSessions() ?? []
+    return c.json({ count: sessions.length, sessions })
+  })
+
   app.get('/opencode-discover-models', async (c) => {
     try {
       const baseUrl = c.req.query('baseUrl')