diff --git a/.claude/skills/setup-trigger-service/improve.sh b/.claude/skills/setup-trigger-service/improve.sh
index fd495fc8..a1fb9d98 100755
--- a/.claude/skills/setup-trigger-service/improve.sh
+++ b/.claude/skills/setup-trigger-service/improve.sh
@@ -14,7 +14,8 @@
 
 set -eo pipefail
 
-REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)"
 MANIFEST="${REPO_ROOT}/manifest.json"
 MODE="${1:-once}"
 
diff --git a/.claude/skills/setup-trigger-service/trigger-server.ts b/.claude/skills/setup-trigger-service/trigger-server.ts
index 9d30cd3b..53af47a0 100644
--- a/.claude/skills/setup-trigger-service/trigger-server.ts
+++ b/.claude/skills/setup-trigger-service/trigger-server.ts
@@ -34,7 +34,7 @@ async function runScript(reason: string) {
   );
   try {
     const proc = Bun.spawn(["bash", TARGET_SCRIPT], {
-      cwd: TARGET_SCRIPT.substring(0, TARGET_SCRIPT.lastIndexOf("/")) || ".",
+      cwd: process.env.REPO_ROOT || TARGET_SCRIPT.substring(0, TARGET_SCRIPT.lastIndexOf("/")) || ".",
       stdout: "inherit",
       stderr: "inherit",
     });