diff --git a/app/api/tasks/[taskId]/client-logs/route.ts b/app/api/tasks/[taskId]/client-logs/route.ts
new file mode 100644
index 00000000..7fe979f2
--- /dev/null
+++ b/app/api/tasks/[taskId]/client-logs/route.ts
@@ -0,0 +1,66 @@
+import { NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { db } from '@/lib/db/client'
+import * as schema from '@/lib/db/schema'
+import { eq, and, isNull } from 'drizzle-orm'
+import { getServerSession } from '@/lib/session/get-server-session'
+import { redactSensitiveInfo } from '@/lib/utils/logging'
+
+const { tasks, logEntrySchema } = schema
+
+// Schema for the request body
+const clientLogsSchema = z.object({
+  logs: z.array(logEntrySchema),
+})
+
+/**
+ * POST /api/tasks/[taskId]/client-logs
+ * Append client-side logs to the task's log database
+ */
+export async function POST(request: NextRequest, { params }: { params: Promise<{ taskId: string }> }) {
+  try {
+    const session = await getServerSession()
+    if (!session?.user?.id) {
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    }
+
+    const { taskId } = await params
+
+    // Parse the request body
+    const body = await request.json()
+    const { logs } = clientLogsSchema.parse(body)
+
+    if (!logs || logs.length === 0) {
+      return NextResponse.json({ error: 'No logs provided' }, { status: 400 })
+    }
+
+    // Get the task and verify ownership (exclude soft-deleted)
+    const [task] = await db
+      .select()
+      .from(tasks)
+      .where(and(eq(tasks.id, taskId), eq(tasks.userId, session.user.id), isNull(tasks.deletedAt)))
+      .limit(1)
+
+    if (!task) {
+      return NextResponse.json({ error: 'Task not found' }, { status: 404 })
+    }
+
+    // Redact sensitive information from all log messages
+    const sanitizedLogs = logs.map((log) => ({
+      ...log,
+      message: redactSensitiveInfo(log.message),
+      timestamp: log.timestamp || new Date(),
+    }))
+
+    // Append the client logs to the existing logs
+    const existingLogs = task.logs || []
+    const updatedLogs = [...existingLogs, ...sanitizedLogs]
+
+    await db.update(tasks).set({ logs: updatedLogs, updatedAt: new Date() }).where(eq(tasks.id, taskId))
+
+    return NextResponse.json({ success: true })
+  } catch (error) {
+    console.error('Error appending client logs:', error)
+    return NextResponse.json({ error: 'Failed to append client logs' }, { status: 500 })
+  }
+}
diff --git a/components/logs-pane.tsx b/components/logs-pane.tsx
index e036417c..7da47487 100644
--- a/components/logs-pane.tsx
+++ b/components/logs-pane.tsx
@@ -17,7 +17,7 @@ interface LogsPaneProps {
 }
 
 type TabType = 'logs' | 'terminal'
-type LogFilterType = 'all' | 'platform' | 'server'
+type LogFilterType = 'all' | 'platform' | 'server' | 'client'
 
 export function LogsPane({ task, onHeightChange }: LogsPaneProps) {
   const [copiedLogs, setCopiedLogs] = useState(false)
@@ -161,8 +161,10 @@ export function LogsPane({ task, onHeightChange }: LogsPaneProps) {
   const getFilteredLogs = (filter: LogFilterType) => {
     return (task.logs || []).filter((log) => {
       const isServerLog = log.message.startsWith('[SERVER]')
+      const isClientLog = log.message.startsWith('[CLIENT]')
       if (filter === 'server') return isServerLog
-      if (filter === 'platform') return !isServerLog
+      if (filter === 'client') return isClientLog
+      if (filter === 'platform') return !isServerLog && !isClientLog
       return true
     })
   }
@@ -302,6 +304,7 @@ export function LogsPane({ task, onHeightChange }: LogsPaneProps) {
                   <SelectItem value="all">All</SelectItem>
                   <SelectItem value="platform">Platform</SelectItem>
                   <SelectItem value="server">Server</SelectItem>
+                  <SelectItem value="client">Client</SelectItem>
                 </SelectContent>
               </Select>
               <Button
@@ -357,7 +360,13 @@ export function LogsPane({ task, onHeightChange }: LogsPaneProps) {
         >
           {getFilteredLogs(logFilter).map((log, index) => {
             const isServerLog = log.message.startsWith('[SERVER]')
-            const messageContent = isServerLog ? log.message.substring(9) : log.message // Remove '[SERVER] '
+            const isClientLog = log.message.startsWith('[CLIENT]')
+            let messageContent = log.message
+            if (isServerLog) {
+              messageContent = log.message.substring(9) // Remove '[SERVER] '
+            } else if (isClientLog) {
+              messageContent = log.message.substring(9) // Remove '[CLIENT] '
+            }
 
             const getLogColor = (logType: LogEntry['type']) => {
               switch (logType) {
@@ -388,7 +397,8 @@ export function LogsPane({ task, onHeightChange }: LogsPaneProps) {
                 <span className="text-white/40 text-[10px] shrink-0">[{formatTime(log.timestamp || new Date())}]</span>
                 <span className={cn('flex-1', getLogColor(log.type))}>
                   {isServerLog && <span className="text-purple-400">[SERVER]</span>}
-                  {isServerLog && ' '}
+                  {isClientLog && <span className="text-blue-400">[CLIENT]</span>}
+                  {(isServerLog || isClientLog) && ' '}
                   {messageContent}
                 </span>
               </div>
diff --git a/components/task-page-client.tsx b/components/task-page-client.tsx
index 2ba86a3e..3575f301 100644
--- a/components/task-page-client.tsx
+++ b/components/task-page-client.tsx
@@ -1,7 +1,8 @@
 'use client'
 
-import { useState } from 'react'
+import { useState, useEffect } from 'react'
 import { useTask } from '@/lib/hooks/use-task'
+import { useClientLogger } from '@/lib/hooks/use-client-logger'
 import { TaskDetails } from '@/components/task-details'
 import { TaskPageHeader } from '@/components/task-page-header'
 import { PageHeader } from '@/components/page-header'
@@ -31,6 +32,14 @@ export function TaskPageClient({
   const { task, isLoading, error } = useTask(taskId)
   const { toggleSidebar } = useTasks()
   const [logsPaneHeight, setLogsPaneHeight] = useState(40) // Default to collapsed height
+  const clientLogger = useClientLogger(taskId)
+
+  // Log when the page is loaded
+  useEffect(() => {
+    if (task && clientLogger) {
+      clientLogger.info('Task page loaded in browser')
+    }
+  }, [task, clientLogger])
 
   if (isLoading) {
     return (
diff --git a/lib/hooks/use-client-logger.ts b/lib/hooks/use-client-logger.ts
new file mode 100644
index 00000000..365481f8
--- /dev/null
+++ b/lib/hooks/use-client-logger.ts
@@ -0,0 +1,75 @@
+import { useEffect, useRef, useCallback } from 'react'
+import { createClientLogger, ClientLogger } from '@/lib/utils/client-logger'
+
+/**
+ * Hook that creates a client logger for a task and provides helper methods
+ * The logger automatically batches and sends logs to the server
+ */
+export function useClientLogger(taskId: string | null | undefined) {
+  const loggerRef = useRef<ClientLogger | null>(null)
+
+  // Create logger when taskId is available
+  useEffect(() => {
+    if (taskId && !loggerRef.current) {
+      loggerRef.current = createClientLogger(taskId)
+    }
+
+    // Cleanup: flush any pending logs when component unmounts
+    return () => {
+      if (loggerRef.current) {
+        loggerRef.current.flush()
+      }
+    }
+  }, [taskId])
+
+  // Helper methods that safely call the logger
+  const info = useCallback(
+    (message: string) => {
+      if (loggerRef.current) {
+        loggerRef.current.info(message)
+      }
+    },
+    [loggerRef],
+  )
+
+  const command = useCallback(
+    (message: string) => {
+      if (loggerRef.current) {
+        loggerRef.current.command(message)
+      }
+    },
+    [loggerRef],
+  )
+
+  const error = useCallback(
+    (message: string) => {
+      if (loggerRef.current) {
+        loggerRef.current.error(message)
+      }
+    },
+    [loggerRef],
+  )
+
+  const success = useCallback(
+    (message: string) => {
+      if (loggerRef.current) {
+        loggerRef.current.success(message)
+      }
+    },
+    [loggerRef],
+  )
+
+  const flush = useCallback(() => {
+    if (loggerRef.current) {
+      loggerRef.current.flush()
+    }
+  }, [loggerRef])
+
+  return {
+    info,
+    command,
+    error,
+    success,
+    flush,
+  }
+}
diff --git a/lib/utils/client-logger.ts b/lib/utils/client-logger.ts
new file mode 100644
index 00000000..fb948ae6
--- /dev/null
+++ b/lib/utils/client-logger.ts
@@ -0,0 +1,129 @@
+/**
+ * Client-side logger that sends logs to the server for storage
+ * All logs are prefixed with [CLIENT] and stored in the task's log database
+ */
+
+import { LogEntry } from '@/lib/db/schema'
+
+export class ClientLogger {
+  private taskId: string
+  private batchQueue: LogEntry[] = []
+  private batchTimeout: NodeJS.Timeout | null = null
+  private readonly BATCH_DELAY = 500 // ms
+  private readonly MAX_BATCH_SIZE = 10
+
+  constructor(taskId: string) {
+    this.taskId = taskId
+  }
+
+  /**
+   * Send logs to the server
+   */
+  private async sendToServer(logs: LogEntry[]): Promise<void> {
+    try {
+      const response = await fetch(`/api/tasks/${this.taskId}/client-logs`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ logs }),
+      })
+
+      if (!response.ok) {
+        console.error('Failed to send client logs to server')
+      }
+    } catch (error) {
+      console.error('Error sending client logs:', error)
+    }
+  }
+
+  /**
+   * Flush the batch queue immediately
+   */
+  private flushBatch(): void {
+    if (this.batchTimeout) {
+      clearTimeout(this.batchTimeout)
+      this.batchTimeout = null
+    }
+
+    if (this.batchQueue.length > 0) {
+      const logsToSend = [...this.batchQueue]
+      this.batchQueue = []
+      this.sendToServer(logsToSend)
+    }
+  }
+
+  /**
+   * Add a log entry to the batch queue
+   */
+  private enqueue(type: LogEntry['type'], message: string): void {
+    const logEntry: LogEntry = {
+      type,
+      message: `[CLIENT] ${message}`,
+      timestamp: new Date(),
+    }
+
+    this.batchQueue.push(logEntry)
+
+    // Flush immediately if batch size reached
+    if (this.batchQueue.length >= this.MAX_BATCH_SIZE) {
+      this.flushBatch()
+      return
+    }
+
+    // Otherwise, schedule a batch flush
+    if (this.batchTimeout) {
+      clearTimeout(this.batchTimeout)
+    }
+
+    this.batchTimeout = setTimeout(() => {
+      this.flushBatch()
+    }, this.BATCH_DELAY)
+  }
+
+  /**
+   * Log an info message
+   */
+  info(message: string): void {
+    this.enqueue('info', message)
+    console.log(`[CLIENT] ${message}`)
+  }
+
+  /**
+   * Log a command
+   */
+  command(message: string): void {
+    this.enqueue('command', message)
+    console.log(`[CLIENT] $ ${message}`)
+  }
+
+  /**
+   * Log an error message
+   */
+  error(message: string): void {
+    this.enqueue('error', message)
+    console.error(`[CLIENT] ${message}`)
+  }
+
+  /**
+   * Log a success message
+   */
+  success(message: string): void {
+    this.enqueue('success', message)
+    console.log(`[CLIENT] ✓ ${message}`)
+  }
+
+  /**
+   * Flush any pending logs immediately
+   */
+  flush(): void {
+    this.flushBatch()
+  }
+}
+
+/**
+ * Create a client logger instance for a specific task
+ */
+export function createClientLogger(taskId: string): ClientLogger {
+  return new ClientLogger(taskId)
+}