@@ -9,7 +9,7 @@
     "build": "bun build src/index.ts --outdir=dist --target=bun",
     "typecheck": "tsc --noEmit",
     "test": "pnpm run test:bun && pnpm run test:vitest",
-    "test:bun": "bun test test/services/assistant-mode.test.ts test/services/internal-token.test.ts test/auth/internal-token-middleware.test.ts test/routes/internal-schedules.test.ts test/routes/internal-notifications.test.ts test/routes/internal-settings.test.ts test/routes/internal-repos.test.ts src/db/model-state.test.ts src/routes/providers.test.ts src/routes/repos.test.ts",
+    "test:bun": "bun test test/services/assistant-mode.test.ts test/services/internal-token.test.ts test/auth/internal-token-middleware.test.ts test/routes/internal-schedules.test.ts test/routes/internal-notifications.test.ts test/routes/internal-settings.test.ts test/routes/internal-repos.test.ts test/routes/internal-assistant.test.ts src/db/model-state.test.ts src/routes/providers.test.ts src/routes/repos.test.ts",
     "test:vitest": "vitest run",
     "test:ui": "vitest --ui",
     "test:watch": "vitest --watch",
 
@@ -317,7 +317,7 @@ app.route('/api/auth-info', createAuthInfoRoutes(auth, db))
 app.route('/api/health', createHealthRoutes(db, openCodeSupervisor))
 
 app.route('/api/mcp-oauth-proxy', createMcpOauthProxyRoutes(openCodeClient, requireAuth))
-app.route('/api/internal', createInternalRoutes(db, scheduleService, notificationService, settingsService))
+app.route('/api/internal', createInternalRoutes(db, scheduleService, notificationService, settingsService, openCodeClient))
 app.route('/api/opencode-proxy', createOpenCodeProxyRoutes(db, settingsService))
 
 const protectedApi = new Hono()
 
@@ -0,0 +1,28 @@
+import { Hono } from 'hono'
+import type { OpenCodeClient } from '../../services/opencode/client'
+import { getAssistantModeDirectory } from '../../services/assistant-mode'
+import { TokenBucketRateLimiter } from '../../utils/rate-limit'
+
+export function createInternalAssistantRoutes(openCodeClient: OpenCodeClient) {
+  const app = new Hono()
+  const limiter = new TokenBucketRateLimiter({ capacity: 5, refillPerMs: 60_000 })
+
+  app.post('/reload', async (c) => {
+    const token = (c.req.header('authorization') ?? '').slice('Bearer '.length)
+    const limit = limiter.tryConsume(token || 'anon')
+    if (!limit.allowed) {
+      c.header('Retry-After', String(Math.ceil(limit.retryAfterMs / 1000)))
+      return c.json({ error: 'Rate limit exceeded' }, 429)
+    }
+
+    const directory = getAssistantModeDirectory()
+    const response = await openCodeClient.forward({ method: 'POST', path: '/instance/dispose', directory })
+    if (!response.ok) {
+      return c.json({ error: 'Failed to reload assistant workspace' }, 502)
+    }
+
+    return c.json({ success: true })
+  })
+
+  return app
+}
@@ -3,6 +3,7 @@ import type { Database } from 'bun:sqlite'
 import type { ScheduleService } from '../../services/schedules'
 import type { NotificationService } from '../../services/notification'
 import type { SettingsService } from '../../services/settings'
+import type { OpenCodeClient } from '../../services/opencode/client'
 import { createScheduleRoutes } from '../schedules'
 import { createInternalTokenMiddleware } from '../../auth/internal-token-middleware'
 import { createInternalNotificationRoutes } from './notifications'
@@ -11,12 +12,14 @@ import { createInternalRepoRoutes } from './repos'
 import { createInternalRepoSyncRoutes } from './repo-sync'
 import { createInternalRepoMirrorRoutes as mirrorRoutes } from './repo-mirror'
 import { createInternalOpenCodeWorkspacesRoutes } from './opencode-workspaces'
+import { createInternalAssistantRoutes } from './assistant'
 
 export function createInternalRoutes(
   db: Database,
   scheduleService: ScheduleService,
   notificationService: NotificationService,
   settingsService: SettingsService,
+  openCodeClient: OpenCodeClient,
 ) {
   const app = new Hono()
   app.use('/*', createInternalTokenMiddleware(db))
@@ -30,5 +33,6 @@ export function createInternalRoutes(
   repos.route('/', mirrorRoutes(db))
   app.route('/repos', repos)
   app.route('/opencode-workspaces', createInternalOpenCodeWorkspacesRoutes(db))
+  app.route('/assistant', createInternalAssistantRoutes(openCodeClient))
   return app
 }
@@ -27,7 +27,28 @@ export function createInternalSettingsRoutes(settingsService: SettingsService) {
       return c.json({ error: 'Invalid request body', details: parsed.error.issues }, 400)
     }
 
-    const updated = settingsService.updateSettings(parsed.data as Partial<UserPreferences>, userId)
+    const patch = parsed.data
+    const currentPrefs = settingsService.getSettings(userId).preferences
+    const updates: Partial<UserPreferences> = {}
+    for (const key of Object.keys(patch)) {
+      if (key !== 'tts' && key !== 'stt') {
+        (updates as Record<string, unknown>)[key] = (patch as Record<string, unknown>)[key]
+      }
+    }
+    if (patch.tts) {
+      if (!currentPrefs.tts?.apiKey) {
+        return c.json({ error: 'TTS is not configured. Set up TTS (including credentials) in the UI before adjusting it.' }, 400)
+      }
+      updates.tts = { ...currentPrefs.tts, ...patch.tts }
+    }
+    if (patch.stt) {
+      if (!currentPrefs.stt?.apiKey) {
+        return c.json({ error: 'STT is not configured. Set up STT (including credentials) in the UI before adjusting it.' }, 400)
+      }
+      updates.stt = { ...currentPrefs.stt, ...patch.stt }
+    }
+
+    const updated = settingsService.updateSettings(updates as Partial<UserPreferences>, userId)
     return c.json(updated)
   })
 
 
@@ -150,8 +150,7 @@ function buildLegacyAssistantAgentPrompt(): string {
   ].join('\n')
 }
 
-function buildLegacyAssistantDefaultAgentMd(): string {
-  const prompt = buildLegacyAssistantAgentPrompt()
+function buildAssistantDefaultAgentMdFromPrompt(prompt: string): string {
   const permission = buildAssistantAgentPermission()
 
   return `---
@@ -171,6 +170,10 @@ ${prompt}
 `
 }
 
+function buildLegacyAssistantDefaultAgentMd(): string {
+  return buildAssistantDefaultAgentMdFromPrompt(buildLegacyAssistantAgentPrompt())
+}
+
 function matchesGeneratedAssistantAgentsMd(content: string): boolean {
   const currentHash = hashContent(buildAssistantAgentsMd())
   const legacyHash = hashContent(buildLegacyAssistantAgentsMd())
@@ -180,17 +183,19 @@ function matchesGeneratedAssistantAgentsMd(content: string): boolean {
 
 function matchesGeneratedAssistantDefaultAgentMd(content: string): boolean {
   const currentHash = hashContent(buildAssistantDefaultAgentMd())
+  const previousHash = hashContent(buildPreviousAssistantDefaultAgentMd())
   const legacyHash = hashContent(buildLegacyAssistantDefaultAgentMd())
   const contentHash = hashContent(content)
-  return contentHash === currentHash || contentHash === legacyHash
+  return contentHash === currentHash || contentHash === previousHash || contentHash === legacyHash
 }
 
 function matchesGeneratedAssistantAgentPrompt(content: unknown): content is string {
   if (typeof content !== 'string') return false
   const currentHash = hashContent(buildAssistantAgentPrompt())
+  const previousHash = hashContent(buildPreviousAssistantAgentPrompt())
   const legacyHash = hashContent(buildLegacyAssistantAgentPrompt())
   const contentHash = hashContent(content)
-  return contentHash === currentHash || contentHash === legacyHash
+  return contentHash === currentHash || contentHash === previousHash || contentHash === legacyHash
 }
 
 function containsLegacyAssistantAgentsGuidance(content: string): boolean {
@@ -215,6 +220,30 @@ Assistant-specific instructions belong in \`.opencode/agents/assistant.md\`.
 `
 }
 
+function buildPreviousAssistantAgentPrompt(): string {
+  return [
+    'You are the default Assistant Mode agent for OpenCode Manager.',
+    '',
+    'This workspace is the shared assistant workspace for OpenCode Manager. Help the user manage repos, schedules, notifications, settings, and assistant behavior safely.',
+    '',
+    '## Self-Editing Rules',
+    '',
+    'Durable assistant instructions, behavior, and preferences belong in `.opencode/agents/assistant.md`. Edit that file when the user expresses lasting preferences or when you need to refine your behavior.',
+    '',
+    'The workspace directory explanation belongs in `AGENTS.md`. Keep that file focused on describing the directory contents and pointing to managed files.',
+    '',
+    'Preserve user-customized workspace files unless the user explicitly asks you to change them. Ask before making significant, destructive, or out-of-workspace changes.',
+    '',
+    '## Skill Usage',
+    '',
+    'Use the workspace skills when relevant:',
+    '- Load `repo-management` before `schedule-management` when you need a repo ID.',
+    '- Load `schedule-management` for schedule jobs and runs.',
+    '- Load `notifications` when the user should be notified about important events.',
+    '- Load `manager-settings` when reading or safely updating UI preferences.',
+  ].join('\n')
+}
+
 function buildAssistantAgentPrompt(): string {
   return [
     'You are the default Assistant Mode agent for OpenCode Manager.',
@@ -229,6 +258,8 @@ function buildAssistantAgentPrompt(): string {
     '',
     'Preserve user-customized workspace files unless the user explicitly asks you to change them. Ask before making significant, destructive, or out-of-workspace changes.',
     '',
+    'After editing `.opencode/agents/assistant.md`, load `manager-settings` and call `POST /assistant/reload` to apply changes. Always ask the user before reloading.',
+    '',
     '## Skill Usage',
     '',
     'Use the workspace skills when relevant:',
@@ -251,34 +282,12 @@ function buildAssistantAgentPermission(): { read: 'allow'; edit: 'allow'; glob:
   }
 }
 
-export function buildAssistantDefaultAgentConfig() {
-  return {
-    description: 'Default OpenCode Manager assistant workspace agent',
-    mode: 'primary',
-    prompt: buildAssistantAgentPrompt(),
-    permission: buildAssistantAgentPermission(),
-  }
+function buildPreviousAssistantDefaultAgentMd(): string {
+  return buildAssistantDefaultAgentMdFromPrompt(buildPreviousAssistantAgentPrompt())
 }
 
 export function buildAssistantDefaultAgentMd(): string {
-  const prompt = buildAssistantAgentPrompt()
-  const permission = buildAssistantAgentPermission()
-
-  return `---
-description: Default OpenCode Manager assistant workspace agent
-mode: primary
-permission:
-  read: ${permission.read}
-  edit: ${permission.edit}
-  glob: ${permission.glob}
-  grep: ${permission.grep}
-  list: ${permission.list}
-  bash: ${permission.bash}
-  external_directory: ${permission.external_directory}
----
-
-${prompt}
-`
+  return buildAssistantDefaultAgentMdFromPrompt(buildAssistantAgentPrompt())
 }
 
 function toLocalhostInternalBaseUrl(baseUrl: string): string {
@@ -559,12 +568,16 @@ The following preference keys can be modified:
 - \`simpleChatMode\`, \`leaderKey\`, \`directShortcuts\`
 - \`keyboardShortcuts\`, \`customCommands\`, \`notifications\`
 - \`repoOrder\`, \`repoSortMode\`
+- \`tts\` — Non-secret TTS preferences (\`enabled\`, \`provider\`, \`autoPlay\`, \`voice\`, \`model\`, \`speed\`). TTS must already be configured in the UI (the endpoint returns 400 otherwise).
+- \`stt\` — Non-secret STT preferences (\`enabled\`, \`provider\`, \`model\`, \`language\`). STT must already be configured in the UI (the endpoint returns 400 otherwise).
 
 **DO NOT attempt to set:**
 - \`gitCredentials\` - Git credentials must be managed via the full UI
 - \`gitIdentity\` - Git identity must be managed via the full UI
 - \`tts.apiKey\` - TTS credentials must be managed via the full UI
+- \`tts.endpoint\` - TTS endpoint must be managed via the full UI
 - \`stt.apiKey\` - STT credentials must be managed via the full UI
+- \`stt.endpoint\` - STT endpoint must be managed via the full UI
 - \`lastKnownGoodConfig\` - Internal state, do not modify
 - Any other keys not in the allowed list above
 
@@ -582,6 +595,25 @@ curl -X PATCH -H "Authorization: Bearer <token>" \\
 **Response:**
 Returns the updated settings object with the same structure as GET.
 
+### POST /assistant/reload
+
+Reload the assistant workspace by disposing the current OpenCode instance. Use this after editing \`.opencode/agents/assistant.md\` or \`opencode.json\` so changes take effect on the next message.
+
+**Note:** Always confirm with the user before reloading, as it re-bootstraps the workspace.
+
+**Rate Limiting:** 5 requests per minute per token. Returns \`429 Too Many Requests\` with \`Retry-After\` header when exceeded.
+
+**Example:**
+\`\`\`bash
+curl -X POST -H "Authorization: Bearer <token>" \\
+  "${internalBaseUrl}/assistant/reload"
+\`\`\`
+
+**Response:**
+\`\`\`ts
+{ "success": true }
+\`\`\`
+
 ## Safety
 
 - This API intentionally rejects any attempt to modify credentials, API keys, or other sensitive settings
@@ -660,12 +692,10 @@ curl -H "Authorization: Bearer <token>" "${internalBaseUrl}/repos"
 export function buildAssistantOpenCodeConfig(): OpenCodeConfigInput {
   const config: OpenCodeConfigInput = {
     default_agent: ASSISTANT_DEFAULT_AGENT_NAME,
-    instructions: [
-      'AGENTS.md',
-    ],
+    instructions: ['AGENTS.md'],
     permission: buildAssistantAgentPermission(),
     agent: {
-      [ASSISTANT_DEFAULT_AGENT_NAME]: buildAssistantDefaultAgentConfig(),
+      [ASSISTANT_DEFAULT_AGENT_NAME]: { mode: 'primary' },
     },
   }
 
@@ -731,8 +761,8 @@ export async function ensureAssistantMode(
             const existingContent = await readFileContent(opencodeJsonPath)
             const existingConfig = JSON.parse(existingContent) as OpenCodeConfigInput
             const mergedConfig = mergeAssistantOpenCodeConfig(existingConfig)
-            return assistantOpenCodeConfigPromptNeedsMigration(mergedConfig)
-              ? migrateGeneratedAssistantOpenCodePrompt(mergedConfig)
+            return assistantOpenCodeConfigHasGeneratedAgentPersona(mergedConfig)
+              ? stripGeneratedAssistantAgentPersona(mergedConfig)
               : mergedConfig
           } catch {
             return buildAssistantOpenCodeConfig()
@@ -748,8 +778,8 @@ export async function ensureAssistantMode(
       const repairedConfig = assistantOpenCodeConfigNeedsRepair(existingConfig)
         ? mergeAssistantOpenCodeConfig(existingConfig)
         : existingConfig
-      const updatedConfig = assistantOpenCodeConfigPromptNeedsMigration(repairedConfig)
-        ? migrateGeneratedAssistantOpenCodePrompt(repairedConfig)
+      const updatedConfig = assistantOpenCodeConfigHasGeneratedAgentPersona(repairedConfig)
+        ? stripGeneratedAssistantAgentPersona(repairedConfig)
         : repairedConfig
 
       if (updatedConfig !== existingConfig) {
@@ -890,41 +920,55 @@ function assistantOpenCodeConfigNeedsRepair(config: OpenCodeConfigInput): boolea
   const mode = (assistantAgent as { mode?: unknown }).mode
   if (mode !== 'primary' && mode !== 'all') return true
   if ((assistantAgent as { disable?: unknown }).disable === true) return true
+  if (assistantOpenCodeConfigHasGeneratedAgentPersona(config)) return true
   return false
 }
 
-function assistantOpenCodeConfigPromptNeedsMigration(config: OpenCodeConfigInput): boolean {
-  const prompt = (config.agent?.[ASSISTANT_DEFAULT_AGENT_NAME] as { prompt?: unknown } | undefined)?.prompt
-  return matchesGeneratedAssistantAgentPrompt(prompt) && prompt !== buildAssistantAgentPrompt()
+function assistantOpenCodeConfigHasGeneratedAgentPersona(config: OpenCodeConfigInput): boolean {
+  const agent = config.agent?.[ASSISTANT_DEFAULT_AGENT_NAME]
+  if (typeof agent !== 'object' || agent === null) return false
+  const prompt = (agent as { prompt?: unknown }).prompt
+  return matchesGeneratedAssistantAgentPrompt(prompt)
 }
 
-function migrateGeneratedAssistantOpenCodePrompt(config: OpenCodeConfigInput): OpenCodeConfigInput {
+function resolveValidAssistantMode(agent: unknown): 'primary' | 'all' {
+  const mode = (agent as { mode?: unknown } | undefined)?.mode
+  return mode === 'primary' || mode === 'all' ? mode : 'primary'
+}
+
+function stripGeneratedAssistantAgentPersona(config: OpenCodeConfigInput): OpenCodeConfigInput {
   const existingAssistantAgent = config.agent?.[ASSISTANT_DEFAULT_AGENT_NAME]
-  if (typeof existingAssistantAgent !== 'object' || existingAssistantAgent === null) return config
+  const validMode = resolveValidAssistantMode(existingAssistantAgent)
 
   return {
     ...config,
     agent: {
       ...(config.agent ?? {}),
-      [ASSISTANT_DEFAULT_AGENT_NAME]: {
-        ...existingAssistantAgent,
-        prompt: buildAssistantAgentPrompt(),
-      },
+      [ASSISTANT_DEFAULT_AGENT_NAME]: { mode: validMode },
     },
   }
 }
 
 function mergeAssistantOpenCodeConfig(existing?: OpenCodeConfigInput): OpenCodeConfigInput {
   const generated = buildAssistantOpenCodeConfig()
   const existingAssistantAgent = existing?.agent?.[ASSISTANT_DEFAULT_AGENT_NAME]
-  const existingMode = (existingAssistantAgent as { mode?: 'primary' | 'all' | unknown } | undefined)?.mode
-  const validMode = existingMode === 'primary' || existingMode === 'all' ? existingMode : 'primary'
-
-  const mergedAssistantAgent = {
-    ...generated.agent?.[ASSISTANT_DEFAULT_AGENT_NAME],
-    ...(typeof existingAssistantAgent === 'object' && existingAssistantAgent !== null ? existingAssistantAgent : {}),
-    mode: validMode,
-    disable: false,
+  const validMode = resolveValidAssistantMode(existingAssistantAgent)
+
+  const existingIsGenerated = existingAssistantAgent != null &&
+    typeof existingAssistantAgent === 'object' &&
+    matchesGeneratedAssistantAgentPrompt(
+      (existingAssistantAgent as { prompt?: unknown }).prompt,
+    )
+
+  let mergedAssistantAgent: Record<string, unknown>
+  if (existingIsGenerated) {
+    mergedAssistantAgent = { mode: validMode }
+  } else {
+    mergedAssistantAgent = {
+      ...(typeof existingAssistantAgent === 'object' && existingAssistantAgent !== null ? existingAssistantAgent : {}),
+      mode: validMode,
+      disable: false,
+    }
   }
 
   return {