diff --git a/skills/kugetsu/scripts/kugetsu b/skills/kugetsu/scripts/kugetsu
index c381026..79bc0c4 100755
--- a/skills/kugetsu/scripts/kugetsu
+++ b/skills/kugetsu/scripts/kugetsu
@@ -1439,12 +1439,13 @@ cmd_continue() {
 
     echo "Continuing session for '$session_name'..."
     # Note: --continue always allowed (existing sessions don't count toward limit)
+    # Wrap in subshell with cd to ensure worktree directory is set correctly in session DB
     if [ -n "$worktree_path" ] && [ -d "$worktree_path" ]; then
         echo "Using worktree: $worktree_path"
         if [ "$DEBUG_MODE" = true ]; then
-            opencode run "$message" --continue --session "$opencode_session_id" --dir "$worktree_path" 2>&1 | tee "$session_path.debug.log" &
+            (cd "$worktree_path" && opencode run "$message" --continue --session "$opencode_session_id" --dir "$worktree_path" 2>&1) | tee "$session_path.debug.log" &
         else
-            opencode run "$message" --continue --session "$opencode_session_id" --dir "$worktree_path" 2>&1 &
+            (cd "$worktree_path" && opencode run "$message" --continue --session "$opencode_session_id" --dir "$worktree_path" 2>&1) &
         fi
     else
         if [ "$DEBUG_MODE" = true ]; then