claude-ws 0.3.94 → 0.3.95

package/README.md

@@ -35,7 +35,9 @@ claude-ws
 # Option 3: From source
 git clone https://github.com/Claude-Workspace/claude-ws.git
 cd claude-ws
-pnpm install && pnpm dev
+pnpm install && pnpm run dev
+or
+pnpm install && pmpm run build && pnpm start
 ```
 
 Open http://localhost:8556
@@ -68,22 +70,6 @@ CLAUDE_PATH=/path/to/claude
 | `ANTHROPIC_API_RETRY_TIMES` | Number of retry attempts for failed Anthropic API requests (5xx errors or network failures) | `3` |
 | `ANTHROPIC_API_RETRY_DELAY_MS` | Delay between retry attempts in milliseconds | `10000` |
 
----
-
-## Production (PM2)
-
-```bash
-npm install claude-ws
-```
-
-Go to a folder that you want to run you claude-ws instance
-Config your .env (if prefferred)
-Start claude-ws instance
-```bash
-claude-ws
-```
-
-You can use it with pm2 for auto startup with system starts.
 
 ---
 

package/locales/de.json

@@ -56,7 +56,7 @@
     "deleteColumn": "Spalte löschen",
     "addColumn": "Spalte hinzufügen",
     "noTasks": "Keine Aufgaben",
-    "deleteAllTasks": "Alle {count} Aufgabe(n) löschen?",
+    "deleteAllTasks": "Alle {count} Aufgabe(n) in \"{status}\" löschen?",
     "newTaskShortcut": "Neue Aufgabe (Strg/⌘ + Leertaste)",
     "addNew": "Neu",
     "createNewTask": "Neue Aufgabe erstellen",
@@ -283,11 +283,13 @@
     "running": "Läuft...",
     "attachFilesTitle": "Dateien anhängen",
     "describeWhatYouWant": "Beschreiben Sie, was Claude tun soll...",
+    "interruptAndSend": "Nachricht senden, um Claude zu unterbrechen...",
     "pasteImageOrText": "Bild oder Text einfügen",
     "dropFilesHere": "Dateien hier ablegen",
     "commandsHint": "Befehle",
     "filesHint": "Dateien",
-    "pasteImageHint": "Bild einfügen"
+    "pasteImageHint": "Bild einfügen",
+    "cancelled": "Abgebrochen"
   },
   "agentProvider": {
     "configureTitle": "Agent-Provider konfigurieren",

package/locales/en.json

@@ -56,7 +56,7 @@
     "deleteColumn": "Delete Column",
     "addColumn": "Add Column",
     "noTasks": "No tasks",
-    "deleteAllTasks": "Delete all {count} task(s)?",
+    "deleteAllTasks": "Delete all {count} task(s) in \"{status}\"?",
     "newTaskShortcut": "New Task (Ctrl/⌘ + Space)",
     "addNew": "New",
     "createNewTask": "Create New Task",
@@ -283,11 +283,13 @@
     "running": "Running...",
     "attachFilesTitle": "Attach files",
     "describeWhatYouWant": "Describe what you want Claude to do...",
+    "interruptAndSend": "Send a message to interrupt Claude...",
     "pasteImageOrText": "Paste image or text",
     "dropFilesHere": "Drop files here",
     "commandsHint": "commands",
     "filesHint": "files",
-    "pasteImageHint": "paste image"
+    "pasteImageHint": "paste image",
+    "cancelled": "Cancelled"
   },
   "agentProvider": {
     "configureTitle": "Configure Agent Provider",

package/locales/es.json

@@ -56,7 +56,7 @@
     "deleteColumn": "Eliminar Columna",
     "addColumn": "Añadir Columna",
     "noTasks": "Sin tareas",
-    "deleteAllTasks": "¿Eliminar {count} tarea(s)?",
+    "deleteAllTasks": "¿Eliminar {count} tarea(s) en \"{status}\"?",
     "newTaskShortcut": "Nueva Tarea (Ctrl/⌘ + Espacio)",
     "addNew": "Nuevo",
     "createNewTask": "Crear Nueva Tarea",
@@ -283,11 +283,13 @@
     "running": "Ejecutándose...",
     "attachFilesTitle": "Adjuntar archivos",
     "describeWhatYouWant": "Describe lo que quieres que Claude haga...",
+    "interruptAndSend": "Enviar un mensaje para interrumpir a Claude...",
     "pasteImageOrText": "Pegar imagen o texto",
     "dropFilesHere": "Suelta archivos aquí",
     "commandsHint": "comandos",
     "filesHint": "archivos",
-    "pasteImageHint": "pegar imagen"
+    "pasteImageHint": "pegar imagen",
+    "cancelled": "Cancelado"
   },
   "accessAnywhere": {
     "title": "Acceder Desde Cualquier Lugar",

package/locales/fr.json

@@ -56,7 +56,7 @@
     "deleteColumn": "Supprimer la colonne",
     "addColumn": "Ajouter une colonne",
     "noTasks": "Aucune tâche",
-    "deleteAllTasks": "Supprimer les {count} tâche(s) ?",
+    "deleteAllTasks": "Supprimer les {count} tâche(s) dans \"{status}\" ?",
     "newTaskShortcut": "Nouvelle tâche (Ctrl/⌘ + Espace)",
     "addNew": "Nouveau",
     "createNewTask": "Créer une nouvelle tâche",
@@ -283,11 +283,13 @@
     "running": "En cours...",
     "attachFilesTitle": "Joindre des fichiers",
     "describeWhatYouWant": "Décrivez ce que vous voulez que Claude fasse...",
+    "interruptAndSend": "Envoyer un message pour interrompre Claude...",
     "pasteImageOrText": "Coller une image ou du texte",
     "dropFilesHere": "Déposez les fichiers ici",
     "commandsHint": "commandes",
     "filesHint": "fichiers",
-    "pasteImageHint": "coller image"
+    "pasteImageHint": "coller image",
+    "cancelled": "Annulé"
   },
   "accessAnywhere": {
     "title": "Accès Partout",

package/locales/ja.json

@@ -56,7 +56,7 @@
     "deleteColumn": "列を削除",
     "addColumn": "列を追加",
     "noTasks": "タスクなし",
-    "deleteAllTasks": "すべての {count} 個のタスクを削除しますか？",
+    "deleteAllTasks": "「{status}」のすべての {count} 個のタスクを削除しますか？",
     "newTaskShortcut": "新しいタスク (Ctrl/⌘ + Space)",
     "addNew": "新規",
     "createNewTask": "新しいタスクを作成",
@@ -283,11 +283,13 @@
     "running": "実行中...",
     "attachFilesTitle": "ファイルを添付",
     "describeWhatYouWant": "Claude にやりたいことを説明...",
+    "interruptAndSend": "メッセージを送信して Claude を中断...",
     "pasteImageOrText": "画像またはテキストを貼り付け",
     "dropFilesHere": "ここにファイルをドロップ",
     "commandsHint": "コマンド",
     "filesHint": "ファイル",
-    "pasteImageHint": "画像を貼り付け"
+    "pasteImageHint": "画像を貼り付け",
+    "cancelled": "キャンセルされました"
   },
   "accessAnywhere": {
     "title": "どこからでもアクセス",

package/locales/ko.json

@@ -56,7 +56,7 @@
     "deleteColumn": "열 삭제",
     "addColumn": "열 추가",
     "noTasks": "작업 없음",
-    "deleteAllTasks": "모든 {count} 개의 작업을 삭제하시겠습니까?",
+    "deleteAllTasks": "\"{status}\"의 모든 {count} 개의 작업을 삭제하시겠습니까?",
     "newTaskShortcut": "새 작업 (Ctrl/⌘ + Space)",
     "addNew": "추가",
     "createNewTask": "새 작업 만들기",
@@ -283,11 +283,13 @@
     "running": "실행 중...",
     "attachFilesTitle": "파일 첨부",
     "describeWhatYouWant": "Claude에게 원하는 것을 설명하세요...",
+    "interruptAndSend": "메시지를 보내 Claude를 중단...",
     "pasteImageOrText": "이미지 또는 텍스트 붙여넣기",
     "dropFilesHere": "파일을 여기에 놓으세요",
     "commandsHint": "명령어",
     "filesHint": "파일",
-    "pasteImageHint": "이미지 붙여넣기"
+    "pasteImageHint": "이미지 붙여넣기",
+    "cancelled": "취소됨"
   },
   "accessAnywhere": {
     "title": "어디서나 접근",

package/locales/vi.json

@@ -56,7 +56,7 @@
     "deleteColumn": "Xóa cột",
     "addColumn": "Thêm cột",
     "noTasks": "Không có nhiệm vụ",
-    "deleteAllTasks": "Xóa tất cả {count} nhiệm vụ?",
+    "deleteAllTasks": "Xóa tất cả {count} nhiệm vụ trong \"{status}\"?",
     "newTaskShortcut": "Nhiệm vụ mới (Ctrl/⌘ + Space)",
     "addNew": "Thêm",
     "createNewTask": "Tạo nhiệm vụ mới",
@@ -283,11 +283,13 @@
     "running": "Đang chạy...",
     "attachFilesTitle": "Đính kèm tập tin",
     "describeWhatYouWant": "Mô tả những gì bạn muốn Claude làm...",
+    "interruptAndSend": "Gửi tin nhắn để ngắt Claude...",
     "pasteImageOrText": "Dán hình ảnh hoặc văn bản",
     "dropFilesHere": "Thả tập tin vào đây",
     "commandsHint": "lệnh",
     "filesHint": "tập tin",
-    "pasteImageHint": "dán hình ảnh"
+    "pasteImageHint": "dán hình ảnh",
+    "cancelled": "Đã hủy"
   },
   "agentProvider": {
     "configureTitle": "Cấu hình Nhà cung cấp Agent",

package/locales/zh.json

@@ -56,7 +56,7 @@
     "deleteColumn": "删除列",
     "addColumn": "添加列",
     "noTasks": "无任务",
-    "deleteAllTasks": "删除所有 {count} 个任务？",
+    "deleteAllTasks": "删除\"{status}\"中的所有 {count} 个任务？",
     "newTaskShortcut": "新任务 (Ctrl/⌘ + 空格)",
     "addNew": "新建",
     "createNewTask": "创建新任务",
@@ -283,11 +283,13 @@
     "running": "运行中...",
     "attachFilesTitle": "附加文件",
     "describeWhatYouWant": "描述您希望 Claude 做什么...",
+    "interruptAndSend": "发送消息以中断 Claude...",
     "pasteImageOrText": "粘贴图片或文本",
     "dropFilesHere": "将文件拖放到此处",
     "commandsHint": "命令",
     "filesHint": "文件",
-    "pasteImageHint": "粘贴图片"
+    "pasteImageHint": "粘贴图片",
+    "cancelled": "已取消"
   },
   "accessAnywhere": {
     "title": "随处访问",

package/next.config.ts

@@ -7,6 +7,8 @@ const withNextIntl = createNextIntlPlugin('./src/i18n/request.ts');
 const nextConfig: NextConfig = {
   // Enable gzip compression for responses
   compress: true,
+  // Transpile xterm packages for proper CSS/ESM handling
+  transpilePackages: ['@xterm/xterm', '@xterm/addon-fit', '@xterm/addon-web-links'],
   outputFileTracingRoot: path.join(__dirname),
   outputFileTracingIncludes: {
     '/': ['./src/**/*'],
@@ -33,21 +35,38 @@ const nextConfig: NextConfig = {
     ],
   },
   // Add caching headers for static assets - helps tunnel performance
-  headers: async () => [
-    {
-      source: '/_next/static/:path*',
-      headers: [
-        { key: 'Cache-Control', value: 'public, max-age=31536000, immutable' },
-      ],
-    },
-    {
-      source: '/fonts/:path*',
-      headers: [
-        { key: 'Cache-Control', value: 'public, max-age=31536000, immutable' },
-      ],
-    },
-  ],
-  webpack: (config) => {
+  // Only enable aggressive caching in production
+  headers: async () => {
+    const isProduction = process.env.NODE_ENV === 'production';
+
+    if (isProduction) {
+      return [
+        {
+          source: '/_next/static/:path*',
+          headers: [
+            { key: 'Cache-Control', value: 'public, max-age=2592000, immutable' },
+          ],
+        },
+        {
+          source: '/fonts/:path*',
+          headers: [
+            { key: 'Cache-Control', value: 'public, max-age=2592000, immutable' },
+          ],
+        },
+      ];
+    }
+
+    // Development: disable cache
+    return [
+      {
+        source: '/:path*',
+        headers: [
+          { key: 'Cache-Control', value: 'no-store, no-cache, must-revalidate' },
+        ],
+      },
+    ];
+  },
+  webpack: (config, { isServer }) => {
     // Force single instance of @codemirror packages to avoid instanceof issues
     config.resolve.alias = {
       ...config.resolve.alias,
@@ -55,6 +74,13 @@ const nextConfig: NextConfig = {
       '@codemirror/view': path.resolve(__dirname, 'node_modules/@codemirror/view'),
       '@codemirror/language': path.resolve(__dirname, 'node_modules/@codemirror/language'),
     };
+
+    // Externalize node-pty from server-side bundling (native addon)
+    if (isServer) {
+      config.externals = config.externals || [];
+      config.externals.push('node-pty');
+    }
+
     return config;
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-ws",
-  "version": "0.3.94",
+  "version": "0.3.95",
   "private": false,
   "description": "A beautifully crafted workspace interface for Claude Code with real-time streaming and local SQLite database",
   "keywords": [
@@ -61,6 +61,7 @@
     ]
   },
   "scripts": {
+    "postinstall": "node -e \"try{require('fs').chmodSync(require('path').join('node_modules','node-pty','prebuilds',process.platform+'-'+process.arch,'spawn-helper'),0o755)}catch{}\"",
     "dev": "tsx server.ts",
     "build": "cross-env NODE_ENV=production next build",
     "start": "cross-env NODE_ENV=production tsx server.ts",
@@ -68,7 +69,7 @@
     "db:fix": "tsx scripts/db-fix-columns.ts"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.29",
+    "@anthropic-ai/claude-agent-sdk": "^0.2.42",
     "@anthropic-ai/sdk": "^0.71.2",
     "@codemirror/lang-cpp": "^6.0.3",
     "@codemirror/lang-css": "^6.3.1",
@@ -84,9 +85,9 @@
     "@codemirror/lang-xml": "^6.1.0",
     "@codemirror/lang-yaml": "^6.1.2",
     "@codemirror/language": "^6.12.1",
-    "@codemirror/state": "^6.5.3",
+    "@codemirror/state": "^6.5.4",
     "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.39.9",
+    "@codemirror/view": "^6.39.14",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
@@ -103,16 +104,19 @@
     "@radix-ui/react-toast": "^1.2.15",
     "@radix-ui/react-tooltip": "^1.2.8",
     "@radix-ui/react-visually-hidden": "^1.2.4",
-    "@tailwindcss/postcss": "^4",
+    "@tailwindcss/postcss": "^4.1.18",
     "@types/adm-zip": "^0.5.7",
     "@types/better-sqlite3": "^7.6.13",
     "@types/compression": "^1.8.1",
-    "@types/node": "^20",
-    "@types/react": "^19",
-    "@types/react-dom": "^19",
+    "@types/node": "^20.19.33",
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
     "@uiw/react-codemirror": "^4.25.4",
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/addon-web-links": "^0.12.0",
+    "@xterm/xterm": "^6.0.0",
     "adm-zip": "^0.5.16",
-    "better-sqlite3": "^12.5.0",
+    "better-sqlite3": "^12.6.2",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
@@ -121,20 +125,21 @@
     "ctunnel": "^1.0.3",
     "date-fns": "^4.1.0",
     "diff": "^8.0.3",
-    "dotenv": "^17.2.3",
-    "drizzle-kit": "^0.31.8",
+    "dotenv": "^17.2.4",
+    "drizzle-kit": "^0.31.9",
     "drizzle-orm": "^0.45.1",
-    "eslint": "^9",
-    "eslint-config-next": "^16.1.3",
+    "eslint": "^9.39.2",
+    "eslint-config-next": "^16.1.6",
     "highlight.js": "^11.11.1",
     "js-yaml": "^4.1.1",
     "lowlight": "^3.3.0",
     "lucide-react": "^0.562.0",
     "nanoid": "^5.1.6",
-    "next": "^16.1.3",
-    "next-intl": "^4.7.0",
+    "next": "^16.1.6",
+    "next-intl": "^4.8.2",
     "next-themes": "^0.4.6",
-    "pino": "^10.3.0",
+    "node-pty": "^1.1.0",
+    "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
     "react": "19.2.3",
     "react-dom": "19.2.3",
@@ -145,13 +150,13 @@
     "socket.io-client": "^4.8.3",
     "sonner": "^2.0.7",
     "tailwind-merge": "^3.4.0",
-    "tailwindcss": "^4",
-    "tar": "^7.5.2",
+    "tailwindcss": "^4.1.18",
+    "tar": "^7.5.7",
     "tsx": "^4.21.0",
     "tw-animate-css": "^1.4.0",
-    "typescript": "^5",
+    "typescript": "^5.9.3",
     "vscode-icons-js": "^11.6.1",
-    "zustand": "^5.0.9"
+    "zustand": "^5.0.11"
   },
   "packageManager": "pnpm@10.28.0+sha512.05df71d1421f21399e053fde567cea34d446fa02c76571441bfc1c7956e98e363088982d940465fd34480d4d90a0668bc12362f8aa88000a64e83d0b0e47be48",
   "devDependencies": {

package/server.ts

@@ -20,6 +20,10 @@ import { logCacheStats } from './src/lib/proxy-token-cache';
 // Enable SDK file checkpointing globally
 process.env.CLAUDE_CODE_ENABLE_SDK_FILE_CHECKPOINTING = '1';
 
+// Unset CLAUDECODE to prevent nested session detection (SDK v0.2.42+)
+// claude-ws spawns Claude CLI from a server process that may itself run inside Claude Code
+delete process.env.CLAUDECODE;
+
 import { createServer } from 'http';
 import { parse } from 'url';
 import next from 'next';
@@ -30,6 +34,7 @@ import { sessionManager } from './src/lib/session-manager';
 import { checkpointManager } from './src/lib/checkpoint-manager';
 import { inlineEditManager } from './src/lib/inline-edit-manager';
 import { shellManager } from './src/lib/shell-manager';
+import { terminalManager } from './src/lib/terminal-manager';
 import { db, schema } from './src/lib/db';
 import { createLogger } from './src/lib/logger';
 
@@ -64,9 +69,11 @@ app.prepare().then(async () => {
     const isProxyEndpoint = pathname.startsWith('/api/proxy/anthropic');
     const isTunnelStatusEndpoint = pathname === '/api/tunnel/status';
     const isApiAccessKeyEndpoint = pathname === '/api/settings/api-access-key';
+    // Uploads GET is public (for serving files), POST/DELETE require API key
+    const isUploadsGetEndpoint = pathname.startsWith('/api/uploads/') && req.method === 'GET';
 
-    // Skip auth for verify, tunnel status, and api-access-key endpoints
-    if (isApiRoute && !isVerifyEndpoint && !isProxyEndpoint && !isTunnelStatusEndpoint && !isApiAccessKeyEndpoint && apiAccessKey && apiAccessKey.length > 0) {
+    // Skip auth for verify, tunnel status, api-access-key, and uploads GET endpoints
+    if (isApiRoute && !isVerifyEndpoint && !isProxyEndpoint && !isTunnelStatusEndpoint && !isApiAccessKeyEndpoint && !isUploadsGetEndpoint && apiAccessKey && apiAccessKey.length > 0) {
       const providedKey = req.headers['x-api-key'];
 
       if (!providedKey || providedKey !== apiAccessKey) {
@@ -614,6 +621,71 @@ app.prepare().then(async () => {
       }
     });
 
+    // ========================================
+    // Interactive Terminal Socket Handlers
+    // ========================================
+
+    socket.on('terminal:create', async (
+      data: { projectId?: string; cols?: number; rows?: number },
+      ack?: (result: { success: boolean; terminalId?: string; error?: string }) => void
+    ) => {
+      log.info('[Server] Creating terminal session');
+      try {
+        // Resolve CWD: try project path if projectId given, fallback to user CWD
+        let cwd = userCwd;
+        if (data.projectId) {
+          const project = await db.query.projects.findFirst({
+            where: eq(schema.projects.id, data.projectId),
+          });
+          if (project) cwd = project.path;
+        }
+
+        const terminalId = terminalManager.create({
+          projectId: data.projectId || 'global',
+          cwd,
+          cols: data.cols,
+          rows: data.rows,
+        });
+
+        socket.join(`terminal:${terminalId}`);
+        log.info({ terminalId, cwd }, '[Server] Terminal session created');
+        if (ack) ack({ success: true, terminalId });
+      } catch (error) {
+        const msg = error instanceof Error ? error.message : 'Failed to create terminal';
+        log.error({ error: msg }, '[Server] Terminal create error');
+        if (ack) ack({ success: false, error: msg });
+      }
+    });
+
+    socket.on('terminal:input', (data: { terminalId: string; data: string }) => {
+      terminalManager.write(data.terminalId, data.data);
+    });
+
+    socket.on('terminal:resize', (data: { terminalId: string; cols: number; rows: number }) => {
+      terminalManager.resize(data.terminalId, data.cols, data.rows);
+    });
+
+    socket.on('terminal:close', (
+      data: { terminalId: string },
+      ack?: (result: { success: boolean }) => void
+    ) => {
+      log.info({ terminalId: data.terminalId }, '[Server] Closing terminal session');
+      const success = terminalManager.destroy(data.terminalId);
+      if (ack) ack({ success });
+    });
+
+    socket.on('terminal:subscribe', (data: { terminalId: string }) => {
+      socket.join(`terminal:${data.terminalId}`);
+    });
+
+    socket.on('terminal:check', (
+      data: { terminalId: string },
+      ack?: (result: { alive: boolean }) => void
+    ) => {
+      const alive = terminalManager.has(data.terminalId);
+      if (ack) ack({ alive });
+    });
+
     socket.on('disconnect', () => {
       log.info(`Client disconnected: ${socket.id}`);
     });
@@ -678,6 +750,19 @@ app.prepare().then(async () => {
     }
   });
 
+  // ========================================
+  // Terminal Manager Event Handlers
+  // ========================================
+
+  terminalManager.on('output', ({ terminalId, data }) => {
+    io.to(`terminal:${terminalId}`).emit('terminal:output', { terminalId, data });
+  });
+
+  terminalManager.on('exit', ({ terminalId, exitCode, signal }) => {
+    log.info({ terminalId, exitCode, signal }, '[Server] Terminal exited');
+    io.to(`terminal:${terminalId}`).emit('terminal:exit', { terminalId, exitCode, signal });
+  });
+
   // Forward AgentManager events to WebSocket clients
   agentManager.on('started', ({ attemptId, taskId }) => {
     log.info(`[Server] Agent started for attempt ${attemptId}, task ${taskId}`);
@@ -1174,6 +1259,10 @@ app.prepare().then(async () => {
     agentManager.cancelAll();
     log.info('> Cancelled all Claude agents');
 
+    // Destroy all interactive terminal sessions
+    terminalManager.destroyAll();
+    log.info('> Destroyed all terminal sessions');
+
     // Close all socket connections
     io.close(() => {
       log.info('> Socket.io closed');

package/src/app/[locale]/layout.tsx

@@ -3,8 +3,7 @@ import { Geist, Geist_Mono } from 'next/font/google';
 import { Toaster } from 'sonner';
 import { ThemeProvider } from '@/components/providers/theme-provider';
 import { SocketProvider } from '@/components/providers/socket-provider';
-import { AgentProviderConfigProvider } from '@/components/providers/agent-provider-config';
-import { RemoteAccessKeyProvider } from '@/components/providers/remote-access-key-provider';
+import { UnifiedSetupProvider } from '@/components/providers/unified-setup-provider';
 import { ApiKeyProvider } from '@/components/auth/api-key-dialog';
 import { NextIntlClientProvider } from 'next-intl';
 import { getMessages } from 'next-intl/server';
@@ -73,11 +72,9 @@ export default async function RootLayout({
           <ApiKeyProvider>
             <SocketProvider>
               <ThemeProvider>
-                <AgentProviderConfigProvider>
-                  <RemoteAccessKeyProvider>
-                    {children}
-                  </RemoteAccessKeyProvider>
-                </AgentProviderConfigProvider>
+                <UnifiedSetupProvider>
+                  {children}
+                </UnifiedSetupProvider>
                 <Toaster position="top-right" richColors closeButton />
               </ThemeProvider>
             </SocketProvider>