fix: copy CLAUDE.md and skills from templates dir instead of volume-mounted config

/app/config is volume-mounted by docker-compose, which overwrites the
Dockerfile COPY. Move templates to /app/templates/claude/ and add
deployGlobalTemplates() that copies both CLAUDE.md and skills directory
to workspaces. Also deploy templates on terminal creation, not just
pairWorkspace.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Remote Agent

docker/Dockerfile

@@ -147,8 +147,8 @@ RUN mkdir -p /app/workspaces /app/ssh-keys /app/config/hooks /app/config/skills
 # Copy hook scripts (--chmod eliminates ghost layer from separate chmod)
 COPY --chown=agent:agent --chmod=755 docker/hooks/ /app/hooks/
 
-# Copy global CLAUDE.md template
-COPY --chown=agent:agent docker/claude/ /app/config/claude/
+# Copy global CLAUDE.md + skills templates (to /app/templates, NOT /app/config which is volume-mounted)
+COPY --chown=agent:agent docker/claude/ /app/templates/claude/
 
 # ── Metadata & environment ──
 ENV APP_VERSION=$VERSION
@@ -157,6 +157,7 @@ ENV BUN_TMPDIR=/tmp
 ENV WORKSPACES_ROOT=/app/workspaces
 ENV SSH_KEYS_ROOT=/app/ssh-keys
 ENV CONFIG_ROOT=/app/config
+ENV TEMPLATES_ROOT=/app/templates
 ENV NVM_DIR=/home/agent/.nvm
 ENV PATH="/home/agent/.local/bin:/home/agent/.nvm/default_bin:/usr/local/bin:${PATH}"
 

packages/api/src/routes/terminals.routes.ts

@@ -82,8 +82,9 @@ export const terminalRoutes = new Elysia({ prefix: '/terminals' })
       }
       name = body.name || 'Claude';
 
-      // Ensure user workspace and .claude directory exist with default hooks
+      // Ensure user workspace, .claude directory, templates, and hooks exist
       await workspaceService.createUserWorkspace(user!.id);
+      await workspaceService.deployGlobalTemplates(user!.id);
       await workspaceService.storeHooks(user!.id, body.sessionId, terminalId);
 
       // Set session and terminal IDs for hook callbacks

packages/api/src/services/workspace/workspace.service.ts

@@ -37,11 +37,13 @@ export class WorkspaceService {
   private workspacesRoot: string;
   private sshKeysRoot: string;
   private configRoot: string;
+  private templatesRoot: string;
 
-  constructor(opts?: { workspacesRoot?: string; sshKeysRoot?: string; configRoot?: string }) {
+  constructor(opts?: { workspacesRoot?: string; sshKeysRoot?: string; configRoot?: string; templatesRoot?: string }) {
     this.workspacesRoot = opts?.workspacesRoot || '/app/workspaces';
     this.sshKeysRoot = opts?.sshKeysRoot || '/app/ssh-keys';
     this.configRoot = opts?.configRoot || '/app/config';
+    this.templatesRoot = opts?.templatesRoot || '/app/templates';
   }
 
   async createUserWorkspace(userId: string): Promise<string> {
@@ -59,21 +61,18 @@ export class WorkspaceService {
       await this.storeSSHKey(userId, opts.sshPrivateKey, opts.sshPublicKey);
     }
 
-    // 2. Deploy config-based skills (from /app/config/claude/skills/)
-    await this.deploySkills(userId);
+    // 2. Deploy global CLAUDE.md + skills from templates
+    await this.deployGlobalTemplates(userId);
 
-    // 3. Store custom API-provided skills (on top of config-based ones)
+    // 3. Store custom API-provided skills (on top of template ones)
     if (opts.skills?.length) {
       await this.storeSkills(userId, opts.skills);
     }
 
-    // 4. Deploy global CLAUDE.md
-    await this.deployCLAUDEmd(userId);
-
-    // 5. Store custom hooks (merged with notification hooks)
+    // 4. Store custom hooks (merged with notification hooks)
     await this.storeHooks(userId, undefined, undefined, opts.hooks);
 
-    // 6. Store Claude settings
+    // 5. Store Claude settings
     if (opts.claudeSettings) {
       await this.storeSettings(userId, opts.claudeSettings);
     }
@@ -162,35 +161,25 @@ export class WorkspaceService {
     }
   }
 
-  async deployCLAUDEmd(userId: string): Promise<void> {
-    const sourcePath = join(this.configRoot, 'claude', 'CLAUDE.md');
-    const destPath = join(this.workspacesRoot, userId, 'CLAUDE.md');
+  async deployGlobalTemplates(userId: string): Promise<void> {
+    const claudeTemplateDir = join(this.templatesRoot, 'claude');
+    const userPath = join(this.workspacesRoot, userId);
+
+    // Deploy CLAUDE.md to workspace root
     try {
-      await copyFile(sourcePath, destPath);
+      await copyFile(join(claudeTemplateDir, 'CLAUDE.md'), join(userPath, 'CLAUDE.md'));
     } catch {
-      // CLAUDE.md template not found, skip silently
+      // CLAUDE.md template not found, skip
     }
-  }
-
-  async deploySkills(userId: string): Promise<void> {
-    const sourceDir = join(this.configRoot, 'claude', 'skills');
-    const destDir = join(this.workspacesRoot, userId, '.claude', 'skills');
 
+    // Deploy skills to .claude/skills/
     try {
-      const entries = await readdir(sourceDir, { withFileTypes: true });
-      const skillDirs = entries.filter(e => e.isDirectory() && !e.name.startsWith('.'));
-
-      if (skillDirs.length === 0) return;
-
-      await mkdir(destDir, { recursive: true });
-
-      for (const dir of skillDirs) {
-        const src = join(sourceDir, dir.name);
-        const dest = join(destDir, dir.name);
-        await cp(src, dest, { recursive: true, force: true });
-      }
+      const skillsSource = join(claudeTemplateDir, 'skills');
+      const skillsDest = join(userPath, '.claude', 'skills');
+      await readdir(skillsSource);
+      await cp(skillsSource, skillsDest, { recursive: true, force: true });
     } catch {
-      // Skills directory not found, skip silently
+      // Skills directory not found, skip
     }
   }
 
@@ -335,4 +324,5 @@ export const workspaceService = new WorkspaceService({
   workspacesRoot: process.env.WORKSPACES_ROOT || '/app/workspaces',
   sshKeysRoot: process.env.SSH_KEYS_ROOT || '/app/ssh-keys',
   configRoot: process.env.CONFIG_ROOT || '/app/config',
+  templatesRoot: process.env.TEMPLATES_ROOT || '/app/templates',
 });