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

Author: chriswritescode-dev

backend/src/index.ts

@@ -51,6 +51,7 @@ 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'
@@ -321,11 +322,12 @@ sseAggregator.setPendingActionsFetcher(openCodeClient)
 sseAggregator.setPasswordResolver(() => new SettingsService(db).getOpenCodeServerPassword())
 sseAggregator.start()
 
-sseAggregator.setScheduledSessionChecker(
-  (sessionId) => scheduleService.getActiveRunSessionIds().has(sessionId),
+sseAggregator.setScheduledSessionsResolver(
+  () => scheduleService.getActiveRunSessionIds(),
 )
 
 const openCodeRestartCoordinator = new OpenCodeRestartCoordinator(openCodeClient, sseAggregator)
+setOpenCodeRestartCoordinator(openCodeRestartCoordinator)
 
 void scheduleRunnerInstance.start()
 
@@ -343,7 +345,7 @@ const protectedApi = new Hono()
 protectedApi.use('/*', requireAuth)
 
 protectedApi.route('/repos', createRepoRoutes(db, gitAuthService, scheduleService, openCodeClient, openCodeSupervisor))
-protectedApi.route('/settings', createSettingsRoutes(db, gitAuthService, openCodeClient, openCodeSupervisor, openCodeRestartCoordinator))
+protectedApi.route('/settings', createSettingsRoutes(db, gitAuthService, openCodeClient, openCodeSupervisor))
 protectedApi.route('/files', createFileRoutes())
 protectedApi.route('/providers', createProvidersRoutes(db, openCodeClient, openCodeSupervisor))
 protectedApi.route('/oauth', createOAuthRoutes(openCodeClient, openCodeSupervisor))

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

@@ -12,6 +12,7 @@ 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
@@ -211,9 +212,9 @@ function createTestDb(): Database {
   return db
 }
 
-function createTestApp(db: Database, openCodeSupervisor?: OpenCodeSupervisor, openCodeRestartCoordinator?: OpenCodeRestartCoordinator): Hono {
+function createTestApp(db: Database, openCodeSupervisor?: OpenCodeSupervisor): Hono {
   const app = new Hono()
-  app.route('/settings', createSettingsRoutes(db, mockGitAuthService, createStubOpenCodeClient(), openCodeSupervisor, openCodeRestartCoordinator))
+  app.route('/settings', createSettingsRoutes(db, mockGitAuthService, createStubOpenCodeClient(), openCodeSupervisor))
   return app
 }
 
@@ -462,6 +463,7 @@ describe('settings routes — restart coordinator wiring', () => {
 
   afterEach(() => {
     db.close()
+    setOpenCodeRestartCoordinator(null)
   })
 
   it('GET /opencode-active-sessions returns count and sessions from coordinator', async () => {
@@ -474,8 +476,9 @@ describe('settings routes — restart coordinator wiring', () => {
       resumeSessions: vi.fn(),
       runWithResume: vi.fn(),
     } as unknown as OpenCodeRestartCoordinator
+    setOpenCodeRestartCoordinator(fakeCoordinator)
 
-    app = createTestApp(db, undefined, 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[] }
@@ -485,6 +488,7 @@ describe('settings routes — restart coordinator wiring', () => {
   })
 
   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)
@@ -501,8 +505,9 @@ describe('settings routes — restart coordinator wiring', () => {
       resumeSessions: vi.fn(),
       runWithResume,
     } as unknown as OpenCodeRestartCoordinator
+    setOpenCodeRestartCoordinator(fakeCoordinator)
 
-    app = createTestApp(db, undefined, 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[] }

backend/src/routes/settings.ts

@@ -31,7 +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 type { OpenCodeRestartCoordinator } from '../services/opencode-restart-coordinator'
+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'
@@ -93,59 +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 restartOpenCodeWithResume(
-  supervisor: OpenCodeSupervisor | undefined,
-  coordinator: OpenCodeRestartCoordinator | undefined,
-): Promise<{ resumedSessionIDs: string[] } | null> {
-  if (!coordinator) {
-    await restartOpenCode(supervisor)
-    return null
-  }
-  const result = await coordinator.runWithResume(async () => {
-    if (supervisor) return (await supervisor.restart('settings_restart')).healthy
-    opencodeServerManager.clearStartupError()
-    await opencodeServerManager.restart()
-    return opencodeServerManager.checkHealth()
-  })
-  return { resumedSessionIDs: result.resumedSessionIDs }
-}
-
-async function reloadOpenCodeConfigWithResume(
-  supervisor: OpenCodeSupervisor | undefined,
-  coordinator: OpenCodeRestartCoordinator | undefined,
-): Promise<{ resumedSessionIDs: string[] } | null> {
-  if (!coordinator) {
-    await reloadOpenCodeConfig(supervisor)
-    return null
-  }
-  const result = await coordinator.runWithResume(async () => {
-    if (supervisor) return (await supervisor.reloadConfig('settings_reload')).healthy
-    opencodeServerManager.clearStartupError()
-    await opencodeServerManager.reloadConfig()
-    return opencodeServerManager.checkHealth()
-  })
-  return { resumedSessionIDs: result.resumedSessionIDs }
-}
-
 async function restartOpenCodeSafe(openCodeSupervisor: OpenCodeSupervisor | undefined, context: string): Promise<void> {
   try {
     await restartOpenCode(openCodeSupervisor)
@@ -401,7 +348,7 @@ async function extractOpenCodeError(response: Response, defaultError: string): P
     : defaultError
 }
 
-export function createSettingsRoutes(db: Database, gitAuthService: GitAuthService, openCodeClient: OpenCodeClient, openCodeSupervisor?: OpenCodeSupervisor, openCodeRestartCoordinator?: OpenCodeRestartCoordinator) {
+export function createSettingsRoutes(db: Database, gitAuthService: GitAuthService, openCodeClient: OpenCodeClient, openCodeSupervisor?: OpenCodeSupervisor) {
   const app = new Hono()
   const settingsService = new SettingsService(db)
 
@@ -763,11 +710,11 @@ export function createSettingsRoutes(db: Database, gitAuthService: GitAuthServic
     try {
       logger.info('Manual OpenCode server restart requested')
       opencodeServerManager.clearStartupError()
-      const resume = await restartOpenCodeWithResume(openCodeSupervisor, openCodeRestartCoordinator)
+      const { resumedSessionIDs } = await restartOpenCode(openCodeSupervisor)
       return c.json({
         success: true,
         message: 'OpenCode server restarted successfully',
-        resumedSessions: resume?.resumedSessionIDs ?? [],
+        resumedSessions: resumedSessionIDs,
       })
     } catch (error) {
       logger.error('Failed to restart OpenCode server:', error)
@@ -857,12 +804,8 @@ export function createSettingsRoutes(db: Database, gitAuthService: GitAuthServic
   app.post('/opencode-reload', async (c) => {
     try {
       logger.info('OpenCode configuration reload requested')
-      const resume = await reloadOpenCodeConfigWithResume(openCodeSupervisor, openCodeRestartCoordinator)
-      return c.json({
-        success: true,
-        message: 'OpenCode configuration reloaded successfully',
-        resumedSessions: resume?.resumedSessionIDs ?? [],
-      })
+      await reloadOpenCodeConfig(openCodeSupervisor)
+      return c.json({ success: true, message: 'OpenCode configuration reloaded successfully' })
     } catch (error) {
       logger.error('Failed to reload OpenCode config:', error)
       if (error instanceof ConfigReloadError) {
@@ -1923,7 +1866,7 @@ export function createSettingsRoutes(db: Database, gitAuthService: GitAuthServic
   })
 
   app.get('/opencode-active-sessions', (c) => {
-    const sessions = openCodeRestartCoordinator?.captureResumableSessions() ?? []
+    const sessions = getOpenCodeRestartCoordinator()?.captureResumableSessions() ?? []
     return c.json({ count: sessions.length, sessions })
   })
 

backend/src/services/opencode-restart-coordinator.test.ts

@@ -15,7 +15,7 @@ function createFakeActiveSessionsProvider(overrides: Partial<ActiveSessionsProvi
   return {
     getActiveSessions: vi.fn(() => ({})),
     isSubagentSession: vi.fn(() => false),
-    isScheduledSession: vi.fn(() => false),
+    getScheduledSessionIds: vi.fn(() => new Set<string>()),
     ...overrides,
   }
 }
@@ -73,7 +73,7 @@ describe('OpenCodeRestartCoordinator', () => {
       vi.mocked(activeSessions.getActiveSessions).mockReturnValue({
         '/a': ['s1', 'sched1'],
       })
-      vi.mocked(activeSessions.isScheduledSession).mockImplementation((id: string) => id === 'sched1')
+      vi.mocked(activeSessions.getScheduledSessionIds).mockReturnValue(new Set(['sched1']))
 
       const result = coordinator.captureResumableSessions()
 
@@ -85,7 +85,7 @@ describe('OpenCodeRestartCoordinator', () => {
         '/p': ['manual', 'sub', 'sched'],
       })
       vi.mocked(activeSessions.isSubagentSession).mockImplementation((id: string) => id === 'sub')
-      vi.mocked(activeSessions.isScheduledSession).mockImplementation((id: string) => id === 'sched')
+      vi.mocked(activeSessions.getScheduledSessionIds).mockReturnValue(new Set(['sched']))
 
       const result = coordinator.captureResumableSessions()
 
@@ -209,7 +209,7 @@ describe('OpenCodeRestartCoordinator', () => {
       vi.mocked(activeSessions.getActiveSessions).mockReturnValue({
         '/a': ['manual1', 'sched1'],
       })
-      vi.mocked(activeSessions.isScheduledSession).mockImplementation((id: string) => id === 'sched1')
+      vi.mocked(activeSessions.getScheduledSessionIds).mockReturnValue(new Set(['sched1']))
 
       const restart = vi.fn(async () => true)