refactor: extract shared utilities from upstream-fixes

hub/src/api/api-keys.ts

@@ -1,6 +1,6 @@
 import { Hono } from 'hono'
 import { createApiKey, listApiKeys, revokeApiKey } from '../db/dal'
-import { hashToken } from '../ws/channel'
+import { hashToken } from '../lib/crypto'
 import { generateToken } from '../utils/token'
 
 const apiKeys = new Hono()

hub/src/api/plugin.ts

@@ -1,7 +1,7 @@
 import { Hono } from 'hono'
 import { z } from 'zod'
 import { createPluginSession } from '../db/dal'
-import { hashToken } from '../ws/channel'
+import { hashToken } from '../lib/crypto'
 import { generateToken } from '../utils/token'
 
 const plugin = new Hono()

hub/src/api/sessions.ts

@@ -1,7 +1,7 @@
 import { Hono } from 'hono'
 import { z } from 'zod'
 import { createSession, listSessions, getSession, deleteSession, updateSessionToken, markSessionDisconnected } from '../db/dal'
-import { hashToken } from '../ws/channel'
+import { hashToken } from '../lib/crypto'
 import { getChannel } from '../ws/registry'
 import { generateToken } from '../utils/token'
 

hub/src/auth/api-key-middleware.ts

@@ -1,6 +1,6 @@
 import type { Context, Next } from 'hono'
 import { verifyApiKey } from '../db/dal'
-import { hashToken } from '../ws/channel'
+import { hashToken } from '../lib/crypto'
 
 export async function apiKeyMiddleware(c: Context, next: Next) {
   const authHeader = c.req.header('Authorization')

hub/src/lib/crypto.ts

@@ -0,0 +1,12 @@
+// Crypto helpers shared across hub modules.
+// Kept dependency-free (Web Crypto only) so it can be imported from API routes,
+// WS handlers, and middleware without pulling in channel/session code.
+
+export async function hashToken(token: string): Promise<string> {
+  const encoder = new TextEncoder()
+  const data = encoder.encode(token)
+  const hash = await crypto.subtle.digest('SHA-256', data)
+  return Array.from(new Uint8Array(hash))
+    .map(b => b.toString(16).padStart(2, '0'))
+    .join('')
+}

hub/src/ws/agent.ts

@@ -1,7 +1,7 @@
 import type { ServerWebSocket } from 'bun'
 import { AgentInbound } from './agent-protocol'
 import { verifyApiKey, findOrCreateAgentSession, updateSessionStatus as setSessionStatus, insertMessage, insertAssistantPlaceholder, appendToMessage, finalizeMessage, listSessions, getUserSystemPrompt, recentlyDisconnectedForProjectDir, updateSessionAgentInfo } from '../db/dal'
-import { hashToken } from './channel'
+import { hashToken } from '../lib/crypto'
 import { generateToken } from '../utils/token'
 import { registerChannel, unregisterChannel, getChannel, broadcastToSubscribers, broadcastToUser } from './registry'
 import { verifyApiKeyWithCapability, upsertSupervisor, endRun, replaceSupervisorCommands } from '../db/supervisor-dal'

hub/src/ws/channel.ts

@@ -4,6 +4,7 @@ import { ChannelInbound } from './protocol'
 import { verifyChannelToken, updateSessionStatus as setSessionStatus, insertMessage } from '../db/dal'
 import { registerChannel, unregisterChannel, broadcastToSubscribers, broadcastToUser } from './registry'
 import { listSessions } from '../db/dal'
+import { hashToken } from '../lib/crypto'
 
 const AUTH_TIMEOUT_MS = 5_000
 const HEARTBEAT_INTERVAL_MS = 30_000
@@ -32,13 +33,6 @@ export function createChannelWsData(): ChannelWsData {
   }
 }
 
-export async function hashToken(token: string): Promise<string> {
-  const encoder = new TextEncoder()
-  const data = encoder.encode(token)
-  const hash = await crypto.subtle.digest('SHA-256', data)
-  return Array.from(new Uint8Array(hash)).map(b => b.toString(16).padStart(2, '0')).join('')
-}
-
 export function handleChannelOpen(ws: ServerWebSocket<ChannelWsData>) {
   const data = ws.data
   console.log('[channel] connection opened')

web/src/App.tsx

@@ -13,6 +13,14 @@ import type { AuthUser } from './lib/auth.ts'
 
 type Route = 'chat' | 'settings' | 'schedules'
 
+function LoadingScreen() {
+  return (
+    <div className="flex items-center justify-center h-screen bg-[var(--bg-primary)]">
+      <div className="text-[var(--text-muted)]">Loading...</div>
+    </div>
+  )
+}
+
 function getRoute(): Route {
   const hash = window.location.hash
   // Legacy /#/supervisor → settings with supervisor tab
@@ -55,11 +63,7 @@ export default function App() {
   }, [])
 
   if (loading || needsSetup === null) {
-    return (
-      <div className="flex items-center justify-center h-screen bg-[var(--bg-primary)]">
-        <div className="text-[var(--text-muted)]">Loading...</div>
-      </div>
-    )
+    return <LoadingScreen />
   }
 
   if (needsSetup) {
@@ -72,11 +76,7 @@ export default function App() {
 
   // Wait for profile to load before rendering gated routes
   if (profileLoading || !profile) {
-    return (
-      <div className="flex items-center justify-center h-screen bg-[var(--bg-primary)]">
-        <div className="text-[var(--text-muted)]">Loading...</div>
-      </div>
-    )
+    return <LoadingScreen />
   }
 
   return (