diff --git a/components/repo-issues.tsx b/components/repo-issues.tsx
index 39559185..a41ab4f2 100644
--- a/components/repo-issues.tsx
+++ b/components/repo-issues.tsx
@@ -40,7 +40,7 @@ const CODING_AGENTS = [
 const AGENT_MODELS = {
   claude: [
     { value: 'claude-sonnet-4-5', label: 'Sonnet 4.5' },
-    { value: 'claude-opus-4-5', label: 'Opus 4.5' },
+    { value: 'anthropic/claude-opus-4.6', label: 'Opus 4.6' },
     { value: 'claude-haiku-4-5', label: 'Haiku 4.5' },
   ],
   codex: [
diff --git a/components/repo-pull-requests.tsx b/components/repo-pull-requests.tsx
index a751ae6c..bb76f356 100644
--- a/components/repo-pull-requests.tsx
+++ b/components/repo-pull-requests.tsx
@@ -48,7 +48,7 @@ const CODING_AGENTS = [
 const AGENT_MODELS = {
   claude: [
     { value: 'claude-sonnet-4-5', label: 'Sonnet 4.5' },
-    { value: 'claude-opus-4-5', label: 'Opus 4.5' },
+    { value: 'anthropic/claude-opus-4.6', label: 'Opus 4.6' },
     { value: 'claude-haiku-4-5', label: 'Haiku 4.5' },
   ],
   codex: [
diff --git a/components/revert-commit-dialog.tsx b/components/revert-commit-dialog.tsx
index 702cf528..1f87dc27 100644
--- a/components/revert-commit-dialog.tsx
+++ b/components/revert-commit-dialog.tsx
@@ -62,7 +62,7 @@ const CODING_AGENTS = [
 const AGENT_MODELS = {
   claude: [
     { value: 'claude-sonnet-4-5', label: 'Sonnet 4.5' },
-    { value: 'claude-opus-4-5', label: 'Opus 4.5' },
+    { value: 'anthropic/claude-opus-4.6', label: 'Opus 4.6' },
     { value: 'claude-haiku-4-5', label: 'Haiku 4.5' },
   ],
   codex: [
diff --git a/components/task-details.tsx b/components/task-details.tsx
index 7a20517d..c16b773d 100644
--- a/components/task-details.tsx
+++ b/components/task-details.tsx
@@ -115,7 +115,7 @@ const CODING_AGENTS = [
 const AGENT_MODELS = {
   claude: [
     { value: 'claude-sonnet-4-5', label: 'Sonnet 4.5' },
-    { value: 'claude-opus-4-5', label: 'Opus 4.5' },
+    { value: 'anthropic/claude-opus-4.6', label: 'Opus 4.6' },
     { value: 'claude-haiku-4-5', label: 'Haiku 4.5' },
   ],
   codex: [
@@ -691,7 +691,7 @@ export function TaskDetails({ task, maxSandboxDuration = 300 }: TaskDetailsProps
   const AGENT_MODELS: Record<string, Array<{ value: string; label: string }>> = {
     claude: [
       { value: 'claude-sonnet-4-5', label: 'Sonnet 4.5' },
-      { value: 'claude-opus-4-5', label: 'Opus 4.5' },
+      { value: 'anthropic/claude-opus-4.6', label: 'Opus 4.6' },
       { value: 'claude-haiku-4-5', label: 'Haiku 4.5' },
     ],
     codex: [
diff --git a/components/task-form.tsx b/components/task-form.tsx
index 375f9e95..04def281 100644
--- a/components/task-form.tsx
+++ b/components/task-form.tsx
@@ -73,7 +73,7 @@ const CODING_AGENTS = [
 const AGENT_MODELS = {
   claude: [
     { value: 'claude-sonnet-4-5', label: 'Sonnet 4.5' },
-    { value: 'claude-opus-4-5', label: 'Opus 4.5' },
+    { value: 'anthropic/claude-opus-4.6', label: 'Opus 4.6' },
     { value: 'claude-haiku-4-5', label: 'Haiku 4.5' },
   ],
   codex: [
diff --git a/components/task-sidebar.tsx b/components/task-sidebar.tsx
index 0e978efa..26ec15ab 100644
--- a/components/task-sidebar.tsx
+++ b/components/task-sidebar.tsx
@@ -33,7 +33,7 @@ import { githubConnectionAtom } from '@/lib/atoms/github-connection'
 const AGENT_MODELS = {
   claude: [
     { value: 'claude-sonnet-4-5', label: 'Sonnet 4.5' },
-    { value: 'claude-opus-4-5', label: 'Opus 4.5' },
+    { value: 'anthropic/claude-opus-4.6', label: 'Opus 4.6' },
     { value: 'claude-haiku-4-5', label: 'Haiku 4.5' },
   ],
   codex: [
diff --git a/components/tasks-list-client.tsx b/components/tasks-list-client.tsx
index 6af6477e..c7582e0a 100644
--- a/components/tasks-list-client.tsx
+++ b/components/tasks-list-client.tsx
@@ -37,7 +37,7 @@ interface TasksListClientProps {
 const AGENT_MODELS = {
   claude: [
     { value: 'claude-sonnet-4-5', label: 'Sonnet 4.5' },
-    { value: 'claude-opus-4-5', label: 'Opus 4.5' },
+    { value: 'anthropic/claude-opus-4.6', label: 'Opus 4.6' },
     { value: 'claude-haiku-4-5', label: 'Haiku 4.5' },
   ],
   codex: [
diff --git a/lib/sandbox/agents/claude.ts b/lib/sandbox/agents/claude.ts
index b1a815d2..acc37303 100644
--- a/lib/sandbox/agents/claude.ts
+++ b/lib/sandbox/agents/claude.ts
@@ -77,7 +77,7 @@ export async function installClaudeCLI(
   } else {
     // Install Claude CLI
     await logger.info('Installing Claude CLI...')
-    claudeInstall = await runCommandInSandbox(sandbox, 'npm', ['install', '-g', '@anthropic-ai/claude-code'])
+    claudeInstall = await runCommandInSandbox(sandbox, 'sh', ['-c', 'curl -fsSL https://claude.ai/install.sh | bash'])
   }
 
   if (claudeInstall.success) {