fix: consolidate discovery-cache, batch bundle refs, remove dead code (#290)

* fix: consolidate discovery-cache, batch bundle refs, remove dead code

* refactor: consolidate discovery cache into generic discoverCached, extract spawnGit helper

Author: chriswritescode-dev

README.md

@@ -99,7 +99,7 @@ For OAuth, Passkeys, Push Notifications (VAPID), and advanced configuration, see
 
 ## `ocm` CLI
 
-OpenCode Manager ships an `ocm` CLI (from `ocm-cli/`) that attaches your local OpenCode TUI to a repo hosted on the Manager. It lists ready repos, attaches via the Manager's `/api/opencode-proxy` (so prompts run on the Manager's filesystem against a single shared OpenCode server), and can tarball-sync the working tree up or down with `ocm push` / `ocm pull`. Running `ocm` inside a local clone auto-detects the matching Manager repo by `origin` URL.
+OpenCode Manager ships an `ocm` CLI (from `ocm-cli/`) that attaches your local OpenCode TUI to a repo hosted on the Manager. It lists ready repos, attaches via the Manager's `/api/opencode-proxy` (so prompts run on the Manager's filesystem against a single shared OpenCode server), and can sync the working tree up or down with `ocm push` / `ocm pull` (fast git bundle + working-tree patch by default; pass `--full` for the legacy tarball mirror). Running `ocm` inside a local clone auto-detects the matching Manager repo by `origin` URL.
 
 See the [`ocm` CLI guide](docs/ocm-cli.md) for setup and commands.
 

backend/src/routes/internal/repo-mirror.ts

@@ -19,6 +19,7 @@ import {
   readUploadMeta,
   deleteUploadSession,
   getPartPath,
+  getStagingRoot,
   extractPartsToStaging,
   atomicSwapIntoPlace,
   carryOverIgnoredFiles,
@@ -96,6 +97,7 @@ async function applyMirrorPatch(fullPath: string, patch: string): Promise<void>
 async function importBundle(fullPath: string, bundlePath: string, branch: string | null): Promise<void> {
   await gitRaw(fullPath, ['fetch', bundlePath, '+refs/heads/*:refs/remotes/ocm-sync/*', '+refs/tags/*:refs/tags/*'])
   const refs = await gitRaw(fullPath, ['for-each-ref', '--format=%(refname:strip=3) %(objectname)', 'refs/remotes/ocm-sync'])
+  const updates: string[] = []
   for (const line of refs.split('\n')) {
     const trimmed = line.trim()
     if (!trimmed) continue
@@ -104,7 +106,10 @@ async function importBundle(fullPath: string, bundlePath: string, branch: string
     const name = trimmed.slice(0, firstSpace)
     if (name === 'HEAD') continue
     const sha = trimmed.slice(firstSpace + 1)
-    await gitRaw(fullPath, ['update-ref', `refs/heads/${name}`, sha])
+    updates.push(`update refs/heads/${name} ${sha}\n`)
+  }
+  if (updates.length > 0) {
+    await gitRaw(fullPath, ['update-ref', '--stdin'], process.env, updates.join(''))
   }
 
   if (branch) {
@@ -113,17 +118,15 @@ async function importBundle(fullPath: string, bundlePath: string, branch: string
     if (head) await gitRaw(fullPath, ['reset', '--hard', head])
   }
 
-  await gitRaw(fullPath, ['for-each-ref', '--format=%(refname)', 'refs/remotes/ocm-sync'])
-    .then(async (out) => {
-      for (const ref of out.split('\n').map((line) => line.trim()).filter(Boolean)) {
-        await gitRaw(fullPath, ['update-ref', '-d', ref])
-      }
-    })
-    .catch(() => {})
+  const syncRefsOut = await gitRaw(fullPath, ['for-each-ref', '--format=%(refname)', 'refs/remotes/ocm-sync']).catch(() => '')
+  const deletes = syncRefsOut.split('\n').map((l) => l.trim()).filter(Boolean).map((ref) => `delete ${ref}\n`)
+  if (deletes.length > 0) {
+    await gitRaw(fullPath, ['update-ref', '--stdin'], process.env, deletes.join('')).catch(() => {})
+  }
 }
 
 async function createBundle(fullPath: string): Promise<string> {
-  const stagingRoot = join(getReposPath(), '.ocm-staging')
+  const stagingRoot = getStagingRoot()
   mkdirSync(stagingRoot, { recursive: true })
   const bundleDir = mkdtempSync(join(stagingRoot, 'bundle-'))
   const bundlePath = join(bundleDir, 'repo.bundle')
@@ -338,7 +341,7 @@ export function createInternalRepoMirrorRoutes(db: Database) {
     const rawBody = c.req.raw.body
     if (!rawBody) return c.json({ error: 'no body provided' }, 400)
 
-    const stagingRoot = join(getReposPath(), '.ocm-staging')
+    const stagingRoot = getStagingRoot()
     mkdirSync(stagingRoot, { recursive: true })
     const bundleDir = mkdtempSync(join(stagingRoot, 'bundle-upload-'))
     const bundlePath = join(bundleDir, 'repo.bundle')
@@ -460,7 +463,7 @@ export function createInternalRepoMirrorRoutes(db: Database) {
     try {
       const ignored = await gitOut(fullPath, ['ls-files', '--others', '--ignored', '--exclude-standard', '--directory'])
       if (ignored.trim()) {
-        const excludeParent = join(getReposPath(), '.ocm-staging')
+        const excludeParent = getStagingRoot()
         mkdirSync(excludeParent, { recursive: true })
         ignoreFile = mkdtempSync(join(excludeParent, 'exclude-'))
         writeFileSync(join(ignoreFile, '.gitignore'), ignored)

backend/src/routes/settings.ts

@@ -25,11 +25,7 @@ import {
 } from '@opencode-manager/shared'
 import { logger } from '../utils/logger'
 import {
-  fetchAvailableModels,
-  generateDiscoveryCacheKey,
-  getCachedDiscovery,
-  cacheDiscovery,
-  ensureDiscoveryCacheDir,
+  discoverModelsCached,
 } from '../utils/discovery-cache'
 import { opencodeServerManager, ConfigReloadError } from '../services/opencode-single-server'
 import { getOrCreateInternalToken, rotateInternalToken } from '../services/internal-token'
@@ -1904,22 +1900,17 @@ export function createSettingsRoutes(db: Database, gitAuthService: GitAuthServic
       }
 
       const trimmedBaseUrl = baseUrl.trim()
-      const cacheKey = generateDiscoveryCacheKey(trimmedBaseUrl, apiKey, 'opencode-models')
 
-      if (!forceRefresh) {
-        const cachedModels = await getCachedDiscovery<string[]>(cacheKey)
-        if (cachedModels) {
-          return c.json({ models: cachedModels, cached: true })
-        }
-      }
-
-      await ensureDiscoveryCacheDir()
-      logger.info(`Discovering OpenCode models from ${trimmedBaseUrl}`)
-
-      const models = await fetchAvailableModels(trimmedBaseUrl, apiKey, /.*/, [])
-      await cacheDiscovery(cacheKey, models)
+      const { models, cached } = await discoverModelsCached({
+        baseUrl: trimmedBaseUrl,
+        apiKey,
+        type: 'opencode-models',
+        filterPattern: /.*/,
+        defaultModels: [],
+        forceRefresh,
+      })
 
-      return c.json({ models, cached: false })
+      return c.json({ models, cached })
     } catch (error) {
       logger.error('Failed to discover OpenCode models:', error)
       return c.json({ error: 'Failed to discover models' }, 500)

backend/src/routes/stt.ts

@@ -4,11 +4,7 @@ import { SettingsService } from '../services/settings'
 import { logger } from '../utils/logger'
 import {
   normalizeToBaseUrl,
-  ensureDiscoveryCacheDir,
-  getCachedDiscovery,
-  cacheDiscovery,
-  generateDiscoveryCacheKey,
-  fetchAvailableModels,
+  discoverModelsCached,
 } from '../utils/discovery-cache'
 import { type STTConfig } from '@opencode-manager/shared'
 
@@ -142,37 +138,26 @@ export function createSTTRoutes(db: Database) {
         return c.json({ error: 'STT not configured' }, 400)
       }
 
-      const cacheKey = generateDiscoveryCacheKey(sttConfig.endpoint, sttConfig.apiKey, 'models')
+      const { models, cached } = await discoverModelsCached({
+        baseUrl: sttConfig.endpoint,
+        apiKey: sttConfig.apiKey,
+        type: 'models',
+        filterPattern: /whisper|transcri/,
+        defaultModels: ['whisper-1'],
+        forceRefresh,
+      })
 
-      if (!forceRefresh) {
-        const cachedModels = await getCachedDiscovery<string[]>(cacheKey)
-        if (cachedModels) {
-          logger.info(`STT models cache hit for user ${userId}`)
-          return c.json({ models: cachedModels, cached: true })
-        }
+      if (!cached) {
+        await settingsService.updateSettings({
+          stt: {
+            ...sttConfig,
+            availableModels: models,
+            lastModelsFetch: Date.now(),
+          } as STTConfig,
+        }, userId)
       }
 
-      await ensureDiscoveryCacheDir()
-      logger.info(`Fetching STT models for user ${userId}`)
-
-      const models = await fetchAvailableModels(
-        sttConfig.endpoint,
-        sttConfig.apiKey,
-        /whisper|transcri/,
-        ['whisper-1'],
-      )
-      await cacheDiscovery(cacheKey, models)
-
-      await settingsService.updateSettings({
-        stt: {
-          ...sttConfig,
-          availableModels: models,
-          lastModelsFetch: Date.now()
-        } as STTConfig
-      }, userId)
-
-      logger.info(`Fetched ${models.length} STT models`)
-      return c.json({ models, cached: false })
+      return c.json({ models, cached })
     } catch (error) {
       logger.error('Failed to fetch STT models:', error)
       return c.json({ error: 'Failed to fetch models' }, 500)

backend/src/routes/tts.ts

@@ -9,11 +9,8 @@ import { logger } from '../utils/logger'
 import { getWorkspacePath } from '@opencode-manager/shared/config/env'
 import {
   normalizeToBaseUrl,
-  ensureDiscoveryCacheDir,
-  getCachedDiscovery,
-  cacheDiscovery,
-  generateDiscoveryCacheKey,
-  fetchAvailableModels,
+  discoverModelsCached,
+  discoverCached,
 } from '../utils/discovery-cache'
 
 const TTS_CACHE_DIR = join(getWorkspacePath(), 'cache', 'tts')
@@ -357,40 +354,26 @@ export function createTTSRoutes(db: Database) {
         return c.json({ error: 'TTS not configured' }, 400)
       }
 
-      const cacheKey = generateDiscoveryCacheKey(ttsConfig.endpoint, ttsConfig.apiKey, 'models')
-      
-      // Check cache first (unless force refresh)
-      if (!forceRefresh) {
-        const cachedModels = await getCachedDiscovery<string[]>(cacheKey)
-        if (cachedModels) {
-          logger.info(`Models cache hit for user ${userId}`)
-          return c.json({ models: cachedModels, cached: true })
-        }
+      const { models, cached } = await discoverModelsCached({
+        baseUrl: ttsConfig.endpoint,
+        apiKey: ttsConfig.apiKey,
+        type: 'models',
+        filterPattern: /tts|audio|speech/,
+        defaultModels: ['tts-1', 'tts-1-hd'],
+        forceRefresh,
+      })
+
+      if (!cached) {
+        await settingsService.updateSettings({
+          tts: {
+            ...ttsConfig,
+            availableModels: models,
+            lastModelsFetch: Date.now(),
+          },
+        }, userId)
       }
-      
-      // Fetch from API
-      await ensureDiscoveryCacheDir()
-      logger.info(`Fetching TTS models for user ${userId}`)
-      
-      const models = await fetchAvailableModels(
-        ttsConfig.endpoint,
-        ttsConfig.apiKey,
-        /tts|audio|speech/,
-        ['tts-1', 'tts-1-hd'],
-      )
-      await cacheDiscovery(cacheKey, models)
-      
-      // Update user preferences with available models
-      await settingsService.updateSettings({
-        tts: {
-          ...ttsConfig,
-          availableModels: models,
-          lastModelsFetch: Date.now()
-        }
-      }, userId)
-      
-      logger.info(`Fetched ${models.length} TTS models`)
-      return c.json({ models, cached: false })
+
+      return c.json({ models, cached })
     } catch (error) {
       logger.error('Failed to fetch TTS models:', error)
       return c.json({ error: 'Failed to fetch models' }, 500)
@@ -410,35 +393,25 @@ export function createTTSRoutes(db: Database) {
         return c.json({ error: 'TTS not configured' }, 400)
       }
 
-      const cacheKey = generateDiscoveryCacheKey(ttsConfig.endpoint, ttsConfig.apiKey, 'voices')
-      
-      // Check cache first (unless force refresh)
-      if (!forceRefresh) {
-        const cachedVoices = await getCachedDiscovery<string[]>(cacheKey)
-        if (cachedVoices) {
-          logger.info(`Voices cache hit for user ${userId}`)
-          return c.json({ voices: cachedVoices, cached: true })
-        }
+      const { value: voices, cached } = await discoverCached({
+        baseUrl: ttsConfig.endpoint,
+        apiKey: ttsConfig.apiKey,
+        type: 'voices',
+        forceRefresh,
+        fetcher: () => fetchAvailableVoices(ttsConfig.endpoint, ttsConfig.apiKey),
+      })
+
+      if (!cached) {
+        await settingsService.updateSettings({
+          tts: {
+            ...ttsConfig,
+            availableVoices: voices,
+            lastVoicesFetch: Date.now(),
+          },
+        }, userId)
       }
-      
-      // Fetch from API
-      await ensureDiscoveryCacheDir()
-      logger.info(`Fetching TTS voices for user ${userId}`)
-      
-      const voices = await fetchAvailableVoices(ttsConfig.endpoint, ttsConfig.apiKey)
-      await cacheDiscovery(cacheKey, voices)
-      
-      // Update user preferences with available voices
-      await settingsService.updateSettings({
-        tts: {
-          ...ttsConfig,
-          availableVoices: voices,
-          lastVoicesFetch: Date.now()
-        }
-      }, userId)
-      
-      logger.info(`Fetched ${voices.length} TTS voices`)
-      return c.json({ voices, cached: false })
+
+      return c.json({ voices, cached })
     } catch (error) {
       logger.error('Failed to fetch TTS voices:', error)
       return c.json({ error: 'Failed to fetch voices' }, 500)