thepopebot 1.2.72 → 1.2.73-beta.1

package/config/index.js

@@ -15,7 +15,7 @@ export function withThepopebot(nextConfig = {}) {
     distDir: process.env.NEXT_BUILD_DIR || '.next',
     env: {
       ...nextConfig.env,
-      NEXT_PUBLIC_CLAUDE_WORKSPACE: process.env.CLAUDE_CODE_OAUTH_TOKEN && process.env.BETA ? 'true' : '',
+      NEXT_PUBLIC_CODE_WORKSPACE: process.env.CLAUDE_CODE_OAUTH_TOKEN && process.env.BETA ? 'true' : '',
     },
     serverExternalPackages: [
       ...(nextConfig.serverExternalPackages || []),

package/drizzle/0003_rename_code_workspaces.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `claude_workspaces` RENAME TO `code_workspaces`;--> statement-breakpoint
+DROP INDEX IF EXISTS `claude_workspaces_container_name_unique`;--> statement-breakpoint
+CREATE UNIQUE INDEX `code_workspaces_container_name_unique` ON `code_workspaces` (`container_name`);--> statement-breakpoint
+ALTER TABLE `code_workspaces` ADD `coding_agent` text NOT NULL DEFAULT 'claude-code';--> statement-breakpoint
+ALTER TABLE `chats` RENAME COLUMN `claude_workspace_id` TO `code_workspace_id`;

package/drizzle/meta/0003_snapshot.json

@@ -0,0 +1,419 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
+  "prevId": "393d6739-2717-4020-bedb-8a9e1ed756da",
+  "tables": {
+    "chats": {
+      "name": "chats",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'New Chat'"
+        },
+        "starred": {
+          "name": "starred",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "code_workspace_id": {
+          "name": "code_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "code_workspaces": {
+      "name": "code_workspaces",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "container_name": {
+          "name": "container_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'Code Workspace'"
+        },
+        "coding_agent": {
+          "name": "coding_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'claude-code'"
+        },
+        "starred": {
+          "name": "starred",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "code_workspaces_container_name_unique": {
+          "name": "code_workspaces_container_name_unique",
+          "columns": [
+            "container_name"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "messages": {
+      "name": "messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "notifications": {
+      "name": "notifications",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "notification": {
+          "name": "notification",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "read": {
+          "name": "read",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "settings": {
+      "name": "settings",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "subscriptions": {
+      "name": "subscriptions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "platform": {
+          "name": "platform",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "channel_id": {
+          "name": "channel_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "password_hash": {
+          "name": "password_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'admin'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

package/drizzle/meta/_journal.json

@@ -22,6 +22,13 @@
       "when": 1772340907917,
       "tag": "0002_black_daimon_hellstrom",
       "breakpoints": true
+    },
+    {
+      "idx": 3,
+      "version": "6",
+      "when": 1772486536207,
+      "tag": "0003_rename_code_workspaces",
+      "breakpoints": true
     }
   ]
 }

package/lib/ai/index.js

@@ -116,8 +116,8 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
 
     if (!existingChat) {
       // First message: create workspace row, then chat, then link them
-      const { createClaudeWorkspace } = await import('../db/claude-workspaces.js');
-      const workspace = createClaudeWorkspace(options.userId || 'unknown', {
+      const { createCodeWorkspace } = await import('../db/code-workspaces.js');
+      const workspace = createCodeWorkspace(options.userId || 'unknown', {
         repo: options.repo,
         branch: options.branch,
       });
@@ -125,7 +125,7 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
       createChat(options.userId || 'unknown', 'New Chat', threadId);
       linkChatToWorkspace(threadId, workspaceId);
     } else {
-      workspaceId = existingChat.claudeWorkspaceId;
+      workspaceId = existingChat.codeWorkspaceId;
     }
 
     agent = await getCodeAgent({

package/lib/ai/tools.js

@@ -194,12 +194,15 @@ function createStartCodingTool({ repo, branch, workspaceId }) {
     async ({ task_description }) => {
       try {
         const { randomUUID } = await import('crypto');
-        const containerName = `claude-workspace-${randomUUID().slice(0, 8)}`;
+        const containerName = `code-workspace-${randomUUID().slice(0, 8)}`;
 
-        const { createClaudeWorkspaceContainer } = await import('../tools/docker.js');
-        await createClaudeWorkspaceContainer({ containerName, repo, branch });
+        const { getCodeWorkspaceById, updateContainerName } = await import('../db/code-workspaces.js');
+        const workspace = getCodeWorkspaceById(workspaceId);
+        const codingAgent = workspace?.codingAgent || 'claude-code';
+
+        const { createCodeWorkspaceContainer } = await import('../tools/docker.js');
+        await createCodeWorkspaceContainer({ containerName, repo, branch, codingAgent });
 
-        const { updateContainerName } = await import('../db/claude-workspaces.js');
         updateContainerName(workspaceId, containerName);
 
         return JSON.stringify({
@@ -218,7 +221,7 @@ function createStartCodingTool({ repo, branch, workspaceId }) {
     {
       name: 'start_coding',
       description:
-        'Launch a live Claude Code workspace in a Docker container. Only call this when the user explicitly says they are ready to start coding (e.g. "let\'s start coding", "okay let\'s get started", "launch it"). Returns a link to the live workspace.',
+        'Launch a live code workspace in a Docker container. Only call this when the user explicitly says they are ready to start coding (e.g. "let\'s start coding", "okay let\'s get started", "launch it"). Returns a link to the live workspace.',
       schema: z.object({
         task_description: z
           .string()

package/lib/chat/actions.js

@@ -36,7 +36,7 @@ export async function getChats() {
   const user = await requireAuth();
   const { or, eq, desc } = await import('drizzle-orm');
   const { getDb } = await import('../db/index.js');
-  const { chats, claudeWorkspaces } = await import('../db/schema.js');
+  const { chats, codeWorkspaces } = await import('../db/schema.js');
   const db = getDb();
   return db
     .select({
@@ -44,13 +44,13 @@ export async function getChats() {
       userId: chats.userId,
       title: chats.title,
       starred: chats.starred,
-      claudeWorkspaceId: chats.claudeWorkspaceId,
-      containerName: claudeWorkspaces.containerName,
+      codeWorkspaceId: chats.codeWorkspaceId,
+      containerName: codeWorkspaces.containerName,
       createdAt: chats.createdAt,
       updatedAt: chats.updatedAt,
     })
     .from(chats)
-    .leftJoin(claudeWorkspaces, eq(chats.claudeWorkspaceId, claudeWorkspaces.id))
+    .leftJoin(codeWorkspaces, eq(chats.codeWorkspaceId, codeWorkspaces.id))
     .where(or(eq(chats.userId, user.id), eq(chats.userId, 'telegram')))
     .orderBy(desc(chats.updatedAt))
     .all();
@@ -205,10 +205,13 @@ export async function getAppVersion() {
   await requireAuth();
   const { getInstalledVersion } = await import('../cron.js');
   const { getAvailableVersion, getReleaseNotes } = await import('../db/update-check.js');
+  const version = getInstalledVersion();
+  const available = getAvailableVersion();
+  const isNewer = available && available !== version;
   return {
-    version: getInstalledVersion(),
-    updateAvailable: getAvailableVersion(),
-    changelog: getReleaseNotes(),
+    version,
+    updateAvailable: isNewer ? available : null,
+    changelog: isNewer ? getReleaseNotes() : null,
   };
 }
 
@@ -313,9 +316,9 @@ export async function getBranches(repoFullName) {
 }
 
 /**
- * Get chat metadata (claudeWorkspaceId) for an existing chat.
+ * Get chat metadata (codeWorkspaceId) for an existing chat.
  * @param {string} chatId
- * @returns {Promise<{claudeWorkspaceId: string|null}|null>}
+ * @returns {Promise<{codeWorkspaceId: string|null}|null>}
  */
 export async function getChatMeta(chatId) {
   const user = await requireAuth();
@@ -323,7 +326,7 @@ export async function getChatMeta(chatId) {
   if (!chat || (chat.userId !== user.id && chat.userId !== 'telegram')) {
     return null;
   }
-  return { claudeWorkspaceId: chat.claudeWorkspaceId || null };
+  return { codeWorkspaceId: chat.codeWorkspaceId || null };
 }
 
 /**
@@ -334,10 +337,10 @@ export async function getChatMeta(chatId) {
 export async function getWorkspace(workspaceId) {
   await requireAuth();
   try {
-    const { getClaudeWorkspaceById } = await import('../db/claude-workspaces.js');
-    const ws = getClaudeWorkspaceById(workspaceId);
+    const { getCodeWorkspaceById } = await import('../db/code-workspaces.js');
+    const ws = getCodeWorkspaceById(workspaceId);
     if (!ws) return null;
-    return { id: ws.id, repo: ws.repo, branch: ws.branch, containerName: ws.containerName };
+    return { id: ws.id, repo: ws.repo, branch: ws.branch, containerName: ws.containerName, codingAgent: ws.codingAgent };
   } catch (err) {
     console.error('Failed to get workspace:', err);
     return null;

package/lib/chat/components/chat-page.js

@@ -65,8 +65,8 @@ function ChatPage({ session, needsSetup, chatId }) {
         setInitialMessages(uiMessages);
         try {
           const meta = await getChatMeta(activeChatId);
-          if (meta?.claudeWorkspaceId) {
-            const ws = await getWorkspace(meta.claudeWorkspaceId);
+          if (meta?.codeWorkspaceId) {
+            const ws = await getWorkspace(meta.codeWorkspaceId);
             setWorkspace(ws);
           } else {
             setWorkspace(null);

package/lib/chat/components/chat-page.jsx

@@ -82,8 +82,8 @@ export function ChatPage({ session, needsSetup, chatId }) {
         // Check if this is a code chat
         try {
           const meta = await getChatMeta(activeChatId);
-          if (meta?.claudeWorkspaceId) {
-            const ws = await getWorkspace(meta.claudeWorkspaceId);
+          if (meta?.codeWorkspaceId) {
+            const ws = await getWorkspace(meta.codeWorkspaceId);
             setWorkspace(ws);
           } else {
             setWorkspace(null);

package/lib/chat/components/chats-page.js

@@ -187,7 +187,7 @@ function ChatRow({ chat, onNavigate, onDelete, onStar, onRename }) {
   return /* @__PURE__ */ jsxs(
     "a",
     {
-      href: chat.claudeWorkspaceId && chat.containerName ? `/code/${chat.claudeWorkspaceId}` : `/chat/${chat.id}`,
+      href: chat.codeWorkspaceId && chat.containerName ? `/code/${chat.codeWorkspaceId}` : `/chat/${chat.id}`,
       className: "relative group flex items-center gap-3 px-3 py-3 cursor-pointer hover:bg-muted/50 rounded-md",
       style: { textDecoration: "inherit", color: "inherit" },
       onMouseEnter: () => setHovered(true),
@@ -198,14 +198,14 @@ function ChatRow({ chat, onNavigate, onDelete, onStar, onRename }) {
           return;
         }
         e.preventDefault();
-        if (chat.claudeWorkspaceId && chat.containerName) {
-          window.location.href = `/code/${chat.claudeWorkspaceId}`;
+        if (chat.codeWorkspaceId && chat.containerName) {
+          window.location.href = `/code/${chat.codeWorkspaceId}`;
         } else {
           onNavigate(chat.id);
         }
       },
       children: [
-        chat.claudeWorkspaceId && chat.containerName ? /* @__PURE__ */ jsx(CodeIcon, { size: 16 }) : /* @__PURE__ */ jsx(MessageIcon, { size: 16 }),
+        chat.codeWorkspaceId && chat.containerName ? /* @__PURE__ */ jsx(CodeIcon, { size: 16 }) : /* @__PURE__ */ jsx(MessageIcon, { size: 16 }),
         /* @__PURE__ */ jsxs("div", { className: "flex-1 min-w-0", children: [
           editing ? /* @__PURE__ */ jsx(
             "input",

package/lib/chat/components/chats-page.jsx

@@ -229,7 +229,7 @@ function ChatRow({ chat, onNavigate, onDelete, onStar, onRename }) {
 
   return (
     <a
-      href={chat.claudeWorkspaceId && chat.containerName ? `/code/${chat.claudeWorkspaceId}` : `/chat/${chat.id}`}
+      href={chat.codeWorkspaceId && chat.containerName ? `/code/${chat.codeWorkspaceId}` : `/chat/${chat.id}`}
       className="relative group flex items-center gap-3 px-3 py-3 cursor-pointer hover:bg-muted/50 rounded-md"
       style={{ textDecoration: 'inherit', color: 'inherit' }}
       onMouseEnter={() => setHovered(true)}
@@ -237,14 +237,14 @@ function ChatRow({ chat, onNavigate, onDelete, onStar, onRename }) {
       onClick={(e) => {
         if (editing) { e.preventDefault(); return; }
         e.preventDefault();
-        if (chat.claudeWorkspaceId && chat.containerName) {
-          window.location.href = `/code/${chat.claudeWorkspaceId}`;
+        if (chat.codeWorkspaceId && chat.containerName) {
+          window.location.href = `/code/${chat.codeWorkspaceId}`;
         } else {
           onNavigate(chat.id);
         }
       }}
     >
-      {chat.claudeWorkspaceId && chat.containerName ? <CodeIcon size={16} /> : <MessageIcon size={16} />}
+      {chat.codeWorkspaceId && chat.containerName ? <CodeIcon size={16} /> : <MessageIcon size={16} />}
       <div className="flex-1 min-w-0">
         {editing ? (
           <input

package/lib/chat/components/code-mode-toggle.js

@@ -52,7 +52,7 @@ function CodeModeToggle({
       setLoadingBranches(false);
     }).catch(() => setLoadingBranches(false));
   }, [repo]);
-  if (!process.env.NEXT_PUBLIC_CLAUDE_WORKSPACE) return null;
+  if (!process.env.NEXT_PUBLIC_CODE_WORKSPACE) return null;
   if (locked && enabled) {
     return /* @__PURE__ */ jsx("div", { className: "flex justify-center", children: /* @__PURE__ */ jsxs("div", { className: "inline-flex items-center gap-2.5 text-sm text-muted-foreground", children: [
       repo && /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -76,7 +76,7 @@ function CodeModeToggle({
         className: "inline-flex items-center gap-2 group",
         role: "switch",
         "aria-checked": enabled,
-        "aria-label": "Toggle Claude Code mode",
+        "aria-label": "Toggle Code mode",
         children: [
           /* @__PURE__ */ jsx(
             "span",
@@ -99,7 +99,7 @@ function CodeModeToggle({
           /* @__PURE__ */ jsx("span", { className: cn(
             "text-xs font-medium transition-colors",
             enabled ? "text-foreground" : "text-muted-foreground group-hover:text-foreground"
-          ), children: "Claude Code" })
+          ), children: "Code" })
         ]
       }
     ),

package/lib/chat/components/code-mode-toggle.jsx

@@ -73,7 +73,7 @@ export function CodeModeToggle({
     }).catch(() => setLoadingBranches(false));
   }, [repo]);
 
-  if (!process.env.NEXT_PUBLIC_CLAUDE_WORKSPACE) return null;
+  if (!process.env.NEXT_PUBLIC_CODE_WORKSPACE) return null;
 
   // Locked mode: show as centered inline label
   if (locked && enabled) {
@@ -109,7 +109,7 @@ export function CodeModeToggle({
         className="inline-flex items-center gap-2 group"
         role="switch"
         aria-checked={enabled}
-        aria-label="Toggle Claude Code mode"
+        aria-label="Toggle Code mode"
       >
         {/* Track */}
         <span
@@ -131,7 +131,7 @@ export function CodeModeToggle({
           'text-xs font-medium transition-colors',
           enabled ? 'text-foreground' : 'text-muted-foreground group-hover:text-foreground'
         )}>
-          Claude Code
+          Code
         </span>
       </button>
 

package/lib/chat/components/sidebar-history-item.js

@@ -27,20 +27,20 @@ function SidebarHistoryItem({ chat, isActive, onDelete, onStar, onRename }) {
           /* @__PURE__ */ jsxs(
             SidebarMenuButton,
             {
-              href: chat.claudeWorkspaceId && chat.containerName ? `/code/${chat.claudeWorkspaceId}` : `/chat/${chat.id}`,
+              href: chat.codeWorkspaceId && chat.containerName ? `/code/${chat.codeWorkspaceId}` : `/chat/${chat.id}`,
               className: "pr-8",
               isActive,
               onClick: (e) => {
                 e.preventDefault();
-                if (chat.claudeWorkspaceId && chat.containerName) {
-                  window.location.href = `/code/${chat.claudeWorkspaceId}`;
+                if (chat.codeWorkspaceId && chat.containerName) {
+                  window.location.href = `/code/${chat.codeWorkspaceId}`;
                 } else {
                   navigateToChat(chat.id);
                 }
                 setOpenMobile(false);
               },
               children: [
-                chat.claudeWorkspaceId && chat.containerName ? /* @__PURE__ */ jsx(CodeIcon, { size: 14 }) : /* @__PURE__ */ jsx(MessageIcon, { size: 14 }),
+                chat.codeWorkspaceId && chat.containerName ? /* @__PURE__ */ jsx(CodeIcon, { size: 14 }) : /* @__PURE__ */ jsx(MessageIcon, { size: 14 }),
                 /* @__PURE__ */ jsx("span", { className: "truncate flex-1", children: chat.title })
               ]
             }

package/lib/chat/components/sidebar-history-item.jsx

@@ -27,20 +27,20 @@ export function SidebarHistoryItem({ chat, isActive, onDelete, onStar, onRename
         onMouseLeave={() => setHovered(false)}
       >
         <SidebarMenuButton
-          href={chat.claudeWorkspaceId && chat.containerName ? `/code/${chat.claudeWorkspaceId}` : `/chat/${chat.id}`}
+          href={chat.codeWorkspaceId && chat.containerName ? `/code/${chat.codeWorkspaceId}` : `/chat/${chat.id}`}
           className="pr-8"
           isActive={isActive}
           onClick={(e) => {
             e.preventDefault();
-            if (chat.claudeWorkspaceId && chat.containerName) {
-              window.location.href = `/code/${chat.claudeWorkspaceId}`;
+            if (chat.codeWorkspaceId && chat.containerName) {
+              window.location.href = `/code/${chat.codeWorkspaceId}`;
             } else {
               navigateToChat(chat.id);
             }
             setOpenMobile(false);
           }}
         >
-          {chat.claudeWorkspaceId && chat.containerName ? <CodeIcon size={14} /> : <MessageIcon size={14} />}
+          {chat.codeWorkspaceId && chat.containerName ? <CodeIcon size={14} /> : <MessageIcon size={14} />}
           <span className="truncate flex-1">
             {chat.title}
           </span>

package/lib/code/actions.js

@@ -2,13 +2,13 @@
 
 import { auth } from '../auth/index.js';
 import {
-  createClaudeWorkspace as dbCreateClaudeWorkspace,
-  getClaudeWorkspaceById,
-  getClaudeWorkspacesByUser,
-  updateClaudeWorkspaceTitle,
-  toggleClaudeWorkspaceStarred,
-  deleteClaudeWorkspace as dbDeleteClaudeWorkspace,
-} from '../db/claude-workspaces.js';
+  createCodeWorkspace as dbCreateCodeWorkspace,
+  getCodeWorkspaceById,
+  getCodeWorkspacesByUser,
+  updateCodeWorkspaceTitle,
+  toggleCodeWorkspaceStarred,
+  deleteCodeWorkspace as dbDeleteCodeWorkspace,
+} from '../db/code-workspaces.js';
 
 /**
  * Get the authenticated user or throw.
@@ -22,67 +22,67 @@ async function requireAuth() {
 }
 
 /**
- * Get all claude workspaces for the authenticated user.
+ * Get all code workspaces for the authenticated user.
  * @returns {Promise<object[]>}
  */
-export async function getClaudeWorkspaces() {
+export async function getCodeWorkspaces() {
   const user = await requireAuth();
-  return getClaudeWorkspacesByUser(user.id);
+  return getCodeWorkspacesByUser(user.id);
 }
 
 /**
- * Create a new claude workspace.
+ * Create a new code workspace.
  * @param {string} containerName - Docker container DNS name
- * @param {string} [title='Claude Workspace']
+ * @param {string} [title='Code Workspace']
  * @returns {Promise<object>}
  */
-export async function createClaudeWorkspace(containerName, title = 'Claude Workspace') {
+export async function createCodeWorkspace(containerName, title = 'Code Workspace') {
   const user = await requireAuth();
-  return dbCreateClaudeWorkspace(user.id, { containerName, title });
+  return dbCreateCodeWorkspace(user.id, { containerName, title });
 }
 
 /**
- * Rename a claude workspace (with ownership check).
+ * Rename a code workspace (with ownership check).
  * @param {string} id
  * @param {string} title
  * @returns {Promise<{success: boolean}>}
  */
-export async function renameClaudeWorkspace(id, title) {
+export async function renameCodeWorkspace(id, title) {
   const user = await requireAuth();
-  const workspace = getClaudeWorkspaceById(id);
+  const workspace = getCodeWorkspaceById(id);
   if (!workspace || workspace.userId !== user.id) {
     return { success: false };
   }
-  updateClaudeWorkspaceTitle(id, title);
+  updateCodeWorkspaceTitle(id, title);
   return { success: true };
 }
 
 /**
- * Toggle a claude workspace's starred status (with ownership check).
+ * Toggle a code workspace's starred status (with ownership check).
  * @param {string} id
  * @returns {Promise<{success: boolean, starred?: number}>}
  */
-export async function starClaudeWorkspace(id) {
+export async function starCodeWorkspace(id) {
   const user = await requireAuth();
-  const workspace = getClaudeWorkspaceById(id);
+  const workspace = getCodeWorkspaceById(id);
   if (!workspace || workspace.userId !== user.id) {
     return { success: false };
   }
-  const starred = toggleClaudeWorkspaceStarred(id);
+  const starred = toggleCodeWorkspaceStarred(id);
   return { success: true, starred };
 }
 
 /**
- * Delete a claude workspace (with ownership check).
+ * Delete a code workspace (with ownership check).
  * @param {string} id
  * @returns {Promise<{success: boolean}>}
  */
-export async function deleteClaudeWorkspace(id) {
+export async function deleteCodeWorkspace(id) {
   const user = await requireAuth();
-  const workspace = getClaudeWorkspaceById(id);
+  const workspace = getCodeWorkspaceById(id);
   if (!workspace || workspace.userId !== user.id) {
     return { success: false };
   }
-  dbDeleteClaudeWorkspace(id);
+  dbDeleteCodeWorkspace(id);
   return { success: true };
 }

package/lib/code/code-page.js

@@ -13,7 +13,7 @@ import { ChatHeader } from "../chat/components/chat-header.js";
 import "@xterm/xterm/css/xterm.css";
 const STATUS = { connected: "#22c55e", connecting: "#eab308", disconnected: "#ef4444" };
 const RECONNECT_INTERVAL = 3e3;
-function CodePage({ session, claudeWorkspaceId }) {
+function CodePage({ session, codeWorkspaceId }) {
   const containerRef = useRef(null);
   const termRef = useRef(null);
   const fitAddonRef = useRef(null);
@@ -39,7 +39,7 @@ function CodePage({ session, claudeWorkspaceId }) {
     if (!term) return;
     setStatus(STATUS.connecting);
     const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
-    const ws = new WebSocket(`${protocol}//${window.location.host}/code/${claudeWorkspaceId}/ws`);
+    const ws = new WebSocket(`${protocol}//${window.location.host}/code/${codeWorkspaceId}/ws`);
     wsRef.current = ws;
     ws.binaryType = "arraybuffer";
     ws.onopen = () => {
@@ -56,7 +56,7 @@ function CodePage({ session, claudeWorkspaceId }) {
           term.write(payload);
           break;
         case "1":
-          document.title = payload || "Claude Code";
+          document.title = payload || "Code Workspace";
           break;
         case "2":
           break;
@@ -69,7 +69,7 @@ function CodePage({ session, claudeWorkspaceId }) {
     ws.onerror = () => {
       ws.close();
     };
-  }, [claudeWorkspaceId, setStatus]);
+  }, [codeWorkspaceId, setStatus]);
   useEffect(() => {
     const term = new Terminal({
       cursorBlink: true,
@@ -129,7 +129,7 @@ function CodePage({ session, claudeWorkspaceId }) {
   } }, children: /* @__PURE__ */ jsxs(SidebarProvider, { children: [
     /* @__PURE__ */ jsx(AppSidebar, { user: session.user }),
     /* @__PURE__ */ jsx(SidebarInset, { children: /* @__PURE__ */ jsxs("div", { className: "flex h-svh flex-col overflow-hidden", children: [
-      /* @__PURE__ */ jsx(ChatHeader, { workspaceId: claudeWorkspaceId }),
+      /* @__PURE__ */ jsx(ChatHeader, { workspaceId: codeWorkspaceId }),
       /* @__PURE__ */ jsxs("div", { style: { position: "relative", flex: 1, minHeight: 0 }, children: [
         /* @__PURE__ */ jsx("div", { ref: containerRef, className: "mx-4", style: { height: "100%", borderRadius: 6, overflow: "hidden" } }),
         !connected && /* @__PURE__ */ jsx("div", { style: {

package/lib/code/code-page.jsx

@@ -15,7 +15,7 @@ import '@xterm/xterm/css/xterm.css';
 const STATUS = { connected: '#22c55e', connecting: '#eab308', disconnected: '#ef4444' };
 const RECONNECT_INTERVAL = 3000;
 
-export default function CodePage({ session, claudeWorkspaceId }) {
+export default function CodePage({ session, codeWorkspaceId }) {
   const containerRef = useRef(null);
   const termRef = useRef(null);
   const fitAddonRef = useRef(null);
@@ -45,7 +45,7 @@ export default function CodePage({ session, claudeWorkspaceId }) {
     setStatus(STATUS.connecting);
 
     const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
-    const ws = new WebSocket(`${protocol}//${window.location.host}/code/${claudeWorkspaceId}/ws`);
+    const ws = new WebSocket(`${protocol}//${window.location.host}/code/${codeWorkspaceId}/ws`);
     wsRef.current = ws;
 
     ws.binaryType = 'arraybuffer';
@@ -67,7 +67,7 @@ export default function CodePage({ session, claudeWorkspaceId }) {
           term.write(payload);
           break;
         case '1': // title
-          document.title = payload || 'Claude Code';
+          document.title = payload || 'Code Workspace';
           break;
         case '2': // prefs (ignored)
           break;
@@ -82,7 +82,7 @@ export default function CodePage({ session, claudeWorkspaceId }) {
     ws.onerror = () => {
       ws.close();
     };
-  }, [claudeWorkspaceId, setStatus]);
+  }, [codeWorkspaceId, setStatus]);
 
   useEffect(() => {
     const term = new Terminal({
@@ -160,7 +160,7 @@ export default function CodePage({ session, claudeWorkspaceId }) {
         <AppSidebar user={session.user} />
         <SidebarInset>
           <div className="flex h-svh flex-col overflow-hidden">
-            <ChatHeader workspaceId={claudeWorkspaceId} />
+            <ChatHeader workspaceId={codeWorkspaceId} />
             <div style={{ position: 'relative', flex: 1, minHeight: 0 }}>
               <div ref={containerRef} className="mx-4" style={{ height: '100%', borderRadius: 6, overflow: 'hidden' }} />
               {!connected && (

package/lib/code/ws-proxy.js

@@ -1,6 +1,6 @@
 import { WebSocketServer, WebSocket } from 'ws';
 import { decode } from 'next-auth/jwt';
-import { getClaudeWorkspaceById } from '../db/claude-workspaces.js';
+import { getCodeWorkspaceById } from '../db/code-workspaces.js';
 
 async function isAuthenticated(req) {
   const cookies = req.headers.cookie || '';
@@ -37,16 +37,16 @@ export function attachCodeProxy(server) {
       return;
     }
 
-    const claudeWorkspaceId = match[1];
-    const claudeWorkspace = getClaudeWorkspaceById(claudeWorkspaceId);
-    if (!claudeWorkspace) {
-      console.log(`[ws-proxy] rejected: unknown workspace ${claudeWorkspaceId}`);
+    const codeWorkspaceId = match[1];
+    const codeWorkspace = getCodeWorkspaceById(codeWorkspaceId);
+    if (!codeWorkspace) {
+      console.log(`[ws-proxy] rejected: unknown workspace ${codeWorkspaceId}`);
       socket.write('HTTP/1.1 403 Forbidden\r\n\r\n');
       socket.destroy();
       return;
     }
 
-    const container = claudeWorkspace.containerName;
+    const container = codeWorkspace.containerName;
 
     wss.handleUpgrade(req, socket, head, (clientWs) => {
       const backendWs = new WebSocket(`ws://${container}:7681/ws`, 'tty');

package/lib/db/chats.js

@@ -50,13 +50,13 @@ export function getChatById(chatId) {
 }
 
 /**
- * Get a single chat by its claude_workspace_id.
+ * Get a single chat by its code_workspace_id.
  * @param {string} workspaceId
  * @returns {object|undefined}
  */
 export function getChatByWorkspaceId(workspaceId) {
   const db = getDb();
-  return db.select().from(chats).where(eq(chats.claudeWorkspaceId, workspaceId)).get();
+  return db.select().from(chats).where(eq(chats.codeWorkspaceId, workspaceId)).get();
 }
 
 /**
@@ -132,14 +132,14 @@ export function getMessagesByChatId(chatId) {
 }
 
 /**
- * Link a chat to a claude workspace.
+ * Link a chat to a code workspace.
  * @param {string} chatId
  * @param {string} workspaceId
  */
 export function linkChatToWorkspace(chatId, workspaceId) {
   const db = getDb();
   db.update(chats)
-    .set({ claudeWorkspaceId: workspaceId, updatedAt: Date.now() })
+    .set({ codeWorkspaceId: workspaceId, updatedAt: Date.now() })
     .where(eq(chats.id, chatId))
     .run();
 }

package/lib/db/{claude-workspaces.js → code-workspaces.js}

@@ -1,20 +1,21 @@
 import { randomUUID } from 'crypto';
 import { eq, desc } from 'drizzle-orm';
 import { getDb } from './index.js';
-import { claudeWorkspaces } from './schema.js';
+import { codeWorkspaces } from './schema.js';
 
 /**
- * Create a new claude workspace.
+ * Create a new code workspace.
  * @param {string} userId
  * @param {object} options
  * @param {string} [options.containerName] - Docker container DNS name (null until launched)
  * @param {string} [options.repo] - GitHub repo full name (e.g. "owner/repo")
  * @param {string} [options.branch] - Git branch name
- * @param {string} [options.title='Claude Workspace']
+ * @param {string} [options.title='Code Workspace']
+ * @param {string} [options.codingAgent='claude-code'] - Coding agent identifier
  * @param {string} [options.id] - Optional ID (UUID). Generated if not provided.
  * @returns {object} The created workspace
  */
-export function createClaudeWorkspace(userId, { containerName = null, repo = null, branch = null, title = 'Claude Workspace', id = null } = {}) {
+export function createCodeWorkspace(userId, { containerName = null, repo = null, branch = null, title = 'Code Workspace', codingAgent = 'claude-code', id = null } = {}) {
   const db = getDb();
   const now = Date.now();
   const workspace = {
@@ -24,10 +25,11 @@ export function createClaudeWorkspace(userId, { containerName = null, repo = nul
     repo,
     branch,
     title,
+    codingAgent,
     createdAt: now,
     updatedAt: now,
   };
-  db.insert(claudeWorkspaces).values(workspace).run();
+  db.insert(codeWorkspaces).values(workspace).run();
   return workspace;
 }
 
@@ -38,71 +40,71 @@ export function createClaudeWorkspace(userId, { containerName = null, repo = nul
  */
 export function updateContainerName(id, containerName) {
   const db = getDb();
-  db.update(claudeWorkspaces)
+  db.update(codeWorkspaces)
     .set({ containerName, updatedAt: Date.now() })
-    .where(eq(claudeWorkspaces.id, id))
+    .where(eq(codeWorkspaces.id, id))
     .run();
 }
 
 /**
- * Get a single claude workspace by ID.
+ * Get a single code workspace by ID.
  * @param {string} id
  * @returns {object|undefined}
  */
-export function getClaudeWorkspaceById(id) {
+export function getCodeWorkspaceById(id) {
   const db = getDb();
-  return db.select().from(claudeWorkspaces).where(eq(claudeWorkspaces.id, id)).get();
+  return db.select().from(codeWorkspaces).where(eq(codeWorkspaces.id, id)).get();
 }
 
 /**
- * Get all claude workspaces for a user, ordered by most recently updated.
+ * Get all code workspaces for a user, ordered by most recently updated.
  * @param {string} userId
  * @returns {object[]}
  */
-export function getClaudeWorkspacesByUser(userId) {
+export function getCodeWorkspacesByUser(userId) {
   const db = getDb();
   return db
     .select()
-    .from(claudeWorkspaces)
-    .where(eq(claudeWorkspaces.userId, userId))
-    .orderBy(desc(claudeWorkspaces.updatedAt))
+    .from(codeWorkspaces)
+    .where(eq(codeWorkspaces.userId, userId))
+    .orderBy(desc(codeWorkspaces.updatedAt))
     .all();
 }
 
 /**
- * Update a claude workspace's title.
+ * Update a code workspace's title.
  * @param {string} id
  * @param {string} title
  */
-export function updateClaudeWorkspaceTitle(id, title) {
+export function updateCodeWorkspaceTitle(id, title) {
   const db = getDb();
-  db.update(claudeWorkspaces)
+  db.update(codeWorkspaces)
     .set({ title, updatedAt: Date.now() })
-    .where(eq(claudeWorkspaces.id, id))
+    .where(eq(codeWorkspaces.id, id))
     .run();
 }
 
 /**
- * Toggle a claude workspace's starred status.
+ * Toggle a code workspace's starred status.
  * @param {string} id
  * @returns {number} The new starred value (0 or 1)
  */
-export function toggleClaudeWorkspaceStarred(id) {
+export function toggleCodeWorkspaceStarred(id) {
   const db = getDb();
-  const workspace = db.select({ starred: claudeWorkspaces.starred }).from(claudeWorkspaces).where(eq(claudeWorkspaces.id, id)).get();
+  const workspace = db.select({ starred: codeWorkspaces.starred }).from(codeWorkspaces).where(eq(codeWorkspaces.id, id)).get();
   const newValue = workspace?.starred ? 0 : 1;
-  db.update(claudeWorkspaces)
+  db.update(codeWorkspaces)
     .set({ starred: newValue })
-    .where(eq(claudeWorkspaces.id, id))
+    .where(eq(codeWorkspaces.id, id))
     .run();
   return newValue;
 }
 
 /**
- * Delete a claude workspace.
+ * Delete a code workspace.
  * @param {string} id
  */
-export function deleteClaudeWorkspace(id) {
+export function deleteCodeWorkspace(id) {
   const db = getDb();
-  db.delete(claudeWorkspaces).where(eq(claudeWorkspaces.id, id)).run();
+  db.delete(codeWorkspaces).where(eq(codeWorkspaces.id, id)).run();
 }

package/lib/db/schema.js

@@ -14,7 +14,7 @@ export const chats = sqliteTable('chats', {
   userId: text('user_id').notNull(),
   title: text('title').notNull().default('New Chat'),
   starred: integer('starred').notNull().default(0),
-  claudeWorkspaceId: text('claude_workspace_id'),
+  codeWorkspaceId: text('code_workspace_id'),
   createdAt: integer('created_at').notNull(),
   updatedAt: integer('updated_at').notNull(),
 });
@@ -42,13 +42,14 @@ export const subscriptions = sqliteTable('subscriptions', {
   createdAt: integer('created_at').notNull(),
 });
 
-export const claudeWorkspaces = sqliteTable('claude_workspaces', {
+export const codeWorkspaces = sqliteTable('code_workspaces', {
   id: text('id').primaryKey(),
   userId: text('user_id').notNull(),
   containerName: text('container_name').unique(),
   repo: text('repo'),
   branch: text('branch'),
-  title: text('title').notNull().default('Claude Workspace'),
+  title: text('title').notNull().default('Code Workspace'),
+  codingAgent: text('coding_agent').notNull().default('claude-code'),
   starred: integer('starred').notNull().default(0),
   createdAt: integer('created_at').notNull(),
   updatedAt: integer('updated_at').notNull(),

package/lib/tools/docker.js

@@ -50,16 +50,21 @@ async function detectNetwork() {
 }
 
 /**
- * Create and start a Claude workspace Docker container.
+ * Create and start a code workspace Docker container.
  * @param {object} options
  * @param {string} options.containerName - Docker container name
  * @param {string} options.repo - GitHub repo full name (e.g. "owner/repo")
  * @param {string} options.branch - Git branch name
+ * @param {string} [options.codingAgent='claude-code'] - Coding agent identifier
  * @returns {Promise<{containerId: string}>}
  */
-async function createClaudeWorkspaceContainer({ containerName, repo, branch }) {
+async function createCodeWorkspaceContainer({ containerName, repo, branch, codingAgent = 'claude-code' }) {
+  if (codingAgent !== 'claude-code') {
+    throw new Error(`Unsupported coding agent: ${codingAgent}`);
+  }
+
   const version = process.env.THEPOPEBOT_VERSION || 'latest';
-  const image = `stephengpope/thepopebot:claude-workspace-${version}`;
+  const image = `stephengpope/thepopebot:claude-code-workspace-${version}`;
   const network = await detectNetwork();
 
   const env = [
@@ -97,4 +102,4 @@ async function createClaudeWorkspaceContainer({ containerName, repo, branch }) {
   return { containerId };
 }
 
-export { createClaudeWorkspaceContainer };
+export { createCodeWorkspaceContainer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thepopebot",
-  "version": "1.2.72",
+  "version": "1.2.73-beta.1",
   "type": "module",
   "description": "Create autonomous AI agents with a two-layer architecture: Next.js Event Handler + Docker Agent.",
   "bin": {

package/templates/app/code/{[claudeWorkspaceId] → [codeWorkspaceId]}/page.js

@@ -3,6 +3,6 @@ import { CodePage } from 'thepopebot/code';
 
 export default async function CodeRoute({ params }) {
   const session = await auth();
-  const { claudeWorkspaceId } = await params;
-  return <CodePage session={session} claudeWorkspaceId={claudeWorkspaceId} />;
+  const { codeWorkspaceId } = await params;
+  return <CodePage session={session} codeWorkspaceId={codeWorkspaceId} />;
 }

package/templates/docker/{claude-workspace → claude-code-workspace}/Dockerfile

@@ -41,18 +41,18 @@ RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
 RUN npm install -g @anthropic-ai/claude-code
 
 # Non-root user
-RUN useradd -m -s /bin/bash claude \
-    && mkdir -p /home/claude/claude-workspace \
-    && chown claude:claude /home/claude/claude-workspace
+RUN useradd -m -s /bin/bash claude-code \
+    && mkdir -p /home/claude-code/workspace \
+    && chown claude-code:claude-code /home/claude-code/workspace
 
-COPY .tmux.conf /home/claude/.tmux.conf
-RUN chown claude:claude /home/claude/.tmux.conf
+COPY .tmux.conf /home/claude-code/.tmux.conf
+RUN chown claude-code:claude-code /home/claude-code/.tmux.conf
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
-USER claude
-WORKDIR /home/claude/claude-workspace
+USER claude-code
+WORKDIR /home/claude-code/workspace
 
 ENV REPO=""
 ENV BRANCH=main

package/templates/docker/{claude-workspace → claude-code-workspace}/entrypoint.sh

@@ -11,10 +11,10 @@ git config --global user.email "$GH_USER_EMAIL"
 
 # Clone repo
 if [ -n "$REPO" ]; then
-    git clone --branch "$BRANCH" "https://github.com/$REPO" /home/claude/claude-workspace
+    git clone --branch "$BRANCH" "https://github.com/$REPO" /home/claude-code/workspace
 fi
 
-cd /home/claude/claude-workspace
+cd /home/claude-code/workspace
 WORKSPACE_DIR=$(pwd)
 
 # Claude Code auth — use OAuth token, not API key