diff --git a/apps/server/src/routes/enhance-prompt/routes/enhance.ts b/apps/server/src/routes/enhance-prompt/routes/enhance.ts
index 744a67b0..ad6e9602 100644
--- a/apps/server/src/routes/enhance-prompt/routes/enhance.ts
+++ b/apps/server/src/routes/enhance-prompt/routes/enhance.ts
@@ -164,9 +164,7 @@ export function createEnhanceHandler(
           systemPrompt,
           maxTurns: 1,
           allowedTools: [],
-          // AUTONOMOUS MODE: Always bypass permissions
-          permissionMode: 'bypassPermissions',
-          allowDangerouslySkipPermissions: true,
+          permissionMode: 'acceptEdits',
         },
       });
 
diff --git a/apps/server/src/routes/features/routes/generate-title.ts b/apps/server/src/routes/features/routes/generate-title.ts
index 49c59801..2602de03 100644
--- a/apps/server/src/routes/features/routes/generate-title.ts
+++ b/apps/server/src/routes/features/routes/generate-title.ts
@@ -96,9 +96,7 @@ export function createGenerateTitleHandler(): (req: Request, res: Response) => P
           systemPrompt: SYSTEM_PROMPT,
           maxTurns: 1,
           allowedTools: [],
-          // AUTONOMOUS MODE: Always bypass permissions
-          permissionMode: 'bypassPermissions',
-          allowDangerouslySkipPermissions: true,
+          permissionMode: 'default',
         },
       });
 
diff --git a/apps/ui/src/app.tsx b/apps/ui/src/app.tsx
index c14ab6d0..a45073c6 100644
--- a/apps/ui/src/app.tsx
+++ b/apps/ui/src/app.tsx
@@ -18,12 +18,14 @@ export default function App() {
   // Clear accumulated PerformanceMeasure entries to prevent memory leak in dev mode
   // React's internal scheduler creates performance marks/measures that accumulate without cleanup
   useEffect(() => {
-    const clearPerfEntries = () => {
-      performance.clearMarks();
-      performance.clearMeasures();
-    };
-    const interval = setInterval(clearPerfEntries, 5000);
-    return () => clearInterval(interval);
+    if (import.meta.env.DEV) {
+      const clearPerfEntries = () => {
+        performance.clearMarks();
+        performance.clearMeasures();
+      };
+      const interval = setInterval(clearPerfEntries, 5000);
+      return () => clearInterval(interval);
+    }
   }, []);
 
   // Run settings migration on startup (localStorage -> file storage)
diff --git a/scripts/launcher-utils.mjs b/scripts/launcher-utils.mjs
index af68e452..4e09b54a 100644
--- a/scripts/launcher-utils.mjs
+++ b/scripts/launcher-utils.mjs
@@ -558,14 +558,7 @@ export function setupSignalHandlers(cleanup) {
  * @param {object} options - Configuration options
  * @returns {Promise<ChildProcess>} - Server process
  */
-export async function startServerAndWait({
-  serverPort,
-  corsOriginEnv,
-  npmArgs,
-  cwd,
-  fs,
-  baseDir,
-}) {
+export async function startServerAndWait({ serverPort, corsOriginEnv, npmArgs, cwd, fs, baseDir }) {
   log(`Starting backend server on port ${serverPort}...`, 'blue');
 
   // Create logs directory