From 8de978ccf6b9d857d31c8a14acc5efba06282887 Mon Sep 17 00:00:00 2001
From: Eyejoker <phj1081@gmail.com>
Date: Wed, 11 Mar 2026 02:59:34 +0900
Subject: [PATCH] feat: sync project workDir commands and skills into agent
 sessions

---
 src/container-runner.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/container-runner.ts b/src/container-runner.ts
index 7b665f0..12358a6 100644
--- a/src/container-runner.ts
+++ b/src/container-runner.ts
@@ -81,18 +81,25 @@ function prepareGroupEnvironment(
   }
 
   // Sync skills and commands into each group's .claude/ session dir
-  // Sources: 1) user's global ~/.claude/  2) container/skills/ (nanoclaw bundled)
+  // Sources: 1) user's global ~/.claude/  2) project workDir/.claude/  3) container/skills/
+  const workDirClaude = group.workDir
+    ? path.join(group.workDir, '.claude')
+    : null;
   const syncDirs = [
     {
       dst: path.join(groupSessionsDir, 'skills'),
       sources: [
         path.join(os.homedir(), '.claude', 'skills'),
+        ...(workDirClaude ? [path.join(workDirClaude, 'skills')] : []),
         path.join(projectRoot, 'container', 'skills'),
       ],
     },
     {
       dst: path.join(groupSessionsDir, 'commands'),
-      sources: [path.join(os.homedir(), '.claude', 'commands')],
+      sources: [
+        path.join(os.homedir(), '.claude', 'commands'),
+        ...(workDirClaude ? [path.join(workDirClaude, 'commands')] : []),
+      ],
     },
   ];
   for (const { dst, sources } of syncDirs) {