diff --git a/apps/web/src/app/(authenticated)/home/Home.client.test.tsx b/apps/web/src/app/(authenticated)/home/Home.client.test.tsx
index 143a68e98..6def3db83 100644
--- a/apps/web/src/app/(authenticated)/home/Home.client.test.tsx
+++ b/apps/web/src/app/(authenticated)/home/Home.client.test.tsx
@@ -214,11 +214,13 @@ vi.mock('@/components/tasks', async () => {
     TaskPromptInput: ({
       onSubmit,
       onPromptTextChange,
+      promptText,
       placeholder,
       submitDisabledReason,
     }: {
       onSubmit: (message: PromptInputMessage) => Promise<void> | void;
       onPromptTextChange?: (value: string) => void;
+      promptText?: string;
       placeholder?: string;
       submitDisabledReason?: string;
     }) => (
@@ -237,6 +239,11 @@ vi.mock('@/components/tasks', async () => {
         }}
       >
         <div data-testid="prompt-placeholder">{placeholder}</div>
+        <textarea
+          aria-label="Task prompt"
+          value={promptText}
+          onChange={(event) => onPromptTextChange?.(event.target.value)}
+        />
         <button type="submit" disabled={Boolean(submitDisabledReason)}>
           Submit prompt
         </button>
@@ -384,6 +391,72 @@ describe('Home', () => {
     expect(mockCreateStandardTaskRun).not.toHaveBeenCalled();
   });
 
+  it('restores and updates the signed-in users unfinished prompt', () => {
+    const storageKey = 'roomote-home-prompt-draft:v1:user-1';
+    localStorage.setItem(storageKey, 'Review the deployment workflow');
+
+    render(<Home initialPlaceholderIndex={0} />);
+
+    const promptInput = screen.getByRole('textbox', { name: 'Task prompt' });
+    expect(promptInput).toHaveValue('Review the deployment workflow');
+
+    fireEvent.change(promptInput, {
+      target: { value: 'Review the release workflow' },
+    });
+
+    expect(localStorage.getItem(storageKey)).toBe(
+      'Review the release workflow',
+    );
+  });
+
+  it('prefers an explicit prompt link over an unfinished prompt', () => {
+    localStorage.setItem(
+      'roomote-home-prompt-draft:v1:user-1',
+      'Old unfinished prompt',
+    );
+    currentSearchParams = 'prompt=Use%20this%20prompt';
+
+    render(<Home initialPlaceholderIndex={0} />);
+
+    expect(screen.getByRole('textbox', { name: 'Task prompt' })).toHaveValue(
+      'Use this prompt',
+    );
+  });
+
+  it('clears the unfinished prompt after a successful launch', async () => {
+    const storageKey = 'roomote-home-prompt-draft:v1:user-1';
+    localStorage.setItem(storageKey, 'Review the deployment workflow');
+
+    render(<Home initialPlaceholderIndex={0} />);
+
+    fireEvent.click(screen.getByText('Use all repositories workspace'));
+    fireEvent.click(screen.getByRole('button', { name: 'Submit prompt' }));
+
+    await waitFor(() => {
+      expect(mockCreateStandardTaskRun).toHaveBeenCalled();
+    });
+    expect(localStorage.getItem(storageKey)).toBeNull();
+  });
+
+  it('keeps the unfinished prompt when launch fails', async () => {
+    const storageKey = 'roomote-home-prompt-draft:v1:user-1';
+    localStorage.setItem(storageKey, 'Review the deployment workflow');
+    mockCreateStandardTaskRun.mockResolvedValueOnce({
+      success: false,
+      error: 'Launch failed',
+    });
+
+    render(<Home initialPlaceholderIndex={0} />);
+
+    fireEvent.click(screen.getByText('Use all repositories workspace'));
+    fireEvent.click(screen.getByRole('button', { name: 'Submit prompt' }));
+
+    await waitFor(() => {
+      expect(mockCreateStandardTaskRun).toHaveBeenCalled();
+    });
+    expect(localStorage.getItem(storageKey)).toBe('Test prompt');
+  });
+
   it('renders the feedback prompt below the input and opens its dialog', async () => {
     render(<Home initialPlaceholderIndex={0} />);
 
diff --git a/apps/web/src/app/(authenticated)/home/Home.tsx b/apps/web/src/app/(authenticated)/home/Home.tsx
index 0080d888e..2718f927e 100644
--- a/apps/web/src/app/(authenticated)/home/Home.tsx
+++ b/apps/web/src/app/(authenticated)/home/Home.tsx
@@ -73,6 +73,7 @@ import {
 
 const FALLBACK_PROMPT_PLACEHOLDER = 'What do you want to do?';
 const FEEDBACK_DISMISSED_STORAGE_KEY = 'roomote-home-feedback-dismissed';
+const PROMPT_DRAFT_STORAGE_KEY_PREFIX = 'roomote-home-prompt-draft:v1';
 const FEEDBACK_CALENDLY_URL =
   'https://calendly.com/d/ctx9-f7q-6vr/roomote-feedback';
 const FEEDBACK_EMAIL_URL =
@@ -95,6 +96,38 @@ function persistFeedbackPromptDismissal(): void {
   }
 }
 
+function getPromptDraftStorageKey(userId: string | undefined): string | null {
+  return userId ? `${PROMPT_DRAFT_STORAGE_KEY_PREFIX}:${userId}` : null;
+}
+
+function readPromptDraft(storageKey: string | null): string {
+  if (!storageKey) {
+    return '';
+  }
+
+  try {
+    return window.localStorage.getItem(storageKey) ?? '';
+  } catch {
+    return '';
+  }
+}
+
+function persistPromptDraft(storageKey: string | null, prompt: string): void {
+  if (!storageKey) {
+    return;
+  }
+
+  try {
+    if (prompt) {
+      window.localStorage.setItem(storageKey, prompt);
+    } else {
+      window.localStorage.removeItem(storageKey);
+    }
+  } catch {
+    // Draft recovery is best-effort when browser storage is unavailable.
+  }
+}
+
 type RoutingFlowState = 'idle' | 'routing_pending' | 'launching';
 
 type SubmissionSnapshot = {
@@ -141,6 +174,7 @@ export function Home({
   const router = useRouter();
   const environments = useEnvironments();
   const {
+    userId,
     cloudEnabled,
     isAdmin,
     managedAccess = DEFAULT_MANAGED_DEPLOYMENT_ACCESS,
@@ -172,8 +206,11 @@ export function Home({
   const searchParams = useSearchParams();
   const promptParam = searchParams.get('prompt') ?? '';
   const environmentIdParam = searchParams.get('environmentId')?.trim() ?? '';
+  const promptDraftStorageKey = getPromptDraftStorageKey(userId);
 
-  const [promptText, setPromptText] = useState(promptParam);
+  const [promptText, setPromptText] = useState(
+    () => promptParam || readPromptDraft(promptDraftStorageKey),
+  );
   const [isExiting, setIsExiting] = useState(false);
   const [routingState, setRoutingState] = useState<RoutingFlowState>('idle');
   const [selectedComputeProvider, setSelectedComputeProvider] =
@@ -201,7 +238,21 @@ export function Home({
 
   const routingRequestIdRef = useRef(0);
 
-  useEffect(() => setPromptText(promptParam), [promptParam]);
+  useEffect(() => {
+    setPromptText(promptParam || readPromptDraft(promptDraftStorageKey));
+  }, [promptDraftStorageKey, promptParam]);
+
+  const handlePromptTextChange = useCallback(
+    (prompt: string) => {
+      setPromptText(prompt);
+      persistPromptDraft(promptDraftStorageKey, prompt);
+    },
+    [promptDraftStorageKey],
+  );
+
+  const clearPromptDraft = useCallback(() => {
+    persistPromptDraft(promptDraftStorageKey, '');
+  }, [promptDraftStorageKey]);
 
   useEffect(() => {
     setIsFeedbackPromptVisible(!isFeedbackPromptDismissed());
@@ -437,12 +488,21 @@ export function Home({
           payload,
         });
 
+        if (result.success) {
+          clearPromptDraft();
+        }
+
         return result.success;
       } catch {
         return false;
       }
     },
-    [createStandardTaskRun, selectedComputeProvider, selectedModelId],
+    [
+      clearPromptDraft,
+      createStandardTaskRun,
+      selectedComputeProvider,
+      selectedModelId,
+    ],
   );
 
   useEffect(() => {
@@ -725,7 +785,7 @@ export function Home({
                 promptKey={promptParam}
                 isBusy={isBusy}
                 promptText={promptText}
-                onPromptTextChange={setPromptText}
+                onPromptTextChange={handlePromptTextChange}
                 onSubmit={handleSubmit}
                 placeholder={activePromptPlaceholder}
                 autoFocus