feat(cloud): fork a cloud session directly into a new cloud session

apps/web/src/app/(app)/cloud/sessions/SessionsPageContent.tsx

@@ -11,7 +11,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@/components/ui/select';
-import { Search, Cloud, Terminal, Puzzle, Bot, Workflow } from 'lucide-react';
+import { Search, Cloud, Terminal, Puzzle, Bot, Workflow, Loader2 } from 'lucide-react';
 import { SetPageTitle } from '@/components/SetPageTitle';
 import type { SessionsListItem } from '@/components/cloud-agent/SessionsList';
 import { SessionsList } from '@/components/cloud-agent/SessionsList';
@@ -31,6 +31,7 @@ import Link from 'next/link';
 import { PageContainer } from '@/components/layouts/PageContainer';
 import { toast } from 'sonner';
 import { useConfirm } from '@/components/ui/confirm';
+import { useCloudSessionFork } from '@/components/cloud-agent-next/use-cloud-session-fork';
 
 /** Platform filter options matching the badge logic in SessionsList */
 const PLATFORM_OPTIONS: readonly {
@@ -59,7 +60,10 @@ export function SessionsPageContent() {
   const [platformFilter, setPlatformFilter] = useState<PlatformFilterValue>('all');
   const [sessionFilter, setSessionFilter] = useState<SessionFilterValue>('all');
   const [pendingSessionIds, setPendingSessionIds] = useState(() => new Set<string>());
-  type SessionWithSource = SessionsListItem & { source: 'v2' };
+  type SessionWithSource = SessionsListItem & {
+    source: 'v2';
+    cloudAgentSessionId?: string | null;
+  };
   const [selectedSession, setSelectedSession] = useState<SessionWithSource | null>(null);
   const [isDialogOpen, setIsDialogOpen] = useState(false);
 
@@ -74,6 +78,8 @@ export function SessionsPageContent() {
   // Determine if we're in an organization context
   const organizationId = pathname.match(/^\/organizations\/([^/]+)/)?.[1];
 
+  const { forkSessionToNewCloudSession, forkingSessionId } = useCloudSessionFork(organizationId);
+
   // When in organization context, OrganizationTrialWrapper already provides PageContainer
   const shouldUsePageContainer = !organizationId;
 
@@ -183,6 +189,7 @@ export function SessionsPageContent() {
     return {
       createdAt: session.created_at,
       createdOnPlatform: session.created_on_platform,
+      cloudAgentSessionId: session.cloud_agent_session_id,
       prompt,
       repository,
       sessionId: session.session_id,
@@ -203,6 +210,14 @@ export function SessionsPageContent() {
     setIsDialogOpen(true);
   };
 
+  const handleForkToCloud = async () => {
+    if (!selectedSession) return;
+    const forked = await forkSessionToNewCloudSession(selectedSession.sessionId);
+    if (forked) {
+      setIsDialogOpen(false);
+    }
+  };
+
   const content = (
     <>
       <SetPageTitle title="Sessions" />
@@ -352,9 +367,31 @@ export function SessionsPageContent() {
               <div className="space-y-3">
                 <h3 className="text-sm font-medium">Fork Session</h3>
                 <p className="text-muted-foreground text-xs">
-                  Fork this session to continue working on it in your editor or CLI
+                  {selectedSession.cloudAgentSessionId
+                    ? 'Fork this session to continue working on it in your editor, CLI, or a new Cloud Agent session'
+                    : 'Fork this session to continue working on it in your editor or CLI'}
                 </p>
 
+                {/* Fork into a new Cloud Agent session */}
+                {selectedSession.cloudAgentSessionId && (
+                  <Button
+                    type="button"
+                    variant="outline"
+                    className="w-full gap-2"
+                    disabled={forkingSessionId === selectedSession.sessionId}
+                    onClick={() => void handleForkToCloud()}
+                  >
+                    {forkingSessionId === selectedSession.sessionId ? (
+                      <Loader2 className="h-4 w-4 animate-spin" />
+                    ) : (
+                      <Cloud className="h-4 w-4" />
+                    )}
+                    {forkingSessionId === selectedSession.sessionId
+                      ? 'Forking to a new Cloud Agent session...'
+                      : 'Fork to a new Cloud Agent session'}
+                  </Button>
+                )}
+
                 {/* Open in Editor */}
                 <div className="flex justify-center">
                   <OpenInEditorButton

apps/web/src/components/cloud-agent-next/ChatHeader.tsx

@@ -50,6 +50,8 @@ type ChatHeaderProps = {
   sessionTitle?: string;
   sessionActive: boolean;
   sandboxStatusEligible?: boolean;
+  /** Whether the source session is a Cloud Agent session that can be forked. */
+  canForkToCloud?: boolean;
 };
 
 export function ChatHeader({
@@ -72,6 +74,7 @@ export function ChatHeader({
   sessionTitle,
   sessionActive,
   sandboxStatusEligible = false,
+  canForkToCloud = false,
 }: ChatHeaderProps) {
   const [showActionsDialog, setShowActionsDialog] = useState(false);
   const moreOptionsTriggerRef = useRef<HTMLButtonElement | null>(null);
@@ -130,6 +133,8 @@ export function ChatHeader({
         kiloSessionId={kiloSessionId}
         sessionTitle={sessionTitle}
         repository={repository}
+        organizationId={organizationId}
+        canForkToCloud={canForkToCloud}
       />
       <div className="flex min-w-0 items-center gap-1">
         {sandboxStatusEligible && (

apps/web/src/components/cloud-agent-next/CloudChatPage.tsx

@@ -1160,6 +1160,7 @@ export default function CloudChatPage({
       changesOpen={changesDrawerOpen}
       onToggleChanges={canOpenChanges ? handleToggleChanges : undefined}
       sessionActive={isStreaming || activity.type === 'busy' || activity.type === 'retrying'}
+      canForkToCloud={!isReadOnly && Boolean(fetchedSessionData?.cloudAgentSessionId)}
       sandboxStatusEligible={isSandboxStatusEligible({
         currentUserId,
         sessionId,
@@ -1377,7 +1378,14 @@ export default function CloudChatPage({
                       <div hidden={!chatTabActive} className={chatTabActive ? '' : 'hidden'}>
                         {isReadOnly ? (
                           !isLoading && sessionIdFromParams && fetchedSessionData ? (
-                            <SessionContinuationPanel sessionId={sessionIdFromParams} />
+                            <SessionContinuationPanel
+                              sessionId={sessionIdFromParams}
+                              organizationId={organizationId}
+                              canForkToCloud={Boolean(
+                                activeSessionType === 'cloud-agent' &&
+                                fetchedSessionData.cloudAgentSessionId
+                              )}
+                            />
                           ) : null
                         ) : (
                           <>

apps/web/src/components/cloud-agent-next/SessionActionsDialog.tsx

@@ -9,11 +9,12 @@ import {
   DialogTitle,
 } from '@/components/ui/dialog';
 import { Button } from '@/components/ui/button';
-import { Loader2, Copy, Check, Share2, GitFork } from 'lucide-react';
+import { Loader2, Copy, Check, Share2, GitFork, Cloud } from 'lucide-react';
 import { useRawTRPCClient } from '@/lib/trpc/utils';
 import { toast } from 'sonner';
 import { CopyableCommand } from '@/components/CopyableCommand';
 import { OpenInEditorButton } from '@/app/share/[shareId]/open-in-editor-button';
+import { useCloudSessionFork } from './use-cloud-session-fork';
 
 type SessionActionsDialogProps = {
   open: boolean;
@@ -22,6 +23,10 @@ type SessionActionsDialogProps = {
   kiloSessionId?: string;
   sessionTitle?: string;
   repository?: string;
+  /** Organization context the dialog renders in; omitted for personal sessions. */
+  organizationId?: string;
+  /** Whether the source session is a Cloud Agent session that can be forked. */
+  canForkToCloud?: boolean;
 };
 
 export function SessionActionsDialog({
@@ -30,11 +35,15 @@ export function SessionActionsDialog({
   kiloSessionId,
   sessionTitle,
   repository,
+  organizationId,
+  canForkToCloud = false,
 }: SessionActionsDialogProps) {
   const [isSharing, setIsSharing] = useState(false);
   const [shareUrl, setShareUrl] = useState<string | null>(null);
   const [isCopied, setIsCopied] = useState(false);
   const trpc = useRawTRPCClient();
+  const { forkSessionToNewCloudSession, forkingSessionId } = useCloudSessionFork(organizationId);
+  const isForkingToCloud = forkingSessionId === kiloSessionId;
 
   const handleShare = async () => {
     if (!kiloSessionId) {
@@ -82,6 +91,14 @@ export function SessionActionsDialog({
     }, 200);
   };
 
+  const handleForkToCloud = async () => {
+    if (!kiloSessionId) return;
+    const forked = await forkSessionToNewCloudSession(kiloSessionId);
+    if (forked) {
+      handleClose();
+    }
+  };
+
   const truncateId = (id: string, length: number = 8): string => {
     if (id.length <= length) return id;
     return `${id.slice(0, length)}...`;
@@ -183,11 +200,32 @@ export function SessionActionsDialog({
               <h3 className="text-sm font-medium">Fork Session</h3>
             </div>
             <p className="text-muted-foreground text-xs">
-              Fork this session to continue working on it in your editor or CLI
+              {canForkToCloud
+                ? 'Fork this session to continue working on it in your editor, CLI, or a new Cloud Agent session'
+                : 'Fork this session to continue working on it in your editor or CLI'}
             </p>
 
             {kiloSessionId ? (
               <div className="space-y-3">
+                {canForkToCloud && (
+                  <Button
+                    type="button"
+                    variant="outline"
+                    className="w-full gap-2"
+                    disabled={isForkingToCloud}
+                    onClick={() => void handleForkToCloud()}
+                  >
+                    {isForkingToCloud ? (
+                      <Loader2 className="h-4 w-4 animate-spin" />
+                    ) : (
+                      <Cloud className="h-4 w-4" />
+                    )}
+                    {isForkingToCloud
+                      ? 'Forking to a new Cloud Agent session...'
+                      : 'Fork to a new Cloud Agent session'}
+                  </Button>
+                )}
+
                 <div className="flex justify-center">
                   <OpenInEditorButton
                     sessionId={kiloSessionId}

apps/web/src/components/cloud-agent-next/SessionContinuationPanel.tsx

@@ -1,25 +1,44 @@
 'use client';
 
 import { useState, useCallback } from 'react';
-import { Copy, Check, Terminal, ChevronUp } from 'lucide-react';
+import { Copy, Check, Terminal, ChevronUp, Cloud, Loader2 } from 'lucide-react';
 import { OpenInEditorButton } from '@/app/share/[shareId]/open-in-editor-button';
+import { Button } from '@/components/ui/button';
+import { useCloudSessionFork } from './use-cloud-session-fork';
 
 type SessionContinuationPanelProps = {
   sessionId: string;
+  /** Organization context the panel renders in; omitted for personal sessions. */
+  organizationId?: string;
+  /** Whether the source session is a Cloud Agent session that can be forked. */
+  canForkToCloud?: boolean;
 };
 
-function SessionContinuationPanel({ sessionId }: SessionContinuationPanelProps) {
+function SessionContinuationPanel({
+  sessionId,
+  organizationId,
+  canForkToCloud = false,
+}: SessionContinuationPanelProps) {
   const [copied, setCopied] = useState(false);
   const [expanded, setExpanded] = useState(false);
+  const { forkSessionToNewCloudSession, forkingSessionId } = useCloudSessionFork(organizationId);
 
   const cliCommand = `kilo --session ${sessionId} --cloud-fork`;
+  const isForking = forkingSessionId === sessionId;
 
   const handleCopy = useCallback(() => {
     void navigator.clipboard.writeText(cliCommand);
     setCopied(true);
     setTimeout(() => setCopied(false), 2000);
   }, [cliCommand]);
 
+  const handleForkToCloud = useCallback(async () => {
+    const forked = await forkSessionToNewCloudSession(sessionId);
+    if (forked) {
+      setExpanded(false);
+    }
+  }, [forkSessionToNewCloudSession, sessionId]);
+
   return (
     <div className="border-border bg-muted/30 border-t">
       <button
@@ -33,6 +52,25 @@ function SessionContinuationPanel({ sessionId }: SessionContinuationPanelProps)
 
       {expanded && (
         <div className="space-y-3 px-[max(1rem,calc(50%_-_27rem))] pb-4">
+          {canForkToCloud && (
+            <Button
+              type="button"
+              variant="outline"
+              className="w-full gap-2"
+              disabled={isForking}
+              onClick={() => void handleForkToCloud()}
+            >
+              {isForking ? (
+                <Loader2 className="h-4 w-4 animate-spin" />
+              ) : (
+                <Cloud className="h-4 w-4" />
+              )}
+              {isForking
+                ? 'Starting a new Cloud Agent session...'
+                : 'Continue in a new Cloud Agent session'}
+            </Button>
+          )}
+
           <OpenInEditorButton sessionId={sessionId} pathOverride={`/s/${sessionId}`} />
 
           <div className="space-y-1.5">
@@ -56,10 +94,6 @@ function SessionContinuationPanel({ sessionId }: SessionContinuationPanelProps)
               </button>
             </div>
           </div>
-
-          <p className="text-muted-foreground text-xs italic">
-            Continue in Cloud Agent coming soon
-          </p>
         </div>
       )}
     </div>