Handle review notes

Author: charlesvien

apps/twig/src/main/services/agent/service.ts

@@ -22,12 +22,11 @@ import { app } from "electron";
 import { inject, injectable, preDestroy } from "inversify";
 import type { ExecutionMode } from "@/shared/types.js";
 import type { AcpMessage } from "../../../shared/types/session-events.js";
-import { container } from "../../di/container.js";
 import { MAIN_TOKENS } from "../../di/tokens.js";
 import { logger } from "../../lib/logger.js";
 import { TypedEventEmitter } from "../../lib/typed-event-emitter.js";
 import type { ProcessTrackingService } from "../process-tracking/service.js";
-import type { SleepService } from "../sleep/service.js";
+import { SleepService } from "../sleep/service.js";
 import {
   AgentServiceEvent,
   type AgentServiceEvents,
@@ -220,17 +219,17 @@ export class AgentService extends TypedEventEmitter<AgentServiceEvents> {
   private currentToken: string | null = null;
   private pendingPermissions = new Map<string, PendingPermission>();
   private processTracking: ProcessTrackingService;
+  private sleepService: SleepService;
 
   constructor(
     @inject(MAIN_TOKENS.ProcessTrackingService)
     processTracking: ProcessTrackingService,
+    @inject(MAIN_TOKENS.SleepService)
+    sleepService: SleepService,
   ) {
     super();
     this.processTracking = processTracking;
-  }
-
-  private get sleepService() {
-    return container.get<SleepService>(MAIN_TOKENS.SleepService);
+    this.sleepService = sleepService;
   }
 
   public updateToken(newToken: string): void {
@@ -1027,7 +1026,10 @@ For git operations while detached:
               },
             );
           } finally {
-            service.sleepService.acquire(taskRunId);
+            // Only re-acquire if session wasn't cleaned up while waiting
+            if (service.sessions.has(taskRunId)) {
+              service.sleepService.acquire(taskRunId);
+            }
           }
         }
 

apps/twig/src/renderer/features/settings/components/sections/ClaudeCodeSettings.tsx

@@ -14,7 +14,7 @@ import {
 import { Tooltip } from "@renderer/components/ui/Tooltip";
 import { track } from "@renderer/lib/analytics";
 import { trpcReact } from "@renderer/trpc";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { ANALYTICS_EVENTS } from "@/types/analytics";
 
 function CopyableCommand({ command }: { command: string }) {
@@ -79,8 +79,15 @@ export function ClaudeCodeSettings() {
     setPreventSleepWhileRunning,
   } = useSettingsStore();
 
+  const { data: serverPreventSleep } = trpcReact.sleep.getEnabled.useQuery();
   const preventSleepMutation = trpcReact.sleep.setEnabled.useMutation();
 
+  useEffect(() => {
+    if (serverPreventSleep !== undefined) {
+      setPreventSleepWhileRunning(serverPreventSleep);
+    }
+  }, [serverPreventSleep, setPreventSleepWhileRunning]);
+
   const [showBypassWarning, setShowBypassWarning] = useState(false);
 
   const handlePreventSleepChange = useCallback(
@@ -125,8 +132,8 @@ export function ClaudeCodeSettings() {
   return (
     <Flex direction="column">
       <SettingRow
-        label="Prevent sleep while running"
-        description="Keep your computer awake while the agent is running a task"
+        label="Keep awake while agents work"
+        description="Prevent your computer from sleeping while the agent is running a task"
       >
         <Switch
           checked={preventSleepWhileRunning}